diff --git a/.gitmodules b/.gitmodules
index 11596a828c..0d94bc7b4e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -274,3 +274,15 @@
 [submodule "_vendor/github.com/golang/protobuf"]
 	path = _vendor/github.com/golang/protobuf
 	url = https://github.com/golang/protobuf
+[submodule "_vendor/github.com/vmware/govmomi"]
+	path = _vendor/github.com/vmware/govmomi
+	url = https://github.com/vmware/govmomi.git
+[submodule "_vendor/github.com/coreos/go-semver"]
+	path = _vendor/github.com/coreos/go-semver
+	url = https://github.com/coreos/go-semver.git
+[submodule "_vendor/github.com/miekg/coredns"]
+	path = _vendor/github.com/miekg/coredns
+	url = https://github.com/miekg/coredns.git
+[submodule "_vendor/github.com/miekg/dns"]
+	path = _vendor/github.com/miekg/dns
+	url = https://github.com/miekg/dns.git
diff --git a/Makefile b/Makefile
index 7abf7b3766..db54bf2db4 100644
--- a/Makefile
+++ b/Makefile
@@ -31,8 +31,8 @@ MAKEDIR:=$(strip $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))"))
 # Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
 DNS_CONTROLLER_TAG=1.6.0
 
-KOPS_RELEASE_VERSION=1.6.0-alpha.1
-KOPS_CI_VERSION=1.6.0-alpha.2
+KOPS_RELEASE_VERSION=1.6.0-alpha.2
+KOPS_CI_VERSION=1.6.0-alpha.3
 
 GITSHA := $(shell cd ${GOPATH_1ST}/src/k8s.io/kops; git describe --always)
 
@@ -111,7 +111,8 @@ test:
 	go test k8s.io/kops/protokube/... -args -v=1 -logtostderr
 	go test k8s.io/kops/dns-controller/pkg/... -args -v=1 -logtostderr
 	go test k8s.io/kops/cmd/... -args -v=1 -logtostderr
-	go test k8s.io/kops/tests/... -args -v=1 -logtostderr
+	go test k8s.io/kops/cmd/... -args -v=1 -logtostderr
+	go test k8s.io/kops/channels/... -args -v=1 -logtostderr
 	go test k8s.io/kops/util/... -args -v=1 -logtostderr
 
 crossbuild-nodeup:
@@ -174,7 +175,7 @@ gcs-publish-ci: gcs-upload
 	gsutil -h "Cache-Control:private, max-age=0, no-transform" cp .build/upload/${LATEST_FILE} ${GCS_LOCATION}
 
 gen-cli-docs:
-	KOPS_STATE_STORE= kops genhelpdocs --out docs/cli
+	@kops genhelpdocs --out docs/cli
 
 # Will always push a linux-based build up to the server
 push: crossbuild-nodeup
diff --git a/_vendor/github.com/coreos/go-semver b/_vendor/github.com/coreos/go-semver
new file mode 160000
index 0000000000..5e3acbb566
--- /dev/null
+++ b/_vendor/github.com/coreos/go-semver
@@ -0,0 +1 @@
+Subproject commit 5e3acbb5668c4c3deb4842615c4098eb61fb6b1e
diff --git a/_vendor/github.com/miekg/coredns b/_vendor/github.com/miekg/coredns
new file mode 160000
index 0000000000..757f49d8ff
--- /dev/null
+++ b/_vendor/github.com/miekg/coredns
@@ -0,0 +1 @@
+Subproject commit 757f49d8ff2687d289468b00835f360614357252
diff --git a/_vendor/github.com/miekg/dns b/_vendor/github.com/miekg/dns
new file mode 160000
index 0000000000..25ac7f1714
--- /dev/null
+++ b/_vendor/github.com/miekg/dns
@@ -0,0 +1 @@
+Subproject commit 25ac7f171497271bc74ad3c6b5e1f86b4bab54fa
diff --git a/_vendor/github.com/vmware/govmomi b/_vendor/github.com/vmware/govmomi
new file mode 160000
index 0000000000..2d7d7b3702
--- /dev/null
+++ b/_vendor/github.com/vmware/govmomi
@@ -0,0 +1 @@
+Subproject commit 2d7d7b3702fddc23a76ac283c3a3d56bb0375e62
diff --git a/addons/cluster-autoscaler/v1.4.0.yaml b/addons/cluster-autoscaler/v1.4.0.yaml
index 264308acbc..e1356ebd51 100644
--- a/addons/cluster-autoscaler/v1.4.0.yaml
+++ b/addons/cluster-autoscaler/v1.4.0.yaml
@@ -15,6 +15,7 @@ spec:
       labels:
         k8s-app: cluster-autoscaler
       annotations:
+         # For 1.6, we keep the old tolerations in case of a downgrade to 1.5
         scheduler.alpha.kubernetes.io/tolerations: '[{"key":"dedicated", "value":"master"}]'
     spec:
         containers:
@@ -43,4 +44,7 @@ spec:
             hostPath:
               path: {{SSL_CERT_PATH}}
         nodeSelector:
-          kubernetes.io/role: master
+          node-role.kubernetes.io/master: ""
+        tolerations:
+          - key: "node-role.kubernetes.io/master"
+            effect: NoSchedule
diff --git a/addons/route53-mapper/README.md b/addons/route53-mapper/README.md
index c4a307770b..3742e015b6 100644
--- a/addons/route53-mapper/README.md
+++ b/addons/route53-mapper/README.md
@@ -14,9 +14,7 @@ The project is created by wearemolecule, and maintained at
 ### Deploy To Cluster
 
 ```
-# Version 1.2.0
-# https://github.com/wearemolecule/route53-kubernetes/tree/v1.2.0
-$ kubectl apply -f https://raw.githubusercontent.com/kubernetes/kops/master/addons/route53-mapper/v1.2.0.yml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/kops/master/addons/route53-mapper/v1.3.0.yml
 ```
 
 **Important:**
diff --git a/addons/route53-mapper/addon.yml b/addons/route53-mapper/addon.yml
index bdc7505957..3131ac5cb5 100644
--- a/addons/route53-mapper/addon.yml
+++ b/addons/route53-mapper/addon.yml
@@ -7,3 +7,7 @@ spec:
       selector:
         k8s-addon: route53-mapper.addons.k8s.io
       manifest: v1.2.0.yaml
+    - version: 1.3.0
+      selector:
+        k8s-addon: route53-mapper.addons.k8s.io
+      manifest: v1.3.0.yaml
\ No newline at end of file
diff --git a/addons/route53-mapper/v1.3.0.yml b/addons/route53-mapper/v1.3.0.yml
new file mode 100644
index 0000000000..262c954487
--- /dev/null
+++ b/addons/route53-mapper/v1.3.0.yml
@@ -0,0 +1,26 @@
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: route53-mapper
+  namespace: kube-system
+  labels:
+    app: route53-mapper
+    k8s-addon: route53-mapper.addons.k8s.io
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: route53-mapper
+  template:
+    metadata:
+      labels:
+        app: route53-mapper
+      annotations:
+        scheduler.alpha.kubernetes.io/tolerations: '[{"key":"dedicated", "value":"master"}]'
+    spec:
+      nodeSelector:
+        kubernetes.io/role: master
+      containers:
+        - image: quay.io/molecule/route53-kubernetes:v1.3.0
+          name: route53-mapper
diff --git a/channels/cmd/channels/main.go b/channels/cmd/channels/main.go
index c00728843d..fdeba11715 100644
--- a/channels/cmd/channels/main.go
+++ b/channels/cmd/channels/main.go
@@ -18,16 +18,14 @@ package main
 
 import (
 	"fmt"
+	"k8s.io/kops/channels/pkg/cmd"
 	"os"
 )
 
 func main() {
-	Execute()
-}
-
-// exitWithError will terminate execution with an error result
-// It prints the error to stderr and exits with a non-zero exit code
-func exitWithError(err error) {
-	fmt.Fprintf(os.Stderr, "\n%v\n", err)
-	os.Exit(1)
+	f := &cmd.DefaultFactory{}
+	if err := cmd.Execute(f, os.Stdout); err != nil {
+		fmt.Fprintf(os.Stderr, "\n%v\n", err)
+		os.Exit(1)
+	}
 }
diff --git a/channels/pkg/api/channel.go b/channels/pkg/api/channel.go
index f10aa848e8..a795075db1 100644
--- a/channels/pkg/api/channel.go
+++ b/channels/pkg/api/channel.go
@@ -47,4 +47,15 @@ type AddonSpec struct {
 
 	// Manifest is the URL to the manifest that should be applied
 	Manifest *string `json:"manifest,omitempty"`
+
+	// KubernetesVersion is a semver version range on which this version of the addon can be applied
+	KubernetesVersion string `json:"kubernetesVersion,omitempty"`
+
+	// Id is an optional value which can be used to force a refresh even if the Version matches
+	// This is useful for when we have two manifests expressing the same addon version for two
+	// different kubernetes api versions.  For example, we might label the 1.5 version "k8s-1.5"
+	// and the 1.6 version "k8s-1.6".  Both would have the same Version, determined by the
+	// version of the software we are packaging.  But we always want to reinstall when we
+	// switch kubernetes versions.
+	Id string `json:"id,omitempty"`
 }
diff --git a/channels/pkg/channels/addon.go b/channels/pkg/channels/addon.go
index 9aea03660a..9b64c45ac2 100644
--- a/channels/pkg/channels/addon.go
+++ b/channels/pkg/channels/addon.go
@@ -25,6 +25,7 @@ import (
 	"net/url"
 )
 
+// Addon is a wrapper around a single version of an addon
 type Addon struct {
 	Name            string
 	ChannelName     string
@@ -32,16 +33,42 @@ type Addon struct {
 	Spec            *api.AddonSpec
 }
 
+// AddonUpdate holds data about a proposed update to an addon
 type AddonUpdate struct {
 	Name            string
 	ExistingVersion *ChannelVersion
 	NewVersion      *ChannelVersion
 }
 
+// AddonMenu is a collection of addons, with helpers for computing the latest versions
+type AddonMenu struct {
+	Addons map[string]*Addon
+}
+
+func NewAddonMenu() *AddonMenu {
+	return &AddonMenu{
+		Addons: make(map[string]*Addon),
+	}
+}
+
+func (m *AddonMenu) MergeAddons(o *AddonMenu) {
+	for k, v := range o.Addons {
+		existing := m.Addons[k]
+		if existing == nil {
+			m.Addons[k] = v
+		} else {
+			if existing.ChannelVersion().replaces(v.ChannelVersion()) {
+				m.Addons[k] = v
+			}
+		}
+	}
+}
+
 func (a *Addon) ChannelVersion() *ChannelVersion {
 	return &ChannelVersion{
 		Channel: &a.ChannelName,
 		Version: a.Spec.Version,
+		Id:      a.Spec.Id,
 	}
 }
 
@@ -67,7 +94,7 @@ func (a *Addon) GetRequiredUpdates(k8sClient kubernetes.Interface) (*AddonUpdate
 		return nil, err
 	}
 
-	if existingVersion != nil && !newVersion.Replaces(existingVersion) {
+	if existingVersion != nil && !newVersion.replaces(existingVersion) {
 		return nil, nil
 	}
 
diff --git a/channels/pkg/channels/addons.go b/channels/pkg/channels/addons.go
index 1fc54a1b6e..0893766128 100644
--- a/channels/pkg/channels/addons.go
+++ b/channels/pkg/channels/addons.go
@@ -18,6 +18,7 @@ package channels
 
 import (
 	"fmt"
+	"github.com/blang/semver"
 	"github.com/golang/glog"
 	"k8s.io/kops/channels/pkg/api"
 	"k8s.io/kops/upup/pkg/fi/utils"
@@ -58,28 +59,29 @@ func ParseAddons(name string, location *url.URL, data []byte) (*Addons, error) {
 	return &Addons{ChannelName: name, ChannelLocation: *location, APIObject: apiObject}, nil
 }
 
-func (a *Addons) GetCurrent() ([]*Addon, error) {
-	all, err := a.All()
+func (a *Addons) GetCurrent(kubernetesVersion semver.Version) (*AddonMenu, error) {
+	all, err := a.wrapInAddons()
 	if err != nil {
 		return nil, err
 	}
-	specs := make(map[string]*Addon)
+
+	menu := NewAddonMenu()
 	for _, addon := range all {
+		if !addon.matches(kubernetesVersion) {
+			continue
+		}
 		name := addon.Name
-		existing := specs[name]
-		if existing == nil || addon.ChannelVersion().Replaces(existing.ChannelVersion()) {
-			specs[name] = addon
+
+		existing := menu.Addons[name]
+		if existing == nil || addon.ChannelVersion().replaces(existing.ChannelVersion()) {
+			menu.Addons[name] = addon
 		}
 	}
 
-	var addons []*Addon
-	for _, addon := range specs {
-		addons = append(addons, addon)
-	}
-	return addons, nil
+	return menu, nil
 }
 
-func (a *Addons) All() ([]*Addon, error) {
+func (a *Addons) wrapInAddons() ([]*Addon, error) {
 	var addons []*Addon
 	for _, s := range a.APIObject.Spec.Addons {
 		name := a.APIObject.ObjectMeta.Name
@@ -98,3 +100,19 @@ func (a *Addons) All() ([]*Addon, error) {
 	}
 	return addons, nil
 }
+
+func (s *Addon) matches(kubernetesVersion semver.Version) bool {
+	if s.Spec.KubernetesVersion != "" {
+		versionRange, err := semver.ParseRange(s.Spec.KubernetesVersion)
+		if err != nil {
+			glog.Warningf("unable to parse KubernetesVersion %q; skipping", s.Spec.KubernetesVersion)
+			return false
+		}
+		if !versionRange(kubernetesVersion) {
+			glog.V(4).Infof("Skipping version range %q that does not match current version %s", s.Spec.KubernetesVersion, kubernetesVersion)
+			return false
+		}
+	}
+
+	return true
+}
diff --git a/channels/pkg/channels/addons_test.go b/channels/pkg/channels/addons_test.go
new file mode 100644
index 0000000000..810d10bf95
--- /dev/null
+++ b/channels/pkg/channels/addons_test.go
@@ -0,0 +1,154 @@
+/*
+Copyright 2016 The Kubernetes Authors.
+
+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 channels
+
+import (
+	"github.com/blang/semver"
+	"k8s.io/kops/channels/pkg/api"
+	"testing"
+)
+
+func Test_Filtering(t *testing.T) {
+	grid := []struct {
+		Input             api.AddonSpec
+		KubernetesVersion string
+		Expected          bool
+	}{
+		{
+			Input: api.AddonSpec{
+				KubernetesVersion: ">=1.6.0",
+			},
+			KubernetesVersion: "1.6.0",
+			Expected:          true,
+		},
+		{
+			Input: api.AddonSpec{
+				KubernetesVersion: "<1.6.0",
+			},
+			KubernetesVersion: "1.6.0",
+			Expected:          false,
+		},
+		{
+			Input: api.AddonSpec{
+				KubernetesVersion: ">=1.6.0",
+			},
+			KubernetesVersion: "1.5.9",
+			Expected:          false,
+		},
+		{
+			Input: api.AddonSpec{
+				KubernetesVersion: ">=1.4.0 <1.6.0",
+			},
+			KubernetesVersion: "1.5.9",
+			Expected:          true,
+		},
+		{
+			Input: api.AddonSpec{
+				KubernetesVersion: ">=1.4.0 <1.6.0",
+			},
+			KubernetesVersion: "1.6.0",
+			Expected:          false,
+		},
+	}
+	for _, g := range grid {
+		k8sVersion := semver.MustParse(g.KubernetesVersion)
+		addon := &Addon{
+			Spec: &g.Input,
+		}
+		actual := addon.matches(k8sVersion)
+		if actual != g.Expected {
+			t.Errorf("unexpected result from %v, %s.  got %v", g.Input.KubernetesVersion, g.KubernetesVersion, actual)
+		}
+	}
+}
+
+func Test_Replacement(t *testing.T) {
+	grid := []struct {
+		Old      *ChannelVersion
+		New      *ChannelVersion
+		Replaces bool
+	}{
+		// With no id, update iff newer semver
+		{
+			Old:      &ChannelVersion{Version: s("1.0.0"), Id: ""},
+			New:      &ChannelVersion{Version: s("1.0.0"), Id: ""},
+			Replaces: false,
+		},
+		{
+			Old:      &ChannelVersion{Version: s("1.0.0"), Id: ""},
+			New:      &ChannelVersion{Version: s("1.0.1"), Id: ""},
+			Replaces: true,
+		},
+		{
+			Old:      &ChannelVersion{Version: s("1.0.1"), Id: ""},
+			New:      &ChannelVersion{Version: s("1.0.0"), Id: ""},
+			Replaces: false,
+		},
+		{
+			Old:      &ChannelVersion{Version: s("1.1.0"), Id: ""},
+			New:      &ChannelVersion{Version: s("1.1.1"), Id: ""},
+			Replaces: true,
+		},
+		{
+			Old:      &ChannelVersion{Version: s("1.1.1"), Id: ""},
+			New:      &ChannelVersion{Version: s("1.1.0"), Id: ""},
+			Replaces: false,
+		},
+
+		// With id, update if different id and same version, otherwise follow semver
+		{
+			Old:      &ChannelVersion{Version: s("1.0.0"), Id: "a"},
+			New:      &ChannelVersion{Version: s("1.0.0"), Id: "a"},
+			Replaces: false,
+		},
+		{
+			Old:      &ChannelVersion{Version: s("1.0.0"), Id: "a"},
+			New:      &ChannelVersion{Version: s("1.0.0"), Id: "b"},
+			Replaces: true,
+		},
+		{
+			Old:      &ChannelVersion{Version: s("1.0.0"), Id: "b"},
+			New:      &ChannelVersion{Version: s("1.0.0"), Id: "a"},
+			Replaces: true,
+		},
+		{
+			Old:      &ChannelVersion{Version: s("1.0.0"), Id: "a"},
+			New:      &ChannelVersion{Version: s("1.0.1"), Id: "a"},
+			Replaces: true,
+		},
+		{
+			Old:      &ChannelVersion{Version: s("1.0.0"), Id: "a"},
+			New:      &ChannelVersion{Version: s("1.0.1"), Id: "a"},
+			Replaces: true,
+		},
+		{
+			Old:      &ChannelVersion{Version: s("1.0.0"), Id: "a"},
+			New:      &ChannelVersion{Version: s("1.0.1"), Id: "a"},
+			Replaces: true,
+		},
+	}
+	for _, g := range grid {
+		actual := g.New.replaces(g.Old)
+		if actual != g.Replaces {
+			t.Errorf("unexpected result from %v -> %v, expect %t.  actual %v", g.Old, g.New, g.Replaces, actual)
+		}
+	}
+}
+
+func s(v string) *string {
+	return &v
+}
diff --git a/channels/pkg/channels/channel_version.go b/channels/pkg/channels/channel_version.go
index 6b77bf7d48..b5699b29b0 100644
--- a/channels/pkg/channels/channel_version.go
+++ b/channels/pkg/channels/channel_version.go
@@ -38,6 +38,7 @@ type Channel struct {
 type ChannelVersion struct {
 	Version *string `json:"version,omitempty"`
 	Channel *string `json:"channel,omitempty"`
+	Id      string  `json:"id,omitempty"`
 }
 
 func stringValue(s *string) string {
@@ -48,7 +49,11 @@ func stringValue(s *string) string {
 }
 
 func (c *ChannelVersion) String() string {
-	return "Version=" + stringValue(c.Version) + " Channel=" + stringValue(c.Channel)
+	s := "Version=" + stringValue(c.Version) + " Channel=" + stringValue(c.Channel)
+	if c.Id != "" {
+		s += " Id=" + c.Id
+	}
+	return s
 }
 
 func ParseChannelVersion(s string) (*ChannelVersion, error) {
@@ -91,7 +96,7 @@ func (c *Channel) AnnotationName() string {
 	return AnnotationPrefix + c.Name
 }
 
-func (c *ChannelVersion) Replaces(existing *ChannelVersion) bool {
+func (c *ChannelVersion) replaces(existing *ChannelVersion) bool {
 	if existing.Version != nil {
 		if c.Version == nil {
 			return false
@@ -106,13 +111,25 @@ func (c *ChannelVersion) Replaces(existing *ChannelVersion) bool {
 			glog.Warningf("error parsing existing version %q", *existing.Version)
 			return true
 		}
-		return cVersion.GT(existingVersion)
+		if cVersion.LT(existingVersion) {
+			return false
+		} else if cVersion.GT(existingVersion) {
+			return true
+		} else {
+			// Same version; check ids
+			if c.Id == existing.Id {
+				return false
+			} else {
+				glog.V(4).Infof("Channels had same version %q but different ids (%q vs %q); will replace", *c.Version, c.Id, existing.Id)
+			}
+		}
 	}
 
 	glog.Warningf("ChannelVersion did not have a version; can't perform real version check")
 	if c.Version == nil {
 		return false
 	}
+
 	return true
 }
 
diff --git a/channels/cmd/channels/apply.go b/channels/pkg/cmd/apply.go
similarity index 71%
rename from channels/cmd/channels/apply.go
rename to channels/pkg/cmd/apply.go
index 10c06724ba..dd61a4641a 100644
--- a/channels/cmd/channels/apply.go
+++ b/channels/pkg/cmd/apply.go
@@ -14,18 +14,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package cmd
 
 import (
 	"github.com/spf13/cobra"
+	"io"
 )
 
-// applyCmd represents the apply command
-var applyCmd = &cobra.Command{
-	Use:   "apply",
-	Short: "apply resources from a channel",
-}
+func NewCmdApply(f Factory, out io.Writer) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "apply",
+		Short: "apply resources from a channel",
+	}
 
-func init() {
-	rootCommand.AddCommand(applyCmd)
+	// create subcommands
+	cmd.AddCommand(NewCmdApplyChannel(f, out))
+
+	return cmd
 }
diff --git a/channels/cmd/channels/apply_channel.go b/channels/pkg/cmd/apply_channel.go
similarity index 70%
rename from channels/cmd/channels/apply_channel.go
rename to channels/pkg/cmd/apply_channel.go
index 3481aaf82d..e5be02bded 100644
--- a/channels/cmd/channels/apply_channel.go
+++ b/channels/pkg/cmd/apply_channel.go
@@ -14,11 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package cmd
 
 import (
 	"fmt"
+	"github.com/blang/semver"
 	"github.com/spf13/cobra"
+	"io"
 	"k8s.io/kops/channels/pkg/channels"
 	"k8s.io/kops/util/pkg/tables"
 	"net/url"
@@ -26,38 +28,54 @@ import (
 	"strings"
 )
 
-type ApplyChannelCmd struct {
+type ApplyChannelOptions struct {
 	Yes   bool
 	Files []string
 }
 
-var applyChannel ApplyChannelCmd
+func NewCmdApplyChannel(f Factory, out io.Writer) *cobra.Command {
+	var options ApplyChannelOptions
 
-func init() {
 	cmd := &cobra.Command{
 		Use:   "channel",
 		Short: "Apply channel",
-		Run: func(cmd *cobra.Command, args []string) {
-			err := applyChannel.Run(args)
-			if err != nil {
-				exitWithError(err)
-			}
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return RunApplyChannel(f, out, &options, args)
 		},
 	}
 
-	cmd.Flags().BoolVar(&applyChannel.Yes, "yes", false, "Apply update")
-	cmd.Flags().StringSliceVar(&applyChannel.Files, "f", []string{}, "Apply from a local file")
+	cmd.Flags().BoolVar(&options.Yes, "yes", false, "Apply update")
+	cmd.Flags().StringSliceVar(&options.Files, "f", []string{}, "Apply from a local file")
 
-	applyCmd.AddCommand(cmd)
+	return cmd
 }
 
-func (c *ApplyChannelCmd) Run(args []string) error {
-	k8sClient, err := rootCommand.KubernetesClient()
+func RunApplyChannel(f Factory, out io.Writer, options *ApplyChannelOptions, args []string) error {
+	k8sClient, err := f.KubernetesClient()
 	if err != nil {
 		return err
 	}
 
-	var addons []*channels.Addon
+	kubernetesVersionInfo, err := k8sClient.Discovery().ServerVersion()
+	if err != nil {
+		return fmt.Errorf("error querying kubernetes version: %v", err)
+	}
+
+	//kubernetesVersion, err := semver.Parse(kubernetesVersionInfo.Major + "." + kubernetesVersionInfo.Minor + ".0")
+	//if err != nil {
+	//	return fmt.Errorf("cannot parse kubernetes version %q", kubernetesVersionInfo.Major+"."+kubernetesVersionInfo.Minor + ".0")
+	//}
+
+	kubernetesVersion, err := semver.ParseTolerant(kubernetesVersionInfo.GitVersion)
+	if err != nil {
+		return fmt.Errorf("cannot parse kubernetes version %q", kubernetesVersionInfo.GitVersion)
+	}
+
+	// Remove Pre and Patch, as they make semver comparisons impractical
+	kubernetesVersion.Pre = nil
+
+	menu := channels.NewAddonMenu()
+
 	for _, name := range args {
 		location, err := url.Parse(name)
 		if err != nil {
@@ -80,14 +98,14 @@ func (c *ApplyChannelCmd) Run(args []string) error {
 			return fmt.Errorf("error loading channel %q: %v", location, err)
 		}
 
-		current, err := o.GetCurrent()
+		current, err := o.GetCurrent(kubernetesVersion)
 		if err != nil {
 			return fmt.Errorf("error processing latest versions in %q: %v", location, err)
 		}
-		addons = append(addons, current...)
+		menu.MergeAddons(current)
 	}
 
-	for _, f := range c.Files {
+	for _, f := range options.Files {
 		location, err := url.Parse(f)
 		if err != nil {
 			return fmt.Errorf("unable to parse argument %q as url", f)
@@ -108,16 +126,16 @@ func (c *ApplyChannelCmd) Run(args []string) error {
 			return fmt.Errorf("error loading file %q: %v", f, err)
 		}
 
-		current, err := o.GetCurrent()
+		current, err := o.GetCurrent(kubernetesVersion)
 		if err != nil {
 			return fmt.Errorf("error processing latest versions in %q: %v", f, err)
 		}
-		addons = append(addons, current...)
+		menu.MergeAddons(current)
 	}
 
 	var updates []*channels.AddonUpdate
 	var needUpdates []*channels.Addon
-	for _, addon := range addons {
+	for _, addon := range menu.Addons {
 		// TODO: Cache lookups to prevent repeated lookups?
 		update, err := addon.GetRequiredUpdates(k8sClient)
 		if err != nil {
@@ -165,7 +183,7 @@ func (c *ApplyChannelCmd) Run(args []string) error {
 		}
 	}
 
-	if !c.Yes {
+	if !options.Yes {
 		fmt.Printf("\nMust specify --yes to update\n")
 		return nil
 	}
@@ -178,7 +196,7 @@ func (c *ApplyChannelCmd) Run(args []string) error {
 		// Could have been a concurrent request
 		if update != nil {
 			if update.NewVersion.Version != nil {
-				fmt.Printf("Updated %q to %d\n", update.Name, *update.NewVersion)
+				fmt.Printf("Updated %q to %s\n", update.Name, *update.NewVersion.Version)
 			} else {
 				fmt.Printf("Updated %q\n", update.Name)
 			}
diff --git a/channels/pkg/cmd/factory.go b/channels/pkg/cmd/factory.go
new file mode 100644
index 0000000000..6d1ebbcdd1
--- /dev/null
+++ b/channels/pkg/cmd/factory.go
@@ -0,0 +1,59 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+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 cmd
+
+import (
+	"fmt"
+
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/tools/clientcmd"
+)
+
+type Factory interface {
+	KubernetesClient() (kubernetes.Interface, error)
+}
+
+type DefaultFactory struct {
+	kubernetesClient kubernetes.Interface
+}
+
+var _ Factory = &DefaultFactory{}
+
+func (f *DefaultFactory) KubernetesClient() (kubernetes.Interface, error) {
+	if f.kubernetesClient == nil {
+		loadingRules := clientcmd.NewDefaultClientConfigLoadingRules()
+		loadingRules.DefaultClientConfig = &clientcmd.DefaultClientConfig
+
+		configOverrides := &clientcmd.ConfigOverrides{
+			ClusterDefaults: clientcmd.ClusterDefaults,
+		}
+
+		kubeConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, configOverrides)
+		config, err := kubeConfig.ClientConfig()
+		if err != nil {
+			return nil, fmt.Errorf("cannot load kubecfg settings: %v", err)
+		}
+
+		k8sClient, err := kubernetes.NewForConfig(config)
+		if err != nil {
+			return nil, fmt.Errorf("cannot build kube client: %v", err)
+		}
+		f.kubernetesClient = k8sClient
+	}
+
+	return f.kubernetesClient, nil
+}
diff --git a/channels/cmd/channels/get.go b/channels/pkg/cmd/get.go
similarity index 62%
rename from channels/cmd/channels/get.go
rename to channels/pkg/cmd/get.go
index 5f1471a893..dd10ee9df0 100644
--- a/channels/cmd/channels/get.go
+++ b/channels/pkg/cmd/get.go
@@ -14,36 +14,22 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package cmd
 
 import (
 	"github.com/spf13/cobra"
+	"io"
 )
 
-// GetCmd represents the get command
-type GetCmd struct {
-	output string
-
-	cobraCommand *cobra.Command
-}
-
-var getCmd = GetCmd{
-	cobraCommand: &cobra.Command{
+func NewCmdGet(f Factory, out io.Writer) *cobra.Command {
+	cmd := &cobra.Command{
 		Use:        "get",
 		SuggestFor: []string{"list"},
 		Short:      "list or get objects",
-	},
-}
-
-const (
-	OutputYaml  = "yaml"
-	OutputTable = "table"
-)
-
-func init() {
-	cmd := getCmd.cobraCommand
-
-	rootCommand.AddCommand(cmd)
-
-	cmd.PersistentFlags().StringVarP(&getCmd.output, "output", "o", OutputTable, "output format.  One of: table, yaml")
+	}
+
+	// create subcommands
+	cmd.AddCommand(NewCmdGetAddons(f, out))
+
+	return cmd
 }
diff --git a/channels/cmd/channels/get_addons.go b/channels/pkg/cmd/get_addons.go
similarity index 71%
rename from channels/cmd/channels/get_addons.go
rename to channels/pkg/cmd/get_addons.go
index 198e43c8ef..0738038869 100644
--- a/channels/cmd/channels/get_addons.go
+++ b/channels/pkg/cmd/get_addons.go
@@ -14,11 +14,28 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+/*
+Copyright 2017 The Kubernetes Authors.
+
+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 cmd
 
 import (
 	"fmt"
 	"github.com/spf13/cobra"
+	"io"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/kops/channels/pkg/channels"
@@ -26,26 +43,23 @@ import (
 	"os"
 )
 
-type GetAddonsCmd struct {
+type GetAddonsOptions struct {
 }
 
-var getAddonsCmd GetAddonsCmd
+func NewCmdGetAddons(f Factory, out io.Writer) *cobra.Command {
+	var options GetAddonsOptions
 
-func init() {
 	cmd := &cobra.Command{
 		Use:     "addons",
 		Aliases: []string{"addon"},
 		Short:   "get addons",
 		Long:    `List or get addons.`,
-		Run: func(cmd *cobra.Command, args []string) {
-			err := getAddonsCmd.Run(args)
-			if err != nil {
-				exitWithError(err)
-			}
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return RunGetAddons(f, out, &options)
 		},
 	}
 
-	getCmd.cobraCommand.AddCommand(cmd)
+	return cmd
 }
 
 type addonInfo struct {
@@ -54,8 +68,8 @@ type addonInfo struct {
 	Namespace *v1.Namespace
 }
 
-func (c *GetAddonsCmd) Run(args []string) error {
-	k8sClient, err := rootCommand.KubernetesClient()
+func RunGetAddons(f Factory, out io.Writer, options *GetAddonsOptions) error {
+	k8sClient, err := f.KubernetesClient()
 	if err != nil {
 		return err
 	}
diff --git a/channels/cmd/channels/root.go b/channels/pkg/cmd/root.go
similarity index 50%
rename from channels/cmd/channels/root.go
rename to channels/pkg/cmd/root.go
index b1e40e9ce9..c8353ba86f 100644
--- a/channels/cmd/channels/root.go
+++ b/channels/pkg/cmd/root.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package cmd
 
 import (
 	goflag "flag"
@@ -22,48 +22,44 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/tools/clientcmd"
+	"io"
 )
 
-type RootCmd struct {
+type CmdRootOptions struct {
 	configFile string
-
-	cobraCommand *cobra.Command
 }
 
-var rootCommand = RootCmd{
-	cobraCommand: &cobra.Command{
-		Use:   "channels",
-		Short: "channels applies software from a channel",
-	},
-}
-
-func Execute() {
-	goflag.Set("logtostderr", "true")
-	goflag.CommandLine.Parse([]string{})
-	if err := rootCommand.cobraCommand.Execute(); err != nil {
-		exitWithError(err)
-	}
-}
-
-func init() {
+func Execute(f Factory, out io.Writer) error {
 	cobra.OnInitialize(initConfig)
 
-	cmd := rootCommand.cobraCommand
+	cmd := NewCmdRoot(f, out)
+
+	goflag.Set("logtostderr", "true")
+	goflag.CommandLine.Parse([]string{})
+	return cmd.Execute()
+}
+
+func NewCmdRoot(f Factory, out io.Writer) *cobra.Command {
+	options := &CmdRootOptions{}
+
+	cmd := &cobra.Command{
+		Use:   "channels",
+		Short: "channels applies software from a channel",
+	}
 
 	cmd.PersistentFlags().AddGoFlagSet(goflag.CommandLine)
 
-	cmd.PersistentFlags().StringVar(&rootCommand.configFile, "config", "", "config file (default is $HOME/.channels.yaml)")
+	cmd.PersistentFlags().StringVar(&options.configFile, "config", "", "config file (default is $HOME/.channels.yaml)")
+
+	// create subcommands
+	cmd.AddCommand(NewCmdApply(f, out))
+	cmd.AddCommand(NewCmdGet(f, out))
+
+	return cmd
 }
 
 // initConfig reads in config file and ENV variables if set.
 func initConfig() {
-	if rootCommand.configFile != "" {
-		// enable ability to specify config file via flag
-		viper.SetConfigFile(rootCommand.configFile)
-	}
-
 	viper.SetConfigName(".channels") // name of config file (without extension)
 	viper.AddConfigPath("$HOME")     // adding home directory as first search path
 	viper.AutomaticEnv()             // read in environment variables that match
@@ -73,28 +69,3 @@ func initConfig() {
 		fmt.Println("Using config file:", viper.ConfigFileUsed())
 	}
 }
-
-func (c *RootCmd) AddCommand(cmd *cobra.Command) {
-	c.cobraCommand.AddCommand(cmd)
-}
-
-func (c *RootCmd) KubernetesClient() (kubernetes.Interface, error) {
-	loadingRules := clientcmd.NewDefaultClientConfigLoadingRules()
-	loadingRules.DefaultClientConfig = &clientcmd.DefaultClientConfig
-
-	configOverrides := &clientcmd.ConfigOverrides{
-		ClusterDefaults: clientcmd.ClusterDefaults,
-	}
-
-	kubeConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, configOverrides)
-	config, err := kubeConfig.ClientConfig()
-	if err != nil {
-		return nil, fmt.Errorf("cannot load kubecfg settings: %v", err)
-	}
-
-	k8sClient, err := kubernetes.NewForConfig(config)
-	if err != nil {
-		return nil, fmt.Errorf("cannot build kube client: %v", err)
-	}
-	return k8sClient, err
-}
diff --git a/cloudmock/aws/mockec2/unimplemented.go b/cloudmock/aws/mockec2/unimplemented.go
index a39fffc899..cd402d0a5e 100644
--- a/cloudmock/aws/mockec2/unimplemented.go
+++ b/cloudmock/aws/mockec2/unimplemented.go
@@ -690,14 +690,6 @@ func (m *MockEC2) DescribeInstancesPages(*ec2.DescribeInstancesInput, func(*ec2.
 	panic("Not implemented")
 	return nil
 }
-func (m *MockEC2) DescribeInternetGatewaysRequest(*ec2.DescribeInternetGatewaysInput) (*request.Request, *ec2.DescribeInternetGatewaysOutput) {
-	panic("Not implemented")
-	return nil, nil
-}
-func (m *MockEC2) DescribeInternetGateways(*ec2.DescribeInternetGatewaysInput) (*ec2.DescribeInternetGatewaysOutput, error) {
-	panic("Not implemented")
-	return nil, nil
-}
 func (m *MockEC2) DescribeMovingAddressesRequest(*ec2.DescribeMovingAddressesInput) (*request.Request, *ec2.DescribeMovingAddressesOutput) {
 	panic("Not implemented")
 	return nil, nil
diff --git a/cloudmock/aws/mockec2/vpcs.go b/cloudmock/aws/mockec2/vpcs.go
index b3b7fd6155..a2d4327807 100644
--- a/cloudmock/aws/mockec2/vpcs.go
+++ b/cloudmock/aws/mockec2/vpcs.go
@@ -144,3 +144,15 @@ func (m *MockEC2) DescribeVpcAttribute(request *ec2.DescribeVpcAttributeInput) (
 
 	return response, nil
 }
+
+func (m *MockEC2) DescribeInternetGatewaysRequest(*ec2.DescribeInternetGatewaysInput) (*request.Request, *ec2.DescribeInternetGatewaysOutput) {
+	panic("Not implemented")
+	return nil, nil
+}
+func (m *MockEC2) DescribeInternetGateways(*ec2.DescribeInternetGatewaysInput) (*ec2.DescribeInternetGatewaysOutput, error) {
+	return &ec2.DescribeInternetGatewaysOutput{
+		InternetGateways: []*ec2.InternetGateway{{
+			InternetGatewayId: aws.String("fake-ig"),
+		}},
+	}, nil
+}
diff --git a/cloudmock/aws/mockroute53/api.go b/cloudmock/aws/mockroute53/api.go
index e464bc45b7..c7c2186dd5 100644
--- a/cloudmock/aws/mockroute53/api.go
+++ b/cloudmock/aws/mockroute53/api.go
@@ -27,6 +27,7 @@ type zoneInfo struct {
 	ID         string
 	hostedZone *route53.HostedZone
 	records    []*route53.ResourceRecordSet
+	vpcs       []*route53.VPC
 }
 
 type MockRoute53 struct {
@@ -48,10 +49,11 @@ func (m *MockRoute53) findZone(hostedZoneId string) *zoneInfo {
 	return nil
 }
 
-func (m *MockRoute53) MockCreateZone(z *route53.HostedZone) {
+func (m *MockRoute53) MockCreateZone(z *route53.HostedZone, vpcs []*route53.VPC) {
 	zi := &zoneInfo{
 		ID:         aws.StringValue(z.Id),
 		hostedZone: z,
+		vpcs:       vpcs,
 	}
 	m.Zones = append(m.Zones, zi)
 }
diff --git a/cloudmock/aws/mockroute53/zones.go b/cloudmock/aws/mockroute53/zones.go
index 07ad8a0533..408bea86aa 100644
--- a/cloudmock/aws/mockroute53/zones.go
+++ b/cloudmock/aws/mockroute53/zones.go
@@ -45,7 +45,7 @@ func (m *MockRoute53) GetHostedZone(request *route53.GetHostedZoneInput) (*route
 	response := &route53.GetHostedZoneOutput{
 		// DelegationSet ???
 		HostedZone: &copy,
-		// VPCs
+		VPCs:       zone.vpcs,
 	}
 	return response, nil
 }
@@ -89,6 +89,13 @@ func (m *MockRoute53) ListHostedZonesByNameRequest(*route53.ListHostedZonesByNam
 }
 
 func (m *MockRoute53) ListHostedZonesByName(*route53.ListHostedZonesByNameInput) (*route53.ListHostedZonesByNameOutput, error) {
-	panic("MockRoute53 ListHostedZonesByName not implemented")
-	return nil, nil
+	var zones []*route53.HostedZone
+
+	for _, z := range m.Zones {
+		zones = append(zones, z.hostedZone)
+	}
+
+	return &route53.ListHostedZonesByNameOutput{
+		HostedZones: zones,
+	}, nil
 }
diff --git a/cmd/kops/delete.go b/cmd/kops/delete.go
index eddd8e9781..e1b460461c 100644
--- a/cmd/kops/delete.go
+++ b/cmd/kops/delete.go
@@ -17,25 +17,48 @@ limitations under the License.
 package main
 
 import (
+	"fmt"
 	"io"
 
+	"bytes"
+
+	"github.com/golang/glog"
 	"github.com/spf13/cobra"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/kops/cmd/kops/util"
+	kopsapi "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/apis/kops/v1alpha1"
+	"k8s.io/kops/util/pkg/vfs"
+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
+	"k8s.io/kubernetes/pkg/kubectl/resource"
 )
 
 type DeleteOptions struct {
+	resource.FilenameOptions
+	Yes bool
 }
 
 func NewCmdDelete(f *util.Factory, out io.Writer) *cobra.Command {
-	//options := &DeleteOptions{}
+	options := &DeleteOptions{}
 
 	cmd := &cobra.Command{
-		Use:        "delete",
-		Short:      "Delete clusters and other resources.",
-		Long:       `Delete clusters`,
+		Use:        "delete -f FILENAME [--yes]",
+		Short:      "Delete clusters and instancegroups",
+		Long:       `Delete clusters and instancegroups`,
 		SuggestFor: []string{"rm"},
+		Run: func(cmd *cobra.Command, args []string) {
+			if cmdutil.IsFilenameEmpty(options.Filenames) {
+				cmd.Help()
+				return
+			}
+			cmdutil.CheckErr(RunDelete(f, out, options))
+		},
 	}
 
+	cmd.Flags().StringSliceVarP(&options.Filenames, "filename", "f", options.Filenames, "Filename to use to delete the resource")
+	cmd.Flags().BoolVarP(&options.Yes, "yes", "y", options.Yes, "Specify --yes to delete the resource")
+	cmd.MarkFlagRequired("filename")
+
 	// create subcommands
 	cmd.AddCommand(NewCmdDeleteCluster(f, out))
 	cmd.AddCommand(NewCmdDeleteInstanceGroup(f, out))
@@ -43,3 +66,68 @@ func NewCmdDelete(f *util.Factory, out io.Writer) *cobra.Command {
 
 	return cmd
 }
+
+func RunDelete(factory *util.Factory, out io.Writer, d *DeleteOptions) error {
+	// Codecs provides access to encoding and decoding for the scheme
+	codecs := kopsapi.Codecs //serializer.NewCodecFactory(scheme)
+
+	codec := codecs.UniversalDecoder(kopsapi.SchemeGroupVersion)
+
+	var sb bytes.Buffer
+	fmt.Fprintf(&sb, "\n")
+	for _, f := range d.Filenames {
+		contents, err := vfs.Context.ReadFile(f)
+		if err != nil {
+			return fmt.Errorf("error reading file %q: %v", f, err)
+		}
+
+		sections := bytes.Split(contents, []byte("\n---\n"))
+		for _, section := range sections {
+			defaults := &schema.GroupVersionKind{
+				Group:   v1alpha1.SchemeGroupVersion.Group,
+				Version: v1alpha1.SchemeGroupVersion.Version,
+			}
+			o, gvk, err := codec.Decode(section, defaults, nil)
+			if err != nil {
+				return fmt.Errorf("error parsing file %q: %v", f, err)
+			}
+
+			switch v := o.(type) {
+			case *kopsapi.Cluster:
+				options := &DeleteClusterOptions{}
+				options.ClusterName = v.ObjectMeta.Name
+				options.Yes = d.Yes
+				err = RunDeleteCluster(factory, out, options)
+				if err != nil {
+					exitWithError(err)
+				}
+				if d.Yes {
+					fmt.Fprintf(&sb, "Deleted cluster/%s\n", v.ObjectMeta.Name)
+				}
+			case *kopsapi.InstanceGroup:
+				options := &DeleteInstanceGroupOptions{}
+				options.GroupName = v.ObjectMeta.Name
+				options.ClusterName = v.ObjectMeta.Labels[kopsapi.LabelClusterName]
+				options.Yes = d.Yes
+				err := RunDeleteInstanceGroup(factory, out, options)
+				if err != nil {
+					exitWithError(err)
+				}
+				if d.Yes {
+					fmt.Fprintf(&sb, "Deleted instancegroup/%s\n", v.ObjectMeta.Name)
+				}
+			default:
+				glog.V(2).Infof("Type of object was %T", v)
+				return fmt.Errorf("Unhandled kind %q in %s", gvk, f)
+			}
+		}
+	}
+	{
+		_, err := out.Write(sb.Bytes())
+		if err != nil {
+			return fmt.Errorf("error writing to output: %v", err)
+		}
+	}
+
+	return nil
+}
diff --git a/cmd/kops/integration_test.go b/cmd/kops/integration_test.go
index 8c5079534c..601b120d02 100644
--- a/cmd/kops/integration_test.go
+++ b/cmd/kops/integration_test.go
@@ -102,6 +102,16 @@ func TestPrivateKopeio(t *testing.T) {
 	runTest(t, "privatekopeio.example.com", "../../tests/integration/privatekopeio", "v1alpha2", true, 1)
 }
 
+// TestPrivateDns runs the test on a configuration with private topology, private dns
+func TestPrivateDns1(t *testing.T) {
+	runTest(t, "privatedns1.example.com", "../../tests/integration/privatedns1", "v1alpha2", true, 1)
+}
+
+// TestPrivateDns runs the test on a configuration with private topology, private dns, extant vpc
+func TestPrivateDns2(t *testing.T) {
+	runTest(t, "privatedns2.example.com", "../../tests/integration/privatedns2", "v1alpha2", true, 1)
+}
+
 func runTest(t *testing.T, clusterName string, srcDir string, version string, private bool, zones int) {
 	var stdout bytes.Buffer
 
@@ -369,7 +379,28 @@ func (h *IntegrationTestHarness) SetupMockAWS() {
 	mockRoute53.MockCreateZone(&route53.HostedZone{
 		Id:   aws.String("/hostedzone/Z1AFAKE1ZON3YO"),
 		Name: aws.String("example.com."),
-	})
+		Config: &route53.HostedZoneConfig{
+			PrivateZone: aws.Bool(false),
+		},
+	}, nil)
+	mockRoute53.MockCreateZone(&route53.HostedZone{
+		Id:   aws.String("/hostedzone/Z2AFAKE1ZON3NO"),
+		Name: aws.String("internal.example.com."),
+		Config: &route53.HostedZoneConfig{
+			PrivateZone: aws.Bool(true),
+		},
+	}, []*route53.VPC{{
+		VPCId: aws.String("vpc-234"),
+	}})
+	mockRoute53.MockCreateZone(&route53.HostedZone{
+		Id:   aws.String("/hostedzone/Z3AFAKE1ZOMORE"),
+		Name: aws.String("private.example.com."),
+		Config: &route53.HostedZoneConfig{
+			PrivateZone: aws.Bool(true),
+		},
+	}, []*route53.VPC{{
+		VPCId: aws.String("vpc-123"),
+	}})
 
 	mockEC2.Images = append(mockEC2.Images, &ec2.Image{
 		ImageId:        aws.String("ami-12345678"),
diff --git a/cmd/kops/rollingupdatecluster.go b/cmd/kops/rollingupdatecluster.go
index ce31523c41..e7f18db731 100644
--- a/cmd/kops/rollingupdatecluster.go
+++ b/cmd/kops/rollingupdatecluster.go
@@ -95,7 +95,7 @@ func NewCmdRollingUpdateCluster(f *util.Factory, out io.Writer) *cobra.Command {
 		Short: "Rolling update a cluster",
 		Long: `Rolling update a cluster instance groups.
 
-This command updates a kubernetes cluseter to match the cloud, and kops specifications.
+This command updates a kubernetes cluster to match the cloud, and kops specifications.
 
 To perform rolling update, you need to update the cloud resources first with "kops update cluster"
 
diff --git a/cmd/kops/update_cluster.go b/cmd/kops/update_cluster.go
index 6bff456858..8f6cd8bd00 100644
--- a/cmd/kops/update_cluster.go
+++ b/cmd/kops/update_cluster.go
@@ -86,7 +86,7 @@ func NewCmdUpdateCluster(f *util.Factory, out io.Writer) *cobra.Command {
 	cmd.Flags().StringVar(&options.Models, "model", options.Models, "Models to apply (separate multiple models with commas)")
 	cmd.Flags().StringVar(&options.SSHPublicKey, "ssh-public-key", options.SSHPublicKey, "SSH public key to use (deprecated: use kops create secret instead)")
 	cmd.Flags().StringVar(&options.OutDir, "out", options.OutDir, "Path to write any local output")
-
+	cmd.Flags().BoolVar(&options.CreateKubecfg, "create-kube-config", options.CreateKubecfg, "Will control automatically creating the kube config file on your local filesystem")
 	return cmd
 }
 
diff --git a/cmd/nodeup/main.go b/cmd/nodeup/main.go
index 177ee54959..7d90916609 100644
--- a/cmd/nodeup/main.go
+++ b/cmd/nodeup/main.go
@@ -89,6 +89,9 @@ func main() {
 					}
 
 					fi, err := os.Lstat(procSelfExe)
+					if err != nil {
+						glog.Fatalf("error doing lstat on %q: %v", procSelfExe, err)
+					}
 					if fi.Mode()&os.ModeSymlink != os.ModeSymlink {
 						glog.Fatalf("file %v is not a symlink", procSelfExe)
 					}
diff --git a/dns-controller/pkg/dns/dnscontroller.go b/dns-controller/pkg/dns/dnscontroller.go
index 29ee01d97d..d3c6e4e364 100644
--- a/dns-controller/pkg/dns/dnscontroller.go
+++ b/dns-controller/pkg/dns/dnscontroller.go
@@ -299,7 +299,7 @@ func (c *DNSController) runOnce() error {
 	for key, changeset := range op.changesets {
 		glog.V(2).Infof("applying DNS changeset for zone %s", key)
 		if err := changeset.Apply(); err != nil {
-			glog.Warningf("error applying DNS changset for zone %s: %v", key, err)
+			glog.Warningf("error applying DNS changeset for zone %s: %v", key, err)
 			errors = append(errors, fmt.Errorf("error applying DNS changeset for zone %s: %v", key, err))
 		}
 	}
diff --git a/docs/addon_manager.md b/docs/addon_manager.md
new file mode 100644
index 0000000000..3d0f9fd06c
--- /dev/null
+++ b/docs/addon_manager.md
@@ -0,0 +1,137 @@
+## Addons Management
+
+kops incorporates management of some addons; we _have_ to manage some addons which are needed before
+the kubernetes API is functional.
+
+In addition, kops offers end-user management of addons via the `channels` tool (which is still experimental,
+but we are working on making it a recommended part of kubernetes addon management).  We ship some
+curated addons in the [addons directory](/addons), more information in the [addons document](addons.md).
+
+
+kops uses the `channels` tool for system addon management also.  Because kops uses the same tool
+for *system* addon management as it does for *user* addon management, this means that
+addons installed by kops as part of cluster bringup can be managed alongside additional addons.
+(Though note that bootstrap addons are much more likely to be replaced during a kops upgrade).
+
+The general kops philosophy is to try to make the set of bootstrap addons minimal, and
+to make installation of subsequent addons easy.
+
+Thus, `kube-dns` and the networking overlay (if any) are the canonical bootstrap addons.
+But addons such as the dashboard or the EFK stack are easily installed after kops bootstrap,
+with a `kubectl apply -f https://...` or with the channels tool.
+
+In future, we may as a convenience make it easy to add optional addons to the kops manifest,
+though this will just be a convenience wrapper around doing it manually.
+
+## Versioning
+
+The channels tool adds a manifest-of-manifests file, of `Kind: Addons`, which allows for a description
+of the various manifest versions that are available.  In this way kops can manage updates
+as new versions of the addon are released.  For example,
+the [dashboard addon](https://github.com/kubernetes/kops/blob/master/addons/kubernetes-dashboard/addon.yaml)
+lists multiple versions.
+
+For example, a typical addons declaration might looks like this:
+
+```
+  - version: 1.4.0
+    selector:
+      k8s-addon: kubernetes-dashboard.addons.k8s.io
+    manifest: v1.4.0.yaml
+ - version: 1.5.0
+    selector:
+      k8s-addon: kubernetes-dashboard.addons.k8s.io
+    manifest: v1.5.0.yaml
+```
+
+That declares two versions of an addon, with manifests at `v1.4.0.yaml` and at `v1.5.0.yaml`.
+These are evaluated as relative paths to the Addons file itself.  (The channels tool supports
+a few more protocols than `kubectl` - for example `s3://...` for S3 hosted manifests).
+
+The `version` field gives meaning to the alternative manifests.  This is interpreted as a
+semver.  The channels tool keeps track of the current version installed (currently by means
+of an annotation on the `kube-system` namespace), and it will not reapply the same version
+of the manifest.  This means that a user can edit a deployed addon, and changes will not
+be replaced, until a new version of the addon is installed.
+
+The long-term direction here is that addons will mostly be configured through a ConfigMap or Secret object,
+and that the addon manager will (TODO) not replace the ConfigMap.
+
+The `selector` determines the objects which make up the addon.  This will be used
+to construct a `--prune` argument (TODO), so that objects that existed in the
+previous but not the new version will be removed as part of an upgrade.
+
+## Kubernetes Version Selection
+
+The addon manager now supports a `kubernetesVersion` field, which is a semver range specifier
+on the kubernetes version.  If the targeted version of kubernetes does not match the semver
+specified, the addon version will be ignored.
+
+This allows you to have different versions of the manifest for significant changes to the
+kubernetes API.  For example, 1.6 changed the taints & tolerations to a field, and RBAC moved
+to beta.  As such it is easier to have two separate manifests.
+
+For example:
+
+```
+  - version: 1.5.0
+    selector:
+      k8s-addon: kube-dashboard.addons.k8s.io
+    manifest: v1.5.0.yaml
+    kubernetesVersion: "<1.6.0"
+    id: "pre-k8s-16"
+ - version: 1.6.0
+    selector:
+      k8s-addon: kube-dashboard.addons.k8s.io
+    manifest: v1.6.0.yaml
+    kubernetesVersion: ">=1.6.0"
+    id: "k8s-16"
+```
+
+On kubernetes versions before 1.6, we will install `v1.5.0.yaml`, whereas from kubernetes
+versions 1.6 on we will install `v1.6.0.yaml`.
+
+Note that we remove the `pre-release` field of the kubernetes semver, so that `1.6.0-beta.1`
+will match `>=1.6.0`.  This matches the way kubernetes does pre-releases.
+
+## Semver is not enough: `id`
+
+However, semver is insufficient here with the kubernetes version selection.  The problem is
+arises in the following scenario:
+
+* Install k8s 1.5, 1.5 version of manifest is installed
+* Upgrade to k8s 1.6, 1.6 version of manifest is installed
+* Downgrade to k8s 1.5; we want the 1.5 version of the manifest to be installed but the 1.6 version
+  will have a semver that is greater than or equal to the 1.5 semver.
+
+We need a way to break the ties between the semvers, and thus we introduce the `id` field.
+
+Thus a manifest will actually look like this:
+
+```
+  - version: 1.6.0
+    selector:
+      k8s-addon: kube-dns.addons.k8s.io
+    manifest: pre-k8s-16.yaml
+    kubernetesVersion: "<1.6.0"
+    id: "pre-k8s-16"
+ - version: 1.6.0
+    selector:
+      k8s-addon: kube-dns.addons.k8s.io
+    manifest: k8s-16.yaml
+    kubernetesVersion: ">=1.6.0"
+    id: "k8s-16"
+```
+
+Note that the two addons have the same version, but a different `kubernetesVersion` selector.
+But they have different `id` values; addons with matching semvers but different `id`s will
+be upgraded.  (We will never downgrade to an older semver though, regardless of `id`)
+
+So now in the above scenario after the downgrade to 1.5, although the semver is the same,
+the id will not match, and the `pre-k8s-16` will be installed.  (And when we upgrade back
+to 1.6, the `k8s-16` version will be installed.
+
+A few tips:
+
+* The `version` can now more closely mirror the upstream version.
+* The manifest names should probably incorporate the `id`, for maintainability.
diff --git a/docs/addons.md b/docs/addons.md
index 4ee5468526..18528732d2 100644
--- a/docs/addons.md
+++ b/docs/addons.md
@@ -2,6 +2,8 @@
 
 With kops you manage addons by using kubectl.
 
+(For a description of the addon-manager, please see [addon_manager.md](addon_manager.md).)
+
 Addons in kubernetes are traditionally done by copying files to `/etc/kubernetes/addons` on the master.  But this
 doesn't really make sense in HA master configurations.  We also have kubectl available, and addons is just a thin
 wrapper over calling kubectl.
diff --git a/docs/cli/kops_delete.md b/docs/cli/kops_delete.md
index 0b4d210feb..573348e98b 100644
--- a/docs/cli/kops_delete.md
+++ b/docs/cli/kops_delete.md
@@ -1,11 +1,21 @@
 ## kops delete
 
-delete clusters
+Deletes a resource by filename or stdin
 
 ### Synopsis
 
+Delete clusters or instancegroups by filename or stdin
 
-Delete clusters
+```
+kops delete -f FILENAME [--yes]
+```
+
+### Options
+
+```
+  -f, --filename stringSlice   Filename to use to delete the resource
+  -y, --yes                    Specify --yes to delete the resource
+```
 
 ### Options inherited from parent commands
 
@@ -27,4 +37,3 @@ Delete clusters
 * [kops delete cluster](kops_delete_cluster.md)	 - Delete cluster
 * [kops delete instancegroup](kops_delete_instancegroup.md)	 - Delete instancegroup
 * [kops delete secret](kops_delete_secret.md)	 - Delete secret
-
diff --git a/docs/cli/kops_rolling-update_cluster.md b/docs/cli/kops_rolling-update_cluster.md
index 8a64893179..de822f9918 100644
--- a/docs/cli/kops_rolling-update_cluster.md
+++ b/docs/cli/kops_rolling-update_cluster.md
@@ -7,7 +7,7 @@ Rolling update a cluster
 
 Rolling update a cluster instance groups.
 
-This command updates a kubernetes cluseter to match the cloud, and kops specifications.
+This command updates a kubernetes cluster to match the cloud, and kops specifications.
 
 To perform rolling update, you need to update the cloud resources first with "kops update cluster"
 
diff --git a/docs/cli/kops_update_cluster.md b/docs/cli/kops_update_cluster.md
index 8f2e802578..cfffc71eea 100644
--- a/docs/cli/kops_update_cluster.md
+++ b/docs/cli/kops_update_cluster.md
@@ -14,6 +14,7 @@ kops update cluster
 ### Options
 
 ```
+      --create-kube-config      Will control automatically creating the kube config file on your local filesystem (default true)
       --model string            Models to apply (separate multiple models with commas) (default "config,proto,cloudup")
       --out string              Path to write any local output
       --ssh-public-key string   SSH public key to use (deprecated: use kops create secret instead)
diff --git a/docs/cluster_spec.md b/docs/cluster_spec.md
index af6f7d3037..3ff13dba8d 100644
--- a/docs/cluster_spec.md
+++ b/docs/cluster_spec.md
@@ -118,6 +118,23 @@ spec:
 
 Will result in the flag `--runtime-config=batch/v2alpha1=true,apps/v1alpha1=true`. Note that `kube-apiserver` accepts `true` as a value for switch-like flags.
 
+### kubelet
+
+This block contains configurations for `kubelet`.  See https://kubernetes.io/docs/admin/kubelet/
+
+####  Feature Gates
+
+```yaml
+spec:
+  kubelet:
+    featureGates:
+      ExperimentalCriticalPodAnnotation: "true"
+      AllowExtTrafficLocalEndpoints: "false"
+```
+
+Will result in the flag `--feature-gates=ExperimentalCriticalPodAnnotation=true,AllowExtTrafficLocalEndpoints=false`
+
+
 ### networkID
 
 On AWS, this is the id of the VPC the cluster is created in. If creating a cluster from scratch, this field doesn't need to be specified at create time; `kops` will create a `VPC` for you.
diff --git a/docs/images.md b/docs/images.md
index 1c6f08f775..bad50bd9db 100644
--- a/docs/images.md
+++ b/docs/images.md
@@ -99,7 +99,7 @@ CoreOS support is highly experimental.  Please report any issues.
 The following steps are known:
 
 * CoreOS AMIs can be found using `aws ec2 describe-images --region=us-east-1 --owner=595879546273 --filters Name=virtualization-type,Values=hvm`
-* You can specify the name using the 'coreos.com` owner alias, for example `coreos.com/CoreOS-stable-1235.9.0-hvm`
+* You can specify the name using the `coreos.com` owner alias, for example `coreos.com/CoreOS-stable-1235.9.0-hvm`
 
 
 
diff --git a/docs/instance_groups.md b/docs/instance_groups.md
index e8e8b1f354..3e1a48333e 100644
--- a/docs/instance_groups.md
+++ b/docs/instance_groups.md
@@ -15,7 +15,7 @@ By default, a cluster has:
 ## Listing instance groups
 
 `kops get instancegroups`
-> ```
+```
 NAME                    ROLE    MACHINETYPE     MIN     MAX     ZONES
 master-us-east-1c       Master                  1       1       us-east-1c
 nodes                   Node    t2.medium       2       2
@@ -32,7 +32,7 @@ have not yet been applied (this may change soon though!).
 To preview the change:
 
 `kops update cluster <clustername>`
-> ```
+```
 ...
 Will modify resources:
   *awstasks.LaunchConfiguration launchConfiguration/mycluster.mydomain.com
diff --git a/docs/labels.md b/docs/labels.md
index 2319ad494d..1fbef1fdfa 100644
--- a/docs/labels.md
+++ b/docs/labels.md
@@ -7,7 +7,10 @@ There are two main types of labels that kops can create:
 
 Both are specified at the InstanceGroup level.
 
-A nice use for CloudLabels is to specify [AWS cost allocation tags](http://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html)
+A nice use for cloudLabels is to specify [AWS cost allocation tags](http://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html).
+
+A good use for nodeLables is to implement [nodeSelector labels](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#step-two-add-a-nodeselector-field-to-your-pod-configuration). 
+CloudLables and nodeLables are automatically applied to new nodes created by [AWS EC2 auto scaling groups](https://aws.amazon.com/autoscaling/).
 
 An example:
 
@@ -28,3 +31,10 @@ Note that keys and values are strings, so you need quotes around values that YAM
  would otherwise treat as numbers or booleans.
 
 To apply changes, you'll need to do a `kops update cluster` and then likely a `kops rolling-update cluster`
+
+For AWS if `kops rolling-update cluster --instance-group nodes` returns "No rolling-update required." the 
+[kops rolling-update cluster](https://github.com/kubernetes/kops/blob/8bc48ef10a44a3e481b604f5dbb663420c68dcab/docs/cli/kops_rolling-update_cluster.md) `--force` flag can be used to force a rolling update, even when no changes are identified.
+
+Example:
+
+`kops rolling-update cluster --instance-group nodes --force`
\ No newline at end of file
diff --git a/docs/terraform.md b/docs/terraform.md
index 0002fe2289..060b77e681 100644
--- a/docs/terraform.md
+++ b/docs/terraform.md
@@ -1,6 +1,6 @@
 ## Building Kubernetes clusters with Terraform
 
-Kops can generate Terraform configurations, and then you can then apply them using the `terraform plan` and `terraform apply` tools. This is very handy if you are already using Terraform, or if you want to check in the Terraform output into version control.
+Kops can generate Terraform configurations, and then you can apply them using the `terraform plan` and `terraform apply` tools. This is very handy if you are already using Terraform, or if you want to check in the Terraform output into version control.
 
 The gist of it is that, instead of letting kops apply the changes, you tell kops what you want, and then kops spits out what it wants done into a `.tf` file. **_You_** are then responsible for turning those plans into reality.
 
diff --git a/hack/.packages b/hack/.packages
index 8d8b1ba7a1..5987d2dbd1 100644
--- a/hack/.packages
+++ b/hack/.packages
@@ -2,6 +2,7 @@ k8s.io/kops
 k8s.io/kops/channels/cmd/channels
 k8s.io/kops/channels/pkg/api
 k8s.io/kops/channels/pkg/channels
+k8s.io/kops/channels/pkg/cmd
 k8s.io/kops/cloudmock/aws/mockautoscaling
 k8s.io/kops/cloudmock/aws/mockec2
 k8s.io/kops/cloudmock/aws/mockroute53
diff --git a/hack/dev-build.sh b/hack/dev-build.sh
index 4991564af0..3187f7e897 100755
--- a/hack/dev-build.sh
+++ b/hack/dev-build.sh
@@ -76,6 +76,7 @@ NODE_ZONES=${NODE_ZONES:-"us-west-2a,us-west-2b,us-west-2c"}
 NODE_SIZE=${NODE_SIZE:-m4.xlarge}
 MASTER_ZONES=${MASTER_ZONES:-"us-west-2a,us-west-2b,us-west-2c"}
 MASTER_SIZE=${MASTER_SIZE:-m4.large}
+KOPS_CREATE=${KOPS_CREATE:-yes}
 
 
 # NETWORK
@@ -90,15 +91,18 @@ cd $KOPS_DIRECTORY/..
 GIT_VER=git-$(git describe --always)
 [ -z "$GIT_VER" ] && echo "we do not have GIT_VER something is very wrong" && exit 1;
 
-
 echo ==========
 echo "Starting build"
 
-make ci && S3_BUCKET=s3://${NODEUP_BUCKET} make upload
+export CI=1
+make && make test && S3_BUCKET=s3://${NODEUP_BUCKET} make upload
 
-KOPS_CHANNEL=$(kops version | awk '{ print $2 }')
+KOPS_CHANNEL=$(kops version | awk '{ print $2 }' |sed 's/\+/%2B/')
 KOPS_BASE_URL="http://${NODEUP_BUCKET}.s3.amazonaws.com/kops/${KOPS_CHANNEL}/"
 
+echo "KOPS_BASE_URL=${KOPS_BASE_URL}"
+echo "NODEUP_URL=${KOPS_BASE_URL}linux/amd64/nodeup"
+
 echo ==========
 echo "Deleting cluster ${CLUSTER_NAME}. Elle est finie."
 
@@ -111,25 +115,21 @@ kops delete cluster \
 echo ==========
 echo "Creating cluster ${CLUSTER_NAME}"
 
-NODEUP_URL=${KOPS_BASE_URL}linux/amd64/nodeup \
-KOPS_BASE_URL=${KOPS_BASE_URL} \
-kops create cluster \
-  --name $CLUSTER_NAME \
-  --state $KOPS_STATE_STORE \
-  --node-count $NODE_COUNT \
-  --zones $NODE_ZONES \
-  --master-zones $MASTER_ZONES \
-  --cloud aws \
-  --node-size $NODE_SIZE \
-  --master-size $MASTER_SIZE \
-  -v $VERBOSITY \
-  --image $IMAGE \
-  --kubernetes-version "1.5.2" \
-  --topology $TOPOLOGY \
-  --networking $NETWORKING \
-  --bastion="true" \
-  --yes
+kops_command="NODEUP_URL=${KOPS_BASE_URL}linux/amd64/nodeup KOPS_BASE_URL=${KOPS_BASE_URL} kops create cluster --name $CLUSTER_NAME --state $KOPS_STATE_STORE --node-count $NODE_COUNT --zones $NODE_ZONES --master-zones $MASTER_ZONES --node-size $NODE_SIZE --master-size $MASTER_SIZE -v $VERBOSITY --image $IMAGE --channel alpha --topology $TOPOLOGY --networking $NETWORKING"
 
+if [[ $TOPOLOGY == "private" ]]; then
+  kops_command+=" --bastion='true'"
+fi
+
+if [ -n "${KOPS_FEATURE_FLAGS+x}" ]; then 
+  kops_command=KOPS_FEATURE_FLAGS="${KOPS_FEATURE_FLAGS}" $kops_command
+fi
+
+if [[ $KOPS_CREATE == "yes" ]]; then 
+  kops_command="$kops_command --yes"
+fi
+
+eval $kops_command
 
 echo ==========
 echo "Your k8s cluster ${CLUSTER_NAME}, awaits your bidding."
diff --git a/hack/update-header.sh b/hack/update-header.sh
index a03d6125b0..26ec5ac90f 100755
--- a/hack/update-header.sh
+++ b/hack/update-header.sh
@@ -16,7 +16,7 @@
 
 . $(dirname "${BASH_SOURCE}")/common.sh
 
-BAD_HEADERS=$(${KUBE_ROOT}/hack/verify-boilerplate.sh | awk '{ print $6}')
+BAD_HEADERS=$((${KUBE_ROOT}/hack/verify-boilerplate.sh || true) | awk '{ print $6}')
 FORMATS="sh go Makefile Dockerfile"
 
 for i in ${FORMATS}
diff --git a/images/protokube-builder/onbuild.sh b/images/protokube-builder/onbuild.sh
index 4e943e0963..72740c6e96 100755
--- a/images/protokube-builder/onbuild.sh
+++ b/images/protokube-builder/onbuild.sh
@@ -34,5 +34,5 @@ cp /go/bin/channels /src/.build/artifacts/
 
 # channels uses protokube
 cd /src/.build/artifacts/
-curl -O https://storage.googleapis.com/kubernetes-release/release/v1.6.0-beta.1/bin/linux/amd64/kubectl
+curl -O https://storage.googleapis.com/kubernetes-release/release/v1.6.1/bin/linux/amd64/kubectl
 chmod +x kubectl
diff --git a/nodeup/pkg/model/cloudconfig.go b/nodeup/pkg/model/cloudconfig.go
index 665ed904e4..7b6c1c9114 100644
--- a/nodeup/pkg/model/cloudconfig.go
+++ b/nodeup/pkg/model/cloudconfig.go
@@ -37,18 +37,28 @@ func (b *CloudConfigBuilder) Build(c *fi.ModelBuilderContext) error {
 	// Add cloud config file if needed
 	var lines []string
 
+	cloudProvider := b.Cluster.Spec.CloudProvider
 	cloudConfig := b.Cluster.Spec.CloudConfig
+
 	if cloudConfig == nil {
 		cloudConfig = &kops.CloudConfiguration{}
 	}
-	if cloudConfig.NodeTags != nil {
-		lines = append(lines, "node-tags = "+*cloudConfig.NodeTags)
-	}
-	if cloudConfig.NodeInstancePrefix != nil {
-		lines = append(lines, "node-instance-prefix = "+*cloudConfig.NodeInstancePrefix)
-	}
-	if cloudConfig.Multizone != nil {
-		lines = append(lines, fmt.Sprintf("multizone = %t", *cloudConfig.Multizone))
+
+	switch cloudProvider {
+	case "gce":
+		if cloudConfig.NodeTags != nil {
+			lines = append(lines, "node-tags = "+*cloudConfig.NodeTags)
+		}
+		if cloudConfig.NodeInstancePrefix != nil {
+			lines = append(lines, "node-instance-prefix = "+*cloudConfig.NodeInstancePrefix)
+		}
+		if cloudConfig.Multizone != nil {
+			lines = append(lines, fmt.Sprintf("multizone = %t", *cloudConfig.Multizone))
+		}
+	case "aws":
+		if cloudConfig.DisableSecurityGroupIngress != nil {
+			lines = append(lines, fmt.Sprintf("DisableSecurityGroupIngress = %t", *cloudConfig.DisableSecurityGroupIngress))
+		}
 	}
 
 	config := "[global]\n" + strings.Join(lines, "\n") + "\n"
diff --git a/nodeup/pkg/model/context.go b/nodeup/pkg/model/context.go
index 37ea037f5e..c5f526d1b3 100644
--- a/nodeup/pkg/model/context.go
+++ b/nodeup/pkg/model/context.go
@@ -36,7 +36,6 @@ type NodeupModelContext struct {
 	Distribution  distros.Distribution
 
 	IsMaster bool
-	UsesCNI  bool
 
 	Assets      *fi.AssetStore
 	KeyStore    fi.CAStore
@@ -83,7 +82,7 @@ func (c *NodeupModelContext) PathSrvSshproxy() string {
 	}
 }
 
-func (c *NodeupModelContext) NetworkPluginDir() string {
+func (c *NodeupModelContext) CNIBinDir() string {
 	switch c.Distribution {
 	case distros.DistributionContainerOS:
 		return "/home/kubernetes/bin/"
@@ -92,6 +91,10 @@ func (c *NodeupModelContext) NetworkPluginDir() string {
 	}
 }
 
+func (c *NodeupModelContext) CNIConfDir() string {
+	return "/etc/cni/net.d/"
+}
+
 func (c *NodeupModelContext) buildPKIKubeconfig(id string) (string, error) {
 	caCertificate, err := c.KeyStore.Cert(fi.CertificateId_CA)
 	if err != nil {
@@ -171,3 +174,11 @@ func (c *NodeupModelContext) buildPKIKubeconfig(id string) (string, error) {
 func (c *NodeupModelContext) IsKubernetesGTE(version string) bool {
 	return util.IsKubernetesGTE(version, c.KubernetesVersion)
 }
+
+func (c *NodeupModelContext) UsesCNI() bool {
+	networking := c.Cluster.Spec.Networking
+	if networking == nil || networking.Classic != nil {
+		return false
+	}
+	return true
+}
diff --git a/nodeup/pkg/model/docker.go b/nodeup/pkg/model/docker.go
index 81de66330a..1a2d9542e6 100644
--- a/nodeup/pkg/model/docker.go
+++ b/nodeup/pkg/model/docker.go
@@ -141,6 +141,8 @@ var dockerVersions = []dockerVersion{
 		Hash:          "52ec22128e70acc2f76b3a8e87ff96785995116a",
 	},
 
+	// 1.12.3 - k8s 1.5
+
 	// 1.12.3 - Jessie
 	{
 		DockerVersion: "1.12.3",
@@ -199,6 +201,67 @@ var dockerVersions = []dockerVersion{
 		Source:        "https://yum.dockerproject.org/repo/main/centos/7/Packages/docker-engine-selinux-1.12.3-1.el7.centos.noarch.rpm",
 		Hash:          "a6b0243af348140236ed96f2e902b259c590eefa",
 	},
+
+	// 1.12.6 - k8s 1.6
+
+	// 1.12.6 - Jessie
+	{
+		DockerVersion: "1.12.6",
+		Name:          "docker-engine",
+		Distros:       []distros.Distribution{distros.DistributionJessie},
+		Architectures: []Architecture{ArchitectureAmd64},
+		Version:       "1.12.6-0~debian-jessie",
+		Source:        "http://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_1.12.6-0~debian-jessie_amd64.deb",
+		Hash:          "1a8b0c4e3386e12964676a126d284cebf599cc8e",
+		Dependencies:  []string{"bridge-utils", "libapparmor1", "libltdl7", "perl"},
+		//Depends: iptables, init-system-helpers (>= 1.18~), libapparmor1 (>= 2.6~devel), libc6 (>= 2.17), libdevmapper1.02.1 (>= 2:1.02.90), libltdl7 (>= 2.4.2), libsystemd0
+		//Recommends: aufs-tools, ca-certificates, cgroupfs-mount | cgroup-lite, git, xz-utils
+	},
+
+	// 1.12.6 - Jessie on ARM
+	{
+		DockerVersion: "1.12.6",
+		Name:          "docker-engine",
+		Distros:       []distros.Distribution{distros.DistributionJessie},
+		Architectures: []Architecture{ArchitectureArm},
+		Version:       "1.12.6-0~debian-jessie",
+		Source:        "http://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_1.12.6-0~debian-jessie_armhf.deb",
+		Hash:          "ac148e1f7381e4201e139584dd3c102372ad96fb",
+		Dependencies:  []string{"bridge-utils", "libapparmor1", "libltdl7", "perl"},
+	},
+
+	// 1.12.6 - Xenial
+	{
+		DockerVersion: "1.12.6",
+		Name:          "docker-engine",
+		Distros:       []distros.Distribution{distros.DistributionXenial},
+		Architectures: []Architecture{ArchitectureAmd64},
+		Version:       "1.12.6-0~ubuntu-xenial",
+		Source:        "http://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_1.12.6-0~ubuntu-xenial_amd64.deb",
+		Hash:          "fffc22da4ad5b20715bbb6c485b2d2bb7e84fd33",
+		Dependencies:  []string{"bridge-utils", "libapparmor1", "libltdl7", "perl"},
+	},
+
+	// 1.12.6 - Centos / Rhel7 (two packages)
+	{
+		DockerVersion: "1.12.6",
+		Name:          "docker-engine",
+		Distros:       []distros.Distribution{distros.DistributionRhel7, distros.DistributionCentos7},
+		Architectures: []Architecture{ArchitectureAmd64},
+		Version:       "1.12.6",
+		Source:        "https://yum.dockerproject.org/repo/main/centos/7/Packages/docker-engine-1.12.6-1.el7.centos.x86_64.rpm",
+		Hash:          "776dbefa9dc7733000e46049293555a9a422c50e",
+		Dependencies:  []string{"libtool-ltdl", "libseccomp"},
+	},
+	{
+		DockerVersion: "1.12.6",
+		Name:          "docker-engine-selinux",
+		Distros:       []distros.Distribution{distros.DistributionRhel7, distros.DistributionCentos7},
+		Architectures: []Architecture{ArchitectureAmd64},
+		Version:       "1.12.6",
+		Source:        "https://yum.dockerproject.org/repo/main/centos/7/Packages/docker-engine-selinux-1.12.6-1.el7.centos.noarch.rpm",
+		Hash:          "9a6ee0d631ca911b6927450a3c396e9a5be75047",
+	},
 }
 
 func (d *dockerVersion) matches(arch Architecture, dockerVersion string, distro distros.Distribution) bool {
diff --git a/nodeup/pkg/model/docker_test.go b/nodeup/pkg/model/docker_test.go
index a63a0606bf..2c44b30bbd 100644
--- a/nodeup/pkg/model/docker_test.go
+++ b/nodeup/pkg/model/docker_test.go
@@ -17,14 +17,9 @@ limitations under the License.
 package model
 
 import (
-	"io/ioutil"
-	"k8s.io/kops/nodeup/pkg/distros"
 	"k8s.io/kops/pkg/apis/kops"
-	"k8s.io/kops/pkg/diff"
 	"k8s.io/kops/upup/pkg/fi"
 	"path"
-	"sort"
-	"strings"
 	"testing"
 
 	// Register our APIs
@@ -90,64 +85,23 @@ func TestDockerBuilder_BuildFlags(t *testing.T) {
 func runDockerBuilderTest(t *testing.T, key string) {
 	basedir := path.Join("tests/dockerbuilder/", key)
 
-	clusterYamlPath := path.Join(basedir, "cluster.yaml")
-	clusterYaml, err := ioutil.ReadFile(clusterYamlPath)
+	nodeUpModelContext, err := LoadModel(basedir)
 	if err != nil {
-		t.Fatalf("error reading cluster yaml file %q: %v", clusterYamlPath, err)
+		t.Fatalf("error parsing cluster yaml %q: %v", basedir, err)
+		return
 	}
-	obj, _, err := kops.ParseVersionedYaml(clusterYaml)
-	if err != nil {
-		t.Fatalf("error parsing cluster yaml %q: %v", clusterYamlPath, err)
-	}
-	cluster := obj.(*kops.Cluster)
 
 	context := &fi.ModelBuilderContext{
 		Tasks: make(map[string]fi.Task),
 	}
-	nodeUpModelContext := &NodeupModelContext{
-		Cluster:      cluster,
-		Architecture: "amd64",
-		Distribution: distros.DistributionXenial,
-	}
 
 	builder := DockerBuilder{NodeupModelContext: nodeUpModelContext}
 
 	err = builder.Build(context)
 	if err != nil {
 		t.Fatalf("error from DockerBuilder Build: %v", err)
+		return
 	}
 
-	var keys []string
-	for key := range context.Tasks {
-		keys = append(keys, key)
-	}
-	sort.Strings(keys)
-
-	var yamls []string
-	for _, key := range keys {
-		task := context.Tasks[key]
-		yaml, err := kops.ToRawYaml(task)
-		if err != nil {
-			t.Fatalf("error serializing task: %v", err)
-		}
-		yamls = append(yamls, strings.TrimSpace(string(yaml)))
-	}
-
-	actualTasksYaml := strings.Join(yamls, "\n---\n")
-
-	tasksYamlPath := path.Join(basedir, "tasks.yaml")
-	expectedTasksYamlBytes, err := ioutil.ReadFile(tasksYamlPath)
-	if err != nil {
-		t.Fatalf("error reading file %q: %v", tasksYamlPath, err)
-	}
-
-	actualTasksYaml = strings.TrimSpace(actualTasksYaml)
-	expectedTasksYaml := strings.TrimSpace(string(expectedTasksYamlBytes))
-
-	if expectedTasksYaml != actualTasksYaml {
-		diffString := diff.FormatDiff(expectedTasksYaml, actualTasksYaml)
-		t.Logf("diff:\n%s\n", diffString)
-
-		t.Fatalf("tasks differed from expected for test %q", key)
-	}
+	ValidateTasks(t, basedir, context)
 }
diff --git a/nodeup/pkg/model/kubeapiserver.go b/nodeup/pkg/model/kubeapiserver.go
index 3b97630c52..3b11c2ef8d 100644
--- a/nodeup/pkg/model/kubeapiserver.go
+++ b/nodeup/pkg/model/kubeapiserver.go
@@ -61,6 +61,18 @@ func (b *KubeAPIServerBuilder) Build(c *fi.ModelBuilderContext) error {
 		c.AddTask(t)
 	}
 
+	// Touch log file, so that docker doesn't create a directory instead
+	{
+		t := &nodetasks.File{
+			Path:        "/var/log/kube-apiserver.log",
+			Contents:    fi.NewStringResource(""),
+			Type:        nodetasks.FileType_File,
+			Mode:        s("0400"),
+			IfNotExists: true,
+		}
+		c.AddTask(t)
+	}
+
 	return nil
 }
 
diff --git a/nodeup/pkg/model/kubelet.go b/nodeup/pkg/model/kubelet.go
index 6eee50bad6..1ecc3f35e7 100644
--- a/nodeup/pkg/model/kubelet.go
+++ b/nodeup/pkg/model/kubelet.go
@@ -44,30 +44,10 @@ func (b *KubeletBuilder) Build(c *fi.ModelBuilderContext) error {
 		return fmt.Errorf("error building kubelet config: %v", err)
 	}
 
-	// Add sysconfig file
 	{
-		// TODO: Dump this - just complexity!
-		flags, err := flagbuilder.BuildFlags(kubeletConfig)
+		t, err := b.buildSystemdEnvironmentFile(kubeletConfig)
 		if err != nil {
-			return fmt.Errorf("error building kubelet flags: %v", err)
-		}
-
-		// Add cloud config file if needed
-		// We build this flag differently because it depends on CloudConfig, and to expose it directly
-		// would be a degree of freedom we don't have (we'd have to write the config to different files)
-		// We can always add this later if it is needed.
-		if b.Cluster.Spec.CloudConfig != nil {
-			flags += " --cloud-config=" + CloudConfigFilePath
-		}
-
-		flags += " --network-plugin-dir=" + b.NetworkPluginDir()
-
-		sysconfig := "DAEMON_ARGS=\"" + flags + "\"\n"
-
-		t := &nodetasks.File{
-			Path:     "/etc/sysconfig/kubelet",
-			Contents: fi.NewStringResource(sysconfig),
-			Type:     nodetasks.FileType_File,
+			return err
 		}
 		c.AddTask(t)
 	}
@@ -77,6 +57,7 @@ func (b *KubeletBuilder) Build(c *fi.ModelBuilderContext) error {
 		// TODO: Extract to common function?
 		assetName := "kubelet"
 		assetPath := ""
+		// TODO make Find call to an interface, we cannot mock out this function because it finds a file on disk
 		asset, err := b.Assets.Find(assetName, assetPath)
 		if err != nil {
 			return fmt.Errorf("error trying to locate asset %q: %v", assetName, err)
@@ -111,9 +92,9 @@ func (b *KubeletBuilder) Build(c *fi.ModelBuilderContext) error {
 		c.AddTask(t)
 	}
 
-	if b.UsesCNI {
+	if b.UsesCNI() {
 		t := &nodetasks.File{
-			Path: "/etc/cni/net.d/",
+			Path: b.CNIConfDir(),
 			Type: nodetasks.FileType_Directory,
 		}
 		c.AddTask(t)
@@ -139,6 +120,41 @@ func (b *KubeletBuilder) kubeletPath() string {
 	return kubeletCommand
 }
 
+func (b *KubeletBuilder) buildSystemdEnvironmentFile(kubeletConfig *kops.KubeletConfigSpec) (*nodetasks.File, error) {
+	// TODO: Dump the separate file for flags - just complexity!
+	flags, err := flagbuilder.BuildFlags(kubeletConfig)
+	if err != nil {
+		return nil, fmt.Errorf("error building kubelet flags: %v", err)
+	}
+
+	// Add cloud config file if needed
+	// We build this flag differently because it depends on CloudConfig, and to expose it directly
+	// would be a degree of freedom we don't have (we'd have to write the config to different files)
+	// We can always add this later if it is needed.
+	if b.Cluster.Spec.CloudConfig != nil {
+		flags += " --cloud-config=" + CloudConfigFilePath
+	}
+
+	if b.UsesCNI() {
+		flags += " --cni-bin-dir=" + b.CNIBinDir()
+		flags += " --cni-conf-dir=" + b.CNIConfDir()
+	}
+
+	if b.Cluster.Spec.Networking != nil && b.Cluster.Spec.Networking.Kubenet != nil {
+		// Kubenet is neither CNI nor not-CNI, so we need to pass it `--network-plugin-dir` also
+		flags += " --network-plugin-dir=" + b.CNIBinDir()
+	}
+
+	sysconfig := "DAEMON_ARGS=\"" + flags + "\"\n"
+
+	t := &nodetasks.File{
+		Path:     "/etc/sysconfig/kubelet",
+		Contents: fi.NewStringResource(sysconfig),
+		Type:     nodetasks.FileType_File,
+	}
+	return t, nil
+}
+
 func (b *KubeletBuilder) buildSystemdService() *nodetasks.Service {
 	kubeletCommand := b.kubeletPath()
 
diff --git a/nodeup/pkg/model/kubelet_test.go b/nodeup/pkg/model/kubelet_test.go
index b3ec6a07d6..6926eed0ce 100644
--- a/nodeup/pkg/model/kubelet_test.go
+++ b/nodeup/pkg/model/kubelet_test.go
@@ -17,9 +17,20 @@ limitations under the License.
 package model
 
 import (
-	"k8s.io/kops/pkg/apis/kops"
-	"k8s.io/kops/upup/pkg/fi"
+	"bytes"
+	"io/ioutil"
+	"path"
+	"sort"
+	"strings"
 	"testing"
+
+	"fmt"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/kops/nodeup/pkg/distros"
+	"k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/apis/kops/v1alpha2"
+	"k8s.io/kops/pkg/diff"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 func Test_InstanceGroupKubeletMerge(t *testing.T) {
@@ -142,3 +153,115 @@ func stringSlicesEqual(exp, other []string) bool {
 
 	return true
 }
+
+func Test_RunKubeletBuilder(t *testing.T) {
+	basedir := "tests/kubelet/featuregates"
+
+	context := &fi.ModelBuilderContext{
+		Tasks: make(map[string]fi.Task),
+	}
+	nodeUpModelContext, err := LoadModel(basedir)
+	if err != nil {
+		t.Fatalf("error loading model %q: %v", basedir, err)
+		return
+	}
+
+	builder := KubeletBuilder{NodeupModelContext: nodeUpModelContext}
+
+	kubeletConfig, err := builder.buildKubeletConfig()
+	if err != nil {
+		t.Fatalf("error from KubeletBuilder buildKubeletConfig: %v", err)
+		return
+	}
+
+	fileTask, err := builder.buildSystemdEnvironmentFile(kubeletConfig)
+	if err != nil {
+		t.Fatalf("error from KubeletBuilder buildSystemdEnvironmentFile: %v", err)
+		return
+	}
+	context.AddTask(fileTask)
+
+	ValidateTasks(t, basedir, context)
+}
+
+func LoadModel(basedir string) (*NodeupModelContext, error) {
+	clusterYamlPath := path.Join(basedir, "cluster.yaml")
+	clusterYaml, err := ioutil.ReadFile(clusterYamlPath)
+	if err != nil {
+		return nil, fmt.Errorf("error reading cluster yaml file %q: %v", clusterYamlPath, err)
+	}
+
+	var cluster *kops.Cluster
+	var instanceGroup *kops.InstanceGroup
+
+	// Codecs provides access to encoding and decoding for the scheme
+	codecs := kops.Codecs
+
+	codec := codecs.UniversalDecoder(kops.SchemeGroupVersion)
+
+	sections := bytes.Split(clusterYaml, []byte("\n---\n"))
+	for _, section := range sections {
+		defaults := &schema.GroupVersionKind{
+			Group:   v1alpha2.SchemeGroupVersion.Group,
+			Version: v1alpha2.SchemeGroupVersion.Version,
+		}
+		o, gvk, err := codec.Decode(section, defaults, nil)
+		if err != nil {
+			return nil, fmt.Errorf("error parsing file %v", err)
+		}
+
+		switch v := o.(type) {
+		case *kops.Cluster:
+			cluster = v
+		case *kops.InstanceGroup:
+			instanceGroup = v
+		default:
+			return nil, fmt.Errorf("Unhandled kind %q", gvk)
+		}
+	}
+
+	nodeUpModelContext := &NodeupModelContext{
+		Cluster:       cluster,
+		Architecture:  "amd64",
+		Distribution:  distros.DistributionXenial,
+		InstanceGroup: instanceGroup,
+	}
+
+	return nodeUpModelContext, nil
+}
+
+func ValidateTasks(t *testing.T, basedir string, context *fi.ModelBuilderContext) {
+	var keys []string
+	for key := range context.Tasks {
+		keys = append(keys, key)
+	}
+	sort.Strings(keys)
+
+	var yamls []string
+	for _, key := range keys {
+		task := context.Tasks[key]
+		yaml, err := kops.ToRawYaml(task)
+		if err != nil {
+			t.Fatalf("error serializing task: %v", err)
+		}
+		yamls = append(yamls, strings.TrimSpace(string(yaml)))
+	}
+
+	actualTasksYaml := strings.Join(yamls, "\n---\n")
+
+	tasksYamlPath := path.Join(basedir, "tasks.yaml")
+	expectedTasksYamlBytes, err := ioutil.ReadFile(tasksYamlPath)
+	if err != nil {
+		t.Fatalf("error reading file %q: %v", tasksYamlPath, err)
+	}
+
+	actualTasksYaml = strings.TrimSpace(actualTasksYaml)
+	expectedTasksYaml := strings.TrimSpace(string(expectedTasksYamlBytes))
+
+	if expectedTasksYaml != actualTasksYaml {
+		diffString := diff.FormatDiff(expectedTasksYaml, actualTasksYaml)
+		t.Logf("diff:\n%s\n", diffString)
+
+		t.Fatalf("tasks differed from expected for test %q", basedir)
+	}
+}
diff --git a/nodeup/pkg/model/kubeproxy.go b/nodeup/pkg/model/kubeproxy.go
index 65870c6191..663eca042b 100644
--- a/nodeup/pkg/model/kubeproxy.go
+++ b/nodeup/pkg/model/kubeproxy.go
@@ -125,7 +125,7 @@ func (b *KubeProxyBuilder) buildPod() (*v1.Pod, error) {
 	}
 
 	image := c.Image
-	cmd := "echo -998 > /proc/$$$/oom_score_adj && kube-proxy --kubeconfig=/var/lib/kube-proxy/kubeconfig --resource-container=\"\" "
+	cmd := "echo -998 > /proc/$$$/oom_score_adj && kube-proxy --kubeconfig=/var/lib/kube-proxy/kubeconfig --conntrack-max-per-core=131072 --resource-container=\"\" "
 	cmd += flags
 
 	// cmd += " 1>>/var/log/kube-proxy.log 2>&1"
diff --git a/nodeup/pkg/model/network.go b/nodeup/pkg/model/network.go
index a339d6749d..49cccde06b 100644
--- a/nodeup/pkg/model/network.go
+++ b/nodeup/pkg/model/network.go
@@ -55,7 +55,7 @@ func (b *NetworkBuilder) Build(c *fi.ModelBuilderContext) error {
 	}
 
 	for _, assetName := range assetNames {
-		if err := b.addAsset(c, assetName); err != nil {
+		if err := b.addCNIBinAsset(c, assetName); err != nil {
 			return err
 		}
 	}
@@ -63,7 +63,7 @@ func (b *NetworkBuilder) Build(c *fi.ModelBuilderContext) error {
 	return nil
 }
 
-func (b *NetworkBuilder) addAsset(c *fi.ModelBuilderContext, assetName string) error {
+func (b *NetworkBuilder) addCNIBinAsset(c *fi.ModelBuilderContext, assetName string) error {
 	assetPath := ""
 	asset, err := b.Assets.Find(assetName, assetPath)
 	if err != nil {
@@ -74,7 +74,7 @@ func (b *NetworkBuilder) addAsset(c *fi.ModelBuilderContext, assetName string) e
 	}
 
 	t := &nodetasks.File{
-		Path:     filepath.Join(b.NetworkPluginDir(), assetName),
+		Path:     filepath.Join(b.CNIBinDir(), assetName),
 		Contents: asset,
 		Type:     nodetasks.FileType_File,
 		Mode:     s("0755"),
diff --git a/nodeup/pkg/model/sysctls.go b/nodeup/pkg/model/sysctls.go
index 009b526c16..32e40c4b96 100644
--- a/nodeup/pkg/model/sysctls.go
+++ b/nodeup/pkg/model/sysctls.go
@@ -95,10 +95,6 @@ func (b *SysctlBuilder) Build(c *fi.ModelBuilderContext) error {
 			"# Increase size of file handles and inode cache",
 			"fs.file-max = 2097152",
 			"",
-
-			"# Increase size of conntrack table size to avoid poor iptables performance",
-			"net.netfilter.nf_conntrack_max = 1000000",
-			"",
 		)
 	}
 
diff --git a/nodeup/pkg/model/tests/kubelet/featuregates/cluster.yaml b/nodeup/pkg/model/tests/kubelet/featuregates/cluster.yaml
new file mode 100644
index 0000000000..3639005c04
--- /dev/null
+++ b/nodeup/pkg/model/tests/kubelet/featuregates/cluster.yaml
@@ -0,0 +1,60 @@
+apiVersion: kops/v1alpha2
+kind: Cluster
+metadata:
+  creationTimestamp: "2016-12-10T22:42:27Z"
+  name: minimal.example.com
+spec:
+  kubernetesApiAccess:
+  - 0.0.0.0/0
+  channel: stable
+  cloudProvider: aws
+  configBase: memfs://clusters.example.com/minimal.example.com
+  etcdClusters:
+  - etcdMembers:
+    - instanceGroup: master-us-test-1a
+      name: master-us-test-1a
+    name: main
+  - etcdMembers:
+    - instanceGroup: master-us-test-1a
+      name: master-us-test-1a
+    name: events
+  kubelet:
+    featureGates:
+      ExperimentalCriticalPodAnnotation: "true"
+      AllowExtTrafficLocalEndpoints: "false"
+  kubernetesVersion: v1.5.0
+  masterInternalName: api.internal.minimal.example.com
+  masterPublicName: api.minimal.example.com
+  networkCIDR: 172.20.0.0/16
+  networking:
+    kubenet: {}
+  nonMasqueradeCIDR: 100.64.0.0/10
+  sshAccess:
+    - 0.0.0.0/0
+  topology:
+    masters: public
+    nodes: public
+  subnets:
+  - cidr: 172.20.32.0/19
+    name: us-test-1a
+    type: Public
+    zone: us-test-1a
+
+---
+
+apiVersion: kops/v1alpha2
+kind: InstanceGroup
+metadata:
+  creationTimestamp: "2016-12-10T22:42:28Z"
+  name: nodes
+  labels:
+    kops.k8s.io/cluster: minimal.example.com
+spec:
+  associatePublicIp: true
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
+  machineType: t2.medium
+  maxSize: 2
+  minSize: 2
+  role: Node
+  subnets:
+  - us-test-1a
diff --git a/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml b/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml
new file mode 100644
index 0000000000..585a3aae16
--- /dev/null
+++ b/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml
@@ -0,0 +1,4 @@
+contents: |
+  DAEMON_ARGS="--feature-gates=AllowExtTrafficLocalEndpoints=false,ExperimentalCriticalPodAnnotation=true --node-labels=kubernetes.io/role=node,node-role.kubernetes.io/node= --cni-bin-dir=/opt/cni/bin/ --cni-conf-dir=/etc/cni/net.d/ --network-plugin-dir=/opt/cni/bin/"
+path: /etc/sysconfig/kubelet
+type: file
diff --git a/pkg/apis/kops/componentconfig.go b/pkg/apis/kops/componentconfig.go
index 1c10bc8e68..82b03c135d 100644
--- a/pkg/apis/kops/componentconfig.go
+++ b/pkg/apis/kops/componentconfig.go
@@ -319,6 +319,9 @@ type KubeletConfigSpec struct {
 
 	// Taints to add when registering a node in the cluster
 	Taints []string `json:"taints,omitempty" flag:"register-with-taints"`
+
+	// FeatureGates is set of key=value pairs that describe feature gates for alpha/experimental features.
+	FeatureGates map[string]string `json:"featureGates,omitempty" flag:"feature-gates"`
 }
 
 type KubeProxyConfig struct {
@@ -686,4 +689,6 @@ type CloudConfiguration struct {
 	Multizone          *bool   `json:"multizone,omitempty"`
 	NodeTags           *string `json:"nodeTags,omitempty"`
 	NodeInstancePrefix *string `json:"nodeInstancePrefix,omitempty"`
+	// AWS cloud-config options
+	DisableSecurityGroupIngress *bool `json:"disableSecurityGroupIngress,omitempty"`
 }
diff --git a/pkg/apis/kops/v1alpha1/componentconfig.go b/pkg/apis/kops/v1alpha1/componentconfig.go
index 3824505082..dc8b5722e8 100644
--- a/pkg/apis/kops/v1alpha1/componentconfig.go
+++ b/pkg/apis/kops/v1alpha1/componentconfig.go
@@ -318,6 +318,9 @@ type KubeletConfigSpec struct {
 
 	// Taints to add when registering a node in the cluster
 	Taints []string `json:"taints,omitempty" flag:"register-with-taints"`
+
+	// FeatureGates is set of key=value pairs that describe feature gates for alpha/experimental features.
+	FeatureGates map[string]string `json:"featureGates,omitempty" flag:"feature-gates"`
 }
 
 type KubeProxyConfig struct {
diff --git a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go
index ba75c45769..5a2550590c 100644
--- a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go
+++ b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go
@@ -1365,6 +1365,7 @@ func autoConvert_v1alpha1_KubeletConfigSpec_To_kops_KubeletConfigSpec(in *Kubele
 	out.EvictionMinimumReclaim = in.EvictionMinimumReclaim
 	out.VolumePluginDirectory = in.VolumePluginDirectory
 	out.Taints = in.Taints
+	out.FeatureGates = in.FeatureGates
 	return nil
 }
 
@@ -1411,6 +1412,7 @@ func autoConvert_kops_KubeletConfigSpec_To_v1alpha1_KubeletConfigSpec(in *kops.K
 	out.EvictionMinimumReclaim = in.EvictionMinimumReclaim
 	out.VolumePluginDirectory = in.VolumePluginDirectory
 	out.Taints = in.Taints
+	out.FeatureGates = in.FeatureGates
 	return nil
 }
 
diff --git a/pkg/apis/kops/v1alpha2/componentconfig.go b/pkg/apis/kops/v1alpha2/componentconfig.go
index 9561fe164b..7c79100f2f 100644
--- a/pkg/apis/kops/v1alpha2/componentconfig.go
+++ b/pkg/apis/kops/v1alpha2/componentconfig.go
@@ -140,6 +140,9 @@ type KubeletConfigSpec struct {
 
 	// Taints to add when registering a node in the cluster
 	Taints []string `json:"taints,omitempty" flag:"register-with-taints"`
+
+	// FeatureGates is set of key=value pairs that describe feature gates for alpha/experimental features.
+	FeatureGates map[string]string `json:"featureGates,omitempty" flag:"feature-gates"`
 }
 
 type KubeProxyConfig struct {
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go
index 534cb2da6e..22d863c06f 100644
--- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go
+++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go
@@ -1463,6 +1463,7 @@ func autoConvert_v1alpha2_KubeletConfigSpec_To_kops_KubeletConfigSpec(in *Kubele
 	out.EvictionMinimumReclaim = in.EvictionMinimumReclaim
 	out.VolumePluginDirectory = in.VolumePluginDirectory
 	out.Taints = in.Taints
+	out.FeatureGates = in.FeatureGates
 	return nil
 }
 
@@ -1509,6 +1510,7 @@ func autoConvert_kops_KubeletConfigSpec_To_v1alpha2_KubeletConfigSpec(in *kops.K
 	out.EvictionMinimumReclaim = in.EvictionMinimumReclaim
 	out.VolumePluginDirectory = in.VolumePluginDirectory
 	out.Taints = in.Taints
+	out.FeatureGates = in.FeatureGates
 	return nil
 }
 
diff --git a/pkg/flagbuilder/build_flags.go b/pkg/flagbuilder/build_flags.go
index a8230f34fe..38981fad66 100644
--- a/pkg/flagbuilder/build_flags.go
+++ b/pkg/flagbuilder/build_flags.go
@@ -89,6 +89,7 @@ func BuildFlags(options interface{}) (string, error) {
 					arg := fmt.Sprintf("%s=%s", k, v)
 					args = append(args, arg)
 				}
+				sort.Strings(args)
 				if len(args) != 0 {
 					flag := fmt.Sprintf("--%s=%s", flagName, strings.Join(args, ","))
 					flags = append(flags, flag)
diff --git a/pkg/model/components/docker.go b/pkg/model/components/docker.go
index 104fde53ce..4ecc2cb905 100644
--- a/pkg/model/components/docker.go
+++ b/pkg/model/components/docker.go
@@ -48,7 +48,9 @@ func (b *DockerOptionsBuilder) BuildOptions(o interface{}) error {
 		}
 
 		dockerVersion := ""
-		if sv.Major == 1 && sv.Minor >= 5 {
+		if sv.Major == 1 && sv.Minor >= 6 {
+			dockerVersion = "1.12.6"
+		} else if sv.Major == 1 && sv.Minor >= 5 {
 			dockerVersion = "1.12.3"
 		} else if sv.Major == 1 && sv.Minor <= 4 {
 			dockerVersion = "1.11.2"
diff --git a/pkg/model/components/kubecontrollermanager.go b/pkg/model/components/kubecontrollermanager.go
index dcf566b3ea..59cee590d6 100644
--- a/pkg/model/components/kubecontrollermanager.go
+++ b/pkg/model/components/kubecontrollermanager.go
@@ -140,7 +140,7 @@ func (b *KubeControllerManagerOptionsBuilder) BuildOptions(o interface{}) error
 		kcm.ConfigureCloudRoutes = fi.Bool(false)
 	} else if networking.Kopeio != nil {
 		// Kopeio is based on kubenet / external
-		kcm.ConfigureCloudRoutes = fi.Bool(true)
+		kcm.ConfigureCloudRoutes = fi.Bool(false)
 	} else {
 		return fmt.Errorf("no networking mode set")
 	}
diff --git a/pkg/validation/validate_cluster.go b/pkg/validation/validate_cluster.go
index 615429df3b..183197350a 100644
--- a/pkg/validation/validate_cluster.go
+++ b/pkg/validation/validate_cluster.go
@@ -180,7 +180,7 @@ func validateTheNodes(clusterName string, validationCluster *ValidationCluster)
 	}
 
 	validationCluster.NodesReady = true
-	if len(validationCluster.NodesNotReadyArray) != 0 || validationCluster.NodesCount != len(validationCluster.NodesReadyArray) {
+	if len(validationCluster.NodesNotReadyArray) != 0 || validationCluster.NodesCount > len(validationCluster.NodesReadyArray) {
 		validationCluster.NodesReady = false
 	}
 
diff --git a/pkg/validation/validate_cluster_test.go b/pkg/validation/validate_cluster_test.go
index 9ead8d504a..f0c2c1f8ec 100644
--- a/pkg/validation/validate_cluster_test.go
+++ b/pkg/validation/validate_cluster_test.go
@@ -196,6 +196,11 @@ func dummyClient(masterReady string, nodeReady string) kubernetes.Interface {
 				"kubernetes.io/role": "node",
 				NODE_READY:           nodeReady,
 			},
+			{
+				"name":               "node2",
+				"kubernetes.io/role": "node",
+				NODE_READY:           "true",
+			},
 		},
 	))
 }
diff --git a/tests/integration/privatedns1/id_rsa.pub b/tests/integration/privatedns1/id_rsa.pub
new file mode 100755
index 0000000000..81cb012783
--- /dev/null
+++ b/tests/integration/privatedns1/id_rsa.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ==
diff --git a/tests/integration/privatedns1/in-v1alpha2.yaml b/tests/integration/privatedns1/in-v1alpha2.yaml
new file mode 100644
index 0000000000..74e6ee526d
--- /dev/null
+++ b/tests/integration/privatedns1/in-v1alpha2.yaml
@@ -0,0 +1,102 @@
+apiVersion: kops/v1alpha2
+kind: Cluster
+metadata:
+  creationTimestamp: "2016-12-12T04:13:14Z"
+  name: privatedns1.example.com
+spec:
+  kubernetesApiAccess:
+  - 0.0.0.0/0
+  channel: stable
+  cloudProvider: aws
+  configBase: memfs://clusters.example.com/privatedns1.example.com
+  dnsZone: internal.example.com
+  etcdClusters:
+  - etcdMembers:
+    - instanceGroup: master-us-test-1a
+      name: us-test-1a
+    name: main
+  - etcdMembers:
+    - instanceGroup: master-us-test-1a
+      name: us-test-1a
+    name: events
+  kubernetesVersion: v1.4.6
+  masterInternalName: api.internal.privatedns1.example.com
+  masterPublicName: api.privatedns1.example.com
+  networkCIDR: 172.20.0.0/16
+  networking:
+    weave: {}
+  nonMasqueradeCIDR: 100.64.0.0/10
+  sshAccess:
+  - 0.0.0.0/0
+  topology:
+    dns:
+      type: Private
+    masters: private
+    nodes: private
+  subnets:
+  - cidr: 172.20.32.0/19
+    name: us-test-1a
+    type: Private
+    zone: us-test-1a
+  - cidr: 172.20.4.0/22
+    name: utility-us-test-1a
+    type: Utility
+    zone: us-test-1a
+
+---
+
+apiVersion: kops/v1alpha2
+kind: InstanceGroup
+metadata:
+  creationTimestamp: "2016-12-12T04:13:15Z"
+  name: master-us-test-1a
+  labels:
+    kops.k8s.io/cluster: privatedns1.example.com
+spec:
+  associatePublicIp: true
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
+  machineType: m3.medium
+  maxSize: 1
+  minSize: 1
+  role: Master
+  subnets:
+  - us-test-1a
+
+---
+
+apiVersion: kops/v1alpha2
+kind: InstanceGroup
+metadata:
+  creationTimestamp: "2016-12-12T04:13:15Z"
+  name: nodes
+  labels:
+    kops.k8s.io/cluster: privatedns1.example.com
+spec:
+  associatePublicIp: true
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
+  machineType: t2.medium
+  maxSize: 2
+  minSize: 2
+  role: Node
+  subnets:
+  - us-test-1a
+
+
+---
+
+apiVersion: kops/v1alpha2
+kind: InstanceGroup
+metadata:
+  creationTimestamp: "2016-12-14T15:32:41Z"
+  name: bastion
+  labels:
+    kops.k8s.io/cluster: privatedns1.example.com
+spec:
+  associatePublicIp: true
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
+  machineType: t2.micro
+  maxSize: 1
+  minSize: 1
+  role: Bastion
+  subnets:
+  - utility-us-test-1a
diff --git a/tests/integration/privatedns1/kubernetes.tf b/tests/integration/privatedns1/kubernetes.tf
new file mode 100644
index 0000000000..cc88988502
--- /dev/null
+++ b/tests/integration/privatedns1/kubernetes.tf
@@ -0,0 +1,653 @@
+output "bastion_security_group_ids" {
+  value = ["${aws_security_group.bastion-privatedns1-example-com.id}"]
+}
+
+output "cluster_name" {
+  value = "privatedns1.example.com"
+}
+
+output "master_security_group_ids" {
+  value = ["${aws_security_group.masters-privatedns1-example-com.id}"]
+}
+
+output "node_security_group_ids" {
+  value = ["${aws_security_group.nodes-privatedns1-example-com.id}"]
+}
+
+output "node_subnet_ids" {
+  value = ["${aws_subnet.us-test-1a-privatedns1-example-com.id}"]
+}
+
+output "region" {
+  value = "us-test-1"
+}
+
+output "vpc_id" {
+  value = "${aws_vpc.privatedns1-example-com.id}"
+}
+
+resource "aws_autoscaling_attachment" "bastion-privatedns1-example-com" {
+  elb                    = "${aws_elb.bastion-privatedns1-example-com.id}"
+  autoscaling_group_name = "${aws_autoscaling_group.bastion-privatedns1-example-com.id}"
+}
+
+resource "aws_autoscaling_attachment" "master-us-test-1a-masters-privatedns1-example-com" {
+  elb                    = "${aws_elb.api-privatedns1-example-com.id}"
+  autoscaling_group_name = "${aws_autoscaling_group.master-us-test-1a-masters-privatedns1-example-com.id}"
+}
+
+resource "aws_autoscaling_group" "bastion-privatedns1-example-com" {
+  name                 = "bastion.privatedns1.example.com"
+  launch_configuration = "${aws_launch_configuration.bastion-privatedns1-example-com.id}"
+  max_size             = 1
+  min_size             = 1
+  vpc_zone_identifier  = ["${aws_subnet.utility-us-test-1a-privatedns1-example-com.id}"]
+
+  tag = {
+    key                 = "KubernetesCluster"
+    value               = "privatedns1.example.com"
+    propagate_at_launch = true
+  }
+
+  tag = {
+    key                 = "Name"
+    value               = "bastion.privatedns1.example.com"
+    propagate_at_launch = true
+  }
+
+  tag = {
+    key                 = "k8s.io/role/bastion"
+    value               = "1"
+    propagate_at_launch = true
+  }
+}
+
+resource "aws_autoscaling_group" "master-us-test-1a-masters-privatedns1-example-com" {
+  name                 = "master-us-test-1a.masters.privatedns1.example.com"
+  launch_configuration = "${aws_launch_configuration.master-us-test-1a-masters-privatedns1-example-com.id}"
+  max_size             = 1
+  min_size             = 1
+  vpc_zone_identifier  = ["${aws_subnet.us-test-1a-privatedns1-example-com.id}"]
+
+  tag = {
+    key                 = "KubernetesCluster"
+    value               = "privatedns1.example.com"
+    propagate_at_launch = true
+  }
+
+  tag = {
+    key                 = "Name"
+    value               = "master-us-test-1a.masters.privatedns1.example.com"
+    propagate_at_launch = true
+  }
+
+  tag = {
+    key                 = "k8s.io/role/master"
+    value               = "1"
+    propagate_at_launch = true
+  }
+}
+
+resource "aws_autoscaling_group" "nodes-privatedns1-example-com" {
+  name                 = "nodes.privatedns1.example.com"
+  launch_configuration = "${aws_launch_configuration.nodes-privatedns1-example-com.id}"
+  max_size             = 2
+  min_size             = 2
+  vpc_zone_identifier  = ["${aws_subnet.us-test-1a-privatedns1-example-com.id}"]
+
+  tag = {
+    key                 = "KubernetesCluster"
+    value               = "privatedns1.example.com"
+    propagate_at_launch = true
+  }
+
+  tag = {
+    key                 = "Name"
+    value               = "nodes.privatedns1.example.com"
+    propagate_at_launch = true
+  }
+
+  tag = {
+    key                 = "k8s.io/role/node"
+    value               = "1"
+    propagate_at_launch = true
+  }
+}
+
+resource "aws_ebs_volume" "us-test-1a-etcd-events-privatedns1-example-com" {
+  availability_zone = "us-test-1a"
+  size              = 20
+  type              = "gp2"
+  encrypted         = false
+
+  tags = {
+    KubernetesCluster    = "privatedns1.example.com"
+    Name                 = "us-test-1a.etcd-events.privatedns1.example.com"
+    "k8s.io/etcd/events" = "us-test-1a/us-test-1a"
+    "k8s.io/role/master" = "1"
+  }
+}
+
+resource "aws_ebs_volume" "us-test-1a-etcd-main-privatedns1-example-com" {
+  availability_zone = "us-test-1a"
+  size              = 20
+  type              = "gp2"
+  encrypted         = false
+
+  tags = {
+    KubernetesCluster    = "privatedns1.example.com"
+    Name                 = "us-test-1a.etcd-main.privatedns1.example.com"
+    "k8s.io/etcd/main"   = "us-test-1a/us-test-1a"
+    "k8s.io/role/master" = "1"
+  }
+}
+
+resource "aws_eip" "us-test-1a-privatedns1-example-com" {
+  vpc = true
+}
+
+resource "aws_elb" "api-privatedns1-example-com" {
+  name = "api-privatedns1-example-c-lq96ht"
+
+  listener = {
+    instance_port     = 443
+    instance_protocol = "TCP"
+    lb_port           = 443
+    lb_protocol       = "TCP"
+  }
+
+  security_groups = ["${aws_security_group.api-elb-privatedns1-example-com.id}"]
+  subnets         = ["${aws_subnet.utility-us-test-1a-privatedns1-example-com.id}"]
+
+  health_check = {
+    target              = "TCP:443"
+    healthy_threshold   = 2
+    unhealthy_threshold = 2
+    interval            = 10
+    timeout             = 5
+  }
+
+  idle_timeout = 300
+
+  tags = {
+    KubernetesCluster = "privatedns1.example.com"
+    Name              = "api.privatedns1.example.com"
+  }
+}
+
+resource "aws_elb" "bastion-privatedns1-example-com" {
+  name = "bastion-privatedns1-examp-mbgbef"
+
+  listener = {
+    instance_port     = 22
+    instance_protocol = "TCP"
+    lb_port           = 22
+    lb_protocol       = "TCP"
+  }
+
+  security_groups = ["${aws_security_group.bastion-elb-privatedns1-example-com.id}"]
+  subnets         = ["${aws_subnet.utility-us-test-1a-privatedns1-example-com.id}"]
+
+  health_check = {
+    target              = "TCP:22"
+    healthy_threshold   = 2
+    unhealthy_threshold = 2
+    interval            = 10
+    timeout             = 5
+  }
+
+  idle_timeout = 300
+
+  tags = {
+    KubernetesCluster = "privatedns1.example.com"
+    Name              = "bastion.privatedns1.example.com"
+  }
+}
+
+resource "aws_iam_instance_profile" "bastions-privatedns1-example-com" {
+  name  = "bastions.privatedns1.example.com"
+  roles = ["${aws_iam_role.bastions-privatedns1-example-com.name}"]
+}
+
+resource "aws_iam_instance_profile" "masters-privatedns1-example-com" {
+  name  = "masters.privatedns1.example.com"
+  roles = ["${aws_iam_role.masters-privatedns1-example-com.name}"]
+}
+
+resource "aws_iam_instance_profile" "nodes-privatedns1-example-com" {
+  name  = "nodes.privatedns1.example.com"
+  roles = ["${aws_iam_role.nodes-privatedns1-example-com.name}"]
+}
+
+resource "aws_iam_role" "bastions-privatedns1-example-com" {
+  name               = "bastions.privatedns1.example.com"
+  assume_role_policy = "${file("${path.module}/data/aws_iam_role_bastions.privatedns1.example.com_policy")}"
+}
+
+resource "aws_iam_role" "masters-privatedns1-example-com" {
+  name               = "masters.privatedns1.example.com"
+  assume_role_policy = "${file("${path.module}/data/aws_iam_role_masters.privatedns1.example.com_policy")}"
+}
+
+resource "aws_iam_role" "nodes-privatedns1-example-com" {
+  name               = "nodes.privatedns1.example.com"
+  assume_role_policy = "${file("${path.module}/data/aws_iam_role_nodes.privatedns1.example.com_policy")}"
+}
+
+resource "aws_iam_role_policy" "bastions-privatedns1-example-com" {
+  name   = "bastions.privatedns1.example.com"
+  role   = "${aws_iam_role.bastions-privatedns1-example-com.name}"
+  policy = "${file("${path.module}/data/aws_iam_role_policy_bastions.privatedns1.example.com_policy")}"
+}
+
+resource "aws_iam_role_policy" "masters-privatedns1-example-com" {
+  name   = "masters.privatedns1.example.com"
+  role   = "${aws_iam_role.masters-privatedns1-example-com.name}"
+  policy = "${file("${path.module}/data/aws_iam_role_policy_masters.privatedns1.example.com_policy")}"
+}
+
+resource "aws_iam_role_policy" "nodes-privatedns1-example-com" {
+  name   = "nodes.privatedns1.example.com"
+  role   = "${aws_iam_role.nodes-privatedns1-example-com.name}"
+  policy = "${file("${path.module}/data/aws_iam_role_policy_nodes.privatedns1.example.com_policy")}"
+}
+
+resource "aws_internet_gateway" "privatedns1-example-com" {
+  vpc_id = "${aws_vpc.privatedns1-example-com.id}"
+
+  tags = {
+    KubernetesCluster = "privatedns1.example.com"
+    Name              = "privatedns1.example.com"
+  }
+}
+
+resource "aws_key_pair" "kubernetes-privatedns1-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157" {
+  key_name   = "kubernetes.privatedns1.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57"
+  public_key = "${file("${path.module}/data/aws_key_pair_kubernetes.privatedns1.example.com-c4a6ed9aa889b9e2c39cd663eb9c7157_public_key")}"
+}
+
+resource "aws_launch_configuration" "bastion-privatedns1-example-com" {
+  name_prefix                 = "bastion.privatedns1.example.com-"
+  image_id                    = "ami-12345678"
+  instance_type               = "t2.micro"
+  key_name                    = "${aws_key_pair.kubernetes-privatedns1-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id}"
+  iam_instance_profile        = "${aws_iam_instance_profile.bastions-privatedns1-example-com.id}"
+  security_groups             = ["${aws_security_group.bastion-privatedns1-example-com.id}"]
+  associate_public_ip_address = true
+
+  root_block_device = {
+    volume_type           = "gp2"
+    volume_size           = 20
+    delete_on_termination = true
+  }
+
+  lifecycle = {
+    create_before_destroy = true
+  }
+}
+
+resource "aws_launch_configuration" "master-us-test-1a-masters-privatedns1-example-com" {
+  name_prefix                 = "master-us-test-1a.masters.privatedns1.example.com-"
+  image_id                    = "ami-12345678"
+  instance_type               = "m3.medium"
+  key_name                    = "${aws_key_pair.kubernetes-privatedns1-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id}"
+  iam_instance_profile        = "${aws_iam_instance_profile.masters-privatedns1-example-com.id}"
+  security_groups             = ["${aws_security_group.masters-privatedns1-example-com.id}"]
+  associate_public_ip_address = false
+  user_data                   = "${file("${path.module}/data/aws_launch_configuration_master-us-test-1a.masters.privatedns1.example.com_user_data")}"
+
+  root_block_device = {
+    volume_type           = "gp2"
+    volume_size           = 20
+    delete_on_termination = true
+  }
+
+  ephemeral_block_device = {
+    device_name  = "/dev/sdc"
+    virtual_name = "ephemeral0"
+  }
+
+  lifecycle = {
+    create_before_destroy = true
+  }
+}
+
+resource "aws_launch_configuration" "nodes-privatedns1-example-com" {
+  name_prefix                 = "nodes.privatedns1.example.com-"
+  image_id                    = "ami-12345678"
+  instance_type               = "t2.medium"
+  key_name                    = "${aws_key_pair.kubernetes-privatedns1-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id}"
+  iam_instance_profile        = "${aws_iam_instance_profile.nodes-privatedns1-example-com.id}"
+  security_groups             = ["${aws_security_group.nodes-privatedns1-example-com.id}"]
+  associate_public_ip_address = false
+  user_data                   = "${file("${path.module}/data/aws_launch_configuration_nodes.privatedns1.example.com_user_data")}"
+
+  root_block_device = {
+    volume_type           = "gp2"
+    volume_size           = 20
+    delete_on_termination = true
+  }
+
+  lifecycle = {
+    create_before_destroy = true
+  }
+}
+
+resource "aws_nat_gateway" "us-test-1a-privatedns1-example-com" {
+  allocation_id = "${aws_eip.us-test-1a-privatedns1-example-com.id}"
+  subnet_id     = "${aws_subnet.utility-us-test-1a-privatedns1-example-com.id}"
+}
+
+resource "aws_route" "0-0-0-0--0" {
+  route_table_id         = "${aws_route_table.privatedns1-example-com.id}"
+  destination_cidr_block = "0.0.0.0/0"
+  gateway_id             = "${aws_internet_gateway.privatedns1-example-com.id}"
+}
+
+resource "aws_route" "private-us-test-1a-0-0-0-0--0" {
+  route_table_id         = "${aws_route_table.private-us-test-1a-privatedns1-example-com.id}"
+  destination_cidr_block = "0.0.0.0/0"
+  nat_gateway_id         = "${aws_nat_gateway.us-test-1a-privatedns1-example-com.id}"
+}
+
+resource "aws_route53_record" "api-privatedns1-example-com" {
+  name = "api.privatedns1.example.com"
+  type = "A"
+
+  alias = {
+    name                   = "${aws_elb.api-privatedns1-example-com.dns_name}"
+    zone_id                = "${aws_elb.api-privatedns1-example-com.zone_id}"
+    evaluate_target_health = false
+  }
+
+  zone_id = "/hostedzone/Z2AFAKE1ZON3NO"
+}
+
+resource "aws_route53_zone_association" "internal-example-com" {
+  zone_id = "/hostedzone/Z2AFAKE1ZON3NO"
+  vpc_id  = "${aws_vpc.privatedns1-example-com.id}"
+}
+
+resource "aws_route_table" "private-us-test-1a-privatedns1-example-com" {
+  vpc_id = "${aws_vpc.privatedns1-example-com.id}"
+
+  tags = {
+    KubernetesCluster = "privatedns1.example.com"
+    Name              = "private-us-test-1a.privatedns1.example.com"
+  }
+}
+
+resource "aws_route_table" "privatedns1-example-com" {
+  vpc_id = "${aws_vpc.privatedns1-example-com.id}"
+
+  tags = {
+    KubernetesCluster = "privatedns1.example.com"
+    Name              = "privatedns1.example.com"
+  }
+}
+
+resource "aws_route_table_association" "private-us-test-1a-privatedns1-example-com" {
+  subnet_id      = "${aws_subnet.us-test-1a-privatedns1-example-com.id}"
+  route_table_id = "${aws_route_table.private-us-test-1a-privatedns1-example-com.id}"
+}
+
+resource "aws_route_table_association" "utility-us-test-1a-privatedns1-example-com" {
+  subnet_id      = "${aws_subnet.utility-us-test-1a-privatedns1-example-com.id}"
+  route_table_id = "${aws_route_table.privatedns1-example-com.id}"
+}
+
+resource "aws_security_group" "api-elb-privatedns1-example-com" {
+  name        = "api-elb.privatedns1.example.com"
+  vpc_id      = "${aws_vpc.privatedns1-example-com.id}"
+  description = "Security group for api ELB"
+
+  tags = {
+    KubernetesCluster = "privatedns1.example.com"
+    Name              = "api-elb.privatedns1.example.com"
+  }
+}
+
+resource "aws_security_group" "bastion-elb-privatedns1-example-com" {
+  name        = "bastion-elb.privatedns1.example.com"
+  vpc_id      = "${aws_vpc.privatedns1-example-com.id}"
+  description = "Security group for bastion ELB"
+
+  tags = {
+    KubernetesCluster = "privatedns1.example.com"
+    Name              = "bastion-elb.privatedns1.example.com"
+  }
+}
+
+resource "aws_security_group" "bastion-privatedns1-example-com" {
+  name        = "bastion.privatedns1.example.com"
+  vpc_id      = "${aws_vpc.privatedns1-example-com.id}"
+  description = "Security group for bastion"
+
+  tags = {
+    KubernetesCluster = "privatedns1.example.com"
+    Name              = "bastion.privatedns1.example.com"
+  }
+}
+
+resource "aws_security_group" "masters-privatedns1-example-com" {
+  name        = "masters.privatedns1.example.com"
+  vpc_id      = "${aws_vpc.privatedns1-example-com.id}"
+  description = "Security group for masters"
+
+  tags = {
+    KubernetesCluster = "privatedns1.example.com"
+    Name              = "masters.privatedns1.example.com"
+  }
+}
+
+resource "aws_security_group" "nodes-privatedns1-example-com" {
+  name        = "nodes.privatedns1.example.com"
+  vpc_id      = "${aws_vpc.privatedns1-example-com.id}"
+  description = "Security group for nodes"
+
+  tags = {
+    KubernetesCluster = "privatedns1.example.com"
+    Name              = "nodes.privatedns1.example.com"
+  }
+}
+
+resource "aws_security_group_rule" "all-master-to-master" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.masters-privatedns1-example-com.id}"
+  source_security_group_id = "${aws_security_group.masters-privatedns1-example-com.id}"
+  from_port                = 0
+  to_port                  = 0
+  protocol                 = "-1"
+}
+
+resource "aws_security_group_rule" "all-master-to-node" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.nodes-privatedns1-example-com.id}"
+  source_security_group_id = "${aws_security_group.masters-privatedns1-example-com.id}"
+  from_port                = 0
+  to_port                  = 0
+  protocol                 = "-1"
+}
+
+resource "aws_security_group_rule" "all-node-to-node" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.nodes-privatedns1-example-com.id}"
+  source_security_group_id = "${aws_security_group.nodes-privatedns1-example-com.id}"
+  from_port                = 0
+  to_port                  = 0
+  protocol                 = "-1"
+}
+
+resource "aws_security_group_rule" "api-elb-egress" {
+  type              = "egress"
+  security_group_id = "${aws_security_group.api-elb-privatedns1-example-com.id}"
+  from_port         = 0
+  to_port           = 0
+  protocol          = "-1"
+  cidr_blocks       = ["0.0.0.0/0"]
+}
+
+resource "aws_security_group_rule" "bastion-egress" {
+  type              = "egress"
+  security_group_id = "${aws_security_group.bastion-privatedns1-example-com.id}"
+  from_port         = 0
+  to_port           = 0
+  protocol          = "-1"
+  cidr_blocks       = ["0.0.0.0/0"]
+}
+
+resource "aws_security_group_rule" "bastion-elb-egress" {
+  type              = "egress"
+  security_group_id = "${aws_security_group.bastion-elb-privatedns1-example-com.id}"
+  from_port         = 0
+  to_port           = 0
+  protocol          = "-1"
+  cidr_blocks       = ["0.0.0.0/0"]
+}
+
+resource "aws_security_group_rule" "bastion-to-master-ssh" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.masters-privatedns1-example-com.id}"
+  source_security_group_id = "${aws_security_group.bastion-privatedns1-example-com.id}"
+  from_port                = 22
+  to_port                  = 22
+  protocol                 = "tcp"
+}
+
+resource "aws_security_group_rule" "bastion-to-node-ssh" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.nodes-privatedns1-example-com.id}"
+  source_security_group_id = "${aws_security_group.bastion-privatedns1-example-com.id}"
+  from_port                = 22
+  to_port                  = 22
+  protocol                 = "tcp"
+}
+
+resource "aws_security_group_rule" "https-api-elb-0-0-0-0--0" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.api-elb-privatedns1-example-com.id}"
+  from_port         = 443
+  to_port           = 443
+  protocol          = "tcp"
+  cidr_blocks       = ["0.0.0.0/0"]
+}
+
+resource "aws_security_group_rule" "https-elb-to-master" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.masters-privatedns1-example-com.id}"
+  source_security_group_id = "${aws_security_group.api-elb-privatedns1-example-com.id}"
+  from_port                = 443
+  to_port                  = 443
+  protocol                 = "tcp"
+}
+
+resource "aws_security_group_rule" "master-egress" {
+  type              = "egress"
+  security_group_id = "${aws_security_group.masters-privatedns1-example-com.id}"
+  from_port         = 0
+  to_port           = 0
+  protocol          = "-1"
+  cidr_blocks       = ["0.0.0.0/0"]
+}
+
+resource "aws_security_group_rule" "node-egress" {
+  type              = "egress"
+  security_group_id = "${aws_security_group.nodes-privatedns1-example-com.id}"
+  from_port         = 0
+  to_port           = 0
+  protocol          = "-1"
+  cidr_blocks       = ["0.0.0.0/0"]
+}
+
+resource "aws_security_group_rule" "node-to-master-tcp-1-4000" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.masters-privatedns1-example-com.id}"
+  source_security_group_id = "${aws_security_group.nodes-privatedns1-example-com.id}"
+  from_port                = 1
+  to_port                  = 4000
+  protocol                 = "tcp"
+}
+
+resource "aws_security_group_rule" "node-to-master-tcp-4003-65535" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.masters-privatedns1-example-com.id}"
+  source_security_group_id = "${aws_security_group.nodes-privatedns1-example-com.id}"
+  from_port                = 4003
+  to_port                  = 65535
+  protocol                 = "tcp"
+}
+
+resource "aws_security_group_rule" "node-to-master-udp-1-65535" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.masters-privatedns1-example-com.id}"
+  source_security_group_id = "${aws_security_group.nodes-privatedns1-example-com.id}"
+  from_port                = 1
+  to_port                  = 65535
+  protocol                 = "udp"
+}
+
+resource "aws_security_group_rule" "ssh-elb-to-bastion" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.bastion-privatedns1-example-com.id}"
+  source_security_group_id = "${aws_security_group.bastion-elb-privatedns1-example-com.id}"
+  from_port                = 22
+  to_port                  = 22
+  protocol                 = "tcp"
+}
+
+resource "aws_security_group_rule" "ssh-external-to-bastion-elb-0-0-0-0--0" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.bastion-elb-privatedns1-example-com.id}"
+  from_port         = 22
+  to_port           = 22
+  protocol          = "tcp"
+  cidr_blocks       = ["0.0.0.0/0"]
+}
+
+resource "aws_subnet" "us-test-1a-privatedns1-example-com" {
+  vpc_id            = "${aws_vpc.privatedns1-example-com.id}"
+  cidr_block        = "172.20.32.0/19"
+  availability_zone = "us-test-1a"
+
+  tags = {
+    KubernetesCluster = "privatedns1.example.com"
+    Name              = "us-test-1a.privatedns1.example.com"
+  }
+}
+
+resource "aws_subnet" "utility-us-test-1a-privatedns1-example-com" {
+  vpc_id            = "${aws_vpc.privatedns1-example-com.id}"
+  cidr_block        = "172.20.4.0/22"
+  availability_zone = "us-test-1a"
+
+  tags = {
+    KubernetesCluster = "privatedns1.example.com"
+    Name              = "utility-us-test-1a.privatedns1.example.com"
+  }
+}
+
+resource "aws_vpc" "privatedns1-example-com" {
+  cidr_block           = "172.20.0.0/16"
+  enable_dns_hostnames = true
+  enable_dns_support   = true
+
+  tags = {
+    KubernetesCluster = "privatedns1.example.com"
+    Name              = "privatedns1.example.com"
+  }
+}
+
+resource "aws_vpc_dhcp_options" "privatedns1-example-com" {
+  domain_name         = "us-test-1.compute.internal"
+  domain_name_servers = ["AmazonProvidedDNS"]
+
+  tags = {
+    KubernetesCluster = "privatedns1.example.com"
+    Name              = "privatedns1.example.com"
+  }
+}
+
+resource "aws_vpc_dhcp_options_association" "privatedns1-example-com" {
+  vpc_id          = "${aws_vpc.privatedns1-example-com.id}"
+  dhcp_options_id = "${aws_vpc_dhcp_options.privatedns1-example-com.id}"
+}
diff --git a/tests/integration/privatedns2/id_rsa.pub b/tests/integration/privatedns2/id_rsa.pub
new file mode 100755
index 0000000000..81cb012783
--- /dev/null
+++ b/tests/integration/privatedns2/id_rsa.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ==
diff --git a/tests/integration/privatedns2/in-v1alpha2.yaml b/tests/integration/privatedns2/in-v1alpha2.yaml
new file mode 100644
index 0000000000..3b5bb8ff8d
--- /dev/null
+++ b/tests/integration/privatedns2/in-v1alpha2.yaml
@@ -0,0 +1,103 @@
+apiVersion: kops/v1alpha2
+kind: Cluster
+metadata:
+  creationTimestamp: "2016-12-12T04:13:14Z"
+  name: privatedns2.example.com
+spec:
+  kubernetesApiAccess:
+  - 0.0.0.0/0
+  channel: stable
+  cloudProvider: aws
+  configBase: memfs://clusters.example.com/privatedns2.example.com
+  dnsZone: private.example.com
+  etcdClusters:
+  - etcdMembers:
+    - instanceGroup: master-us-test-1a
+      name: us-test-1a
+    name: main
+  - etcdMembers:
+    - instanceGroup: master-us-test-1a
+      name: us-test-1a
+    name: events
+  kubernetesVersion: v1.4.6
+  masterInternalName: api.internal.privatedns2.example.com
+  masterPublicName: api.privatedns2.example.com
+  networkCIDR: 172.20.0.0/16
+  networkID: vpc-123
+  networking:
+    weave: {}
+  nonMasqueradeCIDR: 100.64.0.0/10
+  sshAccess:
+  - 0.0.0.0/0
+  topology:
+    dns:
+      type: Private
+    masters: private
+    nodes: private
+  subnets:
+  - cidr: 172.20.32.0/19
+    name: us-test-1a
+    type: Private
+    zone: us-test-1a
+  - cidr: 172.20.4.0/22
+    name: utility-us-test-1a
+    type: Utility
+    zone: us-test-1a
+
+---
+
+apiVersion: kops/v1alpha2
+kind: InstanceGroup
+metadata:
+  creationTimestamp: "2016-12-12T04:13:15Z"
+  name: master-us-test-1a
+  labels:
+    kops.k8s.io/cluster: privatedns2.example.com
+spec:
+  associatePublicIp: true
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
+  machineType: m3.medium
+  maxSize: 1
+  minSize: 1
+  role: Master
+  subnets:
+  - us-test-1a
+
+---
+
+apiVersion: kops/v1alpha2
+kind: InstanceGroup
+metadata:
+  creationTimestamp: "2016-12-12T04:13:15Z"
+  name: nodes
+  labels:
+    kops.k8s.io/cluster: privatedns2.example.com
+spec:
+  associatePublicIp: true
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
+  machineType: t2.medium
+  maxSize: 2
+  minSize: 2
+  role: Node
+  subnets:
+  - us-test-1a
+
+
+---
+
+apiVersion: kops/v1alpha2
+kind: InstanceGroup
+metadata:
+  creationTimestamp: "2016-12-14T15:32:41Z"
+  name: bastion
+  labels:
+    kops.k8s.io/cluster: privatedns2.example.com
+spec:
+  associatePublicIp: true
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
+  machineType: t2.micro
+  maxSize: 1
+  minSize: 1
+  role: Bastion
+  subnets:
+  - utility-us-test-1a
diff --git a/tests/integration/privatedns2/kubernetes.tf b/tests/integration/privatedns2/kubernetes.tf
new file mode 100644
index 0000000000..97faba925b
--- /dev/null
+++ b/tests/integration/privatedns2/kubernetes.tf
@@ -0,0 +1,613 @@
+output "bastion_security_group_ids" {
+  value = ["${aws_security_group.bastion-privatedns2-example-com.id}"]
+}
+
+output "cluster_name" {
+  value = "privatedns2.example.com"
+}
+
+output "master_security_group_ids" {
+  value = ["${aws_security_group.masters-privatedns2-example-com.id}"]
+}
+
+output "node_security_group_ids" {
+  value = ["${aws_security_group.nodes-privatedns2-example-com.id}"]
+}
+
+output "node_subnet_ids" {
+  value = ["${aws_subnet.us-test-1a-privatedns2-example-com.id}"]
+}
+
+output "region" {
+  value = "us-test-1"
+}
+
+output "vpc_id" {
+  value = "vpc-123"
+}
+
+resource "aws_autoscaling_attachment" "bastion-privatedns2-example-com" {
+  elb                    = "${aws_elb.bastion-privatedns2-example-com.id}"
+  autoscaling_group_name = "${aws_autoscaling_group.bastion-privatedns2-example-com.id}"
+}
+
+resource "aws_autoscaling_attachment" "master-us-test-1a-masters-privatedns2-example-com" {
+  elb                    = "${aws_elb.api-privatedns2-example-com.id}"
+  autoscaling_group_name = "${aws_autoscaling_group.master-us-test-1a-masters-privatedns2-example-com.id}"
+}
+
+resource "aws_autoscaling_group" "bastion-privatedns2-example-com" {
+  name                 = "bastion.privatedns2.example.com"
+  launch_configuration = "${aws_launch_configuration.bastion-privatedns2-example-com.id}"
+  max_size             = 1
+  min_size             = 1
+  vpc_zone_identifier  = ["${aws_subnet.utility-us-test-1a-privatedns2-example-com.id}"]
+
+  tag = {
+    key                 = "KubernetesCluster"
+    value               = "privatedns2.example.com"
+    propagate_at_launch = true
+  }
+
+  tag = {
+    key                 = "Name"
+    value               = "bastion.privatedns2.example.com"
+    propagate_at_launch = true
+  }
+
+  tag = {
+    key                 = "k8s.io/role/bastion"
+    value               = "1"
+    propagate_at_launch = true
+  }
+}
+
+resource "aws_autoscaling_group" "master-us-test-1a-masters-privatedns2-example-com" {
+  name                 = "master-us-test-1a.masters.privatedns2.example.com"
+  launch_configuration = "${aws_launch_configuration.master-us-test-1a-masters-privatedns2-example-com.id}"
+  max_size             = 1
+  min_size             = 1
+  vpc_zone_identifier  = ["${aws_subnet.us-test-1a-privatedns2-example-com.id}"]
+
+  tag = {
+    key                 = "KubernetesCluster"
+    value               = "privatedns2.example.com"
+    propagate_at_launch = true
+  }
+
+  tag = {
+    key                 = "Name"
+    value               = "master-us-test-1a.masters.privatedns2.example.com"
+    propagate_at_launch = true
+  }
+
+  tag = {
+    key                 = "k8s.io/role/master"
+    value               = "1"
+    propagate_at_launch = true
+  }
+}
+
+resource "aws_autoscaling_group" "nodes-privatedns2-example-com" {
+  name                 = "nodes.privatedns2.example.com"
+  launch_configuration = "${aws_launch_configuration.nodes-privatedns2-example-com.id}"
+  max_size             = 2
+  min_size             = 2
+  vpc_zone_identifier  = ["${aws_subnet.us-test-1a-privatedns2-example-com.id}"]
+
+  tag = {
+    key                 = "KubernetesCluster"
+    value               = "privatedns2.example.com"
+    propagate_at_launch = true
+  }
+
+  tag = {
+    key                 = "Name"
+    value               = "nodes.privatedns2.example.com"
+    propagate_at_launch = true
+  }
+
+  tag = {
+    key                 = "k8s.io/role/node"
+    value               = "1"
+    propagate_at_launch = true
+  }
+}
+
+resource "aws_ebs_volume" "us-test-1a-etcd-events-privatedns2-example-com" {
+  availability_zone = "us-test-1a"
+  size              = 20
+  type              = "gp2"
+  encrypted         = false
+
+  tags = {
+    KubernetesCluster    = "privatedns2.example.com"
+    Name                 = "us-test-1a.etcd-events.privatedns2.example.com"
+    "k8s.io/etcd/events" = "us-test-1a/us-test-1a"
+    "k8s.io/role/master" = "1"
+  }
+}
+
+resource "aws_ebs_volume" "us-test-1a-etcd-main-privatedns2-example-com" {
+  availability_zone = "us-test-1a"
+  size              = 20
+  type              = "gp2"
+  encrypted         = false
+
+  tags = {
+    KubernetesCluster    = "privatedns2.example.com"
+    Name                 = "us-test-1a.etcd-main.privatedns2.example.com"
+    "k8s.io/etcd/main"   = "us-test-1a/us-test-1a"
+    "k8s.io/role/master" = "1"
+  }
+}
+
+resource "aws_eip" "us-test-1a-privatedns2-example-com" {
+  vpc = true
+}
+
+resource "aws_elb" "api-privatedns2-example-com" {
+  name = "api-privatedns2-example-c-6jft30"
+
+  listener = {
+    instance_port     = 443
+    instance_protocol = "TCP"
+    lb_port           = 443
+    lb_protocol       = "TCP"
+  }
+
+  security_groups = ["${aws_security_group.api-elb-privatedns2-example-com.id}"]
+  subnets         = ["${aws_subnet.utility-us-test-1a-privatedns2-example-com.id}"]
+
+  health_check = {
+    target              = "TCP:443"
+    healthy_threshold   = 2
+    unhealthy_threshold = 2
+    interval            = 10
+    timeout             = 5
+  }
+
+  idle_timeout = 300
+
+  tags = {
+    KubernetesCluster = "privatedns2.example.com"
+    Name              = "api.privatedns2.example.com"
+  }
+}
+
+resource "aws_elb" "bastion-privatedns2-example-com" {
+  name = "bastion-privatedns2-examp-e704o2"
+
+  listener = {
+    instance_port     = 22
+    instance_protocol = "TCP"
+    lb_port           = 22
+    lb_protocol       = "TCP"
+  }
+
+  security_groups = ["${aws_security_group.bastion-elb-privatedns2-example-com.id}"]
+  subnets         = ["${aws_subnet.utility-us-test-1a-privatedns2-example-com.id}"]
+
+  health_check = {
+    target              = "TCP:22"
+    healthy_threshold   = 2
+    unhealthy_threshold = 2
+    interval            = 10
+    timeout             = 5
+  }
+
+  idle_timeout = 300
+
+  tags = {
+    KubernetesCluster = "privatedns2.example.com"
+    Name              = "bastion.privatedns2.example.com"
+  }
+}
+
+resource "aws_iam_instance_profile" "bastions-privatedns2-example-com" {
+  name  = "bastions.privatedns2.example.com"
+  roles = ["${aws_iam_role.bastions-privatedns2-example-com.name}"]
+}
+
+resource "aws_iam_instance_profile" "masters-privatedns2-example-com" {
+  name  = "masters.privatedns2.example.com"
+  roles = ["${aws_iam_role.masters-privatedns2-example-com.name}"]
+}
+
+resource "aws_iam_instance_profile" "nodes-privatedns2-example-com" {
+  name  = "nodes.privatedns2.example.com"
+  roles = ["${aws_iam_role.nodes-privatedns2-example-com.name}"]
+}
+
+resource "aws_iam_role" "bastions-privatedns2-example-com" {
+  name               = "bastions.privatedns2.example.com"
+  assume_role_policy = "${file("${path.module}/data/aws_iam_role_bastions.privatedns2.example.com_policy")}"
+}
+
+resource "aws_iam_role" "masters-privatedns2-example-com" {
+  name               = "masters.privatedns2.example.com"
+  assume_role_policy = "${file("${path.module}/data/aws_iam_role_masters.privatedns2.example.com_policy")}"
+}
+
+resource "aws_iam_role" "nodes-privatedns2-example-com" {
+  name               = "nodes.privatedns2.example.com"
+  assume_role_policy = "${file("${path.module}/data/aws_iam_role_nodes.privatedns2.example.com_policy")}"
+}
+
+resource "aws_iam_role_policy" "bastions-privatedns2-example-com" {
+  name   = "bastions.privatedns2.example.com"
+  role   = "${aws_iam_role.bastions-privatedns2-example-com.name}"
+  policy = "${file("${path.module}/data/aws_iam_role_policy_bastions.privatedns2.example.com_policy")}"
+}
+
+resource "aws_iam_role_policy" "masters-privatedns2-example-com" {
+  name   = "masters.privatedns2.example.com"
+  role   = "${aws_iam_role.masters-privatedns2-example-com.name}"
+  policy = "${file("${path.module}/data/aws_iam_role_policy_masters.privatedns2.example.com_policy")}"
+}
+
+resource "aws_iam_role_policy" "nodes-privatedns2-example-com" {
+  name   = "nodes.privatedns2.example.com"
+  role   = "${aws_iam_role.nodes-privatedns2-example-com.name}"
+  policy = "${file("${path.module}/data/aws_iam_role_policy_nodes.privatedns2.example.com_policy")}"
+}
+
+resource "aws_key_pair" "kubernetes-privatedns2-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157" {
+  key_name   = "kubernetes.privatedns2.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57"
+  public_key = "${file("${path.module}/data/aws_key_pair_kubernetes.privatedns2.example.com-c4a6ed9aa889b9e2c39cd663eb9c7157_public_key")}"
+}
+
+resource "aws_launch_configuration" "bastion-privatedns2-example-com" {
+  name_prefix                 = "bastion.privatedns2.example.com-"
+  image_id                    = "ami-12345678"
+  instance_type               = "t2.micro"
+  key_name                    = "${aws_key_pair.kubernetes-privatedns2-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id}"
+  iam_instance_profile        = "${aws_iam_instance_profile.bastions-privatedns2-example-com.id}"
+  security_groups             = ["${aws_security_group.bastion-privatedns2-example-com.id}"]
+  associate_public_ip_address = true
+
+  root_block_device = {
+    volume_type           = "gp2"
+    volume_size           = 20
+    delete_on_termination = true
+  }
+
+  lifecycle = {
+    create_before_destroy = true
+  }
+}
+
+resource "aws_launch_configuration" "master-us-test-1a-masters-privatedns2-example-com" {
+  name_prefix                 = "master-us-test-1a.masters.privatedns2.example.com-"
+  image_id                    = "ami-12345678"
+  instance_type               = "m3.medium"
+  key_name                    = "${aws_key_pair.kubernetes-privatedns2-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id}"
+  iam_instance_profile        = "${aws_iam_instance_profile.masters-privatedns2-example-com.id}"
+  security_groups             = ["${aws_security_group.masters-privatedns2-example-com.id}"]
+  associate_public_ip_address = false
+  user_data                   = "${file("${path.module}/data/aws_launch_configuration_master-us-test-1a.masters.privatedns2.example.com_user_data")}"
+
+  root_block_device = {
+    volume_type           = "gp2"
+    volume_size           = 20
+    delete_on_termination = true
+  }
+
+  ephemeral_block_device = {
+    device_name  = "/dev/sdc"
+    virtual_name = "ephemeral0"
+  }
+
+  lifecycle = {
+    create_before_destroy = true
+  }
+}
+
+resource "aws_launch_configuration" "nodes-privatedns2-example-com" {
+  name_prefix                 = "nodes.privatedns2.example.com-"
+  image_id                    = "ami-12345678"
+  instance_type               = "t2.medium"
+  key_name                    = "${aws_key_pair.kubernetes-privatedns2-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id}"
+  iam_instance_profile        = "${aws_iam_instance_profile.nodes-privatedns2-example-com.id}"
+  security_groups             = ["${aws_security_group.nodes-privatedns2-example-com.id}"]
+  associate_public_ip_address = false
+  user_data                   = "${file("${path.module}/data/aws_launch_configuration_nodes.privatedns2.example.com_user_data")}"
+
+  root_block_device = {
+    volume_type           = "gp2"
+    volume_size           = 20
+    delete_on_termination = true
+  }
+
+  lifecycle = {
+    create_before_destroy = true
+  }
+}
+
+resource "aws_nat_gateway" "us-test-1a-privatedns2-example-com" {
+  allocation_id = "${aws_eip.us-test-1a-privatedns2-example-com.id}"
+  subnet_id     = "${aws_subnet.utility-us-test-1a-privatedns2-example-com.id}"
+}
+
+resource "aws_route" "0-0-0-0--0" {
+  route_table_id         = "${aws_route_table.privatedns2-example-com.id}"
+  destination_cidr_block = "0.0.0.0/0"
+  gateway_id             = "fake-ig"
+}
+
+resource "aws_route" "private-us-test-1a-0-0-0-0--0" {
+  route_table_id         = "${aws_route_table.private-us-test-1a-privatedns2-example-com.id}"
+  destination_cidr_block = "0.0.0.0/0"
+  nat_gateway_id         = "${aws_nat_gateway.us-test-1a-privatedns2-example-com.id}"
+}
+
+resource "aws_route53_record" "api-privatedns2-example-com" {
+  name = "api.privatedns2.example.com"
+  type = "A"
+
+  alias = {
+    name                   = "${aws_elb.api-privatedns2-example-com.dns_name}"
+    zone_id                = "${aws_elb.api-privatedns2-example-com.zone_id}"
+    evaluate_target_health = false
+  }
+
+  zone_id = "/hostedzone/Z3AFAKE1ZOMORE"
+}
+
+resource "aws_route_table" "private-us-test-1a-privatedns2-example-com" {
+  vpc_id = "vpc-123"
+
+  tags = {
+    KubernetesCluster = "privatedns2.example.com"
+    Name              = "private-us-test-1a.privatedns2.example.com"
+  }
+}
+
+resource "aws_route_table" "privatedns2-example-com" {
+  vpc_id = "vpc-123"
+
+  tags = {
+    KubernetesCluster = "privatedns2.example.com"
+    Name              = "privatedns2.example.com"
+  }
+}
+
+resource "aws_route_table_association" "private-us-test-1a-privatedns2-example-com" {
+  subnet_id      = "${aws_subnet.us-test-1a-privatedns2-example-com.id}"
+  route_table_id = "${aws_route_table.private-us-test-1a-privatedns2-example-com.id}"
+}
+
+resource "aws_route_table_association" "utility-us-test-1a-privatedns2-example-com" {
+  subnet_id      = "${aws_subnet.utility-us-test-1a-privatedns2-example-com.id}"
+  route_table_id = "${aws_route_table.privatedns2-example-com.id}"
+}
+
+resource "aws_security_group" "api-elb-privatedns2-example-com" {
+  name        = "api-elb.privatedns2.example.com"
+  vpc_id      = "vpc-123"
+  description = "Security group for api ELB"
+
+  tags = {
+    KubernetesCluster = "privatedns2.example.com"
+    Name              = "api-elb.privatedns2.example.com"
+  }
+}
+
+resource "aws_security_group" "bastion-elb-privatedns2-example-com" {
+  name        = "bastion-elb.privatedns2.example.com"
+  vpc_id      = "vpc-123"
+  description = "Security group for bastion ELB"
+
+  tags = {
+    KubernetesCluster = "privatedns2.example.com"
+    Name              = "bastion-elb.privatedns2.example.com"
+  }
+}
+
+resource "aws_security_group" "bastion-privatedns2-example-com" {
+  name        = "bastion.privatedns2.example.com"
+  vpc_id      = "vpc-123"
+  description = "Security group for bastion"
+
+  tags = {
+    KubernetesCluster = "privatedns2.example.com"
+    Name              = "bastion.privatedns2.example.com"
+  }
+}
+
+resource "aws_security_group" "masters-privatedns2-example-com" {
+  name        = "masters.privatedns2.example.com"
+  vpc_id      = "vpc-123"
+  description = "Security group for masters"
+
+  tags = {
+    KubernetesCluster = "privatedns2.example.com"
+    Name              = "masters.privatedns2.example.com"
+  }
+}
+
+resource "aws_security_group" "nodes-privatedns2-example-com" {
+  name        = "nodes.privatedns2.example.com"
+  vpc_id      = "vpc-123"
+  description = "Security group for nodes"
+
+  tags = {
+    KubernetesCluster = "privatedns2.example.com"
+    Name              = "nodes.privatedns2.example.com"
+  }
+}
+
+resource "aws_security_group_rule" "all-master-to-master" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.masters-privatedns2-example-com.id}"
+  source_security_group_id = "${aws_security_group.masters-privatedns2-example-com.id}"
+  from_port                = 0
+  to_port                  = 0
+  protocol                 = "-1"
+}
+
+resource "aws_security_group_rule" "all-master-to-node" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.nodes-privatedns2-example-com.id}"
+  source_security_group_id = "${aws_security_group.masters-privatedns2-example-com.id}"
+  from_port                = 0
+  to_port                  = 0
+  protocol                 = "-1"
+}
+
+resource "aws_security_group_rule" "all-node-to-node" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.nodes-privatedns2-example-com.id}"
+  source_security_group_id = "${aws_security_group.nodes-privatedns2-example-com.id}"
+  from_port                = 0
+  to_port                  = 0
+  protocol                 = "-1"
+}
+
+resource "aws_security_group_rule" "api-elb-egress" {
+  type              = "egress"
+  security_group_id = "${aws_security_group.api-elb-privatedns2-example-com.id}"
+  from_port         = 0
+  to_port           = 0
+  protocol          = "-1"
+  cidr_blocks       = ["0.0.0.0/0"]
+}
+
+resource "aws_security_group_rule" "bastion-egress" {
+  type              = "egress"
+  security_group_id = "${aws_security_group.bastion-privatedns2-example-com.id}"
+  from_port         = 0
+  to_port           = 0
+  protocol          = "-1"
+  cidr_blocks       = ["0.0.0.0/0"]
+}
+
+resource "aws_security_group_rule" "bastion-elb-egress" {
+  type              = "egress"
+  security_group_id = "${aws_security_group.bastion-elb-privatedns2-example-com.id}"
+  from_port         = 0
+  to_port           = 0
+  protocol          = "-1"
+  cidr_blocks       = ["0.0.0.0/0"]
+}
+
+resource "aws_security_group_rule" "bastion-to-master-ssh" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.masters-privatedns2-example-com.id}"
+  source_security_group_id = "${aws_security_group.bastion-privatedns2-example-com.id}"
+  from_port                = 22
+  to_port                  = 22
+  protocol                 = "tcp"
+}
+
+resource "aws_security_group_rule" "bastion-to-node-ssh" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.nodes-privatedns2-example-com.id}"
+  source_security_group_id = "${aws_security_group.bastion-privatedns2-example-com.id}"
+  from_port                = 22
+  to_port                  = 22
+  protocol                 = "tcp"
+}
+
+resource "aws_security_group_rule" "https-api-elb-0-0-0-0--0" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.api-elb-privatedns2-example-com.id}"
+  from_port         = 443
+  to_port           = 443
+  protocol          = "tcp"
+  cidr_blocks       = ["0.0.0.0/0"]
+}
+
+resource "aws_security_group_rule" "https-elb-to-master" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.masters-privatedns2-example-com.id}"
+  source_security_group_id = "${aws_security_group.api-elb-privatedns2-example-com.id}"
+  from_port                = 443
+  to_port                  = 443
+  protocol                 = "tcp"
+}
+
+resource "aws_security_group_rule" "master-egress" {
+  type              = "egress"
+  security_group_id = "${aws_security_group.masters-privatedns2-example-com.id}"
+  from_port         = 0
+  to_port           = 0
+  protocol          = "-1"
+  cidr_blocks       = ["0.0.0.0/0"]
+}
+
+resource "aws_security_group_rule" "node-egress" {
+  type              = "egress"
+  security_group_id = "${aws_security_group.nodes-privatedns2-example-com.id}"
+  from_port         = 0
+  to_port           = 0
+  protocol          = "-1"
+  cidr_blocks       = ["0.0.0.0/0"]
+}
+
+resource "aws_security_group_rule" "node-to-master-tcp-1-4000" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.masters-privatedns2-example-com.id}"
+  source_security_group_id = "${aws_security_group.nodes-privatedns2-example-com.id}"
+  from_port                = 1
+  to_port                  = 4000
+  protocol                 = "tcp"
+}
+
+resource "aws_security_group_rule" "node-to-master-tcp-4003-65535" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.masters-privatedns2-example-com.id}"
+  source_security_group_id = "${aws_security_group.nodes-privatedns2-example-com.id}"
+  from_port                = 4003
+  to_port                  = 65535
+  protocol                 = "tcp"
+}
+
+resource "aws_security_group_rule" "node-to-master-udp-1-65535" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.masters-privatedns2-example-com.id}"
+  source_security_group_id = "${aws_security_group.nodes-privatedns2-example-com.id}"
+  from_port                = 1
+  to_port                  = 65535
+  protocol                 = "udp"
+}
+
+resource "aws_security_group_rule" "ssh-elb-to-bastion" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.bastion-privatedns2-example-com.id}"
+  source_security_group_id = "${aws_security_group.bastion-elb-privatedns2-example-com.id}"
+  from_port                = 22
+  to_port                  = 22
+  protocol                 = "tcp"
+}
+
+resource "aws_security_group_rule" "ssh-external-to-bastion-elb-0-0-0-0--0" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.bastion-elb-privatedns2-example-com.id}"
+  from_port         = 22
+  to_port           = 22
+  protocol          = "tcp"
+  cidr_blocks       = ["0.0.0.0/0"]
+}
+
+resource "aws_subnet" "us-test-1a-privatedns2-example-com" {
+  vpc_id            = "vpc-123"
+  cidr_block        = "172.20.32.0/19"
+  availability_zone = "us-test-1a"
+
+  tags = {
+    KubernetesCluster = "privatedns2.example.com"
+    Name              = "us-test-1a.privatedns2.example.com"
+  }
+}
+
+resource "aws_subnet" "utility-us-test-1a-privatedns2-example-com" {
+  vpc_id            = "vpc-123"
+  cidr_block        = "172.20.4.0/22"
+  availability_zone = "us-test-1a"
+
+  tags = {
+    KubernetesCluster = "privatedns2.example.com"
+    Name              = "utility-us-test-1a.privatedns2.example.com"
+  }
+}
diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template
index fcb0dfd847..5283d7ccba 100644
--- a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template
+++ b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template
@@ -20,6 +20,8 @@ spec:
         version: v1.6.0
       annotations:
         scheduler.alpha.kubernetes.io/critical-pod: ''
+        # For 1.6, we keep the old tolerations in case of a downgrade to 1.5
+        scheduler.alpha.kubernetes.io/tolerations: '[{"key": "dedicated", "value": "master"}]'
     spec:
       tolerations:
       - key: "node-role.kubernetes.io/master"
@@ -72,6 +74,14 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - "extensions"
+  resources:
+  - ingresses
+  verbs:
+  - get
+  - list
+  - watch
 
 ---
 
diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.5.yaml.template b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template
similarity index 100%
rename from upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.5.yaml.template
rename to upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template
diff --git a/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.6.yaml.template
index c5602c429f..30546708f5 100644
--- a/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.6.yaml.template
+++ b/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.6.yaml.template
@@ -28,6 +28,7 @@ spec:
         k8s-app: kube-dns-autoscaler
       annotations:
         scheduler.alpha.kubernetes.io/critical-pod: ''
+        # For 1.6, we keep the old tolerations in case of a downgrade to 1.5
         scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
     spec:
       serviceAccountName: kube-dns-autoscaler
@@ -79,6 +80,7 @@ spec:
         k8s-app: kube-dns
       annotations:
         scheduler.alpha.kubernetes.io/critical-pod: ''
+        # For 1.6, we keep the old tolerations in case of a downgrade to 1.5
         scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
     spec:
       dnsPolicy: Default  # Don't use cluster DNS.
diff --git a/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.5.yaml.template b/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/pre-k8s-1.6.yaml.template
similarity index 100%
rename from upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.5.yaml.template
rename to upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/pre-k8s-1.6.yaml.template
diff --git a/upup/models/cloudup/resources/addons/networking.flannel/k8s-1.6.yaml b/upup/models/cloudup/resources/addons/networking.flannel/k8s-1.6.yaml
new file mode 100644
index 0000000000..3d577537fa
--- /dev/null
+++ b/upup/models/cloudup/resources/addons/networking.flannel/k8s-1.6.yaml
@@ -0,0 +1,109 @@
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: flannel
+  namespace: kube-system
+  labels:
+    role.kubernetes.io/networking: "1"
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: kube-flannel-cfg
+  namespace: kube-system
+  labels:
+    k8s-app: flannel
+    role.kubernetes.io/networking: "1"
+data:
+  cni-conf.json: |
+    {
+      "name": "cbr0",
+      "type": "flannel",
+      "delegate": {
+        "forceAddress": true,
+        "isDefaultGateway": true
+      }
+    }
+  net-conf.json: |
+    {
+      "Network": "100.64.0.0/10",
+      "Backend": {
+        "Type": "udp"
+      }
+    }
+---
+kind: DaemonSet
+apiVersion: extensions/v1beta1
+metadata:
+  name: kube-flannel-ds
+  namespace: kube-system
+  labels:
+    k8s-app: flannel
+    role.kubernetes.io/networking: "1"
+spec:
+  template:
+    metadata:
+      labels:
+        tier: node
+        app: flannel
+        role.kubernetes.io/networking: "1"
+    spec:
+      hostNetwork: true
+      nodeSelector:
+        beta.kubernetes.io/arch: amd64
+      serviceAccountName: flannel
+      tolerations:
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/master
+      containers:
+      - name: kube-flannel
+        image: quay.io/coreos/flannel:v0.7.0
+        command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ]
+        securityContext:
+          privileged: true
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        resources:
+          limits:
+            cpu: 100m
+            memory: 100Mi
+          requests:
+            cpu: 100m
+            memory: 100Mi
+        volumeMounts:
+        - name: run
+          mountPath: /run
+        - name: flannel-cfg
+          mountPath: /etc/kube-flannel/
+      - name: install-cni
+        image: quay.io/coreos/flannel:v0.7.0
+        command: [ "/bin/sh", "-c", "set -e -x; cp -f /etc/kube-flannel/cni-conf.json /etc/cni/net.d/10-flannel.conf; while true; do sleep 3600; done" ]
+        resources:
+          limits:
+            cpu: 10m
+            memory: 25Mi
+          requests:
+            cpu: 10m
+            memory: 25Mi
+        volumeMounts:
+        - name: cni
+          mountPath: /etc/cni/net.d
+        - name: flannel-cfg
+          mountPath: /etc/kube-flannel/
+      volumes:
+        - name: run
+          hostPath:
+            path: /run
+        - name: cni
+          hostPath:
+            path: /etc/cni/net.d
+        - name: flannel-cfg
+          configMap:
+            name: kube-flannel-cfg
diff --git a/upup/models/cloudup/resources/addons/networking.flannel/v0.7.0.yaml b/upup/models/cloudup/resources/addons/networking.flannel/pre-k8s-1.6.yaml
similarity index 100%
rename from upup/models/cloudup/resources/addons/networking.flannel/v0.7.0.yaml
rename to upup/models/cloudup/resources/addons/networking.flannel/pre-k8s-1.6.yaml
diff --git a/upup/models/cloudup/resources/addons/networking.kope.io/k8s-1.6.yaml b/upup/models/cloudup/resources/addons/networking.kope.io/k8s-1.6.yaml
new file mode 100644
index 0000000000..3bf99fcc4b
--- /dev/null
+++ b/upup/models/cloudup/resources/addons/networking.kope.io/k8s-1.6.yaml
@@ -0,0 +1,89 @@
+apiVersion: extensions/v1beta1
+kind: DaemonSet
+metadata:
+  name: kopeio-networking-agent
+  namespace: kube-system
+  labels:
+    k8s-addon: networking.kope.io
+    role.kubernetes.io/networking: "1"
+spec:
+  template:
+    metadata:
+      labels:
+        name: kopeio-networking-agent
+        role.kubernetes.io/networking: "1"
+    spec:
+      hostPID: true
+      hostIPC: true
+      hostNetwork: true
+      containers:
+        - resources:
+            requests:
+              cpu: 20m
+              memory: 100Mi
+            limits:
+              cpu: 20m
+              memory: 100Mi
+          securityContext:
+            privileged: true
+          image: kopeio/networking-agent:1.0.20170406
+          name: networking-agent
+          volumeMounts:
+            - name: lib-modules
+              mountPath: /lib/modules
+              readOnly: true
+      serviceAccountName: kopeio-networking-agent
+      tolerations:
+      - key: node-role.kubernetes.io/master
+        effect: NoSchedule
+      volumes:
+        - name: lib-modules
+          hostPath:
+            path: /lib/modules
+
+---
+
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: kopeio-networking-agent
+  namespace: kube-system
+  labels:
+    k8s-addon: networking.kope.io
+    role.kubernetes.io/networking: "1"
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRole
+metadata:
+  labels:
+    k8s-addon: networking.kope.io
+  name: kopeio:networking-agent
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  verbs:
+  - get
+  - list
+  - watch
+  - patch
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    k8s-addon: networking.kope.io
+  name: kopeio:networking-agent
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: kopeio:networking-agent
+subjects:
+- apiGroup: rbac.authorization.k8s.io
+  kind: User
+  name: system:serviceaccount:kube-system:kopeio-networking-agent
diff --git a/upup/models/cloudup/resources/addons/networking.kope.io/v1.0.20161116.yaml b/upup/models/cloudup/resources/addons/networking.kope.io/pre-k8s-1.6.yaml
similarity index 80%
rename from upup/models/cloudup/resources/addons/networking.kope.io/v1.0.20161116.yaml
rename to upup/models/cloudup/resources/addons/networking.kope.io/pre-k8s-1.6.yaml
index c2f6c94ce7..6ce20df78b 100644
--- a/upup/models/cloudup/resources/addons/networking.kope.io/v1.0.20161116.yaml
+++ b/upup/models/cloudup/resources/addons/networking.kope.io/pre-k8s-1.6.yaml
@@ -4,7 +4,7 @@ metadata:
   name: kopeio-networking-agent
   namespace: kube-system
   labels:
-    k8s-addon: networking.addons.k8s.io
+    k8s-addon: networking.kope.io
     role.kubernetes.io/networking: "1"
 spec:
   template:
@@ -20,9 +20,13 @@ spec:
         - resources:
             requests:
               cpu: 20m
+              memory: 100Mi
+            limits:
+              cpu: 20m
+              memory: 100Mi
           securityContext:
             privileged: true
-          image: kopeio/networking-agent:1.0.20161116
+          image: kopeio/networking-agent:1.0.20170406
           name: networking-agent
           volumeMounts:
             - name: lib-modules
diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.6.yaml.template
new file mode 100644
index 0000000000..5033a1015b
--- /dev/null
+++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.6.yaml.template
@@ -0,0 +1,201 @@
+# This ConfigMap can be used to configure a self-hosted Canal installation.
+# See `canal.yaml` for an example of a Canal deployment which uses
+# the config in this ConfigMap.
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: canal-config
+  namespace: kube-system
+data:
+  # The interface used by canal for host <-> host communication.
+  # If left blank, then the interface is chosing using the node's
+  # default route.
+  canal_iface: ""
+
+  # Whether or not to masquerade traffic to destinations not within
+  # the pod network.
+  masquerade: "true"
+
+  # The CNI network configuration to install on each node.
+  cni_network_config: |-
+    {
+        "name": "k8s-pod-network",
+        "type": "calico",
+        "log_level": "info",
+        "datastore_type": "kubernetes",
+        "hostname": "__KUBERNETES_NODE_NAME__",
+        "ipam": {
+            "type": "host-local",
+            "subnet": "usePodCidr"
+        },
+        "policy": {
+            "type": "k8s",
+            "k8s_auth_token": "__SERVICEACCOUNT_TOKEN__"
+        },
+        "kubernetes": {
+            "k8s_api_root": "https://__KUBERNETES_SERVICE_HOST__:__KUBERNETES_SERVICE_PORT__",
+            "kubeconfig": "__KUBECONFIG_FILEPATH__",
+            "node_name": "__KUBERNETES_NODE_NAME__"
+        }
+    }
+
+  # Flannel network configuration.
+  net-conf.json: |
+    {
+      "Network": "{{ .NonMasqueradeCIDR }}",
+      "Backend": {
+        "Type": "vxlan"
+      }
+    }
+
+
+---
+
+# This manifest installs the calico/node container, as well
+# as the Calico CNI plugins and network config on
+# each master and worker node in a Kubernetes cluster.
+kind: DaemonSet
+apiVersion: extensions/v1beta1
+metadata:
+  name: canal
+  namespace: kube-system
+  labels:
+    k8s-app: canal
+    role.kubernetes.io/networking: "1"
+spec:
+  selector:
+    matchLabels:
+      k8s-app: canal
+  template:
+    metadata:
+      labels:
+        k8s-app: canal
+      annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ''
+    spec:
+      hostNetwork: true
+      tolerations:
+      - key: node-role.kubernetes.io/master
+        effect: NoSchedule
+      - key: CriticalAddonsOnly
+        operator: Exists
+      containers:
+        # Runs calico/node container on each Kubernetes node.  This
+        # container programs network policy and routes on each
+        # host.
+        - name: calico-node
+          image: calico/node:v1.0.2
+          resources:
+            requests:
+              cpu: 10m
+          env:
+            # Use Kubernetes API as the backing datastore.
+            - name: DATASTORE_TYPE
+              value: "kubernetes"
+            # Enable felix logging.
+            - name: FELIX_LOGSEVERITYSYS
+              value: "info"
+            # Don't enable BGP.
+            - name: CALICO_NETWORKING_BACKEND
+              value: "none"
+            # Disable file logging so `kubectl logs` works.
+            - name: CALICO_DISABLE_FILE_LOGGING
+              value: "true"
+            # No IP address needed.
+            - name: IP
+              value: ""
+            # Set the hostname based on the k8s node name.
+            - name: HOSTNAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+          securityContext:
+            privileged: true
+          volumeMounts:
+            - mountPath: /lib/modules
+              name: lib-modules
+              readOnly: true
+            - mountPath: /var/run/calico
+              name: var-run-calico
+              readOnly: false
+        # This container installs the Calico CNI binaries
+        # and CNI network config file on each node.
+        - name: install-cni
+          image: calico/cni:v1.5.6
+          command: ["/install-cni.sh"]
+          resources:
+            requests:
+              cpu: 10m
+          env:
+            # The CNI network config to install on each node.
+            - name: CNI_NETWORK_CONFIG
+              valueFrom:
+                configMapKeyRef:
+                  name: canal-config
+                  key: cni_network_config
+            # Set the hostname based on the k8s node name.
+            - name: KUBERNETES_NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+          volumeMounts:
+            - mountPath: /host/opt/cni/bin
+              name: cni-bin-dir
+            - mountPath: /host/etc/cni/net.d
+              name: cni-net-dir
+        # This container runs flannel using the kube-subnet-mgr backend
+        # for allocating subnets.
+        - name: kube-flannel
+          image: quay.io/coreos/flannel:v0.7.0
+          command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ]
+          securityContext:
+            privileged: true
+          resources:
+            requests:
+              cpu: 10m
+          env:
+          - name: POD_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.name
+          - name: POD_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
+          - name: FLANNELD_IFACE
+            valueFrom:
+              configMapKeyRef:
+                name: canal-config
+                key: canal_iface
+          - name: FLANNELD_IP_MASQ
+            valueFrom:
+              configMapKeyRef:
+                name: canal-config
+                key: masquerade
+          volumeMounts:
+          - name: run
+            mountPath: /run
+          - name: flannel-cfg
+            mountPath: /etc/kube-flannel/
+      volumes:
+        # Used by calico/node.
+        - name: lib-modules
+          hostPath:
+            path: /lib/modules
+        - name: var-run-calico
+          hostPath:
+            path: /var/run/calico
+        # Used to install CNI.
+        - name: cni-bin-dir
+          hostPath:
+            path: /opt/cni/bin
+        - name: cni-net-dir
+          hostPath:
+            path: /etc/cni/net.d
+        # Used by flannel.
+        - name: run
+          hostPath:
+            path: /run
+        - name: flannel-cfg
+          configMap:
+            name: canal-config
\ No newline at end of file
diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/v1.0.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/pre-k8s-1.6.yaml.template
similarity index 98%
rename from upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/v1.0.yaml.template
rename to upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/pre-k8s-1.6.yaml.template
index 0798578044..1db0c49d5d 100644
--- a/upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/v1.0.yaml.template
+++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/pre-k8s-1.6.yaml.template
@@ -61,6 +61,7 @@ metadata:
   namespace: kube-system
   labels:
     k8s-app: canal
+    role.kubernetes.io/networking: "1"
 spec:
   selector:
     matchLabels:
diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.6.yaml.template
new file mode 100644
index 0000000000..8fed80d377
--- /dev/null
+++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.6.yaml.template
@@ -0,0 +1,327 @@
+# This ConfigMap is used to configure a self-hosted Calico installation.
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: calico-config
+  namespace: kube-system
+data:
+  # The calico-etcd PetSet service IP:port
+  etcd_endpoints: "{{ $cluster := index .EtcdClusters 0 -}}
+                      {{- range $j, $member := $cluster.Members -}}
+                          {{- if $j }},{{ end -}}
+                          http://etcd-{{ $member.Name }}.internal.{{ ClusterName }}:4001
+                      {{- end }}"
+
+  # True enables BGP networking, false tells Calico to enforce
+  # policy only, using native networking.
+  enable_bgp: "true"
+
+  # The CNI network configuration to install on each node.
+  cni_network_config: |-
+    {
+        "name": "k8s-pod-network",
+        "type": "calico",
+        "etcd_endpoints": "__ETCD_ENDPOINTS__",
+        "log_level": "info",
+        "ipam": {
+            "type": "calico-ipam"
+        },
+        "policy": {
+            "type": "k8s",
+             "k8s_api_root": "https://__KUBERNETES_SERVICE_HOST__:__KUBERNETES_SERVICE_PORT__",
+             "k8s_auth_token": "__SERVICEACCOUNT_TOKEN__"
+        },
+        "kubernetes": {
+            "kubeconfig": "/etc/cni/net.d/__KUBECONFIG_FILENAME__"
+        }
+    }
+
+  # The default IP Pool to be created for the cluster.
+  # Pod IP addresses will be assigned from this pool.
+  ippool.yaml: |
+      apiVersion: v1
+      kind: ipPool
+      metadata:
+        cidr: {{ .NonMasqueradeCIDR }}
+      spec:
+        ipip:
+          enabled: true
+        nat-outgoing: true
+
+---
+
+# This manifest installs the calico/node container, as well
+# as the Calico CNI plugins and network config on
+# each master and worker node in a Kubernetes cluster.
+kind: DaemonSet
+apiVersion: extensions/v1beta1
+metadata:
+  name: calico-node
+  namespace: kube-system
+  labels:
+    k8s-app: calico-node
+    role.kubernetes.io/networking: "1"
+spec:
+  selector:
+    matchLabels:
+      k8s-app: calico-node
+  template:
+    metadata:
+      labels:
+        k8s-app: calico-node
+        role.kubernetes.io/networking: "1"
+    spec:
+      hostNetwork: true
+      serviceAccountName: calico
+      tolerations:
+      - key: node-role.kubernetes.io/master
+        effect: NoSchedule
+      - key: CriticalAddonsOnly
+        operator: Exists
+      containers:
+        # Runs calico/node container on each Kubernetes node.  This
+        # container programs network policy and routes on each
+        # host.
+        - name: calico-node
+          image: calico/node:v1.1.1
+          resources:
+            requests:
+              cpu: 10m
+          env:
+            # The location of the Calico etcd cluster.
+            - name: ETCD_ENDPOINTS
+              valueFrom:
+                configMapKeyRef:
+                  name: calico-config
+                  key: etcd_endpoints
+            # Enable BGP.  Disable to enforce policy only.
+            - name: CALICO_NETWORKING
+              valueFrom:
+                configMapKeyRef:
+                  name: calico-config
+                  key: enable_bgp
+            # Disable file logging so `kubectl logs` works.
+            - name: CALICO_DISABLE_FILE_LOGGING
+              value: "true"
+            # Don't configure a default pool.  This is done by the Job
+            # below.
+            - name: NO_DEFAULT_POOLS
+              value: "true"
+            # Auto-detect the BGP IP address.
+            - name: IP
+              value: ""
+          securityContext:
+            privileged: true
+          volumeMounts:
+            - mountPath: /lib/modules
+              name: lib-modules
+              readOnly: true
+            - mountPath: /var/run/calico
+              name: var-run-calico
+              readOnly: false
+        # This container installs the Calico CNI binaries
+        # and CNI network config file on each node.
+        - name: install-cni
+          image: calico/cni:v1.6.1
+          resources:
+            requests:
+              cpu: 10m
+          imagePullPolicy: Always
+          command: ["/install-cni.sh"]
+          env:
+            # The location of the Calico etcd cluster.
+            - name: ETCD_ENDPOINTS
+              valueFrom:
+                configMapKeyRef:
+                  name: calico-config
+                  key: etcd_endpoints
+            # The CNI network config to install on each node.
+            - name: CNI_NETWORK_CONFIG
+              valueFrom:
+                configMapKeyRef:
+                  name: calico-config
+                  key: cni_network_config
+          volumeMounts:
+            - mountPath: /host/opt/cni/bin
+              name: cni-bin-dir
+            - mountPath: /host/etc/cni/net.d
+              name: cni-net-dir
+      volumes:
+        # Used by calico/node.
+        - name: lib-modules
+          hostPath:
+            path: /lib/modules
+        - name: var-run-calico
+          hostPath:
+            path: /var/run/calico
+        # Used to install CNI.
+        - name: cni-bin-dir
+          hostPath:
+            path: /opt/cni/bin
+        - name: cni-net-dir
+          hostPath:
+            path: /etc/cni/net.d
+
+---
+
+# This manifest deploys the Calico policy controller on Kubernetes.
+# See https://github.com/projectcalico/k8s-policy
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: calico-policy-controller
+  namespace: kube-system
+  labels:
+    k8s-app: calico-policy
+    role.kubernetes.io/networking: "1"
+spec:
+  # The policy controller can only have a single active instance.
+  replicas: 1
+  template:
+    metadata:
+      name: calico-policy-controller
+      namespace: kube-system
+      labels:
+        k8s-app: calico-policy-controller
+        role.kubernetes.io/networking: "1"
+      annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ''
+    spec:
+      # The policy controller must run in the host network namespace so that
+      # it isn't governed by policy that would prevent it from working.
+      hostNetwork: true
+      serviceAccountName: calico
+      tolerations:
+      - key: node-role.kubernetes.io/master
+        effect: NoSchedule
+      - key: CriticalAddonsOnly
+        operator: Exists
+      containers:
+        - name: calico-policy-controller
+          image: calico/kube-policy-controller:v0.5.4
+          resources:
+            requests:
+              cpu: 10m
+          env:
+            # The location of the Calico etcd cluster.
+            - name: ETCD_ENDPOINTS
+              valueFrom:
+                configMapKeyRef:
+                  name: calico-config
+                  key: etcd_endpoints
+            # The location of the Kubernetes API.  Use the default Kubernetes
+            # service for API access.
+            - name: K8S_API
+              value: "https://kubernetes.default:443"
+            # Since we're running in the host namespace and might not have KubeDNS
+            # access, configure the container's /etc/hosts to resolve
+            # kubernetes.default to the correct service clusterIP.
+            - name: CONFIGURE_ETC_HOSTS
+              value: "true"
+
+---
+
+## This manifest deploys a Job which performs one time
+# configuration of Calico
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: configure-calico
+  namespace: kube-system
+  labels:
+    k8s-app: calico
+    role.kubernetes.io/networking: "1"
+spec:
+  template:
+    metadata:
+      name: configure-calico
+      annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ''
+    spec:
+      hostNetwork: true
+      serviceAccountName: calico
+      tolerations:
+      - key: node-role.kubernetes.io/master
+        effect: NoSchedule
+      - key: CriticalAddonsOnly
+        operator: Exists
+      restartPolicy: OnFailure
+      containers:
+        # Writes basic configuration to datastore.
+        - name: configure-calico
+          image: calico/ctl:v1.1.1
+          args:
+          - apply
+          - -f
+          - /etc/config/calico/ippool.yaml
+          volumeMounts:
+            - name: config-volume
+              mountPath: /etc/config
+          env:
+            # The location of the etcd cluster.
+            - name: ETCD_ENDPOINTS
+              valueFrom:
+                configMapKeyRef:
+                  name: calico-config
+                  key: etcd_endpoints
+      volumes:
+       - name: config-volume
+         configMap:
+           name: calico-config
+           items:
+            - key: ippool.yaml
+              path: calico/ippool.yaml
+
+---
+
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1beta1
+metadata:
+  name: calico
+  labels:
+    role.kubernetes.io/networking: "1"
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  - namespaces
+  - nodes
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - extensions
+  resources:
+  - networkpolicies
+  verbs:
+  - get
+  - list
+  - watch
+
+---
+
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: calico
+  namespace: kube-system
+  labels:
+    role.kubernetes.io/networking: "1"
+---
+
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1beta1
+metadata:
+  name: calico
+  labels:
+    role.kubernetes.io/networking: "1"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: calico
+subjects:
+- kind: ServiceAccount
+  name: calico
+  namespace: kube-system
diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/v2.0.2.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/pre-k8s-1.6.yaml.template
similarity index 97%
rename from upup/models/cloudup/resources/addons/networking.projectcalico.org/v2.0.2.yaml.template
rename to upup/models/cloudup/resources/addons/networking.projectcalico.org/pre-k8s-1.6.yaml.template
index fbb6dc5034..c7a7c6581e 100644
--- a/upup/models/cloudup/resources/addons/networking.projectcalico.org/v2.0.2.yaml.template
+++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org/pre-k8s-1.6.yaml.template
@@ -77,7 +77,7 @@ spec:
         # container programs network policy and routes on each
         # host.
         - name: calico-node
-          image: calico/node:v1.0.2
+          image: calico/node:v1.1.1
           resources:
             requests:
               cpu: 10m
@@ -116,7 +116,7 @@ spec:
         # This container installs the Calico CNI binaries
         # and CNI network config file on each node.
         - name: install-cni
-          image: calico/cni:v1.5.6
+          image: calico/cni:v1.6.1
           resources:
             requests:
               cpu: 10m
@@ -189,7 +189,7 @@ spec:
       hostNetwork: true
       containers:
         - name: calico-policy-controller
-          image: calico/kube-policy-controller:v0.5.2
+          image: calico/kube-policy-controller:v0.5.4
           resources:
             requests:
               cpu: 10m
@@ -237,7 +237,7 @@ spec:
       containers:
         # Writes basic configuration to datastore.
         - name: configure-calico
-          image: calico/ctl:v1.0.2
+          image: calico/ctl:v1.1.1
           args:
           - apply
           - -f
@@ -258,4 +258,4 @@ spec:
            name: calico-config
            items:
             - key: ippool.yaml
-              path: calico/ippool.yaml
\ No newline at end of file
+              path: calico/ippool.yaml
diff --git a/upup/models/cloudup/resources/addons/networking.weave/v1.9.4.yaml b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.6.yaml
similarity index 83%
rename from upup/models/cloudup/resources/addons/networking.weave/v1.9.4.yaml
rename to upup/models/cloudup/resources/addons/networking.weave/k8s-1.6.yaml
index e01fadc503..bfbb6ff707 100644
--- a/upup/models/cloudup/resources/addons/networking.weave/v1.9.4.yaml
+++ b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.6.yaml
@@ -2,6 +2,8 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: weave-net
+  labels:
+    role.kubernetes.io/networking: "1"
 rules:
 - apiGroups:
   - ""
@@ -27,11 +29,15 @@ kind: ServiceAccount
 metadata:
   name: weave-net
   namespace: kube-system
+  labels:
+    role.kubernetes.io/networking: "1"
 ---
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: weave-net
+  labels:
+    role.kubernetes.io/networking: "1"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -46,11 +52,15 @@ kind: DaemonSet
 metadata:
   name: weave-net
   namespace: kube-system
+  labels:
+    name: weave-net
+    role.kubernetes.io/networking: "1"
 spec:
   template:
     metadata:
       labels:
         name: weave-net
+        role.kubernetes.io/networking: "1"
     spec:
       hostNetwork: true
       hostPID: true
@@ -82,12 +92,20 @@ spec:
               mountPath: /lib/modules
           resources:
             requests:
-              cpu: 10m
+              cpu: 100m
+              memory: 200Mi
+            limits:
+              cpu: 100m
+              memory: 200Mi
         - name: weave-npc
           image: weaveworks/weave-npc:1.9.4
           resources:
             requests:
-              cpu: 10m
+              cpu: 100m
+              memory: 200Mi
+            limits:
+              cpu: 100m
+              memory: 200Mi
           securityContext:
             privileged: true
       restartPolicy: Always
diff --git a/upup/models/cloudup/resources/addons/networking.weave/v1.9.2.yaml b/upup/models/cloudup/resources/addons/networking.weave/pre-k8s-1.6.yaml
similarity index 95%
rename from upup/models/cloudup/resources/addons/networking.weave/v1.9.2.yaml
rename to upup/models/cloudup/resources/addons/networking.weave/pre-k8s-1.6.yaml
index 109435690d..3a5f29a9d9 100644
--- a/upup/models/cloudup/resources/addons/networking.weave/v1.9.2.yaml
+++ b/upup/models/cloudup/resources/addons/networking.weave/pre-k8s-1.6.yaml
@@ -4,6 +4,7 @@ metadata:
   name: weave-net
   namespace: kube-system
   labels:
+    name: weave-net
     role.kubernetes.io/networking: "1"
 spec:
   template:
@@ -26,7 +27,7 @@ spec:
       hostPID: true
       containers:
         - name: weave
-          image: weaveworks/weave-kube:1.9.2
+          image: weaveworks/weave-kube:1.9.4
           command:
             - /home/weave/launch.sh
           livenessProbe:
@@ -58,7 +59,7 @@ spec:
               cpu: 100m
               memory: 200Mi
         - name: weave-npc
-          image: weaveworks/weave-npc:1.9.2
+          image: weaveworks/weave-npc:1.9.4
           resources:
             requests:
               cpu: 100m
diff --git a/upup/models/cloudup/resources/addons/networking.weave/v1.9.0.yaml b/upup/models/cloudup/resources/addons/networking.weave/v1.9.0.yaml
deleted file mode 100644
index 05f4aeceb2..0000000000
--- a/upup/models/cloudup/resources/addons/networking.weave/v1.9.0.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: DaemonSet
-metadata:
-  name: weave-net
-  namespace: kube-system
-  labels:
-    role.kubernetes.io/networking: "1"
-spec:
-  template:
-    metadata:
-      labels:
-        name: weave-net
-        role.kubernetes.io/networking: "1"
-      annotations:
-        scheduler.alpha.kubernetes.io/tolerations: |
-          [
-            {
-              "key": "dedicated",
-              "operator": "Equal",
-              "value": "master",
-              "effect": "NoSchedule"
-            }
-          ]
-    spec:
-      hostNetwork: true
-      hostPID: true
-      containers:
-        - name: weave
-          image: weaveworks/weave-kube:1.9.0
-          command:
-            - /home/weave/launch.sh
-          livenessProbe:
-            initialDelaySeconds: 30
-            httpGet:
-              host: 127.0.0.1
-              path: /status
-              port: 6784
-          securityContext:
-            privileged: true
-          volumeMounts:
-            - name: weavedb
-              mountPath: /weavedb
-            - name: cni-bin
-              mountPath: /host/opt
-            - name: cni-bin2
-              mountPath: /host/home
-            - name: cni-conf
-              mountPath: /host/etc
-            - name: dbus
-              mountPath: /host/var/lib/dbus
-          resources:
-            requests:
-              cpu: 100m
-              memory: 200Mi
-            limits:
-              cpu: 100m
-              memory: 200Mi
-        - name: weave-npc
-          image: weaveworks/weave-npc:1.9.0
-          resources:
-            requests:
-              cpu: 100m
-              memory: 200Mi
-            limits:
-              cpu: 100m
-              memory: 200Mi
-          securityContext:
-            privileged: true
-      restartPolicy: Always
-      volumes:
-        - name: weavedb
-          emptyDir: {}
-        - name: cni-bin
-          hostPath:
-            path: /opt
-        - name: cni-bin2
-          hostPath:
-            path: /home
-        - name: cni-conf
-          hostPath:
-            path: /etc
-        - name: dbus
-          hostPath:
-            path: /var/lib/dbus
diff --git a/upup/models/cloudup/resources/addons/networking.weave/v1.9.3.yaml b/upup/models/cloudup/resources/addons/networking.weave/v1.9.3.yaml
deleted file mode 100644
index 7f87183b2f..0000000000
--- a/upup/models/cloudup/resources/addons/networking.weave/v1.9.3.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: DaemonSet
-metadata:
-  name: weave-net
-  namespace: kube-system
-  labels:
-    role.kubernetes.io/networking: "1"
-spec:
-  template:
-    metadata:
-      labels:
-        name: weave-net
-        role.kubernetes.io/networking: "1"
-      annotations:
-        scheduler.alpha.kubernetes.io/tolerations: |
-          [
-            {
-              "key": "dedicated",
-              "operator": "Equal",
-              "value": "master",
-              "effect": "NoSchedule"
-            }
-          ]
-    spec:
-      hostNetwork: true
-      hostPID: true
-      containers:
-        - name: weave
-          image: weaveworks/weave-kube:1.9.3
-          command:
-            - /home/weave/launch.sh
-          livenessProbe:
-            initialDelaySeconds: 30
-            httpGet:
-              host: 127.0.0.1
-              path: /status
-              port: 6784
-          securityContext:
-            privileged: true
-          volumeMounts:
-            - name: weavedb
-              mountPath: /weavedb
-            - name: cni-bin
-              mountPath: /host/opt
-            - name: cni-bin2
-              mountPath: /host/home
-            - name: cni-conf
-              mountPath: /host/etc
-            - name: dbus
-              mountPath: /host/var/lib/dbus
-            - name: lib-modules
-              mountPath: /lib/modules
-          resources:
-            requests:
-              cpu: 100m
-              memory: 200Mi
-            limits:
-              cpu: 100m
-              memory: 200Mi
-        - name: weave-npc
-          image: weaveworks/weave-npc:1.9.3
-          resources:
-            requests:
-              cpu: 100m
-              memory: 200Mi
-            limits:
-              cpu: 100m
-              memory: 200Mi
-          securityContext:
-            privileged: true
-      restartPolicy: Always
-      volumes:
-        - name: weavedb
-          emptyDir: {}
-        - name: cni-bin
-          hostPath:
-            path: /opt
-        - name: cni-bin2
-          hostPath:
-            path: /home
-        - name: cni-conf
-          hostPath:
-            path: /etc
-        - name: dbus
-          hostPath:
-            path: /var/lib/dbus
-        - name: lib-modules
-          hostPath:
-            path: /lib/modules
diff --git a/upup/models/nodeup/_kubernetes_master/kube-apiserver/files/var/log/kube-apiserver.log.meta b/upup/models/nodeup/_kubernetes_master/kube-apiserver/files/var/log/kube-apiserver.log.meta
deleted file mode 100644
index 56d0e34103..0000000000
--- a/upup/models/nodeup/_kubernetes_master/kube-apiserver/files/var/log/kube-apiserver.log.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "ifNotExists": true
-}
\ No newline at end of file
diff --git a/upup/models/nodeup/docker/_systemd/_debian_family/services/docker-healthcheck.service.meta b/upup/models/nodeup/docker/_systemd/_debian_family/services/docker-healthcheck.service.meta
deleted file mode 100644
index 6c615f549a..0000000000
--- a/upup/models/nodeup/docker/_systemd/_debian_family/services/docker-healthcheck.service.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "manageState": false
-}
\ No newline at end of file
diff --git a/upup/pkg/fi/cloudup/awstasks/dnszone.go b/upup/pkg/fi/cloudup/awstasks/dnszone.go
index dfc2904ac0..2e06f1222a 100644
--- a/upup/pkg/fi/cloudup/awstasks/dnszone.go
+++ b/upup/pkg/fi/cloudup/awstasks/dnszone.go
@@ -132,7 +132,7 @@ func (e *DNSZone) findExisting(cloud awsup.AWSCloud) (*route53.GetHostedZoneOutp
 
 	var zones []*route53.HostedZone
 	for _, zone := range response.HostedZones {
-		if aws.StringValue(zone.Name) == findName {
+		if aws.StringValue(zone.Name) == findName && fi.BoolValue(zone.Config.PrivateZone) == fi.BoolValue(e.Private) {
 			zones = append(zones, zone)
 		}
 	}
@@ -219,10 +219,9 @@ func (_ *DNSZone) RenderAWS(t *awsup.AWSAPITarget, a, e, changes *DNSZone) error
 	return nil
 }
 
-type terraformRoute53Zone struct {
-	Name      *string              `json:"name"`
-	VPCID     *terraform.Literal   `json:"vpc_id,omitempty"`
-	Tags      map[string]string    `json:"tags,omitempty"`
+type terraformRoute53ZoneAssociation struct {
+	ZoneID    *terraform.Literal   `json:"zone_id"`
+	VPCID     *terraform.Literal   `json:"vpc_id"`
 	Lifecycle *terraform.Lifecycle `json:"lifecycle,omitempty"`
 }
 
@@ -244,34 +243,45 @@ func (_ *DNSZone) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *D
 		glog.Infof("Existing zone %q found; will configure TF to reuse", aws.StringValue(z.HostedZone.Name))
 
 		e.ZoneID = z.HostedZone.Id
-	}
 
-	if z == nil {
-		// Because we expect most users to create their zones externally,
-		// we now block hostedzone creation in terraform.
-		// This lets us perform deeper DNS validation, but also solves the problem
-		// that otherwise we don't know if TF created the hosted zone
-		// (in which case we should output it) or whether it already existed (in which case we should not)
-		// The root problem here is that TF doesn't have a strong notion of an unmanaged resource
-		return fmt.Errorf("Creation of Route53 hosted zones is not supported for terraform")
-		//tf := &terraformRoute53Zone{
-		//	Name: e.Name,
-		//	//Tags:               cloud.BuildTags(e.Name, nil),
-		//}
-		//
-		//tf.Lifecycle = &terraform.Lifecycle{
-		//	PreventDestroy: fi.Bool(true),
-		//}
-		//
-		//return t.RenderResource("aws_route53_zone", *e.Name, tf)
-	} else {
-		// Same problem here also...
+		// If the user specifies dns=private we'll have a non-nil PrivateVPC that specifies the VPC
+		// that should used with the private Route53 zone. If the zone doesn't already know about the
+		// VPC, we add that association.
 		if e.PrivateVPC != nil {
-			return fmt.Errorf("Route53 private hosted zones are not supported for terraform")
+			assocNeeded := true
+			var vpcName string
+			if e.PrivateVPC.ID != nil {
+				vpcName = *e.PrivateVPC.ID
+				for _, vpc := range z.VPCs {
+					if *vpc.VPCId == vpcName {
+						glog.Infof("VPC %q already associated with zone %q", vpcName, aws.StringValue(z.HostedZone.Name))
+						assocNeeded = false
+					}
+				}
+			} else {
+				vpcName = *e.PrivateVPC.Name
+			}
+
+			if assocNeeded {
+				glog.Infof("No association between VPC %q and zone %q; adding", vpcName, aws.StringValue(z.HostedZone.Name))
+				tf := &terraformRoute53ZoneAssociation{
+					ZoneID: terraform.LiteralFromStringValue(*e.ZoneID),
+					VPCID:  e.PrivateVPC.TerraformLink(),
+				}
+				return t.RenderResource("aws_route53_zone_association", *e.Name, tf)
+			}
 		}
 
 		return nil
 	}
+
+	// Because we expect most users to create their zones externally,
+	// we now block hostedzone creation in terraform.
+	// This lets us perform deeper DNS validation, but also solves the problem
+	// that otherwise we don't know if TF created the hosted zone
+	// (in which case we should output it) or whether it already existed (in which case we should not)
+	// The root problem here is that TF doesn't have a strong notion of an unmanaged resource
+	return fmt.Errorf("Creation of Route53 hosted zones is not supported for terraform")
 }
 
 func (e *DNSZone) TerraformLink() *terraform.Literal {
diff --git a/upup/pkg/fi/cloudup/awstasks/launchconfiguration.go b/upup/pkg/fi/cloudup/awstasks/launchconfiguration.go
index fe1145922d..262114b5bb 100644
--- a/upup/pkg/fi/cloudup/awstasks/launchconfiguration.go
+++ b/upup/pkg/fi/cloudup/awstasks/launchconfiguration.go
@@ -83,6 +83,9 @@ func (e *LaunchConfiguration) Find(c *fi.Context) (*LaunchConfiguration, error)
 		}
 		return true
 	})
+	if err != nil {
+		return nil, fmt.Errorf("error listing AutoscalingLaunchConfigurations: %v", err)
+	}
 
 	if len(configurations) == 0 {
 		return nil, nil
@@ -111,6 +114,7 @@ func (e *LaunchConfiguration) Find(c *fi.Context) (*LaunchConfiguration, error)
 		AssociatePublicIP:  lc.AssociatePublicIpAddress,
 		IAMInstanceProfile: &IAMInstanceProfile{Name: lc.IamInstanceProfile},
 		SpotPrice:          aws.StringValue(lc.SpotPrice),
+		Tenancy:            lc.PlacementTenancy,
 	}
 
 	securityGroups := []*SecurityGroup{}
@@ -339,6 +343,7 @@ type terraformLaunchConfiguration struct {
 	EphemeralBlockDevice     []*terraformBlockDevice `json:"ephemeral_block_device,omitempty"`
 	Lifecycle                *terraform.Lifecycle    `json:"lifecycle,omitempty"`
 	SpotPrice                *string                 `json:"spot_price,omitempty"`
+	PlacementTenancy         *string                 `json:"placement_tenancy,omitempty"`
 }
 
 type terraformBlockDevice struct {
@@ -377,6 +382,10 @@ func (_ *LaunchConfiguration) RenderTerraform(t *terraform.TerraformTarget, a, e
 		tf.KeyName = e.SSHKey.TerraformLink()
 	}
 
+	if e.Tenancy != nil {
+		tf.PlacementTenancy = e.Tenancy
+	}
+
 	for _, sg := range e.SecurityGroups {
 		tf.SecurityGroups = append(tf.SecurityGroups, sg.TerraformLink())
 	}
@@ -450,6 +459,7 @@ type cloudformationLaunchConfiguration struct {
 	SecurityGroups           []*cloudformation.Literal    `json:"SecurityGroups,omitempty"`
 	SpotPrice                *string                      `json:"SpotPrice,omitempty"`
 	UserData                 *string                      `json:"UserData,omitempty"`
+	PlacementTenancy         *string                      `json:"PlacementTenancy,omitempty"`
 
 	//NamePrefix               *string                 `json:"name_prefix,omitempty"`
 	//Lifecycle                *cloudformation.Lifecycle    `json:"lifecycle,omitempty"`
@@ -498,6 +508,10 @@ func (_ *LaunchConfiguration) RenderCloudformation(t *cloudformation.Cloudformat
 		cf.KeyName = e.SSHKey.Name
 	}
 
+	if e.Tenancy != nil {
+		cf.PlacementTenancy = e.Tenancy
+	}
+
 	for _, sg := range e.SecurityGroups {
 		cf.SecurityGroups = append(cf.SecurityGroups, sg.CloudformationLink())
 	}
diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
index fc32a3ce0b..77fa7aff22 100644
--- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
+++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -21,7 +21,6 @@ import (
 
 	channelsapi "k8s.io/kops/channels/pkg/api"
 	"k8s.io/kops/pkg/apis/kops"
-	"k8s.io/kops/pkg/apis/kops/util"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/fitasks"
 	"k8s.io/kops/upup/pkg/fi/utils"
@@ -73,11 +72,6 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 	addons.Kind = "Addons"
 	addons.ObjectMeta.Name = "bootstrap"
 
-	kv, err := util.ParseKubernetesVersion(b.cluster.Spec.KubernetesVersion)
-	if err != nil {
-		return nil, nil, fmt.Errorf("unable to determine kubernetes version from %q", b.cluster.Spec.KubernetesVersion)
-	}
-
 	{
 		key := "core.addons.k8s.io"
 		version := "1.4.0"
@@ -95,25 +89,37 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 
 	{
 		key := "kube-dns.addons.k8s.io"
+		version := "1.6.1-alpha.2"
 
-		var version string
-		var location string
-		switch {
-		case kv.Major == 1 && kv.Minor <= 5:
-			version = "1.5.1"
-			location = key + "/k8s-1.5.yaml"
-		default:
-			version = "1.6.0"
-			location = key + "/k8s-1.6.yaml"
+		{
+			location := key + "/pre-k8s-1.6.yaml"
+			id := "pre-k8s-1.6"
+
+			addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
+				Name:              fi.String(key),
+				Version:           fi.String(version),
+				Selector:          map[string]string{"k8s-addon": key},
+				Manifest:          fi.String(location),
+				KubernetesVersion: "<1.6.0",
+				Id:                id,
+			})
+			manifests[key+"-"+id] = "addons/" + location
 		}
 
-		addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
-			Name:     fi.String(key),
-			Version:  fi.String(version),
-			Selector: map[string]string{"k8s-addon": key},
-			Manifest: fi.String(location),
-		})
-		manifests[key] = "addons/" + location
+		{
+			location := key + "/k8s-1.6.yaml"
+			id := "k8s-1.6"
+
+			addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
+				Name:              fi.String(key),
+				Version:           fi.String(version),
+				Selector:          map[string]string{"k8s-addon": key},
+				Manifest:          fi.String(location),
+				KubernetesVersion: ">=1.6.0",
+				Id:                id,
+			})
+			manifests[key+"-"+id] = "addons/" + location
+		}
 	}
 
 	{
@@ -133,27 +139,37 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 
 	{
 		key := "dns-controller.addons.k8s.io"
+		version := "1.6.1-alpha.2"
 
-		var version string
-		var location string
-		switch {
-		case kv.Major == 1 && kv.Minor <= 5:
-			// This is awkward... we would like to do version 1.6.0,
-			// but if we do then we won't get the new manifest when we upgrade to 1.6.0
-			version = "1.5.3"
-			location = key + "/k8s-1.5.yaml"
-		default:
-			version = "1.6.0"
-			location = key + "/k8s-1.6.yaml"
+		{
+			location := key + "/pre-k8s-1.6.yaml"
+			id := "pre-k8s-1.6"
+
+			addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
+				Name:              fi.String(key),
+				Version:           fi.String(version),
+				Selector:          map[string]string{"k8s-addon": key},
+				Manifest:          fi.String(location),
+				KubernetesVersion: "<1.6.0",
+				Id:                id,
+			})
+			manifests[key+"-"+id] = "addons/" + location
 		}
 
-		addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
-			Name:     fi.String(key),
-			Version:  fi.String(version),
-			Selector: map[string]string{"k8s-addon": key},
-			Manifest: fi.String(location),
-		})
-		manifests[key] = "addons/" + location
+		{
+			location := key + "/k8s-1.6.yaml"
+			id := "k8s-1.6"
+
+			addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
+				Name:              fi.String(key),
+				Version:           fi.String(version),
+				Selector:          map[string]string{"k8s-addon": key},
+				Manifest:          fi.String(location),
+				KubernetesVersion: ">=1.6.0",
+				Id:                id,
+			})
+			manifests[key+"-"+id] = "addons/" + location
+		}
 	}
 
 	{
@@ -184,95 +200,183 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 	// TODO: Create "empty" configurations for others, so we can delete e.g. the kopeio configuration
 	// if we switch to kubenet?
 
+	// TODO: Create configuration object for cni providers (maybe create it but orphan it)?
+
+	networkingSelector := map[string]string{"role.kubernetes.io/networking": "1"}
+
 	if b.cluster.Spec.Networking.Kopeio != nil {
 		key := "networking.kope.io"
-		version := "1.0.20161116"
+		version := "1.0.20170406"
 
-		// TODO: Create configuration object for cni providers (maybe create it but orphan it)?
-		location := key + "/v" + version + ".yaml"
+		{
+			location := key + "/pre-k8s-1.6.yaml"
+			id := "pre-k8s-1.6"
 
-		addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
-			Name:     fi.String(key),
-			Version:  fi.String(version),
-			Selector: map[string]string{"role.kubernetes.io/networking": "1"},
-			Manifest: fi.String(location),
-		})
+			addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
+				Name:              fi.String(key),
+				Version:           fi.String(version),
+				Selector:          networkingSelector,
+				Manifest:          fi.String(location),
+				KubernetesVersion: "<1.6.0",
+				Id:                id,
+			})
+			manifests[key+"-"+id] = "addons/" + location
+		}
 
-		manifests[key] = "addons/" + location
+		{
+			location := key + "/k8s-1.6.yaml"
+			id := "k8s-1.6"
+
+			addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
+				Name:              fi.String(key),
+				Version:           fi.String(version),
+				Selector:          networkingSelector,
+				Manifest:          fi.String(location),
+				KubernetesVersion: ">=1.6.0",
+				Id:                id,
+			})
+			manifests[key+"-"+id] = "addons/" + location
+		}
 	}
 
 	if b.cluster.Spec.Networking.Weave != nil {
 		key := "networking.weave"
-		var version string
-		switch {
-		case kv.Major == 1 && kv.Minor <= 5:
-			version = "1.9.3"
-		default:
-			version = "1.9.4"
+		version := "1.9.4"
+
+		{
+			location := key + "/pre-k8s-1.6.yaml"
+			id := "pre-k8s-1.6"
+
+			addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
+				Name:              fi.String(key),
+				Version:           fi.String(version),
+				Selector:          networkingSelector,
+				Manifest:          fi.String(location),
+				KubernetesVersion: "<1.6.0",
+				Id:                id,
+			})
+			manifests[key+"-"+id] = "addons/" + location
 		}
 
-		// TODO: Create configuration object for cni providers (maybe create it but orphan it)?
-		location := key + "/v" + version + ".yaml"
+		{
+			location := key + "/k8s-1.6.yaml"
+			id := "k8s-1.6"
 
-		addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
-			Name:     fi.String(key),
-			Version:  fi.String(version),
-			Selector: map[string]string{"role.kubernetes.io/networking": "1"},
-			Manifest: fi.String(location),
-		})
-
-		manifests[key] = "addons/" + location
+			addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
+				Name:              fi.String(key),
+				Version:           fi.String(version),
+				Selector:          networkingSelector,
+				Manifest:          fi.String(location),
+				KubernetesVersion: ">=1.6.0",
+				Id:                id,
+			})
+			manifests[key+"-"+id] = "addons/" + location
+		}
 	}
 
 	if b.cluster.Spec.Networking.Flannel != nil {
 		key := "networking.flannel"
 		version := "0.7.0"
 
-		// TODO: Create configuration object for cni providers (maybe create it but orphan it)?
-		location := key + "/v" + version + ".yaml"
+		{
+			location := key + "/pre-k8s-1.6.yaml"
+			id := "pre-k8s-1.6"
 
-		addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
-			Name:     fi.String(key),
-			Version:  fi.String(version),
-			Selector: map[string]string{"role.kubernetes.io/networking": "1"},
-			Manifest: fi.String(location),
-		})
+			addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
+				Name:              fi.String(key),
+				Version:           fi.String(version),
+				Selector:          networkingSelector,
+				Manifest:          fi.String(location),
+				KubernetesVersion: "<1.6.0",
+				Id:                id,
+			})
+			manifests[key+"-"+id] = "addons/" + location
+		}
 
-		manifests[key] = "addons/" + location
+		{
+			location := key + "/k8s-1.6.yaml"
+			id := "k8s-1.6"
+
+			addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
+				Name:              fi.String(key),
+				Version:           fi.String(version),
+				Selector:          networkingSelector,
+				Manifest:          fi.String(location),
+				KubernetesVersion: ">=1.6.0",
+				Id:                id,
+			})
+			manifests[key+"-"+id] = "addons/" + location
+		}
 	}
 
 	if b.cluster.Spec.Networking.Calico != nil {
 		key := "networking.projectcalico.org"
-		version := "2.0.2"
+		version := "2.1.1"
 
-		// TODO: Create configuration object for cni providers (maybe create it but orphan it)?
-		location := key + "/v" + version + ".yaml"
+		{
+			location := key + "/pre-k8s-1.6.yaml"
+			id := "pre-k8s-1.6"
 
-		addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
-			Name:     fi.String(key),
-			Version:  fi.String(version),
-			Selector: map[string]string{"role.kubernetes.io/networking": "1"},
-			Manifest: fi.String(location),
-		})
+			addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
+				Name:              fi.String(key),
+				Version:           fi.String(version),
+				Selector:          networkingSelector,
+				Manifest:          fi.String(location),
+				KubernetesVersion: "<1.6.0",
+				Id:                id,
+			})
+			manifests[key+"-"+id] = "addons/" + location
+		}
 
-		manifests[key] = "addons/" + location
+		{
+			location := key + "/k8s-1.6.yaml"
+			id := "k8s-1.6"
+
+			addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
+				Name:              fi.String(key),
+				Version:           fi.String(version),
+				Selector:          networkingSelector,
+				Manifest:          fi.String(location),
+				KubernetesVersion: ">=1.6.0",
+				Id:                id,
+			})
+			manifests[key+"-"+id] = "addons/" + location
+		}
 	}
 
 	if b.cluster.Spec.Networking.Canal != nil {
 		key := "networking.projectcalico.org.canal"
 		version := "1.0"
 
-		// TODO: Create configuration object for cni providers (maybe create it but orphan it)?
-		location := key + "/v" + version + ".yaml"
+		{
+			location := key + "/pre-k8s-1.6.yaml"
+			id := "pre-k8s-1.6"
 
-		addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
-			Name:     fi.String(key),
-			Version:  fi.String(version),
-			Selector: map[string]string{"role.kubernetes.io/networking": "1"},
-			Manifest: fi.String(location),
-		})
+			addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
+				Name:              fi.String(key),
+				Version:           fi.String(version),
+				Selector:          networkingSelector,
+				Manifest:          fi.String(location),
+				KubernetesVersion: "<1.6.0",
+				Id:                id,
+			})
+			manifests[key+"-"+id] = "addons/" + location
+		}
 
-		manifests[key] = "addons/" + location
+		{
+			location := key + "/k8s-1.6.yaml"
+			id := "k8s-1.6"
+
+			addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
+				Name:              fi.String(key),
+				Version:           fi.String(version),
+				Selector:          networkingSelector,
+				Manifest:          fi.String(location),
+				KubernetesVersion: ">=1.6.0",
+				Id:                id,
+			})
+			manifests[key+"-"+id] = "addons/" + location
+		}
 	}
 
 	return addons, manifests, nil
diff --git a/upup/pkg/fi/cloudup/networking.go b/upup/pkg/fi/cloudup/networking.go
index df39a5b577..596ad44cff 100644
--- a/upup/pkg/fi/cloudup/networking.go
+++ b/upup/pkg/fi/cloudup/networking.go
@@ -50,7 +50,7 @@ func usesCNI(c *api.Cluster) bool {
 	}
 
 	if networkConfig.Flannel != nil {
-		//  Weave uses CNI
+		//  Flannel uses CNI
 		return true
 	}
 
diff --git a/upup/pkg/fi/cloudup/populate_instancegroup_spec.go b/upup/pkg/fi/cloudup/populate_instancegroup_spec.go
index bd58d12430..ab5584db4f 100644
--- a/upup/pkg/fi/cloudup/populate_instancegroup_spec.go
+++ b/upup/pkg/fi/cloudup/populate_instancegroup_spec.go
@@ -43,9 +43,10 @@ const (
 
 var masterMachineTypeExceptions = map[string]string{
 	// Some regions do not (currently) support the m3 family; the c4 large is the cheapest non-burstable instance
-	"us-east-2":    "c4.large",
-	"ca-central-1": "c4.large",
-	"eu-west-2":    "c4.large",
+	"us-east-2":      "c4.large",
+	"ca-central-1":   "c4.large",
+	"eu-west-2":      "c4.large",
+	"ap-northeast-2": "c4.large",
 }
 
 var awsDedicatedInstanceExceptions = map[string]bool{
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
index 439d13599e..1da7a5eec3 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
@@ -9,28 +9,55 @@ spec:
     selector:
       k8s-addon: core.addons.k8s.io
     version: 1.4.0
-  - manifest: kube-dns.addons.k8s.io/k8s-1.5.yaml
+  - id: pre-k8s-1.6
+    kubernetesVersion: <1.6.0
+    manifest: kube-dns.addons.k8s.io/pre-k8s-1.6.yaml
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io
-    version: 1.5.1
+    version: 1.6.1-alpha.2
+  - id: k8s-1.6
+    kubernetesVersion: '>=1.6.0'
+    manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
+    name: kube-dns.addons.k8s.io
+    selector:
+      k8s-addon: kube-dns.addons.k8s.io
+    version: 1.6.1-alpha.2
   - manifest: limit-range.addons.k8s.io/v1.5.0.yaml
     name: limit-range.addons.k8s.io
     selector:
       k8s-addon: limit-range.addons.k8s.io
     version: 1.5.0
-  - manifest: dns-controller.addons.k8s.io/k8s-1.5.yaml
+  - id: pre-k8s-1.6
+    kubernetesVersion: <1.6.0
+    manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
-    version: 1.5.3
+    version: 1.6.1-alpha.2
+  - id: k8s-1.6
+    kubernetesVersion: '>=1.6.0'
+    manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
+    name: dns-controller.addons.k8s.io
+    selector:
+      k8s-addon: dns-controller.addons.k8s.io
+    version: 1.6.1-alpha.2
   - manifest: storage-aws.addons.k8s.io/v1.6.0.yaml
     name: storage-aws.addons.k8s.io
     selector:
       k8s-addon: storage-aws.addons.k8s.io
     version: 1.6.0
-  - manifest: networking.kope.io/v1.0.20161116.yaml
+  - id: pre-k8s-1.6
+    kubernetesVersion: <1.6.0
+    manifest: networking.kope.io/pre-k8s-1.6.yaml
     name: networking.kope.io
     selector:
       role.kubernetes.io/networking: "1"
-    version: 1.0.20161116
+    version: 1.0.20170406
+  - id: k8s-1.6
+    kubernetesVersion: '>=1.6.0'
+    manifest: networking.kope.io/k8s-1.6.yaml
+    name: networking.kope.io
+    selector:
+      role.kubernetes.io/networking: "1"
+    version: 1.0.20170406
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
index f44f5c479b..ddba0461d7 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
@@ -9,21 +9,39 @@ spec:
     selector:
       k8s-addon: core.addons.k8s.io
     version: 1.4.0
-  - manifest: kube-dns.addons.k8s.io/k8s-1.5.yaml
+  - id: pre-k8s-1.6
+    kubernetesVersion: <1.6.0
+    manifest: kube-dns.addons.k8s.io/pre-k8s-1.6.yaml
     name: kube-dns.addons.k8s.io
     selector:
       k8s-addon: kube-dns.addons.k8s.io
-    version: 1.5.1
+    version: 1.6.1-alpha.2
+  - id: k8s-1.6
+    kubernetesVersion: '>=1.6.0'
+    manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml
+    name: kube-dns.addons.k8s.io
+    selector:
+      k8s-addon: kube-dns.addons.k8s.io
+    version: 1.6.1-alpha.2
   - manifest: limit-range.addons.k8s.io/v1.5.0.yaml
     name: limit-range.addons.k8s.io
     selector:
       k8s-addon: limit-range.addons.k8s.io
     version: 1.5.0
-  - manifest: dns-controller.addons.k8s.io/k8s-1.5.yaml
+  - id: pre-k8s-1.6
+    kubernetesVersion: <1.6.0
+    manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
-    version: 1.5.3
+    version: 1.6.1-alpha.2
+  - id: k8s-1.6
+    kubernetesVersion: '>=1.6.0'
+    manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
+    name: dns-controller.addons.k8s.io
+    selector:
+      k8s-addon: dns-controller.addons.k8s.io
+    version: 1.6.1-alpha.2
   - manifest: storage-aws.addons.k8s.io/v1.6.0.yaml
     name: storage-aws.addons.k8s.io
     selector:
diff --git a/upup/pkg/fi/nodeup/command.go b/upup/pkg/fi/nodeup/command.go
index b760ef28ff..d7df5c9c13 100644
--- a/upup/pkg/fi/nodeup/command.go
+++ b/upup/pkg/fi/nodeup/command.go
@@ -37,7 +37,6 @@ import (
 	"k8s.io/kops/upup/pkg/fi/nodeup/cloudinit"
 	"k8s.io/kops/upup/pkg/fi/nodeup/local"
 	"k8s.io/kops/upup/pkg/fi/nodeup/nodetasks"
-	"k8s.io/kops/upup/pkg/fi/nodeup/tags"
 	"k8s.io/kops/upup/pkg/fi/utils"
 	"k8s.io/kops/util/pkg/vfs"
 )
@@ -208,7 +207,6 @@ func (c *NodeUpCommand) Run(out io.Writer) error {
 		Architecture:  model.ArchitectureAmd64,
 		InstanceGroup: c.instanceGroup,
 		IsMaster:      nodeTags.Has(TagMaster),
-		UsesCNI:       nodeTags.Has(tags.TagCNI),
 		Assets:        assets,
 		KeyStore:      tf.keyStore,
 		SecretStore:   tf.secretStore,
diff --git a/upup/pkg/fi/nodeup/tags/tags.go b/upup/pkg/fi/nodeup/tags/tags.go
index 723a32d60c..d554dd7245 100644
--- a/upup/pkg/fi/nodeup/tags/tags.go
+++ b/upup/pkg/fi/nodeup/tags/tags.go
@@ -21,8 +21,6 @@ const (
 	TagOSFamilyDebian = "_debian_family"
 
 	TagSystemd = "_systemd"
-
-	TagCNI = "_networking_cni"
 )
 
 type HasTags interface {
diff --git a/upup/pkg/kutil/delete_cluster_gce.go b/upup/pkg/kutil/delete_cluster_gce.go
index 8113192c63..ca719559ac 100644
--- a/upup/pkg/kutil/delete_cluster_gce.go
+++ b/upup/pkg/kutil/delete_cluster_gce.go
@@ -399,7 +399,7 @@ func (d *clusterDiscoveryGCE) listGCEDisks() ([]*ResourceTracker, error) {
 		}
 
 		for _, u := range t.Users {
-			tracker.blocked = append(tracker.blocked, typeInstance+":"+gce.LastComponent(u))
+			tracker.blocked = append(tracker.blocked, typeInstance+":"+t.Zone+"/"+gce.LastComponent(u))
 		}
 
 		glog.V(4).Infof("Found resource: %s", t.SelfLink)
diff --git a/vendor/github.com/coreos/go-semver/.travis.yml b/vendor/github.com/coreos/go-semver/.travis.yml
new file mode 100644
index 0000000000..05f548c9ab
--- /dev/null
+++ b/vendor/github.com/coreos/go-semver/.travis.yml
@@ -0,0 +1,8 @@
+language: go
+sudo: false
+go:
+  - 1.4
+  - 1.5
+  - 1.6
+  - tip
+script: cd semver && go test
diff --git a/vendor/github.com/coreos/go-semver/LICENSE b/vendor/github.com/coreos/go-semver/LICENSE
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/vendor/github.com/coreos/go-semver/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/vendor/github.com/coreos/go-semver/README.md b/vendor/github.com/coreos/go-semver/README.md
new file mode 100644
index 0000000000..5bc9263cfb
--- /dev/null
+++ b/vendor/github.com/coreos/go-semver/README.md
@@ -0,0 +1,28 @@
+# go-semver - Semantic Versioning Library
+
+[![Build Status](https://travis-ci.org/coreos/go-semver.svg?branch=master)](https://travis-ci.org/coreos/go-semver)
+[![GoDoc](https://godoc.org/github.com/coreos/go-semver/semver?status.svg)](https://godoc.org/github.com/coreos/go-semver/semver)
+
+go-semver is a [semantic versioning][semver] library for Go. It lets you parse
+and compare two semantic version strings.
+
+[semver]: http://semver.org/
+
+## Usage
+
+```go
+vA := semver.New("1.2.3")
+vB := semver.New("3.2.1")
+
+fmt.Printf("%s < %s == %t\n", vA, vB, vA.LessThan(*vB))
+```
+
+## Example Application
+
+```
+$ go run example.go 1.2.3 3.2.1
+1.2.3 < 3.2.1 == true
+
+$ go run example.go 5.2.3 3.2.1
+5.2.3 < 3.2.1 == false
+```
diff --git a/vendor/github.com/coreos/go-semver/example.go b/vendor/github.com/coreos/go-semver/example.go
new file mode 100644
index 0000000000..fd2ee5af27
--- /dev/null
+++ b/vendor/github.com/coreos/go-semver/example.go
@@ -0,0 +1,20 @@
+package main
+
+import (
+	"fmt"
+	"github.com/coreos/go-semver/semver"
+	"os"
+)
+
+func main() {
+	vA, err := semver.NewVersion(os.Args[1])
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+	vB, err := semver.NewVersion(os.Args[2])
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+
+	fmt.Printf("%s < %s == %t\n", vA, vB, vA.LessThan(*vB))
+}
diff --git a/vendor/github.com/coreos/go-semver/semver/semver.go b/vendor/github.com/coreos/go-semver/semver/semver.go
new file mode 100644
index 0000000000..9c8072d1a1
--- /dev/null
+++ b/vendor/github.com/coreos/go-semver/semver/semver.go
@@ -0,0 +1,275 @@
+// Copyright 2013-2015 CoreOS, Inc.
+//
+// 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.
+
+// Semantic Versions http://semver.org
+package semver
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"strconv"
+	"strings"
+)
+
+type Version struct {
+	Major      int64
+	Minor      int64
+	Patch      int64
+	PreRelease PreRelease
+	Metadata   string
+}
+
+type PreRelease string
+
+func splitOff(input *string, delim string) (val string) {
+	parts := strings.SplitN(*input, delim, 2)
+
+	if len(parts) == 2 {
+		*input = parts[0]
+		val = parts[1]
+	}
+
+	return val
+}
+
+func New(version string) *Version {
+	return Must(NewVersion(version))
+}
+
+func NewVersion(version string) (*Version, error) {
+	v := Version{}
+
+	if err := v.Set(version); err != nil {
+		return nil, err
+	}
+
+	return &v, nil
+}
+
+// Must is a helper for wrapping NewVersion and will panic if err is not nil.
+func Must(v *Version, err error) *Version {
+	if err != nil {
+		panic(err)
+	}
+	return v
+}
+
+// Set parses and updates v from the given version string. Implements flag.Value
+func (v *Version) Set(version string) error {
+	metadata := splitOff(&version, "+")
+	preRelease := PreRelease(splitOff(&version, "-"))
+	dotParts := strings.SplitN(version, ".", 3)
+
+	if len(dotParts) != 3 {
+		return fmt.Errorf("%s is not in dotted-tri format", version)
+	}
+
+	parsed := make([]int64, 3, 3)
+
+	for i, v := range dotParts[:3] {
+		val, err := strconv.ParseInt(v, 10, 64)
+		parsed[i] = val
+		if err != nil {
+			return err
+		}
+	}
+
+	v.Metadata = metadata
+	v.PreRelease = preRelease
+	v.Major = parsed[0]
+	v.Minor = parsed[1]
+	v.Patch = parsed[2]
+	return nil
+}
+
+func (v Version) String() string {
+	var buffer bytes.Buffer
+
+	fmt.Fprintf(&buffer, "%d.%d.%d", v.Major, v.Minor, v.Patch)
+
+	if v.PreRelease != "" {
+		fmt.Fprintf(&buffer, "-%s", v.PreRelease)
+	}
+
+	if v.Metadata != "" {
+		fmt.Fprintf(&buffer, "+%s", v.Metadata)
+	}
+
+	return buffer.String()
+}
+
+func (v *Version) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	var data string
+	if err := unmarshal(&data); err != nil {
+		return err
+	}
+	return v.Set(data)
+}
+
+func (v Version) MarshalJSON() ([]byte, error) {
+	return []byte(`"` + v.String() + `"`), nil
+}
+
+func (v *Version) UnmarshalJSON(data []byte) error {
+	l := len(data)
+	if l == 0 || string(data) == `""` {
+		return nil
+	}
+	if l < 2 || data[0] != '"' || data[l-1] != '"' {
+		return errors.New("invalid semver string")
+	}
+	return v.Set(string(data[1 : l-1]))
+}
+
+// Compare tests if v is less than, equal to, or greater than versionB,
+// returning -1, 0, or +1 respectively.
+func (v Version) Compare(versionB Version) int {
+	if cmp := recursiveCompare(v.Slice(), versionB.Slice()); cmp != 0 {
+		return cmp
+	}
+	return preReleaseCompare(v, versionB)
+}
+
+// Equal tests if v is equal to versionB.
+func (v Version) Equal(versionB Version) bool {
+	return v.Compare(versionB) == 0
+}
+
+// LessThan tests if v is less than versionB.
+func (v Version) LessThan(versionB Version) bool {
+	return v.Compare(versionB) < 0
+}
+
+// Slice converts the comparable parts of the semver into a slice of integers.
+func (v Version) Slice() []int64 {
+	return []int64{v.Major, v.Minor, v.Patch}
+}
+
+func (p PreRelease) Slice() []string {
+	preRelease := string(p)
+	return strings.Split(preRelease, ".")
+}
+
+func preReleaseCompare(versionA Version, versionB Version) int {
+	a := versionA.PreRelease
+	b := versionB.PreRelease
+
+	/* Handle the case where if two versions are otherwise equal it is the
+	 * one without a PreRelease that is greater */
+	if len(a) == 0 && (len(b) > 0) {
+		return 1
+	} else if len(b) == 0 && (len(a) > 0) {
+		return -1
+	}
+
+	// If there is a prerelease, check and compare each part.
+	return recursivePreReleaseCompare(a.Slice(), b.Slice())
+}
+
+func recursiveCompare(versionA []int64, versionB []int64) int {
+	if len(versionA) == 0 {
+		return 0
+	}
+
+	a := versionA[0]
+	b := versionB[0]
+
+	if a > b {
+		return 1
+	} else if a < b {
+		return -1
+	}
+
+	return recursiveCompare(versionA[1:], versionB[1:])
+}
+
+func recursivePreReleaseCompare(versionA []string, versionB []string) int {
+	// A larger set of pre-release fields has a higher precedence than a smaller set,
+	// if all of the preceding identifiers are equal.
+	if len(versionA) == 0 {
+		if len(versionB) > 0 {
+			return -1
+		}
+		return 0
+	} else if len(versionB) == 0 {
+		// We're longer than versionB so return 1.
+		return 1
+	}
+
+	a := versionA[0]
+	b := versionB[0]
+
+	aInt := false
+	bInt := false
+
+	aI, err := strconv.Atoi(versionA[0])
+	if err == nil {
+		aInt = true
+	}
+
+	bI, err := strconv.Atoi(versionB[0])
+	if err == nil {
+		bInt = true
+	}
+
+	// Numeric identifiers always have lower precedence than non-numeric identifiers.
+	if aInt && !bInt {
+		return -1
+	} else if !aInt && bInt {
+		return 1
+	}
+
+	// Handle Integer Comparison
+	if aInt && bInt {
+		if aI > bI {
+			return 1
+		} else if aI < bI {
+			return -1
+		}
+	}
+
+	// Handle String Comparison
+	if a > b {
+		return 1
+	} else if a < b {
+		return -1
+	}
+
+	return recursivePreReleaseCompare(versionA[1:], versionB[1:])
+}
+
+// BumpMajor increments the Major field by 1 and resets all other fields to their default values
+func (v *Version) BumpMajor() {
+	v.Major += 1
+	v.Minor = 0
+	v.Patch = 0
+	v.PreRelease = PreRelease("")
+	v.Metadata = ""
+}
+
+// BumpMinor increments the Minor field by 1 and resets all other fields to their default values
+func (v *Version) BumpMinor() {
+	v.Minor += 1
+	v.Patch = 0
+	v.PreRelease = PreRelease("")
+	v.Metadata = ""
+}
+
+// BumpPatch increments the Patch field by 1 and resets all other fields to their default values
+func (v *Version) BumpPatch() {
+	v.Patch += 1
+	v.PreRelease = PreRelease("")
+	v.Metadata = ""
+}
diff --git a/vendor/github.com/coreos/go-semver/semver/semver_test.go b/vendor/github.com/coreos/go-semver/semver/semver_test.go
new file mode 100644
index 0000000000..511e02a8d4
--- /dev/null
+++ b/vendor/github.com/coreos/go-semver/semver/semver_test.go
@@ -0,0 +1,371 @@
+// Copyright 2013-2015 CoreOS, Inc.
+//
+// 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 semver
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"flag"
+	"fmt"
+	"math/rand"
+	"reflect"
+	"testing"
+	"time"
+
+	"gopkg.in/yaml.v2"
+)
+
+type fixture struct {
+	GreaterVersion string
+	LesserVersion  string
+}
+
+var fixtures = []fixture{
+	fixture{"0.0.0", "0.0.0-foo"},
+	fixture{"0.0.1", "0.0.0"},
+	fixture{"1.0.0", "0.9.9"},
+	fixture{"0.10.0", "0.9.0"},
+	fixture{"0.99.0", "0.10.0"},
+	fixture{"2.0.0", "1.2.3"},
+	fixture{"0.0.0", "0.0.0-foo"},
+	fixture{"0.0.1", "0.0.0"},
+	fixture{"1.0.0", "0.9.9"},
+	fixture{"0.10.0", "0.9.0"},
+	fixture{"0.99.0", "0.10.0"},
+	fixture{"2.0.0", "1.2.3"},
+	fixture{"0.0.0", "0.0.0-foo"},
+	fixture{"0.0.1", "0.0.0"},
+	fixture{"1.0.0", "0.9.9"},
+	fixture{"0.10.0", "0.9.0"},
+	fixture{"0.99.0", "0.10.0"},
+	fixture{"2.0.0", "1.2.3"},
+	fixture{"1.2.3", "1.2.3-asdf"},
+	fixture{"1.2.3", "1.2.3-4"},
+	fixture{"1.2.3", "1.2.3-4-foo"},
+	fixture{"1.2.3-5-foo", "1.2.3-5"},
+	fixture{"1.2.3-5", "1.2.3-4"},
+	fixture{"1.2.3-5-foo", "1.2.3-5-Foo"},
+	fixture{"3.0.0", "2.7.2+asdf"},
+	fixture{"3.0.0+foobar", "2.7.2"},
+	fixture{"1.2.3-a.10", "1.2.3-a.5"},
+	fixture{"1.2.3-a.b", "1.2.3-a.5"},
+	fixture{"1.2.3-a.b", "1.2.3-a"},
+	fixture{"1.2.3-a.b.c.10.d.5", "1.2.3-a.b.c.5.d.100"},
+	fixture{"1.0.0", "1.0.0-rc.1"},
+	fixture{"1.0.0-rc.2", "1.0.0-rc.1"},
+	fixture{"1.0.0-rc.1", "1.0.0-beta.11"},
+	fixture{"1.0.0-beta.11", "1.0.0-beta.2"},
+	fixture{"1.0.0-beta.2", "1.0.0-beta"},
+	fixture{"1.0.0-beta", "1.0.0-alpha.beta"},
+	fixture{"1.0.0-alpha.beta", "1.0.0-alpha.1"},
+	fixture{"1.0.0-alpha.1", "1.0.0-alpha"},
+	fixture{"1.2.3-rc.1-1-1hash", "1.2.3-rc.2"},
+}
+
+func TestCompare(t *testing.T) {
+	for _, v := range fixtures {
+		gt, err := NewVersion(v.GreaterVersion)
+		if err != nil {
+			t.Error(err)
+		}
+
+		lt, err := NewVersion(v.LesserVersion)
+		if err != nil {
+			t.Error(err)
+		}
+
+		if gt.LessThan(*lt) {
+			t.Errorf("%s should not be less than %s", gt, lt)
+		}
+		if gt.Equal(*lt) {
+			t.Errorf("%s should not be equal to %s", gt, lt)
+		}
+		if gt.Compare(*lt) <= 0 {
+			t.Errorf("%s should be greater than %s", gt, lt)
+		}
+		if !lt.LessThan(*gt) {
+			t.Errorf("%s should be less than %s", lt, gt)
+		}
+		if !lt.Equal(*lt) {
+			t.Errorf("%s should be equal to %s", lt, lt)
+		}
+		if lt.Compare(*gt) > 0 {
+			t.Errorf("%s should not be greater than %s", lt, gt)
+		}
+	}
+}
+
+func testString(t *testing.T, orig string, version *Version) {
+	if orig != version.String() {
+		t.Errorf("%s != %s", orig, version)
+	}
+}
+
+func TestString(t *testing.T) {
+	for _, v := range fixtures {
+		gt, err := NewVersion(v.GreaterVersion)
+		if err != nil {
+			t.Error(err)
+		}
+		testString(t, v.GreaterVersion, gt)
+
+		lt, err := NewVersion(v.LesserVersion)
+		if err != nil {
+			t.Error(err)
+		}
+		testString(t, v.LesserVersion, lt)
+	}
+}
+
+func shuffleStringSlice(src []string) []string {
+	dest := make([]string, len(src))
+	rand.Seed(time.Now().Unix())
+	perm := rand.Perm(len(src))
+	for i, v := range perm {
+		dest[v] = src[i]
+	}
+	return dest
+}
+
+func TestSort(t *testing.T) {
+	sortedVersions := []string{"1.0.0", "1.0.2", "1.2.0", "3.1.1"}
+	unsortedVersions := shuffleStringSlice(sortedVersions)
+
+	semvers := []*Version{}
+	for _, v := range unsortedVersions {
+		sv, err := NewVersion(v)
+		if err != nil {
+			t.Fatal(err)
+		}
+		semvers = append(semvers, sv)
+	}
+
+	Sort(semvers)
+
+	for idx, sv := range semvers {
+		if sv.String() != sortedVersions[idx] {
+			t.Fatalf("incorrect sort at index %v", idx)
+		}
+	}
+}
+
+func TestBumpMajor(t *testing.T) {
+	version, _ := NewVersion("1.0.0")
+	version.BumpMajor()
+	if version.Major != 2 {
+		t.Fatalf("bumping major on 1.0.0 resulted in %v", version)
+	}
+
+	version, _ = NewVersion("1.5.2")
+	version.BumpMajor()
+	if version.Minor != 0 && version.Patch != 0 {
+		t.Fatalf("bumping major on 1.5.2 resulted in %v", version)
+	}
+
+	version, _ = NewVersion("1.0.0+build.1-alpha.1")
+	version.BumpMajor()
+	if version.PreRelease != "" && version.Metadata != "" {
+		t.Fatalf("bumping major on 1.0.0+build.1-alpha.1 resulted in %v", version)
+	}
+}
+
+func TestBumpMinor(t *testing.T) {
+	version, _ := NewVersion("1.0.0")
+	version.BumpMinor()
+
+	if version.Major != 1 {
+		t.Fatalf("bumping minor on 1.0.0 resulted in %v", version)
+	}
+
+	if version.Minor != 1 {
+		t.Fatalf("bumping major on 1.0.0 resulted in %v", version)
+	}
+
+	version, _ = NewVersion("1.0.0+build.1-alpha.1")
+	version.BumpMinor()
+	if version.PreRelease != "" && version.Metadata != "" {
+		t.Fatalf("bumping major on 1.0.0+build.1-alpha.1 resulted in %v", version)
+	}
+}
+
+func TestBumpPatch(t *testing.T) {
+	version, _ := NewVersion("1.0.0")
+	version.BumpPatch()
+
+	if version.Major != 1 {
+		t.Fatalf("bumping minor on 1.0.0 resulted in %v", version)
+	}
+
+	if version.Minor != 0 {
+		t.Fatalf("bumping major on 1.0.0 resulted in %v", version)
+	}
+
+	if version.Patch != 1 {
+		t.Fatalf("bumping major on 1.0.0 resulted in %v", version)
+	}
+
+	version, _ = NewVersion("1.0.0+build.1-alpha.1")
+	version.BumpPatch()
+	if version.PreRelease != "" && version.Metadata != "" {
+		t.Fatalf("bumping major on 1.0.0+build.1-alpha.1 resulted in %v", version)
+	}
+}
+
+func TestMust(t *testing.T) {
+	tests := []struct {
+		versionStr string
+
+		version *Version
+		recov   interface{}
+	}{
+		{
+			versionStr: "1.0.0",
+			version:    &Version{Major: 1},
+		},
+		{
+			versionStr: "version number",
+			recov:      errors.New("version number is not in dotted-tri format"),
+		},
+	}
+
+	for _, tt := range tests {
+		func() {
+			defer func() {
+				recov := recover()
+				if !reflect.DeepEqual(tt.recov, recov) {
+					t.Fatalf("incorrect panic for %q: want %v, got %v", tt.versionStr, tt.recov, recov)
+				}
+			}()
+
+			version := Must(NewVersion(tt.versionStr))
+			if !reflect.DeepEqual(tt.version, version) {
+				t.Fatalf("incorrect version for %q: want %+v, got %+v", tt.versionStr, tt.version, version)
+			}
+		}()
+	}
+}
+
+type fixtureJSON struct {
+	GreaterVersion *Version
+	LesserVersion  *Version
+}
+
+func TestJSON(t *testing.T) {
+	fj := make([]fixtureJSON, len(fixtures))
+	for i, v := range fixtures {
+		var err error
+		fj[i].GreaterVersion, err = NewVersion(v.GreaterVersion)
+		if err != nil {
+			t.Fatal(err)
+		}
+		fj[i].LesserVersion, err = NewVersion(v.LesserVersion)
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	fromStrings, err := json.Marshal(fixtures)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fromVersions, err := json.Marshal(fj)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !bytes.Equal(fromStrings, fromVersions) {
+		t.Errorf("Expected:   %s", fromStrings)
+		t.Errorf("Unexpected: %s", fromVersions)
+	}
+
+	fromJson := make([]fixtureJSON, 0, len(fj))
+	err = json.Unmarshal(fromStrings, &fromJson)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !reflect.DeepEqual(fromJson, fj) {
+		t.Error("Expected:   ", fj)
+		t.Error("Unexpected: ", fromJson)
+	}
+}
+
+func TestYAML(t *testing.T) {
+	document, err := yaml.Marshal(fixtures)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	expected := make([]fixtureJSON, len(fixtures))
+	for i, v := range fixtures {
+		var err error
+		expected[i].GreaterVersion, err = NewVersion(v.GreaterVersion)
+		if err != nil {
+			t.Fatal(err)
+		}
+		expected[i].LesserVersion, err = NewVersion(v.LesserVersion)
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	fromYAML := make([]fixtureJSON, 0, len(fixtures))
+	err = yaml.Unmarshal(document, &fromYAML)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !reflect.DeepEqual(fromYAML, expected) {
+		t.Error("Expected:   ", expected)
+		t.Error("Unexpected: ", fromYAML)
+	}
+}
+
+func TestBadInput(t *testing.T) {
+	bad := []string{
+		"1.2",
+		"1.2.3x",
+		"0x1.3.4",
+		"-1.2.3",
+		"1.2.3.4",
+	}
+	for _, b := range bad {
+		if _, err := NewVersion(b); err == nil {
+			t.Error("Improperly accepted value: ", b)
+		}
+	}
+}
+
+func TestFlag(t *testing.T) {
+	v := Version{}
+	f := flag.NewFlagSet("version", flag.ContinueOnError)
+	f.Var(&v, "version", "set version")
+
+	if err := f.Set("version", "1.2.3"); err != nil {
+		t.Fatal(err)
+	}
+
+	if v.String() != "1.2.3" {
+		t.Errorf("Set wrong value %q", v)
+	}
+}
+
+func ExampleVersion_LessThan() {
+	vA := New("1.2.3")
+	vB := New("3.2.1")
+
+	fmt.Printf("%s < %s == %t\n", vA, vB, vA.LessThan(*vB))
+	// Output:
+	// 1.2.3 < 3.2.1 == true
+}
diff --git a/vendor/github.com/coreos/go-semver/semver/sort.go b/vendor/github.com/coreos/go-semver/semver/sort.go
new file mode 100644
index 0000000000..e256b41a5d
--- /dev/null
+++ b/vendor/github.com/coreos/go-semver/semver/sort.go
@@ -0,0 +1,38 @@
+// Copyright 2013-2015 CoreOS, Inc.
+//
+// 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 semver
+
+import (
+	"sort"
+)
+
+type Versions []*Version
+
+func (s Versions) Len() int {
+	return len(s)
+}
+
+func (s Versions) Swap(i, j int) {
+	s[i], s[j] = s[j], s[i]
+}
+
+func (s Versions) Less(i, j int) bool {
+	return s[i].LessThan(*s[j])
+}
+
+// Sort sorts the given slice of Version
+func Sort(versions []*Version) {
+	sort.Sort(Versions(versions))
+}
diff --git a/vendor/github.com/miekg/coredns/.gitignore b/vendor/github.com/miekg/coredns/.gitignore
new file mode 100644
index 0000000000..8ab6c9c9d0
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/.gitignore
@@ -0,0 +1,7 @@
+query.log
+Corefile
+*.swp
+coredns
+kubectl
+go-test-tmpfile*
+coverage.txt
diff --git a/vendor/github.com/miekg/coredns/.travis.yml b/vendor/github.com/miekg/coredns/.travis.yml
new file mode 100644
index 0000000000..3a3f1aa261
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/.travis.yml
@@ -0,0 +1,49 @@
+sudo: required
+# Trusty distribution is much faster when sudo is required
+dist: trusty
+
+services:
+  - docker
+
+language: go
+go:
+  - 1.8
+
+go_import_path: github.com/coredns/coredns
+
+env:
+  - ETCD_VERSION=2.3.1 K8S_VERSION=1.3.7 KUBECTL="docker exec hyperkube /hyperkube kubectl" DNS_ARGUMENTS=""
+
+# In the Travis VM-based build environment, IPv6 networking is not
+# enabled by default. The sysctl operations below enable IPv6.
+# IPv6 is needed by some of the CoreDNS test cases. The VM environment
+# is needed to have access to sudo in the test environment. Sudo is
+# needed to have docker in the test environment. Docker is needed to
+# launch a kubernetes instance in the test environment.
+# (Dependencies are fun! :) )
+before_install:
+  - cat /proc/net/if_inet6
+  - uname -a
+  - sudo bash -c 'if [ `cat /proc/net/if_inet6 | wc -l` = "0" ]; then echo "Enabling IPv6" ; sysctl net.ipv6.conf.all.disable_ipv6=0 ; sysctl net.ipv6.conf.default.disable_ipv6=0 ; sysctl net.ipv6.conf.lo.disable_ipv6=0 ; fi'
+  - cat /proc/net/if_inet6
+  - env
+
+before_script:
+  - docker run -d --net=host --name=etcd quay.io/coreos/etcd:v$ETCD_VERSION
+  - docker run -d --volume=/:/rootfs:ro --volume=/sys:/sys:ro --volume=/var/lib/docker/:/var/lib/docker:rw --volume=/var/lib/kubelet/:/var/lib/kubelet:rw --volume=/var/run:/var/run:rw --volume=`pwd`/.travis:/travis --net=host --pid=host --privileged --name=hyperkube gcr.io/google_containers/hyperkube-amd64:v$K8S_VERSION /hyperkube kubelet --containerized --hostname-override=127.0.0.1 --api-servers=http://localhost:8080 --config=/etc/kubernetes/manifests $DNS_ARGUMENTS --allow-privileged --v=2
+  # Wait until kubectl is ready
+  - for i in {1..10}; do $KUBECTL version && break || sleep 5; done
+  - $KUBECTL version
+  - $KUBECTL config set-cluster test-doc --server=http://localhost:8080
+  - $KUBECTL config set-context test-doc --cluster=test-doc
+  - $KUBECTL config use-context test-doc
+  # Wait until k8s is ready
+  - for i in {1..30}; do $KUBECTL get nodes && break || sleep 5; done
+  - $KUBECTL create -f /travis/kubernetes/dns-test.yaml
+  - docker ps -a
+
+script:
+  - make coverage
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
diff --git a/vendor/github.com/miekg/coredns/.travis/kubernetes/dns-test.yaml b/vendor/github.com/miekg/coredns/.travis/kubernetes/dns-test.yaml
new file mode 100644
index 0000000000..1f5587ca3b
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/.travis/kubernetes/dns-test.yaml
@@ -0,0 +1,185 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: test-1
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: test-2
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: de-1-a
+  namespace: test-1
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: app-1-a
+    spec:
+      containers:
+      - name: app-1-a-c
+        image: gcr.io/google_containers/pause-amd64:3.0
+        ports:
+        - containerPort: 80
+          name: http
+          protocol: TCP
+        - containerPort: 443
+          name: https
+          protocol: TCP
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: de-1-b
+  namespace: test-1
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: app-1-b
+    spec:
+      containers:
+      - name: app-1-b-c
+        image: gcr.io/google_containers/pause-amd64:3.0
+        ports:
+        - containerPort: 80
+          name: http
+          protocol: TCP
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: de-c
+  namespace: test-1
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: app-c
+    spec:
+      containers:
+      - name: app-c-c
+        image: gcr.io/google_containers/pause-amd64:3.0
+        ports:
+        - containerPort: 1234
+          name: c-port
+          protocol: UDP
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: de-c
+  namespace: test-2
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: app-c
+    spec:
+      containers:
+      - name: app-c-c
+        image: gcr.io/google_containers/pause-amd64:3.0
+        ports:
+        - containerPort: 1234
+          name: c-port
+          protocol: UDP
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: de-d1
+  namespace: test-1
+spec:
+  replicas: 2
+  template:
+    metadata:
+      labels:
+        app: app-d
+    spec:
+      containers:
+      - name: app-d-c
+        image: gcr.io/google_containers/pause-amd64:3.0
+        ports:
+        - containerPort: 1234
+          name: c-port
+          protocol: UDP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: svc-1-a
+  namespace: test-1
+spec:
+  selector:
+    app: app-1-a
+  clusterIP: 10.0.0.100
+  ports:
+  - name: http
+    port: 80
+    protocol: TCP
+  - name: https
+    port: 443
+    protocol: TCP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: svc-1-b
+  namespace: test-1
+spec:
+  selector:
+    app: app-1-b
+  clusterIP: 10.0.0.110
+  ports:
+  - name: http
+    port: 80
+    protocol: TCP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: svc-c
+  namespace: test-1
+spec:
+  selector:
+    app: app-c
+  clusterIP: 10.0.0.115
+  ports:
+  - name: c-port
+    port: 1234
+    protocol: UDP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: svc-c
+  namespace: test-2
+spec:
+  selector:
+    app: app-c
+  clusterIP: 10.0.0.120
+  ports:
+  - name: c-port
+    port: 1234
+    protocol: UDP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: headless-svc
+  namespace: test-1
+spec:
+  selector:
+    app: app-d
+  clusterIP: None
+  ports:
+  - name: c-port
+    port: 1234
+    protocol: UDP
diff --git a/vendor/github.com/miekg/coredns/CODE-OF-CONDUCT.md b/vendor/github.com/miekg/coredns/CODE-OF-CONDUCT.md
new file mode 100644
index 0000000000..26a2b36731
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/CODE-OF-CONDUCT.md
@@ -0,0 +1,43 @@
+CNCF Community Code of Conduct
+
+### Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of fostering
+an open and welcoming community, we pledge to respect all people who contribute
+through reporting issues, posting feature requests, updating documentation,
+submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for
+everyone, regardless of level of experience, gender, gender identity and expression,
+sexual orientation, disability, personal appearance, body size, race, ethnicity, age,
+religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic addresses,
+ without explicit permission
+* Other unethical or unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are not
+aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers
+commit themselves to fairly and consistently applying these principles to every aspect
+of managing this project. Project maintainers who do not follow or enforce the Code of
+Conduct may be permanently removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a CNCF project maintainer, Sarah Novotny <sarahnovotny@google.com>, and/or Dan Kohn <dan@linuxfoundation.org>.
+
+This Code of Conduct is adapted from the Contributor Covenant
+(http://contributor-covenant.org), version 1.2.0, available at
+http://contributor-covenant.org/version/1/2/0/
+
+### CNCF Events Code of Conduct
+
+CNCF events are governed by the Linux Foundation [Code of Conduct](http://events.linuxfoundation.org/events/cloudnativecon/attend/code-of-conduct) available on the event page. This is designed to be compatible with the above policy and also includes more details on responding to incidents.
diff --git a/vendor/github.com/miekg/coredns/CONTRIBUTING.md b/vendor/github.com/miekg/coredns/CONTRIBUTING.md
new file mode 100644
index 0000000000..cae1d899cb
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/CONTRIBUTING.md
@@ -0,0 +1,87 @@
+## Contributing to CoreDNS
+
+Welcome! Our community focuses on helping others and making CoreDNS the best it
+can be. We gladly accept contributions and encourage you to get involved!
+
+### Bug reports
+
+First, please [search this repository](https://github.com/coredns/coredns/search?q=&type=Issues&utf8=%E2%9C%93)
+with a variety of keywords to ensure your bug is not already reported.
+
+If not, [open an issue](https://github.com/coredns/coredns/issues) and answer the
+questions so we can understand and reproduce the problematic behavior.
+
+The burden is on you to convince us that it is actually a bug in CoreDNS. This is
+easiest to do when you write clear, concise instructions so we can reproduce
+the behavior (even if it seems obvious). The more detailed and specific you are,
+the faster we will be able to help you. Check out
+[How to Report Bugs Effectively](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html).
+
+Please be kind. :smile: Remember that CoreDNS comes at no cost to you, and you're
+getting free help.
+
+
+### Minor improvements and new tests
+
+Submit [pull requests](https://github.com/coredns/coredns/pulls) at any time. Make
+sure to write tests to assert your change is working properly and is thoroughly
+covered.
+
+
+### Proposals, suggestions, ideas, new features
+
+First, please [search](https://github.com/coredns/coredns/search?q=&type=Issues&utf8=%E2%9C%93)
+with a variety of keywords to ensure your suggestion/proposal is new.
+
+If so, you may open either an issue or a pull request for discussion and
+feedback.
+
+The advantage of issues is that you don't have to spend time actually
+implementing your idea, but you should still describe it thoroughly. The
+advantage of a pull request is that we can immediately see the impact the change
+will have on the project, what the code will look like, and how to improve it.
+The disadvantage of pull requests is that they are unlikely to get accepted
+without significant changes, or it may be rejected entirely. Don't worry, that
+won't happen without an open discussion first.
+
+If you are going to spend significant time implementing code for a pull request,
+best to open an issue first and "claim" it and get feedback before you invest
+a lot of time.
+
+
+### Vulnerabilities
+
+If you've found a vulnerability that is serious, please email me: <miek@miek.nl>.
+If it's not a big deal, a pull request will probably be faster.
+
+## Thank you
+
+Thanks for your help! CoreDNS would not be what it is today without your contributions.
+
+## Git Hook
+
+We use `golint` and `go vet` as tools to warn use about things (noted golint is obnoxious sometimes,
+but still helpful). Add the following script as a git `post-commit` in `.git/hooks/post-commit` and
+make it executable.
+
+~~~ sh
+#!/bin/bash
+
+# <https://git-scm.com/docs/githooks>:
+# The script takes no parameters and its exit status does not affect the commit in any way.  You can
+# use git # rev-parse HEAD to get the new commit’s SHA1 hash, or you can use git log -l HEAD to get
+# all of its # information.
+
+for d in *; do
+    if [[ "$d" == "vendor" ]]; then
+        continue
+    fi
+    if [[ "$d" == "logo" ]]; then
+        continue
+    fi
+    if [[ ! -d "$d" ]]; then
+        continue
+    fi
+    golint "$d"/...
+done
+~~~
diff --git a/vendor/github.com/miekg/coredns/Dockerfile b/vendor/github.com/miekg/coredns/Dockerfile
new file mode 100644
index 0000000000..b76adcc63a
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/Dockerfile
@@ -0,0 +1,9 @@
+FROM alpine:latest
+MAINTAINER Miek Gieben <miek@miek.nl> @miekg
+
+RUN apk --update add bind-tools && rm -rf /var/cache/apk/*
+
+ADD coredns /coredns
+
+EXPOSE 53 53/udp
+ENTRYPOINT ["/coredns"]
diff --git a/vendor/github.com/miekg/coredns/LICENSE b/vendor/github.com/miekg/coredns/LICENSE
new file mode 100644
index 0000000000..8dada3edaf
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   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.
diff --git a/vendor/github.com/miekg/coredns/Makefile b/vendor/github.com/miekg/coredns/Makefile
new file mode 100644
index 0000000000..5211aa19c4
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/Makefile
@@ -0,0 +1,72 @@
+BUILD_VERBOSE := -v
+
+TEST_VERBOSE := -v
+
+all: coredns
+
+# Phony this to ensure we always build the binary.
+# TODO: Add .go file dependencies.
+.PHONY: coredns
+coredns: check
+	go build $(BUILD_VERBOSE) -ldflags="-s -w"
+
+.PHONY: deps
+deps: core/zmiddleware.go core/dnsserver/zdirectives.go
+	go get ${BUILD_VERBOSE}
+	go get -u github.com/golang/lint/golint
+
+.PHONY: check
+check: fmt deps
+
+.PHONY: test
+test: check
+	go test -race $(TEST_VERBOSE) ./test ./middleware/...
+
+.PHONY: testk8s
+testk8s: check
+	go test -race $(TEST_VERBOSE) -tags=k8s -run 'TestKubernetes' ./test ./middleware/kubernetes/...
+
+.PHONY: coverage
+coverage: check
+	set -e -x
+	echo "" > coverage.txt
+	for d in `go list ./... | grep -v vendor`; do \
+		go test $(TEST_VERBOSE)  -tags 'etcd k8s' -race -coverprofile=cover.out -covermode=atomic -bench=. $$d || exit 1; \
+		if [ -f cover.out ]; then \
+			cat cover.out >> coverage.txt; \
+			rm cover.out; \
+		fi; \
+	done
+
+.PHONY: clean
+clean:
+	go clean
+	rm -f coredns
+
+core/zmiddleware.go core/dnsserver/zdirectives.go: middleware.cfg
+	go generate coredns.go
+
+.PHONY: gen
+gen:
+	go generate coredns.go
+
+.PHONY: fmt
+fmt:
+	## run go fmt
+	@test -z "$$(gofmt -s -l . | grep -v vendor/ | tee /dev/stderr)" || \
+		(echo "please format Go code with 'gofmt -s -w'" && false)
+
+.PHONY: lint
+lint: deps
+	## run go lint, suggestion only (not enforced)
+	@test -z "$$(golint ./... | grep -v vendor/ | grep -v ".pb.go:" | grep -vE "context\.Context should be the first parameter of a function" | tee /dev/stderr)"
+
+.PHONY: distclean
+distclean: clean
+	# Clean all dependencies and build artifacts
+	find $(GOPATH)/pkg -maxdepth 1 -mindepth 1 | xargs rm -rf
+	find $(GOPATH)/bin -maxdepth 1 -mindepth 1 | xargs rm -rf
+
+	find $(GOPATH)/src -maxdepth 1 -mindepth 1 | grep -v github | xargs rm -rf
+	find $(GOPATH)/src -maxdepth 2 -mindepth 2 | grep -v miekg | xargs rm -rf
+	find $(GOPATH)/src/github.com/miekg -maxdepth 1 -mindepth 1 \! -name \*coredns\* | xargs rm -rf
diff --git a/vendor/github.com/miekg/coredns/Makefile.release b/vendor/github.com/miekg/coredns/Makefile.release
new file mode 100644
index 0000000000..a9835c0812
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/Makefile.release
@@ -0,0 +1,89 @@
+# Makefile for releasing CoreDNS
+#
+# The release is controlled from coremain/version.go. The version found
+# there is used to tag the git repo and to build the assets that are
+# uploaded to github (after some sanity checks).
+#
+# The release should be accompanied by release notes published on
+# blog.coredns.io. For example:
+# https://blog.coredns.io/2016/09/18/coredns-001-release/
+#
+# We use https://github.com/progrium/gh-release to automate github stuff
+# be sure to have that binary in your path.
+#
+# Get a list of authors for this release with:
+#
+# git log --pretty=format:'%an' v001..master | sort -u
+# (where v001 is the previous release, obviously you'll need to adjust this)
+#
+# Steps:
+# * Get an access token: https://help.github.com/articles/creating-an-access-token-for-command-line-use/
+# * export GITHUB_ACCESS_TOKEN=<token>
+# * Up the version in coremain/version.go
+# * Run: make -f Makefile.release
+#   * will commit your change with 'Release $VERSION'
+#   * push to github
+#   * build the release and do all that fluff.
+#
+# Steps for docker
+# * Login into docker: docker login (should have push creds for coredns registry)
+# * Run: make -f Makefile.release docker
+# 
+# Docker push should happen after you make the new release and uploaded it to Github.
+
+NAME:=coredns
+VERSION:=$(shell grep 'coreVersion' coremain/version.go | awk '{ print $$3 }' | tr -d '"')
+ARCH:=$(shell uname -m)
+GITHUB:=coredns
+DOCKER:=coredns
+DOCKER_IMAGE_NAME:=$(DOCKER)/$(NAME)
+
+all:	commit push build tar release
+
+docker: docker-build docker-release
+
+.PHONY: push
+push:
+	@echo Pushing release to master
+	git push
+
+.PHONY: commit
+commit:
+	@echo Committing
+	git commit -am"Release $(VERSION)"
+
+.PHONY: build
+build:
+	@echo Building: $(VERSION)
+	mkdir -p build/Darwin     && CGO_ENABLED=0 GOOS=darwin            go build -ldflags="-s -w" -o build/Darwin/$(NAME)
+	mkdir -p build/Linux/Arm  && CGO_ENABLED=0 GOOS=linux GOARCH=arm  go build -ldflags="-s -w" -o build/Linux/Arm/$(NAME)
+	mkdir -p build/Linux      && CGO_ENABLED=0 GOOS=linux             go build -ldflags="-s -w" -o build/Linux/$(NAME)
+
+
+.PHONY: tar
+tar:
+	rm -rf release && mkdir release
+	tar -zcf release/$(NAME)_$(VERSION)_linux_$(ARCH).tgz -C build/Linux $(NAME)
+	tar -zcf release/$(NAME)_$(VERSION)_linux_armv6l.tgz -C build/Linux/Arm $(NAME)
+	tar -zcf release/$(NAME)_$(VERSION)_darwin_$(ARCH).tgz -C build/Darwin $(NAME)
+
+.PHONY: release
+release:
+	@echo Releasing: $(VERSION)
+	gh-release create $(GITHUB)/$(NAME) $(VERSION)
+
+.PHONY: docker-build
+docker:
+	CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w"
+	docker build -t $(DOCKER_IMAGE_NAME) .
+	docker tag $(DOCKER_IMAGE_NAME):latest $(DOCKER_IMAGE_NAME):$(VERSION)
+
+.PHONY: docker-release
+docker-release:
+	@echo Pushing: $(VERSION)
+	docker tag $(DOCKER_IMAGE_NAME):latest $(DOCKER_IMAGE_NAME):$(VERSION)
+
+.PHONY: clean
+clean:
+	rm -rf release
+	rm -rf build
diff --git a/vendor/github.com/miekg/coredns/README.md b/vendor/github.com/miekg/coredns/README.md
new file mode 100644
index 0000000000..074b98c5d5
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/README.md
@@ -0,0 +1,226 @@
+# CoreDNS
+
+[![Documentation](https://img.shields.io/badge/godoc-reference-blue.svg?style=flat-square)](https://godoc.org/github.com/coredns/coredns)
+[![Build Status](https://img.shields.io/travis/coredns/coredns.svg?style=flat-square&label=build)](https://travis-ci.org/coredns/coredns)
+[![Code Coverage](https://img.shields.io/codecov/c/github/coredns/coredns/master.svg?style=flat-square)](https://codecov.io/github/coredns/coredns?branch=master)
+[![Go Report Card](https://goreportcard.com/badge/github.com/coredns/coredns?style=flat-square)](https://goreportcard.com/report/coredns/coredns)
+
+CoreDNS is a DNS server that started as a fork of [Caddy](https://github.com/mholt/caddy/). It has
+the same model: it chains middleware. In fact it's so similar that CoreDNS is now a server type
+plugin for Caddy.
+
+CoreDNS is also a [Cloud Native Computing Foundation](https://cncf.io) inception level project.
+
+CoreDNS is the successor to [SkyDNS](https://github.com/skynetservices/skydns). SkyDNS is a thin
+layer that exposes services in etcd in the DNS. CoreDNS builds on this idea and is a generic DNS
+server that can talk to multiple backends (etcd, kubernetes, etc.).
+
+CoreDNS aims to be a fast and flexible DNS server. The keyword here is *flexible*: with CoreDNS you
+are able to do what you want with your DNS data. And if not: write some middleware!
+
+CoreDNS can listen for DNS request coming in over UDP/TCP (go'old DNS), TLS ([RFC
+7858](https://tools.ietf.org/html/rfc7858)) and gRPC (not a standard.
+
+Currently CoreDNS is able to:
+
+* Serve zone data from a file; both DNSSEC (NSEC only) and DNS are supported (*file*).
+* Retrieve zone data from primaries, i.e., act as a secondary server (AXFR only) (*secondary*).
+* Sign zone data on-the-fly (*dnssec*).
+* Load balancing of responses (*loadbalance*).
+* Allow for zone transfers, i.e., act as a primary server (*file*).
+* Automatically load zone files from disk (*auto*)
+* Caching (*cache*).
+* Health checking endpoint (*health*).
+* Use etcd as a backend, i.e., a 101.5% replacement for
+  [SkyDNS](https://github.com/skynetservices/skydns) (*etcd*).
+* Use k8s (kubernetes) as a backend (*kubernetes*).
+* Serve as a proxy to forward queries to some other (recursive) nameserver (*proxy*).
+* Provide metrics (by using Prometheus) (*metrics*).
+* Provide query (*log*) and error (*error*) logging.
+* Support the CH class: `version.bind` and friends (*chaos*).
+* Profiling support (*pprof*).
+* Rewrite queries (qtype, qclass and qname) (*rewrite*).
+* Echo back the IP address, transport and port number used (*whoami*).
+
+Each of the middlewares has a README.md of its own.
+
+## Status
+
+CoreDNS can be used as an authoritative nameserver for your domains, and should be stable enough to
+provide you with good DNS(SEC) service.
+
+There are still a few known [issues](https://github.com/coredns/coredns/issues), and work is ongoing
+on making things fast and to reduce the memory usage.
+
+All in all, CoreDNS should be able to provide you with enough functionality to replace parts of BIND
+9, Knot, NSD or PowerDNS and SkyDNS. Most documentation is in the source and some blog articles can
+be [found here](https://blog.coredns.io). If you do want to use CoreDNS in production, please
+let us know and how we can help.
+
+<https://caddyserver.com/> is also full of examples on how to structure a Corefile (renamed from
+Caddyfile when forked).
+
+## Compilation
+
+CoreDNS (as a servertype plugin for Caddy) has a dependency on Caddy, but this is not different than
+any other Go dependency. If you have the source of CoreDNS, get all dependencies:
+
+    go get ./...
+
+And then `go build` as you would normally do:
+
+    go build
+
+This should yield a `coredns` binary.
+
+## Examples
+
+When starting CoreDNS without any configuration, it loads the `whoami` middleware and starts
+listening on port 53 (override with `-dns.port`), it should show the following:
+
+~~~ txt
+.:53
+2016/09/18 09:20:50 [INFO] CoreDNS-001
+CoreDNS-001
+~~~
+
+Any query send to port 53 should return some information; your sending address, port and protocol
+used.
+
+If you have a Corefile without a port number specified it will, by default, use port 53, but you
+can override the port with the `-dns.port` flag:
+
+~~~ txt
+.: {
+    proxy . 8.8.8.8:53
+    log stdout
+}
+~~~
+
+`./coredns -dns.port 1053`, runs the server on port 1053.
+
+Start a simple proxy, you'll need to be root to start listening on port 53.
+
+`Corefile` contains:
+
+~~~ txt
+.:53 {
+    proxy . 8.8.8.8:53
+    log stdout
+}
+~~~
+
+Just start CoreDNS: `./coredns`.
+And then just query on that port (53). The query should be forwarded to 8.8.8.8 and the response
+will be returned. Each query should also show up in the log.
+
+Serve the (NSEC) DNSSEC-signed `example.org` on port 1053, with errors and logging sent to stdout.
+Allow zone transfers to everybody, but specically mention 1 IP address so that CoreDNS can send
+notifies to it.
+
+~~~ txt
+example.org:1053 {
+    file /var/lib/coredns/example.org.signed {
+        transfer to *
+        transfer to 2001:500:8f::53
+    }
+    errors stdout
+    log stdout
+}
+~~~
+
+Serve `example.org` on port 1053, but forward everything that does *not* match `example.org` to a recursive
+nameserver *and* rewrite ANY queries to HINFO.
+
+~~~ txt
+.:1053 {
+    rewrite ANY HINFO
+    proxy . 8.8.8.8:53
+
+    file /var/lib/coredns/example.org.signed example.org {
+        transfer to *
+        transfer to 2001:500:8f::53
+    }
+    errors stdout
+    log stdout
+}
+~~~
+
+### Zone Specification
+
+The following Corefile fragment is legal, but does not explicitly define a zone to listen on:
+
+~~~ txt
+{
+   # ...
+}
+~~~
+
+This defaults to `.:53` (or whatever `-dns.port` is).
+
+The next one only defines a port:
+~~~ txt
+:123 {
+    # ...
+}
+~~~
+This defaults to the root zone `.`, but can't be overruled with the `-dns.port` flag.
+
+Just specifying a zone, default to listening on port 53 (can still be overridden with `-dns.port`:
+
+~~~ txt
+example.org {
+    # ...
+}
+~~~
+
+Listening on TLS and for gRPC? Use:
+
+~~~ txt
+tls://example.org grpc://example.org {
+    # ...
+}
+~~~
+
+Specifying ports works in the same way:
+
+~~~ txt
+grpc://example.org:1443 {
+    # ...
+}
+~~~
+
+When no transport protocol is specified the default `dns://` is assumed.
+
+## Blog and Contact
+
+Website: <https://coredns.io>
+Twitter: [@corednsio](https://twitter.com/corednsio)
+Docs: <https://miek.nl/tags/coredns/>
+Github: <https://github.com/coredns/coredns>
+
+
+## Systemd Service File
+
+Use this as a systemd service file. It defaults to a coredns with a homedir of /home/coredns
+and the binary lives in /opt/bin and the config in `/etc/coredns/Corefile`:
+
+~~~ txt
+[Unit]
+Description=CoreDNS DNS server
+Documentation=https://coredns.io
+After=network.target
+
+[Service]
+PermissionsStartOnly=true
+LimitNOFILE=8192
+User=coredns
+WorkingDirectory=/home/coredns
+ExecStartPre=/sbin/setcap cap_net_bind_service=+ep /opt/bin/coredns
+ExecStart=/opt/bin/coredns -conf=/etc/coredns/Corefile
+ExecReload=/bin/kill -SIGUSR1 $MAINPID
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
+~~~
diff --git a/vendor/github.com/miekg/coredns/core/coredns.go b/vendor/github.com/miekg/coredns/core/coredns.go
new file mode 100644
index 0000000000..f1c37cae47
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/core/coredns.go
@@ -0,0 +1,31 @@
+// Package core registers the server and all plugins we support.
+package core
+
+import (
+	// plug in the server
+	_ "github.com/coredns/coredns/core/dnsserver"
+
+	// plug in the standard directives (sorted)
+	_ "github.com/coredns/coredns/middleware/auto"
+	_ "github.com/coredns/coredns/middleware/bind"
+	_ "github.com/coredns/coredns/middleware/cache"
+	_ "github.com/coredns/coredns/middleware/chaos"
+	_ "github.com/coredns/coredns/middleware/dnssec"
+	_ "github.com/coredns/coredns/middleware/erratic"
+	_ "github.com/coredns/coredns/middleware/errors"
+	_ "github.com/coredns/coredns/middleware/etcd"
+	_ "github.com/coredns/coredns/middleware/file"
+	_ "github.com/coredns/coredns/middleware/health"
+	_ "github.com/coredns/coredns/middleware/kubernetes"
+	_ "github.com/coredns/coredns/middleware/loadbalance"
+	_ "github.com/coredns/coredns/middleware/log"
+	_ "github.com/coredns/coredns/middleware/metrics"
+	_ "github.com/coredns/coredns/middleware/pprof"
+	_ "github.com/coredns/coredns/middleware/proxy"
+	_ "github.com/coredns/coredns/middleware/reverse"
+	_ "github.com/coredns/coredns/middleware/rewrite"
+	_ "github.com/coredns/coredns/middleware/root"
+	_ "github.com/coredns/coredns/middleware/secondary"
+	_ "github.com/coredns/coredns/middleware/trace"
+	_ "github.com/coredns/coredns/middleware/whoami"
+)
diff --git a/vendor/github.com/miekg/coredns/core/dnsserver/address.go b/vendor/github.com/miekg/coredns/core/dnsserver/address.go
new file mode 100644
index 0000000000..48dcee3cf6
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/core/dnsserver/address.go
@@ -0,0 +1,89 @@
+package dnsserver
+
+import (
+	"fmt"
+	"net"
+	"strings"
+
+	"github.com/miekg/dns"
+)
+
+type zoneAddr struct {
+	Zone      string
+	Port      string
+	Transport string // dns, tls or grpc
+}
+
+// String return the string represenation of z.
+func (z zoneAddr) String() string { return z.Transport + "://" + z.Zone + ":" + z.Port }
+
+// Transport returns the protocol of the string s
+func Transport(s string) string {
+	switch {
+	case strings.HasPrefix(s, TransportTLS+"://"):
+		return TransportTLS
+	case strings.HasPrefix(s, TransportDNS+"://"):
+		return TransportDNS
+	case strings.HasPrefix(s, TransportGRPC+"://"):
+		return TransportGRPC
+	}
+	return TransportDNS
+}
+
+// normalizeZone parses an zone string into a structured format with separate
+// host, and port portions, as well as the original input string.
+//
+// TODO(miek): possibly move this to middleware/normalize.go
+func normalizeZone(str string) (zoneAddr, error) {
+	var err error
+
+	// Default to DNS if there isn't a transport protocol prefix.
+	trans := TransportDNS
+
+	switch {
+	case strings.HasPrefix(str, TransportTLS+"://"):
+		trans = TransportTLS
+		str = str[len(TransportTLS+"://"):]
+	case strings.HasPrefix(str, TransportDNS+"://"):
+		trans = TransportDNS
+		str = str[len(TransportDNS+"://"):]
+	case strings.HasPrefix(str, TransportGRPC+"://"):
+		trans = TransportGRPC
+		str = str[len(TransportGRPC+"://"):]
+	}
+
+	host, port, err := net.SplitHostPort(str)
+	if err != nil {
+		host, port, err = net.SplitHostPort(str + ":")
+		// no error check here; return err at end of function
+	}
+
+	if len(host) > 255 { // TODO(miek): this should take escaping into account.
+		return zoneAddr{}, fmt.Errorf("specified zone is too long: %d > 255", len(host))
+	}
+	_, d := dns.IsDomainName(host)
+	if !d {
+		return zoneAddr{}, fmt.Errorf("zone is not a valid domain name: %s", host)
+	}
+
+	if port == "" {
+		if trans == TransportDNS {
+			port = Port
+		}
+		if trans == TransportTLS {
+			port = TLSPort
+		}
+		if trans == TransportGRPC {
+			port = GRPCPort
+		}
+	}
+
+	return zoneAddr{Zone: strings.ToLower(dns.Fqdn(host)), Port: port, Transport: trans}, err
+}
+
+// Supported transports.
+const (
+	TransportDNS  = "dns"
+	TransportTLS  = "tls"
+	TransportGRPC = "grpc"
+)
diff --git a/vendor/github.com/miekg/coredns/core/dnsserver/address_test.go b/vendor/github.com/miekg/coredns/core/dnsserver/address_test.go
new file mode 100644
index 0000000000..84747d8723
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/core/dnsserver/address_test.go
@@ -0,0 +1,28 @@
+package dnsserver
+
+import "testing"
+
+func TestNormalizeZone(t *testing.T) {
+	for i, test := range []struct {
+		input     string
+		expected  string
+		shouldErr bool
+	}{
+		{".", "dns://.:53", false},
+		{".:54", "dns://.:54", false},
+		{"..", "://:", true},
+		{"..", "://:", true},
+	} {
+		addr, err := normalizeZone(test.input)
+		actual := addr.String()
+		if test.shouldErr && err == nil {
+			t.Errorf("Test %d: Expected error, but there wasn't any", i)
+		}
+		if !test.shouldErr && err != nil {
+			t.Errorf("Test %d: Expected no error, but there was one: %v", i, err)
+		}
+		if actual != test.expected {
+			t.Errorf("Test %d: Expected %s but got %s", i, test.expected, actual)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/core/dnsserver/config.go b/vendor/github.com/miekg/coredns/core/dnsserver/config.go
new file mode 100644
index 0000000000..942d43d586
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/core/dnsserver/config.go
@@ -0,0 +1,67 @@
+package dnsserver
+
+import (
+	"crypto/tls"
+
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/mholt/caddy"
+)
+
+// Config configuration for a single server.
+type Config struct {
+	// The zone of the site.
+	Zone string
+
+	// The hostname to bind listener to, defaults to the wildcard address
+	ListenHost string
+
+	// The port to listen on.
+	Port string
+
+	// Root points to a base directory we we find user defined "things".
+	// First consumer is the file middleware to looks for zone files in this place.
+	Root string
+
+	// The transport we implement, normally just "dns" over TCP/UDP, but could be
+	// DNS-over-TLS or DNS-over-gRPC.
+	Transport string
+
+	// TLSConfig when listening for encrypted connections (gRPC, DNS-over-TLS).
+	TLSConfig *tls.Config
+
+	// Middleware stack.
+	Middleware []middleware.Middleware
+
+	// Compiled middleware stack.
+	middlewareChain middleware.Handler
+}
+
+// GetConfig gets the Config that corresponds to c.
+// If none exist nil is returned.
+func GetConfig(c *caddy.Controller) *Config {
+	ctx := c.Context().(*dnsContext)
+	if cfg, ok := ctx.keysToConfigs[c.Key]; ok {
+		return cfg
+	}
+	// we should only get here during tests because directive
+	// actions typically skip the server blocks where we make
+	// the configs.
+	ctx.saveConfig(c.Key, &Config{})
+	return GetConfig(c)
+}
+
+// GetMiddleware returns the middleware handler that has been added to the config under name.
+// This is useful to inspect if a certain middleware is active in this server.
+// Note that this is order dependent and the order is defined in directives.go, i.e. if your middleware
+// comes before the middleware you are checking; it will not be there (yet).
+func GetMiddleware(c *caddy.Controller, name string) middleware.Handler {
+	conf := GetConfig(c)
+	for _, h := range conf.Middleware {
+		x := h(nil)
+		if name == x.Name() {
+			return x
+		}
+	}
+	return nil
+}
diff --git a/vendor/github.com/miekg/coredns/core/dnsserver/directives.go b/vendor/github.com/miekg/coredns/core/dnsserver/directives.go
new file mode 100644
index 0000000000..bc37baf112
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/core/dnsserver/directives.go
@@ -0,0 +1,64 @@
+package dnsserver
+
+import (
+	"fmt"
+	"os"
+	"strings"
+)
+
+// RegisterDevDirective splices name into the list of directives
+// immediately before another directive. This function is ONLY
+// for plugin development purposes! NEVER use it for a plugin
+// that you are not currently building. If before is empty,
+// the directive will be appended to the end of the list.
+//
+// It is imperative that directives execute in the proper
+// order, and hard-coding the list of directives guarantees
+// a correct, absolute order every time. This function is
+// convenient when developing a plugin, but it does not
+// guarantee absolute ordering. Multiple plugins registering
+// directives with this function will lead to non-
+// deterministic builds and buggy software.
+//
+// Directive names must be lower-cased and unique. Any errors
+// here are fatal, and even successful calls print a message
+// to stdout as a reminder to use it only in development.
+func RegisterDevDirective(name, before string) {
+	if name == "" {
+		fmt.Println("[FATAL] Cannot register empty directive name")
+		os.Exit(1)
+	}
+	if strings.ToLower(name) != name {
+		fmt.Printf("[FATAL] %s: directive name must be lowercase\n", name)
+		os.Exit(1)
+	}
+	for _, dir := range directives {
+		if dir == name {
+			fmt.Printf("[FATAL] %s: directive name already exists\n", name)
+			os.Exit(1)
+		}
+	}
+	if before == "" {
+		directives = append(directives, name)
+	} else {
+		var found bool
+		for i, dir := range directives {
+			if dir == before {
+				directives = append(directives[:i], append([]string{name}, directives[i:]...)...)
+				found = true
+				break
+			}
+		}
+		if !found {
+			fmt.Printf("[FATAL] %s: directive not found\n", before)
+			os.Exit(1)
+		}
+	}
+	msg := fmt.Sprintf("Registered directive '%s' ", name)
+	if before == "" {
+		msg += "at end of list"
+	} else {
+		msg += fmt.Sprintf("before '%s'", before)
+	}
+	fmt.Printf("[INFO] %s\n", msg)
+}
diff --git a/vendor/github.com/miekg/coredns/core/dnsserver/register.go b/vendor/github.com/miekg/coredns/core/dnsserver/register.go
new file mode 100644
index 0000000000..4b0ec5945b
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/core/dnsserver/register.go
@@ -0,0 +1,166 @@
+package dnsserver
+
+import (
+	"flag"
+	"fmt"
+	"net"
+	"time"
+
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/mholt/caddy"
+	"github.com/mholt/caddy/caddyfile"
+)
+
+const serverType = "dns"
+
+// Any flags defined here, need to be namespaced to the serverType other
+// wise they potentially clash with other server types.
+func init() {
+	flag.StringVar(&Port, serverType+".port", DefaultPort, "Default port")
+
+	caddy.RegisterServerType(serverType, caddy.ServerType{
+		Directives: func() []string { return directives },
+		DefaultInput: func() caddy.Input {
+			return caddy.CaddyfileInput{
+				Filepath:       "Corefile",
+				Contents:       []byte(".:" + Port + " {\nwhoami\n}\n"),
+				ServerTypeName: serverType,
+			}
+		},
+		NewContext: newContext,
+	})
+}
+
+func newContext() caddy.Context {
+	return &dnsContext{keysToConfigs: make(map[string]*Config)}
+}
+
+type dnsContext struct {
+	keysToConfigs map[string]*Config
+
+	// configs is the master list of all site configs.
+	configs []*Config
+}
+
+func (h *dnsContext) saveConfig(key string, cfg *Config) {
+	h.configs = append(h.configs, cfg)
+	h.keysToConfigs[key] = cfg
+}
+
+// InspectServerBlocks make sure that everything checks out before
+// executing directives and otherwise prepares the directives to
+// be parsed and executed.
+func (h *dnsContext) InspectServerBlocks(sourceFile string, serverBlocks []caddyfile.ServerBlock) ([]caddyfile.ServerBlock, error) {
+	// Normalize and check all the zone names and check for duplicates
+	dups := map[string]string{}
+	for _, s := range serverBlocks {
+		for i, k := range s.Keys {
+			za, err := normalizeZone(k)
+			if err != nil {
+				return nil, err
+			}
+			s.Keys[i] = za.String()
+			if v, ok := dups[za.String()]; ok {
+				return nil, fmt.Errorf("cannot serve %s - zone already defined for %v", za, v)
+			}
+			dups[za.String()] = za.String()
+
+			// Save the config to our master list, and key it for lookups
+			cfg := &Config{
+				Zone:      za.Zone,
+				Port:      za.Port,
+				Transport: za.Transport,
+			}
+			h.saveConfig(za.String(), cfg)
+		}
+	}
+	return serverBlocks, nil
+}
+
+// MakeServers uses the newly-created siteConfigs to create and return a list of server instances.
+func (h *dnsContext) MakeServers() ([]caddy.Server, error) {
+
+	// we must map (group) each config to a bind address
+	groups, err := groupConfigsByListenAddr(h.configs)
+	if err != nil {
+		return nil, err
+	}
+	// then we create a server for each group
+	var servers []caddy.Server
+	for addr, group := range groups {
+		// switch on addr
+		switch Transport(addr) {
+		case TransportDNS:
+			s, err := NewServer(addr, group)
+			if err != nil {
+				return nil, err
+			}
+			servers = append(servers, s)
+
+		case TransportTLS:
+			s, err := NewServerTLS(addr, group)
+			if err != nil {
+				return nil, err
+			}
+			servers = append(servers, s)
+
+		case TransportGRPC:
+			s, err := NewServergRPC(addr, group)
+			if err != nil {
+				return nil, err
+			}
+			servers = append(servers, s)
+
+		}
+
+	}
+
+	return servers, nil
+}
+
+// AddMiddleware adds a middleware to a site's middleware stack.
+func (c *Config) AddMiddleware(m middleware.Middleware) {
+	c.Middleware = append(c.Middleware, m)
+}
+
+// groupSiteConfigsByListenAddr groups site configs by their listen
+// (bind) address, so sites that use the same listener can be served
+// on the same server instance. The return value maps the listen
+// address (what you pass into net.Listen) to the list of site configs.
+// This function does NOT vet the configs to ensure they are compatible.
+func groupConfigsByListenAddr(configs []*Config) (map[string][]*Config, error) {
+	groups := make(map[string][]*Config)
+
+	for _, conf := range configs {
+		addr, err := net.ResolveTCPAddr("tcp", net.JoinHostPort(conf.ListenHost, conf.Port))
+		if err != nil {
+			return nil, err
+		}
+		addrstr := conf.Transport + "://" + addr.String()
+		groups[addrstr] = append(groups[addrstr], conf)
+	}
+
+	return groups, nil
+}
+
+const (
+	// DefaultPort is the default port.
+	DefaultPort = "53"
+	// TLSPort is the default port for DNS-over-TLS.
+	TLSPort = "853"
+	// GRPCPort is the default port for DNS-over-gRPC.
+	GRPCPort = "443"
+)
+
+// These "soft defaults" are configurable by
+// command line flags, etc.
+var (
+	// Port is the port we listen on by default.
+	Port = DefaultPort
+
+	// GracefulTimeout is the maximum duration of a graceful shutdown.
+	GracefulTimeout time.Duration
+)
+
+var _ caddy.GracefulServer = new(Server)
diff --git a/vendor/github.com/miekg/coredns/core/dnsserver/server-grpc.go b/vendor/github.com/miekg/coredns/core/dnsserver/server-grpc.go
new file mode 100644
index 0000000000..5eed5fc54c
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/core/dnsserver/server-grpc.go
@@ -0,0 +1,165 @@
+package dnsserver
+
+import (
+	"crypto/tls"
+	"errors"
+	"fmt"
+	"net"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/peer"
+
+	"github.com/coredns/coredns/pb"
+)
+
+// servergRPC represents an instance of a DNS-over-gRPC server.
+type servergRPC struct {
+	*Server
+	grpcServer *grpc.Server
+
+	listenAddr net.Addr
+}
+
+// NewGRPCServer returns a new CoreDNS GRPC server and compiles all middleware in to it.
+func NewServergRPC(addr string, group []*Config) (*servergRPC, error) {
+
+	s, err := NewServer(addr, group)
+	if err != nil {
+		return nil, err
+	}
+	gs := &servergRPC{Server: s}
+	gs.grpcServer = grpc.NewServer()
+	// trace foo... TODO(miek)
+	pb.RegisterDnsServiceServer(gs.grpcServer, gs)
+
+	return gs, nil
+}
+
+// Serve implements caddy.TCPServer interface.
+func (s *servergRPC) Serve(l net.Listener) error {
+	s.m.Lock()
+	s.listenAddr = l.Addr()
+	s.m.Unlock()
+
+	return s.grpcServer.Serve(l)
+}
+
+// ServePacket implements caddy.UDPServer interface.
+func (s *servergRPC) ServePacket(p net.PacketConn) error { return nil }
+
+// Listen implements caddy.TCPServer interface.
+func (s *servergRPC) Listen() (net.Listener, error) {
+
+	// The *tls* middleware must make sure that multiple conflicting
+	// TLS configuration return an error: it can only be specified once.
+	tlsConfig := new(tls.Config)
+	for _, conf := range s.zones {
+		// Should we error if some configs *don't* have TLS?
+		tlsConfig = conf.TLSConfig
+	}
+
+	var (
+		l   net.Listener
+		err error
+	)
+
+	if tlsConfig == nil {
+		l, err = net.Listen("tcp", s.Addr[len(TransportGRPC+"://"):])
+	} else {
+		l, err = tls.Listen("tcp", s.Addr[len(TransportGRPC+"://"):], tlsConfig)
+	}
+
+	if err != nil {
+		return nil, err
+	}
+	return l, nil
+}
+
+// ListenPacket implements caddy.UDPServer interface.
+func (s *servergRPC) ListenPacket() (net.PacketConn, error) { return nil, nil }
+
+// OnStartupComplete lists the sites served by this server
+// and any relevant information, assuming Quiet is false.
+func (s *servergRPC) OnStartupComplete() {
+	if Quiet {
+		return
+	}
+
+	for zone, config := range s.zones {
+		fmt.Println(TransportGRPC + "://" + zone + ":" + config.Port)
+	}
+}
+
+func (s *servergRPC) Stop() (err error) {
+	s.m.Lock()
+	defer s.m.Unlock()
+	if s.grpcServer != nil {
+		s.grpcServer.GracefulStop()
+	}
+	return
+}
+
+// Query is the main entry-point into the gRPC server. From here we call ServeDNS like
+// any normal server. We use a custom responseWriter to pick up the bytes we need to write
+// back to the client as a protobuf.
+func (s *servergRPC) Query(ctx context.Context, in *pb.DnsPacket) (*pb.DnsPacket, error) {
+	msg := new(dns.Msg)
+	err := msg.Unpack(in.Msg)
+	if err != nil {
+		return nil, err
+	}
+
+	p, ok := peer.FromContext(ctx)
+	if !ok {
+		return nil, errors.New("no peer in gRPC context")
+	}
+
+	a, ok := p.Addr.(*net.TCPAddr)
+	if !ok {
+		return nil, fmt.Errorf("no TCP peer in gRPC context: %v", p.Addr)
+	}
+
+	r := &net.IPAddr{IP: a.IP}
+	w := &gRPCresponse{localAddr: s.listenAddr, remoteAddr: r, Msg: msg}
+
+	s.ServeDNS(ctx, w, msg)
+
+	packed, err := w.Msg.Pack()
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.DnsPacket{Msg: packed}, nil
+}
+
+func (g *servergRPC) Shutdown() error {
+	if g.grpcServer != nil {
+		g.grpcServer.Stop()
+	}
+	return nil
+}
+
+type gRPCresponse struct {
+	localAddr  net.Addr
+	remoteAddr net.Addr
+	Msg        *dns.Msg
+}
+
+// Write is the hack that makes this work. It does not actually write the message
+// but returns the bytes we need to to write in r. We can then pick this up in Query
+// and write a proper protobuf back to the client.
+func (r *gRPCresponse) Write(b []byte) (int, error) {
+	r.Msg = new(dns.Msg)
+	return len(b), r.Msg.Unpack(b)
+}
+
+// These methods implement the dns.ResponseWriter interface from Go DNS.
+func (r *gRPCresponse) Close() error              { return nil }
+func (r *gRPCresponse) TsigStatus() error         { return nil }
+func (r *gRPCresponse) TsigTimersOnly(b bool)     { return }
+func (r *gRPCresponse) Hijack()                   { return }
+func (r *gRPCresponse) LocalAddr() net.Addr       { return r.localAddr }
+func (r *gRPCresponse) RemoteAddr() net.Addr      { return r.remoteAddr }
+func (r *gRPCresponse) WriteMsg(m *dns.Msg) error { r.Msg = m; return nil }
diff --git a/vendor/github.com/miekg/coredns/core/dnsserver/server-tls.go b/vendor/github.com/miekg/coredns/core/dnsserver/server-tls.go
new file mode 100644
index 0000000000..9d0a818769
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/core/dnsserver/server-tls.go
@@ -0,0 +1,85 @@
+package dnsserver
+
+import (
+	"context"
+	"crypto/tls"
+	"fmt"
+	"net"
+
+	"github.com/miekg/dns"
+)
+
+// serverTLS represents an instance of a TLS-over-DNS-server.
+type serverTLS struct {
+	*Server
+}
+
+// NewTLSServer returns a new CoreDNS TLS server and compiles all middleware in to it.
+func NewServerTLS(addr string, group []*Config) (*serverTLS, error) {
+
+	s, err := NewServer(addr, group)
+	if err != nil {
+		return nil, err
+	}
+
+	return &serverTLS{Server: s}, nil
+}
+
+// Serve implements caddy.TCPServer interface.
+func (s *serverTLS) Serve(l net.Listener) error {
+	s.m.Lock()
+
+	// Only fill out the TCP server for this one.
+	s.server[tcp] = &dns.Server{Listener: l, Net: "tcp-tls", Handler: dns.HandlerFunc(func(w dns.ResponseWriter, r *dns.Msg) {
+		ctx := context.Background()
+		s.ServeDNS(ctx, w, r)
+	})}
+	s.m.Unlock()
+
+	return s.server[tcp].ActivateAndServe()
+}
+
+// ServePacket implements caddy.UDPServer interface.
+func (s *serverTLS) ServePacket(p net.PacketConn) error { return nil }
+
+// Listen implements caddy.TCPServer interface.
+func (s *serverTLS) Listen() (net.Listener, error) {
+	// The *tls* middleware must make sure that multiple conflicting
+	// TLS configuration return an error: it can only be specified once.
+	tlsConfig := new(tls.Config)
+	for _, conf := range s.zones {
+		// Should we error if some configs *don't* have TLS?
+		tlsConfig = conf.TLSConfig
+	}
+
+	var (
+		l   net.Listener
+		err error
+	)
+
+	if tlsConfig == nil {
+		l, err = net.Listen("tcp", s.Addr[len(TransportTLS+"://"):])
+	} else {
+		l, err = tls.Listen("tcp", s.Addr[len(TransportTLS+"://"):], tlsConfig)
+	}
+
+	if err != nil {
+		return nil, err
+	}
+	return l, nil
+}
+
+// ListenPacket implements caddy.UDPServer interface.
+func (s *serverTLS) ListenPacket() (net.PacketConn, error) { return nil, nil }
+
+// OnStartupComplete lists the sites served by this server
+// and any relevant information, assuming Quiet is false.
+func (s *serverTLS) OnStartupComplete() {
+	if Quiet {
+		return
+	}
+
+	for zone, config := range s.zones {
+		fmt.Println(TransportTLS + "://" + zone + ":" + config.Port)
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/core/dnsserver/server.go b/vendor/github.com/miekg/coredns/core/dnsserver/server.go
new file mode 100644
index 0000000000..89060bc782
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/core/dnsserver/server.go
@@ -0,0 +1,281 @@
+// Package dnsserver implements all the interfaces from Caddy, so that CoreDNS can be a servertype plugin.
+package dnsserver
+
+import (
+	"fmt"
+	"log"
+	"net"
+	"runtime"
+	"sync"
+	"time"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/metrics/vars"
+	"github.com/coredns/coredns/middleware/pkg/edns"
+	"github.com/coredns/coredns/middleware/pkg/rcode"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+// Server represents an instance of a server, which serves
+// DNS requests at a particular address (host and port). A
+// server is capable of serving numerous zones on
+// the same address and the listener may be stopped for
+// graceful termination (POSIX only).
+type Server struct {
+	Addr string // Address we listen on
+
+	server [2]*dns.Server // 0 is a net.Listener, 1 is a net.PacketConn (a *UDPConn) in our case.
+	m      sync.Mutex     // protects the servers
+
+	zones       map[string]*Config // zones keyed by their address
+	dnsWg       sync.WaitGroup     // used to wait on outstanding connections
+	connTimeout time.Duration      // the maximum duration of a graceful shutdown
+}
+
+// NewServer returns a new CoreDNS server and compiles all middleware in to it.
+func NewServer(addr string, group []*Config) (*Server, error) {
+
+	s := &Server{
+		Addr:        addr,
+		zones:       make(map[string]*Config),
+		connTimeout: 5 * time.Second, // TODO(miek): was configurable
+	}
+
+	// We have to bound our wg with one increment
+	// to prevent a "race condition" that is hard-coded
+	// into sync.WaitGroup.Wait() - basically, an add
+	// with a positive delta must be guaranteed to
+	// occur before Wait() is called on the wg.
+	// In a way, this kind of acts as a safety barrier.
+	s.dnsWg.Add(1)
+
+	for _, site := range group {
+		// set the config per zone
+		s.zones[site.Zone] = site
+		// compile custom middleware for everything
+		var stack middleware.Handler
+		for i := len(site.Middleware) - 1; i >= 0; i-- {
+			stack = site.Middleware[i](stack)
+		}
+		site.middlewareChain = stack
+	}
+
+	return s, nil
+}
+
+// Serve starts the server with an existing listener. It blocks until the server stops.
+// This implements caddy.TCPServer interface.
+func (s *Server) Serve(l net.Listener) error {
+	s.m.Lock()
+	s.server[tcp] = &dns.Server{Listener: l, Net: "tcp", Handler: dns.HandlerFunc(func(w dns.ResponseWriter, r *dns.Msg) {
+		ctx := context.Background()
+		s.ServeDNS(ctx, w, r)
+	})}
+	s.m.Unlock()
+
+	return s.server[tcp].ActivateAndServe()
+}
+
+// ServePacket starts the server with an existing packetconn. It blocks until the server stops.
+// This implements caddy.UDPServer interface.
+func (s *Server) ServePacket(p net.PacketConn) error {
+	s.m.Lock()
+	s.server[udp] = &dns.Server{PacketConn: p, Net: "udp", Handler: dns.HandlerFunc(func(w dns.ResponseWriter, r *dns.Msg) {
+		ctx := context.Background()
+		s.ServeDNS(ctx, w, r)
+	})}
+	s.m.Unlock()
+
+	return s.server[udp].ActivateAndServe()
+}
+
+// Listen implements caddy.TCPServer interface.
+func (s *Server) Listen() (net.Listener, error) {
+	l, err := net.Listen("tcp", s.Addr[len(TransportDNS+"://"):])
+	if err != nil {
+		return nil, err
+	}
+	return l, nil
+}
+
+// ListenPacket implements caddy.UDPServer interface.
+func (s *Server) ListenPacket() (net.PacketConn, error) {
+	p, err := net.ListenPacket("udp", s.Addr[len(TransportDNS+"://"):])
+	if err != nil {
+		return nil, err
+	}
+
+	return p, nil
+}
+
+// Stop stops the server. It blocks until the server is
+// totally stopped. On POSIX systems, it will wait for
+// connections to close (up to a max timeout of a few
+// seconds); on Windows it will close the listener
+// immediately.
+// This implements Caddy.Stopper interface.
+func (s *Server) Stop() (err error) {
+
+	if runtime.GOOS != "windows" {
+		// force connections to close after timeout
+		done := make(chan struct{})
+		go func() {
+			s.dnsWg.Done() // decrement our initial increment used as a barrier
+			s.dnsWg.Wait()
+			close(done)
+		}()
+
+		// Wait for remaining connections to finish or
+		// force them all to close after timeout
+		select {
+		case <-time.After(s.connTimeout):
+		case <-done:
+		}
+	}
+
+	// Close the listener now; this stops the server without delay
+	s.m.Lock()
+	for _, s1 := range s.server {
+		// We might not have started and initialized the full set of servers
+		if s1 != nil {
+			err = s1.Shutdown()
+		}
+	}
+	s.m.Unlock()
+	return
+}
+
+// Address together with Stop() implement caddy.GracefulServer.
+func (s *Server) Address() string { return s.Addr }
+
+// ServeDNS is the entry point for every request to the address that s
+// is bound to. It acts as a multiplexer for the requests zonename as
+// defined in the request so that the correct zone
+// (configuration and middleware stack) will handle the request.
+func (s *Server) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) {
+	defer func() {
+		// In case the user doesn't enable error middleware, we still
+		// need to make sure that we stay alive up here
+		if rec := recover(); rec != nil {
+			DefaultErrorFunc(w, r, dns.RcodeServerFailure)
+		}
+	}()
+
+	if m, err := edns.Version(r); err != nil { // Wrong EDNS version, return at once.
+		w.WriteMsg(m)
+		return
+	}
+
+	q := r.Question[0].Name
+	b := make([]byte, len(q))
+	off, end := 0, false
+
+	var dshandler *Config
+
+	for {
+		l := len(q[off:])
+		for i := 0; i < l; i++ {
+			b[i] = q[off+i]
+			// normalize the name for the lookup
+			if b[i] >= 'A' && b[i] <= 'Z' {
+				b[i] |= ('a' - 'A')
+			}
+		}
+
+		if h, ok := s.zones[string(b[:l])]; ok {
+			if r.Question[0].Qtype != dns.TypeDS {
+				rcode, _ := h.middlewareChain.ServeDNS(ctx, w, r)
+				if rcodeNoClientWrite(rcode) {
+					DefaultErrorFunc(w, r, rcode)
+				}
+				return
+			}
+			// The type is DS, keep the handler, but keep on searching as maybe we are serving
+			// the parent as well and the DS should be routed to it - this will probably *misroute* DS
+			// queries to a possibly grand parent, but there is no way for us to know at this point
+			// if there is an actually delegation from grandparent -> parent -> zone.
+			// In all fairness: direct DS queries should not be needed.
+			dshandler = h
+		}
+		off, end = dns.NextLabel(q, off)
+		if end {
+			break
+		}
+	}
+
+	if dshandler != nil {
+		// DS request, and we found a zone, use the handler for the query
+		rcode, _ := dshandler.middlewareChain.ServeDNS(ctx, w, r)
+		if rcodeNoClientWrite(rcode) {
+			DefaultErrorFunc(w, r, rcode)
+		}
+		return
+	}
+
+	// Wildcard match, if we have found nothing try the root zone as a last resort.
+	if h, ok := s.zones["."]; ok {
+		rcode, _ := h.middlewareChain.ServeDNS(ctx, w, r)
+		if rcodeNoClientWrite(rcode) {
+			DefaultErrorFunc(w, r, rcode)
+		}
+		return
+	}
+
+	// Still here? Error out with REFUSED and some logging
+	remoteHost := w.RemoteAddr().String()
+	DefaultErrorFunc(w, r, dns.RcodeRefused)
+	log.Printf("[INFO] \"%s %s %s\" - No such zone at %s (Remote: %s)", dns.Type(r.Question[0].Qtype), dns.Class(r.Question[0].Qclass), q, s.Addr, remoteHost)
+}
+
+// OnStartupComplete lists the sites served by this server
+// and any relevant information, assuming Quiet is false.
+func (s *Server) OnStartupComplete() {
+	if Quiet {
+		return
+	}
+
+	for zone, config := range s.zones {
+		fmt.Println(zone + ":" + config.Port)
+	}
+}
+
+// DefaultErrorFunc responds to an DNS request with an error.
+func DefaultErrorFunc(w dns.ResponseWriter, r *dns.Msg, rc int) {
+	state := request.Request{W: w, Req: r}
+
+	answer := new(dns.Msg)
+	answer.SetRcode(r, rc)
+
+	state.SizeAndDo(answer)
+
+	vars.Report(state, vars.Dropped, rcode.ToString(rc), answer.Len(), time.Now())
+
+	w.WriteMsg(answer)
+}
+
+func rcodeNoClientWrite(rcode int) bool {
+	switch rcode {
+	case dns.RcodeServerFailure:
+		fallthrough
+	case dns.RcodeRefused:
+		fallthrough
+	case dns.RcodeFormatError:
+		fallthrough
+	case dns.RcodeNotImplemented:
+		return true
+	}
+	return false
+}
+
+const (
+	tcp = 0
+	udp = 1
+)
+
+var (
+	// Quiet mode will not show any informative output on initialization.
+	Quiet bool
+)
diff --git a/vendor/github.com/miekg/coredns/core/dnsserver/zdirectives.go b/vendor/github.com/miekg/coredns/core/dnsserver/zdirectives.go
new file mode 100644
index 0000000000..7be013e176
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/core/dnsserver/zdirectives.go
@@ -0,0 +1,39 @@
+// generated by directives_generate.go; DO NOT EDIT
+
+package dnsserver
+
+// Directives are registered in the order they should be
+// executed.
+//
+// Ordering is VERY important. Every middleware will
+// feel the effects of all other middleware below
+// (after) them during a request, but they must not
+// care what middleware above them are doing.
+
+var directives = []string{
+	"tls",
+	"root",
+	"bind",
+	"trace",
+	"health",
+	"pprof",
+	"prometheus",
+	"errors",
+	"log",
+	"chaos",
+	"cache",
+	"rewrite",
+	"loadbalance",
+	"dnssec",
+	"reverse",
+	"file",
+	"auto",
+	"secondary",
+	"etcd",
+	"kubernetes",
+	"proxy",
+	"whoami",
+	"erratic",
+	"startup",
+	"shutdown",
+}
diff --git a/vendor/github.com/miekg/coredns/core/zmiddleware.go b/vendor/github.com/miekg/coredns/core/zmiddleware.go
new file mode 100644
index 0000000000..baef133046
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/core/zmiddleware.go
@@ -0,0 +1,31 @@
+// generated by directives_generate.go; DO NOT EDIT
+
+package core
+
+import (
+	// Include all middleware.
+	_ "github.com/coredns/coredns/middleware/auto"
+	_ "github.com/coredns/coredns/middleware/bind"
+	_ "github.com/coredns/coredns/middleware/cache"
+	_ "github.com/coredns/coredns/middleware/chaos"
+	_ "github.com/coredns/coredns/middleware/dnssec"
+	_ "github.com/coredns/coredns/middleware/erratic"
+	_ "github.com/coredns/coredns/middleware/errors"
+	_ "github.com/coredns/coredns/middleware/etcd"
+	_ "github.com/coredns/coredns/middleware/file"
+	_ "github.com/coredns/coredns/middleware/health"
+	_ "github.com/coredns/coredns/middleware/kubernetes"
+	_ "github.com/coredns/coredns/middleware/loadbalance"
+	_ "github.com/coredns/coredns/middleware/log"
+	_ "github.com/coredns/coredns/middleware/metrics"
+	_ "github.com/coredns/coredns/middleware/pprof"
+	_ "github.com/coredns/coredns/middleware/proxy"
+	_ "github.com/coredns/coredns/middleware/reverse"
+	_ "github.com/coredns/coredns/middleware/rewrite"
+	_ "github.com/coredns/coredns/middleware/root"
+	_ "github.com/coredns/coredns/middleware/secondary"
+	_ "github.com/coredns/coredns/middleware/tls"
+	_ "github.com/coredns/coredns/middleware/trace"
+	_ "github.com/coredns/coredns/middleware/whoami"
+	_ "github.com/mholt/caddy/startupshutdown"
+)
diff --git a/vendor/github.com/miekg/coredns/coredns.go b/vendor/github.com/miekg/coredns/coredns.go
new file mode 100644
index 0000000000..aa9e20818c
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/coredns.go
@@ -0,0 +1,9 @@
+package main
+
+//go:generate go run directives_generate.go
+
+import "github.com/coredns/coredns/coremain"
+
+func main() {
+	coremain.Run()
+}
diff --git a/vendor/github.com/miekg/coredns/coremain/run.go b/vendor/github.com/miekg/coredns/coremain/run.go
new file mode 100644
index 0000000000..2ae9d0b32b
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/coremain/run.go
@@ -0,0 +1,260 @@
+// Package coremain contains the functions for starting CoreDNS.
+package coremain
+
+import (
+	"errors"
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"os"
+	"runtime"
+	"strconv"
+	"strings"
+
+	"github.com/mholt/caddy"
+
+	"github.com/coredns/coredns/core/dnsserver"
+
+	// Plug in CoreDNS
+	_ "github.com/coredns/coredns/core"
+)
+
+func init() {
+	// Reset flag.CommandLine to get rid of unwanted flags for instance from glog (used in kubernetes).
+	// And readd the once we want to keep.
+	flag.VisitAll(func(f *flag.Flag) {
+		if _, ok := flagsBlacklist[f.Name]; ok {
+			return
+		}
+		flagsToKeep = append(flagsToKeep, f)
+	})
+
+	flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ExitOnError)
+	for _, f := range flagsToKeep {
+		flag.Var(f.Value, f.Name, f.Usage)
+	}
+
+	caddy.TrapSignals()
+	caddy.DefaultConfigFile = "Corefile"
+	caddy.Quiet = true // don't show init stuff from caddy
+	setVersion()
+
+	flag.StringVar(&conf, "conf", "", "Corefile to load (default \""+caddy.DefaultConfigFile+"\")")
+	flag.StringVar(&cpu, "cpu", "100%", "CPU cap")
+	flag.BoolVar(&plugins, "plugins", false, "List installed plugins")
+	flag.StringVar(&logfile, "log", "", "Process log file")
+	flag.StringVar(&caddy.PidFile, "pidfile", "", "Path to write pid file")
+	flag.BoolVar(&version, "version", false, "Show version")
+	flag.BoolVar(&dnsserver.Quiet, "quiet", false, "Quiet mode (no initialization output)")
+
+	caddy.RegisterCaddyfileLoader("flag", caddy.LoaderFunc(confLoader))
+	caddy.SetDefaultCaddyfileLoader("default", caddy.LoaderFunc(defaultLoader))
+}
+
+// Run is CoreDNS's main() function.
+func Run() {
+
+	flag.Parse()
+
+	caddy.AppName = coreName
+	caddy.AppVersion = coreVersion
+
+	// Set up process log before anything bad happens
+	switch logfile {
+	case "stdout":
+		log.SetOutput(os.Stdout)
+	case "stderr":
+		log.SetOutput(os.Stderr)
+	default:
+		log.SetOutput(os.Stdout)
+	}
+	log.SetFlags(log.LstdFlags)
+
+	if version {
+		showVersion()
+		os.Exit(0)
+	}
+	if plugins {
+		fmt.Println(caddy.DescribePlugins())
+		os.Exit(0)
+	}
+
+	// Set CPU cap
+	if err := setCPU(cpu); err != nil {
+		mustLogFatal(err)
+	}
+
+	// Get Corefile input
+	corefile, err := caddy.LoadCaddyfile(serverType)
+	if err != nil {
+		mustLogFatal(err)
+	}
+
+	// Start your engines
+	instance, err := caddy.Start(corefile)
+	if err != nil {
+		mustLogFatal(err)
+	}
+
+	logVersion()
+	if !dnsserver.Quiet {
+		showVersion()
+	}
+
+	// Twiddle your thumbs
+	instance.Wait()
+}
+
+// mustLogFatal wraps log.Fatal() in a way that ensures the
+// output is always printed to stderr so the user can see it
+// if the user is still there, even if the process log was not
+// enabled. If this process is an upgrade, however, and the user
+// might not be there anymore, this just logs to the process
+// log and exits.
+func mustLogFatal(args ...interface{}) {
+	if !caddy.IsUpgrade() {
+		log.SetOutput(os.Stderr)
+	}
+	log.Fatal(args...)
+}
+
+// confLoader loads the Caddyfile using the -conf flag.
+func confLoader(serverType string) (caddy.Input, error) {
+	if conf == "" {
+		return nil, nil
+	}
+
+	if conf == "stdin" {
+		return caddy.CaddyfileFromPipe(os.Stdin, "dns")
+	}
+
+	contents, err := ioutil.ReadFile(conf)
+	if err != nil {
+		return nil, err
+	}
+	return caddy.CaddyfileInput{
+		Contents:       contents,
+		Filepath:       conf,
+		ServerTypeName: serverType,
+	}, nil
+}
+
+// defaultLoader loads the Corefile from the current working directory.
+func defaultLoader(serverType string) (caddy.Input, error) {
+	contents, err := ioutil.ReadFile(caddy.DefaultConfigFile)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return nil, nil
+		}
+		return nil, err
+	}
+	return caddy.CaddyfileInput{
+		Contents:       contents,
+		Filepath:       caddy.DefaultConfigFile,
+		ServerTypeName: serverType,
+	}, nil
+}
+
+// logVersion logs the version that is starting.
+func logVersion() { log.Print("[INFO] " + versionString()) }
+
+// showVersion prints the version that is starting.
+func showVersion() {
+	fmt.Print(versionString())
+	if devBuild && gitShortStat != "" {
+		fmt.Printf("%s\n%s\n", gitShortStat, gitFilesModified)
+	}
+}
+
+// versionString returns the CoreDNS version as a string.
+func versionString() string {
+	return fmt.Sprintf("%s-%s\n", caddy.AppName, caddy.AppVersion)
+}
+
+// setVersion figures out the version information
+// based on variables set by -ldflags.
+func setVersion() {
+	// A development build is one that's not at a tag or has uncommitted changes
+	devBuild = gitTag == "" || gitShortStat != ""
+
+	// Only set the appVersion if -ldflags was used
+	if gitNearestTag != "" || gitTag != "" {
+		if devBuild && gitNearestTag != "" {
+			appVersion = fmt.Sprintf("%s (+%s %s)",
+				strings.TrimPrefix(gitNearestTag, "v"), gitCommit, buildDate)
+		} else if gitTag != "" {
+			appVersion = strings.TrimPrefix(gitTag, "v")
+		}
+	}
+}
+
+// setCPU parses string cpu and sets GOMAXPROCS
+// according to its value. It accepts either
+// a number (e.g. 3) or a percent (e.g. 50%).
+func setCPU(cpu string) error {
+	var numCPU int
+
+	availCPU := runtime.NumCPU()
+
+	if strings.HasSuffix(cpu, "%") {
+		// Percent
+		var percent float32
+		pctStr := cpu[:len(cpu)-1]
+		pctInt, err := strconv.Atoi(pctStr)
+		if err != nil || pctInt < 1 || pctInt > 100 {
+			return errors.New("invalid CPU value: percentage must be between 1-100")
+		}
+		percent = float32(pctInt) / 100
+		numCPU = int(float32(availCPU) * percent)
+	} else {
+		// Number
+		num, err := strconv.Atoi(cpu)
+		if err != nil || num < 1 {
+			return errors.New("invalid CPU value: provide a number or percent greater than 0")
+		}
+		numCPU = num
+	}
+
+	if numCPU > availCPU {
+		numCPU = availCPU
+	}
+
+	runtime.GOMAXPROCS(numCPU)
+	return nil
+}
+
+// Flags that control program flow or startup
+var (
+	conf    string
+	cpu     string
+	logfile string
+	version bool
+	plugins bool
+)
+
+// Build information obtained with the help of -ldflags
+var (
+	appVersion = "(untracked dev build)" // inferred at startup
+	devBuild   = true                    // inferred at startup
+
+	buildDate        string // date -u
+	gitTag           string // git describe --exact-match HEAD 2> /dev/null
+	gitNearestTag    string // git describe --abbrev=0 --tags HEAD
+	gitCommit        string // git rev-parse HEAD
+	gitShortStat     string // git diff-index --shortstat
+	gitFilesModified string // git diff-index --name-only HEAD
+)
+
+// flagsBlacklist removes flags with these names from our flagset.
+var flagsBlacklist = map[string]bool{
+	"logtostderr":      true,
+	"alsologtostderr":  true,
+	"v":                true,
+	"stderrthreshold":  true,
+	"vmodule":          true,
+	"log_backtrace_at": true,
+	"log_dir":          true,
+}
+
+var flagsToKeep []*flag.Flag
diff --git a/vendor/github.com/miekg/coredns/coremain/run_test.go b/vendor/github.com/miekg/coredns/coremain/run_test.go
new file mode 100644
index 0000000000..da01637d8d
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/coremain/run_test.go
@@ -0,0 +1,44 @@
+package coremain
+
+import (
+	"runtime"
+	"testing"
+)
+
+func TestSetCPU(t *testing.T) {
+	currentCPU := runtime.GOMAXPROCS(-1)
+	maxCPU := runtime.NumCPU()
+	halfCPU := int(0.5 * float32(maxCPU))
+	if halfCPU < 1 {
+		halfCPU = 1
+	}
+	for i, test := range []struct {
+		input     string
+		output    int
+		shouldErr bool
+	}{
+		{"1", 1, false},
+		{"-1", currentCPU, true},
+		{"0", currentCPU, true},
+		{"100%", maxCPU, false},
+		{"50%", halfCPU, false},
+		{"110%", currentCPU, true},
+		{"-10%", currentCPU, true},
+		{"invalid input", currentCPU, true},
+		{"invalid input%", currentCPU, true},
+		{"9999", maxCPU, false}, // over available CPU
+	} {
+		err := setCPU(test.input)
+		if test.shouldErr && err == nil {
+			t.Errorf("Test %d: Expected error, but there wasn't any", i)
+		}
+		if !test.shouldErr && err != nil {
+			t.Errorf("Test %d: Expected no error, but there was one: %v", i, err)
+		}
+		if actual, expected := runtime.GOMAXPROCS(-1), test.output; actual != expected {
+			t.Errorf("Test %d: GOMAXPROCS was %d but expected %d", i, actual, expected)
+		}
+		// teardown
+		runtime.GOMAXPROCS(currentCPU)
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/coremain/version.go b/vendor/github.com/miekg/coredns/coremain/version.go
new file mode 100644
index 0000000000..37a5282c15
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/coremain/version.go
@@ -0,0 +1,8 @@
+package coremain
+
+const (
+	coreName    = "CoreDNS"
+	coreVersion = "006"
+
+	serverType = "dns"
+)
diff --git a/vendor/github.com/miekg/coredns/directives_generate.go b/vendor/github.com/miekg/coredns/directives_generate.go
new file mode 100644
index 0000000000..74f7e2be26
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/directives_generate.go
@@ -0,0 +1,119 @@
+//+build ignore
+
+package main
+
+import (
+	"bufio"
+	"go/format"
+	"io/ioutil"
+	"log"
+	"os"
+	"sort"
+	"strconv"
+	"strings"
+)
+
+func main() {
+	mi := make(map[string]string, 0)
+	md := make(map[int]string, 0)
+
+	file, err := os.Open(middlewareFile)
+	fatalIfErr(err)
+
+	defer file.Close()
+
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		line := scanner.Text()
+		if strings.HasPrefix(line, "#") {
+			continue
+		}
+
+		items := strings.Split(line, ":")
+		if len(items) != 3 {
+			// ignore
+			continue
+		}
+		priority, err := strconv.Atoi(items[0])
+		fatalIfErr(err)
+
+		if v, ok := md[priority]; ok {
+			log.Fatalf("Duplicate priority '%d', slot already taken by %q", priority, v)
+		}
+		md[priority] = items[1]
+		mi[items[1]] = middlewarePath + items[2] // Default, unless overriden by 3rd arg
+
+		if strings.Contains(items[2], "/") { // External package has been given
+			mi[items[1]] = items[2]
+		}
+	}
+
+	genImports("core/zmiddleware.go", "core", mi)
+	genDirectives("core/dnsserver/zdirectives.go", "dnsserver", md)
+}
+
+func genImports(file, pack string, mi map[string]string) {
+	outs := header + "package " + pack + "\n\n" + "import ("
+
+	if len(mi) > 0 {
+		outs += "\n"
+	}
+
+	outs += "// Include all middleware.\n"
+	for _, v := range mi {
+		outs += `_ "` + v + `"` + "\n"
+	}
+	outs += ")\n"
+
+	res, err := format.Source([]byte(outs))
+	fatalIfErr(err)
+
+	err = ioutil.WriteFile(file, res, 0644)
+	fatalIfErr(err)
+}
+
+func genDirectives(file, pack string, md map[int]string) {
+
+	outs := header + "package " + pack + "\n\n"
+	outs += `
+// Directives are registered in the order they should be
+// executed.
+//
+// Ordering is VERY important. Every middleware will
+// feel the effects of all other middleware below
+// (after) them during a request, but they must not
+// care what middleware above them are doing.
+
+var directives = []string{
+`
+
+	var orders []int
+	for k := range md {
+		orders = append(orders, k)
+	}
+	sort.Ints(orders)
+
+	for _, k := range orders {
+		outs += `"` + md[k] + `",` + "\n"
+	}
+
+	outs += "}\n"
+
+	res, err := format.Source([]byte(outs))
+	fatalIfErr(err)
+
+	err = ioutil.WriteFile(file, res, 0644)
+	fatalIfErr(err)
+}
+
+func fatalIfErr(err error) {
+	if err != nil {
+		log.Fatal(err)
+	}
+}
+
+const (
+	middlewarePath = "github.com/coredns/coredns/middleware/"
+	middlewareFile = "middleware.cfg"
+	header         = "// generated by directives_generate.go; DO NOT EDIT\n\n"
+)
diff --git a/vendor/github.com/miekg/coredns/middleware.cfg b/vendor/github.com/miekg/coredns/middleware.cfg
new file mode 100644
index 0000000000..6695718a2a
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware.cfg
@@ -0,0 +1,46 @@
+# Directives are registered in the order they should be
+# executed.
+#
+# Ordering is VERY important. Every middleware will
+# feel the effects of all other middleware below
+# (after) them during a request, but they must not
+# care what middleware above them are doing.
+
+# How to rebuild with updated middleware configurations:
+# Modify the list below and run `go gen && go build`
+
+# The parser takes the input format of
+#     <order>:<middleware-name>:<package-name>
+# Or
+#     <order>:<middleware-name>:<fully-qualified-package-name>
+#
+# External middleware example:
+# 80:log:github.com/coredns/coredns/middleware/log
+# Local middleware example:
+# 80:log:log
+
+1:tls:tls
+10:root:root
+20:bind:bind
+30:trace:trace
+40:health:health
+50:pprof:pprof
+60:prometheus:metrics
+70:errors:errors
+80:log:log
+90:chaos:chaos
+100:cache:cache
+110:rewrite:rewrite
+120:loadbalance:loadbalance
+130:dnssec:dnssec
+140:reverse:reverse
+150:file:file
+160:auto:auto
+170:secondary:secondary
+180:etcd:etcd
+190:kubernetes:kubernetes
+200:proxy:proxy
+210:whoami:whoami
+220:erratic:erratic
+500:startup:github.com/mholt/caddy/startupshutdown
+510:shutdown:github.com/mholt/caddy/startupshutdown
diff --git a/vendor/github.com/miekg/coredns/middleware.md b/vendor/github.com/miekg/coredns/middleware.md
new file mode 100644
index 0000000000..46e6e06733
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware.md
@@ -0,0 +1,134 @@
+# Middleware
+
+## Writing Middleware
+
+From the Caddy docs:
+
+> Oh yes, those pesky return values on ServeHTTP(). You read the documentation so you already know
+> what they mean. But what does that imply for the behavior of your middleware?
+>
+> Basically, return a status code only if you did NOT write to the response body. If you DO write to
+> the response body, return a status code of 0. Return an error value if your middleware encountered
+> an error that you want logged. It is common to return an error status and an error value together,
+> so that the error handler up the chain can write the correct error page.
+>
+> The returned status code is not logged directly; rather, it tells middleware higher up the chain
+> what status code to use if/when the response body is written. Again, return a 0 status if you've
+> already written a body!
+
+In the DNS status codes are called rcodes and it's slightly harder to return the correct
+answer in case of failure.
+
+So CoreDNS treats:
+
+* SERVFAIL (dns.RcodeServerFailure)
+* REFUSED (dns.RecodeRefused)
+* FORMERR (dns.RcodeFormatError)
+* NOTIMP (dns.RcodeNotImplemented)
+
+as special and will then assume nothing has written to the client. In all other cases it is assumes
+something has been written to the client (by the middleware).
+
+## Hooking It Up
+
+See a couple of blog posts on how to write and add middleware to CoreDNS:
+
+* <https://blog.coredns.io/#> TO BE PUBLISHED.
+* <https://blog.coredns.io/2016/12/19/writing-middleware-for-coredns/>, slightly older, but useful.
+
+## Metrics
+
+When exporting metrics the *Namespace* should be `middleware.Namespace` (="coredns"), and the
+*Subsystem* should be the name of the middleware. The README.md for the middleware should then
+also contain a *Metrics* section detailing the metrics.
+
+## Documentation
+
+Each middleware should have a README.md explaining what the middleware does and how it is
+configured. The file should have the following layout:
+
+* Title: use the middleware's name
+* Subsection titled: "Syntax"
+* Subsection titled: "Examples"
+
+More sections are of course possible.
+
+### Style
+
+We use the Unix manual page style:
+
+* The name of middleware in the running text should be italic: *middleware*.
+* all CAPITAL: user supplied argument, in the running text references this use strong text: `**`:
+  **EXAMPLE**.
+* Optional text: in block quotes: `[optional]`.
+* Use three dots to indicate multiple options are allowed: `arg...`.
+* Item used literal: `literal`.
+
+### Example Domain Names
+
+Please be sure to use `example.org` or `example.net` in any examples you provide. These are the
+standard domain names created for this purpose.
+
+## Fallthrough
+
+In a perfect world the following would be true for middleware: "Either you are responsible for
+a zone or not". If the answer is "not", the middleware should call the next middleware in the chain.
+If "yes" it should handle *all* names that fall in this zone and the names below - i.e. it should
+handle the entire domain.
+
+~~~ txt
+. {
+    file example.org db.example
+}
+~~~
+In this example the *file* middleware is handling all names below (and including) `example.org`. If
+a query comes in that is not a subdomain (or equal to) `example.org` the next middleware is called.
+
+Now, the world isn't perfect, and there are good reasons to "fallthrough" to the next middlware,
+meaning a middleware is only responsible for a subset of names within the zone. The first of these
+to appear was the *reverse* middleware that synthesis PTR and A/AAAA responses (useful with IPv6).
+
+The nature of the *reverse* middleware is such that it only deals with A,AAAA and PTR and then only
+for a subset of the names. Ideally you would want to layer *reverse* **in front off** another
+middleware such as *file* or *auto* (or even *proxy*). This means *reverse* handles some special
+reverse cases and **all other** request are handled by the backing middleware. This is exactly what
+"fallthrough" does. To keep things explicit we've opted that middlewares implement such behavior
+should implement a `fallthrough` keyword.
+
+### Example Fallthrough Usage
+
+The following Corefile example, sets up the *reverse* middleware, but disables fallthrough. It
+also defines a zonefile for use with the *file* middleware for other names in the `compute.internal`.
+
+~~~ txt
+arpa compute.internal {
+    reverse 10.32.0.0/16 {
+        hostname ip-{ip}.{zone[2]}
+        #fallthrough
+    }
+    file db.compute.internal compute.internal
+}
+~~~
+
+This works for returning a response to a PTR request:
+
+~~~ sh
+% dig +nocmd @localhost +noall +ans -x 10.32.0.1
+1.0.32.10.in-addr.arpa.	3600	IN	PTR	ip-10-32-0-1.compute.internal.
+~~~
+
+And for the forward:
+
+~~~ sh
+% dig +nocmd @localhost +noall +ans A ip-10-32-0-1.compute.internal
+ip-10-32-0-1.compute.internal. 3600 IN	A	10.32.0.1
+~~~
+
+But a query for `mx compute.internal` will return SERVFAIL. Now when we remove the '#' from
+fallthrough and reload (on Unix: `kill -SIGUSR1 $(pidof coredns)`) CoreDNS, we *should* get an
+answer for the MX query:
+
+~~~ sh
+% dig +nocmd @localhost +noall +ans MX compute.internal
+compute.internal.	3600	IN	MX	10 mx.compute.internal.
+~~~
diff --git a/vendor/github.com/miekg/coredns/middleware/auto/README.md b/vendor/github.com/miekg/coredns/middleware/auto/README.md
new file mode 100644
index 0000000000..64807b8213
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/auto/README.md
@@ -0,0 +1,67 @@
+# auto
+
+*auto* enables serving zone data from an RFC 1035-style master file which is automatically picked
+up from disk.
+
+The *auto* middleware is used for an "old-style" DNS server. It serves from a preloaded file that exists
+on disk. If the zone file contains signatures (i.e. is signed, i.e. DNSSEC) correct DNSSEC answers
+are returned. Only NSEC is supported! If you use this setup *you* are responsible for resigning the
+zonefile. New zones or changed zone are automatically picked up from disk.
+
+## Syntax
+
+~~~
+auto [ZONES...] {
+    directory DIR [REGEXP ORIGIN_TEMPLATE [TIMEOUT]]
+    no_reload
+    upstream ADDRESS...
+}
+~~~
+
+**ZONES** zones it should be authoritative for. If empty, the zones from the configuration block
+are used.
+
+* `directory` loads zones from the speficied **DIR**. If a file name matches **REGEXP** it will be
+  used to extract the origin. **ORIGIN_TEMPLATE** will be used as a template for the origin. Strings
+  like `{<number>}` are replaced with the respective matches in the file name, i.e. `{1}` is the
+  first match, `{2}` is the second, etc.. The default is: `db\.(.*)  {1}` e.g. from a file with the
+  name `db.example.com`, the extracted origin will be `example.com`. **TIMEOUT** specifies how often
+  CoreDNS should scan the directory, the default is every 60 seconds. This value is in seconds.
+  The minimum value is 1 second.
+* `no_reload` by default CoreDNS will reload a zone from disk whenever it detects a change to the
+  file. This option disables that behavior.
+* `upstream` defines upstream resolvers to be used resolve external names found (think CNAMEs)
+  pointing to external names.
+
+All directives from the *file* middleware are supported. Note that *auto* will load all zones found,
+even though the directive might only receive queries for a specific zone. I.e:
+
+~~~
+auto example.org {
+    directory /etc/coredns/zones
+}
+~~~
+Will happily pick up a zone for `example.COM`, except it will never be queried, because the *auto*
+directive only is authoritative for `example.ORG`.
+
+## Examples
+
+Load `org` domains from `/etc/coredns/zones/org` and allow transfers to the internet, but send
+notifies to 10.240.1.1
+
+~~~
+auto org {
+    directory /etc/coredns/zones/org
+    transfer to *
+    transfer to 10.240.1.1
+}
+~~~
+
+Load `org` domains from `/etc/coredns/zones/org` and looks for file names as `www.db.example.org`,
+where `example.org` is the origin. Scan every 45 seconds.
+
+~~~
+auto org {
+    directory /etc/coredns/zones/org www\.db\.(.*) {1} 45
+}
+~~~
diff --git a/vendor/github.com/miekg/coredns/middleware/auto/auto.go b/vendor/github.com/miekg/coredns/middleware/auto/auto.go
new file mode 100644
index 0000000000..019613a0ff
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/auto/auto.go
@@ -0,0 +1,100 @@
+// Package auto implements an on-the-fly loading file backend.
+package auto
+
+import (
+	"errors"
+	"regexp"
+	"time"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/file"
+	"github.com/coredns/coredns/middleware/metrics"
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+type (
+	// Auto holds the zones and the loader configuration for automatically loading zones.
+	Auto struct {
+		Next middleware.Handler
+		*Zones
+
+		metrics *metrics.Metrics
+		loader
+	}
+
+	loader struct {
+		directory string
+		template  string
+		re        *regexp.Regexp
+
+		// In the future this should be something like ZoneMeta that contains all this stuff.
+		transferTo []string
+		noReload   bool
+		proxy      proxy.Proxy // Proxy for looking up names during the resolution process
+
+		duration time.Duration
+	}
+)
+
+// ServeDNS implements the middleware.Handle interface.
+func (a Auto) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	state := request.Request{W: w, Req: r}
+	if state.QClass() != dns.ClassINET {
+		return dns.RcodeServerFailure, middleware.Error(a.Name(), errors.New("can only deal with ClassINET"))
+	}
+	qname := state.Name()
+
+	// TODO(miek): match the qname better in the map
+
+	// Precheck with the origins, i.e. are we allowed to looks here.
+	zone := middleware.Zones(a.Zones.Origins()).Matches(qname)
+	if zone == "" {
+		return middleware.NextOrFailure(a.Name(), a.Next, ctx, w, r)
+	}
+
+	// Now the real zone.
+	zone = middleware.Zones(a.Zones.Names()).Matches(qname)
+
+	a.Zones.RLock()
+	z, ok := a.Zones.Z[zone]
+	a.Zones.RUnlock()
+
+	if !ok || z == nil {
+		return dns.RcodeServerFailure, nil
+	}
+
+	if state.QType() == dns.TypeAXFR || state.QType() == dns.TypeIXFR {
+		xfr := file.Xfr{Zone: z}
+		return xfr.ServeDNS(ctx, w, r)
+	}
+
+	answer, ns, extra, result := z.Lookup(state, qname)
+
+	m := new(dns.Msg)
+	m.SetReply(r)
+	m.Authoritative, m.RecursionAvailable, m.Compress = true, true, true
+	m.Answer, m.Ns, m.Extra = answer, ns, extra
+
+	switch result {
+	case file.Success:
+	case file.NoData:
+	case file.NameError:
+		m.Rcode = dns.RcodeNameError
+	case file.Delegation:
+		m.Authoritative = false
+	case file.ServerFailure:
+		return dns.RcodeServerFailure, nil
+	}
+
+	state.SizeAndDo(m)
+	m, _ = state.Scrub(m)
+	w.WriteMsg(m)
+	return dns.RcodeSuccess, nil
+}
+
+// Name implements the Handler interface.
+func (a Auto) Name() string { return "auto" }
diff --git a/vendor/github.com/miekg/coredns/middleware/auto/regexp.go b/vendor/github.com/miekg/coredns/middleware/auto/regexp.go
new file mode 100644
index 0000000000..fa424ec7ec
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/auto/regexp.go
@@ -0,0 +1,20 @@
+package auto
+
+// rewriteToExpand rewrites our template string to one that we can give to regexp.ExpandString. This basically
+// involves prefixing any '{' with a '$'.
+func rewriteToExpand(s string) string {
+	// Pretty dumb at the moment, every { will get a $ prefixed.
+	// Also wasteful as we build the string with +=. This is OKish
+	// as we do this during config parsing.
+
+	copy := ""
+
+	for _, c := range s {
+		if c == '{' {
+			copy += "$"
+		}
+		copy += string(c)
+	}
+
+	return copy
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/auto/regexp_test.go b/vendor/github.com/miekg/coredns/middleware/auto/regexp_test.go
new file mode 100644
index 0000000000..17c35eb90c
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/auto/regexp_test.go
@@ -0,0 +1,20 @@
+package auto
+
+import "testing"
+
+func TestRewriteToExpand(t *testing.T) {
+	tests := []struct {
+		in       string
+		expected string
+	}{
+		{in: "", expected: ""},
+		{in: "{1}", expected: "${1}"},
+		{in: "{1", expected: "${1"},
+	}
+	for i, tc := range tests {
+		got := rewriteToExpand(tc.in)
+		if got != tc.expected {
+			t.Errorf("Test %d: Expected error %v, but got %v", i, tc.expected, got)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/auto/setup.go b/vendor/github.com/miekg/coredns/middleware/auto/setup.go
new file mode 100644
index 0000000000..1f8fd3b6ce
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/auto/setup.go
@@ -0,0 +1,172 @@
+package auto
+
+import (
+	"log"
+	"os"
+	"path"
+	"regexp"
+	"strconv"
+	"time"
+
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/file"
+	"github.com/coredns/coredns/middleware/metrics"
+	"github.com/coredns/coredns/middleware/pkg/dnsutil"
+	"github.com/coredns/coredns/middleware/proxy"
+
+	"github.com/mholt/caddy"
+)
+
+func init() {
+	caddy.RegisterPlugin("auto", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setup,
+	})
+}
+
+func setup(c *caddy.Controller) error {
+	a, err := autoParse(c)
+	if err != nil {
+		return middleware.Error("auto", err)
+	}
+
+	// If we have enabled prometheus we should add newly discovered zones to it.
+	met := dnsserver.GetMiddleware(c, "prometheus")
+	if met != nil {
+		a.metrics = met.(*metrics.Metrics)
+	}
+
+	walkChan := make(chan bool)
+
+	c.OnStartup(func() error {
+		err := a.Walk()
+		if err != nil {
+			return err
+		}
+
+		go func() {
+			ticker := time.NewTicker(a.loader.duration)
+			for {
+				select {
+				case <-walkChan:
+					return
+				case <-ticker.C:
+					a.Walk()
+				}
+			}
+		}()
+		return nil
+	})
+
+	c.OnShutdown(func() error {
+		close(walkChan)
+		return nil
+	})
+
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
+		a.Next = next
+		return a
+	})
+
+	return nil
+}
+
+func autoParse(c *caddy.Controller) (Auto, error) {
+	var a = Auto{
+		loader: loader{template: "${1}", re: regexp.MustCompile(`db\.(.*)`), duration: time.Duration(60 * time.Second)},
+		Zones:  &Zones{},
+	}
+
+	config := dnsserver.GetConfig(c)
+
+	for c.Next() {
+		if c.Val() == "auto" {
+			// auto [ZONES...]
+			a.Zones.origins = make([]string, len(c.ServerBlockKeys))
+			copy(a.Zones.origins, c.ServerBlockKeys)
+
+			args := c.RemainingArgs()
+			if len(args) > 0 {
+				a.Zones.origins = args
+			}
+			for i := range a.Zones.origins {
+				a.Zones.origins[i] = middleware.Host(a.Zones.origins[i]).Normalize()
+			}
+
+			for c.NextBlock() {
+				switch c.Val() {
+				case "directory": // directory DIR [REGEXP [TEMPLATE] [DURATION]]
+					if !c.NextArg() {
+						return a, c.ArgErr()
+					}
+					a.loader.directory = c.Val()
+					if !path.IsAbs(a.loader.directory) && config.Root != "" {
+						a.loader.directory = path.Join(config.Root, a.loader.directory)
+					}
+					_, err := os.Stat(a.loader.directory)
+					if err != nil {
+						if os.IsNotExist(err) {
+							log.Printf("[WARNING] Directory does not exist: %s", a.loader.directory)
+						} else {
+							return a, c.Errf("Unable to access root path '%s': %v", a.loader.directory, err)
+						}
+					}
+
+					// regexp
+					if c.NextArg() {
+						a.loader.re, err = regexp.Compile(c.Val())
+						if err != nil {
+							return a, err
+						}
+						if a.loader.re.NumSubexp() == 0 {
+							return a, c.Errf("Need at least one sub expression")
+						}
+					}
+
+					// template
+					if c.NextArg() {
+						a.loader.template = rewriteToExpand(c.Val())
+					}
+
+					// duration
+					if c.NextArg() {
+						i, err := strconv.Atoi(c.Val())
+						if err != nil {
+							return a, err
+						}
+						if i < 1 {
+							i = 1
+						}
+						a.loader.duration = time.Duration(i) * time.Second
+					}
+
+				case "no_reload":
+					a.loader.noReload = true
+
+				case "upstream":
+					args := c.RemainingArgs()
+					if len(args) == 0 {
+						return a, c.ArgErr()
+					}
+					ups, err := dnsutil.ParseHostPortOrFile(args...)
+					if err != nil {
+						return a, err
+					}
+					a.loader.proxy = proxy.NewLookup(ups)
+
+				default:
+					t, _, e := file.TransferParse(c, false)
+					if e != nil {
+						return a, e
+					}
+					if t != nil {
+						a.loader.transferTo = append(a.loader.transferTo, t...)
+					}
+				}
+			}
+
+		}
+	}
+	return a, nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/auto/setup_test.go b/vendor/github.com/miekg/coredns/middleware/auto/setup_test.go
new file mode 100644
index 0000000000..3d65a4a862
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/auto/setup_test.go
@@ -0,0 +1,94 @@
+package auto
+
+import (
+	"testing"
+
+	"github.com/mholt/caddy"
+)
+
+func TestAutoParse(t *testing.T) {
+	tests := []struct {
+		inputFileRules    string
+		shouldErr         bool
+		expectedDirectory string
+		expectedTempl     string
+		expectedRe        string
+		expectedTo        []string
+	}{
+		{
+			`auto example.org {
+				directory /tmp
+				transfer to 127.0.0.1
+			}`,
+			false, "/tmp", "${1}", `db\.(.*)`, []string{"127.0.0.1:53"},
+		},
+		{
+			`auto {
+				directory /tmp
+			}`,
+			false, "/tmp", "${1}", `db\.(.*)`, nil,
+		},
+		{
+			`auto {
+				directory /tmp (.*) bliep
+			}`,
+			false, "/tmp", "bliep", `(.*)`, nil,
+		},
+		{
+			`auto {
+				directory /tmp (.*) bliep
+				transfer to 127.0.0.1
+				transfer to 127.0.0.2
+				upstream 8.8.8.8
+			}`,
+			false, "/tmp", "bliep", `(.*)`, []string{"127.0.0.1:53", "127.0.0.2:53"},
+		},
+		// errors
+		{
+			`auto example.org {
+				directory
+			}`,
+			true, "", "${1}", `db\.(.*)`, nil,
+		},
+		{
+			`auto example.org {
+				directory /tmp * {1}
+			}`,
+			true, "", "${1}", ``, nil,
+		},
+		{
+			`auto example.org {
+				directory /tmp .* {1}
+			}`,
+			true, "", "${1}", ``, nil,
+		},
+	}
+
+	for i, test := range tests {
+		c := caddy.NewTestController("dns", test.inputFileRules)
+		a, err := autoParse(c)
+
+		if err == nil && test.shouldErr {
+			t.Fatalf("Test %d expected errors, but got no error", i)
+		} else if err != nil && !test.shouldErr {
+			t.Fatalf("Test %d expected no errors, but got '%v'", i, err)
+		} else if !test.shouldErr {
+			if a.loader.directory != test.expectedDirectory {
+				t.Fatalf("Test %d expected %v, got %v", i, test.expectedDirectory, a.loader.directory)
+			}
+			if a.loader.template != test.expectedTempl {
+				t.Fatalf("Test %d expected %v, got %v", i, test.expectedTempl, a.loader.template)
+			}
+			if a.loader.re.String() != test.expectedRe {
+				t.Fatalf("Test %d expected %v, got %v", i, test.expectedRe, a.loader.re)
+			}
+			if test.expectedTo != nil {
+				for j, got := range a.loader.transferTo {
+					if got != test.expectedTo[j] {
+						t.Fatalf("Test %d expected %v, got %v", i, test.expectedTo[j], got)
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/auto/walk.go b/vendor/github.com/miekg/coredns/middleware/auto/walk.go
new file mode 100644
index 0000000000..8b399f422c
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/auto/walk.go
@@ -0,0 +1,108 @@
+package auto
+
+import (
+	"log"
+	"os"
+	"path"
+	"path/filepath"
+	"regexp"
+
+	"github.com/coredns/coredns/middleware/file"
+
+	"github.com/miekg/dns"
+)
+
+// Walk will recursively walk of the file under l.directory and adds the one that match l.re.
+func (a Auto) Walk() error {
+
+	// TODO(miek): should add something so that we don't stomp on each other.
+
+	toDelete := make(map[string]bool)
+	for _, n := range a.Zones.Names() {
+		toDelete[n] = true
+	}
+
+	filepath.Walk(a.loader.directory, func(path string, info os.FileInfo, err error) error {
+		if info == nil || info.IsDir() {
+			return nil
+		}
+
+		match, origin := matches(a.loader.re, info.Name(), a.loader.template)
+		if !match {
+			return nil
+		}
+
+		if _, ok := a.Zones.Z[origin]; ok {
+			// we already have this zone
+			toDelete[origin] = false
+			return nil
+		}
+
+		reader, err := os.Open(path)
+		if err != nil {
+			log.Printf("[WARNING] Opening %s failed: %s", path, err)
+			return nil
+		}
+		defer reader.Close()
+
+		zo, err := file.Parse(reader, origin, path)
+		if err != nil {
+			// Parse barfs warning by itself...
+			return nil
+		}
+
+		zo.NoReload = a.loader.noReload
+		zo.Proxy = a.loader.proxy
+		zo.TransferTo = a.loader.transferTo
+
+		a.Zones.Add(zo, origin)
+
+		if a.metrics != nil {
+			a.metrics.AddZone(origin)
+		}
+
+		zo.Notify()
+
+		log.Printf("[INFO] Inserting zone `%s' from: %s", origin, path)
+
+		toDelete[origin] = false
+
+		return nil
+	})
+
+	for origin, ok := range toDelete {
+		if !ok {
+			continue
+		}
+
+		if a.metrics != nil {
+			a.metrics.RemoveZone(origin)
+		}
+
+		a.Zones.Remove(origin)
+
+		log.Printf("[INFO] Deleting zone `%s'", origin)
+	}
+
+	return nil
+}
+
+// matches matches re to filename, if is is a match, the subexpression will be used to expand
+// template to an origin. When match is true that origin is returned. Origin is fully qualified.
+func matches(re *regexp.Regexp, filename, template string) (match bool, origin string) {
+	base := path.Base(filename)
+
+	matches := re.FindStringSubmatchIndex(base)
+	if matches == nil {
+		return false, ""
+	}
+
+	by := re.ExpandString(nil, template, base, matches)
+	if by == nil {
+		return false, ""
+	}
+
+	origin = dns.Fqdn(string(by))
+
+	return true, origin
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/auto/walk_test.go b/vendor/github.com/miekg/coredns/middleware/auto/walk_test.go
new file mode 100644
index 0000000000..29b9dbb556
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/auto/walk_test.go
@@ -0,0 +1,94 @@
+package auto
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+	"path"
+	"regexp"
+	"testing"
+)
+
+var dbFiles = []string{"db.example.org", "aa.example.org"}
+
+const zoneContent = `; testzone
+@	IN	SOA	sns.dns.icann.org. noc.dns.icann.org. 2016082534 7200 3600 1209600 3600
+		NS	a.iana-servers.net.
+		NS	b.iana-servers.net.
+
+www IN A 127.0.0.1
+`
+
+func TestWalk(t *testing.T) {
+	log.SetOutput(ioutil.Discard)
+
+	tempdir, err := createFiles()
+	if err != nil {
+		if tempdir != "" {
+			os.RemoveAll(tempdir)
+		}
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(tempdir)
+
+	ldr := loader{
+		directory: tempdir,
+		re:        regexp.MustCompile(`db\.(.*)`),
+		template:  `${1}`,
+	}
+
+	a := Auto{
+		loader: ldr,
+		Zones:  &Zones{},
+	}
+
+	a.Walk()
+
+	// db.example.org and db.example.com should be here (created in createFiles)
+	for _, name := range []string{"example.com.", "example.org."} {
+		if _, ok := a.Zones.Z[name]; !ok {
+			t.Errorf("%s should have been added", name)
+		}
+	}
+}
+
+func TestWalkNonExistent(t *testing.T) {
+	log.SetOutput(ioutil.Discard)
+
+	nonExistingDir := "highly_unlikely_to_exist_dir"
+
+	ldr := loader{
+		directory: nonExistingDir,
+		re:        regexp.MustCompile(`db\.(.*)`),
+		template:  `${1}`,
+	}
+
+	a := Auto{
+		loader: ldr,
+		Zones:  &Zones{},
+	}
+
+	a.Walk()
+}
+
+func createFiles() (string, error) {
+	dir, err := ioutil.TempDir(os.TempDir(), "coredns")
+	if err != nil {
+		return dir, err
+	}
+
+	for _, name := range dbFiles {
+		if err := ioutil.WriteFile(path.Join(dir, name), []byte(zoneContent), 0644); err != nil {
+			return dir, err
+		}
+	}
+	// symlinks
+	if err = os.Symlink(path.Join(dir, "db.example.org"), path.Join(dir, "db.example.com")); err != nil {
+		return dir, err
+	}
+	if err = os.Symlink(path.Join(dir, "db.example.org"), path.Join(dir, "aa.example.com")); err != nil {
+		return dir, err
+	}
+
+	return dir, nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/auto/watcher_test.go b/vendor/github.com/miekg/coredns/middleware/auto/watcher_test.go
new file mode 100644
index 0000000000..329d8dc85a
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/auto/watcher_test.go
@@ -0,0 +1,58 @@
+package auto
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+	"path"
+	"regexp"
+	"testing"
+)
+
+func TestWatcher(t *testing.T) {
+	log.SetOutput(ioutil.Discard)
+
+	tempdir, err := createFiles()
+	if err != nil {
+		if tempdir != "" {
+			os.RemoveAll(tempdir)
+		}
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(tempdir)
+
+	ldr := loader{
+		directory: tempdir,
+		re:        regexp.MustCompile(`db\.(.*)`),
+		template:  `${1}`,
+	}
+
+	a := Auto{
+		loader: ldr,
+		Zones:  &Zones{},
+	}
+
+	a.Walk()
+
+	// example.org and example.com should exist
+	if x := len(a.Zones.Z["example.org."].All()); x != 4 {
+		t.Fatalf("Expected 4 RRs, got %d", x)
+	}
+	if x := len(a.Zones.Z["example.com."].All()); x != 4 {
+		t.Fatalf("Expected 4 RRs, got %d", x)
+	}
+
+	// Now remove one file, rescan and see if it's gone.
+	if err := os.Remove(path.Join(tempdir, "db.example.com")); err != nil {
+		t.Fatal(err)
+	}
+
+	a.Walk()
+
+	if _, ok := a.Zones.Z["example.com."]; ok {
+		t.Errorf("Expected %q to be gone.", "example.com.")
+	}
+	if _, ok := a.Zones.Z["example.org."]; !ok {
+		t.Errorf("Expected %q to still be there.", "example.org.")
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/auto/zone.go b/vendor/github.com/miekg/coredns/middleware/auto/zone.go
new file mode 100644
index 0000000000..ead26541ef
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/auto/zone.go
@@ -0,0 +1,76 @@
+// Package auto implements a on-the-fly loading file backend.
+package auto
+
+import (
+	"sync"
+
+	"github.com/coredns/coredns/middleware/file"
+)
+
+// Zones maps zone names to a *Zone. This keep track of what we zones we have loaded at
+// any one time.
+type Zones struct {
+	Z     map[string]*file.Zone // A map mapping zone (origin) to the Zone's data.
+	names []string              // All the keys from the map Z as a string slice.
+
+	origins []string // Any origins from the server block.
+
+	sync.RWMutex
+}
+
+// Names returns the names from z.
+func (z *Zones) Names() []string {
+	z.RLock()
+	n := z.names
+	z.RUnlock()
+	return n
+}
+
+// Origins returns the origins from z.
+func (z *Zones) Origins() []string {
+	// doesn't need locking, because there aren't multiple Go routines accessing it.
+	return z.origins
+}
+
+// Zones returns a zone with origin name from z, nil when not found.
+func (z *Zones) Zones(name string) *file.Zone {
+	z.RLock()
+	zo := z.Z[name]
+	z.RUnlock()
+	return zo
+}
+
+// Add adds a new zone into z. If zo.NoReload is false, the
+// reload goroutine is started.
+func (z *Zones) Add(zo *file.Zone, name string) {
+	z.Lock()
+
+	if z.Z == nil {
+		z.Z = make(map[string]*file.Zone)
+	}
+
+	z.Z[name] = zo
+	z.names = append(z.names, name)
+	zo.Reload()
+
+	z.Unlock()
+}
+
+// Remove removes the zone named name from z. It also stop the the zone's reload goroutine.
+func (z *Zones) Remove(name string) {
+	z.Lock()
+
+	if zo, ok := z.Z[name]; ok && !zo.NoReload {
+		zo.ReloadShutdown <- true
+	}
+
+	delete(z.Z, name)
+
+	// TODO(miek): just regenerate Names (might be bad if you have a lot of zones...)
+	z.names = []string{}
+	for n := range z.Z {
+		z.names = append(z.names, n)
+	}
+
+	z.Unlock()
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/backend.go b/vendor/github.com/miekg/coredns/middleware/backend.go
new file mode 100644
index 0000000000..e1c6e9496a
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/backend.go
@@ -0,0 +1,33 @@
+package middleware
+
+import (
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+// ServiceBackend defines a (dynamic) backend that returns a slice of service definitions.
+type ServiceBackend interface {
+	// Services communicates with the backend to retrieve the service definition. Exact indicates
+	// on exact much are that we are allowed to recurs.
+	Services(state request.Request, exact bool, opt Options) ([]msg.Service, []msg.Service, error)
+
+	// Reverse communicates with the backend to retrieve service definition based on a IP address
+	// instead of a name. I.e. a reverse DNS lookup.
+	Reverse(state request.Request, exact bool, opt Options) ([]msg.Service, []msg.Service, error)
+
+	// Lookup is used to find records else where.
+	Lookup(state request.Request, name string, typ uint16) (*dns.Msg, error)
+
+	// IsNameError return true if err indicated a record not found condition
+	IsNameError(err error) bool
+
+	// Debug returns a string used when returning debug services.
+	Debug() string
+}
+
+// Options are extra options that can be specified for a lookup.
+type Options struct {
+	Debug string // This is a debug query. A query prefixed with debug.o-o
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/backend_lookup.go b/vendor/github.com/miekg/coredns/middleware/backend_lookup.go
new file mode 100644
index 0000000000..8b86495bb6
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/backend_lookup.go
@@ -0,0 +1,451 @@
+package middleware
+
+import (
+	"fmt"
+	"math"
+	"net"
+	"time"
+
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsutil"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+// A returns A records from Backend or an error.
+func A(b ServiceBackend, zone string, state request.Request, previousRecords []dns.RR, opt Options) (records []dns.RR, debug []msg.Service, err error) {
+	services, debug, err := b.Services(state, false, opt)
+	if err != nil {
+		return nil, debug, err
+	}
+
+	for _, serv := range services {
+		ip := net.ParseIP(serv.Host)
+		switch {
+		case ip == nil:
+			if Name(state.Name()).Matches(dns.Fqdn(serv.Host)) {
+				// x CNAME x is a direct loop, don't add those
+				continue
+			}
+
+			newRecord := serv.NewCNAME(state.QName(), serv.Host)
+			if len(previousRecords) > 7 {
+				// don't add it, and just continue
+				continue
+			}
+			if dnsutil.DuplicateCNAME(newRecord, previousRecords) {
+				continue
+			}
+
+			state1 := state.NewWithQuestion(serv.Host, state.QType())
+			nextRecords, nextDebug, err := A(b, zone, state1, append(previousRecords, newRecord), opt)
+
+			if err == nil {
+				// Not only have we found something we should add the CNAME and the IP addresses.
+				if len(nextRecords) > 0 {
+					records = append(records, newRecord)
+					records = append(records, nextRecords...)
+					debug = append(debug, nextDebug...)
+				}
+				continue
+			}
+			// This means we can not complete the CNAME, try to look else where.
+			target := newRecord.Target
+			if dns.IsSubDomain(zone, target) {
+				// We should already have found it
+				continue
+			}
+			// Lookup
+			m1, e1 := b.Lookup(state, target, state.QType())
+			if e1 != nil {
+				debugMsg := msg.Service{Key: msg.Path(target, b.Debug()), Host: target, Text: " IN " + state.Type() + ": " + e1.Error()}
+				debug = append(debug, debugMsg)
+				continue
+			}
+			// Len(m1.Answer) > 0 here is well?
+			records = append(records, newRecord)
+			records = append(records, m1.Answer...)
+			continue
+		case ip.To4() != nil:
+			records = append(records, serv.NewA(state.QName(), ip.To4()))
+		case ip.To4() == nil:
+			// nodata?
+		}
+	}
+	return records, debug, nil
+}
+
+// AAAA returns AAAA records from Backend or an error.
+func AAAA(b ServiceBackend, zone string, state request.Request, previousRecords []dns.RR, opt Options) (records []dns.RR, debug []msg.Service, err error) {
+	services, debug, err := b.Services(state, false, opt)
+	if err != nil {
+		return nil, debug, err
+	}
+
+	for _, serv := range services {
+		ip := net.ParseIP(serv.Host)
+		switch {
+		case ip == nil:
+			// Try to resolve as CNAME if it's not an IP, but only if we don't create loops.
+			if Name(state.Name()).Matches(dns.Fqdn(serv.Host)) {
+				// x CNAME x is a direct loop, don't add those
+				continue
+			}
+
+			newRecord := serv.NewCNAME(state.QName(), serv.Host)
+			if len(previousRecords) > 7 {
+				// don't add it, and just continue
+				continue
+			}
+			if dnsutil.DuplicateCNAME(newRecord, previousRecords) {
+				continue
+			}
+
+			state1 := state.NewWithQuestion(serv.Host, state.QType())
+			nextRecords, nextDebug, err := AAAA(b, zone, state1, append(previousRecords, newRecord), opt)
+
+			if err == nil {
+				// Not only have we found something we should add the CNAME and the IP addresses.
+				if len(nextRecords) > 0 {
+					records = append(records, newRecord)
+					records = append(records, nextRecords...)
+					debug = append(debug, nextDebug...)
+				}
+				continue
+			}
+			// This means we can not complete the CNAME, try to look else where.
+			target := newRecord.Target
+			if dns.IsSubDomain(zone, target) {
+				// We should already have found it
+				continue
+			}
+			m1, e1 := b.Lookup(state, target, state.QType())
+			if e1 != nil {
+				debugMsg := msg.Service{Key: msg.Path(target, b.Debug()), Host: target, Text: " IN " + state.Type() + ": " + e1.Error()}
+				debug = append(debug, debugMsg)
+				continue
+			}
+			// Len(m1.Answer) > 0 here is well?
+			records = append(records, newRecord)
+			records = append(records, m1.Answer...)
+			continue
+			// both here again
+		case ip.To4() != nil:
+			// nada?
+		case ip.To4() == nil:
+			records = append(records, serv.NewAAAA(state.QName(), ip.To16()))
+		}
+	}
+	return records, debug, nil
+}
+
+// SRV returns SRV records from the Backend.
+// If the Target is not a name but an IP address, a name is created on the fly.
+func SRV(b ServiceBackend, zone string, state request.Request, opt Options) (records, extra []dns.RR, debug []msg.Service, err error) {
+	services, debug, err := b.Services(state, false, opt)
+	if err != nil {
+		return nil, nil, nil, err
+	}
+
+	// Looping twice to get the right weight vs priority
+	w := make(map[int]int)
+	for _, serv := range services {
+		weight := 100
+		if serv.Weight != 0 {
+			weight = serv.Weight
+		}
+		if _, ok := w[serv.Priority]; !ok {
+			w[serv.Priority] = weight
+			continue
+		}
+		w[serv.Priority] += weight
+	}
+	lookup := make(map[string]bool)
+	for _, serv := range services {
+		w1 := 100.0 / float64(w[serv.Priority])
+		if serv.Weight == 0 {
+			w1 *= 100
+		} else {
+			w1 *= float64(serv.Weight)
+		}
+		weight := uint16(math.Floor(w1))
+		ip := net.ParseIP(serv.Host)
+		switch {
+		case ip == nil:
+			srv := serv.NewSRV(state.QName(), weight)
+			records = append(records, srv)
+
+			if _, ok := lookup[srv.Target]; ok {
+				break
+			}
+
+			lookup[srv.Target] = true
+
+			if !dns.IsSubDomain(zone, srv.Target) {
+				m1, e1 := b.Lookup(state, srv.Target, dns.TypeA)
+				if e1 == nil {
+					extra = append(extra, m1.Answer...)
+				} else {
+					debugMsg := msg.Service{Key: msg.Path(srv.Target, b.Debug()), Host: srv.Target, Text: " IN A: " + e1.Error()}
+					debug = append(debug, debugMsg)
+				}
+
+				m1, e1 = b.Lookup(state, srv.Target, dns.TypeAAAA)
+				if e1 == nil {
+					// If we have seen CNAME's we *assume* that they are already added.
+					for _, a := range m1.Answer {
+						if _, ok := a.(*dns.CNAME); !ok {
+							extra = append(extra, a)
+						}
+					}
+				} else {
+					debugMsg := msg.Service{Key: msg.Path(srv.Target, b.Debug()), Host: srv.Target, Text: " IN AAAA: " + e1.Error()}
+					debug = append(debug, debugMsg)
+				}
+				break
+			}
+			// Internal name, we should have some info on them, either v4 or v6
+			// Clients expect a complete answer, because we are a recursor in their view.
+			state1 := state.NewWithQuestion(srv.Target, dns.TypeA)
+			addr, debugAddr, e1 := A(b, zone, state1, nil, Options(opt))
+			if e1 == nil {
+				extra = append(extra, addr...)
+				debug = append(debug, debugAddr...)
+			}
+			// IPv6 lookups here as well? AAAA(zone, state1, nil).
+		case ip.To4() != nil:
+			serv.Host = msg.Domain(serv.Key)
+			srv := serv.NewSRV(state.QName(), weight)
+
+			records = append(records, srv)
+			extra = append(extra, serv.NewA(srv.Target, ip.To4()))
+		case ip.To4() == nil:
+			serv.Host = msg.Domain(serv.Key)
+			srv := serv.NewSRV(state.QName(), weight)
+
+			records = append(records, srv)
+			extra = append(extra, serv.NewAAAA(srv.Target, ip.To16()))
+		}
+	}
+	return records, extra, debug, nil
+}
+
+// MX returns MX records from the Backend. If the Target is not a name but an IP address, a name is created on the fly.
+func MX(b ServiceBackend, zone string, state request.Request, opt Options) (records, extra []dns.RR, debug []msg.Service, err error) {
+	services, debug, err := b.Services(state, false, opt)
+	if err != nil {
+		return nil, nil, debug, err
+	}
+
+	lookup := make(map[string]bool)
+	for _, serv := range services {
+		if !serv.Mail {
+			continue
+		}
+		ip := net.ParseIP(serv.Host)
+		switch {
+		case ip == nil:
+			mx := serv.NewMX(state.QName())
+			records = append(records, mx)
+			if _, ok := lookup[mx.Mx]; ok {
+				break
+			}
+
+			lookup[mx.Mx] = true
+
+			if !dns.IsSubDomain(zone, mx.Mx) {
+				m1, e1 := b.Lookup(state, mx.Mx, dns.TypeA)
+				if e1 == nil {
+					extra = append(extra, m1.Answer...)
+				} else {
+					debugMsg := msg.Service{Key: msg.Path(mx.Mx, b.Debug()), Host: mx.Mx, Text: " IN A: " + e1.Error()}
+					debug = append(debug, debugMsg)
+				}
+				m1, e1 = b.Lookup(state, mx.Mx, dns.TypeAAAA)
+				if e1 == nil {
+					// If we have seen CNAME's we *assume* that they are already added.
+					for _, a := range m1.Answer {
+						if _, ok := a.(*dns.CNAME); !ok {
+							extra = append(extra, a)
+						}
+					}
+				} else {
+					debugMsg := msg.Service{Key: msg.Path(mx.Mx, b.Debug()), Host: mx.Mx, Text: " IN AAAA: " + e1.Error()}
+					debug = append(debug, debugMsg)
+				}
+				break
+			}
+			// Internal name
+			state1 := state.NewWithQuestion(mx.Mx, dns.TypeA)
+			addr, debugAddr, e1 := A(b, zone, state1, nil, opt)
+			if e1 == nil {
+				extra = append(extra, addr...)
+				debug = append(debug, debugAddr...)
+			}
+			// e.AAAA as well
+		case ip.To4() != nil:
+			serv.Host = msg.Domain(serv.Key)
+			records = append(records, serv.NewMX(state.QName()))
+			extra = append(extra, serv.NewA(serv.Host, ip.To4()))
+		case ip.To4() == nil:
+			serv.Host = msg.Domain(serv.Key)
+			records = append(records, serv.NewMX(state.QName()))
+			extra = append(extra, serv.NewAAAA(serv.Host, ip.To16()))
+		}
+	}
+	return records, extra, debug, nil
+}
+
+// CNAME returns CNAME records from the backend or an error.
+func CNAME(b ServiceBackend, zone string, state request.Request, opt Options) (records []dns.RR, debug []msg.Service, err error) {
+	services, debug, err := b.Services(state, true, opt)
+	if err != nil {
+		return nil, debug, err
+	}
+
+	if len(services) > 0 {
+		serv := services[0]
+		if ip := net.ParseIP(serv.Host); ip == nil {
+			records = append(records, serv.NewCNAME(state.QName(), serv.Host))
+		}
+	}
+	return records, debug, nil
+}
+
+// TXT returns TXT records from Backend or an error.
+func TXT(b ServiceBackend, zone string, state request.Request, opt Options) (records []dns.RR, debug []msg.Service, err error) {
+	services, debug, err := b.Services(state, false, opt)
+	if err != nil {
+		return nil, debug, err
+	}
+
+	for _, serv := range services {
+		if serv.Text == "" {
+			continue
+		}
+		records = append(records, serv.NewTXT(state.QName()))
+	}
+	return records, debug, nil
+}
+
+// PTR returns the PTR records from the backend, only services that have a domain name as host are included.
+func PTR(b ServiceBackend, zone string, state request.Request, opt Options) (records []dns.RR, debug []msg.Service, err error) {
+	services, debug, err := b.Reverse(state, true, opt)
+	if err != nil {
+		return nil, debug, err
+	}
+
+	for _, serv := range services {
+		if ip := net.ParseIP(serv.Host); ip == nil {
+			records = append(records, serv.NewPTR(state.QName(), serv.Host))
+		}
+	}
+	return records, debug, nil
+}
+
+// NS returns NS records from  the backend
+func NS(b ServiceBackend, zone string, state request.Request, opt Options) (records, extra []dns.RR, debug []msg.Service, err error) {
+	// NS record for this zone live in a special place, ns.dns.<zone>. Fake our lookup.
+	// only a tad bit fishy...
+	old := state.QName()
+
+	state.Clear()
+	state.Req.Question[0].Name = "ns.dns." + zone
+	services, debug, err := b.Services(state, false, opt)
+	if err != nil {
+		return nil, nil, debug, err
+	}
+	// ... and reset
+	state.Req.Question[0].Name = old
+
+	for _, serv := range services {
+		ip := net.ParseIP(serv.Host)
+		switch {
+		case ip == nil:
+			return nil, nil, debug, fmt.Errorf("NS record must be an IP address: %s", serv.Host)
+		case ip.To4() != nil:
+			serv.Host = msg.Domain(serv.Key)
+			records = append(records, serv.NewNS(state.QName()))
+			extra = append(extra, serv.NewA(serv.Host, ip.To4()))
+		case ip.To4() == nil:
+			serv.Host = msg.Domain(serv.Key)
+			records = append(records, serv.NewNS(state.QName()))
+			extra = append(extra, serv.NewAAAA(serv.Host, ip.To16()))
+		}
+	}
+	return records, extra, debug, nil
+}
+
+// SOA returns a SOA record from the backend.
+func SOA(b ServiceBackend, zone string, state request.Request, opt Options) ([]dns.RR, []msg.Service, error) {
+	header := dns.RR_Header{Name: zone, Rrtype: dns.TypeSOA, Ttl: 300, Class: dns.ClassINET}
+
+	soa := &dns.SOA{Hdr: header,
+		Mbox:    hostmaster + "." + zone,
+		Ns:      "ns.dns." + zone,
+		Serial:  uint32(time.Now().Unix()),
+		Refresh: 7200,
+		Retry:   1800,
+		Expire:  86400,
+		Minttl:  minTTL,
+	}
+	// TODO(miek): fake some msg.Service here when returning?
+	return []dns.RR{soa}, nil, nil
+}
+
+// BackendError writes an error response to the client.
+func BackendError(b ServiceBackend, zone string, rcode int, state request.Request, debug []msg.Service, err error, opt Options) (int, error) {
+	m := new(dns.Msg)
+	m.SetRcode(state.Req, rcode)
+	m.Authoritative, m.RecursionAvailable, m.Compress = true, true, true
+	m.Ns, _, _ = SOA(b, zone, state, opt)
+	if opt.Debug != "" {
+		m.Extra = ServicesToTxt(debug)
+		txt := ErrorToTxt(err)
+		if txt != nil {
+			m.Extra = append(m.Extra, ErrorToTxt(err))
+		}
+	}
+	state.SizeAndDo(m)
+	state.W.WriteMsg(m)
+	// Return success as the rcode to signal we have written to the client.
+	return dns.RcodeSuccess, err
+}
+
+// ServicesToTxt puts debug in TXT RRs.
+func ServicesToTxt(debug []msg.Service) []dns.RR {
+	if debug == nil {
+		return nil
+	}
+
+	rr := make([]dns.RR, len(debug))
+	for i, d := range debug {
+		rr[i] = d.RR()
+	}
+	return rr
+}
+
+// ErrorToTxt puts in error's text into an TXT RR.
+func ErrorToTxt(err error) dns.RR {
+	if err == nil {
+		return nil
+	}
+	msg := err.Error()
+	if len(msg) > 255 {
+		msg = msg[:255]
+	}
+	t := new(dns.TXT)
+	t.Hdr.Class = dns.ClassCHAOS
+	t.Hdr.Ttl = 0
+	t.Hdr.Rrtype = dns.TypeTXT
+	t.Hdr.Name = "."
+
+	t.Txt = []string{msg}
+	return t
+}
+
+const (
+	minTTL     = 60
+	hostmaster = "hostmaster"
+)
diff --git a/vendor/github.com/miekg/coredns/middleware/bind/README.md b/vendor/github.com/miekg/coredns/middleware/bind/README.md
new file mode 100644
index 0000000000..98be903a2d
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/bind/README.md
@@ -0,0 +1,21 @@
+# bind
+
+*bind* overrides the host to which the server should bind. Normally, the listener binds to the
+wildcard host. However, you may force the listener to bind to another IP instead. This
+directive accepts only an address, not a port.
+
+## Syntax
+
+~~~ txt
+bind ADDRESS
+~~~
+
+**ADDRESS** is the IP address to bind to.
+
+## Examples
+
+To make your socket accessible only to that machine, bind to IP 127.0.0.1 (localhost):
+
+~~~ txt
+bind 127.0.0.1
+~~~
diff --git a/vendor/github.com/miekg/coredns/middleware/bind/bind.go b/vendor/github.com/miekg/coredns/middleware/bind/bind.go
new file mode 100644
index 0000000000..bd3c32b51c
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/bind/bind.go
@@ -0,0 +1,11 @@
+// Package bind allows binding to a specific interface instead of bind to all of them.
+package bind
+
+import "github.com/mholt/caddy"
+
+func init() {
+	caddy.RegisterPlugin("bind", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setupBind,
+	})
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/bind/bind_test.go b/vendor/github.com/miekg/coredns/middleware/bind/bind_test.go
new file mode 100644
index 0000000000..11556f0bd8
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/bind/bind_test.go
@@ -0,0 +1,30 @@
+package bind
+
+import (
+	"testing"
+
+	"github.com/coredns/coredns/core/dnsserver"
+
+	"github.com/mholt/caddy"
+)
+
+func TestSetupBind(t *testing.T) {
+	c := caddy.NewTestController("dns", `bind 1.2.3.4`)
+	err := setupBind(c)
+	if err != nil {
+		t.Fatalf("Expected no errors, but got: %v", err)
+	}
+
+	cfg := dnsserver.GetConfig(c)
+	if got, want := cfg.ListenHost, "1.2.3.4"; got != want {
+		t.Errorf("Expected the config's ListenHost to be %s, was %s", want, got)
+	}
+}
+
+func TestBindAddress(t *testing.T) {
+	c := caddy.NewTestController("dns", `bind 1.2.3.bla`)
+	err := setupBind(c)
+	if err == nil {
+		t.Fatalf("Expected errors, but got none")
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/bind/setup.go b/vendor/github.com/miekg/coredns/middleware/bind/setup.go
new file mode 100644
index 0000000000..1e7178cc3f
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/bind/setup.go
@@ -0,0 +1,24 @@
+package bind
+
+import (
+	"fmt"
+	"net"
+
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/mholt/caddy"
+)
+
+func setupBind(c *caddy.Controller) error {
+	config := dnsserver.GetConfig(c)
+	for c.Next() {
+		if !c.Args(&config.ListenHost) {
+			return middleware.Error("bind", c.ArgErr())
+		}
+	}
+	if net.ParseIP(config.ListenHost) == nil {
+		return middleware.Error("bind", fmt.Errorf("not a valid IP address: %s", config.ListenHost))
+	}
+	return nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/cache/README.md b/vendor/github.com/miekg/coredns/middleware/cache/README.md
new file mode 100644
index 0000000000..145ce2fdfd
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/cache/README.md
@@ -0,0 +1,64 @@
+# cache
+
+*cache* enables a frontend cache. It will cache all records except zone transfers and metadata records.
+
+## Syntax
+
+~~~ txt
+cache [TTL] [ZONES...]
+~~~
+
+* **TTL** max TTL in seconds. If not specified, the maximum TTL will be used which is 3600 for
+    noerror responses and 1800 for denial of existence ones.
+    A set TTL of 300 *cache 300* would cache the record up to 300 seconds.
+    Smaller record provided TTLs will take precedence.
+* **ZONES** zones it should cache for. If empty, the zones from the configuration block are used.
+
+Each element in the cache is cached according to its TTL (with **TTL** as the max).
+For the negative cache, the SOA's MinTTL value is used. A cache can contain up to 10,000 items by
+default. A TTL of zero is not allowed. No cache invalidation triggered by other middlewares is available. Therefore even reloaded items might still be cached for the duration of the TTL.
+
+If you want more control:
+
+~~~ txt
+cache [TTL] [ZONES...] {
+    success CAPACITY [TTL]
+    denial CAPACITY [TTL]
+}
+~~~
+
+* **TTL**  and **ZONES** as above.
+* `success`, override the settings for caching successful responses, **CAPACITY** indicates the maximum
+  number of packets we cache before we start evicting (LRU). **TTL** overrides the cache maximum TTL.
+* `denial`, override the settings for caching denial of existence responses, **CAPACITY** indicates the maximum
+  number of packets we cache before we start evicting (LRU). **TTL** overrides the cache maximum TTL.
+
+There is a third category (`error`) but those responses are never cached.
+
+The minimum TTL allowed on resource records is 5 seconds.
+
+## Metrics
+
+If monitoring is enabled (via the *prometheus* directive) then the following metrics are exported:
+
+* coredns_cache_size{type} - Total elements in the cache by cache type.
+* coredns_cache_capacity{type} - Total capacity of the cache by cache type.
+* coredns_cache_hits_total{type} - Counter of cache hits by cache type.
+* coredns_cache_misses_total - Counter of cache misses.
+
+Cache types are either "denial" or "success".
+
+## Examples
+
+Enable caching for all zones, but cap everything to a TTL of 10 seconds:
+
+~~~
+cache 10
+~~~
+
+Proxy to Google Public DNS and only cache responses for example.org (or below).
+
+~~~
+proxy . 8.8.8.8:53
+cache example.org
+~~~
diff --git a/vendor/github.com/miekg/coredns/middleware/cache/cache.go b/vendor/github.com/miekg/coredns/middleware/cache/cache.go
new file mode 100644
index 0000000000..1bd3d33520
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/cache/cache.go
@@ -0,0 +1,137 @@
+// Package cache implements a cache.
+package cache
+
+import (
+	"log"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/response"
+
+	"github.com/hashicorp/golang-lru"
+	"github.com/miekg/dns"
+)
+
+// Cache is middleware that looks up responses in a cache and caches replies.
+// It has a success and a denial of existence cache.
+type Cache struct {
+	Next  middleware.Handler
+	Zones []string
+
+	ncache *lru.Cache
+	ncap   int
+	nttl   time.Duration
+
+	pcache *lru.Cache
+	pcap   int
+	pttl   time.Duration
+}
+
+// Return key under which we store the item. The empty string is returned
+// when we don't want to cache the message. Currently we do not cache Truncated, errors
+// zone transfers or dynamic update messages.
+func key(m *dns.Msg, t response.Type, do bool) string {
+	// We don't store truncated responses.
+	if m.Truncated {
+		return ""
+	}
+	// Nor errors or Meta or Update
+	if t == response.OtherError || t == response.Meta || t == response.Update {
+		return ""
+	}
+
+	qtype := m.Question[0].Qtype
+	qname := strings.ToLower(m.Question[0].Name)
+	return rawKey(qname, qtype, do)
+}
+
+func rawKey(qname string, qtype uint16, do bool) string {
+	if do {
+		return "1" + qname + "." + strconv.Itoa(int(qtype))
+	}
+	return "0" + qname + "." + strconv.Itoa(int(qtype))
+}
+
+// ResponseWriter is a response writer that caches the reply message.
+type ResponseWriter struct {
+	dns.ResponseWriter
+	*Cache
+}
+
+// WriteMsg implements the dns.ResponseWriter interface.
+func (c *ResponseWriter) WriteMsg(res *dns.Msg) error {
+	do := false
+	mt, opt := response.Typify(res)
+	if opt != nil {
+		do = opt.Do()
+	}
+
+	// key returns empty string for anything we don't want to cache.
+	key := key(res, mt, do)
+
+	duration := c.pttl
+	if mt == response.NameError || mt == response.NoData {
+		duration = c.nttl
+	}
+
+	msgTTL := minMsgTTL(res, mt)
+	if msgTTL < duration {
+		duration = msgTTL
+	}
+
+	if key != "" {
+		c.set(res, key, mt, duration)
+
+		cacheSize.WithLabelValues(Success).Set(float64(c.pcache.Len()))
+		cacheSize.WithLabelValues(Denial).Set(float64(c.ncache.Len()))
+	}
+
+	setMsgTTL(res, uint32(duration.Seconds()))
+
+	return c.ResponseWriter.WriteMsg(res)
+}
+
+func (c *ResponseWriter) set(m *dns.Msg, key string, mt response.Type, duration time.Duration) {
+	if key == "" {
+		log.Printf("[ERROR] Caching called with empty cache key")
+		return
+	}
+
+	switch mt {
+	case response.NoError, response.Delegation:
+		i := newItem(m, duration)
+		c.pcache.Add(key, i)
+
+	case response.NameError, response.NoData:
+		i := newItem(m, duration)
+		c.ncache.Add(key, i)
+
+	case response.OtherError:
+		// don't cache these
+	default:
+		log.Printf("[WARNING] Caching called with unknown classification: %d", mt)
+	}
+}
+
+// Write implements the dns.ResponseWriter interface.
+func (c *ResponseWriter) Write(buf []byte) (int, error) {
+	log.Printf("[WARNING] Caching called with Write: not caching reply")
+	n, err := c.ResponseWriter.Write(buf)
+	return n, err
+}
+
+const (
+	maxTTL  = 1 * time.Hour
+	maxNTTL = 30 * time.Minute
+
+	minTTL = 5 // seconds
+
+	defaultCap = 10000 // default capacity of the cache.
+
+	// Success is the class for caching positive caching.
+	Success = "success"
+	// Denial is the class defined for negative caching.
+	Denial = "denial"
+)
diff --git a/vendor/github.com/miekg/coredns/middleware/cache/cache_test.go b/vendor/github.com/miekg/coredns/middleware/cache/cache_test.go
new file mode 100644
index 0000000000..d703e2a582
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/cache/cache_test.go
@@ -0,0 +1,151 @@
+package cache
+
+import (
+	"io/ioutil"
+	"log"
+	"testing"
+	"time"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/response"
+	"github.com/coredns/coredns/middleware/test"
+
+	lru "github.com/hashicorp/golang-lru"
+	"github.com/miekg/dns"
+)
+
+type cacheTestCase struct {
+	test.Case
+	in                 test.Case
+	AuthenticatedData  bool
+	Authoritative      bool
+	RecursionAvailable bool
+	Truncated          bool
+}
+
+var cacheTestCases = []cacheTestCase{
+	{
+		RecursionAvailable: true, AuthenticatedData: true, Authoritative: true,
+		Case: test.Case{
+			Qname: "miek.nl.", Qtype: dns.TypeMX,
+			Answer: []dns.RR{
+				test.MX("miek.nl.	3600	IN	MX	1 aspmx.l.google.com."),
+				test.MX("miek.nl.	3600	IN	MX	10 aspmx2.googlemail.com."),
+			},
+		},
+		in: test.Case{
+			Qname: "miek.nl.", Qtype: dns.TypeMX,
+			Answer: []dns.RR{
+				test.MX("miek.nl.	3601	IN	MX	1 aspmx.l.google.com."),
+				test.MX("miek.nl.	3601	IN	MX	10 aspmx2.googlemail.com."),
+			},
+		},
+	},
+	{
+		RecursionAvailable: true, AuthenticatedData: true, Authoritative: true,
+		Case: test.Case{
+			Qname: "mIEK.nL.", Qtype: dns.TypeMX,
+			Answer: []dns.RR{
+				test.MX("mIEK.nL.	3600	IN	MX	1 aspmx.l.google.com."),
+				test.MX("mIEK.nL.	3600	IN	MX	10 aspmx2.googlemail.com."),
+			},
+		},
+		in: test.Case{
+			Qname: "mIEK.nL.", Qtype: dns.TypeMX,
+			Answer: []dns.RR{
+				test.MX("mIEK.nL.	3601	IN	MX	1 aspmx.l.google.com."),
+				test.MX("mIEK.nL.	3601	IN	MX	10 aspmx2.googlemail.com."),
+			},
+		},
+	},
+	{
+		Truncated: true,
+		Case: test.Case{
+			Qname: "miek.nl.", Qtype: dns.TypeMX,
+			Answer: []dns.RR{test.MX("miek.nl.	1800	IN	MX	1 aspmx.l.google.com.")},
+		},
+		in: test.Case{},
+	},
+	{
+		RecursionAvailable: true, Authoritative: true,
+		Case: test.Case{
+			Rcode: dns.RcodeNameError,
+			Qname: "example.org.", Qtype: dns.TypeA,
+			Ns: []dns.RR{
+				test.SOA("example.org. 3600 IN	SOA	sns.dns.icann.org. noc.dns.icann.org. 2016082540 7200 3600 1209600 3600"),
+			},
+		},
+		in: test.Case{
+			Rcode: dns.RcodeNameError,
+			Qname: "example.org.", Qtype: dns.TypeA,
+			Ns: []dns.RR{
+				test.SOA("example.org. 3600 IN	SOA	sns.dns.icann.org. noc.dns.icann.org. 2016082540 7200 3600 1209600 3600"),
+			},
+		},
+	},
+}
+
+func cacheMsg(m *dns.Msg, tc cacheTestCase) *dns.Msg {
+	m.RecursionAvailable = tc.RecursionAvailable
+	m.AuthenticatedData = tc.AuthenticatedData
+	m.Authoritative = tc.Authoritative
+	m.Rcode = tc.Rcode
+	m.Truncated = tc.Truncated
+	m.Answer = tc.in.Answer
+	m.Ns = tc.in.Ns
+	//	m.Extra = tc.in.Extra , not the OPT record!
+	return m
+}
+
+func newTestCache(ttl time.Duration) (*Cache, *ResponseWriter) {
+	c := &Cache{Zones: []string{"."}, pcap: defaultCap, ncap: defaultCap, pttl: ttl, nttl: ttl}
+	c.pcache, _ = lru.New(c.pcap)
+	c.ncache, _ = lru.New(c.ncap)
+
+	crr := &ResponseWriter{nil, c}
+	return c, crr
+}
+
+func TestCache(t *testing.T) {
+	c, crr := newTestCache(maxTTL)
+
+	log.SetOutput(ioutil.Discard)
+
+	for _, tc := range cacheTestCases {
+		m := tc.in.Msg()
+		m = cacheMsg(m, tc)
+		do := tc.in.Do
+
+		mt, _ := response.Typify(m)
+		k := key(m, mt, do)
+		crr.set(m, k, mt, c.pttl)
+
+		name := middleware.Name(m.Question[0].Name).Normalize()
+		qtype := m.Question[0].Qtype
+		i, ok, _ := c.get(name, qtype, do)
+		if ok && m.Truncated {
+			t.Errorf("Truncated message should not have been cached")
+			continue
+		}
+
+		if ok {
+			resp := i.toMsg(m)
+
+			if !test.Header(t, tc.Case, resp) {
+				t.Logf("%v\n", resp)
+				continue
+			}
+
+			if !test.Section(t, tc.Case, test.Answer, resp.Answer) {
+				t.Logf("%v\n", resp)
+			}
+			if !test.Section(t, tc.Case, test.Ns, resp.Ns) {
+				t.Logf("%v\n", resp)
+
+			}
+			if !test.Section(t, tc.Case, test.Extra, resp.Extra) {
+				t.Logf("%v\n", resp)
+			}
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/cache/handler.go b/vendor/github.com/miekg/coredns/middleware/cache/handler.go
new file mode 100644
index 0000000000..195322e31c
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/cache/handler.go
@@ -0,0 +1,96 @@
+package cache
+
+import (
+	"time"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+	"github.com/prometheus/client_golang/prometheus"
+	"golang.org/x/net/context"
+)
+
+// ServeDNS implements the middleware.Handler interface.
+func (c *Cache) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	state := request.Request{W: w, Req: r}
+
+	qname := state.Name()
+	qtype := state.QType()
+	zone := middleware.Zones(c.Zones).Matches(qname)
+	if zone == "" {
+		return c.Next.ServeDNS(ctx, w, r)
+	}
+
+	do := state.Do() // TODO(): might need more from OPT record? Like the actual bufsize?
+
+	if i, ok, expired := c.get(qname, qtype, do); ok && !expired {
+		resp := i.toMsg(r)
+		state.SizeAndDo(resp)
+		resp, _ = state.Scrub(resp)
+		w.WriteMsg(resp)
+
+		return dns.RcodeSuccess, nil
+	}
+
+	crr := &ResponseWriter{w, c}
+	return middleware.NextOrFailure(c.Name(), c.Next, ctx, crr, r)
+}
+
+// Name implements the Handler interface.
+func (c *Cache) Name() string { return "cache" }
+
+func (c *Cache) get(qname string, qtype uint16, do bool) (*item, bool, bool) {
+	k := rawKey(qname, qtype, do)
+
+	if i, ok := c.ncache.Get(k); ok {
+		cacheHits.WithLabelValues(Denial).Inc()
+		return i.(*item), ok, i.(*item).expired(time.Now())
+	}
+
+	if i, ok := c.pcache.Get(k); ok {
+		cacheHits.WithLabelValues(Success).Inc()
+		return i.(*item), ok, i.(*item).expired(time.Now())
+	}
+	cacheMisses.Inc()
+	return nil, false, false
+}
+
+var (
+	cacheSize = prometheus.NewGaugeVec(prometheus.GaugeOpts{
+		Namespace: middleware.Namespace,
+		Subsystem: subsystem,
+		Name:      "size",
+		Help:      "The number of elements in the cache.",
+	}, []string{"type"})
+
+	cacheCapacity = prometheus.NewGaugeVec(prometheus.GaugeOpts{
+		Namespace: middleware.Namespace,
+		Subsystem: subsystem,
+		Name:      "capacity",
+		Help:      "The cache's capacity.",
+	}, []string{"type"})
+
+	cacheHits = prometheus.NewCounterVec(prometheus.CounterOpts{
+		Namespace: middleware.Namespace,
+		Subsystem: subsystem,
+		Name:      "hits_total",
+		Help:      "The count of cache hits.",
+	}, []string{"type"})
+
+	cacheMisses = prometheus.NewCounter(prometheus.CounterOpts{
+		Namespace: middleware.Namespace,
+		Subsystem: subsystem,
+		Name:      "misses_total",
+		Help:      "The count of cache misses.",
+	})
+)
+
+const subsystem = "cache"
+
+func init() {
+	prometheus.MustRegister(cacheSize)
+	prometheus.MustRegister(cacheCapacity)
+	prometheus.MustRegister(cacheHits)
+	prometheus.MustRegister(cacheMisses)
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/cache/item.go b/vendor/github.com/miekg/coredns/middleware/cache/item.go
new file mode 100644
index 0000000000..6a75afdf9b
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/cache/item.go
@@ -0,0 +1,115 @@
+package cache
+
+import (
+	"time"
+
+	"github.com/coredns/coredns/middleware/pkg/response"
+	"github.com/miekg/dns"
+)
+
+type item struct {
+	Rcode              int
+	Authoritative      bool
+	AuthenticatedData  bool
+	RecursionAvailable bool
+	Answer             []dns.RR
+	Ns                 []dns.RR
+	Extra              []dns.RR
+
+	origTTL uint32
+	stored  time.Time
+}
+
+func newItem(m *dns.Msg, d time.Duration) *item {
+	i := new(item)
+	i.Rcode = m.Rcode
+	i.Authoritative = m.Authoritative
+	i.AuthenticatedData = m.AuthenticatedData
+	i.RecursionAvailable = m.RecursionAvailable
+	i.Answer = m.Answer
+	i.Ns = m.Ns
+	i.Extra = make([]dns.RR, len(m.Extra))
+	// Don't copy OPT record as these are hop-by-hop.
+	j := 0
+	for _, e := range m.Extra {
+		if e.Header().Rrtype == dns.TypeOPT {
+			continue
+		}
+		i.Extra[j] = e
+		j++
+	}
+	i.Extra = i.Extra[:j]
+
+	i.origTTL = uint32(d.Seconds())
+	i.stored = time.Now().UTC()
+
+	return i
+}
+
+// toMsg turns i into a message, it tailers the reply to m.
+// The Authoritative bit is always set to 0, because the answer is from the cache.
+func (i *item) toMsg(m *dns.Msg) *dns.Msg {
+	m1 := new(dns.Msg)
+	m1.SetReply(m)
+
+	m1.Authoritative = false
+	m1.AuthenticatedData = i.AuthenticatedData
+	m1.RecursionAvailable = i.RecursionAvailable
+	m1.Rcode = i.Rcode
+	m1.Compress = true
+
+	m1.Answer = i.Answer
+	m1.Ns = i.Ns
+	m1.Extra = i.Extra
+
+	ttl := int(i.origTTL) - int(time.Now().UTC().Sub(i.stored).Seconds())
+	setMsgTTL(m1, uint32(ttl))
+	return m1
+}
+
+func (i *item) expired(now time.Time) bool {
+	ttl := int(i.origTTL) - int(now.UTC().Sub(i.stored).Seconds())
+	return ttl < 0
+}
+
+// setMsgTTL sets the ttl on all RRs in all sections. If ttl is smaller than minTTL
+// that value is used.
+func setMsgTTL(m *dns.Msg, ttl uint32) {
+	if ttl < minTTL {
+		ttl = minTTL
+	}
+
+	for _, r := range m.Answer {
+		r.Header().Ttl = ttl
+	}
+	for _, r := range m.Ns {
+		r.Header().Ttl = ttl
+	}
+	for _, r := range m.Extra {
+		if r.Header().Rrtype == dns.TypeOPT {
+			continue
+		}
+		r.Header().Ttl = ttl
+	}
+}
+
+func minMsgTTL(m *dns.Msg, mt response.Type) time.Duration {
+	if mt != response.NoError && mt != response.NameError && mt != response.NoData {
+		return 0
+	}
+
+	minTTL := maxTTL
+	for _, r := range append(m.Answer, m.Ns...) {
+		switch mt {
+		case response.NameError, response.NoData:
+			if r.Header().Rrtype == dns.TypeSOA {
+				return time.Duration(r.(*dns.SOA).Minttl) * time.Second
+			}
+		case response.NoError, response.Delegation:
+			if r.Header().Ttl < uint32(minTTL.Seconds()) {
+				minTTL = time.Duration(r.Header().Ttl) * time.Second
+			}
+		}
+	}
+	return minTTL
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/cache/item_test.go b/vendor/github.com/miekg/coredns/middleware/cache/item_test.go
new file mode 100644
index 0000000000..b338d02bd7
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/cache/item_test.go
@@ -0,0 +1,20 @@
+package cache
+
+import (
+	"testing"
+
+	"github.com/miekg/dns"
+)
+
+func TestKey(t *testing.T) {
+	if x := rawKey("miek.nl.", dns.TypeMX, false); x != "0miek.nl..15" {
+		t.Errorf("failed to create correct key, got %s", x)
+	}
+	if x := rawKey("miek.nl.", dns.TypeMX, true); x != "1miek.nl..15" {
+		t.Errorf("failed to create correct key, got %s", x)
+	}
+	// rawKey does not lowercase.
+	if x := rawKey("miEK.nL.", dns.TypeMX, true); x != "1miEK.nL..15" {
+		t.Errorf("failed to create correct key, got %s", x)
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/cache/setup.go b/vendor/github.com/miekg/coredns/middleware/cache/setup.go
new file mode 100644
index 0000000000..eb835ba4eb
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/cache/setup.go
@@ -0,0 +1,137 @@
+package cache
+
+import (
+	"fmt"
+	"strconv"
+	"time"
+
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/hashicorp/golang-lru"
+	"github.com/mholt/caddy"
+)
+
+func init() {
+	caddy.RegisterPlugin("cache", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setup,
+	})
+}
+
+func setup(c *caddy.Controller) error {
+	ca, err := cacheParse(c)
+	if err != nil {
+		return middleware.Error("cache", err)
+	}
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
+		ca.Next = next
+		return ca
+	})
+
+	// Export the capacity for the metrics. This only happens once, because this is a re-load change only.
+	cacheCapacity.WithLabelValues(Success).Set(float64(ca.pcap))
+	cacheCapacity.WithLabelValues(Denial).Set(float64(ca.ncap))
+
+	return nil
+}
+
+func cacheParse(c *caddy.Controller) (*Cache, error) {
+
+	ca := &Cache{pcap: defaultCap, ncap: defaultCap, pttl: maxTTL, nttl: maxNTTL}
+
+	for c.Next() {
+		// cache [ttl] [zones..]
+		origins := make([]string, len(c.ServerBlockKeys))
+		copy(origins, c.ServerBlockKeys)
+		args := c.RemainingArgs()
+
+		if len(args) > 0 {
+			// first args may be just a number, then it is the ttl, if not it is a zone
+			ttl, err := strconv.Atoi(args[0])
+			if err == nil {
+				// Reserve 0 (and smaller for future things)
+				if ttl <= 0 {
+					return nil, fmt.Errorf("cache TTL can not be zero or negative: %d", ttl)
+				}
+				ca.pttl = time.Duration(ttl) * time.Second
+				ca.nttl = time.Duration(ttl) * time.Second
+				args = args[1:]
+			}
+			if len(args) > 0 {
+				copy(origins, args)
+			}
+		}
+
+		// Refinements? In an extra block.
+		for c.NextBlock() {
+			switch c.Val() {
+			// first number is cap, second is an new ttl
+			case Success:
+				args := c.RemainingArgs()
+				if len(args) == 0 {
+					return nil, c.ArgErr()
+				}
+				pcap, err := strconv.Atoi(args[0])
+				if err != nil {
+					return nil, err
+				}
+				ca.pcap = pcap
+				if len(args) > 1 {
+					pttl, err := strconv.Atoi(args[1])
+					if err != nil {
+						return nil, err
+					}
+					// Reserve 0 (and smaller for future things)
+					if pttl <= 0 {
+						return nil, fmt.Errorf("cache TTL can not be zero or negative: %d", pttl)
+					}
+					ca.pttl = time.Duration(pttl) * time.Second
+				}
+			case Denial:
+				args := c.RemainingArgs()
+				if len(args) == 0 {
+					return nil, c.ArgErr()
+				}
+				ncap, err := strconv.Atoi(args[0])
+				if err != nil {
+					return nil, err
+				}
+				ca.ncap = ncap
+				if len(args) > 1 {
+					nttl, err := strconv.Atoi(args[1])
+					if err != nil {
+						return nil, err
+					}
+					// Reserve 0 (and smaller for future things)
+					if nttl <= 0 {
+						return nil, fmt.Errorf("cache TTL can not be zero or negative: %d", nttl)
+					}
+					ca.nttl = time.Duration(nttl) * time.Second
+				}
+			default:
+				return nil, c.ArgErr()
+			}
+		}
+
+		for i := range origins {
+			origins[i] = middleware.Host(origins[i]).Normalize()
+		}
+
+		var err error
+		ca.Zones = origins
+
+		ca.pcache, err = lru.New(ca.pcap)
+		if err != nil {
+			return nil, err
+		}
+		ca.ncache, err = lru.New(ca.ncap)
+		if err != nil {
+			return nil, err
+		}
+
+		return ca, nil
+	}
+
+	return nil, nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/cache/setup_test.go b/vendor/github.com/miekg/coredns/middleware/cache/setup_test.go
new file mode 100644
index 0000000000..f46a93b76e
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/cache/setup_test.go
@@ -0,0 +1,80 @@
+package cache
+
+import (
+	"testing"
+	"time"
+
+	"github.com/mholt/caddy"
+)
+
+func TestSetup(t *testing.T) {
+	tests := []struct {
+		input        string
+		shouldErr    bool
+		expectedNcap int
+		expectedPcap int
+		expectedNttl time.Duration
+		expectedPttl time.Duration
+	}{
+		{`cache`, false, defaultCap, defaultCap, maxNTTL, maxTTL},
+		{`cache {}`, false, defaultCap, defaultCap, maxNTTL, maxTTL},
+		{`cache example.nl {
+			success 10
+		}`, false, defaultCap, 10, maxNTTL, maxTTL},
+		{`cache example.nl {
+			success 10
+			denial 10 15
+		}`, false, 10, 10, 15 * time.Second, maxTTL},
+		{`cache 25 example.nl {
+			success 10
+			denial 10 15
+		}`, false, 10, 10, 15 * time.Second, 25 * time.Second},
+		{`cache aaa example.nl`, false, defaultCap, defaultCap, maxNTTL, maxTTL},
+
+		// fails
+		{`cache example.nl {
+			success
+			denial 10 15
+		}`, true, defaultCap, defaultCap, maxTTL, maxTTL},
+		{`cache example.nl {
+			success 15
+			denial aaa
+		}`, true, defaultCap, defaultCap, maxTTL, maxTTL},
+		{`cache example.nl {
+			positive 15
+			negative aaa
+		}`, true, defaultCap, defaultCap, maxTTL, maxTTL},
+		{`cache 0 example.nl`, true, defaultCap, defaultCap, maxTTL, maxTTL},
+		{`cache -1 example.nl`, true, defaultCap, defaultCap, maxTTL, maxTTL},
+		{`cache 1 example.nl {
+			positive 0
+		}`, true, defaultCap, defaultCap, maxTTL, maxTTL},
+	}
+	for i, test := range tests {
+		c := caddy.NewTestController("dns", test.input)
+		ca, err := cacheParse(c)
+		if test.shouldErr && err == nil {
+			t.Errorf("Test %v: Expected error but found nil", i)
+			continue
+		} else if !test.shouldErr && err != nil {
+			t.Errorf("Test %v: Expected no error but found error: %v", i, err)
+			continue
+		}
+		if test.shouldErr && err != nil {
+			continue
+		}
+
+		if ca.ncap != test.expectedNcap {
+			t.Errorf("Test %v: Expected ncap %v but found: %v", i, test.expectedNcap, ca.ncap)
+		}
+		if ca.pcap != test.expectedPcap {
+			t.Errorf("Test %v: Expected pcap %v but found: %v", i, test.expectedPcap, ca.pcap)
+		}
+		if ca.nttl != test.expectedNttl {
+			t.Errorf("Test %v: Expected nttl %v but found: %v", i, test.expectedNttl, ca.nttl)
+		}
+		if ca.pttl != test.expectedPttl {
+			t.Errorf("Test %v: Expected pttl %v but found: %v", i, test.expectedPttl, ca.pttl)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/chaos/README.md b/vendor/github.com/miekg/coredns/middleware/chaos/README.md
new file mode 100644
index 0000000000..e03af7d007
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/chaos/README.md
@@ -0,0 +1,23 @@
+# chaos
+
+The *chaos* middleware allows CoreDNS to respond to TXT queries in the CH class.
+This is useful for retrieving version or author information from the server.
+
+## Syntax
+
+~~~
+chaos [VERSION] [AUTHORS...]
+~~~
+
+* **VERSION** is the version to return. Defaults to `CoreDNS-<version>`, if not set.
+* **AUTHORS** is what authors to return. No default.
+
+Note that you have to make sure that this middleware will get actual queries for the
+following zones: `version.bind`, `version.server`, `authors.bind`, `hostname.bind` and
+`id.server`.
+
+## Examples
+
+~~~
+chaos CoreDNS-001 "Miek Gieben" miek@miek.nl
+~~~
diff --git a/vendor/github.com/miekg/coredns/middleware/chaos/chaos.go b/vendor/github.com/miekg/coredns/middleware/chaos/chaos.go
new file mode 100644
index 0000000000..e320a1b7a5
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/chaos/chaos.go
@@ -0,0 +1,62 @@
+// Package chaos implements a middleware that answer to 'CH version.bind TXT' type queries.
+package chaos
+
+import (
+	"os"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+// Chaos allows CoreDNS to reply to CH TXT queries and return author or
+// version information.
+type Chaos struct {
+	Next    middleware.Handler
+	Version string
+	Authors map[string]bool
+}
+
+// ServeDNS implements the middleware.Handler interface.
+func (c Chaos) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	state := request.Request{W: w, Req: r}
+	if state.QClass() != dns.ClassCHAOS || state.QType() != dns.TypeTXT {
+		return middleware.NextOrFailure(c.Name(), c.Next, ctx, w, r)
+	}
+
+	m := new(dns.Msg)
+	m.SetReply(r)
+
+	hdr := dns.RR_Header{Name: state.QName(), Rrtype: dns.TypeTXT, Class: dns.ClassCHAOS, Ttl: 0}
+	switch state.Name() {
+	default:
+		return c.Next.ServeDNS(ctx, w, r)
+	case "authors.bind.":
+		for a := range c.Authors {
+			m.Answer = append(m.Answer, &dns.TXT{Hdr: hdr, Txt: []string{trim(a)}})
+		}
+	case "version.bind.", "version.server.":
+		m.Answer = []dns.RR{&dns.TXT{Hdr: hdr, Txt: []string{trim(c.Version)}}}
+	case "hostname.bind.", "id.server.":
+		hostname, err := os.Hostname()
+		if err != nil {
+			hostname = "localhost"
+		}
+		m.Answer = []dns.RR{&dns.TXT{Hdr: hdr, Txt: []string{trim(hostname)}}}
+	}
+	state.SizeAndDo(m)
+	w.WriteMsg(m)
+	return 0, nil
+}
+
+// Name implements the Handler interface.
+func (c Chaos) Name() string { return "chaos" }
+
+func trim(s string) string {
+	if len(s) < 256 {
+		return s
+	}
+	return s[:255]
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/chaos/chaos_test.go b/vendor/github.com/miekg/coredns/middleware/chaos/chaos_test.go
new file mode 100644
index 0000000000..dd383370b0
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/chaos/chaos_test.go
@@ -0,0 +1,80 @@
+package chaos
+
+import (
+	"testing"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+func TestChaos(t *testing.T) {
+	em := Chaos{
+		Version: version,
+		Authors: map[string]bool{"Miek Gieben": true},
+	}
+
+	tests := []struct {
+		next          middleware.Handler
+		qname         string
+		qtype         uint16
+		expectedCode  int
+		expectedReply string
+		expectedErr   error
+	}{
+		{
+			next:          test.NextHandler(dns.RcodeSuccess, nil),
+			qname:         "version.bind",
+			expectedCode:  dns.RcodeSuccess,
+			expectedReply: version,
+			expectedErr:   nil,
+		},
+		{
+			next:          test.NextHandler(dns.RcodeSuccess, nil),
+			qname:         "authors.bind",
+			expectedCode:  dns.RcodeSuccess,
+			expectedReply: "Miek Gieben",
+			expectedErr:   nil,
+		},
+		{
+			next:         test.NextHandler(dns.RcodeSuccess, nil),
+			qname:        "authors.bind",
+			qtype:        dns.TypeSRV,
+			expectedCode: dns.RcodeSuccess,
+			expectedErr:  nil,
+		},
+	}
+
+	ctx := context.TODO()
+
+	for i, tc := range tests {
+		req := new(dns.Msg)
+		if tc.qtype == 0 {
+			tc.qtype = dns.TypeTXT
+		}
+		req.SetQuestion(dns.Fqdn(tc.qname), tc.qtype)
+		req.Question[0].Qclass = dns.ClassCHAOS
+		em.Next = tc.next
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		code, err := em.ServeDNS(ctx, rec, req)
+
+		if err != tc.expectedErr {
+			t.Errorf("Test %d: Expected error %v, but got %v", i, tc.expectedErr, err)
+		}
+		if code != int(tc.expectedCode) {
+			t.Errorf("Test %d: Expected status code %d, but got %d", i, tc.expectedCode, code)
+		}
+		if tc.expectedReply != "" {
+			answer := rec.Msg.Answer[0].(*dns.TXT).Txt[0]
+			if answer != tc.expectedReply {
+				t.Errorf("Test %d: Expected answer %s, but got %s", i, tc.expectedReply, answer)
+			}
+		}
+	}
+}
+
+const version = "CoreDNS-001"
diff --git a/vendor/github.com/miekg/coredns/middleware/chaos/setup.go b/vendor/github.com/miekg/coredns/middleware/chaos/setup.go
new file mode 100644
index 0000000000..816dc79445
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/chaos/setup.go
@@ -0,0 +1,51 @@
+package chaos
+
+import (
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/mholt/caddy"
+)
+
+func init() {
+	caddy.RegisterPlugin("chaos", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setup,
+	})
+}
+
+func setup(c *caddy.Controller) error {
+	version, authors, err := chaosParse(c)
+	if err != nil {
+		return middleware.Error("chaos", err)
+	}
+
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
+		return Chaos{Next: next, Version: version, Authors: authors}
+	})
+
+	return nil
+}
+
+func chaosParse(c *caddy.Controller) (string, map[string]bool, error) {
+	version := ""
+	authors := make(map[string]bool)
+
+	for c.Next() {
+		args := c.RemainingArgs()
+		if len(args) == 0 {
+			return defaultVersion, nil, nil
+		}
+		if len(args) == 1 {
+			return args[0], nil, nil
+		}
+		version = args[0]
+		for _, a := range args[1:] {
+			authors[a] = true
+		}
+		return version, authors, nil
+	}
+	return version, authors, nil
+}
+
+var defaultVersion = caddy.AppName + "-" + caddy.AppVersion
diff --git a/vendor/github.com/miekg/coredns/middleware/chaos/setup_test.go b/vendor/github.com/miekg/coredns/middleware/chaos/setup_test.go
new file mode 100644
index 0000000000..c1741cdf6a
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/chaos/setup_test.go
@@ -0,0 +1,63 @@
+package chaos
+
+import (
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/mholt/caddy"
+)
+
+func TestSetupChaos(t *testing.T) {
+	tests := []struct {
+		input              string
+		shouldErr          bool
+		expectedVersion    string // expected version.
+		expectedAuthor     string // expected author (string, although we get a map).
+		expectedErrContent string // substring from the expected error. Empty for positive cases.
+	}{
+		// positive
+		{
+			`chaos`, false, defaultVersion, "", "",
+		},
+		{
+			`chaos v2`, false, "v2", "", "",
+		},
+		{
+			`chaos v3 "Miek Gieben"`, false, "v3", "Miek Gieben", "",
+		},
+		{
+			fmt.Sprintf(`chaos {
+				%s
+			}`, defaultVersion), false, defaultVersion, "", "",
+		},
+	}
+
+	for i, test := range tests {
+		c := caddy.NewTestController("dns", test.input)
+		version, authors, err := chaosParse(c)
+
+		if test.shouldErr && err == nil {
+			t.Errorf("Test %d: Expected error but found %s for input %s", i, err, test.input)
+		}
+
+		if err != nil {
+			if !test.shouldErr {
+				t.Errorf("Test %d: Expected no error but found one for input %s. Error was: %v", i, test.input, err)
+			}
+
+			if !strings.Contains(err.Error(), test.expectedErrContent) {
+				t.Errorf("Test %d: Expected error to contain: %v, found error: %v, input: %s", i, test.expectedErrContent, err, test.input)
+			}
+		}
+
+		if !test.shouldErr && version != test.expectedVersion {
+			t.Errorf("Chaos not correctly set for input %s. Expected: %s, actual: %s", test.input, test.expectedVersion, version)
+		}
+		if !test.shouldErr && authors != nil {
+			if _, ok := authors[test.expectedAuthor]; !ok {
+				t.Errorf("Chaos not correctly set for input %s. Expected: '%s', actual: '%s'", test.input, test.expectedAuthor, "Miek Gieben")
+			}
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/dnssec/README.md b/vendor/github.com/miekg/coredns/middleware/dnssec/README.md
new file mode 100644
index 0000000000..18322f7404
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/dnssec/README.md
@@ -0,0 +1,49 @@
+# dnssec
+
+*dnssec* enables on-the-fly DNSSEC signing of served data.
+
+## Syntax
+
+~~~
+dnssec [ZONES...]
+~~~
+
+* **ZONES** zones that should be signed. If empty, the zones from the configuration block
+    are used.
+
+If keys are not specified (see below), a key is generated and used for all signing operations. The
+DNSSEC signing will treat this key a CSK (common signing key), forgoing the ZSK/KSK split. All
+signing operations are done online. Authenticated denial of existence is implemented with NSEC black
+lies. Using ECDSA as an algorithm is preferred as this leads to smaller signatures (compared to
+RSA). NSEC3 is *not* supported.
+
+A single signing key can be specified by using the `key` directive.
+
+NOTE: Key generation has not been implemented yet.
+
+TODO(miek): think about key rollovers, and how to do them automatically.
+
+~~~
+dnssec [ZONES... ] {
+    key file KEY...
+    cache_capacity CAPACITY
+}
+~~~
+
+* `key file` indicates that key file(s) should be read from disk. When multiple keys are specified, RRsets
+  will be signed with all keys. Generating a key can be done with `dnssec-keygen`: `dnssec-keygen -a
+  ECDSAP256SHA256 <zonename>`. A key created for zone *A* can be safely used for zone *B*.
+
+* `cache_capacity` indicates the capacity of the LRU cache. The dnssec middleware uses LRU cache to manage
+  objects and the default capacity is 10000.
+
+## Metrics
+
+If monitoring is enabled (via the *prometheus* directive) then the following metrics are exported:
+
+* coredns_dnssec_cache_size{type} - total elements in the cache, type is "signature".
+* coredns_dnssec_cache_capacity{type} - total capacity of the cache, type is "signature".
+* coredns_dnssec_cache_hits_total - Counter of cache hits.
+* coredns_dnssec_cache_misses_total - Counter of cache misses.
+
+## Examples
diff --git a/vendor/github.com/miekg/coredns/middleware/dnssec/black_lies.go b/vendor/github.com/miekg/coredns/middleware/dnssec/black_lies.go
new file mode 100644
index 0000000000..527b2fc3ed
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/dnssec/black_lies.go
@@ -0,0 +1,24 @@
+package dnssec
+
+import "github.com/miekg/dns"
+
+// nsec returns an NSEC useful for NXDOMAIN respsones.
+// See https://tools.ietf.org/html/draft-valsorda-dnsop-black-lies-00
+// For example, a request for the non-existing name a.example.com would
+// cause the following NSEC record to be generated:
+//	a.example.com. 3600 IN NSEC \000.a.example.com. ( RRSIG NSEC )
+// This inturn makes every NXDOMAIN answer a NODATA one, don't forget to flip
+// the header rcode to NOERROR.
+func (d Dnssec) nsec(name, zone string, ttl, incep, expir uint32) ([]dns.RR, error) {
+	nsec := &dns.NSEC{}
+	nsec.Hdr = dns.RR_Header{Name: name, Ttl: ttl, Class: dns.ClassINET, Rrtype: dns.TypeNSEC}
+	nsec.NextDomain = "\\000." + name
+	nsec.TypeBitMap = []uint16{dns.TypeRRSIG, dns.TypeNSEC}
+
+	sigs, err := d.sign([]dns.RR{nsec}, zone, ttl, incep, expir)
+	if err != nil {
+		return nil, err
+	}
+
+	return append(sigs, nsec), nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/dnssec/black_lies_test.go b/vendor/github.com/miekg/coredns/middleware/dnssec/black_lies_test.go
new file mode 100644
index 0000000000..342e7bb3ab
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/dnssec/black_lies_test.go
@@ -0,0 +1,49 @@
+package dnssec
+
+import (
+	"testing"
+	"time"
+
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+func TestZoneSigningBlackLies(t *testing.T) {
+	d, rm1, rm2 := newDnssec(t, []string{"miek.nl."})
+	defer rm1()
+	defer rm2()
+
+	m := testNxdomainMsg()
+	state := request.Request{Req: m}
+	m = d.Sign(state, "miek.nl.", time.Now().UTC())
+	if !section(m.Ns, 2) {
+		t.Errorf("authority section should have 2 sig")
+	}
+	var nsec *dns.NSEC
+	for _, r := range m.Ns {
+		if r.Header().Rrtype == dns.TypeNSEC {
+			nsec = r.(*dns.NSEC)
+		}
+	}
+	if m.Rcode != dns.RcodeSuccess {
+		t.Errorf("expected rcode %d, got %d", dns.RcodeSuccess, m.Rcode)
+	}
+	if nsec == nil {
+		t.Fatalf("expected NSEC, got none")
+	}
+	if nsec.Hdr.Name != "ww.miek.nl." {
+		t.Errorf("expected %s, got %s", "ww.miek.nl.", nsec.Hdr.Name)
+	}
+	if nsec.NextDomain != "\\000.ww.miek.nl." {
+		t.Errorf("expected %s, got %s", "\\000.ww.miek.nl.", nsec.NextDomain)
+	}
+}
+
+func testNxdomainMsg() *dns.Msg {
+	return &dns.Msg{MsgHdr: dns.MsgHdr{Rcode: dns.RcodeNameError},
+		Question: []dns.Question{{Name: "ww.miek.nl.", Qclass: dns.ClassINET, Qtype: dns.TypeTXT}},
+		Ns: []dns.RR{test.SOA("miek.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1461471181 14400 3600 604800 14400")},
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/dnssec/cache.go b/vendor/github.com/miekg/coredns/middleware/dnssec/cache.go
new file mode 100644
index 0000000000..2153c84cbf
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/dnssec/cache.go
@@ -0,0 +1,23 @@
+package dnssec
+
+import (
+	"hash/fnv"
+	"strconv"
+
+	"github.com/miekg/dns"
+)
+
+// Key serializes the RRset and return a signature cache key.
+func key(rrs []dns.RR) string {
+	h := fnv.New64()
+	buf := make([]byte, 256)
+	for _, r := range rrs {
+		off, err := dns.PackRR(r, buf, 0, nil, false)
+		if err == nil {
+			h.Write(buf[:off])
+		}
+	}
+
+	i := h.Sum64()
+	return strconv.FormatUint(i, 10)
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/dnssec/cache_test.go b/vendor/github.com/miekg/coredns/middleware/dnssec/cache_test.go
new file mode 100644
index 0000000000..c88e310e3d
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/dnssec/cache_test.go
@@ -0,0 +1,35 @@
+package dnssec
+
+import (
+	"testing"
+	"time"
+
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
+
+	"github.com/hashicorp/golang-lru"
+)
+
+func TestCacheSet(t *testing.T) {
+	fPriv, rmPriv, _ := test.TempFile(".", privKey)
+	fPub, rmPub, _ := test.TempFile(".", pubKey)
+	defer rmPriv()
+	defer rmPub()
+
+	dnskey, err := ParseKeyFile(fPub, fPriv)
+	if err != nil {
+		t.Fatalf("failed to parse key: %v\n", err)
+	}
+
+	cache, _ := lru.New(defaultCap)
+	m := testMsg()
+	state := request.Request{Req: m}
+	k := key(m.Answer) // calculate *before* we add the sig
+	d := New([]string{"miek.nl."}, []*DNSKEY{dnskey}, nil, cache)
+	m = d.Sign(state, "miek.nl.", time.Now().UTC())
+
+	_, ok := d.get(k)
+	if !ok {
+		t.Errorf("signature was not added to the cache")
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/dnssec/dnskey.go b/vendor/github.com/miekg/coredns/middleware/dnssec/dnskey.go
new file mode 100644
index 0000000000..ce787ab54e
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/dnssec/dnskey.go
@@ -0,0 +1,72 @@
+package dnssec
+
+import (
+	"crypto"
+	"crypto/ecdsa"
+	"crypto/rsa"
+	"errors"
+	"os"
+	"time"
+
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+// DNSKEY holds a DNSSEC public and private key used for on-the-fly signing.
+type DNSKEY struct {
+	K      *dns.DNSKEY
+	s      crypto.Signer
+	keytag uint16
+}
+
+// ParseKeyFile read a DNSSEC keyfile as generated by dnssec-keygen or other
+// utilities. It adds ".key" for the public key and ".private" for the private key.
+func ParseKeyFile(pubFile, privFile string) (*DNSKEY, error) {
+	f, e := os.Open(pubFile)
+	if e != nil {
+		return nil, e
+	}
+	k, e := dns.ReadRR(f, pubFile)
+	if e != nil {
+		return nil, e
+	}
+
+	f, e = os.Open(privFile)
+	if e != nil {
+		return nil, e
+	}
+	p, e := k.(*dns.DNSKEY).ReadPrivateKey(f, privFile)
+	if e != nil {
+		return nil, e
+	}
+
+	if v, ok := p.(*rsa.PrivateKey); ok {
+		return &DNSKEY{k.(*dns.DNSKEY), v, k.(*dns.DNSKEY).KeyTag()}, nil
+	}
+	if v, ok := p.(*ecdsa.PrivateKey); ok {
+		return &DNSKEY{k.(*dns.DNSKEY), v, k.(*dns.DNSKEY).KeyTag()}, nil
+	}
+	return &DNSKEY{k.(*dns.DNSKEY), nil, 0}, errors.New("no known? private key found")
+}
+
+// getDNSKEY returns the correct DNSKEY to the client. Signatures are added when do is true.
+func (d Dnssec) getDNSKEY(state request.Request, zone string, do bool) *dns.Msg {
+	keys := make([]dns.RR, len(d.keys))
+	for i, k := range d.keys {
+		keys[i] = dns.Copy(k.K)
+		keys[i].Header().Name = zone
+	}
+	m := new(dns.Msg)
+	m.SetReply(state.Req)
+	m.Answer = keys
+	if !do {
+		return m
+	}
+
+	incep, expir := incepExpir(time.Now().UTC())
+	if sigs, err := d.sign(keys, zone, 3600, incep, expir); err == nil {
+		m.Answer = append(m.Answer, sigs...)
+	}
+	return m
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/dnssec/dnssec.go b/vendor/github.com/miekg/coredns/middleware/dnssec/dnssec.go
new file mode 100644
index 0000000000..539ef0b98d
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/dnssec/dnssec.go
@@ -0,0 +1,134 @@
+// Package dnssec implements a middleware that signs responses on-the-fly using
+// NSEC black lies.
+package dnssec
+
+import (
+	"time"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/response"
+	"github.com/coredns/coredns/middleware/pkg/singleflight"
+	"github.com/coredns/coredns/request"
+
+	"github.com/hashicorp/golang-lru"
+	"github.com/miekg/dns"
+)
+
+// Dnssec signs the reply on-the-fly.
+type Dnssec struct {
+	Next middleware.Handler
+
+	zones    []string
+	keys     []*DNSKEY
+	inflight *singleflight.Group
+	cache    *lru.Cache
+}
+
+// New returns a new Dnssec.
+func New(zones []string, keys []*DNSKEY, next middleware.Handler, cache *lru.Cache) Dnssec {
+	return Dnssec{Next: next,
+		zones:    zones,
+		keys:     keys,
+		cache:    cache,
+		inflight: new(singleflight.Group),
+	}
+}
+
+// Sign signs the message in state. it takes care of negative or nodata responses. It
+// uses NSEC black lies for authenticated denial of existence. Signatures
+// creates will be cached for a short while. By default we sign for 8 days,
+// starting 3 hours ago.
+func (d Dnssec) Sign(state request.Request, zone string, now time.Time) *dns.Msg {
+	req := state.Req
+
+	mt, _ := response.Typify(req) // TODO(miek): need opt record here?
+	if mt == response.Delegation {
+		return req
+	}
+
+	incep, expir := incepExpir(now)
+
+	if mt == response.NameError {
+		if req.Ns[0].Header().Rrtype != dns.TypeSOA || len(req.Ns) > 1 {
+			return req
+		}
+
+		ttl := req.Ns[0].Header().Ttl
+
+		if sigs, err := d.sign(req.Ns, zone, ttl, incep, expir); err == nil {
+			req.Ns = append(req.Ns, sigs...)
+		}
+		if sigs, err := d.nsec(state.Name(), zone, ttl, incep, expir); err == nil {
+			req.Ns = append(req.Ns, sigs...)
+		}
+		if len(req.Ns) > 1 { // actually added nsec and sigs, reset the rcode
+			req.Rcode = dns.RcodeSuccess
+		}
+		return req
+	}
+
+	for _, r := range rrSets(req.Answer) {
+		ttl := r[0].Header().Ttl
+		if sigs, err := d.sign(r, zone, ttl, incep, expir); err == nil {
+			req.Answer = append(req.Answer, sigs...)
+		}
+	}
+	for _, r := range rrSets(req.Ns) {
+		ttl := r[0].Header().Ttl
+		if sigs, err := d.sign(r, zone, ttl, incep, expir); err == nil {
+			req.Ns = append(req.Ns, sigs...)
+		}
+	}
+	for _, r := range rrSets(req.Extra) {
+		ttl := r[0].Header().Ttl
+		if sigs, err := d.sign(r, zone, ttl, incep, expir); err == nil {
+			req.Extra = append(sigs, req.Extra...) // prepend to leave OPT alone
+		}
+	}
+	return req
+}
+
+func (d Dnssec) sign(rrs []dns.RR, signerName string, ttl, incep, expir uint32) ([]dns.RR, error) {
+	k := key(rrs)
+	sgs, ok := d.get(k)
+	if ok {
+		return sgs, nil
+	}
+
+	sigs, err := d.inflight.Do(k, func() (interface{}, error) {
+		sigs := make([]dns.RR, len(d.keys))
+		var e error
+		for i, k := range d.keys {
+			sig := k.newRRSIG(signerName, ttl, incep, expir)
+			e = sig.Sign(k.s, rrs)
+			sigs[i] = sig
+		}
+		d.set(k, sigs)
+		return sigs, e
+	})
+	return sigs.([]dns.RR), err
+}
+
+func (d Dnssec) set(key string, sigs []dns.RR) {
+	d.cache.Add(key, sigs)
+}
+
+func (d Dnssec) get(key string) ([]dns.RR, bool) {
+	if s, ok := d.cache.Get(key); ok {
+		cacheHits.Inc()
+		return s.([]dns.RR), true
+	}
+	cacheMisses.Inc()
+	return nil, false
+}
+
+func incepExpir(now time.Time) (uint32, uint32) {
+	incep := uint32(now.Add(-3 * time.Hour).Unix()) // -(2+1) hours, be sure to catch daylight saving time and such
+	expir := uint32(now.Add(eightDays).Unix())      // sign for 8 days
+	return incep, expir
+}
+
+const (
+	eightDays  = 8 * 24 * time.Hour
+	defaultCap = 10000 // default capacity of the cache.
+)
diff --git a/vendor/github.com/miekg/coredns/middleware/dnssec/dnssec_test.go b/vendor/github.com/miekg/coredns/middleware/dnssec/dnssec_test.go
new file mode 100644
index 0000000000..037dfbdd77
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/dnssec/dnssec_test.go
@@ -0,0 +1,195 @@
+package dnssec
+
+import (
+	"testing"
+	"time"
+
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
+
+	"github.com/hashicorp/golang-lru"
+	"github.com/miekg/dns"
+)
+
+func TestZoneSigning(t *testing.T) {
+	d, rm1, rm2 := newDnssec(t, []string{"miek.nl."})
+	defer rm1()
+	defer rm2()
+
+	m := testMsg()
+	state := request.Request{Req: m}
+
+	m = d.Sign(state, "miek.nl.", time.Now().UTC())
+	if !section(m.Answer, 1) {
+		t.Errorf("answer section should have 1 sig")
+	}
+	if !section(m.Ns, 1) {
+		t.Errorf("authority section should have 1 sig")
+	}
+}
+
+func TestZoneSigningDouble(t *testing.T) {
+	d, rm1, rm2 := newDnssec(t, []string{"miek.nl."})
+	defer rm1()
+	defer rm2()
+
+	fPriv1, rmPriv1, _ := test.TempFile(".", privKey1)
+	fPub1, rmPub1, _ := test.TempFile(".", pubKey1)
+	defer rmPriv1()
+	defer rmPub1()
+
+	key1, err := ParseKeyFile(fPub1, fPriv1)
+	if err != nil {
+		t.Fatalf("failed to parse key: %v\n", err)
+	}
+	d.keys = append(d.keys, key1)
+
+	m := testMsg()
+	state := request.Request{Req: m}
+	m = d.Sign(state, "miek.nl.", time.Now().UTC())
+	if !section(m.Answer, 2) {
+		t.Errorf("answer section should have 1 sig")
+	}
+	if !section(m.Ns, 2) {
+		t.Errorf("authority section should have 1 sig")
+	}
+}
+
+// TestSigningDifferentZone tests if a key for miek.nl and be used for example.org.
+func TestSigningDifferentZone(t *testing.T) {
+	fPriv, rmPriv, _ := test.TempFile(".", privKey)
+	fPub, rmPub, _ := test.TempFile(".", pubKey)
+	defer rmPriv()
+	defer rmPub()
+
+	key, err := ParseKeyFile(fPub, fPriv)
+	if err != nil {
+		t.Fatalf("failed to parse key: %v\n", err)
+	}
+
+	m := testMsgEx()
+	state := request.Request{Req: m}
+	cache, _ := lru.New(defaultCap)
+	d := New([]string{"example.org."}, []*DNSKEY{key}, nil, cache)
+	m = d.Sign(state, "example.org.", time.Now().UTC())
+	if !section(m.Answer, 1) {
+		t.Errorf("answer section should have 1 sig")
+		t.Logf("%+v\n", m)
+	}
+	if !section(m.Ns, 1) {
+		t.Errorf("authority section should have 1 sig")
+		t.Logf("%+v\n", m)
+	}
+}
+
+func TestSigningCname(t *testing.T) {
+	d, rm1, rm2 := newDnssec(t, []string{"miek.nl."})
+	defer rm1()
+	defer rm2()
+
+	m := testMsgCname()
+	state := request.Request{Req: m}
+	m = d.Sign(state, "miek.nl.", time.Now().UTC())
+	if !section(m.Answer, 1) {
+		t.Errorf("answer section should have 1 sig")
+	}
+}
+
+func TestZoneSigningDelegation(t *testing.T) {
+	d, rm1, rm2 := newDnssec(t, []string{"miek.nl."})
+	defer rm1()
+	defer rm2()
+
+	m := testDelegationMsg()
+	state := request.Request{Req: m}
+	m = d.Sign(state, "miek.nl.", time.Now().UTC())
+	if !section(m.Ns, 0) {
+		t.Errorf("authority section should have 0 sig")
+		t.Logf("%v\n", m)
+	}
+	if !section(m.Extra, 0) {
+		t.Errorf("answer section should have 0 sig")
+		t.Logf("%v\n", m)
+	}
+}
+
+func section(rss []dns.RR, nrSigs int) bool {
+	i := 0
+	for _, r := range rss {
+		if r.Header().Rrtype == dns.TypeRRSIG {
+			i++
+		}
+	}
+	return nrSigs == i
+}
+
+func testMsg() *dns.Msg {
+	// don't care about the message header
+	return &dns.Msg{
+		Answer: []dns.RR{test.MX("miek.nl.	1703	IN	MX	1 aspmx.l.google.com.")},
+		Ns: []dns.RR{test.NS("miek.nl.	1703	IN	NS	omval.tednet.nl.")},
+	}
+}
+func testMsgEx() *dns.Msg {
+	return &dns.Msg{
+		Answer: []dns.RR{test.MX("example.org.	1703	IN	MX	1 aspmx.l.google.com.")},
+		Ns: []dns.RR{test.NS("example.org.	1703	IN	NS	omval.tednet.nl.")},
+	}
+}
+
+func testMsgCname() *dns.Msg {
+	return &dns.Msg{
+		Answer: []dns.RR{test.CNAME("www.miek.nl.	1800	IN	CNAME	a.miek.nl.")},
+	}
+}
+
+func testDelegationMsg() *dns.Msg {
+	return &dns.Msg{
+		Ns: []dns.RR{
+			test.NS("miek.nl.	3600	IN	NS	linode.atoom.net."),
+			test.NS("miek.nl.	3600	IN	NS	ns-ext.nlnetlabs.nl."),
+			test.NS("miek.nl.	3600	IN	NS	omval.tednet.nl."),
+		},
+		Extra: []dns.RR{
+			test.A("omval.tednet.nl.	3600	IN	A	185.49.141.42"),
+			test.AAAA("omval.tednet.nl.	3600	IN	AAAA	2a04:b900:0:100::42"),
+		},
+	}
+}
+
+func newDnssec(t *testing.T, zones []string) (Dnssec, func(), func()) {
+	k, rm1, rm2 := newKey(t)
+	cache, _ := lru.New(defaultCap)
+	d := New(zones, []*DNSKEY{k}, nil, cache)
+	return d, rm1, rm2
+}
+
+func newKey(t *testing.T) (*DNSKEY, func(), func()) {
+	fPriv, rmPriv, _ := test.TempFile(".", privKey)
+	fPub, rmPub, _ := test.TempFile(".", pubKey)
+
+	key, err := ParseKeyFile(fPub, fPriv)
+	if err != nil {
+		t.Fatalf("failed to parse key: %v\n", err)
+	}
+	return key, rmPriv, rmPub
+}
+
+const (
+	pubKey  = `miek.nl. IN DNSKEY 257 3 13 0J8u0XJ9GNGFEBXuAmLu04taHG4BXPP3gwhetiOUMnGA+x09nqzgF5IY OyjWB7N3rXqQbnOSILhH1hnuyh7mmA==`
+	privKey = `Private-key-format: v1.3
+Algorithm: 13 (ECDSAP256SHA256)
+PrivateKey: /4BZk8AFvyW5hL3cOLSVxIp1RTqHSAEloWUxj86p3gs=
+Created: 20160423195532
+Publish: 20160423195532
+Activate: 20160423195532
+`
+	pubKey1  = `example.org. IN DNSKEY 257 3 13 tVRWNSGpHZbCi7Pr7OmbADVUO3MxJ0Lb8Lk3o/HBHqCxf5K/J50lFqRa 98lkdAIiFOVRy8LyMvjwmxZKwB5MNw==`
+	privKey1 = `Private-key-format: v1.3
+Algorithm: 13 (ECDSAP256SHA256)
+PrivateKey: i8j4OfDGT8CQt24SDwLz2hg9yx4qKOEOh1LvbAuSp1c=
+Created: 20160423211746
+Publish: 20160423211746
+Activate: 20160423211746
+`
+)
diff --git a/vendor/github.com/miekg/coredns/middleware/dnssec/handler.go b/vendor/github.com/miekg/coredns/middleware/dnssec/handler.go
new file mode 100644
index 0000000000..dab02e4690
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/dnssec/handler.go
@@ -0,0 +1,82 @@
+package dnssec
+
+import (
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+	"github.com/prometheus/client_golang/prometheus"
+	"golang.org/x/net/context"
+)
+
+// ServeDNS implements the middleware.Handler interface.
+func (d Dnssec) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	state := request.Request{W: w, Req: r}
+
+	do := state.Do()
+	qname := state.Name()
+	qtype := state.QType()
+	zone := middleware.Zones(d.zones).Matches(qname)
+	if zone == "" {
+		return middleware.NextOrFailure(d.Name(), d.Next, ctx, w, r)
+	}
+
+	// Intercept queries for DNSKEY, but only if one of the zones matches the qname, otherwise we let
+	// the query through.
+	if qtype == dns.TypeDNSKEY {
+		for _, z := range d.zones {
+			if qname == z {
+				resp := d.getDNSKEY(state, z, do)
+				resp.Authoritative = true
+				state.SizeAndDo(resp)
+				w.WriteMsg(resp)
+				return dns.RcodeSuccess, nil
+			}
+		}
+	}
+
+	drr := &ResponseWriter{w, d}
+	return middleware.NextOrFailure(d.Name(), d.Next, ctx, drr, r)
+}
+
+var (
+	cacheSize = prometheus.NewGaugeVec(prometheus.GaugeOpts{
+		Namespace: middleware.Namespace,
+		Subsystem: subsystem,
+		Name:      "cache_size",
+		Help:      "The number of elements in the dnssec cache.",
+	}, []string{"type"})
+
+	cacheCapacity = prometheus.NewGaugeVec(prometheus.GaugeOpts{
+		Namespace: middleware.Namespace,
+		Subsystem: subsystem,
+		Name:      "cache_capacity",
+		Help:      "The dnssec cache's capacity.",
+	}, []string{"type"})
+
+	cacheHits = prometheus.NewCounter(prometheus.CounterOpts{
+		Namespace: middleware.Namespace,
+		Subsystem: subsystem,
+		Name:      "cache_hits_total",
+		Help:      "The count of cache hits.",
+	})
+
+	cacheMisses = prometheus.NewCounter(prometheus.CounterOpts{
+		Namespace: middleware.Namespace,
+		Subsystem: subsystem,
+		Name:      "cache_misses_total",
+		Help:      "The count of cache misses.",
+	})
+)
+
+// Name implements the Handler interface.
+func (d Dnssec) Name() string { return "dnssec" }
+
+const subsystem = "dnssec"
+
+func init() {
+	prometheus.MustRegister(cacheSize)
+	prometheus.MustRegister(cacheCapacity)
+	prometheus.MustRegister(cacheHits)
+	prometheus.MustRegister(cacheMisses)
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/dnssec/handler_test.go b/vendor/github.com/miekg/coredns/middleware/dnssec/handler_test.go
new file mode 100644
index 0000000000..0264950c97
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/dnssec/handler_test.go
@@ -0,0 +1,188 @@
+package dnssec
+
+import (
+	"sort"
+	"strings"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/file"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/hashicorp/golang-lru"
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+var dnssecTestCases = []test.Case{
+	{
+		Qname: "miek.nl.", Qtype: dns.TypeDNSKEY,
+		Answer: []dns.RR{
+			test.DNSKEY("miek.nl.	3600	IN	DNSKEY	257 3 13 0J8u0XJ9GNGFEBXuAmLu04taHG4"),
+		},
+	},
+	{
+		Qname: "miek.nl.", Qtype: dns.TypeDNSKEY, Do: true,
+		Answer: []dns.RR{
+			test.DNSKEY("miek.nl.	3600	IN	DNSKEY	257 3 13 0J8u0XJ9GNGFEBXuAmLu04taHG4"),
+			test.RRSIG("miek.nl.	3600	IN	RRSIG	DNSKEY 13 2 3600 20160503150844 20160425120844 18512 miek.nl. Iw/kNOyM"),
+		},
+		Extra: []dns.RR{test.OPT(4096, true)},
+	},
+}
+
+var dnsTestCases = []test.Case{
+	{
+		Qname: "miek.nl.", Qtype: dns.TypeDNSKEY,
+		Answer: []dns.RR{
+			test.DNSKEY("miek.nl.	3600	IN	DNSKEY	257 3 13 0J8u0XJ9GNGFEBXuAmLu04taHG4"),
+		},
+	},
+	{
+		Qname: "miek.nl.", Qtype: dns.TypeMX,
+		Answer: []dns.RR{
+			test.MX("miek.nl.	1800	IN	MX	1 aspmx.l.google.com."),
+		},
+		Ns: []dns.RR{
+			test.NS("miek.nl.	1800	IN	NS	linode.atoom.net."),
+		},
+	},
+	{
+		Qname: "miek.nl.", Qtype: dns.TypeMX, Do: true,
+		Answer: []dns.RR{
+			test.MX("miek.nl.	1800	IN	MX	1 aspmx.l.google.com."),
+			test.RRSIG("miek.nl.	1800	IN	RRSIG	MX 13 2 3600 20160503192428 20160425162428 18512 miek.nl. 4nxuGKitXjPVA9zP1JIUvA09"),
+		},
+		Ns: []dns.RR{
+			test.NS("miek.nl.	1800	IN	NS	linode.atoom.net."),
+			test.RRSIG("miek.nl.	1800	IN	RRSIG	NS 13 2 3600 20161217114912 20161209084912 18512 miek.nl. ad9gA8VWgF1H8ze9/0Rk2Q=="),
+		},
+		Extra: []dns.RR{test.OPT(4096, true)},
+	},
+	{
+		Qname: "www.miek.nl.", Qtype: dns.TypeAAAA, Do: true,
+		Answer: []dns.RR{
+			test.AAAA("a.miek.nl.	1800	IN	AAAA	2a01:7e00::f03c:91ff:fef1:6735"),
+			test.RRSIG("a.miek.nl.	1800	IN	RRSIG	AAAA 13 3 3600 20160503193047 20160425163047 18512 miek.nl. UAyMG+gcnoXW3"),
+			test.CNAME("www.miek.nl.	1800	IN	CNAME	a.miek.nl."),
+			test.RRSIG("www.miek.nl.	1800	IN	RRSIG	CNAME 13 3 3600 20160503193047 20160425163047 18512 miek.nl. E3qGZn"),
+		},
+		Ns: []dns.RR{
+			test.NS("miek.nl.	1800	IN	NS	linode.atoom.net."),
+			test.RRSIG("miek.nl.	1800	IN	RRSIG	NS 13 2 3600 20161217114912 20161209084912 18512 miek.nl. ad9gA8VWgF1H8ze9/0Rk2Q=="),
+		},
+		Extra: []dns.RR{test.OPT(4096, true)},
+	},
+	{
+		Qname: "www.example.org.", Qtype: dns.TypeAAAA, Do: true,
+		Rcode: dns.RcodeServerFailure,
+		// Extra: []dns.RR{test.OPT(4096, true)}, // test.ErrorHandler is a simple handler that does not do EDNS.
+	},
+}
+
+func TestLookupZone(t *testing.T) {
+	zone, err := file.Parse(strings.NewReader(dbMiekNL), "miek.nl.", "stdin")
+	if err != nil {
+		return
+	}
+	fm := file.File{Next: test.ErrorHandler(), Zones: file.Zones{Z: map[string]*file.Zone{"miek.nl.": zone}, Names: []string{"miek.nl."}}}
+	dnskey, rm1, rm2 := newKey(t)
+	defer rm1()
+	defer rm2()
+	cache, _ := lru.New(defaultCap)
+	dh := New([]string{"miek.nl."}, []*DNSKEY{dnskey}, fm, cache)
+	ctx := context.TODO()
+
+	for _, tc := range dnsTestCases {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		_, err := dh.ServeDNS(ctx, rec, m)
+		if err != nil {
+			t.Errorf("expected no error, got %v\n", err)
+			return
+		}
+
+		resp := rec.Msg
+		sort.Sort(test.RRSet(resp.Answer))
+		sort.Sort(test.RRSet(resp.Ns))
+		sort.Sort(test.RRSet(resp.Extra))
+
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
+
+func TestLookupDNSKEY(t *testing.T) {
+	dnskey, rm1, rm2 := newKey(t)
+	defer rm1()
+	defer rm2()
+	cache, _ := lru.New(defaultCap)
+	dh := New([]string{"miek.nl."}, []*DNSKEY{dnskey}, test.ErrorHandler(), cache)
+	ctx := context.TODO()
+
+	for _, tc := range dnssecTestCases {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		_, err := dh.ServeDNS(ctx, rec, m)
+		if err != nil {
+			t.Errorf("expected no error, got %v\n", err)
+			return
+		}
+
+		resp := rec.Msg
+		if !resp.Authoritative {
+			t.Errorf("Authoritative Answer should be true, got false")
+		}
+
+		sort.Sort(test.RRSet(resp.Answer))
+		sort.Sort(test.RRSet(resp.Ns))
+		sort.Sort(test.RRSet(resp.Extra))
+
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
+
+const dbMiekNL = `
+$TTL    30M
+$ORIGIN miek.nl.
+@       IN      SOA     linode.atoom.net. miek.miek.nl. (
+                             1282630057 ; Serial
+                             4H         ; Refresh
+                             1H         ; Retry
+                             7D         ; Expire
+                             4H )       ; Negative Cache TTL
+                IN      NS      linode.atoom.net.
+
+                IN      MX      1  aspmx.l.google.com.
+
+                IN      A       139.162.196.78
+                IN      AAAA    2a01:7e00::f03c:91ff:fef1:6735
+
+a               IN      A       139.162.196.78
+                IN      AAAA    2a01:7e00::f03c:91ff:fef1:6735
+www             IN      CNAME   a`
diff --git a/vendor/github.com/miekg/coredns/middleware/dnssec/responsewriter.go b/vendor/github.com/miekg/coredns/middleware/dnssec/responsewriter.go
new file mode 100644
index 0000000000..d3c34d114d
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/dnssec/responsewriter.go
@@ -0,0 +1,49 @@
+package dnssec
+
+import (
+	"log"
+	"time"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+// ResponseWriter sign the response on the fly.
+type ResponseWriter struct {
+	dns.ResponseWriter
+	d Dnssec
+}
+
+// WriteMsg implements the dns.ResponseWriter interface.
+func (d *ResponseWriter) WriteMsg(res *dns.Msg) error {
+	// By definition we should sign anything that comes back, we should still figure out for
+	// which zone it should be.
+	state := request.Request{W: d.ResponseWriter, Req: res}
+
+	qname := state.Name()
+	zone := middleware.Zones(d.d.zones).Matches(qname)
+	if zone == "" {
+		return d.ResponseWriter.WriteMsg(res)
+	}
+
+	if state.Do() {
+		res = d.d.Sign(state, zone, time.Now().UTC())
+
+		cacheSize.WithLabelValues("signature").Set(float64(d.d.cache.Len()))
+	}
+	state.SizeAndDo(res)
+
+	return d.ResponseWriter.WriteMsg(res)
+}
+
+// Write implements the dns.ResponseWriter interface.
+func (d *ResponseWriter) Write(buf []byte) (int, error) {
+	log.Printf("[WARNING] Dnssec called with Write: not signing reply")
+	n, err := d.ResponseWriter.Write(buf)
+	return n, err
+}
+
+// Hijack implements the dns.ResponseWriter interface.
+func (d *ResponseWriter) Hijack() { d.ResponseWriter.Hijack() }
diff --git a/vendor/github.com/miekg/coredns/middleware/dnssec/rrsig.go b/vendor/github.com/miekg/coredns/middleware/dnssec/rrsig.go
new file mode 100644
index 0000000000..c68413622e
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/dnssec/rrsig.go
@@ -0,0 +1,53 @@
+package dnssec
+
+import "github.com/miekg/dns"
+
+// newRRSIG return a new RRSIG, with all fields filled out, except the signed data.
+func (k *DNSKEY) newRRSIG(signerName string, ttl, incep, expir uint32) *dns.RRSIG {
+	sig := new(dns.RRSIG)
+
+	sig.Hdr.Rrtype = dns.TypeRRSIG
+	sig.Algorithm = k.K.Algorithm
+	sig.KeyTag = k.keytag
+	sig.SignerName = signerName
+	sig.Hdr.Ttl = ttl
+	sig.OrigTtl = origTTL
+
+	sig.Inception = incep
+	sig.Expiration = expir
+
+	return sig
+}
+
+type rrset struct {
+	qname string
+	qtype uint16
+}
+
+// rrSets returns rrs as a map of RRsets. It skips RRSIG and OPT records as those don't need to be signed.
+func rrSets(rrs []dns.RR) map[rrset][]dns.RR {
+	m := make(map[rrset][]dns.RR)
+
+	for _, r := range rrs {
+		if r.Header().Rrtype == dns.TypeRRSIG || r.Header().Rrtype == dns.TypeOPT {
+			continue
+		}
+
+		if s, ok := m[rrset{r.Header().Name, r.Header().Rrtype}]; ok {
+			s = append(s, r)
+			m[rrset{r.Header().Name, r.Header().Rrtype}] = s
+			continue
+		}
+
+		s := make([]dns.RR, 1, 3)
+		s[0] = r
+		m[rrset{r.Header().Name, r.Header().Rrtype}] = s
+	}
+
+	if len(m) > 0 {
+		return m
+	}
+	return nil
+}
+
+const origTTL = 3600
diff --git a/vendor/github.com/miekg/coredns/middleware/dnssec/setup.go b/vendor/github.com/miekg/coredns/middleware/dnssec/setup.go
new file mode 100644
index 0000000000..1b1fb6393b
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/dnssec/setup.go
@@ -0,0 +1,112 @@
+package dnssec
+
+import (
+	"strconv"
+	"strings"
+
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/hashicorp/golang-lru"
+	"github.com/mholt/caddy"
+)
+
+func init() {
+	caddy.RegisterPlugin("dnssec", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setup,
+	})
+}
+
+func setup(c *caddy.Controller) error {
+	zones, keys, capacity, err := dnssecParse(c)
+	if err != nil {
+		return middleware.Error("dnssec", err)
+	}
+
+	cache, err := lru.New(capacity)
+	if err != nil {
+		return err
+	}
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
+		return New(zones, keys, next, cache)
+	})
+
+	// Export the capacity for the metrics. This only happens once, because this is a re-load change only.
+	cacheCapacity.WithLabelValues("signature").Set(float64(capacity))
+
+	return nil
+}
+
+func dnssecParse(c *caddy.Controller) ([]string, []*DNSKEY, int, error) {
+	zones := []string{}
+
+	keys := []*DNSKEY{}
+
+	capacity := defaultCap
+	for c.Next() {
+		if c.Val() == "dnssec" {
+			// dnssec [zones...]
+			zones = make([]string, len(c.ServerBlockKeys))
+			copy(zones, c.ServerBlockKeys)
+			args := c.RemainingArgs()
+			if len(args) > 0 {
+				zones = args
+			}
+
+			for c.NextBlock() {
+				switch c.Val() {
+				case "key":
+					k, e := keyParse(c)
+					if e != nil {
+						return nil, nil, 0, e
+					}
+					keys = append(keys, k...)
+				case "cache_capacity":
+					if !c.NextArg() {
+						return nil, nil, 0, c.ArgErr()
+					}
+					value := c.Val()
+					cacheCap, err := strconv.Atoi(value)
+					if err != nil {
+						return nil, nil, 0, err
+					}
+					capacity = cacheCap
+				}
+
+			}
+		}
+	}
+	for i := range zones {
+		zones[i] = middleware.Host(zones[i]).Normalize()
+	}
+	return zones, keys, capacity, nil
+}
+
+func keyParse(c *caddy.Controller) ([]*DNSKEY, error) {
+	keys := []*DNSKEY{}
+
+	if !c.NextArg() {
+		return nil, c.ArgErr()
+	}
+	value := c.Val()
+	if value == "file" {
+		ks := c.RemainingArgs()
+		for _, k := range ks {
+			base := k
+			// Kmiek.nl.+013+26205.key, handle .private or without extension: Kmiek.nl.+013+26205
+			if strings.HasSuffix(k, ".key") {
+				base = k[:len(k)-4]
+			}
+			if strings.HasSuffix(k, ".private") {
+				base = k[:len(k)-8]
+			}
+			k, err := ParseKeyFile(base+".key", base+".private")
+			if err != nil {
+				return nil, err
+			}
+			keys = append(keys, k)
+		}
+	}
+	return keys, nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/dnssec/setup_test.go b/vendor/github.com/miekg/coredns/middleware/dnssec/setup_test.go
new file mode 100644
index 0000000000..3940505a94
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/dnssec/setup_test.go
@@ -0,0 +1,65 @@
+package dnssec
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/mholt/caddy"
+)
+
+func TestSetupDnssec(t *testing.T) {
+	tests := []struct {
+		input              string
+		shouldErr          bool
+		expectedZones      []string
+		expectedKeys       []string
+		expectedCapacity   int
+		expectedErrContent string
+	}{
+		{
+			`dnssec`, false, nil, nil, defaultCap, "",
+		},
+		{
+			`dnssec miek.nl`, false, []string{"miek.nl."}, nil, defaultCap, "",
+		},
+		{
+			`dnssec miek.nl {
+				cache_capacity 100
+			}`, false, []string{"miek.nl."}, nil, 100, "",
+		},
+	}
+
+	for i, test := range tests {
+		c := caddy.NewTestController("dns", test.input)
+		zones, keys, capacity, err := dnssecParse(c)
+
+		if test.shouldErr && err == nil {
+			t.Errorf("Test %d: Expected error but found %s for input %s", i, err, test.input)
+		}
+
+		if err != nil {
+			if !test.shouldErr {
+				t.Errorf("Test %d: Expected no error but found one for input %s. Error was: %v", i, test.input, err)
+			}
+
+			if !strings.Contains(err.Error(), test.expectedErrContent) {
+				t.Errorf("Test %d: Expected error to contain: %v, found error: %v, input: %s", i, test.expectedErrContent, err, test.input)
+			}
+		}
+		if !test.shouldErr {
+			for i, z := range test.expectedZones {
+				if zones[i] != z {
+					t.Errorf("Dnssec not correctly set for input %s. Expected: %s, actual: %s", test.input, z, zones[i])
+				}
+			}
+			for i, k := range test.expectedKeys {
+				if k != keys[i].K.Header().Name {
+					t.Errorf("Dnssec not correctly set for input %s. Expected: '%s', actual: '%s'", test.input, k, keys[i].K.Header().Name)
+				}
+			}
+			if capacity != test.expectedCapacity {
+				t.Errorf("Dnssec not correctly set capacity for input '%s' Expected: '%d', actual: '%d'", test.input, capacity, test.expectedCapacity)
+			}
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/erratic/README.md b/vendor/github.com/miekg/coredns/middleware/erratic/README.md
new file mode 100644
index 0000000000..c255e31500
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/erratic/README.md
@@ -0,0 +1,45 @@
+# erratic
+
+*erratic* is a middleware useful for testing client behavior. It returns a static response to all
+queries, but the responses can be delayed by a random amount of time or dropped all together, i.e.
+no answer at all.
+
+~~~ txt
+._<transport>.qname. 0 IN SRV 0 0 <port> .
+~~~
+
+The *erratic* middleware will respond to every A or AAAA query. For any other type it will return
+a SERVFAIL response. The reply for A will return 192.0.2.53 (see RFC 5737), for AAAA it returns
+2001:DB8::53 (see RFC 3849).
+
+## Syntax
+
+~~~ txt
+erratic {
+    drop AMOUNT
+}
+~~~
+
+* **AMOUNT** drop 1 per **AMOUNT** of the queries, the default is 2.
+
+## Examples
+
+~~~ txt
+.:53 {
+    erratic {
+        drop 3
+    }
+}
+~~~
+
+Or even shorter if the defaults suits you:
+
+~~~ txt
+. {
+    erratic
+}
+~~~
+
+## Bugs
+
+Delaying answers is not implemented.
diff --git a/vendor/github.com/miekg/coredns/middleware/erratic/erratic.go b/vendor/github.com/miekg/coredns/middleware/erratic/erratic.go
new file mode 100644
index 0000000000..a3fbb2e8e6
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/erratic/erratic.go
@@ -0,0 +1,74 @@
+// Package erratic implements a middleware that returns erratic answers (delayed, dropped).
+package erratic
+
+import (
+	"sync/atomic"
+
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+// Erratic is a middleware that returns erratic repsonses to each client.
+type Erratic struct {
+	amount uint64
+
+	q uint64 // counter of queries
+}
+
+// ServeDNS implements the middleware.Handler interface.
+func (e *Erratic) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	state := request.Request{W: w, Req: r}
+
+	drop := false
+	if e.amount > 0 {
+		queryNr := atomic.LoadUint64(&e.q)
+
+		if queryNr%e.amount == 0 {
+			drop = true
+		}
+
+		atomic.AddUint64(&e.q, 1)
+	}
+
+	m := new(dns.Msg)
+	m.SetReply(r)
+	m.Compress = true
+	m.Authoritative = true
+
+	// small dance to copy rrA or rrAAAA into a non-pointer var that allows us to overwrite the ownername
+	// in a non-racy way.
+	switch state.QType() {
+	case dns.TypeA:
+		rr := *(rrA.(*dns.A))
+		rr.Header().Name = state.QName()
+		m.Answer = append(m.Answer, &rr)
+	case dns.TypeAAAA:
+		rr := *(rrAAAA.(*dns.AAAA))
+		rr.Header().Name = state.QName()
+		m.Answer = append(m.Answer, &rr)
+	default:
+		if !drop {
+			// coredns will return error.
+			return dns.RcodeServerFailure, nil
+		}
+	}
+
+	if drop {
+		return 0, nil
+	}
+
+	state.SizeAndDo(m)
+	w.WriteMsg(m)
+
+	return 0, nil
+}
+
+// Name implements the Handler interface.
+func (e *Erratic) Name() string { return "erratic" }
+
+var (
+	rrA, _    = dns.NewRR(". IN 0 A 192.0.2.53")
+	rrAAAA, _ = dns.NewRR(". IN 0 AAAA 2001:DB8::53")
+)
diff --git a/vendor/github.com/miekg/coredns/middleware/erratic/erratic_test.go b/vendor/github.com/miekg/coredns/middleware/erratic/erratic_test.go
new file mode 100644
index 0000000000..e63545b359
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/erratic/erratic_test.go
@@ -0,0 +1,45 @@
+package erratic
+
+import (
+	"testing"
+
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+func TestErraticDrop(t *testing.T) {
+	e := &Erratic{amount: 2} // 50% drops
+
+	tests := []struct {
+		expectedCode int
+		expectedErr  error
+		drop         bool
+	}{
+		{expectedCode: dns.RcodeSuccess, expectedErr: nil, drop: true},
+		{expectedCode: dns.RcodeSuccess, expectedErr: nil, drop: false},
+	}
+
+	ctx := context.TODO()
+
+	for i, tc := range tests {
+		req := new(dns.Msg)
+		req.SetQuestion("example.org.", dns.TypeA)
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		code, err := e.ServeDNS(ctx, rec, req)
+
+		if err != tc.expectedErr {
+			t.Errorf("Test %d: Expected error %q, but got %q", i, tc.expectedErr, err)
+		}
+		if code != int(tc.expectedCode) {
+			t.Errorf("Test %d: Expected status code %d, but got %d", i, tc.expectedCode, code)
+		}
+
+		if tc.drop && rec.Msg != nil {
+			t.Errorf("Test %d: Expected dropped packet, but got %q", i, rec.Msg.Question[0].Name)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/erratic/setup.go b/vendor/github.com/miekg/coredns/middleware/erratic/setup.go
new file mode 100644
index 0000000000..ac40d24fba
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/erratic/setup.go
@@ -0,0 +1,59 @@
+package erratic
+
+import (
+	"fmt"
+	"strconv"
+
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/mholt/caddy"
+)
+
+func init() {
+	caddy.RegisterPlugin("erratic", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setupErratic,
+	})
+}
+
+func setupErratic(c *caddy.Controller) error {
+	e, err := parseErratic(c)
+	if err != nil {
+		return middleware.Error("erratic", err)
+	}
+
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
+		return e
+	})
+
+	return nil
+}
+
+func parseErratic(c *caddy.Controller) (*Erratic, error) {
+	e := &Erratic{amount: 2}
+	for c.Next() { // 'erratic'
+		for c.NextBlock() {
+			switch c.Val() {
+			case "drop":
+				args := c.RemainingArgs()
+				if len(args) > 1 {
+					return nil, c.ArgErr()
+				}
+
+				if len(args) == 0 {
+					return nil, nil
+				}
+				amount, err := strconv.ParseInt(args[0], 10, 32)
+				if err != nil {
+					return nil, err
+				}
+				if amount < 0 {
+					return nil, fmt.Errorf("illegal amount value given %q", args[0])
+				}
+				e.amount = uint64(amount)
+			}
+		}
+	}
+	return e, nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/erratic/setup_test.go b/vendor/github.com/miekg/coredns/middleware/erratic/setup_test.go
new file mode 100644
index 0000000000..99b545f5e7
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/erratic/setup_test.go
@@ -0,0 +1,28 @@
+package erratic
+
+import (
+	"testing"
+
+	"github.com/mholt/caddy"
+)
+
+func TestSetupWhoami(t *testing.T) {
+	c := caddy.NewTestController("dns", `erratic {
+		drop
+	}`)
+	if err := setupErratic(c); err != nil {
+		t.Fatalf("Test 1, expected no errors, but got: %q", err)
+	}
+
+	c = caddy.NewTestController("dns", `erratic`)
+	if err := setupErratic(c); err != nil {
+		t.Fatalf("Test 2, expected no errors, but got: %q", err)
+	}
+
+	c = caddy.NewTestController("dns", `erratic {
+		drop -1
+	}`)
+	if err := setupErratic(c); err == nil {
+		t.Fatalf("Test 4, expected errors, but got: %q", err)
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/errors/README.md b/vendor/github.com/miekg/coredns/middleware/errors/README.md
new file mode 100644
index 0000000000..aa3b170aff
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/errors/README.md
@@ -0,0 +1,40 @@
+# errors
+
+*errors* enables error logging.
+TODO: what are errors.
+
+## Syntax
+
+~~~
+errors [LOGFILE]
+~~~
+
+* **LOGFILE** is the path to the error log file to create (or append to), relative to the current
+  working directory. It can also be `stdout` or `stderr` to write to the console, syslog to write to the
+  system log (except on Windows), or visible to write the error (including full stack trace, if
+  applicable) to the response. Writing errors to the response is NOT advised except in local debug
+  situations. The default is stderr. The above syntax will simply enable error reporting on the
+  server. To specify custom error pages, open a block:
+
+~~~
+errors {
+    what where
+}
+~~~
+
+* `what` can only be `log`.
+* `where` is the path to the log file (as described above) and you can enable rotation to manage the log files.
+
+## Examples
+
+Log errors into a file in the parent directory:
+
+~~~
+errors ../error.log
+~~~
+
+Make errors visible to the client (for debugging only):
+
+~~~
+errors visible
+~~~
diff --git a/vendor/github.com/miekg/coredns/middleware/errors/errors.go b/vendor/github.com/miekg/coredns/middleware/errors/errors.go
new file mode 100644
index 0000000000..d2b6f3a220
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/errors/errors.go
@@ -0,0 +1,109 @@
+// Package errors implements an HTTP error handling middleware.
+package errors
+
+import (
+	"fmt"
+	"log"
+	"runtime"
+	"strings"
+	"time"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+// errorHandler handles DNS errors (and errors from other middleware).
+type errorHandler struct {
+	Next    middleware.Handler
+	LogFile string
+	Log     *log.Logger
+	Debug   bool // if true, errors are written out to client rather than to a log
+}
+
+// ServeDNS implements the middleware.Handler interface.
+func (h errorHandler) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	defer h.recovery(ctx, w, r)
+
+	rcode, err := middleware.NextOrFailure(h.Name(), h.Next, ctx, w, r)
+
+	if err != nil {
+		state := request.Request{W: w, Req: r}
+		errMsg := fmt.Sprintf("%s [ERROR %d %s %s] %v", time.Now().Format(timeFormat), rcode, state.Name(), state.Type(), err)
+
+		if h.Debug {
+			// Write error to response as a txt message instead of to log
+			answer := debugMsg(rcode, r)
+			txt, _ := dns.NewRR(". IN 0 TXT " + errMsg)
+			answer.Answer = append(answer.Answer, txt)
+			state.SizeAndDo(answer)
+			w.WriteMsg(answer)
+			return 0, err
+		}
+		h.Log.Println(errMsg)
+	}
+
+	return rcode, err
+}
+
+func (h errorHandler) Name() string { return "errors" }
+
+func (h errorHandler) recovery(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) {
+	rec := recover()
+	if rec == nil {
+		return
+	}
+
+	state := request.Request{W: w, Req: r}
+	// Obtain source of panic
+	// From: https://gist.github.com/swdunlop/9629168
+	var name, file string // function name, file name
+	var line int
+	var pc [16]uintptr
+	n := runtime.Callers(3, pc[:])
+	for _, pc := range pc[:n] {
+		fn := runtime.FuncForPC(pc)
+		if fn == nil {
+			continue
+		}
+		file, line = fn.FileLine(pc)
+		name = fn.Name()
+		if !strings.HasPrefix(name, "runtime.") {
+			break
+		}
+	}
+
+	// Trim file path
+	delim := "/coredns/"
+	pkgPathPos := strings.Index(file, delim)
+	if pkgPathPos > -1 && len(file) > pkgPathPos+len(delim) {
+		file = file[pkgPathPos+len(delim):]
+	}
+
+	panicMsg := fmt.Sprintf("%s [PANIC %s %s] %s:%d - %v", time.Now().Format(timeFormat), r.Question[0].Name, dns.Type(r.Question[0].Qtype), file, line, rec)
+	if h.Debug {
+		// Write error and stack trace to the response rather than to a log
+		var stackBuf [4096]byte
+		stack := stackBuf[:runtime.Stack(stackBuf[:], false)]
+		answer := debugMsg(dns.RcodeServerFailure, r)
+		// add stack buf in TXT, limited to 255 chars for now.
+		txt, _ := dns.NewRR(". IN 0 TXT " + string(stack[:255]))
+		answer.Answer = append(answer.Answer, txt)
+		state.SizeAndDo(answer)
+		w.WriteMsg(answer)
+	} else {
+		// Currently we don't use the function name, since file:line is more conventional
+		h.Log.Printf(panicMsg)
+	}
+}
+
+// debugMsg creates a debug message that gets send back to the client.
+func debugMsg(rcode int, r *dns.Msg) *dns.Msg {
+	answer := new(dns.Msg)
+	answer.SetRcode(r, rcode)
+	return answer
+}
+
+const timeFormat = "02/Jan/2006:15:04:05 -0700"
diff --git a/vendor/github.com/miekg/coredns/middleware/errors/errors_test.go b/vendor/github.com/miekg/coredns/middleware/errors/errors_test.go
new file mode 100644
index 0000000000..1d389ba47a
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/errors/errors_test.go
@@ -0,0 +1,97 @@
+package errors
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"log"
+	"strings"
+	"testing"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+func TestErrors(t *testing.T) {
+	buf := bytes.Buffer{}
+	em := errorHandler{Log: log.New(&buf, "", 0)}
+
+	testErr := errors.New("test error")
+	tests := []struct {
+		next         middleware.Handler
+		expectedCode int
+		expectedLog  string
+		expectedErr  error
+	}{
+		{
+			next:         genErrorHandler(dns.RcodeSuccess, nil),
+			expectedCode: dns.RcodeSuccess,
+			expectedLog:  "",
+			expectedErr:  nil,
+		},
+		{
+			next:         genErrorHandler(dns.RcodeNotAuth, testErr),
+			expectedCode: dns.RcodeNotAuth,
+			expectedLog:  fmt.Sprintf("[ERROR %d %s] %v\n", dns.RcodeNotAuth, "example.org. A", testErr),
+			expectedErr:  testErr,
+		},
+	}
+
+	ctx := context.TODO()
+	req := new(dns.Msg)
+	req.SetQuestion("example.org.", dns.TypeA)
+
+	for i, tc := range tests {
+		em.Next = tc.next
+		buf.Reset()
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		code, err := em.ServeDNS(ctx, rec, req)
+
+		if err != tc.expectedErr {
+			t.Errorf("Test %d: Expected error %v, but got %v",
+				i, tc.expectedErr, err)
+		}
+		if code != tc.expectedCode {
+			t.Errorf("Test %d: Expected status code %d, but got %d",
+				i, tc.expectedCode, code)
+		}
+		if log := buf.String(); !strings.Contains(log, tc.expectedLog) {
+			t.Errorf("Test %d: Expected log %q, but got %q",
+				i, tc.expectedLog, log)
+		}
+	}
+}
+
+func TestVisibleErrorWithPanic(t *testing.T) {
+	const panicMsg = "I'm a panic"
+	eh := errorHandler{
+		Debug: true,
+		Next: middleware.HandlerFunc(func(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+			panic(panicMsg)
+		}),
+	}
+
+	ctx := context.TODO()
+	req := new(dns.Msg)
+	req.SetQuestion("example.org.", dns.TypeA)
+
+	rec := dnsrecorder.New(&test.ResponseWriter{})
+
+	code, err := eh.ServeDNS(ctx, rec, req)
+	if code != 0 {
+		t.Errorf("Expected error handler to return 0 (it should write to response), got status %d", code)
+	}
+	if err != nil {
+		t.Errorf("Expected error handler to return nil error (it should panic!), but got '%v'", err)
+	}
+}
+
+func genErrorHandler(rcode int, err error) middleware.Handler {
+	return middleware.HandlerFunc(func(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+		return rcode, err
+	})
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/errors/setup.go b/vendor/github.com/miekg/coredns/middleware/errors/setup.go
new file mode 100644
index 0000000000..787b89724e
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/errors/setup.go
@@ -0,0 +1,111 @@
+package errors
+
+import (
+	"io"
+	"log"
+	"os"
+
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/hashicorp/go-syslog"
+	"github.com/mholt/caddy"
+)
+
+func init() {
+	caddy.RegisterPlugin("errors", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setup,
+	})
+}
+
+func setup(c *caddy.Controller) error {
+	handler, err := errorsParse(c)
+	if err != nil {
+		return middleware.Error("errors", err)
+	}
+
+	var writer io.Writer
+
+	switch handler.LogFile {
+	case "visible":
+		handler.Debug = true
+	case "stdout":
+		writer = os.Stdout
+	case "stderr":
+		writer = os.Stderr
+	case "syslog":
+		writer, err = gsyslog.NewLogger(gsyslog.LOG_ERR, "LOCAL0", "coredns")
+		if err != nil {
+			return middleware.Error("errors", err)
+		}
+	default:
+		if handler.LogFile == "" {
+			writer = os.Stderr // default
+			break
+		}
+
+		var file *os.File
+		file, err = os.OpenFile(handler.LogFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
+		if err != nil {
+			return middleware.Error("errors", err)
+		}
+		writer = file
+	}
+	handler.Log = log.New(writer, "", 0)
+
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
+		handler.Next = next
+		return handler
+	})
+
+	return nil
+}
+
+func errorsParse(c *caddy.Controller) (errorHandler, error) {
+	handler := errorHandler{}
+
+	optionalBlock := func() (bool, error) {
+		var hadBlock bool
+
+		for c.NextBlock() {
+			hadBlock = true
+
+			what := c.Val()
+			if !c.NextArg() {
+				return hadBlock, c.ArgErr()
+			}
+			where := c.Val()
+
+			if what == "log" {
+				if where == "visible" {
+					handler.Debug = true
+				} else {
+					handler.LogFile = where
+				}
+			}
+		}
+		return hadBlock, nil
+	}
+
+	for c.Next() {
+		// Configuration may be in a block
+		hadBlock, err := optionalBlock()
+		if err != nil {
+			return handler, err
+		}
+
+		// Otherwise, the only argument would be an error log file name or 'visible'
+		if !hadBlock {
+			if c.NextArg() {
+				if c.Val() == "visible" {
+					handler.Debug = true
+				} else {
+					handler.LogFile = c.Val()
+				}
+			}
+		}
+	}
+
+	return handler, nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/errors/setup_test.go b/vendor/github.com/miekg/coredns/middleware/errors/setup_test.go
new file mode 100644
index 0000000000..adae0009c8
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/errors/setup_test.go
@@ -0,0 +1,48 @@
+package errors
+
+import (
+	"testing"
+
+	"github.com/mholt/caddy"
+)
+
+func TestErrorsParse(t *testing.T) {
+	tests := []struct {
+		inputErrorsRules     string
+		shouldErr            bool
+		expectedErrorHandler errorHandler
+	}{
+		{`errors`, false, errorHandler{
+			LogFile: "",
+		}},
+		{`errors errors.txt`, false, errorHandler{
+			LogFile: "errors.txt",
+		}},
+		{`errors visible`, false, errorHandler{
+			LogFile: "",
+			Debug:   true,
+		}},
+		{`errors { log visible }`, false, errorHandler{
+			LogFile: "",
+			Debug:   true,
+		}},
+	}
+	for i, test := range tests {
+		c := caddy.NewTestController("dns", test.inputErrorsRules)
+		actualErrorsRule, err := errorsParse(c)
+
+		if err == nil && test.shouldErr {
+			t.Errorf("Test %d didn't error, but it should have", i)
+		} else if err != nil && !test.shouldErr {
+			t.Errorf("Test %d errored, but it shouldn't have; got '%v'", i, err)
+		}
+		if actualErrorsRule.LogFile != test.expectedErrorHandler.LogFile {
+			t.Errorf("Test %d expected LogFile to be %s, but got %s",
+				i, test.expectedErrorHandler.LogFile, actualErrorsRule.LogFile)
+		}
+		if actualErrorsRule.Debug != test.expectedErrorHandler.Debug {
+			t.Errorf("Test %d expected Debug to be %v, but got %v",
+				i, test.expectedErrorHandler.Debug, actualErrorsRule.Debug)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/etcd/README.md b/vendor/github.com/miekg/coredns/middleware/etcd/README.md
new file mode 100644
index 0000000000..4b5d70e6e2
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/etcd/README.md
@@ -0,0 +1,151 @@
+# etcd
+
+*etcd* enables reading zone data from an etcd instance. The data in etcd has to be encoded as
+a [message](https://github.com/skynetservices/skydns/blob/2fcff74cdc9f9a7dd64189a447ef27ac354b725f/msg/service.go#L26)
+like [SkyDNS](https//github.com/skynetservices/skydns). It should also work just like SkyDNS.
+
+The etcd middleware makes extensive use of the proxy middleware to forward and query other servers
+in the network.
+
+## Syntax
+
+~~~
+etcd [ZONES...]
+~~~
+
+* **ZONES** zones etcd should be authoritative for.
+
+The path will default to `/skydns` the local etcd proxy (http://localhost:2379).
+If no zones are specified the block's zone will be used as the zone.
+
+If you want to `round robin` A and AAAA responses look at the `loadbalance` middleware.
+
+~~~
+etcd [ZONES...] {
+    stubzones
+    path PATH
+    endpoint ENDPOINT...
+    upstream ADDRESS...
+    tls CERT KEY CACERt
+    debug
+}
+~~~
+
+* `stubzones` enables the stub zones feature. The stubzone is *only* done in the etcd tree located
+    under the *first* zone specified.
+* **PATH** the path inside etcd. Defaults to "/skydns".
+* **ENDPOINT** the etcd endpoints. Defaults to "http://localhost:2397".
+* `upstream` upstream resolvers to be used resolve external names found in etcd (think CNAMEs)
+  pointing to external names. If you want CoreDNS to act as a proxy for clients, you'll need to add
+  the proxy middleware. **ADDRESS** can be an IP address, and IP:port or a string pointing to a file
+  that is structured as /etc/resolv.conf.
+* `tls` followed by:
+  * no arguments, if the server certificate is signed by a system-installed CA and no client cert is needed
+  * a single argument that is the CA PEM file, if the server cert is not signed by a system CA and no client cert is needed
+  * two arguments - path to cert PEM file, the path to private key PEM file - if the server certificate is signed by a system-installed CA and a client certificate is needed
+  * three arguments - path to cert PEM file, path to client private key PEM file, path to CA PEM file - if the server certificate is not signed by a system-installed CA and client certificate is needed
+* `debug` allows for debug queries. Prefix the name with `o-o.debug.` to retrieve extra information in the
+  additional section of the reply in the form of TXT records.
+
+## Examples
+
+This is the default SkyDNS setup, with everying specified in full:
+
+~~~
+.:53 {
+    etcd skydns.local {
+        stubzones
+        path /skydns
+        endpoint http://localhost:2379
+        upstream 8.8.8.8:53 8.8.4.4:53
+    }
+    prometheus
+    cache 160 skydns.local
+    loadbalance
+    proxy . 8.8.8.8:53 8.8.4.4:53
+}
+~~~
+
+Or a setup where we use `/etc/resolv.conf` as the basis for the proxy and the upstream
+when resolving external pointing CNAMEs.
+
+~~~
+.:53 {
+    etcd skydns.local {
+        path /skydns
+        upstream /etc/resolv.conf
+    }
+    cache 160 skydns.local
+    proxy . /etc/resolv.conf
+}
+~~~
+
+
+### Reverse zones
+
+Reverse zones are supported. You need to make CoreDNS aware of the fact that you are also
+authoritative for the reverse. For instance if you want to add the reverse for 10.0.0.0/24, you'll
+need to add the zone `0.0.10.in-addr.arpa` to the list of zones. (The fun starts with IPv6 reverse zones
+in the ip6.arpa domain.) Showing a snippet of a Corefile:
+
+~~~
+    etcd skydns.local 0.0.10.in-addr.arpa {
+        stubzones
+    ...
+~~~
+
+Next you'll need to populate the zone with reverse records, here we add a reverse for
+10.0.0.127 pointing to reverse.skydns.local.
+
+~~~
+% curl -XPUT http://127.0.0.1:4001/v2/keys/skydns/arpa/in-addr/10/0/0/127 \
+    -d value='{"host":"reverse.skydns.local."}'
+~~~
+
+Querying with dig:
+
+~~~
+% dig @localhost -x 10.0.0.127 +short
+reverse.atoom.net.
+~~~
+
+Or with *debug* queries enabled:
+
+~~~
+% dig @localhost -p 1053 o-o.debug.127.0.0.10.in-addr.arpa. PTR
+
+;; OPT PSEUDOSECTION:
+; EDNS: version: 0, flags:; udp: 4096
+;; QUESTION SECTION:
+;o-o.debug.127.0.0.10.in-addr.arpa. IN  PTR
+
+;; ANSWER SECTION:
+127.0.0.10.in-addr.arpa. 300    IN      PTR     reverse.atoom.net.
+
+;; ADDITIONAL SECTION:
+127.0.0.10.in-addr.arpa. 300    CH      TXT     "reverse.atoom.net.:0(10,0,,false)[0,]"
+~~~
+
+## Debug queries
+
+When debug queries are enabled CoreDNS will return errors and etcd records encountered during the resolution
+process in the response. The general form looks like this:
+
+    skydns.test.skydns.dom.a.	0	CH	TXT	"127.0.0.1:0(10,0,,false)[0,]"
+
+This shows the complete key as the owername, the rdata of the TXT record has:
+`host:port(priority,weight,txt content,mail)[targetstrip,group]`.
+
+Errors when communicating with an upstream will be returned as: `host:0(0,0,error message,false)[0,]`.
+
+An example:
+
+    www.example.org.	0	CH	TXT	"www.example.org.:0(0,0, IN A: unreachable backend,false)[0,]"
+
+Signalling that an A record for www.example.org. was sought, but it failed with that error.
+
+Any errors seen doing parsing will show up like this:
+
+    . 0 CH TXT "/skydns/local/skydns/r/a: invalid character '.' after object key:value pair"
+
+which shows `a.r.skydns.local.` has a json encoding problem.
diff --git a/vendor/github.com/miekg/coredns/middleware/etcd/cname_test.go b/vendor/github.com/miekg/coredns/middleware/etcd/cname_test.go
new file mode 100644
index 0000000000..4c39491fd8
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/etcd/cname_test.go
@@ -0,0 +1,79 @@
+// +build etcd
+
+package etcd
+
+// etcd needs to be running on http://localhost:2379
+
+import (
+	"testing"
+
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+)
+
+// Check the ordering of returned cname.
+func TestCnameLookup(t *testing.T) {
+	etc := newEtcdMiddleware()
+
+	for _, serv := range servicesCname {
+		set(t, etc, serv.Key, 0, serv)
+		defer delete(t, etc, serv.Key)
+	}
+	for _, tc := range dnsTestCasesCname {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		_, err := etc.ServeDNS(ctxt, rec, m)
+		if err != nil {
+			t.Errorf("expected no error, got %v\n", err)
+			return
+		}
+
+		resp := rec.Msg
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
+
+var servicesCname = []*msg.Service{
+	{Host: "cname1.region2.skydns.test", Key: "a.server1.dev.region1.skydns.test."},
+	{Host: "cname2.region2.skydns.test", Key: "cname1.region2.skydns.test."},
+	{Host: "cname3.region2.skydns.test", Key: "cname2.region2.skydns.test."},
+	{Host: "cname4.region2.skydns.test", Key: "cname3.region2.skydns.test."},
+	{Host: "cname5.region2.skydns.test", Key: "cname4.region2.skydns.test."},
+	{Host: "cname6.region2.skydns.test", Key: "cname5.region2.skydns.test."},
+	{Host: "endpoint.region2.skydns.test", Key: "cname6.region2.skydns.test."},
+	{Host: "10.240.0.1", Key: "endpoint.region2.skydns.test."},
+}
+
+var dnsTestCasesCname = []test.Case{
+	{
+		Qname: "a.server1.dev.region1.skydns.test.", Qtype: dns.TypeSRV,
+		Answer: []dns.RR{
+			test.SRV("a.server1.dev.region1.skydns.test.	300	IN	SRV	10 100 0 cname1.region2.skydns.test."),
+		},
+		Extra: []dns.RR{
+			test.CNAME("cname1.region2.skydns.test.	300	IN	CNAME	cname2.region2.skydns.test."),
+			test.CNAME("cname2.region2.skydns.test.	300	IN	CNAME	cname3.region2.skydns.test."),
+			test.CNAME("cname3.region2.skydns.test.	300	IN	CNAME	cname4.region2.skydns.test."),
+			test.CNAME("cname4.region2.skydns.test.	300	IN	CNAME	cname5.region2.skydns.test."),
+			test.CNAME("cname5.region2.skydns.test.	300	IN	CNAME	cname6.region2.skydns.test."),
+			test.CNAME("cname6.region2.skydns.test.	300	IN	CNAME	endpoint.region2.skydns.test."),
+			test.A("endpoint.region2.skydns.test.	300	IN	A	10.240.0.1"),
+		},
+	},
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/etcd/debug_test.go b/vendor/github.com/miekg/coredns/middleware/etcd/debug_test.go
new file mode 100644
index 0000000000..65e503d6a3
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/etcd/debug_test.go
@@ -0,0 +1,130 @@
+// +build etcd
+
+package etcd
+
+import (
+	"sort"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+)
+
+func TestDebugLookup(t *testing.T) {
+	etc := newEtcdMiddleware()
+	etc.Debugging = true
+
+	for _, serv := range servicesDebug {
+		set(t, etc, serv.Key, 0, serv)
+		defer delete(t, etc, serv.Key)
+	}
+
+	for _, tc := range dnsTestCasesDebug {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		etc.ServeDNS(ctxt, rec, m)
+
+		resp := rec.Msg
+		sort.Sort(test.RRSet(resp.Answer))
+		sort.Sort(test.RRSet(resp.Ns))
+		sort.Sort(test.RRSet(resp.Extra))
+
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
+
+func TestDebugLookupFalse(t *testing.T) {
+	etc := newEtcdMiddleware()
+
+	for _, serv := range servicesDebug {
+		set(t, etc, serv.Key, 0, serv)
+		defer delete(t, etc, serv.Key)
+	}
+	for _, tc := range dnsTestCasesDebugFalse {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		etc.ServeDNS(ctxt, rec, m)
+
+		resp := rec.Msg
+		sort.Sort(test.RRSet(resp.Answer))
+		sort.Sort(test.RRSet(resp.Ns))
+		sort.Sort(test.RRSet(resp.Extra))
+
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
+
+var servicesDebug = []*msg.Service{
+	{Host: "127.0.0.1", Key: "a.dom.skydns.test."},
+	{Host: "127.0.0.2", Key: "b.sub.dom.skydns.test."},
+}
+
+var dnsTestCasesDebug = []test.Case{
+	{
+		Qname: "o-o.debug.dom.skydns.test.", Qtype: dns.TypeA,
+		Answer: []dns.RR{
+			test.A("dom.skydns.test. 300 IN A 127.0.0.1"),
+			test.A("dom.skydns.test. 300 IN A 127.0.0.2"),
+		},
+		Extra: []dns.RR{
+			test.TXT(`a.dom.skydns.test. 300	CH	TXT	"127.0.0.1:0(10,0,,false)[0,]"`),
+			test.TXT(`b.sub.dom.skydns.test. 300	CH	TXT	"127.0.0.2:0(10,0,,false)[0,]"`),
+		},
+	},
+	{
+		Qname: "o-o.debug.dom.skydns.test.", Qtype: dns.TypeTXT,
+		Ns: []dns.RR{
+			test.SOA("skydns.test. 300 IN SOA ns.dns.skydns.test. hostmaster.skydns.test. 1463943291 7200 1800 86400 60"),
+		},
+		Extra: []dns.RR{
+			test.TXT(`a.dom.skydns.test. 300	CH	TXT	"127.0.0.1:0(10,0,,false)[0,]"`),
+			test.TXT(`b.sub.dom.skydns.test. 300	CH	TXT	"127.0.0.2:0(10,0,,false)[0,]"`),
+		},
+	},
+}
+
+var dnsTestCasesDebugFalse = []test.Case{
+	{
+		Qname: "o-o.debug.dom.skydns.test.", Qtype: dns.TypeA,
+		Rcode: dns.RcodeNameError,
+		Ns: []dns.RR{
+			test.SOA("skydns.test. 300 IN SOA ns.dns.skydns.test. hostmaster.skydns.test. 1463943291 7200 1800 86400 60"),
+		},
+	},
+	{
+		Qname: "o-o.debug.dom.skydns.test.", Qtype: dns.TypeTXT,
+		Rcode: dns.RcodeNameError,
+		Ns: []dns.RR{
+			test.SOA("skydns.test. 300 IN SOA ns.dns.skydns.test. hostmaster.skydns.test. 1463943291 7200 1800 86400 60"),
+		},
+	},
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/etcd/etcd.go b/vendor/github.com/miekg/coredns/middleware/etcd/etcd.go
new file mode 100644
index 0000000000..f701785f3c
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/etcd/etcd.go
@@ -0,0 +1,189 @@
+// Package etcd provides the etcd backend middleware.
+package etcd
+
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/singleflight"
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/request"
+
+	etcdc "github.com/coreos/etcd/client"
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+// Etcd is a middleware talks to an etcd cluster.
+type Etcd struct {
+	Next       middleware.Handler
+	Zones      []string
+	PathPrefix string
+	Proxy      proxy.Proxy // Proxy for looking up names during the resolution process
+	Client     etcdc.KeysAPI
+	Ctx        context.Context
+	Inflight   *singleflight.Group
+	Stubmap    *map[string]proxy.Proxy // list of proxies for stub resolving.
+	Debugging  bool                    // Do we allow debug queries.
+
+	endpoints []string // Stored here as well, to aid in testing.
+}
+
+// Services implements the ServiceBackend interface.
+func (e *Etcd) Services(state request.Request, exact bool, opt middleware.Options) (services, debug []msg.Service, err error) {
+	services, err = e.Records(state.Name(), exact)
+	if err != nil {
+		return
+	}
+	if opt.Debug != "" {
+		debug = services
+	}
+	services = msg.Group(services)
+	return
+}
+
+// Reverse implements the ServiceBackend interface.
+func (e *Etcd) Reverse(state request.Request, exact bool, opt middleware.Options) (services, debug []msg.Service, err error) {
+	return e.Services(state, exact, opt)
+}
+
+// Lookup implements the ServiceBackend interface.
+func (e *Etcd) Lookup(state request.Request, name string, typ uint16) (*dns.Msg, error) {
+	return e.Proxy.Lookup(state, name, typ)
+}
+
+// IsNameError implements the ServiceBackend interface.
+func (e *Etcd) IsNameError(err error) bool {
+	if ee, ok := err.(etcdc.Error); ok && ee.Code == etcdc.ErrorCodeKeyNotFound {
+		return true
+	}
+	return false
+}
+
+// Debug implements the ServiceBackend interface.
+func (e *Etcd) Debug() string {
+	return e.PathPrefix
+}
+
+// Records looks up records in etcd. If exact is true, it will lookup just this
+// name. This is used when find matches when completing SRV lookups for instance.
+func (e *Etcd) Records(name string, exact bool) ([]msg.Service, error) {
+	path, star := msg.PathWithWildcard(name, e.PathPrefix)
+	r, err := e.get(path, true)
+	if err != nil {
+		return nil, err
+	}
+	segments := strings.Split(msg.Path(name, e.PathPrefix), "/")
+	switch {
+	case exact && r.Node.Dir:
+		return nil, nil
+	case r.Node.Dir:
+		return e.loopNodes(r.Node.Nodes, segments, star, nil)
+	default:
+		return e.loopNodes([]*etcdc.Node{r.Node}, segments, false, nil)
+	}
+}
+
+// get is a wrapper for client.Get that uses SingleInflight to suppress multiple outstanding queries.
+func (e *Etcd) get(path string, recursive bool) (*etcdc.Response, error) {
+	resp, err := e.Inflight.Do(path, func() (interface{}, error) {
+		ctx, cancel := context.WithTimeout(e.Ctx, etcdTimeout)
+		defer cancel()
+		r, e := e.Client.Get(ctx, path, &etcdc.GetOptions{Sort: false, Recursive: recursive})
+		if e != nil {
+			return nil, e
+		}
+		return r, e
+	})
+	if err != nil {
+		return nil, err
+	}
+	return resp.(*etcdc.Response), err
+}
+
+// skydns/local/skydns/east/staging/web
+// skydns/local/skydns/west/production/web
+//
+// skydns/local/skydns/*/*/web
+// skydns/local/skydns/*/web
+
+// loopNodes recursively loops through the nodes and returns all the values. The nodes' keyname
+// will be match against any wildcards when star is true.
+func (e *Etcd) loopNodes(ns []*etcdc.Node, nameParts []string, star bool, bx map[msg.Service]bool) (sx []msg.Service, err error) {
+	if bx == nil {
+		bx = make(map[msg.Service]bool)
+	}
+Nodes:
+	for _, n := range ns {
+		if n.Dir {
+			nodes, err := e.loopNodes(n.Nodes, nameParts, star, bx)
+			if err != nil {
+				return nil, err
+			}
+			sx = append(sx, nodes...)
+			continue
+		}
+		if star {
+			keyParts := strings.Split(n.Key, "/")
+			for i, n := range nameParts {
+				if i > len(keyParts)-1 {
+					// name is longer than key
+					continue Nodes
+				}
+				if n == "*" || n == "any" {
+					continue
+				}
+				if keyParts[i] != n {
+					continue Nodes
+				}
+			}
+		}
+		serv := new(msg.Service)
+		if err := json.Unmarshal([]byte(n.Value), serv); err != nil {
+			return nil, fmt.Errorf("%s: %s", n.Key, err.Error())
+		}
+		b := msg.Service{Host: serv.Host, Port: serv.Port, Priority: serv.Priority, Weight: serv.Weight, Text: serv.Text, Key: n.Key}
+		if _, ok := bx[b]; ok {
+			continue
+		}
+		bx[b] = true
+
+		serv.Key = n.Key
+		serv.TTL = e.TTL(n, serv)
+		if serv.Priority == 0 {
+			serv.Priority = priority
+		}
+		sx = append(sx, *serv)
+	}
+	return sx, nil
+}
+
+// TTL returns the smaller of the etcd TTL and the service's
+// TTL. If neither of these are set (have a zero value), a default is used.
+func (e *Etcd) TTL(node *etcdc.Node, serv *msg.Service) uint32 {
+	etcdTTL := uint32(node.TTL)
+
+	if etcdTTL == 0 && serv.TTL == 0 {
+		return ttl
+	}
+	if etcdTTL == 0 {
+		return serv.TTL
+	}
+	if serv.TTL == 0 {
+		return etcdTTL
+	}
+	if etcdTTL < serv.TTL {
+		return etcdTTL
+	}
+	return serv.TTL
+}
+
+const (
+	priority    = 10  // default priority when nothing is set
+	ttl         = 300 // default ttl when nothing is set
+	etcdTimeout = 5 * time.Second
+)
diff --git a/vendor/github.com/miekg/coredns/middleware/etcd/group_test.go b/vendor/github.com/miekg/coredns/middleware/etcd/group_test.go
new file mode 100644
index 0000000000..0c18587ca5
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/etcd/group_test.go
@@ -0,0 +1,91 @@
+// +build etcd
+
+package etcd
+
+import (
+	"sort"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+)
+
+func TestGroupLookup(t *testing.T) {
+	etc := newEtcdMiddleware()
+
+	for _, serv := range servicesGroup {
+		set(t, etc, serv.Key, 0, serv)
+		defer delete(t, etc, serv.Key)
+	}
+	for _, tc := range dnsTestCasesGroup {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		_, err := etc.ServeDNS(ctxt, rec, m)
+		if err != nil {
+			t.Errorf("expected no error, got %v\n", err)
+			continue
+		}
+
+		resp := rec.Msg
+		sort.Sort(test.RRSet(resp.Answer))
+		sort.Sort(test.RRSet(resp.Ns))
+		sort.Sort(test.RRSet(resp.Extra))
+
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
+
+// Note the key is encoded as DNS name, while in "reality" it is a etcd path.
+var servicesGroup = []*msg.Service{
+	{Host: "127.0.0.1", Key: "a.dom.skydns.test.", Group: "g1"},
+	{Host: "127.0.0.2", Key: "b.sub.dom.skydns.test.", Group: "g1"},
+
+	{Host: "127.0.0.1", Key: "a.dom2.skydns.test.", Group: "g1"},
+	{Host: "127.0.0.2", Key: "b.sub.dom2.skydns.test.", Group: ""},
+
+	{Host: "127.0.0.1", Key: "a.dom1.skydns.test.", Group: "g1"},
+	{Host: "127.0.0.2", Key: "b.sub.dom1.skydns.test.", Group: "g2"},
+}
+
+var dnsTestCasesGroup = []test.Case{
+	// Groups
+	{
+		// hits the group 'g1' and only includes those records
+		Qname: "dom.skydns.test.", Qtype: dns.TypeA,
+		Answer: []dns.RR{
+			test.A("dom.skydns.test. 300 IN A 127.0.0.1"),
+			test.A("dom.skydns.test. 300 IN A 127.0.0.2"),
+		},
+	},
+	{
+		// One has group, the other has not...  Include the non-group always.
+		Qname: "dom2.skydns.test.", Qtype: dns.TypeA,
+		Answer: []dns.RR{
+			test.A("dom2.skydns.test. 300 IN A 127.0.0.1"),
+			test.A("dom2.skydns.test. 300 IN A 127.0.0.2"),
+		},
+	},
+	{
+		// The groups differ.
+		Qname: "dom1.skydns.test.", Qtype: dns.TypeA,
+		Answer: []dns.RR{
+			test.A("dom1.skydns.test. 300 IN A 127.0.0.1"),
+		},
+	},
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/etcd/handler.go b/vendor/github.com/miekg/coredns/middleware/etcd/handler.go
new file mode 100644
index 0000000000..cf11f3f867
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/etcd/handler.go
@@ -0,0 +1,120 @@
+package etcd
+
+import (
+	"errors"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/debug"
+	"github.com/coredns/coredns/middleware/pkg/dnsutil"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+// ServeDNS implements the middleware.Handler interface.
+func (e *Etcd) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	opt := middleware.Options{}
+	state := request.Request{W: w, Req: r}
+	if state.QClass() != dns.ClassINET {
+		return dns.RcodeServerFailure, middleware.Error(e.Name(), errors.New("can only deal with ClassINET"))
+	}
+	name := state.Name()
+	if e.Debugging {
+		if bug := debug.IsDebug(name); bug != "" {
+			opt.Debug = r.Question[0].Name
+			state.Clear()
+			state.Req.Question[0].Name = bug
+		}
+	}
+
+	// We need to check stubzones first, because we may get a request for a zone we
+	// are not auth. for *but* do have a stubzone forward for. If we do the stubzone
+	// handler will handle the request.
+	if e.Stubmap != nil && len(*e.Stubmap) > 0 {
+		for zone := range *e.Stubmap {
+			if middleware.Name(zone).Matches(name) {
+				stub := Stub{Etcd: e, Zone: zone}
+				return stub.ServeDNS(ctx, w, r)
+			}
+		}
+	}
+
+	zone := middleware.Zones(e.Zones).Matches(state.Name())
+	if zone == "" {
+		if opt.Debug != "" {
+			r.Question[0].Name = opt.Debug
+		}
+		return middleware.NextOrFailure(e.Name(), e.Next, ctx, w, r)
+	}
+
+	var (
+		records, extra []dns.RR
+		debug          []msg.Service
+		err            error
+	)
+	switch state.Type() {
+	case "A":
+		records, debug, err = middleware.A(e, zone, state, nil, opt)
+	case "AAAA":
+		records, debug, err = middleware.AAAA(e, zone, state, nil, opt)
+	case "TXT":
+		records, debug, err = middleware.TXT(e, zone, state, opt)
+	case "CNAME":
+		records, debug, err = middleware.CNAME(e, zone, state, opt)
+	case "PTR":
+		records, debug, err = middleware.PTR(e, zone, state, opt)
+	case "MX":
+		records, extra, debug, err = middleware.MX(e, zone, state, opt)
+	case "SRV":
+		records, extra, debug, err = middleware.SRV(e, zone, state, opt)
+	case "SOA":
+		records, debug, err = middleware.SOA(e, zone, state, opt)
+	case "NS":
+		if state.Name() == zone {
+			records, extra, debug, err = middleware.NS(e, zone, state, opt)
+			break
+		}
+		fallthrough
+	default:
+		// Do a fake A lookup, so we can distinguish between NODATA and NXDOMAIN
+		_, debug, err = middleware.A(e, zone, state, nil, opt)
+	}
+
+	if opt.Debug != "" {
+		// Substitute this name with the original when we return the request.
+		state.Clear()
+		state.Req.Question[0].Name = opt.Debug
+	}
+
+	if e.IsNameError(err) {
+		// Make err nil when returning here, so we don't log spam for NXDOMAIN.
+		return middleware.BackendError(e, zone, dns.RcodeNameError, state, debug, nil /* err */, opt)
+	}
+	if err != nil {
+		return middleware.BackendError(e, zone, dns.RcodeServerFailure, state, debug, err, opt)
+	}
+
+	if len(records) == 0 {
+		return middleware.BackendError(e, zone, dns.RcodeSuccess, state, debug, err, opt)
+	}
+
+	m := new(dns.Msg)
+	m.SetReply(r)
+	m.Authoritative, m.RecursionAvailable, m.Compress = true, true, true
+	m.Answer = append(m.Answer, records...)
+	m.Extra = append(m.Extra, extra...)
+	if opt.Debug != "" {
+		m.Extra = append(m.Extra, middleware.ServicesToTxt(debug)...)
+	}
+
+	m = dnsutil.Dedup(m)
+	state.SizeAndDo(m)
+	m, _ = state.Scrub(m)
+	w.WriteMsg(m)
+	return dns.RcodeSuccess, nil
+}
+
+// Name implements the Handler interface.
+func (e *Etcd) Name() string { return "etcd" }
diff --git a/vendor/github.com/miekg/coredns/middleware/etcd/lookup_test.go b/vendor/github.com/miekg/coredns/middleware/etcd/lookup_test.go
new file mode 100644
index 0000000000..dc61a6e73e
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/etcd/lookup_test.go
@@ -0,0 +1,208 @@
+// +build etcd
+
+package etcd
+
+import (
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+)
+
+// Note the key is encoded as DNS name, while in "reality" it is a etcd path.
+var services = []*msg.Service{
+	{Host: "dev.server1", Port: 8080, Key: "a.server1.dev.region1.skydns.test."},
+	{Host: "10.0.0.1", Port: 8080, Key: "a.server1.prod.region1.skydns.test."},
+	{Host: "10.0.0.2", Port: 8080, Key: "b.server1.prod.region1.skydns.test."},
+	{Host: "::1", Port: 8080, Key: "b.server6.prod.region1.skydns.test."},
+	// Unresolvable internal name.
+	{Host: "unresolvable.skydns.test", Key: "cname.prod.region1.skydns.test."},
+	// Priority.
+	{Host: "priority.server1", Priority: 333, Port: 8080, Key: "priority.skydns.test."},
+	// Subdomain.
+	{Host: "sub.server1", Port: 0, Key: "a.sub.region1.skydns.test."},
+	{Host: "sub.server2", Port: 80, Key: "b.sub.region1.skydns.test."},
+	{Host: "10.0.0.1", Port: 8080, Key: "c.sub.region1.skydns.test."},
+	// Cname loop.
+	{Host: "a.cname.skydns.test", Key: "b.cname.skydns.test."},
+	{Host: "b.cname.skydns.test", Key: "a.cname.skydns.test."},
+	// Nameservers.
+	{Host: "10.0.0.2", Key: "a.ns.dns.skydns.test."},
+	{Host: "10.0.0.3", Key: "b.ns.dns.skydns.test."},
+	// Reverse.
+	{Host: "reverse.example.com", Key: "1.0.0.10.in-addr.arpa."}, // 10.0.0.1
+}
+
+var dnsTestCases = []test.Case{
+	// SRV Test
+	{
+		Qname: "a.server1.dev.region1.skydns.test.", Qtype: dns.TypeSRV,
+		Answer: []dns.RR{test.SRV("a.server1.dev.region1.skydns.test. 300 SRV 10 100 8080 dev.server1.")},
+	},
+	// SRV Test (case test)
+	{
+		Qname: "a.SERVer1.dEv.region1.skydns.tEst.", Qtype: dns.TypeSRV,
+		Answer: []dns.RR{test.SRV("a.SERVer1.dEv.region1.skydns.tEst. 300 SRV 10 100 8080 dev.server1.")},
+	},
+	// NXDOMAIN Test
+	{
+		Qname: "doesnotexist.skydns.test.", Qtype: dns.TypeA,
+		Rcode: dns.RcodeNameError,
+		Ns: []dns.RR{
+			test.SOA("skydns.test. 300 SOA ns.dns.skydns.test. hostmaster.skydns.test. 0 0 0 0 0"),
+		},
+	},
+	// A Test
+	{
+		Qname: "a.server1.prod.region1.skydns.test.", Qtype: dns.TypeA,
+		Answer: []dns.RR{test.A("a.server1.prod.region1.skydns.test. 300 A 10.0.0.1")},
+	},
+	// SRV Test where target is IP address
+	{
+		Qname: "a.server1.prod.region1.skydns.test.", Qtype: dns.TypeSRV,
+		Answer: []dns.RR{test.SRV("a.server1.prod.region1.skydns.test. 300 SRV 10 100 8080 a.server1.prod.region1.skydns.test.")},
+		Extra:  []dns.RR{test.A("a.server1.prod.region1.skydns.test. 300 A 10.0.0.1")},
+	},
+	// AAAA Test
+	{
+		Qname: "b.server6.prod.region1.skydns.test.", Qtype: dns.TypeAAAA,
+		Answer: []dns.RR{test.AAAA("b.server6.prod.region1.skydns.test. 300 AAAA ::1")},
+	},
+	// Multiple A Record Test
+	{
+		Qname: "server1.prod.region1.skydns.test.", Qtype: dns.TypeA,
+		Answer: []dns.RR{
+			test.A("server1.prod.region1.skydns.test. 300 A 10.0.0.1"),
+			test.A("server1.prod.region1.skydns.test. 300 A 10.0.0.2"),
+		},
+	},
+	// Priority Test
+	{
+		Qname: "priority.skydns.test.", Qtype: dns.TypeSRV,
+		Answer: []dns.RR{test.SRV("priority.skydns.test. 300 SRV 333 100 8080 priority.server1.")},
+	},
+	// Subdomain Test
+	{
+		Qname: "sub.region1.skydns.test.", Qtype: dns.TypeSRV,
+		Answer: []dns.RR{
+			test.SRV("sub.region1.skydns.test. 300 IN SRV 10 33 0 sub.server1."),
+			test.SRV("sub.region1.skydns.test. 300 IN SRV 10 33 80 sub.server2."),
+			test.SRV("sub.region1.skydns.test. 300 IN SRV 10 33 8080 c.sub.region1.skydns.test."),
+		},
+		Extra: []dns.RR{test.A("c.sub.region1.skydns.test. 300 IN A 10.0.0.1")},
+	},
+	// CNAME (unresolvable internal name)
+	{
+		Qname: "cname.prod.region1.skydns.test.", Qtype: dns.TypeA,
+		Ns: []dns.RR{test.SOA("skydns.test. 300 SOA ns.dns.skydns.test. hostmaster.skydns.test. 0 0 0 0 0")},
+	},
+	// Wildcard Test
+	{
+		Qname: "*.region1.skydns.test.", Qtype: dns.TypeSRV,
+		Answer: []dns.RR{
+			test.SRV("*.region1.skydns.test.	300	IN	SRV	10 12 0 sub.server1."),
+			test.SRV("*.region1.skydns.test.	300	IN	SRV	10 12 0 unresolvable.skydns.test."),
+			test.SRV("*.region1.skydns.test.	300	IN	SRV	10 12 80 sub.server2."),
+			test.SRV("*.region1.skydns.test.	300	IN	SRV	10 12 8080 a.server1.prod.region1.skydns.test."),
+			test.SRV("*.region1.skydns.test.	300	IN	SRV	10 12 8080 b.server1.prod.region1.skydns.test."),
+			test.SRV("*.region1.skydns.test.	300	IN	SRV	10 12 8080 b.server6.prod.region1.skydns.test."),
+			test.SRV("*.region1.skydns.test.	300	IN	SRV	10 12 8080 c.sub.region1.skydns.test."),
+			test.SRV("*.region1.skydns.test.	300	IN	SRV	10 12 8080 dev.server1."),
+		},
+		Extra: []dns.RR{
+			test.A("a.server1.prod.region1.skydns.test.	300	IN	A	10.0.0.1"),
+			test.A("b.server1.prod.region1.skydns.test.	300	IN	A	10.0.0.2"),
+			test.AAAA("b.server6.prod.region1.skydns.test.	300	IN	AAAA	::1"),
+			test.A("c.sub.region1.skydns.test.	300	IN	A	10.0.0.1"),
+		},
+	},
+	// Wildcard Test
+	{
+		Qname: "prod.*.skydns.test.", Qtype: dns.TypeSRV,
+		Answer: []dns.RR{
+
+			test.SRV("prod.*.skydns.test.	300	IN	SRV	10 25 0 unresolvable.skydns.test."),
+			test.SRV("prod.*.skydns.test.	300	IN	SRV	10 25 8080 a.server1.prod.region1.skydns.test."),
+			test.SRV("prod.*.skydns.test.	300	IN	SRV	10 25 8080 b.server1.prod.region1.skydns.test."),
+			test.SRV("prod.*.skydns.test.	300	IN	SRV	10 25 8080 b.server6.prod.region1.skydns.test."),
+		},
+		Extra: []dns.RR{
+			test.A("a.server1.prod.region1.skydns.test.	300	IN	A	10.0.0.1"),
+			test.A("b.server1.prod.region1.skydns.test.	300	IN	A	10.0.0.2"),
+			test.AAAA("b.server6.prod.region1.skydns.test.	300	IN	AAAA	::1"),
+		},
+	},
+	// Wildcard Test
+	{
+		Qname: "prod.any.skydns.test.", Qtype: dns.TypeSRV,
+		Answer: []dns.RR{
+			test.SRV("prod.any.skydns.test.	300	IN	SRV	10 25 0 unresolvable.skydns.test."),
+			test.SRV("prod.any.skydns.test.	300	IN	SRV	10 25 8080 a.server1.prod.region1.skydns.test."),
+			test.SRV("prod.any.skydns.test.	300	IN	SRV	10 25 8080 b.server1.prod.region1.skydns.test."),
+			test.SRV("prod.any.skydns.test.	300	IN	SRV	10 25 8080 b.server6.prod.region1.skydns.test."),
+		},
+		Extra: []dns.RR{
+			test.A("a.server1.prod.region1.skydns.test.	300	IN	A	10.0.0.1"),
+			test.A("b.server1.prod.region1.skydns.test.	300	IN	A	10.0.0.2"),
+			test.AAAA("b.server6.prod.region1.skydns.test.	300	IN	AAAA	::1"),
+		},
+	},
+	// CNAME loop detection
+	{
+		Qname: "a.cname.skydns.test.", Qtype: dns.TypeA,
+		Ns: []dns.RR{test.SOA("skydns.test. 300 SOA ns.dns.skydns.test. hostmaster.skydns.test. 1407441600 28800 7200 604800 60")},
+	},
+	// NODATA Test
+	{
+		Qname: "a.server1.dev.region1.skydns.test.", Qtype: dns.TypeTXT,
+		Ns: []dns.RR{test.SOA("skydns.test. 300 SOA ns.dns.skydns.test. hostmaster.skydns.test. 0 0 0 0 0")},
+	},
+	// NODATA Test
+	{
+		Qname: "a.server1.dev.region1.skydns.test.", Qtype: dns.TypeHINFO,
+		Ns: []dns.RR{test.SOA("skydns.test. 300 SOA ns.dns.skydns.test. hostmaster.skydns.test. 0 0 0 0 0")},
+	},
+	// NXDOMAIN Test
+	{
+		Qname: "a.server1.nonexistent.region1.skydns.test.", Qtype: dns.TypeHINFO, Rcode: dns.RcodeNameError,
+		Ns: []dns.RR{test.SOA("skydns.test. 300 SOA ns.dns.skydns.test. hostmaster.skydns.test. 0 0 0 0 0")},
+	},
+	{
+		Qname: "skydns.test.", Qtype: dns.TypeSOA,
+		Answer: []dns.RR{test.SOA("skydns.test.	300	IN	SOA	ns.dns.skydns.test. hostmaster.skydns.test. 1460498836 14400 3600 604800 60")},
+	},
+	// NS Record Test
+	{
+		Qname: "skydns.test.", Qtype: dns.TypeNS,
+		Answer: []dns.RR{
+			test.NS("skydns.test. 300 NS a.ns.dns.skydns.test."),
+			test.NS("skydns.test. 300 NS b.ns.dns.skydns.test."),
+		},
+		Extra: []dns.RR{
+			test.A("a.ns.dns.skydns.test. 300 A 10.0.0.2"),
+			test.A("b.ns.dns.skydns.test. 300 A 10.0.0.3"),
+		},
+	},
+	// NS Record Test
+	{
+		Qname: "a.skydns.test.", Qtype: dns.TypeNS, Rcode: dns.RcodeNameError,
+		Ns: []dns.RR{test.SOA("skydns.test.	300	IN	SOA	ns.dns.skydns.test. hostmaster.skydns.test. 1460498836 14400 3600 604800 60")},
+	},
+	// A Record For NS Record Test
+	{
+		Qname: "ns.dns.skydns.test.", Qtype: dns.TypeA,
+		Answer: []dns.RR{
+			test.A("ns.dns.skydns.test. 300 A 10.0.0.2"),
+			test.A("ns.dns.skydns.test. 300 A 10.0.0.3"),
+		},
+	},
+	{
+		Qname: "skydns_extra.test.", Qtype: dns.TypeSOA,
+		Answer: []dns.RR{test.SOA("skydns_extra.test. 300 IN SOA ns.dns.skydns_extra.test. hostmaster.skydns_extra.test. 1460498836 14400 3600 604800 60")},
+	},
+	// Reverse lookup
+	{
+		Qname: "1.0.0.10.in-addr.arpa.", Qtype: dns.TypePTR,
+		Answer: []dns.RR{test.PTR("1.0.0.10.in-addr.arpa. 300 PTR reverse.example.com.")},
+	},
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/etcd/msg/path.go b/vendor/github.com/miekg/coredns/middleware/etcd/msg/path.go
new file mode 100644
index 0000000000..aeb52f665d
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/etcd/msg/path.go
@@ -0,0 +1,46 @@
+package msg
+
+import (
+	"path"
+	"strings"
+
+	"github.com/miekg/dns"
+)
+
+// Path converts a domainname to an etcd path. If s looks like service.staging.skydns.local.,
+// the resulting key will be /skydns/local/skydns/staging/service .
+func Path(s, prefix string) string {
+	l := dns.SplitDomainName(s)
+	for i, j := 0, len(l)-1; i < j; i, j = i+1, j-1 {
+		l[i], l[j] = l[j], l[i]
+	}
+	return path.Join(append([]string{"/" + prefix + "/"}, l...)...)
+}
+
+// Domain is the opposite of Path.
+func Domain(s string) string {
+	l := strings.Split(s, "/")
+	// start with 1, to strip /skydns
+	for i, j := 1, len(l)-1; i < j; i, j = i+1, j-1 {
+		l[i], l[j] = l[j], l[i]
+	}
+	return dns.Fqdn(strings.Join(l[1:len(l)-1], "."))
+}
+
+// PathWithWildcard ascts as Path, but if a name contains wildcards (* or any), the name will be
+// chopped of before the (first) wildcard, and we do a highler evel search and
+// later find the matching names.  So service.*.skydns.local, will look for all
+// services under skydns.local and will later check for names that match
+// service.*.skydns.local.  If a wildcard is found the returned bool is true.
+func PathWithWildcard(s, prefix string) (string, bool) {
+	l := dns.SplitDomainName(s)
+	for i, j := 0, len(l)-1; i < j; i, j = i+1, j-1 {
+		l[i], l[j] = l[j], l[i]
+	}
+	for i, k := range l {
+		if k == "*" || k == "any" {
+			return path.Join(append([]string{"/" + prefix + "/"}, l[:i]...)...), true
+		}
+	}
+	return path.Join(append([]string{"/" + prefix + "/"}, l...)...), false
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/etcd/msg/path_test.go b/vendor/github.com/miekg/coredns/middleware/etcd/msg/path_test.go
new file mode 100644
index 0000000000..a9ec59713d
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/etcd/msg/path_test.go
@@ -0,0 +1,12 @@
+package msg
+
+import "testing"
+
+func TestPath(t *testing.T) {
+	for _, path := range []string{"mydns", "skydns"} {
+		result := Path("service.staging.skydns.local.", path)
+		if result != "/"+path+"/local/skydns/staging/service" {
+			t.Errorf("Failure to get domain's path with prefix: %s", result)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/etcd/msg/service.go b/vendor/github.com/miekg/coredns/middleware/etcd/msg/service.go
new file mode 100644
index 0000000000..9250cb634e
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/etcd/msg/service.go
@@ -0,0 +1,203 @@
+// Package msg defines the Service structure which is used for service discovery.
+package msg
+
+import (
+	"fmt"
+	"net"
+	"strings"
+
+	"github.com/miekg/dns"
+)
+
+// Service defines a discoverable service in etcd. It is the rdata from a SRV
+// record, but with a twist.  Host (Target in SRV) must be a domain name, but
+// if it looks like an IP address (4/6), we will treat it like an IP address.
+type Service struct {
+	Host     string `json:"host,omitempty"`
+	Port     int    `json:"port,omitempty"`
+	Priority int    `json:"priority,omitempty"`
+	Weight   int    `json:"weight,omitempty"`
+	Text     string `json:"text,omitempty"`
+	Mail     bool   `json:"mail,omitempty"` // Be an MX record. Priority becomes Preference.
+	TTL      uint32 `json:"ttl,omitempty"`
+
+	// When a SRV record with a "Host: IP-address" is added, we synthesize
+	// a srv.Target domain name.  Normally we convert the full Key where
+	// the record lives to a DNS name and use this as the srv.Target.  When
+	// TargetStrip > 0 we strip the left most TargetStrip labels from the
+	// DNS name.
+	TargetStrip int `json:"targetstrip,omitempty"`
+
+	// Group is used to group (or *not* to group) different services
+	// together. Services with an identical Group are returned in the same
+	// answer.
+	Group string `json:"group,omitempty"`
+
+	// Etcd key where we found this service and ignored from json un-/marshalling
+	Key string `json:"-"`
+}
+
+// RR returns an RR representation of s. It is in a condensed form to minimize space
+// when this is returned in a DNS message.
+// The RR will look like:
+//	1.rails.production.east.skydns.local. 300 CH TXT "service1.example.com:8080(10,0,,false)[0,]"
+//                      etcd Key              Ttl               Host:Port          <   see below   >
+// between parens: (Priority, Weight, Text (only first 200 bytes!), Mail)
+// between blockquotes: [TargetStrip,Group]
+// If the record is synthesised by CoreDNS (i.e. no lookup in etcd happened):
+//
+//	TODO(miek): what to put here?
+//
+func (s *Service) RR() *dns.TXT {
+	l := len(s.Text)
+	if l > 200 {
+		l = 200
+	}
+	t := new(dns.TXT)
+	t.Hdr.Class = dns.ClassCHAOS
+	t.Hdr.Ttl = s.TTL
+	t.Hdr.Rrtype = dns.TypeTXT
+	t.Hdr.Name = Domain(s.Key)
+
+	t.Txt = make([]string, 1)
+	t.Txt[0] = fmt.Sprintf("%s:%d(%d,%d,%s,%t)[%d,%s]",
+		s.Host, s.Port,
+		s.Priority, s.Weight, s.Text[:l], s.Mail,
+		s.TargetStrip, s.Group)
+	return t
+}
+
+// NewSRV returns a new SRV record based on the Service.
+func (s *Service) NewSRV(name string, weight uint16) *dns.SRV {
+	host := targetStrip(dns.Fqdn(s.Host), s.TargetStrip)
+
+	return &dns.SRV{Hdr: dns.RR_Header{Name: name, Rrtype: dns.TypeSRV, Class: dns.ClassINET, Ttl: s.TTL},
+		Priority: uint16(s.Priority), Weight: weight, Port: uint16(s.Port), Target: dns.Fqdn(host)}
+}
+
+// NewMX returns a new MX record based on the Service.
+func (s *Service) NewMX(name string) *dns.MX {
+	host := targetStrip(dns.Fqdn(s.Host), s.TargetStrip)
+
+	return &dns.MX{Hdr: dns.RR_Header{Name: name, Rrtype: dns.TypeMX, Class: dns.ClassINET, Ttl: s.TTL},
+		Preference: uint16(s.Priority), Mx: host}
+}
+
+// NewA returns a new A record based on the Service.
+func (s *Service) NewA(name string, ip net.IP) *dns.A {
+	return &dns.A{Hdr: dns.RR_Header{Name: name, Rrtype: dns.TypeA, Class: dns.ClassINET, Ttl: s.TTL}, A: ip}
+}
+
+// NewAAAA returns a new AAAA record based on the Service.
+func (s *Service) NewAAAA(name string, ip net.IP) *dns.AAAA {
+	return &dns.AAAA{Hdr: dns.RR_Header{Name: name, Rrtype: dns.TypeAAAA, Class: dns.ClassINET, Ttl: s.TTL}, AAAA: ip}
+}
+
+// NewCNAME returns a new CNAME record based on the Service.
+func (s *Service) NewCNAME(name string, target string) *dns.CNAME {
+	return &dns.CNAME{Hdr: dns.RR_Header{Name: name, Rrtype: dns.TypeCNAME, Class: dns.ClassINET, Ttl: s.TTL}, Target: dns.Fqdn(target)}
+}
+
+// NewTXT returns a new TXT record based on the Service.
+func (s *Service) NewTXT(name string) *dns.TXT {
+	return &dns.TXT{Hdr: dns.RR_Header{Name: name, Rrtype: dns.TypeTXT, Class: dns.ClassINET, Ttl: s.TTL}, Txt: split255(s.Text)}
+}
+
+// NewPTR returns a new PTR record based on the Service.
+func (s *Service) NewPTR(name string, target string) *dns.PTR {
+	return &dns.PTR{Hdr: dns.RR_Header{Name: name, Rrtype: dns.TypePTR, Class: dns.ClassINET, Ttl: s.TTL}, Ptr: dns.Fqdn(target)}
+}
+
+// NewNS returns a new NS record based on the Service.
+func (s *Service) NewNS(name string) *dns.NS {
+	host := targetStrip(dns.Fqdn(s.Host), s.TargetStrip)
+	return &dns.NS{Hdr: dns.RR_Header{Name: name, Rrtype: dns.TypeNS, Class: dns.ClassINET, Ttl: s.TTL}, Ns: host}
+}
+
+// Group checks the services in sx, it looks for a Group attribute on the shortest
+// keys. If there are multiple shortest keys *and* the group attribute disagrees (and
+// is not empty), we don't consider it a group.
+// If a group is found, only services with *that* group (or no group) will be returned.
+func Group(sx []Service) []Service {
+	if len(sx) == 0 {
+		return sx
+	}
+
+	// Shortest key with group attribute sets the group for this set.
+	group := sx[0].Group
+	slashes := strings.Count(sx[0].Key, "/")
+	length := make([]int, len(sx))
+	for i, s := range sx {
+		x := strings.Count(s.Key, "/")
+		length[i] = x
+		if x < slashes {
+			if s.Group == "" {
+				break
+			}
+			slashes = x
+			group = s.Group
+		}
+	}
+
+	if group == "" {
+		return sx
+	}
+
+	ret := []Service{} // with slice-tricks in sx we can prolly save this allocation (TODO)
+
+	for i, s := range sx {
+		if s.Group == "" {
+			ret = append(ret, s)
+			continue
+		}
+
+		// Disagreement on the same level
+		if length[i] == slashes && s.Group != group {
+			return sx
+		}
+
+		if s.Group == group {
+			ret = append(ret, s)
+		}
+	}
+	return ret
+}
+
+// Split255 splits a string into 255 byte chunks.
+func split255(s string) []string {
+	if len(s) < 255 {
+		return []string{s}
+	}
+	sx := []string{}
+	p, i := 0, 255
+	for {
+		if i <= len(s) {
+			sx = append(sx, s[p:i])
+		} else {
+			sx = append(sx, s[p:])
+			break
+
+		}
+		p, i = p+255, i+255
+	}
+
+	return sx
+}
+
+// targetStrip strips "targetstrip" labels from the left side of the fully qualified name.
+func targetStrip(name string, targetStrip int) string {
+	if targetStrip == 0 {
+		return name
+	}
+
+	offset, end := 0, false
+	for i := 0; i < targetStrip; i++ {
+		offset, end = dns.NextLabel(name, offset)
+	}
+	if end {
+		// We overshot the name, use the orignal one.
+		offset = 0
+	}
+	name = name[offset:]
+	return name
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/etcd/msg/service_test.go b/vendor/github.com/miekg/coredns/middleware/etcd/msg/service_test.go
new file mode 100644
index 0000000000..0c19ba95b3
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/etcd/msg/service_test.go
@@ -0,0 +1,125 @@
+package msg
+
+import "testing"
+
+func TestSplit255(t *testing.T) {
+	xs := split255("abc")
+	if len(xs) != 1 && xs[0] != "abc" {
+		t.Errorf("Failure to split abc")
+	}
+	s := ""
+	for i := 0; i < 255; i++ {
+		s += "a"
+	}
+	xs = split255(s)
+	if len(xs) != 1 && xs[0] != s {
+		t.Errorf("failure to split 255 char long string")
+	}
+	s += "b"
+	xs = split255(s)
+	if len(xs) != 2 || xs[1] != "b" {
+		t.Errorf("failure to split 256 char long string: %d", len(xs))
+	}
+	for i := 0; i < 255; i++ {
+		s += "a"
+	}
+	xs = split255(s)
+	if len(xs) != 3 || xs[2] != "a" {
+		t.Errorf("failure to split 510 char long string: %d", len(xs))
+	}
+}
+
+func TestGroup(t *testing.T) {
+	// Key are in the wrong order, but for this test it does not matter.
+	sx := Group(
+		[]Service{
+			{Host: "127.0.0.1", Group: "g1", Key: "b/sub/dom1/skydns/test"},
+			{Host: "127.0.0.2", Group: "g2", Key: "a/dom1/skydns/test"},
+		},
+	)
+	// Expecting to return the shortest key with a Group attribute.
+	if len(sx) != 1 {
+		t.Fatalf("failure to group zeroth set: %v", sx)
+	}
+	if sx[0].Key != "a/dom1/skydns/test" {
+		t.Fatalf("failure to group zeroth set: %v, wrong Key", sx)
+	}
+
+	// Groups disagree, so we will not do anything.
+	sx = Group(
+		[]Service{
+			{Host: "server1", Group: "g1", Key: "region1/skydns/test"},
+			{Host: "server2", Group: "g2", Key: "region1/skydns/test"},
+		},
+	)
+	if len(sx) != 2 {
+		t.Fatalf("failure to group first set: %v", sx)
+	}
+
+	// Group is g1, include only the top-level one.
+	sx = Group(
+		[]Service{
+			{Host: "server1", Group: "g1", Key: "a/dom/region1/skydns/test"},
+			{Host: "server2", Group: "g2", Key: "a/subdom/dom/region1/skydns/test"},
+		},
+	)
+	if len(sx) != 1 {
+		t.Fatalf("failure to group second set: %v", sx)
+	}
+
+	// Groupless services must be included.
+	sx = Group(
+		[]Service{
+			{Host: "server1", Group: "g1", Key: "a/dom/region1/skydns/test"},
+			{Host: "server2", Group: "g2", Key: "a/subdom/dom/region1/skydns/test"},
+			{Host: "server2", Group: "", Key: "b/subdom/dom/region1/skydns/test"},
+		},
+	)
+	if len(sx) != 2 {
+		t.Fatalf("failure to group third set: %v", sx)
+	}
+
+	// Empty group on the highest level: include that one also.
+	sx = Group(
+		[]Service{
+			{Host: "server1", Group: "g1", Key: "a/dom/region1/skydns/test"},
+			{Host: "server1", Group: "", Key: "b/dom/region1/skydns/test"},
+			{Host: "server2", Group: "g2", Key: "a/subdom/dom/region1/skydns/test"},
+		},
+	)
+	if len(sx) != 2 {
+		t.Fatalf("failure to group fourth set: %v", sx)
+	}
+
+	// Empty group on the highest level: include that one also, and the rest.
+	sx = Group(
+		[]Service{
+			{Host: "server1", Group: "g5", Key: "a/dom/region1/skydns/test"},
+			{Host: "server1", Group: "", Key: "b/dom/region1/skydns/test"},
+			{Host: "server2", Group: "g5", Key: "a/subdom/dom/region1/skydns/test"},
+		},
+	)
+	if len(sx) != 3 {
+		t.Fatalf("failure to group fith set: %v", sx)
+	}
+
+	// One group.
+	sx = Group(
+		[]Service{
+			{Host: "server1", Group: "g6", Key: "a/dom/region1/skydns/test"},
+		},
+	)
+	if len(sx) != 1 {
+		t.Fatalf("failure to group sixth set: %v", sx)
+	}
+
+	// No group, once service
+	sx = Group(
+		[]Service{
+			{Host: "server1", Key: "a/dom/region1/skydns/test"},
+		},
+	)
+	if len(sx) != 1 {
+		t.Fatalf("failure to group seventh set: %v", sx)
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/etcd/multi_test.go b/vendor/github.com/miekg/coredns/middleware/etcd/multi_test.go
new file mode 100644
index 0000000000..26ce9b3ce3
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/etcd/multi_test.go
@@ -0,0 +1,75 @@
+// +build etcd
+
+package etcd
+
+import (
+	"sort"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+)
+
+func TestMultiLookup(t *testing.T) {
+	etc := newEtcdMiddleware()
+	etc.Zones = []string{"skydns.test.", "miek.nl."}
+	etc.Next = test.ErrorHandler()
+
+	for _, serv := range servicesMulti {
+		set(t, etc, serv.Key, 0, serv)
+		defer delete(t, etc, serv.Key)
+	}
+	for _, tc := range dnsTestCasesMulti {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		_, err := etc.ServeDNS(ctxt, rec, m)
+		if err != nil {
+			t.Errorf("expected no error, got %v\n", err)
+			return
+		}
+
+		resp := rec.Msg
+		sort.Sort(test.RRSet(resp.Answer))
+		sort.Sort(test.RRSet(resp.Ns))
+		sort.Sort(test.RRSet(resp.Extra))
+
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
+
+// Note the key is encoded as DNS name, while in "reality" it is a etcd path.
+var servicesMulti = []*msg.Service{
+	{Host: "dev.server1", Port: 8080, Key: "a.server1.dev.region1.skydns.test."},
+	{Host: "dev.server1", Port: 8080, Key: "a.server1.dev.region1.miek.nl."},
+	{Host: "dev.server1", Port: 8080, Key: "a.server1.dev.region1.example.org."},
+}
+
+var dnsTestCasesMulti = []test.Case{
+	{
+		Qname: "a.server1.dev.region1.skydns.test.", Qtype: dns.TypeSRV,
+		Answer: []dns.RR{test.SRV("a.server1.dev.region1.skydns.test. 300 SRV 10 100 8080 dev.server1.")},
+	},
+	{
+		Qname: "a.server1.dev.region1.miek.nl.", Qtype: dns.TypeSRV,
+		Answer: []dns.RR{test.SRV("a.server1.dev.region1.miek.nl. 300 SRV 10 100 8080 dev.server1.")},
+	},
+	{
+		Qname: "a.server1.dev.region1.example.org.", Qtype: dns.TypeSRV, Rcode: dns.RcodeServerFailure,
+	},
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/etcd/other_test.go b/vendor/github.com/miekg/coredns/middleware/etcd/other_test.go
new file mode 100644
index 0000000000..22b7200780
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/etcd/other_test.go
@@ -0,0 +1,167 @@
+// +build etcd
+
+// tests mx and txt records
+
+package etcd
+
+import (
+	"fmt"
+	"sort"
+	"strings"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+)
+
+func TestOtherLookup(t *testing.T) {
+	etc := newEtcdMiddleware()
+
+	for _, serv := range servicesOther {
+		set(t, etc, serv.Key, 0, serv)
+		defer delete(t, etc, serv.Key)
+	}
+	for _, tc := range dnsTestCasesOther {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		_, err := etc.ServeDNS(ctxt, rec, m)
+		if err != nil {
+			t.Errorf("expected no error, got %v\n", err)
+			continue
+		}
+
+		resp := rec.Msg
+		sort.Sort(test.RRSet(resp.Answer))
+		sort.Sort(test.RRSet(resp.Ns))
+		sort.Sort(test.RRSet(resp.Extra))
+
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
+
+// Note the key is encoded as DNS name, while in "reality" it is a etcd path.
+var servicesOther = []*msg.Service{
+	{Host: "dev.server1", Port: 8080, Key: "a.server1.dev.region1.skydns.test."},
+
+	// mx
+	{Host: "mx.skydns.test", Priority: 50, Mail: true, Key: "a.mail.skydns.test."},
+	{Host: "mx.miek.nl", Priority: 50, Mail: true, Key: "b.mail.skydns.test."},
+	{Host: "a.ipaddr.skydns.test", Priority: 30, Mail: true, Key: "a.mx.skydns.test."},
+
+	{Host: "a.ipaddr.skydns.test", Mail: true, Key: "a.mx2.skydns.test."},
+	{Host: "b.ipaddr.skydns.test", Mail: true, Key: "b.mx2.skydns.test."},
+
+	{Host: "a.ipaddr.skydns.test", Priority: 20, Mail: true, Key: "a.mx3.skydns.test."},
+	{Host: "a.ipaddr.skydns.test", Priority: 30, Mail: true, Key: "b.mx3.skydns.test."},
+
+	{Host: "172.16.1.1", Key: "a.ipaddr.skydns.test."},
+	{Host: "172.16.1.2", Key: "b.ipaddr.skydns.test."},
+
+	// txt
+	{Text: "abc", Key: "a1.txt.skydns.test."},
+	{Text: "abc abc", Key: "a2.txt.skydns.test."},
+	// txt sizes
+	{Text: strings.Repeat("0", 400), Key: "large400.skydns.test."},
+	{Text: strings.Repeat("0", 600), Key: "large600.skydns.test."},
+	{Text: strings.Repeat("0", 2000), Key: "large2000.skydns.test."},
+
+	// duplicate ip address
+	{Host: "10.11.11.10", Key: "http.multiport.http.skydns.test.", Port: 80},
+	{Host: "10.11.11.10", Key: "https.multiport.http.skydns.test.", Port: 443},
+}
+
+var dnsTestCasesOther = []test.Case{
+	// MX Tests
+	{
+		// NODATA as this is not an Mail: true record.
+		Qname: "a.server1.dev.region1.skydns.test.", Qtype: dns.TypeMX,
+		Ns: []dns.RR{
+			test.SOA("skydns.test. 300 SOA ns.dns.skydns.test. hostmaster.skydns.test. 0 0 0 0 0"),
+		},
+	},
+	{
+		Qname: "a.mail.skydns.test.", Qtype: dns.TypeMX,
+		Answer: []dns.RR{test.MX("a.mail.skydns.test. 300 IN MX 50 mx.skydns.test.")},
+		Extra: []dns.RR{
+			test.A("a.ipaddr.skydns.test.	300	IN	A	172.16.1.1"),
+			test.CNAME("mx.skydns.test.	300	IN	CNAME	a.ipaddr.skydns.test."),
+		},
+	},
+	{
+		Qname: "mx2.skydns.test.", Qtype: dns.TypeMX,
+		Answer: []dns.RR{
+			test.MX("mx2.skydns.test. 300 IN MX 10 a.ipaddr.skydns.test."),
+			test.MX("mx2.skydns.test. 300 IN MX 10 b.ipaddr.skydns.test."),
+		},
+		Extra: []dns.RR{
+			test.A("a.ipaddr.skydns.test. 300 A 172.16.1.1"),
+			test.A("b.ipaddr.skydns.test. 300 A 172.16.1.2"),
+		},
+	},
+	// different priority, same host
+	{
+		Qname: "mx3.skydns.test.", Qtype: dns.TypeMX,
+		Answer: []dns.RR{
+			test.MX("mx3.skydns.test. 300 IN MX 20 a.ipaddr.skydns.test."),
+			test.MX("mx3.skydns.test. 300 IN MX 30 a.ipaddr.skydns.test."),
+		},
+		Extra: []dns.RR{
+			test.A("a.ipaddr.skydns.test. 300 A 172.16.1.1"),
+		},
+	},
+	// Txt
+	{
+		Qname: "a1.txt.skydns.test.", Qtype: dns.TypeTXT,
+		Answer: []dns.RR{
+			test.TXT("a1.txt.skydns.test. 300 IN TXT \"abc\""),
+		},
+	},
+	{
+		Qname: "a2.txt.skydns.test.", Qtype: dns.TypeTXT,
+		Answer: []dns.RR{
+			test.TXT("a2.txt.skydns.test. 300 IN TXT \"abc abc\""),
+		},
+	},
+	// Large txt less than 512
+	{
+		Qname: "large400.skydns.test.", Qtype: dns.TypeTXT,
+		Answer: []dns.RR{
+			test.TXT(fmt.Sprintf("large400.skydns.test. 300 IN TXT \"%s\"", strings.Repeat("0", 400))),
+		},
+	},
+	// Large txt greater than 512 (UDP)
+	{
+		Qname: "large600.skydns.test.", Qtype: dns.TypeTXT,
+		Answer: []dns.RR{
+			test.TXT(fmt.Sprintf("large600.skydns.test. 300 IN TXT \"%s\"", strings.Repeat("0", 600))),
+		},
+	},
+	// Large txt greater than 1500 (typical Ethernet)
+	{
+		Qname: "large2000.skydns.test.", Qtype: dns.TypeTXT,
+		Answer: []dns.RR{
+			test.TXT(fmt.Sprintf("large2000.skydns.test. 300 IN TXT \"%s\"", strings.Repeat("0", 2000))),
+		},
+	},
+	// Duplicate IP address test
+	{
+		Qname: "multiport.http.skydns.test.", Qtype: dns.TypeA,
+		Answer: []dns.RR{test.A("multiport.http.skydns.test. 300 IN A 10.11.11.10")},
+	},
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/etcd/proxy_lookup_test.go b/vendor/github.com/miekg/coredns/middleware/etcd/proxy_lookup_test.go
new file mode 100644
index 0000000000..3ee3005d7f
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/etcd/proxy_lookup_test.go
@@ -0,0 +1,74 @@
+// +build etcd
+
+package etcd
+
+import (
+	"sort"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+)
+
+func TestProxyLookupFailDebug(t *testing.T) {
+	etc := newEtcdMiddleware()
+	etc.Proxy = proxy.NewLookup([]string{"127.0.0.1:154"})
+	etc.Debugging = true
+
+	for _, serv := range servicesProxy {
+		set(t, etc, serv.Key, 0, serv)
+		defer delete(t, etc, serv.Key)
+	}
+
+	for _, tc := range dnsTestCasesProxy {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		_, err := etc.ServeDNS(ctxt, rec, m)
+		if err != nil {
+			t.Errorf("expected no error, got %v\n", err)
+			continue
+		}
+
+		resp := rec.Msg
+		sort.Sort(test.RRSet(resp.Answer))
+		sort.Sort(test.RRSet(resp.Ns))
+		sort.Sort(test.RRSet(resp.Extra))
+
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
+
+var servicesProxy = []*msg.Service{
+	{Host: "www.example.org", Key: "a.dom.skydns.test."},
+}
+
+var dnsTestCasesProxy = []test.Case{
+	{
+		Qname: "o-o.debug.dom.skydns.test.", Qtype: dns.TypeSRV,
+		Answer: []dns.RR{
+			test.SRV("dom.skydns.test. 300 IN SRV 10 100 0 www.example.org."),
+		},
+		Extra: []dns.RR{
+			test.TXT("a.dom.skydns.test.	300	CH	TXT	\"www.example.org:0(10,0,,false)[0,]\""),
+			test.TXT("www.example.org.	0	CH	TXT	\"www.example.org.:0(0,0, IN A: unreachable backend,false)[0,]\""),
+			test.TXT("www.example.org.	0	CH	TXT	\"www.example.org.:0(0,0, IN AAAA: unreachable backend,false)[0,]\""),
+		},
+	},
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/etcd/setup.go b/vendor/github.com/miekg/coredns/middleware/etcd/setup.go
new file mode 100644
index 0000000000..a193c745c2
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/etcd/setup.go
@@ -0,0 +1,200 @@
+package etcd
+
+import (
+	"crypto/tls"
+	"net"
+	"net/http"
+	"time"
+
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/dnsutil"
+	"github.com/coredns/coredns/middleware/pkg/singleflight"
+	mwtls "github.com/coredns/coredns/middleware/pkg/tls"
+	"github.com/coredns/coredns/middleware/proxy"
+
+	etcdc "github.com/coreos/etcd/client"
+	"github.com/mholt/caddy"
+	"golang.org/x/net/context"
+)
+
+func init() {
+	caddy.RegisterPlugin("etcd", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setup,
+	})
+}
+
+func setup(c *caddy.Controller) error {
+	e, stubzones, err := etcdParse(c)
+	if err != nil {
+		return middleware.Error("etcd", err)
+	}
+
+	if stubzones {
+		c.OnStartup(func() error {
+			e.UpdateStubZones()
+			return nil
+		})
+	}
+
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
+		e.Next = next
+		return e
+	})
+
+	return nil
+}
+
+func etcdParse(c *caddy.Controller) (*Etcd, bool, error) {
+	stub := make(map[string]proxy.Proxy)
+	etc := Etcd{
+		// Don't default to a proxy for lookups.
+		//		Proxy:      proxy.NewLookup([]string{"8.8.8.8:53", "8.8.4.4:53"}),
+		PathPrefix: "skydns",
+		Ctx:        context.Background(),
+		Inflight:   &singleflight.Group{},
+		Stubmap:    &stub,
+	}
+	var (
+		tlsConfig *tls.Config
+		err       error
+		endpoints = []string{defaultEndpoint}
+		stubzones = false
+	)
+	for c.Next() {
+		if c.Val() == "etcd" {
+			etc.Zones = c.RemainingArgs()
+			if len(etc.Zones) == 0 {
+				etc.Zones = make([]string, len(c.ServerBlockKeys))
+				copy(etc.Zones, c.ServerBlockKeys)
+			}
+			for i, str := range etc.Zones {
+				etc.Zones[i] = middleware.Host(str).Normalize()
+			}
+
+			if c.NextBlock() {
+				// TODO(miek): 2 switches?
+				switch c.Val() {
+				case "stubzones":
+					stubzones = true
+				case "debug":
+					etc.Debugging = true
+				case "path":
+					if !c.NextArg() {
+						return &Etcd{}, false, c.ArgErr()
+					}
+					etc.PathPrefix = c.Val()
+				case "endpoint":
+					args := c.RemainingArgs()
+					if len(args) == 0 {
+						return &Etcd{}, false, c.ArgErr()
+					}
+					endpoints = args
+				case "upstream":
+					args := c.RemainingArgs()
+					if len(args) == 0 {
+						return &Etcd{}, false, c.ArgErr()
+					}
+					ups, err := dnsutil.ParseHostPortOrFile(args...)
+					if err != nil {
+						return &Etcd{}, false, err
+					}
+					etc.Proxy = proxy.NewLookup(ups)
+				case "tls": // cert key cacertfile
+					args := c.RemainingArgs()
+					tlsConfig, err = mwtls.NewTLSConfigFromArgs(args...)
+					if err != nil {
+						return &Etcd{}, false, err
+					}
+				default:
+					if c.Val() != "}" {
+						return &Etcd{}, false, c.Errf("unknown property '%s'", c.Val())
+					}
+				}
+				for c.Next() {
+					switch c.Val() {
+					case "stubzones":
+						stubzones = true
+					case "debug":
+						etc.Debugging = true
+					case "path":
+						if !c.NextArg() {
+							return &Etcd{}, false, c.ArgErr()
+						}
+						etc.PathPrefix = c.Val()
+					case "endpoint":
+						args := c.RemainingArgs()
+						if len(args) == 0 {
+							return &Etcd{}, false, c.ArgErr()
+						}
+						endpoints = args
+					case "upstream":
+						args := c.RemainingArgs()
+						if len(args) == 0 {
+							return &Etcd{}, false, c.ArgErr()
+						}
+						ups, err := dnsutil.ParseHostPortOrFile(args...)
+						if err != nil {
+							return &Etcd{}, false, c.ArgErr()
+						}
+						etc.Proxy = proxy.NewLookup(ups)
+					case "tls": // cert key cacertfile
+						args := c.RemainingArgs()
+						tlsConfig, err = mwtls.NewTLSConfigFromArgs(args...)
+						if err != nil {
+							return &Etcd{}, false, err
+						}
+					default:
+						if c.Val() != "}" { // TODO(miek): this feels like I'm doing it completely wrong.
+							return &Etcd{}, false, c.Errf("unknown property '%s'", c.Val())
+						}
+					}
+				}
+
+			}
+			client, err := newEtcdClient(endpoints, tlsConfig)
+			if err != nil {
+				return &Etcd{}, false, err
+			}
+			etc.Client = client
+			etc.endpoints = endpoints
+
+			return &etc, stubzones, nil
+		}
+	}
+	return &Etcd{}, false, nil
+}
+
+func newEtcdClient(endpoints []string, cc *tls.Config) (etcdc.KeysAPI, error) {
+	etcdCfg := etcdc.Config{
+		Endpoints: endpoints,
+		Transport: newHTTPSTransport(cc),
+	}
+	cli, err := etcdc.New(etcdCfg)
+	if err != nil {
+		return nil, err
+	}
+	return etcdc.NewKeysAPI(cli), nil
+}
+
+func newHTTPSTransport(cc *tls.Config) etcdc.CancelableTransport {
+	// this seems like a bad idea but was here in the previous version
+	if cc != nil {
+		cc.InsecureSkipVerify = true
+	}
+
+	tr := &http.Transport{
+		Proxy: http.ProxyFromEnvironment,
+		Dial: (&net.Dialer{
+			Timeout:   30 * time.Second,
+			KeepAlive: 30 * time.Second,
+		}).Dial,
+		TLSHandshakeTimeout: 10 * time.Second,
+		TLSClientConfig:     cc,
+	}
+
+	return tr
+}
+
+const defaultEndpoint = "http://localhost:2379"
diff --git a/vendor/github.com/miekg/coredns/middleware/etcd/setup_test.go b/vendor/github.com/miekg/coredns/middleware/etcd/setup_test.go
new file mode 100644
index 0000000000..d29f34bc50
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/etcd/setup_test.go
@@ -0,0 +1,149 @@
+// +build etcd
+
+package etcd
+
+import (
+	"encoding/json"
+	"sort"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/pkg/singleflight"
+	"github.com/coredns/coredns/middleware/pkg/tls"
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/middleware/test"
+
+	etcdc "github.com/coreos/etcd/client"
+	"github.com/mholt/caddy"
+	"golang.org/x/net/context"
+)
+
+func init() {
+	ctxt, _ = context.WithTimeout(context.Background(), etcdTimeout)
+}
+
+func newEtcdMiddleware() *Etcd {
+	ctxt, _ = context.WithTimeout(context.Background(), etcdTimeout)
+
+	endpoints := []string{"http://localhost:2379"}
+	tlsc, _ := tls.NewTLSConfigFromArgs()
+	client, _ := newEtcdClient(endpoints, tlsc)
+
+	return &Etcd{
+		Proxy:      proxy.NewLookup([]string{"8.8.8.8:53"}),
+		PathPrefix: "skydns",
+		Ctx:        context.Background(),
+		Inflight:   &singleflight.Group{},
+		Zones:      []string{"skydns.test.", "skydns_extra.test.", "in-addr.arpa."},
+		Client:     client,
+	}
+}
+
+func set(t *testing.T, e *Etcd, k string, ttl time.Duration, m *msg.Service) {
+	b, err := json.Marshal(m)
+	if err != nil {
+		t.Fatal(err)
+	}
+	path, _ := msg.PathWithWildcard(k, e.PathPrefix)
+	e.Client.Set(ctxt, path, string(b), &etcdc.SetOptions{TTL: ttl})
+}
+
+func delete(t *testing.T, e *Etcd, k string) {
+	path, _ := msg.PathWithWildcard(k, e.PathPrefix)
+	e.Client.Delete(ctxt, path, &etcdc.DeleteOptions{Recursive: false})
+}
+
+func TestLookup(t *testing.T) {
+	etc := newEtcdMiddleware()
+	for _, serv := range services {
+		set(t, etc, serv.Key, 0, serv)
+		defer delete(t, etc, serv.Key)
+	}
+
+	for _, tc := range dnsTestCases {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		etc.ServeDNS(ctxt, rec, m)
+
+		resp := rec.Msg
+		sort.Sort(test.RRSet(resp.Answer))
+		sort.Sort(test.RRSet(resp.Ns))
+		sort.Sort(test.RRSet(resp.Extra))
+
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
+
+func TestSetupEtcd(t *testing.T) {
+	tests := []struct {
+		input              string
+		shouldErr          bool
+		expectedPath       string
+		expectedEndpoint   string
+		expectedErrContent string // substring from the expected error. Empty for positive cases.
+	}{
+		// positive
+		{
+			`etcd`, false, "skydns", "http://localhost:2379", "",
+		},
+		{
+			`etcd skydns.local {
+	endpoint localhost:300
+}
+`, false, "skydns", "localhost:300", "",
+		},
+		// negative
+		{
+			`etcd {
+	endpoints localhost:300
+}
+`, true, "", "", "unknown property 'endpoints'",
+		},
+	}
+
+	for i, test := range tests {
+		c := caddy.NewTestController("dns", test.input)
+		etcd, _ /*stubzones*/, err := etcdParse(c)
+
+		if test.shouldErr && err == nil {
+			t.Errorf("Test %d: Expected error but found %s for input %s", i, err, test.input)
+		}
+
+		if err != nil {
+			if !test.shouldErr {
+				t.Errorf("Test %d: Expected no error but found one for input %s. Error was: %v", i, test.input, err)
+				continue
+			}
+
+			if !strings.Contains(err.Error(), test.expectedErrContent) {
+				t.Errorf("Test %d: Expected error to contain: %v, found error: %v, input: %s", i, test.expectedErrContent, err, test.input)
+				continue
+			}
+		}
+
+		if !test.shouldErr && etcd.PathPrefix != test.expectedPath {
+			t.Errorf("Etcd not correctly set for input %s. Expected: %s, actual: %s", test.input, test.expectedPath, etcd.PathPrefix)
+		}
+		if !test.shouldErr && etcd.endpoints[0] != test.expectedEndpoint { // only checks the first
+			t.Errorf("Etcd not correctly set for input %s. Expected: '%s', actual: '%s'", test.input, test.expectedEndpoint, etcd.endpoints[0])
+		}
+	}
+}
+
+var ctxt context.Context
diff --git a/vendor/github.com/miekg/coredns/middleware/etcd/stub.go b/vendor/github.com/miekg/coredns/middleware/etcd/stub.go
new file mode 100644
index 0000000000..ae75a88d1a
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/etcd/stub.go
@@ -0,0 +1,77 @@
+package etcd
+
+import (
+	"log"
+	"net"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/proxy"
+
+	"github.com/miekg/dns"
+)
+
+// UpdateStubZones checks etcd for an update on the stubzones.
+func (e *Etcd) UpdateStubZones() {
+	go func() {
+		for {
+			e.updateStubZones()
+			time.Sleep(15 * time.Second)
+		}
+	}()
+}
+
+// Look in .../dns/stub/<zone>/xx for msg.Services. Loop through them
+// extract <zone> and add them as forwarders (ip:port-combos) for
+// the stub zones. Only numeric (i.e. IP address) hosts are used.
+// Only the first zone configured on e is used for the lookup.
+func (e *Etcd) updateStubZones() {
+	zone := e.Zones[0]
+	services, err := e.Records(stubDomain+"."+zone, false)
+	if err != nil {
+		return
+	}
+
+	stubmap := make(map[string]proxy.Proxy)
+	// track the nameservers on a per domain basis, but allow a list on the domain.
+	nameservers := map[string][]string{}
+
+Services:
+	for _, serv := range services {
+		if serv.Port == 0 {
+			serv.Port = 53
+		}
+		ip := net.ParseIP(serv.Host)
+		if ip == nil {
+			log.Printf("[WARNING] Non IP address stub nameserver: %s", serv.Host)
+			continue
+		}
+
+		domain := msg.Domain(serv.Key)
+		labels := dns.SplitDomainName(domain)
+
+		// If the remaining name equals any of the zones we have, we ignore it.
+		for _, z := range e.Zones {
+			// Chop of left most label, because that is used as the nameserver place holder
+			// and drop the right most labels that belong to zone.
+			// We must *also* chop of dns.stub. which means cutting two more labels.
+			domain = dns.Fqdn(strings.Join(labels[1:len(labels)-dns.CountLabel(z)-2], "."))
+			if domain == z {
+				log.Printf("[WARNING] Skipping nameserver for domain we are authoritative for: %s", domain)
+				continue Services
+			}
+		}
+		nameservers[domain] = append(nameservers[domain], net.JoinHostPort(serv.Host, strconv.Itoa(serv.Port)))
+	}
+
+	for domain, nss := range nameservers {
+		stubmap[domain] = proxy.NewLookup(nss)
+	}
+	// atomic swap (at least that's what we hope it is)
+	if len(stubmap) > 0 {
+		e.Stubmap = &stubmap
+	}
+	return
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/etcd/stub_handler.go b/vendor/github.com/miekg/coredns/middleware/etcd/stub_handler.go
new file mode 100644
index 0000000000..a6b752177f
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/etcd/stub_handler.go
@@ -0,0 +1,86 @@
+package etcd
+
+import (
+	"errors"
+	"log"
+
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+// Stub wraps an Etcd. We have this type so that it can have a ServeDNS method.
+type Stub struct {
+	*Etcd
+	Zone string // for what zone (and thus what nameservers are we called)
+}
+
+// ServeDNS implements the middleware.Handler interface.
+func (s Stub) ServeDNS(ctx context.Context, w dns.ResponseWriter, req *dns.Msg) (int, error) {
+	if hasStubEdns0(req) {
+		log.Printf("[WARNING] Forwarding cycle detected, refusing msg: %s", req.Question[0].Name)
+		return dns.RcodeRefused, errors.New("stub forward cycle")
+	}
+	req = addStubEdns0(req)
+	proxy, ok := (*s.Etcd.Stubmap)[s.Zone]
+	if !ok { // somebody made a mistake..
+		return dns.RcodeServerFailure, nil
+	}
+
+	state := request.Request{W: w, Req: req}
+	m, e := proxy.Forward(state)
+	if e != nil {
+		return dns.RcodeServerFailure, e
+	}
+	m.RecursionAvailable, m.Compress = true, true
+	state.SizeAndDo(m)
+	w.WriteMsg(m)
+	return dns.RcodeSuccess, nil
+}
+
+// hasStubEdns0 checks if the message is carrying our special edns0 zero option.
+func hasStubEdns0(m *dns.Msg) bool {
+	option := m.IsEdns0()
+	if option == nil {
+		return false
+	}
+	for _, o := range option.Option {
+		if o.Option() == ednsStubCode && len(o.(*dns.EDNS0_LOCAL).Data) == 1 &&
+			o.(*dns.EDNS0_LOCAL).Data[0] == 1 {
+			return true
+		}
+	}
+	return false
+}
+
+// addStubEdns0 adds our special option to the message's OPT record.
+func addStubEdns0(m *dns.Msg) *dns.Msg {
+	option := m.IsEdns0()
+	// Add a custom EDNS0 option to the packet, so we can detect loops when 2 stubs are forwarding to each other.
+	if option != nil {
+		option.Option = append(option.Option, &dns.EDNS0_LOCAL{Code: ednsStubCode, Data: []byte{1}})
+		return m
+	}
+
+	m.Extra = append(m.Extra, ednsStub)
+	return m
+}
+
+const (
+	ednsStubCode = dns.EDNS0LOCALSTART + 10
+	stubDomain   = "stub.dns"
+)
+
+var ednsStub = func() *dns.OPT {
+	o := new(dns.OPT)
+	o.Hdr.Name = "."
+	o.Hdr.Rrtype = dns.TypeOPT
+	o.SetUDPSize(4096)
+
+	e := new(dns.EDNS0_LOCAL)
+	e.Code = ednsStubCode
+	e.Data = []byte{1}
+	o.Option = append(o.Option, e)
+	return o
+}()
diff --git a/vendor/github.com/miekg/coredns/middleware/etcd/stub_test.go b/vendor/github.com/miekg/coredns/middleware/etcd/stub_test.go
new file mode 100644
index 0000000000..2ec89c0bf4
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/etcd/stub_test.go
@@ -0,0 +1,104 @@
+// +build etcd
+
+package etcd
+
+import (
+	"net"
+	"sort"
+	"strconv"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+)
+
+func fakeStubServerExampleNet(t *testing.T) (*dns.Server, string) {
+	server, addr, err := test.UDPServer("127.0.0.1:0")
+	if err != nil {
+		t.Fatalf("failed to create a UDP server: %s", err)
+	}
+	// add handler for example.net
+	dns.HandleFunc("example.net.", func(w dns.ResponseWriter, r *dns.Msg) {
+		m := new(dns.Msg)
+		m.SetReply(r)
+		m.Answer = []dns.RR{test.A("example.net.	86400	IN	A	93.184.216.34")}
+		w.WriteMsg(m)
+	})
+
+	return server, addr
+}
+
+func TestStubLookup(t *testing.T) {
+	server, addr := fakeStubServerExampleNet(t)
+	defer server.Shutdown()
+
+	host, p, _ := net.SplitHostPort(addr)
+	port, _ := strconv.Atoi(p)
+	exampleNetStub := &msg.Service{Host: host, Port: port, Key: "a.example.net.stub.dns.skydns.test."}
+	servicesStub = append(servicesStub, exampleNetStub)
+
+	etc := newEtcdMiddleware()
+
+	for _, serv := range servicesStub {
+		set(t, etc, serv.Key, 0, serv)
+		defer delete(t, etc, serv.Key)
+	}
+
+	etc.updateStubZones()
+
+	for _, tc := range dnsTestCasesStub {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		_, err := etc.ServeDNS(ctxt, rec, m)
+		if err != nil && m.Question[0].Name == "example.org." {
+			// This is OK, we expect this backend to *not* work.
+			continue
+		}
+		if err != nil {
+			t.Errorf("expected no error, got %v for %s\n", err, m.Question[0].Name)
+		}
+		resp := rec.Msg
+		if resp == nil {
+			// etcd not running?
+			continue
+		}
+		sort.Sort(test.RRSet(resp.Answer))
+		sort.Sort(test.RRSet(resp.Ns))
+		sort.Sort(test.RRSet(resp.Extra))
+
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
+
+var servicesStub = []*msg.Service{
+	// Two tests, ask a question that should return servfail because remote it no accessible
+	// and one with edns0 option added, that should return refused.
+	{Host: "127.0.0.1", Port: 666, Key: "b.example.org.stub.dns.skydns.test."},
+}
+
+var dnsTestCasesStub = []test.Case{
+	{
+		Qname: "example.org.", Qtype: dns.TypeA, Rcode: dns.RcodeServerFailure,
+	},
+	{
+		Qname: "example.net.", Qtype: dns.TypeA,
+		Answer: []dns.RR{test.A("example.net.	86400	IN	A	93.184.216.34")},
+		Extra: []dns.RR{test.OPT(4096, false)}, // This will have an EDNS0 section, because *we* added our local stub forward to detect loops.
+	},
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/file/README.md b/vendor/github.com/miekg/coredns/middleware/file/README.md
new file mode 100644
index 0000000000..2839869455
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/README.md
@@ -0,0 +1,53 @@
+# file
+
+*file* enables serving zone data from an RFC 1035-style master file.
+
+The file middleware is used for an "old-style" DNS server. It serves from a preloaded file that exists
+on disk. If the zone file contains signatures (i.e. is signed, i.e. DNSSEC) correct DNSSEC answers
+are returned. Only NSEC is supported! If you use this setup *you* are responsible for resigning the
+zonefile.
+
+## Syntax
+
+~~~
+file DBFILE [ZONES...]
+~~~
+
+* **DBFILE** the database file to read and parse. If the path is relative the path from the *root*
+  directive will be prepended to it.
+* **ZONES** zones it should be authoritative for. If empty, the zones from the configuration block
+    are used.
+
+If you want to round robin A and AAAA responses look at the *loadbalance* middleware.
+
+TSIG key configuration is TODO; directive format for transfer will probably be extended with
+TSIG key information, something like `transfer out [ADDRESS...] key [NAME[:ALG]] [BASE64]`
+
+~~~
+file DBFILE [ZONES... ] {
+    transfer to ADDRESS...
+    no_reload
+    upstream ADDRESS...
+}
+~~~
+
+* `transfer` enables zone transfers. It may be specified multiples times. `To` or `from` signals
+  the direction. **ADDRESS** must be denoted in CIDR notation (127.0.0.1/32 etc.) or just as plain
+  addresses. The special wildcard `*` means: the entire internet (only valid for 'transfer to').
+  When an address is specified a notify message will be send whenever the zone is reloaded.
+* `no_reload` by default CoreDNS will reload a zone from disk whenever it detects a change to the
+  file. This option disables that behavior.
+* `upstream` defines upstream resolvers to be used resolve external names found (think CNAMEs)
+  pointing to external names.
+
+## Examples
+
+Load the `example.org` zone from `example.org.signed` and allow transfers to the internet, but send
+notifies to 10.240.1.1
+
+~~~
+file example.org.signed example.org {
+    transfer to *
+    transfer to 10.240.1.1
+}
+~~~
diff --git a/vendor/github.com/miekg/coredns/middleware/file/closest.go b/vendor/github.com/miekg/coredns/middleware/file/closest.go
new file mode 100644
index 0000000000..ea201671f1
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/closest.go
@@ -0,0 +1,24 @@
+package file
+
+import (
+	"github.com/coredns/coredns/middleware/file/tree"
+
+	"github.com/miekg/dns"
+)
+
+// ClosestEncloser returns the closest encloser for qname.
+func (z *Zone) ClosestEncloser(qname string) (*tree.Elem, bool) {
+
+	offset, end := dns.NextLabel(qname, 0)
+	for !end {
+		elem, _ := z.Tree.Search(qname)
+		if elem != nil {
+			return elem, true
+		}
+		qname = qname[offset:]
+
+		offset, end = dns.NextLabel(qname, offset)
+	}
+
+	return z.Tree.Search(z.origin)
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/file/closest_test.go b/vendor/github.com/miekg/coredns/middleware/file/closest_test.go
new file mode 100644
index 0000000000..5915774309
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/closest_test.go
@@ -0,0 +1,38 @@
+package file
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestClosestEncloser(t *testing.T) {
+	z, err := Parse(strings.NewReader(dbMiekNL), testzone, "stdin")
+	if err != nil {
+		t.Fatalf("expect no error when reading zone, got %q", err)
+	}
+
+	tests := []struct {
+		in, out string
+	}{
+		{"miek.nl.", "miek.nl."},
+		{"www.miek.nl.", "www.miek.nl."},
+
+		{"blaat.miek.nl.", "miek.nl."},
+		{"blaat.www.miek.nl.", "www.miek.nl."},
+		{"www.blaat.miek.nl.", "miek.nl."},
+		{"blaat.a.miek.nl.", "a.miek.nl."},
+	}
+
+	for _, tc := range tests {
+		ce, _ := z.ClosestEncloser(tc.in)
+		if ce == nil {
+			if z.origin != tc.out {
+				t.Errorf("Expected ce to be %s for %s, got %s", tc.out, tc.in, ce.Name())
+			}
+			continue
+		}
+		if ce.Name() != tc.out {
+			t.Errorf("Expected ce to be %s for %s, got %s", tc.out, tc.in, ce.Name())
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/file/cname_test.go b/vendor/github.com/miekg/coredns/middleware/file/cname_test.go
new file mode 100644
index 0000000000..3961d09e42
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/cname_test.go
@@ -0,0 +1,161 @@
+package file
+
+import (
+	"sort"
+	"strings"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+func TestLookupCNAMEChain(t *testing.T) {
+	name := "example.org."
+	zone, err := Parse(strings.NewReader(dbExampleCNAME), name, "stdin")
+	if err != nil {
+		t.Fatalf("Expected no error when reading zone, got %q", err)
+	}
+
+	fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{name: zone}, Names: []string{name}}}
+	ctx := context.TODO()
+
+	for _, tc := range cnameTestCases {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		_, err := fm.ServeDNS(ctx, rec, m)
+		if err != nil {
+			t.Errorf("Expected no error, got %v\n", err)
+			return
+		}
+
+		resp := rec.Msg
+		sort.Sort(test.RRSet(resp.Answer))
+		sort.Sort(test.RRSet(resp.Ns))
+		sort.Sort(test.RRSet(resp.Extra))
+
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
+
+var cnameTestCases = []test.Case{
+	{
+		Qname: "a.example.org.", Qtype: dns.TypeA,
+		Answer: []dns.RR{
+			test.A("a.example.org. 1800	IN	A 127.0.0.1"),
+		},
+	},
+	{
+		Qname: "www3.example.org.", Qtype: dns.TypeCNAME,
+		Answer: []dns.RR{
+			test.CNAME("www3.example.org. 1800	IN	CNAME www2.example.org."),
+		},
+	},
+	{
+		Qname: "dangling.example.org.", Qtype: dns.TypeA,
+		Answer: []dns.RR{
+			test.CNAME("dangling.example.org. 1800	IN	CNAME foo.example.org."),
+		},
+	},
+	{
+		Qname: "www3.example.org.", Qtype: dns.TypeA,
+		Answer: []dns.RR{
+			test.A("a.example.org. 1800	IN	A 127.0.0.1"),
+			test.CNAME("www.example.org. 1800	IN	CNAME a.example.org."),
+			test.CNAME("www1.example.org. 1800	IN	CNAME www.example.org."),
+			test.CNAME("www2.example.org. 1800	IN	CNAME www1.example.org."),
+			test.CNAME("www3.example.org. 1800	IN	CNAME www2.example.org."),
+		},
+	},
+}
+
+func TestLookupCNAMEExternal(t *testing.T) {
+	name := "example.org."
+	zone, err := Parse(strings.NewReader(dbExampleCNAME), name, "stdin")
+	if err != nil {
+		t.Fatalf("Expected no error when reading zone, got %q", err)
+	}
+	zone.Proxy = proxy.NewLookup([]string{"8.8.8.8:53"}) // TODO(miek): point to local instance
+
+	fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{name: zone}, Names: []string{name}}}
+	ctx := context.TODO()
+
+	for _, tc := range exernalTestCases {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		_, err := fm.ServeDNS(ctx, rec, m)
+		if err != nil {
+			t.Errorf("Expected no error, got %v\n", err)
+			return
+		}
+
+		resp := rec.Msg
+		sort.Sort(test.RRSet(resp.Answer))
+		sort.Sort(test.RRSet(resp.Ns))
+		sort.Sort(test.RRSet(resp.Extra))
+
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
+
+var exernalTestCases = []test.Case{
+	{
+		Qname: "external.example.org.", Qtype: dns.TypeA,
+		Answer: []dns.RR{
+			test.CNAME("external.example.org. 1800	CNAME	www.example.net."),
+			// magic 303 TTL that says: don't check TTL.
+			test.A("www.example.net.	303	IN	A	93.184.216.34"),
+		},
+	},
+}
+
+const dbExampleCNAME = `
+$TTL    30M
+$ORIGIN example.org.
+@       IN      SOA     linode.atoom.net. miek.miek.nl. (
+                             1282630057 ; Serial
+                             4H         ; Refresh
+                             1H         ; Retry
+                             7D         ; Expire
+                             4H )       ; Negative Cache TTL
+
+a               IN      A       127.0.0.1
+www3            IN      CNAME   www2
+www2            IN      CNAME   www1
+www1            IN      CNAME   www
+www             IN      CNAME   a
+dangling        IN      CNAME   foo
+external        IN      CNAME   www.example.net.`
diff --git a/vendor/github.com/miekg/coredns/middleware/file/delegation_test.go b/vendor/github.com/miekg/coredns/middleware/file/delegation_test.go
new file mode 100644
index 0000000000..07fb814a57
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/delegation_test.go
@@ -0,0 +1,224 @@
+package file
+
+import (
+	"sort"
+	"strings"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+var delegationTestCases = []test.Case{
+	{
+		Qname: "a.delegated.miek.nl.", Qtype: dns.TypeTXT,
+		Ns: []dns.RR{
+			test.NS("delegated.miek.nl.	1800	IN	NS	a.delegated.miek.nl."),
+			test.NS("delegated.miek.nl.	1800	IN	NS	ns-ext.nlnetlabs.nl."),
+		},
+		Extra: []dns.RR{
+			test.A("a.delegated.miek.nl. 1800 IN A 139.162.196.78"),
+			test.AAAA("a.delegated.miek.nl. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"),
+		},
+	},
+	{
+		Qname: "delegated.miek.nl.", Qtype: dns.TypeNS,
+		Answer: []dns.RR{
+			test.NS("delegated.miek.nl.	1800	IN	NS	a.delegated.miek.nl."),
+			test.NS("delegated.miek.nl.	1800	IN	NS	ns-ext.nlnetlabs.nl."),
+		},
+		Extra: []dns.RR{
+			test.A("a.delegated.miek.nl. 1800 IN A 139.162.196.78"),
+			test.AAAA("a.delegated.miek.nl. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"),
+		},
+	},
+	{
+		Qname: "foo.delegated.miek.nl.", Qtype: dns.TypeA,
+		Ns: []dns.RR{
+			test.NS("delegated.miek.nl.	1800	IN	NS	a.delegated.miek.nl."),
+			test.NS("delegated.miek.nl.	1800	IN	NS	ns-ext.nlnetlabs.nl."),
+		},
+		Extra: []dns.RR{
+			test.A("a.delegated.miek.nl. 1800 IN A 139.162.196.78"),
+			test.AAAA("a.delegated.miek.nl. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"),
+		},
+	},
+	{
+		Qname: "foo.delegated.miek.nl.", Qtype: dns.TypeTXT,
+		Ns: []dns.RR{
+			test.NS("delegated.miek.nl.	1800	IN	NS	a.delegated.miek.nl."),
+			test.NS("delegated.miek.nl.	1800	IN	NS	ns-ext.nlnetlabs.nl."),
+		},
+		Extra: []dns.RR{
+			test.A("a.delegated.miek.nl. 1800 IN A 139.162.196.78"),
+			test.AAAA("a.delegated.miek.nl. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"),
+		},
+	},
+	{
+		Qname: "miek.nl.", Qtype: dns.TypeSOA,
+		Answer: []dns.RR{
+			test.SOA("miek.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
+		},
+		Ns: miekAuth,
+	},
+	{
+		Qname: "miek.nl.", Qtype: dns.TypeAAAA,
+		Ns: []dns.RR{
+			test.SOA("miek.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
+		},
+	},
+}
+
+var secureDelegationTestCases = []test.Case{
+	{
+		Qname: "a.delegated.example.org.", Qtype: dns.TypeTXT,
+		Do: true,
+		Ns: []dns.RR{
+			test.DS("delegated.example.org.	1800	IN	DS	10056 5 1 EE72CABD1927759CDDA92A10DBF431504B9E1F13"),
+			test.DS("delegated.example.org.	1800	IN	DS	10056 5 2 E4B05F87725FA86D9A64F1E53C3D0E6250946599DFE639C45955B0ED416CDDFA"),
+			test.NS("delegated.example.org.	1800	IN	NS	a.delegated.example.org."),
+			test.NS("delegated.example.org.	1800	IN	NS	ns-ext.nlnetlabs.nl."),
+			test.RRSIG("delegated.example.org.	1800	IN	RRSIG	DS 13 3 1800 20161129153240 20161030153240 49035 example.org. rlNNzcUmtbjLSl02ZzQGUbWX75yCUx0Mug1jHtKVqRq1hpPE2S3863tIWSlz+W9wz4o19OI4jbznKKqk+DGKog=="),
+		},
+		Extra: []dns.RR{
+			test.OPT(4096, true),
+			test.A("a.delegated.example.org. 1800 IN A 139.162.196.78"),
+			test.AAAA("a.delegated.example.org. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"),
+		},
+	},
+	{
+		Qname: "delegated.example.org.", Qtype: dns.TypeNS,
+		Do: true,
+		Answer: []dns.RR{
+			test.NS("delegated.example.org.	1800	IN	NS	a.delegated.example.org."),
+			test.NS("delegated.example.org.	1800	IN	NS	ns-ext.nlnetlabs.nl."),
+		},
+		Extra: []dns.RR{
+			test.OPT(4096, true),
+			test.A("a.delegated.example.org. 1800 IN A 139.162.196.78"),
+			test.AAAA("a.delegated.example.org. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"),
+		},
+	},
+	{
+		Qname: "foo.delegated.example.org.", Qtype: dns.TypeA,
+		Do: true,
+		Ns: []dns.RR{
+			test.DS("delegated.example.org.	1800	IN	DS	10056 5 1 EE72CABD1927759CDDA92A10DBF431504B9E1F13"),
+			test.DS("delegated.example.org.	1800	IN	DS	10056 5 2 E4B05F87725FA86D9A64F1E53C3D0E6250946599DFE639C45955B0ED416CDDFA"),
+			test.NS("delegated.example.org.	1800	IN	NS	a.delegated.example.org."),
+			test.NS("delegated.example.org.	1800	IN	NS	ns-ext.nlnetlabs.nl."),
+			test.RRSIG("delegated.example.org.	1800	IN	RRSIG	DS 13 3 1800 20161129153240 20161030153240 49035 example.org. rlNNzcUmtbjLSl02ZzQGUbWX75yCUx0Mug1jHtKVqRq1hpPE2S3863tIWSlz+W9wz4o19OI4jbznKKqk+DGKog=="),
+		},
+		Extra: []dns.RR{
+			test.OPT(4096, true),
+			test.A("a.delegated.example.org. 1800 IN A 139.162.196.78"),
+			test.AAAA("a.delegated.example.org. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"),
+		},
+	},
+	{
+		Qname: "foo.delegated.example.org.", Qtype: dns.TypeTXT,
+		Do: true,
+		Ns: []dns.RR{
+			test.DS("delegated.example.org.	1800	IN	DS	10056 5 1 EE72CABD1927759CDDA92A10DBF431504B9E1F13"),
+			test.DS("delegated.example.org.	1800	IN	DS	10056 5 2 E4B05F87725FA86D9A64F1E53C3D0E6250946599DFE639C45955B0ED416CDDFA"),
+			test.NS("delegated.example.org.	1800	IN	NS	a.delegated.example.org."),
+			test.NS("delegated.example.org.	1800	IN	NS	ns-ext.nlnetlabs.nl."),
+			test.RRSIG("delegated.example.org.	1800	IN	RRSIG	DS 13 3 1800 20161129153240 20161030153240 49035 example.org. rlNNzcUmtbjLSl02ZzQGUbWX75yCUx0Mug1jHtKVqRq1hpPE2S3863tIWSlz+W9wz4o19OI4jbznKKqk+DGKog=="),
+		},
+		Extra: []dns.RR{
+			test.OPT(4096, true),
+			test.A("a.delegated.example.org. 1800 IN A 139.162.196.78"),
+			test.AAAA("a.delegated.example.org. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"),
+		},
+	},
+}
+
+var miekAuth = []dns.RR{
+	test.NS("miek.nl.	1800	IN	NS	ext.ns.whyscream.net."),
+	test.NS("miek.nl.	1800	IN	NS	linode.atoom.net."),
+	test.NS("miek.nl.	1800	IN	NS	ns-ext.nlnetlabs.nl."),
+	test.NS("miek.nl.	1800	IN	NS	omval.tednet.nl."),
+}
+
+func TestLookupDelegation(t *testing.T) {
+	testDelegation(t, dbMiekNLDelegation, testzone, delegationTestCases)
+}
+
+func TestLookupSecureDelegation(t *testing.T) {
+	testDelegation(t, exampleOrgSigned, "example.org.", secureDelegationTestCases)
+}
+
+func testDelegation(t *testing.T, z, origin string, testcases []test.Case) {
+	zone, err := Parse(strings.NewReader(z), origin, "stdin")
+	if err != nil {
+		t.Fatalf("Expect no error when reading zone, got %q", err)
+	}
+
+	fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{origin: zone}, Names: []string{origin}}}
+	ctx := context.TODO()
+
+	for _, tc := range testcases {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		_, err := fm.ServeDNS(ctx, rec, m)
+		if err != nil {
+			t.Errorf("Expected no error, got %q\n", err)
+			return
+		}
+
+		resp := rec.Msg
+		sort.Sort(test.RRSet(resp.Answer))
+		sort.Sort(test.RRSet(resp.Ns))
+		sort.Sort(test.RRSet(resp.Extra))
+
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
+
+const dbMiekNLDelegation = `
+$TTL    30M
+$ORIGIN miek.nl.
+@       IN      SOA     linode.atoom.net. miek.miek.nl. (
+                             1282630057 ; Serial
+                             4H         ; Refresh
+                             1H         ; Retry
+                             7D         ; Expire
+                             4H )       ; Negative Cache TTL
+                IN      NS      linode.atoom.net.
+                IN      NS      ns-ext.nlnetlabs.nl.
+                IN      NS      omval.tednet.nl.
+                IN      NS      ext.ns.whyscream.net.
+
+                IN      MX      1  aspmx.l.google.com.
+                IN      MX      5  alt1.aspmx.l.google.com.
+                IN      MX      5  alt2.aspmx.l.google.com.
+                IN      MX      10 aspmx2.googlemail.com.
+                IN      MX      10 aspmx3.googlemail.com.
+
+delegated	IN	NS      a.delegated
+		IN	NS      ns-ext.nlnetlabs.nl.
+
+a.delegated     IN      TXT     "obscured"
+                IN      A       139.162.196.78
+                IN      AAAA    2a01:7e00::f03c:91ff:fef1:6735
+
+a               IN      A       139.162.196.78
+                IN      AAAA    2a01:7e00::f03c:91ff:fef1:6735
+www             IN      CNAME   a
+archive         IN      CNAME   a`
diff --git a/vendor/github.com/miekg/coredns/middleware/file/dnssec_test.go b/vendor/github.com/miekg/coredns/middleware/file/dnssec_test.go
new file mode 100644
index 0000000000..e033da051d
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/dnssec_test.go
@@ -0,0 +1,377 @@
+package file
+
+import (
+	"sort"
+	"strings"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+var dnssecTestCases = []test.Case{
+	{
+		Qname: "miek.nl.", Qtype: dns.TypeSOA, Do: true,
+		Answer: []dns.RR{
+			test.RRSIG("miek.nl.	1800	IN	RRSIG	SOA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. FIrzy07acBbtyQczy1dc="),
+			test.SOA("miek.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
+		},
+		Ns:    auth,
+		Extra: []dns.RR{test.OPT(4096, true)},
+	},
+	{
+		Qname: "miek.nl.", Qtype: dns.TypeAAAA, Do: true,
+		Answer: []dns.RR{
+			test.AAAA("miek.nl.	1800	IN	AAAA	2a01:7e00::f03c:91ff:fef1:6735"),
+			test.RRSIG("miek.nl.	1800	IN	RRSIG	AAAA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. SsRT="),
+		},
+		Ns:    auth,
+		Extra: []dns.RR{test.OPT(4096, true)},
+	},
+	{
+		Qname: "miek.nl.", Qtype: dns.TypeNS, Do: true,
+		Answer: []dns.RR{
+			test.NS("miek.nl.	1800	IN	NS	ext.ns.whyscream.net."),
+			test.NS("miek.nl.	1800	IN	NS	linode.atoom.net."),
+			test.NS("miek.nl.	1800	IN	NS	ns-ext.nlnetlabs.nl."),
+			test.NS("miek.nl.	1800	IN	NS	omval.tednet.nl."),
+			test.RRSIG("miek.nl.	1800	IN	RRSIG	NS 8 2 1800 20160426031301 20160327031301 12051 miek.nl. ZLtsQhwaz+lHfNpztFoR1Vxs="),
+		},
+		Extra: []dns.RR{test.OPT(4096, true)},
+	},
+	{
+		Qname: "miek.nl.", Qtype: dns.TypeMX, Do: true,
+		Answer: []dns.RR{
+			test.MX("miek.nl.	1800	IN	MX	1 aspmx.l.google.com."),
+			test.MX("miek.nl.	1800	IN	MX	10 aspmx2.googlemail.com."),
+			test.MX("miek.nl.	1800	IN	MX	10 aspmx3.googlemail.com."),
+			test.MX("miek.nl.	1800	IN	MX	5 alt1.aspmx.l.google.com."),
+			test.MX("miek.nl.	1800	IN	MX	5 alt2.aspmx.l.google.com."),
+			test.RRSIG("miek.nl.	1800	IN	RRSIG	MX 8 2 1800 20160426031301 20160327031301 12051 miek.nl. kLqG+iOr="),
+		},
+		Ns:    auth,
+		Extra: []dns.RR{test.OPT(4096, true)},
+	},
+	{
+		Qname: "www.miek.nl.", Qtype: dns.TypeA, Do: true,
+		Answer: []dns.RR{
+			test.A("a.miek.nl.	1800	IN	A	139.162.196.78"),
+			test.RRSIG("a.miek.nl.	1800	IN	RRSIG	A 8 3 1800 20160426031301 20160327031301 12051 miek.nl. lxLotCjWZ3kihTxk="),
+			test.CNAME("www.miek.nl.	1800	IN	CNAME	a.miek.nl."),
+			test.RRSIG("www.miek.nl. 1800	RRSIG	CNAME 8 3 1800 20160426031301 20160327031301 12051 miek.nl.  NVZmMJaypS+wDL2Lar4Zw1zF"),
+		},
+		Ns: auth,
+		Extra: []dns.RR{
+			test.OPT(4096, true),
+		},
+	},
+	{
+		// NoData
+		Qname: "a.miek.nl.", Qtype: dns.TypeSRV, Do: true,
+		Ns: []dns.RR{
+			test.NSEC("a.miek.nl.	14400	IN	NSEC	archive.miek.nl. A AAAA RRSIG NSEC"),
+			test.RRSIG("a.miek.nl.	14400	IN	RRSIG	NSEC 8 3 14400 20160426031301 20160327031301 12051 miek.nl. GqnF6cutipmSHEao="),
+			test.RRSIG("miek.nl.	1800	IN	RRSIG	SOA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. FIrzy07acBbtyQczy1dc="),
+			test.SOA("miek.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
+		},
+		Extra: []dns.RR{test.OPT(4096, true)},
+	},
+	{
+		Qname: "b.miek.nl.", Qtype: dns.TypeA, Do: true,
+		Rcode: dns.RcodeNameError,
+		Ns: []dns.RR{
+			test.NSEC("archive.miek.nl.	14400	IN	NSEC	go.dns.miek.nl. CNAME RRSIG NSEC"),
+			test.RRSIG("archive.miek.nl.	14400	IN	RRSIG	NSEC 8 3 14400 20160426031301 20160327031301 12051 miek.nl. jEpx8lcp4do5fWXg="),
+			test.NSEC("miek.nl.	14400	IN	NSEC	a.miek.nl. A NS SOA MX AAAA RRSIG NSEC DNSKEY"),
+			test.RRSIG("miek.nl.	14400	IN	RRSIG	NSEC 8 2 14400 20160426031301 20160327031301 12051 miek.nl. mFfc3r/9PSC1H6oSpdC"),
+			test.RRSIG("miek.nl.	1800	IN	RRSIG	SOA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. FIrzy07acBbtyQczy1dc="),
+			test.SOA("miek.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
+		},
+		Extra: []dns.RR{test.OPT(4096, true)},
+	},
+	{
+		Qname: "b.blaat.miek.nl.", Qtype: dns.TypeA, Do: true,
+		Rcode: dns.RcodeNameError,
+		Ns: []dns.RR{
+			test.NSEC("archive.miek.nl.	14400	IN	NSEC	go.dns.miek.nl. CNAME RRSIG NSEC"),
+			test.RRSIG("archive.miek.nl.	14400	IN	RRSIG	NSEC 8 3 14400 20160426031301 20160327031301 12051 miek.nl. jEpx8lcp4do5fWXg="),
+			test.NSEC("miek.nl.	14400	IN	NSEC	a.miek.nl. A NS SOA MX AAAA RRSIG NSEC DNSKEY"),
+			test.RRSIG("miek.nl.	14400	IN	RRSIG	NSEC 8 2 14400 20160426031301 20160327031301 12051 miek.nl. mFfc3r/9PSC1H6oSpdC"),
+			test.RRSIG("miek.nl.	1800	IN	RRSIG	SOA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. FIrzy07acBbtyQczy1dc="),
+			test.SOA("miek.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
+		},
+		Extra: []dns.RR{test.OPT(4096, true)},
+	},
+	{
+		Qname: "b.a.miek.nl.", Qtype: dns.TypeA, Do: true,
+		Rcode: dns.RcodeNameError,
+		Ns: []dns.RR{
+			// dedupped NSEC, because 1 nsec tells all
+			test.NSEC("a.miek.nl.	14400	IN	NSEC	archive.miek.nl. A AAAA RRSIG NSEC"),
+			test.RRSIG("a.miek.nl.	14400	IN	RRSIG	NSEC 8 3 14400 20160426031301 20160327031301 12051 miek.nl. GqnF6cut/RRGPQ1QGQE1ipmSHEao="),
+			test.RRSIG("miek.nl.	1800	IN	RRSIG	SOA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. FIrzy07acBbtyQczy1dc="),
+			test.SOA("miek.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
+		},
+		Extra: []dns.RR{test.OPT(4096, true)},
+	},
+}
+
+var auth = []dns.RR{
+	test.NS("miek.nl.	1800	IN	NS	ext.ns.whyscream.net."),
+	test.NS("miek.nl.	1800	IN	NS	linode.atoom.net."),
+	test.NS("miek.nl.	1800	IN	NS	ns-ext.nlnetlabs.nl."),
+	test.NS("miek.nl.	1800	IN	NS	omval.tednet.nl."),
+	test.RRSIG("miek.nl.	1800	IN	RRSIG	NS 8 2 1800 20160426031301 20160327031301 12051 miek.nl. ZLtsQhwazbqSpztFoR1Vxs="),
+}
+
+func TestLookupDNSSEC(t *testing.T) {
+	zone, err := Parse(strings.NewReader(dbMiekNLSigned), testzone, "stdin")
+	if err != nil {
+		t.Fatalf("Expected no error when reading zone, got %q", err)
+	}
+
+	fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: zone}, Names: []string{testzone}}}
+	ctx := context.TODO()
+
+	for _, tc := range dnssecTestCases {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		_, err := fm.ServeDNS(ctx, rec, m)
+		if err != nil {
+			t.Errorf("Expected no error, got %v\n", err)
+			return
+		}
+
+		resp := rec.Msg
+		sort.Sort(test.RRSet(resp.Answer))
+		sort.Sort(test.RRSet(resp.Ns))
+		sort.Sort(test.RRSet(resp.Extra))
+
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
+
+func BenchmarkLookupDNSSEC(b *testing.B) {
+	zone, err := Parse(strings.NewReader(dbMiekNLSigned), testzone, "stdin")
+	if err != nil {
+		return
+	}
+
+	fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: zone}, Names: []string{testzone}}}
+	ctx := context.TODO()
+	rec := dnsrecorder.New(&test.ResponseWriter{})
+
+	tc := test.Case{
+		Qname: "b.miek.nl.", Qtype: dns.TypeA, Do: true,
+		Rcode: dns.RcodeNameError,
+		Ns: []dns.RR{
+			test.NSEC("archive.miek.nl.	14400	IN	NSEC	go.dns.miek.nl. CNAME RRSIG NSEC"),
+			test.RRSIG("archive.miek.nl.	14400	IN	RRSIG	NSEC 8 3 14400 20160426031301 20160327031301 12051 miek.nl. jEpx8lcp4do5fWXg="),
+			test.NSEC("miek.nl.	14400	IN	NSEC	a.miek.nl. A NS SOA MX AAAA RRSIG NSEC DNSKEY"),
+			test.RRSIG("miek.nl.	14400	IN	RRSIG	NSEC 8 2 14400 20160426031301 20160327031301 12051 miek.nl. mFfc3r/9PSC1H6oSpdC"),
+			test.RRSIG("miek.nl.	1800	IN	RRSIG	SOA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. FIrzy07acBbtyQczy1dc="),
+			test.SOA("miek.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
+		},
+	}
+
+	m := tc.Msg()
+
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		fm.ServeDNS(ctx, rec, m)
+	}
+}
+
+const dbMiekNLSigned = `
+; File written on Sun Mar 27 04:13:01 2016
+; dnssec_signzone version 9.10.3-P4-Ubuntu
+miek.nl.		1800	IN SOA	linode.atoom.net. miek.miek.nl. (
+					1459051981 ; serial
+					14400      ; refresh (4 hours)
+					3600       ; retry (1 hour)
+					604800     ; expire (1 week)
+					14400      ; minimum (4 hours)
+					)
+			1800	RRSIG	SOA 8 2 1800 (
+					20160426031301 20160327031301 12051 miek.nl.
+					FIrzy07acBzrf6kNW13Ypmq/ahojoMqOj0qJ
+					ixTevTvwOEcVuw9GlJoYIHTYg+hm1sZHtx9K
+					RiVmYsm8SHKsJA1WzixtT4K7vQvM+T+qbeOJ
+					xA6YTivKUcGRWRXQlOTUAlHS/KqBEfmxKgRS
+					68G4oOEClFDSJKh7RbtyQczy1dc= )
+			1800	NS	ext.ns.whyscream.net.
+			1800	NS	omval.tednet.nl.
+			1800	NS	linode.atoom.net.
+			1800	NS	ns-ext.nlnetlabs.nl.
+			1800	RRSIG	NS 8 2 1800 (
+					20160426031301 20160327031301 12051 miek.nl.
+					ZLtsQhwaz+CwrgzgFiEAqbqS/JH65MYjziA3
+					6EXwlGDy41lcfGm71PpxA7cDzFhWNkJNk4QF
+					q48wtpP4IGPPpHbnJHKDUXj6se7S+ylAGbS+
+					VgVJ4YaVcE6xA9ZVhVpz8CSSjeH34vmqq9xj
+					zmFjofuDvraZflHfNpztFoR1Vxs= )
+			1800	A	139.162.196.78
+			1800	RRSIG	A 8 2 1800 (
+					20160426031301 20160327031301 12051 miek.nl.
+					hl+6Q075tsCkxIqbop8zZ6U8rlFvooz7Izzx
+					MgCZYVLcg75El28EXKIhBfRb1dPaKbd+v+AD
+					wrJMHL131pY5sU2Ly05K+7CqmmyaXgDaVsKS
+					rSw/TbhGDIItBemeseeuXGAKAbY2+gE7kNN9
+					mZoQ9hRB3SrxE2jhctv66DzYYQQ= )
+			1800	MX	1 aspmx.l.google.com.
+			1800	MX	5 alt1.aspmx.l.google.com.
+			1800	MX	5 alt2.aspmx.l.google.com.
+			1800	MX	10 aspmx2.googlemail.com.
+			1800	MX	10 aspmx3.googlemail.com.
+			1800	RRSIG	MX 8 2 1800 (
+					20160426031301 20160327031301 12051 miek.nl.
+					kLqG+iOrKSzms1H9Et9me8Zts1rbyeCFSVQD
+					G9is/u6ec3Lqg2vwJddf/yRsjVpVgadWSAkc
+					GSDuD2dK8oBeP24axWc3Z1OY2gdMI7w+PKWT
+					Z+pjHVjbjM47Ii/a6jk5SYeOwpGMsdEwhtTP
+					vk2O2WGljifqV3uE7GshF5WNR10= )
+			1800	AAAA	2a01:7e00::f03c:91ff:fef1:6735
+			1800	RRSIG	AAAA 8 2 1800 (
+					20160426031301 20160327031301 12051 miek.nl.
+					SsRTHytW4YTAuHovHQgfIMhNwMtMp4gaAU/Z
+					lgTO+IkBb9y9F8uHrf25gG6RqA1bnGV/gezV
+					NU5negXm50bf1BNcyn3aCwEbA0rCGYIL+nLJ
+					szlBVbBu6me/Ym9bbJlfgfHRDfsVy2ZkNL+B
+					jfNQtGCSDoJwshjcqJlfIVSardo= )
+			14400	NSEC	a.miek.nl. A NS SOA MX AAAA RRSIG NSEC DNSKEY
+			14400	RRSIG	NSEC 8 2 14400 (
+					20160426031301 20160327031301 12051 miek.nl.
+					mFfc3r/9PSC1H6oSpdC+FDy/Iu02W2Tf0x+b
+					n6Lpe1gCC1uvcSUrrmBNlyAWRr5Zm+ZXssEb
+					cKddRGiu/5sf0bUWrs4tqokL/HUl10X/sBxb
+					HfwNAeD7R7+CkpMv67li5AhsDgmQzpX2r3P6
+					/6oZyLvODGobysbmzeWM6ckE8IE= )
+			1800	DNSKEY	256 3 8 (
+					AwEAAcNEU67LJI5GEgF9QLNqLO1SMq1EdoQ6
+					E9f85ha0k0ewQGCblyW2836GiVsm6k8Kr5EC
+					IoMJ6fZWf3CQSQ9ycWfTyOHfmI3eQ/1Covhb
+					2y4bAmL/07PhrL7ozWBW3wBfM335Ft9xjtXH
+					Py7ztCbV9qZ4TVDTW/Iyg0PiwgoXVesz
+					) ; ZSK; alg = RSASHA256; key id = 12051
+			1800	DNSKEY	257 3 8 (
+					AwEAAcWdjBl4W4wh/hPxMDcBytmNCvEngIgB
+					9Ut3C2+QI0oVz78/WK9KPoQF7B74JQ/mjO4f
+					vIncBmPp6mFNxs9/WQX0IXf7oKviEVOXLjct
+					R4D1KQLX0wprvtUIsQFIGdXaO6suTT5eDbSd
+					6tTwu5xIkGkDmQhhH8OQydoEuCwV245ZwF/8
+					AIsqBYDNQtQ6zhd6jDC+uZJXg/9LuPOxFHbi
+					MTjp6j3CCW0kHbfM/YHZErWWtjPj3U3Z7knQ
+					SIm5PO5FRKBEYDdr5UxWJ/1/20SrzI3iztvP
+					wHDsA2rdHm/4YRzq7CvG4N0t9ac/T0a0Sxba
+					/BUX2UVPWaIVBdTRBtgHi0s=
+					) ; KSK; alg = RSASHA256; key id = 33694
+			1800	RRSIG	DNSKEY 8 2 1800 (
+					20160426031301 20160327031301 12051 miek.nl.
+					o/D6o8+/bNGQyyRvwZ2hM0BJ+3HirvNjZoko
+					yGhGe9sPSrYU39WF3JVIQvNJFK6W3/iwlKir
+					TPOeYlN6QilnztFq1vpCxwj2kxJaIJhZecig
+					LsKxY/fOHwZlIbBLZZadQG6JoGRLHnImSzpf
+					xtyVaXQtfnJFC07HHt9np3kICfE= )
+			1800	RRSIG	DNSKEY 8 2 1800 (
+					20160426031301 20160327031301 33694 miek.nl.
+					Ak/mbbQVQV+nUgw5Sw/c+TSoYqIwbLARzuNE
+					QJvJNoRR4tKVOY6qSxQv+j5S7vzyORZ+yeDp
+					NlEa1T9kxZVBMABoOtLX5kRqZncgijuH8fxb
+					L57Sv2IzINI9+DOcy9Q9p9ygtwYzQKrYoNi1
+					0hwHi6emGkVG2gGghruMinwOJASGgQy487Yd
+					eIpcEKJRw73nxd2le/4/Vafy+mBpKWOczfYi
+					5m9MSSxcK56NFYjPG7TvdIw0m70F/smY9KBP
+					pGWEdzRQDlqfZ4fpDaTAFGyRX0mPFzMbs1DD
+					3hQ4LHUSi/NgQakdH9eF42EVEDeL4cI69K98
+					6NNk6X9TRslO694HKw== )
+a.miek.nl.		1800	IN A	139.162.196.78
+			1800	RRSIG	A 8 3 1800 (
+					20160426031301 20160327031301 12051 miek.nl.
+					lxLotCjWZ3kikNNcePu6HOCqMHDINKFRJRD8
+					laz2KQ9DKtgXPdnRw5RJvVITSj8GUVzw1ec1
+					CYVEKu/eMw/rc953Zns528QBypGPeMNLe2vu
+					C6a6UhZnGHA48dSd9EX33eSJs0MP9xsC9csv
+					LGdzYmv++eslkKxkhSOk2j/hTxk= )
+			1800	AAAA	2a01:7e00::f03c:91ff:fef1:6735
+			1800	RRSIG	AAAA 8 3 1800 (
+					20160426031301 20160327031301 12051 miek.nl.
+					ji3QMlaUzlK85ppB5Pc+y2WnfqOi6qrm6dm1
+					bXgsEov/5UV1Lmcv8+Y5NBbTbBlXGlWcpqNp
+					uWpf9z3lbguDWznpnasN2MM8t7yxo/Cr7WRf
+					QCzui7ewpWiA5hq7j0kVbM4nnDc6cO+U93hO
+					mMhVbeVI70HM2m0HaHkziEyzVZk= )
+			14400	NSEC	archive.miek.nl. A AAAA RRSIG NSEC
+			14400	RRSIG	NSEC 8 3 14400 (
+					20160426031301 20160327031301 12051 miek.nl.
+					GqnF6cut/KCxbnJj27MCjjVGkjObV0hLhHOP
+					E1/GXAUTEKG6BWxJq8hidS3p/yrOmP5PEL9T
+					4FjBp0/REdVmGpuLaiHyMselES82p/uMMdY5
+					QqRM6LHhZdO1zsRbyzOZbm5MsW6GR7K2kHlX
+					9TdBIULiRRGPQ1QGQE1ipmSHEao= )
+archive.miek.nl.	1800	IN CNAME a.miek.nl.
+			1800	RRSIG	CNAME 8 3 1800 (
+					20160426031301 20160327031301 12051 miek.nl.
+					s4zVJiDrVuUiUFr8CNQLuXYYfpqpl8rovL50
+					BYsub/xK756NENiOTAOjYH6KYg7RSzsygJjV
+					YQwXolZly2/KXAr48SCtxzkGFxLexxiKcFaj
+					vm7ZDl7Btoa5l68qmBcxOX5E/W0IKITi4PNK
+					mhBs7dlaf0IbPGNgMxae72RosxM= )
+			14400	NSEC	go.dns.miek.nl. CNAME RRSIG NSEC
+			14400	RRSIG	NSEC 8 3 14400 (
+					20160426031301 20160327031301 12051 miek.nl.
+					jEp7LsoK++/PRFh2HieLzasA1jXBpp90NyDf
+					RfpfOxdM69yRKfvXMc2bazIiMuDhxht79dGI
+					Gj02cn1cvX60SlaHkeFtqTdJcHdK9rbI65EK
+					YHFZFzGh9XVnuMJKpUsm/xS1dnUSAnXN8q+0
+					xBlUDlQpsAFv/cx8lcp4do5fWXg= )
+go.dns.miek.nl.		1800	IN TXT	"Hello!"
+			1800	RRSIG	TXT 8 4 1800 (
+					20160426031301 20160327031301 12051 miek.nl.
+					O0uo1NsXTq2TTfgOmGbHQQEchrcpllaDAMMX
+					dTDizw3t+vZ5SR32qJ8W7y6VXLgUqJgcdRxS
+					Fou1pp+t5juRZSQ0LKgxMpZAgHorkzPvRf1b
+					E9eBKrDSuLGagsQRwHeldFGFgsXtCbf07vVH
+					zoKR8ynuG4/cAoY0JzMhCts+56U= )
+			14400	NSEC	www.miek.nl. TXT RRSIG NSEC
+			14400	RRSIG	NSEC 8 4 14400 (
+					20160426031301 20160327031301 12051 miek.nl.
+					BW6qo7kYe3Z+Y0ebaVTWTy1c3bpdf8WUEoXq
+					WDQxLDEj2fFiuEBDaSN5lTWRg3wj8kZmr6Uk
+					LvX0P29lbATFarIgkyiAdbOEdaf88nMfqBW8
+					z2T5xrPQcN0F13uehmv395yAJs4tebRxErMl
+					KdkVF0dskaDvw8Wo3YgjHUf6TXM= )
+www.miek.nl.		1800	IN CNAME a.miek.nl.
+			1800	RRSIG	CNAME 8 3 1800 (
+					20160426031301 20160327031301 12051 miek.nl.
+					MiQQh2lScoNiNVZmMJaypS+wDL2Lar4Zw1zF
+					Uo4tL16BfQOt7yl8gXdAH2JMFqoKAoIdM2K6
+					XwFOwKTOGSW0oNCOcaE7ts+1Z1U0H3O2tHfq
+					FAzfg1s9pQ5zxk8J/bJgkVIkw2/cyB0y1/PK
+					EmIqvChBSb4NchTuMCSqo63LJM8= )
+			14400	NSEC	miek.nl. CNAME RRSIG NSEC
+			14400	RRSIG	NSEC 8 3 14400 (
+					20160426031301 20160327031301 12051 miek.nl.
+					OPPZ8iaUPrVKEP4cqeCiiv1WLRAY30GRIhc/
+					me0gBwFkbmTEnvB+rUp831OJZDZBNKv4QdZj
+					Uyc26wKUOQeUyMJqv4IRDgxH7nq9GB5JRjYZ
+					IVxtGD1aqWLXz+8aMaf9ARJjtYUd3K4lt8Wz
+					LbJSo5Wdq7GOWqhgkY5n3XD0/FA= )`
diff --git a/vendor/github.com/miekg/coredns/middleware/file/dnssex_test.go b/vendor/github.com/miekg/coredns/middleware/file/dnssex_test.go
new file mode 100644
index 0000000000..d9a0a4568b
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/dnssex_test.go
@@ -0,0 +1,145 @@
+package file
+
+const dbDnssexNLSigned = `
+; File written on Tue Mar 29 21:02:24 2016
+; dnssec_signzone version 9.10.3-P4-Ubuntu
+dnssex.nl.		1800	IN SOA	linode.atoom.net. miek.miek.nl. (
+					1459281744 ; serial
+					14400      ; refresh (4 hours)
+					3600       ; retry (1 hour)
+					604800     ; expire (1 week)
+					14400      ; minimum (4 hours)
+					)
+			1800	RRSIG	SOA 8 2 1800 (
+					20160428190224 20160329190224 14460 dnssex.nl.
+					CA/Y3m9hCOiKC/8ieSOv8SeP964BUdG/8MC3
+					WtKljUosK9Z9bBGrVizDjjqgq++lyH8BZJcT
+					aabAsERs4xj5PRtcxicwQXZACX5VYjXHQeZm
+					CyytFU5wq2gcXSmvUH86zZzftx3RGPvn1aOo
+					TlcvoC3iF8fYUCpROlUS0YR8Cdw= )
+			1800	NS	omval.tednet.nl.
+			1800	NS	linode.atoom.net.
+			1800	NS	ns-ext.nlnetlabs.nl.
+			1800	RRSIG	NS 8 2 1800 (
+					20160428190224 20160329190224 14460 dnssex.nl.
+					dLIeEvP86jj5nd3orv9bH7hTvkblF4Na0sbl
+					k6fJA6ha+FPN1d6Pig3NNEEVQ/+wlOp/JTs2
+					v07L7roEEUCbBprI8gMSld2gFDwNLW3DAB4M
+					WD/oayYdAnumekcLzhgvWixTABjWAGRTGQsP
+					sVDFXsGMf9TGGC9FEomgkCVeNC0= )
+			1800	A	139.162.196.78
+			1800	RRSIG	A 8 2 1800 (
+					20160428190224 20160329190224 14460 dnssex.nl.
+					LKJKLzPiSEDWOLAag2YpfD5EJCuDcEAJu+FZ
+					Xy+4VyOv9YvRHCTL4vbrevOo5+XymY2RxU1q
+					j+6leR/Fe7nlreSj2wzAAk2bIYn4m6r7hqeO
+					aKZsUFfpX8cNcFtGEywfHndCPELbRxFeEziP
+					utqHFLPNMX5nYCpS28w4oJ5sAnM= )
+			1800	TXT	"Doing It Safe Is Better"
+			1800	RRSIG	TXT 8 2 1800 (
+					20160428190224 20160329190224 14460 dnssex.nl.
+					f6S+DUfJK1UYdOb3AHgUXzFTTtu+yLp/Fv7S
+					Hv0CAGhXAVw+nBbK719igFvBtObS33WKwzxD
+					1pQNMaJcS6zeevtD+4PKB1KDC4fyJffeEZT6
+					E30jGR8Y29/xA+Fa4lqDNnj9zP3b8TiABCle
+					ascY5abkgWCALLocFAzFJQ/27YQ= )
+			1800	AAAA	2a01:7e00::f03c:91ff:fef1:6735
+			1800	RRSIG	AAAA 8 2 1800 (
+					20160428190224 20160329190224 14460 dnssex.nl.
+					PWcPSawEUBAfCuv0liEOQ8RYe7tfNW4rubIJ
+					LE+dbrub1DUer3cWrDoCYFtOufvcbkYJQ2CQ
+					AGjJmAQ5J2aqYDOPMrKa615V0KT3ifbZJcGC
+					gkIic4U/EXjaQpRoLdDzR9MyVXOmbA6sKYzj
+					ju1cNkLqM8D7Uunjl4pIr6rdSFo= )
+			14400	NSEC	*.dnssex.nl. A NS SOA TXT AAAA RRSIG NSEC DNSKEY
+			14400	RRSIG	NSEC 8 2 14400 (
+					20160428190224 20160329190224 14460 dnssex.nl.
+					oIvM6JZIlNc1aNKGTxv58ApSnDr1nDPPgnD9
+					9oJZRIn7eb5WnpeDz2H3z5+x6Bhlp5hJJaUp
+					KJ3Ss6Jg/IDnrmIvKmgq6L6gHj1Y1IiHmmU8
+					VeZTRzdTsDx/27OsN23roIvsytjveNSEMfIm
+					iLZ23x5kg1kBdJ9p3xjYHm5lR+8= )
+			1800	DNSKEY	256 3 8 (
+					AwEAAazSO6uvLPEVknDA8yxjFe8nnAMU7txp
+					wb19k55hQ81WV3G4bpBM1NdN6sbYHrkXaTNx
+					2bQWAkvX6pz0XFx3z/MPhW+vkakIWFYpyQ7R
+					AT5LIJfToVfiCDiyhhF0zVobKBInO9eoGjd9
+					BAW3TUt+LmNAO/Ak5D5BX7R3CuA7v9k7
+					) ; ZSK; alg = RSASHA256; key id = 14460
+			1800	DNSKEY	257 3 8 (
+					AwEAAbyeaV9zg0IqdtgYoqK5jJ239anzwG2i
+					gvH1DxSazLyaoNvEkCIvPgMLW/JWfy7Z1mQp
+					SMy9DtzL5pzRyQgw7kIeXLbi6jufUFd9pxN+
+					xnzKLf9mY5AcnGToTrbSL+jnMT67wG+c34+Q
+					PeVfucHNUePBxsbz2+4xbXiViSQyCQGv
+					) ; KSK; alg = RSASHA256; key id = 18772
+			1800	RRSIG	DNSKEY 8 2 1800 (
+					20160428190224 20160329190224 14460 dnssex.nl.
+					cFSFtJE+DBGNxb52AweFaVHBe5Ue5MDpqNdC
+					TIneUnEhP2m+vK4zJ/TraK0WdQFpsX63pod8
+					PZ9y03vHUfewivyonCCBD3DcNdoU9subhN22
+					tez9Ct8Z5/9E4RAz7orXal4M1VUEhRcXSEH8
+					SJW20mfVsqJAiKqqNeGB/pAj23I= )
+			1800	RRSIG	DNSKEY 8 2 1800 (
+					20160428190224 20160329190224 18772 dnssex.nl.
+					oiiwo/7NYacePqohEp50261elhm6Dieh4j2S
+					VZGAHU5gqLIQeW9CxKJKtSCkBVgUo4cvO4Rn
+					2tzArAuclDvBrMXRIoct8u7f96moeFE+x5FI
+					DYqICiV6k449ljj9o4t/5G7q2CRsEfxZKpTI
+					A/L0+uDk0RwVVzL45+TnilcsmZs= )
+*.dnssex.nl.		1800	IN TXT	"Doing It Safe Is Better"
+			1800	RRSIG	TXT 8 2 1800 (
+					20160428190224 20160329190224 14460 dnssex.nl.
+					FUZSTyvZfeuuOpCmNzVKOfITRHJ6/ygjmnnb
+					XGBxVUyQjoLuYXwD5XqZWGw4iKH6QeSDfGCx
+					4MPqA4qQmW7Wwth7mat9yMfA4+p2sO84bysl
+					7/BG9+W2G+q1uQiM9bX9V42P2X/XuW5Y/t9Y
+					8u1sljQ7D8WwS6naH/vbaJxnDBw= )
+			14400	NSEC	a.dnssex.nl. TXT RRSIG NSEC
+			14400	RRSIG	NSEC 8 2 14400 (
+					20160428190224 20160329190224 14460 dnssex.nl.
+					os6INm6q2eXknD5z8TpfbK00uxVbQefMvHcR
+					/RNX/kh0xXvzAaaDOV+Ge/Ko+2dXnKP+J1LY
+					G9ffXNpdbaQy5ygzH5F041GJst4566GdG/jt
+					7Z7vLHYxEBTpZfxo+PLsXQXH3VTemZyuWyDf
+					qJzafXJVH1F0nDrcXmMlR6jlBHA= )
+www.dnssex.nl.		1800	IN CNAME a.dnssex.nl.
+			1800	RRSIG	CNAME 8 3 1800 (
+					20160428190224 20160329190224 14460 dnssex.nl.
+					Omv42q/uVvdNsWQoSrQ6m6w6U7r7Abga7uF4
+					25b3gZlse0C+WyMyGFMGUbapQm7azvBpreeo
+					uKJHjzd+ufoG+Oul6vU9vyoj+ejgHzGLGbJQ
+					HftfP+UqP5SWvAaipP/LULTWKPuiBcLDLiBI
+					PGTfsq0DB6R+qCDTV0fNnkgxEBQ= )
+			14400	NSEC	dnssex.nl. CNAME RRSIG NSEC
+			14400	RRSIG	NSEC 8 3 14400 (
+					20160428190224 20160329190224 14460 dnssex.nl.
+					TBN3ddfZW+kC84/g3QlNNJMeLZoyCalPQylt
+					KXXLPGuxfGpl3RYRY8KaHbP+5a8MnHjqjuMB
+					Lofb7yKMFxpSzMh8E36vnOqry1mvkSakNj9y
+					9jM8PwDjcpYUwn/ql76MsmNgEV5CLeQ7lyH4
+					AOrL79yOSQVI3JHJIjKSiz88iSw= )
+a.dnssex.nl.		1800	IN A	139.162.196.78
+			1800	RRSIG	A 8 3 1800 (
+					20160428190224 20160329190224 14460 dnssex.nl.
+					OXHpFj9nSpKi5yA/ULH7MOpGAWfyJ2yC/2xa
+					Pw0fqSY4QvcRt+V3adcFA4H9+P1b32GpxEjB
+					lXmCJID+H4lYkhUR4r4IOZBVtKG2SJEBZXip
+					pH00UkOIBiXxbGzfX8VL04v2G/YxUgLW57kA
+					aknaeTOkJsO20Y+8wmR9EtzaRFI= )
+			1800	AAAA	2a01:7e00::f03c:91ff:fef1:6735
+			1800	RRSIG	AAAA 8 3 1800 (
+					20160428190224 20160329190224 14460 dnssex.nl.
+					jrepc/VnRzJypnrG0WDEqaAr3HMjWrPxJNX0
+					86gbFjZG07QxBmrA1rj0jM9YEWTjjyWb2tT7
+					lQhzKDYX/0XdOVUeeOM4FoSks80V+pWR8fvj
+					AZ5HmX69g36tLosMDKNR4lXcrpv89QovG4Hr
+					/r58fxEKEFJqrLDjMo6aOrg+uKA= )
+			14400	NSEC	www.dnssex.nl. A AAAA RRSIG NSEC
+			14400	RRSIG	NSEC 8 3 14400 (
+					20160428190224 20160329190224 14460 dnssex.nl.
+					S+UM62wXRNNFN3QDWK5YFWUbHBXC4aqaqinZ
+					A2ZDeC+IQgyw7vazPz7cLI5T0YXXks0HTMlr
+					soEjKnnRZsqSO9EuUavPNE1hh11Jjm0fB+5+
+					+Uro0EmA5Dhgc0Z2VpbXVQEhNDf/pI1gem15
+					RffN2tBYNykZn4Has2ySgRaaRYQ= )`
diff --git a/vendor/github.com/miekg/coredns/middleware/file/ds_test.go b/vendor/github.com/miekg/coredns/middleware/file/ds_test.go
new file mode 100644
index 0000000000..691b6ddb4b
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/ds_test.go
@@ -0,0 +1,92 @@
+package file
+
+import (
+	"sort"
+	"strings"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+var dsTestCases = []test.Case{
+	{
+		Qname: "a.delegated.miek.nl.", Qtype: dns.TypeDS,
+		Ns: []dns.RR{
+			test.NS("delegated.miek.nl.	1800	IN	NS	a.delegated.miek.nl."),
+			test.NS("delegated.miek.nl.	1800	IN	NS	ns-ext.nlnetlabs.nl."),
+		},
+		Extra: []dns.RR{
+			test.A("a.delegated.miek.nl. 1800 IN A 139.162.196.78"),
+			test.AAAA("a.delegated.miek.nl. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"),
+		},
+	},
+	{
+		Qname: "_udp.delegated.miek.nl.", Qtype: dns.TypeDS,
+		Ns: []dns.RR{
+			test.NS("delegated.miek.nl.	1800	IN	NS	a.delegated.miek.nl."),
+			test.NS("delegated.miek.nl.	1800	IN	NS	ns-ext.nlnetlabs.nl."),
+		},
+		Extra: []dns.RR{
+			test.A("a.delegated.miek.nl. 1800 IN A 139.162.196.78"),
+			test.AAAA("a.delegated.miek.nl. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"),
+		},
+	},
+	{
+		// This works *here* because we skip the server routing for DS in core/dnsserver/server.go
+		Qname: "_udp.miek.nl.", Qtype: dns.TypeDS,
+		Rcode: dns.RcodeNameError,
+		Ns: []dns.RR{
+			test.SOA("miek.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
+		},
+	},
+	{
+		Qname: "miek.nl.", Qtype: dns.TypeDS,
+		Ns: []dns.RR{
+			test.SOA("miek.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
+		},
+	},
+}
+
+func TestLookupDS(t *testing.T) {
+	zone, err := Parse(strings.NewReader(dbMiekNLDelegation), testzone, "stdin")
+	if err != nil {
+		t.Fatalf("Expected no error when reading zone, got %q", err)
+	}
+
+	fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: zone}, Names: []string{testzone}}}
+	ctx := context.TODO()
+
+	for _, tc := range dsTestCases {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		_, err := fm.ServeDNS(ctx, rec, m)
+		if err != nil {
+			t.Errorf("Expected no error, got %v\n", err)
+			return
+		}
+
+		resp := rec.Msg
+		sort.Sort(test.RRSet(resp.Answer))
+		sort.Sort(test.RRSet(resp.Ns))
+		sort.Sort(test.RRSet(resp.Extra))
+
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/file/ent_test.go b/vendor/github.com/miekg/coredns/middleware/file/ent_test.go
new file mode 100644
index 0000000000..119e028937
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/ent_test.go
@@ -0,0 +1,178 @@
+package file
+
+import (
+	"sort"
+	"strings"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+var entTestCases = []test.Case{
+	{
+		Qname: "b.c.miek.nl.", Qtype: dns.TypeA,
+		Ns: []dns.RR{
+			test.SOA("miek.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
+		},
+	},
+	{
+		Qname: "b.c.miek.nl.", Qtype: dns.TypeA, Do: true,
+		Ns: []dns.RR{
+			test.NSEC("a.miek.nl.	14400	IN	NSEC	a.b.c.miek.nl. A RRSIG NSEC"),
+			test.RRSIG("a.miek.nl.	14400	IN	RRSIG	NSEC 8 3 14400 20160502144311 20160402144311 12051 miek.nl. d5XZEy6SUpq98ZKUlzqhAfkLI9pQPc="),
+			test.RRSIG("miek.nl.	1800	IN	RRSIG	SOA 8 2 1800 20160502144311 20160402144311 12051 miek.nl. KegoBxA3Tbrhlc4cEdkRiteIkOfsq"),
+			test.SOA("miek.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
+		},
+		Extra: []dns.RR{test.OPT(4096, true)},
+	},
+}
+
+func TestLookupEnt(t *testing.T) {
+	zone, err := Parse(strings.NewReader(dbMiekENTNL), testzone, "stdin")
+	if err != nil {
+		t.Fatalf("expect no error when reading zone, got %q", err)
+	}
+
+	fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: zone}, Names: []string{testzone}}}
+	ctx := context.TODO()
+
+	for _, tc := range entTestCases {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		_, err := fm.ServeDNS(ctx, rec, m)
+		if err != nil {
+			t.Errorf("expected no error, got %v\n", err)
+			return
+		}
+
+		resp := rec.Msg
+		sort.Sort(test.RRSet(resp.Answer))
+		sort.Sort(test.RRSet(resp.Ns))
+		sort.Sort(test.RRSet(resp.Extra))
+
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
+
+// fdjfdjkf
+const dbMiekENTNL = `; File written on Sat Apr  2 16:43:11 2016
+; dnssec_signzone version 9.10.3-P4-Ubuntu
+miek.nl.		1800	IN SOA	linode.atoom.net. miek.miek.nl. (
+					1282630057 ; serial
+					14400      ; refresh (4 hours)
+					3600       ; retry (1 hour)
+					604800     ; expire (1 week)
+					14400      ; minimum (4 hours)
+					)
+			1800	RRSIG	SOA 8 2 1800 (
+					20160502144311 20160402144311 12051 miek.nl.
+					KegoBxA3Tbrhlc4cEdkRiteIkOfsqD4oCLLM
+					ISJ5bChWy00LGHUlAnHVu5Ti96hUjVNmGSxa
+					xtGSuAAMFCr52W8pAB8LBIlu9B6QZUPHMccr
+					SuzxAX3ioawk2uTjm+k8AGPT4RoQdXemGLAp
+					zJTASolTVmeMTh5J0sZTZJrtvZ0= )
+			1800	NS	linode.atoom.net.
+			1800	RRSIG	NS 8 2 1800 (
+					20160502144311 20160402144311 12051 miek.nl.
+					m0cOHL6Rre/0jZPXe+0IUjs/8AFASRCvDbSx
+					ZQsRDSlZgS6RoMP3OC77cnrKDVlfZ2Vhq3Ce
+					nYPoGe0/atB92XXsilmstx4HTSU64gsV9iLN
+					Xkzk36617t7zGOl/qumqfaUXeA9tihItzEim
+					6SGnufVZI4o8xeyaVCNDDuN0bvY= )
+			14400	NSEC	a.miek.nl. NS SOA RRSIG NSEC DNSKEY
+			14400	RRSIG	NSEC 8 2 14400 (
+					20160502144311 20160402144311 12051 miek.nl.
+					BCWVgwxWrs4tBjS9QXKkftCUbiLi40NyH1yA
+					nbFy1wCKQ2jDH00810+ia4b66QrjlAKgxE9z
+					9U7MKSMV86sNkyAtlCi+2OnjtWF6sxPdJO7k
+					CHeg46XBjrQuiJRY8CneQX56+IEPdufLeqPR
+					l+ocBQ2UkGhXmQdWp3CFDn2/eqU= )
+			1800	DNSKEY	256 3 8 (
+					AwEAAcNEU67LJI5GEgF9QLNqLO1SMq1EdoQ6
+					E9f85ha0k0ewQGCblyW2836GiVsm6k8Kr5EC
+					IoMJ6fZWf3CQSQ9ycWfTyOHfmI3eQ/1Covhb
+					2y4bAmL/07PhrL7ozWBW3wBfM335Ft9xjtXH
+					Py7ztCbV9qZ4TVDTW/Iyg0PiwgoXVesz
+					) ; ZSK; alg = RSASHA256; key id = 12051
+			1800	DNSKEY	257 3 8 (
+					AwEAAcWdjBl4W4wh/hPxMDcBytmNCvEngIgB
+					9Ut3C2+QI0oVz78/WK9KPoQF7B74JQ/mjO4f
+					vIncBmPp6mFNxs9/WQX0IXf7oKviEVOXLjct
+					R4D1KQLX0wprvtUIsQFIGdXaO6suTT5eDbSd
+					6tTwu5xIkGkDmQhhH8OQydoEuCwV245ZwF/8
+					AIsqBYDNQtQ6zhd6jDC+uZJXg/9LuPOxFHbi
+					MTjp6j3CCW0kHbfM/YHZErWWtjPj3U3Z7knQ
+					SIm5PO5FRKBEYDdr5UxWJ/1/20SrzI3iztvP
+					wHDsA2rdHm/4YRzq7CvG4N0t9ac/T0a0Sxba
+					/BUX2UVPWaIVBdTRBtgHi0s=
+					) ; KSK; alg = RSASHA256; key id = 33694
+			1800	RRSIG	DNSKEY 8 2 1800 (
+					20160502144311 20160402144311 12051 miek.nl.
+					YNpi1jRDQKpnsQEjIjxqy+kJGaYnV16e8Iug
+					40c82y4pee7kIojFUllSKP44qiJpCArxF557
+					tfjfwBd6c4hkqCScGPZXJ06LMyG4u//rhVMh
+					4hyKcxzQFKxmrFlj3oQGksCI8lxGX6RxiZuR
+					qv2ol2lUWrqetpAL+Zzwt71884E= )
+			1800	RRSIG	DNSKEY 8 2 1800 (
+					20160502144311 20160402144311 33694 miek.nl.
+					jKpLDEeyadgM0wDgzEk6sBBdWr2/aCrkAOU/
+					w6dYIafN98f21oIYQfscV1gc7CTsA0vwzzUu
+					x0QgwxoNLMvSxxjOiW/2MzF8eozczImeCWbl
+					ad/pVCYH6Jn5UBrZ5RCWMVcs2RP5KDXWeXKs
+					jEN/0EmQg5qNd4zqtlPIQinA9I1HquJAnS56
+					pFvYyGIbZmGEbhR18sXVBeTWYr+zOMHn2quX
+					0kkrx2udz+sPg7i4yRsLdhw138gPRy1qvbaC
+					8ELs1xo1mC9pTlDOhz24Q3iXpVAU1lXLYOh9
+					nUP1/4UvZEYXHBUQk/XPRciojniWjAF825x3
+					QoSivMHblBwRdAKJSg== )
+a.miek.nl.		1800	IN A	127.0.0.1
+			1800	RRSIG	A 8 3 1800 (
+					20160502144311 20160402144311 12051 miek.nl.
+					lUOYdSxScjyYz+Ebc+nb6iTNgCohqj7K+Dat
+					97KE7haV2nP3LxdYuDCJYZpeyhsXDLHd4bFI
+					bInYPwJiC6DUCxPCuCWy0KYlZOWW8KCLX3Ia
+					BOPQbvIwLsJhnX+/tyMD9mXortoqATO79/6p
+					nNxvFeM8pFDwaih17fXMuFR/BsI= )
+			14400	NSEC	a.b.c.miek.nl. A RRSIG NSEC
+			14400	RRSIG	NSEC 8 3 14400 (
+					20160502144311 20160402144311 12051 miek.nl.
+					d5XZEy6SUp+TPRJQED+0R65zf2Yeo/1dlEA2
+					jYYvkXGSHXke4sg9nH8U3nr1rLcuqA1DsQgH
+					uMIjdENvXuZ+WCSwvIbhC+JEI6AyQ6Gfaf/D
+					I3mfu60C730IRByTrKM5C2rt11lwRQlbdaUY
+					h23/nn/q98ZKUlzqhAfkLI9pQPc= )
+a.b.c.miek.nl.		1800	IN A	127.0.0.1
+			1800	RRSIG	A 8 5 1800 (
+					20160502144311 20160402144311 12051 miek.nl.
+					FwgU5+fFD4hEebco3gvKQt3PXfY+dcOJr8dl
+					Ky4WLsONIdhP+4e9oprPisSLxImErY21BcrW
+					xzu1IZrYDsS8XBVV44lBx5WXEKvAOrUcut/S
+					OWhFZW7ncdIQCp32ZBIatiLRJEqXUjx+guHs
+					noFLiHix35wJWsRKwjGLIhH1fbs= )
+			14400	NSEC	miek.nl. A RRSIG NSEC
+			14400	RRSIG	NSEC 8 5 14400 (
+					20160502144311 20160402144311 12051 miek.nl.
+					lXgOqm9/jRRYvaG5jC1CDvTtGYxMroTzf4t4
+					jeYGb60+qI0q9sHQKfAJvoQ5o8o1qfR7OuiF
+					f544ipYT9eTcJRyGAOoJ37yMie7ZIoVJ91tB
+					r8YdzZ9Q6x3v1cbwTaQiacwhPZhGYOw63qIs
+					q5IQErIPos2sNk+y9D8BEce2DO4= )`
diff --git a/vendor/github.com/miekg/coredns/middleware/file/example_org.go b/vendor/github.com/miekg/coredns/middleware/file/example_org.go
new file mode 100644
index 0000000000..eba18e0e4d
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/example_org.go
@@ -0,0 +1,113 @@
+package file
+
+// exampleOrgSigned is a fake signed example.org zone with two delegations,
+// one signed (with DSs) and one "normal".
+const exampleOrgSigned = `
+example.org.		1800	IN SOA	a.iana-servers.net. devnull.example.org. (
+					1282630057 ; serial
+					14400      ; refresh (4 hours)
+					3600       ; retry (1 hour)
+					604800     ; expire (1 week)
+					14400      ; minimum (4 hours)
+					)
+			1800	RRSIG	SOA 13 2 1800 (
+					20161129153240 20161030153240 49035 example.org.
+					GVnMpFmN+6PDdgCtlYDEYBsnBNDgYmEJNvos
+					Bk9+PNTPNWNst+BXCpDadTeqRwrr1RHEAQ7j
+					YWzNwqn81pN+IA== )
+			1800	NS	a.iana-servers.net.
+			1800	NS	b.iana-servers.net.
+			1800	RRSIG	NS 13 2 1800 (
+					20161129153240 20161030153240 49035 example.org.
+					llrHoIuwjnbo28LOt4p5zWAs98XGqrXicKVI
+					Qxyaf/ORM8boJvW2XrKr3nj6Y8FKMhzd287D
+					5PBzVCL6MZyjQg== )
+			14400	NSEC	a.example.org. NS SOA RRSIG NSEC DNSKEY
+			14400	RRSIG	NSEC 13 2 14400 (
+					20161129153240 20161030153240 49035 example.org.
+					BQROf1swrmYi3GqpP5M/h5vTB8jmJ/RFnlaX
+					7fjxvV7aMvXCsr3ekWeB2S7L6wWFihDYcKJg
+					9BxVPqxzBKeaqg== )
+			1800	DNSKEY	256 3 13 (
+					UNTqlHbC51EbXuY0rshW19Iz8SkCuGVS+L0e
+					bQj53dvtNlaKfWmtTauC797FoyVLbQwoMy/P
+					G68SXgLCx8g+9g==
+					) ; ZSK; alg = ECDSAP256SHA256; key id = 49035
+			1800	RRSIG	DNSKEY 13 2 1800 (
+					20161129153240 20161030153240 49035 example.org.
+					LnLHyqYJaCMOt7EHB4GZxzAzWLwEGCTFiEhC
+					jj1X1VuQSjJcN42Zd3yF+jihSW6huknrig0Z
+					Mqv0FM6mJ/qPKg== )
+a.delegated.example.org. 1800	IN A	139.162.196.78
+			1800	TXT	"obscured"
+			1800	AAAA	2a01:7e00::f03c:91ff:fef1:6735
+archive.example.org.	1800	IN CNAME a.example.org.
+			1800	RRSIG	CNAME 13 3 1800 (
+					20161129153240 20161030153240 49035 example.org.
+					SDFW1z/PN9knzH8BwBvmWK0qdIwMVtGrMgRw
+					7lgy4utRrdrRdCSLZy3xpkmkh1wehuGc4R0S
+					05Z3DPhB0Fg5BA== )
+			14400	NSEC	delegated.example.org. CNAME RRSIG NSEC
+			14400	RRSIG	NSEC 13 3 14400 (
+					20161129153240 20161030153240 49035 example.org.
+					DQqLSVNl8F6v1K09wRU6/M6hbHy2VUddnOwn
+					JusJjMlrAOmoOctCZ/N/BwqCXXBA+d9yFGdH
+					knYumXp+BVPBAQ== )
+www.example.org.	1800	IN CNAME a.example.org.
+			1800	RRSIG	CNAME 13 3 1800 (
+					20161129153240 20161030153240 49035 example.org.
+					adzujOxCV0uBV4OayPGfR11iWBLiiSAnZB1R
+					slmhBFaDKOKSNYijGtiVPeaF+EuZs63pzd4y
+					6Nm2Iq9cQhAwAA== )
+			14400	NSEC	example.org. CNAME RRSIG NSEC
+			14400	RRSIG	NSEC 13 3 14400 (
+					20161129153240 20161030153240 49035 example.org.
+					jy3f96GZGBaRuQQjuqsoP1YN8ObZF37o+WkV
+					PL7TruzI7iNl0AjrUDy9FplP8Mqk/HWyvlPe
+					N3cU+W8NYlfDDQ== )
+a.example.org.		1800	IN A	139.162.196.78
+			1800	RRSIG	A 13 3 1800 (
+					20161129153240 20161030153240 49035 example.org.
+					41jFz0Dr8tZBN4Kv25S5dD4vTmviFiLx7xSA
+					qMIuLFm0qibKL07perKpxqgLqM0H1wreT4xz
+					I9Y4Dgp1nsOuMA== )
+			1800	AAAA	2a01:7e00::f03c:91ff:fef1:6735
+			1800	RRSIG	AAAA 13 3 1800 (
+					20161129153240 20161030153240 49035 example.org.
+					brHizDxYCxCHrSKIu+J+XQbodRcb7KNRdN4q
+					VOWw8wHqeBsFNRzvFF6jwPQYphGP7kZh1KAb
+					VuY5ZVVhM2kHjw== )
+			14400	NSEC	archive.example.org. A AAAA RRSIG NSEC
+			14400	RRSIG	NSEC 13 3 14400 (
+					20161129153240 20161030153240 49035 example.org.
+					zIenVlg5ScLr157EWigrTGUgrv7W/1s49Fic
+					i2k+OVjZfT50zw+q5X6DPKkzfAiUhIuqs53r
+					hZUzZwV/1Wew9Q== )
+delegated.example.org.	1800	IN NS	a.delegated.example.org.
+			1800	IN NS	ns-ext.nlnetlabs.nl.
+			1800	DS	10056 5 1 (
+					EE72CABD1927759CDDA92A10DBF431504B9E
+					1F13 )
+			1800	DS	10056 5 2 (
+					E4B05F87725FA86D9A64F1E53C3D0E625094
+					6599DFE639C45955B0ED416CDDFA )
+			1800	RRSIG	DS 13 3 1800 (
+					20161129153240 20161030153240 49035 example.org.
+					rlNNzcUmtbjLSl02ZzQGUbWX75yCUx0Mug1j
+					HtKVqRq1hpPE2S3863tIWSlz+W9wz4o19OI4
+					jbznKKqk+DGKog== )
+			14400	NSEC	sub.example.org. NS DS RRSIG NSEC
+			14400	RRSIG	NSEC 13 3 14400 (
+					20161129153240 20161030153240 49035 example.org.
+					lNQ5kRTB26yvZU5bFn84LYFCjwWTmBcRCDbD
+					cqWZvCSw4LFOcqbz1/wJKIRjIXIqnWIrfIHe
+					fZ9QD5xZsrPgUQ== )
+sub.example.org.	1800	IN NS	sub1.example.net.
+			1800	IN NS	sub2.example.net.
+			14400	NSEC	www.example.org. NS RRSIG NSEC
+			14400	RRSIG	NSEC 13 3 14400 (
+					20161129153240 20161030153240 49035 example.org.
+					VYjahdV+TTkA3RBdnUI0hwXDm6U5k/weeZZr
+					ix1znORpOELbeLBMJW56cnaG+LGwOQfw9qqj
+					bOuULDst84s4+g== )
+`
diff --git a/vendor/github.com/miekg/coredns/middleware/file/file.go b/vendor/github.com/miekg/coredns/middleware/file/file.go
new file mode 100644
index 0000000000..b07ec9cfdd
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/file.go
@@ -0,0 +1,125 @@
+// Package file implements a file backend.
+package file
+
+import (
+	"errors"
+	"io"
+	"log"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+type (
+	// File is the middleware that reads zone data from disk.
+	File struct {
+		Next  middleware.Handler
+		Zones Zones
+	}
+
+	// Zones maps zone names to a *Zone.
+	Zones struct {
+		Z     map[string]*Zone // A map mapping zone (origin) to the Zone's data
+		Names []string         // All the keys from the map Z as a string slice.
+	}
+)
+
+// ServeDNS implements the middleware.Handle interface.
+func (f File) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	state := request.Request{W: w, Req: r}
+
+	if state.QClass() != dns.ClassINET {
+		return dns.RcodeServerFailure, middleware.Error(f.Name(), errors.New("can only deal with ClassINET"))
+	}
+	qname := state.Name()
+	// TODO(miek): match the qname better in the map
+	zone := middleware.Zones(f.Zones.Names).Matches(qname)
+	if zone == "" {
+		return middleware.NextOrFailure(f.Name(), f.Next, ctx, w, r)
+	}
+
+	z, ok := f.Zones.Z[zone]
+	if !ok || z == nil {
+		return dns.RcodeServerFailure, nil
+	}
+
+	// This is only for when we are a secondary zones.
+	if r.Opcode == dns.OpcodeNotify {
+		if z.isNotify(state) {
+			m := new(dns.Msg)
+			m.SetReply(r)
+			m.Authoritative, m.RecursionAvailable, m.Compress = true, true, true
+			state.SizeAndDo(m)
+			w.WriteMsg(m)
+
+			log.Printf("[INFO] Notify from %s for %s: checking transfer", state.IP(), zone)
+			ok, err := z.shouldTransfer()
+			if ok {
+				z.TransferIn()
+			} else {
+				log.Printf("[INFO] Notify from %s for %s: no serial increase seen", state.IP(), zone)
+			}
+			if err != nil {
+				log.Printf("[WARNING] Notify from %s for %s: failed primary check: %s", state.IP(), zone, err)
+			}
+			return dns.RcodeSuccess, nil
+		}
+		log.Printf("[INFO] Dropping notify from %s for %s", state.IP(), zone)
+		return dns.RcodeSuccess, nil
+	}
+
+	if z.Expired != nil && *z.Expired {
+		log.Printf("[ERROR] Zone %s is expired", zone)
+		return dns.RcodeServerFailure, nil
+	}
+
+	if state.QType() == dns.TypeAXFR || state.QType() == dns.TypeIXFR {
+		xfr := Xfr{z}
+		return xfr.ServeDNS(ctx, w, r)
+	}
+
+	answer, ns, extra, result := z.Lookup(state, qname)
+
+	m := new(dns.Msg)
+	m.SetReply(r)
+	m.Authoritative, m.RecursionAvailable, m.Compress = true, true, true
+	m.Answer, m.Ns, m.Extra = answer, ns, extra
+
+	switch result {
+	case Success:
+	case NoData:
+	case NameError:
+		m.Rcode = dns.RcodeNameError
+	case Delegation:
+		m.Authoritative = false
+	case ServerFailure:
+		return dns.RcodeServerFailure, nil
+	}
+
+	state.SizeAndDo(m)
+	m, _ = state.Scrub(m)
+	w.WriteMsg(m)
+	return dns.RcodeSuccess, nil
+}
+
+// Name implements the Handler interface.
+func (f File) Name() string { return "file" }
+
+// Parse parses the zone in filename and returns a new Zone or an error.
+func Parse(f io.Reader, origin, fileName string) (*Zone, error) {
+	tokens := dns.ParseZone(f, dns.Fqdn(origin), fileName)
+	z := NewZone(origin, fileName)
+	for x := range tokens {
+		if x.Error != nil {
+			log.Printf("[ERROR] Failed to parse `%s': %v", origin, x.Error)
+			return nil, x.Error
+		}
+		if err := z.Insert(x.RR); err != nil {
+			return nil, err
+		}
+	}
+	return z, nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/file/file_test.go b/vendor/github.com/miekg/coredns/middleware/file/file_test.go
new file mode 100644
index 0000000000..7688179005
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/file_test.go
@@ -0,0 +1,12 @@
+package file
+
+import (
+	"strings"
+	"testing"
+)
+
+func BenchmarkParseInsert(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		Parse(strings.NewReader(dbMiekENTNL), testzone, "stdin")
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/file/glue_test.go b/vendor/github.com/miekg/coredns/middleware/file/glue_test.go
new file mode 100644
index 0000000000..289c30428f
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/glue_test.go
@@ -0,0 +1,272 @@
+package file
+
+import (
+	"sort"
+	"strings"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+// another personal zone (helps in testing as my secondary is NSD
+// atoom = atom in English.
+var atoomTestCases = []test.Case{
+	{
+		Qname: atoom, Qtype: dns.TypeNS, Do: true,
+		Answer: []dns.RR{
+			test.NS("atoom.net.		1800	IN	NS	linode.atoom.net."),
+			test.NS("atoom.net.		1800	IN	NS	ns-ext.nlnetlabs.nl."),
+			test.NS("atoom.net.		1800	IN	NS	omval.tednet.nl."),
+			test.RRSIG("atoom.net.		1800	IN	RRSIG	NS 8 2 1800 20170112031301 20161213031301 53289 atoom.net. DLe+G1 jlw="),
+		},
+		Extra: []dns.RR{
+			test.OPT(4096, true),
+			test.A("linode.atoom.net.	1800	IN	A	176.58.119.54"),
+			test.AAAA("linode.atoom.net.	1800	IN	AAAA	2a01:7e00::f03c:91ff:fe79:234c"),
+			test.RRSIG("linode.atoom.net.	1800	IN	RRSIG	A 8 3 1800 20170112031301 20161213031301 53289 atoom.net. Z4Ka4OLDoyxj72CL vkI="),
+			test.RRSIG("linode.atoom.net.	1800	IN	RRSIG	AAAA 8 3 1800 20170112031301 20161213031301 53289 atoom.net. l+9Qc914zFH/okG2fzJ1q olQ="),
+		},
+	},
+}
+
+func TestLookupGlue(t *testing.T) {
+	zone, err := Parse(strings.NewReader(dbAtoomNetSigned), atoom, "stdin")
+	if err != nil {
+		t.Fatalf("Expected no error when reading zone, got %q", err)
+	}
+
+	fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{atoom: zone}, Names: []string{atoom}}}
+	ctx := context.TODO()
+
+	for _, tc := range atoomTestCases {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		_, err := fm.ServeDNS(ctx, rec, m)
+		if err != nil {
+			t.Errorf("Expected no error, got %v\n", err)
+			return
+		}
+
+		resp := rec.Msg
+		sort.Sort(test.RRSet(resp.Answer))
+		sort.Sort(test.RRSet(resp.Ns))
+		sort.Sort(test.RRSet(resp.Extra))
+
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
+
+const dbAtoomNetSigned = `
+; File written on Tue Dec 13 04:13:01 2016
+; dnssec_signzone version 9.10.3-P4-Debian
+atoom.net.		1800	IN SOA	linode.atoom.net. miek.miek.nl. (
+					1481602381 ; serial
+					14400      ; refresh (4 hours)
+					3600       ; retry (1 hour)
+					604800     ; expire (1 week)
+					14400      ; minimum (4 hours)
+					)
+			1800	RRSIG	SOA 8 2 1800 (
+					20170112031301 20161213031301 53289 atoom.net.
+					GZ30uFuGATKzwHXgpEwK70qjdXSAqmbB5d4z
+					e7WTibvJDPLa1ptZBI7Zuod2KMOkT1ocSvhL
+					U7makhdv0BQx+5RSaP25mAmPIzfU7/T7R+DJ
+					5q1GLlDSvOprfyMUlwOgZKZinesSdUa9gRmu
+					8E+XnPNJ/jcTrGzzaDjn1/irrM0= )
+			1800	NS	omval.tednet.nl.
+			1800	NS	linode.atoom.net.
+			1800	NS	ns-ext.nlnetlabs.nl.
+			1800	RRSIG	NS 8 2 1800 (
+					20170112031301 20161213031301 53289 atoom.net.
+					D8Sd9JpXIOxOrUF5Hi1ASutyQwP7JNu8XZxA
+					rse86A6L01O8H8sCNib2VEoJjHuZ/dDEogng
+					OgmfqeFy04cpSX19GAk3bkx8Lr6aEat3nqIC
+					XA/xsCCfXy0NKZpI05zntHPbbP5tF/NvpE7n
+					0+oLtlHSPEg1ZnEgwNoLe+G1jlw= )
+			1800	A	176.58.119.54
+			1800	RRSIG	A 8 2 1800 (
+					20170112031301 20161213031301 53289 atoom.net.
+					mrjiUFNCqDgCW8TuhjzcMh0V841uC224QvwH
+					0+OvYhcve9twbX3Y12PSFmz77Xz3Jg9WAj4I
+					qhh3iHUac4dzUXyC702DT62yMF/9CMUO0+Ee
+					b6wRtvPHr2Tt0i/xV/BTbArInIvurXJrvKvo
+					LsZHOfsg7dZs6Mvdpe/CgwRExpk= )
+			1800	AAAA	2a01:7e00::f03c:91ff:fe79:234c
+			1800	RRSIG	AAAA 8 2 1800 (
+					20170112031301 20161213031301 53289 atoom.net.
+					EkMxX2vUaP4h0qbWlHaT4yNhm8MrPMZTn/3R
+					zNw+i3oF2cLMWKh6GCfuIX/x5ID706o8kfum
+					bxTYwuTe1LJ+GoZHWEiH8VCa1laTlh8l3qSi
+					PZKU8339rr5cCYluk6p9PbAuRkYYOEruNg42
+					wPOx46dsAlvp2XpOaOeJtU64QGQ= )
+			14400	NSEC	deb.atoom.net. A NS SOA AAAA RRSIG NSEC DNSKEY
+			14400	RRSIG	NSEC 8 2 14400 (
+					20170112031301 20161213031301 53289 atoom.net.
+					P7Stx7lqRKl8tbTAAaJ0W6UhgJwZz3cjpM8z
+					eplbhXEVohKtyJ9xgptKt1vreH6lkhzciar5
+					EB9Nj0VOmcthiht/+As8aEKmf8UlcJ2EbLII
+					NT7NUaasxsrLE2rjjX5mEtzOZ1uQAGiU8Hnk
+					XdGweTgIVFuiCcMCgaKpC2TRrMw= )
+			1800	DNSKEY	256 3 8 (
+					AwEAAeDZTH9YT9qLMPlq4VrxX7H3GbWcqCrC
+					tXc9RT/hf96GN+ttnnEQVaJY8Gbly3IZpYQW
+					MwaCi0t30UULXE3s9FUQtl4AMbplyiz9EF8L
+					/XoBS1yhGm5WV5u608ihoPaRkYNyVV3egb5Y
+					hA5EXWy2vfsa1XWPpxvSAhlqM0YENtP3
+					) ; ZSK; alg = RSASHA256; key id = 53289
+			1800	DNSKEY	257 3 8 (
+					AwEAAepN7Vo8enDCruVduVlGxTDIv7QG0wJQ
+					fTL1hMy4k0Yf/7dXzrn5bZT4ytBvH1hoBImH
+					mtTrQo6DQlBBVXDJXTyQjQozaHpN1HhTJJTz
+					IXl8UrdbkLWvz6QSeJPmBBYQRAqylUA2KE29
+					nxyiNboheDLiIWyQ7Q/Op7lYaKMdb555kQAs
+					b/XT4Tb3/3BhAjcofNofNBjDjPq2i8pAo8HU
+					5mW5/Pl+ZT/S0aqQPnCkHk/iofSRu3ZdBzkH
+					54eoC+BdyXb7gTbPGRr+1gMbf/rzhRiZ4vnX
+					NoEzGAXmorKzJHANNb6KQ/932V9UDHm9wbln
+					6y3s7IBvsMX5KF8vo81Stkc=
+					) ; KSK; alg = RSASHA256; key id = 19114
+			1800	RRSIG	DNSKEY 8 2 1800 (
+					20170112031301 20161213031301 19114 atoom.net.
+					IEjViubKdef8RWB5bcnirqVcqDk16irkywJZ
+					sBjMyNs03/a+sl0UHEGAB7qCC+Rn+RDaM5It
+					WF+Gha6BwRIN9NuSg3BwB2h1nJtHw61pMVU9
+					2j9Q3pq7X1xoTBAcwY95t5a1xlw0iTCaLu1L
+					Iu/PbVp1gj1o8BF/PiYilvZJGUjaTgsi+YNi
+					2kiWpp6afO78/W4nfVx+lQBmpyfX1lwL5PEC
+					9f5PMbzRmOapvUBc2XdddGywLdmlNsLHimGV
+					t7kkHZHOWQR1TvvMbU3dsC0bFCrBVGDhEuxC
+					hATR+X5YV0AyDSyrew7fOGJKrapwMWS3yRLr
+					FAt0Vcxno5lwQImbCQ== )
+			1800	RRSIG	DNSKEY 8 2 1800 (
+					20170112031301 20161213031301 53289 atoom.net.
+					sSxdgPT+gFZPN0ot6lZRGqOwvONUEsg0uEbf
+					kh19JlWHu/qvq5HOOK2VOW/UnswpVmtpFk0W
+					z/jiCNHifjpCCVn5tfCMZDLGekmPOjdobw24
+					swBuGjnn0NHvxHoN6S+mb+AR6V/dLjquNUda
+					yzBc2Ua+XtQ7SCLKIvEhcNg9H3o= )
+deb.atoom.net.		1800	IN A	176.58.119.54
+			1800	RRSIG	A 8 3 1800 (
+					20170112031301 20161213031301 53289 atoom.net.
+					ZW7jm/VDa/I9DxWlE7Cm+HHymiVv4Wk5UGYI
+					Uf/g0EfxLCBR6SwL5QKuV1z7xoWKaiNqqrmc
+					gg35xgskKyS8QHgCCODhDzcIKe+MSsBXbY04
+					AtrC5dV3JJQoA65Ng/48hwcyghAjXKrA2Yyq
+					GXf2DSvWeIV9Jmk0CsOELP24dpk= )
+			1800	TXT	"v=spf1 a ip6:2a01:7e00::f03c:91ff:fe79:234c ~all"
+			1800	RRSIG	TXT 8 3 1800 (
+					20170112031301 20161213031301 53289 atoom.net.
+					fpvVJ+Z6tzSd9yETn/PhLSCRISwRD1c3ET80
+					8twnx3XfAPQfV2R8dw7pz8Vw4TSxvf19bAZc
+					PWRjW682gb7gAxoJshCXBYabMfqExrBc9V1S
+					ezwm3D93xNMyegxzHx2b/H8qp3ZWdsMLTvvN
+					Azu7P4iyO+WRWT0R7bJGrdTwRz8= )
+			1800	AAAA	2a01:7e00::f03c:91ff:fe79:234c
+			1800	RRSIG	AAAA 8 3 1800 (
+					20170112031301 20161213031301 53289 atoom.net.
+					aaPF6NqXfWamzi+xUDVeYa7StJUVM1tDsL34
+					w5uozFRZ0f4K/Z88Kk5CgztxmtpNNKGdLWa0
+					iryUJsbVWAbSQfrZNkNckBtczMNxGgjqn97A
+					2//F6ajH/qrR3dWcCm+VJMgu3UPqAxLiCaYO
+					GQUx6Y8JA1VIM/RJAM6BhgNxjD0= )
+			14400	NSEC	lafhart.atoom.net. A TXT AAAA RRSIG NSEC
+			14400	RRSIG	NSEC 8 3 14400 (
+					20170112031301 20161213031301 53289 atoom.net.
+					1Llad64NDWcz8CyBu2TsyANrJ9Tpfm5257sY
+					FPYF579p3c9Imwp9kYEO1zMEKgNoXBN/sQnd
+					YCugq3r2GAI6bfJj8sV5bt6GKuZcGHMESug4
+					uh2gU0NDcCA4GPdBYGdusePwV0RNpcRnVCFA
+					fsACp+22j3uwRUbCh0re0ufbAs4= )
+lafhart.atoom.net.	1800	IN A	178.79.160.171
+			1800	RRSIG	A 8 3 1800 (
+					20170112031301 20161213031301 53289 atoom.net.
+					fruP6cvMVICXEV8NcheS73NWLCEKlO1FgW6B
+					35D2GhtfYZe+M23V5YBRtlVCCrAdS0etdCOf
+					xH9yt3u2kVvDXuMRiQr1zJPRDEq3cScYumpd
+					bOO8cjHiCic5lEcRVWNNHXyGtpqTvrp9CxOu
+					IQw1WgAlZyKj43zGg3WZi6OTKLg= )
+			14400	NSEC	linode.atoom.net. A RRSIG NSEC
+			14400	RRSIG	NSEC 8 3 14400 (
+					20170112031301 20161213031301 53289 atoom.net.
+					2AUWXbScL0jIJ7G6UsJAlUs+bgSprZ1zY6v/
+					iVB5BAYwZD6pPky7LZdzvPEHh0aNLGIFbbU8
+					SDJI7u/e4RUTlE+8yyjl6obZNfNKyJFqE5xN
+					1BJ8sjFrVn6KaHIDKEOZunNb1MlMfCRkLg9O
+					94zg04XEgVUfaYCPxvLs3fCEgzw= )
+voordeur.atoom.net.	1800	IN A	77.249.87.46
+			1800	RRSIG	A 8 3 1800 (
+					20170112031301 20161213031301 53289 atoom.net.
+					SzJz0NaKLRA/lW4CxgMHgeuQLp5QqFEjQv3I
+					zfPtY4joQsZn8RN8RLECcpcPKjbC8Dj6mxIJ
+					dd2vwhsCVlZKMNcZUOfpB7eGx1TR9HnzMkY9
+					OdTt30a9+tktagrJEoy31vAhj1hJqLbSgvOa
+					pRr1P4ZpQ53/qH8JX/LOmqfWTdg= )
+			14400	NSEC	www.atoom.net. A RRSIG NSEC
+			14400	RRSIG	NSEC 8 3 14400 (
+					20170112031301 20161213031301 53289 atoom.net.
+					CETJhUJy1rKjVj9wsW1549gth+/Z37//BI6S
+					nxJ+2Oq63jEjlbznmyo5hvFW54DbVUod+cLo
+					N9PdlNQDr1XsRBgWhkKW37RkuoRVEPwqRykv
+					xzn9i7CgYKAAHFyWMGihBLkV9ByPp8GDR8Zr
+					DEkrG3ErDlBcwi3FqGZFsSOW2xg= )
+www.atoom.net.		1800	IN CNAME deb.atoom.net.
+			1800	RRSIG	CNAME 8 3 1800 (
+					20170112031301 20161213031301 53289 atoom.net.
+					1lhG6iTtbeesBCVOrA8a7+V2gogCuXzKgSi8
+					6K0Pzq2CwqTScdNcZvcDOIbLq45Am5p09PIj
+					lXnd2fw6WAxphwvRhmwCve3uTZMUt5STw7oi
+					0rED7GMuFUSC/BX0XVly7NET3ECa1vaK6RhO
+					hDSsKPWFI7to4d1z6tQ9j9Kvm4Y= )
+			14400	NSEC	atoom.net. CNAME RRSIG NSEC
+			14400	RRSIG	NSEC 8 3 14400 (
+					20170112031301 20161213031301 53289 atoom.net.
+					CC4yCYP1q75/gTmPz+mVM6Lam2foPP5oTccY
+					RtROuTkgbt8DtAoPe304vmNazWBlGidnWJeD
+					YyAAe3znIHP0CgrxjD/hRL9FUzMnVrvB3mnx
+					4W13wP1rE97RqJxV1kk22Wl3uCkVGy7LCjb0
+					JLFvzCe2fuMe7YcTzI+t1rioTP0= )
+linode.atoom.net.	1800	IN A	176.58.119.54
+			1800	RRSIG	A 8 3 1800 (
+					20170112031301 20161213031301 53289 atoom.net.
+					Z4Ka4OLDha4eQNWs3GtUd1Cumr48RUnH523I
+					nZzGXtpQNou70qsm5Jt8n/HmsZ4L5DoxomRz
+					rgZTGnrqj43+A16UUGfVEk6SfUUHOgxgspQW
+					zoaqk5/5mQO1ROsLKY8RqaRqzvbToHvqeZEh
+					VkTPVA02JK9UFlKqoyxj72CLvkI= )
+			1800	AAAA	2a01:7e00::f03c:91ff:fe79:234c
+			1800	RRSIG	AAAA 8 3 1800 (
+					20170112031301 20161213031301 53289 atoom.net.
+					l+9Qce/EQyKrTJVKLv7iatjuCO285ckd5Oie
+					P2LzWVsL4tW04oHzieKZwIuNBRE+px8g5qrT
+					LIK2TikCGL1xHAd7CT7gbCtDcZ7jHmSTmMTJ
+					405nOV3G3xWelreLI5Fn5ck8noEsF64kiw1y
+					XfkyQn2B914zFH/okG2fzJ1qolQ= )
+			14400	NSEC	voordeur.atoom.net. A AAAA RRSIG NSEC
+			14400	RRSIG	NSEC 8 3 14400 (
+					20170112031301 20161213031301 53289 atoom.net.
+					Owzmz7QrVL2Gw2njEsUVEknMl2amx1HG9X3K
+					tO+Ihyy4tApiUFxUjAu3P/30QdqbB85h7s//
+					ipwX/AmQJNoxTScR3nHt9qDqJ044DPmiuh0l
+					NuIjguyZRANApmKCTA6AoxXIUqToIIjfVzi/
+					PxXE6T3YIPlK7Bxgv1lcCBJ1fmE= )`
+
+const atoom = "atoom.net."
diff --git a/vendor/github.com/miekg/coredns/middleware/file/lookup.go b/vendor/github.com/miekg/coredns/middleware/file/lookup.go
new file mode 100644
index 0000000000..94ec0e726d
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/lookup.go
@@ -0,0 +1,438 @@
+package file
+
+import (
+	"github.com/coredns/coredns/middleware/file/tree"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+// Result is the result of a Lookup
+type Result int
+
+const (
+	// Success is a successful lookup.
+	Success Result = iota
+	// NameError indicates a nameerror
+	NameError
+	// Delegation indicates the lookup resulted in a delegation.
+	Delegation
+	// NoData indicates the lookup resulted in a NODATA.
+	NoData
+	// ServerFailure indicates a server failure during the lookup.
+	ServerFailure
+)
+
+// Lookup looks up qname and qtype in the zone. When do is true DNSSEC records are included.
+// Three sets of records are returned, one for the answer, one for authority  and one for the additional section.
+func (z *Zone) Lookup(state request.Request, qname string) ([]dns.RR, []dns.RR, []dns.RR, Result) {
+
+	qtype := state.QType()
+	do := state.Do()
+
+	if !z.NoReload {
+		z.reloadMu.RLock()
+	}
+	defer func() {
+		if !z.NoReload {
+			z.reloadMu.RUnlock()
+		}
+	}()
+
+	if qtype == dns.TypeSOA {
+		return z.soa(do), z.ns(do), nil, Success
+	}
+	if qtype == dns.TypeNS && qname == z.origin {
+		nsrrs := z.ns(do)
+		glue := z.Glue(nsrrs, do)
+		return nsrrs, nil, glue, Success
+	}
+
+	var (
+		found, shot    bool
+		parts          string
+		i              int
+		elem, wildElem *tree.Elem
+	)
+
+	// Lookup:
+	// * Per label from the right, look if it exists. We do this to find potential
+	//   delegation records.
+	// * If the per-label search finds nothing, we will look for the wildcard at the
+	//   level. If found we keep it around. If we don't find the complete name we will
+	//   use the wildcard.
+	//
+	// Main for-loop handles delegation and finding or not finding the qname.
+	// If found we check if it is a CNAME and do CNAME processing (DNAME should be added as well)
+	// We also check if we have type and do a nodata resposne.
+	//
+	// If not found, we check the potential wildcard, and use that for further processing.
+	// If not found and no wildcard we will process this as an NXDOMAIN response.
+	//
+	for {
+		parts, shot = z.nameFromRight(qname, i)
+		// We overshot the name, break and check if we previously found something.
+		if shot {
+			break
+		}
+
+		elem, found = z.Tree.Search(parts)
+		if !found {
+			// Apex will always be found, when we are here we can search for a wildcard
+			// and save the result of that search. So when nothing match, but we have a
+			// wildcard we should expand the wildcard. There can only be one wildcard,
+			// so when we found one, we won't look for another.
+
+			if wildElem == nil {
+				wildcard := replaceWithAsteriskLabel(parts)
+				wildElem, _ = z.Tree.Search(wildcard)
+			}
+
+			// Keep on searching, because maybe we hit an empty-non-terminal (which aren't
+			// stored in the tree. Only when we have match the full qname (and possible wildcard
+			// we can be confident that we didn't find anything.
+			i++
+			continue
+		}
+
+		// If we see NS records, it means the name as been delegated, and we should return the delegation.
+		if nsrrs := elem.Types(dns.TypeNS); nsrrs != nil {
+			glue := z.Glue(nsrrs, do)
+			// If qtype == NS, we should returns success to put RRs in answer.
+			if qtype == dns.TypeNS {
+				return nsrrs, nil, glue, Success
+			}
+
+			if do {
+				dss := z.typeFromElem(elem, dns.TypeDS, do)
+				nsrrs = append(nsrrs, dss...)
+			}
+
+			return nil, nsrrs, glue, Delegation
+		}
+
+		i++
+	}
+
+	// What does found and !shot mean - do we ever hit it?
+	if found && !shot {
+		return nil, nil, nil, ServerFailure
+	}
+
+	// Found entire name.
+	if found && shot {
+
+		// DNAME...?
+		if rrs := elem.Types(dns.TypeCNAME); len(rrs) > 0 && qtype != dns.TypeCNAME {
+			return z.searchCNAME(state, elem, rrs)
+		}
+
+		rrs := elem.Types(qtype, qname)
+
+		// NODATA
+		if len(rrs) == 0 {
+			ret := z.soa(do)
+			if do {
+				nsec := z.typeFromElem(elem, dns.TypeNSEC, do)
+				ret = append(ret, nsec...)
+			}
+			return nil, ret, nil, NoData
+		}
+
+		// Additional section processing for MX, SRV. Check response and see if any of the names are in baliwick -
+		// if so add IP addresses to the additional section.
+		additional := additionalProcessing(z, rrs, do)
+
+		if do {
+			sigs := elem.Types(dns.TypeRRSIG)
+			sigs = signatureForSubType(sigs, qtype)
+			rrs = append(rrs, sigs...)
+		}
+
+		return rrs, z.ns(do), additional, Success
+
+	}
+
+	// Haven't found the original name.
+
+	// Found wildcard.
+	if wildElem != nil {
+		auth := z.ns(do)
+
+		if rrs := wildElem.Types(dns.TypeCNAME, qname); len(rrs) > 0 {
+			return z.searchCNAME(state, wildElem, rrs)
+		}
+
+		rrs := wildElem.Types(qtype, qname)
+
+		// NODATA response.
+		if len(rrs) == 0 {
+			ret := z.soa(do)
+			if do {
+				nsec := z.typeFromElem(wildElem, dns.TypeNSEC, do)
+				ret = append(ret, nsec...)
+			}
+			return nil, ret, nil, Success
+		}
+
+		if do {
+			// An NSEC is needed to say no longer name exists under this wildcard.
+			if deny, found := z.Tree.Prev(qname); found {
+				nsec := z.typeFromElem(deny, dns.TypeNSEC, do)
+				auth = append(auth, nsec...)
+			}
+
+			sigs := wildElem.Types(dns.TypeRRSIG, qname)
+			sigs = signatureForSubType(sigs, qtype)
+			rrs = append(rrs, sigs...)
+
+		}
+		return rrs, auth, nil, Success
+	}
+
+	rcode := NameError
+
+	// Hacky way to get around empty-non-terminals. If a longer name does exist, but this qname, does not, it
+	// must be an empty-non-terminal. If so, we do the proper NXDOMAIN handling, but set the rcode to be success.
+	if x, found := z.Tree.Next(qname); found {
+		if dns.IsSubDomain(qname, x.Name()) {
+			rcode = Success
+		}
+	}
+
+	ret := z.soa(do)
+	if do {
+		deny, found := z.Tree.Prev(qname)
+		nsec := z.typeFromElem(deny, dns.TypeNSEC, do)
+		ret = append(ret, nsec...)
+
+		if rcode != NameError {
+			goto Out
+		}
+
+		ce, found := z.ClosestEncloser(qname)
+
+		// wildcard denial only for NXDOMAIN
+		if found {
+			// wildcard denial
+			wildcard := "*." + ce.Name()
+			if ss, found := z.Tree.Prev(wildcard); found {
+				// Only add this nsec if it is different than the one already added
+				if ss.Name() != deny.Name() {
+					nsec := z.typeFromElem(ss, dns.TypeNSEC, do)
+					ret = append(ret, nsec...)
+				}
+			}
+		}
+
+	}
+Out:
+	return nil, ret, nil, rcode
+}
+
+// Return type tp from e and add signatures (if they exists) and do is true.
+func (z *Zone) typeFromElem(elem *tree.Elem, tp uint16, do bool) []dns.RR {
+	rrs := elem.Types(tp)
+	if do {
+		sigs := elem.Types(dns.TypeRRSIG)
+		sigs = signatureForSubType(sigs, tp)
+		if len(sigs) > 0 {
+			rrs = append(rrs, sigs...)
+		}
+	}
+	return rrs
+}
+
+func (z *Zone) soa(do bool) []dns.RR {
+	if do {
+		ret := append([]dns.RR{z.Apex.SOA}, z.Apex.SIGSOA...)
+		return ret
+	}
+	return []dns.RR{z.Apex.SOA}
+}
+
+func (z *Zone) ns(do bool) []dns.RR {
+	if do {
+		ret := append(z.Apex.NS, z.Apex.SIGNS...)
+		return ret
+	}
+	return z.Apex.NS
+}
+
+// TODO(miek): should be better named, like aditionalProcessing?
+func (z *Zone) searchCNAME(state request.Request, elem *tree.Elem, rrs []dns.RR) ([]dns.RR, []dns.RR, []dns.RR, Result) {
+
+	qtype := state.QType()
+	do := state.Do()
+
+	if do {
+		sigs := elem.Types(dns.TypeRRSIG)
+		sigs = signatureForSubType(sigs, dns.TypeCNAME)
+		if len(sigs) > 0 {
+			rrs = append(rrs, sigs...)
+		}
+	}
+
+	targetName := rrs[0].(*dns.CNAME).Target
+	elem, _ = z.Tree.Search(targetName)
+	if elem == nil {
+		if !dns.IsSubDomain(z.origin, targetName) {
+			rrs = append(rrs, z.externalLookup(state, targetName, qtype)...)
+		}
+		return rrs, z.ns(do), nil, Success
+	}
+
+	i := 0
+
+Redo:
+	cname := elem.Types(dns.TypeCNAME)
+	if len(cname) > 0 {
+		rrs = append(rrs, cname...)
+
+		if do {
+			sigs := elem.Types(dns.TypeRRSIG)
+			sigs = signatureForSubType(sigs, dns.TypeCNAME)
+			if len(sigs) > 0 {
+				rrs = append(rrs, sigs...)
+			}
+		}
+		targetName := cname[0].(*dns.CNAME).Target
+		elem, _ = z.Tree.Search(targetName)
+		if elem == nil {
+			if !dns.IsSubDomain(z.origin, targetName) {
+				if !dns.IsSubDomain(z.origin, targetName) {
+					rrs = append(rrs, z.externalLookup(state, targetName, qtype)...)
+				}
+			}
+			return rrs, z.ns(do), nil, Success
+		}
+
+		i++
+		if i > maxChain {
+			return rrs, z.ns(do), nil, Success
+		}
+
+		goto Redo
+	}
+
+	targets := cnameForType(elem.All(), qtype)
+	if len(targets) > 0 {
+		rrs = append(rrs, targets...)
+
+		if do {
+			sigs := elem.Types(dns.TypeRRSIG)
+			sigs = signatureForSubType(sigs, qtype)
+			if len(sigs) > 0 {
+				rrs = append(rrs, sigs...)
+			}
+		}
+	}
+
+	return rrs, z.ns(do), nil, Success
+}
+
+func cnameForType(targets []dns.RR, origQtype uint16) []dns.RR {
+	ret := []dns.RR{}
+	for _, target := range targets {
+		if target.Header().Rrtype == origQtype {
+			ret = append(ret, target)
+		}
+	}
+	return ret
+}
+
+func (z *Zone) externalLookup(state request.Request, target string, qtype uint16) []dns.RR {
+	m, e := z.Proxy.Lookup(state, target, qtype)
+	if e != nil {
+		// TODO(miek): debugMsg for this as well? Log?
+		return nil
+	}
+	return m.Answer
+}
+
+// signatureForSubType range through the signature and return the correct ones for the subtype.
+func signatureForSubType(rrs []dns.RR, subtype uint16) []dns.RR {
+	sigs := []dns.RR{}
+	for _, sig := range rrs {
+		if s, ok := sig.(*dns.RRSIG); ok {
+			if s.TypeCovered == subtype {
+				sigs = append(sigs, s)
+			}
+		}
+	}
+	return sigs
+}
+
+// Glue returns any potential glue records for nsrrs.
+func (z *Zone) Glue(nsrrs []dns.RR, do bool) []dns.RR {
+	glue := []dns.RR{}
+	for _, rr := range nsrrs {
+		if ns, ok := rr.(*dns.NS); ok && dns.IsSubDomain(ns.Header().Name, ns.Ns) {
+			glue = append(glue, z.searchGlue(ns.Ns, do)...)
+		}
+	}
+	return glue
+}
+
+// searchGlue looks up A and AAAA for name.
+func (z *Zone) searchGlue(name string, do bool) []dns.RR {
+	glue := []dns.RR{}
+
+	// A
+	if elem, found := z.Tree.Search(name); found {
+		glue = append(glue, elem.Types(dns.TypeA)...)
+		if do {
+			sigs := elem.Types(dns.TypeRRSIG)
+			sigs = signatureForSubType(sigs, dns.TypeA)
+			glue = append(glue, sigs...)
+		}
+	}
+
+	// AAAA
+	if elem, found := z.Tree.Search(name); found {
+		glue = append(glue, elem.Types(dns.TypeAAAA)...)
+		if do {
+			sigs := elem.Types(dns.TypeRRSIG)
+			sigs = signatureForSubType(sigs, dns.TypeAAAA)
+			glue = append(glue, sigs...)
+		}
+	}
+	return glue
+}
+
+// additionalProcessing checks the current answer section and retrieves A or AAAA records
+// (and possible SIGs) to need to be put in the additional section.
+func additionalProcessing(z *Zone, answer []dns.RR, do bool) (extra []dns.RR) {
+	for _, rr := range answer {
+		name := ""
+		switch x := rr.(type) {
+		case *dns.SRV:
+			name = x.Target
+		case *dns.MX:
+			name = x.Mx
+		}
+		if !dns.IsSubDomain(z.origin, name) {
+			continue
+		}
+
+		elem, _ := z.Tree.Search(name)
+		if elem == nil {
+			continue
+		}
+
+		sigs := elem.Types(dns.TypeRRSIG)
+		for _, addr := range []uint16{dns.TypeA, dns.TypeAAAA} {
+			if a := elem.Types(addr); a != nil {
+				extra = append(extra, a...)
+				if do {
+					sig := signatureForSubType(sigs, addr)
+					extra = append(extra, sig...)
+				}
+			}
+		}
+	}
+
+	return extra
+}
+
+const maxChain = 8
diff --git a/vendor/github.com/miekg/coredns/middleware/file/lookup_test.go b/vendor/github.com/miekg/coredns/middleware/file/lookup_test.go
new file mode 100644
index 0000000000..51c057ffd8
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/lookup_test.go
@@ -0,0 +1,213 @@
+package file
+
+import (
+	"sort"
+	"strings"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+var dnsTestCases = []test.Case{
+	{
+		Qname: "www.miek.nl.", Qtype: dns.TypeA,
+		Answer: []dns.RR{
+			test.A("a.miek.nl.	1800	IN	A	139.162.196.78"),
+			test.CNAME("www.miek.nl.	1800	IN	CNAME	a.miek.nl."),
+		},
+		Ns: miekAuth,
+	},
+	{
+		Qname: "www.miek.nl.", Qtype: dns.TypeAAAA,
+		Answer: []dns.RR{
+			test.AAAA("a.miek.nl.	1800	IN	AAAA	2a01:7e00::f03c:91ff:fef1:6735"),
+			test.CNAME("www.miek.nl.	1800	IN	CNAME	a.miek.nl."),
+		},
+		Ns: miekAuth,
+	},
+	{
+		Qname: "miek.nl.", Qtype: dns.TypeSOA,
+		Answer: []dns.RR{
+			test.SOA("miek.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
+		},
+		Ns: miekAuth,
+	},
+	{
+		Qname: "miek.nl.", Qtype: dns.TypeAAAA,
+		Answer: []dns.RR{
+			test.AAAA("miek.nl.	1800	IN	AAAA	2a01:7e00::f03c:91ff:fef1:6735"),
+		},
+		Ns: miekAuth,
+	},
+	{
+		Qname: "mIeK.NL.", Qtype: dns.TypeAAAA,
+		Answer: []dns.RR{
+			test.AAAA("miek.nl.	1800	IN	AAAA	2a01:7e00::f03c:91ff:fef1:6735"),
+		},
+		Ns: miekAuth,
+	},
+	{
+		Qname: "miek.nl.", Qtype: dns.TypeMX,
+		Answer: []dns.RR{
+			test.MX("miek.nl.	1800	IN	MX	1 aspmx.l.google.com."),
+			test.MX("miek.nl.	1800	IN	MX	10 aspmx2.googlemail.com."),
+			test.MX("miek.nl.	1800	IN	MX	10 aspmx3.googlemail.com."),
+			test.MX("miek.nl.	1800	IN	MX	5 alt1.aspmx.l.google.com."),
+			test.MX("miek.nl.	1800	IN	MX	5 alt2.aspmx.l.google.com."),
+		},
+		Ns: miekAuth,
+	},
+	{
+		Qname: "a.miek.nl.", Qtype: dns.TypeSRV,
+		Ns: []dns.RR{
+			test.SOA("miek.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
+		},
+	},
+	{
+		Qname: "b.miek.nl.", Qtype: dns.TypeA,
+		Rcode: dns.RcodeNameError,
+		Ns: []dns.RR{
+			test.SOA("miek.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
+		},
+	},
+	{
+		Qname: "srv.miek.nl.", Qtype: dns.TypeSRV,
+		Answer: []dns.RR{
+			test.SRV("srv.miek.nl.	1800	IN	SRV	10 10 8080  a.miek.nl."),
+		},
+		Extra: []dns.RR{
+			test.A("a.miek.nl.	1800	IN	A       139.162.196.78"),
+			test.AAAA("a.miek.nl.	1800	IN	AAAA	2a01:7e00::f03c:91ff:fef1:6735"),
+		},
+		Ns: miekAuth,
+	},
+	{
+		Qname: "mx.miek.nl.", Qtype: dns.TypeMX,
+		Answer: []dns.RR{
+			test.MX("mx.miek.nl.	1800	IN	MX	10 a.miek.nl."),
+		},
+		Extra: []dns.RR{
+			test.A("a.miek.nl.	1800	IN	A       139.162.196.78"),
+			test.AAAA("a.miek.nl.	1800	IN	AAAA	2a01:7e00::f03c:91ff:fef1:6735"),
+		},
+		Ns: miekAuth,
+	},
+}
+
+const (
+	testzone  = "miek.nl."
+	testzone1 = "dnssex.nl."
+)
+
+func TestLookup(t *testing.T) {
+	zone, err := Parse(strings.NewReader(dbMiekNL), testzone, "stdin")
+	if err != nil {
+		t.Fatalf("expect no error when reading zone, got %q", err)
+	}
+
+	fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: zone}, Names: []string{testzone}}}
+	ctx := context.TODO()
+
+	for _, tc := range dnsTestCases {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		_, err := fm.ServeDNS(ctx, rec, m)
+		if err != nil {
+			t.Errorf("expected no error, got %v\n", err)
+			return
+		}
+
+		resp := rec.Msg
+		sort.Sort(test.RRSet(resp.Answer))
+		sort.Sort(test.RRSet(resp.Ns))
+		sort.Sort(test.RRSet(resp.Extra))
+
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
+
+func TestLookupNil(t *testing.T) {
+	fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: nil}, Names: []string{testzone}}}
+	ctx := context.TODO()
+
+	m := dnsTestCases[0].Msg()
+	rec := dnsrecorder.New(&test.ResponseWriter{})
+	fm.ServeDNS(ctx, rec, m)
+}
+
+func BenchmarkLookup(b *testing.B) {
+	zone, err := Parse(strings.NewReader(dbMiekNL), testzone, "stdin")
+	if err != nil {
+		return
+	}
+
+	fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: zone}, Names: []string{testzone}}}
+	ctx := context.TODO()
+	rec := dnsrecorder.New(&test.ResponseWriter{})
+
+	tc := test.Case{
+		Qname: "www.miek.nl.", Qtype: dns.TypeA,
+		Answer: []dns.RR{
+			test.CNAME("www.miek.nl.	1800	IN	CNAME	a.miek.nl."),
+			test.A("a.miek.nl.	1800	IN	A	139.162.196.78"),
+		},
+	}
+
+	m := tc.Msg()
+
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		fm.ServeDNS(ctx, rec, m)
+	}
+}
+
+const dbMiekNL = `
+$TTL    30M
+$ORIGIN miek.nl.
+@       IN      SOA     linode.atoom.net. miek.miek.nl. (
+                             1282630057 ; Serial
+                             4H         ; Refresh
+                             1H         ; Retry
+                             7D         ; Expire
+                             4H )       ; Negative Cache TTL
+                IN      NS      linode.atoom.net.
+                IN      NS      ns-ext.nlnetlabs.nl.
+                IN      NS      omval.tednet.nl.
+                IN      NS      ext.ns.whyscream.net.
+
+                IN      MX      1  aspmx.l.google.com.
+                IN      MX      5  alt1.aspmx.l.google.com.
+                IN      MX      5  alt2.aspmx.l.google.com.
+                IN      MX      10 aspmx2.googlemail.com.
+                IN      MX      10 aspmx3.googlemail.com.
+
+		IN      A       139.162.196.78
+		IN      AAAA    2a01:7e00::f03c:91ff:fef1:6735
+
+a               IN      A       139.162.196.78
+                IN      AAAA    2a01:7e00::f03c:91ff:fef1:6735
+www             IN      CNAME   a
+archive         IN      CNAME   a
+
+srv		IN	SRV     10 10 8080 a.miek.nl.
+mx		IN	MX      10 a.miek.nl.`
diff --git a/vendor/github.com/miekg/coredns/middleware/file/notify.go b/vendor/github.com/miekg/coredns/middleware/file/notify.go
new file mode 100644
index 0000000000..381c1e8c2e
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/notify.go
@@ -0,0 +1,77 @@
+package file
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/rcode"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+// isNotify checks if state is a notify message and if so, will *also* check if it
+// is from one of the configured masters. If not it will not be a valid notify
+// message. If the zone z is not a secondary zone the message will also be ignored.
+func (z *Zone) isNotify(state request.Request) bool {
+	if state.Req.Opcode != dns.OpcodeNotify {
+		return false
+	}
+	if len(z.TransferFrom) == 0 {
+		return false
+	}
+	remote := middleware.Addr(state.IP()).Normalize()
+	for _, from := range z.TransferFrom {
+		if from == remote {
+			return true
+		}
+	}
+	return false
+}
+
+// Notify will send notifies to all configured TransferTo IP addresses.
+func (z *Zone) Notify() {
+	go notify(z.origin, z.TransferTo)
+}
+
+// notify sends notifies to the configured remote servers. It will try up to three times
+// before giving up on a specific remote. We will sequentially loop through "to"
+// until they all have replied (or have 3 failed attempts).
+func notify(zone string, to []string) error {
+	m := new(dns.Msg)
+	m.SetNotify(zone)
+	c := new(dns.Client)
+
+	for _, t := range to {
+		if t == "*" {
+			continue
+		}
+		if err := notifyAddr(c, m, t); err != nil {
+			log.Printf("[ERROR] " + err.Error())
+		} else {
+			log.Printf("[INFO] Sent notify for zone %q to %q", zone, t)
+		}
+	}
+	return nil
+}
+
+func notifyAddr(c *dns.Client, m *dns.Msg, s string) (err error) {
+	ret := new(dns.Msg)
+
+	code := dns.RcodeServerFailure
+	for i := 0; i < 3; i++ {
+		ret, _, err = c.Exchange(m, s)
+		if err != nil {
+			continue
+		}
+		code = ret.Rcode
+		if code == dns.RcodeSuccess {
+			return nil
+		}
+	}
+	if err != nil {
+		return fmt.Errorf("Notify for zone %q was not accepted by %q: %q", m.Question[0].Name, s, err)
+	}
+	return fmt.Errorf("Notify for zone %q was not accepted by %q: rcode was %q", m.Question[0].Name, s, rcode.ToString(code))
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/file/nsec3_test.go b/vendor/github.com/miekg/coredns/middleware/file/nsec3_test.go
new file mode 100644
index 0000000000..04b76b8a22
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/nsec3_test.go
@@ -0,0 +1,28 @@
+package file
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestParseNSEC3PARAM(t *testing.T) {
+	_, err := Parse(strings.NewReader(nsec3paramTest), "miek.nl", "stdin")
+	if err == nil {
+		t.Fatalf("expected error when reading zone, got nothing")
+	}
+}
+
+func TestParseNSEC3(t *testing.T) {
+	_, err := Parse(strings.NewReader(nsec3Test), "miek.nl", "stdin")
+	if err == nil {
+		t.Fatalf("expected error when reading zone, got nothing")
+	}
+}
+
+const nsec3paramTest = `miek.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1460175181 14400 3600 604800 14400
+miek.nl.		1800	IN	NS	omval.tednet.nl.
+miek.nl.		0	IN	NSEC3PARAM 1 0 5 A3DEBC9CC4F695C7`
+
+const nsec3Test = `example.org.		1800	IN	SOA	sns.dns.icann.org. noc.dns.icann.org. 2016082508 7200 3600 1209600 3600
+aub8v9ce95ie18spjubsr058h41n7pa5.example.org. 284 IN NSEC3 1 1 5 D0CBEAAF0AC77314 AUB95P93VPKP55G6U5S4SGS7LS61ND85 NS SOA TXT RRSIG DNSKEY NSEC3PARAM
+aub8v9ce95ie18spjubsr058h41n7pa5.example.org. 284 IN RRSIG NSEC3 8 2 600 20160910232502 20160827231002 14028 example.org. XBNpA7KAIjorPbXvTinOHrc1f630aHic2U716GHLHA4QMx9cl9ss4QjR Wj2UpDM9zBW/jNYb1xb0yjQoez/Jv200w0taSWjRci5aUnRpOi9bmcrz STHb6wIUjUsbJ+NstQsUwVkj6679UviF1FqNwr4GlJnWG3ZrhYhE+NI6 s0k=`
diff --git a/vendor/github.com/miekg/coredns/middleware/file/reload_test.go b/vendor/github.com/miekg/coredns/middleware/file/reload_test.go
new file mode 100644
index 0000000000..77e6444174
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/reload_test.go
@@ -0,0 +1,73 @@
+package file
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+func TestZoneReload(t *testing.T) {
+	log.SetOutput(ioutil.Discard)
+
+	fileName, rm, err := test.TempFile(".", reloadZoneTest)
+	if err != nil {
+		t.Fatalf("failed to create zone: %s", err)
+	}
+	defer rm()
+	reader, err := os.Open(fileName)
+	if err != nil {
+		t.Fatalf("failed to open zone: %s", err)
+	}
+	z, err := Parse(reader, "miek.nl", fileName)
+	if err != nil {
+		t.Fatalf("failed to parse zone: %s", err)
+	}
+
+	z.Reload()
+
+	r := new(dns.Msg)
+	r.SetQuestion("miek.nl", dns.TypeSOA)
+	state := request.Request{W: &test.ResponseWriter{}, Req: r}
+	if _, _, _, res := z.Lookup(state, "miek.nl."); res != Success {
+		t.Fatalf("failed to lookup, got %d", res)
+	}
+
+	r = new(dns.Msg)
+	r.SetQuestion("miek.nl", dns.TypeNS)
+	state = request.Request{W: &test.ResponseWriter{}, Req: r}
+	if _, _, _, res := z.Lookup(state, "miek.nl."); res != Success {
+		t.Fatalf("failed to lookup, got %d", res)
+	}
+
+	if len(z.All()) != 5 {
+		t.Fatalf("expected 5 RRs, got %d", len(z.All()))
+	}
+	if err := ioutil.WriteFile(fileName, []byte(reloadZone2Test), 0644); err != nil {
+		t.Fatalf("failed to write new zone data: %s", err)
+	}
+	// Could still be racy, but we need to wait a bit for the event to be seen
+	time.Sleep(1 * time.Second)
+
+	if len(z.All()) != 3 {
+		t.Fatalf("expected 3 RRs, got %d", len(z.All()))
+	}
+}
+
+const reloadZoneTest = `miek.nl.		1627	IN	SOA	linode.atoom.net. miek.miek.nl. 1460175181 14400 3600 604800 14400
+miek.nl.		1627	IN	NS	ext.ns.whyscream.net.
+miek.nl.		1627	IN	NS	omval.tednet.nl.
+miek.nl.		1627	IN	NS	linode.atoom.net.
+miek.nl.		1627	IN	NS	ns-ext.nlnetlabs.nl.
+`
+
+const reloadZone2Test = `miek.nl.		1627	IN	SOA	linode.atoom.net. miek.miek.nl. 1460175181 14400 3600 604800 14400
+miek.nl.		1627	IN	NS	ext.ns.whyscream.net.
+miek.nl.		1627	IN	NS	omval.tednet.nl.
+`
diff --git a/vendor/github.com/miekg/coredns/middleware/file/secondary.go b/vendor/github.com/miekg/coredns/middleware/file/secondary.go
new file mode 100644
index 0000000000..70ec217f7b
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/secondary.go
@@ -0,0 +1,186 @@
+package file
+
+import (
+	"log"
+	"time"
+
+	"github.com/miekg/dns"
+)
+
+// TransferIn retrieves the zone from the masters, parses it and sets it live.
+func (z *Zone) TransferIn() error {
+	if len(z.TransferFrom) == 0 {
+		return nil
+	}
+	m := new(dns.Msg)
+	m.SetAxfr(z.origin)
+
+	z1 := z.Copy()
+	var (
+		Err error
+		tr  string
+	)
+
+Transfer:
+	for _, tr = range z.TransferFrom {
+		t := new(dns.Transfer)
+		c, err := t.In(m, tr)
+		if err != nil {
+			log.Printf("[ERROR] Failed to setup transfer `%s' with `%s': %v", z.origin, tr, err)
+			Err = err
+			continue Transfer
+		}
+		for env := range c {
+			if env.Error != nil {
+				log.Printf("[ERROR] Failed to parse transfer `%s': %v", z.origin, env.Error)
+				Err = env.Error
+				continue Transfer
+			}
+			for _, rr := range env.RR {
+				if err := z1.Insert(rr); err != nil {
+					log.Printf("[ERROR] Failed to parse transfer `%s': %v", z.origin, err)
+					Err = err
+					continue Transfer
+				}
+			}
+		}
+		Err = nil
+		break
+	}
+	if Err != nil {
+		log.Printf("[ERROR] Failed to transfer %s: %s", z.origin, Err)
+		return Err
+	}
+
+	z.Tree = z1.Tree
+	z.Apex = z1.Apex
+	*z.Expired = false
+	log.Printf("[INFO] Transferred: %s from %s", z.origin, tr)
+	return nil
+}
+
+// shouldTransfer checks the primaries of zone, retrieves the SOA record, checks the current serial
+// and the remote serial and will return true if the remote one is higher than the locally configured one.
+func (z *Zone) shouldTransfer() (bool, error) {
+	c := new(dns.Client)
+	c.Net = "tcp" // do this query over TCP to minimize spoofing
+	m := new(dns.Msg)
+	m.SetQuestion(z.origin, dns.TypeSOA)
+
+	var Err error
+	serial := -1
+
+Transfer:
+	for _, tr := range z.TransferFrom {
+		Err = nil
+		ret, _, err := c.Exchange(m, tr)
+		if err != nil || ret.Rcode != dns.RcodeSuccess {
+			Err = err
+			continue
+		}
+		for _, a := range ret.Answer {
+			if a.Header().Rrtype == dns.TypeSOA {
+				serial = int(a.(*dns.SOA).Serial)
+				break Transfer
+			}
+		}
+	}
+	if serial == -1 {
+		return false, Err
+	}
+	if z.Apex.SOA == nil {
+		return true, Err
+	}
+	return less(z.Apex.SOA.Serial, uint32(serial)), Err
+}
+
+// less return true of a is smaller than b when taking RFC 1982 serial arithmetic into account.
+func less(a, b uint32) bool {
+	if a < b {
+		return (b - a) <= MaxSerialIncrement
+	}
+	return (a - b) > MaxSerialIncrement
+}
+
+// Update updates the secondary zone according to its SOA. It will run for the life time of the server
+// and uses the SOA parameters. Every refresh it will check for a new SOA number. If that fails (for all
+// server) it wil retry every retry interval. If the zone failed to transfer before the expire, the zone
+// will be marked expired.
+func (z *Zone) Update() error {
+	// If we don't have a SOA, we don't have a zone, wait for it to appear.
+	for z.Apex.SOA == nil {
+		time.Sleep(1 * time.Second)
+	}
+	retryActive := false
+
+Restart:
+	refresh := time.Second * time.Duration(z.Apex.SOA.Refresh)
+	retry := time.Second * time.Duration(z.Apex.SOA.Retry)
+	expire := time.Second * time.Duration(z.Apex.SOA.Expire)
+
+	if refresh < time.Hour {
+		refresh = time.Hour
+	}
+	if retry < time.Hour {
+		retry = time.Hour
+	}
+	if refresh > 24*time.Hour {
+		refresh = 24 * time.Hour
+	}
+	if retry > 12*time.Hour {
+		retry = 12 * time.Hour
+	}
+
+	refreshTicker := time.NewTicker(refresh)
+	retryTicker := time.NewTicker(retry)
+	expireTicker := time.NewTicker(expire)
+
+	for {
+		select {
+		case <-expireTicker.C:
+			if !retryActive {
+				break
+			}
+			*z.Expired = true
+
+		case <-retryTicker.C:
+			if !retryActive {
+				break
+			}
+			ok, err := z.shouldTransfer()
+			if err != nil && ok {
+				if err := z.TransferIn(); err != nil {
+					// transfer failed, leave retryActive true
+					break
+				}
+				retryActive = false
+				// transfer OK, possible new SOA, stop timers and redo
+				refreshTicker.Stop()
+				retryTicker.Stop()
+				expireTicker.Stop()
+				goto Restart
+			}
+
+		case <-refreshTicker.C:
+			ok, err := z.shouldTransfer()
+			retryActive = err != nil
+			if err != nil && ok {
+				if err := z.TransferIn(); err != nil {
+					// transfer failed
+					retryActive = true
+					break
+				}
+				retryActive = false
+				// transfer OK, possible new SOA, stop timers and redo
+				refreshTicker.Stop()
+				retryTicker.Stop()
+				expireTicker.Stop()
+				goto Restart
+			}
+		}
+	}
+}
+
+// MaxSerialIncrement is the maximum difference between two serial numbers. If the difference between
+// two serials is greater than this number, the smaller one is considered greater.
+const MaxSerialIncrement uint32 = 2147483647
diff --git a/vendor/github.com/miekg/coredns/middleware/file/secondary_test.go b/vendor/github.com/miekg/coredns/middleware/file/secondary_test.go
new file mode 100644
index 0000000000..cdb051d261
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/secondary_test.go
@@ -0,0 +1,168 @@
+package file
+
+import (
+	"fmt"
+	"io/ioutil"
+	"log"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+// TODO(miek): should test notifies as well, ie start test server (a real coredns one)...
+// setup other test server that sends notify, see if CoreDNS comes calling for a zone
+// tranfer
+
+func TestLess(t *testing.T) {
+	const (
+		min  = 0
+		max  = 4294967295
+		low  = 12345
+		high = 4000000000
+	)
+
+	if less(min, max) {
+		t.Fatalf("less: should be false")
+	}
+	if !less(max, min) {
+		t.Fatalf("less: should be true")
+	}
+	if !less(high, low) {
+		t.Fatalf("less: should be true")
+	}
+	if !less(7, 9) {
+		t.Fatalf("less; should be true")
+	}
+}
+
+type soa struct {
+	serial uint32
+}
+
+func (s *soa) Handler(w dns.ResponseWriter, req *dns.Msg) {
+	m := new(dns.Msg)
+	m.SetReply(req)
+	switch req.Question[0].Qtype {
+	case dns.TypeSOA:
+		m.Answer = make([]dns.RR, 1)
+		m.Answer[0] = test.SOA(fmt.Sprintf("%s IN SOA bla. bla. %d 0 0 0 0 ", testZone, s.serial))
+		w.WriteMsg(m)
+	case dns.TypeAXFR:
+		m.Answer = make([]dns.RR, 4)
+		m.Answer[0] = test.SOA(fmt.Sprintf("%s IN SOA bla. bla. %d 0 0 0 0 ", testZone, s.serial))
+		m.Answer[1] = test.A(fmt.Sprintf("%s IN A 127.0.0.1", testZone))
+		m.Answer[2] = test.A(fmt.Sprintf("%s IN A 127.0.0.1", testZone))
+		m.Answer[3] = test.SOA(fmt.Sprintf("%s IN SOA bla. bla. %d 0 0 0 0 ", testZone, s.serial))
+		w.WriteMsg(m)
+	}
+}
+
+func (s *soa) TransferHandler(w dns.ResponseWriter, req *dns.Msg) {
+	m := new(dns.Msg)
+	m.SetReply(req)
+	m.Answer = make([]dns.RR, 1)
+	m.Answer[0] = test.SOA(fmt.Sprintf("%s IN SOA bla. bla. %d 0 0 0 0 ", testZone, s.serial))
+	w.WriteMsg(m)
+}
+
+const testZone = "secondary.miek.nl."
+
+func TestShouldTransfer(t *testing.T) {
+	soa := soa{250}
+	log.SetOutput(ioutil.Discard)
+
+	dns.HandleFunc(testZone, soa.Handler)
+	defer dns.HandleRemove(testZone)
+
+	s, addrstr, err := test.TCPServer("127.0.0.1:0")
+	if err != nil {
+		t.Fatalf("unable to run test server: %v", err)
+	}
+	defer s.Shutdown()
+
+	z := new(Zone)
+	z.origin = testZone
+	z.TransferFrom = []string{addrstr}
+
+	// when we have a nil SOA (initial state)
+	should, err := z.shouldTransfer()
+	if err != nil {
+		t.Fatalf("unable to run shouldTransfer: %v", err)
+	}
+	if !should {
+		t.Fatalf("shouldTransfer should return true for serial: %d", soa.serial)
+	}
+	// Serial smaller
+	z.Apex.SOA = test.SOA(fmt.Sprintf("%s IN SOA bla. bla. %d 0 0 0 0 ", testZone, soa.serial-1))
+	should, err = z.shouldTransfer()
+	if err != nil {
+		t.Fatalf("unable to run shouldTransfer: %v", err)
+	}
+	if !should {
+		t.Fatalf("shouldTransfer should return true for serial: %q", soa.serial-1)
+	}
+	// Serial equal
+	z.Apex.SOA = test.SOA(fmt.Sprintf("%s IN SOA bla. bla. %d 0 0 0 0 ", testZone, soa.serial))
+	should, err = z.shouldTransfer()
+	if err != nil {
+		t.Fatalf("unable to run shouldTransfer: %v", err)
+	}
+	if should {
+		t.Fatalf("shouldTransfer should return false for serial: %d", soa.serial)
+	}
+}
+
+func TestTransferIn(t *testing.T) {
+	soa := soa{250}
+	log.SetOutput(ioutil.Discard)
+
+	dns.HandleFunc(testZone, soa.Handler)
+	defer dns.HandleRemove(testZone)
+
+	s, addrstr, err := test.TCPServer("127.0.0.1:0")
+	if err != nil {
+		t.Fatalf("unable to run test server: %v", err)
+	}
+	defer s.Shutdown()
+
+	z := new(Zone)
+	z.Expired = new(bool)
+	z.origin = testZone
+	z.TransferFrom = []string{addrstr}
+
+	err = z.TransferIn()
+	if err != nil {
+		t.Fatalf("unable to run TransferIn: %v", err)
+	}
+	if z.Apex.SOA.String() != fmt.Sprintf("%s	3600	IN	SOA	bla. bla. 250 0 0 0 0", testZone) {
+		t.Fatalf("unknown SOA transferred")
+	}
+}
+
+func TestIsNotify(t *testing.T) {
+	z := new(Zone)
+	z.Expired = new(bool)
+	z.origin = testZone
+	state := newRequest(testZone, dns.TypeSOA)
+	// need to set opcode
+	state.Req.Opcode = dns.OpcodeNotify
+
+	z.TransferFrom = []string{"10.240.0.1:53"} // IP from from testing/responseWriter
+	if !z.isNotify(state) {
+		t.Fatal("should have been valid notify")
+	}
+	z.TransferFrom = []string{"10.240.0.2:53"}
+	if z.isNotify(state) {
+		t.Fatal("should have been invalid notify")
+	}
+}
+
+func newRequest(zone string, qtype uint16) request.Request {
+	m := new(dns.Msg)
+	m.SetQuestion("example.com.", dns.TypeA)
+	m.SetEdns0(4097, true)
+	return request.Request{W: &test.ResponseWriter{}, Req: m}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/file/setup.go b/vendor/github.com/miekg/coredns/middleware/file/setup.go
new file mode 100644
index 0000000000..c48e4c0892
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/setup.go
@@ -0,0 +1,169 @@
+package file
+
+import (
+	"fmt"
+	"os"
+	"path"
+
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/dnsutil"
+	"github.com/coredns/coredns/middleware/proxy"
+
+	"github.com/mholt/caddy"
+)
+
+func init() {
+	caddy.RegisterPlugin("file", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setup,
+	})
+}
+
+func setup(c *caddy.Controller) error {
+	zones, err := fileParse(c)
+	if err != nil {
+		return middleware.Error("file", err)
+	}
+
+	// Add startup functions to notify the master(s).
+	for _, n := range zones.Names {
+		z := zones.Z[n]
+		c.OnStartup(func() error {
+			z.StartupOnce.Do(func() {
+				if len(z.TransferTo) > 0 {
+					z.Notify()
+				}
+				z.Reload()
+			})
+			return nil
+		})
+	}
+
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
+		return File{Next: next, Zones: zones}
+	})
+
+	return nil
+}
+
+func fileParse(c *caddy.Controller) (Zones, error) {
+	z := make(map[string]*Zone)
+	names := []string{}
+	origins := []string{}
+
+	config := dnsserver.GetConfig(c)
+
+	for c.Next() {
+		if c.Val() == "file" {
+			// file db.file [zones...]
+			if !c.NextArg() {
+				return Zones{}, c.ArgErr()
+			}
+			fileName := c.Val()
+
+			origins = make([]string, len(c.ServerBlockKeys))
+			copy(origins, c.ServerBlockKeys)
+			args := c.RemainingArgs()
+			if len(args) > 0 {
+				origins = args
+			}
+
+			if !path.IsAbs(fileName) && config.Root != "" {
+				fileName = path.Join(config.Root, fileName)
+			}
+
+			reader, err := os.Open(fileName)
+			if err != nil {
+				// bail out
+				return Zones{}, err
+			}
+
+			for i := range origins {
+				origins[i] = middleware.Host(origins[i]).Normalize()
+				zone, err := Parse(reader, origins[i], fileName)
+				if err == nil {
+					z[origins[i]] = zone
+				} else {
+					return Zones{}, err
+				}
+				names = append(names, origins[i])
+			}
+
+			noReload := false
+			prxy := proxy.Proxy{}
+			for c.NextBlock() {
+				t, _, e := TransferParse(c, false)
+				if e != nil {
+					return Zones{}, e
+				}
+				switch c.Val() {
+				case "no_reload":
+					noReload = true
+
+				case "upstream":
+					args := c.RemainingArgs()
+					if len(args) == 0 {
+						return Zones{}, c.ArgErr()
+					}
+					ups, err := dnsutil.ParseHostPortOrFile(args...)
+					if err != nil {
+						return Zones{}, err
+					}
+					prxy = proxy.NewLookup(ups)
+				}
+
+				for _, origin := range origins {
+					if t != nil {
+						z[origin].TransferTo = append(z[origin].TransferTo, t...)
+					}
+					z[origin].NoReload = noReload
+					z[origin].Proxy = prxy
+				}
+			}
+		}
+	}
+	return Zones{Z: z, Names: names}, nil
+}
+
+// TransferParse parses transfer statements: 'transfer to [address...]'.
+func TransferParse(c *caddy.Controller, secondary bool) (tos, froms []string, err error) {
+	what := c.Val()
+	if !c.NextArg() {
+		return nil, nil, c.ArgErr()
+	}
+	value := c.Val()
+	switch what {
+	case "transfer":
+		if value == "to" {
+			tos = c.RemainingArgs()
+			for i := range tos {
+				if tos[i] != "*" {
+					normalized, err := dnsutil.ParseHostPort(tos[i], "53")
+					if err != nil {
+						return nil, nil, err
+					}
+					tos[i] = normalized
+				}
+			}
+		}
+		if value == "from" {
+			if !secondary {
+				return nil, nil, fmt.Errorf("can't use `transfer from` when not being a secondary")
+			}
+			froms = c.RemainingArgs()
+			for i := range froms {
+				if froms[i] != "*" {
+					normalized, err := dnsutil.ParseHostPort(froms[i], "53")
+					if err != nil {
+						return nil, nil, err
+					}
+					froms[i] = normalized
+				} else {
+					return nil, nil, fmt.Errorf("can't use '*' in transfer from")
+				}
+			}
+		}
+	}
+	return
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/file/setup_test.go b/vendor/github.com/miekg/coredns/middleware/file/setup_test.go
new file mode 100644
index 0000000000..02ed049c42
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/setup_test.go
@@ -0,0 +1,72 @@
+package file
+
+import (
+	"testing"
+
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/mholt/caddy"
+)
+
+func TestFileParse(t *testing.T) {
+	zoneFileName1, rm, err := test.TempFile(".", dbMiekNL)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer rm()
+
+	zoneFileName2, rm, err := test.TempFile(".", dbDnssexNLSigned)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer rm()
+
+	tests := []struct {
+		inputFileRules string
+		shouldErr      bool
+		expectedZones  Zones
+	}{
+		{
+			`file ` + zoneFileName1 + ` miek.nl {
+				transfer from 127.0.0.1
+			}`,
+			true,
+			Zones{},
+		},
+		{
+			`file`,
+			true,
+			Zones{},
+		},
+		{
+			`file ` + zoneFileName1 + ` miek.nl.`,
+			false,
+			Zones{Names: []string{"miek.nl."}},
+		},
+		{
+			`file ` + zoneFileName2 + ` dnssex.nl.`,
+			false,
+			Zones{Names: []string{"dnssex.nl."}},
+		},
+	}
+
+	for i, test := range tests {
+		c := caddy.NewTestController("dns", test.inputFileRules)
+		actualZones, err := fileParse(c)
+
+		if err == nil && test.shouldErr {
+			t.Fatalf("Test %d expected errors, but got no error", i)
+		} else if err != nil && !test.shouldErr {
+			t.Fatalf("Test %d expected no errors, but got '%v'", i, err)
+		} else {
+			if len(actualZones.Names) != len(test.expectedZones.Names) {
+				t.Fatalf("Test %d expected %v, got %v", i, test.expectedZones.Names, actualZones.Names)
+			}
+			for j, name := range test.expectedZones.Names {
+				if actualZones.Names[j] != name {
+					t.Fatalf("Test %d expected %v for %d th zone, got %v", i, name, j, actualZones.Names[j])
+				}
+			}
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/file/tree/all.go b/vendor/github.com/miekg/coredns/middleware/file/tree/all.go
new file mode 100644
index 0000000000..fd806365f3
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/tree/all.go
@@ -0,0 +1,48 @@
+package tree
+
+// All traverses tree and returns all elements
+func (t *Tree) All() []*Elem {
+	if t.Root == nil {
+		return nil
+	}
+	found := t.Root.all(nil)
+	return found
+}
+
+func (n *Node) all(found []*Elem) []*Elem {
+	if n.Left != nil {
+		found = n.Left.all(found)
+	}
+	found = append(found, n.Elem)
+	if n.Right != nil {
+		found = n.Right.all(found)
+	}
+	return found
+}
+
+// Do performs fn on all values stored in the tree. A boolean is returned indicating whether the
+// Do traversal was interrupted by an Operation returning true. If fn alters stored values' sort
+// relationships, future tree operation behaviors are undefined.
+func (t *Tree) Do(fn func(e *Elem) bool) bool {
+	if t.Root == nil {
+		return false
+	}
+	return t.Root.do(fn)
+}
+
+func (n *Node) do(fn func(e *Elem) bool) (done bool) {
+	if n.Left != nil {
+		done = n.Left.do(fn)
+		if done {
+			return
+		}
+	}
+	done = fn(n.Elem)
+	if done {
+		return
+	}
+	if n.Right != nil {
+		done = n.Right.do(fn)
+	}
+	return
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/file/tree/elem.go b/vendor/github.com/miekg/coredns/middleware/file/tree/elem.go
new file mode 100644
index 0000000000..6317cc9123
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/tree/elem.go
@@ -0,0 +1,136 @@
+package tree
+
+import "github.com/miekg/dns"
+
+// Elem is an element in the tree.
+type Elem struct {
+	m    map[uint16][]dns.RR
+	name string // owner name
+}
+
+// newElem returns a new elem.
+func newElem(rr dns.RR) *Elem {
+	e := Elem{m: make(map[uint16][]dns.RR)}
+	e.m[rr.Header().Rrtype] = []dns.RR{rr}
+	return &e
+}
+
+// Types returns the RRs with type qtype from e. If qname is given (only the
+// first one is used), the RR are copied and the owner is replaced with qname[0].
+func (e *Elem) Types(qtype uint16, qname ...string) []dns.RR {
+	rrs := e.m[qtype]
+
+	if rrs != nil && len(qname) > 0 {
+		copied := make([]dns.RR, len(rrs))
+		for i := range rrs {
+			copied[i] = dns.Copy(rrs[i])
+			copied[i].Header().Name = qname[0]
+		}
+		return copied
+	}
+	return rrs
+}
+
+// All returns all RRs from e, regardless of type.
+func (e *Elem) All() []dns.RR {
+	list := []dns.RR{}
+	for _, rrs := range e.m {
+		list = append(list, rrs...)
+	}
+	return list
+}
+
+// Name returns the name for this node.
+func (e *Elem) Name() string {
+	if e.name != "" {
+		return e.name
+	}
+	for _, rrs := range e.m {
+		e.name = rrs[0].Header().Name
+		return e.name
+	}
+	return ""
+}
+
+// Empty returns true is e does not contain any RRs, i.e. is an
+// empty-non-terminal.
+func (e *Elem) Empty() bool {
+	return len(e.m) == 0
+}
+
+// Insert inserts rr into e. If rr is equal to existing rrs this is a noop.
+func (e *Elem) Insert(rr dns.RR) {
+	t := rr.Header().Rrtype
+	if e.m == nil {
+		e.m = make(map[uint16][]dns.RR)
+		e.m[t] = []dns.RR{rr}
+		return
+	}
+	rrs, ok := e.m[t]
+	if !ok {
+		e.m[t] = []dns.RR{rr}
+		return
+	}
+	for _, er := range rrs {
+		if equalRdata(er, rr) {
+			return
+		}
+	}
+
+	rrs = append(rrs, rr)
+	e.m[t] = rrs
+}
+
+// Delete removes rr from e. When e is empty after the removal the returned bool is true.
+func (e *Elem) Delete(rr dns.RR) (empty bool) {
+	if e.m == nil {
+		return true
+	}
+
+	t := rr.Header().Rrtype
+	rrs, ok := e.m[t]
+	if !ok {
+		return
+	}
+
+	for i, er := range rrs {
+		if equalRdata(er, rr) {
+			rrs = removeFromSlice(rrs, i)
+			e.m[t] = rrs
+			empty = len(rrs) == 0
+			if empty {
+				delete(e.m, t)
+			}
+			return
+		}
+	}
+	return
+}
+
+// Less is a tree helper function that calls less.
+func Less(a *Elem, name string) int { return less(name, a.Name()) }
+
+// Assuming the same type and name this will check if the rdata is equal as well.
+func equalRdata(a, b dns.RR) bool {
+	switch x := a.(type) {
+	// TODO(miek): more types, i.e. all types. + tests for this.
+	case *dns.A:
+		return x.A.Equal(b.(*dns.A).A)
+	case *dns.AAAA:
+		return x.AAAA.Equal(b.(*dns.AAAA).AAAA)
+	case *dns.MX:
+		if x.Mx == b.(*dns.MX).Mx && x.Preference == b.(*dns.MX).Preference {
+			return true
+		}
+	}
+	return false
+}
+
+// removeFromSlice removes index i from the slice.
+func removeFromSlice(rrs []dns.RR, i int) []dns.RR {
+	if i >= len(rrs) {
+		return rrs
+	}
+	rrs = append(rrs[:i], rrs[i+1:]...)
+	return rrs
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/file/tree/less.go b/vendor/github.com/miekg/coredns/middleware/file/tree/less.go
new file mode 100644
index 0000000000..3b8340088d
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/tree/less.go
@@ -0,0 +1,59 @@
+package tree
+
+import (
+	"bytes"
+
+	"github.com/miekg/dns"
+)
+
+// less returns <0 when a is less than b, 0 when they are equal and
+// >0 when a is larger than b.
+// The function orders names in DNSSEC canonical order: RFC 4034s section-6.1
+//
+// See http://bert-hubert.blogspot.co.uk/2015/10/how-to-do-fast-canonical-ordering-of.html
+// for a blog article on this implementation, although here we still go label by label.
+//
+// The values of a and b are *not* lowercased before the comparison!
+func less(a, b string) int {
+	i := 1
+	aj := len(a)
+	bj := len(b)
+	for {
+		ai, oka := dns.PrevLabel(a, i)
+		bi, okb := dns.PrevLabel(b, i)
+		if oka && okb {
+			return 0
+		}
+
+		// sadly this []byte will allocate... TODO(miek): check if this is needed
+		// for a name, otherwise compare the strings.
+		ab := []byte(a[ai:aj])
+		bb := []byte(b[bi:bj])
+		doDDD(ab)
+		doDDD(bb)
+
+		res := bytes.Compare(ab, bb)
+		if res != 0 {
+			return res
+		}
+
+		i++
+		aj, bj = ai, bi
+	}
+}
+
+func doDDD(b []byte) {
+	lb := len(b)
+	for i := 0; i < lb; i++ {
+		if i+3 < lb && b[i] == '\\' && isDigit(b[i+1]) && isDigit(b[i+2]) && isDigit(b[i+3]) {
+			b[i] = dddToByte(b[i:])
+			for j := i + 1; j < lb-3; j++ {
+				b[j] = b[j+3]
+			}
+			lb -= 3
+		}
+	}
+}
+
+func isDigit(b byte) bool     { return b >= '0' && b <= '9' }
+func dddToByte(s []byte) byte { return (s[1]-'0')*100 + (s[2]-'0')*10 + (s[3] - '0') }
diff --git a/vendor/github.com/miekg/coredns/middleware/file/tree/less_test.go b/vendor/github.com/miekg/coredns/middleware/file/tree/less_test.go
new file mode 100644
index 0000000000..ed021b66f9
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/tree/less_test.go
@@ -0,0 +1,81 @@
+package tree
+
+import (
+	"sort"
+	"strings"
+	"testing"
+)
+
+type set []string
+
+func (p set) Len() int           { return len(p) }
+func (p set) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
+func (p set) Less(i, j int) bool { d := less(p[i], p[j]); return d <= 0 }
+
+func TestLess(t *testing.T) {
+	tests := []struct {
+		in  []string
+		out []string
+	}{
+		{
+			[]string{"aaa.powerdns.de", "bbb.powerdns.net.", "xxx.powerdns.com."},
+			[]string{"xxx.powerdns.com.", "aaa.powerdns.de", "bbb.powerdns.net."},
+		},
+		{
+			[]string{"aaa.POWERDNS.de", "bbb.PoweRdnS.net.", "xxx.powerdns.com."},
+			[]string{"xxx.powerdns.com.", "aaa.POWERDNS.de", "bbb.PoweRdnS.net."},
+		},
+		{
+			[]string{"aaa.aaaa.aa.", "aa.aaa.a.", "bbb.bbbb.bb."},
+			[]string{"aa.aaa.a.", "aaa.aaaa.aa.", "bbb.bbbb.bb."},
+		},
+		{
+			[]string{"aaaaa.", "aaa.", "bbb."},
+			[]string{"aaa.", "aaaaa.", "bbb."},
+		},
+		{
+			[]string{"a.a.a.a.", "a.a.", "a.a.a."},
+			[]string{"a.a.", "a.a.a.", "a.a.a.a."},
+		},
+		{
+			[]string{"example.", "z.example.", "a.example."},
+			[]string{"example.", "a.example.", "z.example."},
+		},
+		{
+			[]string{"a.example.", "Z.a.example.", "z.example.", "yljkjljk.a.example.", "\\001.z.example.", "example.", "*.z.example.", "\\200.z.example.", "zABC.a.EXAMPLE."},
+			[]string{"example.", "a.example.", "yljkjljk.a.example.", "Z.a.example.", "zABC.a.EXAMPLE.", "z.example.", "\\001.z.example.", "*.z.example.", "\\200.z.example."},
+		},
+		{
+			// RFC3034 example.
+			[]string{"a.example.", "Z.a.example.", "z.example.", "yljkjljk.a.example.", "example.", "*.z.example.", "zABC.a.EXAMPLE."},
+			[]string{"example.", "a.example.", "yljkjljk.a.example.", "Z.a.example.", "zABC.a.EXAMPLE.", "z.example.", "*.z.example."},
+		},
+	}
+
+Tests:
+	for j, test := range tests {
+		// Need to lowercase these example as the Less function does lowercase for us anymore.
+		for i, b := range test.in {
+			test.in[i] = strings.ToLower(b)
+		}
+		for i, b := range test.out {
+			test.out[i] = strings.ToLower(b)
+		}
+
+		sort.Sort(set(test.in))
+		for i := 0; i < len(test.in); i++ {
+			if test.in[i] != test.out[i] {
+				t.Errorf("Test %d: expected %s, got %s\n", j, test.out[i], test.in[i])
+				n := ""
+				for k, in := range test.in {
+					if k+1 == len(test.in) {
+						n = "\n"
+					}
+					t.Logf("%s <-> %s\n%s", in, test.out[k], n)
+				}
+				continue Tests
+			}
+
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/file/tree/print.go b/vendor/github.com/miekg/coredns/middleware/file/tree/print.go
new file mode 100644
index 0000000000..bd86ef690b
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/tree/print.go
@@ -0,0 +1,62 @@
+package tree
+
+import "fmt"
+
+// Print prints a Tree. Main use is to aid in debugging.
+func (t *Tree) Print() {
+	if t.Root == nil {
+		fmt.Println("<nil>")
+	}
+	t.Root.print()
+}
+
+func (n *Node) print() {
+	q := newQueue()
+	q.push(n)
+
+	nodesInCurrentLevel := 1
+	nodesInNextLevel := 0
+
+	for !q.empty() {
+		do := q.pop()
+		nodesInCurrentLevel--
+
+		if do != nil {
+			fmt.Print(do.Elem.Name(), " ")
+			q.push(do.Left)
+			q.push(do.Right)
+			nodesInNextLevel += 2
+		}
+		if nodesInCurrentLevel == 0 {
+			fmt.Println()
+		}
+		nodesInCurrentLevel = nodesInNextLevel
+		nodesInNextLevel = 0
+	}
+	fmt.Println()
+}
+
+type queue []*Node
+
+// newQueue returns a new queue.
+func newQueue() queue {
+	q := queue([]*Node{})
+	return q
+}
+
+// push pushes n to the end of the queue.
+func (q *queue) push(n *Node) {
+	*q = append(*q, n)
+}
+
+// pop pops the first element off the queue.
+func (q *queue) pop() *Node {
+	n := (*q)[0]
+	*q = (*q)[1:]
+	return n
+}
+
+// empty returns true when the queue contains zero nodes.
+func (q *queue) empty() bool {
+	return len(*q) == 0
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/file/tree/tree.go b/vendor/github.com/miekg/coredns/middleware/file/tree/tree.go
new file mode 100644
index 0000000000..ed33c09a48
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/tree/tree.go
@@ -0,0 +1,455 @@
+// Copyright ©2012 The bíogo Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found at the end of this file.
+
+// Package tree implements Left-Leaning Red Black trees as described by Robert Sedgewick.
+//
+// More details relating to the implementation are available at the following locations:
+//
+// http://www.cs.princeton.edu/~rs/talks/LLRB/LLRB.pdf
+// http://www.cs.princeton.edu/~rs/talks/LLRB/Java/RedBlackBST.java
+// http://www.teachsolaisgames.com/articles/balanced_left_leaning.html
+//
+// Heavily modified by Miek Gieben for use in DNS zones.
+package tree
+
+import "github.com/miekg/dns"
+
+const (
+	td234 = iota
+	bu23
+)
+
+// Operation mode of the LLRB tree.
+const mode = bu23
+
+func init() {
+	if mode != td234 && mode != bu23 {
+		panic("tree: unknown mode")
+	}
+}
+
+// A Color represents the color of a Node.
+type Color bool
+
+const (
+	// Red as false give us the defined behaviour that new nodes are red. Although this
+	// is incorrect for the root node, that is resolved on the first insertion.
+	red   Color = false
+	black Color = true
+)
+
+// A Node represents a node in the LLRB tree.
+type Node struct {
+	Elem        *Elem
+	Left, Right *Node
+	Color       Color
+}
+
+// A Tree manages the root node of an LLRB tree. Public methods are exposed through this type.
+type Tree struct {
+	Root  *Node // Root node of the tree.
+	Count int   // Number of elements stored.
+}
+
+// Helper methods
+
+// color returns the effect color of a Node. A nil node returns black.
+func (n *Node) color() Color {
+	if n == nil {
+		return black
+	}
+	return n.Color
+}
+
+// (a,c)b -rotL-> ((a,)b,)c
+func (n *Node) rotateLeft() (root *Node) {
+	// Assumes: n has two children.
+	root = n.Right
+	n.Right = root.Left
+	root.Left = n
+	root.Color = n.Color
+	n.Color = red
+	return
+}
+
+// (a,c)b -rotR-> (,(,c)b)a
+func (n *Node) rotateRight() (root *Node) {
+	// Assumes: n has two children.
+	root = n.Left
+	n.Left = root.Right
+	root.Right = n
+	root.Color = n.Color
+	n.Color = red
+	return
+}
+
+// (aR,cR)bB -flipC-> (aB,cB)bR | (aB,cB)bR -flipC-> (aR,cR)bB
+func (n *Node) flipColors() {
+	// Assumes: n has two children.
+	n.Color = !n.Color
+	n.Left.Color = !n.Left.Color
+	n.Right.Color = !n.Right.Color
+}
+
+// fixUp ensures that black link balance is correct, that red nodes lean left,
+// and that 4 nodes are split in the case of BU23 and properly balanced in TD234.
+func (n *Node) fixUp() *Node {
+	if n.Right.color() == red {
+		if mode == td234 && n.Right.Left.color() == red {
+			n.Right = n.Right.rotateRight()
+		}
+		n = n.rotateLeft()
+	}
+	if n.Left.color() == red && n.Left.Left.color() == red {
+		n = n.rotateRight()
+	}
+	if mode == bu23 && n.Left.color() == red && n.Right.color() == red {
+		n.flipColors()
+	}
+	return n
+}
+
+func (n *Node) moveRedLeft() *Node {
+	n.flipColors()
+	if n.Right.Left.color() == red {
+		n.Right = n.Right.rotateRight()
+		n = n.rotateLeft()
+		n.flipColors()
+		if mode == td234 && n.Right.Right.color() == red {
+			n.Right = n.Right.rotateLeft()
+		}
+	}
+	return n
+}
+
+func (n *Node) moveRedRight() *Node {
+	n.flipColors()
+	if n.Left.Left.color() == red {
+		n = n.rotateRight()
+		n.flipColors()
+	}
+	return n
+}
+
+// Len returns the number of elements stored in the Tree.
+func (t *Tree) Len() int {
+	return t.Count
+}
+
+// Search returns the first match of qname in the Tree.
+func (t *Tree) Search(qname string) (*Elem, bool) {
+	if t.Root == nil {
+		return nil, false
+	}
+	n, res := t.Root.search(qname)
+	if n == nil {
+		return nil, res
+	}
+	return n.Elem, res
+}
+
+// search searches the tree for qname and type.
+func (n *Node) search(qname string) (*Node, bool) {
+	for n != nil {
+		switch c := Less(n.Elem, qname); {
+		case c == 0:
+			return n, true
+		case c < 0:
+			n = n.Left
+		default:
+			n = n.Right
+		}
+	}
+
+	return n, false
+}
+
+// Insert inserts rr into the Tree at the first match found
+// with e or when a nil node is reached.
+func (t *Tree) Insert(rr dns.RR) {
+	var d int
+	t.Root, d = t.Root.insert(rr)
+	t.Count += d
+	t.Root.Color = black
+}
+
+// insert inserts rr in to the tree.
+func (n *Node) insert(rr dns.RR) (root *Node, d int) {
+	if n == nil {
+		return &Node{Elem: newElem(rr)}, 1
+	} else if n.Elem == nil {
+		n.Elem = newElem(rr)
+		return n, 1
+	}
+
+	if mode == td234 {
+		if n.Left.color() == red && n.Right.color() == red {
+			n.flipColors()
+		}
+	}
+
+	switch c := Less(n.Elem, rr.Header().Name); {
+	case c == 0:
+		n.Elem.Insert(rr)
+	case c < 0:
+		n.Left, d = n.Left.insert(rr)
+	default:
+		n.Right, d = n.Right.insert(rr)
+	}
+
+	if n.Right.color() == red && n.Left.color() == black {
+		n = n.rotateLeft()
+	}
+	if n.Left.color() == red && n.Left.Left.color() == red {
+		n = n.rotateRight()
+	}
+
+	if mode == bu23 {
+		if n.Left.color() == red && n.Right.color() == red {
+			n.flipColors()
+		}
+	}
+
+	root = n
+
+	return
+}
+
+// DeleteMin deletes the node with the minimum value in the tree.
+func (t *Tree) DeleteMin() {
+	if t.Root == nil {
+		return
+	}
+	var d int
+	t.Root, d = t.Root.deleteMin()
+	t.Count += d
+	if t.Root == nil {
+		return
+	}
+	t.Root.Color = black
+}
+
+func (n *Node) deleteMin() (root *Node, d int) {
+	if n.Left == nil {
+		return nil, -1
+	}
+	if n.Left.color() == black && n.Left.Left.color() == black {
+		n = n.moveRedLeft()
+	}
+	n.Left, d = n.Left.deleteMin()
+
+	root = n.fixUp()
+
+	return
+}
+
+// DeleteMax deletes the node with the maximum value in the tree.
+func (t *Tree) DeleteMax() {
+	if t.Root == nil {
+		return
+	}
+	var d int
+	t.Root, d = t.Root.deleteMax()
+	t.Count += d
+	if t.Root == nil {
+		return
+	}
+	t.Root.Color = black
+}
+
+func (n *Node) deleteMax() (root *Node, d int) {
+	if n.Left != nil && n.Left.color() == red {
+		n = n.rotateRight()
+	}
+	if n.Right == nil {
+		return nil, -1
+	}
+	if n.Right.color() == black && n.Right.Left.color() == black {
+		n = n.moveRedRight()
+	}
+	n.Right, d = n.Right.deleteMax()
+
+	root = n.fixUp()
+
+	return
+}
+
+// Delete removes rr from the tree, is the node turns empty, that node is deleted with DeleteNode.
+func (t *Tree) Delete(rr dns.RR) {
+	if t.Root == nil {
+		return
+	}
+
+	el, _ := t.Search(rr.Header().Name)
+	if el == nil {
+		t.deleteNode(rr)
+		return
+	}
+	// Delete from this element.
+	empty := el.Delete(rr)
+	if empty {
+		t.deleteNode(rr)
+		return
+	}
+}
+
+// DeleteNode deletes the node that matches rr according to Less().
+func (t *Tree) deleteNode(rr dns.RR) {
+	if t.Root == nil {
+		return
+	}
+	var d int
+	t.Root, d = t.Root.delete(rr)
+	t.Count += d
+	if t.Root == nil {
+		return
+	}
+	t.Root.Color = black
+}
+
+func (n *Node) delete(rr dns.RR) (root *Node, d int) {
+	if Less(n.Elem, rr.Header().Name) < 0 {
+		if n.Left != nil {
+			if n.Left.color() == black && n.Left.Left.color() == black {
+				n = n.moveRedLeft()
+			}
+			n.Left, d = n.Left.delete(rr)
+		}
+	} else {
+		if n.Left.color() == red {
+			n = n.rotateRight()
+		}
+		if n.Right == nil && Less(n.Elem, rr.Header().Name) == 0 {
+			return nil, -1
+		}
+		if n.Right != nil {
+			if n.Right.color() == black && n.Right.Left.color() == black {
+				n = n.moveRedRight()
+			}
+			if Less(n.Elem, rr.Header().Name) == 0 {
+				n.Elem = n.Right.min().Elem
+				n.Right, d = n.Right.deleteMin()
+			} else {
+				n.Right, d = n.Right.delete(rr)
+			}
+		}
+	}
+
+	root = n.fixUp()
+	return
+}
+
+// Min returns the minimum value stored in the tree.
+func (t *Tree) Min() *Elem {
+	if t.Root == nil {
+		return nil
+	}
+	return t.Root.min().Elem
+}
+
+func (n *Node) min() *Node {
+	for ; n.Left != nil; n = n.Left {
+	}
+	return n
+}
+
+// Max returns the maximum value stored in the tree.
+func (t *Tree) Max() *Elem {
+	if t.Root == nil {
+		return nil
+	}
+	return t.Root.max().Elem
+}
+
+func (n *Node) max() *Node {
+	for ; n.Right != nil; n = n.Right {
+	}
+	return n
+}
+
+// Prev returns the greatest value equal to or less than the qname according to Less().
+func (t *Tree) Prev(qname string) (*Elem, bool) {
+	if t.Root == nil {
+		return nil, false
+	}
+
+	n := t.Root.floor(qname)
+	if n == nil {
+		return nil, false
+	}
+	return n.Elem, true
+}
+
+func (n *Node) floor(qname string) *Node {
+	if n == nil {
+		return nil
+	}
+	switch c := Less(n.Elem, qname); {
+	case c == 0:
+		return n
+	case c <= 0:
+		return n.Left.floor(qname)
+	default:
+		if r := n.Right.floor(qname); r != nil {
+			return r
+		}
+	}
+	return n
+}
+
+// Next returns the smallest value equal to or greater than the qname according to Less().
+func (t *Tree) Next(qname string) (*Elem, bool) {
+	if t.Root == nil {
+		return nil, false
+	}
+	n := t.Root.ceil(qname)
+	if n == nil {
+		return nil, false
+	}
+	return n.Elem, true
+}
+
+func (n *Node) ceil(qname string) *Node {
+	if n == nil {
+		return nil
+	}
+	switch c := Less(n.Elem, qname); {
+	case c == 0:
+		return n
+	case c > 0:
+		return n.Right.ceil(qname)
+	default:
+		if l := n.Left.ceil(qname); l != nil {
+			return l
+		}
+	}
+	return n
+}
+
+/*
+Copyright ©2012 The bíogo Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of the bíogo project nor the names of its authors and
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
diff --git a/vendor/github.com/miekg/coredns/middleware/file/wildcard.go b/vendor/github.com/miekg/coredns/middleware/file/wildcard.go
new file mode 100644
index 0000000000..9526cb53f7
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/wildcard.go
@@ -0,0 +1,13 @@
+package file
+
+import "github.com/miekg/dns"
+
+// replaceWithWildcard replaces the left most label with '*'.
+func replaceWithAsteriskLabel(qname string) (wildcard string) {
+	i, shot := dns.NextLabel(qname, 0)
+	if shot {
+		return ""
+	}
+
+	return "*." + qname[i:]
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/file/wildcard_test.go b/vendor/github.com/miekg/coredns/middleware/file/wildcard_test.go
new file mode 100644
index 0000000000..9f34b13f24
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/wildcard_test.go
@@ -0,0 +1,226 @@
+package file
+
+import (
+	"sort"
+	"strings"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+var wildcardTestCases = []test.Case{
+	{
+		Qname: "wild.dnssex.nl.", Qtype: dns.TypeTXT,
+		Answer: []dns.RR{
+			test.TXT(`wild.dnssex.nl.	1800	IN	TXT	"Doing It Safe Is Better"`),
+		},
+		Ns: dnssexAuth[:len(dnssexAuth)-1], // remove RRSIG on the end
+	},
+	{
+		Qname: "a.wild.dnssex.nl.", Qtype: dns.TypeTXT,
+		Answer: []dns.RR{
+			test.TXT(`a.wild.dnssex.nl.	1800	IN	TXT	"Doing It Safe Is Better"`),
+		},
+		Ns: dnssexAuth[:len(dnssexAuth)-1], // remove RRSIG on the end
+	},
+	{
+		Qname: "wild.dnssex.nl.", Qtype: dns.TypeTXT, Do: true,
+		Answer: []dns.RR{
+			test.RRSIG("wild.dnssex.nl.	1800	IN	RRSIG	TXT 8 2 1800 20160428190224 20160329190224 14460 dnssex.nl. FUZSTyvZfeuuOpCm"),
+			test.TXT(`wild.dnssex.nl.	1800	IN	TXT	"Doing It Safe Is Better"`),
+		},
+		Ns: append([]dns.RR{
+			test.NSEC("a.dnssex.nl.	14400	IN	NSEC	www.dnssex.nl. A AAAA RRSIG NSEC"),
+			test.RRSIG("a.dnssex.nl.	14400	IN	RRSIG	NSEC 8 3 14400 20160428190224 20160329190224 14460 dnssex.nl. S+UMs2ySgRaaRY"),
+		}, dnssexAuth...),
+		Extra: []dns.RR{test.OPT(4096, true)},
+	},
+	{
+		Qname: "a.wild.dnssex.nl.", Qtype: dns.TypeTXT, Do: true,
+		Answer: []dns.RR{
+			test.RRSIG("a.wild.dnssex.nl.	1800	IN	RRSIG	TXT 8 2 1800 20160428190224 20160329190224 14460 dnssex.nl. FUZSTyvZfeuuOpCm"),
+			test.TXT(`a.wild.dnssex.nl.	1800	IN	TXT	"Doing It Safe Is Better"`),
+		},
+		Ns: append([]dns.RR{
+			test.NSEC("a.dnssex.nl.	14400	IN	NSEC	www.dnssex.nl. A AAAA RRSIG NSEC"),
+			test.RRSIG("a.dnssex.nl.	14400	IN	RRSIG	NSEC 8 3 14400 20160428190224 20160329190224 14460 dnssex.nl. S+UMs2ySgRaaRY"),
+		}, dnssexAuth...),
+		Extra: []dns.RR{test.OPT(4096, true)},
+	},
+	// nodata responses
+	{
+		Qname: "wild.dnssex.nl.", Qtype: dns.TypeSRV,
+		Ns: []dns.RR{
+			test.SOA(`dnssex.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1459281744 14400 3600 604800 14400`),
+		},
+	},
+	{
+		Qname: "wild.dnssex.nl.", Qtype: dns.TypeSRV, Do: true,
+		Ns: []dns.RR{
+			// TODO(miek): needs closest encloser proof as well? This is the wrong answer
+			test.NSEC(`*.dnssex.nl.	14400	IN	NSEC	a.dnssex.nl. TXT RRSIG NSEC`),
+			test.RRSIG(`*.dnssex.nl.	14400	IN	RRSIG	NSEC 8 2 14400 20160428190224 20160329190224 14460 dnssex.nl. os6INm6q2eXknD5z8TaaDOV+Ge/Ko+2dXnKP+J1fqJzafXJVH1F0nDrcXmMlR6jlBHA=`),
+			test.RRSIG(`dnssex.nl.	1800	IN	RRSIG	SOA 8 2 1800 20160428190224 20160329190224 14460 dnssex.nl. CA/Y3m9hCOiKC/8ieSOv8SeP964Bq++lyH8BZJcTaabAsERs4xj5PRtcxicwQXZiF8fYUCpROlUS0YR8Cdw=`),
+			test.SOA(`dnssex.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1459281744 14400 3600 604800 14400`),
+		},
+		Extra: []dns.RR{test.OPT(4096, true)},
+	},
+}
+
+var dnssexAuth = []dns.RR{
+	test.NS("dnssex.nl.	1800	IN	NS	linode.atoom.net."),
+	test.NS("dnssex.nl.	1800	IN	NS	ns-ext.nlnetlabs.nl."),
+	test.NS("dnssex.nl.	1800	IN	NS	omval.tednet.nl."),
+	test.RRSIG("dnssex.nl.	1800	IN	RRSIG	NS 8 2 1800 20160428190224 20160329190224 14460 dnssex.nl. dLIeEvP86jj5ndkcLzhgvWixTABjWAGRTGQsPsVDFXsGMf9TGGC9FEomgkCVeNC0="),
+}
+
+func TestLookupWildcard(t *testing.T) {
+	zone, err := Parse(strings.NewReader(dbDnssexNLSigned), testzone1, "stdin")
+	if err != nil {
+		t.Fatalf("Expect no error when reading zone, got %q", err)
+	}
+
+	fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone1: zone}, Names: []string{testzone1}}}
+	ctx := context.TODO()
+
+	for _, tc := range wildcardTestCases {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		_, err := fm.ServeDNS(ctx, rec, m)
+		if err != nil {
+			t.Errorf("Expected no error, got %v\n", err)
+			return
+		}
+
+		resp := rec.Msg
+		sort.Sort(test.RRSet(resp.Answer))
+		sort.Sort(test.RRSet(resp.Ns))
+		sort.Sort(test.RRSet(resp.Extra))
+
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
+
+var wildcardDoubleTestCases = []test.Case{
+	{
+		Qname: "wild.w.example.org.", Qtype: dns.TypeTXT,
+		Answer: []dns.RR{
+			test.TXT(`wild.w.example.org. IN	TXT	"Wildcard"`),
+		},
+		Ns: exampleAuth,
+	},
+	{
+		Qname: "wild.c.example.org.", Qtype: dns.TypeTXT,
+		Answer: []dns.RR{
+			test.TXT(`wild.c.example.org. IN	TXT	"c Wildcard"`),
+		},
+		Ns: exampleAuth,
+	},
+	{
+		Qname: "wild.d.example.org.", Qtype: dns.TypeTXT,
+		Answer: []dns.RR{
+			test.TXT(`alias.example.org. IN	TXT	"Wildcard CNAME expansion"`),
+			test.CNAME(`wild.d.example.org. IN	CNAME	alias.example.org`),
+		},
+		Ns: exampleAuth,
+	},
+	{
+		Qname: "alias.example.org.", Qtype: dns.TypeTXT,
+		Answer: []dns.RR{
+			test.TXT(`alias.example.org. IN	TXT	"Wildcard CNAME expansion"`),
+		},
+		Ns: exampleAuth,
+	},
+}
+
+var exampleAuth = []dns.RR{
+	test.NS("example.org.	3600	IN	NS	a.iana-servers.net."),
+	test.NS("example.org.	3600	IN	NS	b.iana-servers.net."),
+}
+
+func TestLookupDoubleWildcard(t *testing.T) {
+	zone, err := Parse(strings.NewReader(exampleOrg), "example.org.", "stdin")
+	if err != nil {
+		t.Fatalf("Expect no error when reading zone, got %q", err)
+	}
+
+	fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{"example.org.": zone}, Names: []string{"example.org."}}}
+	ctx := context.TODO()
+
+	for _, tc := range wildcardDoubleTestCases {
+		m := tc.Msg()
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		_, err := fm.ServeDNS(ctx, rec, m)
+		if err != nil {
+			t.Errorf("Expected no error, got %v\n", err)
+			return
+		}
+
+		resp := rec.Msg
+		sort.Sort(test.RRSet(resp.Answer))
+		sort.Sort(test.RRSet(resp.Ns))
+		sort.Sort(test.RRSet(resp.Extra))
+
+		if !test.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+		if !test.Section(t, tc, test.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+		}
+		if !test.Section(t, tc, test.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
+
+func TestReplaceWithAsteriskLabel(t *testing.T) {
+	tests := []struct {
+		in, out string
+	}{
+		{".", ""},
+		{"miek.nl.", "*.nl."},
+		{"www.miek.nl.", "*.miek.nl."},
+	}
+
+	for _, tc := range tests {
+		got := replaceWithAsteriskLabel(tc.in)
+		if got != tc.out {
+			t.Errorf("Expected to be %s, got %s", tc.out, got)
+		}
+	}
+}
+
+const exampleOrg = `; example.org test file
+example.org.		IN	SOA	sns.dns.icann.org. noc.dns.icann.org. 2015082541 7200 3600 1209600 3600
+example.org.		IN	NS	b.iana-servers.net.
+example.org.		IN	NS	a.iana-servers.net.
+example.org.		IN	A	127.0.0.1
+example.org.		IN	A	127.0.0.2
+*.w.example.org.        IN      TXT     "Wildcard"
+a.b.c.w.example.org.    IN      TXT     "Not a wildcard"
+*.c.example.org.        IN      TXT     "c Wildcard"
+*.d.example.org.        IN      CNAME   alias.example.org.
+alias.example.org.      IN      TXT     "Wildcard CNAME expansion"
+`
diff --git a/vendor/github.com/miekg/coredns/middleware/file/xfr.go b/vendor/github.com/miekg/coredns/middleware/file/xfr.go
new file mode 100644
index 0000000000..4d7f07a48e
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/xfr.go
@@ -0,0 +1,62 @@
+package file
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+// Xfr serves up an AXFR.
+type Xfr struct {
+	*Zone
+}
+
+// ServeDNS implements the middleware.Handler interface.
+func (x Xfr) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	state := request.Request{W: w, Req: r}
+	if !x.TransferAllowed(state) {
+		return dns.RcodeServerFailure, nil
+	}
+	if state.QType() != dns.TypeAXFR && state.QType() != dns.TypeIXFR {
+		return 0, middleware.Error(x.Name(), fmt.Errorf("xfr called with non transfer type: %d", state.QType()))
+	}
+
+	records := x.All()
+	if len(records) == 0 {
+		return dns.RcodeServerFailure, nil
+	}
+
+	ch := make(chan *dns.Envelope)
+	defer close(ch)
+	tr := new(dns.Transfer)
+	go tr.Out(w, r, ch)
+
+	j, l := 0, 0
+	records = append(records, records[0]) // add closing SOA to the end
+	log.Printf("[INFO] Outgoing transfer of %d records of zone %s to %s started", len(records), x.origin, state.IP())
+	for i, r := range records {
+		l += dns.Len(r)
+		if l > transferLength {
+			ch <- &dns.Envelope{RR: records[j:i]}
+			l = 0
+			j = i
+		}
+	}
+	if j < len(records) {
+		ch <- &dns.Envelope{RR: records[j:]}
+	}
+
+	w.Hijack()
+	// w.Close() // Client closes connection
+	return dns.RcodeSuccess, nil
+}
+
+// Name implements the middleware.Hander interface.
+func (x Xfr) Name() string { return "xfr" } // Or should we return "file" here?
+
+const transferLength = 1000 // Start a new envelop after message reaches this size in bytes. Intentionally small to test multi envelope parsing.
diff --git a/vendor/github.com/miekg/coredns/middleware/file/xfr_test.go b/vendor/github.com/miekg/coredns/middleware/file/xfr_test.go
new file mode 100644
index 0000000000..07caaf1d96
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/xfr_test.go
@@ -0,0 +1,34 @@
+package file
+
+import (
+	"fmt"
+	"strings"
+)
+
+func ExampleZone_All() {
+	zone, err := Parse(strings.NewReader(dbMiekNL), testzone, "stdin")
+	if err != nil {
+		return
+	}
+	records := zone.All()
+	for _, r := range records {
+		fmt.Printf("%+v\n", r)
+	}
+	// Output
+	// xfr_test.go:15: miek.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400
+	// xfr_test.go:15: www.miek.nl.	1800	IN	CNAME	a.miek.nl.
+	// xfr_test.go:15: miek.nl.	1800	IN	NS	linode.atoom.net.
+	// xfr_test.go:15: miek.nl.	1800	IN	NS	ns-ext.nlnetlabs.nl.
+	// xfr_test.go:15: miek.nl.	1800	IN	NS	omval.tednet.nl.
+	// xfr_test.go:15: miek.nl.	1800	IN	NS	ext.ns.whyscream.net.
+	// xfr_test.go:15: miek.nl.	1800	IN	MX	1 aspmx.l.google.com.
+	// xfr_test.go:15: miek.nl.	1800	IN	MX	5 alt1.aspmx.l.google.com.
+	// xfr_test.go:15: miek.nl.	1800	IN	MX	5 alt2.aspmx.l.google.com.
+	// xfr_test.go:15: miek.nl.	1800	IN	MX	10 aspmx2.googlemail.com.
+	// xfr_test.go:15: miek.nl.	1800	IN	MX	10 aspmx3.googlemail.com.
+	// xfr_test.go:15: miek.nl.	1800	IN	A	139.162.196.78
+	// xfr_test.go:15: miek.nl.	1800	IN	AAAA	2a01:7e00::f03c:91ff:fef1:6735
+	// xfr_test.go:15: archive.miek.nl.	1800	IN	CNAME	a.miek.nl.
+	// xfr_test.go:15: a.miek.nl.	1800	IN	A	139.162.196.78
+	// xfr_test.go:15: a.miek.nl.	1800	IN	AAAA	2a01:7e00::f03c:91ff:fef1:6735
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/file/zone.go b/vendor/github.com/miekg/coredns/middleware/file/zone.go
new file mode 100644
index 0000000000..2d994319a7
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/zone.go
@@ -0,0 +1,232 @@
+package file
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"path"
+	"strings"
+	"sync"
+
+	"github.com/coredns/coredns/middleware/file/tree"
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/request"
+
+	"github.com/fsnotify/fsnotify"
+	"github.com/miekg/dns"
+)
+
+// Zone defines a structure that contains all data related to a DNS zone.
+type Zone struct {
+	origin  string
+	origLen int
+	file    string
+	*tree.Tree
+	Apex Apex
+
+	TransferTo   []string
+	StartupOnce  sync.Once
+	TransferFrom []string
+	Expired      *bool
+
+	NoReload       bool
+	reloadMu       sync.RWMutex
+	ReloadShutdown chan bool
+	Proxy          proxy.Proxy // Proxy for looking up names during the resolution process
+}
+
+// Apex contains the apex records of a zone: SOA, NS and their potential signatures.
+type Apex struct {
+	SOA    *dns.SOA
+	NS     []dns.RR
+	SIGSOA []dns.RR
+	SIGNS  []dns.RR
+}
+
+// NewZone returns a new zone.
+func NewZone(name, file string) *Zone {
+	z := &Zone{
+		origin:         dns.Fqdn(name),
+		origLen:        dns.CountLabel(dns.Fqdn(name)),
+		file:           path.Clean(file),
+		Tree:           &tree.Tree{},
+		Expired:        new(bool),
+		ReloadShutdown: make(chan bool),
+	}
+	*z.Expired = false
+
+	return z
+}
+
+// Copy copies a zone *without* copying the zone's content. It is not a deep copy.
+func (z *Zone) Copy() *Zone {
+	z1 := NewZone(z.origin, z.file)
+	z1.TransferTo = z.TransferTo
+	z1.TransferFrom = z.TransferFrom
+	z1.Expired = z.Expired
+	z1.Apex = z.Apex
+	return z1
+}
+
+// Insert inserts r into z.
+func (z *Zone) Insert(r dns.RR) error {
+	r.Header().Name = strings.ToLower(r.Header().Name)
+
+	switch h := r.Header().Rrtype; h {
+	case dns.TypeNS:
+		r.(*dns.NS).Ns = strings.ToLower(r.(*dns.NS).Ns)
+
+		if r.Header().Name == z.origin {
+			z.Apex.NS = append(z.Apex.NS, r)
+			return nil
+		}
+	case dns.TypeSOA:
+		r.(*dns.SOA).Ns = strings.ToLower(r.(*dns.SOA).Ns)
+		r.(*dns.SOA).Mbox = strings.ToLower(r.(*dns.SOA).Mbox)
+
+		z.Apex.SOA = r.(*dns.SOA)
+		return nil
+	case dns.TypeNSEC3, dns.TypeNSEC3PARAM:
+		return fmt.Errorf("NSEC3 zone is not supported, dropping RR: %s for zone: %s", r.Header().Name, z.origin)
+	case dns.TypeRRSIG:
+		x := r.(*dns.RRSIG)
+		switch x.TypeCovered {
+		case dns.TypeSOA:
+			z.Apex.SIGSOA = append(z.Apex.SIGSOA, x)
+			return nil
+		case dns.TypeNS:
+			if r.Header().Name == z.origin {
+				z.Apex.SIGNS = append(z.Apex.SIGNS, x)
+				return nil
+			}
+		}
+	case dns.TypeCNAME:
+		r.(*dns.CNAME).Target = strings.ToLower(r.(*dns.CNAME).Target)
+	case dns.TypeMX:
+		r.(*dns.MX).Mx = strings.ToLower(r.(*dns.MX).Mx)
+	case dns.TypeSRV:
+		r.(*dns.SRV).Target = strings.ToLower(r.(*dns.SRV).Target)
+	}
+
+	z.Tree.Insert(r)
+	return nil
+}
+
+// Delete deletes r from z.
+func (z *Zone) Delete(r dns.RR) { z.Tree.Delete(r) }
+
+// TransferAllowed checks if incoming request for transferring the zone is allowed according to the ACLs.
+func (z *Zone) TransferAllowed(req request.Request) bool {
+	for _, t := range z.TransferTo {
+		if t == "*" {
+			return true
+		}
+	}
+	// TODO(miek): future matching against IP/CIDR notations
+	return false
+}
+
+// All returns all records from the zone, the first record will be the SOA record,
+// otionally followed by all RRSIG(SOA)s.
+func (z *Zone) All() []dns.RR {
+	if !z.NoReload {
+		z.reloadMu.RLock()
+		defer z.reloadMu.RUnlock()
+	}
+
+	records := []dns.RR{}
+	allNodes := z.Tree.All()
+	for _, a := range allNodes {
+		records = append(records, a.All()...)
+	}
+
+	if len(z.Apex.SIGNS) > 0 {
+		records = append(z.Apex.SIGNS, records...)
+	}
+	records = append(z.Apex.NS, records...)
+
+	if len(z.Apex.SIGSOA) > 0 {
+		records = append(z.Apex.SIGSOA, records...)
+	}
+	return append([]dns.RR{z.Apex.SOA}, records...)
+}
+
+// Reload reloads a zone when it is changed on disk. If z.NoRoload is true, no reloading will be done.
+func (z *Zone) Reload() error {
+	if z.NoReload {
+		return nil
+	}
+	watcher, err := fsnotify.NewWatcher()
+	if err != nil {
+		return err
+	}
+	err = watcher.Add(path.Dir(z.file))
+	if err != nil {
+		return err
+	}
+
+	go func() {
+		// TODO(miek): needs to be killed on reload.
+		for {
+			select {
+			case event := <-watcher.Events:
+				if path.Clean(event.Name) == z.file {
+
+					reader, err := os.Open(z.file)
+					if err != nil {
+						log.Printf("[ERROR] Failed to open `%s' for `%s': %v", z.file, z.origin, err)
+						continue
+					}
+					zone, err := Parse(reader, z.origin, z.file)
+					if err != nil {
+						log.Printf("[ERROR] Failed to parse `%s': %v", z.origin, err)
+						continue
+					}
+
+					// copy elements we need
+					z.reloadMu.Lock()
+					z.Apex = zone.Apex
+					z.Tree = zone.Tree
+					z.reloadMu.Unlock()
+
+					log.Printf("[INFO] Successfully reloaded zone `%s'", z.origin)
+					z.Notify()
+				}
+			case <-z.ReloadShutdown:
+				watcher.Close()
+				return
+			}
+		}
+	}()
+	return nil
+}
+
+// Print prints the zone's tree to stdout.
+func (z *Zone) Print() {
+	z.Tree.Print()
+}
+
+// NameFromRight returns the labels from the right, staring with the
+// origin and then i labels extra. When we are overshooting the name
+// the returned boolean is set to true.
+func (z *Zone) nameFromRight(qname string, i int) (string, bool) {
+	if i <= 0 {
+		return z.origin, false
+	}
+
+	for j := 1; j <= z.origLen; j++ {
+		if _, shot := dns.PrevLabel(qname, j); shot {
+			return qname, shot
+		}
+	}
+
+	k := 0
+	shot := false
+	for j := 1; j <= i; j++ {
+		k, shot = dns.PrevLabel(qname, j+z.origLen)
+		if shot {
+			return qname, shot
+		}
+	}
+	return qname[k:], false
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/file/zone_test.go b/vendor/github.com/miekg/coredns/middleware/file/zone_test.go
new file mode 100644
index 0000000000..c9ff174db1
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/file/zone_test.go
@@ -0,0 +1,30 @@
+package file
+
+import "testing"
+
+func TestNameFromRight(t *testing.T) {
+	z := NewZone("example.org.", "stdin")
+
+	tests := []struct {
+		in       string
+		labels   int
+		shot     bool
+		expected string
+	}{
+		{"example.org.", 0, false, "example.org."},
+		{"a.example.org.", 0, false, "example.org."},
+		{"a.example.org.", 1, false, "a.example.org."},
+		{"a.example.org.", 2, true, "a.example.org."},
+		{"a.b.example.org.", 2, false, "a.b.example.org."},
+	}
+
+	for i, tc := range tests {
+		got, shot := z.nameFromRight(tc.in, tc.labels)
+		if got != tc.expected {
+			t.Errorf("Test %d: expected %s, got %s\n", i, tc.expected, got)
+		}
+		if shot != tc.shot {
+			t.Errorf("Test %d: expected shot to be %t, got %t\n", i, tc.shot, shot)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/health/README.md b/vendor/github.com/miekg/coredns/middleware/health/README.md
new file mode 100644
index 0000000000..aee23ceae8
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/health/README.md
@@ -0,0 +1,21 @@
+# health
+
+This module enables a simple health check endpoint.
+By default it will listen on port 8080.
+
+## Syntax
+
+~~~
+health [ADDRESS]
+~~~
+
+Optionally takes an address; the default is `:8080`. The health path is fixed to `/health`. It
+will just return "OK" when CoreDNS is healthy, which currently mean: it is up and running.
+
+This middleware only needs to be enabled once.
+
+## Examples
+
+~~~
+health localhost:8091
+~~~
diff --git a/vendor/github.com/miekg/coredns/middleware/health/health.go b/vendor/github.com/miekg/coredns/middleware/health/health.go
new file mode 100644
index 0000000000..08aa847d2a
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/health/health.go
@@ -0,0 +1,59 @@
+// Package health implements an HTTP handler that responds to health checks.
+package health
+
+import (
+	"io"
+	"log"
+	"net"
+	"net/http"
+	"sync"
+)
+
+var once sync.Once
+
+type health struct {
+	Addr string
+
+	ln  net.Listener
+	mux *http.ServeMux
+}
+
+func (h *health) Startup() error {
+	if h.Addr == "" {
+		h.Addr = defAddr
+	}
+
+	once.Do(func() {
+		ln, err := net.Listen("tcp", h.Addr)
+		if err != nil {
+			log.Printf("[ERROR] Failed to start health handler: %s", err)
+			return
+		}
+
+		h.ln = ln
+
+		h.mux = http.NewServeMux()
+
+		h.mux.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {
+			io.WriteString(w, ok)
+		})
+
+		go func() {
+			http.Serve(h.ln, h.mux)
+		}()
+	})
+	return nil
+}
+
+func (h *health) Shutdown() error {
+	if h.ln != nil {
+		return h.ln.Close()
+	}
+	return nil
+}
+
+const (
+	ok      = "OK"
+	defAddr = ":8080"
+	path    = "/health"
+)
diff --git a/vendor/github.com/miekg/coredns/middleware/health/health_test.go b/vendor/github.com/miekg/coredns/middleware/health/health_test.go
new file mode 100644
index 0000000000..de95eb1033
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/health/health_test.go
@@ -0,0 +1,37 @@
+package health
+
+import (
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"testing"
+)
+
+func TestHealth(t *testing.T) {
+	// We use a random port instead of a fixed port like 8080 that may have been
+	// occupied by some other process.
+	h := health{Addr: ":0"}
+	if err := h.Startup(); err != nil {
+		t.Fatalf("Unable to startup the health server: %v", err)
+	}
+	defer h.Shutdown()
+
+	// Reconstruct the http address based on the port allocated by operating system.
+	address := fmt.Sprintf("http://%s%s", h.ln.Addr().String(), path)
+
+	response, err := http.Get(address)
+	if err != nil {
+		t.Fatalf("Unable to query %s: %v", address, err)
+	}
+	defer response.Body.Close()
+	if response.StatusCode != 200 {
+		t.Errorf("Invalid status code: expecting '200', got '%d'", response.StatusCode)
+	}
+	content, err := ioutil.ReadAll(response.Body)
+	if err != nil {
+		t.Fatalf("Unable to get response body from %s: %v", address, err)
+	}
+	if string(content) != "OK" {
+		t.Errorf("Invalid response body: expecting 'OK', got '%s'", string(content))
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/health/setup.go b/vendor/github.com/miekg/coredns/middleware/health/setup.go
new file mode 100644
index 0000000000..f698d9603f
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/health/setup.go
@@ -0,0 +1,46 @@
+package health
+
+import (
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/mholt/caddy"
+)
+
+func init() {
+	caddy.RegisterPlugin("health", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setup,
+	})
+}
+
+func setup(c *caddy.Controller) error {
+	addr, err := healthParse(c)
+	if err != nil {
+		return middleware.Error("health", err)
+	}
+
+	h := &health{Addr: addr}
+	c.OnStartup(h.Startup)
+	c.OnShutdown(h.Shutdown)
+
+	// Don't do AddMiddleware, as health is not *really* a middleware just a separate
+	// webserver running.
+
+	return nil
+}
+
+func healthParse(c *caddy.Controller) (string, error) {
+	addr := ""
+	for c.Next() {
+		args := c.RemainingArgs()
+
+		switch len(args) {
+		case 0:
+		case 1:
+			addr = args[0]
+		default:
+			return "", c.ArgErr()
+		}
+	}
+	return addr, nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/kubernetes/DEV-README.md b/vendor/github.com/miekg/coredns/middleware/kubernetes/DEV-README.md
new file mode 100644
index 0000000000..be937e27bd
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/kubernetes/DEV-README.md
@@ -0,0 +1,159 @@
+# Basic Setup for Development and Testing
+
+## Launch Kubernetes
+
+Kubernetes is launched using the commands in the `.travis/kubernetes/00_run_k8s.sh` script.
+
+## Configure kubectl and Test
+
+The kubernetes control client can be downloaded from the generic URL:
+`http://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/${GOOS}/${GOARCH}/${K8S_BINARY}`
+
+For example, the kubectl client for Linux can be downloaded using the command:
+`curl -sSL "http://storage.googleapis.com/kubernetes-release/release/v1.2.4/bin/linux/amd64/kubectl"`
+
+The `contrib/kubernetes/testscripts/10_setup_kubectl.sh` script can be stored in the same directory as
+kubectl to setup kubectl to communicate with kubernetes running on the localhost.
+
+## Launch a kubernetes service and expose the service
+
+The following commands will create a kubernetes namespace "demo",
+launch an nginx service in the namespace, and expose the service on port 80:
+
+~~~
+$ ./kubectl create namespace demo
+$ ./kubectl get namespace
+
+$ ./kubectl run mynginx --namespace=demo --image=nginx
+$ ./kubectl get deployment --namespace=demo
+
+$ ./kubectl expose deployment mynginx --namespace=demo --port=80
+$ ./kubectl get service --namespace=demo
+~~~
+
+The script `.travis/kubernetes/20_setup_k8s_services.sh` creates a couple of sample namespaces
+with services running in those namespaces. The automated kubernetes integration tests in
+`test/kubernetes_test.go` depend on these services and namespaces to exist in kubernetes.
+
+
+## Launch CoreDNS
+
+Build CoreDNS and launch using this configuration file:
+
+~~~ txt
+# Serve on port 53
+.:53 {
+    kubernetes coredns.local {
+        resyncperiod 5m
+        endpoint http://localhost:8080
+        namespaces demo
+        # Only expose the records for kubernetes objects
+        # that matches this label selector. 
+        # See http://kubernetes.io/docs/user-guide/labels/
+        # Example selector below only exposes objects tagged as
+        # "application=nginx" in the staging or qa environments.
+        #labels environment in (staging, qa),application=nginx
+    }
+    #cache 180 coredns.local # optionally enable caching
+}
+~~~
+
+Put it in `~/k8sCorefile` for instance. This configuration file sets up CoreDNS to use the zone
+`coredns.local` for the kubernetes services.
+
+The command to launch CoreDNS is:
+
+~~~
+$ ./coredns -conf ~/k8sCorefile
+~~~
+
+In a separate terminal a DNS query can be issued using dig:
+
+~~~
+$ dig @localhost mynginx.demo.coredns.local
+
+;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 47614
+;; flags: qr aa rd ra; QUERY: 1, ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 1
+
+;; OPT PSEUDOSECTION:
+; EDNS: version: 0, flags:; udp: 4096
+;; QUESTION SECTION:
+;mynginx.demo.coredns.local.    IN  A
+
+;; ANSWER SECTION:
+mynginx.demo.coredns.local. 0   IN  A   10.0.0.10
+
+;; Query time: 2 msec
+;; SERVER: ::1#53(::1)
+;; WHEN: Thu Jun 02 11:07:18 PDT 2016
+;; MSG SIZE  rcvd: 71
+~~~
+
+# Implementation Notes/Ideas
+
+## Internal IP or External IP?
+* Should the Corefile configuration allow control over whether the internal IP or external IP is exposed?
+* If the Corefile configuration allows control over internal IP or external IP, then the config should allow users to control the precedence.
+
+For example a service "myservice" running in namespace "mynamespace" with internal IP "10.0.0.100" and external IP "1.2.3.4".
+
+This example could be published as:
+
+| Corefile directive           | Result              |
+|------------------------------|---------------------|
+| iporder = internal           | 10.0.0.100          |
+| iporder = external           | 1.2.3.4             |
+| iporder = external, internal | 10.0.0.100, 1.2.3.4 |
+| iporder = internal, external | 1.2.3.4, 10.0.0.100 |
+| _no directive_               | 10.0.0.100, 1.2.3.4 |
+
+
+## TODO
+* SkyDNS compatibility/equivalency:
+	* Kubernetes packaging and execution
+		* Automate packaging to allow executing in Kubernetes. That is, add Docker
+		  container build as target in Makefile. Also include anything else needed
+		  to simplify launch as the k8s DNS service.
+		  Note: Dockerfile already exists in coredns repo to build the docker image.
+		  This work item should identify how to pass configuration and run as a SkyDNS
+		  replacement.
+		* Identify any kubernetes changes necessary to use coredns as k8s DNS server. That is,
+		  how do we consume the "--cluster-dns=" and "--cluster-domain=" arguments.
+		* Work out how to pass CoreDNS configuration via kubectl command line and yaml
+		  service definition file.
+		* Ensure that resolver in each kubernetes container is configured to use
+		  coredns instance.
+		* Update kubernetes middleware documentation to describe running CoreDNS as a
+		  SkyDNS replacement. (Include descriptions of different ways to pass CoreFile
+		  to coredns command.)
+		* Remove dependency on healthz for health checking in
+		  `kubernetes-rc.yaml` file.
+	* Functional work
+		* Calculate SRV priority based on number of instances running.
+		  (See SkyDNS README.md)
+	* Performance
+		* Improve lookup to reduce size of query result obtained from k8s API.
+		  (namespace-based?, other ideas?)
+		* reduce cache size by caching data into custom structs, instead of caching whole API objects
+		* add (and use) indexes on the caches that support indexing
+* Additional features:
+	* Implement IP selection and ordering (internal/external). Related to
+	  wildcards and SkyDNS use of CNAMES.
+	* Expose arbitrary kubernetes repository data as TXT records?
+* DNS Correctness
+	* Do we need to generate synthetic zone records for namespaces?
+	* Do we need to generate synthetic zone records for the skydns synthetic zones?
+* Test cases
+	* Implement test cases for SkyDNS equivalent functionality.
+	* Add test cases for lables based filtering
+	* Test with CoreDNS caching. CoreDNS caching for DNS response is working
+	  using the `cache` directive. Tested working using 20s cache timeout
+	  and A-record queries. Automate testing with cache in place.
+	* Automate CoreDNS performance tests. Initially for zone files, and for
+	  pre-loaded k8s API cache. With and without CoreDNS response caching.
+    * Try to get rid of kubernetes launch scripts by moving operations into
+      .travis.yml file.
+    * Find root cause of timing condition that results in no data returned to
+      test client when running k8s integration tests. Current work-around is a
+      nasty hack of waiting 5 seconds after setting up test server before performing
+      client calls. (See hack in test/kubernetes_test.go)
diff --git a/vendor/github.com/miekg/coredns/middleware/kubernetes/README.md b/vendor/github.com/miekg/coredns/middleware/kubernetes/README.md
new file mode 100644
index 0000000000..9232e4756c
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/kubernetes/README.md
@@ -0,0 +1,132 @@
+# kubernetes
+
+*kubernetes* enables reading zone data from a kubernetes cluster.
+It implements the [spec](https://github.com/kubernetes/dns/blob/master/docs/specification.md)
+defined for kubernetes DNS-Based service discovery:
+
+Service `A` records are constructed as "myservice.mynamespace.svc.coredns.local" where:
+
+* "myservice" is the name of the k8s service
+* "mynamespace" is the k8s namespace for the service, and
+* "svc" indicates this is a service
+* "coredns.local" is the zone
+
+Pod `A` records are constructed as "1-2-3-4.mynamespace.pod.coredns.local" where:
+
+* "1-2-3-4" is derived from the ip address of the pod (1.2.3.4 in this example)
+* "mynamespace" is the k8s namespace for the service, and
+* "pod" indicates this is a pod
+* "coredns.local" is the zone
+
+Endpoint `A` records are constructed as "epname.myservice.mynamespace.svc.coredns.local" where:
+
+* "epname" is the hostname (or name constructed from IP) of the endpoint
+* "myservice" is the name of the k8s service that the endpoint serves
+* "mynamespace" is the k8s namespace for the service, and
+* "svc" indicates this is a service
+* "coredns.local" is the zone
+
+Also supported are PTR and SRV records for services/endpoints.
+
+## Syntax
+
+This is an example kubernetes configuration block, with all options described:
+
+```
+# kubernetes <zone> [<zone>] ...
+#
+# Use kubernetes middleware for domain "coredns.local"
+# Reverse domain zones can be defined here (e.g. 0.0.10.in-addr.arpa),
+# or instead with the "cidrs" option.
+#
+kubernetes coredns.local {
+
+	# resyncperiod <period>
+	#
+	# Kubernetes data API resync period. Default is 5m
+	# Example values: 60s, 5m, 1h
+	#
+	resyncperiod 5m
+
+	# endpoint <url>
+	#
+	# Use url for a remote k8s API endpoint.  If omitted, it will connect to
+	# k8s in-cluster using the cluster service account.
+	#
+	endpoint https://k8s-endpoint:8080
+
+	# tls <cert-filename> <key-filename> <cacert-filename>
+	#
+	# The tls cert, key and the CA cert filenanames for remote k8s connection.
+	# This option is ignored if connecting in-cluster (i.e. endpoint is not
+	# specified).
+	#
+	tls cert key cacert
+
+	# namespaces <namespace> [<namespace>] ...
+	#
+	# Only expose the k8s namespaces listed.  If this option is omitted
+	# all namespaces are exposed
+	#
+	namespaces demo
+
+	# lables <expression> [,<expression>] ...
+	#
+	# Only expose the records for kubernetes objects
+	# that match this label selector. The label
+	# selector syntax is described in the kubernetes
+	# API documentation: http://kubernetes.io/docs/user-guide/labels/
+	# Example selector below only exposes objects tagged as
+	# "application=nginx" in the staging or qa environments.
+	#
+	labels environment in (staging, qa),application=nginx
+
+	# pods <disabled|insecure|verified>
+	#
+	# Set the mode of responding to pod A record requests.
+	# e.g 1-2-3-4.ns.pod.zone.  This option is provided to allow use of
+	# SSL certs when connecting directly to pods.
+	# Valid values: disabled, verified, insecure
+	#  disabled: Do not process pod requests, always returning NXDOMAIN
+	#  insecure: Always return an A record with IP from request (without
+	#            checking k8s).  This option is is vulnerable to abuse if
+	#            used maliciously in conjuction with wildcard SSL certs.
+	#  verified: Return an A record if there exists a pod in same
+	#            namespace with matching IP.  This option requires
+	#            substantially more memory than in insecure mode, since it
+	#            will maintain a watch on all pods.
+	# Default value is "disabled".
+	#
+	pods disabled
+
+	# cidrs <cidr> [<cidr>] ...
+	#
+	# Expose cidr ranges to reverse lookups.  Include any number of space
+	# delimited cidrs, and or multiple cidrs options on separate lines.
+	# kubernetes middleware will respond to PTR requests for ip addresses
+	# that fall within these ranges.
+	#
+	cidrs 10.0.0.0/24 10.0.10.0/25
+
+}
+
+```
+
+## Wildcards
+
+Some query labels accept a wildcard value to match any value.
+If a label is a valid wildcard (\*, or the word "any"), then that label will match
+all values.  The labels that accept wildcards are:
+* _service_ in an `A` record request: _service_.namespace.svc.zone.
+   * e.g. `*.ns.svc.myzone.local`
+* _namespace_ in an `A` record request: service._namespace_.svc.zone.
+   * e.g. `nginx.*.svc.myzone.local`
+* _port and/or protocol_ in an `SRV` request: __port_.__protocol_.service.namespace.svc.zone.
+   * e.g. `_http.*.service.ns.svc.`
+* multiple wild cards are allowed in a single query.
+   * e.g. `A` Request `*.*.svc.zone.` or `SRV` request `*.*.*.*.svc.zone.`
+
+## Deployment in Kubernetes
+
+See the [deployment](https://github.com/coredns/deployment) repository for details on how
+to deploy CoreDNS in Kubernetes.
diff --git a/vendor/github.com/miekg/coredns/middleware/kubernetes/SkyDNS.md b/vendor/github.com/miekg/coredns/middleware/kubernetes/SkyDNS.md
new file mode 100644
index 0000000000..02fbc8115f
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/kubernetes/SkyDNS.md
@@ -0,0 +1,44 @@
+## DNS Schema
+
+Notes about the SkyDNS record naming scheme. (Copied from SkyDNS project README for reference while
+hacking on the k8s middleware.)
+
+### Services
+
+#### A Records
+
+"Normal" (not headless) Services are assigned a DNS A record for a name of the form `my-svc.my-namespace.svc.cluster.local.`
+This resolves to the cluster IP of the Service.
+
+"Headless" (without a cluster IP) Services are also assigned a DNS A record for a name of the form `my-svc.my-namespace.svc.cluster.local.`
+Unlike normal Services, this resolves to the set of IPs of the pods selected by the Service.
+Clients are expected to consume the set or else use standard round-robin selection from the set.
+
+
+### Pods
+
+#### A Records
+
+When enabled, pods are assigned a DNS A record in the form of `pod-ip-address.my-namespace.pod.cluster.local.`
+
+For example, a pod with ip `1.2.3.4` in the namespace default with a dns name of `cluster.local` would have 
+an entry: `1-2-3-4.default.pod.cluster.local.`
+
+####A Records and hostname Based on Pod Annotations - A Beta Feature in Kubernetes v1.2
+Currently when a pod is created, its hostname is the Pod's `metadata.name` value.
+With v1.2, users can specify a Pod annotation, `pod.beta.kubernetes.io/hostname`, to specify what the Pod's hostname should be.
+If the annotation is specified, the annotation value takes precedence over the Pod's name, to be the hostname of the pod.
+For example, given a Pod with annotation `pod.beta.kubernetes.io/hostname: my-pod-name`, the Pod will have its hostname set to "my-pod-name".
+
+v1.2 introduces a beta feature where the user can specify a Pod annotation, `pod.beta.kubernetes.io/subdomain`, to specify what the Pod's subdomain should be.
+If the annotation is specified, the fully qualified Pod hostname will be "<hostname>.<subdomain>.<pod namespace>.svc.<cluster domain>".
+For example, given a Pod with the hostname annotation set to "foo", and the subdomain annotation set to "bar", in namespace "my-namespace", the pod will set its own FQDN as "foo.bar.my-namespace.svc.cluster.local"
+
+If there exists a headless service in the same namespace as the pod and with the same name as the subdomain, the cluster's KubeDNS Server will also return an A record for the Pod's fully qualified hostname.
+Given a Pod with the hostname annotation set to "foo" and the subdomain annotation set to "bar", and a headless Service named "bar" in the same namespace, the pod will see it's own FQDN as "foo.bar.my-namespace.svc.cluster.local". DNS will serve an A record at that name, pointing to the Pod's IP.
+
+With v1.2, the Endpoints object also has a new annotation `endpoints.beta.kubernetes.io/hostnames-map`. Its value is the json representation of map[string(IP)][endpoints.HostRecord], for example: '{"10.245.1.6":{HostName: "my-webserver"}}'.
+If the Endpoints are for a headless service, then A records will be created with the format <hostname>.<service name>.<pod namespace>.svc.<cluster domain>
+For the example json, if endpoints are for a headless service named "bar", and one of the endpoints has IP "10.245.1.6", then a A record will be created with the name "my-webserver.bar.my-namespace.svc.cluster.local" and the A record lookup would return "10.245.1.6".
+This endpoints annotation generally does not need to be specified by end-users, but can used by the internal service controller to deliver the aforementioned feature.
+
diff --git a/vendor/github.com/miekg/coredns/middleware/kubernetes/controller.go b/vendor/github.com/miekg/coredns/middleware/kubernetes/controller.go
new file mode 100644
index 0000000000..e6e79366ae
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/kubernetes/controller.go
@@ -0,0 +1,360 @@
+package kubernetes
+
+import (
+	"errors"
+	"fmt"
+	"log"
+	"sync"
+	"time"
+
+	"k8s.io/client-go/1.5/kubernetes"
+	"k8s.io/client-go/1.5/pkg/api"
+	"k8s.io/client-go/1.5/pkg/api/v1"
+	"k8s.io/client-go/1.5/pkg/labels"
+	"k8s.io/client-go/1.5/pkg/runtime"
+	"k8s.io/client-go/1.5/pkg/watch"
+	"k8s.io/client-go/1.5/tools/cache"
+)
+
+var (
+	namespace = api.NamespaceAll
+)
+
+// storeToNamespaceLister makes a Store that lists Namespaces.
+type storeToNamespaceLister struct {
+	cache.Store
+}
+
+const podIPIndex = "PodIP"
+
+// List lists all Namespaces in the store.
+func (s *storeToNamespaceLister) List() (ns api.NamespaceList, err error) {
+	for _, m := range s.Store.List() {
+		ns.Items = append(ns.Items, *(m.(*api.Namespace)))
+	}
+	return ns, nil
+}
+
+type dnsController struct {
+	client *kubernetes.Clientset
+
+	selector *labels.Selector
+
+	svcController *cache.Controller
+	podController *cache.Controller
+	nsController  *cache.Controller
+	epController  *cache.Controller
+
+	svcLister cache.StoreToServiceLister
+	podLister cache.StoreToPodLister
+	nsLister  storeToNamespaceLister
+	epLister  cache.StoreToEndpointsLister
+
+	// stopLock is used to enforce only a single call to Stop is active.
+	// Needed because we allow stopping through an http endpoint and
+	// allowing concurrent stoppers leads to stack traces.
+	stopLock sync.Mutex
+	shutdown bool
+	stopCh   chan struct{}
+}
+
+// newDNSController creates a controller for CoreDNS.
+func newdnsController(kubeClient *kubernetes.Clientset, resyncPeriod time.Duration, lselector *labels.Selector, initPodCache bool) *dnsController {
+	dns := dnsController{
+		client:   kubeClient,
+		selector: lselector,
+		stopCh:   make(chan struct{}),
+	}
+
+	dns.svcLister.Indexer, dns.svcController = cache.NewIndexerInformer(
+		&cache.ListWatch{
+			ListFunc:  serviceListFunc(dns.client, namespace, dns.selector),
+			WatchFunc: serviceWatchFunc(dns.client, namespace, dns.selector),
+		},
+		&api.Service{},
+		resyncPeriod,
+		cache.ResourceEventHandlerFuncs{},
+		cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
+
+	if initPodCache {
+		dns.podLister.Indexer, dns.podController = cache.NewIndexerInformer(
+			&cache.ListWatch{
+				ListFunc:  podListFunc(dns.client, namespace, dns.selector),
+				WatchFunc: podWatchFunc(dns.client, namespace, dns.selector),
+			},
+			&api.Pod{}, // TODO replace with a lighter-weight custom struct
+			resyncPeriod,
+			cache.ResourceEventHandlerFuncs{},
+			cache.Indexers{podIPIndex: podIPIndexFunc})
+	}
+
+	dns.nsLister.Store, dns.nsController = cache.NewInformer(
+		&cache.ListWatch{
+			ListFunc:  namespaceListFunc(dns.client, dns.selector),
+			WatchFunc: namespaceWatchFunc(dns.client, dns.selector),
+		},
+		&api.Namespace{}, resyncPeriod, cache.ResourceEventHandlerFuncs{})
+
+	dns.epLister.Store, dns.epController = cache.NewInformer(
+		&cache.ListWatch{
+			ListFunc:  endpointsListFunc(dns.client, namespace, dns.selector),
+			WatchFunc: endpointsWatchFunc(dns.client, namespace, dns.selector),
+		},
+		&api.Endpoints{}, resyncPeriod, cache.ResourceEventHandlerFuncs{})
+
+	return &dns
+}
+
+func podIPIndexFunc(obj interface{}) ([]string, error) {
+	p, ok := obj.(*api.Pod)
+	if !ok {
+		return nil, errors.New("obj was not an *api.Pod")
+	}
+	return []string{p.Status.PodIP}, nil
+}
+
+func serviceListFunc(c *kubernetes.Clientset, ns string, s *labels.Selector) func(api.ListOptions) (runtime.Object, error) {
+	return func(opts api.ListOptions) (runtime.Object, error) {
+		if s != nil {
+			opts.LabelSelector = *s
+		}
+		listV1, err := c.Core().Services(ns).List(opts)
+
+		if err != nil {
+			return nil, err
+		}
+		var listAPI api.ServiceList
+		err = v1.Convert_v1_ServiceList_To_api_ServiceList(listV1, &listAPI, nil)
+		if err != nil {
+			return nil, err
+		}
+		return &listAPI, err
+	}
+}
+
+func podListFunc(c *kubernetes.Clientset, ns string, s *labels.Selector) func(api.ListOptions) (runtime.Object, error) {
+	return func(opts api.ListOptions) (runtime.Object, error) {
+		if s != nil {
+			opts.LabelSelector = *s
+		}
+		listV1, err := c.Core().Pods(ns).List(opts)
+
+		if err != nil {
+			return nil, err
+		}
+		var listAPI api.PodList
+		err = v1.Convert_v1_PodList_To_api_PodList(listV1, &listAPI, nil)
+		if err != nil {
+			return nil, err
+		}
+
+		return &listAPI, err
+	}
+}
+
+func v1ToAPIFilter(in watch.Event) (out watch.Event, keep bool) {
+	if in.Type == watch.Error {
+		return in, true
+	}
+
+	switch v1Obj := in.Object.(type) {
+	case *v1.Service:
+		var apiObj api.Service
+		err := v1.Convert_v1_Service_To_api_Service(v1Obj, &apiObj, nil)
+		if err != nil {
+			log.Printf("[ERROR] Could not convert v1.Service: %s", err)
+			return in, true
+		}
+		return watch.Event{Type: in.Type, Object: &apiObj}, true
+	case *v1.Pod:
+		var apiObj api.Pod
+		err := v1.Convert_v1_Pod_To_api_Pod(v1Obj, &apiObj, nil)
+		if err != nil {
+			log.Printf("[ERROR] Could not convert v1.Pod: %s", err)
+			return in, true
+		}
+		return watch.Event{Type: in.Type, Object: &apiObj}, true
+	case *v1.Namespace:
+		var apiObj api.Namespace
+		err := v1.Convert_v1_Namespace_To_api_Namespace(v1Obj, &apiObj, nil)
+		if err != nil {
+			log.Printf("[ERROR] Could not convert v1.Namespace: %s", err)
+			return in, true
+		}
+		return watch.Event{Type: in.Type, Object: &apiObj}, true
+	case *v1.Endpoints:
+		var apiObj api.Endpoints
+		err := v1.Convert_v1_Endpoints_To_api_Endpoints(v1Obj, &apiObj, nil)
+		if err != nil {
+			log.Printf("[ERROR] Could not convert v1.Endpoint: %s", err)
+			return in, true
+		}
+		return watch.Event{Type: in.Type, Object: &apiObj}, true
+	}
+
+	log.Printf("[WARN] Unhandled v1 type in event: %v", in)
+	return in, true
+}
+
+func serviceWatchFunc(c *kubernetes.Clientset, ns string, s *labels.Selector) func(options api.ListOptions) (watch.Interface, error) {
+	return func(options api.ListOptions) (watch.Interface, error) {
+		if s != nil {
+			options.LabelSelector = *s
+		}
+		w, err := c.Core().Services(ns).Watch(options)
+		if err != nil {
+			return nil, err
+		}
+		return watch.Filter(w, v1ToAPIFilter), nil
+	}
+}
+
+func podWatchFunc(c *kubernetes.Clientset, ns string, s *labels.Selector) func(options api.ListOptions) (watch.Interface, error) {
+	return func(options api.ListOptions) (watch.Interface, error) {
+		if s != nil {
+			options.LabelSelector = *s
+		}
+		w, err := c.Core().Pods(ns).Watch(options)
+
+		if err != nil {
+			return nil, err
+		}
+		return watch.Filter(w, v1ToAPIFilter), nil
+	}
+}
+
+func namespaceListFunc(c *kubernetes.Clientset, s *labels.Selector) func(api.ListOptions) (runtime.Object, error) {
+	return func(opts api.ListOptions) (runtime.Object, error) {
+		if s != nil {
+			opts.LabelSelector = *s
+		}
+		listV1, err := c.Core().Namespaces().List(opts)
+		if err != nil {
+			return nil, err
+		}
+		var listAPI api.NamespaceList
+		err = v1.Convert_v1_NamespaceList_To_api_NamespaceList(listV1, &listAPI, nil)
+		if err != nil {
+			return nil, err
+		}
+		return &listAPI, err
+	}
+}
+
+func namespaceWatchFunc(c *kubernetes.Clientset, s *labels.Selector) func(options api.ListOptions) (watch.Interface, error) {
+	return func(options api.ListOptions) (watch.Interface, error) {
+		if s != nil {
+			options.LabelSelector = *s
+		}
+		w, err := c.Core().Namespaces().Watch(options)
+		if err != nil {
+			return nil, err
+		}
+		return watch.Filter(w, v1ToAPIFilter), nil
+	}
+}
+
+func endpointsListFunc(c *kubernetes.Clientset, ns string, s *labels.Selector) func(api.ListOptions) (runtime.Object, error) {
+	return func(opts api.ListOptions) (runtime.Object, error) {
+		if s != nil {
+			opts.LabelSelector = *s
+		}
+		listV1, err := c.Core().Endpoints(ns).List(opts)
+
+		if err != nil {
+			return nil, err
+		}
+		var listAPI api.EndpointsList
+		err = v1.Convert_v1_EndpointsList_To_api_EndpointsList(listV1, &listAPI, nil)
+		if err != nil {
+			return nil, err
+		}
+		return &listAPI, err
+	}
+}
+
+func endpointsWatchFunc(c *kubernetes.Clientset, ns string, s *labels.Selector) func(options api.ListOptions) (watch.Interface, error) {
+	return func(options api.ListOptions) (watch.Interface, error) {
+		if s != nil {
+			options.LabelSelector = *s
+		}
+		w, err := c.Core().Endpoints(ns).Watch(options)
+		if err != nil {
+			return nil, err
+		}
+		return watch.Filter(w, v1ToAPIFilter), nil
+	}
+}
+
+func (dns *dnsController) controllersInSync() bool {
+	return dns.svcController.HasSynced()
+}
+
+// Stop stops the  controller.
+func (dns *dnsController) Stop() error {
+	dns.stopLock.Lock()
+	defer dns.stopLock.Unlock()
+
+	// Only try draining the workqueue if we haven't already.
+	if !dns.shutdown {
+		close(dns.stopCh)
+		dns.shutdown = true
+
+		return nil
+	}
+
+	return fmt.Errorf("shutdown already in progress")
+}
+
+// Run starts the controller.
+func (dns *dnsController) Run() {
+	go dns.svcController.Run(dns.stopCh)
+	go dns.nsController.Run(dns.stopCh)
+	go dns.epController.Run(dns.stopCh)
+	if dns.podController != nil {
+		go dns.podController.Run(dns.stopCh)
+	}
+	<-dns.stopCh
+}
+
+func (dns *dnsController) NamespaceList() *api.NamespaceList {
+	nsList, err := dns.nsLister.List()
+	if err != nil {
+		return &api.NamespaceList{}
+	}
+
+	return &nsList
+}
+
+func (dns *dnsController) ServiceList() []*api.Service {
+	svcs, err := dns.svcLister.List(labels.Everything())
+	if err != nil {
+		return []*api.Service{}
+	}
+
+	return svcs
+}
+
+// ServicesByNamespace returns a map of:
+//
+// namespacename :: [ kubernetesService ]
+func (dns *dnsController) ServicesByNamespace() map[string][]api.Service {
+	k8sServiceList := dns.ServiceList()
+	items := make(map[string][]api.Service, len(k8sServiceList))
+	for _, i := range k8sServiceList {
+		namespace := i.Namespace
+		items[namespace] = append(items[namespace], *i)
+	}
+
+	return items
+}
+
+// ServiceInNamespace returns the Service that matches servicename in the namespace
+func (dns *dnsController) ServiceInNamespace(namespace, servicename string) *api.Service {
+	svcObj, err := dns.svcLister.Services(namespace).Get(servicename)
+	if err != nil {
+		// TODO(...): should return err here
+		return nil
+	}
+	return svcObj
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/kubernetes/handler.go b/vendor/github.com/miekg/coredns/middleware/kubernetes/handler.go
new file mode 100644
index 0000000000..9dfc5c5a09
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/kubernetes/handler.go
@@ -0,0 +1,96 @@
+package kubernetes
+
+import (
+	"errors"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/dnsutil"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+// ServeDNS implements the middleware.Handler interface.
+func (k Kubernetes) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	state := request.Request{W: w, Req: r}
+	if state.QClass() != dns.ClassINET {
+		return dns.RcodeServerFailure, middleware.Error(k.Name(), errors.New("can only deal with ClassINET"))
+	}
+
+	m := new(dns.Msg)
+	m.SetReply(r)
+	m.Authoritative, m.RecursionAvailable, m.Compress = true, true, true
+
+	// Check that query matches one of the zones served by this middleware,
+	// otherwise delegate to the next in the pipeline.
+	zone := middleware.Zones(k.Zones).Matches(state.Name())
+	if zone == "" {
+		if state.Type() != "PTR" {
+			return middleware.NextOrFailure(k.Name(), k.Next, ctx, w, r)
+		}
+		// If this is a PTR request, and the request is in a defined
+		// pod/service cidr range, process the request in this middleware,
+		// otherwise pass to next middleware.
+		if !k.isRequestInReverseRange(state) {
+			return middleware.NextOrFailure(k.Name(), k.Next, ctx, w, r)
+		}
+		// Set the zone to this specific request.
+		zone = state.Name()
+	}
+
+	var (
+		records, extra []dns.RR
+		err            error
+	)
+	switch state.Type() {
+	case "A":
+		records, _, err = middleware.A(&k, zone, state, nil, middleware.Options{})
+	case "AAAA":
+		records, _, err = middleware.AAAA(&k, zone, state, nil, middleware.Options{})
+	case "TXT":
+		records, _, err = middleware.TXT(&k, zone, state, middleware.Options{})
+	case "CNAME":
+		records, _, err = middleware.CNAME(&k, zone, state, middleware.Options{})
+	case "PTR":
+		records, _, err = middleware.PTR(&k, zone, state, middleware.Options{})
+	case "MX":
+		records, extra, _, err = middleware.MX(&k, zone, state, middleware.Options{})
+	case "SRV":
+		records, extra, _, err = middleware.SRV(&k, zone, state, middleware.Options{})
+	case "SOA":
+		records, _, err = middleware.SOA(&k, zone, state, middleware.Options{})
+	case "NS":
+		if state.Name() == zone {
+			records, extra, _, err = middleware.NS(&k, zone, state, middleware.Options{})
+			break
+		}
+		fallthrough
+	default:
+		// Do a fake A lookup, so we can distinguish between NODATA and NXDOMAIN
+		_, _, err = middleware.A(&k, zone, state, nil, middleware.Options{})
+	}
+	if k.IsNameError(err) {
+		// Make err nil when returning here, so we don't log spam for NXDOMAIN.
+		return middleware.BackendError(&k, zone, dns.RcodeNameError, state, nil /*debug*/, nil /* err */, middleware.Options{})
+	}
+	if err != nil {
+		return dns.RcodeServerFailure, err
+	}
+
+	if len(records) == 0 {
+		return middleware.BackendError(&k, zone, dns.RcodeSuccess, state, nil /*debug*/, nil, middleware.Options{})
+	}
+
+	m.Answer = append(m.Answer, records...)
+	m.Extra = append(m.Extra, extra...)
+
+	m = dnsutil.Dedup(m)
+	state.SizeAndDo(m)
+	m, _ = state.Scrub(m)
+	w.WriteMsg(m)
+	return dns.RcodeSuccess, nil
+}
+
+// Name implements the Handler interface.
+func (k Kubernetes) Name() string { return "kubernetes" }
diff --git a/vendor/github.com/miekg/coredns/middleware/kubernetes/kubernetes.go b/vendor/github.com/miekg/coredns/middleware/kubernetes/kubernetes.go
new file mode 100644
index 0000000000..ca2d69824a
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/kubernetes/kubernetes.go
@@ -0,0 +1,541 @@
+// Package kubernetes provides the kubernetes backend.
+package kubernetes
+
+import (
+	"errors"
+	"fmt"
+	"log"
+	"net"
+	"strings"
+	"time"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsutil"
+	dnsstrings "github.com/coredns/coredns/middleware/pkg/strings"
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+	"k8s.io/client-go/1.5/kubernetes"
+	"k8s.io/client-go/1.5/pkg/api"
+	unversionedapi "k8s.io/client-go/1.5/pkg/api/unversioned"
+	"k8s.io/client-go/1.5/pkg/labels"
+	"k8s.io/client-go/1.5/rest"
+	"k8s.io/client-go/1.5/tools/clientcmd"
+	clientcmdapi "k8s.io/client-go/1.5/tools/clientcmd/api"
+)
+
+// Kubernetes implements a middleware that connects to a Kubernetes cluster.
+type Kubernetes struct {
+	Next          middleware.Handler
+	Zones         []string
+	primaryZone   int
+	Proxy         proxy.Proxy // Proxy for looking up names during the resolution process
+	APIEndpoint   string
+	APICertAuth   string
+	APIClientCert string
+	APIClientKey  string
+	APIConn       *dnsController
+	ResyncPeriod  time.Duration
+	Namespaces    []string
+	LabelSelector *unversionedapi.LabelSelector
+	Selector      *labels.Selector
+	PodMode       string
+	ReverseCidrs  []net.IPNet
+}
+
+const (
+	// PodModeDisabled is the default value where pod requests are ignored
+	PodModeDisabled = "disabled"
+	// PodModeVerified is where Pod requests are answered only if they exist
+	PodModeVerified = "verified"
+	// PodModeInsecure is where pod requests are answered without verfying they exist
+	PodModeInsecure = "insecure"
+	// DNSSchemaVersion is the schema version: https://github.com/kubernetes/dns/blob/master/docs/specification.md
+	DNSSchemaVersion = "1.0.0"
+)
+
+type endpoint struct {
+	addr api.EndpointAddress
+	port api.EndpointPort
+}
+
+type service struct {
+	name      string
+	namespace string
+	addr      string
+	ports     []api.ServicePort
+	endpoints []endpoint
+}
+
+type pod struct {
+	name      string
+	namespace string
+	addr      string
+}
+
+type recordRequest struct {
+	port, protocol, endpoint, service, namespace, typeName, zone string
+}
+
+var errNoItems = errors.New("no items found")
+var errNsNotExposed = errors.New("namespace is not exposed")
+var errInvalidRequest = errors.New("invalid query name")
+
+// Services implements the ServiceBackend interface.
+func (k *Kubernetes) Services(state request.Request, exact bool, opt middleware.Options) ([]msg.Service, []msg.Service, error) {
+
+	r, e := k.parseRequest(state.Name(), state.Type())
+	if e != nil {
+		return nil, nil, e
+	}
+
+	switch state.Type() {
+	case "A", "SRV":
+		s, e := k.Records(r)
+		return s, nil, e // Haven't implemented debug queries yet.
+	case "TXT":
+		s, e := k.recordsForTXT(r)
+		return s, nil, e
+	}
+	return nil, nil, nil
+}
+
+func (k *Kubernetes) recordsForTXT(r recordRequest) ([]msg.Service, error) {
+	switch r.typeName {
+	case "dns-version":
+		s := msg.Service{
+			Text: DNSSchemaVersion,
+			TTL:  28800,
+			Key:  msg.Path(r.typeName+"."+r.zone, "coredns")}
+		return []msg.Service{s}, nil
+	}
+	return nil, nil
+}
+
+// PrimaryZone will return the first non-reverse zone being handled by this middleware
+func (k *Kubernetes) PrimaryZone() string {
+	return k.Zones[k.primaryZone]
+}
+
+// Reverse implements the ServiceBackend interface.
+func (k *Kubernetes) Reverse(state request.Request, exact bool, opt middleware.Options) ([]msg.Service, []msg.Service, error) {
+	ip := dnsutil.ExtractAddressFromReverse(state.Name())
+	if ip == "" {
+		return nil, nil, nil
+	}
+
+	records := k.getServiceRecordForIP(ip, state.Name())
+	return records, nil, nil
+}
+
+func (k *Kubernetes) isRequestInReverseRange(state request.Request) bool {
+	ip := dnsutil.ExtractAddressFromReverse(state.Name())
+	for _, c := range k.ReverseCidrs {
+		if c.Contains(net.ParseIP(ip)) {
+			return true
+		}
+	}
+	return false
+}
+
+// Lookup implements the ServiceBackend interface.
+func (k *Kubernetes) Lookup(state request.Request, name string, typ uint16) (*dns.Msg, error) {
+	return k.Proxy.Lookup(state, name, typ)
+}
+
+// IsNameError implements the ServiceBackend interface.
+func (k *Kubernetes) IsNameError(err error) bool {
+	return err == errNoItems || err == errNsNotExposed || err == errInvalidRequest
+}
+
+// Debug implements the ServiceBackend interface.
+func (k *Kubernetes) Debug() string { return "debug" }
+
+func (k *Kubernetes) getClientConfig() (*rest.Config, error) {
+	// For a custom api server or running outside a k8s cluster
+	// set URL in env.KUBERNETES_MASTER or set endpoint in Corefile
+	loadingRules := clientcmd.NewDefaultClientConfigLoadingRules()
+	overrides := &clientcmd.ConfigOverrides{}
+	clusterinfo := clientcmdapi.Cluster{}
+	authinfo := clientcmdapi.AuthInfo{}
+	if len(k.APIEndpoint) > 0 {
+		clusterinfo.Server = k.APIEndpoint
+	} else {
+		cc, err := rest.InClusterConfig()
+		if err != nil {
+			return nil, err
+		}
+		return cc, err
+	}
+	if len(k.APICertAuth) > 0 {
+		clusterinfo.CertificateAuthority = k.APICertAuth
+	}
+	if len(k.APIClientCert) > 0 {
+		authinfo.ClientCertificate = k.APIClientCert
+	}
+	if len(k.APIClientKey) > 0 {
+		authinfo.ClientKey = k.APIClientKey
+	}
+	overrides.ClusterInfo = clusterinfo
+	overrides.AuthInfo = authinfo
+	clientConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, overrides)
+	return clientConfig.ClientConfig()
+}
+
+// InitKubeCache initializes a new Kubernetes cache.
+func (k *Kubernetes) InitKubeCache() error {
+
+	config, err := k.getClientConfig()
+	if err != nil {
+		return err
+	}
+
+	kubeClient, err := kubernetes.NewForConfig(config)
+	if err != nil {
+		return fmt.Errorf("Failed to create kubernetes notification controller: %v", err)
+	}
+
+	if k.LabelSelector != nil {
+		var selector labels.Selector
+		selector, err = unversionedapi.LabelSelectorAsSelector(k.LabelSelector)
+		k.Selector = &selector
+		if err != nil {
+			return fmt.Errorf("Unable to create Selector for LabelSelector '%s'.Error was: %s", k.LabelSelector, err)
+		}
+	}
+
+	if k.LabelSelector == nil {
+		log.Printf("[INFO] Kubernetes middleware configured without a label selector. No label-based filtering will be performed.")
+	} else {
+		log.Printf("[INFO] Kubernetes middleware configured with the label selector '%s'. Only kubernetes objects matching this label selector will be exposed.", unversionedapi.FormatLabelSelector(k.LabelSelector))
+	}
+
+	k.APIConn = newdnsController(kubeClient, k.ResyncPeriod, k.Selector, k.PodMode == PodModeVerified)
+
+	return err
+}
+
+func (k *Kubernetes) parseRequest(lowerCasedName, qtype string) (r recordRequest, err error) {
+	// 3 Possible cases
+	//   SRV Request: _port._protocol.service.namespace.type.zone
+	//   A Request (endpoint): endpoint.service.namespace.type.zone
+	//   A Request (service): service.namespace.type.zone
+
+	// separate zone from rest of lowerCasedName
+	var segs []string
+	for _, z := range k.Zones {
+		if dns.IsSubDomain(z, lowerCasedName) {
+			r.zone = z
+
+			segs = dns.SplitDomainName(lowerCasedName)
+			segs = segs[:len(segs)-dns.CountLabel(r.zone)]
+			break
+		}
+	}
+	if r.zone == "" {
+		return r, errors.New("zone not found")
+	}
+
+	offset := 0
+	if qtype == "SRV" {
+		if len(segs) != 5 {
+			return r, errInvalidRequest
+		}
+		// This is a SRV style request, get first two elements as port and
+		// protocol, stripping leading underscores if present.
+		if segs[0][0] == '_' {
+			r.port = segs[0][1:]
+		} else {
+			r.port = segs[0]
+			if !symbolContainsWildcard(r.port) {
+				return r, errInvalidRequest
+			}
+		}
+		if segs[1][0] == '_' {
+			r.protocol = segs[1][1:]
+			if r.protocol != "tcp" && r.protocol != "udp" {
+				return r, errInvalidRequest
+			}
+		} else {
+			r.protocol = segs[1]
+			if !symbolContainsWildcard(r.protocol) {
+				return r, errInvalidRequest
+			}
+		}
+		if r.port == "" || r.protocol == "" {
+			return r, errInvalidRequest
+		}
+		offset = 2
+	}
+	if qtype == "A" && len(segs) == 4 {
+		// This is an endpoint A record request. Get first element as endpoint.
+		r.endpoint = segs[0]
+		offset = 1
+	}
+
+	if len(segs) == (offset + 3) {
+		r.service = segs[offset]
+		r.namespace = segs[offset+1]
+		r.typeName = segs[offset+2]
+
+		return r, nil
+	}
+
+	if len(segs) == 1 && qtype == "TXT" {
+		r.typeName = segs[0]
+		return r, nil
+	}
+
+	return r, errInvalidRequest
+
+}
+
+// Records looks up services in kubernetes. If exact is true, it will lookup
+// just this name. This is used when find matches when completing SRV lookups
+// for instance.
+func (k *Kubernetes) Records(r recordRequest) ([]msg.Service, error) {
+
+	// Abort if the namespace does not contain a wildcard, and namespace is not published per CoreFile
+	// Case where namespace contains a wildcard is handled in Get(...) method.
+	if (!symbolContainsWildcard(r.namespace)) && (len(k.Namespaces) > 0) && (!dnsstrings.StringInSlice(r.namespace, k.Namespaces)) {
+		return nil, errNsNotExposed
+	}
+
+	services, pods, err := k.get(r)
+	if err != nil {
+		return nil, err
+	}
+	if len(services) == 0 && len(pods) == 0 {
+		// Did not find item in k8s
+		return nil, errNoItems
+	}
+
+	records := k.getRecordsForK8sItems(services, pods, r.zone)
+	return records, nil
+}
+
+func endpointHostname(addr api.EndpointAddress) string {
+	if addr.Hostname != "" {
+		return strings.ToLower(addr.Hostname)
+	}
+	if strings.Contains(addr.IP, ".") {
+		return strings.Replace(addr.IP, ".", "-", -1)
+	}
+	if strings.Contains(addr.IP, ":") {
+		return strings.ToLower(strings.Replace(addr.IP, ":", "-", -1))
+	}
+	return ""
+}
+
+func (k *Kubernetes) getRecordsForK8sItems(services []service, pods []pod, zone string) []msg.Service {
+	var records []msg.Service
+
+	for _, svc := range services {
+
+		key := svc.name + "." + svc.namespace + ".svc." + zone
+
+		if svc.addr == api.ClusterIPNone {
+			// This is a headless service, create records for each endpoint
+			for _, ep := range svc.endpoints {
+				ephostname := endpointHostname(ep.addr)
+				s := msg.Service{
+					Key:  msg.Path(strings.ToLower(ephostname+"."+key), "coredns"),
+					Host: ep.addr.IP, Port: int(ep.port.Port),
+				}
+				records = append(records, s)
+
+			}
+		} else {
+			// Create records for each exposed port...
+			for _, p := range svc.ports {
+				s := msg.Service{Key: msg.Path(strings.ToLower(key), "coredns"), Host: svc.addr, Port: int(p.Port)}
+				records = append(records, s)
+			}
+		}
+	}
+
+	for _, p := range pods {
+		key := p.name + "." + p.namespace + ".pod." + zone
+		s := msg.Service{
+			Key:  msg.Path(strings.ToLower(key), "coredns"),
+			Host: p.addr,
+		}
+		records = append(records, s)
+	}
+
+	return records
+}
+
+func ipFromPodName(podname string) string {
+	if strings.Count(podname, "-") == 3 && !strings.Contains(podname, "--") {
+		return strings.Replace(podname, "-", ".", -1)
+	}
+	return strings.Replace(podname, "-", ":", -1)
+}
+
+func (k *Kubernetes) findPods(namespace, podname string) (pods []pod, err error) {
+	if k.PodMode == PodModeDisabled {
+		return pods, errors.New("pod records disabled")
+	}
+
+	var ip string
+	if strings.Count(podname, "-") == 3 && !strings.Contains(podname, "--") {
+		ip = strings.Replace(podname, "-", ".", -1)
+	} else {
+		ip = strings.Replace(podname, "-", ":", -1)
+	}
+
+	if k.PodMode == PodModeInsecure {
+		s := pod{name: podname, namespace: namespace, addr: ip}
+		pods = append(pods, s)
+		return pods, nil
+	}
+
+	// PodModeVerified
+	objList, err := k.APIConn.podLister.Indexer.ByIndex(podIPIndex, ip)
+	if err != nil {
+		return nil, err
+	}
+
+	nsWildcard := symbolContainsWildcard(namespace)
+	for _, o := range objList {
+		p, ok := o.(*api.Pod)
+		if !ok {
+			return nil, errors.New("expected type *api.Pod")
+		}
+		// If namespace has a wildcard, filter results against Corefile namespace list.
+		if nsWildcard && (len(k.Namespaces) > 0) && (!dnsstrings.StringInSlice(p.Namespace, k.Namespaces)) {
+			continue
+		}
+		// check for matching ip and namespace
+		if ip == p.Status.PodIP && symbolMatches(namespace, p.Namespace, nsWildcard) {
+			s := pod{name: podname, namespace: namespace, addr: ip}
+			pods = append(pods, s)
+			return pods, nil
+		}
+	}
+	return pods, nil
+}
+
+// get retrieves matching data from the cache.
+func (k *Kubernetes) get(r recordRequest) (services []service, pods []pod, err error) {
+	switch {
+	case r.typeName == "pod":
+		pods, err = k.findPods(r.namespace, r.service)
+		return nil, pods, err
+	default:
+		services, err = k.findServices(r)
+		return services, nil, err
+	}
+}
+
+func (k *Kubernetes) findServices(r recordRequest) ([]service, error) {
+	serviceList := k.APIConn.ServiceList()
+
+	var resultItems []service
+
+	nsWildcard := symbolContainsWildcard(r.namespace)
+	serviceWildcard := symbolContainsWildcard(r.service)
+	portWildcard := symbolContainsWildcard(r.port) || r.port == ""
+	protocolWildcard := symbolContainsWildcard(r.protocol) || r.protocol == ""
+
+	for _, svc := range serviceList {
+		if !(symbolMatches(r.namespace, svc.Namespace, nsWildcard) && symbolMatches(r.service, svc.Name, serviceWildcard)) {
+			continue
+		}
+		// If namespace has a wildcard, filter results against Corefile namespace list.
+		// (Namespaces without a wildcard were filtered before the call to this function.)
+		if nsWildcard && (len(k.Namespaces) > 0) && (!dnsstrings.StringInSlice(svc.Namespace, k.Namespaces)) {
+			continue
+		}
+		s := service{name: svc.Name, namespace: svc.Namespace, addr: svc.Spec.ClusterIP}
+		if s.addr != api.ClusterIPNone {
+			for _, p := range svc.Spec.Ports {
+				if !(symbolMatches(r.port, strings.ToLower(p.Name), portWildcard) && symbolMatches(r.protocol, strings.ToLower(string(p.Protocol)), protocolWildcard)) {
+					continue
+				}
+				s.ports = append(s.ports, p)
+			}
+			resultItems = append(resultItems, s)
+			continue
+		}
+		// Headless service
+		endpointsList, err := k.APIConn.epLister.List()
+		if err != nil {
+			continue
+		}
+		for _, ep := range endpointsList.Items {
+			if ep.ObjectMeta.Name != svc.Name || ep.ObjectMeta.Namespace != svc.Namespace {
+				continue
+			}
+			for _, eps := range ep.Subsets {
+				for _, addr := range eps.Addresses {
+					for _, p := range eps.Ports {
+						ephostname := endpointHostname(addr)
+						if r.endpoint != "" && r.endpoint != ephostname {
+							continue
+						}
+						if !(symbolMatches(r.port, strings.ToLower(p.Name), portWildcard) && symbolMatches(r.protocol, strings.ToLower(string(p.Protocol)), protocolWildcard)) {
+							continue
+						}
+						s.endpoints = append(s.endpoints, endpoint{addr: addr, port: p})
+					}
+				}
+			}
+		}
+		resultItems = append(resultItems, s)
+	}
+	return resultItems, nil
+}
+
+func symbolMatches(queryString, candidateString string, wildcard bool) bool {
+	if wildcard {
+		return true
+	}
+	return queryString == candidateString
+}
+
+// getServiceRecordForIP: Gets a service record with a cluster ip matching the ip argument
+// If a service cluster ip does not match, it checks all endpoints
+func (k *Kubernetes) getServiceRecordForIP(ip, name string) []msg.Service {
+	// First check services with cluster ips
+	svcList, err := k.APIConn.svcLister.List(labels.Everything())
+	if err != nil {
+		return nil
+	}
+	for _, service := range svcList {
+		if (len(k.Namespaces) > 0) && !dnsstrings.StringInSlice(service.Namespace, k.Namespaces) {
+			continue
+		}
+		if service.Spec.ClusterIP == ip {
+			domain := service.Name + "." + service.Namespace + ".svc." + k.PrimaryZone()
+			return []msg.Service{{Host: domain}}
+		}
+	}
+	// If no cluster ips match, search endpoints
+	epList, err := k.APIConn.epLister.List()
+	if err != nil {
+		return nil
+	}
+	for _, ep := range epList.Items {
+		if (len(k.Namespaces) > 0) && !dnsstrings.StringInSlice(ep.ObjectMeta.Namespace, k.Namespaces) {
+			continue
+		}
+		for _, eps := range ep.Subsets {
+			for _, addr := range eps.Addresses {
+				if addr.IP == ip {
+					domain := endpointHostname(addr) + "." + ep.ObjectMeta.Name + "." + ep.ObjectMeta.Namespace + ".svc." + k.PrimaryZone()
+					return []msg.Service{{Host: domain}}
+				}
+			}
+		}
+	}
+	return nil
+}
+
+// symbolContainsWildcard checks whether symbol contains a wildcard value
+func symbolContainsWildcard(symbol string) bool {
+	return (symbol == "*" || symbol == "any")
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/kubernetes/kubernetes_test.go b/vendor/github.com/miekg/coredns/middleware/kubernetes/kubernetes_test.go
new file mode 100644
index 0000000000..2b83aaecfe
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/kubernetes/kubernetes_test.go
@@ -0,0 +1,134 @@
+package kubernetes
+
+import "testing"
+import "reflect"
+
+// Test data for TestSymbolContainsWildcard cases.
+var testdataSymbolContainsWildcard = []struct {
+	Symbol         string
+	ExpectedResult bool
+}{
+	{"mynamespace", false},
+	{"*", true},
+	{"any", true},
+	{"my*space", false},
+	{"*space", false},
+	{"myname*", false},
+}
+
+func TestSymbolContainsWildcard(t *testing.T) {
+	for _, example := range testdataSymbolContainsWildcard {
+		actualResult := symbolContainsWildcard(example.Symbol)
+		if actualResult != example.ExpectedResult {
+			t.Errorf("Expected SymbolContainsWildcard result '%v' for example string='%v'. Instead got result '%v'.", example.ExpectedResult, example.Symbol, actualResult)
+		}
+	}
+}
+
+func expectString(t *testing.T, function, qtype, query string, r *recordRequest, field, expected string) {
+	ref := reflect.ValueOf(r)
+	refField := reflect.Indirect(ref).FieldByName(field)
+	got := refField.String()
+	if got != expected {
+		t.Errorf("Expected %v(%v, \"%v\") to get %v == \"%v\". Instead got \"%v\".", function, query, qtype, field, expected, got)
+	}
+}
+
+func TestParseRequest(t *testing.T) {
+
+	var tcs map[string]string
+
+	k := Kubernetes{Zones: []string{"inter.webs.test"}}
+	f := "parseRequest"
+
+	// Test a valid SRV request
+	//
+	query := "_http._tcp.webs.mynamespace.svc.inter.webs.test."
+	r, e := k.parseRequest(query, "SRV")
+	if e != nil {
+		t.Errorf("Expected no error from parseRequest(%v, \"SRV\"). Instead got '%v'.", query, e)
+	}
+
+	tcs = map[string]string{
+		"port":      "http",
+		"protocol":  "tcp",
+		"endpoint":  "",
+		"service":   "webs",
+		"namespace": "mynamespace",
+		"typeName":  "svc",
+		"zone":      "inter.webs.test",
+	}
+	for field, expected := range tcs {
+		expectString(t, f, "SRV", query, &r, field, expected)
+	}
+
+	// Test wildcard acceptance
+	//
+	query = "*.any.*.any.svc.inter.webs.test."
+	r, e = k.parseRequest(query, "SRV")
+	if e != nil {
+		t.Errorf("Expected no error from parseRequest(\"%v\", \"SRV\"). Instead got '%v'.", query, e)
+	}
+
+	tcs = map[string]string{
+		"port":      "*",
+		"protocol":  "any",
+		"endpoint":  "",
+		"service":   "*",
+		"namespace": "any",
+		"typeName":  "svc",
+		"zone":      "inter.webs.test",
+	}
+	for field, expected := range tcs {
+		expectString(t, f, "SRV", query, &r, field, expected)
+	}
+
+	// Test A request of endpoint
+	query = "1-2-3-4.webs.mynamespace.svc.inter.webs.test."
+	r, e = k.parseRequest(query, "A")
+	if e != nil {
+		t.Errorf("Expected no error from parseRequest(\"%v\", \"A\"). Instead got '%v'.", query, e)
+	}
+	tcs = map[string]string{
+		"port":      "",
+		"protocol":  "",
+		"endpoint":  "1-2-3-4",
+		"service":   "webs",
+		"namespace": "mynamespace",
+		"typeName":  "svc",
+		"zone":      "inter.webs.test",
+	}
+	for field, expected := range tcs {
+		expectString(t, f, "A", query, &r, field, expected)
+	}
+
+	// Invalid query tests
+	invalidAQueries := []string{
+		"_http._tcp.webs.mynamespace.svc.inter.webs.test.", // A requests cannot have port or protocol
+		"servname.ns1.srv.inter.nets.test.",                // A requests must have zone that matches corefile
+
+	}
+	for _, q := range invalidAQueries {
+		_, e = k.parseRequest(q, "A")
+		if e == nil {
+			t.Errorf("Expected error from %v(\"%v\", \"A\").", f, q)
+		}
+	}
+
+	invalidSRVQueries := []string{
+		"webs.mynamespace.svc.inter.webs.test.",            // SRV requests must have port and protocol
+		"_http._pcp.webs.mynamespace.svc.inter.webs.test.", // SRV protocol must be tcp or udp
+		"_http._tcp.ep.webs.ns.svc.inter.webs.test.",       // SRV requests cannot have an endpoint
+		"_*._*.webs.mynamespace.svc.inter.webs.test.",      // SRV request with invalid wildcards
+		"_http._tcp",
+		"_tcp.test.",
+		".",
+	}
+
+	for _, q := range invalidSRVQueries {
+		_, e = k.parseRequest(q, "SRV")
+		if e == nil {
+			t.Errorf("Expected error from %v(\"%v\", \"SRV\").", f, q)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/kubernetes/lookup.go b/vendor/github.com/miekg/coredns/middleware/kubernetes/lookup.go
new file mode 100644
index 0000000000..57659012db
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/kubernetes/lookup.go
@@ -0,0 +1,54 @@
+package kubernetes
+
+import (
+	"fmt"
+	"net"
+
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/pkg/dnsutil"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+func (k Kubernetes) records(state request.Request, exact bool) ([]msg.Service, error) {
+	r, err := k.parseRequest(state.Name(), state.Type())
+	if err != nil {
+		return nil, err
+	}
+	services, err := k.Records(r)
+	if err != nil {
+		return nil, err
+	}
+	services = msg.Group(services)
+	return services, nil
+}
+
+// PTR Record returns PTR records from kubernetes.
+func (k Kubernetes) PTR(zone string, state request.Request) ([]dns.RR, error) {
+	reverseIP := dnsutil.ExtractAddressFromReverse(state.Name())
+	if reverseIP == "" {
+		return nil, fmt.Errorf("does not support reverse lookup for %s", state.QName())
+	}
+
+	records := make([]dns.RR, 1)
+	services, err := k.records(state, false)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, serv := range services {
+		ip := net.ParseIP(serv.Host)
+		if reverseIP != serv.Host {
+			continue
+		}
+		switch {
+		case ip.To4() != nil:
+			records = append(records, serv.NewPTR(state.QName(), ip.To4().String()))
+			break
+		case ip.To4() == nil:
+			// nodata?
+		}
+	}
+	return records, nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/kubernetes/setup.go b/vendor/github.com/miekg/coredns/middleware/kubernetes/setup.go
new file mode 100644
index 0000000000..be045a522c
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/kubernetes/setup.go
@@ -0,0 +1,169 @@
+package kubernetes
+
+import (
+	"errors"
+	"fmt"
+	"net"
+	"strings"
+	"time"
+
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/mholt/caddy"
+	unversionedapi "k8s.io/client-go/1.5/pkg/api/unversioned"
+)
+
+func init() {
+	caddy.RegisterPlugin("kubernetes", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setup,
+	})
+}
+
+func setup(c *caddy.Controller) error {
+	kubernetes, err := kubernetesParse(c)
+	if err != nil {
+		return middleware.Error("kubernetes", err)
+	}
+
+	err = kubernetes.InitKubeCache()
+	if err != nil {
+		return middleware.Error("kubernetes", err)
+	}
+
+	// Register KubeCache start and stop functions with Caddy
+	c.OnStartup(func() error {
+		go kubernetes.APIConn.Run()
+		return nil
+	})
+
+	c.OnShutdown(func() error {
+		return kubernetes.APIConn.Stop()
+	})
+
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
+		kubernetes.Next = next
+		return kubernetes
+	})
+
+	return nil
+}
+
+func kubernetesParse(c *caddy.Controller) (*Kubernetes, error) {
+	k8s := &Kubernetes{ResyncPeriod: defaultResyncPeriod}
+	k8s.PodMode = PodModeDisabled
+
+	for c.Next() {
+		if c.Val() == "kubernetes" {
+			zones := c.RemainingArgs()
+
+			if len(zones) == 0 {
+				k8s.Zones = make([]string, len(c.ServerBlockKeys))
+				copy(k8s.Zones, c.ServerBlockKeys)
+			}
+
+			k8s.Zones = NormalizeZoneList(zones)
+			middleware.Zones(k8s.Zones).Normalize()
+
+			if k8s.Zones == nil || len(k8s.Zones) < 1 {
+				return nil, errors.New("zone name must be provided for kubernetes middleware")
+			}
+
+			k8s.primaryZone = -1
+			for i, z := range k8s.Zones {
+				if strings.HasSuffix(z, "in-addr.arpa.") || strings.HasSuffix(z, "ip6.arpa.") {
+					continue
+				}
+				k8s.primaryZone = i
+				break
+			}
+
+			if k8s.primaryZone == -1 {
+				return nil, errors.New("non-reverse zone name must be given for Kubernetes")
+			}
+
+			for c.NextBlock() {
+				switch c.Val() {
+				case "cidrs":
+					args := c.RemainingArgs()
+					if len(args) > 0 {
+						for _, cidrStr := range args {
+							_, cidr, err := net.ParseCIDR(cidrStr)
+							if err != nil {
+								return nil, errors.New("Invalid cidr: " + cidrStr)
+							}
+							k8s.ReverseCidrs = append(k8s.ReverseCidrs, *cidr)
+
+						}
+						continue
+					}
+					return nil, c.ArgErr()
+				case "pods":
+					args := c.RemainingArgs()
+					if len(args) == 1 {
+						switch args[0] {
+						case PodModeDisabled, PodModeInsecure, PodModeVerified:
+							k8s.PodMode = args[0]
+						default:
+							return nil, errors.New("Value for pods must be one of: disabled, verified, insecure")
+						}
+						continue
+					}
+					return nil, c.ArgErr()
+				case "namespaces":
+					args := c.RemainingArgs()
+					if len(args) > 0 {
+						k8s.Namespaces = append(k8s.Namespaces, args...)
+						continue
+					}
+					return nil, c.ArgErr()
+				case "endpoint":
+					args := c.RemainingArgs()
+					if len(args) > 0 {
+						k8s.APIEndpoint = args[0]
+						continue
+					}
+					return nil, c.ArgErr()
+				case "tls": // cert key cacertfile
+					args := c.RemainingArgs()
+					if len(args) == 3 {
+						k8s.APIClientCert, k8s.APIClientKey, k8s.APICertAuth = args[0], args[1], args[2]
+						continue
+					}
+					return nil, c.ArgErr()
+				case "resyncperiod":
+					args := c.RemainingArgs()
+					if len(args) > 0 {
+						rp, err := time.ParseDuration(args[0])
+						if err != nil {
+							return nil, fmt.Errorf("Unable to parse resync duration value. Value provided was '%v'. Example valid values: '15s', '5m', '1h'. Error was: %v", args[0], err)
+						}
+						k8s.ResyncPeriod = rp
+						continue
+					}
+					return nil, c.ArgErr()
+				case "labels":
+					args := c.RemainingArgs()
+					if len(args) > 0 {
+						labelSelectorString := strings.Join(args, " ")
+						ls, err := unversionedapi.ParseToLabelSelector(labelSelectorString)
+						if err != nil {
+							return nil, fmt.Errorf("Unable to parse label selector. Value provided was '%v'. Error was: %v", labelSelectorString, err)
+						}
+						k8s.LabelSelector = ls
+						continue
+					}
+					return nil, c.ArgErr()
+				}
+			}
+			return k8s, nil
+		}
+	}
+	return nil, errors.New("Kubernetes setup called without keyword 'kubernetes' in Corefile")
+}
+
+const (
+	defaultResyncPeriod = 5 * time.Minute
+	defaultPodMode      = PodModeDisabled
+)
diff --git a/vendor/github.com/miekg/coredns/middleware/kubernetes/setup_test.go b/vendor/github.com/miekg/coredns/middleware/kubernetes/setup_test.go
new file mode 100644
index 0000000000..bc6418c0d3
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/kubernetes/setup_test.go
@@ -0,0 +1,471 @@
+package kubernetes
+
+import (
+	"net"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/mholt/caddy"
+	unversionedapi "k8s.io/client-go/1.5/pkg/api/unversioned"
+)
+
+func parseCidr(cidr string) net.IPNet {
+	_, ipnet, _ := net.ParseCIDR(cidr)
+	return *ipnet
+}
+
+func TestKubernetesParse(t *testing.T) {
+	tests := []struct {
+		description           string        // Human-facing description of test case
+		input                 string        // Corefile data as string
+		shouldErr             bool          // true if test case is exected to produce an error.
+		expectedErrContent    string        // substring from the expected error. Empty for positive cases.
+		expectedZoneCount     int           // expected count of defined zones.
+		expectedNSCount       int           // expected count of namespaces.
+		expectedResyncPeriod  time.Duration // expected resync period value
+		expectedLabelSelector string        // expected label selector value
+		expectedPodMode       string
+		expectedCidrs         []net.IPNet
+	}{
+		// positive
+		{
+			"kubernetes keyword with one zone",
+			`kubernetes coredns.local`,
+			false,
+			"",
+			1,
+			0,
+			defaultResyncPeriod,
+			"",
+			defaultPodMode,
+			nil,
+		},
+		{
+			"kubernetes keyword with multiple zones",
+			`kubernetes coredns.local test.local`,
+			false,
+			"",
+			2,
+			0,
+			defaultResyncPeriod,
+			"",
+			defaultPodMode,
+			nil,
+		},
+		{
+			"kubernetes keyword with zone and empty braces",
+			`kubernetes coredns.local {
+}`,
+			false,
+			"",
+			1,
+			0,
+			defaultResyncPeriod,
+			"",
+			defaultPodMode,
+			nil,
+		},
+		{
+			"endpoint keyword with url",
+			`kubernetes coredns.local {
+	endpoint http://localhost:9090
+}`,
+			false,
+			"",
+			1,
+			0,
+			defaultResyncPeriod,
+			"",
+			defaultPodMode,
+			nil,
+		},
+		{
+			"namespaces keyword with one namespace",
+			`kubernetes coredns.local {
+	namespaces demo
+}`,
+			false,
+			"",
+			1,
+			1,
+			defaultResyncPeriod,
+			"",
+			defaultPodMode,
+			nil,
+		},
+		{
+			"namespaces keyword with multiple namespaces",
+			`kubernetes coredns.local {
+	namespaces demo test
+}`,
+			false,
+			"",
+			1,
+			2,
+			defaultResyncPeriod,
+			"",
+			defaultPodMode,
+			nil,
+		},
+		{
+			"resync period in seconds",
+			`kubernetes coredns.local {
+    resyncperiod 30s
+}`,
+			false,
+			"",
+			1,
+			0,
+			30 * time.Second,
+			"",
+			defaultPodMode,
+			nil,
+		},
+		{
+			"resync period in minutes",
+			`kubernetes coredns.local {
+    resyncperiod 15m
+}`,
+			false,
+			"",
+			1,
+			0,
+			15 * time.Minute,
+			"",
+			defaultPodMode,
+			nil,
+		},
+		{
+			"basic label selector",
+			`kubernetes coredns.local {
+    labels environment=prod
+}`,
+			false,
+			"",
+			1,
+			0,
+			defaultResyncPeriod,
+			"environment=prod",
+			defaultPodMode,
+			nil,
+		},
+		{
+			"multi-label selector",
+			`kubernetes coredns.local {
+    labels environment in (production, staging, qa),application=nginx
+}`,
+			false,
+			"",
+			1,
+			0,
+			defaultResyncPeriod,
+			"application=nginx,environment in (production,qa,staging)",
+			defaultPodMode,
+			nil,
+		},
+		{
+			"fully specified valid config",
+			`kubernetes coredns.local test.local {
+    resyncperiod 15m
+	endpoint http://localhost:8080
+	namespaces demo test
+    labels environment in (production, staging, qa),application=nginx
+}`,
+			false,
+			"",
+			2,
+			2,
+			15 * time.Minute,
+			"application=nginx,environment in (production,qa,staging)",
+			defaultPodMode,
+			nil,
+		},
+		// negative
+		{
+			"no kubernetes keyword",
+			"",
+			true,
+			"Kubernetes setup called without keyword 'kubernetes' in Corefile",
+			-1,
+			-1,
+			defaultResyncPeriod,
+			"",
+			defaultPodMode,
+			nil,
+		},
+		{
+			"kubernetes keyword without a zone",
+			`kubernetes`,
+			true,
+			"zone name must be provided for kubernetes middleware",
+			-1,
+			0,
+			defaultResyncPeriod,
+			"",
+			defaultPodMode,
+			nil,
+		},
+		{
+			"endpoint keyword without an endpoint value",
+			`kubernetes coredns.local {
+    endpoint
+}`,
+			true,
+			"Wrong argument count or unexpected line ending after 'endpoint'",
+			-1,
+			-1,
+			defaultResyncPeriod,
+			"",
+			defaultPodMode,
+			nil,
+		},
+		{
+			"namespace keyword without a namespace value",
+			`kubernetes coredns.local {
+	namespaces
+}`,
+			true,
+			"Parse error: Wrong argument count or unexpected line ending after 'namespaces'",
+			-1,
+			-1,
+			defaultResyncPeriod,
+			"",
+			defaultPodMode,
+			nil,
+		},
+		{
+			"resyncperiod keyword without a duration value",
+			`kubernetes coredns.local {
+    resyncperiod
+}`,
+			true,
+			"Wrong argument count or unexpected line ending after 'resyncperiod'",
+			-1,
+			0,
+			0 * time.Minute,
+			"",
+			defaultPodMode,
+			nil,
+		},
+		{
+			"resync period no units",
+			`kubernetes coredns.local {
+    resyncperiod 15
+}`,
+			true,
+			"Unable to parse resync duration value. Value provided was ",
+			-1,
+			0,
+			0 * time.Second,
+			"",
+			defaultPodMode,
+			nil,
+		},
+		{
+			"resync period invalid",
+			`kubernetes coredns.local {
+    resyncperiod abc
+}`,
+			true,
+			"Unable to parse resync duration value. Value provided was ",
+			-1,
+			0,
+			0 * time.Second,
+			"",
+			defaultPodMode,
+			nil,
+		},
+		{
+			"labels with no selector value",
+			`kubernetes coredns.local {
+    labels
+}`,
+			true,
+			"Wrong argument count or unexpected line ending after 'labels'",
+			-1,
+			0,
+			0 * time.Second,
+			"",
+			defaultPodMode,
+			nil,
+		},
+		{
+			"labels with invalid selector value",
+			`kubernetes coredns.local {
+    labels environment in (production, qa
+}`,
+			true,
+			"Unable to parse label selector. Value provided was",
+			-1,
+			0,
+			0 * time.Second,
+			"",
+			defaultPodMode,
+			nil,
+		},
+		// pods disabled
+		{
+			"pods disabled",
+			`kubernetes coredns.local {
+	pods disabled
+}`,
+			false,
+			"",
+			1,
+			0,
+			defaultResyncPeriod,
+			"",
+			PodModeDisabled,
+			nil,
+		},
+		// pods insecure
+		{
+			"pods insecure",
+			`kubernetes coredns.local {
+	pods insecure
+}`,
+			false,
+			"",
+			1,
+			0,
+			defaultResyncPeriod,
+			"",
+			PodModeInsecure,
+			nil,
+		},
+		// pods verified
+		{
+			"pods verified",
+			`kubernetes coredns.local {
+	pods verified
+}`,
+			false,
+			"",
+			1,
+			0,
+			defaultResyncPeriod,
+			"",
+			PodModeVerified,
+			nil,
+		},
+		// pods invalid
+		{
+			"invalid pods mode",
+			`kubernetes coredns.local {
+	pods giant_seed
+}`,
+			true,
+			"Value for pods must be one of: disabled, verified, insecure",
+			-1,
+			0,
+			defaultResyncPeriod,
+			"",
+			PodModeVerified,
+			nil,
+		},
+		// cidrs ok
+		{
+			"valid cidrs",
+			`kubernetes coredns.local {
+	cidrs 10.0.0.0/24 10.0.1.0/24
+}`,
+			false,
+			"",
+			1,
+			0,
+			defaultResyncPeriod,
+			"",
+			defaultPodMode,
+			[]net.IPNet{parseCidr("10.0.0.0/24"), parseCidr("10.0.1.0/24")},
+		},
+		// cidrs ok
+		{
+			"Invalid cidr: hard",
+			`kubernetes coredns.local {
+	cidrs hard dry
+}`,
+			true,
+			"Invalid cidr: hard",
+			-1,
+			0,
+			defaultResyncPeriod,
+			"",
+			defaultPodMode,
+			nil,
+		},
+	}
+
+	for i, test := range tests {
+		c := caddy.NewTestController("dns", test.input)
+		k8sController, err := kubernetesParse(c)
+
+		if test.shouldErr && err == nil {
+			t.Errorf("Test %d: Expected error, but did not find error for input '%s'. Error was: '%v'", i, test.input, err)
+		}
+
+		if err != nil {
+			if !test.shouldErr {
+				t.Errorf("Test %d: Expected no error but found one for input %s. Error was: %v", i, test.input, err)
+				continue
+			}
+
+			if test.shouldErr && (len(test.expectedErrContent) < 1) {
+				t.Fatalf("Test %d: Test marked as expecting an error, but no expectedErrContent provided for input '%s'. Error was: '%v'", i, test.input, err)
+			}
+
+			if test.shouldErr && (test.expectedZoneCount >= 0) {
+				t.Errorf("Test %d: Test marked as expecting an error, but provides value for expectedZoneCount!=-1 for input '%s'. Error was: '%v'", i, test.input, err)
+			}
+
+			if !strings.Contains(err.Error(), test.expectedErrContent) {
+				t.Errorf("Test %d: Expected error to contain: %v, found error: %v, input: %s", i, test.expectedErrContent, err, test.input)
+			}
+			continue
+		}
+
+		// No error was raised, so validate initialization of k8sController
+		//     Zones
+		foundZoneCount := len(k8sController.Zones)
+		if foundZoneCount != test.expectedZoneCount {
+			t.Errorf("Test %d: Expected kubernetes controller to be initialized with %d zones, instead found %d zones: '%v' for input '%s'", i, test.expectedZoneCount, foundZoneCount, k8sController.Zones, test.input)
+		}
+
+		//    Namespaces
+		foundNSCount := len(k8sController.Namespaces)
+		if foundNSCount != test.expectedNSCount {
+			t.Errorf("Test %d: Expected kubernetes controller to be initialized with %d namespaces. Instead found %d namespaces: '%v' for input '%s'", i, test.expectedNSCount, foundNSCount, k8sController.Namespaces, test.input)
+		}
+
+		//    ResyncPeriod
+		foundResyncPeriod := k8sController.ResyncPeriod
+		if foundResyncPeriod != test.expectedResyncPeriod {
+			t.Errorf("Test %d: Expected kubernetes controller to be initialized with resync period '%s'. Instead found period '%s' for input '%s'", i, test.expectedResyncPeriod, foundResyncPeriod, test.input)
+		}
+
+		//    Labels
+		if k8sController.LabelSelector != nil {
+			foundLabelSelectorString := unversionedapi.FormatLabelSelector(k8sController.LabelSelector)
+			if foundLabelSelectorString != test.expectedLabelSelector {
+				t.Errorf("Test %d: Expected kubernetes controller to be initialized with label selector '%s'. Instead found selector '%s' for input '%s'", i, test.expectedLabelSelector, foundLabelSelectorString, test.input)
+			}
+		}
+		//    Pods
+		foundPodMode := k8sController.PodMode
+		if foundPodMode != test.expectedPodMode {
+			t.Errorf("Test %d: Expected kubernetes controller to be initialized with pod mode '%s'. Instead found pod mode '%s' for input '%s'", i, test.expectedPodMode, foundPodMode, test.input)
+		}
+
+		//    Cidrs
+		foundCidrs := k8sController.ReverseCidrs
+		if len(foundCidrs) != len(test.expectedCidrs) {
+			t.Errorf("Test %d: Expected kubernetes controller to be initialized with %d cidrs. Instead found %d cidrs for input '%s'", i, len(test.expectedCidrs), len(foundCidrs), test.input)
+		}
+		for j, cidr := range test.expectedCidrs {
+			if cidr.String() != foundCidrs[j].String() {
+				t.Errorf("Test %d: Expected kubernetes controller to be initialized with cidr '%s'. Instead found cidr '%s' for input '%s'", i, test.expectedCidrs[j].String(), foundCidrs[j].String(), test.input)
+			}
+		}
+
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/kubernetes/subzone.go b/vendor/github.com/miekg/coredns/middleware/kubernetes/subzone.go
new file mode 100644
index 0000000000..6c4a79126a
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/kubernetes/subzone.go
@@ -0,0 +1,48 @@
+package kubernetes
+
+import (
+	"log"
+
+	"github.com/miekg/dns"
+)
+
+// NormalizeZoneList filters the zones argument to remove
+// array items that conflict with other items in zones.
+// For example, providing the following zones array:
+//    [ "a.b.c", "b.c", "a", "e.d.f", "a.b" ]
+// Returns:
+//    [ "a.b.c", "a", "e.d.f", "a.b" ]
+// Zones filted out:
+//    - "b.c" because "a.b.c" and "b.c" share the common top
+//      level "b.c". First listed zone wins if there is a conflict.
+//
+// Note: This may prove to be too restrictive in practice.
+//       Need to find counter-example use-cases.
+func NormalizeZoneList(zones []string) []string {
+	filteredZones := []string{}
+
+	for _, z := range zones {
+		zoneConflict, _ := subzoneConflict(filteredZones, z)
+		if zoneConflict {
+			log.Printf("[WARN] new zone '%v' from Corefile conflicts with existing zones: %v\n        Ignoring zone '%v'\n", z, filteredZones, z)
+		} else {
+			filteredZones = append(filteredZones, z)
+		}
+	}
+
+	return filteredZones
+}
+
+// subzoneConflict returns true if name is a child or parent zone of
+// any element in zones. If conflicts exist, return the conflicting zones.
+func subzoneConflict(zones []string, name string) (bool, []string) {
+	conflicts := []string{}
+
+	for _, z := range zones {
+		if dns.IsSubDomain(z, name) || dns.IsSubDomain(name, z) {
+			conflicts = append(conflicts, z)
+		}
+	}
+
+	return (len(conflicts) != 0), conflicts
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/kubernetes/subzone_test.go b/vendor/github.com/miekg/coredns/middleware/kubernetes/subzone_test.go
new file mode 100644
index 0000000000..b1a9541b3f
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/kubernetes/subzone_test.go
@@ -0,0 +1,32 @@
+package kubernetes
+
+import (
+	"testing"
+)
+
+// List of configured zones to test against
+var confZones = []string{
+	"a.b.c",
+	"d",
+}
+
+// Map of zonename :: expected boolean result
+var examplesSubzoneConflict = map[string]bool{
+	"a.b.c":   true,  // conflicts with zone "a.b.c"
+	"b.c":     true,  // conflicts with zone "a.b.c"
+	"c":       true,  // conflicts with zone "a.b.c"
+	"e":       false, // no conflict
+	"a.b.c.e": false, // no conflict
+	"a.b.c.d": true,  // conflicts with zone "d"
+	"":        false,
+}
+
+func TestSubzoneConflict(t *testing.T) {
+	for z, expected := range examplesSubzoneConflict {
+		actual, conflicts := subzoneConflict(confZones, z)
+
+		if actual != expected {
+			t.Errorf("Expected conflict result '%v' for example '%v'. Instead got '%v'. Conflicting zones are: %v", expected, z, actual, conflicts)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/loadbalance/README.md b/vendor/github.com/miekg/coredns/middleware/loadbalance/README.md
new file mode 100644
index 0000000000..cb5afc1da4
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/loadbalance/README.md
@@ -0,0 +1,22 @@
+# loadbalance
+
+*loadbalance* acts as a round-robin DNS loadbalancer by randomizing the order of A and AAAA records
+ in the answer. See [Wikipedia](https://en.wikipedia.org/wiki/Round-robin_DNS) about the pros and
+ cons on this setup.
+
+It will take care to sort any CNAMEs before any address records, because some stub resolver
+implementations (like glibc) are particular about that.
+
+## Syntax
+
+~~~
+loadbalance [POLICY]
+~~~
+
+* **POLICY** is how to balance, the default is "round_robin"
+
+## Examples
+
+~~~
+loadbalance round_robin
+~~~
diff --git a/vendor/github.com/miekg/coredns/middleware/loadbalance/handler.go b/vendor/github.com/miekg/coredns/middleware/loadbalance/handler.go
new file mode 100644
index 0000000000..3d3e4aa269
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/loadbalance/handler.go
@@ -0,0 +1,23 @@
+// Package loadbalance is middleware for rewriting responses to do "load balancing"
+package loadbalance
+
+import (
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+// RoundRobin is middleware to rewrite responses for "load balancing".
+type RoundRobin struct {
+	Next middleware.Handler
+}
+
+// ServeDNS implements the middleware.Handler interface.
+func (rr RoundRobin) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	wrr := &RoundRobinResponseWriter{w}
+	return middleware.NextOrFailure(rr.Name(), rr.Next, ctx, wrr, r)
+}
+
+// Name implements the Handler interface.
+func (rr RoundRobin) Name() string { return "loadbalance" }
diff --git a/vendor/github.com/miekg/coredns/middleware/loadbalance/loadbalance.go b/vendor/github.com/miekg/coredns/middleware/loadbalance/loadbalance.go
new file mode 100644
index 0000000000..7df0b31c65
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/loadbalance/loadbalance.go
@@ -0,0 +1,87 @@
+// Package loadbalance shuffles A and AAAA records.
+package loadbalance
+
+import (
+	"log"
+
+	"github.com/miekg/dns"
+)
+
+// RoundRobinResponseWriter is a response writer that shuffles A and AAAA records.
+type RoundRobinResponseWriter struct {
+	dns.ResponseWriter
+}
+
+// WriteMsg implements the dns.ResponseWriter interface.
+func (r *RoundRobinResponseWriter) WriteMsg(res *dns.Msg) error {
+	if res.Rcode != dns.RcodeSuccess {
+		return r.ResponseWriter.WriteMsg(res)
+	}
+
+	res.Answer = roundRobin(res.Answer)
+	res.Ns = roundRobin(res.Ns)
+	res.Extra = roundRobin(res.Extra)
+
+	return r.ResponseWriter.WriteMsg(res)
+}
+
+func roundRobin(in []dns.RR) []dns.RR {
+	cname := []dns.RR{}
+	address := []dns.RR{}
+	mx := []dns.RR{}
+	rest := []dns.RR{}
+	for _, r := range in {
+		switch r.Header().Rrtype {
+		case dns.TypeCNAME:
+			cname = append(cname, r)
+		case dns.TypeA, dns.TypeAAAA:
+			address = append(address, r)
+		case dns.TypeMX:
+			mx = append(mx, r)
+		default:
+			rest = append(rest, r)
+		}
+	}
+
+	roundRobinShuffle(address)
+	roundRobinShuffle(mx)
+
+	out := append(cname, rest...)
+	out = append(out, address...)
+	out = append(out, mx...)
+	return out
+}
+
+func roundRobinShuffle(records []dns.RR) {
+	switch l := len(records); l {
+	case 0, 1:
+		break
+	case 2:
+		if dns.Id()%2 == 0 {
+			records[0], records[1] = records[1], records[0]
+		}
+	default:
+		for j := 0; j < l*(int(dns.Id())%4+1); j++ {
+			q := int(dns.Id()) % l
+			p := int(dns.Id()) % l
+			if q == p {
+				p = (p + 1) % l
+			}
+			records[q], records[p] = records[p], records[q]
+		}
+	}
+}
+
+// Write implements the dns.ResponseWriter interface.
+func (r *RoundRobinResponseWriter) Write(buf []byte) (int, error) {
+	// Should we pack and unpack here to fiddle with the packet... Not likely.
+	log.Printf("[WARNING] RoundRobin called with Write: no shuffling records")
+	n, err := r.ResponseWriter.Write(buf)
+	return n, err
+}
+
+// Hijack implements the dns.ResponseWriter interface.
+func (r *RoundRobinResponseWriter) Hijack() {
+	r.ResponseWriter.Hijack()
+	return
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/loadbalance/loadbalance_test.go b/vendor/github.com/miekg/coredns/middleware/loadbalance/loadbalance_test.go
new file mode 100644
index 0000000000..8c9205ca9b
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/loadbalance/loadbalance_test.go
@@ -0,0 +1,168 @@
+package loadbalance
+
+import (
+	"testing"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+func TestLoadBalance(t *testing.T) {
+	rm := RoundRobin{Next: handler()}
+
+	// the first X records must be cnames after this test
+	tests := []struct {
+		answer        []dns.RR
+		extra         []dns.RR
+		cnameAnswer   int
+		cnameExtra    int
+		addressAnswer int
+		addressExtra  int
+		mxAnswer      int
+		mxExtra       int
+	}{
+		{
+			answer: []dns.RR{
+				test.CNAME("cname1.region2.skydns.test.	300	IN	CNAME		cname2.region2.skydns.test."),
+				test.CNAME("cname2.region2.skydns.test.	300	IN	CNAME		cname3.region2.skydns.test."),
+				test.CNAME("cname5.region2.skydns.test.	300	IN	CNAME		cname6.region2.skydns.test."),
+				test.CNAME("cname6.region2.skydns.test.	300	IN	CNAME		endpoint.region2.skydns.test."),
+				test.A("endpoint.region2.skydns.test.		300	IN	A			10.240.0.1"),
+				test.MX("mx.region2.skydns.test.			300	IN	MX		1	mx1.region2.skydns.test."),
+				test.MX("mx.region2.skydns.test.			300	IN	MX		2	mx2.region2.skydns.test."),
+				test.MX("mx.region2.skydns.test.			300	IN	MX		3	mx3.region2.skydns.test."),
+			},
+			cnameAnswer:   4,
+			addressAnswer: 1,
+			mxAnswer:      3,
+		},
+		{
+			answer: []dns.RR{
+				test.A("endpoint.region2.skydns.test.		300	IN	A			10.240.0.1"),
+				test.MX("mx.region2.skydns.test.			300	IN	MX		1	mx1.region2.skydns.test."),
+				test.CNAME("cname.region2.skydns.test.	300	IN	CNAME		endpoint.region2.skydns.test."),
+			},
+			cnameAnswer:   1,
+			addressAnswer: 1,
+			mxAnswer:      1,
+		},
+		{
+			answer: []dns.RR{
+				test.MX("mx.region2.skydns.test.			300	IN	MX		1	mx1.region2.skydns.test."),
+				test.A("endpoint.region2.skydns.test.		300	IN	A			10.240.0.1"),
+				test.A("endpoint.region2.skydns.test.		300	IN	A			10.240.0.2"),
+				test.MX("mx.region2.skydns.test.			300	IN	MX		1	mx2.region2.skydns.test."),
+				test.CNAME("cname2.region2.skydns.test.	300	IN	CNAME		cname3.region2.skydns.test."),
+				test.A("endpoint.region2.skydns.test.		300	IN	A			10.240.0.3"),
+				test.MX("mx.region2.skydns.test.			300	IN	MX		1	mx3.region2.skydns.test."),
+			},
+			extra: []dns.RR{
+				test.A("endpoint.region2.skydns.test.		300	IN	A			10.240.0.1"),
+				test.AAAA("endpoint.region2.skydns.test.	300	IN	AAAA		::1"),
+				test.MX("mx.region2.skydns.test.			300	IN	MX		1	mx1.region2.skydns.test."),
+				test.CNAME("cname2.region2.skydns.test.	300	IN	CNAME		cname3.region2.skydns.test."),
+				test.MX("mx.region2.skydns.test.			300	IN	MX		1	mx2.region2.skydns.test."),
+				test.A("endpoint.region2.skydns.test.		300	IN	A			10.240.0.3"),
+				test.AAAA("endpoint.region2.skydns.test.	300	IN	AAAA		::2"),
+				test.MX("mx.region2.skydns.test.			300	IN	MX		1	mx3.region2.skydns.test."),
+			},
+			cnameAnswer:   1,
+			cnameExtra:    1,
+			addressAnswer: 3,
+			addressExtra:  4,
+			mxAnswer:      3,
+			mxExtra:       3,
+		},
+	}
+
+	rec := dnsrecorder.New(&test.ResponseWriter{})
+
+	for i, test := range tests {
+		req := new(dns.Msg)
+		req.SetQuestion("region2.skydns.test.", dns.TypeSRV)
+		req.Answer = test.answer
+		req.Extra = test.extra
+
+		_, err := rm.ServeDNS(context.TODO(), rec, req)
+		if err != nil {
+			t.Errorf("Test %d: Expected no error, but got %s", i, err)
+			continue
+
+		}
+
+		cname, address, mx, sorted := countRecords(rec.Msg.Answer)
+		if !sorted {
+			t.Errorf("Test %d: Expected CNAMEs, then AAAAs, then MX in Answer, but got mixed", i)
+		}
+		if cname != test.cnameAnswer {
+			t.Errorf("Test %d: Expected %d CNAMEs in Answer, but got %d", i, test.cnameAnswer, cname)
+		}
+		if address != test.addressAnswer {
+			t.Errorf("Test %d: Expected %d A/AAAAs in Answer, but got %d", i, test.addressAnswer, address)
+		}
+		if mx != test.mxAnswer {
+			t.Errorf("Test %d: Expected %d MXs in Answer, but got %d", i, test.mxAnswer, mx)
+		}
+
+		cname, address, mx, sorted = countRecords(rec.Msg.Extra)
+		if !sorted {
+			t.Errorf("Test %d: Expected CNAMEs, then AAAAs, then MX in Extra, but got mixed", i)
+		}
+		if cname != test.cnameExtra {
+			t.Errorf("Test %d: Expected %d CNAMEs in Extra, but got %d", i, test.cnameAnswer, cname)
+		}
+		if address != test.addressExtra {
+			t.Errorf("Test %d: Expected %d A/AAAAs in Extra, but got %d", i, test.addressAnswer, address)
+		}
+		if mx != test.mxExtra {
+			t.Errorf("Test %d: Expected %d MXs in Extra, but got %d", i, test.mxAnswer, mx)
+		}
+	}
+}
+
+func countRecords(result []dns.RR) (cname int, address int, mx int, sorted bool) {
+	const (
+		Start = iota
+		CNAMERecords
+		ARecords
+		MXRecords
+		Any
+	)
+
+	// The order of the records is used to determine if the round-robin actually did anything.
+	sorted = true
+	cname = 0
+	address = 0
+	mx = 0
+	state := Start
+	for _, r := range result {
+		switch r.Header().Rrtype {
+		case dns.TypeCNAME:
+			sorted = sorted && state <= CNAMERecords
+			state = CNAMERecords
+			cname++
+		case dns.TypeA, dns.TypeAAAA:
+			sorted = sorted && state <= ARecords
+			state = ARecords
+			address++
+		case dns.TypeMX:
+			sorted = sorted && state <= MXRecords
+			state = MXRecords
+			mx++
+		default:
+			state = Any
+		}
+	}
+	return
+}
+
+func handler() middleware.Handler {
+	return middleware.HandlerFunc(func(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+		w.WriteMsg(r)
+		return dns.RcodeSuccess, nil
+	})
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/loadbalance/setup.go b/vendor/github.com/miekg/coredns/middleware/loadbalance/setup.go
new file mode 100644
index 0000000000..334d288a0e
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/loadbalance/setup.go
@@ -0,0 +1,26 @@
+package loadbalance
+
+import (
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+	"github.com/mholt/caddy"
+)
+
+func init() {
+	caddy.RegisterPlugin("loadbalance", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setup,
+	})
+}
+
+func setup(c *caddy.Controller) error {
+	for c.Next() {
+		// TODO(miek): block and option parsing
+	}
+
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
+		return RoundRobin{Next: next}
+	})
+
+	return nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/log/README.md b/vendor/github.com/miekg/coredns/middleware/log/README.md
new file mode 100644
index 0000000000..812fa20bb7
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/log/README.md
@@ -0,0 +1,101 @@
+# log
+
+*log* enables query logging.
+
+## Syntax
+
+~~~ txt
+log
+~~~
+
+* With no arguments, a query log entry is written to query.log in the common log format for all requests
+
+~~~ txt
+log FILE
+~~~
+
+* **FILE** is the log file to create (or append to).
+
+~~~ txt
+log [NAME] FILE [FORMAT]
+~~~
+
+* `NAME` is the name to match in order to be logged
+* `FILE` is the log file to create (or append to)
+* `FORMAT` is the log format to use (default is Common Log Format)
+
+You can further specify the class of responses that get logged:
+
+~~~ txt
+log [NAME] FILE [FORMAT] {
+    class [success|denial|error|all]
+}
+~~~
+
+Here `success` `denial` and `error` denotes the class of responses that should be logged. The
+classes have the following meaning:
+
+* `success`: successful response
+* `denial`: either NXDOMAIN or NODATA (name exists, type does not)
+* `error`: SERVFAIL, NOTIMP, REFUSED, etc. Anything that indicates the remote server is not willing to
+    resolve the request.
+* `all`: the default - nothing is specified.
+
+If no class is specified, it defaults to *all*.
+
+## Log File
+
+The log file can be any filename. It could also be *stdout* or *stderr* to write the log to the console,
+or *syslog* to write to the system log (except on Windows). If the log file does not exist beforehand,
+CoreDNS will create it before appending to it.
+
+## Log Format
+
+You can specify a custom log format with any placeholder values. Log supports both request and
+response placeholders.
+
+The following place holders are supported:
+
+* `{type}`: qtype of the request.
+* `{name}`: qname of the request.
+* `{class}`: qclass of the request.
+* `{proto}`: protocol used (tcp or udp).
+* `{when}`: time of the query.
+* `{remote}`: client's IP address.
+* `{size}`: request size in bytes.
+* `{port}`: client's port.
+* `{duration}`: response duration.
+* `{>bufsize}`: the EDNS0 buffer size advertised.
+* `{>do}`: is the EDNS0 DO (DNSSEC OK) bit set.
+* `{>id}`: query ID
+* `{>opcode}`: query OPCODE.
+* `{rcode}`: response RCODE.
+* `{rsize}`: response size.
+
+The default Common Log Format is:
+
+~~~ txt
+`{remote} - [{when}] "{type} {class} {name} {proto} {size} {>do} {>bufsize}" {rcode} {rsize} {duration}`
+~~~
+
+## Examples
+
+Log all requests to a file:
+
+~~~
+log /var/log/query.log
+~~~
+
+Custom log format:
+
+~~~
+log . ../query.log "{proto} Request: {name} {type} {>id}"
+~~~
+
+Only log denials for example.org (and below to a file)
+
+~~~
+log example.org example-query-log {
+    class denial
+}
+~~~
diff --git a/vendor/github.com/miekg/coredns/middleware/log/log.go b/vendor/github.com/miekg/coredns/middleware/log/log.go
new file mode 100644
index 0000000000..137411f27e
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/log/log.go
@@ -0,0 +1,90 @@
+// Package log implements basic but useful request (access) logging middleware.
+package log
+
+import (
+	"log"
+	"time"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/metrics/vars"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/pkg/rcode"
+	"github.com/coredns/coredns/middleware/pkg/replacer"
+	"github.com/coredns/coredns/middleware/pkg/response"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+// Logger is a basic request logging middleware.
+type Logger struct {
+	Next      middleware.Handler
+	Rules     []Rule
+	ErrorFunc func(dns.ResponseWriter, *dns.Msg, int) // failover error handler
+}
+
+// ServeDNS implements the middleware.Handler interface.
+func (l Logger) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	state := request.Request{W: w, Req: r}
+	for _, rule := range l.Rules {
+		if !middleware.Name(rule.NameScope).Matches(state.Name()) {
+			continue
+		}
+
+		rrw := dnsrecorder.New(w)
+		rc, err := middleware.NextOrFailure(l.Name(), l.Next, ctx, rrw, r)
+
+		if rc > 0 {
+			// There was an error up the chain, but no response has been written yet.
+			// The error must be handled here so the log entry will record the response size.
+			if l.ErrorFunc != nil {
+				l.ErrorFunc(rrw, r, rc)
+			} else {
+				answer := new(dns.Msg)
+				answer.SetRcode(r, rc)
+				state.SizeAndDo(answer)
+
+				vars.Report(state, vars.Dropped, rcode.ToString(rc), answer.Len(), time.Now())
+
+				w.WriteMsg(answer)
+			}
+			rc = 0
+		}
+
+		class, _ := response.Classify(rrw.Msg)
+		if rule.Class == response.All || rule.Class == class {
+			rep := replacer.New(r, rrw, CommonLogEmptyValue)
+			rule.Log.Println(rep.Replace(rule.Format))
+		}
+
+		return rc, err
+
+	}
+	return middleware.NextOrFailure(l.Name(), l.Next, ctx, w, r)
+}
+
+// Name implements the Handler interface.
+func (l Logger) Name() string { return "log" }
+
+// Rule configures the logging middleware.
+type Rule struct {
+	NameScope  string
+	Class      response.Class
+	OutputFile string
+	Format     string
+	Log        *log.Logger
+}
+
+const (
+	// DefaultLogFilename is the default log filename.
+	DefaultLogFilename = "query.log"
+	// CommonLogFormat is the common log format.
+	CommonLogFormat = `{remote} ` + CommonLogEmptyValue + ` [{when}] "{type} {class} {name} {proto} {size} {>do} {>bufsize}" {rcode} {rsize} {duration}`
+	// CommonLogEmptyValue is the common empty log value.
+	CommonLogEmptyValue = "-"
+	// CombinedLogFormat is the combined log format.
+	CombinedLogFormat = CommonLogFormat + ` "{>opcode}"`
+	// DefaultLogFormat is the default log format.
+	DefaultLogFormat = CommonLogFormat
+)
diff --git a/vendor/github.com/miekg/coredns/middleware/log/log_test.go b/vendor/github.com/miekg/coredns/middleware/log/log_test.go
new file mode 100644
index 0000000000..80efc971ca
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/log/log_test.go
@@ -0,0 +1,101 @@
+package log
+
+import (
+	"bytes"
+	"log"
+	"strings"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/pkg/response"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+func TestLoggedStatus(t *testing.T) {
+	var f bytes.Buffer
+	rule := Rule{
+		NameScope: ".",
+		Format:    DefaultLogFormat,
+		Log:       log.New(&f, "", 0),
+	}
+
+	logger := Logger{
+		Rules: []Rule{rule},
+		Next:  test.ErrorHandler(),
+	}
+
+	ctx := context.TODO()
+	r := new(dns.Msg)
+	r.SetQuestion("example.org.", dns.TypeA)
+
+	rec := dnsrecorder.New(&test.ResponseWriter{})
+
+	rcode, _ := logger.ServeDNS(ctx, rec, r)
+	if rcode != 0 {
+		t.Errorf("Expected rcode to be 0 - was: %d", rcode)
+	}
+
+	logged := f.String()
+	if !strings.Contains(logged, "A IN example.org. udp 29 false 512") {
+		t.Errorf("Expected it to be logged. Logged string: %s", logged)
+	}
+}
+
+func TestLoggedClassDenial(t *testing.T) {
+	var f bytes.Buffer
+	rule := Rule{
+		NameScope: ".",
+		Format:    DefaultLogFormat,
+		Log:       log.New(&f, "", 0),
+		Class:     response.Denial,
+	}
+
+	logger := Logger{
+		Rules: []Rule{rule},
+		Next:  test.ErrorHandler(),
+	}
+
+	ctx := context.TODO()
+	r := new(dns.Msg)
+	r.SetQuestion("example.org.", dns.TypeA)
+
+	rec := dnsrecorder.New(&test.ResponseWriter{})
+
+	logger.ServeDNS(ctx, rec, r)
+
+	logged := f.String()
+	if len(logged) != 0 {
+		t.Errorf("Expected it not to be logged, but got string: %s", logged)
+	}
+}
+
+func TestLoggedClassError(t *testing.T) {
+	var f bytes.Buffer
+	rule := Rule{
+		NameScope: ".",
+		Format:    DefaultLogFormat,
+		Log:       log.New(&f, "", 0),
+		Class:     response.Error,
+	}
+
+	logger := Logger{
+		Rules: []Rule{rule},
+		Next:  test.ErrorHandler(),
+	}
+
+	ctx := context.TODO()
+	r := new(dns.Msg)
+	r.SetQuestion("example.org.", dns.TypeA)
+
+	rec := dnsrecorder.New(&test.ResponseWriter{})
+
+	logger.ServeDNS(ctx, rec, r)
+
+	logged := f.String()
+	if !strings.Contains(logged, "SERVFAIL") {
+		t.Errorf("Expected it to be logged. Logged string: %s", logged)
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/log/setup.go b/vendor/github.com/miekg/coredns/middleware/log/setup.go
new file mode 100644
index 0000000000..ce4f5c44db
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/log/setup.go
@@ -0,0 +1,132 @@
+package log
+
+import (
+	"io"
+	"log"
+	"os"
+
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/response"
+
+	"github.com/hashicorp/go-syslog"
+	"github.com/mholt/caddy"
+	"github.com/miekg/dns"
+)
+
+func init() {
+	caddy.RegisterPlugin("log", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setup,
+	})
+}
+
+func setup(c *caddy.Controller) error {
+	rules, err := logParse(c)
+	if err != nil {
+		return middleware.Error("log", err)
+	}
+
+	// Open the log files for writing when the server starts
+	c.OnStartup(func() error {
+		for i := 0; i < len(rules); i++ {
+			var err error
+			var writer io.Writer
+
+			if rules[i].OutputFile == "stdout" {
+				writer = os.Stdout
+			} else if rules[i].OutputFile == "stderr" {
+				writer = os.Stderr
+			} else if rules[i].OutputFile == "syslog" {
+				writer, err = gsyslog.NewLogger(gsyslog.LOG_INFO, "LOCAL0", "coredns")
+				if err != nil {
+					return middleware.Error("log", err)
+				}
+			} else {
+				var file *os.File
+				file, err = os.OpenFile(rules[i].OutputFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
+				if err != nil {
+					return middleware.Error("log", err)
+				}
+				writer = file
+			}
+
+			rules[i].Log = log.New(writer, "", 0)
+		}
+
+		return nil
+	})
+
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
+		return Logger{Next: next, Rules: rules, ErrorFunc: dnsserver.DefaultErrorFunc}
+	})
+
+	return nil
+}
+
+func logParse(c *caddy.Controller) ([]Rule, error) {
+	var rules []Rule
+
+	for c.Next() {
+		args := c.RemainingArgs()
+
+		if len(args) == 0 {
+			// Nothing specified; use defaults
+			rules = append(rules, Rule{
+				NameScope:  ".",
+				OutputFile: DefaultLogFilename,
+				Format:     DefaultLogFormat,
+			})
+		} else if len(args) == 1 {
+			// Only an output file specified
+			rules = append(rules, Rule{
+				NameScope:  ".",
+				OutputFile: args[0],
+				Format:     DefaultLogFormat,
+			})
+		} else {
+			// Name scope, output file, and maybe a format specified
+
+			format := DefaultLogFormat
+
+			if len(args) > 2 {
+				switch args[2] {
+				case "{common}":
+					format = CommonLogFormat
+				case "{combined}":
+					format = CombinedLogFormat
+				default:
+					format = args[2]
+				}
+			}
+
+			rules = append(rules, Rule{
+				NameScope:  dns.Fqdn(args[0]),
+				OutputFile: args[1],
+				Format:     format,
+			})
+		}
+
+		// Class refinements in an extra block.
+		for c.NextBlock() {
+			switch c.Val() {
+			// class followed by all, denial, error or success.
+			case "class":
+				classes := c.RemainingArgs()
+				if len(classes) == 0 {
+					return nil, c.ArgErr()
+				}
+				cls, err := response.ClassFromString(classes[0])
+				if err != nil {
+					return nil, err
+				}
+				// update class and the last added Rule (bit icky)
+				rules[len(rules)-1].Class = cls
+			default:
+				return nil, c.ArgErr()
+			}
+		}
+	}
+
+	return rules, nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/log/setup_test.go b/vendor/github.com/miekg/coredns/middleware/log/setup_test.go
new file mode 100644
index 0000000000..48bfbfa04c
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/log/setup_test.go
@@ -0,0 +1,130 @@
+package log
+
+import (
+	"testing"
+
+	"github.com/coredns/coredns/middleware/pkg/response"
+
+	"github.com/mholt/caddy"
+)
+
+func TestLogParse(t *testing.T) {
+	tests := []struct {
+		inputLogRules    string
+		shouldErr        bool
+		expectedLogRules []Rule
+	}{
+		{`log`, false, []Rule{{
+			NameScope:  ".",
+			OutputFile: DefaultLogFilename,
+			Format:     DefaultLogFormat,
+		}}},
+		{`log log.txt`, false, []Rule{{
+			NameScope:  ".",
+			OutputFile: "log.txt",
+			Format:     DefaultLogFormat,
+		}}},
+		{`log example.org log.txt`, false, []Rule{{
+			NameScope:  "example.org.",
+			OutputFile: "log.txt",
+			Format:     DefaultLogFormat,
+		}}},
+		{`log example.org. stdout`, false, []Rule{{
+			NameScope:  "example.org.",
+			OutputFile: "stdout",
+			Format:     DefaultLogFormat,
+		}}},
+		{`log example.org log.txt {common}`, false, []Rule{{
+			NameScope:  "example.org.",
+			OutputFile: "log.txt",
+			Format:     CommonLogFormat,
+		}}},
+		{`log example.org accesslog.txt {combined}`, false, []Rule{{
+			NameScope:  "example.org.",
+			OutputFile: "accesslog.txt",
+			Format:     CombinedLogFormat,
+		}}},
+		{`log example.org. log.txt
+			  log example.net accesslog.txt {combined}`, false, []Rule{{
+			NameScope:  "example.org.",
+			OutputFile: "log.txt",
+			Format:     DefaultLogFormat,
+		}, {
+			NameScope:  "example.net.",
+			OutputFile: "accesslog.txt",
+			Format:     CombinedLogFormat,
+		}}},
+		{`log example.org stdout {host}
+			  log example.org log.txt {when}`, false, []Rule{{
+			NameScope:  "example.org.",
+			OutputFile: "stdout",
+			Format:     "{host}",
+		}, {
+			NameScope:  "example.org.",
+			OutputFile: "log.txt",
+			Format:     "{when}",
+		}}},
+
+		{`log example.org log.txt {
+				class all
+			}`, false, []Rule{{
+			NameScope:  "example.org.",
+			OutputFile: "log.txt",
+			Format:     CommonLogFormat,
+			Class:      response.All,
+		}}},
+		{`log example.org log.txt {
+			class denial
+		}`, false, []Rule{{
+			NameScope:  "example.org.",
+			OutputFile: "log.txt",
+			Format:     CommonLogFormat,
+			Class:      response.Denial,
+		}}},
+		{`log {
+			class denial
+		}`, false, []Rule{{
+			NameScope:  ".",
+			OutputFile: DefaultLogFilename,
+			Format:     CommonLogFormat,
+			Class:      response.Denial,
+		}}},
+	}
+	for i, test := range tests {
+		c := caddy.NewTestController("dns", test.inputLogRules)
+		actualLogRules, err := logParse(c)
+
+		if err == nil && test.shouldErr {
+			t.Errorf("Test %d didn't error, but it should have", i)
+		} else if err != nil && !test.shouldErr {
+			t.Errorf("Test %d errored, but it shouldn't have; got '%v'", i, err)
+		}
+		if len(actualLogRules) != len(test.expectedLogRules) {
+			t.Fatalf("Test %d expected %d no of Log rules, but got %d ",
+				i, len(test.expectedLogRules), len(actualLogRules))
+		}
+		for j, actualLogRule := range actualLogRules {
+
+			if actualLogRule.NameScope != test.expectedLogRules[j].NameScope {
+				t.Errorf("Test %d expected %dth LogRule NameScope to be  %s  , but got %s",
+					i, j, test.expectedLogRules[j].NameScope, actualLogRule.NameScope)
+			}
+
+			if actualLogRule.OutputFile != test.expectedLogRules[j].OutputFile {
+				t.Errorf("Test %d expected %dth LogRule OutputFile to be  %s  , but got %s",
+					i, j, test.expectedLogRules[j].OutputFile, actualLogRule.OutputFile)
+			}
+
+			if actualLogRule.Format != test.expectedLogRules[j].Format {
+				t.Errorf("Test %d expected %dth LogRule Format to be  %s  , but got %s",
+					i, j, test.expectedLogRules[j].Format, actualLogRule.Format)
+			}
+
+			if actualLogRule.Class != test.expectedLogRules[j].Class {
+				t.Errorf("Test %d expected %dth LogRule Class to be  %s  , but got %s",
+					i, j, test.expectedLogRules[j].Class, actualLogRule.Class)
+			}
+		}
+	}
+
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/metrics/README.md b/vendor/github.com/miekg/coredns/middleware/metrics/README.md
new file mode 100644
index 0000000000..f321089326
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/metrics/README.md
@@ -0,0 +1,53 @@
+# prometheus
+
+This module enables prometheus metrics for CoreDNS. The default location for the metrics is
+`localhost:9153`. The metrics path is fixed to `/metrics`.
+
+The following metrics are exported:
+
+* coredns_dns_request_count_total{zone, proto, family}
+* coredns_dns_request_duration_milliseconds{zone}
+* coredns_dns_request_size_bytes{zone, proto}
+* coredns_dns_request_do_count_total{zone}
+* coredns_dns_request_type_count_total{zone, type}
+* coredns_dns_response_size_bytes{zone, proto}
+* coredns_dns_response_rcode_count_total{zone, rcode}
+
+Each counter has a label `zone` which is the zonename used for the request/response.
+
+Extra labels used are:
+
+* `proto` which holds the transport of the response ("udp" or "tcp")
+* The address family (`family`) of the transport (1 = IP (IP version 4), 2 = IP6 (IP version 6)).
+* `type` which holds the query type. It holds most common types (A, AAAA, MX, SOA, CNAME, PTR, TXT,
+  NS, SRV, DS, DNSKEY, RRSIG, NSEC, NSEC3, IXFR, AXFR and ANY) and "other" which lumps together all
+  other types.
+* The `response_rcode_count_total` has an extra label `rcode` which holds the rcode of the response.
+
+If monitoring is enabled, queries that do not enter the middleware chain are exported under the fake
+name "dropped" (without a closing dot - this is never a valid domain name).
+
+
+## Syntax
+
+~~~
+prometheus [ADDRESS]
+~~~
+
+For each zone that you want to see metrics for.
+
+It optionally takes an address to which the metrics are exported; the default
+is `localhost:9153`. The metrics path is fixed to `/metrics`.
+
+## Examples
+
+Use an alternative address:
+
+~~~
+prometheus localhost:9253
+~~~
+
+# Bugs
+
+When reloading, we keep the handler running, meaning that any changes to the handler aren't picked
+up. You'll need to restart CoreDNS for that to happen.
diff --git a/vendor/github.com/miekg/coredns/middleware/metrics/handler.go b/vendor/github.com/miekg/coredns/middleware/metrics/handler.go
new file mode 100644
index 0000000000..50dc4141e6
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/metrics/handler.go
@@ -0,0 +1,34 @@
+package metrics
+
+import (
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/metrics/vars"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/pkg/rcode"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+// ServeDNS implements the Handler interface.
+func (m *Metrics) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	state := request.Request{W: w, Req: r}
+
+	qname := state.QName()
+	zone := middleware.Zones(m.ZoneNames()).Matches(qname)
+	if zone == "" {
+		zone = "."
+	}
+
+	// Record response to get status code and size of the reply.
+	rw := dnsrecorder.New(w)
+	status, err := middleware.NextOrFailure(m.Name(), m.Next, ctx, rw, r)
+
+	vars.Report(state, zone, rcode.ToString(rw.Rcode), rw.Len, rw.Start)
+
+	return status, err
+}
+
+// Name implements the Handler interface.
+func (m *Metrics) Name() string { return "prometheus" }
diff --git a/vendor/github.com/miekg/coredns/middleware/metrics/metrics.go b/vendor/github.com/miekg/coredns/middleware/metrics/metrics.go
new file mode 100644
index 0000000000..6e06a2bf41
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/metrics/metrics.go
@@ -0,0 +1,101 @@
+// Package metrics implement a handler and middleware that provides Prometheus metrics.
+package metrics
+
+import (
+	"log"
+	"net"
+	"net/http"
+	"sync"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/metrics/vars"
+
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+func init() {
+	prometheus.MustRegister(vars.RequestCount)
+	prometheus.MustRegister(vars.RequestDuration)
+	prometheus.MustRegister(vars.RequestSize)
+	prometheus.MustRegister(vars.RequestDo)
+	prometheus.MustRegister(vars.RequestType)
+
+	prometheus.MustRegister(vars.ResponseSize)
+	prometheus.MustRegister(vars.ResponseRcode)
+}
+
+// Metrics holds the prometheus configuration. The metrics' path is fixed to be /metrics
+type Metrics struct {
+	Next middleware.Handler
+	Addr string
+	ln   net.Listener
+	mux  *http.ServeMux
+
+	zoneNames []string
+	zoneMap   map[string]bool
+	zoneMu    sync.RWMutex
+}
+
+// AddZone adds zone z to m.
+func (m *Metrics) AddZone(z string) {
+	m.zoneMu.Lock()
+	m.zoneMap[z] = true
+	m.zoneNames = keys(m.zoneMap)
+	m.zoneMu.Unlock()
+}
+
+// RemoveZone remove zone z from m.
+func (m *Metrics) RemoveZone(z string) {
+	m.zoneMu.Lock()
+	delete(m.zoneMap, z)
+	m.zoneNames = keys(m.zoneMap)
+	m.zoneMu.Unlock()
+}
+
+// ZoneNames returns the zones of m.
+func (m *Metrics) ZoneNames() []string {
+	m.zoneMu.RLock()
+	s := m.zoneNames
+	m.zoneMu.RUnlock()
+	return s
+}
+
+// OnStartup sets up the metrics on startup.
+func (m *Metrics) OnStartup() error {
+	ln, err := net.Listen("tcp", m.Addr)
+	if err != nil {
+		log.Printf("[ERROR] Failed to start metrics handler: %s", err)
+		return err
+	}
+
+	m.ln = ln
+	ListenAddr = m.ln.Addr().String()
+
+	m.mux = http.NewServeMux()
+	m.mux.Handle("/metrics", prometheus.Handler())
+
+	go func() {
+		http.Serve(m.ln, m.mux)
+	}()
+	return nil
+}
+
+// OnShutdown tears down the metrics on shutdown and restart.
+func (m *Metrics) OnShutdown() error {
+	if m.ln != nil {
+		return m.ln.Close()
+	}
+	return nil
+}
+
+func keys(m map[string]bool) []string {
+	sx := []string{}
+	for k := range m {
+		sx = append(sx, k)
+	}
+	return sx
+}
+
+// ListenAddr is assigned the address of the prometheus listener. Its use is mainly in tests where
+// we listen on "localhost:0" and need to retrieve the actual address.
+var ListenAddr string
diff --git a/vendor/github.com/miekg/coredns/middleware/metrics/metrics_test.go b/vendor/github.com/miekg/coredns/middleware/metrics/metrics_test.go
new file mode 100644
index 0000000000..18a9011ed1
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/metrics/metrics_test.go
@@ -0,0 +1,83 @@
+package metrics
+
+import (
+	"testing"
+
+	"github.com/coredns/coredns/middleware"
+	mtest "github.com/coredns/coredns/middleware/metrics/test"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+func TestMetrics(t *testing.T) {
+	met := &Metrics{Addr: "localhost:0", zoneMap: make(map[string]bool)}
+	if err := met.OnStartup(); err != nil {
+		t.Fatalf("Failed to start metrics handler: %s", err)
+	}
+	defer met.OnShutdown()
+
+	met.AddZone("example.org.")
+
+	tests := []struct {
+		next          middleware.Handler
+		qname         string
+		qtype         uint16
+		metric        string
+		expectedValue string
+	}{
+		// This all works because 1 bucket (1 zone, 1 type)
+		{
+			next:          test.NextHandler(dns.RcodeSuccess, nil),
+			qname:         "example.org",
+			metric:        "coredns_dns_request_count_total",
+			expectedValue: "1",
+		},
+		{
+			next:          test.NextHandler(dns.RcodeSuccess, nil),
+			qname:         "example.org",
+			metric:        "coredns_dns_request_count_total",
+			expectedValue: "2",
+		},
+		{
+			next:          test.NextHandler(dns.RcodeSuccess, nil),
+			qname:         "example.org",
+			metric:        "coredns_dns_request_type_count_total",
+			expectedValue: "3",
+		},
+		{
+			next:          test.NextHandler(dns.RcodeSuccess, nil),
+			qname:         "example.org",
+			metric:        "coredns_dns_response_rcode_count_total",
+			expectedValue: "4",
+		},
+	}
+
+	ctx := context.TODO()
+
+	for i, tc := range tests {
+		req := new(dns.Msg)
+		if tc.qtype == 0 {
+			tc.qtype = dns.TypeA
+		}
+		req.SetQuestion(dns.Fqdn(tc.qname), tc.qtype)
+		met.Next = tc.next
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		_, err := met.ServeDNS(ctx, rec, req)
+		if err != nil {
+			t.Fatalf("Test %d: Expected no error, but got %s", i, err)
+		}
+
+		result := mtest.Scrape(t, "http://"+ListenAddr+"/metrics")
+
+		if tc.expectedValue != "" {
+			got, _ := mtest.MetricValue(tc.metric, result)
+			if got != tc.expectedValue {
+				t.Errorf("Test %d: Expected value %s for metrics %s, but got %s", i, tc.expectedValue, tc.metric, got)
+			}
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/metrics/setup.go b/vendor/github.com/miekg/coredns/middleware/metrics/setup.go
new file mode 100644
index 0000000000..40f0ee6711
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/metrics/setup.go
@@ -0,0 +1,92 @@
+package metrics
+
+import (
+	"net"
+	"sync"
+
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/mholt/caddy"
+)
+
+func init() {
+	caddy.RegisterPlugin("prometheus", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setup,
+	})
+}
+
+func setup(c *caddy.Controller) error {
+	m, err := prometheusParse(c)
+	if err != nil {
+		return middleware.Error("prometheus", err)
+	}
+
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
+		m.Next = next
+		return m
+	})
+
+	// During restarts we will keep this handler running.
+	metricsOnce.Do(func() {
+		c.OncePerServerBlock(m.OnStartup)
+		c.OnFinalShutdown(m.OnShutdown)
+	})
+
+	return nil
+}
+
+func prometheusParse(c *caddy.Controller) (*Metrics, error) {
+	var (
+		met = &Metrics{Addr: addr, zoneMap: make(map[string]bool)}
+		err error
+	)
+
+	for c.Next() {
+		if len(met.ZoneNames()) > 0 {
+			return met, c.Err("can only have one metrics module per server")
+		}
+
+		for _, z := range c.ServerBlockKeys {
+			met.AddZone(middleware.Host(z).Normalize())
+		}
+		args := c.RemainingArgs()
+
+		switch len(args) {
+		case 0:
+		case 1:
+			met.Addr = args[0]
+			_, _, e := net.SplitHostPort(met.Addr)
+			if e != nil {
+				return met, e
+			}
+		default:
+			return met, c.ArgErr()
+		}
+		for c.NextBlock() {
+			switch c.Val() {
+			case "address":
+				args = c.RemainingArgs()
+				if len(args) != 1 {
+					return met, c.ArgErr()
+				}
+				met.Addr = args[0]
+				// expecting something that resembles a host-port
+				_, _, e := net.SplitHostPort(met.Addr)
+				if e != nil {
+					return met, e
+				}
+			default:
+				return met, c.Errf("unknown item: %s", c.Val())
+			}
+
+		}
+	}
+	return met, err
+}
+
+var metricsOnce sync.Once
+
+// Addr is the address the where the metrics are exported by default.
+const addr = "localhost:9153"
diff --git a/vendor/github.com/miekg/coredns/middleware/metrics/setup_test.go b/vendor/github.com/miekg/coredns/middleware/metrics/setup_test.go
new file mode 100644
index 0000000000..fbda89a54e
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/metrics/setup_test.go
@@ -0,0 +1,41 @@
+package metrics
+
+import (
+	"testing"
+
+	"github.com/mholt/caddy"
+)
+
+func TestPrometheusParse(t *testing.T) {
+	tests := []struct {
+		input     string
+		shouldErr bool
+		addr      string
+	}{
+		// oks
+		{`prometheus`, false, "localhost:9153"},
+		{`prometheus localhost:53`, false, "localhost:53"},
+		// fails
+		{`prometheus {}`, true, ""},
+		{`prometheus /foo`, true, ""},
+	}
+	for i, test := range tests {
+		c := caddy.NewTestController("dns", test.input)
+		m, err := prometheusParse(c)
+		if test.shouldErr && err == nil {
+			t.Errorf("Test %v: Expected error but found nil", i)
+			continue
+		} else if !test.shouldErr && err != nil {
+			t.Errorf("Test %v: Expected no error but found error: %v", i, err)
+			continue
+		}
+
+		if test.shouldErr {
+			continue
+		}
+
+		if test.addr != m.Addr {
+			t.Errorf("Test %v: Expected address %s but found: %s", i, test.addr, m.Addr)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/metrics/test/scrape.go b/vendor/github.com/miekg/coredns/middleware/metrics/test/scrape.go
new file mode 100644
index 0000000000..c748be2098
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/metrics/test/scrape.go
@@ -0,0 +1,225 @@
+// Adapted by Miek Gieben for CoreDNS testing.
+//
+// License from prom2json
+// Copyright 2014 Prometheus Team
+// 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 test will scrape a target and you can inspect the variables.
+// Basic usage:
+//
+//	result := Scrape("http://localhost:9153/metrics")
+//	v := MetricValue("coredns_cache_capacity", result)
+//
+package test
+
+import (
+	"fmt"
+	"io"
+	"mime"
+	"net/http"
+	"testing"
+
+	"github.com/matttproud/golang_protobuf_extensions/pbutil"
+	"github.com/prometheus/common/expfmt"
+
+	dto "github.com/prometheus/client_model/go"
+)
+
+type (
+	// MetricFamily holds a prometheus metric.
+	MetricFamily struct {
+		Name    string        `json:"name"`
+		Help    string        `json:"help"`
+		Type    string        `json:"type"`
+		Metrics []interface{} `json:"metrics,omitempty"` // Either metric or summary.
+	}
+
+	// metric is for all "single value" metrics.
+	metric struct {
+		Labels map[string]string `json:"labels,omitempty"`
+		Value  string            `json:"value"`
+	}
+
+	summary struct {
+		Labels    map[string]string `json:"labels,omitempty"`
+		Quantiles map[string]string `json:"quantiles,omitempty"`
+		Count     string            `json:"count"`
+		Sum       string            `json:"sum"`
+	}
+
+	histogram struct {
+		Labels  map[string]string `json:"labels,omitempty"`
+		Buckets map[string]string `json:"buckets,omitempty"`
+		Count   string            `json:"count"`
+		Sum     string            `json:"sum"`
+	}
+)
+
+// Scrape returns the all the vars a []*metricFamily.
+func Scrape(t *testing.T, url string) []*MetricFamily {
+	mfChan := make(chan *dto.MetricFamily, 1024)
+
+	go fetchMetricFamilies(t, url, mfChan)
+
+	result := []*MetricFamily{}
+	for mf := range mfChan {
+		result = append(result, newMetricFamily(mf))
+	}
+	return result
+}
+
+// MetricValue returns the value associated with name as a string as well as the labels.
+// It only returns the first metrics of the slice.
+func MetricValue(name string, mfs []*MetricFamily) (string, map[string]string) {
+	for _, mf := range mfs {
+		if mf.Name == name {
+			// Only works with Gauge and Counter...
+			return mf.Metrics[0].(metric).Value, mf.Metrics[0].(metric).Labels
+		}
+	}
+	return "", nil
+}
+
+// MetricValueLabel returns the value for name *and* label *value*.
+func MetricValueLabel(name, label string, mfs []*MetricFamily) (string, map[string]string) {
+	// bit hacky is this really handy...?
+	for _, mf := range mfs {
+		if mf.Name == name {
+			for _, m := range mf.Metrics {
+				for _, v := range m.(metric).Labels {
+					if v == label {
+						return m.(metric).Value, m.(metric).Labels
+					}
+				}
+
+			}
+		}
+	}
+	return "", nil
+}
+
+func newMetricFamily(dtoMF *dto.MetricFamily) *MetricFamily {
+	mf := &MetricFamily{
+		Name:    dtoMF.GetName(),
+		Help:    dtoMF.GetHelp(),
+		Type:    dtoMF.GetType().String(),
+		Metrics: make([]interface{}, len(dtoMF.Metric)),
+	}
+	for i, m := range dtoMF.Metric {
+		if dtoMF.GetType() == dto.MetricType_SUMMARY {
+			mf.Metrics[i] = summary{
+				Labels:    makeLabels(m),
+				Quantiles: makeQuantiles(m),
+				Count:     fmt.Sprint(m.GetSummary().GetSampleCount()),
+				Sum:       fmt.Sprint(m.GetSummary().GetSampleSum()),
+			}
+		} else if dtoMF.GetType() == dto.MetricType_HISTOGRAM {
+			mf.Metrics[i] = histogram{
+				Labels:  makeLabels(m),
+				Buckets: makeBuckets(m),
+				Count:   fmt.Sprint(m.GetHistogram().GetSampleCount()),
+				Sum:     fmt.Sprint(m.GetSummary().GetSampleSum()),
+			}
+		} else {
+			mf.Metrics[i] = metric{
+				Labels: makeLabels(m),
+				Value:  fmt.Sprint(value(m)),
+			}
+		}
+	}
+	return mf
+}
+
+func value(m *dto.Metric) float64 {
+	if m.Gauge != nil {
+		return m.GetGauge().GetValue()
+	}
+	if m.Counter != nil {
+		return m.GetCounter().GetValue()
+	}
+	if m.Untyped != nil {
+		return m.GetUntyped().GetValue()
+	}
+	return 0.
+}
+
+func makeLabels(m *dto.Metric) map[string]string {
+	result := map[string]string{}
+	for _, lp := range m.Label {
+		result[lp.GetName()] = lp.GetValue()
+	}
+	return result
+}
+
+func makeQuantiles(m *dto.Metric) map[string]string {
+	result := map[string]string{}
+	for _, q := range m.GetSummary().Quantile {
+		result[fmt.Sprint(q.GetQuantile())] = fmt.Sprint(q.GetValue())
+	}
+	return result
+}
+
+func makeBuckets(m *dto.Metric) map[string]string {
+	result := map[string]string{}
+	for _, b := range m.GetHistogram().Bucket {
+		result[fmt.Sprint(b.GetUpperBound())] = fmt.Sprint(b.GetCumulativeCount())
+	}
+	return result
+}
+
+func fetchMetricFamilies(t *testing.T, url string, ch chan<- *dto.MetricFamily) {
+	defer close(ch)
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		t.Fatalf("creating GET request for URL %q failed: %s", url, err)
+	}
+	req.Header.Add("Accept", acceptHeader)
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		t.Fatalf("executing GET request for URL %q failed: %s", url, err)
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		t.Fatalf("GET request for URL %q returned HTTP status %s", url, resp.Status)
+	}
+
+	mediatype, params, err := mime.ParseMediaType(resp.Header.Get("Content-Type"))
+	if err == nil && mediatype == "application/vnd.google.protobuf" &&
+		params["encoding"] == "delimited" &&
+		params["proto"] == "io.prometheus.client.MetricFamily" {
+		for {
+			mf := &dto.MetricFamily{}
+			if _, err = pbutil.ReadDelimited(resp.Body, mf); err != nil {
+				if err == io.EOF {
+					break
+				}
+				t.Fatalf("reading metric family protocol buffer failed: %s", err)
+			}
+			ch <- mf
+		}
+	} else {
+		// We could do further content-type checks here, but the
+		// fallback for now will anyway be the text format
+		// version 0.0.4, so just go for it and see if it works.
+		var parser expfmt.TextParser
+		metricFamilies, err := parser.TextToMetricFamilies(resp.Body)
+		if err != nil {
+			t.Fatal("reading text format failed:", err)
+		}
+		for _, mf := range metricFamilies {
+			ch <- mf
+		}
+	}
+}
+
+const acceptHeader = `application/vnd.google.protobuf;proto=io.prometheus.client.MetricFamily;encoding=delimited;q=0.7,text/plain;version=0.0.4;q=0.3`
diff --git a/vendor/github.com/miekg/coredns/middleware/metrics/vars/report.go b/vendor/github.com/miekg/coredns/middleware/metrics/vars/report.go
new file mode 100644
index 0000000000..5d8f2ba645
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/metrics/vars/report.go
@@ -0,0 +1,62 @@
+package vars
+
+import (
+	"time"
+
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+// Report reports the metrics data associcated with request.
+func Report(req request.Request, zone, rcode string, size int, start time.Time) {
+	// Proto and Family.
+	net := req.Proto()
+	fam := "1"
+	if req.Family() == 2 {
+		fam = "2"
+	}
+
+	typ := req.QType()
+
+	RequestCount.WithLabelValues(zone, net, fam).Inc()
+	RequestDuration.WithLabelValues(zone).Observe(float64(time.Since(start) / time.Millisecond))
+
+	if req.Do() {
+		RequestDo.WithLabelValues(zone).Inc()
+	}
+
+	if _, known := monitorType[typ]; known {
+		RequestType.WithLabelValues(zone, dns.Type(typ).String()).Inc()
+	} else {
+		RequestType.WithLabelValues(zone, other).Inc()
+	}
+
+	ResponseSize.WithLabelValues(zone, net).Observe(float64(size))
+	RequestSize.WithLabelValues(zone, net).Observe(float64(req.Len()))
+
+	ResponseRcode.WithLabelValues(zone, rcode).Inc()
+}
+
+var monitorType = map[uint16]bool{
+	dns.TypeAAAA:   true,
+	dns.TypeA:      true,
+	dns.TypeCNAME:  true,
+	dns.TypeDNSKEY: true,
+	dns.TypeDS:     true,
+	dns.TypeMX:     true,
+	dns.TypeNSEC3:  true,
+	dns.TypeNSEC:   true,
+	dns.TypeNS:     true,
+	dns.TypePTR:    true,
+	dns.TypeRRSIG:  true,
+	dns.TypeSOA:    true,
+	dns.TypeSRV:    true,
+	dns.TypeTXT:    true,
+	// Meta Qtypes
+	dns.TypeIXFR: true,
+	dns.TypeAXFR: true,
+	dns.TypeANY:  true,
+}
+
+const other = "other"
diff --git a/vendor/github.com/miekg/coredns/middleware/metrics/vars/vars.go b/vendor/github.com/miekg/coredns/middleware/metrics/vars/vars.go
new file mode 100644
index 0000000000..42af100072
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/metrics/vars/vars.go
@@ -0,0 +1,69 @@
+package vars
+
+import (
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+// Request* and Response* are the prometheus counters and gauges we are using for exporting metrics.
+var (
+	RequestCount = prometheus.NewCounterVec(prometheus.CounterOpts{
+		Namespace: middleware.Namespace,
+		Subsystem: subsystem,
+		Name:      "request_count_total",
+		Help:      "Counter of DNS requests made per zone, protocol and family.",
+	}, []string{"zone", "proto", "family"})
+
+	RequestDuration = prometheus.NewHistogramVec(prometheus.HistogramOpts{
+		Namespace: middleware.Namespace,
+		Subsystem: subsystem,
+		Name:      "request_duration_milliseconds",
+		Buckets:   append(prometheus.DefBuckets, []float64{50, 100, 200, 500, 1000, 2000, 3000, 4000, 5000, 10000}...),
+		Help:      "Histogram of the time (in milliseconds) each request took.",
+	}, []string{"zone"})
+
+	RequestSize = prometheus.NewHistogramVec(prometheus.HistogramOpts{
+		Namespace: middleware.Namespace,
+		Subsystem: subsystem,
+		Name:      "request_size_bytes",
+		Help:      "Size of the EDNS0 UDP buffer in bytes (64K for TCP).",
+		Buckets:   []float64{0, 100, 200, 300, 400, 511, 1023, 2047, 4095, 8291, 16e3, 32e3, 48e3, 64e3},
+	}, []string{"zone", "proto"})
+
+	RequestDo = prometheus.NewCounterVec(prometheus.CounterOpts{
+		Namespace: middleware.Namespace,
+		Subsystem: subsystem,
+		Name:      "request_do_count_total",
+		Help:      "Counter of DNS requests with DO bit set per zone.",
+	}, []string{"zone"})
+
+	RequestType = prometheus.NewCounterVec(prometheus.CounterOpts{
+		Namespace: middleware.Namespace,
+		Subsystem: subsystem,
+		Name:      "request_type_count_total",
+		Help:      "Counter of DNS requests per type, per zone.",
+	}, []string{"zone", "type"})
+
+	ResponseSize = prometheus.NewHistogramVec(prometheus.HistogramOpts{
+		Namespace: middleware.Namespace,
+		Subsystem: subsystem,
+		Name:      "response_size_bytes",
+		Help:      "Size of the returned response in bytes.",
+		Buckets:   []float64{0, 100, 200, 300, 400, 511, 1023, 2047, 4095, 8291, 16e3, 32e3, 48e3, 64e3},
+	}, []string{"zone", "proto"})
+
+	ResponseRcode = prometheus.NewCounterVec(prometheus.CounterOpts{
+		Namespace: middleware.Namespace,
+		Subsystem: subsystem,
+		Name:      "response_rcode_count_total",
+		Help:      "Counter of response status codes.",
+	}, []string{"zone", "rcode"})
+)
+
+const (
+	subsystem = "dns"
+
+	// Dropped indicates we dropped the query before any handling. It has no closing dot, so it can not be a valid zone.
+	Dropped = "dropped"
+)
diff --git a/vendor/github.com/miekg/coredns/middleware/middleware.go b/vendor/github.com/miekg/coredns/middleware/middleware.go
new file mode 100644
index 0000000000..7d0d502b33
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/middleware.go
@@ -0,0 +1,86 @@
+// Package middleware provides some types and functions common among middleware.
+package middleware
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/miekg/dns"
+	ot "github.com/opentracing/opentracing-go"
+	"golang.org/x/net/context"
+)
+
+type (
+	// Middleware is the middle layer which represents the traditional
+	// idea of middleware: it chains one Handler to the next by being
+	// passed the next Handler in the chain.
+	Middleware func(Handler) Handler
+
+	// Handler is like dns.Handler except ServeDNS may return an rcode
+	// and/or error.
+	//
+	// If ServeDNS writes to the response body, it should return a status
+	// code. If the status code is not one of the following:
+	//
+	// * SERVFAIL (dns.RcodeServerFailure)
+	//
+	// * REFUSED (dns.RecodeRefused)
+	//
+	// * FORMERR (dns.RcodeFormatError)
+	//
+	// * NOTIMP (dns.RcodeNotImplemented)
+	//
+	// CoreDNS assumes *no* reply has yet been written. All other response
+	// codes signal other handlers above it that the response message is
+	// already written, and that they should not write to it also.
+	//
+	// If ServeDNS encounters an error, it should return the error value
+	// so it can be logged by designated error-handling middleware.
+	//
+	// If writing a response after calling another ServeDNS method, the
+	// returned rcode SHOULD be used when writing the response.
+	//
+	// If handling errors after calling another ServeDNS method, the
+	// returned error value SHOULD be logged or handled accordingly.
+	//
+	// Otherwise, return values should be propagated down the middleware
+	// chain by returning them unchanged.
+	Handler interface {
+		ServeDNS(context.Context, dns.ResponseWriter, *dns.Msg) (int, error)
+		Name() string
+	}
+
+	// HandlerFunc is a convenience type like dns.HandlerFunc, except
+	// ServeDNS returns an rcode and an error. See Handler
+	// documentation for more information.
+	HandlerFunc func(context.Context, dns.ResponseWriter, *dns.Msg) (int, error)
+)
+
+// ServeDNS implements the Handler interface.
+func (f HandlerFunc) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	return f(ctx, w, r)
+}
+
+// Name implements the Handler interface.
+func (f HandlerFunc) Name() string { return "handlerfunc" }
+
+// Error returns err with 'middleware/name: ' prefixed to it.
+func Error(name string, err error) error { return fmt.Errorf("%s/%s: %s", "middleware", name, err) }
+
+// NextOrFailure calls next.ServeDNS when next is not nill, otherwise it will return, a ServerFailure
+// and a nil error.
+func NextOrFailure(name string, next Handler, ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	if next != nil {
+		if span := ot.SpanFromContext(ctx); span != nil {
+			child := span.Tracer().StartSpan(next.Name(), ot.ChildOf(span.Context()))
+			defer child.Finish()
+			ctx = ot.ContextWithSpan(ctx, child)
+		}
+		return next.ServeDNS(ctx, w, r)
+	}
+
+	return dns.RcodeServerFailure, Error(name, errors.New("no next middleware found"))
+}
+
+// Namespace is the namespace used for the metrics.
+const Namespace = "coredns"
diff --git a/vendor/github.com/miekg/coredns/middleware/middleware_test.go b/vendor/github.com/miekg/coredns/middleware/middleware_test.go
new file mode 100644
index 0000000000..c870d7c164
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/middleware_test.go
@@ -0,0 +1 @@
+package middleware
diff --git a/vendor/github.com/miekg/coredns/middleware/normalize.go b/vendor/github.com/miekg/coredns/middleware/normalize.go
new file mode 100644
index 0000000000..77ef979934
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/normalize.go
@@ -0,0 +1,100 @@
+package middleware
+
+import (
+	"net"
+	"strings"
+
+	"github.com/miekg/dns"
+)
+
+// See core/dnsserver/address.go - we should unify these two impls.
+
+// Zones respresents a lists of zone names.
+type Zones []string
+
+// Matches checks is qname is a subdomain of any of the zones in z.  The match
+// will return the most specific zones that matches other. The empty string
+// signals a not found condition.
+func (z Zones) Matches(qname string) string {
+	zone := ""
+	for _, zname := range z {
+		if dns.IsSubDomain(zname, qname) {
+			// We want the *longest* matching zone, otherwise we may end up in a parent
+			if len(zname) > len(zone) {
+				zone = zname
+			}
+		}
+	}
+	return zone
+}
+
+// Normalize fully qualifies all zones in z.
+func (z Zones) Normalize() {
+	for i := range z {
+		z[i] = Name(z[i]).Normalize()
+	}
+}
+
+// Name represents a domain name.
+type Name string
+
+// Matches checks to see if other is a subdomain (or the same domain) of n.
+// This method assures that names can be easily and consistently matched.
+func (n Name) Matches(child string) bool {
+	if dns.Name(n) == dns.Name(child) {
+		return true
+	}
+	return dns.IsSubDomain(string(n), child)
+}
+
+// Normalize lowercases and makes n fully qualified.
+func (n Name) Normalize() string { return strings.ToLower(dns.Fqdn(string(n))) }
+
+type (
+	// Host represents a host from the Corefile, may contain port.
+	Host string // Host represents a host from the Corefile, may contain port.
+	// Addr represents an address in the Corefile.
+	Addr string // Addr resprents an address in the Corefile.
+)
+
+// Normalize will return the host portion of host, stripping
+// of any port or transport. The host will also be fully qualified and lowercased.
+func (h Host) Normalize() string {
+
+	s := string(h)
+
+	switch {
+	case strings.HasPrefix(s, TransportTLS+"://"):
+		s = s[len(TransportTLS+"://"):]
+	case strings.HasPrefix(s, TransportDNS+"://"):
+		s = s[len(TransportDNS+"://"):]
+	case strings.HasPrefix(s, TransportGRPC+"://"):
+		s = s[len(TransportGRPC+"://"):]
+	}
+
+	// separate host and port
+	host, _, err := net.SplitHostPort(s)
+	if err != nil {
+		host, _, _ = net.SplitHostPort(s + ":")
+	}
+	return Name(host).Normalize()
+}
+
+// Normalize will return a normalized address, if not port is specified
+// port 53 is added, otherwise the port will be left as is.
+func (a Addr) Normalize() string {
+	// separate host and port
+	addr, port, err := net.SplitHostPort(string(a))
+	if err != nil {
+		addr, port, _ = net.SplitHostPort(string(a) + ":53")
+	}
+	// TODO(miek): lowercase it?
+	return net.JoinHostPort(addr, port)
+}
+
+// Duplicated from core/dnsserver/address.go !
+const (
+	TransportDNS  = "dns"
+	TransportTLS  = "tls"
+	TransportGRPC = "grpc"
+)
diff --git a/vendor/github.com/miekg/coredns/middleware/normalize_test.go b/vendor/github.com/miekg/coredns/middleware/normalize_test.go
new file mode 100644
index 0000000000..285e185fd0
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/normalize_test.go
@@ -0,0 +1,96 @@
+package middleware
+
+import "testing"
+
+func TestZoneMatches(t *testing.T) {
+	child := "example.org."
+	zones := Zones([]string{"org.", "."})
+	actual := zones.Matches(child)
+	if actual != "org." {
+		t.Errorf("Expected %v, got %v", "org.", actual)
+	}
+
+	child = "bla.example.org."
+	zones = Zones([]string{"bla.example.org.", "org.", "."})
+	actual = zones.Matches(child)
+
+	if actual != "bla.example.org." {
+		t.Errorf("Expected %v, got %v", "org.", actual)
+	}
+}
+
+func TestZoneNormalize(t *testing.T) {
+	zones := Zones([]string{"example.org", "Example.ORG.", "example.org."})
+	expected := "example.org."
+	zones.Normalize()
+
+	for _, actual := range zones {
+		if actual != expected {
+			t.Errorf("Expected %v, got %v\n", expected, actual)
+		}
+	}
+}
+
+func TestNameMatches(t *testing.T) {
+	matches := []struct {
+		child    string
+		parent   string
+		expected bool
+	}{
+		{".", ".", true},
+		{"example.org.", ".", true},
+		{"example.org.", "example.org.", true},
+		{"example.org.", "org.", true},
+		{"org.", "example.org.", false},
+	}
+
+	for _, m := range matches {
+		actual := Name(m.parent).Matches(m.child)
+		if actual != m.expected {
+			t.Errorf("Expected %v for %s/%s, got %v", m.expected, m.parent, m.child, actual)
+		}
+
+	}
+}
+
+func TestNameNormalize(t *testing.T) {
+	names := []string{
+		"example.org", "example.org.",
+		"Example.ORG.", "example.org."}
+
+	for i := 0; i < len(names); i += 2 {
+		ts := names[i]
+		expected := names[i+1]
+		actual := Name(ts).Normalize()
+		if expected != actual {
+			t.Errorf("Expected %v, got %v\n", expected, actual)
+		}
+	}
+}
+
+func TestHostNormalize(t *testing.T) {
+	hosts := []string{".:53", ".", "example.org:53", "example.org.", "example.org.:53", "example.org."}
+
+	for i := 0; i < len(hosts); i += 2 {
+		ts := hosts[i]
+		expected := hosts[i+1]
+		actual := Host(ts).Normalize()
+		if expected != actual {
+			t.Errorf("Expected %v, got %v\n", expected, actual)
+		}
+	}
+}
+
+func TestAddrNormalize(t *testing.T) {
+	addrs := []string{".:53", ".:53", "example.org", "example.org:53", "example.org.:1053", "example.org.:1053"}
+
+	for i := 0; i < len(addrs); i += 2 {
+		ts := addrs[i]
+		expected := addrs[i+1]
+		actual := Addr(ts).Normalize()
+		if expected != actual {
+			t.Errorf("Expected %v, got %v\n", expected, actual)
+		}
+	}
+
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/debug/debug.go b/vendor/github.com/miekg/coredns/middleware/pkg/debug/debug.go
new file mode 100644
index 0000000000..186872f127
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/debug/debug.go
@@ -0,0 +1,21 @@
+package debug
+
+import "strings"
+
+// Name is the domain prefix we check for when it is a debug query.
+const Name = "o-o.debug."
+
+// IsDebug checks if name is a debugging name, i.e. starts with o-o.debug.
+// it returns the empty string if it is not a debug message, otherwise it will return the
+// name with o-o.debug. stripped off. Must be called with name lowercased.
+func IsDebug(name string) string {
+	if len(name) == len(Name) {
+		return ""
+	}
+	name = strings.ToLower(name)
+	debug := strings.HasPrefix(name, Name)
+	if !debug {
+		return ""
+	}
+	return name[len(Name):]
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/debug/debug_test.go b/vendor/github.com/miekg/coredns/middleware/pkg/debug/debug_test.go
new file mode 100644
index 0000000000..9b0d9ea4f0
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/debug/debug_test.go
@@ -0,0 +1,21 @@
+package debug
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestIsDebug(t *testing.T) {
+	if ok := IsDebug("o-o.debug.miek.nl."); ok != "miek.nl." {
+		t.Errorf("expected o-o.debug.miek.nl. to be debug")
+	}
+	if ok := IsDebug(strings.ToLower("o-o.Debug.miek.nl.")); ok != "miek.nl." {
+		t.Errorf("expected o-o.Debug.miek.nl. to be debug")
+	}
+	if ok := IsDebug("i-o.debug.miek.nl."); ok != "" {
+		t.Errorf("expected i-o.Debug.miek.nl. to be non-debug")
+	}
+	if ok := IsDebug(strings.ToLower("i-o.Debug.")); ok != "" {
+		t.Errorf("expected o-o.Debug. to be non-debug")
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/dnsrecorder/recorder.go b/vendor/github.com/miekg/coredns/middleware/pkg/dnsrecorder/recorder.go
new file mode 100644
index 0000000000..3ca5f00d0a
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/dnsrecorder/recorder.go
@@ -0,0 +1,58 @@
+// Package dnsrecorder allows you to record a DNS response when it is send to the client.
+package dnsrecorder
+
+import (
+	"time"
+
+	"github.com/miekg/dns"
+)
+
+// Recorder is a type of ResponseWriter that captures
+// the rcode code written to it and also the size of the message
+// written in the response. A rcode code does not have
+// to be written, however, in which case 0 must be assumed.
+// It is best to have the constructor initialize this type
+// with that default status code.
+type Recorder struct {
+	dns.ResponseWriter
+	Rcode int
+	Len   int
+	Msg   *dns.Msg
+	Start time.Time
+}
+
+// New makes and returns a new Recorder,
+// which captures the DNS rcode from the ResponseWriter
+// and also the length of the response message written through it.
+func New(w dns.ResponseWriter) *Recorder {
+	return &Recorder{
+		ResponseWriter: w,
+		Rcode:          0,
+		Msg:            nil,
+		Start:          time.Now(),
+	}
+}
+
+// WriteMsg records the status code and calls the
+// underlying ResponseWriter's WriteMsg method.
+func (r *Recorder) WriteMsg(res *dns.Msg) error {
+	r.Rcode = res.Rcode
+	// We may get called multiple times (axfr for instance).
+	// Save the last message, but add the sizes.
+	r.Len += res.Len()
+	r.Msg = res
+	return r.ResponseWriter.WriteMsg(res)
+}
+
+// Write is a wrapper that records the length of the message that gets written.
+func (r *Recorder) Write(buf []byte) (int, error) {
+	n, err := r.ResponseWriter.Write(buf)
+	if err == nil {
+		r.Len += n
+	}
+	return n, err
+}
+
+// Hijack implements dns.Hijacker. It simply wraps the underlying
+// ResponseWriter's Hijack method if there is one, or returns an error.
+func (r *Recorder) Hijack() { r.ResponseWriter.Hijack(); return }
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/dnsrecorder/recorder_test.go b/vendor/github.com/miekg/coredns/middleware/pkg/dnsrecorder/recorder_test.go
new file mode 100644
index 0000000000..c9c2f6ce43
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/dnsrecorder/recorder_test.go
@@ -0,0 +1,28 @@
+package dnsrecorder
+
+/*
+func TestNewResponseRecorder(t *testing.T) {
+	w := httptest.NewRecorder()
+	recordRequest := NewResponseRecorder(w)
+	if !(recordRequest.ResponseWriter == w) {
+		t.Fatalf("Expected Response writer in the Recording to be same as the one sent\n")
+	}
+	if recordRequest.status != http.StatusOK {
+		t.Fatalf("Expected recorded status  to be http.StatusOK (%d) , but found %d\n ", http.StatusOK, recordRequest.status)
+	}
+}
+
+func TestWrite(t *testing.T) {
+	w := httptest.NewRecorder()
+	responseTestString := "test"
+	recordRequest := NewResponseRecorder(w)
+	buf := []byte(responseTestString)
+	recordRequest.Write(buf)
+	if recordRequest.size != len(buf) {
+		t.Fatalf("Expected the bytes written counter to be %d, but instead found %d\n", len(buf), recordRequest.size)
+	}
+	if w.Body.String() != responseTestString {
+		t.Fatalf("Expected Response Body to be %s , but found %s\n", responseTestString, w.Body.String())
+	}
+}
+*/
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/cname.go b/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/cname.go
new file mode 100644
index 0000000000..281e032182
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/cname.go
@@ -0,0 +1,15 @@
+package dnsutil
+
+import "github.com/miekg/dns"
+
+// DuplicateCNAME returns true if r already exists in records.
+func DuplicateCNAME(r *dns.CNAME, records []dns.RR) bool {
+	for _, rec := range records {
+		if v, ok := rec.(*dns.CNAME); ok {
+			if v.Target == r.Target {
+				return true
+			}
+		}
+	}
+	return false
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/cname_test.go b/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/cname_test.go
new file mode 100644
index 0000000000..5fb8d30291
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/cname_test.go
@@ -0,0 +1,55 @@
+package dnsutil
+
+import (
+	"testing"
+
+	"github.com/miekg/dns"
+)
+
+func TestDuplicateCNAME(t *testing.T) {
+	tests := []struct {
+		cname    string
+		records  []string
+		expected bool
+	}{
+		{
+			"1.0.0.192.IN-ADDR.ARPA.	3600	IN	CNAME	1.0.0.0.192.IN-ADDR.ARPA.",
+			[]string{
+				"US.    86400	IN	NSEC	0-.us. NS SOA RRSIG NSEC DNSKEY TYPE65534",
+				"1.0.0.192.IN-ADDR.ARPA.	3600	IN	CNAME	1.0.0.0.192.IN-ADDR.ARPA.",
+			},
+			true,
+		},
+		{
+			"1.0.0.192.IN-ADDR.ARPA.	3600	IN	CNAME	1.0.0.0.192.IN-ADDR.ARPA.",
+			[]string{
+				"US.    86400	IN	NSEC	0-.us. NS SOA RRSIG NSEC DNSKEY TYPE65534",
+			},
+			false,
+		},
+		{
+			"1.0.0.192.IN-ADDR.ARPA.	3600	IN	CNAME	1.0.0.0.192.IN-ADDR.ARPA.",
+			[]string{},
+			false,
+		},
+	}
+	for i, test := range tests {
+		cnameRR, err := dns.NewRR(test.cname)
+		if err != nil {
+			t.Fatalf("Test %d, cname ('%s') error (%s)!", i, test.cname, err)
+		}
+		cname := cnameRR.(*dns.CNAME)
+		records := []dns.RR{}
+		for j, r := range test.records {
+			rr, err := dns.NewRR(r)
+			if err != nil {
+				t.Fatalf("Test %d, record %d ('%s') error (%s)!", i, j, r, err)
+			}
+			records = append(records, rr)
+		}
+		got := DuplicateCNAME(cname, records)
+		if got != test.expected {
+			t.Errorf("Test %d, expected '%v', got '%v' for CNAME ('%s') and RECORDS (%v)", i, test.expected, got, test.cname, test.records)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/dedup.go b/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/dedup.go
new file mode 100644
index 0000000000..dae656a012
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/dedup.go
@@ -0,0 +1,12 @@
+package dnsutil
+
+import "github.com/miekg/dns"
+
+// Dedup de-duplicates a message.
+func Dedup(m *dns.Msg) *dns.Msg {
+	// TODO(miek): expensive!
+	m.Answer = dns.Dedup(m.Answer, nil)
+	m.Ns = dns.Dedup(m.Ns, nil)
+	m.Extra = dns.Dedup(m.Extra, nil)
+	return m
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/doc.go b/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/doc.go
new file mode 100644
index 0000000000..75d1e8c7a6
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/doc.go
@@ -0,0 +1,2 @@
+// Package dnsutil contains DNS related helper functions.
+package dnsutil
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/host.go b/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/host.go
new file mode 100644
index 0000000000..aaab586e81
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/host.go
@@ -0,0 +1,82 @@
+package dnsutil
+
+import (
+	"fmt"
+	"net"
+	"os"
+
+	"github.com/miekg/dns"
+)
+
+// ParseHostPortOrFile parses the strings in s, each string can either be a address,
+// address:port or a filename. The address part is checked and the filename case a
+// resolv.conf like file is parsed and the nameserver found are returned.
+func ParseHostPortOrFile(s ...string) ([]string, error) {
+	var servers []string
+	for _, host := range s {
+		addr, _, err := net.SplitHostPort(host)
+		if err != nil {
+			// Parse didn't work, it is not a addr:port combo
+			if net.ParseIP(host) == nil {
+				// Not an IP address.
+				ss, err := tryFile(host)
+				if err == nil {
+					servers = append(servers, ss...)
+					continue
+				}
+				return servers, fmt.Errorf("not an IP address or file: %q", host)
+			}
+			ss := net.JoinHostPort(host, "53")
+			servers = append(servers, ss)
+			continue
+		}
+
+		if net.ParseIP(addr) == nil {
+			// No an IP address.
+			ss, err := tryFile(host)
+			if err == nil {
+				servers = append(servers, ss...)
+				continue
+			}
+			return servers, fmt.Errorf("not an IP address or file: %q", host)
+		}
+		servers = append(servers, host)
+	}
+	return servers, nil
+}
+
+// Try to open this is a file first.
+func tryFile(s string) ([]string, error) {
+	c, err := dns.ClientConfigFromFile(s)
+	if err == os.ErrNotExist {
+		return nil, fmt.Errorf("failed to open file %q: %q", s, err)
+	} else if err != nil {
+		return nil, err
+	}
+
+	servers := []string{}
+	for _, s := range c.Servers {
+		servers = append(servers, net.JoinHostPort(s, c.Port))
+	}
+	return servers, nil
+}
+
+// ParseHostPort will check if the host part is a valid IP address, if the
+// IP address is valid, but no port is found, defaultPort is added.
+func ParseHostPort(s, defaultPort string) (string, error) {
+	addr, port, err := net.SplitHostPort(s)
+	if port == "" {
+		port = defaultPort
+	}
+	if err != nil {
+		if net.ParseIP(s) == nil {
+			return "", fmt.Errorf("must specify an IP address: `%s'", s)
+		}
+		return net.JoinHostPort(s, port), nil
+	}
+
+	if net.ParseIP(addr) == nil {
+		return "", fmt.Errorf("must specify an IP address: `%s'", addr)
+	}
+	return net.JoinHostPort(addr, port), nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/host_test.go b/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/host_test.go
new file mode 100644
index 0000000000..cc55f45705
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/host_test.go
@@ -0,0 +1,85 @@
+package dnsutil
+
+import (
+	"io/ioutil"
+	"os"
+	"testing"
+)
+
+func TestParseHostPortOrFile(t *testing.T) {
+	tests := []struct {
+		in        string
+		expected  string
+		shouldErr bool
+	}{
+		{
+			"8.8.8.8",
+			"8.8.8.8:53",
+			false,
+		},
+		{
+			"8.8.8.8:153",
+			"8.8.8.8:153",
+			false,
+		},
+		{
+			"/etc/resolv.conf:53",
+			"",
+			true,
+		},
+		{
+			"resolv.conf",
+			"127.0.0.1:53",
+			false,
+		},
+	}
+
+	err := ioutil.WriteFile("resolv.conf", []byte("nameserver 127.0.0.1\n"), 0600)
+	if err != nil {
+		t.Fatalf("Failed to write test resolv.conf")
+	}
+	defer os.Remove("resolv.conf")
+
+	for i, tc := range tests {
+		got, err := ParseHostPortOrFile(tc.in)
+		if err == nil && tc.shouldErr {
+			t.Errorf("Test %d, expected error, got nil", i)
+			continue
+		}
+		if err != nil && tc.shouldErr {
+			continue
+		}
+		if got[0] != tc.expected {
+			t.Errorf("Test %d, expected %q, got %q", i, tc.expected, got[0])
+		}
+	}
+}
+
+func TestParseHostPort(t *testing.T) {
+	tests := []struct {
+		in        string
+		expected  string
+		shouldErr bool
+	}{
+		{"8.8.8.8:53", "8.8.8.8:53", false},
+		{"a.a.a.a:153", "", true},
+		{"8.8.8.8", "8.8.8.8:53", false},
+		{"8.8.8.8:", "8.8.8.8:53", false},
+		{"8.8.8.8::53", "", true},
+		{"resolv.conf", "", true},
+	}
+
+	for i, tc := range tests {
+		got, err := ParseHostPort(tc.in, "53")
+		if err == nil && tc.shouldErr {
+			t.Errorf("Test %d, expected error, got nil", i)
+			continue
+		}
+		if err != nil && !tc.shouldErr {
+			t.Errorf("Test %d, expected no error, got %q", i, err)
+		}
+		if got != tc.expected {
+			t.Errorf("Test %d, expected %q, got %q", i, tc.expected, got)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/reverse.go b/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/reverse.go
new file mode 100644
index 0000000000..daf9cc600a
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/reverse.go
@@ -0,0 +1,68 @@
+package dnsutil
+
+import (
+	"net"
+	"strings"
+)
+
+// ExtractAddressFromReverse turns a standard PTR reverse record name
+// into an IP address. This works for ipv4 or ipv6.
+//
+// 54.119.58.176.in-addr.arpa. becomes 176.58.119.54. If the conversion
+// failes the empty string is returned.
+func ExtractAddressFromReverse(reverseName string) string {
+	search := ""
+
+	f := reverse
+
+	switch {
+	case strings.HasSuffix(reverseName, v4arpaSuffix):
+		search = strings.TrimSuffix(reverseName, v4arpaSuffix)
+	case strings.HasSuffix(reverseName, v6arpaSuffix):
+		search = strings.TrimSuffix(reverseName, v6arpaSuffix)
+		f = reverse6
+	default:
+		return ""
+	}
+
+	// Reverse the segments and then combine them.
+	return f(strings.Split(search, "."))
+}
+
+func reverse(slice []string) string {
+	for i := 0; i < len(slice)/2; i++ {
+		j := len(slice) - i - 1
+		slice[i], slice[j] = slice[j], slice[i]
+	}
+	ip := net.ParseIP(strings.Join(slice, ".")).To4()
+	if ip == nil {
+		return ""
+	}
+	return ip.String()
+}
+
+// reverse6 reverse the segments and combine them according to RFC3596:
+// b.a.9.8.7.6.5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2
+// is reversed to 2001:db8::567:89ab
+func reverse6(slice []string) string {
+	for i := 0; i < len(slice)/2; i++ {
+		j := len(slice) - i - 1
+		slice[i], slice[j] = slice[j], slice[i]
+	}
+	slice6 := []string{}
+	for i := 0; i < len(slice)/4; i++ {
+		slice6 = append(slice6, strings.Join(slice[i*4:i*4+4], ""))
+	}
+	ip := net.ParseIP(strings.Join(slice6, ":")).To16()
+	if ip == nil {
+		return ""
+	}
+	return ip.String()
+}
+
+const (
+	// v4arpaSuffix is the reverse tree suffix for v4 IP addresses.
+	v4arpaSuffix = ".in-addr.arpa."
+	// v6arpaSuffix is the reverse tree suffix for v6 IP addresses.
+	v6arpaSuffix = ".ip6.arpa."
+)
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/reverse_test.go b/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/reverse_test.go
new file mode 100644
index 0000000000..25bd897ac1
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/dnsutil/reverse_test.go
@@ -0,0 +1,51 @@
+package dnsutil
+
+import (
+	"testing"
+)
+
+func TestExtractAddressFromReverse(t *testing.T) {
+	tests := []struct {
+		reverseName     string
+		expectedAddress string
+	}{
+		{
+			"54.119.58.176.in-addr.arpa.",
+			"176.58.119.54",
+		},
+		{
+			".58.176.in-addr.arpa.",
+			"",
+		},
+		{
+			"b.a.9.8.7.6.5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.in-addr.arpa.",
+			"",
+		},
+		{
+			"b.a.9.8.7.6.5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa.",
+			"2001:db8::567:89ab",
+		},
+		{
+			"d.0.1.0.0.2.ip6.arpa.",
+			"",
+		},
+		{
+			"54.119.58.176.ip6.arpa.",
+			"",
+		},
+		{
+			"NONAME",
+			"",
+		},
+		{
+			"",
+			"",
+		},
+	}
+	for i, test := range tests {
+		got := ExtractAddressFromReverse(test.reverseName)
+		if got != test.expectedAddress {
+			t.Errorf("Test %d, expected '%s', got '%s'", i, test.expectedAddress, got)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/edns/edns.go b/vendor/github.com/miekg/coredns/middleware/pkg/edns/edns.go
new file mode 100644
index 0000000000..6cbe2cdaef
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/edns/edns.go
@@ -0,0 +1,46 @@
+// Package edns provides function useful for adding/inspecting OPT records to/in messages.
+package edns
+
+import (
+	"errors"
+
+	"github.com/miekg/dns"
+)
+
+// Version checks the EDNS version in the request. If error
+// is nil everything is OK and we can invoke the middleware. If non-nil, the
+// returned Msg is valid to be returned to the client (and should). For some
+// reason this response should not contain a question RR in the question section.
+func Version(req *dns.Msg) (*dns.Msg, error) {
+	opt := req.IsEdns0()
+	if opt == nil {
+		return nil, nil
+	}
+	if opt.Version() == 0 {
+		return nil, nil
+	}
+	m := new(dns.Msg)
+	m.SetReply(req)
+	// zero out question section, wtf.
+	m.Question = nil
+
+	o := new(dns.OPT)
+	o.Hdr.Name = "."
+	o.Hdr.Rrtype = dns.TypeOPT
+	o.SetVersion(0)
+	o.SetExtendedRcode(dns.RcodeBadVers)
+	m.Extra = []dns.RR{o}
+
+	return m, errors.New("EDNS0 BADVERS")
+}
+
+// Size returns a normalized size based on proto.
+func Size(proto string, size int) int {
+	if proto == "tcp" {
+		return dns.MaxMsgSize
+	}
+	if size < dns.MinMsgSize {
+		return dns.MinMsgSize
+	}
+	return size
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/edns/edns_test.go b/vendor/github.com/miekg/coredns/middleware/pkg/edns/edns_test.go
new file mode 100644
index 0000000000..89ac6d2ec9
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/edns/edns_test.go
@@ -0,0 +1,37 @@
+package edns
+
+import (
+	"testing"
+
+	"github.com/miekg/dns"
+)
+
+func TestVersion(t *testing.T) {
+	m := ednsMsg()
+	m.Extra[0].(*dns.OPT).SetVersion(2)
+
+	_, err := Version(m)
+	if err == nil {
+		t.Errorf("expected wrong version, but got OK")
+	}
+}
+
+func TestVersionNoEdns(t *testing.T) {
+	m := ednsMsg()
+	m.Extra = nil
+
+	_, err := Version(m)
+	if err != nil {
+		t.Errorf("expected no error, but got one: %s", err)
+	}
+}
+
+func ednsMsg() *dns.Msg {
+	m := new(dns.Msg)
+	m.SetQuestion("example.com.", dns.TypeA)
+	o := new(dns.OPT)
+	o.Hdr.Name = "."
+	o.Hdr.Rrtype = dns.TypeOPT
+	m.Extra = append(m.Extra, o)
+	return m
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/rcode/rcode.go b/vendor/github.com/miekg/coredns/middleware/pkg/rcode/rcode.go
new file mode 100644
index 0000000000..32863f0b2b
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/rcode/rcode.go
@@ -0,0 +1,16 @@
+package rcode
+
+import (
+	"strconv"
+
+	"github.com/miekg/dns"
+)
+
+// ToString convert the rcode to the official DNS string, or to "RCODE"+value if the RCODE
+// value is unknown.
+func ToString(rcode int) string {
+	if str, ok := dns.RcodeToString[rcode]; ok {
+		return str
+	}
+	return "RCODE" + strconv.Itoa(rcode)
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/rcode/rcode_test.go b/vendor/github.com/miekg/coredns/middleware/pkg/rcode/rcode_test.go
new file mode 100644
index 0000000000..bfca32f1de
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/rcode/rcode_test.go
@@ -0,0 +1,29 @@
+package rcode
+
+import (
+	"testing"
+
+	"github.com/miekg/dns"
+)
+
+func TestToString(t *testing.T) {
+	tests := []struct {
+		in       int
+		expected string
+	}{
+		{
+			dns.RcodeSuccess,
+			"NOERROR",
+		},
+		{
+			28,
+			"RCODE28",
+		},
+	}
+	for i, test := range tests {
+		got := ToString(test.in)
+		if got != test.expected {
+			t.Errorf("Test %d, expected %s, got %s", i, test.expected, got)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/replacer/replacer.go b/vendor/github.com/miekg/coredns/middleware/pkg/replacer/replacer.go
new file mode 100644
index 0000000000..5227808aea
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/replacer/replacer.go
@@ -0,0 +1,116 @@
+package replacer
+
+import (
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+// Replacer is a type which can replace placeholder
+// substrings in a string with actual values from a
+// dns.Msg and responseRecorder. Always use
+// NewReplacer to get one of these.
+type Replacer interface {
+	Replace(string) string
+	Set(key, value string)
+}
+
+type replacer struct {
+	replacements map[string]string
+	emptyValue   string
+}
+
+// New makes a new replacer based on r and rr.
+// Do not create a new replacer until r and rr have all
+// the needed values, because this function copies those
+// values into the replacer. rr may be nil if it is not
+// available. emptyValue should be the string that is used
+// in place of empty string (can still be empty string).
+func New(r *dns.Msg, rr *dnsrecorder.Recorder, emptyValue string) Replacer {
+	req := request.Request{W: rr, Req: r}
+	rep := replacer{
+		replacements: map[string]string{
+			"{type}":  req.Type(),
+			"{name}":  req.Name(),
+			"{class}": req.Class(),
+			"{proto}": req.Proto(),
+			"{when}": func() string {
+				return time.Now().Format(timeFormat)
+			}(),
+			"{size}":   strconv.Itoa(req.Len()),
+			"{remote}": req.IP(),
+			"{port}":   req.Port(),
+		},
+		emptyValue: emptyValue,
+	}
+	if rr != nil {
+		rcode := dns.RcodeToString[rr.Rcode]
+		if rcode == "" {
+			rcode = strconv.Itoa(rr.Rcode)
+		}
+		rep.replacements["{rcode}"] = rcode
+		rep.replacements["{rsize}"] = strconv.Itoa(rr.Len)
+		rep.replacements["{duration}"] = time.Since(rr.Start).String()
+	}
+
+	// Header placeholders (case-insensitive)
+	rep.replacements[headerReplacer+"id}"] = strconv.Itoa(int(r.Id))
+	rep.replacements[headerReplacer+"opcode}"] = strconv.Itoa(int(r.Opcode))
+	rep.replacements[headerReplacer+"do}"] = boolToString(req.Do())
+	rep.replacements[headerReplacer+"bufsize}"] = strconv.Itoa(req.Size())
+
+	return rep
+}
+
+// Replace performs a replacement of values on s and returns
+// the string with the replaced values.
+func (r replacer) Replace(s string) string {
+	// Header replacements - these are case-insensitive, so we can't just use strings.Replace()
+	for strings.Contains(s, headerReplacer) {
+		idxStart := strings.Index(s, headerReplacer)
+		endOffset := idxStart + len(headerReplacer)
+		idxEnd := strings.Index(s[endOffset:], "}")
+		if idxEnd > -1 {
+			placeholder := strings.ToLower(s[idxStart : endOffset+idxEnd+1])
+			replacement := r.replacements[placeholder]
+			if replacement == "" {
+				replacement = r.emptyValue
+			}
+			s = s[:idxStart] + replacement + s[endOffset+idxEnd+1:]
+		} else {
+			break
+		}
+	}
+
+	// Regular replacements - these are easier because they're case-sensitive
+	for placeholder, replacement := range r.replacements {
+		if replacement == "" {
+			replacement = r.emptyValue
+		}
+		s = strings.Replace(s, placeholder, replacement, -1)
+	}
+
+	return s
+}
+
+// Set sets key to value in the replacements map.
+func (r replacer) Set(key, value string) {
+	r.replacements["{"+key+"}"] = value
+}
+
+func boolToString(b bool) string {
+	if b {
+		return "true"
+	}
+	return "false"
+}
+
+const (
+	timeFormat     = "02/Jan/2006:15:04:05 -0700"
+	headerReplacer = "{>"
+)
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/replacer/replacer_test.go b/vendor/github.com/miekg/coredns/middleware/pkg/replacer/replacer_test.go
new file mode 100644
index 0000000000..09904c1a92
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/replacer/replacer_test.go
@@ -0,0 +1,119 @@
+package replacer
+
+/*
+func TestNewReplacer(t *testing.T) {
+	w := httptest.NewRecorder()
+	recordRequest := NewResponseRecorder(w)
+	reader := strings.NewReader(`{"username": "dennis"}`)
+
+	request, err := http.NewRequest("POST", "http://localhost", reader)
+	if err != nil {
+		t.Fatal("Request Formation Failed\n")
+	}
+	replaceValues := NewReplacer(request, recordRequest, "")
+
+	switch v := replaceValues.(type) {
+	case replacer:
+
+		if v.replacements["{host}"] != "localhost" {
+			t.Error("Expected host to be localhost")
+		}
+		if v.replacements["{method}"] != "POST" {
+			t.Error("Expected request method  to be POST")
+		}
+		if v.replacements["{status}"] != "200" {
+			t.Error("Expected status to be 200")
+		}
+
+	default:
+		t.Fatal("Return Value from New Replacer expected pass type assertion into a replacer type\n")
+	}
+}
+
+func TestReplace(t *testing.T) {
+	w := httptest.NewRecorder()
+	recordRequest := NewResponseRecorder(w)
+	reader := strings.NewReader(`{"username": "dennis"}`)
+
+	request, err := http.NewRequest("POST", "http://localhost", reader)
+	if err != nil {
+		t.Fatal("Request Formation Failed\n")
+	}
+	request.Header.Set("Custom", "foobarbaz")
+	request.Header.Set("ShorterVal", "1")
+	repl := NewReplacer(request, recordRequest, "-")
+
+	if expected, actual := "This host is localhost.", repl.Replace("This host is {host}."); expected != actual {
+		t.Errorf("{host} replacement: expected '%s', got '%s'", expected, actual)
+	}
+	if expected, actual := "This request method is POST.", repl.Replace("This request method is {method}."); expected != actual {
+		t.Errorf("{method} replacement: expected '%s', got '%s'", expected, actual)
+	}
+	if expected, actual := "The response status is 200.", repl.Replace("The response status is {status}."); expected != actual {
+		t.Errorf("{status} replacement: expected '%s', got '%s'", expected, actual)
+	}
+	if expected, actual := "The Custom header is foobarbaz.", repl.Replace("The Custom header is {>Custom}."); expected != actual {
+		t.Errorf("{>Custom} replacement: expected '%s', got '%s'", expected, actual)
+	}
+
+	// Test header case-insensitivity
+	if expected, actual := "The cUsToM header is foobarbaz...", repl.Replace("The cUsToM header is {>cUsToM}..."); expected != actual {
+		t.Errorf("{>cUsToM} replacement: expected '%s', got '%s'", expected, actual)
+	}
+
+	// Test non-existent header/value
+	if expected, actual := "The Non-Existent header is -.", repl.Replace("The Non-Existent header is {>Non-Existent}."); expected != actual {
+		t.Errorf("{>Non-Existent} replacement: expected '%s', got '%s'", expected, actual)
+	}
+
+	// Test bad placeholder
+	if expected, actual := "Bad {host placeholder...", repl.Replace("Bad {host placeholder..."); expected != actual {
+		t.Errorf("bad placeholder: expected '%s', got '%s'", expected, actual)
+	}
+
+	// Test bad header placeholder
+	if expected, actual := "Bad {>Custom placeholder", repl.Replace("Bad {>Custom placeholder"); expected != actual {
+		t.Errorf("bad header placeholder: expected '%s', got '%s'", expected, actual)
+	}
+
+	// Test bad header placeholder with valid one later
+	if expected, actual := "Bad -", repl.Replace("Bad {>Custom placeholder {>ShorterVal}"); expected != actual {
+		t.Errorf("bad header placeholders: expected '%s', got '%s'", expected, actual)
+	}
+
+	// Test shorter header value with multiple placeholders
+	if expected, actual := "Short value 1 then foobarbaz.", repl.Replace("Short value {>ShorterVal} then {>Custom}."); expected != actual {
+		t.Errorf("short value: expected '%s', got '%s'", expected, actual)
+	}
+}
+
+func TestSet(t *testing.T) {
+	w := httptest.NewRecorder()
+	recordRequest := NewResponseRecorder(w)
+	reader := strings.NewReader(`{"username": "dennis"}`)
+
+	request, err := http.NewRequest("POST", "http://localhost", reader)
+	if err != nil {
+		t.Fatalf("Request Formation Failed \n")
+	}
+	repl := NewReplacer(request, recordRequest, "")
+
+	repl.Set("host", "getcaddy.com")
+	repl.Set("method", "GET")
+	repl.Set("status", "201")
+	repl.Set("variable", "value")
+
+	if repl.Replace("This host is {host}") != "This host is getcaddy.com" {
+		t.Error("Expected host replacement failed")
+	}
+	if repl.Replace("This request method is {method}") != "This request method is GET" {
+		t.Error("Expected method replacement failed")
+	}
+	if repl.Replace("The response status is {status}") != "The response status is 201" {
+		t.Error("Expected status replacement failed")
+	}
+	if repl.Replace("The value of variable is {variable}") != "The value of variable is value" {
+		t.Error("Expected variable replacement failed")
+	}
+}
+*/
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/response/classify.go b/vendor/github.com/miekg/coredns/middleware/pkg/response/classify.go
new file mode 100644
index 0000000000..e9f17fe00a
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/response/classify.go
@@ -0,0 +1,71 @@
+package response
+
+import (
+	"fmt"
+
+	"github.com/miekg/dns"
+)
+
+// Class holds sets of Types
+type Class int
+
+const (
+	// All is a meta class encompassing all the classes.
+	All Class = iota
+	// Success is a class for a successful response.
+	Success
+	// Denial is a class for denying existence (NXDOMAIN, or a nodata: type does not exist)
+	Denial
+	// Error is a class for errors, right now defined as not Success and not Denial
+	Error
+)
+
+func (c Class) String() string {
+	switch c {
+	case All:
+		return "all"
+	case Success:
+		return "success"
+	case Denial:
+		return "denial"
+	case Error:
+		return "error"
+	}
+	return ""
+}
+
+// ClassFromString returns the class from the string s. If not class matches
+// the All class and an error are returned
+func ClassFromString(s string) (Class, error) {
+	switch s {
+	case "all":
+		return All, nil
+	case "success":
+		return Success, nil
+	case "denial":
+		return Denial, nil
+	case "error":
+		return Error, nil
+	}
+	return All, fmt.Errorf("invalid Class: %s", s)
+}
+
+// Classify classifies a dns message: it returns its Class.
+func Classify(m *dns.Msg) (Class, *dns.OPT) {
+	t, o := Typify(m)
+	return classify(t), o
+}
+
+// Does need to be exported?
+func classify(t Type) Class {
+	switch t {
+	case NoError, Delegation:
+		return Success
+	case NameError, NoData:
+		return Denial
+	case OtherError:
+		fallthrough
+	default:
+		return Error
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/response/typify.go b/vendor/github.com/miekg/coredns/middleware/pkg/response/typify.go
new file mode 100644
index 0000000000..d2bbeb47e6
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/response/typify.go
@@ -0,0 +1,126 @@
+package response
+
+import (
+	"fmt"
+
+	"github.com/miekg/dns"
+)
+
+// Type is the type of the message
+type Type int
+
+const (
+	// NoError indicates a positive reply
+	NoError Type = iota
+	// NameError is a NXDOMAIN in header, SOA in auth.
+	NameError
+	// NoData indicates name found, but not the type: NOERROR in header, SOA in auth.
+	NoData
+	// Delegation is a msg with a pointer to another nameserver: NOERROR in header, NS in auth, optionally fluff in additional (not checked).
+	Delegation
+	// Meta indicates a meta message, NOTIFY, or a transfer:  qType is IXFR or AXFR.
+	Meta
+	// Update is an dynamic update message.
+	Update
+	// OtherError indicates any other error: don't cache these.
+	OtherError
+)
+
+func (t Type) String() string {
+	switch t {
+	case NoError:
+		return "NOERROR"
+	case NameError:
+		return "NXDOMAIN"
+	case NoData:
+		return "NODATA"
+	case Delegation:
+		return "DELEGATION"
+	case Meta:
+		return "META"
+	case Update:
+		return "UPDATE"
+	case OtherError:
+		return "OTHERERROR"
+	}
+	return ""
+}
+
+// TypeFromString returns the type from the string s. If not type matches
+// the OtherError type and an error are returned.
+func TypeFromString(s string) (Type, error) {
+	switch s {
+	case "NOERROR":
+		return NoError, nil
+	case "NXDOMAIN":
+		return NameError, nil
+	case "NODATA":
+		return NoData, nil
+	case "DELEGATION":
+		return Delegation, nil
+	case "META":
+		return Meta, nil
+	case "UPDATE":
+		return Update, nil
+	case "OTHERERROR":
+		return OtherError, nil
+	}
+	return NoError, fmt.Errorf("invalid Type: %s", s)
+}
+
+// Typify classifies a message, it returns the Type.
+func Typify(m *dns.Msg) (Type, *dns.OPT) {
+	if m == nil {
+		return OtherError, nil
+	}
+	opt := m.IsEdns0()
+
+	if m.Opcode == dns.OpcodeUpdate {
+		return Update, opt
+	}
+
+	// Check transfer and update first
+	if m.Opcode == dns.OpcodeNotify {
+		return Meta, opt
+	}
+
+	if len(m.Question) > 0 {
+		if m.Question[0].Qtype == dns.TypeAXFR || m.Question[0].Qtype == dns.TypeIXFR {
+			return Meta, opt
+		}
+	}
+
+	if len(m.Answer) > 0 && m.Rcode == dns.RcodeSuccess {
+		return NoError, opt
+	}
+
+	soa := false
+	ns := 0
+	for _, r := range m.Ns {
+		if r.Header().Rrtype == dns.TypeSOA {
+			soa = true
+			continue
+		}
+		if r.Header().Rrtype == dns.TypeNS {
+			ns++
+		}
+	}
+
+	// Check length of different sections, and drop stuff that is just to large? TODO(miek).
+	if soa && m.Rcode == dns.RcodeSuccess {
+		return NoData, opt
+	}
+	if soa && m.Rcode == dns.RcodeNameError {
+		return NameError, opt
+	}
+
+	if ns > 0 && ns == len(m.Ns) && m.Rcode == dns.RcodeSuccess {
+		return Delegation, opt
+	}
+
+	if m.Rcode == dns.RcodeSuccess {
+		return NoError, opt
+	}
+
+	return OtherError, opt
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/response/typify_test.go b/vendor/github.com/miekg/coredns/middleware/pkg/response/typify_test.go
new file mode 100644
index 0000000000..3ae795e233
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/response/typify_test.go
@@ -0,0 +1,40 @@
+package response
+
+import (
+	"testing"
+
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+)
+
+func TestTypifyNilMsg(t *testing.T) {
+	var m *dns.Msg
+
+	ty, _ := Typify(m)
+	if ty != OtherError {
+		t.Errorf("message wrongly typified, expected OtherError, got %d", ty)
+	}
+}
+
+func TestClassifyDelegation(t *testing.T) {
+	m := delegationMsg()
+	mt, _ := Typify(m)
+	if mt != Delegation {
+		t.Errorf("message is wrongly classified, expected delegation, got %d", mt)
+	}
+}
+
+func delegationMsg() *dns.Msg {
+	return &dns.Msg{
+		Ns: []dns.RR{
+			test.NS("miek.nl.	3600	IN	NS	linode.atoom.net."),
+			test.NS("miek.nl.	3600	IN	NS	ns-ext.nlnetlabs.nl."),
+			test.NS("miek.nl.	3600	IN	NS	omval.tednet.nl."),
+		},
+		Extra: []dns.RR{
+			test.A("omval.tednet.nl.	3600	IN	A	185.49.141.42"),
+			test.AAAA("omval.tednet.nl.	3600	IN	AAAA	2a04:b900:0:100::42"),
+		},
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/singleflight/singleflight.go b/vendor/github.com/miekg/coredns/middleware/pkg/singleflight/singleflight.go
new file mode 100644
index 0000000000..ff2c2ee4f3
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/singleflight/singleflight.go
@@ -0,0 +1,64 @@
+/*
+Copyright 2012 Google Inc.
+
+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 singleflight provides a duplicate function call suppression
+// mechanism.
+package singleflight
+
+import "sync"
+
+// call is an in-flight or completed Do call
+type call struct {
+	wg  sync.WaitGroup
+	val interface{}
+	err error
+}
+
+// Group represents a class of work and forms a namespace in which
+// units of work can be executed with duplicate suppression.
+type Group struct {
+	mu sync.Mutex       // protects m
+	m  map[string]*call // lazily initialized
+}
+
+// Do executes and returns the results of the given function, making
+// sure that only one execution is in-flight for a given key at a
+// time. If a duplicate comes in, the duplicate caller waits for the
+// original to complete and receives the same results.
+func (g *Group) Do(key string, fn func() (interface{}, error)) (interface{}, error) {
+	g.mu.Lock()
+	if g.m == nil {
+		g.m = make(map[string]*call)
+	}
+	if c, ok := g.m[key]; ok {
+		g.mu.Unlock()
+		c.wg.Wait()
+		return c.val, c.err
+	}
+	c := new(call)
+	c.wg.Add(1)
+	g.m[key] = c
+	g.mu.Unlock()
+
+	c.val, c.err = fn()
+	c.wg.Done()
+
+	g.mu.Lock()
+	delete(g.m, key)
+	g.mu.Unlock()
+
+	return c.val, c.err
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/singleflight/singleflight_test.go b/vendor/github.com/miekg/coredns/middleware/pkg/singleflight/singleflight_test.go
new file mode 100644
index 0000000000..47b4d3dc09
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/singleflight/singleflight_test.go
@@ -0,0 +1,85 @@
+/*
+Copyright 2012 Google Inc.
+
+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 singleflight
+
+import (
+	"errors"
+	"fmt"
+	"sync"
+	"sync/atomic"
+	"testing"
+	"time"
+)
+
+func TestDo(t *testing.T) {
+	var g Group
+	v, err := g.Do("key", func() (interface{}, error) {
+		return "bar", nil
+	})
+	if got, want := fmt.Sprintf("%v (%T)", v, v), "bar (string)"; got != want {
+		t.Errorf("Do = %v; want %v", got, want)
+	}
+	if err != nil {
+		t.Errorf("Do error = %v", err)
+	}
+}
+
+func TestDoErr(t *testing.T) {
+	var g Group
+	someErr := errors.New("Some error")
+	v, err := g.Do("key", func() (interface{}, error) {
+		return nil, someErr
+	})
+	if err != someErr {
+		t.Errorf("Do error = %v; want someErr", err)
+	}
+	if v != nil {
+		t.Errorf("unexpected non-nil value %#v", v)
+	}
+}
+
+func TestDoDupSuppress(t *testing.T) {
+	var g Group
+	c := make(chan string)
+	var calls int32
+	fn := func() (interface{}, error) {
+		atomic.AddInt32(&calls, 1)
+		return <-c, nil
+	}
+
+	const n = 10
+	var wg sync.WaitGroup
+	for i := 0; i < n; i++ {
+		wg.Add(1)
+		go func() {
+			v, err := g.Do("key", fn)
+			if err != nil {
+				t.Errorf("Do error: %v", err)
+			}
+			if v.(string) != "bar" {
+				t.Errorf("got %q; want %q", v, "bar")
+			}
+			wg.Done()
+		}()
+	}
+	time.Sleep(100 * time.Millisecond) // let goroutines above block
+	c <- "bar"
+	wg.Wait()
+	if got := atomic.LoadInt32(&calls); got != 1 {
+		t.Errorf("number of calls = %d; want 1", got)
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/storage/fs.go b/vendor/github.com/miekg/coredns/middleware/pkg/storage/fs.go
new file mode 100644
index 0000000000..bb9719c86c
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/storage/fs.go
@@ -0,0 +1,60 @@
+// Package storage abstracts away where middleware can store assests (zones, keys, etc).
+package storage
+
+import (
+	"net/http"
+	"os"
+	"path"
+	"path/filepath"
+	"runtime"
+)
+
+// dir wraps an http.Dir that restrict file access to a specific directory tree, see http.Dir's documentation
+// for methods for accessing files.
+type dir http.Dir
+
+// CoreDir is the directory where middleware can store assets, like zone files after a zone transfer
+// or public and private keys or anything else a middleware might need. The convention is to place
+// assets in a subdirectory named after the zone prefixed with "D", to prevent the root zone become a hidden directory.
+//
+// Dexample.org/Kexample.org<something>.key
+//
+// Note that subzone(s) under example.org are places in the own directory under CoreDir:
+//
+// Dexample.org/...
+// Db.example.org/...
+//
+// CoreDir will default to "$HOME/.coredns" on Unix, but it's location can be overridden with the COREDNSPATH
+// environment variable.
+var CoreDir = dir(fsPath())
+
+func (d dir) Zone(z string) dir {
+	if z != "." && z[len(z)-2] == '.' {
+		return dir(path.Join(string(d), "D"+z[:len(z)-1]))
+	}
+	return dir(path.Join(string(d), "D"+z))
+}
+
+// fsPath returns the path to the directory where the application may store data.
+// If COREDNSPATH env variable. is set, that value is used. Otherwise, the path is
+// the result of evaluating "$HOME/.coredns".
+func fsPath() string {
+	if corePath := os.Getenv("COREDNSPATH"); corePath != "" {
+		return corePath
+	}
+	return filepath.Join(userHomeDir(), ".coredns")
+}
+
+// userHomeDir returns the user's home directory according to environment variables.
+//
+// Credit: http://stackoverflow.com/a/7922977/1048862
+func userHomeDir() string {
+	if runtime.GOOS == "windows" {
+		home := os.Getenv("HOMEDRIVE") + os.Getenv("HOMEPATH")
+		if home == "" {
+			home = os.Getenv("USERPROFILE")
+		}
+		return home
+	}
+	return os.Getenv("HOME")
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/storage/fs_test.go b/vendor/github.com/miekg/coredns/middleware/pkg/storage/fs_test.go
new file mode 100644
index 0000000000..5692b580eb
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/storage/fs_test.go
@@ -0,0 +1,42 @@
+package storage
+
+import (
+	"os"
+	"path"
+	"strings"
+	"testing"
+)
+
+func TestFsPath(t *testing.T) {
+	if actual := fsPath(); !strings.HasSuffix(actual, ".coredns") {
+		t.Errorf("Expected path to be a .coredns folder, got: %v", actual)
+	}
+
+	os.Setenv("COREDNSPATH", "testpath")
+	defer os.Setenv("COREDNSPATH", "")
+	if actual, expected := fsPath(), "testpath"; actual != expected {
+		t.Errorf("Expected path to be %v, got: %v", expected, actual)
+	}
+}
+
+func TestZone(t *testing.T) {
+	for _, ts := range []string{"example.org.", "example.org"} {
+		d := CoreDir.Zone(ts)
+		actual := path.Base(string(d))
+		expected := "D" + ts
+		if actual != expected {
+			t.Errorf("Expected path to be %v, got %v", actual, expected)
+		}
+	}
+}
+
+func TestZoneRoot(t *testing.T) {
+	for _, ts := range []string{"."} {
+		d := CoreDir.Zone(ts)
+		actual := path.Base(string(d))
+		expected := "D" + ts
+		if actual != expected {
+			t.Errorf("Expected path to be %v, got %v", actual, expected)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/strings/slice.go b/vendor/github.com/miekg/coredns/middleware/pkg/strings/slice.go
new file mode 100644
index 0000000000..3d4b1d4810
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/strings/slice.go
@@ -0,0 +1,11 @@
+package strings
+
+// StringInSlice check whether string a is a member of slice.
+func StringInSlice(a string, slice []string) bool {
+	for _, b := range slice {
+		if b == a {
+			return true
+		}
+	}
+	return false
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/tls/tls.go b/vendor/github.com/miekg/coredns/middleware/pkg/tls/tls.go
new file mode 100644
index 0000000000..7ec30c4ff6
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/tls/tls.go
@@ -0,0 +1,104 @@
+package tls
+
+import (
+	"crypto/tls"
+	"crypto/x509"
+	"fmt"
+	"io/ioutil"
+)
+
+// NewTLSConfigFromArgs returns a TLS config based upon the passed
+// in list of arguments. Typically these come straight from the
+// Corefile.
+// no args
+//  - creates a Config with no cert and using system CAs
+//  - use for a client that talks to a server with a public signed cert (CA installed in system)
+//  - the client will not be authenticated by the server since there is no cert
+// one arg: the path to CA PEM file
+//  - creates a Config with no cert using a specific CA
+//  - use for a client that talks to a server with a private signed cert (CA not installed in system)
+//  - the client will not be authenticated by the server since there is no cert
+// two args: path to cert PEM file, the path to private key PEM file
+//  - creates a Config with a cert, using system CAs to validate the other end
+//  - use for:
+//    - a server; or,
+//    - a client that talks to a server with a public cert and needs certificate-based authentication
+//  - the other end will authenticate this end via the provided cert
+//  - the cert of the other end will be verified via system CAs
+// three args: path to cert PEM file, path to client private key PEM file, path to CA PEM file
+//  - creates a Config with the cert, using specified CA to validate the other end
+//  - use for:
+//    - a server; or,
+//    - a client that talks to a server with a privately signed cert and needs certificate-based
+//      authentication
+//  - the other end will authenticate this end via the provided cert
+//  - this end will verify the other end's cert using the specified CA
+func NewTLSConfigFromArgs(args ...string) (*tls.Config, error) {
+	var err error
+	var c *tls.Config
+	switch len(args) {
+	case 0:
+		// No client cert, use system CA
+		c, err = NewTLSClientConfig("")
+	case 1:
+		// No client cert, use specified CA
+		c, err = NewTLSClientConfig(args[0])
+	case 2:
+		// Client cert, use system CA
+		c, err = NewTLSConfig(args[0], args[1], "")
+	case 3:
+		// Client cert, use specified CA
+		c, err = NewTLSConfig(args[0], args[1], args[2])
+	default:
+		err = fmt.Errorf("Maximum of three arguments allowed for TLS config, found %d", len(args))
+	}
+	if err != nil {
+		return nil, err
+	}
+	return c, nil
+}
+
+// NewTLSConfig returns a TLS config that includes a certificate
+// Use for server TLS config or when using a client certificate
+// If caPath is empty, system CAs will be used
+func NewTLSConfig(certPath, keyPath, caPath string) (*tls.Config, error) {
+	cert, err := tls.LoadX509KeyPair(certPath, keyPath)
+	if err != nil {
+		return nil, fmt.Errorf("Could not load TLS cert: %s", err)
+	}
+
+	roots, err := loadRoots(caPath)
+	if err != nil {
+		return nil, err
+	}
+
+	return &tls.Config{Certificates: []tls.Certificate{cert}, RootCAs: roots}, nil
+}
+
+// NewTLSClientConfig returns a TLS config for a client connection
+// If caPath is empty, system CAs will be used
+func NewTLSClientConfig(caPath string) (*tls.Config, error) {
+	roots, err := loadRoots(caPath)
+	if err != nil {
+		return nil, err
+	}
+
+	return &tls.Config{RootCAs: roots}, nil
+}
+
+func loadRoots(caPath string) (*x509.CertPool, error) {
+	if caPath == "" {
+		return nil, nil
+	}
+
+	roots := x509.NewCertPool()
+	pem, err := ioutil.ReadFile(caPath)
+	if err != nil {
+		return nil, fmt.Errorf("Error reading %s: %s", caPath, err)
+	}
+	ok := roots.AppendCertsFromPEM(pem)
+	if !ok {
+		return nil, fmt.Errorf("Could not read root certs: %s", err)
+	}
+	return roots, nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pkg/tls/tls_test.go b/vendor/github.com/miekg/coredns/middleware/pkg/tls/tls_test.go
new file mode 100644
index 0000000000..6d0cb7372c
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pkg/tls/tls_test.go
@@ -0,0 +1,81 @@
+package tls
+
+import (
+	"path/filepath"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/test"
+)
+
+func getPEMFiles(t *testing.T) (rmFunc func(), cert, key, ca string) {
+	tempDir, rmFunc, err := test.WritePEMFiles("")
+	if err != nil {
+		t.Fatalf("Could not write PEM files: %s", err)
+	}
+
+	cert = filepath.Join(tempDir, "cert.pem")
+	key = filepath.Join(tempDir, "key.pem")
+	ca = filepath.Join(tempDir, "ca.pem")
+
+	return
+}
+
+func TestNewTLSConfig(t *testing.T) {
+	rmFunc, cert, key, ca := getPEMFiles(t)
+	defer rmFunc()
+
+	_, err := NewTLSConfig(cert, key, ca)
+	if err != nil {
+		t.Errorf("Failed to create TLSConfig: %s", err)
+	}
+}
+
+func TestNewTLSClientConfig(t *testing.T) {
+	rmFunc, _, _, ca := getPEMFiles(t)
+	defer rmFunc()
+
+	_, err := NewTLSClientConfig(ca)
+	if err != nil {
+		t.Errorf("Failed to create TLSConfig: %s", err)
+	}
+}
+
+func TestNewTLSConfigFromArgs(t *testing.T) {
+	rmFunc, cert, key, ca := getPEMFiles(t)
+	defer rmFunc()
+
+	_, err := NewTLSConfigFromArgs()
+	if err != nil {
+		t.Errorf("Failed to create TLSConfig: %s", err)
+	}
+
+	c, err := NewTLSConfigFromArgs(ca)
+	if err != nil {
+		t.Errorf("Failed to create TLSConfig: %s", err)
+	}
+	if c.RootCAs == nil {
+		t.Error("RootCAs should not be nil when one arg passed")
+	}
+
+	c, err = NewTLSConfigFromArgs(cert, key)
+	if err != nil {
+		t.Errorf("Failed to create TLSConfig: %s", err)
+	}
+	if c.RootCAs != nil {
+		t.Error("RootCAs should be nil when two args passed")
+	}
+	if len(c.Certificates) != 1 {
+		t.Error("Certificates should have a single entry when two args passed")
+	}
+	args := []string{cert, key, ca}
+	c, err = NewTLSConfigFromArgs(args...)
+	if err != nil {
+		t.Errorf("Failed to create TLSConfig: %s", err)
+	}
+	if c.RootCAs == nil {
+		t.Error("RootCAs should not be nil when three args passed")
+	}
+	if len(c.Certificates) != 1 {
+		t.Error("Certificateis should have a single entry when three args passed")
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/pprof/README.md b/vendor/github.com/miekg/coredns/middleware/pprof/README.md
new file mode 100644
index 0000000000..7ff8048eb2
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pprof/README.md
@@ -0,0 +1,28 @@
+# pprof
+
+*pprof* publishes runtime profiling data at endpoints under /debug/pprof. You can visit
+ `/debug/pprof`
+on your site for an index of the available endpoints. By default it will listen on localhost:6053.
+
+> This is a debugging tool. Certain requests (such as collecting execution traces) can be slow. If
+> you use pprof on a live site, consider restricting access or enabling it only temporarily.
+
+For more information, please see [Go's pprof
+documentation](https://golang.org/pkg/net/http/pprof/s://golang.org/pkg/net/http/pprof/) and read
+[Profiling Go Programs](https://blog.golang.org/profiling-go-programs).
+
+There is not configuration.
+
+## Syntax
+
+~~~
+pprof
+~~~
+
+## Examples
+
+Enable pprof endpoints:
+
+~~~
+pprof
+~~~
diff --git a/vendor/github.com/miekg/coredns/middleware/pprof/pprof.go b/vendor/github.com/miekg/coredns/middleware/pprof/pprof.go
new file mode 100644
index 0000000000..aef834a688
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pprof/pprof.go
@@ -0,0 +1,49 @@
+// Package pprof implement a debug endpoint for getting profiles using the
+// go pprof tooling.
+package pprof
+
+import (
+	"log"
+	"net"
+	"net/http"
+	pp "net/http/pprof"
+)
+
+type handler struct {
+	ln  net.Listener
+	mux *http.ServeMux
+}
+
+func (h *handler) Startup() error {
+	ln, err := net.Listen("tcp", addr)
+	if err != nil {
+		log.Printf("[ERROR] Failed to start pprof handler: %s", err)
+		return err
+	}
+
+	h.ln = ln
+
+	h.mux = http.NewServeMux()
+	h.mux.HandleFunc(path+"/", pp.Index)
+	h.mux.HandleFunc(path+"/cmdline", pp.Cmdline)
+	h.mux.HandleFunc(path+"/profile", pp.Profile)
+	h.mux.HandleFunc(path+"/symbol", pp.Symbol)
+	h.mux.HandleFunc(path+"/trace", pp.Trace)
+
+	go func() {
+		http.Serve(h.ln, h.mux)
+	}()
+	return nil
+}
+
+func (h *handler) Shutdown() error {
+	if h.ln != nil {
+		return h.ln.Close()
+	}
+	return nil
+}
+
+const (
+	addr = "localhost:6053"
+	path = "/debug/pprof"
+)
diff --git a/vendor/github.com/miekg/coredns/middleware/pprof/setup.go b/vendor/github.com/miekg/coredns/middleware/pprof/setup.go
new file mode 100644
index 0000000000..725dc0d63c
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pprof/setup.go
@@ -0,0 +1,42 @@
+package pprof
+
+import (
+	"sync"
+
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/mholt/caddy"
+)
+
+func init() {
+	caddy.RegisterPlugin("pprof", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setup,
+	})
+}
+
+func setup(c *caddy.Controller) error {
+	found := false
+	for c.Next() {
+		if found {
+			return middleware.Error("pprof", c.Err("pprof can only be specified once"))
+		}
+		if len(c.RemainingArgs()) != 0 {
+			return middleware.Error("pprof", c.ArgErr())
+		}
+		if c.NextBlock() {
+			return middleware.Error("pprof", c.ArgErr())
+		}
+		found = true
+	}
+
+	h := &handler{}
+	pprofOnce.Do(func() {
+		c.OnStartup(h.Startup)
+		c.OnShutdown(h.Shutdown)
+	})
+
+	return nil
+}
+
+var pprofOnce sync.Once
diff --git a/vendor/github.com/miekg/coredns/middleware/pprof/setup_test.go b/vendor/github.com/miekg/coredns/middleware/pprof/setup_test.go
new file mode 100644
index 0000000000..af46fd415e
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/pprof/setup_test.go
@@ -0,0 +1,32 @@
+package pprof
+
+import (
+	"testing"
+
+	"github.com/mholt/caddy"
+)
+
+func TestPProf(t *testing.T) {
+	tests := []struct {
+		input     string
+		shouldErr bool
+	}{
+		{`pprof`, false},
+		{`pprof {}`, true},
+		{`pprof /foo`, true},
+		{`pprof {
+            a b
+        }`, true},
+		{`pprof
+          pprof`, true},
+	}
+	for i, test := range tests {
+		c := caddy.NewTestController("dns", test.input)
+		err := setup(c)
+		if test.shouldErr && err == nil {
+			t.Errorf("Test %v: Expected error but found nil", i)
+		} else if !test.shouldErr && err != nil {
+			t.Errorf("Test %v: Expected no error but found error: %v", i, err)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/proxy/README.md b/vendor/github.com/miekg/coredns/middleware/proxy/README.md
new file mode 100644
index 0000000000..3b4f3098de
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/proxy/README.md
@@ -0,0 +1,174 @@
+# proxy
+
+*proxy* facilitates both a basic reverse proxy and a robust load balancer. The proxy has support for
+ multiple backends. The load balancing features include multiple policies, health checks, and
+ failovers. If all hosts fail their health check the proxy middleware will fail back to randomly
+ selecting a target and sending packets to it.
+
+## Syntax
+
+In its most basic form, a simple reverse proxy uses this syntax:
+
+~~~
+proxy FROM TO
+~~~
+
+* **FROM** is the base domain to match for the request to be proxied.
+* **TO** is the destination endpoint to proxy to.
+
+However, advanced features including load balancing can be utilized with an expanded syntax:
+
+~~~
+proxy FROM TO... {
+    policy random|least_conn|round_robin
+    fail_timeout DURATION
+    max_fails INTEGER
+    health_check PATH:PORT [DURATION]
+    except IGNORED_NAMES...
+    spray
+    protocol [dns [force_tcp]|https_google [bootstrap ADDRESS...]|grpc [insecure|CA-PEM|KEY-PEM CERT-PEM|KEY-PEM CERT-PEM CA-PEM]]
+}
+~~~
+
+* **FROM** is the name to match for the request to be proxied.
+* **TO** is the destination endpoint to proxy to. At least one is required, but multiple may be
+  specified. **TO** may be an IP:Port pair, or may reference a file in resolv.conf format
+* `policy` is the load balancing policy to use; applies only with multiple backends. May be one of
+  random, least_conn, or round_robin. Default is random.
+* `fail_timeout` specifies how long to consider a backend as down after it has failed. While it is
+  down, requests will not be routed to that backend. A backend is "down" if CoreDNS fails to
+  communicate with it. The default value is 10 seconds ("10s").
+* `max_fails` is the number of failures within fail_timeout that are needed before considering
+  a backend to be down. If 0, the backend will never be marked as down. Default is 1.
+* `health_check` will check path (on port) on each backend. If a backend returns a status code of
+  200-399, then that backend is healthy. If it doesn't, the backend is marked as unhealthy for
+  duration and no requests are routed to it. If this option is not provided then health checks are
+  disabled. The default duration is 30 seconds ("30s").
+* **IGNORED_NAMES** in `except` is a space-separated list of domains to exclude from proxying.
+  Requests that match none of these names will be passed through.
+* `spray` when all backends are unhealthy, randomly pick one to send the traffic to. (This is
+  a failsafe.)
+* `protocol` specifies what protocol to use to speak to an upstream, `dns` (the default) is plain
+  old DNS, and `https_google` uses `https://dns.google.com` and speaks a JSON DNS dialect. Note when
+  using this **TO** will be ignored. The `grpc` option will talk to a server that has implemented
+  the [DnsService](https://github.com/coredns/coredns/pb/dns.proto).
+  An out-of-tree middleware that implements the server side of this can be found at
+  [here](https://github.com/infobloxopen/coredns-grpc).
+
+## Policies
+
+There are three load-balancing policies available:
+* `random` (default) - Randomly select a backend
+* `least_conn` - Select the backend with the fewest active connections
+* `round_robin` - Select the backend in round-robin fashion
+
+All polices implement randomly spraying packets to backend hosts when *no healthy* hosts are
+available. This is to preeempt the case where the healthchecking (as a mechanism) fails.
+
+## Upstream Protocols
+
+Currently `protocol` supports `dns` (i.e., standard DNS over UDP/TCP) and `https_google` (JSON
+payload over HTTPS). Note that with `https_google` the entire transport is encrypted. Only *you* and
+*Google* can see your DNS activity.
+
+* `dns`: uses the standard DNS exchange. You can pass `force_tcp` to make sure that the proxied connection is performed
+  over TCP, regardless of the inbound request's protocol.
+* `https_google`: bootstrap **ADDRESS...** is used to (re-)resolve `dns.google.com` to an address to
+  connect to. This happens every 300s. If not specified the default is used: 8.8.8.8:53/8.8.4.4:53.
+  Note that **TO** is *ignored* when `https_google` is used, as its upstream is defined as
+  `dns.google.com`.
+
+  Debug queries are enabled by default and currently there is no way to turn them off. When CoreDNS
+  receives a debug query (i.e. the name is prefixed with `o-o.debug.`) a TXT record with Comment
+  from `dns.google.com` is added. Note this is not always set.
+* `grpc`: options are used to control how the TLS connection is made to the gRPC server.
+  * None - No client authentication is used, and the system CAs are used to verify the server certificate.
+  * `insecure` - TLS is not used, the connection is made in plaintext (not good in production).
+  * CA-PEM - No client authentication is used, and the file CA-PEM is used to verify the server certificate.
+  * KEY-PEM CERT-PEM - Client authentication is used with the specified key/cert pair. The server
+    certificate is verified with the system CAs.
+  * KEY-PEM CERT-PEM CA-PEM - Client authentication is used with the specified key/cert pair. The
+    server certificate is verified using the CA-PEM file.
+
+  An out-of-tree middleware that implements the server side of this can be found at
+  [here](https://github.com/infobloxopen/coredns-grpc).
+
+## Metrics
+
+If monitoring is enabled (via the *prometheus* directive) then the following metric is exported:
+
+* coredns_proxy_request_count_total{proto, proxy_proto, from}
+
+Where `proxy_proto` is the protocol used (`dns`, `grpc`, or `https_google`) and `from` is **FROM**
+specified in the config, `proto` is the protocol used by the incoming query ("tcp" or "udp").
+
+## Examples
+
+Proxy all requests within example.org. to a backend system:
+
+~~~
+proxy example.org localhost:9005
+~~~
+
+Load-balance all requests between three backends (using random policy):
+
+~~~
+proxy . dns1.local:53 dns2.local:1053 dns3.local
+~~~
+
+Same as above, but round-robin style:
+
+~~~
+proxy . dns1.local:53 dns2.local:1053 dns3.local {
+	policy round_robin
+}
+~~~
+
+With health checks and proxy headers to pass hostname, IP, and scheme upstream:
+
+~~~
+proxy . dns1.local:53 dns2.local:53 dns3.local:53 {
+	policy round_robin
+	health_check /health:8080
+}
+~~~
+
+Proxy everything except requests to miek.nl or example.org
+
+~~~
+proxy . backend:1234 {
+	except miek.nl example.org
+}
+~~~
+
+Proxy everything except example.org using the host resolv.conf nameservers:
+
+~~~
+proxy . /etc/resolv.conf {
+	except miek.nl example.org
+}
+~~~
+
+Proxy all requests within example.org to Google's dns.google.com.
+
+~~~
+proxy example.org 1.2.3.4:53 {
+    protocol https_google
+}
+~~~
+
+Proxy everything with HTTPS to `dns.google.com`, except `example.org`. Then have another proxy in
+another stanza that uses plain DNS to resolve names under `example.org`.
+
+~~~
+. {
+    proxy . 1.2.3.4:53 {
+        execpt example.org
+        protocol https_google
+    }
+}
+
+example.org {
+    proxy . 8.8.8.8:53
+}
+~~~
diff --git a/vendor/github.com/miekg/coredns/middleware/proxy/dns.go b/vendor/github.com/miekg/coredns/middleware/proxy/dns.go
new file mode 100644
index 0000000000..78a8c3bfe0
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/proxy/dns.go
@@ -0,0 +1,115 @@
+package proxy
+
+import (
+	"context"
+	"net"
+	"time"
+
+	"github.com/coredns/coredns/middleware/pkg/singleflight"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+type dnsEx struct {
+	Timeout time.Duration
+	group   *singleflight.Group
+	Options
+}
+
+type Options struct {
+	ForceTCP bool // If true use TCP for upstream no matter what
+}
+
+func newDNSEx() *dnsEx {
+	return newDNSExWithOption(Options{})
+}
+
+func newDNSExWithOption(opt Options) *dnsEx {
+	return &dnsEx{group: new(singleflight.Group), Timeout: defaultTimeout * time.Second, Options: opt}
+}
+
+func (d *dnsEx) Protocol() string          { return "dns" }
+func (d *dnsEx) OnShutdown(p *Proxy) error { return nil }
+func (d *dnsEx) OnStartup(p *Proxy) error  { return nil }
+
+// Exchange implements the Exchanger interface.
+func (d *dnsEx) Exchange(ctx context.Context, addr string, state request.Request) (*dns.Msg, error) {
+	proto := state.Proto()
+	if d.Options.ForceTCP {
+		proto = "tcp"
+	}
+	co, err := net.DialTimeout(proto, addr, d.Timeout)
+	if err != nil {
+		return nil, err
+	}
+
+	reply, _, err := d.ExchangeConn(state.Req, co)
+
+	co.Close()
+
+	if reply != nil && reply.Truncated {
+		// Suppress proxy error for truncated responses
+		err = nil
+	}
+
+	if err != nil {
+		return nil, err
+	}
+	// Make sure it fits in the DNS response.
+	reply, _ = state.Scrub(reply)
+	reply.Compress = true
+	reply.Id = state.Req.Id
+
+	return reply, nil
+}
+
+func (d *dnsEx) ExchangeConn(m *dns.Msg, co net.Conn) (*dns.Msg, time.Duration, error) {
+	t := "nop"
+	if t1, ok := dns.TypeToString[m.Question[0].Qtype]; ok {
+		t = t1
+	}
+	cl := "nop"
+	if cl1, ok := dns.ClassToString[m.Question[0].Qclass]; ok {
+		cl = cl1
+	}
+
+	start := time.Now()
+
+	// Name needs to be normalized! Bug in go dns.
+	r, err := d.group.Do(m.Question[0].Name+t+cl, func() (interface{}, error) {
+		return exchange(m, co)
+	})
+
+	r1 := r.(dns.Msg)
+	rtt := time.Since(start)
+	return &r1, rtt, err
+}
+
+// exchange does *not* return a pointer to dns.Msg because that leads to buffer reuse when
+// group.Do is used in Exchange.
+func exchange(m *dns.Msg, co net.Conn) (dns.Msg, error) {
+	opt := m.IsEdns0()
+
+	udpsize := uint16(dns.MinMsgSize)
+	// If EDNS0 is used use that for size.
+	if opt != nil && opt.UDPSize() >= dns.MinMsgSize {
+		udpsize = opt.UDPSize()
+	}
+
+	dnsco := &dns.Conn{Conn: co, UDPSize: udpsize}
+
+	writeDeadline := time.Now().Add(defaultTimeout)
+	dnsco.SetWriteDeadline(writeDeadline)
+	dnsco.WriteMsg(m)
+
+	readDeadline := time.Now().Add(defaultTimeout)
+	co.SetReadDeadline(readDeadline)
+	r, err := dnsco.ReadMsg()
+
+	dnsco.Close()
+	if r == nil {
+		return dns.Msg{}, err
+	}
+	return *r, err
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/proxy/exchanger.go b/vendor/github.com/miekg/coredns/middleware/proxy/exchanger.go
new file mode 100644
index 0000000000..28e1b1b114
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/proxy/exchanger.go
@@ -0,0 +1,18 @@
+package proxy
+
+import (
+	"context"
+
+	"github.com/coredns/coredns/request"
+	"github.com/miekg/dns"
+)
+
+// Exchanger is an interface that specifies a type implementing a DNS resolver that
+// can use whatever transport it likes.
+type Exchanger interface {
+	Exchange(ctx context.Context, addr string, state request.Request) (*dns.Msg, error)
+	Protocol() string
+
+	OnStartup(*Proxy) error
+	OnShutdown(*Proxy) error
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/proxy/google.go b/vendor/github.com/miekg/coredns/middleware/proxy/google.go
new file mode 100644
index 0000000000..dc83755add
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/proxy/google.go
@@ -0,0 +1,246 @@
+package proxy
+
+import (
+	"context"
+	"crypto/tls"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"net"
+	"net/http"
+	"net/url"
+	"sync/atomic"
+	"time"
+
+	"github.com/coredns/coredns/middleware/pkg/debug"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+type google struct {
+	client *http.Client
+
+	endpoint string // Name to resolve via 'bootstrapProxy'
+
+	bootstrapProxy Proxy
+	quit           chan bool
+}
+
+func newGoogle(endpoint string, bootstrap []string) *google {
+	if endpoint == "" {
+		endpoint = ghost
+	}
+	tls := &tls.Config{ServerName: endpoint}
+	client := &http.Client{
+		Timeout:   time.Second * defaultTimeout,
+		Transport: &http.Transport{TLSClientConfig: tls},
+	}
+
+	boot := NewLookup(bootstrap)
+
+	return &google{client: client, endpoint: dns.Fqdn(endpoint), bootstrapProxy: boot, quit: make(chan bool)}
+}
+
+func (g *google) Exchange(ctx context.Context, addr string, state request.Request) (*dns.Msg, error) {
+	v := url.Values{}
+
+	v.Set("name", state.Name())
+	v.Set("type", fmt.Sprintf("%d", state.QType()))
+
+	optDebug := false
+	if bug := debug.IsDebug(state.Name()); bug != "" {
+		optDebug = true
+		v.Set("name", bug)
+	}
+
+	buf, backendErr := g.exchangeJSON(addr, v.Encode())
+
+	if backendErr == nil {
+		gm := new(googleMsg)
+		if err := json.Unmarshal(buf, gm); err != nil {
+			return nil, err
+		}
+
+		m, debug, err := toMsg(gm)
+		if err != nil {
+			return nil, err
+		}
+
+		if optDebug {
+			// reset question
+			m.Question[0].Name = state.QName()
+			// prepend debug RR to the additional section
+			m.Extra = append([]dns.RR{debug}, m.Extra...)
+
+		}
+
+		m.Id = state.Req.Id
+		return m, nil
+	}
+
+	log.Printf("[WARNING] Failed to connect to HTTPS backend %q: %s", g.endpoint, backendErr)
+	return nil, backendErr
+}
+
+func (g *google) exchangeJSON(addr, json string) ([]byte, error) {
+	url := "https://" + addr + "/resolve?" + json
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	req.Host = g.endpoint // TODO(miek): works with the extra dot at the end?
+
+	resp, err := g.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	buf, err := ioutil.ReadAll(resp.Body)
+	resp.Body.Close()
+	if err != nil {
+		return nil, err
+	}
+
+	if resp.StatusCode != 200 {
+		return nil, fmt.Errorf("failed to get 200 status code, got %d", resp.StatusCode)
+	}
+
+	return buf, nil
+}
+
+func (g *google) Protocol() string { return "https_google" }
+
+func (g *google) OnShutdown(p *Proxy) error {
+	g.quit <- true
+	return nil
+}
+
+func (g *google) OnStartup(p *Proxy) error {
+	// We fake a state because normally the proxy is called after we already got a incoming query.
+	// This is a non-edns0, udp request to g.endpoint.
+	req := new(dns.Msg)
+	req.SetQuestion(g.endpoint, dns.TypeA)
+	state := request.Request{W: new(fakeBootWriter), Req: req}
+
+	new, err := g.bootstrapProxy.Lookup(state, g.endpoint, dns.TypeA)
+
+	var oldUpstream Upstream
+
+	// ignore errors here, as we want to keep on trying.
+	if err != nil {
+		log.Printf("[WARNING] Failed to bootstrap A records %q: %s", g.endpoint, err)
+	} else {
+		addrs, err1 := extractAnswer(new)
+		if err1 != nil {
+			log.Printf("[WARNING] Failed to bootstrap A records %q: %s", g.endpoint, err)
+		}
+
+		if len(*p.Upstreams) > 0 {
+			oldUpstream = (*p.Upstreams)[0]
+			up := newUpstream(addrs, oldUpstream.(*staticUpstream))
+			p.Upstreams = &[]Upstream{up}
+		} else {
+			log.Printf("[WARNING] Failed to bootstrap upstreams %q", g.endpoint)
+		}
+	}
+
+	go func() {
+		tick := time.NewTicker(300 * time.Second)
+
+		for {
+			select {
+			case <-tick.C:
+
+				new, err := g.bootstrapProxy.Lookup(state, g.endpoint, dns.TypeA)
+				if err != nil {
+					log.Printf("[WARNING] Failed to bootstrap A records %q: %s", g.endpoint, err)
+				} else {
+					addrs, err1 := extractAnswer(new)
+					if err1 != nil {
+						log.Printf("[WARNING] Failed to bootstrap A records %q: %s", g.endpoint, err)
+						continue
+					}
+
+					// TODO(miek): can this actually happen?
+					if oldUpstream != nil {
+						up := newUpstream(addrs, oldUpstream.(*staticUpstream))
+						p.Upstreams = &[]Upstream{up}
+					}
+				}
+
+			case <-g.quit:
+				return
+			}
+		}
+	}()
+
+	return nil
+}
+
+func extractAnswer(m *dns.Msg) ([]string, error) {
+	if len(m.Answer) == 0 {
+		return nil, fmt.Errorf("no answer section in response")
+	}
+	ret := []string{}
+	for _, an := range m.Answer {
+		if a, ok := an.(*dns.A); ok {
+			ret = append(ret, net.JoinHostPort(a.A.String(), "443"))
+		}
+	}
+	if len(ret) > 0 {
+		return ret, nil
+	}
+
+	return nil, fmt.Errorf("no address records in answer section")
+}
+
+// newUpstream returns an upstream initialized with hosts.
+func newUpstream(hosts []string, old *staticUpstream) Upstream {
+	upstream := &staticUpstream{
+		from:              old.from,
+		Hosts:             nil,
+		Policy:            &Random{},
+		Spray:             nil,
+		FailTimeout:       10 * time.Second,
+		MaxFails:          3,
+		ex:                old.ex,
+		WithoutPathPrefix: old.WithoutPathPrefix,
+		IgnoredSubDomains: old.IgnoredSubDomains,
+	}
+
+	upstream.Hosts = make([]*UpstreamHost, len(hosts))
+	for i, h := range hosts {
+		uh := &UpstreamHost{
+			Name:        h,
+			Conns:       0,
+			Fails:       0,
+			FailTimeout: upstream.FailTimeout,
+			Unhealthy:   false,
+
+			CheckDown: func(upstream *staticUpstream) UpstreamHostDownFunc {
+				return func(uh *UpstreamHost) bool {
+					if uh.Unhealthy {
+						return true
+					}
+
+					fails := atomic.LoadInt32(&uh.Fails)
+					if fails >= upstream.MaxFails && upstream.MaxFails != 0 {
+						return true
+					}
+					return false
+				}
+			}(upstream),
+			WithoutPathPrefix: upstream.WithoutPathPrefix,
+		}
+		upstream.Hosts[i] = uh
+	}
+	return upstream
+}
+
+const (
+	// Default endpoint for this service.
+	ghost = "dns.google.com."
+)
diff --git a/vendor/github.com/miekg/coredns/middleware/proxy/google_rr.go b/vendor/github.com/miekg/coredns/middleware/proxy/google_rr.go
new file mode 100644
index 0000000000..8c7e82bc22
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/proxy/google_rr.go
@@ -0,0 +1,90 @@
+package proxy
+
+import (
+	"fmt"
+
+	"github.com/miekg/dns"
+)
+
+// toMsg converts a googleMsg into the dns message. The returned RR is the comment disquised as a TXT record.
+func toMsg(g *googleMsg) (*dns.Msg, dns.RR, error) {
+	m := new(dns.Msg)
+	m.Response = true
+	m.Rcode = g.Status
+	m.Truncated = g.TC
+	m.RecursionDesired = g.RD
+	m.RecursionAvailable = g.RA
+	m.AuthenticatedData = g.AD
+	m.CheckingDisabled = g.CD
+
+	m.Question = make([]dns.Question, 1)
+	m.Answer = make([]dns.RR, len(g.Answer))
+	m.Ns = make([]dns.RR, len(g.Authority))
+	m.Extra = make([]dns.RR, len(g.Additional))
+
+	m.Question[0] = dns.Question{Name: g.Question[0].Name, Qtype: g.Question[0].Type, Qclass: dns.ClassINET}
+
+	var err error
+	for i := 0; i < len(m.Answer); i++ {
+		m.Answer[i], err = toRR(g.Answer[i])
+		if err != nil {
+			return nil, nil, err
+		}
+	}
+	for i := 0; i < len(m.Ns); i++ {
+		m.Ns[i], err = toRR(g.Authority[i])
+		if err != nil {
+			return nil, nil, err
+		}
+	}
+	for i := 0; i < len(m.Extra); i++ {
+		m.Extra[i], err = toRR(g.Additional[i])
+		if err != nil {
+			return nil, nil, err
+		}
+	}
+
+	txt, _ := dns.NewRR(". 0 CH TXT " + g.Comment)
+	return m, txt, nil
+}
+
+// toRR transforms a "google" RR to a dns.RR.
+func toRR(g googleRR) (dns.RR, error) {
+	typ, ok := dns.TypeToString[g.Type]
+	if !ok {
+		return nil, fmt.Errorf("failed to convert type %q", g.Type)
+	}
+
+	str := fmt.Sprintf("%s %d %s %s", g.Name, g.TTL, typ, g.Data)
+	rr, err := dns.NewRR(str)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse %q: %s", str, err)
+	}
+	return rr, nil
+}
+
+// googleRR represents a dns.RR in another form.
+type googleRR struct {
+	Name string
+	Type uint16
+	TTL  uint32
+	Data string
+}
+
+// googleMsg is a JSON representation of the dns.Msg.
+type googleMsg struct {
+	Status   int
+	TC       bool
+	RD       bool
+	RA       bool
+	AD       bool
+	CD       bool
+	Question []struct {
+		Name string
+		Type uint16
+	}
+	Answer     []googleRR
+	Authority  []googleRR
+	Additional []googleRR
+	Comment    string
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/proxy/google_test.go b/vendor/github.com/miekg/coredns/middleware/proxy/google_test.go
new file mode 100644
index 0000000000..1ce5916641
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/proxy/google_test.go
@@ -0,0 +1,5 @@
+package proxy
+
+// TODO(miek):
+// Test cert failures - put those in SERVFAIL messages, but attach error code in TXT
+// Test connecting to a a bad host.
diff --git a/vendor/github.com/miekg/coredns/middleware/proxy/grpc.go b/vendor/github.com/miekg/coredns/middleware/proxy/grpc.go
new file mode 100644
index 0000000000..d3ed14ccd4
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/proxy/grpc.go
@@ -0,0 +1,94 @@
+package proxy
+
+import (
+	"context"
+	"crypto/tls"
+	"log"
+
+	"github.com/coredns/coredns/middleware/trace"
+	"github.com/coredns/coredns/pb"
+	"github.com/coredns/coredns/request"
+
+	"github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc"
+	"github.com/miekg/dns"
+	opentracing "github.com/opentracing/opentracing-go"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials"
+)
+
+type grpcClient struct {
+	dialOpts []grpc.DialOption
+	clients  map[string]pb.DnsServiceClient
+	conns    []*grpc.ClientConn
+	upstream *staticUpstream
+}
+
+func newGrpcClient(tls *tls.Config, u *staticUpstream) *grpcClient {
+	g := &grpcClient{upstream: u}
+
+	if tls == nil {
+		g.dialOpts = append(g.dialOpts, grpc.WithInsecure())
+	} else {
+		g.dialOpts = append(g.dialOpts, grpc.WithTransportCredentials(credentials.NewTLS(tls)))
+	}
+	g.clients = map[string]pb.DnsServiceClient{}
+
+	return g
+}
+
+func (g *grpcClient) Exchange(ctx context.Context, addr string, state request.Request) (*dns.Msg, error) {
+	msg, err := state.Req.Pack()
+	if err != nil {
+		return nil, err
+	}
+
+	reply, err := g.clients[addr].Query(ctx, &pb.DnsPacket{Msg: msg})
+	if err != nil {
+		return nil, err
+	}
+	d := new(dns.Msg)
+	err = d.Unpack(reply.Msg)
+	if err != nil {
+		return nil, err
+	}
+	return d, nil
+}
+
+func (g *grpcClient) Protocol() string { return "grpc" }
+
+func (g *grpcClient) OnShutdown(p *Proxy) error {
+	g.clients = map[string]pb.DnsServiceClient{}
+	for i, conn := range g.conns {
+		err := conn.Close()
+		if err != nil {
+			log.Printf("[WARNING] Error closing connection %d: %s\n", i, err)
+		}
+	}
+	g.conns = []*grpc.ClientConn{}
+	return nil
+}
+
+func (g *grpcClient) OnStartup(p *Proxy) error {
+	dialOpts := g.dialOpts
+	if p.Trace != nil {
+		if t, ok := p.Trace.(trace.Trace); ok {
+			onlyIfParent := func(parentSpanCtx opentracing.SpanContext, method string, req, resp interface{}) bool {
+				return parentSpanCtx != nil
+			}
+			intercept := otgrpc.OpenTracingClientInterceptor(t.Tracer(), otgrpc.IncludingSpans(onlyIfParent))
+			dialOpts = append(dialOpts, grpc.WithUnaryInterceptor(intercept))
+		} else {
+			log.Printf("[WARNING] Wrong type for trace middleware reference: %s", p.Trace)
+		}
+	}
+	for _, host := range g.upstream.Hosts {
+		conn, err := grpc.Dial(host.Name, dialOpts...)
+		if err != nil {
+			log.Printf("[WARNING] Skipping gRPC host '%s' due to Dial error: %s\n", host.Name, err)
+		} else {
+			g.clients[host.Name] = pb.NewDnsServiceClient(conn)
+			g.conns = append(g.conns, conn)
+		}
+	}
+	return nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/proxy/grpc_test.go b/vendor/github.com/miekg/coredns/middleware/proxy/grpc_test.go
new file mode 100644
index 0000000000..0eade58a93
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/proxy/grpc_test.go
@@ -0,0 +1,54 @@
+package proxy
+
+import (
+	"testing"
+	"time"
+)
+
+func pool() []*UpstreamHost {
+	return []*UpstreamHost{
+		{
+			Name: "localhost:10053",
+		},
+		{
+			Name: "localhost:10054",
+		},
+	}
+}
+
+func TestStartupShutdown(t *testing.T) {
+	upstream := &staticUpstream{
+		from:        ".",
+		Hosts:       pool(),
+		Policy:      &Random{},
+		Spray:       nil,
+		FailTimeout: 10 * time.Second,
+		MaxFails:    1,
+	}
+	g := newGrpcClient(nil, upstream)
+	upstream.ex = g
+
+	p := &Proxy{Trace: nil}
+	p.Upstreams = &[]Upstream{upstream}
+
+	err := g.OnStartup(p)
+	if err != nil {
+		t.Errorf("Error starting grpc client exchanger: %s", err)
+		return
+	}
+	if len(g.clients) != len(pool()) {
+		t.Errorf("Expected %d grpc clients but found %d", len(pool()), len(g.clients))
+	}
+
+	err = g.OnShutdown(p)
+	if err != nil {
+		t.Errorf("Error stopping grpc client exchanger: %s", err)
+		return
+	}
+	if len(g.clients) != 0 {
+		t.Errorf("Shutdown didn't remove clients, found %d", len(g.clients))
+	}
+	if len(g.conns) != 0 {
+		t.Errorf("Shutdown didn't remove conns, found %d", len(g.conns))
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/proxy/lookup.go b/vendor/github.com/miekg/coredns/middleware/proxy/lookup.go
new file mode 100644
index 0000000000..e97741fb57
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/proxy/lookup.go
@@ -0,0 +1,119 @@
+package proxy
+
+// functions other middleware might want to use to do lookup in the same style as the proxy.
+
+import (
+	"context"
+	"sync/atomic"
+	"time"
+
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+// NewLookup create a new proxy with the hosts in host and a Random policy.
+func NewLookup(hosts []string) Proxy {
+	return NewLookupWithOption(hosts, Options{})
+}
+
+// NewLookupWithForcedProto process creates a simple round robin forward with potentially forced proto for upstream.
+func NewLookupWithOption(hosts []string, opts Options) Proxy {
+	p := Proxy{Next: nil}
+
+	upstream := &staticUpstream{
+		from:        ".",
+		Hosts:       make([]*UpstreamHost, len(hosts)),
+		Policy:      &Random{},
+		Spray:       nil,
+		FailTimeout: 10 * time.Second,
+		MaxFails:    3, // TODO(miek): disable error checking for simple lookups?
+		ex:          newDNSExWithOption(opts),
+	}
+
+	for i, host := range hosts {
+		uh := &UpstreamHost{
+			Name:        host,
+			Conns:       0,
+			Fails:       0,
+			FailTimeout: upstream.FailTimeout,
+
+			Unhealthy: false,
+			CheckDown: func(upstream *staticUpstream) UpstreamHostDownFunc {
+				return func(uh *UpstreamHost) bool {
+					if uh.Unhealthy {
+						return true
+					}
+					fails := atomic.LoadInt32(&uh.Fails)
+					if fails >= upstream.MaxFails && upstream.MaxFails != 0 {
+						return true
+					}
+					return false
+				}
+			}(upstream),
+			WithoutPathPrefix: upstream.WithoutPathPrefix,
+		}
+		upstream.Hosts[i] = uh
+	}
+	p.Upstreams = &[]Upstream{upstream}
+	return p
+}
+
+// Lookup will use name and type to forge a new message and will send that upstream. It will
+// set any EDNS0 options correctly so that downstream will be able to process the reply.
+func (p Proxy) Lookup(state request.Request, name string, typ uint16) (*dns.Msg, error) {
+	req := new(dns.Msg)
+	req.SetQuestion(name, typ)
+	state.SizeAndDo(req)
+
+	state2 := request.Request{W: state.W, Req: req}
+
+	return p.lookup(state2)
+}
+
+// Forward forward the request in state as-is. Unlike Lookup that adds EDNS0 suffix to the message.
+func (p Proxy) Forward(state request.Request) (*dns.Msg, error) {
+	return p.lookup(state)
+}
+
+func (p Proxy) lookup(state request.Request) (*dns.Msg, error) {
+	upstream := p.match(state)
+	if upstream == nil {
+		return nil, errInvalidDomain
+	}
+	for {
+		start := time.Now()
+
+		// Since Select() should give us "up" hosts, keep retrying
+		// hosts until timeout (or until we get a nil host).
+		for time.Now().Sub(start) < tryDuration {
+			host := upstream.Select()
+			if host == nil {
+				return nil, errUnreachable
+			}
+
+			// duplicated from proxy.go, but with a twist, we don't write the
+			// reply back to the client, we return it and there is no monitoring.
+
+			atomic.AddInt64(&host.Conns, 1)
+
+			reply, backendErr := upstream.Exchanger().Exchange(context.TODO(), host.Name, state)
+
+			atomic.AddInt64(&host.Conns, -1)
+
+			if backendErr == nil {
+				return reply, nil
+			}
+			timeout := host.FailTimeout
+			if timeout == 0 {
+				timeout = 10 * time.Second
+			}
+			atomic.AddInt32(&host.Fails, 1)
+			go func(host *UpstreamHost, timeout time.Duration) {
+				time.Sleep(timeout)
+				atomic.AddInt32(&host.Fails, -1)
+			}(host, timeout)
+		}
+		return nil, errUnreachable
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/proxy/metrics.go b/vendor/github.com/miekg/coredns/middleware/proxy/metrics.go
new file mode 100644
index 0000000000..e9bb48d6fe
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/proxy/metrics.go
@@ -0,0 +1,30 @@
+package proxy
+
+import (
+	"sync"
+
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+// Metrics the proxy middleware exports.
+var (
+	RequestDuration = prometheus.NewHistogramVec(prometheus.HistogramOpts{
+		Namespace: middleware.Namespace,
+		Subsystem: "proxy",
+		Name:      "request_duration_milliseconds",
+		Buckets:   append(prometheus.DefBuckets, []float64{50, 100, 200, 500, 1000, 2000, 3000, 4000, 5000, 10000}...),
+		Help:      "Histogram of the time (in milliseconds) each request took.",
+	}, []string{"proto", "proxy_proto", "from"})
+)
+
+// OnStartupMetrics sets up the metrics on startup. This is done for all proxy protocols.
+func OnStartupMetrics() error {
+	metricsOnce.Do(func() {
+		prometheus.MustRegister(RequestDuration)
+	})
+	return nil
+}
+
+var metricsOnce sync.Once
diff --git a/vendor/github.com/miekg/coredns/middleware/proxy/policy.go b/vendor/github.com/miekg/coredns/middleware/proxy/policy.go
new file mode 100644
index 0000000000..e0c9d7e2bd
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/proxy/policy.go
@@ -0,0 +1,113 @@
+package proxy
+
+import (
+	"log"
+	"math/rand"
+	"sync/atomic"
+)
+
+// HostPool is a collection of UpstreamHosts.
+type HostPool []*UpstreamHost
+
+// Policy decides how a host will be selected from a pool. When all hosts are unhealthy, it is assumed the
+// healthchecking failed. In this case each policy will *randomly* return a host from the pool to prevent
+// no traffic to go through at all.
+type Policy interface {
+	Select(pool HostPool) *UpstreamHost
+}
+
+func init() {
+	RegisterPolicy("random", func() Policy { return &Random{} })
+	RegisterPolicy("least_conn", func() Policy { return &LeastConn{} })
+	RegisterPolicy("round_robin", func() Policy { return &RoundRobin{} })
+}
+
+// Random is a policy that selects up hosts from a pool at random.
+type Random struct{}
+
+// Select selects an up host at random from the specified pool.
+func (r *Random) Select(pool HostPool) *UpstreamHost {
+	// instead of just generating a random index
+	// this is done to prevent selecting a down host
+	var randHost *UpstreamHost
+	count := 0
+	for _, host := range pool {
+		if host.Down() {
+			continue
+		}
+		count++
+		if count == 1 {
+			randHost = host
+		} else {
+			r := rand.Int() % count
+			if r == (count - 1) {
+				randHost = host
+			}
+		}
+	}
+	return randHost
+}
+
+// Spray is a policy that selects a host from a pool at random. This should be used as a last ditch
+// attempt to get a host when all hosts are reporting unhealthy.
+type Spray struct{}
+
+// Select selects an up host at random from the specified pool.
+func (r *Spray) Select(pool HostPool) *UpstreamHost {
+	rnd := rand.Int() % len(pool)
+	randHost := pool[rnd]
+	log.Printf("[WARNING] All hosts reported as down, spraying to target: %s", randHost.Name)
+	return randHost
+}
+
+// LeastConn is a policy that selects the host with the least connections.
+type LeastConn struct{}
+
+// Select selects the up host with the least number of connections in the
+// pool.  If more than one host has the same least number of connections,
+// one of the hosts is chosen at random.
+func (r *LeastConn) Select(pool HostPool) *UpstreamHost {
+	var bestHost *UpstreamHost
+	count := 0
+	leastConn := int64(1<<63 - 1)
+	for _, host := range pool {
+		if host.Down() {
+			continue
+		}
+		hostConns := host.Conns
+		if hostConns < leastConn {
+			bestHost = host
+			leastConn = hostConns
+			count = 1
+		} else if hostConns == leastConn {
+			// randomly select host among hosts with least connections
+			count++
+			if count == 1 {
+				bestHost = host
+			} else {
+				r := rand.Int() % count
+				if r == (count - 1) {
+					bestHost = host
+				}
+			}
+		}
+	}
+	return bestHost
+}
+
+// RoundRobin is a policy that selects hosts based on round robin ordering.
+type RoundRobin struct {
+	Robin uint32
+}
+
+// Select selects an up host from the pool using a round robin ordering scheme.
+func (r *RoundRobin) Select(pool HostPool) *UpstreamHost {
+	poolLen := uint32(len(pool))
+	selection := atomic.AddUint32(&r.Robin, 1) % poolLen
+	host := pool[selection]
+	// if the currently selected host is down, just ffwd to up host
+	for i := uint32(1); host.Down() && i < poolLen; i++ {
+		host = pool[(selection+i)%poolLen]
+	}
+	return host
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/proxy/policy_test.go b/vendor/github.com/miekg/coredns/middleware/proxy/policy_test.go
new file mode 100644
index 0000000000..8f4f1f7928
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/proxy/policy_test.go
@@ -0,0 +1,87 @@
+package proxy
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"testing"
+)
+
+var workableServer *httptest.Server
+
+func TestMain(m *testing.M) {
+	workableServer = httptest.NewServer(http.HandlerFunc(
+		func(w http.ResponseWriter, r *http.Request) {
+			// do nothing
+		}))
+	r := m.Run()
+	workableServer.Close()
+	os.Exit(r)
+}
+
+type customPolicy struct{}
+
+func (r *customPolicy) Select(pool HostPool) *UpstreamHost {
+	return pool[0]
+}
+
+func testPool() HostPool {
+	pool := []*UpstreamHost{
+		{
+			Name: workableServer.URL, // this should resolve (healthcheck test)
+		},
+		{
+			Name: "http://shouldnot.resolve", // this shouldn't
+		},
+		{
+			Name: "http://C",
+		},
+	}
+	return HostPool(pool)
+}
+
+func TestRoundRobinPolicy(t *testing.T) {
+	pool := testPool()
+	rrPolicy := &RoundRobin{}
+	h := rrPolicy.Select(pool)
+	// First selected host is 1, because counter starts at 0
+	// and increments before host is selected
+	if h != pool[1] {
+		t.Error("Expected first round robin host to be second host in the pool.")
+	}
+	h = rrPolicy.Select(pool)
+	if h != pool[2] {
+		t.Error("Expected second round robin host to be third host in the pool.")
+	}
+	// mark host as down
+	pool[0].Unhealthy = true
+	h = rrPolicy.Select(pool)
+	if h != pool[1] {
+		t.Error("Expected third round robin host to be first host in the pool.")
+	}
+}
+
+func TestLeastConnPolicy(t *testing.T) {
+	pool := testPool()
+	lcPolicy := &LeastConn{}
+	pool[0].Conns = 10
+	pool[1].Conns = 10
+	h := lcPolicy.Select(pool)
+	if h != pool[2] {
+		t.Error("Expected least connection host to be third host.")
+	}
+	pool[2].Conns = 100
+	h = lcPolicy.Select(pool)
+	if h != pool[0] && h != pool[1] {
+		t.Error("Expected least connection host to be first or second host.")
+	}
+}
+
+func TestCustomPolicy(t *testing.T) {
+	pool := testPool()
+	customPolicy := &customPolicy{}
+	h := customPolicy.Select(pool)
+	if h != pool[0] {
+		t.Error("Expected custom policy host to be the first host.")
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/proxy/proxy.go b/vendor/github.com/miekg/coredns/middleware/proxy/proxy.go
new file mode 100644
index 0000000000..ce8b99d83b
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/proxy/proxy.go
@@ -0,0 +1,172 @@
+// Package proxy is middleware that proxies requests.
+package proxy
+
+import (
+	"errors"
+	"sync"
+	"sync/atomic"
+	"time"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+	ot "github.com/opentracing/opentracing-go"
+	"golang.org/x/net/context"
+)
+
+var (
+	errUnreachable     = errors.New("unreachable backend")
+	errInvalidProtocol = errors.New("invalid protocol")
+	errInvalidDomain   = errors.New("invalid path for proxy")
+)
+
+// Proxy represents a middleware instance that can proxy requests to another (DNS) server.
+type Proxy struct {
+	Next middleware.Handler
+
+	// Upstreams is a pointer to a slice, so we can update the upstream (used for Google)
+	// midway.
+
+	Upstreams *[]Upstream
+
+	// Trace is the Trace middleware, if it is installed
+	// This is used by the grpc exchanger to trace through the grpc calls
+	Trace middleware.Handler
+}
+
+// Upstream manages a pool of proxy upstream hosts. Select should return a
+// suitable upstream host, or nil if no such hosts are available.
+type Upstream interface {
+	// The domain name this upstream host should be routed on.
+	From() string
+	// Selects an upstream host to be routed to.
+	Select() *UpstreamHost
+	// Checks if subpdomain is not an ignored.
+	IsAllowedDomain(string) bool
+	// Exchanger returns the exchanger to be used for this upstream.
+	Exchanger() Exchanger
+}
+
+// UpstreamHostDownFunc can be used to customize how Down behaves.
+type UpstreamHostDownFunc func(*UpstreamHost) bool
+
+// UpstreamHost represents a single proxy upstream
+type UpstreamHost struct {
+	Conns             int64  // must be first field to be 64-bit aligned on 32-bit systems
+	Name              string // IP address (and port) of this upstream host
+	Fails             int32
+	FailTimeout       time.Duration
+	Unhealthy         bool
+	CheckDown         UpstreamHostDownFunc
+	WithoutPathPrefix string
+	checkMu           sync.Mutex
+}
+
+// Down checks whether the upstream host is down or not.
+// Down will try to use uh.CheckDown first, and will fall
+// back to some default criteria if necessary.
+func (uh *UpstreamHost) Down() bool {
+	if uh.CheckDown == nil {
+		// Default settings
+		fails := atomic.LoadInt32(&uh.Fails)
+		return uh.Unhealthy || fails > 0
+	}
+	return uh.CheckDown(uh)
+}
+
+// tryDuration is how long to try upstream hosts; failures result in
+// immediate retries until this duration ends or we get a nil host.
+var tryDuration = 60 * time.Second
+
+// ServeDNS satisfies the middleware.Handler interface.
+func (p Proxy) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	var span, child ot.Span
+	span = ot.SpanFromContext(ctx)
+	state := request.Request{W: w, Req: r}
+
+	upstream := p.match(state)
+	if upstream == nil {
+		return middleware.NextOrFailure(p.Name(), p.Next, ctx, w, r)
+	}
+
+	for {
+		start := time.Now()
+
+		// Since Select() should give us "up" hosts, keep retrying
+		// hosts until timeout (or until we get a nil host).
+		for time.Now().Sub(start) < tryDuration {
+			host := upstream.Select()
+			if host == nil {
+
+				RequestDuration.WithLabelValues(state.Proto(), upstream.Exchanger().Protocol(), upstream.From()).Observe(float64(time.Since(start) / time.Millisecond))
+
+				return dns.RcodeServerFailure, errUnreachable
+			}
+
+			if span != nil {
+				child = span.Tracer().StartSpan("exchange", ot.ChildOf(span.Context()))
+				ctx = ot.ContextWithSpan(ctx, child)
+			}
+
+			atomic.AddInt64(&host.Conns, 1)
+
+			reply, backendErr := upstream.Exchanger().Exchange(ctx, host.Name, state)
+
+			atomic.AddInt64(&host.Conns, -1)
+
+			if child != nil {
+				child.Finish()
+			}
+
+			if backendErr == nil {
+				w.WriteMsg(reply)
+
+				RequestDuration.WithLabelValues(state.Proto(), upstream.Exchanger().Protocol(), upstream.From()).Observe(float64(time.Since(start) / time.Millisecond))
+
+				return 0, nil
+			}
+			timeout := host.FailTimeout
+			if timeout == 0 {
+				timeout = 10 * time.Second
+			}
+			atomic.AddInt32(&host.Fails, 1)
+			go func(host *UpstreamHost, timeout time.Duration) {
+				time.Sleep(timeout)
+				atomic.AddInt32(&host.Fails, -1)
+			}(host, timeout)
+		}
+
+		RequestDuration.WithLabelValues(state.Proto(), upstream.Exchanger().Protocol(), upstream.From()).Observe(float64(time.Since(start) / time.Millisecond))
+
+		return dns.RcodeServerFailure, errUnreachable
+	}
+}
+
+func (p Proxy) match(state request.Request) (u Upstream) {
+	if p.Upstreams == nil {
+		return nil
+	}
+
+	longestMatch := 0
+	for _, upstream := range *p.Upstreams {
+		from := upstream.From()
+
+		if !middleware.Name(from).Matches(state.Name()) || !upstream.IsAllowedDomain(state.Name()) {
+			continue
+		}
+
+		if lf := len(from); lf > longestMatch {
+			longestMatch = lf
+			u = upstream
+		}
+	}
+	return u
+
+}
+
+// Name implements the Handler interface.
+func (p Proxy) Name() string { return "proxy" }
+
+// defaultTimeout is the default networking timeout for DNS requests.
+const defaultTimeout = 5 * time.Second
diff --git a/vendor/github.com/miekg/coredns/middleware/proxy/response.go b/vendor/github.com/miekg/coredns/middleware/proxy/response.go
new file mode 100644
index 0000000000..2ad553c410
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/proxy/response.go
@@ -0,0 +1,21 @@
+package proxy
+
+import (
+	"net"
+
+	"github.com/miekg/dns"
+)
+
+type fakeBootWriter struct {
+	dns.ResponseWriter
+}
+
+func (w *fakeBootWriter) LocalAddr() net.Addr {
+	local := net.ParseIP("127.0.0.1")
+	return &net.UDPAddr{IP: local, Port: 53} // Port is not used here
+}
+
+func (w *fakeBootWriter) RemoteAddr() net.Addr {
+	remote := net.ParseIP("8.8.8.8")
+	return &net.UDPAddr{IP: remote, Port: 53} // Port is not used here
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/proxy/setup.go b/vendor/github.com/miekg/coredns/middleware/proxy/setup.go
new file mode 100644
index 0000000000..36401188fa
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/proxy/setup.go
@@ -0,0 +1,43 @@
+package proxy
+
+import (
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/mholt/caddy"
+)
+
+func init() {
+	caddy.RegisterPlugin("proxy", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setup,
+	})
+}
+
+func setup(c *caddy.Controller) error {
+	upstreams, err := NewStaticUpstreams(&c.Dispenser)
+	if err != nil {
+		return middleware.Error("proxy", err)
+	}
+
+	t := dnsserver.GetMiddleware(c, "trace")
+	P := &Proxy{Trace: t}
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
+		P.Next = next
+		P.Upstreams = &upstreams
+		return P
+	})
+
+	c.OnStartup(OnStartupMetrics)
+
+	for _, u := range upstreams {
+		c.OnStartup(func() error {
+			return u.Exchanger().OnStartup(P)
+		})
+		c.OnShutdown(func() error {
+			return u.Exchanger().OnShutdown(P)
+		})
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/proxy/upstream.go b/vendor/github.com/miekg/coredns/middleware/proxy/upstream.go
new file mode 100644
index 0000000000..c595976bce
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/proxy/upstream.go
@@ -0,0 +1,343 @@
+package proxy
+
+import (
+	"fmt"
+	"io"
+	"io/ioutil"
+	"log"
+	"net"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+	"sync/atomic"
+	"time"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/dnsutil"
+	"github.com/coredns/coredns/middleware/pkg/tls"
+	"github.com/mholt/caddy/caddyfile"
+	"github.com/miekg/dns"
+)
+
+var (
+	supportedPolicies = make(map[string]func() Policy)
+)
+
+type staticUpstream struct {
+	from   string
+	Hosts  HostPool
+	Policy Policy
+	Spray  Policy
+
+	FailTimeout time.Duration
+	MaxFails    int32
+	HealthCheck struct {
+		Path     string
+		Port     string
+		Interval time.Duration
+	}
+	WithoutPathPrefix string
+	IgnoredSubDomains []string
+	ex                Exchanger
+}
+
+// NewStaticUpstreams parses the configuration input and sets up
+// static upstreams for the proxy middleware.
+func NewStaticUpstreams(c *caddyfile.Dispenser) ([]Upstream, error) {
+	var upstreams []Upstream
+	for c.Next() {
+		upstream := &staticUpstream{
+			from:        ".",
+			Hosts:       nil,
+			Policy:      &Random{},
+			Spray:       nil,
+			FailTimeout: 10 * time.Second,
+			MaxFails:    1,
+			ex:          newDNSEx(),
+		}
+
+		if !c.Args(&upstream.from) {
+			return upstreams, c.ArgErr()
+		}
+		to := c.RemainingArgs()
+		if len(to) == 0 {
+			return upstreams, c.ArgErr()
+		}
+
+		// process the host list, substituting in any nameservers in files
+		toHosts, err := dnsutil.ParseHostPortOrFile(to...)
+		if err != nil {
+			return upstreams, err
+		}
+
+		for c.NextBlock() {
+			if err := parseBlock(c, upstream); err != nil {
+				return upstreams, err
+			}
+		}
+
+		upstream.Hosts = make([]*UpstreamHost, len(toHosts))
+		for i, host := range toHosts {
+			uh := &UpstreamHost{
+				Name:        host,
+				Conns:       0,
+				Fails:       0,
+				FailTimeout: upstream.FailTimeout,
+				Unhealthy:   false,
+
+				CheckDown: func(upstream *staticUpstream) UpstreamHostDownFunc {
+					return func(uh *UpstreamHost) bool {
+						if uh.Unhealthy {
+							return true
+						}
+
+						fails := atomic.LoadInt32(&uh.Fails)
+						if fails >= upstream.MaxFails && upstream.MaxFails != 0 {
+							return true
+						}
+						return false
+					}
+				}(upstream),
+				WithoutPathPrefix: upstream.WithoutPathPrefix,
+			}
+
+			upstream.Hosts[i] = uh
+		}
+
+		if upstream.HealthCheck.Path != "" {
+			go upstream.HealthCheckWorker(nil)
+		}
+		upstreams = append(upstreams, upstream)
+	}
+	return upstreams, nil
+}
+
+// RegisterPolicy adds a custom policy to the proxy.
+func RegisterPolicy(name string, policy func() Policy) {
+	supportedPolicies[name] = policy
+}
+
+func (u *staticUpstream) From() string {
+	return u.from
+}
+
+func parseBlock(c *caddyfile.Dispenser, u *staticUpstream) error {
+	switch c.Val() {
+	case "policy":
+		if !c.NextArg() {
+			return c.ArgErr()
+		}
+		policyCreateFunc, ok := supportedPolicies[c.Val()]
+		if !ok {
+			return c.ArgErr()
+		}
+		u.Policy = policyCreateFunc()
+	case "fail_timeout":
+		if !c.NextArg() {
+			return c.ArgErr()
+		}
+		dur, err := time.ParseDuration(c.Val())
+		if err != nil {
+			return err
+		}
+		u.FailTimeout = dur
+	case "max_fails":
+		if !c.NextArg() {
+			return c.ArgErr()
+		}
+		n, err := strconv.Atoi(c.Val())
+		if err != nil {
+			return err
+		}
+		u.MaxFails = int32(n)
+	case "health_check":
+		if !c.NextArg() {
+			return c.ArgErr()
+		}
+		var err error
+		u.HealthCheck.Path, u.HealthCheck.Port, err = net.SplitHostPort(c.Val())
+		if err != nil {
+			return err
+		}
+		u.HealthCheck.Interval = 30 * time.Second
+		if c.NextArg() {
+			dur, err := time.ParseDuration(c.Val())
+			if err != nil {
+				return err
+			}
+			u.HealthCheck.Interval = dur
+		}
+	case "without":
+		if !c.NextArg() {
+			return c.ArgErr()
+		}
+		u.WithoutPathPrefix = c.Val()
+	case "except":
+		ignoredDomains := c.RemainingArgs()
+		if len(ignoredDomains) == 0 {
+			return c.ArgErr()
+		}
+		for i := 0; i < len(ignoredDomains); i++ {
+			ignoredDomains[i] = strings.ToLower(dns.Fqdn(ignoredDomains[i]))
+		}
+		u.IgnoredSubDomains = ignoredDomains
+	case "spray":
+		u.Spray = &Spray{}
+	case "protocol":
+		encArgs := c.RemainingArgs()
+		if len(encArgs) == 0 {
+			return c.ArgErr()
+		}
+		switch encArgs[0] {
+		case "dns":
+			if len(encArgs) > 1 {
+				if encArgs[1] == "force_tcp" {
+					opts := Options{ForceTCP: true}
+					u.ex = newDNSExWithOption(opts)
+				} else {
+					return fmt.Errorf("only force_tcp allowed as parameter to dns")
+				}
+			} else {
+				u.ex = newDNSEx()
+			}
+		case "https_google":
+			boot := []string{"8.8.8.8:53", "8.8.4.4:53"}
+			if len(encArgs) > 2 && encArgs[1] == "bootstrap" {
+				boot = encArgs[2:]
+			}
+
+			u.ex = newGoogle("", boot) // "" for default in google.go
+		case "grpc":
+			if len(encArgs) == 2 && encArgs[1] == "insecure" {
+				u.ex = newGrpcClient(nil, u)
+				return nil
+			}
+			tls, err := tls.NewTLSConfigFromArgs(encArgs[1:]...)
+			if err != nil {
+				return err
+			}
+			u.ex = newGrpcClient(tls, u)
+		default:
+			return fmt.Errorf("%s: %s", errInvalidProtocol, encArgs[0])
+		}
+
+	default:
+		return c.Errf("unknown property '%s'", c.Val())
+	}
+	return nil
+}
+
+func (u *staticUpstream) healthCheck() {
+	for _, host := range u.Hosts {
+		var hostName, checkPort string
+
+		// The DNS server might be an HTTP server.  If so, extract its name.
+		if url, err := url.Parse(host.Name); err == nil {
+			hostName = url.Host
+		} else {
+			hostName = host.Name
+		}
+
+		// Extract the port number from the parsed server name.
+		checkHostName, checkPort, err := net.SplitHostPort(hostName)
+		if err != nil {
+			checkHostName = hostName
+		}
+
+		if u.HealthCheck.Port != "" {
+			checkPort = u.HealthCheck.Port
+		}
+
+		hostURL := "http://" + net.JoinHostPort(checkHostName, checkPort) + u.HealthCheck.Path
+
+		host.checkMu.Lock()
+		defer host.checkMu.Unlock()
+
+		if r, err := http.Get(hostURL); err == nil {
+			io.Copy(ioutil.Discard, r.Body)
+			r.Body.Close()
+			if r.StatusCode < 200 || r.StatusCode >= 400 {
+				log.Printf("[WARNING] Health check URL %s returned HTTP code %d\n",
+					hostURL, r.StatusCode)
+				host.Unhealthy = true
+			} else {
+				host.Unhealthy = false
+			}
+		} else {
+			log.Printf("[WARNING] Health check probe failed: %v\n", err)
+			host.Unhealthy = true
+		}
+	}
+}
+
+func (u *staticUpstream) HealthCheckWorker(stop chan struct{}) {
+	ticker := time.NewTicker(u.HealthCheck.Interval)
+	u.healthCheck()
+	for {
+		select {
+		case <-ticker.C:
+			u.healthCheck()
+		case <-stop:
+			// TODO: the library should provide a stop channel and global
+			// waitgroup to allow goroutines started by plugins a chance
+			// to clean themselves up.
+		}
+	}
+}
+
+func (u *staticUpstream) Select() *UpstreamHost {
+	pool := u.Hosts
+	if len(pool) == 1 {
+		if pool[0].Down() && u.Spray == nil {
+			return nil
+		}
+		return pool[0]
+	}
+	allDown := true
+	for _, host := range pool {
+		if !host.Down() {
+			allDown = false
+			break
+		}
+	}
+	if allDown {
+		if u.Spray == nil {
+			return nil
+		}
+		return u.Spray.Select(pool)
+	}
+
+	if u.Policy == nil {
+		h := (&Random{}).Select(pool)
+		if h == nil && u.Spray == nil {
+			return nil
+		}
+		return u.Spray.Select(pool)
+	}
+
+	h := u.Policy.Select(pool)
+	if h != nil {
+		return h
+	}
+
+	if u.Spray == nil {
+		return nil
+	}
+	return u.Spray.Select(pool)
+}
+
+func (u *staticUpstream) IsAllowedDomain(name string) bool {
+	if dns.Name(name) == dns.Name(u.From()) {
+		return true
+	}
+
+	for _, ignoredSubDomain := range u.IgnoredSubDomains {
+		if middleware.Name(ignoredSubDomain).Matches(name) {
+			return false
+		}
+	}
+	return true
+}
+
+func (u *staticUpstream) Exchanger() Exchanger { return u.ex }
diff --git a/vendor/github.com/miekg/coredns/middleware/proxy/upstream_test.go b/vendor/github.com/miekg/coredns/middleware/proxy/upstream_test.go
new file mode 100644
index 0000000000..587d969944
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/proxy/upstream_test.go
@@ -0,0 +1,382 @@
+package proxy
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/mholt/caddy"
+)
+
+func TestHealthCheck(t *testing.T) {
+	log.SetOutput(ioutil.Discard)
+
+	upstream := &staticUpstream{
+		from:        ".",
+		Hosts:       testPool(),
+		Policy:      &Random{},
+		Spray:       nil,
+		FailTimeout: 10 * time.Second,
+		MaxFails:    1,
+	}
+	upstream.healthCheck()
+	if upstream.Hosts[0].Down() {
+		t.Error("Expected first host in testpool to not fail healthcheck.")
+	}
+	if !upstream.Hosts[1].Down() {
+		t.Error("Expected second host in testpool to fail healthcheck.")
+	}
+}
+
+func TestSelect(t *testing.T) {
+	upstream := &staticUpstream{
+		from:        ".",
+		Hosts:       testPool()[:3],
+		Policy:      &Random{},
+		FailTimeout: 10 * time.Second,
+		MaxFails:    1,
+	}
+	upstream.Hosts[0].Unhealthy = true
+	upstream.Hosts[1].Unhealthy = true
+	upstream.Hosts[2].Unhealthy = true
+	if h := upstream.Select(); h != nil {
+		t.Error("Expected select to return nil as all host are down")
+	}
+	upstream.Hosts[2].Unhealthy = false
+	if h := upstream.Select(); h == nil {
+		t.Error("Expected select to not return nil")
+	}
+}
+
+func TestRegisterPolicy(t *testing.T) {
+	name := "custom"
+	customPolicy := &customPolicy{}
+	RegisterPolicy(name, func() Policy { return customPolicy })
+	if _, ok := supportedPolicies[name]; !ok {
+		t.Error("Expected supportedPolicies to have a custom policy.")
+	}
+
+}
+
+func TestAllowedDomain(t *testing.T) {
+	upstream := &staticUpstream{
+		from:              "miek.nl.",
+		IgnoredSubDomains: []string{"download.miek.nl.", "static.miek.nl."}, // closing dot mandatory
+	}
+	tests := []struct {
+		name     string
+		expected bool
+	}{
+		{"miek.nl.", true},
+		{"download.miek.nl.", false},
+		{"static.miek.nl.", false},
+		{"blaat.miek.nl.", true},
+	}
+
+	for i, test := range tests {
+		isAllowed := upstream.IsAllowedDomain(test.name)
+		if test.expected != isAllowed {
+			t.Errorf("Test %d: expected %v found %v for %s", i+1, test.expected, isAllowed, test.name)
+		}
+	}
+}
+
+func writeTmpFile(t *testing.T, data string) (string, string) {
+	tempDir, err := ioutil.TempDir("", "")
+	if err != nil {
+		t.Fatalf("tempDir: %v", err)
+	}
+
+	path := filepath.Join(tempDir, "resolv.conf")
+	if err := ioutil.WriteFile(path, []byte(data), 0644); err != nil {
+		t.Fatalf("writeFile: %v", err)
+	}
+	return tempDir, path
+}
+
+func TestProxyParse(t *testing.T) {
+	rmFunc, cert, key, ca := getPEMFiles(t)
+	defer rmFunc()
+
+	grpc1 := "proxy . 8.8.8.8:53 {\n protocol grpc " + ca + "\n}"
+	grpc2 := "proxy . 8.8.8.8:53 {\n protocol grpc " + cert + " " + key + "\n}"
+	grpc3 := "proxy . 8.8.8.8:53 {\n protocol grpc " + cert + " " + key + " " + ca + "\n}"
+	grpc4 := "proxy . 8.8.8.8:53 {\n protocol grpc " + key + "\n}"
+
+	tests := []struct {
+		inputUpstreams string
+		shouldErr      bool
+	}{
+		{
+			`proxy . 8.8.8.8:53`,
+			false,
+		},
+		{
+			`
+proxy . 8.8.8.8:53 {
+    policy round_robin
+}`,
+			false,
+		},
+		{
+			`
+proxy . 8.8.8.8:53 {
+    fail_timeout 5s
+}`,
+			false,
+		},
+		{
+			`
+proxy . 8.8.8.8:53 {
+    max_fails 10
+}`,
+			false,
+		},
+		{
+			`
+proxy . 8.8.8.8:53 {
+    health_check /health:8080
+}`,
+			false,
+		},
+		{
+			`
+proxy . 8.8.8.8:53 {
+    without without
+}`,
+			false,
+		},
+		{
+			`
+proxy . 8.8.8.8:53 {
+    except miek.nl example.org
+}`,
+			false,
+		},
+		{
+			`
+proxy . 8.8.8.8:53 {
+    spray
+}`,
+			false,
+		},
+		{
+			`
+proxy . 8.8.8.8:53 {
+    error_option
+}`,
+			true,
+		},
+		{
+			`
+proxy . some_bogus_filename`,
+			true,
+		},
+		{
+			`
+proxy . 8.8.8.8:53 {
+	protocol dns
+}`,
+			false,
+		},
+		{
+			`
+proxy . 8.8.8.8:53 {
+	protocol grpc
+}`,
+			false,
+		},
+		{
+			`
+proxy . 8.8.8.8:53 {
+	protocol grpc insecure
+}`,
+			false,
+		},
+		{
+			`
+proxy . 8.8.8.8:53 {
+	protocol dns force_tcp
+}`,
+			false,
+		},
+		{
+			`
+proxy . 8.8.8.8:53 {
+	protocol grpc a b c d
+}`,
+			true,
+		},
+		{
+			grpc1,
+			false,
+		},
+		{
+			grpc2,
+			false,
+		},
+		{
+			grpc3,
+			false,
+		},
+		{
+			grpc4,
+			true,
+		},
+		{
+			`
+proxy . 8.8.8.8:53 {
+	protocol foobar
+}`,
+			true,
+		},
+		{
+			`proxy`,
+			true,
+		},
+		{
+			`
+proxy . 8.8.8.8:53 {
+	protocol foobar
+}`,
+			true,
+		},
+		{
+			`
+proxy . 8.8.8.8:53 {
+	policy
+}`,
+			true,
+		},
+		{
+			`
+proxy . 8.8.8.8:53 {
+	fail_timeout
+}`,
+			true,
+		},
+		{
+			`
+proxy . 8.8.8.8:53 {
+	fail_timeout junky
+}`,
+			true,
+		},
+		{
+			`
+proxy . 8.8.8.8:53 {
+	health_check
+}`,
+			true,
+		},
+		{
+			`
+proxy . 8.8.8.8:53 {
+	protocol dns force
+}`,
+			true,
+		},
+	}
+	for i, test := range tests {
+		c := caddy.NewTestController("dns", test.inputUpstreams)
+		_, err := NewStaticUpstreams(&c.Dispenser)
+		if (err != nil) != test.shouldErr {
+			t.Errorf("Test %d expected no error, got %v for %s", i+1, err, test.inputUpstreams)
+		}
+	}
+}
+
+func TestResolvParse(t *testing.T) {
+	tests := []struct {
+		inputUpstreams string
+		filedata       string
+		shouldErr      bool
+		expected       []string
+	}{
+		{
+			`
+proxy . FILE
+`,
+			`
+nameserver 1.2.3.4
+nameserver 4.3.2.1
+`,
+			false,
+			[]string{"1.2.3.4:53", "4.3.2.1:53"},
+		},
+		{
+			`
+proxy example.com 1.1.1.1:5000
+proxy . FILE
+proxy example.org 2.2.2.2:1234
+`,
+			`
+nameserver 1.2.3.4
+`,
+			false,
+			[]string{"1.1.1.1:5000", "1.2.3.4:53", "2.2.2.2:1234"},
+		},
+		{
+			`
+proxy example.com 1.1.1.1:5000
+proxy . FILE
+proxy example.org 2.2.2.2:1234
+`,
+			`
+junky resolve.conf
+`,
+			false,
+			[]string{"1.1.1.1:5000", "2.2.2.2:1234"},
+		},
+	}
+	for i, test := range tests {
+		tempDir, path := writeTmpFile(t, test.filedata)
+		defer os.RemoveAll(tempDir)
+		config := strings.Replace(test.inputUpstreams, "FILE", path, -1)
+		c := caddy.NewTestController("dns", config)
+		upstreams, err := NewStaticUpstreams(&c.Dispenser)
+		if (err != nil) != test.shouldErr {
+			t.Errorf("Test %d expected no error, got %v", i+1, err)
+		}
+		var hosts []string
+		for _, u := range upstreams {
+			for _, h := range u.(*staticUpstream).Hosts {
+				hosts = append(hosts, h.Name)
+			}
+		}
+		if !test.shouldErr {
+			if len(hosts) != len(test.expected) {
+				t.Errorf("Test %d expected %d hosts got %d", i+1, len(test.expected), len(upstreams))
+			} else {
+				ok := true
+				for i, v := range test.expected {
+					if v != hosts[i] {
+						ok = false
+					}
+				}
+				if !ok {
+					t.Errorf("Test %d expected %v got %v", i+1, test.expected, upstreams)
+				}
+			}
+		}
+	}
+}
+
+func getPEMFiles(t *testing.T) (rmFunc func(), cert, key, ca string) {
+	tempDir, rmFunc, err := test.WritePEMFiles("")
+	if err != nil {
+		t.Fatalf("Could not write PEM files: %s", err)
+	}
+
+	cert = filepath.Join(tempDir, "cert.pem")
+	key = filepath.Join(tempDir, "key.pem")
+	ca = filepath.Join(tempDir, "ca.pem")
+
+	return
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/reverse/README.md b/vendor/github.com/miekg/coredns/middleware/reverse/README.md
new file mode 100644
index 0000000000..e9189e5feb
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/reverse/README.md
@@ -0,0 +1,84 @@
+# reverse
+
+The *reverse* middleware allows CoreDNS to respond dynamicly to an PTR request and the related A/AAAA request.
+
+## Syntax
+
+~~~
+reverse NETWORK... {
+    hostname TEMPLATE
+    [ttl TTL]
+    [fallthrough]
+~~~
+
+* **NETWORK** one or more CIDR formatted networks to respond on.
+* `hostname` inject the IP and zone to an template for the hostname. Defaults to "ip-{IP}.{zone[1]}". See below for template.
+* `ttl` defaults to 60
+* `fallthrough` If zone matches and no record can be generated, pass request to the next middleware.
+
+### Template Syntax
+
+The template for the hostname is used for generating the PTR for an reverse lookup and matching the
+forward lookup back to an IP.
+
+#### `{ip}`
+
+The `{ip}` symbol is **required** to make reverse work.
+For IPv4 lookups the "." is replaced with an "-", i.e.: 10.1.1.1 results in "10-1-1-1"
+With IPv6 lookups the ":" is removed, and any zero ranged are expanded, i.e.:
+"ffff::ffff" results in "ffff000000000000000000000000ffff"
+
+#### `{zone[i]}`
+
+The `{zone[i]}` symbol is **optional** and can be replaced by a fixed (zone) string.
+The zone will be matched by the zones listed in *this* configuration stanza.
+`i` needs to be replaced to the index of the configured listener zones, starting with 1.
+
+## Examples
+
+~~~ txt
+arpa compute.internal {
+    # proxy unmatched requests
+    proxy . 8.8.8.8
+
+    # answer requests for IPs in this networks
+    # PTR 1.0.32.10.in-addr.arpa. 3600 ip-10-0-32-1.compute.internal.
+    # A ip-10-0-32-1.compute.internal. 3600 10.0.32.1
+    # v6 is also possible
+    # PTR 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.d.f.ip6.arpa. 3600 ip-fd010000000000000000000000000001.compute.internal.
+    # AAAA ip-fd010000000000000000000000000001.compute.internal. 3600 fd01::1
+    reverse 10.32.0.0/16 fd01::/16 {
+        # template of the ip injection to hostname, zone resolved to compute.internal.
+        hostname ip-{ip}.{zone[2]}
+
+        ttl 3600
+
+        # Forward unanswered or unmatched requests to proxy # without this flag, requesting A/AAAA
+        records on compute.internal. will end here.
+        fallthrough
+    }
+}
+~~~
+
+
+~~~ txt
+32.10.in-addr.arpa.arpa arpa.company.org {
+
+    reverse 10.32.0.0/16 {
+        # template of the ip injection to hostname, zone resolved to arpa.company.org.
+        hostname "ip-{ip}.v4.{zone[2]}"
+
+        ttl 3600
+
+        # fallthrough is not required, v4.arpa.company.org. will be only answered here
+    }
+
+    # cidr closer to the ip wins, so we can overwrite the "default"
+    reverse 10.32.2.0/24 {
+        # its also possible to set fix domain suffix
+        hostname ip-{ip}.fix.arpa.company.org.
+
+        ttl 3600
+    }
+}
+~~~
diff --git a/vendor/github.com/miekg/coredns/middleware/reverse/network.go b/vendor/github.com/miekg/coredns/middleware/reverse/network.go
new file mode 100644
index 0000000000..83ce21309c
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/reverse/network.go
@@ -0,0 +1,109 @@
+package reverse
+
+import (
+	"bytes"
+	"net"
+	"regexp"
+	"strings"
+)
+
+type network struct {
+	IPnet        *net.IPNet
+	Zone         string // forward lookup zone
+	Template     string
+	TTL          uint32
+	RegexMatchIP *regexp.Regexp
+}
+
+// TODO: we might want to get rid of these regexes.
+const hexDigit = "0123456789abcdef"
+const templateNameIP = "{ip}"
+const regexMatchV4 = "((?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\-){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))"
+const regexMatchV6 = "([0-9a-fA-F]{32})"
+
+// hostnameToIP converts the hostname back to an ip, based on the template
+// returns nil if there is no IP found.
+func (network *network) hostnameToIP(rname string) net.IP {
+	var matchedIP net.IP
+
+	match := network.RegexMatchIP.FindStringSubmatch(rname)
+	if len(match) != 2 {
+		return nil
+	}
+
+	if network.IPnet.IP.To4() != nil {
+		matchedIP = net.ParseIP(strings.Replace(match[1], "-", ".", 4))
+	} else {
+		// TODO: can probably just allocate a []byte and use that.
+		var buf bytes.Buffer
+		// convert back to an valid ipv6 string with colons
+		for i := 0; i < 8*4; i += 4 {
+			buf.WriteString(match[1][i : i+4])
+			if i < 28 {
+				buf.WriteString(":")
+			}
+		}
+		matchedIP = net.ParseIP(buf.String())
+	}
+
+	// No valid ip or it does not belong to this network
+	if matchedIP == nil || !network.IPnet.Contains(matchedIP) {
+		return nil
+	}
+
+	return matchedIP
+}
+
+// ipToHostname converts an IP to an DNS compatible hostname and injects it into the template.domain.
+func (network *network) ipToHostname(ip net.IP) (name string) {
+	if ipv4 := ip.To4(); ipv4 != nil {
+		// replace . to -
+		name = uitoa(ipv4[0]) + "-" +
+			uitoa(ipv4[1]) + "-" +
+			uitoa(ipv4[2]) + "-" +
+			uitoa(ipv4[3])
+	} else {
+		// assume v6
+		// ensure zeros are present in string
+		buf := make([]byte, 0, len(ip)*4)
+		for i := 0; i < len(ip); i++ {
+			v := ip[i]
+			buf = append(buf, hexDigit[v>>4])
+			buf = append(buf, hexDigit[v&0xF])
+		}
+		name = string(buf)
+	}
+	// inject the converted ip into the fqdn template
+	return strings.Replace(network.Template, templateNameIP, name, 1)
+}
+
+// just the same from net.ip package, but with uint8
+func uitoa(val uint8) string {
+	if val == 0 {
+		// avoid string allocation
+		return "0"
+	}
+	var buf [20]byte // big enough for 64bit value base 10
+	i := len(buf) - 1
+	for val >= 10 {
+		q := val / 10
+		buf[i] = byte('0' + val - q*10)
+		i--
+		val = q
+	}
+	// val < 10
+	buf[i] = byte('0' + val)
+	return string(buf[i:])
+}
+
+type networks []network
+
+func (n networks) Len() int      { return len(n) }
+func (n networks) Swap(i, j int) { n[i], n[j] = n[j], n[i] }
+
+// cidr closer to the ip wins (by netmask)
+func (n networks) Less(i, j int) bool {
+	isize, _ := n[i].IPnet.Mask.Size()
+	jsize, _ := n[j].IPnet.Mask.Size()
+	return isize > jsize
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/reverse/network_test.go b/vendor/github.com/miekg/coredns/middleware/reverse/network_test.go
new file mode 100644
index 0000000000..88ea88250e
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/reverse/network_test.go
@@ -0,0 +1,135 @@
+package reverse
+
+import (
+	"net"
+	"reflect"
+	"regexp"
+	"testing"
+)
+
+// Test converting from hostname to IP and back again to hostname
+func TestNetworkConversion(t *testing.T) {
+
+	_, net4, _ := net.ParseCIDR("10.1.1.0/24")
+	_, net6, _ := net.ParseCIDR("fd01::/64")
+
+	regexIP4, _ := regexp.Compile("^dns-" + regexMatchV4 + "\\.domain\\.internal\\.$")
+	regexIP6, _ := regexp.Compile("^dns-" + regexMatchV6 + "\\.domain\\.internal\\.$")
+
+	tests := []struct {
+		network    network
+		resultHost string
+		resultIP   net.IP
+	}{
+		{
+			network{
+				IPnet:        net4,
+				Template:     "dns-{ip}.domain.internal.",
+				RegexMatchIP: regexIP4,
+			},
+			"dns-10-1-1-23.domain.internal.",
+			net.ParseIP("10.1.1.23"),
+		},
+		{
+			network{
+				IPnet:        net6,
+				Template:     "dns-{ip}.domain.internal.",
+				RegexMatchIP: regexIP6,
+			},
+			"dns-fd01000000000000000000000000a32f.domain.internal.",
+			net.ParseIP("fd01::a32f"),
+		},
+	}
+
+	for i, test := range tests {
+		resultIP := test.network.hostnameToIP(test.resultHost)
+		if !reflect.DeepEqual(test.resultIP, resultIP) {
+			t.Fatalf("Test %d expected %v, got %v", i, test.resultIP, resultIP)
+		}
+
+		resultHost := test.network.ipToHostname(test.resultIP)
+		if !reflect.DeepEqual(test.resultHost, resultHost) {
+			t.Fatalf("Test %d expected %v, got %v", i, test.resultHost, resultHost)
+		}
+	}
+}
+
+func TestNetworkHostnameToIP(t *testing.T) {
+
+	_, net4, _ := net.ParseCIDR("10.1.1.0/24")
+	_, net6, _ := net.ParseCIDR("fd01::/64")
+
+	regexIP4, _ := regexp.Compile("^dns-" + regexMatchV4 + "\\.domain\\.internal\\.$")
+	regexIP6, _ := regexp.Compile("^dns-" + regexMatchV6 + "\\.domain\\.internal\\.$")
+
+	// Test regex does NOT match
+	// All this test should return nil
+	testsNil := []struct {
+		network  network
+		hostname string
+	}{
+		{
+			network{
+				IPnet:        net4,
+				RegexMatchIP: regexIP4,
+			},
+			// domain does not match
+			"dns-10-1-1-23.domain.internals.",
+		},
+		{
+			network{
+				IPnet:        net4,
+				RegexMatchIP: regexIP4,
+			},
+			// IP does match / contain in subnet
+			"dns-200-1-1-23.domain.internals.",
+		},
+		{
+			network{
+				IPnet:        net4,
+				RegexMatchIP: regexIP4,
+			},
+			// template does not match
+			"dns-10-1-1-23-x.domain.internal.",
+		},
+		{
+			network{
+				IPnet:        net4,
+				RegexMatchIP: regexIP4,
+			},
+			// template does not match
+			"IP-dns-10-1-1-23.domain.internal.",
+		},
+		{
+			network{
+				IPnet:        net6,
+				RegexMatchIP: regexIP6,
+			},
+			// template does not match
+			"dnx-fd01000000000000000000000000a32f.domain.internal.",
+		},
+		{
+			network{
+				IPnet:        net6,
+				RegexMatchIP: regexIP6,
+			},
+			// no valid v6 (missing one 0, only 31 chars)
+			"dns-fd0100000000000000000000000a32f.domain.internal.",
+		},
+		{
+			network{
+				IPnet:        net6,
+				RegexMatchIP: regexIP6,
+			},
+			// IP does match / contain in subnet
+			"dns-ed01000000000000000000000000a32f.domain.internal.",
+		},
+	}
+
+	for i, test := range testsNil {
+		resultIP := test.network.hostnameToIP(test.hostname)
+		if resultIP != nil {
+			t.Fatalf("Test %d expected nil, got %v", i, resultIP)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/reverse/reverse.go b/vendor/github.com/miekg/coredns/middleware/reverse/reverse.go
new file mode 100644
index 0000000000..eb14ae155f
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/reverse/reverse.go
@@ -0,0 +1,107 @@
+package reverse
+
+import (
+	"net"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/dnsutil"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+// Reverse provides dynamic reverse DNS and the related forward RR.
+type Reverse struct {
+	Next        middleware.Handler
+	Networks    networks
+	Fallthrough bool
+}
+
+// ServeDNS implements the middleware.Handler interface.
+func (re Reverse) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	var rr dns.RR
+
+	state := request.Request{W: w, Req: r}
+	m := new(dns.Msg)
+	m.SetReply(r)
+	m.Authoritative, m.RecursionAvailable, m.Compress = true, true, true
+
+	switch state.QType() {
+	case dns.TypePTR:
+		address := dnsutil.ExtractAddressFromReverse(state.Name())
+
+		if address == "" {
+			// Not an reverse lookup, but can still be an pointer for an domain
+			break
+		}
+
+		ip := net.ParseIP(address)
+		// loop through the configured networks
+		for _, n := range re.Networks {
+			if n.IPnet.Contains(ip) {
+				rr = &dns.PTR{
+					Hdr: dns.RR_Header{Name: state.QName(), Rrtype: dns.TypePTR, Class: dns.ClassINET, Ttl: n.TTL},
+					Ptr: n.ipToHostname(ip),
+				}
+				break
+			}
+		}
+
+	case dns.TypeA:
+		for _, n := range re.Networks {
+			if dns.IsSubDomain(n.Zone, state.Name()) {
+
+				// skip if requesting an v4 address and network is not v4
+				if n.IPnet.IP.To4() == nil {
+					continue
+				}
+
+				result := n.hostnameToIP(state.Name())
+				if result != nil {
+					rr = &dns.A{
+						Hdr: dns.RR_Header{Name: state.QName(), Rrtype: dns.TypeA, Class: dns.ClassINET, Ttl: n.TTL},
+						A:   result,
+					}
+					break
+				}
+			}
+		}
+
+	case dns.TypeAAAA:
+		for _, n := range re.Networks {
+			if dns.IsSubDomain(n.Zone, state.Name()) {
+
+				// Do not use To16 which tries to make v4 in v6
+				if n.IPnet.IP.To4() != nil {
+					continue
+				}
+
+				result := n.hostnameToIP(state.Name())
+				if result != nil {
+					rr = &dns.AAAA{
+						Hdr:  dns.RR_Header{Name: state.QName(), Rrtype: dns.TypeAAAA, Class: dns.ClassINET, Ttl: n.TTL},
+						AAAA: result,
+					}
+					break
+				}
+			}
+		}
+
+	}
+
+	if rr != nil {
+		m.Answer = append(m.Answer, rr)
+		state.SizeAndDo(m)
+		w.WriteMsg(m)
+		return dns.RcodeSuccess, nil
+	}
+
+	if re.Fallthrough {
+		return middleware.NextOrFailure(re.Name(), re.Next, ctx, w, r)
+	}
+	return dns.RcodeServerFailure, nil
+}
+
+// Name implements the Handler interface.
+func (re Reverse) Name() string { return "reverse" }
diff --git a/vendor/github.com/miekg/coredns/middleware/reverse/setup.go b/vendor/github.com/miekg/coredns/middleware/reverse/setup.go
new file mode 100644
index 0000000000..56ab620fae
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/reverse/setup.go
@@ -0,0 +1,144 @@
+package reverse
+
+import (
+	"net"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/mholt/caddy"
+)
+
+func init() {
+	caddy.RegisterPlugin("reverse", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setupReverse,
+	})
+}
+
+func setupReverse(c *caddy.Controller) error {
+	networks, fallThrough, err := reverseParse(c)
+	if err != nil {
+		return middleware.Error("reverse", err)
+	}
+
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
+		return Reverse{Next: next, Networks: networks, Fallthrough: fallThrough}
+	})
+
+	return nil
+}
+
+func reverseParse(c *caddy.Controller) (nets networks, fall bool, err error) {
+
+	// normalize zones, validation is almost done by dnsserver
+	// TODO(miek): need sane helpers for these.
+	zones := make([]string, len(c.ServerBlockKeys))
+
+	for i, str := range c.ServerBlockKeys {
+		zones[i] = middleware.Host(str).Normalize()
+	}
+
+	for c.Next() {
+		if c.Val() == "reverse" {
+
+			var cidrs []*net.IPNet
+
+			// parse all networks
+			for _, cidr := range c.RemainingArgs() {
+				if cidr == "{" {
+					break
+				}
+				_, ipnet, err := net.ParseCIDR(cidr)
+				if err != nil {
+					return nil, false, c.Errf("network needs to be CIDR formatted: %q\n", cidr)
+				}
+				cidrs = append(cidrs, ipnet)
+			}
+			if len(cidrs) == 0 {
+				return nil, false, c.ArgErr()
+			}
+
+			// set defaults
+			var (
+				template = "ip-" + templateNameIP + ".{zone[1]}"
+				ttl      = 60
+			)
+			for c.NextBlock() {
+				switch c.Val() {
+				case "hostname":
+					if !c.NextArg() {
+						return nil, false, c.ArgErr()
+					}
+					template = c.Val()
+
+				case "ttl":
+					if !c.NextArg() {
+						return nil, false, c.ArgErr()
+					}
+					ttl, err = strconv.Atoi(c.Val())
+					if err != nil {
+						return nil, false, err
+					}
+
+				case "fallthrough":
+					fall = true
+
+				default:
+					return nil, false, c.ArgErr()
+				}
+			}
+
+			// prepare template
+			// replace {zone[index]} by the listen zone/domain of this config block
+			for i, zone := range zones {
+				// TODO: we should be smarter about actually replacing this. This works, but silently allows "zone[-1]"
+				// for instance.
+				template = strings.Replace(template, "{zone["+strconv.Itoa(i+1)+"]}", zone, 1)
+			}
+			if !strings.HasSuffix(template, ".") {
+				template += "."
+			}
+
+			// extract zone from template
+			templateZone := strings.SplitAfterN(template, ".", 2)
+			if len(templateZone) != 2 || templateZone[1] == "" {
+				return nil, false, c.Errf("cannot find domain in template '%v'", template)
+			}
+
+			// Create for each configured network in this stanza
+			for _, ipnet := range cidrs {
+				// precompile regex for hostname to ip matching
+				regexIP := regexMatchV4
+				if ipnet.IP.To4() == nil {
+					regexIP = regexMatchV6
+				}
+				regex, err := regexp.Compile(
+					"^" + strings.Replace( // inject ip regex into template
+						regexp.QuoteMeta(template), // escape dots
+						regexp.QuoteMeta(templateNameIP),
+						regexIP,
+						1) + "$")
+				if err != nil {
+					return nil, false, err
+				}
+
+				nets = append(nets, network{
+					IPnet:        ipnet,
+					Zone:         templateZone[1],
+					Template:     template,
+					RegexMatchIP: regex,
+					TTL:          uint32(ttl),
+				})
+			}
+		}
+	}
+
+	// sort by cidr
+	sort.Sort(nets)
+	return nets, fall, nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/reverse/setup_test.go b/vendor/github.com/miekg/coredns/middleware/reverse/setup_test.go
new file mode 100644
index 0000000000..88dbccf1cb
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/reverse/setup_test.go
@@ -0,0 +1,178 @@
+package reverse
+
+import (
+	"net"
+	"reflect"
+	"regexp"
+	"testing"
+
+	"github.com/mholt/caddy"
+)
+
+func TestSetupParse(t *testing.T) {
+
+	_, net4, _ := net.ParseCIDR("10.1.1.0/24")
+	_, net6, _ := net.ParseCIDR("fd01::/64")
+
+	regexIP6, _ := regexp.Compile("^ip-" + regexMatchV6 + "\\.domain\\.com\\.$")
+	regexIpv4dynamic, _ := regexp.Compile("^dynamic-" + regexMatchV4 + "-intern\\.dynamic\\.domain\\.com\\.$")
+	regexIpv6dynamic, _ := regexp.Compile("^dynamic-" + regexMatchV6 + "-intern\\.dynamic\\.domain\\.com\\.$")
+	regexIpv4vpndynamic, _ := regexp.Compile("^dynamic-" + regexMatchV4 + "-vpn\\.dynamic\\.domain\\.com\\.$")
+
+	serverBlockKeys := []string{"domain.com.:8053", "dynamic.domain.com.:8053"}
+
+	tests := []struct {
+		inputFileRules string
+		shouldErr      bool
+		networks       networks
+	}{
+		{
+			// with defaults
+			`reverse fd01::/64`,
+			false,
+			networks{network{
+				IPnet:        net6,
+				Template:     "ip-{ip}.domain.com.",
+				Zone:         "domain.com.",
+				TTL:          60,
+				RegexMatchIP: regexIP6,
+			}},
+		},
+		{
+			`reverse`,
+			true,
+			networks{},
+		},
+		{
+			//no cidr
+			`reverse 10.1.1.1`,
+			true,
+			networks{},
+		},
+		{
+			//no cidr
+			`reverse 10.1.1.0/16 fd00::`,
+			true,
+			networks{},
+		},
+		{
+			// invalid key
+			`reverse 10.1.1.0/24 {
+				notavailable
+			}`,
+			true,
+			networks{},
+		},
+		{
+			// no domain suffix
+			`reverse 10.1.1.0/24 {
+				hostname ip-{ip}.
+			}`,
+			true,
+			networks{},
+		},
+		{
+			// hostname requires an second arg
+			`reverse 10.1.1.0/24 {
+				hostname
+			}`,
+			true,
+			networks{},
+		},
+		{
+			// template breaks regex compile
+			`reverse 10.1.1.0/24 {
+				hostname ip-{[-x
+			}`,
+			true,
+			networks{},
+		},
+		{
+			// ttl requires an (u)int
+			`reverse 10.1.1.0/24 {
+				ttl string
+			}`,
+			true,
+			networks{},
+		},
+		{
+			`reverse fd01::/64 {
+				hostname dynamic-{ip}-intern.{zone[2]}
+				ttl 50
+			}
+			reverse 10.1.1.0/24 {
+				hostname dynamic-{ip}-vpn.{zone[2]}
+				fallthrough
+			}`,
+			false,
+			networks{network{
+				IPnet:        net6,
+				Template:     "dynamic-{ip}-intern.dynamic.domain.com.",
+				Zone:         "dynamic.domain.com.",
+				TTL:          50,
+				RegexMatchIP: regexIpv6dynamic,
+			}, network{
+				IPnet:        net4,
+				Template:     "dynamic-{ip}-vpn.dynamic.domain.com.",
+				Zone:         "dynamic.domain.com.",
+				TTL:          60,
+				RegexMatchIP: regexIpv4vpndynamic,
+			}},
+		},
+		{
+			// multiple networks in one stanza
+			`reverse fd01::/64 10.1.1.0/24 {
+				hostname dynamic-{ip}-intern.{zone[2]}
+				ttl 50
+				fallthrough
+			}`,
+			false,
+			networks{network{
+				IPnet:        net6,
+				Template:     "dynamic-{ip}-intern.dynamic.domain.com.",
+				Zone:         "dynamic.domain.com.",
+				TTL:          50,
+				RegexMatchIP: regexIpv6dynamic,
+			}, network{
+				IPnet:        net4,
+				Template:     "dynamic-{ip}-intern.dynamic.domain.com.",
+				Zone:         "dynamic.domain.com.",
+				TTL:          50,
+				RegexMatchIP: regexIpv4dynamic,
+			}},
+		},
+		{
+			// fix domain in template
+			`reverse fd01::/64 {
+				hostname dynamic-{ip}-intern.dynamic.domain.com
+				ttl 300
+				fallthrough
+			}`,
+			false,
+			networks{network{
+				IPnet:        net6,
+				Template:     "dynamic-{ip}-intern.dynamic.domain.com.",
+				Zone:         "dynamic.domain.com.",
+				TTL:          300,
+				RegexMatchIP: regexIpv6dynamic,
+			}},
+		},
+	}
+	for i, test := range tests {
+		c := caddy.NewTestController("dns", test.inputFileRules)
+		c.ServerBlockKeys = serverBlockKeys
+		networks, _, err := reverseParse(c)
+
+		if err == nil && test.shouldErr {
+			t.Fatalf("Test %d expected errors, but got no error", i)
+		} else if err != nil && !test.shouldErr {
+			t.Fatalf("Test %d expected no errors, but got '%v'", i, err)
+		}
+		for j, n := range networks {
+			reflect.DeepEqual(test.networks[j], n)
+			if !reflect.DeepEqual(test.networks[j], n) {
+				t.Fatalf("Test %d/%d expected %v, got %v", i, j, test.networks[j], n)
+			}
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/rewrite/README.md b/vendor/github.com/miekg/coredns/middleware/rewrite/README.md
new file mode 100644
index 0000000000..3d0c6c321c
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/rewrite/README.md
@@ -0,0 +1,59 @@
+# rewrite
+
+*rewrite* performs internal message rewriting. Rewrites are invisible to the client.
+There are simple rewrites (fast) and complex rewrites (slower), but they're powerful enough to
+accommodate most dynamic back-end applications.
+
+## Syntax
+
+~~~
+rewrite FIELD FROM TO
+~~~
+
+* **FIELD** is (`type`, `class`, `name`, ...)
+* **FROM** is the exact name of type to match
+* **TO** is the destination name or type to rewrite to
+
+When the FIELD is `type` and FROM is (`A`, `MX`, etc.), the type of the message will be rewritten;
+e.g., to rewrite ANY queries to HINFO, use `rewrite type ANY HINFO`.
+
+When the FIELD is `class` and FROM is (`IN`, `CH`, or `HS`) the class of the message will be
+rewritten; e.g., to rewrite CH queries to IN use `rewrite class CH IN`.
+
+When the FIELD is `name` the query name in the message is rewritten; this
+needs to be a full match of the name, e.g., `rewrite name miek.nl example.org`.
+
+When the FIELD is `edns0` an EDNS0 option can be appended to the request as described below.
+
+If you specify multiple rules and an incoming query matches on multiple (simple) rules, only
+the first rewrite is applied.
+
+## EDNS0 Options
+
+Using FIELD edns0, you can set, append, or replace specific EDNS0 options on the request.
+
+* `replace` will modify any matching (what that means may vary based on EDNS0 type) option with the specified option
+* `append` will add the option regardless of what options already exist
+* `set` will modify a matching option or add one if none is found
+
+Currently supported are `EDNS0_LOCAL` and `EDNS0_NSID`.
+
+### `EDNS0_LOCAL`
+
+This has two fields, code and data. A match is defined as having the same code. Data may be a string, or if
+it starts with `0x` it will be treated as hex. Example:
+
+~~~
+rewrite edns0 local set 0xffee 0x61626364
+~~~
+
+rewrites the first local option with code 0xffee, setting the data to "abcd". Equivalent:
+
+~~~
+rewrite edns0 local set 0xffee abcd
+~~~
+
+### `EDNS0_NSID`
+
+This has no fields; it will add an NSID option with an empty string for the NSID. If the option already exists
+and the action is `replace` or `set`, then the NSID in the option will be set to the empty string.
diff --git a/vendor/github.com/miekg/coredns/middleware/rewrite/class.go b/vendor/github.com/miekg/coredns/middleware/rewrite/class.go
new file mode 100644
index 0000000000..a2bd00d0fb
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/rewrite/class.go
@@ -0,0 +1,35 @@
+package rewrite
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/miekg/dns"
+)
+
+type classRule struct {
+	fromClass, toClass uint16
+}
+
+func newClassRule(fromS, toS string) (Rule, error) {
+	var from, to uint16
+	var ok bool
+	if from, ok = dns.StringToClass[strings.ToUpper(fromS)]; !ok {
+		return nil, fmt.Errorf("invalid class %q", strings.ToUpper(fromS))
+	}
+	if to, ok = dns.StringToClass[strings.ToUpper(toS)]; !ok {
+		return nil, fmt.Errorf("invalid class %q", strings.ToUpper(toS))
+	}
+	return &classRule{fromClass: from, toClass: to}, nil
+}
+
+// Rewrite rewrites the the current request.
+func (rule *classRule) Rewrite(r *dns.Msg) Result {
+	if rule.fromClass > 0 && rule.toClass > 0 {
+		if r.Question[0].Qclass == rule.fromClass {
+			r.Question[0].Qclass = rule.toClass
+			return RewriteDone
+		}
+	}
+	return RewriteIgnored
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/rewrite/condition.go b/vendor/github.com/miekg/coredns/middleware/rewrite/condition.go
new file mode 100644
index 0000000000..5bc8452a9e
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/rewrite/condition.go
@@ -0,0 +1,132 @@
+package rewrite
+
+import (
+	"fmt"
+	"regexp"
+	"strings"
+
+	"github.com/coredns/coredns/middleware/pkg/replacer"
+
+	"github.com/miekg/dns"
+)
+
+// Operators
+const (
+	Is         = "is"
+	Not        = "not"
+	Has        = "has"
+	NotHas     = "not_has"
+	StartsWith = "starts_with"
+	EndsWith   = "ends_with"
+	Match      = "match"
+	NotMatch   = "not_match"
+)
+
+func operatorError(operator string) error {
+	return fmt.Errorf("Invalid operator %v", operator)
+}
+
+func newReplacer(r *dns.Msg) replacer.Replacer {
+	return replacer.New(r, nil, "")
+}
+
+// condition is a rewrite condition.
+type condition func(string, string) bool
+
+var conditions = map[string]condition{
+	Is:         isFunc,
+	Not:        notFunc,
+	Has:        hasFunc,
+	NotHas:     notHasFunc,
+	StartsWith: startsWithFunc,
+	EndsWith:   endsWithFunc,
+	Match:      matchFunc,
+	NotMatch:   notMatchFunc,
+}
+
+// isFunc is condition for Is operator.
+// It checks for equality.
+func isFunc(a, b string) bool {
+	return a == b
+}
+
+// notFunc is condition for Not operator.
+// It checks for inequality.
+func notFunc(a, b string) bool {
+	return a != b
+}
+
+// hasFunc is condition for Has operator.
+// It checks if b is a substring of a.
+func hasFunc(a, b string) bool {
+	return strings.Contains(a, b)
+}
+
+// notHasFunc is condition for NotHas operator.
+// It checks if b is not a substring of a.
+func notHasFunc(a, b string) bool {
+	return !strings.Contains(a, b)
+}
+
+// startsWithFunc is condition for StartsWith operator.
+// It checks if b is a prefix of a.
+func startsWithFunc(a, b string) bool {
+	return strings.HasPrefix(a, b)
+}
+
+// endsWithFunc is condition for EndsWith operator.
+// It checks if b is a suffix of a.
+func endsWithFunc(a, b string) bool {
+	// TODO(miek): IsSubDomain
+	return strings.HasSuffix(a, b)
+}
+
+// matchFunc is condition for Match operator.
+// It does regexp matching of a against pattern in b
+// and returns if they match.
+func matchFunc(a, b string) bool {
+	matched, _ := regexp.MatchString(b, a)
+	return matched
+}
+
+// notMatchFunc is condition for NotMatch operator.
+// It does regexp matching of a against pattern in b
+// and returns if they do not match.
+func notMatchFunc(a, b string) bool {
+	matched, _ := regexp.MatchString(b, a)
+	return !matched
+}
+
+// If is statement for a rewrite condition.
+type If struct {
+	A        string
+	Operator string
+	B        string
+}
+
+// True returns true if the condition is true and false otherwise.
+// If r is not nil, it replaces placeholders before comparison.
+func (i If) True(r *dns.Msg) bool {
+	if c, ok := conditions[i.Operator]; ok {
+		a, b := i.A, i.B
+		if r != nil {
+			replacer := newReplacer(r)
+			a = replacer.Replace(i.A)
+			b = replacer.Replace(i.B)
+		}
+		return c(a, b)
+	}
+	return false
+}
+
+// NewIf creates a new If condition.
+func NewIf(a, operator, b string) (If, error) {
+	if _, ok := conditions[operator]; !ok {
+		return If{}, operatorError(operator)
+	}
+	return If{
+		A:        a,
+		Operator: operator,
+		B:        b,
+	}, nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/rewrite/condition_test.go b/vendor/github.com/miekg/coredns/middleware/rewrite/condition_test.go
new file mode 100644
index 0000000000..91004f9d7f
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/rewrite/condition_test.go
@@ -0,0 +1,102 @@
+package rewrite
+
+/*
+func TestConditions(t *testing.T) {
+	tests := []struct {
+		condition string
+		isTrue    bool
+	}{
+		{"a is b", false},
+		{"a is a", true},
+		{"a not b", true},
+		{"a not a", false},
+		{"a has a", true},
+		{"a has b", false},
+		{"ba has b", true},
+		{"bab has b", true},
+		{"bab has bb", false},
+		{"a not_has a", false},
+		{"a not_has b", true},
+		{"ba not_has b", false},
+		{"bab not_has b", false},
+		{"bab not_has bb", true},
+		{"bab starts_with bb", false},
+		{"bab starts_with ba", true},
+		{"bab starts_with bab", true},
+		{"bab ends_with bb", false},
+		{"bab ends_with bab", true},
+		{"bab ends_with ab", true},
+		{"a match *", false},
+		{"a match a", true},
+		{"a match .*", true},
+		{"a match a.*", true},
+		{"a match b.*", false},
+		{"ba match b.*", true},
+		{"ba match b[a-z]", true},
+		{"b0 match b[a-z]", false},
+		{"b0a match b[a-z]", false},
+		{"b0a match b[a-z]+", false},
+		{"b0a match b[a-z0-9]+", true},
+		{"a not_match *", true},
+		{"a not_match a", false},
+		{"a not_match .*", false},
+		{"a not_match a.*", false},
+		{"a not_match b.*", true},
+		{"ba not_match b.*", false},
+		{"ba not_match b[a-z]", false},
+		{"b0 not_match b[a-z]", true},
+		{"b0a not_match b[a-z]", true},
+		{"b0a not_match b[a-z]+", true},
+		{"b0a not_match b[a-z0-9]+", false},
+	}
+
+	for i, test := range tests {
+		str := strings.Fields(test.condition)
+		ifCond, err := NewIf(str[0], str[1], str[2])
+		if err != nil {
+			t.Error(err)
+		}
+		isTrue := ifCond.True(nil)
+		if isTrue != test.isTrue {
+			t.Errorf("Test %v: expected %v found %v", i, test.isTrue, isTrue)
+		}
+	}
+
+	invalidOperators := []string{"ss", "and", "if"}
+	for _, op := range invalidOperators {
+		_, err := NewIf("a", op, "b")
+		if err == nil {
+			t.Errorf("Invalid operator %v used, expected error.", op)
+		}
+	}
+
+	replaceTests := []struct {
+		url       string
+		condition string
+		isTrue    bool
+	}{
+		{"/home", "{uri} match /home", true},
+		{"/hom", "{uri} match /home", false},
+		{"/hom", "{uri} starts_with /home", false},
+		{"/hom", "{uri} starts_with /h", true},
+		{"/home/.hiddenfile", `{uri} match \/\.(.*)`, true},
+		{"/home/.hiddendir/afile", `{uri} match \/\.(.*)`, true},
+	}
+
+	for i, test := range replaceTests {
+		r, err := http.NewRequest("GET", test.url, nil)
+		if err != nil {
+			t.Error(err)
+		}
+		str := strings.Fields(test.condition)
+		ifCond, err := NewIf(str[0], str[1], str[2])
+		if err != nil {
+			t.Error(err)
+		}
+		isTrue := ifCond.True(r)
+		if isTrue != test.isTrue {
+			t.Errorf("Test %v: expected %v found %v", i, test.isTrue, isTrue)
+		}
+	}
+}
+*/
diff --git a/vendor/github.com/miekg/coredns/middleware/rewrite/edns0.go b/vendor/github.com/miekg/coredns/middleware/rewrite/edns0.go
new file mode 100644
index 0000000000..3ba214c6a0
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/rewrite/edns0.go
@@ -0,0 +1,141 @@
+// Package rewrite is middleware for rewriting requests internally to something different.
+package rewrite
+
+import (
+	"encoding/hex"
+	"fmt"
+	"strconv"
+	"strings"
+
+	"github.com/miekg/dns"
+)
+
+// edns0LocalRule is a rewrite rule for EDNS0_LOCAL options
+type edns0LocalRule struct {
+	action string
+	code   uint16
+	data   []byte
+}
+
+// ends0NsidRule is a rewrite rule for EDNS0_NSID options
+type edns0NsidRule struct {
+	action string
+}
+
+// setupEdns0Opt will retrieve the EDNS0 OPT or create it if it does not exist
+func setupEdns0Opt(r *dns.Msg) *dns.OPT {
+	o := r.IsEdns0()
+	if o == nil {
+		r.SetEdns0(4096, true)
+		o = r.IsEdns0()
+	}
+	return o
+}
+
+// Rewrite will alter the request EDNS0 NSID option
+func (rule *edns0NsidRule) Rewrite(r *dns.Msg) Result {
+	result := RewriteIgnored
+	o := setupEdns0Opt(r)
+	found := false
+	for _, s := range o.Option {
+		switch e := s.(type) {
+		case *dns.EDNS0_NSID:
+			if rule.action == "replace" || rule.action == "set" {
+				e.Nsid = "" // make sure it is empty for request
+				result = RewriteDone
+			}
+			found = true
+			break
+		}
+	}
+
+	// add option if not found
+	if !found && (rule.action == "append" || rule.action == "set") {
+		o.SetDo(true)
+		o.Option = append(o.Option, &dns.EDNS0_NSID{Code: dns.EDNS0NSID, Nsid: ""})
+		result = RewriteDone
+	}
+
+	return result
+}
+
+// Rewrite will alter the request EDNS0 local options
+func (rule *edns0LocalRule) Rewrite(r *dns.Msg) Result {
+	result := RewriteIgnored
+	o := setupEdns0Opt(r)
+	found := false
+	for _, s := range o.Option {
+		switch e := s.(type) {
+		case *dns.EDNS0_LOCAL:
+			if rule.code == e.Code {
+				if rule.action == "replace" || rule.action == "set" {
+					e.Data = rule.data
+					result = RewriteDone
+				}
+				found = true
+				break
+			}
+		}
+	}
+
+	// add option if not found
+	if !found && (rule.action == "append" || rule.action == "set") {
+		o.SetDo(true)
+		var opt dns.EDNS0_LOCAL
+		opt.Code = rule.code
+		opt.Data = rule.data
+		o.Option = append(o.Option, &opt)
+		result = RewriteDone
+	}
+
+	return result
+}
+
+// newEdns0Rule creates an EDNS0 rule of the appropriate type based on the args
+func newEdns0Rule(args ...string) (Rule, error) {
+	if len(args) < 2 {
+		return nil, fmt.Errorf("Too few arguments for an EDNS0 rule")
+	}
+
+	ruleType := strings.ToLower(args[0])
+	action := strings.ToLower(args[1])
+	switch action {
+	case "append":
+	case "replace":
+	case "set":
+	default:
+		return nil, fmt.Errorf("invalid action: %q", action)
+	}
+
+	switch ruleType {
+	case "local":
+		if len(args) != 4 {
+			return nil, fmt.Errorf("EDNS0 local rules require exactly three args")
+		}
+		return newEdns0LocalRule(action, args[2], args[3])
+	case "nsid":
+		if len(args) != 2 {
+			return nil, fmt.Errorf("EDNS0 NSID rules do not accept args")
+		}
+		return &edns0NsidRule{action: action}, nil
+	default:
+		return nil, fmt.Errorf("invalid rule type %q", ruleType)
+	}
+}
+
+func newEdns0LocalRule(action, code, data string) (*edns0LocalRule, error) {
+	c, err := strconv.ParseUint(code, 0, 16)
+	if err != nil {
+		return nil, err
+	}
+
+	decoded := []byte(data)
+	if strings.HasPrefix(data, "0x") {
+		decoded, err = hex.DecodeString(data[2:])
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return &edns0LocalRule{action: action, code: uint16(c), data: decoded}, nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/rewrite/name.go b/vendor/github.com/miekg/coredns/middleware/rewrite/name.go
new file mode 100644
index 0000000000..69c387f103
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/rewrite/name.go
@@ -0,0 +1,24 @@
+package rewrite
+
+import (
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/miekg/dns"
+)
+
+type nameRule struct {
+	From, To string
+}
+
+func newNameRule(from, to string) (Rule, error) {
+	return &nameRule{middleware.Name(from).Normalize(), middleware.Name(to).Normalize()}, nil
+}
+
+// Rewrite rewrites the the current request.
+func (rule *nameRule) Rewrite(r *dns.Msg) Result {
+	if rule.From == r.Question[0].Name {
+		r.Question[0].Name = rule.To
+		return RewriteDone
+	}
+	return RewriteIgnored
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/rewrite/reverter.go b/vendor/github.com/miekg/coredns/middleware/rewrite/reverter.go
new file mode 100644
index 0000000000..400fb5fffc
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/rewrite/reverter.go
@@ -0,0 +1,39 @@
+package rewrite
+
+import "github.com/miekg/dns"
+
+// ResponseReverter reverses the operations done on the question section of a packet.
+// This is need because the client will otherwise disregards the response, i.e.
+// dig will complain with ';; Question section mismatch: got miek.nl/HINFO/IN'
+type ResponseReverter struct {
+	dns.ResponseWriter
+	original dns.Question
+}
+
+// NewResponseReverter returns a pointer to a new ResponseReverter.
+func NewResponseReverter(w dns.ResponseWriter, r *dns.Msg) *ResponseReverter {
+	return &ResponseReverter{
+		ResponseWriter: w,
+		original:       r.Question[0],
+	}
+}
+
+// WriteMsg records the status code and calls the
+// underlying ResponseWriter's WriteMsg method.
+func (r *ResponseReverter) WriteMsg(res *dns.Msg) error {
+	res.Question[0] = r.original
+	return r.ResponseWriter.WriteMsg(res)
+}
+
+// Write is a wrapper that records the size of the message that gets written.
+func (r *ResponseReverter) Write(buf []byte) (int, error) {
+	n, err := r.ResponseWriter.Write(buf)
+	return n, err
+}
+
+// Hijack implements dns.Hijacker. It simply wraps the underlying
+// ResponseWriter's Hijack method if there is one, or returns an error.
+func (r *ResponseReverter) Hijack() {
+	r.ResponseWriter.Hijack()
+	return
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/rewrite/rewrite.go b/vendor/github.com/miekg/coredns/middleware/rewrite/rewrite.go
new file mode 100644
index 0000000000..2db97b2f18
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/rewrite/rewrite.go
@@ -0,0 +1,86 @@
+package rewrite
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/miekg/dns"
+
+	"golang.org/x/net/context"
+)
+
+// Result is the result of a rewrite
+type Result int
+
+const (
+	// RewriteIgnored is returned when rewrite is not done on request.
+	RewriteIgnored Result = iota
+	// RewriteDone is returned when rewrite is done on request.
+	RewriteDone
+	// RewriteStatus is returned when rewrite is not needed and status code should be set
+	// for the request.
+	RewriteStatus
+)
+
+// Rewrite is middleware to rewrite requests internally before being handled.
+type Rewrite struct {
+	Next     middleware.Handler
+	Rules    []Rule
+	noRevert bool
+}
+
+// ServeDNS implements the middleware.Handler interface.
+func (rw Rewrite) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	wr := NewResponseReverter(w, r)
+	for _, rule := range rw.Rules {
+		switch result := rule.Rewrite(r); result {
+		case RewriteDone:
+			if rw.noRevert {
+				return middleware.NextOrFailure(rw.Name(), rw.Next, ctx, w, r)
+			}
+			return middleware.NextOrFailure(rw.Name(), rw.Next, ctx, wr, r)
+		case RewriteIgnored:
+			break
+		case RewriteStatus:
+			// only valid for complex rules.
+			// if cRule, ok := rule.(*ComplexRule); ok && cRule.Status != 0 {
+			// return cRule.Status, nil
+			// }
+		}
+	}
+	return middleware.NextOrFailure(rw.Name(), rw.Next, ctx, w, r)
+}
+
+// Name implements the Handler interface.
+func (rw Rewrite) Name() string { return "rewrite" }
+
+// Rule describes a rewrite rule.
+type Rule interface {
+	// Rewrite rewrites the current request.
+	Rewrite(*dns.Msg) Result
+}
+
+func newRule(args ...string) (Rule, error) {
+	if len(args) == 0 {
+		return nil, fmt.Errorf("No rule type specified for rewrite")
+	}
+
+	ruleType := strings.ToLower(args[0])
+	if ruleType != "edns0" && len(args) != 3 {
+		return nil, fmt.Errorf("%s rules must have exactly two arguments", ruleType)
+	}
+	switch ruleType {
+	case "name":
+		return newNameRule(args[1], args[2])
+	case "class":
+		return newClassRule(args[1], args[2])
+	case "type":
+		return newTypeRule(args[1], args[2])
+	case "edns0":
+		return newEdns0Rule(args[1:]...)
+	default:
+		return nil, fmt.Errorf("invalid rule type %q", args[0])
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/rewrite/rewrite_test.go b/vendor/github.com/miekg/coredns/middleware/rewrite/rewrite_test.go
new file mode 100644
index 0000000000..e4c0afc503
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/rewrite/rewrite_test.go
@@ -0,0 +1,287 @@
+package rewrite
+
+import (
+	"bytes"
+	"reflect"
+	"testing"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+func msgPrinter(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	w.WriteMsg(r)
+	return 0, nil
+}
+
+func TestNewRule(t *testing.T) {
+	tests := []struct {
+		args        []string
+		shouldError bool
+		expType     reflect.Type
+	}{
+		{[]string{}, true, nil},
+		{[]string{"foo"}, true, nil},
+		{[]string{"name"}, true, nil},
+		{[]string{"name", "a.com"}, true, nil},
+		{[]string{"name", "a.com", "b.com", "c.com"}, true, nil},
+		{[]string{"name", "a.com", "b.com"}, false, reflect.TypeOf(&nameRule{})},
+		{[]string{"type"}, true, nil},
+		{[]string{"type", "a"}, true, nil},
+		{[]string{"type", "any", "a", "a"}, true, nil},
+		{[]string{"type", "any", "a"}, false, reflect.TypeOf(&typeRule{})},
+		{[]string{"type", "XY", "WV"}, true, nil},
+		{[]string{"type", "ANY", "WV"}, true, nil},
+		{[]string{"class"}, true, nil},
+		{[]string{"class", "IN"}, true, nil},
+		{[]string{"class", "ch", "in", "in"}, true, nil},
+		{[]string{"class", "ch", "in"}, false, reflect.TypeOf(&classRule{})},
+		{[]string{"class", "XY", "WV"}, true, nil},
+		{[]string{"class", "IN", "WV"}, true, nil},
+		{[]string{"edns0"}, true, nil},
+		{[]string{"edns0", "local"}, true, nil},
+		{[]string{"edns0", "local", "set"}, true, nil},
+		{[]string{"edns0", "local", "set", "0xffee"}, true, nil},
+		{[]string{"edns0", "local", "set", "65518", "abcdefg"}, false, reflect.TypeOf(&edns0LocalRule{})},
+		{[]string{"edns0", "local", "set", "0xffee", "abcdefg"}, false, reflect.TypeOf(&edns0LocalRule{})},
+		{[]string{"edns0", "local", "append", "0xffee", "abcdefg"}, false, reflect.TypeOf(&edns0LocalRule{})},
+		{[]string{"edns0", "local", "replace", "0xffee", "abcdefg"}, false, reflect.TypeOf(&edns0LocalRule{})},
+		{[]string{"edns0", "local", "foo", "0xffee", "abcdefg"}, true, nil},
+		{[]string{"edns0", "local", "set", "0xffee", "0xabcdefg"}, true, nil},
+		{[]string{"edns0", "nsid", "set", "junk"}, true, nil},
+		{[]string{"edns0", "nsid", "set"}, false, reflect.TypeOf(&edns0NsidRule{})},
+		{[]string{"edns0", "nsid", "append"}, false, reflect.TypeOf(&edns0NsidRule{})},
+		{[]string{"edns0", "nsid", "replace"}, false, reflect.TypeOf(&edns0NsidRule{})},
+		{[]string{"edns0", "nsid", "foo"}, true, nil},
+	}
+
+	for i, tc := range tests {
+		r, err := newRule(tc.args...)
+		if err == nil && tc.shouldError {
+			t.Errorf("Test %d: expected error but got success", i)
+		} else if err != nil && !tc.shouldError {
+			t.Errorf("Test %d: expected success but got error: %s", i, err)
+		}
+
+		if !tc.shouldError && reflect.TypeOf(r) != tc.expType {
+			t.Errorf("Test %d: expected %q but got %q", i, tc.expType, r)
+		}
+	}
+}
+
+func TestRewrite(t *testing.T) {
+	rules := []Rule{}
+	r, _ := newNameRule("from.nl.", "to.nl.")
+	rules = append(rules, r)
+	r, _ = newClassRule("CH", "IN")
+	rules = append(rules, r)
+	r, _ = newTypeRule("ANY", "HINFO")
+	rules = append(rules, r)
+
+	rw := Rewrite{
+		Next:     middleware.HandlerFunc(msgPrinter),
+		Rules:    rules,
+		noRevert: true,
+	}
+
+	tests := []struct {
+		from  string
+		fromT uint16
+		fromC uint16
+		to    string
+		toT   uint16
+		toC   uint16
+	}{
+		{"from.nl.", dns.TypeA, dns.ClassINET, "to.nl.", dns.TypeA, dns.ClassINET},
+		{"a.nl.", dns.TypeA, dns.ClassINET, "a.nl.", dns.TypeA, dns.ClassINET},
+		{"a.nl.", dns.TypeA, dns.ClassCHAOS, "a.nl.", dns.TypeA, dns.ClassINET},
+		{"a.nl.", dns.TypeANY, dns.ClassINET, "a.nl.", dns.TypeHINFO, dns.ClassINET},
+		// name is rewritten, type is not.
+		{"from.nl.", dns.TypeANY, dns.ClassINET, "to.nl.", dns.TypeANY, dns.ClassINET},
+		// name is not, type is, but class is, because class is the 2nd rule.
+		{"a.nl.", dns.TypeANY, dns.ClassCHAOS, "a.nl.", dns.TypeANY, dns.ClassINET},
+	}
+
+	ctx := context.TODO()
+	for i, tc := range tests {
+		m := new(dns.Msg)
+		m.SetQuestion(tc.from, tc.fromT)
+		m.Question[0].Qclass = tc.fromC
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		rw.ServeDNS(ctx, rec, m)
+
+		resp := rec.Msg
+		if resp.Question[0].Name != tc.to {
+			t.Errorf("Test %d: Expected Name to be %q but was %q", i, tc.to, resp.Question[0].Name)
+		}
+		if resp.Question[0].Qtype != tc.toT {
+			t.Errorf("Test %d: Expected Type to be '%d' but was '%d'", i, tc.toT, resp.Question[0].Qtype)
+		}
+		if resp.Question[0].Qclass != tc.toC {
+			t.Errorf("Test %d: Expected Class to be '%d' but was '%d'", i, tc.toC, resp.Question[0].Qclass)
+		}
+	}
+}
+
+func TestRewriteEDNS0Local(t *testing.T) {
+	rw := Rewrite{
+		Next:     middleware.HandlerFunc(msgPrinter),
+		noRevert: true,
+	}
+
+	tests := []struct {
+		fromOpts []dns.EDNS0
+		args     []string
+		toOpts   []dns.EDNS0
+	}{
+		{
+			[]dns.EDNS0{},
+			[]string{"local", "set", "0xffee", "0xabcdef"},
+			[]dns.EDNS0{&dns.EDNS0_LOCAL{Code: 0xffee, Data: []byte{0xab, 0xcd, 0xef}}},
+		},
+		{
+			[]dns.EDNS0{},
+			[]string{"local", "append", "0xffee", "abcdefghijklmnop"},
+			[]dns.EDNS0{&dns.EDNS0_LOCAL{Code: 0xffee, Data: []byte("abcdefghijklmnop")}},
+		},
+		{
+			[]dns.EDNS0{},
+			[]string{"local", "replace", "0xffee", "abcdefghijklmnop"},
+			[]dns.EDNS0{},
+		},
+		{
+			[]dns.EDNS0{},
+			[]string{"nsid", "set"},
+			[]dns.EDNS0{&dns.EDNS0_NSID{Code: dns.EDNS0NSID, Nsid: ""}},
+		},
+		{
+			[]dns.EDNS0{},
+			[]string{"nsid", "append"},
+			[]dns.EDNS0{&dns.EDNS0_NSID{Code: dns.EDNS0NSID, Nsid: ""}},
+		},
+		{
+			[]dns.EDNS0{},
+			[]string{"nsid", "replace"},
+			[]dns.EDNS0{},
+		},
+	}
+
+	ctx := context.TODO()
+	for i, tc := range tests {
+		m := new(dns.Msg)
+		m.SetQuestion("example.com.", dns.TypeA)
+		m.Question[0].Qclass = dns.ClassINET
+
+		r, err := newEdns0Rule(tc.args...)
+		if err != nil {
+			t.Errorf("Error creating test rule: %s", err)
+			continue
+		}
+		rw.Rules = []Rule{r}
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		rw.ServeDNS(ctx, rec, m)
+
+		resp := rec.Msg
+		o := resp.IsEdns0()
+		if o == nil {
+			t.Errorf("Test %d: EDNS0 options not set", i)
+			continue
+		}
+		if !optsEqual(o.Option, tc.toOpts) {
+			t.Errorf("Test %d: Expected %v but got %v", i, tc.toOpts, o)
+		}
+	}
+}
+
+func TestEdns0LocalMultiRule(t *testing.T) {
+	rules := []Rule{}
+	r, _ := newEdns0Rule("local", "replace", "0xffee", "abcdef")
+	rules = append(rules, r)
+	r, _ = newEdns0Rule("local", "set", "0xffee", "fedcba")
+	rules = append(rules, r)
+
+	rw := Rewrite{
+		Next:     middleware.HandlerFunc(msgPrinter),
+		Rules:    rules,
+		noRevert: true,
+	}
+
+	tests := []struct {
+		fromOpts []dns.EDNS0
+		toOpts   []dns.EDNS0
+	}{
+		{
+			nil,
+			[]dns.EDNS0{&dns.EDNS0_LOCAL{Code: 0xffee, Data: []byte("fedcba")}},
+		},
+		{
+			[]dns.EDNS0{&dns.EDNS0_LOCAL{Code: 0xffee, Data: []byte("foobar")}},
+			[]dns.EDNS0{&dns.EDNS0_LOCAL{Code: 0xffee, Data: []byte("abcdef")}},
+		},
+	}
+
+	ctx := context.TODO()
+	for i, tc := range tests {
+		m := new(dns.Msg)
+		m.SetQuestion("example.com.", dns.TypeA)
+		m.Question[0].Qclass = dns.ClassINET
+		if tc.fromOpts != nil {
+			o := m.IsEdns0()
+			if o == nil {
+				m.SetEdns0(4096, true)
+				o = m.IsEdns0()
+			}
+			o.Option = append(o.Option, tc.fromOpts...)
+		}
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		rw.ServeDNS(ctx, rec, m)
+
+		resp := rec.Msg
+		o := resp.IsEdns0()
+		if o == nil {
+			t.Errorf("Test %d: EDNS0 options not set", i)
+			continue
+		}
+		if !optsEqual(o.Option, tc.toOpts) {
+			t.Errorf("Test %d: Expected %v but got %v", i, tc.toOpts, o)
+		}
+	}
+}
+
+func optsEqual(a, b []dns.EDNS0) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	for i := range a {
+		switch aa := a[i].(type) {
+		case *dns.EDNS0_LOCAL:
+			if bb, ok := b[i].(*dns.EDNS0_LOCAL); ok {
+				if aa.Code != bb.Code {
+					return false
+				}
+				if !bytes.Equal(aa.Data, bb.Data) {
+					return false
+				}
+			} else {
+				return false
+			}
+		case *dns.EDNS0_NSID:
+			if bb, ok := b[i].(*dns.EDNS0_NSID); ok {
+				if aa.Nsid != bb.Nsid {
+					return false
+				}
+			} else {
+				return false
+			}
+		default:
+			return false
+		}
+	}
+	return true
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/rewrite/setup.go b/vendor/github.com/miekg/coredns/middleware/rewrite/setup.go
new file mode 100644
index 0000000000..156129f707
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/rewrite/setup.go
@@ -0,0 +1,42 @@
+package rewrite
+
+import (
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/mholt/caddy"
+)
+
+func init() {
+	caddy.RegisterPlugin("rewrite", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setup,
+	})
+}
+
+func setup(c *caddy.Controller) error {
+	rewrites, err := rewriteParse(c)
+	if err != nil {
+		return middleware.Error("rewrite", err)
+	}
+
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
+		return Rewrite{Next: next, Rules: rewrites}
+	})
+
+	return nil
+}
+
+func rewriteParse(c *caddy.Controller) ([]Rule, error) {
+	var rules []Rule
+
+	for c.Next() {
+		args := c.RemainingArgs()
+		rule, err := newRule(args...)
+		if err != nil {
+			return nil, err
+		}
+		rules = append(rules, rule)
+	}
+	return rules, nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/rewrite/setup_test.go b/vendor/github.com/miekg/coredns/middleware/rewrite/setup_test.go
new file mode 100644
index 0000000000..67ef88e180
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/rewrite/setup_test.go
@@ -0,0 +1,25 @@
+package rewrite
+
+import (
+	"testing"
+
+	"github.com/mholt/caddy"
+)
+
+func TestParse(t *testing.T) {
+	c := caddy.NewTestController("dns", `rewrite`)
+	_, err := rewriteParse(c)
+	if err == nil {
+		t.Errorf("Expected error but found nil for `rewrite`")
+	}
+	c = caddy.NewTestController("dns", `rewrite name`)
+	_, err = rewriteParse(c)
+	if err == nil {
+		t.Errorf("Expected error but found nil for `rewrite name`")
+	}
+	c = caddy.NewTestController("dns", `rewrite name a.com b.com`)
+	_, err = rewriteParse(c)
+	if err != nil {
+		t.Errorf("Expected success but found %s for `rewrite name a.com b.com`", err)
+	}
+}
diff --git a/upup/models/nodeup/_kubernetes_master/kube-apiserver/files/var/log/kube-apiserver.log b/vendor/github.com/miekg/coredns/middleware/rewrite/testdata/testdir/empty
similarity index 100%
rename from upup/models/nodeup/_kubernetes_master/kube-apiserver/files/var/log/kube-apiserver.log
rename to vendor/github.com/miekg/coredns/middleware/rewrite/testdata/testdir/empty
diff --git a/vendor/github.com/miekg/coredns/middleware/rewrite/testdata/testfile b/vendor/github.com/miekg/coredns/middleware/rewrite/testdata/testfile
new file mode 100644
index 0000000000..7b4d68d70f
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/rewrite/testdata/testfile
@@ -0,0 +1 @@
+empty
\ No newline at end of file
diff --git a/vendor/github.com/miekg/coredns/middleware/rewrite/type.go b/vendor/github.com/miekg/coredns/middleware/rewrite/type.go
new file mode 100644
index 0000000000..c2b7866d7f
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/rewrite/type.go
@@ -0,0 +1,37 @@
+// Package rewrite is middleware for rewriting requests internally to something different.
+package rewrite
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/miekg/dns"
+)
+
+// typeRule is a type rewrite rule.
+type typeRule struct {
+	fromType, toType uint16
+}
+
+func newTypeRule(fromS, toS string) (Rule, error) {
+	var from, to uint16
+	var ok bool
+	if from, ok = dns.StringToType[strings.ToUpper(fromS)]; !ok {
+		return nil, fmt.Errorf("invalid type %q", strings.ToUpper(fromS))
+	}
+	if to, ok = dns.StringToType[strings.ToUpper(toS)]; !ok {
+		return nil, fmt.Errorf("invalid type %q", strings.ToUpper(toS))
+	}
+	return &typeRule{fromType: from, toType: to}, nil
+}
+
+// Rewrite rewrites the the current request.
+func (rule *typeRule) Rewrite(r *dns.Msg) Result {
+	if rule.fromType > 0 && rule.toType > 0 {
+		if r.Question[0].Qtype == rule.fromType {
+			r.Question[0].Qtype = rule.toType
+			return RewriteDone
+		}
+	}
+	return RewriteIgnored
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/root/README.md b/vendor/github.com/miekg/coredns/middleware/root/README.md
new file mode 100644
index 0000000000..5d09a31f34
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/root/README.md
@@ -0,0 +1,21 @@
+# root
+
+*root* simply specifies the root of where CoreDNS finds (e.g.) zone files.
+The default root is the current working directory of CoreDNS.
+A relative root path is relative to the current working directory.
+
+## Syntax
+
+~~~ txt
+root PATH
+~~~
+
+**PATH** is the directory to set as CoreDNS' root.
+
+## Examples
+
+Serve zone data (when the *file* middleware is used) from `/etc/coredns/zones`:
+
+~~~ txt
+root /etc/coredns/zones
+~~~
diff --git a/vendor/github.com/miekg/coredns/middleware/root/root.go b/vendor/github.com/miekg/coredns/middleware/root/root.go
new file mode 100644
index 0000000000..d03ecb8a48
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/root/root.go
@@ -0,0 +1,43 @@
+package root
+
+import (
+	"log"
+	"os"
+
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/mholt/caddy"
+)
+
+func init() {
+	caddy.RegisterPlugin("root", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setup,
+	})
+}
+
+func setup(c *caddy.Controller) error {
+	config := dnsserver.GetConfig(c)
+
+	for c.Next() {
+		if !c.NextArg() {
+			return middleware.Error("root", c.ArgErr())
+		}
+		config.Root = c.Val()
+	}
+
+	// Check if root path exists
+	_, err := os.Stat(config.Root)
+	if err != nil {
+		if os.IsNotExist(err) {
+			// Allow this, because the folder might appear later.
+			// But make sure the user knows!
+			log.Printf("[WARNING] Root path does not exist: %s", config.Root)
+		} else {
+			return middleware.Error("root", c.Errf("unable to access root path '%s': %v", config.Root, err))
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/root/root_test.go b/vendor/github.com/miekg/coredns/middleware/root/root_test.go
new file mode 100644
index 0000000000..6823301f88
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/root/root_test.go
@@ -0,0 +1,107 @@
+package root
+
+import (
+	"fmt"
+	"io/ioutil"
+	"log"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/coredns/coredns/core/dnsserver"
+
+	"github.com/mholt/caddy"
+)
+
+func TestRoot(t *testing.T) {
+	log.SetOutput(ioutil.Discard)
+
+	// Predefined error substrings
+	parseErrContent := "Parse error:"
+	unableToAccessErrContent := "unable to access root path"
+
+	existingDirPath, err := getTempDirPath()
+	if err != nil {
+		t.Fatalf("BeforeTest: Failed to find an existing directory for testing! Error was: %v", err)
+	}
+
+	nonExistingDir := filepath.Join(existingDirPath, "highly_unlikely_to_exist_dir")
+
+	existingFile, err := ioutil.TempFile("", "root_test")
+	if err != nil {
+		t.Fatalf("BeforeTest: Failed to create temp file for testing! Error was: %v", err)
+	}
+	defer func() {
+		existingFile.Close()
+		os.Remove(existingFile.Name())
+	}()
+
+	inaccessiblePath := getInaccessiblePath(existingFile.Name())
+
+	tests := []struct {
+		input              string
+		shouldErr          bool
+		expectedRoot       string // expected root, set to the controller. Empty for negative cases.
+		expectedErrContent string // substring from the expected error. Empty for positive cases.
+	}{
+		// positive
+		{
+			fmt.Sprintf(`root %s`, nonExistingDir), false, nonExistingDir, "",
+		},
+		{
+			fmt.Sprintf(`root %s`, existingDirPath), false, existingDirPath, "",
+		},
+		// negative
+		{
+			`root `, true, "", parseErrContent,
+		},
+		{
+			fmt.Sprintf(`root %s`, inaccessiblePath), true, "", unableToAccessErrContent,
+		},
+		{
+			fmt.Sprintf(`root {
+				%s
+			}`, existingDirPath), true, "", parseErrContent,
+		},
+	}
+
+	for i, test := range tests {
+		c := caddy.NewTestController("dns", test.input)
+		err := setup(c)
+		cfg := dnsserver.GetConfig(c)
+
+		if test.shouldErr && err == nil {
+			t.Errorf("Test %d: Expected error but found %s for input %s", i, err, test.input)
+		}
+
+		if err != nil {
+			if !test.shouldErr {
+				t.Errorf("Test %d: Expected no error but found one for input %s. Error was: %v", i, test.input, err)
+			}
+
+			if !strings.Contains(err.Error(), test.expectedErrContent) {
+				t.Errorf("Test %d: Expected error to contain: %v, found error: %v, input: %s", i, test.expectedErrContent, err, test.input)
+			}
+		}
+
+		// check root only if we are in a positive test.
+		if !test.shouldErr && test.expectedRoot != cfg.Root {
+			t.Errorf("Root not correctly set for input %s. Expected: %s, actual: %s", test.input, test.expectedRoot, cfg.Root)
+		}
+	}
+}
+
+// getTempDirPath returnes the path to the system temp directory. If it does not exists - an error is returned.
+func getTempDirPath() (string, error) {
+	tempDir := os.TempDir()
+	_, err := os.Stat(tempDir)
+	if err != nil {
+		return "", err
+	}
+	return tempDir, nil
+}
+
+func getInaccessiblePath(file string) string {
+	return filepath.Join("C:", "file\x00name") // null byte in filename is not allowed on Windows AND unix
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/secondary/README.md b/vendor/github.com/miekg/coredns/middleware/secondary/README.md
new file mode 100644
index 0000000000..559a06717b
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/secondary/README.md
@@ -0,0 +1,34 @@
+# secondary
+
+*secondary* enables serving a zone retrieved from a primary server.
+
+## Syntax
+
+~~~
+secondary [ZONES...]
+~~~
+
+* **ZONES** zones it should be authoritative for. If empty, the zones from the configuration block
+    are used. Note that without a remote address to *get* the zone from, the above is not that useful.
+
+A working syntax would be:
+
+~~~
+secondary [zones...] {
+    transfer from ADDRESS
+    [transfer to ADDRESS]
+}
+~~~
+
+* `transfer from` specifies from which address to fetch the zone. It can be specified multiple times;
+    if one does not work, another will be tried.
+* `transfer to` can be enabled to allow this secondary zone to be transferred again.
+
+## Examples
+
+~~~
+secondary example.org {
+    transfer from 10.0.1.1
+    transfer from 10.1.2.1
+}
+~~~
diff --git a/vendor/github.com/miekg/coredns/middleware/secondary/secondary.go b/vendor/github.com/miekg/coredns/middleware/secondary/secondary.go
new file mode 100644
index 0000000000..da31d51714
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/secondary/secondary.go
@@ -0,0 +1,10 @@
+// Package secondary implements a secondary middleware.
+package secondary
+
+import "github.com/coredns/coredns/middleware/file"
+
+// Secondary implements a secondary middleware that allows CoreDNS to retrieve (via AXFR)
+// zone information from a primary server.
+type Secondary struct {
+	file.File
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/secondary/setup.go b/vendor/github.com/miekg/coredns/middleware/secondary/setup.go
new file mode 100644
index 0000000000..5822f9e8f7
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/secondary/setup.go
@@ -0,0 +1,82 @@
+package secondary
+
+import (
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/file"
+
+	"github.com/mholt/caddy"
+)
+
+func init() {
+	caddy.RegisterPlugin("secondary", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setup,
+	})
+}
+
+func setup(c *caddy.Controller) error {
+	zones, err := secondaryParse(c)
+	if err != nil {
+		return middleware.Error("secondary", err)
+	}
+
+	// Add startup functions to retrieve the zone and keep it up to date.
+	for _, n := range zones.Names {
+		if len(zones.Z[n].TransferFrom) > 0 {
+			c.OnStartup(func() error {
+				zones.Z[n].StartupOnce.Do(func() {
+					zones.Z[n].TransferIn()
+					go func() {
+						zones.Z[n].Update()
+					}()
+				})
+				return nil
+			})
+		}
+	}
+
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
+		return Secondary{file.File{Next: next, Zones: zones}}
+	})
+
+	return nil
+}
+
+func secondaryParse(c *caddy.Controller) (file.Zones, error) {
+	z := make(map[string]*file.Zone)
+	names := []string{}
+	origins := []string{}
+	for c.Next() {
+		if c.Val() == "secondary" {
+			// secondary [origin]
+			origins = make([]string, len(c.ServerBlockKeys))
+			copy(origins, c.ServerBlockKeys)
+			args := c.RemainingArgs()
+			if len(args) > 0 {
+				origins = args
+			}
+			for i := range origins {
+				origins[i] = middleware.Host(origins[i]).Normalize()
+				z[origins[i]] = file.NewZone(origins[i], "stdin")
+				names = append(names, origins[i])
+			}
+
+			for c.NextBlock() {
+				t, f, e := file.TransferParse(c, true)
+				if e != nil {
+					return file.Zones{}, e
+				}
+				for _, origin := range origins {
+					if t != nil {
+						z[origin].TransferTo = append(z[origin].TransferTo, t...)
+					}
+					if f != nil {
+						z[origin].TransferFrom = append(z[origin].TransferFrom, f...)
+					}
+				}
+			}
+		}
+	}
+	return file.Zones{Z: z, Names: names}, nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/secondary/setup_test.go b/vendor/github.com/miekg/coredns/middleware/secondary/setup_test.go
new file mode 100644
index 0000000000..c58483f6bc
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/secondary/setup_test.go
@@ -0,0 +1,41 @@
+package secondary
+
+import (
+	"testing"
+
+	"github.com/mholt/caddy"
+)
+
+// TODO(miek): this only check the syntax.
+func TestSecondaryParse(t *testing.T) {
+	tests := []struct {
+		inputFileRules string
+		shouldErr      bool
+		transferFrom   string
+	}{
+		{
+			`secondary`,
+			false, // TODO(miek): should actually be true, because without transfer lines this does not make sense
+			"",
+		},
+		{
+			`secondary {
+				transfer from 127.0.0.1
+				transfer to 127.0.0.1
+			}`,
+			false,
+			"",
+		},
+	}
+
+	for i, test := range tests {
+		c := caddy.NewTestController("dns", test.inputFileRules)
+		_, err := secondaryParse(c)
+
+		if err == nil && test.shouldErr {
+			t.Fatalf("Test %d expected errors, but got no error", i)
+		} else if err != nil && !test.shouldErr {
+			t.Fatalf("Test %d expected no errors, but got '%v'", i, err)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/test/doc.go b/vendor/github.com/miekg/coredns/middleware/test/doc.go
new file mode 100644
index 0000000000..e2f90262b2
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/test/doc.go
@@ -0,0 +1,2 @@
+// Package test contains helper functions for writing middleware tests.
+package test
diff --git a/vendor/github.com/miekg/coredns/middleware/test/file.go b/vendor/github.com/miekg/coredns/middleware/test/file.go
new file mode 100644
index 0000000000..f87300e556
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/test/file.go
@@ -0,0 +1,107 @@
+package test
+
+import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
+)
+
+// TempFile will create a temporary file on disk and returns the name and a cleanup function to remove it later.
+func TempFile(dir, content string) (string, func(), error) {
+	f, err := ioutil.TempFile(dir, "go-test-tmpfile")
+	if err != nil {
+		return "", nil, err
+	}
+	if err := ioutil.WriteFile(f.Name(), []byte(content), 0644); err != nil {
+		return "", nil, err
+	}
+	rmFunc := func() { os.Remove(f.Name()) }
+	return f.Name(), rmFunc, nil
+}
+
+// WritePEMFiles creates a tmp dir with ca.pem, cert.pem, and key.pem and the func to remove it
+func WritePEMFiles(dir string) (string, func(), error) {
+	tempDir, err := ioutil.TempDir(dir, "go-test-pemfiles")
+	if err != nil {
+		return "", nil, err
+	}
+
+	data := `-----BEGIN CERTIFICATE-----
+MIIC9zCCAd+gAwIBAgIJALGtqdMzpDemMA0GCSqGSIb3DQEBCwUAMBIxEDAOBgNV
+BAMMB2t1YmUtY2EwHhcNMTYxMDE5MTU1NDI0WhcNNDQwMzA2MTU1NDI0WjASMRAw
+DgYDVQQDDAdrdWJlLWNhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+pa4Wu/WkpJNRr8pMVE6jjwzNUOx5mIyoDr8WILSxVQcEeyVPPmAqbmYXtVZO11p9
+jTzoEqF7Kgts3HVYGCk5abqbE14a8Ru/DmV5avU2hJ/NvSjtNi/O+V6SzCbg5yR9
+lBR53uADDlzuJEQT9RHq7A5KitFkx4vUcXnjOQCbDogWFoYuOgNEwJPy0Raz3NJc
+ViVfDqSJ0QHg02kCOMxcGFNRQ9F5aoW7QXZXZXD0tn3wLRlu4+GYyqt8fw5iNdLJ
+t79yKp8I+vMTmMPz4YKUO+eCl5EY10Qs7wvoG/8QNbjH01BRN3L8iDT2WfxdvjTu
+1RjPxFL92i+B7HZO7jGLfQIDAQABo1AwTjAdBgNVHQ4EFgQUZTrg+Xt87tkxDhlB
+gKk9FdTOW3IwHwYDVR0jBBgwFoAUZTrg+Xt87tkxDhlBgKk9FdTOW3IwDAYDVR0T
+BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEApB7JFVrZpGSOXNO3W7SlN6OCPXv9
+C7rIBc8rwOrzi2mZWcBmWheQrqBo8xHif2rlFNVQxtq3JcQ8kfg/m1fHeQ/Ygzel
+Z+U1OqozynDySBZdNn9i+kXXgAUCqDPp3hEQWe0os/RRpIwo9yOloBxdiX6S0NIf
+VB8n8kAynFPkH7pYrGrL1HQgDFCSfa4tUJ3+9sppnCu0pNtq5AdhYx9xFb2sn+8G
+xGbtCkhVk2VQ+BiCWnjYXJ6ZMzabP7wiOFDP9Pvr2ik22PRItsW/TLfHFXM1jDmc
+I1rs/VUGKzcJGVIWbHrgjP68CTStGAvKgbsTqw7aLXTSqtPw88N9XVSyRg==
+-----END CERTIFICATE-----`
+	path := filepath.Join(tempDir, "ca.pem")
+	if err := ioutil.WriteFile(path, []byte(data), 0644); err != nil {
+		return "", nil, err
+	}
+	data = `-----BEGIN CERTIFICATE-----
+MIICozCCAYsCCQCRlf5BrvPuqjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdr
+dWJlLWNhMB4XDTE2MTAxOTE2MDUxOFoXDTE3MTAxOTE2MDUxOFowFTETMBEGA1UE
+AwwKa3ViZS1hZG1pbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMTw
+a7wCFoiCad/N53aURfjrme+KR7FS0yf5Ur9OR/oM3BoS9stYu5Flzr35oL5T6t5G
+c2ey78mUs/Cs07psnjUdKH55bDpJSdG7zW9mXNyeLwIefFcj/38SS5NBSotmLo8u
+scJMGXeQpCQtfVuVJSP2bfU5u5d0KTLSg/Cor6UYonqrRB82HbOuuk8Wjaww4VHo
+nCq7X8o948V6HN5ZibQOgMMo+nf0wORREHBjvwc4W7ewbaTcfoe1VNAo/QnkqxTF
+ueMb2HxgghArqQSK8b44O05V0zrde25dVnmnte6sPjcV0plqMJ37jViISxsOPUFh
+/ZW7zbIM/7CMcDekCiECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAYZE8OxwRR7GR
+kdd5aIriDwWfcl56cq5ICyx87U8hAZhBxk46a6a901LZPzt3xKyWIFQSRj/NYiQ+
+/thjGLZI2lhkVgYtyAD4BNxDiuppQSCbkjY9tLVDdExGttEVN7+UYDWJBHy6X16Y
+xSG9FE3Dvp9LI89Nq8E3dRh+Q8wu52q9HaQXjS5YtzQOtDFKPBkihXu/c6gEHj4Y
+bZVk8rFiH8/CvcQxAuvNI3VVCFUKd2LeQtqwYQQ//qoiuA15krTq5Ut9eXJ8zxAw
+zhDEPP4FhY+Sz+y1yWirphl7A1aZwhXVPcfWIGqpQ3jzNwUeocbH27kuLh+U4hQo
+qeg10RdFnw==
+-----END CERTIFICATE-----`
+	path = filepath.Join(tempDir, "cert.pem")
+	if err = ioutil.WriteFile(path, []byte(data), 0644); err != nil {
+		return "", nil, err
+	}
+
+	data = `-----BEGIN RSA PRIVATE KEY-----
+MIIEpgIBAAKCAQEAxPBrvAIWiIJp383ndpRF+OuZ74pHsVLTJ/lSv05H+gzcGhL2
+y1i7kWXOvfmgvlPq3kZzZ7LvyZSz8KzTumyeNR0ofnlsOklJ0bvNb2Zc3J4vAh58
+VyP/fxJLk0FKi2Yujy6xwkwZd5CkJC19W5UlI/Zt9Tm7l3QpMtKD8KivpRiieqtE
+HzYds666TxaNrDDhUeicKrtfyj3jxXoc3lmJtA6Awyj6d/TA5FEQcGO/Bzhbt7Bt
+pNx+h7VU0Cj9CeSrFMW54xvYfGCCECupBIrxvjg7TlXTOt17bl1Weae17qw+NxXS
+mWownfuNWIhLGw49QWH9lbvNsgz/sIxwN6QKIQIDAQABAoIBAQDCXq9V7ZGjxWMN
+OkFaLVkqJg3V91puztoMt+xNV8t+JTcOnOzrIXZuOFbl9PwLHPPP0SSRkm9LOvKl
+dU26zv0OWureeKSymia7U2mcqyC3tX+bzc7WinbeSYZBnc0e7AjD1EgpBcaU1TLL
+agIxY3A2oD9CKmrVPhZzTIZf/XztqTYjhvs5I2kBeT0imdYGpXkdndRyGX4I5/JQ
+fnp3Czj+AW3zX7RvVnXOh4OtIAcfoG9xoNyD5LOSlJkkX0MwTS8pEBeZA+A4nb+C
+ivjnOSgXWD+liisI+LpBgBbwYZ/E49x5ghZYrJt8QXSk7Bl/+UOyv6XZAm2mev6j
+RLAZtoABAoGBAP2P+1PoKOwsk+d/AmHqyTCUQm0UG18LOLB/5PyWfXs/6caDmdIe
+DZWeZWng1jUQLEadmoEw/CBY5+tPfHlzwzMNhT7KwUfIDQCIBoS7dzHYnwrJ3VZh
+qYA05cuGHAAHqwb6UWz3y6Pa4AEVSHX6CM83CAi9jdWZ1rdZybWG+qYBAoGBAMbV
+FsR/Ft+tK5ALgXGoG83TlmxzZYuZ1SnNje1OSdCQdMFCJB10gwoaRrw1ICzi40Xk
+ydJwV1upGz1om9ReDAD1zQM9artmQx6+TVLiVPALuARdZE70+NrA6w3ZvxUgJjdN
+ngvXUr+8SdvaYUAwFu7BulfJlwXjUS711hHW/KQhAoGBALY41QuV2mLwHlLNie7I
+hlGtGpe9TXZeYB0nrG6B0CfU5LJPPSotguG1dXhDpm138/nDpZeWlnrAqdsHwpKd
+yPhVjR51I7XsZLuvBdA50Q03egSM0c4UXXXPjh1XgaPb3uMi3YWMBwL4ducQXoS6
+bb5M9C8j2lxZNF+L3VPhbxwBAoGBAIEWDvX7XKpTDxkxnxRfA84ZNGusb5y2fsHp
+Bd+vGBUj8+kUO8Yzwm9op8vA4ebCVrMl2jGZZd3IaDryE1lIxZpJ+pPD5+tKdQEc
+o67P6jz+HrYWu+zW9klvPit71qasfKMi7Rza6oo4f+sQWFsH3ZucgpJD+pyD/Ez0
+pcpnPRaBAoGBANT/xgHBfIWt4U2rtmRLIIiZxKr+3mGnQdpA1J2BCh+/6AvrEx//
+E/WObVJXDnBdViu0L9abE9iaTToBVri4cmlDlZagLuKVR+TFTCN/DSlVZTDkqkLI
+8chzqtkH6b2b2R73hyRysWjsomys34ma3mEEPTX/aXeAF2MSZ/EWT9yL
+-----END RSA PRIVATE KEY-----`
+	path = filepath.Join(tempDir, "key.pem")
+	if err = ioutil.WriteFile(path, []byte(data), 0644); err != nil {
+		return "", nil, err
+	}
+
+	rmFunc := func() { os.RemoveAll(tempDir) }
+	return tempDir, rmFunc, nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/test/file_test.go b/vendor/github.com/miekg/coredns/middleware/test/file_test.go
new file mode 100644
index 0000000000..ed86a82605
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/test/file_test.go
@@ -0,0 +1,11 @@
+package test
+
+import "testing"
+
+func TestTempFile(t *testing.T) {
+	_, f, e := TempFile(".", "test")
+	if e != nil {
+		t.Fatalf("failed to create temp file: %s", e)
+	}
+	defer f()
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/test/helpers.go b/vendor/github.com/miekg/coredns/middleware/test/helpers.go
new file mode 100644
index 0000000000..339385a23e
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/test/helpers.go
@@ -0,0 +1,299 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+type sect int
+
+const (
+	// Answer is the answer section in an Msg.
+	Answer sect = iota
+	// Ns is the authrotitative section in an Msg.
+	Ns
+	// Extra is the additional section in an Msg.
+	Extra
+)
+
+// RRSet represents a list of RRs.
+type RRSet []dns.RR
+
+func (p RRSet) Len() int           { return len(p) }
+func (p RRSet) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
+func (p RRSet) Less(i, j int) bool { return p[i].String() < p[j].String() }
+
+// Case represents a test case that encapsulates various data from a query and response.
+// Note that is the TTL of a record is 303 we don't compare it with the TTL.
+type Case struct {
+	Qname  string
+	Qtype  uint16
+	Rcode  int
+	Do     bool
+	Answer []dns.RR
+	Ns     []dns.RR
+	Extra  []dns.RR
+}
+
+// Msg returns a *dns.Msg embedded in c.
+func (c Case) Msg() *dns.Msg {
+	m := new(dns.Msg)
+	m.SetQuestion(dns.Fqdn(c.Qname), c.Qtype)
+	if c.Do {
+		o := new(dns.OPT)
+		o.Hdr.Name = "."
+		o.Hdr.Rrtype = dns.TypeOPT
+		o.SetDo()
+		o.SetUDPSize(4096)
+		m.Extra = []dns.RR{o}
+	}
+	return m
+}
+
+// A returns an A record from rr. It panics on errors.
+func A(rr string) *dns.A { r, _ := dns.NewRR(rr); return r.(*dns.A) }
+
+// AAAA returns an AAAA record from rr. It panics on errors.
+func AAAA(rr string) *dns.AAAA { r, _ := dns.NewRR(rr); return r.(*dns.AAAA) }
+
+// CNAME returns a CNAME record from rr. It panics on errors.
+func CNAME(rr string) *dns.CNAME { r, _ := dns.NewRR(rr); return r.(*dns.CNAME) }
+
+// SRV returns a SRV record from rr. It panics on errors.
+func SRV(rr string) *dns.SRV { r, _ := dns.NewRR(rr); return r.(*dns.SRV) }
+
+// SOA returns a SOA record from rr. It panics on errors.
+func SOA(rr string) *dns.SOA { r, _ := dns.NewRR(rr); return r.(*dns.SOA) }
+
+// NS returns an NS record from rr. It panics on errors.
+func NS(rr string) *dns.NS { r, _ := dns.NewRR(rr); return r.(*dns.NS) }
+
+// PTR returns a PTR record from rr. It panics on errors.
+func PTR(rr string) *dns.PTR { r, _ := dns.NewRR(rr); return r.(*dns.PTR) }
+
+// TXT returns a TXT record from rr. It panics on errors.
+func TXT(rr string) *dns.TXT { r, _ := dns.NewRR(rr); return r.(*dns.TXT) }
+
+// MX returns an MX record from rr. It panics on errors.
+func MX(rr string) *dns.MX { r, _ := dns.NewRR(rr); return r.(*dns.MX) }
+
+// RRSIG returns an RRSIG record from rr. It panics on errors.
+func RRSIG(rr string) *dns.RRSIG { r, _ := dns.NewRR(rr); return r.(*dns.RRSIG) }
+
+// NSEC returns an NSEC record from rr. It panics on errors.
+func NSEC(rr string) *dns.NSEC { r, _ := dns.NewRR(rr); return r.(*dns.NSEC) }
+
+// DNSKEY returns a DNSKEY record from rr. It panics on errors.
+func DNSKEY(rr string) *dns.DNSKEY { r, _ := dns.NewRR(rr); return r.(*dns.DNSKEY) }
+
+// DS returns a DS record from rr. It panics on errors.
+func DS(rr string) *dns.DS { r, _ := dns.NewRR(rr); return r.(*dns.DS) }
+
+// OPT returns an OPT record with UDP buffer size set to bufsize and the DO bit set to do.
+func OPT(bufsize int, do bool) *dns.OPT {
+	o := new(dns.OPT)
+	o.Hdr.Name = "."
+	o.Hdr.Rrtype = dns.TypeOPT
+	o.SetVersion(0)
+	o.SetUDPSize(uint16(bufsize))
+	if do {
+		o.SetDo()
+	}
+	return o
+}
+
+// Header test if the header in resp matches the header as defined in tc.
+func Header(t *testing.T, tc Case, resp *dns.Msg) bool {
+	if resp.Rcode != tc.Rcode {
+		t.Errorf("rcode is %q, expected %q", dns.RcodeToString[resp.Rcode], dns.RcodeToString[tc.Rcode])
+		return false
+	}
+
+	if len(resp.Answer) != len(tc.Answer) {
+		t.Errorf("answer for %q contained %d results, %d expected", tc.Qname, len(resp.Answer), len(tc.Answer))
+		return false
+	}
+	if len(resp.Ns) != len(tc.Ns) {
+		t.Errorf("authority for %q contained %d results, %d expected", tc.Qname, len(resp.Ns), len(tc.Ns))
+		return false
+	}
+	if len(resp.Extra) != len(tc.Extra) {
+		t.Errorf("additional for %q contained %d results, %d expected", tc.Qname, len(resp.Extra), len(tc.Extra))
+		return false
+	}
+	return true
+}
+
+// Section tests if the the section in tc matches rr.
+func Section(t *testing.T, tc Case, sec sect, rr []dns.RR) bool {
+	section := []dns.RR{}
+	switch sec {
+	case 0:
+		section = tc.Answer
+	case 1:
+		section = tc.Ns
+	case 2:
+		section = tc.Extra
+	}
+
+	for i, a := range rr {
+		if a.Header().Name != section[i].Header().Name {
+			t.Errorf("rr %d should have a Header Name of %q, but has %q", i, section[i].Header().Name, a.Header().Name)
+			return false
+		}
+		// 303 signals: don't care what the ttl is.
+		if section[i].Header().Ttl != 303 && a.Header().Ttl != section[i].Header().Ttl {
+			if _, ok := section[i].(*dns.OPT); !ok {
+				// we check edns0 bufize on this one
+				t.Errorf("rr %d should have a Header TTL of %d, but has %d", i, section[i].Header().Ttl, a.Header().Ttl)
+				return false
+			}
+		}
+		if a.Header().Rrtype != section[i].Header().Rrtype {
+			t.Errorf("rr %d should have a header rr type of %d, but has %d", i, section[i].Header().Rrtype, a.Header().Rrtype)
+			return false
+		}
+
+		switch x := a.(type) {
+		case *dns.SRV:
+			if x.Priority != section[i].(*dns.SRV).Priority {
+				t.Errorf("rr %d should have a Priority of %d, but has %d", i, section[i].(*dns.SRV).Priority, x.Priority)
+				return false
+			}
+			if x.Weight != section[i].(*dns.SRV).Weight {
+				t.Errorf("rr %d should have a Weight of %d, but has %d", i, section[i].(*dns.SRV).Weight, x.Weight)
+				return false
+			}
+			if x.Port != section[i].(*dns.SRV).Port {
+				t.Errorf("rr %d should have a Port of %d, but has %d", i, section[i].(*dns.SRV).Port, x.Port)
+				return false
+			}
+			if x.Target != section[i].(*dns.SRV).Target {
+				t.Errorf("rr %d should have a Target of %q, but has %q", i, section[i].(*dns.SRV).Target, x.Target)
+				return false
+			}
+		case *dns.RRSIG:
+			if x.TypeCovered != section[i].(*dns.RRSIG).TypeCovered {
+				t.Errorf("rr %d should have a TypeCovered of %d, but has %d", i, section[i].(*dns.RRSIG).TypeCovered, x.TypeCovered)
+				return false
+			}
+			if x.Labels != section[i].(*dns.RRSIG).Labels {
+				t.Errorf("rr %d should have a Labels of %d, but has %d", i, section[i].(*dns.RRSIG).Labels, x.Labels)
+				return false
+			}
+			if x.SignerName != section[i].(*dns.RRSIG).SignerName {
+				t.Errorf("rr %d should have a SignerName of %s, but has %s", i, section[i].(*dns.RRSIG).SignerName, x.SignerName)
+				return false
+			}
+		case *dns.NSEC:
+			if x.NextDomain != section[i].(*dns.NSEC).NextDomain {
+				t.Errorf("rr %d should have a NextDomain of %s, but has %s", i, section[i].(*dns.NSEC).NextDomain, x.NextDomain)
+				return false
+			}
+			// TypeBitMap
+		case *dns.A:
+			if x.A.String() != section[i].(*dns.A).A.String() {
+				t.Errorf("rr %d should have a Address of %q, but has %q", i, section[i].(*dns.A).A.String(), x.A.String())
+				return false
+			}
+		case *dns.AAAA:
+			if x.AAAA.String() != section[i].(*dns.AAAA).AAAA.String() {
+				t.Errorf("rr %d should have a Address of %q, but has %q", i, section[i].(*dns.AAAA).AAAA.String(), x.AAAA.String())
+				return false
+			}
+		case *dns.TXT:
+			for j, txt := range x.Txt {
+				if txt != section[i].(*dns.TXT).Txt[j] {
+					t.Errorf("rr %d should have a Txt of %q, but has %q", i, section[i].(*dns.TXT).Txt[j], txt)
+					return false
+				}
+			}
+		case *dns.SOA:
+			tt := section[i].(*dns.SOA)
+			if x.Ns != tt.Ns {
+				t.Errorf("SOA nameserver should be %q, but is %q", x.Ns, tt.Ns)
+				return false
+			}
+		case *dns.PTR:
+			tt := section[i].(*dns.PTR)
+			if x.Ptr != tt.Ptr {
+				t.Errorf("PTR ptr should be %q, but is %q", x.Ptr, tt.Ptr)
+				return false
+			}
+		case *dns.CNAME:
+			tt := section[i].(*dns.CNAME)
+			if x.Target != tt.Target {
+				t.Errorf("CNAME target should be %q, but is %q", x.Target, tt.Target)
+				return false
+			}
+		case *dns.MX:
+			tt := section[i].(*dns.MX)
+			if x.Mx != tt.Mx {
+				t.Errorf("MX Mx should be %q, but is %q", x.Mx, tt.Mx)
+				return false
+			}
+			if x.Preference != tt.Preference {
+				t.Errorf("MX Preference should be %q, but is %q", x.Preference, tt.Preference)
+				return false
+			}
+		case *dns.NS:
+			tt := section[i].(*dns.NS)
+			if x.Ns != tt.Ns {
+				t.Errorf("NS nameserver should be %q, but is %q", x.Ns, tt.Ns)
+				return false
+			}
+		case *dns.OPT:
+			tt := section[i].(*dns.OPT)
+			if x.UDPSize() != tt.UDPSize() {
+				t.Errorf("OPT UDPSize should be %d, but is %d", tt.UDPSize(), x.UDPSize())
+				return false
+			}
+			if x.Do() != tt.Do() {
+				t.Errorf("OPT DO should be %t, but is %t", tt.Do(), x.Do())
+				return false
+			}
+		}
+	}
+	return true
+}
+
+// ErrorHandler returns a Handler that returns ServerFailure error when called.
+func ErrorHandler() Handler {
+	return HandlerFunc(func(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+		m := new(dns.Msg)
+		m.SetRcode(r, dns.RcodeServerFailure)
+		w.WriteMsg(m)
+		return dns.RcodeServerFailure, nil
+	})
+}
+
+// NextHandler returns a Handler that returns rcode and err.
+func NextHandler(rcode int, err error) Handler {
+	return HandlerFunc(func(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+		return rcode, err
+	})
+}
+
+// Copied here to prevent an import cycle, so that we can define to above handlers.
+
+type (
+	// HandlerFunc is a convenience type like dns.HandlerFunc, except
+	// ServeDNS returns an rcode and an error.
+	HandlerFunc func(context.Context, dns.ResponseWriter, *dns.Msg) (int, error)
+
+	// Handler interface defines a middleware.
+	Handler interface {
+		ServeDNS(context.Context, dns.ResponseWriter, *dns.Msg) (int, error)
+		Name() string
+	}
+)
+
+// ServeDNS implements the Handler interface.
+func (f HandlerFunc) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	return f(ctx, w, r)
+}
+
+// Name implements the Handler interface.
+func (f HandlerFunc) Name() string { return "handlerfunc" }
diff --git a/vendor/github.com/miekg/coredns/middleware/test/helpers_test.go b/vendor/github.com/miekg/coredns/middleware/test/helpers_test.go
new file mode 100644
index 0000000000..1b4d95bbc9
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/test/helpers_test.go
@@ -0,0 +1,8 @@
+package test
+
+import "testing"
+
+func TestA(t *testing.T) {
+	// should not crash
+	A("miek.nl. IN A 127.0.0.1")
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/test/responsewriter.go b/vendor/github.com/miekg/coredns/middleware/test/responsewriter.go
new file mode 100644
index 0000000000..7aa6dd1335
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/test/responsewriter.go
@@ -0,0 +1,44 @@
+package test
+
+import (
+	"net"
+
+	"github.com/miekg/dns"
+)
+
+// ResponseWriter is useful for writing tests. It uses some fixed values for the client. The
+// remote will always be 10.240.0.1 and port 40212. The local address is always 127.0.0.1 and
+// port 53.
+type ResponseWriter struct{}
+
+// LocalAddr returns the local address, always 127.0.0.1:53 (UDP).
+func (t *ResponseWriter) LocalAddr() net.Addr {
+	ip := net.ParseIP("127.0.0.1")
+	port := 53
+	return &net.UDPAddr{IP: ip, Port: port, Zone: ""}
+}
+
+// RemoteAddr returns the remote address, always 10.240.0.1:40212 (UDP).
+func (t *ResponseWriter) RemoteAddr() net.Addr {
+	ip := net.ParseIP("10.240.0.1")
+	port := 40212
+	return &net.UDPAddr{IP: ip, Port: port, Zone: ""}
+}
+
+// WriteMsg implement dns.ResponseWriter interface.
+func (t *ResponseWriter) WriteMsg(m *dns.Msg) error { return nil }
+
+// Write implement dns.ResponseWriter interface.
+func (t *ResponseWriter) Write(buf []byte) (int, error) { return len(buf), nil }
+
+// Close implement dns.ResponseWriter interface.
+func (t *ResponseWriter) Close() error { return nil }
+
+// TsigStatus implement dns.ResponseWriter interface.
+func (t *ResponseWriter) TsigStatus() error { return nil }
+
+// TsigTimersOnly implement dns.ResponseWriter interface.
+func (t *ResponseWriter) TsigTimersOnly(bool) { return }
+
+// Hijack implement dns.ResponseWriter interface.
+func (t *ResponseWriter) Hijack() { return }
diff --git a/vendor/github.com/miekg/coredns/middleware/test/server.go b/vendor/github.com/miekg/coredns/middleware/test/server.go
new file mode 100644
index 0000000000..eb39c7a5b9
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/test/server.go
@@ -0,0 +1,52 @@
+package test
+
+import (
+	"net"
+	"sync"
+	"time"
+
+	"github.com/miekg/dns"
+)
+
+// TCPServer starts a DNS server with a TCP listener on laddr.
+func TCPServer(laddr string) (*dns.Server, string, error) {
+	l, err := net.Listen("tcp", laddr)
+	if err != nil {
+		return nil, "", err
+	}
+
+	server := &dns.Server{Listener: l, ReadTimeout: time.Hour, WriteTimeout: time.Hour}
+
+	waitLock := sync.Mutex{}
+	waitLock.Lock()
+	server.NotifyStartedFunc = func() { waitLock.Unlock() }
+
+	go func() {
+		server.ActivateAndServe()
+		l.Close()
+	}()
+
+	waitLock.Lock()
+	return server, l.Addr().String(), nil
+}
+
+// UDPServer starts a DNS server with an UDP listener on laddr.
+func UDPServer(laddr string) (*dns.Server, string, error) {
+	pc, err := net.ListenPacket("udp", laddr)
+	if err != nil {
+		return nil, "", err
+	}
+	server := &dns.Server{PacketConn: pc, ReadTimeout: time.Hour, WriteTimeout: time.Hour}
+
+	waitLock := sync.Mutex{}
+	waitLock.Lock()
+	server.NotifyStartedFunc = func() { waitLock.Unlock() }
+
+	go func() {
+		server.ActivateAndServe()
+		pc.Close()
+	}()
+
+	waitLock.Lock()
+	return server, pc.LocalAddr().String(), nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/tls/README.md b/vendor/github.com/miekg/coredns/middleware/tls/README.md
new file mode 100644
index 0000000000..6070257d31
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/tls/README.md
@@ -0,0 +1,13 @@
+# tls
+
+*tls* extra TLS configuration.
+
+## Syntax
+
+~~~ txt
+tls [STUFF]
+~~~
+
+**STUFF** is things you'll need to configure TLS.
+
+## Examples
diff --git a/vendor/github.com/miekg/coredns/middleware/tls/tls.go b/vendor/github.com/miekg/coredns/middleware/tls/tls.go
new file mode 100644
index 0000000000..2e2586ce56
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/tls/tls.go
@@ -0,0 +1,37 @@
+package tls
+
+import (
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+	"github.com/coredns/coredns/middleware/pkg/tls"
+
+	"github.com/mholt/caddy"
+)
+
+func init() {
+	caddy.RegisterPlugin("tls", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setup,
+	})
+}
+
+func setup(c *caddy.Controller) error {
+	config := dnsserver.GetConfig(c)
+
+	if config.TLSConfig != nil {
+		return middleware.Error("tls", c.Errf("TLS already configured for this server instance"))
+	}
+
+	for c.Next() {
+		args := c.RemainingArgs()
+		if len(args) != 3 {
+			return middleware.Error("tls", c.ArgErr())
+		}
+		tls, err := tls.NewTLSConfig(args[0], args[1], args[2])
+		if err != nil {
+			return middleware.Error("tls", c.ArgErr())
+		}
+		config.TLSConfig = tls
+	}
+	return nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/tls/tls_test.go b/vendor/github.com/miekg/coredns/middleware/tls/tls_test.go
new file mode 100644
index 0000000000..2374d772c9
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/tls/tls_test.go
@@ -0,0 +1,44 @@
+package tls
+
+import (
+	"io/ioutil"
+	"log"
+	"strings"
+	"testing"
+
+	"github.com/mholt/caddy"
+)
+
+func TestTLS(t *testing.T) {
+	log.SetOutput(ioutil.Discard)
+
+	tests := []struct {
+		input              string
+		shouldErr          bool
+		expectedRoot       string // expected root, set to the controller. Empty for negative cases.
+		expectedErrContent string // substring from the expected error. Empty for positive cases.
+	}{
+	// positive
+	// negative
+	}
+
+	for i, test := range tests {
+		c := caddy.NewTestController("dns", test.input)
+		err := setup(c)
+		//cfg := dnsserver.GetConfig(c)
+
+		if test.shouldErr && err == nil {
+			t.Errorf("Test %d: Expected error but found %s for input %s", i, err, test.input)
+		}
+
+		if err != nil {
+			if !test.shouldErr {
+				t.Errorf("Test %d: Expected no error but found one for input %s. Error was: %v", i, test.input, err)
+			}
+
+			if !strings.Contains(err.Error(), test.expectedErrContent) {
+				t.Errorf("Test %d: Expected error to contain: %v, found error: %v, input: %s", i, test.expectedErrContent, err, test.input)
+			}
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/trace/README.md b/vendor/github.com/miekg/coredns/middleware/trace/README.md
new file mode 100644
index 0000000000..aa157e1e27
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/trace/README.md
@@ -0,0 +1,73 @@
+# trace
+
+This module enables OpenTracing-based tracing of DNS requests as they go through the
+middleware chain.
+
+## Syntax
+
+The simplest form is just:
+
+~~~
+trace [ENDPOINT-TYPE] [ENDPOINT]
+~~~
+
+* **ENDPOINT-TYPE** is the type of tracing destination. Currently only `zipkin` is supported
+  and that is what it defaults to.
+* **ENDPOINT** is the tracing destination, and defaults to `localhost:9411`. For Zipkin, if
+  ENDPOINT does not begin with `http`, then it will be transformed to `http://ENDPOINT/api/v1/spans`.
+
+With this form, all queries will be traced.
+
+Additional features can be enabled with this syntax:
+
+~~~
+trace [ENDPOINT-TYPE] [ENDPOINT] {
+	every AMOUNT
+	service NAME
+	client_server
+}
+~~~
+
+* `every` **AMOUNT** will only trace one query of each AMOUNT queries. For example, to trace 1 in every
+  100 queries, use AMOUNT of 100. The default is 1.
+* `service` **NAME** allows you to specify the service name reported to the tracing server.
+  Default is `coredns`.
+* `client_server` will enable the `ClientServerSameSpan` OpenTracing feature.
+
+## Zipkin
+You can run Zipkin on a Docker host like this:
+
+```
+docker run -d -p 9411:9411 openzipkin/zipkin
+```
+
+## Examples
+
+Use an alternative Zipkin address:
+
+~~~
+trace tracinghost:9253
+~~~
+
+or
+
+~~~
+trace zipkin tracinghost:9253
+~~~
+
+If for some reason you are using an API reverse proxy or something and need to remap
+the standard Zipkin URL you can do something like:
+
+~~~
+trace http://tracinghost:9411/zipkin/api/v1/spans
+~~~
+
+Trace one query every 10000 queries, rename the service, and enable same span:
+
+~~~
+trace tracinghost:9411 {
+	every 10000
+	service dnsproxy
+	client_server
+}
+~~~
diff --git a/vendor/github.com/miekg/coredns/middleware/trace/setup.go b/vendor/github.com/miekg/coredns/middleware/trace/setup.go
new file mode 100644
index 0000000000..a6eb8c340e
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/trace/setup.go
@@ -0,0 +1,113 @@
+package trace
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/mholt/caddy"
+)
+
+func init() {
+	caddy.RegisterPlugin("trace", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setup,
+	})
+}
+
+func setup(c *caddy.Controller) error {
+	t, err := traceParse(c)
+	if err != nil {
+		return middleware.Error("trace", err)
+	}
+
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
+		t.Next = next
+		return t
+	})
+
+	c.OnStartup(t.OnStartup)
+
+	return nil
+}
+
+func traceParse(c *caddy.Controller) (*trace, error) {
+	var (
+		tr  = &trace{Endpoint: defEP, EndpointType: defEpType, every: 1, serviceName: defServiceName}
+		err error
+	)
+
+	cfg := dnsserver.GetConfig(c)
+	tr.ServiceEndpoint = cfg.ListenHost + ":" + cfg.Port
+	for c.Next() { // trace
+		var err error
+		args := c.RemainingArgs()
+		switch len(args) {
+		case 0:
+			tr.Endpoint, err = normalizeEndpoint(tr.EndpointType, defEP)
+		case 1:
+			tr.Endpoint, err = normalizeEndpoint(defEpType, args[0])
+		case 2:
+			tr.EndpointType = strings.ToLower(args[0])
+			tr.Endpoint, err = normalizeEndpoint(tr.EndpointType, args[1])
+		default:
+			err = c.ArgErr()
+		}
+		if err != nil {
+			return tr, err
+		}
+		for c.NextBlock() {
+			switch c.Val() {
+			case "every":
+				args := c.RemainingArgs()
+				if len(args) != 1 {
+					return nil, c.ArgErr()
+				}
+				tr.every, err = strconv.ParseUint(args[0], 10, 64)
+				if err != nil {
+					return nil, err
+				}
+			case "service":
+				args := c.RemainingArgs()
+				if len(args) != 1 {
+					return nil, c.ArgErr()
+				}
+				tr.serviceName = args[0]
+			case "client_server":
+				args := c.RemainingArgs()
+				if len(args) > 1 {
+					return nil, c.ArgErr()
+				}
+				tr.clientServer = true
+				if len(args) == 1 {
+					tr.clientServer, err = strconv.ParseBool(args[0])
+				}
+				if err != nil {
+					return nil, err
+				}
+			}
+		}
+	}
+	return tr, err
+}
+
+func normalizeEndpoint(epType, ep string) (string, error) {
+	switch epType {
+	case "zipkin":
+		if strings.Index(ep, "http") == -1 {
+			ep = "http://" + ep + "/api/v1/spans"
+		}
+		return ep, nil
+	default:
+		return "", fmt.Errorf("tracing endpoint type '%s' is not supported", epType)
+	}
+}
+
+const (
+	defEP          = "localhost:9411"
+	defEpType      = "zipkin"
+	defServiceName = "coredns"
+)
diff --git a/vendor/github.com/miekg/coredns/middleware/trace/setup_test.go b/vendor/github.com/miekg/coredns/middleware/trace/setup_test.go
new file mode 100644
index 0000000000..3c12b76e4c
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/trace/setup_test.go
@@ -0,0 +1,60 @@
+package trace
+
+import (
+	"testing"
+
+	"github.com/mholt/caddy"
+)
+
+func TestTraceParse(t *testing.T) {
+	tests := []struct {
+		input        string
+		shouldErr    bool
+		endpoint     string
+		every        uint64
+		serviceName  string
+		clientServer bool
+	}{
+		// oks
+		{`trace`, false, "http://localhost:9411/api/v1/spans", 1, `coredns`, false},
+		{`trace localhost:1234`, false, "http://localhost:1234/api/v1/spans", 1, `coredns`, false},
+		{`trace http://localhost:1234/somewhere/else`, false, "http://localhost:1234/somewhere/else", 1, `coredns`, false},
+		{`trace zipkin localhost:1234`, false, "http://localhost:1234/api/v1/spans", 1, `coredns`, false},
+		{`trace zipkin http://localhost:1234/somewhere/else`, false, "http://localhost:1234/somewhere/else", 1, `coredns`, false},
+		{"trace {\n every 100\n}", false, "http://localhost:9411/api/v1/spans", 100, `coredns`, false},
+		{"trace {\n every 100\n service foobar\nclient_server\n}", false, "http://localhost:9411/api/v1/spans", 100, `foobar`, true},
+		{"trace {\n every 2\n client_server true\n}", false, "http://localhost:9411/api/v1/spans", 2, `coredns`, true},
+		{"trace {\n client_server false\n}", false, "http://localhost:9411/api/v1/spans", 1, `coredns`, false},
+		// fails
+		{`trace footype localhost:4321`, true, "", 1, "", false},
+		{"trace {\n every 2\n client_server junk\n}", true, "", 1, "", false},
+	}
+	for i, test := range tests {
+		c := caddy.NewTestController("dns", test.input)
+		m, err := traceParse(c)
+		if test.shouldErr && err == nil {
+			t.Errorf("Test %v: Expected error but found nil", i)
+			continue
+		} else if !test.shouldErr && err != nil {
+			t.Errorf("Test %v: Expected no error but found error: %v", i, err)
+			continue
+		}
+
+		if test.shouldErr {
+			continue
+		}
+
+		if test.endpoint != m.Endpoint {
+			t.Errorf("Test %v: Expected endpoint %s but found: %s", i, test.endpoint, m.Endpoint)
+		}
+		if test.every != m.every {
+			t.Errorf("Test %v: Expected every %d but found: %d", i, test.every, m.every)
+		}
+		if test.serviceName != m.serviceName {
+			t.Errorf("Test %v: Expected service name %s but found: %s", i, test.serviceName, m.serviceName)
+		}
+		if test.clientServer != m.clientServer {
+			t.Errorf("Test %v: Expected client_server %t but found: %t", i, test.clientServer, m.clientServer)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/trace/trace.go b/vendor/github.com/miekg/coredns/middleware/trace/trace.go
new file mode 100644
index 0000000000..3413fa6814
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/trace/trace.go
@@ -0,0 +1,90 @@
+// Package trace implements OpenTracing-based tracing
+package trace
+
+import (
+	"fmt"
+	"sync"
+	"sync/atomic"
+
+	"github.com/coredns/coredns/middleware"
+	"github.com/miekg/dns"
+	ot "github.com/opentracing/opentracing-go"
+	zipkin "github.com/openzipkin/zipkin-go-opentracing"
+
+	"golang.org/x/net/context"
+)
+
+// Trace holds the tracer and endpoint info
+type Trace interface {
+	middleware.Handler
+	Tracer() ot.Tracer
+}
+
+type trace struct {
+	Next            middleware.Handler
+	ServiceEndpoint string
+	Endpoint        string
+	EndpointType    string
+	tracer          ot.Tracer
+	serviceName     string
+	clientServer    bool
+	every           uint64
+	count           uint64
+	Once            sync.Once
+}
+
+func (t *trace) Tracer() ot.Tracer {
+	return t.tracer
+}
+
+// OnStartup sets up the tracer
+func (t *trace) OnStartup() error {
+	var err error
+	t.Once.Do(func() {
+		switch t.EndpointType {
+		case "zipkin":
+			err = t.setupZipkin()
+		default:
+			err = fmt.Errorf("Unknown endpoint type: %s", t.EndpointType)
+		}
+	})
+	return err
+}
+
+func (t *trace) setupZipkin() error {
+
+	collector, err := zipkin.NewHTTPCollector(t.Endpoint)
+	if err != nil {
+		return err
+	}
+
+	recorder := zipkin.NewRecorder(collector, false, t.ServiceEndpoint, t.serviceName)
+	t.tracer, err = zipkin.NewTracer(recorder, zipkin.ClientServerSameSpan(t.clientServer))
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// Name implements the Handler interface.
+func (t *trace) Name() string {
+	return "trace"
+}
+
+// ServeDNS implements the middleware.Handle interface.
+func (t *trace) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	trace := false
+	if t.every > 0 {
+		queryNr := atomic.AddUint64(&t.count, 1)
+
+		if queryNr%t.every == 0 {
+			trace = true
+		}
+	}
+	if span := ot.SpanFromContext(ctx); span == nil && trace {
+		span := t.Tracer().StartSpan("servedns")
+		defer span.Finish()
+		ctx = ot.ContextWithSpan(ctx, span)
+	}
+	return middleware.NextOrFailure(t.Name(), t.Next, ctx, w, r)
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/trace/trace_test.go b/vendor/github.com/miekg/coredns/middleware/trace/trace_test.go
new file mode 100644
index 0000000000..06b2aafcfc
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/trace/trace_test.go
@@ -0,0 +1,33 @@
+package trace
+
+import (
+	"testing"
+
+	"github.com/mholt/caddy"
+)
+
+// createTestTrace creates a trace middleware to be used in tests
+func createTestTrace(config string) (*caddy.Controller, *trace, error) {
+	c := caddy.NewTestController("dns", config)
+	m, err := traceParse(c)
+	return c, m, err
+}
+
+func TestTrace(t *testing.T) {
+	_, m, err := createTestTrace(`trace`)
+	if err != nil {
+		t.Errorf("Error parsing test input: %s", err)
+		return
+	}
+	if m.Name() != "trace" {
+		t.Errorf("Wrong name from GetName: %s", m.Name())
+	}
+	err = m.OnStartup()
+	if err != nil {
+		t.Errorf("Error starting tracing middleware: %s", err)
+		return
+	}
+	if m.Tracer() == nil {
+		t.Errorf("Error, no tracer created")
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/whoami/README.md b/vendor/github.com/miekg/coredns/middleware/whoami/README.md
new file mode 100644
index 0000000000..87e6e7ac7b
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/whoami/README.md
@@ -0,0 +1,38 @@
+# whoami
+
+*whoami* returns your local IP address, port and transport used. Your local IP address is returned in
+the additional section as either an A or AAAA record.
+
+The port and transport are included in the additional section as a SRV record, transport can be
+"tcp" or "udp".
+
+~~~ txt
+._<transport>.qname. 0 IN SRV 0 0 <port> .
+~~~
+
+The *whoami* middleware will respond to every A or AAAA query, regardless of the query name.
+
+## Syntax
+
+~~~ txt
+whoami
+~~~
+
+## Examples
+
+~~~ txt
+.:53 {
+    whoami
+}
+~~~
+
+When queried for "example.org A", CoreDNS will respond with:
+
+~~~ txt
+;; QUESTION SECTION:
+;example.org.   IN       A
+
+;; ADDITIONAL SECTION:
+example.org.            0       IN      A       10.240.0.1
+_udp.example.org.       0       IN      SRV     0 0 40212
+~~~
diff --git a/vendor/github.com/miekg/coredns/middleware/whoami/setup.go b/vendor/github.com/miekg/coredns/middleware/whoami/setup.go
new file mode 100644
index 0000000000..e11ac65675
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/whoami/setup.go
@@ -0,0 +1,28 @@
+package whoami
+
+import (
+	"github.com/coredns/coredns/core/dnsserver"
+	"github.com/coredns/coredns/middleware"
+
+	"github.com/mholt/caddy"
+)
+
+func init() {
+	caddy.RegisterPlugin("whoami", caddy.Plugin{
+		ServerType: "dns",
+		Action:     setupWhoami,
+	})
+}
+
+func setupWhoami(c *caddy.Controller) error {
+	c.Next() // 'whoami'
+	if c.NextArg() {
+		return middleware.Error("whoami", c.ArgErr())
+	}
+
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
+		return Whoami{}
+	})
+
+	return nil
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/whoami/setup_test.go b/vendor/github.com/miekg/coredns/middleware/whoami/setup_test.go
new file mode 100644
index 0000000000..73db67d886
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/whoami/setup_test.go
@@ -0,0 +1,19 @@
+package whoami
+
+import (
+	"testing"
+
+	"github.com/mholt/caddy"
+)
+
+func TestSetupWhoami(t *testing.T) {
+	c := caddy.NewTestController("dns", `whoami`)
+	if err := setupWhoami(c); err != nil {
+		t.Fatalf("Expected no errors, but got: %v", err)
+	}
+
+	c = caddy.NewTestController("dns", `whoami example.org`)
+	if err := setupWhoami(c); err == nil {
+		t.Fatalf("Expected errors, but got: %v", err)
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/middleware/whoami/whoami.go b/vendor/github.com/miekg/coredns/middleware/whoami/whoami.go
new file mode 100644
index 0000000000..6b5ed332ae
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/whoami/whoami.go
@@ -0,0 +1,57 @@
+// Package whoami implements a middleware that returns details about the resolving
+// querying it.
+package whoami
+
+import (
+	"net"
+	"strconv"
+
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+// Whoami is a middleware that returns your IP address, port and the protocol used for connecting
+// to CoreDNS.
+type Whoami struct{}
+
+// ServeDNS implements the middleware.Handler interface.
+func (wh Whoami) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+	state := request.Request{W: w, Req: r}
+
+	a := new(dns.Msg)
+	a.SetReply(r)
+	a.Compress = true
+	a.Authoritative = true
+
+	ip := state.IP()
+	var rr dns.RR
+
+	switch state.Family() {
+	case 1:
+		rr = new(dns.A)
+		rr.(*dns.A).Hdr = dns.RR_Header{Name: state.QName(), Rrtype: dns.TypeA, Class: state.QClass()}
+		rr.(*dns.A).A = net.ParseIP(ip).To4()
+	case 2:
+		rr = new(dns.AAAA)
+		rr.(*dns.AAAA).Hdr = dns.RR_Header{Name: state.QName(), Rrtype: dns.TypeAAAA, Class: state.QClass()}
+		rr.(*dns.AAAA).AAAA = net.ParseIP(ip)
+	}
+
+	srv := new(dns.SRV)
+	srv.Hdr = dns.RR_Header{Name: "_" + state.Proto() + "." + state.QName(), Rrtype: dns.TypeSRV, Class: state.QClass()}
+	port, _ := strconv.Atoi(state.Port())
+	srv.Port = uint16(port)
+	srv.Target = "."
+
+	a.Extra = []dns.RR{rr, srv}
+
+	state.SizeAndDo(a)
+	w.WriteMsg(a)
+
+	return 0, nil
+}
+
+// Name implements the Handler interface.
+func (wh Whoami) Name() string { return "whoami" }
diff --git a/vendor/github.com/miekg/coredns/middleware/whoami/whoami_test.go b/vendor/github.com/miekg/coredns/middleware/whoami/whoami_test.go
new file mode 100644
index 0000000000..d9357e497d
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/middleware/whoami/whoami_test.go
@@ -0,0 +1,56 @@
+package whoami
+
+import (
+	"testing"
+
+	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+func TestWhoami(t *testing.T) {
+	wh := Whoami{}
+
+	tests := []struct {
+		qname         string
+		qtype         uint16
+		expectedCode  int
+		expectedReply []string // ownernames for the records in the additional section.
+		expectedErr   error
+	}{
+		{
+			qname:         "example.org",
+			qtype:         dns.TypeA,
+			expectedCode:  dns.RcodeSuccess,
+			expectedReply: []string{"example.org.", "_udp.example.org."},
+			expectedErr:   nil,
+		},
+	}
+
+	ctx := context.TODO()
+
+	for i, tc := range tests {
+		req := new(dns.Msg)
+		req.SetQuestion(dns.Fqdn(tc.qname), tc.qtype)
+
+		rec := dnsrecorder.New(&test.ResponseWriter{})
+		code, err := wh.ServeDNS(ctx, rec, req)
+
+		if err != tc.expectedErr {
+			t.Errorf("Test %d: Expected error %v, but got %v", i, tc.expectedErr, err)
+		}
+		if code != int(tc.expectedCode) {
+			t.Errorf("Test %d: Expected status code %d, but got %d", i, tc.expectedCode, code)
+		}
+		if len(tc.expectedReply) != 0 {
+			for i, expected := range tc.expectedReply {
+				actual := rec.Msg.Extra[i].Header().Name
+				if actual != expected {
+					t.Errorf("Test %d: Expected answer %s, but got %s", i, expected, actual)
+				}
+			}
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/pb/dns.pb.go b/vendor/github.com/miekg/coredns/pb/dns.pb.go
new file mode 100644
index 0000000000..3117102ab4
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/pb/dns.pb.go
@@ -0,0 +1,140 @@
+// Code generated by protoc-gen-go.
+// source: dns.proto
+// DO NOT EDIT!
+
+/*
+Package pb is a generated protocol buffer package.
+
+It is generated from these files:
+	dns.proto
+
+It has these top-level messages:
+	DnsPacket
+*/
+package pb
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
+type DnsPacket struct {
+	Msg []byte `protobuf:"bytes,1,opt,name=msg,proto3" json:"msg,omitempty"`
+}
+
+func (m *DnsPacket) Reset()                    { *m = DnsPacket{} }
+func (m *DnsPacket) String() string            { return proto.CompactTextString(m) }
+func (*DnsPacket) ProtoMessage()               {}
+func (*DnsPacket) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+
+func (m *DnsPacket) GetMsg() []byte {
+	if m != nil {
+		return m.Msg
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*DnsPacket)(nil), "coredns.dns.DnsPacket")
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// Client API for DnsService service
+
+type DnsServiceClient interface {
+	Query(ctx context.Context, in *DnsPacket, opts ...grpc.CallOption) (*DnsPacket, error)
+}
+
+type dnsServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewDnsServiceClient(cc *grpc.ClientConn) DnsServiceClient {
+	return &dnsServiceClient{cc}
+}
+
+func (c *dnsServiceClient) Query(ctx context.Context, in *DnsPacket, opts ...grpc.CallOption) (*DnsPacket, error) {
+	out := new(DnsPacket)
+	err := grpc.Invoke(ctx, "/coredns.dns.DnsService/Query", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// Server API for DnsService service
+
+type DnsServiceServer interface {
+	Query(context.Context, *DnsPacket) (*DnsPacket, error)
+}
+
+func RegisterDnsServiceServer(s *grpc.Server, srv DnsServiceServer) {
+	s.RegisterService(&_DnsService_serviceDesc, srv)
+}
+
+func _DnsService_Query_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DnsPacket)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DnsServiceServer).Query(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/coredns.dns.DnsService/Query",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DnsServiceServer).Query(ctx, req.(*DnsPacket))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _DnsService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "coredns.dns.DnsService",
+	HandlerType: (*DnsServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "Query",
+			Handler:    _DnsService_Query_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "dns.proto",
+}
+
+func init() { proto.RegisterFile("dns.proto", fileDescriptor0) }
+
+var fileDescriptor0 = []byte{
+	// 120 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xe2, 0x4c, 0xc9, 0x2b, 0xd6,
+	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x4e, 0xce, 0x2f, 0x4a, 0x05, 0x71, 0x53, 0xf2, 0x8a,
+	0x95, 0x64, 0xb9, 0x38, 0x5d, 0xf2, 0x8a, 0x03, 0x12, 0x93, 0xb3, 0x53, 0x4b, 0x84, 0x04, 0xb8,
+	0x98, 0x73, 0x8b, 0xd3, 0x25, 0x18, 0x15, 0x18, 0x35, 0x78, 0x82, 0x40, 0x4c, 0x23, 0x57, 0x2e,
+	0x2e, 0x97, 0xbc, 0xe2, 0xe0, 0xd4, 0xa2, 0xb2, 0xcc, 0xe4, 0x54, 0x21, 0x73, 0x2e, 0xd6, 0xc0,
+	0xd2, 0xd4, 0xa2, 0x4a, 0x21, 0x31, 0x3d, 0x24, 0x33, 0xf4, 0xe0, 0x06, 0x48, 0xe1, 0x10, 0x77,
+	0x62, 0x89, 0x62, 0x2a, 0x48, 0x4a, 0x62, 0x03, 0xdb, 0x6f, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff,
+	0xf5, 0xd1, 0x3f, 0x26, 0x8c, 0x00, 0x00, 0x00,
+}
diff --git a/vendor/github.com/miekg/coredns/pb/dns.proto b/vendor/github.com/miekg/coredns/pb/dns.proto
new file mode 100644
index 0000000000..8461f01e6d
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/pb/dns.proto
@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+package coredns.dns;
+option go_package = "pb";
+
+message DnsPacket {
+	bytes msg = 1;
+}
+
+service DnsService {
+	rpc Query (DnsPacket) returns (DnsPacket);
+}
diff --git a/vendor/github.com/miekg/coredns/request/request.go b/vendor/github.com/miekg/coredns/request/request.go
new file mode 100644
index 0000000000..9353373ef0
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/request/request.go
@@ -0,0 +1,248 @@
+// Package request abstracts a client's request so that all middleware
+// will handle them in an unified way.
+package request
+
+import (
+	"net"
+	"strings"
+
+	"github.com/coredns/coredns/middleware/pkg/edns"
+
+	"github.com/miekg/dns"
+)
+
+// Request contains some connection state and is useful in middleware.
+type Request struct {
+	Req *dns.Msg
+	W   dns.ResponseWriter
+
+	// Cache size after first call to Size or Do.
+	size int
+	do   int // 0: not, 1: true: 2: false
+	// TODO(miek): opt record itself as well?
+
+	// Cache lowercase qname.
+	name string
+}
+
+// NewWithQuestion returns a new request based on the old, but with a new question
+// section in the request.
+func (r *Request) NewWithQuestion(name string, typ uint16) Request {
+	req1 := Request{W: r.W, Req: r.Req.Copy()}
+	req1.Req.Question[0] = dns.Question{Name: dns.Fqdn(name), Qtype: dns.ClassINET, Qclass: typ}
+	return req1
+}
+
+// IP gets the (remote) IP address of the client making the request.
+func (r *Request) IP() string {
+	ip, _, err := net.SplitHostPort(r.W.RemoteAddr().String())
+	if err != nil {
+		return r.W.RemoteAddr().String()
+	}
+	return ip
+}
+
+// Port gets the (remote) Port of the client making the request.
+func (r *Request) Port() string {
+	_, port, err := net.SplitHostPort(r.W.RemoteAddr().String())
+	if err != nil {
+		return "0"
+	}
+	return port
+}
+
+// RemoteAddr returns the net.Addr of the client that sent the current request.
+func (r *Request) RemoteAddr() string {
+	return r.W.RemoteAddr().String()
+}
+
+// Proto gets the protocol used as the transport. This will be udp or tcp.
+func (r *Request) Proto() string { return Proto(r.W) }
+
+// Proto gets the protocol used as the transport. This will be udp or tcp.
+func Proto(w dns.ResponseWriter) string {
+	// FIXME(miek): why not a method on Request
+	if _, ok := w.RemoteAddr().(*net.UDPAddr); ok {
+		return "udp"
+	}
+	if _, ok := w.RemoteAddr().(*net.TCPAddr); ok {
+		return "tcp"
+	}
+	return "udp"
+}
+
+// Family returns the family of the transport, 1 for IPv4 and 2 for IPv6.
+func (r *Request) Family() int {
+	var a net.IP
+	ip := r.W.RemoteAddr()
+	if i, ok := ip.(*net.UDPAddr); ok {
+		a = i.IP
+	}
+	if i, ok := ip.(*net.TCPAddr); ok {
+		a = i.IP
+	}
+
+	if a.To4() != nil {
+		return 1
+	}
+	return 2
+}
+
+// Do returns if the request has the DO (DNSSEC OK) bit set.
+func (r *Request) Do() bool {
+	if r.do != 0 {
+		return r.do == doTrue
+	}
+
+	if o := r.Req.IsEdns0(); o != nil {
+		if o.Do() {
+			r.do = doTrue
+		} else {
+			r.do = doFalse
+		}
+		return o.Do()
+	}
+	r.do = doFalse
+	return false
+}
+
+// Len returns the length in bytes in the request.
+func (r *Request) Len() int { return r.Req.Len() }
+
+// Size returns if buffer size *advertised* in the requests OPT record.
+// Or when the request was over TCP, we return the maximum allowed size of 64K.
+func (r *Request) Size() int {
+	if r.size != 0 {
+		return r.size
+	}
+
+	size := 0
+	if o := r.Req.IsEdns0(); o != nil {
+		if o.Do() == true {
+			r.do = doTrue
+		} else {
+			r.do = doFalse
+		}
+		size = int(o.UDPSize())
+	}
+	// TODO(miek) move edns.Size to dnsutil?
+	size = edns.Size(r.Proto(), size)
+	r.size = size
+	return size
+}
+
+// SizeAndDo adds an OPT record that the reflects the intent from request.
+// The returned bool indicated if an record was found and normalised.
+func (r *Request) SizeAndDo(m *dns.Msg) bool {
+	o := r.Req.IsEdns0() // TODO(miek): speed this up
+	if o == nil {
+		return false
+	}
+
+	odo := o.Do()
+
+	if mo := m.IsEdns0(); mo != nil {
+		mo.Hdr.Name = "."
+		mo.Hdr.Rrtype = dns.TypeOPT
+		mo.SetVersion(0)
+		mo.SetUDPSize(o.UDPSize())
+		mo.Hdr.Ttl &= 0xff00 // clear flags
+
+		if odo {
+			mo.SetDo()
+		}
+		return true
+	}
+
+	o.Hdr.Name = "."
+	o.Hdr.Rrtype = dns.TypeOPT
+	o.SetVersion(0)
+	o.Hdr.Ttl &= 0xff00 // clear flags
+
+	if odo {
+		o.SetDo()
+	}
+
+	m.Extra = append(m.Extra, o)
+	return true
+}
+
+// Result is the result of Scrub.
+type Result int
+
+const (
+	// ScrubIgnored is returned when Scrub did nothing to the message.
+	ScrubIgnored Result = iota
+	// ScrubDone is returned when the reply has been scrubbed.
+	ScrubDone
+)
+
+// Scrub scrubs the reply message so that it will fit the client's buffer. If even after dropping
+// the additional section, it still does not fit the TC bit will be set on the message. Note,
+// the TC bit will be set regardless of protocol, even TCP message will get the bit, the client
+// should then retry with pigeons.
+// TODO(referral).
+func (r *Request) Scrub(reply *dns.Msg) (*dns.Msg, Result) {
+	size := r.Size()
+	l := reply.Len()
+	if size >= l {
+		return reply, ScrubIgnored
+	}
+	// TODO(miek): check for delegation
+
+	// If not delegation, drop additional section.
+	reply.Extra = nil
+	r.SizeAndDo(reply)
+	l = reply.Len()
+	if size >= l {
+		return reply, ScrubDone
+	}
+	// Still?!! does not fit.
+	reply.Truncated = true
+	return reply, ScrubDone
+}
+
+// Type returns the type of the question as a string.
+func (r *Request) Type() string { return dns.Type(r.Req.Question[0].Qtype).String() }
+
+// QType returns the type of the question as an uint16.
+func (r *Request) QType() uint16 { return r.Req.Question[0].Qtype }
+
+// Name returns the name of the question in the request. Note
+// this name will always have a closing dot and will be lower cased. After a call Name
+// the value will be cached. To clear this caching call Clear.
+func (r *Request) Name() string {
+	if r.name != "" {
+		return r.name
+	}
+	r.name = strings.ToLower(dns.Name(r.Req.Question[0].Name).String())
+	return r.name
+}
+
+// QName returns the name of the question in the request.
+func (r *Request) QName() string { return dns.Name(r.Req.Question[0].Name).String() }
+
+// Class returns the class of the question in the request.
+func (r *Request) Class() string { return dns.Class(r.Req.Question[0].Qclass).String() }
+
+// QClass returns the class of the question in the request.
+func (r *Request) QClass() uint16 { return r.Req.Question[0].Qclass }
+
+// ErrorMessage returns an error message suitable for sending
+// back to the client.
+func (r *Request) ErrorMessage(rcode int) *dns.Msg {
+	m := new(dns.Msg)
+	m.SetRcode(r.Req, rcode)
+	return m
+}
+
+// Clear clears all caching from Request s.
+func (r *Request) Clear() {
+	r.name = ""
+}
+
+const (
+	// TODO(miek): make this less awkward.
+	doTrue  = 1
+	doFalse = 2
+)
diff --git a/vendor/github.com/miekg/coredns/request/request_test.go b/vendor/github.com/miekg/coredns/request/request_test.go
new file mode 100644
index 0000000000..563e6dfe2b
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/request/request_test.go
@@ -0,0 +1,55 @@
+package request
+
+import (
+	"testing"
+
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+)
+
+func TestRequestDo(t *testing.T) {
+	st := testRequest()
+
+	st.Do()
+	if st.do == 0 {
+		t.Fatalf("Expected st.do to be set")
+	}
+}
+
+func TestRequestRemote(t *testing.T) {
+	st := testRequest()
+	if st.IP() != "10.240.0.1" {
+		t.Fatalf("Wrong IP from request")
+	}
+	p := st.Port()
+	if p == "" {
+		t.Fatalf("Failed to get Port from request")
+	}
+	if p != "40212" {
+		t.Fatalf("Wrong port from request")
+	}
+}
+
+func BenchmarkRequestDo(b *testing.B) {
+	st := testRequest()
+
+	for i := 0; i < b.N; i++ {
+		st.Do()
+	}
+}
+
+func BenchmarkRequestSize(b *testing.B) {
+	st := testRequest()
+
+	for i := 0; i < b.N; i++ {
+		st.Size()
+	}
+}
+
+func testRequest() Request {
+	m := new(dns.Msg)
+	m.SetQuestion("example.com.", dns.TypeA)
+	m.SetEdns0(4097, true)
+	return Request{W: &test.ResponseWriter{}, Req: m}
+}
diff --git a/vendor/github.com/miekg/coredns/test/auto_test.go b/vendor/github.com/miekg/coredns/test/auto_test.go
new file mode 100644
index 0000000000..0efd5df900
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/auto_test.go
@@ -0,0 +1,178 @@
+package test
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+	"path"
+	"testing"
+	"time"
+
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+func TestAuto(t *testing.T) {
+	t.Parallel()
+	tmpdir, err := ioutil.TempDir(os.TempDir(), "coredns")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	corefile := `org:0 {
+		auto {
+			directory ` + tmpdir + ` db\.(.*) {1} 1
+		}
+	}
+`
+
+	i, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ := CoreDNSServerPorts(i, 0)
+	if udp == "" {
+		t.Fatal("Could not get UDP listening port")
+	}
+	defer i.Stop()
+
+	log.SetOutput(ioutil.Discard)
+
+	p := proxy.NewLookup([]string{udp})
+	state := request.Request{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
+
+	resp, err := p.Lookup(state, "www.example.org.", dns.TypeA)
+	if err != nil {
+		t.Fatal("Expected to receive reply, but didn't")
+	}
+	if resp.Rcode != dns.RcodeServerFailure {
+		t.Fatalf("Expected reply to be a SERVFAIL, got %d", resp.Rcode)
+	}
+
+	// Write db.example.org to get example.org.
+	if err = ioutil.WriteFile(path.Join(tmpdir, "db.example.org"), []byte(zoneContent), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	time.Sleep(1100 * time.Millisecond) // wait for it to be picked up
+
+	resp, err = p.Lookup(state, "www.example.org.", dns.TypeA)
+	if err != nil {
+		t.Fatal("Expected to receive reply, but didn't")
+	}
+	if len(resp.Answer) != 1 {
+		t.Fatalf("Expected 1 RR in the answer section, got %d", len(resp.Answer))
+	}
+
+	// Remove db.example.org again.
+	os.Remove(path.Join(tmpdir, "db.example.org"))
+
+	time.Sleep(1100 * time.Millisecond) // wait for it to be picked up
+	resp, err = p.Lookup(state, "www.example.org.", dns.TypeA)
+	if err != nil {
+		t.Fatal("Expected to receive reply, but didn't")
+	}
+	if resp.Rcode != dns.RcodeServerFailure {
+		t.Fatalf("Expected reply to be a SERVFAIL, got %d", resp.Rcode)
+	}
+}
+
+func TestAutoNonExistentZone(t *testing.T) {
+	t.Parallel()
+	tmpdir, err := ioutil.TempDir(os.TempDir(), "coredns")
+	if err != nil {
+		t.Fatal(err)
+	}
+	log.SetOutput(ioutil.Discard)
+
+	corefile := `.:0 {
+		auto {
+			directory ` + tmpdir + ` (.*) {1} 1
+		}
+		errors stdout
+	}
+`
+
+	i, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ := CoreDNSServerPorts(i, 0)
+	if udp == "" {
+		t.Fatal("Could not get UDP listening port")
+	}
+	defer i.Stop()
+
+	p := proxy.NewLookup([]string{udp})
+	state := request.Request{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
+
+	resp, err := p.Lookup(state, "example.org.", dns.TypeA)
+	if err != nil {
+		t.Fatal("Expected to receive reply, but didn't")
+	}
+	if resp.Rcode != dns.RcodeServerFailure {
+		t.Fatalf("Expected reply to be a SERVFAIL, got %d", resp.Rcode)
+	}
+}
+
+func TestAutoAXFR(t *testing.T) {
+	t.Parallel()
+	log.SetOutput(ioutil.Discard)
+
+	tmpdir, err := ioutil.TempDir(os.TempDir(), "coredns")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	corefile := `org:0 {
+		auto {
+			directory ` + tmpdir + ` db\.(.*) {1} 1
+			transfer to *
+		}
+	}
+`
+
+	i, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ := CoreDNSServerPorts(i, 0)
+	if udp == "" {
+		t.Fatal("Could not get UDP listening port")
+	}
+	defer i.Stop()
+
+	// Write db.example.org to get example.org.
+	if err = ioutil.WriteFile(path.Join(tmpdir, "db.example.org"), []byte(zoneContent), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	time.Sleep(1100 * time.Millisecond) // wait for it to be picked up
+
+	p := proxy.NewLookup([]string{udp})
+	m := new(dns.Msg)
+	m.SetAxfr("example.org.")
+	state := request.Request{W: &test.ResponseWriter{}, Req: m}
+
+	resp, err := p.Lookup(state, "example.org.", dns.TypeAXFR)
+	if err != nil {
+		t.Fatal("Expected to receive reply, but didn't")
+	}
+	if len(resp.Answer) != 5 {
+		t.Fatalf("Expected response with %d RRs, got %d", 5, len(resp.Answer))
+	}
+}
+
+const zoneContent = `; testzone
+@	IN	SOA	sns.dns.icann.org. noc.dns.icann.org. 2016082534 7200 3600 1209600 3600
+		NS	a.iana-servers.net.
+		NS	b.iana-servers.net.
+
+www IN A 127.0.0.1
+`
diff --git a/vendor/github.com/miekg/coredns/test/cache_test.go b/vendor/github.com/miekg/coredns/test/cache_test.go
new file mode 100644
index 0000000000..43ef29efbe
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/cache_test.go
@@ -0,0 +1,88 @@
+package test
+
+import (
+	"io/ioutil"
+	"log"
+	"testing"
+	"time"
+
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+func TestLookupCache(t *testing.T) {
+	t.Parallel()
+	// Start auth. CoreDNS holding the auth zone.
+	name, rm, err := test.TempFile(".", exampleOrg)
+	if err != nil {
+		t.Fatalf("failed to create zone: %s", err)
+	}
+	defer rm()
+
+	corefile := `example.org:0 {
+       file ` + name + `
+}
+`
+	i, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ := CoreDNSServerPorts(i, 0)
+	if udp == "" {
+		t.Fatalf("Could not get UDP listening port")
+	}
+	defer i.Stop()
+
+	// Start caching proxy CoreDNS that we want to test.
+	corefile = `example.org:0 {
+	proxy . ` + udp + `
+	cache
+}
+`
+	i, err = CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ = CoreDNSServerPorts(i, 0)
+	if udp == "" {
+		t.Fatalf("Could not get UDP listening port")
+	}
+	defer i.Stop()
+
+	log.SetOutput(ioutil.Discard)
+
+	p := proxy.NewLookup([]string{udp})
+	state := request.Request{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
+
+	resp, err := p.Lookup(state, "example.org.", dns.TypeA)
+	if err != nil {
+		t.Fatal("Expected to receive reply, but didn't")
+	}
+	// expect answer section with A record in it
+	if len(resp.Answer) == 0 {
+		t.Fatal("Expected to at least one RR in the answer section, got none")
+	}
+
+	ttl := resp.Answer[0].Header().Ttl
+
+	time.Sleep(2 * time.Second) // TODO(miek): meh.
+
+	resp, err = p.Lookup(state, "example.org.", dns.TypeA)
+	if err != nil {
+		t.Fatal("Expected to receive reply, but didn't")
+	}
+
+	// expect answer section with A record in it
+	if len(resp.Answer) == 0 {
+		t.Error("Expected to at least one RR in the answer section, got none")
+	}
+	newTTL := resp.Answer[0].Header().Ttl
+	if newTTL >= ttl {
+		t.Errorf("Expected TTL to be lower than: %d, got %d", ttl, newTTL)
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/test/doc.go b/vendor/github.com/miekg/coredns/test/doc.go
new file mode 100644
index 0000000000..ba09e87724
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/doc.go
@@ -0,0 +1,2 @@
+// Package test contains function and types useful for writing tests
+package test
diff --git a/vendor/github.com/miekg/coredns/test/ds_file_test.go b/vendor/github.com/miekg/coredns/test/ds_file_test.go
new file mode 100644
index 0000000000..16170aad35
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/ds_file_test.go
@@ -0,0 +1,87 @@
+package test
+
+import (
+	"io/ioutil"
+	"log"
+	"sort"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/proxy"
+	mtest "github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+// Using miek.nl here because this is the easiest zone to get access to and it's masters
+// run both NSD and BIND9, making checks like "what should we actually return" super easy.
+var dsTestCases = []mtest.Case{
+	{
+		Qname: "_udp.miek.nl.", Qtype: dns.TypeDS,
+		Rcode: dns.RcodeNameError,
+		Ns: []dns.RR{
+			mtest.SOA("miek.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
+		},
+	},
+	{
+		Qname: "miek.nl.", Qtype: dns.TypeDS,
+		Ns: []dns.RR{
+			mtest.SOA("miek.nl.	1800	IN	SOA	linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
+		},
+	},
+}
+
+func TestLookupDS(t *testing.T) {
+	t.Parallel()
+	name, rm, err := TempFile(".", miekNL)
+	if err != nil {
+		t.Fatalf("failed to create zone: %s", err)
+	}
+	defer rm()
+
+	corefile := `miek.nl:0 {
+       file ` + name + `
+}
+`
+
+	i, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ := CoreDNSServerPorts(i, 0)
+	if udp == "" {
+		t.Fatalf("Could not get UDP listening port")
+	}
+	defer i.Stop()
+
+	log.SetOutput(ioutil.Discard)
+
+	p := proxy.NewLookup([]string{udp})
+	state := request.Request{W: &mtest.ResponseWriter{}, Req: new(dns.Msg)}
+
+	for _, tc := range dsTestCases {
+		resp, err := p.Lookup(state, tc.Qname, tc.Qtype)
+		if err != nil || resp == nil {
+			t.Fatalf("Expected to receive reply, but didn't for %s %d", tc.Qname, tc.Qtype)
+		}
+
+		sort.Sort(mtest.RRSet(resp.Answer))
+		sort.Sort(mtest.RRSet(resp.Ns))
+		sort.Sort(mtest.RRSet(resp.Extra))
+
+		if !mtest.Header(t, tc, resp) {
+			t.Logf("%v\n", resp)
+			continue
+		}
+		if !mtest.Section(t, tc, mtest.Answer, resp.Answer) {
+			t.Logf("%v\n", resp)
+		}
+		if !mtest.Section(t, tc, mtest.Ns, resp.Ns) {
+			t.Logf("%v\n", resp)
+		}
+		if !mtest.Section(t, tc, mtest.Extra, resp.Extra) {
+			t.Logf("%v\n", resp)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/test/etcd_cache_debug_test.go b/vendor/github.com/miekg/coredns/test/etcd_cache_debug_test.go
new file mode 100644
index 0000000000..59fdd8d6bb
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/etcd_cache_debug_test.go
@@ -0,0 +1,92 @@
+// +build etcd
+
+package test
+
+import (
+	"io/ioutil"
+	"log"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+// uses some stuff from etcd_tests.go
+
+func TestEtcdCacheAndDebug(t *testing.T) {
+	corefile := `.:0 {
+    etcd skydns.test {
+        path /skydns
+	debug
+    }
+    cache skydns.test
+}`
+
+	ex, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ := CoreDNSServerPorts(ex, 0)
+	if udp == "" {
+		t.Fatalf("Could not get UDP listening port")
+	}
+	defer ex.Stop()
+
+	etc := etcdMiddleware()
+	log.SetOutput(ioutil.Discard)
+
+	var ctx = context.TODO()
+	for _, serv := range servicesCacheTest {
+		set(ctx, t, etc, serv.Key, 0, serv)
+		defer delete(ctx, t, etc, serv.Key)
+	}
+
+	p := proxy.NewLookup([]string{udp})
+	state := request.Request{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
+
+	resp, err := p.Lookup(state, "b.example.skydns.test.", dns.TypeA)
+	if err != nil {
+		t.Errorf("Expected to receive reply, but didn't: %s", err)
+	}
+	checkResponse(t, resp)
+
+	resp, err = p.Lookup(state, "o-o.debug.b.example.skydns.test.", dns.TypeA)
+	if err != nil {
+		t.Errorf("Expected to receive reply, but didn't: %s", err)
+	}
+	checkResponse(t, resp)
+	if len(resp.Extra) != 1 {
+		t.Errorf("Expected one RR in additional section, got: %d", len(resp.Extra))
+	}
+
+	resp, err = p.Lookup(state, "b.example.skydns.test.", dns.TypeA)
+	if err != nil {
+		t.Errorf("Expected to receive reply, but didn't: %s", err)
+	}
+	checkResponse(t, resp)
+	if len(resp.Extra) != 0 {
+		t.Errorf("Expected no RRs in additional section, got: %d", len(resp.Extra))
+	}
+}
+
+func checkResponse(t *testing.T, resp *dns.Msg) {
+	if len(resp.Answer) == 0 {
+		t.Fatal("Expected to at least one RR in the answer section, got none")
+	}
+	if resp.Answer[0].Header().Rrtype != dns.TypeA {
+		t.Errorf("Expected RR to A, got: %d", resp.Answer[0].Header().Rrtype)
+	}
+	if resp.Answer[0].(*dns.A).A.String() != "127.0.0.1" {
+		t.Errorf("Expected 127.0.0.1, got: %d", resp.Answer[0].(*dns.A).A.String())
+	}
+}
+
+var servicesCacheTest = []*msg.Service{
+	{Host: "127.0.0.1", Port: 666, Key: "b.example.skydns.test."},
+}
diff --git a/vendor/github.com/miekg/coredns/test/etcd_test.go b/vendor/github.com/miekg/coredns/test/etcd_test.go
new file mode 100644
index 0000000000..8808f5583c
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/etcd_test.go
@@ -0,0 +1,108 @@
+// +build etcd
+
+package test
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"log"
+	"testing"
+	"time"
+
+	"github.com/coredns/coredns/middleware/etcd"
+	"github.com/coredns/coredns/middleware/etcd/msg"
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
+
+	etcdc "github.com/coreos/etcd/client"
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+)
+
+func etcdMiddleware() *etcd.Etcd {
+	etcdCfg := etcdc.Config{
+		Endpoints: []string{"http://localhost:2379"},
+	}
+	cli, _ := etcdc.New(etcdCfg)
+	client := etcdc.NewKeysAPI(cli)
+	return &etcd.Etcd{Client: client, PathPrefix: "/skydns"}
+}
+
+// This test starts two coredns servers (and needs etcd). Configure a stubzones in both (that will loop) and
+// will then test if we detect this loop.
+func TestEtcdStubLoop(t *testing.T) {
+	// TODO(miek)
+}
+
+func TestEtcdStubAndProxyLookup(t *testing.T) {
+	corefile := `.:0 {
+    etcd skydns.local {
+        stubzones
+        path /skydns
+        endpoint http://localhost:2379
+        upstream 8.8.8.8:53 8.8.4.4:53
+    }
+    proxy . 8.8.8.8:53
+}`
+
+	ex, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ := CoreDNSServerPorts(ex, 0)
+	if udp == "" {
+		t.Fatalf("Could not get UDP listening port")
+	}
+	defer ex.Stop()
+
+	etc := etcdMiddleware()
+	log.SetOutput(ioutil.Discard)
+
+	var ctx = context.TODO()
+	for _, serv := range servicesStub { // adds example.{net,org} as stubs
+		set(ctx, t, etc, serv.Key, 0, serv)
+		defer delete(ctx, t, etc, serv.Key)
+	}
+
+	p := proxy.NewLookup([]string{udp}) // use udp port from the server
+	state := request.Request{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
+	resp, err := p.Lookup(state, "example.com.", dns.TypeA)
+	if err != nil {
+		t.Fatalf("Expected to receive reply, but didn't: %v", err)
+	}
+	if len(resp.Answer) == 0 {
+		t.Fatalf("Expected to at least one RR in the answer section, got none")
+	}
+	if resp.Answer[0].Header().Rrtype != dns.TypeA {
+		t.Errorf("Expected RR to A, got: %d", resp.Answer[0].Header().Rrtype)
+	}
+	if resp.Answer[0].(*dns.A).A.String() != "93.184.216.34" {
+		t.Errorf("Expected 93.184.216.34, got: %s", resp.Answer[0].(*dns.A).A.String())
+	}
+}
+
+var servicesStub = []*msg.Service{
+	// Two tests, ask a question that should return servfail because remote it no accessible
+	// and one with edns0 option added, that should return refused.
+	{Host: "127.0.0.1", Port: 666, Key: "b.example.org.stub.dns.skydns.test."},
+	// Actual test that goes out to the internet.
+	{Host: "199.43.132.53", Key: "a.example.net.stub.dns.skydns.test."},
+}
+
+// Copied from middleware/etcd/setup_test.go
+func set(ctx context.Context, t *testing.T, e *etcd.Etcd, k string, ttl time.Duration, m *msg.Service) {
+	b, err := json.Marshal(m)
+	if err != nil {
+		t.Fatal(err)
+	}
+	path, _ := msg.PathWithWildcard(k, e.PathPrefix)
+	e.Client.Set(ctx, path, string(b), &etcdc.SetOptions{TTL: ttl})
+}
+
+// Copied from middleware/etcd/setup_test.go
+func delete(ctx context.Context, t *testing.T, e *etcd.Etcd, k string) {
+	path, _ := msg.PathWithWildcard(k, e.PathPrefix)
+	e.Client.Delete(ctx, path, &etcdc.DeleteOptions{Recursive: false})
+}
diff --git a/vendor/github.com/miekg/coredns/test/example_test.go b/vendor/github.com/miekg/coredns/test/example_test.go
new file mode 100644
index 0000000000..e8f30e983a
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/example_test.go
@@ -0,0 +1,12 @@
+package test
+
+const exampleOrg = `; example.org test file
+example.org.		IN	SOA	sns.dns.icann.org. noc.dns.icann.org. 2015082541 7200 3600 1209600 3600
+example.org.		IN	NS	b.iana-servers.net.
+example.org.		IN	NS	a.iana-servers.net.
+example.org.		IN	A	127.0.0.1
+example.org.		IN	A	127.0.0.2
+*.w.example.org.        IN      TXT     "Wildcard"
+a.b.c.w.example.org.    IN      TXT     "Not a wildcard"
+cname.example.org.      IN      CNAME   www.example.net.
+`
diff --git a/vendor/github.com/miekg/coredns/test/file.go b/vendor/github.com/miekg/coredns/test/file.go
new file mode 100644
index 0000000000..626224cac7
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/file.go
@@ -0,0 +1,19 @@
+package test
+
+import (
+	"io/ioutil"
+	"os"
+)
+
+// TempFile will create a temporary file on disk and returns the name and a cleanup function to remove it later.
+func TempFile(dir, content string) (string, func(), error) {
+	f, err := ioutil.TempFile(dir, "go-test-tmpfile")
+	if err != nil {
+		return "", nil, err
+	}
+	if err := ioutil.WriteFile(f.Name(), []byte(content), 0644); err != nil {
+		return "", nil, err
+	}
+	rmFunc := func() { os.Remove(f.Name()) }
+	return f.Name(), rmFunc, nil
+}
diff --git a/vendor/github.com/miekg/coredns/test/file_cname_proxy_test.go b/vendor/github.com/miekg/coredns/test/file_cname_proxy_test.go
new file mode 100644
index 0000000000..61bd8764e1
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/file_cname_proxy_test.go
@@ -0,0 +1,52 @@
+package test
+
+import (
+	"io/ioutil"
+	"log"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+func TestZoneExternalCNAMELookup(t *testing.T) {
+	t.Parallel()
+	log.SetOutput(ioutil.Discard)
+
+	name, rm, err := TempFile(".", exampleOrg)
+	if err != nil {
+		t.Fatalf("Failed to create zone: %s", err)
+	}
+	defer rm()
+
+	// Corefile with for example without proxy section.
+	corefile := `example.org:0 {
+       file ` + name + `
+}
+`
+	i, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ := CoreDNSServerPorts(i, 0)
+	if udp == "" {
+		t.Fatalf("Could not get UDP listening port")
+	}
+	defer i.Stop()
+
+	p := proxy.NewLookup([]string{udp})
+	state := request.Request{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
+
+	resp, err := p.Lookup(state, "cname.example.org.", dns.TypeA)
+	if err != nil {
+		t.Fatalf("Expected to receive reply, but didn't: %s", err)
+	}
+	// There should only be a CNAME in the answer section.
+	if len(resp.Answer) != 1 {
+		t.Fatalf("Expected 1 RR in answer section got %d", len(resp.Answer))
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/test/file_reload_test.go b/vendor/github.com/miekg/coredns/test/file_reload_test.go
new file mode 100644
index 0000000000..fd21a73b8b
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/file_reload_test.go
@@ -0,0 +1,77 @@
+package test
+
+import (
+	"io/ioutil"
+	"log"
+	"testing"
+	"time"
+
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+func TestZoneReload(t *testing.T) {
+	t.Parallel()
+	log.SetOutput(ioutil.Discard)
+
+	name, rm, err := TempFile(".", exampleOrg)
+	if err != nil {
+		t.Fatalf("Failed to create zone: %s", err)
+	}
+	defer rm()
+
+	// Corefile with two stanzas
+	corefile := `example.org:0 {
+       file ` + name + `
+}
+
+example.net:0 {
+	file ` + name + `
+}
+`
+	i, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ := CoreDNSServerPorts(i, 0)
+	if udp == "" {
+		t.Fatalf("Could not get UDP listening port")
+	}
+	defer i.Stop()
+
+	p := proxy.NewLookup([]string{udp})
+	state := request.Request{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
+
+	resp, err := p.Lookup(state, "example.org.", dns.TypeA)
+	if err != nil {
+		t.Fatalf("Expected to receive reply, but didn't: %s", err)
+	}
+	if len(resp.Answer) != 2 {
+		t.Fatalf("Expected two RR in answer section got %d", len(resp.Answer))
+	}
+
+	// Remove RR from the Apex
+	ioutil.WriteFile(name, []byte(exampleOrgUpdated), 0644)
+
+	time.Sleep(1 * time.Second) // fsnotify
+
+	resp, err = p.Lookup(state, "example.org.", dns.TypeA)
+	if err != nil {
+		t.Fatal("Expected to receive reply, but didn't")
+	}
+
+	if len(resp.Answer) != 1 {
+		t.Fatalf("Expected two RR in answer section got %d", len(resp.Answer))
+	}
+}
+
+const exampleOrgUpdated = `; example.org test file
+example.org.		IN	SOA	sns.dns.icann.org. noc.dns.icann.org. 2016082541 7200 3600 1209600 3600
+example.org.		IN	NS	b.iana-servers.net.
+example.org.		IN	NS	a.iana-servers.net.
+example.org.		IN	A	127.0.0.2
+`
diff --git a/vendor/github.com/miekg/coredns/test/file_test.go b/vendor/github.com/miekg/coredns/test/file_test.go
new file mode 100644
index 0000000000..d4167e38ea
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/file_test.go
@@ -0,0 +1,12 @@
+package test
+
+import "testing"
+
+func TestTempFile(t *testing.T) {
+	t.Parallel()
+	_, f, e := TempFile(".", "test")
+	if e != nil {
+		t.Fatalf("failed to create temp file: %s", e)
+	}
+	defer f()
+}
diff --git a/vendor/github.com/miekg/coredns/test/grpc_test.go b/vendor/github.com/miekg/coredns/test/grpc_test.go
new file mode 100644
index 0000000000..4e01ea8f03
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/grpc_test.go
@@ -0,0 +1,61 @@
+package test
+
+import (
+	"io/ioutil"
+	"log"
+	"testing"
+	"time"
+
+	"github.com/miekg/dns"
+	"golang.org/x/net/context"
+	"google.golang.org/grpc"
+
+	"github.com/coredns/coredns/pb"
+)
+
+func TestGrpc(t *testing.T) {
+	log.SetOutput(ioutil.Discard)
+
+	corefile := `grpc://.:0 {
+		whoami
+}
+`
+	g, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	_, tcp := CoreDNSServerPorts(g, 0)
+	defer g.Stop()
+
+	conn, err := grpc.Dial(tcp, grpc.WithInsecure(), grpc.WithBlock(), grpc.WithTimeout(5*time.Second))
+	if err != nil {
+		t.Fatalf("Expected no error but got: %s", err)
+	}
+	defer conn.Close()
+
+	client := pb.NewDnsServiceClient(conn)
+
+	m := new(dns.Msg)
+	m.SetQuestion("whoami.example.org.", dns.TypeA)
+	msg, _ := m.Pack()
+
+	reply, err := client.Query(context.TODO(), &pb.DnsPacket{Msg: msg})
+	if err != nil {
+		t.Errorf("Expected no error but got: %s", err)
+	}
+
+	d := new(dns.Msg)
+	err = d.Unpack(reply.Msg)
+	if err != nil {
+		t.Errorf("Expected no error but got: %s", err)
+	}
+
+	if d.Rcode != dns.RcodeSuccess {
+		t.Errorf("Expected success but got %s", d.Rcode)
+	}
+
+	if len(d.Extra) != 2 {
+		t.Errorf("Expected 2 RRs in additional section, but got %s", len(d.Extra))
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/test/kubernetes_test.go b/vendor/github.com/miekg/coredns/test/kubernetes_test.go
new file mode 100644
index 0000000000..54d346ad5d
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/kubernetes_test.go
@@ -0,0 +1,503 @@
+// +build k8s
+
+package test
+
+import (
+	"testing"
+	"time"
+
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/mholt/caddy"
+	"github.com/miekg/dns"
+)
+
+// Test data
+// TODO: Fix the actual RR values
+
+var dnsTestCases = []test.Case{
+	{
+		Qname: "svc-1-a.test-1.svc.cluster.local.", Qtype: dns.TypeA,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.A("svc-1-a.test-1.svc.cluster.local.      303    IN      A       10.0.0.100"),
+		},
+	},
+	{
+		Qname: "bogusservice.test-1.svc.cluster.local.", Qtype: dns.TypeA,
+		Rcode:  dns.RcodeNameError,
+		Answer: []dns.RR{},
+	},
+	{
+		Qname: "svc-1-a.*.svc.cluster.local.", Qtype: dns.TypeA,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.A("svc-1-a.test-1.svc.cluster.local.      303    IN      A       10.0.0.100"),
+		},
+	},
+	{
+		Qname: "svc-1-a.any.svc.cluster.local.", Qtype: dns.TypeA,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.A("svc-1-a.test-1.svc.cluster.local.      303    IN      A       10.0.0.100"),
+		},
+	},
+	{
+		Qname: "bogusservice.*.svc.cluster.local.", Qtype: dns.TypeA,
+		Rcode:  dns.RcodeNameError,
+		Answer: []dns.RR{},
+	},
+	{
+		Qname: "bogusservice.any.svc.cluster.local.", Qtype: dns.TypeA,
+		Rcode:  dns.RcodeNameError,
+		Answer: []dns.RR{},
+	},
+	{
+		Qname: "*.test-1.svc.cluster.local.", Qtype: dns.TypeA,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.A("svc-1-a.test-1.svc.cluster.local.      303    IN      A       10.0.0.100"),
+			test.A("svc-1-b.test-1.svc.cluster.local.      303    IN      A       10.0.0.110"),
+			test.A("svc-c.test-1.svc.cluster.local.        303    IN      A       10.0.0.115"),
+			test.A("headless-svc.test-1.svc.cluster.local.      303    IN      A       172.17.0.5"),
+			test.A("headless-svc.test-1.svc.cluster.local.      303    IN      A       172.17.0.6"),
+		},
+	},
+	{
+		Qname: "any.test-1.svc.cluster.local.", Qtype: dns.TypeA,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.A("svc-1-a.test-1.svc.cluster.local.      303    IN      A       10.0.0.100"),
+			test.A("svc-1-b.test-1.svc.cluster.local.      303    IN      A       10.0.0.110"),
+			test.A("svc-c.test-1.svc.cluster.local.        303    IN      A       10.0.0.115"),
+			test.A("headless-svc.test-1.svc.cluster.local.      303    IN      A       172.17.0.5"),
+			test.A("headless-svc.test-1.svc.cluster.local.      303    IN      A       172.17.0.6"),
+		},
+	},
+	{
+		Qname: "any.test-2.svc.cluster.local.", Qtype: dns.TypeA,
+		Rcode:  dns.RcodeNameError,
+		Answer: []dns.RR{},
+	},
+	{
+		Qname: "*.test-2.svc.cluster.local.", Qtype: dns.TypeA,
+		Rcode:  dns.RcodeNameError,
+		Answer: []dns.RR{},
+	},
+	{
+		Qname: "*.*.svc.cluster.local.", Qtype: dns.TypeA,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.A("svc-1-a.test-1.svc.cluster.local.      303    IN      A       10.0.0.100"),
+			test.A("svc-1-b.test-1.svc.cluster.local.      303    IN      A       10.0.0.110"),
+			test.A("svc-c.test-1.svc.cluster.local.        303    IN      A       10.0.0.115"),
+			test.A("headless-svc.test-1.svc.cluster.local.      303    IN      A       172.17.0.5"),
+			test.A("headless-svc.test-1.svc.cluster.local.      303    IN      A       172.17.0.6"),
+		},
+	},
+	{
+		Qname: "headless-svc.test-1.svc.cluster.local.", Qtype: dns.TypeA,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.A("headless-svc.test-1.svc.cluster.local.      303    IN      A       172.17.0.5"),
+			test.A("headless-svc.test-1.svc.cluster.local.      303    IN      A       172.17.0.6"),
+		},
+	},
+	//TODO: Fix below to all use test.SRV not test.A!
+	{
+		Qname: "*._TcP.svc-1-a.test-1.svc.cluster.local.", Qtype: dns.TypeSRV,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.SRV("_http._tcp.svc-1-a.test-1.svc.cluster.local.      303    IN    SRV 10 100 80 svc-1-a.test-1.svc.cluster.local."),
+			test.SRV("_https._tcp.svc-1-a.test-1.svc.cluster.local.      303    IN    SRV 10 100 443 svc-1-a.test-1.svc.cluster.local."),
+		},
+	},
+	{
+		Qname: "*.*.bogusservice.test-1.svc.cluster.local.", Qtype: dns.TypeSRV,
+		Rcode:  dns.RcodeNameError,
+		Answer: []dns.RR{},
+	},
+	{
+		Qname: "*.any.svc-1-a.*.svc.cluster.local.", Qtype: dns.TypeSRV,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.SRV("_http._tcp.svc-1-a.test-1.svc.cluster.local.      303    IN    SRV 10 100 80 svc-1-a.test-1.svc.cluster.local."),
+			test.SRV("_https._tcp.svc-1-a.test-1.svc.cluster.local.      303    IN    SRV 10 100 443 svc-1-a.test-1.svc.cluster.local."),
+		},
+	},
+	{
+		Qname: "ANY.*.svc-1-a.any.svc.cluster.local.", Qtype: dns.TypeSRV,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.SRV("_http._tcp.svc-1-a.test-1.svc.cluster.local.      303    IN    SRV 10 100 80 svc-1-a.test-1.svc.cluster.local."),
+			test.SRV("_https._tcp.svc-1-a.test-1.svc.cluster.local.      303    IN    SRV 10 100 443 svc-1-a.test-1.svc.cluster.local."),
+		},
+	},
+	{
+		Qname: "*.*.bogusservice.*.svc.cluster.local.", Qtype: dns.TypeSRV,
+		Rcode:  dns.RcodeNameError,
+		Answer: []dns.RR{},
+	},
+	{
+		Qname: "*.*.bogusservice.any.svc.cluster.local.", Qtype: dns.TypeSRV,
+		Rcode:  dns.RcodeNameError,
+		Answer: []dns.RR{},
+	},
+	{
+		Qname: "_c-port._UDP.*.test-1.svc.cluster.local.", Qtype: dns.TypeSRV,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.SRV("_c-port._udp.svc-c.test-1.svc.cluster.local.      303    IN    SRV 10 100 1234 svc-c.test-1.svc.cluster.local."),
+			test.SRV("_c-port._udp.headless-svc.test-1.svc.cluster.local.      303    IN    SRV 10 100 1234 172-17-0-5.headless-svc.test-1.svc.cluster.local."),
+			test.SRV("_c-port._udp.headless-svc.test-1.svc.cluster.local.      303    IN    SRV 10 100 1234 172-17-0-6.headless-svc.test-1.svc.cluster.local."),
+		},
+	},
+	{
+		Qname: "*._tcp.any.test-1.svc.cluster.local.", Qtype: dns.TypeSRV,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.SRV("_http._tcp.svc-1-a.test-1.svc.cluster.local.      303    IN    SRV 10 100 80 svc-1-a.test-1.svc.cluster.local."),
+			test.SRV("_https._tcp.svc-1-a.test-1.svc.cluster.local.      303    IN    SRV 10 100 443 svc-1-a.test-1.svc.cluster.local."),
+			test.SRV("_http._tcp.svc-1-b.test-1.svc.cluster.local.      303    IN    SRV 10 100 80 svc-1-b.test-1.svc.cluster.local."),
+		},
+	},
+	{
+		Qname: "*.*.any.test-2.svc.cluster.local.", Qtype: dns.TypeSRV,
+		Rcode:  dns.RcodeNameError,
+		Answer: []dns.RR{},
+	},
+	{
+		Qname: "*.*.*.test-2.svc.cluster.local.", Qtype: dns.TypeSRV,
+		Rcode:  dns.RcodeNameError,
+		Answer: []dns.RR{},
+	},
+	{
+		Qname: "_http._tcp.*.*.svc.cluster.local.", Qtype: dns.TypeSRV,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.SRV("_http._tcp.svc-1-a.test-1.svc.cluster.local.      303    IN    SRV 10 100 80 svc-1-a.test-1.svc.cluster.local."),
+			test.SRV("_http._tcp.svc-1-b.test-1.svc.cluster.local.      303    IN    SRV 10 100 80 svc-1-b.test-1.svc.cluster.local."),
+		},
+	},
+	{
+		Qname: "*.svc-1-a.test-1.svc.cluster.local.", Qtype: dns.TypeSRV,
+		Rcode:  dns.RcodeNameError,
+		Answer: []dns.RR{},
+	},
+	{
+		Qname: "*._not-udp-or-tcp.svc-1-a.test-1.svc.cluster.local.", Qtype: dns.TypeSRV,
+		Rcode:  dns.RcodeNameError,
+		Answer: []dns.RR{},
+	},
+	{
+		Qname: "svc-1-a.test-1.svc.cluster.local.", Qtype: dns.TypeSRV,
+		Rcode:  dns.RcodeNameError,
+		Answer: []dns.RR{},
+	},
+	{
+		Qname: "10-20-0-101.test-1.pod.cluster.local.", Qtype: dns.TypeA,
+		Rcode:  dns.RcodeServerFailure,
+		Answer: []dns.RR{},
+	},
+	{
+		Qname: "123.0.0.10.in-addr.arpa.", Qtype: dns.TypePTR,
+		Rcode:  dns.RcodeSuccess,
+		Answer: []dns.RR{},
+	},
+	{
+		Qname: "100.0.0.10.in-addr.arpa.", Qtype: dns.TypePTR,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.PTR("100.0.0.10.in-addr.arpa.      303    IN      PTR       svc-1-a.test-1.svc.cluster.local."),
+		},
+	},
+	{
+		Qname: "115.0.0.10.in-addr.arpa.", Qtype: dns.TypePTR,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.PTR("115.0.0.10.in-addr.arpa.      303    IN      PTR       svc-c.test-1.svc.cluster.local."),
+		},
+	},
+	{
+		Qname: "dns-version.cluster.local.", Qtype: dns.TypeTXT,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.TXT("dns-version.cluster.local. 28800 IN TXT \"1.0.0\""),
+		},
+	},
+	{
+		Qname: "next-in-chain.", Qtype: dns.TypeA,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.A("next-in-chain.              0       IN      A       192.0.2.53"),
+		},
+	},
+}
+
+var dnsTestCasesPodsInsecure = []test.Case{
+	{
+		Qname: "10-20-0-101.test-1.pod.cluster.local.", Qtype: dns.TypeA,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.A("10-20-0-101.test-1.pod.cluster.local. 0 IN A    10.20.0.101"),
+		},
+	},
+	{
+		Qname: "10-20-0-101.test-X.pod.cluster.local.", Qtype: dns.TypeA,
+		Rcode:  dns.RcodeNameError,
+		Answer: []dns.RR{},
+	},
+}
+
+var dnsTestCasesPodsVerified = []test.Case{
+	{
+		Qname: "10-20-0-101.test-1.pod.cluster.local.", Qtype: dns.TypeA,
+		Rcode:  dns.RcodeNameError,
+		Answer: []dns.RR{},
+	},
+	{
+		Qname: "10-20-0-101.test-X.pod.cluster.local.", Qtype: dns.TypeA,
+		Rcode:  dns.RcodeNameError,
+		Answer: []dns.RR{},
+	},
+}
+
+var dnsTestCasesCidrReverseZone = []test.Case{
+	{
+		Qname: "123.0.0.10.in-addr.arpa.", Qtype: dns.TypePTR,
+		Rcode:  dns.RcodeSuccess,
+		Answer: []dns.RR{},
+	},
+	{
+		Qname: "100.0.0.10.in-addr.arpa.", Qtype: dns.TypePTR,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.PTR("100.0.0.10.in-addr.arpa.      303    IN      PTR       svc-1-a.test-1.svc.cluster.local."),
+		},
+	},
+	{
+		Qname: "110.0.0.10.in-addr.arpa.", Qtype: dns.TypePTR,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.PTR("115.0.0.10.in-addr.arpa.      303    IN      PTR       svc-1-b.test-1.svc.cluster.local."),
+		},
+	},
+	{
+		Qname: "115.0.0.10.in-addr.arpa.", Qtype: dns.TypePTR,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.PTR("115.0.0.10.in-addr.arpa.      303    IN      PTR       svc-c.test-1.svc.cluster.local."),
+		},
+	},
+	{
+		Qname: "next-in-chain.", Qtype: dns.TypeA,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.A("next-in-chain.              0       IN      A       192.0.2.53"),
+		},
+	},
+}
+
+var dnsTestCasesPartialCidrReverseZone = []test.Case{
+	{
+		// In exposed range, record not present = OK + No data
+		Qname: "99.0.0.10.in-addr.arpa.", Qtype: dns.TypePTR,
+		Rcode:  dns.RcodeSuccess,
+		Answer: []dns.RR{},
+	},
+	{
+		// In exposed range, record present = OK + Data
+		Qname: "100.0.0.10.in-addr.arpa.", Qtype: dns.TypePTR,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.PTR("100.0.0.10.in-addr.arpa.      303    IN      PTR       svc-1-a.test-1.svc.cluster.local."),
+		},
+	},
+	{
+		// In exposed range, record present = OK + Data
+		Qname: "110.0.0.10.in-addr.arpa.", Qtype: dns.TypePTR,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.PTR("115.0.0.10.in-addr.arpa.      303    IN      PTR       svc-1-b.test-1.svc.cluster.local."),
+		},
+	},
+	{
+		// Out of exposed range, record present = pass to next middleware (not existing in test) = FAIL
+		Qname: "115.0.0.10.in-addr.arpa.", Qtype: dns.TypePTR,
+		Rcode:  dns.RcodeServerFailure,
+		Answer: []dns.RR{},
+	},
+	{
+		Qname: "next-in-chain.", Qtype: dns.TypeA,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.A("next-in-chain.              0       IN      A       192.0.2.53"),
+		},
+	},
+}
+
+var dnsTestCasesAllNSExposed = []test.Case{
+	{
+		Qname: "svc-1-a.test-1.svc.cluster.local.", Qtype: dns.TypeA,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.A("svc-1-a.test-1.svc.cluster.local.      303    IN      A       10.0.0.100"),
+		},
+	},
+	{
+		Qname: "svc-c.test-2.svc.cluster.local.", Qtype: dns.TypeA,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.A("svc-c.test-1.svc.cluster.local.      303    IN      A       10.0.0.120"),
+		},
+	},
+	{
+		Qname: "123.0.0.10.in-addr.arpa.", Qtype: dns.TypePTR,
+		Rcode:  dns.RcodeSuccess,
+		Answer: []dns.RR{},
+	},
+	{
+		Qname: "100.0.0.10.in-addr.arpa.", Qtype: dns.TypePTR,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.PTR("100.0.0.10.in-addr.arpa.      303    IN      PTR       svc-1-a.test-1.svc.cluster.local."),
+		},
+	},
+	{
+		Qname: "120.0.0.10.in-addr.arpa.", Qtype: dns.TypePTR,
+		Rcode: dns.RcodeSuccess,
+		Answer: []dns.RR{
+			test.PTR("120.0.0.10.in-addr.arpa.      303    IN      PTR       svc-c.test-2.svc.cluster.local."),
+		},
+	},
+}
+
+func createTestServer(t *testing.T, corefile string) (*caddy.Instance, string) {
+	server, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ := CoreDNSServerPorts(server, 0)
+	if udp == "" {
+		t.Fatalf("Could not get UDP listening port")
+	}
+
+	return server, udp
+}
+
+func doIntegrationTests(t *testing.T, corefile string, testCases []test.Case) {
+	server, udp := createTestServer(t, corefile)
+	defer server.Stop()
+
+	// Work-around for timing condition that results in no-data being returned in
+	// test environment.
+	time.Sleep(1 * time.Second)
+
+	for _, tc := range testCases {
+
+		dnsClient := new(dns.Client)
+		dnsMessage := new(dns.Msg)
+
+		dnsMessage.SetQuestion(tc.Qname, tc.Qtype)
+
+		res, _, err := dnsClient.Exchange(dnsMessage, udp)
+		if err != nil {
+			t.Fatalf("Could not send query: %s", err)
+		}
+
+		// check the answer
+		if res.Rcode != tc.Rcode {
+			t.Errorf("Expected rcode %d but got %d for query %s, %d", tc.Rcode, res.Rcode, tc.Qname, tc.Qtype)
+		}
+
+		if len(res.Answer) != len(tc.Answer) {
+			t.Errorf("Expected %d answers but got %d for query %s, %d", len(tc.Answer), len(res.Answer), tc.Qname, tc.Qtype)
+		}
+
+		//TODO: Check the actual RR values
+	}
+}
+
+func TestKubernetesIntegration(t *testing.T) {
+	corefile :=
+		`.:0 {
+    kubernetes cluster.local 0.0.10.in-addr.arpa {
+                endpoint http://localhost:8080
+		#endpoint https://kubernetes/ 
+		#tls admin.pem admin-key.pem ca.pem
+		#tls k8s_auth/client2.crt k8s_auth/client2.key k8s_auth/ca2.crt
+		namespaces test-1
+		pods disabled
+    }
+	erratic . {
+		drop 0
+	}
+`
+	doIntegrationTests(t, corefile, dnsTestCases)
+}
+
+func TestKubernetesIntegrationPodsInsecure(t *testing.T) {
+	corefile :=
+		`.:0 {
+    kubernetes cluster.local 0.0.10.in-addr.arpa {
+                endpoint http://localhost:8080
+		namespaces test-1
+		pods insecure
+    }
+`
+	doIntegrationTests(t, corefile, dnsTestCasesPodsInsecure)
+}
+
+func TestKubernetesIntegrationPodsVerified(t *testing.T) {
+	corefile :=
+		`.:0 {
+    kubernetes cluster.local 0.0.10.in-addr.arpa {
+                endpoint http://localhost:8080
+                namespaces test-1
+                pods verified
+    }
+`
+	doIntegrationTests(t, corefile, dnsTestCasesPodsVerified)
+}
+
+func TestKubernetesIntegrationCidrReverseZone(t *testing.T) {
+	corefile :=
+		`.:0 {
+    kubernetes cluster.local {
+                endpoint http://localhost:8080
+                namespaces test-1
+				cidrs 10.0.0.0/24				
+    }
+	erratic . {
+		drop 0
+	}
+`
+	doIntegrationTests(t, corefile, dnsTestCasesCidrReverseZone)
+}
+
+func TestKubernetesIntegrationPartialCidrReverseZone(t *testing.T) {
+	corefile :=
+		`.:0 {
+    kubernetes cluster.local {
+                endpoint http://localhost:8080
+                namespaces test-1
+				cidrs 10.0.0.96/28 10.0.0.120/32
+    }
+	erratic . {
+		drop 0
+	}
+`
+	doIntegrationTests(t, corefile, dnsTestCasesPartialCidrReverseZone)
+}
+
+func TestKubernetesIntegrationAllNSExposed(t *testing.T) {
+	corefile :=
+		`.:0 {
+    kubernetes cluster.local {
+                endpoint http://localhost:8080
+				cidrs 10.0.0.0/24
+    }
+`
+	doIntegrationTests(t, corefile, dnsTestCasesAllNSExposed)
+}
diff --git a/vendor/github.com/miekg/coredns/test/metrics_test.go b/vendor/github.com/miekg/coredns/test/metrics_test.go
new file mode 100644
index 0000000000..9ed0f2f5a5
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/metrics_test.go
@@ -0,0 +1,189 @@
+package test
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+	"path"
+	"testing"
+	"time"
+
+	"github.com/coredns/coredns/middleware/cache"
+	"github.com/coredns/coredns/middleware/metrics"
+	mtest "github.com/coredns/coredns/middleware/metrics/test"
+	"github.com/coredns/coredns/middleware/metrics/vars"
+
+	"github.com/miekg/dns"
+)
+
+// fail when done in parallel
+
+// Start test server that has metrics enabled. Then tear it down again.
+func TestMetricsServer(t *testing.T) {
+	corefile := `example.org:0 {
+	chaos CoreDNS-001 miek@miek.nl
+	prometheus localhost:0
+}
+
+example.com:0 {
+	proxy . 8.8.4.4:53
+	prometheus localhost:0
+}
+`
+	srv, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+	defer srv.Stop()
+}
+
+func TestMetricsRefused(t *testing.T) {
+	metricName := "coredns_dns_response_rcode_count_total"
+
+	corefile := `example.org:0 {
+	proxy . 8.8.8.8:53
+	prometheus localhost:0
+}
+`
+	srv, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+	defer srv.Stop()
+
+	udp, _ := CoreDNSServerPorts(srv, 0)
+
+	m := new(dns.Msg)
+	m.SetQuestion("google.com.", dns.TypeA)
+
+	if _, err = dns.Exchange(m, udp); err != nil {
+		t.Fatalf("Could not send message: %s", err)
+	}
+
+	data := mtest.Scrape(t, "http://"+metrics.ListenAddr+"/metrics")
+	got, labels := mtest.MetricValue(metricName, data)
+
+	if got != "1" {
+		t.Errorf("Expected value %s for refused, but got %s", "1", got)
+	}
+	if labels["zone"] != vars.Dropped {
+		t.Errorf("Expected zone value %s for refused, but got %s", vars.Dropped, labels["zone"])
+	}
+	if labels["rcode"] != "REFUSED" {
+		t.Errorf("Expected zone value %s for refused, but got %s", "REFUSED", labels["rcode"])
+	}
+}
+
+// TODO(miek): disabled for now - fails in weird ways in travis.
+func testMetricsCache(t *testing.T) {
+	cacheSizeMetricName := "coredns_cache_size"
+	cacheHitMetricName := "coredns_cache_hits_total"
+
+	corefile := `www.example.net:0 {
+	proxy . 8.8.8.8:53
+	prometheus localhost:0
+	cache
+}
+`
+	srv, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+	defer srv.Stop()
+
+	udp, _ := CoreDNSServerPorts(srv, 0)
+
+	m := new(dns.Msg)
+	m.SetQuestion("www.example.net.", dns.TypeA)
+
+	if _, err = dns.Exchange(m, udp); err != nil {
+		t.Fatalf("Could not send message: %s", err)
+	}
+
+	data := mtest.Scrape(t, "http://"+metrics.ListenAddr+"/metrics")
+	// Get the value for the cache size metric where the one of the labels values matches "success".
+	got, _ := mtest.MetricValueLabel(cacheSizeMetricName, cache.Success, data)
+
+	if got != "1" {
+		t.Errorf("Expected value %s for %s, but got %s", "1", cacheSizeMetricName, got)
+	}
+
+	// Second request for the same response to test hit counter.
+	if _, err = dns.Exchange(m, udp); err != nil {
+		t.Fatalf("Could not send message: %s", err)
+	}
+
+	data = mtest.Scrape(t, "http://"+metrics.ListenAddr+"/metrics")
+	// Get the value for the cache hit counter where the one of the labels values matches "success".
+	got, _ = mtest.MetricValueLabel(cacheHitMetricName, cache.Success, data)
+
+	if got != "2" {
+		t.Errorf("Expected value %s for %s, but got %s", "2", cacheHitMetricName, got)
+	}
+}
+
+func TestMetricsAuto(t *testing.T) {
+	tmpdir, err := ioutil.TempDir(os.TempDir(), "coredns")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	corefile := `org:0 {
+		auto {
+			directory ` + tmpdir + ` db\.(.*) {1} 1
+		}
+		prometheus localhost:0
+	}
+`
+
+	i, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ := CoreDNSServerPorts(i, 0)
+	if udp == "" {
+		t.Fatalf("Could not get UDP listening port")
+	}
+	defer i.Stop()
+
+	log.SetOutput(ioutil.Discard)
+
+	// Write db.example.org to get example.org.
+	if err = ioutil.WriteFile(path.Join(tmpdir, "db.example.org"), []byte(zoneContent), 0644); err != nil {
+		t.Fatal(err)
+	}
+	// TODO(miek): make the auto sleep even less.
+	time.Sleep(1100 * time.Millisecond) // wait for it to be picked up
+
+	m := new(dns.Msg)
+	m.SetQuestion("www.example.org.", dns.TypeA)
+
+	if _, err := dns.Exchange(m, udp); err != nil {
+		t.Fatalf("Could not send message: %s", err)
+	}
+
+	metricName := "coredns_dns_request_count_total" //{zone, proto, family}
+
+	data := mtest.Scrape(t, "http://"+metrics.ListenAddr+"/metrics")
+	// Get the value for the metrics where the one of the labels values matches "example.org."
+	got, _ := mtest.MetricValueLabel(metricName, "example.org.", data)
+
+	if got != "1" {
+		t.Errorf("Expected value %s for %s, but got %s", "1", metricName, got)
+	}
+
+	// Remove db.example.org again. And see if the metric stops increasing.
+	os.Remove(path.Join(tmpdir, "db.example.org"))
+	time.Sleep(1100 * time.Millisecond) // wait for it to be picked up
+	if _, err := dns.Exchange(m, udp); err != nil {
+		t.Fatalf("Could not send message: %s", err)
+	}
+
+	data = mtest.Scrape(t, "http://"+metrics.ListenAddr+"/metrics")
+	got, _ = mtest.MetricValueLabel(metricName, "example.org.", data)
+
+	if got != "1" {
+		t.Errorf("Expected value %s for %s, but got %s", "1", metricName, got)
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/test/middleware_dnssec_test.go b/vendor/github.com/miekg/coredns/test/middleware_dnssec_test.go
new file mode 100644
index 0000000000..34df9bb0f7
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/middleware_dnssec_test.go
@@ -0,0 +1,80 @@
+package test
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+)
+
+func TestLookupBalanceRewriteCacheDnssec(t *testing.T) {
+	t.Parallel()
+	name, rm, err := test.TempFile(".", exampleOrg)
+	if err != nil {
+		t.Fatalf("failed to create zone: %s", err)
+	}
+	defer rm()
+	rm1 := createKeyFile(t)
+	defer rm1()
+
+	corefile := `example.org:0 {
+    file ` + name + `
+    rewrite type ANY HINFO
+    dnssec {
+        key file ` + base + `
+    }
+    loadbalance
+}
+`
+	ex, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ := CoreDNSServerPorts(ex, 0)
+	defer ex.Stop()
+
+	log.SetOutput(ioutil.Discard)
+	c := new(dns.Client)
+	m := new(dns.Msg)
+	m.SetQuestion("example.org.", dns.TypeA)
+	m.SetEdns0(4096, true)
+	res, _, err := c.Exchange(m, udp)
+	if err != nil {
+		t.Fatalf("Could not send query: %s", err)
+	}
+	sig := 0
+	for _, a := range res.Answer {
+		if a.Header().Rrtype == dns.TypeRRSIG {
+			sig++
+		}
+	}
+	if sig == 0 {
+		t.Errorf("expected RRSIGs, got none")
+		t.Logf("%v\n", res)
+	}
+}
+
+func createKeyFile(t *testing.T) func() {
+	ioutil.WriteFile(base+".key",
+		[]byte(`example.org. IN DNSKEY 256 3 13 tDyI0uEIDO4SjhTJh1AVTFBLpKhY3He5BdAlKztewiZ7GecWj94DOodg ovpN73+oJs+UfZ+p9zOSN5usGAlHrw==`),
+		0644)
+	ioutil.WriteFile(base+".private",
+		[]byte(`Private-key-format: v1.3
+Algorithm: 13 (ECDSAP256SHA256)
+PrivateKey: HPmldSNfrkj/aDdUMFwuk/lgzaC5KIsVEG3uoYvF4pQ=
+Created: 20160426083115
+Publish: 20160426083115
+Activate: 20160426083115`),
+		0644)
+	return func() {
+		os.Remove(base + ".key")
+		os.Remove(base + ".private")
+	}
+}
+
+const base = "Kexample.org.+013+44563"
diff --git a/vendor/github.com/miekg/coredns/test/middleware_test.go b/vendor/github.com/miekg/coredns/test/middleware_test.go
new file mode 100644
index 0000000000..10bd3864ca
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/middleware_test.go
@@ -0,0 +1,44 @@
+package test
+
+import (
+	"io/ioutil"
+	"log"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/test"
+
+	"github.com/miekg/dns"
+)
+
+func benchmarkLookupBalanceRewriteCache(b *testing.B) {
+	t := new(testing.T)
+	name, rm, err := test.TempFile(".", exampleOrg)
+	if err != nil {
+		t.Fatalf("failed to create zone: %s", err)
+	}
+	defer rm()
+
+	corefile := `example.org:0 {
+    file ` + name + `
+    rewrite type ANY HINFO
+    loadbalance
+}
+`
+
+	ex, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+	udp, _ := CoreDNSServerPorts(ex, 0)
+	defer ex.Stop()
+
+	log.SetOutput(ioutil.Discard)
+	c := new(dns.Client)
+	m := new(dns.Msg)
+	m.SetQuestion("example.org.", dns.TypeA)
+
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		c.Exchange(m, udp)
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/test/miek_test.go b/vendor/github.com/miekg/coredns/test/miek_test.go
new file mode 100644
index 0000000000..2778817a3f
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/miek_test.go
@@ -0,0 +1,31 @@
+package test
+
+const miekNL = `; miek.nl test zone
+$TTL    30M
+$ORIGIN miek.nl.
+@       IN      SOA     linode.atoom.net. miek.miek.nl. (
+			     1282630059 ; Serial
+                             4H         ; Refresh
+                             1H         ; Retry
+                             7D         ; Expire
+                             4H )       ; Negative Cache TTL
+                IN      NS      linode.atoom.net.
+		IN	NS	ns-ext.nlnetlabs.nl.
+		IN	NS	omval.tednet.nl.
+                IN      NS      ext.ns.whyscream.net.
+
+                IN      MX      1  aspmx.l.google.com.
+                IN      MX      5  alt1.aspmx.l.google.com.
+                IN      MX      5  alt2.aspmx.l.google.com.
+                IN      MX      10 aspmx2.googlemail.com.
+                IN      MX      10 aspmx3.googlemail.com.
+
+		IN 	A       176.58.119.54
+		IN 	AAAA    2a01:7e00::f03c:91ff:fe79:234c
+                IN      HINFO "Please stop asking for ANY" "See draft-ietf-dnsop-refuse-any"
+
+a		IN 	A       176.58.119.54
+		IN 	AAAA    2a01:7e00::f03c:91ff:fe79:234c
+www     	IN 	CNAME 	a
+archive         IN      CNAME   a
+`
diff --git a/vendor/github.com/miekg/coredns/test/proxy_health_test.go b/vendor/github.com/miekg/coredns/test/proxy_health_test.go
new file mode 100644
index 0000000000..19f8bfdc37
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/proxy_health_test.go
@@ -0,0 +1,43 @@
+package test
+
+import (
+	"io/ioutil"
+	"log"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+func TestProxyErratic(t *testing.T) {
+	log.SetOutput(ioutil.Discard)
+
+	corefile := `example.org:0 {
+		erratic {
+			drop 2
+		}
+	}
+`
+
+	backend, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ := CoreDNSServerPorts(backend, 0)
+	if udp == "" {
+		t.Fatalf("Could not get UDP listening port")
+	}
+	defer backend.Stop()
+
+	p := proxy.NewLookup([]string{udp})
+	state := request.Request{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
+
+	// We do one lookup that should not time out.
+	// After this the backend is marked unhealthy anyway. So basically this
+	// tests that it times out.
+	p.Lookup(state, "example.org.", dns.TypeA)
+}
diff --git a/vendor/github.com/miekg/coredns/test/proxy_http_health_test.go b/vendor/github.com/miekg/coredns/test/proxy_http_health_test.go
new file mode 100644
index 0000000000..b190f2b452
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/proxy_http_health_test.go
@@ -0,0 +1,100 @@
+package test
+
+import (
+	"io"
+	"io/ioutil"
+	"log"
+	"net"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
+	"github.com/miekg/dns"
+)
+
+func TestProxyWithHTTPCheckOK(t *testing.T) {
+	log.SetOutput(ioutil.Discard)
+
+	healthCheckServer := httptest.NewServer(http.HandlerFunc(
+		func(w http.ResponseWriter, r *http.Request) {
+			w.WriteHeader(http.StatusOK)
+			io.WriteString(w, "OK\n")
+		}))
+	defer healthCheckServer.Close()
+
+	healthCheckURL, err := url.Parse(healthCheckServer.URL)
+	if err != nil {
+		t.Fatal(err)
+	}
+	// TODO: use URL.Port() (Go 1.8+) once we've deprecated Go 1.7 support
+	var healthCheckPort string
+	if _, healthCheckPort, err = net.SplitHostPort(healthCheckURL.Host); err != nil {
+		healthCheckPort = "80"
+	}
+
+	name, rm, err := test.TempFile(".", exampleOrg)
+	if err != nil {
+		t.Fatalf("failed to create zone: %s", err)
+	}
+	defer rm()
+
+	// We have to bind to 127.0.0.1 because the server started by
+	// httptest.NewServer does, and the IP addresses of the backend
+	// DNS and HTTP servers must match.
+	authoritativeCorefile := `example.org:0 {
+	   bind 127.0.0.1
+       file ` + name + `
+}
+`
+
+	authoritativeInstance, err := CoreDNSServer(authoritativeCorefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS authoritative instance: %s", err)
+	}
+
+	authoritativeAddr, _ := CoreDNSServerPorts(authoritativeInstance, 0)
+	if authoritativeAddr == "" {
+		t.Fatalf("Could not get CoreDNS authoritative instance UDP listening port")
+	}
+	defer authoritativeInstance.Stop()
+
+	proxyCorefile := `example.org:0 {
+    proxy . ` + authoritativeAddr + ` {
+		health_check /health:` + healthCheckPort + ` 1s
+
+	}
+}
+`
+
+	proxyInstance, err := CoreDNSServer(proxyCorefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS proxy instance: %s", err)
+	}
+
+	proxyAddr, _ := CoreDNSServerPorts(proxyInstance, 0)
+	if proxyAddr == "" {
+		t.Fatalf("Could not get CoreDNS proxy instance UDP listening port")
+	}
+	defer proxyInstance.Stop()
+
+	p := proxy.NewLookup([]string{proxyAddr})
+	state := request.Request{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
+	resp, err := p.Lookup(state, "example.org.", dns.TypeA)
+	if err != nil {
+		t.Fatal("Expected to receive reply, but didn't")
+	}
+	// expect answer section with A record in it
+	if len(resp.Answer) == 0 {
+		t.Fatalf("Expected to at least one RR in the answer section, got none: %s", resp)
+	}
+	if resp.Answer[0].Header().Rrtype != dns.TypeA {
+		t.Errorf("Expected RR to A, got: %d", resp.Answer[0].Header().Rrtype)
+	}
+	if resp.Answer[0].(*dns.A).A.String() != "127.0.0.1" {
+		t.Errorf("Expected 127.0.0.1, got: %s", resp.Answer[0].(*dns.A).A.String())
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/test/proxy_test.go b/vendor/github.com/miekg/coredns/test/proxy_test.go
new file mode 100644
index 0000000000..7e85a0c875
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/proxy_test.go
@@ -0,0 +1,139 @@
+package test
+
+import (
+	"io/ioutil"
+	"log"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+func TestLookupProxy(t *testing.T) {
+	t.Parallel()
+	name, rm, err := test.TempFile(".", exampleOrg)
+	if err != nil {
+		t.Fatalf("failed to create zone: %s", err)
+	}
+	defer rm()
+
+	corefile := `example.org:0 {
+       file ` + name + `
+}
+`
+
+	i, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ := CoreDNSServerPorts(i, 0)
+	if udp == "" {
+		t.Fatalf("Could not get UDP listening port")
+	}
+	defer i.Stop()
+
+	log.SetOutput(ioutil.Discard)
+
+	p := proxy.NewLookup([]string{udp})
+	state := request.Request{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
+	resp, err := p.Lookup(state, "example.org.", dns.TypeA)
+	if err != nil {
+		t.Fatal("Expected to receive reply, but didn't")
+	}
+	// expect answer section with A record in it
+	if len(resp.Answer) == 0 {
+		t.Fatalf("Expected to at least one RR in the answer section, got none: %s", resp)
+	}
+	if resp.Answer[0].Header().Rrtype != dns.TypeA {
+		t.Errorf("Expected RR to A, got: %d", resp.Answer[0].Header().Rrtype)
+	}
+	if resp.Answer[0].(*dns.A).A.String() != "127.0.0.1" {
+		t.Errorf("Expected 127.0.0.1, got: %s", resp.Answer[0].(*dns.A).A.String())
+	}
+}
+
+func TestLookupDnsWithForcedTcp(t *testing.T) {
+	t.Parallel()
+	name, rm, err := test.TempFile(".", exampleOrg)
+	if err != nil {
+		t.Fatalf("failed to create zone: %s", err)
+	}
+	defer rm()
+
+	corefile := `example.org:0 {
+       file ` + name + `
+}
+`
+
+	i, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	_, tcp := CoreDNSServerPorts(i, 0)
+	if tcp == "" {
+		t.Fatalf("Could not get TCP listening port")
+	}
+	defer i.Stop()
+
+	log.SetOutput(ioutil.Discard)
+
+	p := proxy.NewLookupWithOption([]string{tcp}, proxy.Options{ForceTCP: true})
+	state := request.Request{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
+	resp, err := p.Lookup(state, "example.org.", dns.TypeA)
+	if err != nil {
+		t.Fatal("Expected to receive reply, but didn't")
+	}
+	// expect answer section with A record in it
+	if len(resp.Answer) == 0 {
+		t.Fatalf("Expected to at least one RR in the answer section, got none: %s", resp)
+	}
+	if resp.Answer[0].Header().Rrtype != dns.TypeA {
+		t.Errorf("Expected RR to A, got: %d", resp.Answer[0].Header().Rrtype)
+	}
+	if resp.Answer[0].(*dns.A).A.String() != "127.0.0.1" {
+		t.Errorf("Expected 127.0.0.1, got: %s", resp.Answer[0].(*dns.A).A.String())
+	}
+}
+
+func BenchmarkLookupProxy(b *testing.B) {
+	t := new(testing.T)
+	name, rm, err := test.TempFile(".", exampleOrg)
+	if err != nil {
+		t.Fatalf("failed to created zone: %s", err)
+	}
+	defer rm()
+
+	corefile := `example.org:0 {
+       file ` + name + `
+}
+`
+
+	i, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ := CoreDNSServerPorts(i, 0)
+	if udp == "" {
+		t.Fatalf("could not get udp listening port")
+	}
+	defer i.Stop()
+
+	log.SetOutput(ioutil.Discard)
+
+	p := proxy.NewLookup([]string{udp})
+	state := request.Request{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
+
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		_, err := p.Lookup(state, "example.org.", dns.TypeA)
+		if err != nil {
+			b.Fatal("Expected to receive reply, but didn't")
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/test/reverse_test.go b/vendor/github.com/miekg/coredns/test/reverse_test.go
new file mode 100644
index 0000000000..6342f66b86
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/reverse_test.go
@@ -0,0 +1,95 @@
+package test
+
+import (
+	"io/ioutil"
+	"log"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+func TestReverseFallthrough(t *testing.T) {
+	t.Parallel()
+	name, rm, err := test.TempFile(".", exampleOrg)
+	if err != nil {
+		t.Fatalf("failed to create zone: %s", err)
+	}
+	defer rm()
+
+	corefile := `arpa:0 example.org:0 {
+    reverse 10.32.0.0/16 {
+        hostname ip-{ip}.{zone[2]}
+        #fallthrough
+    }
+    file ` + name + ` example.org
+}
+`
+
+	i, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ := CoreDNSServerPorts(i, 0)
+	if udp == "" {
+		t.Fatalf("Could not get UDP listening port")
+	}
+
+	log.SetOutput(ioutil.Discard)
+
+	p := proxy.NewLookup([]string{udp})
+	state := request.Request{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
+	resp, err := p.Lookup(state, "example.org.", dns.TypeA)
+	if err != nil {
+		t.Fatal("Expected to receive reply, but didn't")
+	}
+	// Reply should be SERVFAIL because of no fallthrough
+	if resp.Rcode != dns.RcodeServerFailure {
+		t.Fatalf("Expected SERVFAIL, but got: %d", resp.Rcode)
+	}
+
+	// Stop the server.
+	i.Stop()
+
+	// And redo with fallthrough enabled
+
+	corefile = `arpa:0 example.org:0 {
+    reverse 10.32.0.0/16 {
+        hostname ip-{ip}.{zone[2]}
+        fallthrough
+    }
+    file ` + name + ` example.org
+}
+`
+
+	i, err = CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ = CoreDNSServerPorts(i, 0)
+	if udp == "" {
+		t.Fatalf("Could not get UDP listening port")
+	}
+	defer i.Stop()
+
+	p = proxy.NewLookup([]string{udp})
+	resp, err = p.Lookup(state, "example.org.", dns.TypeA)
+	if err != nil {
+		t.Fatal("Expected to receive reply, but didn't")
+	}
+
+	if len(resp.Answer) == 0 {
+		t.Error("Expected to at least one RR in the answer section, got none")
+	}
+	if resp.Answer[0].Header().Rrtype != dns.TypeA {
+		t.Errorf("Expected RR to A, got: %d", resp.Answer[0].Header().Rrtype)
+	}
+	if resp.Answer[0].(*dns.A).A.String() != "127.0.0.1" {
+		t.Errorf("Expected 127.0.0.1, got: %s", resp.Answer[0].(*dns.A).A.String())
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/test/rewrite_test.go b/vendor/github.com/miekg/coredns/test/rewrite_test.go
new file mode 100644
index 0000000000..9aedd7417a
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/rewrite_test.go
@@ -0,0 +1,94 @@
+package test
+
+import (
+	"bytes"
+	"io/ioutil"
+	"log"
+	"testing"
+
+	"github.com/miekg/dns"
+)
+
+func TestRewrite(t *testing.T) {
+	t.Parallel()
+	corefile := `.:0 {
+       rewrite type MX a
+       rewrite edns0 local set 0xffee hello-world
+       erratic . {
+	drop 0
+	}
+}`
+
+	i, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ := CoreDNSServerPorts(i, 0)
+	if udp == "" {
+		t.Fatalf("Could not get UDP listening port")
+	}
+	defer i.Stop()
+
+	log.SetOutput(ioutil.Discard)
+
+	testMX(t, udp)
+	testEdns0(t, udp)
+}
+
+func testMX(t *testing.T, server string) {
+	m := new(dns.Msg)
+	m.SetQuestion("example.com.", dns.TypeMX)
+
+	r, err := dns.Exchange(m, server)
+	if err != nil {
+		t.Fatalf("Expected to receive reply, but didn't: %s", err)
+	}
+
+	// expect answer section with A record in it
+	if len(r.Answer) == 0 {
+		t.Error("Expected to at least one RR in the answer section, got none")
+	}
+	if r.Answer[0].Header().Rrtype != dns.TypeA {
+		t.Errorf("Expected RR to A, got: %d", r.Answer[0].Header().Rrtype)
+	}
+	if r.Answer[0].(*dns.A).A.String() != "192.0.2.53" {
+		t.Errorf("Expected 192.0.2.53, got: %s", r.Answer[0].(*dns.A).A.String())
+	}
+}
+
+func testEdns0(t *testing.T, server string) {
+	m := new(dns.Msg)
+	m.SetQuestion("example.com.", dns.TypeA)
+
+	r, err := dns.Exchange(m, server)
+	if err != nil {
+		t.Fatalf("Expected to receive reply, but didn't: %s", err)
+	}
+
+	// expect answer section with A record in it
+	if len(r.Answer) == 0 {
+		t.Error("Expected to at least one RR in the answer section, got none")
+	}
+	if r.Answer[0].Header().Rrtype != dns.TypeA {
+		t.Errorf("Expected RR to A, got: %d", r.Answer[0].Header().Rrtype)
+	}
+	if r.Answer[0].(*dns.A).A.String() != "192.0.2.53" {
+		t.Errorf("Expected 192.0.2.53, got: %s", r.Answer[0].(*dns.A).A.String())
+	}
+	o := r.IsEdns0()
+	if o == nil || len(o.Option) == 0 {
+		t.Error("Expected EDNS0 options but got none")
+	} else {
+		if e, ok := o.Option[0].(*dns.EDNS0_LOCAL); ok {
+			if e.Code != 0xffee {
+				t.Errorf("Expected EDNS_LOCAL code 0xffee but got %x", e.Code)
+			}
+			if !bytes.Equal(e.Data, []byte("hello-world")) {
+				t.Errorf("Expected EDNS_LOCAL data 'hello-world' but got %q", e.Data)
+			}
+		} else {
+			t.Errorf("Expected EDNS0_LOCAL but got %v", o.Option[0])
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/test/server.go b/vendor/github.com/miekg/coredns/test/server.go
new file mode 100644
index 0000000000..61fe8ea15a
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/server.go
@@ -0,0 +1,68 @@
+package test
+
+import (
+	"io/ioutil"
+	"log"
+	"sync"
+
+	"github.com/coredns/coredns/core/dnsserver"
+
+	// Hook in CoreDNS.
+	_ "github.com/coredns/coredns/core"
+
+	"github.com/mholt/caddy"
+)
+
+var mu sync.Mutex
+
+// CoreDNSServer returns a CoreDNS test server. It just takes a normal Corefile as input.
+func CoreDNSServer(corefile string) (*caddy.Instance, error) {
+	mu.Lock()
+	defer mu.Unlock()
+	caddy.Quiet = true
+	dnsserver.Quiet = true
+	log.SetOutput(ioutil.Discard)
+
+	return caddy.Start(NewInput(corefile))
+}
+
+// CoreDNSServerStop stops a server.
+func CoreDNSServerStop(i *caddy.Instance) { i.Stop() }
+
+// CoreDNSServerPorts returns the ports the instance is listening on. The integer k indicates
+// which ServerListener you want.
+func CoreDNSServerPorts(i *caddy.Instance, k int) (udp, tcp string) {
+	srvs := i.Servers()
+	if len(srvs) < k+1 {
+		return "", ""
+	}
+	u := srvs[k].LocalAddr()
+	t := srvs[k].Addr()
+
+	if u != nil {
+		udp = u.String()
+	}
+	if t != nil {
+		tcp = t.String()
+	}
+	return
+}
+
+// Input implements the caddy.Input interface and acts as an easy way to use a string as a Corefile.
+type Input struct {
+	corefile []byte
+}
+
+// NewInput returns a pointer to Input, containing the corefile string as input.
+func NewInput(corefile string) *Input {
+	return &Input{corefile: []byte(corefile)}
+}
+
+// Body implements the Input interface.
+func (i *Input) Body() []byte { return i.corefile }
+
+// Path implements the Input interface.
+func (i *Input) Path() string { return "Corefile" }
+
+// ServerType implements the Input interface.
+func (i *Input) ServerType() string { return "dns" }
diff --git a/vendor/github.com/miekg/coredns/test/server_test.go b/vendor/github.com/miekg/coredns/test/server_test.go
new file mode 100644
index 0000000000..b7abc86c37
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/server_test.go
@@ -0,0 +1,58 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/miekg/dns"
+)
+
+// Start 2 tests server, server A will proxy to B, server B is an CH server.
+func TestProxyToChaosServer(t *testing.T) {
+	t.Parallel()
+	corefile := `.:0 {
+	chaos CoreDNS-001 miek@miek.nl
+}
+`
+	chaos, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	udpChaos, _ := CoreDNSServerPorts(chaos, 0)
+	defer chaos.Stop()
+
+	corefileProxy := `.:0 {
+		proxy . ` + udpChaos + `
+}
+`
+	proxy, err := CoreDNSServer(corefileProxy)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance")
+	}
+
+	udp, _ := CoreDNSServerPorts(proxy, 0)
+	defer proxy.Stop()
+
+	chaosTest(t, udpChaos)
+
+	chaosTest(t, udp)
+	// chaosTest(t, tcp, "tcp"), commented out because we use the original transport to reach the
+	// proxy and we only forward to the udp port.
+}
+
+func chaosTest(t *testing.T, server string) {
+	m := new(dns.Msg)
+	m.Question = make([]dns.Question, 1)
+	m.Question[0] = dns.Question{Qclass: dns.ClassCHAOS, Name: "version.bind.", Qtype: dns.TypeTXT}
+
+	r, err := dns.Exchange(m, server)
+	if err != nil {
+		t.Fatalf("Could not send message: %s", err)
+	}
+	if r.Rcode != dns.RcodeSuccess || len(r.Answer) == 0 {
+		t.Fatalf("Expected successful reply, got %s", dns.RcodeToString[r.Rcode])
+	}
+	if r.Answer[0].String() != `version.bind.	0	CH	TXT	"CoreDNS-001"` {
+		t.Fatalf("Expected version.bind. reply, got %s", r.Answer[0].String())
+	}
+}
diff --git a/vendor/github.com/miekg/coredns/test/wildcard_test.go b/vendor/github.com/miekg/coredns/test/wildcard_test.go
new file mode 100644
index 0000000000..a8f103ccce
--- /dev/null
+++ b/vendor/github.com/miekg/coredns/test/wildcard_test.go
@@ -0,0 +1,101 @@
+package test
+
+import (
+	"io/ioutil"
+	"log"
+	"testing"
+
+	"github.com/coredns/coredns/middleware/proxy"
+	"github.com/coredns/coredns/middleware/test"
+	"github.com/coredns/coredns/request"
+
+	"github.com/miekg/dns"
+)
+
+func TestLookupWildcard(t *testing.T) {
+	t.Parallel()
+	name, rm, err := test.TempFile(".", exampleOrg)
+	if err != nil {
+		t.Fatalf("failed to create zone: %s", err)
+	}
+	defer rm()
+
+	corefile := `example.org:0 {
+       file ` + name + `
+}
+`
+
+	i, err := CoreDNSServer(corefile)
+	if err != nil {
+		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ := CoreDNSServerPorts(i, 0)
+	if udp == "" {
+		t.Fatalf("Could not get UDP listening port")
+	}
+	defer i.Stop()
+
+	log.SetOutput(ioutil.Discard)
+
+	p := proxy.NewLookup([]string{udp})
+	state := request.Request{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
+
+	for _, lookup := range []string{"a.w.example.org.", "a.a.w.example.org."} {
+		resp, err := p.Lookup(state, lookup, dns.TypeTXT)
+		if err != nil || resp == nil {
+			t.Fatalf("Expected to receive reply, but didn't for %s", lookup)
+		}
+
+		// ;; ANSWER SECTION:
+		// a.w.example.org.          1800    IN      TXT     "Wildcard"
+		if resp.Rcode != dns.RcodeSuccess {
+			t.Errorf("Expected NOERROR RCODE, got %s for %s", dns.RcodeToString[resp.Rcode], lookup)
+			continue
+		}
+		if len(resp.Answer) == 0 {
+			t.Errorf("Expected to at least one RR in the answer section, got none for %s TXT", lookup)
+			t.Logf("%s", resp)
+			continue
+		}
+		if resp.Answer[0].Header().Name != lookup {
+			t.Errorf("Expected name to be %s, got: %s for TXT", lookup, resp.Answer[0].Header().Name)
+			continue
+		}
+		if resp.Answer[0].Header().Rrtype != dns.TypeTXT {
+			t.Errorf("Expected RR to be TXT, got: %d, for %s TXT", resp.Answer[0].Header().Rrtype, lookup)
+			continue
+		}
+		if resp.Answer[0].(*dns.TXT).Txt[0] != "Wildcard" {
+			t.Errorf("Expected Wildcard, got: %s, for %s TXT", resp.Answer[0].(*dns.TXT).Txt[0], lookup)
+			continue
+		}
+	}
+
+	for _, lookup := range []string{"w.example.org.", "a.w.example.org.", "a.a.w.example.org."} {
+		resp, err := p.Lookup(state, lookup, dns.TypeSRV)
+		if err != nil || resp == nil {
+			t.Fatal("Expected to receive reply, but didn't", lookup)
+		}
+
+		// ;; AUTHORITY SECTION:
+		// example.org.              1800    IN      SOA     linode.atoom.net. miek.miek.nl. 1454960557 14400 3600 604800 14400
+		if resp.Rcode != dns.RcodeSuccess {
+			t.Errorf("Expected NOERROR RCODE, got %s for %s", dns.RcodeToString[resp.Rcode], lookup)
+			continue
+		}
+		if len(resp.Answer) != 0 {
+			t.Errorf("Expected zero RRs in the answer section, got some, for %s SRV", lookup)
+			continue
+		}
+		if len(resp.Ns) == 0 {
+			t.Errorf("Expected to at least one RR in the authority section, got none, for %s SRV", lookup)
+			continue
+		}
+		if resp.Ns[0].Header().Rrtype != dns.TypeSOA {
+			t.Errorf("Expected RR to be SOA, got: %d, for %s SRV", resp.Ns[0].Header().Rrtype, lookup)
+			continue
+		}
+	}
+
+}
diff --git a/vendor/github.com/miekg/dns/.gitignore b/vendor/github.com/miekg/dns/.gitignore
new file mode 100644
index 0000000000..776cd950c2
--- /dev/null
+++ b/vendor/github.com/miekg/dns/.gitignore
@@ -0,0 +1,4 @@
+*.6
+tags
+test.out
+a.out
diff --git a/vendor/github.com/miekg/dns/.travis.yml b/vendor/github.com/miekg/dns/.travis.yml
new file mode 100644
index 0000000000..11bc9158ee
--- /dev/null
+++ b/vendor/github.com/miekg/dns/.travis.yml
@@ -0,0 +1,13 @@
+language: go
+sudo: false
+go:
+  - 1.6
+  - 1.7
+
+before_install:
+  # don't use the miekg/dns when testing forks
+  - mkdir -p $GOPATH/src/github.com/miekg
+  - ln -s $TRAVIS_BUILD_DIR $GOPATH/src/github.com/miekg/ || true
+
+script:
+  - go test -race -v -bench=.
diff --git a/vendor/github.com/miekg/dns/AUTHORS b/vendor/github.com/miekg/dns/AUTHORS
new file mode 100644
index 0000000000..1965683525
--- /dev/null
+++ b/vendor/github.com/miekg/dns/AUTHORS
@@ -0,0 +1 @@
+Miek Gieben <miek@miek.nl>
diff --git a/vendor/github.com/miekg/dns/CONTRIBUTORS b/vendor/github.com/miekg/dns/CONTRIBUTORS
new file mode 100644
index 0000000000..f77e8a895f
--- /dev/null
+++ b/vendor/github.com/miekg/dns/CONTRIBUTORS
@@ -0,0 +1,9 @@
+Alex A. Skinner
+Andrew Tunnell-Jones
+Ask Bjørn Hansen
+Dave Cheney
+Dusty Wilson
+Marek Majkowski
+Peter van Dijk
+Omri Bahumi
+Alex Sergeyev
diff --git a/vendor/github.com/miekg/dns/COPYRIGHT b/vendor/github.com/miekg/dns/COPYRIGHT
new file mode 100644
index 0000000000..35702b10e8
--- /dev/null
+++ b/vendor/github.com/miekg/dns/COPYRIGHT
@@ -0,0 +1,9 @@
+Copyright 2009 The Go Authors. All rights reserved. Use of this source code
+is governed by a BSD-style license that can be found in the LICENSE file.
+Extensions of the original work are copyright (c) 2011 Miek Gieben
+
+Copyright 2011 Miek Gieben. All rights reserved. Use of this source code is
+governed by a BSD-style license that can be found in the LICENSE file.
+
+Copyright 2014 CloudFlare. All rights reserved. Use of this source code is
+governed by a BSD-style license that can be found in the LICENSE file.
diff --git a/vendor/github.com/miekg/dns/LICENSE b/vendor/github.com/miekg/dns/LICENSE
new file mode 100644
index 0000000000..5763fa7fe5
--- /dev/null
+++ b/vendor/github.com/miekg/dns/LICENSE
@@ -0,0 +1,32 @@
+Extensions of the original work are copyright (c) 2011 Miek Gieben
+
+As this is fork of the official Go code the same license applies:
+
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/vendor/github.com/miekg/dns/README.md b/vendor/github.com/miekg/dns/README.md
new file mode 100644
index 0000000000..2acc7f1ff9
--- /dev/null
+++ b/vendor/github.com/miekg/dns/README.md
@@ -0,0 +1,159 @@
+[![Build Status](https://travis-ci.org/miekg/dns.svg?branch=master)](https://travis-ci.org/miekg/dns)
+[![](https://godoc.org/github.com/miekg/dns?status.svg)](https://godoc.org/github.com/miekg/dns)
+
+# Alternative (more granular) approach to a DNS library
+
+> Less is more.
+
+Complete and usable DNS library. All widely used Resource Records are
+supported, including the DNSSEC types. It follows a lean and mean philosophy.
+If there is stuff you should know as a DNS programmer there isn't a convenience
+function for it. Server side and client side programming is supported, i.e. you
+can build servers and resolvers with it.
+
+We try to keep the "master" branch as sane as possible and at the bleeding edge
+of standards, avoiding breaking changes wherever reasonable. We support the last
+two versions of Go, currently: 1.6 and 1.7.
+
+# Goals
+
+* KISS;
+* Fast;
+* Small API, if its easy to code in Go, don't make a function for it.
+
+# Users
+
+A not-so-up-to-date-list-that-may-be-actually-current:
+
+* https://github.com/coredns/coredns
+* https://cloudflare.com
+* https://github.com/abh/geodns
+* http://www.statdns.com/
+* http://www.dnsinspect.com/
+* https://github.com/chuangbo/jianbing-dictionary-dns
+* http://www.dns-lg.com/
+* https://github.com/fcambus/rrda
+* https://github.com/kenshinx/godns
+* https://github.com/skynetservices/skydns
+* https://github.com/hashicorp/consul
+* https://github.com/DevelopersPL/godnsagent
+* https://github.com/duedil-ltd/discodns
+* https://github.com/StalkR/dns-reverse-proxy
+* https://github.com/tianon/rawdns
+* https://mesosphere.github.io/mesos-dns/
+* https://pulse.turbobytes.com/
+* https://play.google.com/store/apps/details?id=com.turbobytes.dig
+* https://github.com/fcambus/statzone
+* https://github.com/benschw/dns-clb-go
+* https://github.com/corny/dnscheck for http://public-dns.info/
+* https://namesmith.io
+* https://github.com/miekg/unbound
+* https://github.com/miekg/exdns
+* https://dnslookup.org
+* https://github.com/looterz/grimd
+* https://github.com/phamhongviet/serf-dns
+* https://github.com/mehrdadrad/mylg
+* https://github.com/bamarni/dockness
+* https://github.com/fffaraz/microdns
+* http://quilt.io
+* https://github.com/ipdcode/hades (JD.COM)
+
+Send pull request if you want to be listed here.
+
+# Features
+
+* UDP/TCP queries, IPv4 and IPv6;
+* RFC 1035 zone file parsing ($INCLUDE, $ORIGIN, $TTL and $GENERATE (for all record types) are supported;
+* Fast:
+    * Reply speed around ~ 80K qps (faster hardware results in more qps);
+    * Parsing RRs ~ 100K RR/s, that's 5M records in about 50 seconds;
+* Server side programming (mimicking the net/http package);
+* Client side programming;
+* DNSSEC: signing, validating and key generation for DSA, RSA and ECDSA;
+* EDNS0, NSID, Cookies;
+* AXFR/IXFR;
+* TSIG, SIG(0);
+* DNS over TLS: optional encrypted connection between client and server;
+* DNS name compression;
+* Depends only on the standard library.
+
+Have fun!
+
+Miek Gieben  -  2010-2012  -  <miek@miek.nl>
+
+# Building
+
+Building is done with the `go` tool. If you have setup your GOPATH
+correctly, the following should work:
+
+    go get github.com/miekg/dns
+    go build github.com/miekg/dns
+
+## Examples
+
+A short "how to use the API" is at the beginning of doc.go (this also will show
+when you call `godoc github.com/miekg/dns`).
+
+Example programs can be found in the `github.com/miekg/exdns` repository.
+
+## Supported RFCs
+
+*all of them*
+
+* 103{4,5} - DNS standard
+* 1348 - NSAP record (removed the record)
+* 1982 - Serial Arithmetic
+* 1876 - LOC record
+* 1995 - IXFR
+* 1996 - DNS notify
+* 2136 - DNS Update (dynamic updates)
+* 2181 - RRset definition - there is no RRset type though, just []RR
+* 2537 - RSAMD5 DNS keys
+* 2065 - DNSSEC (updated in later RFCs)
+* 2671 - EDNS record
+* 2782 - SRV record
+* 2845 - TSIG record
+* 2915 - NAPTR record
+* 2929 - DNS IANA Considerations
+* 3110 - RSASHA1 DNS keys
+* 3225 - DO bit (DNSSEC OK)
+* 340{1,2,3} - NAPTR record
+* 3445 - Limiting the scope of (DNS)KEY
+* 3597 - Unknown RRs
+* 403{3,4,5} - DNSSEC + validation functions
+* 4255 - SSHFP record
+* 4343 - Case insensitivity
+* 4408 - SPF record
+* 4509 - SHA256 Hash in DS
+* 4592 - Wildcards in the DNS
+* 4635 - HMAC SHA TSIG
+* 4701 - DHCID
+* 4892 - id.server
+* 5001 - NSID
+* 5155 - NSEC3 record
+* 5205 - HIP record
+* 5702 - SHA2 in the DNS
+* 5936 - AXFR
+* 5966 - TCP implementation recommendations
+* 6605 - ECDSA
+* 6725 - IANA Registry Update
+* 6742 - ILNP DNS
+* 6840 - Clarifications and Implementation Notes for DNS Security
+* 6844 - CAA record
+* 6891 - EDNS0 update
+* 6895 - DNS IANA considerations
+* 6975 - Algorithm Understanding in DNSSEC
+* 7043 - EUI48/EUI64 records
+* 7314 - DNS (EDNS) EXPIRE Option
+* 7828 - edns-tcp-keepalive EDNS0 Option
+* 7553 - URI record
+* 7858 - DNS over TLS: Initiation and Performance Considerations (draft)
+* 7873 - Domain Name System (DNS) Cookies (draft-ietf-dnsop-cookies)
+* xxxx - EDNS0 DNS Update Lease (draft)
+
+## Loosely based upon
+
+* `ldns`
+* `NSD`
+* `Net::DNS`
+* `GRONG`
diff --git a/vendor/github.com/miekg/dns/client.go b/vendor/github.com/miekg/dns/client.go
new file mode 100644
index 0000000000..301dab9c1a
--- /dev/null
+++ b/vendor/github.com/miekg/dns/client.go
@@ -0,0 +1,467 @@
+package dns
+
+// A client implementation.
+
+import (
+	"bytes"
+	"crypto/tls"
+	"encoding/binary"
+	"io"
+	"net"
+	"time"
+)
+
+const dnsTimeout time.Duration = 2 * time.Second
+const tcpIdleTimeout time.Duration = 8 * time.Second
+
+// A Conn represents a connection to a DNS server.
+type Conn struct {
+	net.Conn                         // a net.Conn holding the connection
+	UDPSize        uint16            // minimum receive buffer for UDP messages
+	TsigSecret     map[string]string // secret(s) for Tsig map[<zonename>]<base64 secret>, zonename must be fully qualified
+	rtt            time.Duration
+	t              time.Time
+	tsigRequestMAC string
+}
+
+// A Client defines parameters for a DNS client.
+type Client struct {
+	Net            string            // if "tcp" or "tcp-tls" (DNS over TLS) a TCP query will be initiated, otherwise an UDP one (default is "" for UDP)
+	UDPSize        uint16            // minimum receive buffer for UDP messages
+	TLSConfig      *tls.Config       // TLS connection configuration
+	Timeout        time.Duration     // a cumulative timeout for dial, write and read, defaults to 0 (disabled) - overrides DialTimeout, ReadTimeout and WriteTimeout when non-zero
+	DialTimeout    time.Duration     // net.DialTimeout, defaults to 2 seconds - overridden by Timeout when that value is non-zero
+	ReadTimeout    time.Duration     // net.Conn.SetReadTimeout value for connections, defaults to 2 seconds - overridden by Timeout when that value is non-zero
+	WriteTimeout   time.Duration     // net.Conn.SetWriteTimeout value for connections, defaults to 2 seconds - overridden by Timeout when that value is non-zero
+	TsigSecret     map[string]string // secret(s) for Tsig map[<zonename>]<base64 secret>, zonename must be fully qualified
+	SingleInflight bool              // if true suppress multiple outstanding queries for the same Qname, Qtype and Qclass
+	group          singleflight
+}
+
+// Exchange performs a synchronous UDP query. It sends the message m to the address
+// contained in a and waits for a reply. Exchange does not retry a failed query, nor
+// will it fall back to TCP in case of truncation.
+// See client.Exchange for more information on setting larger buffer sizes.
+func Exchange(m *Msg, a string) (r *Msg, err error) {
+	var co *Conn
+	co, err = DialTimeout("udp", a, dnsTimeout)
+	if err != nil {
+		return nil, err
+	}
+
+	defer co.Close()
+
+	opt := m.IsEdns0()
+	// If EDNS0 is used use that for size.
+	if opt != nil && opt.UDPSize() >= MinMsgSize {
+		co.UDPSize = opt.UDPSize()
+	}
+
+	co.SetWriteDeadline(time.Now().Add(dnsTimeout))
+	if err = co.WriteMsg(m); err != nil {
+		return nil, err
+	}
+
+	co.SetReadDeadline(time.Now().Add(dnsTimeout))
+	r, err = co.ReadMsg()
+	if err == nil && r.Id != m.Id {
+		err = ErrId
+	}
+	return r, err
+}
+
+// ExchangeConn performs a synchronous query. It sends the message m via the connection
+// c and waits for a reply. The connection c is not closed by ExchangeConn.
+// This function is going away, but can easily be mimicked:
+//
+//	co := &dns.Conn{Conn: c} // c is your net.Conn
+//	co.WriteMsg(m)
+//	in, _  := co.ReadMsg()
+//	co.Close()
+//
+func ExchangeConn(c net.Conn, m *Msg) (r *Msg, err error) {
+	println("dns: this function is deprecated")
+	co := new(Conn)
+	co.Conn = c
+	if err = co.WriteMsg(m); err != nil {
+		return nil, err
+	}
+	r, err = co.ReadMsg()
+	if err == nil && r.Id != m.Id {
+		err = ErrId
+	}
+	return r, err
+}
+
+// Exchange performs a synchronous query. It sends the message m to the address
+// contained in a and waits for a reply. Basic use pattern with a *dns.Client:
+//
+//	c := new(dns.Client)
+//	in, rtt, err := c.Exchange(message, "127.0.0.1:53")
+//
+// Exchange does not retry a failed query, nor will it fall back to TCP in
+// case of truncation.
+// It is up to the caller to create a message that allows for larger responses to be
+// returned. Specifically this means adding an EDNS0 OPT RR that will advertise a larger
+// buffer, see SetEdns0. Messages without an OPT RR will fallback to the historic limit
+// of 512 bytes.
+func (c *Client) Exchange(m *Msg, a string) (r *Msg, rtt time.Duration, err error) {
+	if !c.SingleInflight {
+		return c.exchange(m, a)
+	}
+	// This adds a bunch of garbage, TODO(miek).
+	t := "nop"
+	if t1, ok := TypeToString[m.Question[0].Qtype]; ok {
+		t = t1
+	}
+	cl := "nop"
+	if cl1, ok := ClassToString[m.Question[0].Qclass]; ok {
+		cl = cl1
+	}
+	r, rtt, err, shared := c.group.Do(m.Question[0].Name+t+cl, func() (*Msg, time.Duration, error) {
+		return c.exchange(m, a)
+	})
+	if r != nil && shared {
+		r = r.Copy()
+	}
+	if err != nil {
+		return r, rtt, err
+	}
+	return r, rtt, nil
+}
+
+func (c *Client) dialTimeout() time.Duration {
+	if c.Timeout != 0 {
+		return c.Timeout
+	}
+	if c.DialTimeout != 0 {
+		return c.DialTimeout
+	}
+	return dnsTimeout
+}
+
+func (c *Client) readTimeout() time.Duration {
+	if c.ReadTimeout != 0 {
+		return c.ReadTimeout
+	}
+	return dnsTimeout
+}
+
+func (c *Client) writeTimeout() time.Duration {
+	if c.WriteTimeout != 0 {
+		return c.WriteTimeout
+	}
+	return dnsTimeout
+}
+
+func (c *Client) exchange(m *Msg, a string) (r *Msg, rtt time.Duration, err error) {
+	var co *Conn
+	network := "udp"
+	tls := false
+
+	switch c.Net {
+	case "tcp-tls":
+		network = "tcp"
+		tls = true
+	case "tcp4-tls":
+		network = "tcp4"
+		tls = true
+	case "tcp6-tls":
+		network = "tcp6"
+		tls = true
+	default:
+		if c.Net != "" {
+			network = c.Net
+		}
+	}
+
+	var deadline time.Time
+	if c.Timeout != 0 {
+		deadline = time.Now().Add(c.Timeout)
+	}
+
+	if tls {
+		co, err = DialTimeoutWithTLS(network, a, c.TLSConfig, c.dialTimeout())
+	} else {
+		co, err = DialTimeout(network, a, c.dialTimeout())
+	}
+
+	if err != nil {
+		return nil, 0, err
+	}
+	defer co.Close()
+
+	opt := m.IsEdns0()
+	// If EDNS0 is used use that for size.
+	if opt != nil && opt.UDPSize() >= MinMsgSize {
+		co.UDPSize = opt.UDPSize()
+	}
+	// Otherwise use the client's configured UDP size.
+	if opt == nil && c.UDPSize >= MinMsgSize {
+		co.UDPSize = c.UDPSize
+	}
+
+	co.TsigSecret = c.TsigSecret
+	co.SetWriteDeadline(deadlineOrTimeout(deadline, c.writeTimeout()))
+	if err = co.WriteMsg(m); err != nil {
+		return nil, 0, err
+	}
+
+	co.SetReadDeadline(deadlineOrTimeout(deadline, c.readTimeout()))
+	r, err = co.ReadMsg()
+	if err == nil && r.Id != m.Id {
+		err = ErrId
+	}
+	return r, co.rtt, err
+}
+
+// ReadMsg reads a message from the connection co.
+// If the received message contains a TSIG record the transaction
+// signature is verified.
+func (co *Conn) ReadMsg() (*Msg, error) {
+	p, err := co.ReadMsgHeader(nil)
+	if err != nil {
+		return nil, err
+	}
+
+	m := new(Msg)
+	if err := m.Unpack(p); err != nil {
+		// If ErrTruncated was returned, we still want to allow the user to use
+		// the message, but naively they can just check err if they don't want
+		// to use a truncated message
+		if err == ErrTruncated {
+			return m, err
+		}
+		return nil, err
+	}
+	if t := m.IsTsig(); t != nil {
+		if _, ok := co.TsigSecret[t.Hdr.Name]; !ok {
+			return m, ErrSecret
+		}
+		// Need to work on the original message p, as that was used to calculate the tsig.
+		err = TsigVerify(p, co.TsigSecret[t.Hdr.Name], co.tsigRequestMAC, false)
+	}
+	return m, err
+}
+
+// ReadMsgHeader reads a DNS message, parses and populates hdr (when hdr is not nil).
+// Returns message as a byte slice to be parsed with Msg.Unpack later on.
+// Note that error handling on the message body is not possible as only the header is parsed.
+func (co *Conn) ReadMsgHeader(hdr *Header) ([]byte, error) {
+	var (
+		p   []byte
+		n   int
+		err error
+	)
+
+	switch t := co.Conn.(type) {
+	case *net.TCPConn, *tls.Conn:
+		r := t.(io.Reader)
+
+		// First two bytes specify the length of the entire message.
+		l, err := tcpMsgLen(r)
+		if err != nil {
+			return nil, err
+		}
+		p = make([]byte, l)
+		n, err = tcpRead(r, p)
+		co.rtt = time.Since(co.t)
+	default:
+		if co.UDPSize > MinMsgSize {
+			p = make([]byte, co.UDPSize)
+		} else {
+			p = make([]byte, MinMsgSize)
+		}
+		n, err = co.Read(p)
+		co.rtt = time.Since(co.t)
+	}
+
+	if err != nil {
+		return nil, err
+	} else if n < headerSize {
+		return nil, ErrShortRead
+	}
+
+	p = p[:n]
+	if hdr != nil {
+		dh, _, err := unpackMsgHdr(p, 0)
+		if err != nil {
+			return nil, err
+		}
+		*hdr = dh
+	}
+	return p, err
+}
+
+// tcpMsgLen is a helper func to read first two bytes of stream as uint16 packet length.
+func tcpMsgLen(t io.Reader) (int, error) {
+	p := []byte{0, 0}
+	n, err := t.Read(p)
+	if err != nil {
+		return 0, err
+	}
+
+	// As seen with my local router/switch, retursn 1 byte on the above read,
+	// resulting a a ShortRead. Just write it out (instead of loop) and read the
+	// other byte.
+	if n == 1 {
+		n1, err := t.Read(p[1:])
+		if err != nil {
+			return 0, err
+		}
+		n += n1
+	}
+
+	if n != 2 {
+		return 0, ErrShortRead
+	}
+	l := binary.BigEndian.Uint16(p)
+	if l == 0 {
+		return 0, ErrShortRead
+	}
+	return int(l), nil
+}
+
+// tcpRead calls TCPConn.Read enough times to fill allocated buffer.
+func tcpRead(t io.Reader, p []byte) (int, error) {
+	n, err := t.Read(p)
+	if err != nil {
+		return n, err
+	}
+	for n < len(p) {
+		j, err := t.Read(p[n:])
+		if err != nil {
+			return n, err
+		}
+		n += j
+	}
+	return n, err
+}
+
+// Read implements the net.Conn read method.
+func (co *Conn) Read(p []byte) (n int, err error) {
+	if co.Conn == nil {
+		return 0, ErrConnEmpty
+	}
+	if len(p) < 2 {
+		return 0, io.ErrShortBuffer
+	}
+	switch t := co.Conn.(type) {
+	case *net.TCPConn, *tls.Conn:
+		r := t.(io.Reader)
+
+		l, err := tcpMsgLen(r)
+		if err != nil {
+			return 0, err
+		}
+		if l > len(p) {
+			return int(l), io.ErrShortBuffer
+		}
+		return tcpRead(r, p[:l])
+	}
+	// UDP connection
+	n, err = co.Conn.Read(p)
+	if err != nil {
+		return n, err
+	}
+	return n, err
+}
+
+// WriteMsg sends a message through the connection co.
+// If the message m contains a TSIG record the transaction
+// signature is calculated.
+func (co *Conn) WriteMsg(m *Msg) (err error) {
+	var out []byte
+	if t := m.IsTsig(); t != nil {
+		mac := ""
+		if _, ok := co.TsigSecret[t.Hdr.Name]; !ok {
+			return ErrSecret
+		}
+		out, mac, err = TsigGenerate(m, co.TsigSecret[t.Hdr.Name], co.tsigRequestMAC, false)
+		// Set for the next read, although only used in zone transfers
+		co.tsigRequestMAC = mac
+	} else {
+		out, err = m.Pack()
+	}
+	if err != nil {
+		return err
+	}
+	co.t = time.Now()
+	if _, err = co.Write(out); err != nil {
+		return err
+	}
+	return nil
+}
+
+// Write implements the net.Conn Write method.
+func (co *Conn) Write(p []byte) (n int, err error) {
+	switch t := co.Conn.(type) {
+	case *net.TCPConn, *tls.Conn:
+		w := t.(io.Writer)
+
+		lp := len(p)
+		if lp < 2 {
+			return 0, io.ErrShortBuffer
+		}
+		if lp > MaxMsgSize {
+			return 0, &Error{err: "message too large"}
+		}
+		l := make([]byte, 2, lp+2)
+		binary.BigEndian.PutUint16(l, uint16(lp))
+		p = append(l, p...)
+		n, err := io.Copy(w, bytes.NewReader(p))
+		return int(n), err
+	}
+	n, err = co.Conn.Write(p)
+	return n, err
+}
+
+// Dial connects to the address on the named network.
+func Dial(network, address string) (conn *Conn, err error) {
+	conn = new(Conn)
+	conn.Conn, err = net.Dial(network, address)
+	if err != nil {
+		return nil, err
+	}
+	return conn, nil
+}
+
+// DialTimeout acts like Dial but takes a timeout.
+func DialTimeout(network, address string, timeout time.Duration) (conn *Conn, err error) {
+	conn = new(Conn)
+	conn.Conn, err = net.DialTimeout(network, address, timeout)
+	if err != nil {
+		return nil, err
+	}
+	return conn, nil
+}
+
+// DialWithTLS connects to the address on the named network with TLS.
+func DialWithTLS(network, address string, tlsConfig *tls.Config) (conn *Conn, err error) {
+	conn = new(Conn)
+	conn.Conn, err = tls.Dial(network, address, tlsConfig)
+	if err != nil {
+		return nil, err
+	}
+	return conn, nil
+}
+
+// DialTimeoutWithTLS acts like DialWithTLS but takes a timeout.
+func DialTimeoutWithTLS(network, address string, tlsConfig *tls.Config, timeout time.Duration) (conn *Conn, err error) {
+	var dialer net.Dialer
+	dialer.Timeout = timeout
+
+	conn = new(Conn)
+	conn.Conn, err = tls.DialWithDialer(&dialer, network, address, tlsConfig)
+	if err != nil {
+		return nil, err
+	}
+	return conn, nil
+}
+
+func deadlineOrTimeout(deadline time.Time, timeout time.Duration) time.Time {
+	if deadline.IsZero() {
+		return time.Now().Add(timeout)
+	}
+	return deadline
+}
diff --git a/vendor/github.com/miekg/dns/client_test.go b/vendor/github.com/miekg/dns/client_test.go
new file mode 100644
index 0000000000..dee585f367
--- /dev/null
+++ b/vendor/github.com/miekg/dns/client_test.go
@@ -0,0 +1,511 @@
+package dns
+
+import (
+	"crypto/tls"
+	"fmt"
+	"net"
+	"strconv"
+	"sync"
+	"testing"
+	"time"
+)
+
+func TestClientSync(t *testing.T) {
+	HandleFunc("miek.nl.", HelloServer)
+	defer HandleRemove("miek.nl.")
+
+	s, addrstr, err := RunLocalUDPServer("127.0.0.1:0")
+	if err != nil {
+		t.Fatalf("unable to run test server: %v", err)
+	}
+	defer s.Shutdown()
+
+	m := new(Msg)
+	m.SetQuestion("miek.nl.", TypeSOA)
+
+	c := new(Client)
+	r, _, err := c.Exchange(m, addrstr)
+	if err != nil {
+		t.Errorf("failed to exchange: %v", err)
+	}
+	if r != nil && r.Rcode != RcodeSuccess {
+		t.Errorf("failed to get an valid answer\n%v", r)
+	}
+	// And now with plain Exchange().
+	r, err = Exchange(m, addrstr)
+	if err != nil {
+		t.Errorf("failed to exchange: %v", err)
+	}
+	if r == nil || r.Rcode != RcodeSuccess {
+		t.Errorf("failed to get an valid answer\n%v", r)
+	}
+}
+
+func TestClientTLSSync(t *testing.T) {
+	HandleFunc("miek.nl.", HelloServer)
+	defer HandleRemove("miek.nl.")
+
+	cert, err := tls.X509KeyPair(CertPEMBlock, KeyPEMBlock)
+	if err != nil {
+		t.Fatalf("unable to build certificate: %v", err)
+	}
+
+	config := tls.Config{
+		Certificates: []tls.Certificate{cert},
+	}
+
+	s, addrstr, err := RunLocalTLSServer("127.0.0.1:0", &config)
+	if err != nil {
+		t.Fatalf("unable to run test server: %v", err)
+	}
+	defer s.Shutdown()
+
+	m := new(Msg)
+	m.SetQuestion("miek.nl.", TypeSOA)
+
+	c := new(Client)
+	c.Net = "tcp-tls"
+	c.TLSConfig = &tls.Config{
+		InsecureSkipVerify: true,
+	}
+
+	r, _, err := c.Exchange(m, addrstr)
+	if err != nil {
+		t.Errorf("failed to exchange: %v", err)
+	}
+	if r != nil && r.Rcode != RcodeSuccess {
+		t.Errorf("failed to get an valid answer\n%v", r)
+	}
+}
+
+func TestClientSyncBadID(t *testing.T) {
+	HandleFunc("miek.nl.", HelloServerBadID)
+	defer HandleRemove("miek.nl.")
+
+	s, addrstr, err := RunLocalUDPServer("127.0.0.1:0")
+	if err != nil {
+		t.Fatalf("unable to run test server: %v", err)
+	}
+	defer s.Shutdown()
+
+	m := new(Msg)
+	m.SetQuestion("miek.nl.", TypeSOA)
+
+	c := new(Client)
+	if _, _, err := c.Exchange(m, addrstr); err != ErrId {
+		t.Errorf("did not find a bad Id")
+	}
+	// And now with plain Exchange().
+	if _, err := Exchange(m, addrstr); err != ErrId {
+		t.Errorf("did not find a bad Id")
+	}
+}
+
+func TestClientEDNS0(t *testing.T) {
+	HandleFunc("miek.nl.", HelloServer)
+	defer HandleRemove("miek.nl.")
+
+	s, addrstr, err := RunLocalUDPServer("127.0.0.1:0")
+	if err != nil {
+		t.Fatalf("unable to run test server: %v", err)
+	}
+	defer s.Shutdown()
+
+	m := new(Msg)
+	m.SetQuestion("miek.nl.", TypeDNSKEY)
+
+	m.SetEdns0(2048, true)
+
+	c := new(Client)
+	r, _, err := c.Exchange(m, addrstr)
+	if err != nil {
+		t.Errorf("failed to exchange: %v", err)
+	}
+
+	if r != nil && r.Rcode != RcodeSuccess {
+		t.Errorf("failed to get an valid answer\n%v", r)
+	}
+}
+
+// Validates the transmission and parsing of local EDNS0 options.
+func TestClientEDNS0Local(t *testing.T) {
+	optStr1 := "1979:0x0707"
+	optStr2 := strconv.Itoa(EDNS0LOCALSTART) + ":0x0601"
+
+	handler := func(w ResponseWriter, req *Msg) {
+		m := new(Msg)
+		m.SetReply(req)
+
+		m.Extra = make([]RR, 1, 2)
+		m.Extra[0] = &TXT{Hdr: RR_Header{Name: m.Question[0].Name, Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"Hello local edns"}}
+
+		// If the local options are what we expect, then reflect them back.
+		ec1 := req.Extra[0].(*OPT).Option[0].(*EDNS0_LOCAL).String()
+		ec2 := req.Extra[0].(*OPT).Option[1].(*EDNS0_LOCAL).String()
+		if ec1 == optStr1 && ec2 == optStr2 {
+			m.Extra = append(m.Extra, req.Extra[0])
+		}
+
+		w.WriteMsg(m)
+	}
+
+	HandleFunc("miek.nl.", handler)
+	defer HandleRemove("miek.nl.")
+
+	s, addrstr, err := RunLocalUDPServer("127.0.0.1:0")
+	if err != nil {
+		t.Fatalf("unable to run test server: %s", err)
+	}
+	defer s.Shutdown()
+
+	m := new(Msg)
+	m.SetQuestion("miek.nl.", TypeTXT)
+
+	// Add two local edns options to the query.
+	ec1 := &EDNS0_LOCAL{Code: 1979, Data: []byte{7, 7}}
+	ec2 := &EDNS0_LOCAL{Code: EDNS0LOCALSTART, Data: []byte{6, 1}}
+	o := &OPT{Hdr: RR_Header{Name: ".", Rrtype: TypeOPT}, Option: []EDNS0{ec1, ec2}}
+	m.Extra = append(m.Extra, o)
+
+	c := new(Client)
+	r, _, err := c.Exchange(m, addrstr)
+	if err != nil {
+		t.Errorf("failed to exchange: %s", err)
+	}
+
+	if r != nil && r.Rcode != RcodeSuccess {
+		t.Error("failed to get a valid answer")
+		t.Logf("%v\n", r)
+	}
+
+	txt := r.Extra[0].(*TXT).Txt[0]
+	if txt != "Hello local edns" {
+		t.Error("Unexpected result for miek.nl", txt, "!= Hello local edns")
+	}
+
+	// Validate the local options in the reply.
+	got := r.Extra[1].(*OPT).Option[0].(*EDNS0_LOCAL).String()
+	if got != optStr1 {
+		t.Errorf("failed to get local edns0 answer; got %s, expected %s", got, optStr1)
+		t.Logf("%v\n", r)
+	}
+
+	got = r.Extra[1].(*OPT).Option[1].(*EDNS0_LOCAL).String()
+	if got != optStr2 {
+		t.Errorf("failed to get local edns0 answer; got %s, expected %s", got, optStr2)
+		t.Logf("%v\n", r)
+	}
+}
+
+// ExampleTsigSecret_updateLeaseTSIG shows how to update a lease signed with TSIG
+func ExampleTsigSecret_updateLeaseTSIG() {
+	m := new(Msg)
+	m.SetUpdate("t.local.ip6.io.")
+	rr, _ := NewRR("t.local.ip6.io. 30 A 127.0.0.1")
+	rrs := make([]RR, 1)
+	rrs[0] = rr
+	m.Insert(rrs)
+
+	leaseRr := new(OPT)
+	leaseRr.Hdr.Name = "."
+	leaseRr.Hdr.Rrtype = TypeOPT
+	e := new(EDNS0_UL)
+	e.Code = EDNS0UL
+	e.Lease = 120
+	leaseRr.Option = append(leaseRr.Option, e)
+	m.Extra = append(m.Extra, leaseRr)
+
+	c := new(Client)
+	m.SetTsig("polvi.", HmacMD5, 300, time.Now().Unix())
+	c.TsigSecret = map[string]string{"polvi.": "pRZgBrBvI4NAHZYhxmhs/Q=="}
+
+	_, _, err := c.Exchange(m, "127.0.0.1:53")
+	if err != nil {
+		panic(err)
+	}
+}
+
+func TestClientConn(t *testing.T) {
+	HandleFunc("miek.nl.", HelloServer)
+	defer HandleRemove("miek.nl.")
+
+	// This uses TCP just to make it slightly different than TestClientSync
+	s, addrstr, err := RunLocalTCPServer("127.0.0.1:0")
+	if err != nil {
+		t.Fatalf("unable to run test server: %v", err)
+	}
+	defer s.Shutdown()
+
+	m := new(Msg)
+	m.SetQuestion("miek.nl.", TypeSOA)
+
+	cn, err := Dial("tcp", addrstr)
+	if err != nil {
+		t.Errorf("failed to dial %s: %v", addrstr, err)
+	}
+
+	err = cn.WriteMsg(m)
+	if err != nil {
+		t.Errorf("failed to exchange: %v", err)
+	}
+	r, err := cn.ReadMsg()
+	if r == nil || r.Rcode != RcodeSuccess {
+		t.Errorf("failed to get an valid answer\n%v", r)
+	}
+
+	err = cn.WriteMsg(m)
+	if err != nil {
+		t.Errorf("failed to exchange: %v", err)
+	}
+	h := new(Header)
+	buf, err := cn.ReadMsgHeader(h)
+	if buf == nil {
+		t.Errorf("failed to get an valid answer\n%v", r)
+	}
+	if int(h.Bits&0xF) != RcodeSuccess {
+		t.Errorf("failed to get an valid answer in ReadMsgHeader\n%v", r)
+	}
+	if h.Ancount != 0 || h.Qdcount != 1 || h.Nscount != 0 || h.Arcount != 1 {
+		t.Errorf("expected to have question and additional in response; got something else: %+v", h)
+	}
+	if err = r.Unpack(buf); err != nil {
+		t.Errorf("unable to unpack message fully: %v", err)
+	}
+}
+
+func TestTruncatedMsg(t *testing.T) {
+	m := new(Msg)
+	m.SetQuestion("miek.nl.", TypeSRV)
+	cnt := 10
+	for i := 0; i < cnt; i++ {
+		r := &SRV{
+			Hdr:    RR_Header{Name: m.Question[0].Name, Rrtype: TypeSRV, Class: ClassINET, Ttl: 0},
+			Port:   uint16(i + 8000),
+			Target: "target.miek.nl.",
+		}
+		m.Answer = append(m.Answer, r)
+
+		re := &A{
+			Hdr: RR_Header{Name: m.Question[0].Name, Rrtype: TypeA, Class: ClassINET, Ttl: 0},
+			A:   net.ParseIP(fmt.Sprintf("127.0.0.%d", i)).To4(),
+		}
+		m.Extra = append(m.Extra, re)
+	}
+	buf, err := m.Pack()
+	if err != nil {
+		t.Errorf("failed to pack: %v", err)
+	}
+
+	r := new(Msg)
+	if err = r.Unpack(buf); err != nil {
+		t.Errorf("unable to unpack message: %v", err)
+	}
+	if len(r.Answer) != cnt {
+		t.Errorf("answer count after regular unpack doesn't match: %d", len(r.Answer))
+	}
+	if len(r.Extra) != cnt {
+		t.Errorf("extra count after regular unpack doesn't match: %d", len(r.Extra))
+	}
+
+	m.Truncated = true
+	buf, err = m.Pack()
+	if err != nil {
+		t.Errorf("failed to pack truncated: %v", err)
+	}
+
+	r = new(Msg)
+	if err = r.Unpack(buf); err != nil && err != ErrTruncated {
+		t.Errorf("unable to unpack truncated message: %v", err)
+	}
+	if !r.Truncated {
+		t.Errorf("truncated message wasn't unpacked as truncated")
+	}
+	if len(r.Answer) != cnt {
+		t.Errorf("answer count after truncated unpack doesn't match: %d", len(r.Answer))
+	}
+	if len(r.Extra) != cnt {
+		t.Errorf("extra count after truncated unpack doesn't match: %d", len(r.Extra))
+	}
+
+	// Now we want to remove almost all of the extra records
+	// We're going to loop over the extra to get the count of the size of all
+	// of them
+	off := 0
+	buf1 := make([]byte, m.Len())
+	for i := 0; i < len(m.Extra); i++ {
+		off, err = PackRR(m.Extra[i], buf1, off, nil, m.Compress)
+		if err != nil {
+			t.Errorf("failed to pack extra: %v", err)
+		}
+	}
+
+	// Remove all of the extra bytes but 10 bytes from the end of buf
+	off -= 10
+	buf1 = buf[:len(buf)-off]
+
+	r = new(Msg)
+	if err = r.Unpack(buf1); err != nil && err != ErrTruncated {
+		t.Errorf("unable to unpack cutoff message: %v", err)
+	}
+	if !r.Truncated {
+		t.Error("truncated cutoff message wasn't unpacked as truncated")
+	}
+	if len(r.Answer) != cnt {
+		t.Errorf("answer count after cutoff unpack doesn't match: %d", len(r.Answer))
+	}
+	if len(r.Extra) != 0 {
+		t.Errorf("extra count after cutoff unpack is not zero: %d", len(r.Extra))
+	}
+
+	// Now we want to remove almost all of the answer records too
+	buf1 = make([]byte, m.Len())
+	as := 0
+	for i := 0; i < len(m.Extra); i++ {
+		off1 := off
+		off, err = PackRR(m.Extra[i], buf1, off, nil, m.Compress)
+		as = off - off1
+		if err != nil {
+			t.Errorf("failed to pack extra: %v", err)
+		}
+	}
+
+	// Keep exactly one answer left
+	// This should still cause Answer to be nil
+	off -= as
+	buf1 = buf[:len(buf)-off]
+
+	r = new(Msg)
+	if err = r.Unpack(buf1); err != nil && err != ErrTruncated {
+		t.Errorf("unable to unpack cutoff message: %v", err)
+	}
+	if !r.Truncated {
+		t.Error("truncated cutoff message wasn't unpacked as truncated")
+	}
+	if len(r.Answer) != 0 {
+		t.Errorf("answer count after second cutoff unpack is not zero: %d", len(r.Answer))
+	}
+
+	// Now leave only 1 byte of the question
+	// Since the header is always 12 bytes, we just need to keep 13
+	buf1 = buf[:13]
+
+	r = new(Msg)
+	err = r.Unpack(buf1)
+	if err == nil || err == ErrTruncated {
+		t.Errorf("error should not be ErrTruncated from question cutoff unpack: %v", err)
+	}
+
+	// Finally, if we only have the header, we should still return an error
+	buf1 = buf[:12]
+
+	r = new(Msg)
+	if err = r.Unpack(buf1); err == nil || err != ErrTruncated {
+		t.Errorf("error not ErrTruncated from header-only unpack: %v", err)
+	}
+}
+
+func TestTimeout(t *testing.T) {
+	// Set up a dummy UDP server that won't respond
+	addr, err := net.ResolveUDPAddr("udp", "127.0.0.1:0")
+	if err != nil {
+		t.Fatalf("unable to resolve local udp address: %v", err)
+	}
+	conn, err := net.ListenUDP("udp", addr)
+	if err != nil {
+		t.Fatalf("unable to run test server: %v", err)
+	}
+	defer conn.Close()
+	addrstr := conn.LocalAddr().String()
+
+	// Message to send
+	m := new(Msg)
+	m.SetQuestion("miek.nl.", TypeTXT)
+
+	// Use a channel + timeout to ensure we don't get stuck if the
+	// Client Timeout is not working properly
+	done := make(chan struct{})
+
+	timeout := time.Millisecond
+	allowable := timeout + (10 * time.Millisecond)
+	abortAfter := timeout + (100 * time.Millisecond)
+
+	start := time.Now()
+
+	go func() {
+		c := &Client{Timeout: timeout}
+		_, _, err := c.Exchange(m, addrstr)
+		if err == nil {
+			t.Error("no timeout using Client")
+		}
+		done <- struct{}{}
+	}()
+
+	select {
+	case <-done:
+	case <-time.After(abortAfter):
+	}
+
+	length := time.Since(start)
+
+	if length > allowable {
+		t.Errorf("exchange took longer (%v) than specified Timeout (%v)", length, timeout)
+	}
+}
+
+// Check that responses from deduplicated requests aren't shared between callers
+func TestConcurrentExchanges(t *testing.T) {
+	cases := make([]*Msg, 2)
+	cases[0] = new(Msg)
+	cases[1] = new(Msg)
+	cases[1].Truncated = true
+	for _, m := range cases {
+		block := make(chan struct{})
+		waiting := make(chan struct{})
+
+		handler := func(w ResponseWriter, req *Msg) {
+			r := m.Copy()
+			r.SetReply(req)
+
+			waiting <- struct{}{}
+			<-block
+			w.WriteMsg(r)
+		}
+
+		HandleFunc("miek.nl.", handler)
+		defer HandleRemove("miek.nl.")
+
+		s, addrstr, err := RunLocalUDPServer("127.0.0.1:0")
+		if err != nil {
+			t.Fatalf("unable to run test server: %s", err)
+		}
+		defer s.Shutdown()
+
+		m := new(Msg)
+		m.SetQuestion("miek.nl.", TypeSRV)
+		c := &Client{
+			SingleInflight: true,
+		}
+		r := make([]*Msg, 2)
+
+		var wg sync.WaitGroup
+		wg.Add(len(r))
+		for i := 0; i < len(r); i++ {
+			go func(i int) {
+				r[i], _, _ = c.Exchange(m.Copy(), addrstr)
+				wg.Done()
+			}(i)
+		}
+		select {
+		case <-waiting:
+		case <-time.After(time.Second):
+			t.FailNow()
+		}
+		close(block)
+		wg.Wait()
+
+		if r[0] == r[1] {
+			t.Log("Got same response object, expected non-shared responses")
+			t.Fail()
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/dns/clientconfig.go b/vendor/github.com/miekg/dns/clientconfig.go
new file mode 100644
index 0000000000..0a1f5a92c5
--- /dev/null
+++ b/vendor/github.com/miekg/dns/clientconfig.go
@@ -0,0 +1,131 @@
+package dns
+
+import (
+	"bufio"
+	"os"
+	"strconv"
+	"strings"
+)
+
+// ClientConfig wraps the contents of the /etc/resolv.conf file.
+type ClientConfig struct {
+	Servers  []string // servers to use
+	Search   []string // suffixes to append to local name
+	Port     string   // what port to use
+	Ndots    int      // number of dots in name to trigger absolute lookup
+	Timeout  int      // seconds before giving up on packet
+	Attempts int      // lost packets before giving up on server, not used in the package dns
+}
+
+// ClientConfigFromFile parses a resolv.conf(5) like file and returns
+// a *ClientConfig.
+func ClientConfigFromFile(resolvconf string) (*ClientConfig, error) {
+	file, err := os.Open(resolvconf)
+	if err != nil {
+		return nil, err
+	}
+	defer file.Close()
+	c := new(ClientConfig)
+	scanner := bufio.NewScanner(file)
+	c.Servers = make([]string, 0)
+	c.Search = make([]string, 0)
+	c.Port = "53"
+	c.Ndots = 1
+	c.Timeout = 5
+	c.Attempts = 2
+
+	for scanner.Scan() {
+		if err := scanner.Err(); err != nil {
+			return nil, err
+		}
+		line := scanner.Text()
+		f := strings.Fields(line)
+		if len(f) < 1 {
+			continue
+		}
+		switch f[0] {
+		case "nameserver": // add one name server
+			if len(f) > 1 {
+				// One more check: make sure server name is
+				// just an IP address.  Otherwise we need DNS
+				// to look it up.
+				name := f[1]
+				c.Servers = append(c.Servers, name)
+			}
+
+		case "domain": // set search path to just this domain
+			if len(f) > 1 {
+				c.Search = make([]string, 1)
+				c.Search[0] = f[1]
+			} else {
+				c.Search = make([]string, 0)
+			}
+
+		case "search": // set search path to given servers
+			c.Search = make([]string, len(f)-1)
+			for i := 0; i < len(c.Search); i++ {
+				c.Search[i] = f[i+1]
+			}
+
+		case "options": // magic options
+			for i := 1; i < len(f); i++ {
+				s := f[i]
+				switch {
+				case len(s) >= 6 && s[:6] == "ndots:":
+					n, _ := strconv.Atoi(s[6:])
+					if n < 1 {
+						n = 1
+					}
+					c.Ndots = n
+				case len(s) >= 8 && s[:8] == "timeout:":
+					n, _ := strconv.Atoi(s[8:])
+					if n < 1 {
+						n = 1
+					}
+					c.Timeout = n
+				case len(s) >= 8 && s[:9] == "attempts:":
+					n, _ := strconv.Atoi(s[9:])
+					if n < 1 {
+						n = 1
+					}
+					c.Attempts = n
+				case s == "rotate":
+					/* not imp */
+				}
+			}
+		}
+	}
+	return c, nil
+}
+
+// NameList returns all of the names that should be queried based on the
+// config. It is based off of go's net/dns name building, but it does not
+// check the length of the resulting names.
+func (c *ClientConfig) NameList(name string) []string {
+	// if this domain is already fully qualified, no append needed.
+	if IsFqdn(name) {
+		return []string{name}
+	}
+
+	// Check to see if the name has more labels than Ndots. Do this before making
+	// the domain fully qualified.
+	hasNdots := CountLabel(name) > c.Ndots
+	// Make the domain fully qualified.
+	name = Fqdn(name)
+
+	// Make a list of names based off search.
+	names := []string{}
+
+	// If name has enough dots, try that first.
+	if hasNdots {
+		names = append(names, name)
+	}
+	for _, s := range c.Search {
+		names = append(names, Fqdn(name+s))
+	}
+	// If we didn't have enough dots, try after suffixes.
+	if !hasNdots {
+		names = append(names, name)
+	}
+	return names
+}
diff --git a/vendor/github.com/miekg/dns/clientconfig_test.go b/vendor/github.com/miekg/dns/clientconfig_test.go
new file mode 100644
index 0000000000..7755a8a6f6
--- /dev/null
+++ b/vendor/github.com/miekg/dns/clientconfig_test.go
@@ -0,0 +1,87 @@
+package dns
+
+import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+const normal string = `
+# Comment
+domain somedomain.com
+nameserver 10.28.10.2
+nameserver 11.28.10.1
+`
+
+const missingNewline string = `
+domain somedomain.com
+nameserver 10.28.10.2
+nameserver 11.28.10.1` // <- NOTE: NO newline.
+
+func testConfig(t *testing.T, data string) {
+	tempDir, err := ioutil.TempDir("", "")
+	if err != nil {
+		t.Fatalf("tempDir: %v", err)
+	}
+	defer os.RemoveAll(tempDir)
+
+	path := filepath.Join(tempDir, "resolv.conf")
+	if err := ioutil.WriteFile(path, []byte(data), 0644); err != nil {
+		t.Fatalf("writeFile: %v", err)
+	}
+	cc, err := ClientConfigFromFile(path)
+	if err != nil {
+		t.Errorf("error parsing resolv.conf: %v", err)
+	}
+	if l := len(cc.Servers); l != 2 {
+		t.Errorf("incorrect number of nameservers detected: %d", l)
+	}
+	if l := len(cc.Search); l != 1 {
+		t.Errorf("domain directive not parsed correctly: %v", cc.Search)
+	} else {
+		if cc.Search[0] != "somedomain.com" {
+			t.Errorf("domain is unexpected: %v", cc.Search[0])
+		}
+	}
+}
+
+func TestNameserver(t *testing.T)          { testConfig(t, normal) }
+func TestMissingFinalNewLine(t *testing.T) { testConfig(t, missingNewline) }
+
+func TestNameList(t *testing.T) {
+	cfg := ClientConfig{
+		Ndots: 1,
+	}
+	// fqdn should be only result returned
+	names := cfg.NameList("miek.nl.")
+	if len(names) != 1 {
+		t.Errorf("NameList returned != 1 names: %v", names)
+	} else if names[0] != "miek.nl." {
+		t.Errorf("NameList didn't return sent fqdn domain: %v", names[0])
+	}
+
+	cfg.Search = []string{
+		"test",
+	}
+	// Sent domain has NDots and search
+	names = cfg.NameList("miek.nl")
+	if len(names) != 2 {
+		t.Errorf("NameList returned != 2 names: %v", names)
+	} else if names[0] != "miek.nl." {
+		t.Errorf("NameList didn't return sent domain first: %v", names[0])
+	} else if names[1] != "miek.nl.test." {
+		t.Errorf("NameList didn't return search last: %v", names[1])
+	}
+
+	cfg.Ndots = 2
+	// Sent domain has less than NDots and search
+	names = cfg.NameList("miek.nl")
+	if len(names) != 2 {
+		t.Errorf("NameList returned != 2 names: %v", names)
+	} else if names[0] != "miek.nl.test." {
+		t.Errorf("NameList didn't return search first: %v", names[0])
+	} else if names[1] != "miek.nl." {
+		t.Errorf("NameList didn't return sent domain last: %v", names[1])
+	}
+}
diff --git a/vendor/github.com/miekg/dns/compress_generate.go b/vendor/github.com/miekg/dns/compress_generate.go
new file mode 100644
index 0000000000..1a301e9f39
--- /dev/null
+++ b/vendor/github.com/miekg/dns/compress_generate.go
@@ -0,0 +1,184 @@
+//+build ignore
+
+// compression_generate.go is meant to run with go generate. It will use
+// go/{importer,types} to track down all the RR struct types. Then for each type
+// it will look to see if there are (compressible) names, if so it will add that
+// type to compressionLenHelperType and comressionLenSearchType which "fake" the
+// compression so that Len() is fast.
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"go/format"
+	"go/importer"
+	"go/types"
+	"log"
+	"os"
+)
+
+var packageHdr = `
+// *** DO NOT MODIFY ***
+// AUTOGENERATED BY go generate from compress_generate.go
+
+package dns
+
+`
+
+// getTypeStruct will take a type and the package scope, and return the
+// (innermost) struct if the type is considered a RR type (currently defined as
+// those structs beginning with a RR_Header, could be redefined as implementing
+// the RR interface). The bool return value indicates if embedded structs were
+// resolved.
+func getTypeStruct(t types.Type, scope *types.Scope) (*types.Struct, bool) {
+	st, ok := t.Underlying().(*types.Struct)
+	if !ok {
+		return nil, false
+	}
+	if st.Field(0).Type() == scope.Lookup("RR_Header").Type() {
+		return st, false
+	}
+	if st.Field(0).Anonymous() {
+		st, _ := getTypeStruct(st.Field(0).Type(), scope)
+		return st, true
+	}
+	return nil, false
+}
+
+func main() {
+	// Import and type-check the package
+	pkg, err := importer.Default().Import("github.com/miekg/dns")
+	fatalIfErr(err)
+	scope := pkg.Scope()
+
+	domainTypes := map[string]bool{}  // Types that have a domain name in them (either comressible or not).
+	cdomainTypes := map[string]bool{} // Types that have a compressible domain name in them (subset of domainType)
+	for _, name := range scope.Names() {
+		o := scope.Lookup(name)
+		if o == nil || !o.Exported() {
+			continue
+		}
+		st, _ := getTypeStruct(o.Type(), scope)
+		if st == nil {
+			continue
+		}
+		if name == "PrivateRR" {
+			continue
+		}
+
+		if scope.Lookup("Type"+o.Name()) == nil && o.Name() != "RFC3597" {
+			log.Fatalf("Constant Type%s does not exist.", o.Name())
+		}
+
+		for i := 1; i < st.NumFields(); i++ {
+			if _, ok := st.Field(i).Type().(*types.Slice); ok {
+				if st.Tag(i) == `dns:"domain-name"` {
+					domainTypes[o.Name()] = true
+				}
+				if st.Tag(i) == `dns:"cdomain-name"` {
+					cdomainTypes[o.Name()] = true
+					domainTypes[o.Name()] = true
+				}
+				continue
+			}
+
+			switch {
+			case st.Tag(i) == `dns:"domain-name"`:
+				domainTypes[o.Name()] = true
+			case st.Tag(i) == `dns:"cdomain-name"`:
+				cdomainTypes[o.Name()] = true
+				domainTypes[o.Name()] = true
+			}
+		}
+	}
+
+	b := &bytes.Buffer{}
+	b.WriteString(packageHdr)
+
+	// compressionLenHelperType - all types that have domain-name/cdomain-name can be used for compressing names
+
+	fmt.Fprint(b, "func compressionLenHelperType(c map[string]int, r RR) {\n")
+	fmt.Fprint(b, "switch x := r.(type) {\n")
+	for name, _ := range domainTypes {
+		o := scope.Lookup(name)
+		st, _ := getTypeStruct(o.Type(), scope)
+
+		fmt.Fprintf(b, "case *%s:\n", name)
+		for i := 1; i < st.NumFields(); i++ {
+			out := func(s string) { fmt.Fprintf(b, "compressionLenHelper(c, x.%s)\n", st.Field(i).Name()) }
+
+			if _, ok := st.Field(i).Type().(*types.Slice); ok {
+				switch st.Tag(i) {
+				case `dns:"domain-name"`:
+					fallthrough
+				case `dns:"cdomain-name"`:
+					// For HIP we need to slice over the elements in this slice.
+					fmt.Fprintf(b, `for i := range x.%s {
+						compressionLenHelper(c, x.%s[i])
+					}
+`, st.Field(i).Name(), st.Field(i).Name())
+				}
+				continue
+			}
+
+			switch {
+			case st.Tag(i) == `dns:"cdomain-name"`:
+				fallthrough
+			case st.Tag(i) == `dns:"domain-name"`:
+				out(st.Field(i).Name())
+			}
+		}
+	}
+	fmt.Fprintln(b, "}\n}\n\n")
+
+	// compressionLenSearchType - search cdomain-tags types for compressible names.
+
+	fmt.Fprint(b, "func compressionLenSearchType(c map[string]int, r RR) (int, bool) {\n")
+	fmt.Fprint(b, "switch x := r.(type) {\n")
+	for name, _ := range cdomainTypes {
+		o := scope.Lookup(name)
+		st, _ := getTypeStruct(o.Type(), scope)
+
+		fmt.Fprintf(b, "case *%s:\n", name)
+		j := 1
+		for i := 1; i < st.NumFields(); i++ {
+			out := func(s string, j int) {
+				fmt.Fprintf(b, "k%d, ok%d := compressionLenSearch(c, x.%s)\n", j, j, st.Field(i).Name())
+			}
+
+			// There are no slice types with names that can be compressed.
+
+			switch {
+			case st.Tag(i) == `dns:"cdomain-name"`:
+				out(st.Field(i).Name(), j)
+				j++
+			}
+		}
+		k := "k1"
+		ok := "ok1"
+		for i := 2; i < j; i++ {
+			k += fmt.Sprintf(" + k%d", i)
+			ok += fmt.Sprintf(" && ok%d", i)
+		}
+		fmt.Fprintf(b, "return %s, %s\n", k, ok)
+	}
+	fmt.Fprintln(b, "}\nreturn 0, false\n}\n\n")
+
+	// gofmt
+	res, err := format.Source(b.Bytes())
+	if err != nil {
+		b.WriteTo(os.Stderr)
+		log.Fatal(err)
+	}
+
+	f, err := os.Create("zcompress.go")
+	fatalIfErr(err)
+	defer f.Close()
+	f.Write(res)
+}
+
+func fatalIfErr(err error) {
+	if err != nil {
+		log.Fatal(err)
+	}
+}
diff --git a/vendor/github.com/miekg/dns/dane.go b/vendor/github.com/miekg/dns/dane.go
new file mode 100644
index 0000000000..8c4a14ef19
--- /dev/null
+++ b/vendor/github.com/miekg/dns/dane.go
@@ -0,0 +1,43 @@
+package dns
+
+import (
+	"crypto/sha256"
+	"crypto/sha512"
+	"crypto/x509"
+	"encoding/hex"
+	"errors"
+)
+
+// CertificateToDANE converts a certificate to a hex string as used in the TLSA or SMIMEA records.
+func CertificateToDANE(selector, matchingType uint8, cert *x509.Certificate) (string, error) {
+	switch matchingType {
+	case 0:
+		switch selector {
+		case 0:
+			return hex.EncodeToString(cert.Raw), nil
+		case 1:
+			return hex.EncodeToString(cert.RawSubjectPublicKeyInfo), nil
+		}
+	case 1:
+		h := sha256.New()
+		switch selector {
+		case 0:
+			h.Write(cert.Raw)
+			return hex.EncodeToString(h.Sum(nil)), nil
+		case 1:
+			h.Write(cert.RawSubjectPublicKeyInfo)
+			return hex.EncodeToString(h.Sum(nil)), nil
+		}
+	case 2:
+		h := sha512.New()
+		switch selector {
+		case 0:
+			h.Write(cert.Raw)
+			return hex.EncodeToString(h.Sum(nil)), nil
+		case 1:
+			h.Write(cert.RawSubjectPublicKeyInfo)
+			return hex.EncodeToString(h.Sum(nil)), nil
+		}
+	}
+	return "", errors.New("dns: bad MatchingType or Selector")
+}
diff --git a/vendor/github.com/miekg/dns/defaults.go b/vendor/github.com/miekg/dns/defaults.go
new file mode 100644
index 0000000000..3308ec838b
--- /dev/null
+++ b/vendor/github.com/miekg/dns/defaults.go
@@ -0,0 +1,282 @@
+package dns
+
+import (
+	"errors"
+	"net"
+	"strconv"
+)
+
+const hexDigit = "0123456789abcdef"
+
+// Everything is assumed in ClassINET.
+
+// SetReply creates a reply message from a request message.
+func (dns *Msg) SetReply(request *Msg) *Msg {
+	dns.Id = request.Id
+	dns.RecursionDesired = request.RecursionDesired // Copy rd bit
+	dns.Response = true
+	dns.Opcode = OpcodeQuery
+	dns.Rcode = RcodeSuccess
+	if len(request.Question) > 0 {
+		dns.Question = make([]Question, 1)
+		dns.Question[0] = request.Question[0]
+	}
+	return dns
+}
+
+// SetQuestion creates a question message, it sets the Question
+// section, generates an Id and sets the RecursionDesired (RD)
+// bit to true.
+func (dns *Msg) SetQuestion(z string, t uint16) *Msg {
+	dns.Id = Id()
+	dns.RecursionDesired = true
+	dns.Question = make([]Question, 1)
+	dns.Question[0] = Question{z, t, ClassINET}
+	return dns
+}
+
+// SetNotify creates a notify message, it sets the Question
+// section, generates an Id and sets the Authoritative (AA)
+// bit to true.
+func (dns *Msg) SetNotify(z string) *Msg {
+	dns.Opcode = OpcodeNotify
+	dns.Authoritative = true
+	dns.Id = Id()
+	dns.Question = make([]Question, 1)
+	dns.Question[0] = Question{z, TypeSOA, ClassINET}
+	return dns
+}
+
+// SetRcode creates an error message suitable for the request.
+func (dns *Msg) SetRcode(request *Msg, rcode int) *Msg {
+	dns.SetReply(request)
+	dns.Rcode = rcode
+	return dns
+}
+
+// SetRcodeFormatError creates a message with FormError set.
+func (dns *Msg) SetRcodeFormatError(request *Msg) *Msg {
+	dns.Rcode = RcodeFormatError
+	dns.Opcode = OpcodeQuery
+	dns.Response = true
+	dns.Authoritative = false
+	dns.Id = request.Id
+	return dns
+}
+
+// SetUpdate makes the message a dynamic update message. It
+// sets the ZONE section to: z, TypeSOA, ClassINET.
+func (dns *Msg) SetUpdate(z string) *Msg {
+	dns.Id = Id()
+	dns.Response = false
+	dns.Opcode = OpcodeUpdate
+	dns.Compress = false // BIND9 cannot handle compression
+	dns.Question = make([]Question, 1)
+	dns.Question[0] = Question{z, TypeSOA, ClassINET}
+	return dns
+}
+
+// SetIxfr creates message for requesting an IXFR.
+func (dns *Msg) SetIxfr(z string, serial uint32, ns, mbox string) *Msg {
+	dns.Id = Id()
+	dns.Question = make([]Question, 1)
+	dns.Ns = make([]RR, 1)
+	s := new(SOA)
+	s.Hdr = RR_Header{z, TypeSOA, ClassINET, defaultTtl, 0}
+	s.Serial = serial
+	s.Ns = ns
+	s.Mbox = mbox
+	dns.Question[0] = Question{z, TypeIXFR, ClassINET}
+	dns.Ns[0] = s
+	return dns
+}
+
+// SetAxfr creates message for requesting an AXFR.
+func (dns *Msg) SetAxfr(z string) *Msg {
+	dns.Id = Id()
+	dns.Question = make([]Question, 1)
+	dns.Question[0] = Question{z, TypeAXFR, ClassINET}
+	return dns
+}
+
+// SetTsig appends a TSIG RR to the message.
+// This is only a skeleton TSIG RR that is added as the last RR in the
+// additional section. The Tsig is calculated when the message is being send.
+func (dns *Msg) SetTsig(z, algo string, fudge uint16, timesigned int64) *Msg {
+	t := new(TSIG)
+	t.Hdr = RR_Header{z, TypeTSIG, ClassANY, 0, 0}
+	t.Algorithm = algo
+	t.Fudge = fudge
+	t.TimeSigned = uint64(timesigned)
+	t.OrigId = dns.Id
+	dns.Extra = append(dns.Extra, t)
+	return dns
+}
+
+// SetEdns0 appends a EDNS0 OPT RR to the message.
+// TSIG should always the last RR in a message.
+func (dns *Msg) SetEdns0(udpsize uint16, do bool) *Msg {
+	e := new(OPT)
+	e.Hdr.Name = "."
+	e.Hdr.Rrtype = TypeOPT
+	e.SetUDPSize(udpsize)
+	if do {
+		e.SetDo()
+	}
+	dns.Extra = append(dns.Extra, e)
+	return dns
+}
+
+// IsTsig checks if the message has a TSIG record as the last record
+// in the additional section. It returns the TSIG record found or nil.
+func (dns *Msg) IsTsig() *TSIG {
+	if len(dns.Extra) > 0 {
+		if dns.Extra[len(dns.Extra)-1].Header().Rrtype == TypeTSIG {
+			return dns.Extra[len(dns.Extra)-1].(*TSIG)
+		}
+	}
+	return nil
+}
+
+// IsEdns0 checks if the message has a EDNS0 (OPT) record, any EDNS0
+// record in the additional section will do. It returns the OPT record
+// found or nil.
+func (dns *Msg) IsEdns0() *OPT {
+	// EDNS0 is at the end of the additional section, start there.
+	// We might want to change this to *only* look at the last two
+	// records. So we see TSIG and/or OPT - this a slightly bigger
+	// change though.
+	for i := len(dns.Extra) - 1; i >= 0; i-- {
+		if dns.Extra[i].Header().Rrtype == TypeOPT {
+			return dns.Extra[i].(*OPT)
+		}
+	}
+	return nil
+}
+
+// IsDomainName checks if s is a valid domain name, it returns the number of
+// labels and true, when a domain name is valid.  Note that non fully qualified
+// domain name is considered valid, in this case the last label is counted in
+// the number of labels.  When false is returned the number of labels is not
+// defined.  Also note that this function is extremely liberal; almost any
+// string is a valid domain name as the DNS is 8 bit protocol. It checks if each
+// label fits in 63 characters, but there is no length check for the entire
+// string s. I.e.  a domain name longer than 255 characters is considered valid.
+func IsDomainName(s string) (labels int, ok bool) {
+	_, labels, err := packDomainName(s, nil, 0, nil, false)
+	return labels, err == nil
+}
+
+// IsSubDomain checks if child is indeed a child of the parent. If child and parent
+// are the same domain true is returned as well.
+func IsSubDomain(parent, child string) bool {
+	// Entire child is contained in parent
+	return CompareDomainName(parent, child) == CountLabel(parent)
+}
+
+// IsMsg sanity checks buf and returns an error if it isn't a valid DNS packet.
+// The checking is performed on the binary payload.
+func IsMsg(buf []byte) error {
+	// Header
+	if len(buf) < 12 {
+		return errors.New("dns: bad message header")
+	}
+	// Header: Opcode
+	// TODO(miek): more checks here, e.g. check all header bits.
+	return nil
+}
+
+// IsFqdn checks if a domain name is fully qualified.
+func IsFqdn(s string) bool {
+	l := len(s)
+	if l == 0 {
+		return false
+	}
+	return s[l-1] == '.'
+}
+
+// IsRRset checks if a set of RRs is a valid RRset as defined by RFC 2181.
+// This means the RRs need to have the same type, name, and class. Returns true
+// if the RR set is valid, otherwise false.
+func IsRRset(rrset []RR) bool {
+	if len(rrset) == 0 {
+		return false
+	}
+	if len(rrset) == 1 {
+		return true
+	}
+	rrHeader := rrset[0].Header()
+	rrType := rrHeader.Rrtype
+	rrClass := rrHeader.Class
+	rrName := rrHeader.Name
+
+	for _, rr := range rrset[1:] {
+		curRRHeader := rr.Header()
+		if curRRHeader.Rrtype != rrType || curRRHeader.Class != rrClass || curRRHeader.Name != rrName {
+			// Mismatch between the records, so this is not a valid rrset for
+			//signing/verifying
+			return false
+		}
+	}
+
+	return true
+}
+
+// Fqdn return the fully qualified domain name from s.
+// If s is already fully qualified, it behaves as the identity function.
+func Fqdn(s string) string {
+	if IsFqdn(s) {
+		return s
+	}
+	return s + "."
+}
+
+// Copied from the official Go code.
+
+// ReverseAddr returns the in-addr.arpa. or ip6.arpa. hostname of the IP
+// address suitable for reverse DNS (PTR) record lookups or an error if it fails
+// to parse the IP address.
+func ReverseAddr(addr string) (arpa string, err error) {
+	ip := net.ParseIP(addr)
+	if ip == nil {
+		return "", &Error{err: "unrecognized address: " + addr}
+	}
+	if ip.To4() != nil {
+		return strconv.Itoa(int(ip[15])) + "." + strconv.Itoa(int(ip[14])) + "." + strconv.Itoa(int(ip[13])) + "." +
+			strconv.Itoa(int(ip[12])) + ".in-addr.arpa.", nil
+	}
+	// Must be IPv6
+	buf := make([]byte, 0, len(ip)*4+len("ip6.arpa."))
+	// Add it, in reverse, to the buffer
+	for i := len(ip) - 1; i >= 0; i-- {
+		v := ip[i]
+		buf = append(buf, hexDigit[v&0xF])
+		buf = append(buf, '.')
+		buf = append(buf, hexDigit[v>>4])
+		buf = append(buf, '.')
+	}
+	// Append "ip6.arpa." and return (buf already has the final .)
+	buf = append(buf, "ip6.arpa."...)
+	return string(buf), nil
+}
+
+// String returns the string representation for the type t.
+func (t Type) String() string {
+	if t1, ok := TypeToString[uint16(t)]; ok {
+		return t1
+	}
+	return "TYPE" + strconv.Itoa(int(t))
+}
+
+// String returns the string representation for the class c.
+func (c Class) String() string {
+	if c1, ok := ClassToString[uint16(c)]; ok {
+		return c1
+	}
+	return "CLASS" + strconv.Itoa(int(c))
+}
+
+// String returns the string representation for the name n.
+func (n Name) String() string {
+	return sprintName(string(n))
+}
diff --git a/vendor/github.com/miekg/dns/dns.go b/vendor/github.com/miekg/dns/dns.go
new file mode 100644
index 0000000000..b3292287ce
--- /dev/null
+++ b/vendor/github.com/miekg/dns/dns.go
@@ -0,0 +1,104 @@
+package dns
+
+import "strconv"
+
+const (
+	year68     = 1 << 31 // For RFC1982 (Serial Arithmetic) calculations in 32 bits.
+	defaultTtl = 3600    // Default internal TTL.
+
+	DefaultMsgSize = 4096  // DefaultMsgSize is the standard default for messages larger than 512 bytes.
+	MinMsgSize     = 512   // MinMsgSize is the minimal size of a DNS packet.
+	MaxMsgSize     = 65535 // MaxMsgSize is the largest possible DNS packet.
+)
+
+// Error represents a DNS error.
+type Error struct{ err string }
+
+func (e *Error) Error() string {
+	if e == nil {
+		return "dns: <nil>"
+	}
+	return "dns: " + e.err
+}
+
+// An RR represents a resource record.
+type RR interface {
+	// Header returns the header of an resource record. The header contains
+	// everything up to the rdata.
+	Header() *RR_Header
+	// String returns the text representation of the resource record.
+	String() string
+
+	// copy returns a copy of the RR
+	copy() RR
+	// len returns the length (in octets) of the uncompressed RR in wire format.
+	len() int
+	// pack packs an RR into wire format.
+	pack([]byte, int, map[string]int, bool) (int, error)
+}
+
+// RR_Header is the header all DNS resource records share.
+type RR_Header struct {
+	Name     string `dns:"cdomain-name"`
+	Rrtype   uint16
+	Class    uint16
+	Ttl      uint32
+	Rdlength uint16 // Length of data after header.
+}
+
+// Header returns itself. This is here to make RR_Header implements the RR interface.
+func (h *RR_Header) Header() *RR_Header { return h }
+
+// Just to implement the RR interface.
+func (h *RR_Header) copy() RR { return nil }
+
+func (h *RR_Header) copyHeader() *RR_Header {
+	r := new(RR_Header)
+	r.Name = h.Name
+	r.Rrtype = h.Rrtype
+	r.Class = h.Class
+	r.Ttl = h.Ttl
+	r.Rdlength = h.Rdlength
+	return r
+}
+
+func (h *RR_Header) String() string {
+	var s string
+
+	if h.Rrtype == TypeOPT {
+		s = ";"
+		// and maybe other things
+	}
+
+	s += sprintName(h.Name) + "\t"
+	s += strconv.FormatInt(int64(h.Ttl), 10) + "\t"
+	s += Class(h.Class).String() + "\t"
+	s += Type(h.Rrtype).String() + "\t"
+	return s
+}
+
+func (h *RR_Header) len() int {
+	l := len(h.Name) + 1
+	l += 10 // rrtype(2) + class(2) + ttl(4) + rdlength(2)
+	return l
+}
+
+// ToRFC3597 converts a known RR to the unknown RR representation from RFC 3597.
+func (rr *RFC3597) ToRFC3597(r RR) error {
+	buf := make([]byte, r.len()*2)
+	off, err := PackRR(r, buf, 0, nil, false)
+	if err != nil {
+		return err
+	}
+	buf = buf[:off]
+	if int(r.Header().Rdlength) > off {
+		return ErrBuf
+	}
+
+	rfc3597, _, err := unpackRFC3597(*r.Header(), buf, off-int(r.Header().Rdlength))
+	if err != nil {
+		return err
+	}
+	*rr = *rfc3597.(*RFC3597)
+	return nil
+}
diff --git a/vendor/github.com/miekg/dns/dns_bench_test.go b/vendor/github.com/miekg/dns/dns_bench_test.go
new file mode 100644
index 0000000000..bccc3d5404
--- /dev/null
+++ b/vendor/github.com/miekg/dns/dns_bench_test.go
@@ -0,0 +1,211 @@
+package dns
+
+import (
+	"net"
+	"testing"
+)
+
+func BenchmarkMsgLength(b *testing.B) {
+	b.StopTimer()
+	makeMsg := func(question string, ans, ns, e []RR) *Msg {
+		msg := new(Msg)
+		msg.SetQuestion(Fqdn(question), TypeANY)
+		msg.Answer = append(msg.Answer, ans...)
+		msg.Ns = append(msg.Ns, ns...)
+		msg.Extra = append(msg.Extra, e...)
+		msg.Compress = true
+		return msg
+	}
+	name1 := "12345678901234567890123456789012345.12345678.123."
+	rrMx, _ := NewRR(name1 + " 3600 IN MX 10 " + name1)
+	msg := makeMsg(name1, []RR{rrMx, rrMx}, nil, nil)
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		msg.Len()
+	}
+}
+
+func BenchmarkMsgLengthPack(b *testing.B) {
+	makeMsg := func(question string, ans, ns, e []RR) *Msg {
+		msg := new(Msg)
+		msg.SetQuestion(Fqdn(question), TypeANY)
+		msg.Answer = append(msg.Answer, ans...)
+		msg.Ns = append(msg.Ns, ns...)
+		msg.Extra = append(msg.Extra, e...)
+		msg.Compress = true
+		return msg
+	}
+	name1 := "12345678901234567890123456789012345.12345678.123."
+	rrMx, _ := NewRR(name1 + " 3600 IN MX 10 " + name1)
+	msg := makeMsg(name1, []RR{rrMx, rrMx}, nil, nil)
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		_, _ = msg.Pack()
+	}
+}
+
+func BenchmarkPackDomainName(b *testing.B) {
+	name1 := "12345678901234567890123456789012345.12345678.123."
+	buf := make([]byte, len(name1)+1)
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		_, _ = PackDomainName(name1, buf, 0, nil, false)
+	}
+}
+
+func BenchmarkUnpackDomainName(b *testing.B) {
+	name1 := "12345678901234567890123456789012345.12345678.123."
+	buf := make([]byte, len(name1)+1)
+	_, _ = PackDomainName(name1, buf, 0, nil, false)
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		_, _, _ = UnpackDomainName(buf, 0)
+	}
+}
+
+func BenchmarkUnpackDomainNameUnprintable(b *testing.B) {
+	name1 := "\x02\x02\x02\x025\x02\x02\x02\x02.12345678.123."
+	buf := make([]byte, len(name1)+1)
+	_, _ = PackDomainName(name1, buf, 0, nil, false)
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		_, _, _ = UnpackDomainName(buf, 0)
+	}
+}
+
+func BenchmarkCopy(b *testing.B) {
+	b.ReportAllocs()
+	m := new(Msg)
+	m.SetQuestion("miek.nl.", TypeA)
+	rr, _ := NewRR("miek.nl. 2311 IN A 127.0.0.1")
+	m.Answer = []RR{rr}
+	rr, _ = NewRR("miek.nl. 2311 IN NS 127.0.0.1")
+	m.Ns = []RR{rr}
+	rr, _ = NewRR("miek.nl. 2311 IN A 127.0.0.1")
+	m.Extra = []RR{rr}
+
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		m.Copy()
+	}
+}
+
+func BenchmarkPackA(b *testing.B) {
+	a := &A{Hdr: RR_Header{Name: ".", Rrtype: TypeA, Class: ClassANY}, A: net.IPv4(127, 0, 0, 1)}
+
+	buf := make([]byte, a.len())
+	b.ReportAllocs()
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		_, _ = PackRR(a, buf, 0, nil, false)
+	}
+}
+
+func BenchmarkUnpackA(b *testing.B) {
+	a := &A{Hdr: RR_Header{Name: ".", Rrtype: TypeA, Class: ClassANY}, A: net.IPv4(127, 0, 0, 1)}
+
+	buf := make([]byte, a.len())
+	PackRR(a, buf, 0, nil, false)
+	a = nil
+	b.ReportAllocs()
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		_, _, _ = UnpackRR(buf, 0)
+	}
+}
+
+func BenchmarkPackMX(b *testing.B) {
+	m := &MX{Hdr: RR_Header{Name: ".", Rrtype: TypeA, Class: ClassANY}, Mx: "mx.miek.nl."}
+
+	buf := make([]byte, m.len())
+	b.ReportAllocs()
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		_, _ = PackRR(m, buf, 0, nil, false)
+	}
+}
+
+func BenchmarkUnpackMX(b *testing.B) {
+	m := &MX{Hdr: RR_Header{Name: ".", Rrtype: TypeA, Class: ClassANY}, Mx: "mx.miek.nl."}
+
+	buf := make([]byte, m.len())
+	PackRR(m, buf, 0, nil, false)
+	m = nil
+	b.ReportAllocs()
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		_, _, _ = UnpackRR(buf, 0)
+	}
+}
+
+func BenchmarkPackAAAAA(b *testing.B) {
+	aaaa, _ := NewRR(". IN A ::1")
+
+	buf := make([]byte, aaaa.len())
+	b.ReportAllocs()
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		_, _ = PackRR(aaaa, buf, 0, nil, false)
+	}
+}
+
+func BenchmarkUnpackAAAA(b *testing.B) {
+	aaaa, _ := NewRR(". IN A ::1")
+
+	buf := make([]byte, aaaa.len())
+	PackRR(aaaa, buf, 0, nil, false)
+	aaaa = nil
+	b.ReportAllocs()
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		_, _, _ = UnpackRR(buf, 0)
+	}
+}
+
+func BenchmarkPackMsg(b *testing.B) {
+	makeMsg := func(question string, ans, ns, e []RR) *Msg {
+		msg := new(Msg)
+		msg.SetQuestion(Fqdn(question), TypeANY)
+		msg.Answer = append(msg.Answer, ans...)
+		msg.Ns = append(msg.Ns, ns...)
+		msg.Extra = append(msg.Extra, e...)
+		msg.Compress = true
+		return msg
+	}
+	name1 := "12345678901234567890123456789012345.12345678.123."
+	rrMx, _ := NewRR(name1 + " 3600 IN MX 10 " + name1)
+	msg := makeMsg(name1, []RR{rrMx, rrMx}, nil, nil)
+	buf := make([]byte, 512)
+	b.ReportAllocs()
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		_, _ = msg.PackBuffer(buf)
+	}
+}
+
+func BenchmarkUnpackMsg(b *testing.B) {
+	makeMsg := func(question string, ans, ns, e []RR) *Msg {
+		msg := new(Msg)
+		msg.SetQuestion(Fqdn(question), TypeANY)
+		msg.Answer = append(msg.Answer, ans...)
+		msg.Ns = append(msg.Ns, ns...)
+		msg.Extra = append(msg.Extra, e...)
+		msg.Compress = true
+		return msg
+	}
+	name1 := "12345678901234567890123456789012345.12345678.123."
+	rrMx, _ := NewRR(name1 + " 3600 IN MX 10 " + name1)
+	msg := makeMsg(name1, []RR{rrMx, rrMx}, nil, nil)
+	msgBuf, _ := msg.Pack()
+	b.ReportAllocs()
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		_ = msg.Unpack(msgBuf)
+	}
+}
+
+func BenchmarkIdGeneration(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		_ = id()
+	}
+}
diff --git a/vendor/github.com/miekg/dns/dns_test.go b/vendor/github.com/miekg/dns/dns_test.go
new file mode 100644
index 0000000000..dbfe25328f
--- /dev/null
+++ b/vendor/github.com/miekg/dns/dns_test.go
@@ -0,0 +1,450 @@
+package dns
+
+import (
+	"encoding/hex"
+	"net"
+	"testing"
+)
+
+func TestPackUnpack(t *testing.T) {
+	out := new(Msg)
+	out.Answer = make([]RR, 1)
+	key := new(DNSKEY)
+	key = &DNSKEY{Flags: 257, Protocol: 3, Algorithm: RSASHA1}
+	key.Hdr = RR_Header{Name: "miek.nl.", Rrtype: TypeDNSKEY, Class: ClassINET, Ttl: 3600}
+	key.PublicKey = "AwEAAaHIwpx3w4VHKi6i1LHnTaWeHCL154Jug0Rtc9ji5qwPXpBo6A5sRv7cSsPQKPIwxLpyCrbJ4mr2L0EPOdvP6z6YfljK2ZmTbogU9aSU2fiq/4wjxbdkLyoDVgtO+JsxNN4bjr4WcWhsmk1Hg93FV9ZpkWb0Tbad8DFqNDzr//kZ"
+
+	out.Answer[0] = key
+	msg, err := out.Pack()
+	if err != nil {
+		t.Error("failed to pack msg with DNSKEY")
+	}
+	in := new(Msg)
+	if in.Unpack(msg) != nil {
+		t.Error("failed to unpack msg with DNSKEY")
+	}
+
+	sig := new(RRSIG)
+	sig = &RRSIG{TypeCovered: TypeDNSKEY, Algorithm: RSASHA1, Labels: 2,
+		OrigTtl: 3600, Expiration: 4000, Inception: 4000, KeyTag: 34641, SignerName: "miek.nl.",
+		Signature: "AwEAAaHIwpx3w4VHKi6i1LHnTaWeHCL154Jug0Rtc9ji5qwPXpBo6A5sRv7cSsPQKPIwxLpyCrbJ4mr2L0EPOdvP6z6YfljK2ZmTbogU9aSU2fiq/4wjxbdkLyoDVgtO+JsxNN4bjr4WcWhsmk1Hg93FV9ZpkWb0Tbad8DFqNDzr//kZ"}
+	sig.Hdr = RR_Header{Name: "miek.nl.", Rrtype: TypeRRSIG, Class: ClassINET, Ttl: 3600}
+
+	out.Answer[0] = sig
+	msg, err = out.Pack()
+	if err != nil {
+		t.Error("failed to pack msg with RRSIG")
+	}
+
+	if in.Unpack(msg) != nil {
+		t.Error("failed to unpack msg with RRSIG")
+	}
+}
+
+func TestPackUnpack2(t *testing.T) {
+	m := new(Msg)
+	m.Extra = make([]RR, 1)
+	m.Answer = make([]RR, 1)
+	dom := "miek.nl."
+	rr := new(A)
+	rr.Hdr = RR_Header{Name: dom, Rrtype: TypeA, Class: ClassINET, Ttl: 0}
+	rr.A = net.IPv4(127, 0, 0, 1)
+
+	x := new(TXT)
+	x.Hdr = RR_Header{Name: dom, Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}
+	x.Txt = []string{"heelalaollo"}
+
+	m.Extra[0] = x
+	m.Answer[0] = rr
+	_, err := m.Pack()
+	if err != nil {
+		t.Error("Packing failed: ", err)
+		return
+	}
+}
+
+func TestPackUnpack3(t *testing.T) {
+	m := new(Msg)
+	m.Extra = make([]RR, 2)
+	m.Answer = make([]RR, 1)
+	dom := "miek.nl."
+	rr := new(A)
+	rr.Hdr = RR_Header{Name: dom, Rrtype: TypeA, Class: ClassINET, Ttl: 0}
+	rr.A = net.IPv4(127, 0, 0, 1)
+
+	x1 := new(TXT)
+	x1.Hdr = RR_Header{Name: dom, Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}
+	x1.Txt = []string{}
+
+	x2 := new(TXT)
+	x2.Hdr = RR_Header{Name: dom, Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}
+	x2.Txt = []string{"heelalaollo"}
+
+	m.Extra[0] = x1
+	m.Extra[1] = x2
+	m.Answer[0] = rr
+	b, err := m.Pack()
+	if err != nil {
+		t.Error("packing failed: ", err)
+		return
+	}
+
+	var unpackMsg Msg
+	err = unpackMsg.Unpack(b)
+	if err != nil {
+		t.Error("unpacking failed")
+		return
+	}
+}
+
+func TestBailiwick(t *testing.T) {
+	yes := map[string]string{
+		"miek1.nl": "miek1.nl",
+		"miek.nl":  "ns.miek.nl",
+		".":        "miek.nl",
+	}
+	for parent, child := range yes {
+		if !IsSubDomain(parent, child) {
+			t.Errorf("%s should be child of %s", child, parent)
+			t.Errorf("comparelabels %d", CompareDomainName(parent, child))
+			t.Errorf("lenlabels %d %d", CountLabel(parent), CountLabel(child))
+		}
+	}
+	no := map[string]string{
+		"www.miek.nl":  "ns.miek.nl",
+		"m\\.iek.nl":   "ns.miek.nl",
+		"w\\.iek.nl":   "w.iek.nl",
+		"p\\\\.iek.nl": "ns.p.iek.nl", // p\\.iek.nl , literal \ in domain name
+		"miek.nl":      ".",
+	}
+	for parent, child := range no {
+		if IsSubDomain(parent, child) {
+			t.Errorf("%s should not be child of %s", child, parent)
+			t.Errorf("comparelabels %d", CompareDomainName(parent, child))
+			t.Errorf("lenlabels %d %d", CountLabel(parent), CountLabel(child))
+		}
+	}
+}
+
+func TestPack(t *testing.T) {
+	rr := []string{"US.    86400	IN	NSEC	0-.us. NS SOA RRSIG NSEC DNSKEY TYPE65534"}
+	m := new(Msg)
+	var err error
+	m.Answer = make([]RR, 1)
+	for _, r := range rr {
+		m.Answer[0], err = NewRR(r)
+		if err != nil {
+			t.Errorf("failed to create RR: %v", err)
+			continue
+		}
+		if _, err := m.Pack(); err != nil {
+			t.Errorf("packing failed: %v", err)
+		}
+	}
+	x := new(Msg)
+	ns, _ := NewRR("pool.ntp.org.   390 IN  NS  a.ntpns.org")
+	ns.(*NS).Ns = "a.ntpns.org"
+	x.Ns = append(m.Ns, ns)
+	x.Ns = append(m.Ns, ns)
+	x.Ns = append(m.Ns, ns)
+	// This crashes due to the fact the a.ntpns.org isn't a FQDN
+	// How to recover() from a remove panic()?
+	if _, err := x.Pack(); err == nil {
+		t.Error("packing should fail")
+	}
+	x.Answer = make([]RR, 1)
+	x.Answer[0], err = NewRR(rr[0])
+	if _, err := x.Pack(); err == nil {
+		t.Error("packing should fail")
+	}
+	x.Question = make([]Question, 1)
+	x.Question[0] = Question{";sd#edddds鍛↙赏‘℅∥↙xzztsestxssweewwsssstx@s@Z嵌e@cn.pool.ntp.org.", TypeA, ClassINET}
+	if _, err := x.Pack(); err == nil {
+		t.Error("packing should fail")
+	}
+}
+
+func TestPackNAPTR(t *testing.T) {
+	for _, n := range []string{
+		`apple.com. IN NAPTR   100 50 "se" "SIP+D2U" "" _sip._udp.apple.com.`,
+		`apple.com. IN NAPTR   90 50 "se" "SIP+D2T" "" _sip._tcp.apple.com.`,
+		`apple.com. IN NAPTR   50 50 "se" "SIPS+D2T" "" _sips._tcp.apple.com.`,
+	} {
+		rr, _ := NewRR(n)
+		msg := make([]byte, rr.len())
+		if off, err := PackRR(rr, msg, 0, nil, false); err != nil {
+			t.Errorf("packing failed: %v", err)
+			t.Errorf("length %d, need more than %d", rr.len(), off)
+		} else {
+			t.Logf("buf size needed: %d", off)
+		}
+	}
+}
+
+func TestCompressLength(t *testing.T) {
+	m := new(Msg)
+	m.SetQuestion("miek.nl", TypeMX)
+	ul := m.Len()
+	m.Compress = true
+	if ul != m.Len() {
+		t.Fatalf("should be equal")
+	}
+}
+
+// Does the predicted length match final packed length?
+func TestMsgCompressLength(t *testing.T) {
+	makeMsg := func(question string, ans, ns, e []RR) *Msg {
+		msg := new(Msg)
+		msg.SetQuestion(Fqdn(question), TypeANY)
+		msg.Answer = append(msg.Answer, ans...)
+		msg.Ns = append(msg.Ns, ns...)
+		msg.Extra = append(msg.Extra, e...)
+		msg.Compress = true
+		return msg
+	}
+
+	name1 := "12345678901234567890123456789012345.12345678.123."
+	rrA, _ := NewRR(name1 + " 3600 IN A 192.0.2.1")
+	rrMx, _ := NewRR(name1 + " 3600 IN MX 10 " + name1)
+	tests := []*Msg{
+		makeMsg(name1, []RR{rrA}, nil, nil),
+		makeMsg(name1, []RR{rrMx, rrMx}, nil, nil)}
+
+	for _, msg := range tests {
+		predicted := msg.Len()
+		buf, err := msg.Pack()
+		if err != nil {
+			t.Error(err)
+		}
+		if predicted < len(buf) {
+			t.Errorf("predicted compressed length is wrong: predicted %s (len=%d) %d, actual %d",
+				msg.Question[0].Name, len(msg.Answer), predicted, len(buf))
+		}
+	}
+}
+
+func TestMsgLength(t *testing.T) {
+	makeMsg := func(question string, ans, ns, e []RR) *Msg {
+		msg := new(Msg)
+		msg.SetQuestion(Fqdn(question), TypeANY)
+		msg.Answer = append(msg.Answer, ans...)
+		msg.Ns = append(msg.Ns, ns...)
+		msg.Extra = append(msg.Extra, e...)
+		return msg
+	}
+
+	name1 := "12345678901234567890123456789012345.12345678.123."
+	rrA, _ := NewRR(name1 + " 3600 IN A 192.0.2.1")
+	rrMx, _ := NewRR(name1 + " 3600 IN MX 10 " + name1)
+	tests := []*Msg{
+		makeMsg(name1, []RR{rrA}, nil, nil),
+		makeMsg(name1, []RR{rrMx, rrMx}, nil, nil)}
+
+	for _, msg := range tests {
+		predicted := msg.Len()
+		buf, err := msg.Pack()
+		if err != nil {
+			t.Error(err)
+		}
+		if predicted < len(buf) {
+			t.Errorf("predicted length is wrong: predicted %s (len=%d), actual %d",
+				msg.Question[0].Name, predicted, len(buf))
+		}
+	}
+}
+
+func TestMsgLength2(t *testing.T) {
+	// Serialized replies
+	var testMessages = []string{
+		// google.com. IN A?
+		"064e81800001000b0004000506676f6f676c6503636f6d0000010001c00c00010001000000050004adc22986c00c00010001000000050004adc22987c00c00010001000000050004adc22988c00c00010001000000050004adc22989c00c00010001000000050004adc2298ec00c00010001000000050004adc22980c00c00010001000000050004adc22981c00c00010001000000050004adc22982c00c00010001000000050004adc22983c00c00010001000000050004adc22984c00c00010001000000050004adc22985c00c00020001000000050006036e7331c00cc00c00020001000000050006036e7332c00cc00c00020001000000050006036e7333c00cc00c00020001000000050006036e7334c00cc0d800010001000000050004d8ef200ac0ea00010001000000050004d8ef220ac0fc00010001000000050004d8ef240ac10e00010001000000050004d8ef260a0000290500000000050000",
+		// amazon.com. IN A? (reply has no EDNS0 record)
+		// TODO(miek): this one is off-by-one, need to find out why
+		//"6de1818000010004000a000806616d617a6f6e03636f6d0000010001c00c000100010000000500044815c2d4c00c000100010000000500044815d7e8c00c00010001000000050004b02062a6c00c00010001000000050004cdfbf236c00c000200010000000500140570646e733408756c747261646e73036f726700c00c000200010000000500150570646e733508756c747261646e7304696e666f00c00c000200010000000500160570646e733608756c747261646e7302636f02756b00c00c00020001000000050014036e7331037033310664796e656374036e657400c00c00020001000000050006036e7332c0cfc00c00020001000000050006036e7333c0cfc00c00020001000000050006036e7334c0cfc00c000200010000000500110570646e733108756c747261646e73c0dac00c000200010000000500080570646e7332c127c00c000200010000000500080570646e7333c06ec0cb00010001000000050004d04e461fc0eb00010001000000050004cc0dfa1fc0fd00010001000000050004d04e471fc10f00010001000000050004cc0dfb1fc12100010001000000050004cc4a6c01c121001c000100000005001020010502f3ff00000000000000000001c13e00010001000000050004cc4a6d01c13e001c0001000000050010261000a1101400000000000000000001",
+		// yahoo.com. IN A?
+		"fc2d81800001000300070008057961686f6f03636f6d0000010001c00c00010001000000050004628afd6dc00c00010001000000050004628bb718c00c00010001000000050004cebe242dc00c00020001000000050006036e7336c00cc00c00020001000000050006036e7338c00cc00c00020001000000050006036e7331c00cc00c00020001000000050006036e7332c00cc00c00020001000000050006036e7333c00cc00c00020001000000050006036e7334c00cc00c00020001000000050006036e7335c00cc07b0001000100000005000444b48310c08d00010001000000050004448eff10c09f00010001000000050004cb54dd35c0b100010001000000050004628a0b9dc0c30001000100000005000477a0f77cc05700010001000000050004ca2bdfaac06900010001000000050004caa568160000290500000000050000",
+		// microsoft.com. IN A?
+		"f4368180000100020005000b096d6963726f736f667403636f6d0000010001c00c0001000100000005000440040b25c00c0001000100000005000441373ac9c00c0002000100000005000e036e7331046d736674036e657400c00c00020001000000050006036e7332c04fc00c00020001000000050006036e7333c04fc00c00020001000000050006036e7334c04fc00c00020001000000050006036e7335c04fc04b000100010000000500044137253ec04b001c00010000000500102a010111200500000000000000010001c0650001000100000005000440043badc065001c00010000000500102a010111200600060000000000010001c07700010001000000050004d5c7b435c077001c00010000000500102a010111202000000000000000010001c08900010001000000050004cf2e4bfec089001c00010000000500102404f800200300000000000000010001c09b000100010000000500044137e28cc09b001c00010000000500102a010111200f000100000000000100010000290500000000050000",
+		// google.com. IN MX?
+		"724b8180000100050004000b06676f6f676c6503636f6d00000f0001c00c000f000100000005000c000a056173706d78016cc00cc00c000f0001000000050009001404616c7431c02ac00c000f0001000000050009001e04616c7432c02ac00c000f0001000000050009002804616c7433c02ac00c000f0001000000050009003204616c7434c02ac00c00020001000000050006036e7332c00cc00c00020001000000050006036e7333c00cc00c00020001000000050006036e7334c00cc00c00020001000000050006036e7331c00cc02a00010001000000050004adc2421bc02a001c00010000000500102a00145040080c01000000000000001bc04200010001000000050004adc2461bc05700010001000000050004adc2451bc06c000100010000000500044a7d8f1bc081000100010000000500044a7d191bc0ca00010001000000050004d8ef200ac09400010001000000050004d8ef220ac0a600010001000000050004d8ef240ac0b800010001000000050004d8ef260a0000290500000000050000",
+		// reddit.com. IN A?
+		"12b98180000100080000000c0672656464697403636f6d0000020001c00c0002000100000005000f046175733204616b616d036e657400c00c000200010000000500070475736534c02dc00c000200010000000500070475737733c02dc00c000200010000000500070475737735c02dc00c00020001000000050008056173696131c02dc00c00020001000000050008056173696139c02dc00c00020001000000050008056e73312d31c02dc00c0002000100000005000a076e73312d313935c02dc02800010001000000050004c30a242ec04300010001000000050004451f1d39c05600010001000000050004451f3bc7c0690001000100000005000460073240c07c000100010000000500046007fb81c090000100010000000500047c283484c090001c00010000000500102a0226f0006700000000000000000064c0a400010001000000050004c16c5b01c0a4001c000100000005001026001401000200000000000000000001c0b800010001000000050004c16c5bc3c0b8001c0001000000050010260014010002000000000000000000c30000290500000000050000",
+	}
+
+	for i, hexData := range testMessages {
+		// we won't fail the decoding of the hex
+		input, _ := hex.DecodeString(hexData)
+
+		m := new(Msg)
+		m.Unpack(input)
+		m.Compress = true
+		lenComp := m.Len()
+		b, _ := m.Pack()
+		pacComp := len(b)
+		m.Compress = false
+		lenUnComp := m.Len()
+		b, _ = m.Pack()
+		pacUnComp := len(b)
+		if pacComp+1 != lenComp {
+			t.Errorf("msg.Len(compressed)=%d actual=%d for test %d", lenComp, pacComp, i)
+		}
+		if pacUnComp+1 != lenUnComp {
+			t.Errorf("msg.Len(uncompressed)=%d actual=%d for test %d", lenUnComp, pacUnComp, i)
+		}
+	}
+}
+
+func TestMsgLengthCompressionMalformed(t *testing.T) {
+	// SOA with empty hostmaster, which is illegal
+	soa := &SOA{Hdr: RR_Header{Name: ".", Rrtype: TypeSOA, Class: ClassINET, Ttl: 12345},
+		Ns:      ".",
+		Mbox:    "",
+		Serial:  0,
+		Refresh: 28800,
+		Retry:   7200,
+		Expire:  604800,
+		Minttl:  60}
+	m := new(Msg)
+	m.Compress = true
+	m.Ns = []RR{soa}
+	m.Len() // Should not crash.
+}
+
+func TestMsgCompressLength2(t *testing.T) {
+	msg := new(Msg)
+	msg.Compress = true
+	msg.SetQuestion(Fqdn("bliep."), TypeANY)
+	msg.Answer = append(msg.Answer, &SRV{Hdr: RR_Header{Name: "blaat.", Rrtype: 0x21, Class: 0x1, Ttl: 0x3c}, Port: 0x4c57, Target: "foo.bar."})
+	msg.Extra = append(msg.Extra, &A{Hdr: RR_Header{Name: "foo.bar.", Rrtype: 0x1, Class: 0x1, Ttl: 0x3c}, A: net.IP{0xac, 0x11, 0x0, 0x3}})
+	predicted := msg.Len()
+	buf, err := msg.Pack()
+	if err != nil {
+		t.Error(err)
+	}
+	if predicted != len(buf) {
+		t.Errorf("predicted compressed length is wrong: predicted %s (len=%d) %d, actual %d",
+			msg.Question[0].Name, len(msg.Answer), predicted, len(buf))
+	}
+}
+
+func TestToRFC3597(t *testing.T) {
+	a, _ := NewRR("miek.nl. IN A 10.0.1.1")
+	x := new(RFC3597)
+	x.ToRFC3597(a)
+	if x.String() != `miek.nl.	3600	CLASS1	TYPE1	\# 4 0a000101` {
+		t.Errorf("string mismatch, got: %s", x)
+	}
+
+	b, _ := NewRR("miek.nl. IN MX 10 mx.miek.nl.")
+	x.ToRFC3597(b)
+	if x.String() != `miek.nl.	3600	CLASS1	TYPE15	\# 14 000a026d78046d69656b026e6c00` {
+		t.Errorf("string mismatch, got: %s", x)
+	}
+}
+
+func TestNoRdataPack(t *testing.T) {
+	data := make([]byte, 1024)
+	for typ, fn := range TypeToRR {
+		r := fn()
+		*r.Header() = RR_Header{Name: "miek.nl.", Rrtype: typ, Class: ClassINET, Ttl: 16}
+		_, err := PackRR(r, data, 0, nil, false)
+		if err != nil {
+			t.Errorf("failed to pack RR with zero rdata: %s: %v", TypeToString[typ], err)
+		}
+	}
+}
+
+func TestNoRdataUnpack(t *testing.T) {
+	data := make([]byte, 1024)
+	for typ, fn := range TypeToRR {
+		if typ == TypeSOA || typ == TypeTSIG {
+			// SOA, TSIG will not be seen (like this) in dyn. updates?
+			continue
+		}
+		r := fn()
+		*r.Header() = RR_Header{Name: "miek.nl.", Rrtype: typ, Class: ClassINET, Ttl: 16}
+		off, err := PackRR(r, data, 0, nil, false)
+		if err != nil {
+			// Should always works, TestNoDataPack should have caught this
+			t.Errorf("failed to pack RR: %v", err)
+			continue
+		}
+		rr, _, err := UnpackRR(data[:off], 0)
+		if err != nil {
+			t.Errorf("failed to unpack RR with zero rdata: %s: %v", TypeToString[typ], err)
+		}
+		t.Log(rr)
+	}
+}
+
+func TestRdataOverflow(t *testing.T) {
+	rr := new(RFC3597)
+	rr.Hdr.Name = "."
+	rr.Hdr.Class = ClassINET
+	rr.Hdr.Rrtype = 65280
+	rr.Rdata = hex.EncodeToString(make([]byte, 0xFFFF))
+	buf := make([]byte, 0xFFFF*2)
+	if _, err := PackRR(rr, buf, 0, nil, false); err != nil {
+		t.Fatalf("maximum size rrdata pack failed: %v", err)
+	}
+	rr.Rdata += "00"
+	if _, err := PackRR(rr, buf, 0, nil, false); err != ErrRdata {
+		t.Fatalf("oversize rrdata pack didn't return ErrRdata - instead: %v", err)
+	}
+}
+
+func TestCopy(t *testing.T) {
+	rr, _ := NewRR("miek.nl. 2311 IN A 127.0.0.1") // Weird TTL to avoid catching TTL
+	rr1 := Copy(rr)
+	if rr.String() != rr1.String() {
+		t.Fatalf("Copy() failed %s != %s", rr.String(), rr1.String())
+	}
+}
+
+func TestMsgCopy(t *testing.T) {
+	m := new(Msg)
+	m.SetQuestion("miek.nl.", TypeA)
+	rr, _ := NewRR("miek.nl. 2311 IN A 127.0.0.1")
+	m.Answer = []RR{rr}
+	rr, _ = NewRR("miek.nl. 2311 IN NS 127.0.0.1")
+	m.Ns = []RR{rr}
+
+	m1 := m.Copy()
+	if m.String() != m1.String() {
+		t.Fatalf("Msg.Copy() failed %s != %s", m.String(), m1.String())
+	}
+
+	m1.Answer[0], _ = NewRR("somethingelse.nl. 2311 IN A 127.0.0.1")
+	if m.String() == m1.String() {
+		t.Fatalf("Msg.Copy() failed; change to copy changed template %s", m.String())
+	}
+
+	rr, _ = NewRR("miek.nl. 2311 IN A 127.0.0.2")
+	m1.Answer = append(m1.Answer, rr)
+	if m1.Ns[0].String() == m1.Answer[1].String() {
+		t.Fatalf("Msg.Copy() failed; append changed underlying array %s", m1.Ns[0].String())
+	}
+}
+
+func TestMsgPackBuffer(t *testing.T) {
+	var testMessages = []string{
+		// news.ycombinator.com.in.escapemg.com.	IN	A, response
+		"586285830001000000010000046e6577730b79636f6d62696e61746f7203636f6d02696e086573636170656d6703636f6d0000010001c0210006000100000e10002c036e7332c02103646e730b67726f6f7665736861726bc02d77ed50e600002a3000000e1000093a8000000e10",
+
+		// news.ycombinator.com.in.escapemg.com.	IN	A, question
+		"586201000001000000000000046e6577730b79636f6d62696e61746f7203636f6d02696e086573636170656d6703636f6d0000010001",
+
+		"398781020001000000000000046e6577730b79636f6d62696e61746f7203636f6d0000010001",
+	}
+
+	for i, hexData := range testMessages {
+		// we won't fail the decoding of the hex
+		input, _ := hex.DecodeString(hexData)
+		m := new(Msg)
+		if err := m.Unpack(input); err != nil {
+			t.Errorf("packet %d failed to unpack", i)
+			continue
+		}
+		t.Logf("packet %d %s", i, m.String())
+	}
+}
diff --git a/vendor/github.com/miekg/dns/dnssec.go b/vendor/github.com/miekg/dns/dnssec.go
new file mode 100644
index 0000000000..07262011e6
--- /dev/null
+++ b/vendor/github.com/miekg/dns/dnssec.go
@@ -0,0 +1,720 @@
+package dns
+
+import (
+	"bytes"
+	"crypto"
+	"crypto/dsa"
+	"crypto/ecdsa"
+	"crypto/elliptic"
+	_ "crypto/md5"
+	"crypto/rand"
+	"crypto/rsa"
+	_ "crypto/sha1"
+	_ "crypto/sha256"
+	_ "crypto/sha512"
+	"encoding/asn1"
+	"encoding/binary"
+	"encoding/hex"
+	"math/big"
+	"sort"
+	"strings"
+	"time"
+)
+
+// DNSSEC encryption algorithm codes.
+const (
+	_ uint8 = iota
+	RSAMD5
+	DH
+	DSA
+	_ // Skip 4, RFC 6725, section 2.1
+	RSASHA1
+	DSANSEC3SHA1
+	RSASHA1NSEC3SHA1
+	RSASHA256
+	_ // Skip 9, RFC 6725, section 2.1
+	RSASHA512
+	_ // Skip 11, RFC 6725, section 2.1
+	ECCGOST
+	ECDSAP256SHA256
+	ECDSAP384SHA384
+	INDIRECT   uint8 = 252
+	PRIVATEDNS uint8 = 253 // Private (experimental keys)
+	PRIVATEOID uint8 = 254
+)
+
+// AlgorithmToString is a map of algorithm IDs to algorithm names.
+var AlgorithmToString = map[uint8]string{
+	RSAMD5:           "RSAMD5",
+	DH:               "DH",
+	DSA:              "DSA",
+	RSASHA1:          "RSASHA1",
+	DSANSEC3SHA1:     "DSA-NSEC3-SHA1",
+	RSASHA1NSEC3SHA1: "RSASHA1-NSEC3-SHA1",
+	RSASHA256:        "RSASHA256",
+	RSASHA512:        "RSASHA512",
+	ECCGOST:          "ECC-GOST",
+	ECDSAP256SHA256:  "ECDSAP256SHA256",
+	ECDSAP384SHA384:  "ECDSAP384SHA384",
+	INDIRECT:         "INDIRECT",
+	PRIVATEDNS:       "PRIVATEDNS",
+	PRIVATEOID:       "PRIVATEOID",
+}
+
+// StringToAlgorithm is the reverse of AlgorithmToString.
+var StringToAlgorithm = reverseInt8(AlgorithmToString)
+
+// AlgorithmToHash is a map of algorithm crypto hash IDs to crypto.Hash's.
+var AlgorithmToHash = map[uint8]crypto.Hash{
+	RSAMD5:           crypto.MD5, // Deprecated in RFC 6725
+	RSASHA1:          crypto.SHA1,
+	RSASHA1NSEC3SHA1: crypto.SHA1,
+	RSASHA256:        crypto.SHA256,
+	ECDSAP256SHA256:  crypto.SHA256,
+	ECDSAP384SHA384:  crypto.SHA384,
+	RSASHA512:        crypto.SHA512,
+}
+
+// DNSSEC hashing algorithm codes.
+const (
+	_      uint8 = iota
+	SHA1         // RFC 4034
+	SHA256       // RFC 4509
+	GOST94       // RFC 5933
+	SHA384       // Experimental
+	SHA512       // Experimental
+)
+
+// HashToString is a map of hash IDs to names.
+var HashToString = map[uint8]string{
+	SHA1:   "SHA1",
+	SHA256: "SHA256",
+	GOST94: "GOST94",
+	SHA384: "SHA384",
+	SHA512: "SHA512",
+}
+
+// StringToHash is a map of names to hash IDs.
+var StringToHash = reverseInt8(HashToString)
+
+// DNSKEY flag values.
+const (
+	SEP    = 1
+	REVOKE = 1 << 7
+	ZONE   = 1 << 8
+)
+
+// The RRSIG needs to be converted to wireformat with some of the rdata (the signature) missing.
+type rrsigWireFmt struct {
+	TypeCovered uint16
+	Algorithm   uint8
+	Labels      uint8
+	OrigTtl     uint32
+	Expiration  uint32
+	Inception   uint32
+	KeyTag      uint16
+	SignerName  string `dns:"domain-name"`
+	/* No Signature */
+}
+
+// Used for converting DNSKEY's rdata to wirefmt.
+type dnskeyWireFmt struct {
+	Flags     uint16
+	Protocol  uint8
+	Algorithm uint8
+	PublicKey string `dns:"base64"`
+	/* Nothing is left out */
+}
+
+func divRoundUp(a, b int) int {
+	return (a + b - 1) / b
+}
+
+// KeyTag calculates the keytag (or key-id) of the DNSKEY.
+func (k *DNSKEY) KeyTag() uint16 {
+	if k == nil {
+		return 0
+	}
+	var keytag int
+	switch k.Algorithm {
+	case RSAMD5:
+		// Look at the bottom two bytes of the modules, which the last
+		// item in the pubkey. We could do this faster by looking directly
+		// at the base64 values. But I'm lazy.
+		modulus, _ := fromBase64([]byte(k.PublicKey))
+		if len(modulus) > 1 {
+			x := binary.BigEndian.Uint16(modulus[len(modulus)-2:])
+			keytag = int(x)
+		}
+	default:
+		keywire := new(dnskeyWireFmt)
+		keywire.Flags = k.Flags
+		keywire.Protocol = k.Protocol
+		keywire.Algorithm = k.Algorithm
+		keywire.PublicKey = k.PublicKey
+		wire := make([]byte, DefaultMsgSize)
+		n, err := packKeyWire(keywire, wire)
+		if err != nil {
+			return 0
+		}
+		wire = wire[:n]
+		for i, v := range wire {
+			if i&1 != 0 {
+				keytag += int(v) // must be larger than uint32
+			} else {
+				keytag += int(v) << 8
+			}
+		}
+		keytag += (keytag >> 16) & 0xFFFF
+		keytag &= 0xFFFF
+	}
+	return uint16(keytag)
+}
+
+// ToDS converts a DNSKEY record to a DS record.
+func (k *DNSKEY) ToDS(h uint8) *DS {
+	if k == nil {
+		return nil
+	}
+	ds := new(DS)
+	ds.Hdr.Name = k.Hdr.Name
+	ds.Hdr.Class = k.Hdr.Class
+	ds.Hdr.Rrtype = TypeDS
+	ds.Hdr.Ttl = k.Hdr.Ttl
+	ds.Algorithm = k.Algorithm
+	ds.DigestType = h
+	ds.KeyTag = k.KeyTag()
+
+	keywire := new(dnskeyWireFmt)
+	keywire.Flags = k.Flags
+	keywire.Protocol = k.Protocol
+	keywire.Algorithm = k.Algorithm
+	keywire.PublicKey = k.PublicKey
+	wire := make([]byte, DefaultMsgSize)
+	n, err := packKeyWire(keywire, wire)
+	if err != nil {
+		return nil
+	}
+	wire = wire[:n]
+
+	owner := make([]byte, 255)
+	off, err1 := PackDomainName(strings.ToLower(k.Hdr.Name), owner, 0, nil, false)
+	if err1 != nil {
+		return nil
+	}
+	owner = owner[:off]
+	// RFC4034:
+	// digest = digest_algorithm( DNSKEY owner name | DNSKEY RDATA);
+	// "|" denotes concatenation
+	// DNSKEY RDATA = Flags | Protocol | Algorithm | Public Key.
+
+	var hash crypto.Hash
+	switch h {
+	case SHA1:
+		hash = crypto.SHA1
+	case SHA256:
+		hash = crypto.SHA256
+	case SHA384:
+		hash = crypto.SHA384
+	case SHA512:
+		hash = crypto.SHA512
+	default:
+		return nil
+	}
+
+	s := hash.New()
+	s.Write(owner)
+	s.Write(wire)
+	ds.Digest = hex.EncodeToString(s.Sum(nil))
+	return ds
+}
+
+// ToCDNSKEY converts a DNSKEY record to a CDNSKEY record.
+func (k *DNSKEY) ToCDNSKEY() *CDNSKEY {
+	c := &CDNSKEY{DNSKEY: *k}
+	c.Hdr = *k.Hdr.copyHeader()
+	c.Hdr.Rrtype = TypeCDNSKEY
+	return c
+}
+
+// ToCDS converts a DS record to a CDS record.
+func (d *DS) ToCDS() *CDS {
+	c := &CDS{DS: *d}
+	c.Hdr = *d.Hdr.copyHeader()
+	c.Hdr.Rrtype = TypeCDS
+	return c
+}
+
+// Sign signs an RRSet. The signature needs to be filled in with the values:
+// Inception, Expiration, KeyTag, SignerName and Algorithm.  The rest is copied
+// from the RRset. Sign returns a non-nill error when the signing went OK.
+// There is no check if RRSet is a proper (RFC 2181) RRSet.  If OrigTTL is non
+// zero, it is used as-is, otherwise the TTL of the RRset is used as the
+// OrigTTL.
+func (rr *RRSIG) Sign(k crypto.Signer, rrset []RR) error {
+	if k == nil {
+		return ErrPrivKey
+	}
+	// s.Inception and s.Expiration may be 0 (rollover etc.), the rest must be set
+	if rr.KeyTag == 0 || len(rr.SignerName) == 0 || rr.Algorithm == 0 {
+		return ErrKey
+	}
+
+	rr.Hdr.Rrtype = TypeRRSIG
+	rr.Hdr.Name = rrset[0].Header().Name
+	rr.Hdr.Class = rrset[0].Header().Class
+	if rr.OrigTtl == 0 { // If set don't override
+		rr.OrigTtl = rrset[0].Header().Ttl
+	}
+	rr.TypeCovered = rrset[0].Header().Rrtype
+	rr.Labels = uint8(CountLabel(rrset[0].Header().Name))
+
+	if strings.HasPrefix(rrset[0].Header().Name, "*") {
+		rr.Labels-- // wildcard, remove from label count
+	}
+
+	sigwire := new(rrsigWireFmt)
+	sigwire.TypeCovered = rr.TypeCovered
+	sigwire.Algorithm = rr.Algorithm
+	sigwire.Labels = rr.Labels
+	sigwire.OrigTtl = rr.OrigTtl
+	sigwire.Expiration = rr.Expiration
+	sigwire.Inception = rr.Inception
+	sigwire.KeyTag = rr.KeyTag
+	// For signing, lowercase this name
+	sigwire.SignerName = strings.ToLower(rr.SignerName)
+
+	// Create the desired binary blob
+	signdata := make([]byte, DefaultMsgSize)
+	n, err := packSigWire(sigwire, signdata)
+	if err != nil {
+		return err
+	}
+	signdata = signdata[:n]
+	wire, err := rawSignatureData(rrset, rr)
+	if err != nil {
+		return err
+	}
+
+	hash, ok := AlgorithmToHash[rr.Algorithm]
+	if !ok {
+		return ErrAlg
+	}
+
+	h := hash.New()
+	h.Write(signdata)
+	h.Write(wire)
+
+	signature, err := sign(k, h.Sum(nil), hash, rr.Algorithm)
+	if err != nil {
+		return err
+	}
+
+	rr.Signature = toBase64(signature)
+
+	return nil
+}
+
+func sign(k crypto.Signer, hashed []byte, hash crypto.Hash, alg uint8) ([]byte, error) {
+	signature, err := k.Sign(rand.Reader, hashed, hash)
+	if err != nil {
+		return nil, err
+	}
+
+	switch alg {
+	case RSASHA1, RSASHA1NSEC3SHA1, RSASHA256, RSASHA512:
+		return signature, nil
+
+	case ECDSAP256SHA256, ECDSAP384SHA384:
+		ecdsaSignature := &struct {
+			R, S *big.Int
+		}{}
+		if _, err := asn1.Unmarshal(signature, ecdsaSignature); err != nil {
+			return nil, err
+		}
+
+		var intlen int
+		switch alg {
+		case ECDSAP256SHA256:
+			intlen = 32
+		case ECDSAP384SHA384:
+			intlen = 48
+		}
+
+		signature := intToBytes(ecdsaSignature.R, intlen)
+		signature = append(signature, intToBytes(ecdsaSignature.S, intlen)...)
+		return signature, nil
+
+	// There is no defined interface for what a DSA backed crypto.Signer returns
+	case DSA, DSANSEC3SHA1:
+		// 	t := divRoundUp(divRoundUp(p.PublicKey.Y.BitLen(), 8)-64, 8)
+		// 	signature := []byte{byte(t)}
+		// 	signature = append(signature, intToBytes(r1, 20)...)
+		// 	signature = append(signature, intToBytes(s1, 20)...)
+		// 	rr.Signature = signature
+	}
+
+	return nil, ErrAlg
+}
+
+// Verify validates an RRSet with the signature and key. This is only the
+// cryptographic test, the signature validity period must be checked separately.
+// This function copies the rdata of some RRs (to lowercase domain names) for the validation to work.
+func (rr *RRSIG) Verify(k *DNSKEY, rrset []RR) error {
+	// First the easy checks
+	if !IsRRset(rrset) {
+		return ErrRRset
+	}
+	if rr.KeyTag != k.KeyTag() {
+		return ErrKey
+	}
+	if rr.Hdr.Class != k.Hdr.Class {
+		return ErrKey
+	}
+	if rr.Algorithm != k.Algorithm {
+		return ErrKey
+	}
+	if strings.ToLower(rr.SignerName) != strings.ToLower(k.Hdr.Name) {
+		return ErrKey
+	}
+	if k.Protocol != 3 {
+		return ErrKey
+	}
+
+	// IsRRset checked that we have at least one RR and that the RRs in
+	// the set have consistent type, class, and name. Also check that type and
+	// class matches the RRSIG record.
+	if rrset[0].Header().Class != rr.Hdr.Class {
+		return ErrRRset
+	}
+	if rrset[0].Header().Rrtype != rr.TypeCovered {
+		return ErrRRset
+	}
+
+	// RFC 4035 5.3.2.  Reconstructing the Signed Data
+	// Copy the sig, except the rrsig data
+	sigwire := new(rrsigWireFmt)
+	sigwire.TypeCovered = rr.TypeCovered
+	sigwire.Algorithm = rr.Algorithm
+	sigwire.Labels = rr.Labels
+	sigwire.OrigTtl = rr.OrigTtl
+	sigwire.Expiration = rr.Expiration
+	sigwire.Inception = rr.Inception
+	sigwire.KeyTag = rr.KeyTag
+	sigwire.SignerName = strings.ToLower(rr.SignerName)
+	// Create the desired binary blob
+	signeddata := make([]byte, DefaultMsgSize)
+	n, err := packSigWire(sigwire, signeddata)
+	if err != nil {
+		return err
+	}
+	signeddata = signeddata[:n]
+	wire, err := rawSignatureData(rrset, rr)
+	if err != nil {
+		return err
+	}
+
+	sigbuf := rr.sigBuf()           // Get the binary signature data
+	if rr.Algorithm == PRIVATEDNS { // PRIVATEOID
+		// TODO(miek)
+		// remove the domain name and assume its ours?
+	}
+
+	hash, ok := AlgorithmToHash[rr.Algorithm]
+	if !ok {
+		return ErrAlg
+	}
+
+	switch rr.Algorithm {
+	case RSASHA1, RSASHA1NSEC3SHA1, RSASHA256, RSASHA512, RSAMD5:
+		// TODO(mg): this can be done quicker, ie. cache the pubkey data somewhere??
+		pubkey := k.publicKeyRSA() // Get the key
+		if pubkey == nil {
+			return ErrKey
+		}
+
+		h := hash.New()
+		h.Write(signeddata)
+		h.Write(wire)
+		return rsa.VerifyPKCS1v15(pubkey, hash, h.Sum(nil), sigbuf)
+
+	case ECDSAP256SHA256, ECDSAP384SHA384:
+		pubkey := k.publicKeyECDSA()
+		if pubkey == nil {
+			return ErrKey
+		}
+
+		// Split sigbuf into the r and s coordinates
+		r := new(big.Int).SetBytes(sigbuf[:len(sigbuf)/2])
+		s := new(big.Int).SetBytes(sigbuf[len(sigbuf)/2:])
+
+		h := hash.New()
+		h.Write(signeddata)
+		h.Write(wire)
+		if ecdsa.Verify(pubkey, h.Sum(nil), r, s) {
+			return nil
+		}
+		return ErrSig
+
+	default:
+		return ErrAlg
+	}
+}
+
+// ValidityPeriod uses RFC1982 serial arithmetic to calculate
+// if a signature period is valid. If t is the zero time, the
+// current time is taken other t is. Returns true if the signature
+// is valid at the given time, otherwise returns false.
+func (rr *RRSIG) ValidityPeriod(t time.Time) bool {
+	var utc int64
+	if t.IsZero() {
+		utc = time.Now().UTC().Unix()
+	} else {
+		utc = t.UTC().Unix()
+	}
+	modi := (int64(rr.Inception) - utc) / year68
+	mode := (int64(rr.Expiration) - utc) / year68
+	ti := int64(rr.Inception) + (modi * year68)
+	te := int64(rr.Expiration) + (mode * year68)
+	return ti <= utc && utc <= te
+}
+
+// Return the signatures base64 encodedig sigdata as a byte slice.
+func (rr *RRSIG) sigBuf() []byte {
+	sigbuf, err := fromBase64([]byte(rr.Signature))
+	if err != nil {
+		return nil
+	}
+	return sigbuf
+}
+
+// publicKeyRSA returns the RSA public key from a DNSKEY record.
+func (k *DNSKEY) publicKeyRSA() *rsa.PublicKey {
+	keybuf, err := fromBase64([]byte(k.PublicKey))
+	if err != nil {
+		return nil
+	}
+
+	// RFC 2537/3110, section 2. RSA Public KEY Resource Records
+	// Length is in the 0th byte, unless its zero, then it
+	// it in bytes 1 and 2 and its a 16 bit number
+	explen := uint16(keybuf[0])
+	keyoff := 1
+	if explen == 0 {
+		explen = uint16(keybuf[1])<<8 | uint16(keybuf[2])
+		keyoff = 3
+	}
+	pubkey := new(rsa.PublicKey)
+
+	pubkey.N = big.NewInt(0)
+	shift := uint64((explen - 1) * 8)
+	expo := uint64(0)
+	for i := int(explen - 1); i > 0; i-- {
+		expo += uint64(keybuf[keyoff+i]) << shift
+		shift -= 8
+	}
+	// Remainder
+	expo += uint64(keybuf[keyoff])
+	if expo > 2<<31 {
+		// Larger expo than supported.
+		// println("dns: F5 primes (or larger) are not supported")
+		return nil
+	}
+	pubkey.E = int(expo)
+
+	pubkey.N.SetBytes(keybuf[keyoff+int(explen):])
+	return pubkey
+}
+
+// publicKeyECDSA returns the Curve public key from the DNSKEY record.
+func (k *DNSKEY) publicKeyECDSA() *ecdsa.PublicKey {
+	keybuf, err := fromBase64([]byte(k.PublicKey))
+	if err != nil {
+		return nil
+	}
+	pubkey := new(ecdsa.PublicKey)
+	switch k.Algorithm {
+	case ECDSAP256SHA256:
+		pubkey.Curve = elliptic.P256()
+		if len(keybuf) != 64 {
+			// wrongly encoded key
+			return nil
+		}
+	case ECDSAP384SHA384:
+		pubkey.Curve = elliptic.P384()
+		if len(keybuf) != 96 {
+			// Wrongly encoded key
+			return nil
+		}
+	}
+	pubkey.X = big.NewInt(0)
+	pubkey.X.SetBytes(keybuf[:len(keybuf)/2])
+	pubkey.Y = big.NewInt(0)
+	pubkey.Y.SetBytes(keybuf[len(keybuf)/2:])
+	return pubkey
+}
+
+func (k *DNSKEY) publicKeyDSA() *dsa.PublicKey {
+	keybuf, err := fromBase64([]byte(k.PublicKey))
+	if err != nil {
+		return nil
+	}
+	if len(keybuf) < 22 {
+		return nil
+	}
+	t, keybuf := int(keybuf[0]), keybuf[1:]
+	size := 64 + t*8
+	q, keybuf := keybuf[:20], keybuf[20:]
+	if len(keybuf) != 3*size {
+		return nil
+	}
+	p, keybuf := keybuf[:size], keybuf[size:]
+	g, y := keybuf[:size], keybuf[size:]
+	pubkey := new(dsa.PublicKey)
+	pubkey.Parameters.Q = big.NewInt(0).SetBytes(q)
+	pubkey.Parameters.P = big.NewInt(0).SetBytes(p)
+	pubkey.Parameters.G = big.NewInt(0).SetBytes(g)
+	pubkey.Y = big.NewInt(0).SetBytes(y)
+	return pubkey
+}
+
+type wireSlice [][]byte
+
+func (p wireSlice) Len() int      { return len(p) }
+func (p wireSlice) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
+func (p wireSlice) Less(i, j int) bool {
+	_, ioff, _ := UnpackDomainName(p[i], 0)
+	_, joff, _ := UnpackDomainName(p[j], 0)
+	return bytes.Compare(p[i][ioff+10:], p[j][joff+10:]) < 0
+}
+
+// Return the raw signature data.
+func rawSignatureData(rrset []RR, s *RRSIG) (buf []byte, err error) {
+	wires := make(wireSlice, len(rrset))
+	for i, r := range rrset {
+		r1 := r.copy()
+		r1.Header().Ttl = s.OrigTtl
+		labels := SplitDomainName(r1.Header().Name)
+		// 6.2. Canonical RR Form. (4) - wildcards
+		if len(labels) > int(s.Labels) {
+			// Wildcard
+			r1.Header().Name = "*." + strings.Join(labels[len(labels)-int(s.Labels):], ".") + "."
+		}
+		// RFC 4034: 6.2.  Canonical RR Form. (2) - domain name to lowercase
+		r1.Header().Name = strings.ToLower(r1.Header().Name)
+		// 6.2. Canonical RR Form. (3) - domain rdata to lowercase.
+		//   NS, MD, MF, CNAME, SOA, MB, MG, MR, PTR,
+		//   HINFO, MINFO, MX, RP, AFSDB, RT, SIG, PX, NXT, NAPTR, KX,
+		//   SRV, DNAME, A6
+		//
+		// RFC 6840 - Clarifications and Implementation Notes for DNS Security (DNSSEC):
+		//	Section 6.2 of [RFC4034] also erroneously lists HINFO as a record
+		//	that needs conversion to lowercase, and twice at that.  Since HINFO
+		//	records contain no domain names, they are not subject to case
+		//	conversion.
+		switch x := r1.(type) {
+		case *NS:
+			x.Ns = strings.ToLower(x.Ns)
+		case *CNAME:
+			x.Target = strings.ToLower(x.Target)
+		case *SOA:
+			x.Ns = strings.ToLower(x.Ns)
+			x.Mbox = strings.ToLower(x.Mbox)
+		case *MB:
+			x.Mb = strings.ToLower(x.Mb)
+		case *MG:
+			x.Mg = strings.ToLower(x.Mg)
+		case *MR:
+			x.Mr = strings.ToLower(x.Mr)
+		case *PTR:
+			x.Ptr = strings.ToLower(x.Ptr)
+		case *MINFO:
+			x.Rmail = strings.ToLower(x.Rmail)
+			x.Email = strings.ToLower(x.Email)
+		case *MX:
+			x.Mx = strings.ToLower(x.Mx)
+		case *NAPTR:
+			x.Replacement = strings.ToLower(x.Replacement)
+		case *KX:
+			x.Exchanger = strings.ToLower(x.Exchanger)
+		case *SRV:
+			x.Target = strings.ToLower(x.Target)
+		case *DNAME:
+			x.Target = strings.ToLower(x.Target)
+		}
+		// 6.2. Canonical RR Form. (5) - origTTL
+		wire := make([]byte, r1.len()+1) // +1 to be safe(r)
+		off, err1 := PackRR(r1, wire, 0, nil, false)
+		if err1 != nil {
+			return nil, err1
+		}
+		wire = wire[:off]
+		wires[i] = wire
+	}
+	sort.Sort(wires)
+	for i, wire := range wires {
+		if i > 0 && bytes.Equal(wire, wires[i-1]) {
+			continue
+		}
+		buf = append(buf, wire...)
+	}
+	return buf, nil
+}
+
+func packSigWire(sw *rrsigWireFmt, msg []byte) (int, error) {
+	// copied from zmsg.go RRSIG packing
+	off, err := packUint16(sw.TypeCovered, msg, 0)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(sw.Algorithm, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(sw.Labels, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint32(sw.OrigTtl, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint32(sw.Expiration, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint32(sw.Inception, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(sw.KeyTag, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = PackDomainName(sw.SignerName, msg, off, nil, false)
+	if err != nil {
+		return off, err
+	}
+	return off, nil
+}
+
+func packKeyWire(dw *dnskeyWireFmt, msg []byte) (int, error) {
+	// copied from zmsg.go DNSKEY packing
+	off, err := packUint16(dw.Flags, msg, 0)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(dw.Protocol, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(dw.Algorithm, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringBase64(dw.PublicKey, msg, off)
+	if err != nil {
+		return off, err
+	}
+	return off, nil
+}
diff --git a/vendor/github.com/miekg/dns/dnssec_keygen.go b/vendor/github.com/miekg/dns/dnssec_keygen.go
new file mode 100644
index 0000000000..5e4b7741a6
--- /dev/null
+++ b/vendor/github.com/miekg/dns/dnssec_keygen.go
@@ -0,0 +1,156 @@
+package dns
+
+import (
+	"crypto"
+	"crypto/dsa"
+	"crypto/ecdsa"
+	"crypto/elliptic"
+	"crypto/rand"
+	"crypto/rsa"
+	"math/big"
+)
+
+// Generate generates a DNSKEY of the given bit size.
+// The public part is put inside the DNSKEY record.
+// The Algorithm in the key must be set as this will define
+// what kind of DNSKEY will be generated.
+// The ECDSA algorithms imply a fixed keysize, in that case
+// bits should be set to the size of the algorithm.
+func (k *DNSKEY) Generate(bits int) (crypto.PrivateKey, error) {
+	switch k.Algorithm {
+	case DSA, DSANSEC3SHA1:
+		if bits != 1024 {
+			return nil, ErrKeySize
+		}
+	case RSAMD5, RSASHA1, RSASHA256, RSASHA1NSEC3SHA1:
+		if bits < 512 || bits > 4096 {
+			return nil, ErrKeySize
+		}
+	case RSASHA512:
+		if bits < 1024 || bits > 4096 {
+			return nil, ErrKeySize
+		}
+	case ECDSAP256SHA256:
+		if bits != 256 {
+			return nil, ErrKeySize
+		}
+	case ECDSAP384SHA384:
+		if bits != 384 {
+			return nil, ErrKeySize
+		}
+	}
+
+	switch k.Algorithm {
+	case DSA, DSANSEC3SHA1:
+		params := new(dsa.Parameters)
+		if err := dsa.GenerateParameters(params, rand.Reader, dsa.L1024N160); err != nil {
+			return nil, err
+		}
+		priv := new(dsa.PrivateKey)
+		priv.PublicKey.Parameters = *params
+		err := dsa.GenerateKey(priv, rand.Reader)
+		if err != nil {
+			return nil, err
+		}
+		k.setPublicKeyDSA(params.Q, params.P, params.G, priv.PublicKey.Y)
+		return priv, nil
+	case RSAMD5, RSASHA1, RSASHA256, RSASHA512, RSASHA1NSEC3SHA1:
+		priv, err := rsa.GenerateKey(rand.Reader, bits)
+		if err != nil {
+			return nil, err
+		}
+		k.setPublicKeyRSA(priv.PublicKey.E, priv.PublicKey.N)
+		return priv, nil
+	case ECDSAP256SHA256, ECDSAP384SHA384:
+		var c elliptic.Curve
+		switch k.Algorithm {
+		case ECDSAP256SHA256:
+			c = elliptic.P256()
+		case ECDSAP384SHA384:
+			c = elliptic.P384()
+		}
+		priv, err := ecdsa.GenerateKey(c, rand.Reader)
+		if err != nil {
+			return nil, err
+		}
+		k.setPublicKeyECDSA(priv.PublicKey.X, priv.PublicKey.Y)
+		return priv, nil
+	default:
+		return nil, ErrAlg
+	}
+}
+
+// Set the public key (the value E and N)
+func (k *DNSKEY) setPublicKeyRSA(_E int, _N *big.Int) bool {
+	if _E == 0 || _N == nil {
+		return false
+	}
+	buf := exponentToBuf(_E)
+	buf = append(buf, _N.Bytes()...)
+	k.PublicKey = toBase64(buf)
+	return true
+}
+
+// Set the public key for Elliptic Curves
+func (k *DNSKEY) setPublicKeyECDSA(_X, _Y *big.Int) bool {
+	if _X == nil || _Y == nil {
+		return false
+	}
+	var intlen int
+	switch k.Algorithm {
+	case ECDSAP256SHA256:
+		intlen = 32
+	case ECDSAP384SHA384:
+		intlen = 48
+	}
+	k.PublicKey = toBase64(curveToBuf(_X, _Y, intlen))
+	return true
+}
+
+// Set the public key for DSA
+func (k *DNSKEY) setPublicKeyDSA(_Q, _P, _G, _Y *big.Int) bool {
+	if _Q == nil || _P == nil || _G == nil || _Y == nil {
+		return false
+	}
+	buf := dsaToBuf(_Q, _P, _G, _Y)
+	k.PublicKey = toBase64(buf)
+	return true
+}
+
+// Set the public key (the values E and N) for RSA
+// RFC 3110: Section 2. RSA Public KEY Resource Records
+func exponentToBuf(_E int) []byte {
+	var buf []byte
+	i := big.NewInt(int64(_E)).Bytes()
+	if len(i) < 256 {
+		buf = make([]byte, 1, 1+len(i))
+		buf[0] = uint8(len(i))
+	} else {
+		buf = make([]byte, 3, 3+len(i))
+		buf[0] = 0
+		buf[1] = uint8(len(i) >> 8)
+		buf[2] = uint8(len(i))
+	}
+	buf = append(buf, i...)
+	return buf
+}
+
+// Set the public key for X and Y for Curve. The two
+// values are just concatenated.
+func curveToBuf(_X, _Y *big.Int, intlen int) []byte {
+	buf := intToBytes(_X, intlen)
+	buf = append(buf, intToBytes(_Y, intlen)...)
+	return buf
+}
+
+// Set the public key for X and Y for Curve. The two
+// values are just concatenated.
+func dsaToBuf(_Q, _P, _G, _Y *big.Int) []byte {
+	t := divRoundUp(divRoundUp(_G.BitLen(), 8)-64, 8)
+	buf := []byte{byte(t)}
+	buf = append(buf, intToBytes(_Q, 20)...)
+	buf = append(buf, intToBytes(_P, 64+t*8)...)
+	buf = append(buf, intToBytes(_G, 64+t*8)...)
+	buf = append(buf, intToBytes(_Y, 64+t*8)...)
+	return buf
+}
diff --git a/vendor/github.com/miekg/dns/dnssec_keyscan.go b/vendor/github.com/miekg/dns/dnssec_keyscan.go
new file mode 100644
index 0000000000..4f8d830b85
--- /dev/null
+++ b/vendor/github.com/miekg/dns/dnssec_keyscan.go
@@ -0,0 +1,249 @@
+package dns
+
+import (
+	"crypto"
+	"crypto/dsa"
+	"crypto/ecdsa"
+	"crypto/rsa"
+	"io"
+	"math/big"
+	"strconv"
+	"strings"
+)
+
+// NewPrivateKey returns a PrivateKey by parsing the string s.
+// s should be in the same form of the BIND private key files.
+func (k *DNSKEY) NewPrivateKey(s string) (crypto.PrivateKey, error) {
+	if s == "" || s[len(s)-1] != '\n' { // We need a closing newline
+		return k.ReadPrivateKey(strings.NewReader(s+"\n"), "")
+	}
+	return k.ReadPrivateKey(strings.NewReader(s), "")
+}
+
+// ReadPrivateKey reads a private key from the io.Reader q. The string file is
+// only used in error reporting.
+// The public key must be known, because some cryptographic algorithms embed
+// the public inside the privatekey.
+func (k *DNSKEY) ReadPrivateKey(q io.Reader, file string) (crypto.PrivateKey, error) {
+	m, err := parseKey(q, file)
+	if m == nil {
+		return nil, err
+	}
+	if _, ok := m["private-key-format"]; !ok {
+		return nil, ErrPrivKey
+	}
+	if m["private-key-format"] != "v1.2" && m["private-key-format"] != "v1.3" {
+		return nil, ErrPrivKey
+	}
+	// TODO(mg): check if the pubkey matches the private key
+	algo, err := strconv.ParseUint(strings.SplitN(m["algorithm"], " ", 2)[0], 10, 8)
+	if err != nil {
+		return nil, ErrPrivKey
+	}
+	switch uint8(algo) {
+	case DSA:
+		priv, err := readPrivateKeyDSA(m)
+		if err != nil {
+			return nil, err
+		}
+		pub := k.publicKeyDSA()
+		if pub == nil {
+			return nil, ErrKey
+		}
+		priv.PublicKey = *pub
+		return priv, nil
+	case RSAMD5:
+		fallthrough
+	case RSASHA1:
+		fallthrough
+	case RSASHA1NSEC3SHA1:
+		fallthrough
+	case RSASHA256:
+		fallthrough
+	case RSASHA512:
+		priv, err := readPrivateKeyRSA(m)
+		if err != nil {
+			return nil, err
+		}
+		pub := k.publicKeyRSA()
+		if pub == nil {
+			return nil, ErrKey
+		}
+		priv.PublicKey = *pub
+		return priv, nil
+	case ECCGOST:
+		return nil, ErrPrivKey
+	case ECDSAP256SHA256:
+		fallthrough
+	case ECDSAP384SHA384:
+		priv, err := readPrivateKeyECDSA(m)
+		if err != nil {
+			return nil, err
+		}
+		pub := k.publicKeyECDSA()
+		if pub == nil {
+			return nil, ErrKey
+		}
+		priv.PublicKey = *pub
+		return priv, nil
+	default:
+		return nil, ErrPrivKey
+	}
+}
+
+// Read a private key (file) string and create a public key. Return the private key.
+func readPrivateKeyRSA(m map[string]string) (*rsa.PrivateKey, error) {
+	p := new(rsa.PrivateKey)
+	p.Primes = []*big.Int{nil, nil}
+	for k, v := range m {
+		switch k {
+		case "modulus", "publicexponent", "privateexponent", "prime1", "prime2":
+			v1, err := fromBase64([]byte(v))
+			if err != nil {
+				return nil, err
+			}
+			switch k {
+			case "modulus":
+				p.PublicKey.N = big.NewInt(0)
+				p.PublicKey.N.SetBytes(v1)
+			case "publicexponent":
+				i := big.NewInt(0)
+				i.SetBytes(v1)
+				p.PublicKey.E = int(i.Int64()) // int64 should be large enough
+			case "privateexponent":
+				p.D = big.NewInt(0)
+				p.D.SetBytes(v1)
+			case "prime1":
+				p.Primes[0] = big.NewInt(0)
+				p.Primes[0].SetBytes(v1)
+			case "prime2":
+				p.Primes[1] = big.NewInt(0)
+				p.Primes[1].SetBytes(v1)
+			}
+		case "exponent1", "exponent2", "coefficient":
+			// not used in Go (yet)
+		case "created", "publish", "activate":
+			// not used in Go (yet)
+		}
+	}
+	return p, nil
+}
+
+func readPrivateKeyDSA(m map[string]string) (*dsa.PrivateKey, error) {
+	p := new(dsa.PrivateKey)
+	p.X = big.NewInt(0)
+	for k, v := range m {
+		switch k {
+		case "private_value(x)":
+			v1, err := fromBase64([]byte(v))
+			if err != nil {
+				return nil, err
+			}
+			p.X.SetBytes(v1)
+		case "created", "publish", "activate":
+			/* not used in Go (yet) */
+		}
+	}
+	return p, nil
+}
+
+func readPrivateKeyECDSA(m map[string]string) (*ecdsa.PrivateKey, error) {
+	p := new(ecdsa.PrivateKey)
+	p.D = big.NewInt(0)
+	// TODO: validate that the required flags are present
+	for k, v := range m {
+		switch k {
+		case "privatekey":
+			v1, err := fromBase64([]byte(v))
+			if err != nil {
+				return nil, err
+			}
+			p.D.SetBytes(v1)
+		case "created", "publish", "activate":
+			/* not used in Go (yet) */
+		}
+	}
+	return p, nil
+}
+
+// parseKey reads a private key from r. It returns a map[string]string,
+// with the key-value pairs, or an error when the file is not correct.
+func parseKey(r io.Reader, file string) (map[string]string, error) {
+	s := scanInit(r)
+	m := make(map[string]string)
+	c := make(chan lex)
+	k := ""
+	// Start the lexer
+	go klexer(s, c)
+	for l := range c {
+		// It should alternate
+		switch l.value {
+		case zKey:
+			k = l.token
+		case zValue:
+			if k == "" {
+				return nil, &ParseError{file, "no private key seen", l}
+			}
+			//println("Setting", strings.ToLower(k), "to", l.token, "b")
+			m[strings.ToLower(k)] = l.token
+			k = ""
+		}
+	}
+	return m, nil
+}
+
+// klexer scans the sourcefile and returns tokens on the channel c.
+func klexer(s *scan, c chan lex) {
+	var l lex
+	str := "" // Hold the current read text
+	commt := false
+	key := true
+	x, err := s.tokenText()
+	defer close(c)
+	for err == nil {
+		l.column = s.position.Column
+		l.line = s.position.Line
+		switch x {
+		case ':':
+			if commt {
+				break
+			}
+			l.token = str
+			if key {
+				l.value = zKey
+				c <- l
+				// Next token is a space, eat it
+				s.tokenText()
+				key = false
+				str = ""
+			} else {
+				l.value = zValue
+			}
+		case ';':
+			commt = true
+		case '\n':
+			if commt {
+				// Reset a comment
+				commt = false
+			}
+			l.value = zValue
+			l.token = str
+			c <- l
+			str = ""
+			commt = false
+			key = true
+		default:
+			if commt {
+				break
+			}
+			str += string(x)
+		}
+		x, err = s.tokenText()
+	}
+	if len(str) > 0 {
+		// Send remainder
+		l.token = str
+		l.value = zValue
+		c <- l
+	}
+}
diff --git a/vendor/github.com/miekg/dns/dnssec_privkey.go b/vendor/github.com/miekg/dns/dnssec_privkey.go
new file mode 100644
index 0000000000..56f3ea934f
--- /dev/null
+++ b/vendor/github.com/miekg/dns/dnssec_privkey.go
@@ -0,0 +1,85 @@
+package dns
+
+import (
+	"crypto"
+	"crypto/dsa"
+	"crypto/ecdsa"
+	"crypto/rsa"
+	"math/big"
+	"strconv"
+)
+
+const format = "Private-key-format: v1.3\n"
+
+// PrivateKeyString converts a PrivateKey to a string. This string has the same
+// format as the private-key-file of BIND9 (Private-key-format: v1.3).
+// It needs some info from the key (the algorithm), so its a method of the DNSKEY
+// It supports rsa.PrivateKey, ecdsa.PrivateKey and dsa.PrivateKey
+func (r *DNSKEY) PrivateKeyString(p crypto.PrivateKey) string {
+	algorithm := strconv.Itoa(int(r.Algorithm))
+	algorithm += " (" + AlgorithmToString[r.Algorithm] + ")"
+
+	switch p := p.(type) {
+	case *rsa.PrivateKey:
+		modulus := toBase64(p.PublicKey.N.Bytes())
+		e := big.NewInt(int64(p.PublicKey.E))
+		publicExponent := toBase64(e.Bytes())
+		privateExponent := toBase64(p.D.Bytes())
+		prime1 := toBase64(p.Primes[0].Bytes())
+		prime2 := toBase64(p.Primes[1].Bytes())
+		// Calculate Exponent1/2 and Coefficient as per: http://en.wikipedia.org/wiki/RSA#Using_the_Chinese_remainder_algorithm
+		// and from: http://code.google.com/p/go/issues/detail?id=987
+		one := big.NewInt(1)
+		p1 := big.NewInt(0).Sub(p.Primes[0], one)
+		q1 := big.NewInt(0).Sub(p.Primes[1], one)
+		exp1 := big.NewInt(0).Mod(p.D, p1)
+		exp2 := big.NewInt(0).Mod(p.D, q1)
+		coeff := big.NewInt(0).ModInverse(p.Primes[1], p.Primes[0])
+
+		exponent1 := toBase64(exp1.Bytes())
+		exponent2 := toBase64(exp2.Bytes())
+		coefficient := toBase64(coeff.Bytes())
+
+		return format +
+			"Algorithm: " + algorithm + "\n" +
+			"Modulus: " + modulus + "\n" +
+			"PublicExponent: " + publicExponent + "\n" +
+			"PrivateExponent: " + privateExponent + "\n" +
+			"Prime1: " + prime1 + "\n" +
+			"Prime2: " + prime2 + "\n" +
+			"Exponent1: " + exponent1 + "\n" +
+			"Exponent2: " + exponent2 + "\n" +
+			"Coefficient: " + coefficient + "\n"
+
+	case *ecdsa.PrivateKey:
+		var intlen int
+		switch r.Algorithm {
+		case ECDSAP256SHA256:
+			intlen = 32
+		case ECDSAP384SHA384:
+			intlen = 48
+		}
+		private := toBase64(intToBytes(p.D, intlen))
+		return format +
+			"Algorithm: " + algorithm + "\n" +
+			"PrivateKey: " + private + "\n"
+
+	case *dsa.PrivateKey:
+		T := divRoundUp(divRoundUp(p.PublicKey.Parameters.G.BitLen(), 8)-64, 8)
+		prime := toBase64(intToBytes(p.PublicKey.Parameters.P, 64+T*8))
+		subprime := toBase64(intToBytes(p.PublicKey.Parameters.Q, 20))
+		base := toBase64(intToBytes(p.PublicKey.Parameters.G, 64+T*8))
+		priv := toBase64(intToBytes(p.X, 20))
+		pub := toBase64(intToBytes(p.PublicKey.Y, 64+T*8))
+		return format +
+			"Algorithm: " + algorithm + "\n" +
+			"Prime(p): " + prime + "\n" +
+			"Subprime(q): " + subprime + "\n" +
+			"Base(g): " + base + "\n" +
+			"Private_value(x): " + priv + "\n" +
+			"Public_value(y): " + pub + "\n"
+
+	default:
+		return ""
+	}
+}
diff --git a/vendor/github.com/miekg/dns/dnssec_test.go b/vendor/github.com/miekg/dns/dnssec_test.go
new file mode 100644
index 0000000000..ca085ed3b8
--- /dev/null
+++ b/vendor/github.com/miekg/dns/dnssec_test.go
@@ -0,0 +1,733 @@
+package dns
+
+import (
+	"crypto"
+	"crypto/ecdsa"
+	"crypto/rsa"
+	"reflect"
+	"strings"
+	"testing"
+	"time"
+)
+
+func getKey() *DNSKEY {
+	key := new(DNSKEY)
+	key.Hdr.Name = "miek.nl."
+	key.Hdr.Class = ClassINET
+	key.Hdr.Ttl = 14400
+	key.Flags = 256
+	key.Protocol = 3
+	key.Algorithm = RSASHA256
+	key.PublicKey = "AwEAAcNEU67LJI5GEgF9QLNqLO1SMq1EdoQ6E9f85ha0k0ewQGCblyW2836GiVsm6k8Kr5ECIoMJ6fZWf3CQSQ9ycWfTyOHfmI3eQ/1Covhb2y4bAmL/07PhrL7ozWBW3wBfM335Ft9xjtXHPy7ztCbV9qZ4TVDTW/Iyg0PiwgoXVesz"
+	return key
+}
+
+func getSoa() *SOA {
+	soa := new(SOA)
+	soa.Hdr = RR_Header{"miek.nl.", TypeSOA, ClassINET, 14400, 0}
+	soa.Ns = "open.nlnetlabs.nl."
+	soa.Mbox = "miekg.atoom.net."
+	soa.Serial = 1293945905
+	soa.Refresh = 14400
+	soa.Retry = 3600
+	soa.Expire = 604800
+	soa.Minttl = 86400
+	return soa
+}
+
+func TestGenerateEC(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
+	key := new(DNSKEY)
+	key.Hdr.Rrtype = TypeDNSKEY
+	key.Hdr.Name = "miek.nl."
+	key.Hdr.Class = ClassINET
+	key.Hdr.Ttl = 14400
+	key.Flags = 256
+	key.Protocol = 3
+	key.Algorithm = ECDSAP256SHA256
+	privkey, _ := key.Generate(256)
+	t.Log(key.String())
+	t.Log(key.PrivateKeyString(privkey))
+}
+
+func TestGenerateDSA(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
+	key := new(DNSKEY)
+	key.Hdr.Rrtype = TypeDNSKEY
+	key.Hdr.Name = "miek.nl."
+	key.Hdr.Class = ClassINET
+	key.Hdr.Ttl = 14400
+	key.Flags = 256
+	key.Protocol = 3
+	key.Algorithm = DSA
+	privkey, _ := key.Generate(1024)
+	t.Log(key.String())
+	t.Log(key.PrivateKeyString(privkey))
+}
+
+func TestGenerateRSA(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
+	key := new(DNSKEY)
+	key.Hdr.Rrtype = TypeDNSKEY
+	key.Hdr.Name = "miek.nl."
+	key.Hdr.Class = ClassINET
+	key.Hdr.Ttl = 14400
+	key.Flags = 256
+	key.Protocol = 3
+	key.Algorithm = RSASHA256
+	privkey, _ := key.Generate(1024)
+	t.Log(key.String())
+	t.Log(key.PrivateKeyString(privkey))
+}
+
+func TestSecure(t *testing.T) {
+	soa := getSoa()
+
+	sig := new(RRSIG)
+	sig.Hdr = RR_Header{"miek.nl.", TypeRRSIG, ClassINET, 14400, 0}
+	sig.TypeCovered = TypeSOA
+	sig.Algorithm = RSASHA256
+	sig.Labels = 2
+	sig.Expiration = 1296534305 // date -u '+%s' -d"2011-02-01 04:25:05"
+	sig.Inception = 1293942305  // date -u '+%s' -d"2011-01-02 04:25:05"
+	sig.OrigTtl = 14400
+	sig.KeyTag = 12051
+	sig.SignerName = "miek.nl."
+	sig.Signature = "oMCbslaAVIp/8kVtLSms3tDABpcPRUgHLrOR48OOplkYo+8TeEGWwkSwaz/MRo2fB4FxW0qj/hTlIjUGuACSd+b1wKdH5GvzRJc2pFmxtCbm55ygAh4EUL0F6U5cKtGJGSXxxg6UFCQ0doJCmiGFa78LolaUOXImJrk6AFrGa0M="
+
+	key := new(DNSKEY)
+	key.Hdr.Name = "miek.nl."
+	key.Hdr.Class = ClassINET
+	key.Hdr.Ttl = 14400
+	key.Flags = 256
+	key.Protocol = 3
+	key.Algorithm = RSASHA256
+	key.PublicKey = "AwEAAcNEU67LJI5GEgF9QLNqLO1SMq1EdoQ6E9f85ha0k0ewQGCblyW2836GiVsm6k8Kr5ECIoMJ6fZWf3CQSQ9ycWfTyOHfmI3eQ/1Covhb2y4bAmL/07PhrL7ozWBW3wBfM335Ft9xjtXHPy7ztCbV9qZ4TVDTW/Iyg0PiwgoXVesz"
+
+	// It should validate. Period is checked separately, so this will keep on working
+	if sig.Verify(key, []RR{soa}) != nil {
+		t.Error("failure to validate")
+	}
+}
+
+func TestSignature(t *testing.T) {
+	sig := new(RRSIG)
+	sig.Hdr.Name = "miek.nl."
+	sig.Hdr.Class = ClassINET
+	sig.Hdr.Ttl = 3600
+	sig.TypeCovered = TypeDNSKEY
+	sig.Algorithm = RSASHA1
+	sig.Labels = 2
+	sig.OrigTtl = 4000
+	sig.Expiration = 1000 //Thu Jan  1 02:06:40 CET 1970
+	sig.Inception = 800   //Thu Jan  1 01:13:20 CET 1970
+	sig.KeyTag = 34641
+	sig.SignerName = "miek.nl."
+	sig.Signature = "AwEAAaHIwpx3w4VHKi6i1LHnTaWeHCL154Jug0Rtc9ji5qwPXpBo6A5sRv7cSsPQKPIwxLpyCrbJ4mr2L0EPOdvP6z6YfljK2ZmTbogU9aSU2fiq/4wjxbdkLyoDVgtO+JsxNN4bjr4WcWhsmk1Hg93FV9ZpkWb0Tbad8DFqNDzr//kZ"
+
+	// Should not be valid
+	if sig.ValidityPeriod(time.Now()) {
+		t.Error("should not be valid")
+	}
+
+	sig.Inception = 315565800   //Tue Jan  1 10:10:00 CET 1980
+	sig.Expiration = 4102477800 //Fri Jan  1 10:10:00 CET 2100
+	if !sig.ValidityPeriod(time.Now()) {
+		t.Error("should be valid")
+	}
+}
+
+func TestSignVerify(t *testing.T) {
+	// The record we want to sign
+	soa := new(SOA)
+	soa.Hdr = RR_Header{"miek.nl.", TypeSOA, ClassINET, 14400, 0}
+	soa.Ns = "open.nlnetlabs.nl."
+	soa.Mbox = "miekg.atoom.net."
+	soa.Serial = 1293945905
+	soa.Refresh = 14400
+	soa.Retry = 3600
+	soa.Expire = 604800
+	soa.Minttl = 86400
+
+	soa1 := new(SOA)
+	soa1.Hdr = RR_Header{"*.miek.nl.", TypeSOA, ClassINET, 14400, 0}
+	soa1.Ns = "open.nlnetlabs.nl."
+	soa1.Mbox = "miekg.atoom.net."
+	soa1.Serial = 1293945905
+	soa1.Refresh = 14400
+	soa1.Retry = 3600
+	soa1.Expire = 604800
+	soa1.Minttl = 86400
+
+	srv := new(SRV)
+	srv.Hdr = RR_Header{"srv.miek.nl.", TypeSRV, ClassINET, 14400, 0}
+	srv.Port = 1000
+	srv.Weight = 800
+	srv.Target = "web1.miek.nl."
+
+	hinfo := &HINFO{
+		Hdr: RR_Header{
+			Name:   "miek.nl.",
+			Rrtype: TypeHINFO,
+			Class:  ClassINET,
+			Ttl:    3789,
+		},
+		Cpu: "X",
+		Os:  "Y",
+	}
+
+	// With this key
+	key := new(DNSKEY)
+	key.Hdr.Rrtype = TypeDNSKEY
+	key.Hdr.Name = "miek.nl."
+	key.Hdr.Class = ClassINET
+	key.Hdr.Ttl = 14400
+	key.Flags = 256
+	key.Protocol = 3
+	key.Algorithm = RSASHA256
+	privkey, _ := key.Generate(512)
+
+	// Fill in the values of the Sig, before signing
+	sig := new(RRSIG)
+	sig.Hdr = RR_Header{"miek.nl.", TypeRRSIG, ClassINET, 14400, 0}
+	sig.TypeCovered = soa.Hdr.Rrtype
+	sig.Labels = uint8(CountLabel(soa.Hdr.Name)) // works for all 3
+	sig.OrigTtl = soa.Hdr.Ttl
+	sig.Expiration = 1296534305 // date -u '+%s' -d"2011-02-01 04:25:05"
+	sig.Inception = 1293942305  // date -u '+%s' -d"2011-01-02 04:25:05"
+	sig.KeyTag = key.KeyTag()   // Get the keyfrom the Key
+	sig.SignerName = key.Hdr.Name
+	sig.Algorithm = RSASHA256
+
+	for _, r := range []RR{soa, soa1, srv, hinfo} {
+		if err := sig.Sign(privkey.(*rsa.PrivateKey), []RR{r}); err != nil {
+			t.Error("failure to sign the record:", err)
+			continue
+		}
+		if err := sig.Verify(key, []RR{r}); err != nil {
+			t.Error("failure to validate")
+			continue
+		}
+		t.Logf("validated: %s", r.Header().Name)
+	}
+}
+
+func Test65534(t *testing.T) {
+	t6 := new(RFC3597)
+	t6.Hdr = RR_Header{"miek.nl.", 65534, ClassINET, 14400, 0}
+	t6.Rdata = "505D870001"
+	key := new(DNSKEY)
+	key.Hdr.Name = "miek.nl."
+	key.Hdr.Rrtype = TypeDNSKEY
+	key.Hdr.Class = ClassINET
+	key.Hdr.Ttl = 14400
+	key.Flags = 256
+	key.Protocol = 3
+	key.Algorithm = RSASHA256
+	privkey, _ := key.Generate(1024)
+
+	sig := new(RRSIG)
+	sig.Hdr = RR_Header{"miek.nl.", TypeRRSIG, ClassINET, 14400, 0}
+	sig.TypeCovered = t6.Hdr.Rrtype
+	sig.Labels = uint8(CountLabel(t6.Hdr.Name))
+	sig.OrigTtl = t6.Hdr.Ttl
+	sig.Expiration = 1296534305 // date -u '+%s' -d"2011-02-01 04:25:05"
+	sig.Inception = 1293942305  // date -u '+%s' -d"2011-01-02 04:25:05"
+	sig.KeyTag = key.KeyTag()
+	sig.SignerName = key.Hdr.Name
+	sig.Algorithm = RSASHA256
+	if err := sig.Sign(privkey.(*rsa.PrivateKey), []RR{t6}); err != nil {
+		t.Error(err)
+		t.Error("failure to sign the TYPE65534 record")
+	}
+	if err := sig.Verify(key, []RR{t6}); err != nil {
+		t.Error(err)
+		t.Error("failure to validate")
+	} else {
+		t.Logf("validated: %s", t6.Header().Name)
+	}
+}
+
+func TestDnskey(t *testing.T) {
+	pubkey, err := ReadRR(strings.NewReader(`
+miek.nl.	IN	DNSKEY	256 3 10 AwEAAZuMCu2FdugHkTrXYgl5qixvcDw1aDDlvL46/xJKbHBAHY16fNUb2b65cwko2Js/aJxUYJbZk5dwCDZxYfrfbZVtDPQuc3o8QaChVxC7/JYz2AHc9qHvqQ1j4VrH71RWINlQo6VYjzN/BGpMhOZoZOEwzp1HfsOE3lNYcoWU1smL ;{id = 5240 (zsk), size = 1024b}
+`), "Kmiek.nl.+010+05240.key")
+	if err != nil {
+		t.Fatal(err)
+	}
+	privStr := `Private-key-format: v1.3
+Algorithm: 10 (RSASHA512)
+Modulus: m4wK7YV26AeROtdiCXmqLG9wPDVoMOW8vjr/EkpscEAdjXp81RvZvrlzCSjYmz9onFRgltmTl3AINnFh+t9tlW0M9C5zejxBoKFXELv8ljPYAdz2oe+pDWPhWsfvVFYg2VCjpViPM38EakyE5mhk4TDOnUd+w4TeU1hyhZTWyYs=
+PublicExponent: AQAB
+PrivateExponent: UfCoIQ/Z38l8vB6SSqOI/feGjHEl/fxIPX4euKf0D/32k30fHbSaNFrFOuIFmWMB3LimWVEs6u3dpbB9CQeCVg7hwU5puG7OtuiZJgDAhNeOnxvo5btp4XzPZrJSxR4WNQnwIiYWbl0aFlL1VGgHC/3By89ENZyWaZcMLW4KGWE=
+Prime1: yxwC6ogAu8aVcDx2wg1V0b5M5P6jP8qkRFVMxWNTw60Vkn+ECvw6YAZZBHZPaMyRYZLzPgUlyYRd0cjupy4+fQ==
+Prime2: xA1bF8M0RTIQ6+A11AoVG6GIR/aPGg5sogRkIZ7ID/sF6g9HMVU/CM2TqVEBJLRPp73cv6ZeC3bcqOCqZhz+pw==
+Exponent1: xzkblyZ96bGYxTVZm2/vHMOXswod4KWIyMoOepK6B/ZPcZoIT6omLCgtypWtwHLfqyCz3MK51Nc0G2EGzg8rFQ==
+Exponent2: Pu5+mCEb7T5F+kFNZhQadHUklt0JUHbi3hsEvVoHpEGSw3BGDQrtIflDde0/rbWHgDPM4WQY+hscd8UuTXrvLw==
+Coefficient: UuRoNqe7YHnKmQzE6iDWKTMIWTuoqqrFAmXPmKQnC+Y+BQzOVEHUo9bXdDnoI9hzXP1gf8zENMYwYLeWpuYlFQ==
+`
+	privkey, err := pubkey.(*DNSKEY).ReadPrivateKey(strings.NewReader(privStr),
+		"Kmiek.nl.+010+05240.private")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if pubkey.(*DNSKEY).PublicKey != "AwEAAZuMCu2FdugHkTrXYgl5qixvcDw1aDDlvL46/xJKbHBAHY16fNUb2b65cwko2Js/aJxUYJbZk5dwCDZxYfrfbZVtDPQuc3o8QaChVxC7/JYz2AHc9qHvqQ1j4VrH71RWINlQo6VYjzN/BGpMhOZoZOEwzp1HfsOE3lNYcoWU1smL" {
+		t.Error("pubkey is not what we've read")
+	}
+	if pubkey.(*DNSKEY).PrivateKeyString(privkey) != privStr {
+		t.Error("privkey is not what we've read")
+		t.Errorf("%v", pubkey.(*DNSKEY).PrivateKeyString(privkey))
+	}
+}
+
+func TestTag(t *testing.T) {
+	key := new(DNSKEY)
+	key.Hdr.Name = "miek.nl."
+	key.Hdr.Rrtype = TypeDNSKEY
+	key.Hdr.Class = ClassINET
+	key.Hdr.Ttl = 3600
+	key.Flags = 256
+	key.Protocol = 3
+	key.Algorithm = RSASHA256
+	key.PublicKey = "AwEAAcNEU67LJI5GEgF9QLNqLO1SMq1EdoQ6E9f85ha0k0ewQGCblyW2836GiVsm6k8Kr5ECIoMJ6fZWf3CQSQ9ycWfTyOHfmI3eQ/1Covhb2y4bAmL/07PhrL7ozWBW3wBfM335Ft9xjtXHPy7ztCbV9qZ4TVDTW/Iyg0PiwgoXVesz"
+
+	tag := key.KeyTag()
+	if tag != 12051 {
+		t.Errorf("wrong key tag: %d for key %v", tag, key)
+	}
+}
+
+func TestKeyRSA(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
+	key := new(DNSKEY)
+	key.Hdr.Name = "miek.nl."
+	key.Hdr.Rrtype = TypeDNSKEY
+	key.Hdr.Class = ClassINET
+	key.Hdr.Ttl = 3600
+	key.Flags = 256
+	key.Protocol = 3
+	key.Algorithm = RSASHA256
+	priv, _ := key.Generate(2048)
+
+	soa := new(SOA)
+	soa.Hdr = RR_Header{"miek.nl.", TypeSOA, ClassINET, 14400, 0}
+	soa.Ns = "open.nlnetlabs.nl."
+	soa.Mbox = "miekg.atoom.net."
+	soa.Serial = 1293945905
+	soa.Refresh = 14400
+	soa.Retry = 3600
+	soa.Expire = 604800
+	soa.Minttl = 86400
+
+	sig := new(RRSIG)
+	sig.Hdr = RR_Header{"miek.nl.", TypeRRSIG, ClassINET, 14400, 0}
+	sig.TypeCovered = TypeSOA
+	sig.Algorithm = RSASHA256
+	sig.Labels = 2
+	sig.Expiration = 1296534305 // date -u '+%s' -d"2011-02-01 04:25:05"
+	sig.Inception = 1293942305  // date -u '+%s' -d"2011-01-02 04:25:05"
+	sig.OrigTtl = soa.Hdr.Ttl
+	sig.KeyTag = key.KeyTag()
+	sig.SignerName = key.Hdr.Name
+
+	if err := sig.Sign(priv.(*rsa.PrivateKey), []RR{soa}); err != nil {
+		t.Error("failed to sign")
+		return
+	}
+	if err := sig.Verify(key, []RR{soa}); err != nil {
+		t.Error("failed to verify")
+	}
+}
+
+func TestKeyToDS(t *testing.T) {
+	key := new(DNSKEY)
+	key.Hdr.Name = "miek.nl."
+	key.Hdr.Rrtype = TypeDNSKEY
+	key.Hdr.Class = ClassINET
+	key.Hdr.Ttl = 3600
+	key.Flags = 256
+	key.Protocol = 3
+	key.Algorithm = RSASHA256
+	key.PublicKey = "AwEAAcNEU67LJI5GEgF9QLNqLO1SMq1EdoQ6E9f85ha0k0ewQGCblyW2836GiVsm6k8Kr5ECIoMJ6fZWf3CQSQ9ycWfTyOHfmI3eQ/1Covhb2y4bAmL/07PhrL7ozWBW3wBfM335Ft9xjtXHPy7ztCbV9qZ4TVDTW/Iyg0PiwgoXVesz"
+
+	ds := key.ToDS(SHA1)
+	if strings.ToUpper(ds.Digest) != "B5121BDB5B8D86D0CC5FFAFBAAABE26C3E20BAC1" {
+		t.Errorf("wrong DS digest for SHA1\n%v", ds)
+	}
+}
+
+func TestSignRSA(t *testing.T) {
+	pub := "miek.nl. IN DNSKEY 256 3 5 AwEAAb+8lGNCxJgLS8rYVer6EnHVuIkQDghdjdtewDzU3G5R7PbMbKVRvH2Ma7pQyYceoaqWZQirSj72euPWfPxQnMy9ucCylA+FuH9cSjIcPf4PqJfdupHk9X6EBYjxrCLY4p1/yBwgyBIRJtZtAqM3ceAH2WovEJD6rTtOuHo5AluJ"
+
+	priv := `Private-key-format: v1.3
+Algorithm: 5 (RSASHA1)
+Modulus: v7yUY0LEmAtLythV6voScdW4iRAOCF2N217APNTcblHs9sxspVG8fYxrulDJhx6hqpZlCKtKPvZ649Z8/FCczL25wLKUD4W4f1xKMhw9/g+ol926keT1foQFiPGsItjinX/IHCDIEhEm1m0Cozdx4AfZai8QkPqtO064ejkCW4k=
+PublicExponent: AQAB
+PrivateExponent: YPwEmwjk5HuiROKU4xzHQ6l1hG8Iiha4cKRG3P5W2b66/EN/GUh07ZSf0UiYB67o257jUDVEgwCuPJz776zfApcCB4oGV+YDyEu7Hp/rL8KcSN0la0k2r9scKwxTp4BTJT23zyBFXsV/1wRDK1A5NxsHPDMYi2SoK63Enm/1ptk=
+Prime1: /wjOG+fD0ybNoSRn7nQ79udGeR1b0YhUA5mNjDx/x2fxtIXzygYk0Rhx9QFfDy6LOBvz92gbNQlzCLz3DJt5hw==
+Prime2: wHZsJ8OGhkp5p3mrJFZXMDc2mbYusDVTA+t+iRPdS797Tj0pjvU2HN4vTnTj8KBQp6hmnY7dLp9Y1qserySGbw==
+Exponent1: N0A7FsSRIg+IAN8YPQqlawoTtG1t1OkJ+nWrurPootScApX6iMvn8fyvw3p2k51rv84efnzpWAYiC8SUaQDNxQ==
+Exponent2: SvuYRaGyvo0zemE3oS+WRm2scxR8eiA8WJGeOc+obwOKCcBgeZblXzfdHGcEC1KaOcetOwNW/vwMA46lpLzJNw==
+Coefficient: 8+7ZN/JgByqv0NfULiFKTjtyegUcijRuyij7yNxYbCBneDvZGxJwKNi4YYXWx743pcAj4Oi4Oh86gcmxLs+hGw==
+Created: 20110302104537
+Publish: 20110302104537
+Activate: 20110302104537`
+
+	xk, _ := NewRR(pub)
+	k := xk.(*DNSKEY)
+	p, err := k.NewPrivateKey(priv)
+	if err != nil {
+		t.Error(err)
+	}
+	switch priv := p.(type) {
+	case *rsa.PrivateKey:
+		if 65537 != priv.PublicKey.E {
+			t.Error("exponenent should be 65537")
+		}
+	default:
+		t.Errorf("we should have read an RSA key: %v", priv)
+	}
+	if k.KeyTag() != 37350 {
+		t.Errorf("keytag should be 37350, got %d %v", k.KeyTag(), k)
+	}
+
+	soa := new(SOA)
+	soa.Hdr = RR_Header{"miek.nl.", TypeSOA, ClassINET, 14400, 0}
+	soa.Ns = "open.nlnetlabs.nl."
+	soa.Mbox = "miekg.atoom.net."
+	soa.Serial = 1293945905
+	soa.Refresh = 14400
+	soa.Retry = 3600
+	soa.Expire = 604800
+	soa.Minttl = 86400
+
+	sig := new(RRSIG)
+	sig.Hdr = RR_Header{"miek.nl.", TypeRRSIG, ClassINET, 14400, 0}
+	sig.Expiration = 1296534305 // date -u '+%s' -d"2011-02-01 04:25:05"
+	sig.Inception = 1293942305  // date -u '+%s' -d"2011-01-02 04:25:05"
+	sig.KeyTag = k.KeyTag()
+	sig.SignerName = k.Hdr.Name
+	sig.Algorithm = k.Algorithm
+
+	sig.Sign(p.(*rsa.PrivateKey), []RR{soa})
+	if sig.Signature != "D5zsobpQcmMmYsUMLxCVEtgAdCvTu8V/IEeP4EyLBjqPJmjt96bwM9kqihsccofA5LIJ7DN91qkCORjWSTwNhzCv7bMyr2o5vBZElrlpnRzlvsFIoAZCD9xg6ZY7ZyzUJmU6IcTwG4v3xEYajcpbJJiyaw/RqR90MuRdKPiBzSo=" {
+		t.Errorf("signature is not correct: %v", sig)
+	}
+}
+
+func TestSignVerifyECDSA(t *testing.T) {
+	pub := `example.net. 3600 IN DNSKEY 257 3 14 (
+	xKYaNhWdGOfJ+nPrL8/arkwf2EY3MDJ+SErKivBVSum1
+	w/egsXvSADtNJhyem5RCOpgQ6K8X1DRSEkrbYQ+OB+v8
+	/uX45NBwY8rp65F6Glur8I/mlVNgF6W/qTI37m40 )`
+	priv := `Private-key-format: v1.2
+Algorithm: 14 (ECDSAP384SHA384)
+PrivateKey: WURgWHCcYIYUPWgeLmiPY2DJJk02vgrmTfitxgqcL4vwW7BOrbawVmVe0d9V94SR`
+
+	eckey, err := NewRR(pub)
+	if err != nil {
+		t.Fatal(err)
+	}
+	privkey, err := eckey.(*DNSKEY).NewPrivateKey(priv)
+	if err != nil {
+		t.Fatal(err)
+	}
+	// TODO: Create separate test for this
+	ds := eckey.(*DNSKEY).ToDS(SHA384)
+	if ds.KeyTag != 10771 {
+		t.Fatal("wrong keytag on DS")
+	}
+	if ds.Digest != "72d7b62976ce06438e9c0bf319013cf801f09ecc84b8d7e9495f27e305c6a9b0563a9b5f4d288405c3008a946df983d6" {
+		t.Fatal("wrong DS Digest")
+	}
+	a, _ := NewRR("www.example.net. 3600 IN A 192.0.2.1")
+	sig := new(RRSIG)
+	sig.Hdr = RR_Header{"example.net.", TypeRRSIG, ClassINET, 14400, 0}
+	sig.Expiration, _ = StringToTime("20100909102025")
+	sig.Inception, _ = StringToTime("20100812102025")
+	sig.KeyTag = eckey.(*DNSKEY).KeyTag()
+	sig.SignerName = eckey.(*DNSKEY).Hdr.Name
+	sig.Algorithm = eckey.(*DNSKEY).Algorithm
+
+	if sig.Sign(privkey.(*ecdsa.PrivateKey), []RR{a}) != nil {
+		t.Fatal("failure to sign the record")
+	}
+
+	if err := sig.Verify(eckey.(*DNSKEY), []RR{a}); err != nil {
+		t.Fatalf("failure to validate:\n%s\n%s\n%s\n\n%s\n\n%v",
+			eckey.(*DNSKEY).String(),
+			a.String(),
+			sig.String(),
+			eckey.(*DNSKEY).PrivateKeyString(privkey),
+			err,
+		)
+	}
+}
+
+func TestSignVerifyECDSA2(t *testing.T) {
+	srv1, err := NewRR("srv.miek.nl. IN SRV 1000 800 0 web1.miek.nl.")
+	if err != nil {
+		t.Fatal(err)
+	}
+	srv := srv1.(*SRV)
+
+	// With this key
+	key := new(DNSKEY)
+	key.Hdr.Rrtype = TypeDNSKEY
+	key.Hdr.Name = "miek.nl."
+	key.Hdr.Class = ClassINET
+	key.Hdr.Ttl = 14400
+	key.Flags = 256
+	key.Protocol = 3
+	key.Algorithm = ECDSAP256SHA256
+	privkey, err := key.Generate(256)
+	if err != nil {
+		t.Fatal("failure to generate key")
+	}
+
+	// Fill in the values of the Sig, before signing
+	sig := new(RRSIG)
+	sig.Hdr = RR_Header{"miek.nl.", TypeRRSIG, ClassINET, 14400, 0}
+	sig.TypeCovered = srv.Hdr.Rrtype
+	sig.Labels = uint8(CountLabel(srv.Hdr.Name)) // works for all 3
+	sig.OrigTtl = srv.Hdr.Ttl
+	sig.Expiration = 1296534305 // date -u '+%s' -d"2011-02-01 04:25:05"
+	sig.Inception = 1293942305  // date -u '+%s' -d"2011-01-02 04:25:05"
+	sig.KeyTag = key.KeyTag()   // Get the keyfrom the Key
+	sig.SignerName = key.Hdr.Name
+	sig.Algorithm = ECDSAP256SHA256
+
+	if sig.Sign(privkey.(*ecdsa.PrivateKey), []RR{srv}) != nil {
+		t.Fatal("failure to sign the record")
+	}
+
+	err = sig.Verify(key, []RR{srv})
+	if err != nil {
+		t.Logf("failure to validate:\n%s\n%s\n%s\n\n%s\n\n%v",
+			key.String(),
+			srv.String(),
+			sig.String(),
+			key.PrivateKeyString(privkey),
+			err,
+		)
+	}
+}
+
+// Here the test vectors from the relevant RFCs are checked.
+// rfc6605 6.1
+func TestRFC6605P256(t *testing.T) {
+	exDNSKEY := `example.net. 3600 IN DNSKEY 257 3 13 (
+                 GojIhhXUN/u4v54ZQqGSnyhWJwaubCvTmeexv7bR6edb
+                 krSqQpF64cYbcB7wNcP+e+MAnLr+Wi9xMWyQLc8NAA== )`
+	exPriv := `Private-key-format: v1.2
+Algorithm: 13 (ECDSAP256SHA256)
+PrivateKey: GU6SnQ/Ou+xC5RumuIUIuJZteXT2z0O/ok1s38Et6mQ=`
+	rrDNSKEY, err := NewRR(exDNSKEY)
+	if err != nil {
+		t.Fatal(err)
+	}
+	priv, err := rrDNSKEY.(*DNSKEY).NewPrivateKey(exPriv)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	exDS := `example.net. 3600 IN DS 55648 13 2 (
+             b4c8c1fe2e7477127b27115656ad6256f424625bf5c1
+             e2770ce6d6e37df61d17 )`
+	rrDS, err := NewRR(exDS)
+	if err != nil {
+		t.Fatal(err)
+	}
+	ourDS := rrDNSKEY.(*DNSKEY).ToDS(SHA256)
+	if !reflect.DeepEqual(ourDS, rrDS.(*DS)) {
+		t.Errorf("DS record differs:\n%v\n%v", ourDS, rrDS.(*DS))
+	}
+
+	exA := `www.example.net. 3600 IN A 192.0.2.1`
+	exRRSIG := `www.example.net. 3600 IN RRSIG A 13 3 3600 (
+                20100909100439 20100812100439 55648 example.net.
+                qx6wLYqmh+l9oCKTN6qIc+bw6ya+KJ8oMz0YP107epXA
+                yGmt+3SNruPFKG7tZoLBLlUzGGus7ZwmwWep666VCw== )`
+	rrA, err := NewRR(exA)
+	if err != nil {
+		t.Fatal(err)
+	}
+	rrRRSIG, err := NewRR(exRRSIG)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err = rrRRSIG.(*RRSIG).Verify(rrDNSKEY.(*DNSKEY), []RR{rrA}); err != nil {
+		t.Errorf("failure to validate the spec RRSIG: %v", err)
+	}
+
+	ourRRSIG := &RRSIG{
+		Hdr: RR_Header{
+			Ttl: rrA.Header().Ttl,
+		},
+		KeyTag:     rrDNSKEY.(*DNSKEY).KeyTag(),
+		SignerName: rrDNSKEY.(*DNSKEY).Hdr.Name,
+		Algorithm:  rrDNSKEY.(*DNSKEY).Algorithm,
+	}
+	ourRRSIG.Expiration, _ = StringToTime("20100909100439")
+	ourRRSIG.Inception, _ = StringToTime("20100812100439")
+	err = ourRRSIG.Sign(priv.(*ecdsa.PrivateKey), []RR{rrA})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if err = ourRRSIG.Verify(rrDNSKEY.(*DNSKEY), []RR{rrA}); err != nil {
+		t.Errorf("failure to validate our RRSIG: %v", err)
+	}
+
+	// Signatures are randomized
+	rrRRSIG.(*RRSIG).Signature = ""
+	ourRRSIG.Signature = ""
+	if !reflect.DeepEqual(ourRRSIG, rrRRSIG.(*RRSIG)) {
+		t.Fatalf("RRSIG record differs:\n%v\n%v", ourRRSIG, rrRRSIG.(*RRSIG))
+	}
+}
+
+// rfc6605 6.2
+func TestRFC6605P384(t *testing.T) {
+	exDNSKEY := `example.net. 3600 IN DNSKEY 257 3 14 (
+                 xKYaNhWdGOfJ+nPrL8/arkwf2EY3MDJ+SErKivBVSum1
+                 w/egsXvSADtNJhyem5RCOpgQ6K8X1DRSEkrbYQ+OB+v8
+                 /uX45NBwY8rp65F6Glur8I/mlVNgF6W/qTI37m40 )`
+	exPriv := `Private-key-format: v1.2
+Algorithm: 14 (ECDSAP384SHA384)
+PrivateKey: WURgWHCcYIYUPWgeLmiPY2DJJk02vgrmTfitxgqcL4vwW7BOrbawVmVe0d9V94SR`
+	rrDNSKEY, err := NewRR(exDNSKEY)
+	if err != nil {
+		t.Fatal(err)
+	}
+	priv, err := rrDNSKEY.(*DNSKEY).NewPrivateKey(exPriv)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	exDS := `example.net. 3600 IN DS 10771 14 4 (
+           72d7b62976ce06438e9c0bf319013cf801f09ecc84b8
+           d7e9495f27e305c6a9b0563a9b5f4d288405c3008a94
+           6df983d6 )`
+	rrDS, err := NewRR(exDS)
+	if err != nil {
+		t.Fatal(err)
+	}
+	ourDS := rrDNSKEY.(*DNSKEY).ToDS(SHA384)
+	if !reflect.DeepEqual(ourDS, rrDS.(*DS)) {
+		t.Fatalf("DS record differs:\n%v\n%v", ourDS, rrDS.(*DS))
+	}
+
+	exA := `www.example.net. 3600 IN A 192.0.2.1`
+	exRRSIG := `www.example.net. 3600 IN RRSIG A 14 3 3600 (
+           20100909102025 20100812102025 10771 example.net.
+           /L5hDKIvGDyI1fcARX3z65qrmPsVz73QD1Mr5CEqOiLP
+           95hxQouuroGCeZOvzFaxsT8Glr74hbavRKayJNuydCuz
+           WTSSPdz7wnqXL5bdcJzusdnI0RSMROxxwGipWcJm )`
+	rrA, err := NewRR(exA)
+	if err != nil {
+		t.Fatal(err)
+	}
+	rrRRSIG, err := NewRR(exRRSIG)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err = rrRRSIG.(*RRSIG).Verify(rrDNSKEY.(*DNSKEY), []RR{rrA}); err != nil {
+		t.Errorf("failure to validate the spec RRSIG: %v", err)
+	}
+
+	ourRRSIG := &RRSIG{
+		Hdr: RR_Header{
+			Ttl: rrA.Header().Ttl,
+		},
+		KeyTag:     rrDNSKEY.(*DNSKEY).KeyTag(),
+		SignerName: rrDNSKEY.(*DNSKEY).Hdr.Name,
+		Algorithm:  rrDNSKEY.(*DNSKEY).Algorithm,
+	}
+	ourRRSIG.Expiration, _ = StringToTime("20100909102025")
+	ourRRSIG.Inception, _ = StringToTime("20100812102025")
+	err = ourRRSIG.Sign(priv.(*ecdsa.PrivateKey), []RR{rrA})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if err = ourRRSIG.Verify(rrDNSKEY.(*DNSKEY), []RR{rrA}); err != nil {
+		t.Errorf("failure to validate our RRSIG: %v", err)
+	}
+
+	// Signatures are randomized
+	rrRRSIG.(*RRSIG).Signature = ""
+	ourRRSIG.Signature = ""
+	if !reflect.DeepEqual(ourRRSIG, rrRRSIG.(*RRSIG)) {
+		t.Fatalf("RRSIG record differs:\n%v\n%v", ourRRSIG, rrRRSIG.(*RRSIG))
+	}
+}
+
+func TestInvalidRRSet(t *testing.T) {
+	goodRecords := make([]RR, 2)
+	goodRecords[0] = &TXT{Hdr: RR_Header{Name: "name.cloudflare.com.", Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"Hello world"}}
+	goodRecords[1] = &TXT{Hdr: RR_Header{Name: "name.cloudflare.com.", Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"_o/"}}
+
+	// Generate key
+	keyname := "cloudflare.com."
+	key := &DNSKEY{
+		Hdr:       RR_Header{Name: keyname, Rrtype: TypeDNSKEY, Class: ClassINET, Ttl: 0},
+		Algorithm: ECDSAP256SHA256,
+		Flags:     ZONE,
+		Protocol:  3,
+	}
+	privatekey, err := key.Generate(256)
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+
+	// Need to fill in: Inception, Expiration, KeyTag, SignerName and Algorithm
+	curTime := time.Now()
+	signature := &RRSIG{
+		Inception:  uint32(curTime.Unix()),
+		Expiration: uint32(curTime.Add(time.Hour).Unix()),
+		KeyTag:     key.KeyTag(),
+		SignerName: keyname,
+		Algorithm:  ECDSAP256SHA256,
+	}
+
+	// Inconsistent name between records
+	badRecords := make([]RR, 2)
+	badRecords[0] = &TXT{Hdr: RR_Header{Name: "name.cloudflare.com.", Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"Hello world"}}
+	badRecords[1] = &TXT{Hdr: RR_Header{Name: "nama.cloudflare.com.", Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"_o/"}}
+
+	if IsRRset(badRecords) {
+		t.Fatal("Record set with inconsistent names considered valid")
+	}
+
+	badRecords[0] = &TXT{Hdr: RR_Header{Name: "name.cloudflare.com.", Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"Hello world"}}
+	badRecords[1] = &A{Hdr: RR_Header{Name: "name.cloudflare.com.", Rrtype: TypeA, Class: ClassINET, Ttl: 0}}
+
+	if IsRRset(badRecords) {
+		t.Fatal("Record set with inconsistent record types considered valid")
+	}
+
+	badRecords[0] = &TXT{Hdr: RR_Header{Name: "name.cloudflare.com.", Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"Hello world"}}
+	badRecords[1] = &TXT{Hdr: RR_Header{Name: "name.cloudflare.com.", Rrtype: TypeTXT, Class: ClassCHAOS, Ttl: 0}, Txt: []string{"_o/"}}
+
+	if IsRRset(badRecords) {
+		t.Fatal("Record set with inconsistent record class considered valid")
+	}
+
+	// Sign the good record set and then make sure verification fails on the bad record set
+	if err := signature.Sign(privatekey.(crypto.Signer), goodRecords); err != nil {
+		t.Fatal("Signing good records failed")
+	}
+
+	if err := signature.Verify(key, badRecords); err != ErrRRset {
+		t.Fatal("Verification did not return ErrRRset with inconsistent records")
+	}
+}
diff --git a/vendor/github.com/miekg/dns/dnsutil/util.go b/vendor/github.com/miekg/dns/dnsutil/util.go
new file mode 100644
index 0000000000..9ed03f2969
--- /dev/null
+++ b/vendor/github.com/miekg/dns/dnsutil/util.go
@@ -0,0 +1,79 @@
+// Package dnsutil contains higher-level methods useful with the dns
+// package.  While package dns implements the DNS protocols itself,
+// these functions are related but not directly required for protocol
+// processing.  They are often useful in preparing input/output of the
+// functions in package dns.
+package dnsutil
+
+import (
+	"strings"
+
+	"github.com/miekg/dns"
+)
+
+// AddDomain adds origin to s if s is not already a FQDN.
+// Note that the result may not be a FQDN.  If origin does not end
+// with a ".", the result won't either.
+// This implements the zonefile convention (specified in RFC 1035,
+// Section "5.1. Format") that "@" represents the
+// apex (bare) domain. i.e. AddOrigin("@", "foo.com.") returns "foo.com.".
+func AddOrigin(s, origin string) string {
+	// ("foo.", "origin.") -> "foo." (already a FQDN)
+	// ("foo", "origin.") -> "foo.origin."
+	// ("foo"), "origin" -> "foo.origin"
+	// ("@", "origin.") -> "origin." (@ represents the apex (bare) domain)
+	// ("", "origin.") -> "origin." (not obvious)
+	// ("foo", "") -> "foo" (not obvious)
+
+	if dns.IsFqdn(s) {
+		return s // s is already a FQDN, no need to mess with it.
+	}
+	if len(origin) == 0 {
+		return s // Nothing to append.
+	}
+	if s == "@" || len(s) == 0 {
+		return origin // Expand apex.
+	}
+
+	if origin == "." {
+		return s + origin // AddOrigin(s, ".") is an expensive way to add a ".".
+	}
+
+	return s + "." + origin // The simple case.
+}
+
+// TrimDomainName trims origin from s if s is a subdomain.
+// This function will never return "", but returns "@" instead (@ represents the apex (bare) domain).
+func TrimDomainName(s, origin string) string {
+	// An apex (bare) domain is always returned as "@".
+	// If the return value ends in a ".", the domain was not the suffix.
+	// origin can end in "." or not. Either way the results should be the same.
+
+	if len(s) == 0 {
+		return "@" // Return the apex (@) rather than "".
+	}
+	// Someone is using TrimDomainName(s, ".") to remove a dot if it exists.
+	if origin == "." {
+		return strings.TrimSuffix(s, origin)
+	}
+
+	// Dude, you aren't even if the right subdomain!
+	if !dns.IsSubDomain(origin, s) {
+		return s
+	}
+
+	slabels := dns.Split(s)
+	olabels := dns.Split(origin)
+	m := dns.CompareDomainName(s, origin)
+	if len(olabels) == m {
+		if len(olabels) == len(slabels) {
+			return "@" // origin == s
+		}
+		if (s[0] == '.') && (len(slabels) == (len(olabels) + 1)) {
+			return "@" // TrimDomainName(".foo.", "foo.")
+		}
+	}
+
+	// Return the first (len-m) labels:
+	return s[:slabels[len(slabels)-m]-1]
+}
diff --git a/vendor/github.com/miekg/dns/dnsutil/util_test.go b/vendor/github.com/miekg/dns/dnsutil/util_test.go
new file mode 100644
index 0000000000..0f1ecec8e0
--- /dev/null
+++ b/vendor/github.com/miekg/dns/dnsutil/util_test.go
@@ -0,0 +1,130 @@
+package dnsutil
+
+import "testing"
+
+func TestAddOrigin(t *testing.T) {
+	var tests = []struct{ e1, e2, expected string }{
+		{"@", "example.com", "example.com"},
+		{"foo", "example.com", "foo.example.com"},
+		{"foo.", "example.com", "foo."},
+		{"@", "example.com.", "example.com."},
+		{"foo", "example.com.", "foo.example.com."},
+		{"foo.", "example.com.", "foo."},
+		// Oddball tests:
+		// In general origin should not be "" or "." but at least
+		// these tests verify we don't crash and will keep results
+		// from changing unexpectedly.
+		{"*.", "", "*."},
+		{"@", "", "@"},
+		{"foobar", "", "foobar"},
+		{"foobar.", "", "foobar."},
+		{"*.", ".", "*."},
+		{"@", ".", "."},
+		{"foobar", ".", "foobar."},
+		{"foobar.", ".", "foobar."},
+	}
+	for _, test := range tests {
+		actual := AddOrigin(test.e1, test.e2)
+		if test.expected != actual {
+			t.Errorf("AddOrigin(%#v, %#v) expected %#v, go %#v\n", test.e1, test.e2, test.expected, actual)
+		}
+	}
+}
+
+func TestTrimDomainName(t *testing.T) {
+
+	// Basic tests.
+	// Try trimming "example.com" and "example.com." from typical use cases.
+	var tests_examplecom = []struct{ experiment, expected string }{
+		{"foo.example.com", "foo"},
+		{"foo.example.com.", "foo"},
+		{".foo.example.com", ".foo"},
+		{".foo.example.com.", ".foo"},
+		{"*.example.com", "*"},
+		{"example.com", "@"},
+		{"example.com.", "@"},
+		{"com.", "com."},
+		{"foo.", "foo."},
+		{"serverfault.com.", "serverfault.com."},
+		{"serverfault.com", "serverfault.com"},
+		{".foo.ronco.com", ".foo.ronco.com"},
+		{".foo.ronco.com.", ".foo.ronco.com."},
+	}
+	for _, dom := range []string{"example.com", "example.com."} {
+		for i, test := range tests_examplecom {
+			actual := TrimDomainName(test.experiment, dom)
+			if test.expected != actual {
+				t.Errorf("%d TrimDomainName(%#v, %#v): expected (%v) got (%v)\n", i, test.experiment, dom, test.expected, actual)
+			}
+		}
+	}
+
+	// Paranoid tests.
+	// These test shouldn't be needed but I was weary of off-by-one errors.
+	// In theory, these can't happen because there are no single-letter TLDs,
+	// but it is good to exercize the code this way.
+	var tests = []struct{ experiment, expected string }{
+		{"", "@"},
+		{".", "."},
+		{"a.b.c.d.e.f.", "a.b.c.d.e"},
+		{"b.c.d.e.f.", "b.c.d.e"},
+		{"c.d.e.f.", "c.d.e"},
+		{"d.e.f.", "d.e"},
+		{"e.f.", "e"},
+		{"f.", "@"},
+		{".a.b.c.d.e.f.", ".a.b.c.d.e"},
+		{".b.c.d.e.f.", ".b.c.d.e"},
+		{".c.d.e.f.", ".c.d.e"},
+		{".d.e.f.", ".d.e"},
+		{".e.f.", ".e"},
+		{".f.", "@"},
+		{"a.b.c.d.e.f", "a.b.c.d.e"},
+		{"a.b.c.d.e.", "a.b.c.d.e."},
+		{"a.b.c.d.e", "a.b.c.d.e"},
+		{"a.b.c.d.", "a.b.c.d."},
+		{"a.b.c.d", "a.b.c.d"},
+		{"a.b.c.", "a.b.c."},
+		{"a.b.c", "a.b.c"},
+		{"a.b.", "a.b."},
+		{"a.b", "a.b"},
+		{"a.", "a."},
+		{"a", "a"},
+		{".a.b.c.d.e.f", ".a.b.c.d.e"},
+		{".a.b.c.d.e.", ".a.b.c.d.e."},
+		{".a.b.c.d.e", ".a.b.c.d.e"},
+		{".a.b.c.d.", ".a.b.c.d."},
+		{".a.b.c.d", ".a.b.c.d"},
+		{".a.b.c.", ".a.b.c."},
+		{".a.b.c", ".a.b.c"},
+		{".a.b.", ".a.b."},
+		{".a.b", ".a.b"},
+		{".a.", ".a."},
+		{".a", ".a"},
+	}
+	for _, dom := range []string{"f", "f."} {
+		for i, test := range tests {
+			actual := TrimDomainName(test.experiment, dom)
+			if test.expected != actual {
+				t.Errorf("%d TrimDomainName(%#v, %#v): expected (%v) got (%v)\n", i, test.experiment, dom, test.expected, actual)
+			}
+		}
+	}
+
+	// Test cases for bugs found in the wild.
+	// These test cases provide both origin, s, and the expected result.
+	// If you find a bug in the while, this is probably the easiest place
+	// to add it as a test case.
+	var tests_wild = []struct{ e1, e2, expected string }{
+		{"mathoverflow.net.", ".", "mathoverflow.net"},
+		{"mathoverflow.net", ".", "mathoverflow.net"},
+		{"", ".", "@"},
+		{"@", ".", "@"},
+	}
+	for i, test := range tests_wild {
+		actual := TrimDomainName(test.e1, test.e2)
+		if test.expected != actual {
+			t.Errorf("%d TrimDomainName(%#v, %#v): expected (%v) got (%v)\n", i, test.e1, test.e2, test.expected, actual)
+		}
+	}
+
+}
diff --git a/vendor/github.com/miekg/dns/doc.go b/vendor/github.com/miekg/dns/doc.go
new file mode 100644
index 0000000000..e38753d7d8
--- /dev/null
+++ b/vendor/github.com/miekg/dns/doc.go
@@ -0,0 +1,251 @@
+/*
+Package dns implements a full featured interface to the Domain Name System.
+Server- and client-side programming is supported.
+The package allows complete control over what is send out to the DNS. The package
+API follows the less-is-more principle, by presenting a small, clean interface.
+
+The package dns supports (asynchronous) querying/replying, incoming/outgoing zone transfers,
+TSIG, EDNS0, dynamic updates, notifies and DNSSEC validation/signing.
+Note that domain names MUST be fully qualified, before sending them, unqualified
+names in a message will result in a packing failure.
+
+Resource records are native types. They are not stored in wire format.
+Basic usage pattern for creating a new resource record:
+
+     r := new(dns.MX)
+     r.Hdr = dns.RR_Header{Name: "miek.nl.", Rrtype: dns.TypeMX,
+	Class: dns.ClassINET, Ttl: 3600}
+     r.Preference = 10
+     r.Mx = "mx.miek.nl."
+
+Or directly from a string:
+
+     mx, err := dns.NewRR("miek.nl. 3600 IN MX 10 mx.miek.nl.")
+
+Or when the default TTL (3600) and class (IN) suit you:
+
+     mx, err := dns.NewRR("miek.nl. MX 10 mx.miek.nl.")
+
+Or even:
+
+     mx, err := dns.NewRR("$ORIGIN nl.\nmiek 1H IN MX 10 mx.miek")
+
+In the DNS messages are exchanged, these messages contain resource
+records (sets).  Use pattern for creating a message:
+
+     m := new(dns.Msg)
+     m.SetQuestion("miek.nl.", dns.TypeMX)
+
+Or when not certain if the domain name is fully qualified:
+
+	m.SetQuestion(dns.Fqdn("miek.nl"), dns.TypeMX)
+
+The message m is now a message with the question section set to ask
+the MX records for the miek.nl. zone.
+
+The following is slightly more verbose, but more flexible:
+
+     m1 := new(dns.Msg)
+     m1.Id = dns.Id()
+     m1.RecursionDesired = true
+     m1.Question = make([]dns.Question, 1)
+     m1.Question[0] = dns.Question{"miek.nl.", dns.TypeMX, dns.ClassINET}
+
+After creating a message it can be send.
+Basic use pattern for synchronous querying the DNS at a
+server configured on 127.0.0.1 and port 53:
+
+     c := new(dns.Client)
+     in, rtt, err := c.Exchange(m1, "127.0.0.1:53")
+
+Suppressing multiple outstanding queries (with the same question, type and
+class) is as easy as setting:
+
+	c.SingleInflight = true
+
+If these "advanced" features are not needed, a simple UDP query can be send,
+with:
+
+	in, err := dns.Exchange(m1, "127.0.0.1:53")
+
+When this functions returns you will get dns message. A dns message consists
+out of four sections.
+The question section: in.Question, the answer section: in.Answer,
+the authority section: in.Ns and the additional section: in.Extra.
+
+Each of these sections (except the Question section) contain a []RR. Basic
+use pattern for accessing the rdata of a TXT RR as the first RR in
+the Answer section:
+
+	if t, ok := in.Answer[0].(*dns.TXT); ok {
+		// do something with t.Txt
+	}
+
+Domain Name and TXT Character String Representations
+
+Both domain names and TXT character strings are converted to presentation
+form both when unpacked and when converted to strings.
+
+For TXT character strings, tabs, carriage returns and line feeds will be
+converted to \t, \r and \n respectively. Back slashes and quotations marks
+will be escaped. Bytes below 32 and above 127 will be converted to \DDD
+form.
+
+For domain names, in addition to the above rules brackets, periods,
+spaces, semicolons and the at symbol are escaped.
+
+DNSSEC
+
+DNSSEC (DNS Security Extension) adds a layer of security to the DNS. It
+uses public key cryptography to sign resource records. The
+public keys are stored in DNSKEY records and the signatures in RRSIG records.
+
+Requesting DNSSEC information for a zone is done by adding the DO (DNSSEC OK) bit
+to a request.
+
+     m := new(dns.Msg)
+     m.SetEdns0(4096, true)
+
+Signature generation, signature verification and key generation are all supported.
+
+DYNAMIC UPDATES
+
+Dynamic updates reuses the DNS message format, but renames three of
+the sections. Question is Zone, Answer is Prerequisite, Authority is
+Update, only the Additional is not renamed. See RFC 2136 for the gory details.
+
+You can set a rather complex set of rules for the existence of absence of
+certain resource records or names in a zone to specify if resource records
+should be added or removed. The table from RFC 2136 supplemented with the Go
+DNS function shows which functions exist to specify the prerequisites.
+
+ 3.2.4 - Table Of Metavalues Used In Prerequisite Section
+
+  CLASS    TYPE     RDATA    Meaning                    Function
+  --------------------------------------------------------------
+  ANY      ANY      empty    Name is in use             dns.NameUsed
+  ANY      rrset    empty    RRset exists (value indep) dns.RRsetUsed
+  NONE     ANY      empty    Name is not in use         dns.NameNotUsed
+  NONE     rrset    empty    RRset does not exist       dns.RRsetNotUsed
+  zone     rrset    rr       RRset exists (value dep)   dns.Used
+
+The prerequisite section can also be left empty.
+If you have decided on the prerequisites you can tell what RRs should
+be added or deleted. The next table shows the options you have and
+what functions to call.
+
+ 3.4.2.6 - Table Of Metavalues Used In Update Section
+
+  CLASS    TYPE     RDATA    Meaning                     Function
+  ---------------------------------------------------------------
+  ANY      ANY      empty    Delete all RRsets from name dns.RemoveName
+  ANY      rrset    empty    Delete an RRset             dns.RemoveRRset
+  NONE     rrset    rr       Delete an RR from RRset     dns.Remove
+  zone     rrset    rr       Add to an RRset             dns.Insert
+
+TRANSACTION SIGNATURE
+
+An TSIG or transaction signature adds a HMAC TSIG record to each message sent.
+The supported algorithms include: HmacMD5, HmacSHA1, HmacSHA256 and HmacSHA512.
+
+Basic use pattern when querying with a TSIG name "axfr." (note that these key names
+must be fully qualified - as they are domain names) and the base64 secret
+"so6ZGir4GPAqINNh9U5c3A==":
+
+	c := new(dns.Client)
+	c.TsigSecret = map[string]string{"axfr.": "so6ZGir4GPAqINNh9U5c3A=="}
+	m := new(dns.Msg)
+	m.SetQuestion("miek.nl.", dns.TypeMX)
+	m.SetTsig("axfr.", dns.HmacMD5, 300, time.Now().Unix())
+	...
+	// When sending the TSIG RR is calculated and filled in before sending
+
+When requesting an zone transfer (almost all TSIG usage is when requesting zone transfers), with
+TSIG, this is the basic use pattern. In this example we request an AXFR for
+miek.nl. with TSIG key named "axfr." and secret "so6ZGir4GPAqINNh9U5c3A=="
+and using the server 176.58.119.54:
+
+	t := new(dns.Transfer)
+	m := new(dns.Msg)
+	t.TsigSecret = map[string]string{"axfr.": "so6ZGir4GPAqINNh9U5c3A=="}
+	m.SetAxfr("miek.nl.")
+	m.SetTsig("axfr.", dns.HmacMD5, 300, time.Now().Unix())
+	c, err := t.In(m, "176.58.119.54:53")
+	for r := range c { ... }
+
+You can now read the records from the transfer as they come in. Each envelope is checked with TSIG.
+If something is not correct an error is returned.
+
+Basic use pattern validating and replying to a message that has TSIG set.
+
+	server := &dns.Server{Addr: ":53", Net: "udp"}
+	server.TsigSecret = map[string]string{"axfr.": "so6ZGir4GPAqINNh9U5c3A=="}
+	go server.ListenAndServe()
+	dns.HandleFunc(".", handleRequest)
+
+	func handleRequest(w dns.ResponseWriter, r *dns.Msg) {
+		m := new(dns.Msg)
+		m.SetReply(r)
+		if r.IsTsig() != nil {
+			if w.TsigStatus() == nil {
+				// *Msg r has an TSIG record and it was validated
+				m.SetTsig("axfr.", dns.HmacMD5, 300, time.Now().Unix())
+			} else {
+				// *Msg r has an TSIG records and it was not valided
+			}
+		}
+		w.WriteMsg(m)
+	}
+
+PRIVATE RRS
+
+RFC 6895 sets aside a range of type codes for private use. This range
+is 65,280 - 65,534 (0xFF00 - 0xFFFE). When experimenting with new Resource Records these
+can be used, before requesting an official type code from IANA.
+
+see http://miek.nl/2014/September/21/idn-and-private-rr-in-go-dns/ for more
+information.
+
+EDNS0
+
+EDNS0 is an extension mechanism for the DNS defined in RFC 2671 and updated
+by RFC 6891. It defines an new RR type, the OPT RR, which is then completely
+abused.
+Basic use pattern for creating an (empty) OPT RR:
+
+	o := new(dns.OPT)
+	o.Hdr.Name = "." // MUST be the root zone, per definition.
+	o.Hdr.Rrtype = dns.TypeOPT
+
+The rdata of an OPT RR consists out of a slice of EDNS0 (RFC 6891)
+interfaces. Currently only a few have been standardized: EDNS0_NSID
+(RFC 5001) and EDNS0_SUBNET (draft-vandergaast-edns-client-subnet-02). Note
+that these options may be combined in an OPT RR.
+Basic use pattern for a server to check if (and which) options are set:
+
+	// o is a dns.OPT
+	for _, s := range o.Option {
+		switch e := s.(type) {
+		case *dns.EDNS0_NSID:
+			// do stuff with e.Nsid
+		case *dns.EDNS0_SUBNET:
+			// access e.Family, e.Address, etc.
+		}
+	}
+
+SIG(0)
+
+From RFC 2931:
+
+    SIG(0) provides protection for DNS transactions and requests ....
+    ... protection for glue records, DNS requests, protection for message headers
+    on requests and responses, and protection of the overall integrity of a response.
+
+It works like TSIG, except that SIG(0) uses public key cryptography, instead of the shared
+secret approach in TSIG.
+Supported algorithms: DSA, ECDSAP256SHA256, ECDSAP384SHA384, RSASHA1, RSASHA256 and
+RSASHA512.
+
+Signing subsequent messages in multi-message sessions is not implemented.
+*/
+package dns
diff --git a/vendor/github.com/miekg/dns/dyn_test.go b/vendor/github.com/miekg/dns/dyn_test.go
new file mode 100644
index 0000000000..09986a5e4e
--- /dev/null
+++ b/vendor/github.com/miekg/dns/dyn_test.go
@@ -0,0 +1,3 @@
+package dns
+
+// Find better solution
diff --git a/vendor/github.com/miekg/dns/edns.go b/vendor/github.com/miekg/dns/edns.go
new file mode 100644
index 0000000000..dbff3714cf
--- /dev/null
+++ b/vendor/github.com/miekg/dns/edns.go
@@ -0,0 +1,597 @@
+package dns
+
+import (
+	"encoding/binary"
+	"encoding/hex"
+	"errors"
+	"fmt"
+	"net"
+	"strconv"
+)
+
+// EDNS0 Option codes.
+const (
+	EDNS0LLQ          = 0x1     // long lived queries: http://tools.ietf.org/html/draft-sekar-dns-llq-01
+	EDNS0UL           = 0x2     // update lease draft: http://files.dns-sd.org/draft-sekar-dns-ul.txt
+	EDNS0NSID         = 0x3     // nsid (RFC5001)
+	EDNS0DAU          = 0x5     // DNSSEC Algorithm Understood
+	EDNS0DHU          = 0x6     // DS Hash Understood
+	EDNS0N3U          = 0x7     // NSEC3 Hash Understood
+	EDNS0SUBNET       = 0x8     // client-subnet (RFC6891)
+	EDNS0EXPIRE       = 0x9     // EDNS0 expire
+	EDNS0COOKIE       = 0xa     // EDNS0 Cookie
+	EDNS0TCPKEEPALIVE = 0xb     // EDNS0 tcp keep alive (RFC7828)
+	EDNS0SUBNETDRAFT  = 0x50fa  // Don't use! Use EDNS0SUBNET
+	EDNS0LOCALSTART   = 0xFDE9  // Beginning of range reserved for local/experimental use (RFC6891)
+	EDNS0LOCALEND     = 0xFFFE  // End of range reserved for local/experimental use (RFC6891)
+	_DO               = 1 << 15 // dnssec ok
+)
+
+// OPT is the EDNS0 RR appended to messages to convey extra (meta) information.
+// See RFC 6891.
+type OPT struct {
+	Hdr    RR_Header
+	Option []EDNS0 `dns:"opt"`
+}
+
+func (rr *OPT) String() string {
+	s := "\n;; OPT PSEUDOSECTION:\n; EDNS: version " + strconv.Itoa(int(rr.Version())) + "; "
+	if rr.Do() {
+		s += "flags: do; "
+	} else {
+		s += "flags: ; "
+	}
+	s += "udp: " + strconv.Itoa(int(rr.UDPSize()))
+
+	for _, o := range rr.Option {
+		switch o.(type) {
+		case *EDNS0_NSID:
+			s += "\n; NSID: " + o.String()
+			h, e := o.pack()
+			var r string
+			if e == nil {
+				for _, c := range h {
+					r += "(" + string(c) + ")"
+				}
+				s += "  " + r
+			}
+		case *EDNS0_SUBNET:
+			s += "\n; SUBNET: " + o.String()
+			if o.(*EDNS0_SUBNET).DraftOption {
+				s += " (draft)"
+			}
+		case *EDNS0_COOKIE:
+			s += "\n; COOKIE: " + o.String()
+		case *EDNS0_UL:
+			s += "\n; UPDATE LEASE: " + o.String()
+		case *EDNS0_LLQ:
+			s += "\n; LONG LIVED QUERIES: " + o.String()
+		case *EDNS0_DAU:
+			s += "\n; DNSSEC ALGORITHM UNDERSTOOD: " + o.String()
+		case *EDNS0_DHU:
+			s += "\n; DS HASH UNDERSTOOD: " + o.String()
+		case *EDNS0_N3U:
+			s += "\n; NSEC3 HASH UNDERSTOOD: " + o.String()
+		case *EDNS0_LOCAL:
+			s += "\n; LOCAL OPT: " + o.String()
+		}
+	}
+	return s
+}
+
+func (rr *OPT) len() int {
+	l := rr.Hdr.len()
+	for i := 0; i < len(rr.Option); i++ {
+		l += 4 // Account for 2-byte option code and 2-byte option length.
+		lo, _ := rr.Option[i].pack()
+		l += len(lo)
+	}
+	return l
+}
+
+// return the old value -> delete SetVersion?
+
+// Version returns the EDNS version used. Only zero is defined.
+func (rr *OPT) Version() uint8 {
+	return uint8((rr.Hdr.Ttl & 0x00FF0000) >> 16)
+}
+
+// SetVersion sets the version of EDNS. This is usually zero.
+func (rr *OPT) SetVersion(v uint8) {
+	rr.Hdr.Ttl = rr.Hdr.Ttl&0xFF00FFFF | (uint32(v) << 16)
+}
+
+// ExtendedRcode returns the EDNS extended RCODE field (the upper 8 bits of the TTL).
+func (rr *OPT) ExtendedRcode() int {
+	return int((rr.Hdr.Ttl&0xFF000000)>>24) + 15
+}
+
+// SetExtendedRcode sets the EDNS extended RCODE field.
+func (rr *OPT) SetExtendedRcode(v uint8) {
+	if v < RcodeBadVers { // Smaller than 16.. Use the 4 bits you have!
+		return
+	}
+	rr.Hdr.Ttl = rr.Hdr.Ttl&0x00FFFFFF | (uint32(v-15) << 24)
+}
+
+// UDPSize returns the UDP buffer size.
+func (rr *OPT) UDPSize() uint16 {
+	return rr.Hdr.Class
+}
+
+// SetUDPSize sets the UDP buffer size.
+func (rr *OPT) SetUDPSize(size uint16) {
+	rr.Hdr.Class = size
+}
+
+// Do returns the value of the DO (DNSSEC OK) bit.
+func (rr *OPT) Do() bool {
+	return rr.Hdr.Ttl&_DO == _DO
+}
+
+// SetDo sets the DO (DNSSEC OK) bit.
+// If we pass an argument, set the DO bit to that value.
+// It is possible to pass 2 or more arguments. Any arguments after the 1st is silently ignored.
+func (rr *OPT) SetDo(do ...bool) {
+	if len(do) == 1 {
+		if do[0] {
+			rr.Hdr.Ttl |= _DO
+		} else {
+			rr.Hdr.Ttl &^= _DO
+		}
+	} else {
+		rr.Hdr.Ttl |= _DO
+	}
+}
+
+// EDNS0 defines an EDNS0 Option. An OPT RR can have multiple options appended to it.
+type EDNS0 interface {
+	// Option returns the option code for the option.
+	Option() uint16
+	// pack returns the bytes of the option data.
+	pack() ([]byte, error)
+	// unpack sets the data as found in the buffer. Is also sets
+	// the length of the slice as the length of the option data.
+	unpack([]byte) error
+	// String returns the string representation of the option.
+	String() string
+}
+
+// EDNS0_NSID option is used to retrieve a nameserver
+// identifier. When sending a request Nsid must be set to the empty string
+// The identifier is an opaque string encoded as hex.
+// Basic use pattern for creating an nsid option:
+//
+//	o := new(dns.OPT)
+//	o.Hdr.Name = "."
+//	o.Hdr.Rrtype = dns.TypeOPT
+//	e := new(dns.EDNS0_NSID)
+//	e.Code = dns.EDNS0NSID
+//	e.Nsid = "AA"
+//	o.Option = append(o.Option, e)
+type EDNS0_NSID struct {
+	Code uint16 // Always EDNS0NSID
+	Nsid string // This string needs to be hex encoded
+}
+
+func (e *EDNS0_NSID) pack() ([]byte, error) {
+	h, err := hex.DecodeString(e.Nsid)
+	if err != nil {
+		return nil, err
+	}
+	return h, nil
+}
+
+func (e *EDNS0_NSID) Option() uint16        { return EDNS0NSID }
+func (e *EDNS0_NSID) unpack(b []byte) error { e.Nsid = hex.EncodeToString(b); return nil }
+func (e *EDNS0_NSID) String() string        { return string(e.Nsid) }
+
+// EDNS0_SUBNET is the subnet option that is used to give the remote nameserver
+// an idea of where the client lives. It can then give back a different
+// answer depending on the location or network topology.
+// Basic use pattern for creating an subnet option:
+//
+//	o := new(dns.OPT)
+//	o.Hdr.Name = "."
+//	o.Hdr.Rrtype = dns.TypeOPT
+//	e := new(dns.EDNS0_SUBNET)
+//	e.Code = dns.EDNS0SUBNET
+//	e.Family = 1	// 1 for IPv4 source address, 2 for IPv6
+//	e.SourceNetmask = 32	// 32 for IPV4, 128 for IPv6
+//	e.SourceScope = 0
+//	e.Address = net.ParseIP("127.0.0.1").To4()	// for IPv4
+//	// e.Address = net.ParseIP("2001:7b8:32a::2")	// for IPV6
+//	o.Option = append(o.Option, e)
+//
+// Note: the spec (draft-ietf-dnsop-edns-client-subnet-00) has some insane logic
+// for which netmask applies to the address. This code will parse all the
+// available bits when unpacking (up to optlen). When packing it will apply
+// SourceNetmask. If you need more advanced logic, patches welcome and good luck.
+type EDNS0_SUBNET struct {
+	Code          uint16 // Always EDNS0SUBNET
+	Family        uint16 // 1 for IP, 2 for IP6
+	SourceNetmask uint8
+	SourceScope   uint8
+	Address       net.IP
+	DraftOption   bool // Set to true if using the old (0x50fa) option code
+}
+
+func (e *EDNS0_SUBNET) Option() uint16 {
+	if e.DraftOption {
+		return EDNS0SUBNETDRAFT
+	}
+	return EDNS0SUBNET
+}
+
+func (e *EDNS0_SUBNET) pack() ([]byte, error) {
+	b := make([]byte, 4)
+	binary.BigEndian.PutUint16(b[0:], e.Family)
+	b[2] = e.SourceNetmask
+	b[3] = e.SourceScope
+	switch e.Family {
+	case 1:
+		if e.SourceNetmask > net.IPv4len*8 {
+			return nil, errors.New("dns: bad netmask")
+		}
+		if len(e.Address.To4()) != net.IPv4len {
+			return nil, errors.New("dns: bad address")
+		}
+		ip := e.Address.To4().Mask(net.CIDRMask(int(e.SourceNetmask), net.IPv4len*8))
+		needLength := (e.SourceNetmask + 8 - 1) / 8 // division rounding up
+		b = append(b, ip[:needLength]...)
+	case 2:
+		if e.SourceNetmask > net.IPv6len*8 {
+			return nil, errors.New("dns: bad netmask")
+		}
+		if len(e.Address) != net.IPv6len {
+			return nil, errors.New("dns: bad address")
+		}
+		ip := e.Address.Mask(net.CIDRMask(int(e.SourceNetmask), net.IPv6len*8))
+		needLength := (e.SourceNetmask + 8 - 1) / 8 // division rounding up
+		b = append(b, ip[:needLength]...)
+	default:
+		return nil, errors.New("dns: bad address family")
+	}
+	return b, nil
+}
+
+func (e *EDNS0_SUBNET) unpack(b []byte) error {
+	if len(b) < 4 {
+		return ErrBuf
+	}
+	e.Family = binary.BigEndian.Uint16(b)
+	e.SourceNetmask = b[2]
+	e.SourceScope = b[3]
+	switch e.Family {
+	case 1:
+		if e.SourceNetmask > net.IPv4len*8 || e.SourceScope > net.IPv4len*8 {
+			return errors.New("dns: bad netmask")
+		}
+		addr := make([]byte, net.IPv4len)
+		for i := 0; i < net.IPv4len && 4+i < len(b); i++ {
+			addr[i] = b[4+i]
+		}
+		e.Address = net.IPv4(addr[0], addr[1], addr[2], addr[3])
+	case 2:
+		if e.SourceNetmask > net.IPv6len*8 || e.SourceScope > net.IPv6len*8 {
+			return errors.New("dns: bad netmask")
+		}
+		addr := make([]byte, net.IPv6len)
+		for i := 0; i < net.IPv6len && 4+i < len(b); i++ {
+			addr[i] = b[4+i]
+		}
+		e.Address = net.IP{addr[0], addr[1], addr[2], addr[3], addr[4],
+			addr[5], addr[6], addr[7], addr[8], addr[9], addr[10],
+			addr[11], addr[12], addr[13], addr[14], addr[15]}
+	default:
+		return errors.New("dns: bad address family")
+	}
+	return nil
+}
+
+func (e *EDNS0_SUBNET) String() (s string) {
+	if e.Address == nil {
+		s = "<nil>"
+	} else if e.Address.To4() != nil {
+		s = e.Address.String()
+	} else {
+		s = "[" + e.Address.String() + "]"
+	}
+	s += "/" + strconv.Itoa(int(e.SourceNetmask)) + "/" + strconv.Itoa(int(e.SourceScope))
+	return
+}
+
+// The EDNS0_COOKIE option is used to add a DNS Cookie to a message.
+//
+//	o := new(dns.OPT)
+//	o.Hdr.Name = "."
+//	o.Hdr.Rrtype = dns.TypeOPT
+//	e := new(dns.EDNS0_COOKIE)
+//	e.Code = dns.EDNS0COOKIE
+//	e.Cookie = "24a5ac.."
+//	o.Option = append(o.Option, e)
+//
+// The Cookie field consists out of a client cookie (RFC 7873 Section 4), that is
+// always 8 bytes. It may then optionally be followed by the server cookie. The server
+// cookie is of variable length, 8 to a maximum of 32 bytes. In other words:
+//
+//	cCookie := o.Cookie[:16]
+//	sCookie := o.Cookie[16:]
+//
+// There is no guarantee that the Cookie string has a specific length.
+type EDNS0_COOKIE struct {
+	Code   uint16 // Always EDNS0COOKIE
+	Cookie string // Hex-encoded cookie data
+}
+
+func (e *EDNS0_COOKIE) pack() ([]byte, error) {
+	h, err := hex.DecodeString(e.Cookie)
+	if err != nil {
+		return nil, err
+	}
+	return h, nil
+}
+
+func (e *EDNS0_COOKIE) Option() uint16        { return EDNS0COOKIE }
+func (e *EDNS0_COOKIE) unpack(b []byte) error { e.Cookie = hex.EncodeToString(b); return nil }
+func (e *EDNS0_COOKIE) String() string        { return e.Cookie }
+
+// The EDNS0_UL (Update Lease) (draft RFC) option is used to tell the server to set
+// an expiration on an update RR. This is helpful for clients that cannot clean
+// up after themselves. This is a draft RFC and more information can be found at
+// http://files.dns-sd.org/draft-sekar-dns-ul.txt
+//
+//	o := new(dns.OPT)
+//	o.Hdr.Name = "."
+//	o.Hdr.Rrtype = dns.TypeOPT
+//	e := new(dns.EDNS0_UL)
+//	e.Code = dns.EDNS0UL
+//	e.Lease = 120 // in seconds
+//	o.Option = append(o.Option, e)
+type EDNS0_UL struct {
+	Code  uint16 // Always EDNS0UL
+	Lease uint32
+}
+
+func (e *EDNS0_UL) Option() uint16 { return EDNS0UL }
+func (e *EDNS0_UL) String() string { return strconv.FormatUint(uint64(e.Lease), 10) }
+
+// Copied: http://golang.org/src/pkg/net/dnsmsg.go
+func (e *EDNS0_UL) pack() ([]byte, error) {
+	b := make([]byte, 4)
+	binary.BigEndian.PutUint32(b, e.Lease)
+	return b, nil
+}
+
+func (e *EDNS0_UL) unpack(b []byte) error {
+	if len(b) < 4 {
+		return ErrBuf
+	}
+	e.Lease = binary.BigEndian.Uint32(b)
+	return nil
+}
+
+// EDNS0_LLQ stands for Long Lived Queries: http://tools.ietf.org/html/draft-sekar-dns-llq-01
+// Implemented for completeness, as the EDNS0 type code is assigned.
+type EDNS0_LLQ struct {
+	Code      uint16 // Always EDNS0LLQ
+	Version   uint16
+	Opcode    uint16
+	Error     uint16
+	Id        uint64
+	LeaseLife uint32
+}
+
+func (e *EDNS0_LLQ) Option() uint16 { return EDNS0LLQ }
+
+func (e *EDNS0_LLQ) pack() ([]byte, error) {
+	b := make([]byte, 18)
+	binary.BigEndian.PutUint16(b[0:], e.Version)
+	binary.BigEndian.PutUint16(b[2:], e.Opcode)
+	binary.BigEndian.PutUint16(b[4:], e.Error)
+	binary.BigEndian.PutUint64(b[6:], e.Id)
+	binary.BigEndian.PutUint32(b[14:], e.LeaseLife)
+	return b, nil
+}
+
+func (e *EDNS0_LLQ) unpack(b []byte) error {
+	if len(b) < 18 {
+		return ErrBuf
+	}
+	e.Version = binary.BigEndian.Uint16(b[0:])
+	e.Opcode = binary.BigEndian.Uint16(b[2:])
+	e.Error = binary.BigEndian.Uint16(b[4:])
+	e.Id = binary.BigEndian.Uint64(b[6:])
+	e.LeaseLife = binary.BigEndian.Uint32(b[14:])
+	return nil
+}
+
+func (e *EDNS0_LLQ) String() string {
+	s := strconv.FormatUint(uint64(e.Version), 10) + " " + strconv.FormatUint(uint64(e.Opcode), 10) +
+		" " + strconv.FormatUint(uint64(e.Error), 10) + " " + strconv.FormatUint(uint64(e.Id), 10) +
+		" " + strconv.FormatUint(uint64(e.LeaseLife), 10)
+	return s
+}
+
+type EDNS0_DAU struct {
+	Code    uint16 // Always EDNS0DAU
+	AlgCode []uint8
+}
+
+func (e *EDNS0_DAU) Option() uint16        { return EDNS0DAU }
+func (e *EDNS0_DAU) pack() ([]byte, error) { return e.AlgCode, nil }
+func (e *EDNS0_DAU) unpack(b []byte) error { e.AlgCode = b; return nil }
+
+func (e *EDNS0_DAU) String() string {
+	s := ""
+	for i := 0; i < len(e.AlgCode); i++ {
+		if a, ok := AlgorithmToString[e.AlgCode[i]]; ok {
+			s += " " + a
+		} else {
+			s += " " + strconv.Itoa(int(e.AlgCode[i]))
+		}
+	}
+	return s
+}
+
+type EDNS0_DHU struct {
+	Code    uint16 // Always EDNS0DHU
+	AlgCode []uint8
+}
+
+func (e *EDNS0_DHU) Option() uint16        { return EDNS0DHU }
+func (e *EDNS0_DHU) pack() ([]byte, error) { return e.AlgCode, nil }
+func (e *EDNS0_DHU) unpack(b []byte) error { e.AlgCode = b; return nil }
+
+func (e *EDNS0_DHU) String() string {
+	s := ""
+	for i := 0; i < len(e.AlgCode); i++ {
+		if a, ok := HashToString[e.AlgCode[i]]; ok {
+			s += " " + a
+		} else {
+			s += " " + strconv.Itoa(int(e.AlgCode[i]))
+		}
+	}
+	return s
+}
+
+type EDNS0_N3U struct {
+	Code    uint16 // Always EDNS0N3U
+	AlgCode []uint8
+}
+
+func (e *EDNS0_N3U) Option() uint16        { return EDNS0N3U }
+func (e *EDNS0_N3U) pack() ([]byte, error) { return e.AlgCode, nil }
+func (e *EDNS0_N3U) unpack(b []byte) error { e.AlgCode = b; return nil }
+
+func (e *EDNS0_N3U) String() string {
+	// Re-use the hash map
+	s := ""
+	for i := 0; i < len(e.AlgCode); i++ {
+		if a, ok := HashToString[e.AlgCode[i]]; ok {
+			s += " " + a
+		} else {
+			s += " " + strconv.Itoa(int(e.AlgCode[i]))
+		}
+	}
+	return s
+}
+
+type EDNS0_EXPIRE struct {
+	Code   uint16 // Always EDNS0EXPIRE
+	Expire uint32
+}
+
+func (e *EDNS0_EXPIRE) Option() uint16 { return EDNS0EXPIRE }
+func (e *EDNS0_EXPIRE) String() string { return strconv.FormatUint(uint64(e.Expire), 10) }
+
+func (e *EDNS0_EXPIRE) pack() ([]byte, error) {
+	b := make([]byte, 4)
+	b[0] = byte(e.Expire >> 24)
+	b[1] = byte(e.Expire >> 16)
+	b[2] = byte(e.Expire >> 8)
+	b[3] = byte(e.Expire)
+	return b, nil
+}
+
+func (e *EDNS0_EXPIRE) unpack(b []byte) error {
+	if len(b) < 4 {
+		return ErrBuf
+	}
+	e.Expire = binary.BigEndian.Uint32(b)
+	return nil
+}
+
+// The EDNS0_LOCAL option is used for local/experimental purposes. The option
+// code is recommended to be within the range [EDNS0LOCALSTART, EDNS0LOCALEND]
+// (RFC6891), although any unassigned code can actually be used.  The content of
+// the option is made available in Data, unaltered.
+// Basic use pattern for creating a local option:
+//
+//	o := new(dns.OPT)
+//	o.Hdr.Name = "."
+//	o.Hdr.Rrtype = dns.TypeOPT
+//	e := new(dns.EDNS0_LOCAL)
+//	e.Code = dns.EDNS0LOCALSTART
+//	e.Data = []byte{72, 82, 74}
+//	o.Option = append(o.Option, e)
+type EDNS0_LOCAL struct {
+	Code uint16
+	Data []byte
+}
+
+func (e *EDNS0_LOCAL) Option() uint16 { return e.Code }
+func (e *EDNS0_LOCAL) String() string {
+	return strconv.FormatInt(int64(e.Code), 10) + ":0x" + hex.EncodeToString(e.Data)
+}
+
+func (e *EDNS0_LOCAL) pack() ([]byte, error) {
+	b := make([]byte, len(e.Data))
+	copied := copy(b, e.Data)
+	if copied != len(e.Data) {
+		return nil, ErrBuf
+	}
+	return b, nil
+}
+
+func (e *EDNS0_LOCAL) unpack(b []byte) error {
+	e.Data = make([]byte, len(b))
+	copied := copy(e.Data, b)
+	if copied != len(b) {
+		return ErrBuf
+	}
+	return nil
+}
+
+// EDNS0_TCP_KEEPALIVE is an EDNS0 option that instructs the server to keep
+// the TCP connection alive. See RFC 7828.
+type EDNS0_TCP_KEEPALIVE struct {
+	Code    uint16 // Always EDNSTCPKEEPALIVE
+	Length  uint16 // the value 0 if the TIMEOUT is omitted, the value 2 if it is present;
+	Timeout uint16 // an idle timeout value for the TCP connection, specified in units of 100 milliseconds, encoded in network byte order.
+}
+
+func (e *EDNS0_TCP_KEEPALIVE) Option() uint16 { return EDNS0TCPKEEPALIVE }
+
+func (e *EDNS0_TCP_KEEPALIVE) pack() ([]byte, error) {
+	if e.Timeout != 0 && e.Length != 2 {
+		return nil, errors.New("dns: timeout specified but length is not 2")
+	}
+	if e.Timeout == 0 && e.Length != 0 {
+		return nil, errors.New("dns: timeout not specified but length is not 0")
+	}
+	b := make([]byte, 4+e.Length)
+	binary.BigEndian.PutUint16(b[0:], e.Code)
+	binary.BigEndian.PutUint16(b[2:], e.Length)
+	if e.Length == 2 {
+		binary.BigEndian.PutUint16(b[4:], e.Timeout)
+	}
+	return b, nil
+}
+
+func (e *EDNS0_TCP_KEEPALIVE) unpack(b []byte) error {
+	if len(b) < 4 {
+		return ErrBuf
+	}
+	e.Length = binary.BigEndian.Uint16(b[2:4])
+	if e.Length != 0 && e.Length != 2 {
+		return errors.New("dns: length mismatch, want 0/2 but got " + strconv.FormatUint(uint64(e.Length), 10))
+	}
+	if e.Length == 2 {
+		if len(b) < 6 {
+			return ErrBuf
+		}
+		e.Timeout = binary.BigEndian.Uint16(b[4:6])
+	}
+	return nil
+}
+
+func (e *EDNS0_TCP_KEEPALIVE) String() (s string) {
+	s = "use tcp keep-alive"
+	if e.Length == 0 {
+		s += ", timeout omitted"
+	} else {
+		s += fmt.Sprintf(", timeout %dms", e.Timeout*100)
+	}
+	return
+}
diff --git a/vendor/github.com/miekg/dns/edns_test.go b/vendor/github.com/miekg/dns/edns_test.go
new file mode 100644
index 0000000000..c290b0c8a8
--- /dev/null
+++ b/vendor/github.com/miekg/dns/edns_test.go
@@ -0,0 +1,68 @@
+package dns
+
+import "testing"
+
+func TestOPTTtl(t *testing.T) {
+	e := &OPT{}
+	e.Hdr.Name = "."
+	e.Hdr.Rrtype = TypeOPT
+
+	// verify the default setting of DO=0
+	if e.Do() {
+		t.Errorf("DO bit should be zero")
+	}
+
+	// There are 6 possible invocations of SetDo():
+	//
+	// 1. Starting with DO=0, using SetDo()
+	// 2. Starting with DO=0, using SetDo(true)
+	// 3. Starting with DO=0, using SetDo(false)
+	// 4. Starting with DO=1, using SetDo()
+	// 5. Starting with DO=1, using SetDo(true)
+	// 6. Starting with DO=1, using SetDo(false)
+
+	// verify that invoking SetDo() sets DO=1 (TEST #1)
+	e.SetDo()
+	if !e.Do() {
+		t.Errorf("DO bit should be non-zero")
+	}
+	// verify that using SetDo(true) works when DO=1 (TEST #5)
+	e.SetDo(true)
+	if !e.Do() {
+		t.Errorf("DO bit should still be non-zero")
+	}
+	// verify that we can use SetDo(false) to set DO=0 (TEST #6)
+	e.SetDo(false)
+	if e.Do() {
+		t.Errorf("DO bit should be zero")
+	}
+	// verify that if we call SetDo(false) when DO=0 that it is unchanged (TEST #3)
+	e.SetDo(false)
+	if e.Do() {
+		t.Errorf("DO bit should still be zero")
+	}
+	// verify that using SetDo(true) works for DO=0 (TEST #2)
+	e.SetDo(true)
+	if !e.Do() {
+		t.Errorf("DO bit should be non-zero")
+	}
+	// verify that using SetDo() works for DO=1 (TEST #4)
+	e.SetDo()
+	if !e.Do() {
+		t.Errorf("DO bit should be non-zero")
+	}
+
+	if e.Version() != 0 {
+		t.Errorf("version should be non-zero")
+	}
+
+	e.SetVersion(42)
+	if e.Version() != 42 {
+		t.Errorf("set 42, expected %d, got %d", 42, e.Version())
+	}
+
+	e.SetExtendedRcode(42)
+	if e.ExtendedRcode() != 42 {
+		t.Errorf("set 42, expected %d, got %d", 42-15, e.ExtendedRcode())
+	}
+}
diff --git a/vendor/github.com/miekg/dns/example_test.go b/vendor/github.com/miekg/dns/example_test.go
new file mode 100644
index 0000000000..64c14962cd
--- /dev/null
+++ b/vendor/github.com/miekg/dns/example_test.go
@@ -0,0 +1,146 @@
+package dns_test
+
+import (
+	"errors"
+	"fmt"
+	"log"
+	"net"
+
+	"github.com/miekg/dns"
+)
+
+// Retrieve the MX records for miek.nl.
+func ExampleMX() {
+	config, _ := dns.ClientConfigFromFile("/etc/resolv.conf")
+	c := new(dns.Client)
+	m := new(dns.Msg)
+	m.SetQuestion("miek.nl.", dns.TypeMX)
+	m.RecursionDesired = true
+	r, _, err := c.Exchange(m, config.Servers[0]+":"+config.Port)
+	if err != nil {
+		return
+	}
+	if r.Rcode != dns.RcodeSuccess {
+		return
+	}
+	for _, a := range r.Answer {
+		if mx, ok := a.(*dns.MX); ok {
+			fmt.Printf("%s\n", mx.String())
+		}
+	}
+}
+
+// Retrieve the DNSKEY records of a zone and convert them
+// to DS records for SHA1, SHA256 and SHA384.
+func ExampleDS() {
+	config, _ := dns.ClientConfigFromFile("/etc/resolv.conf")
+	c := new(dns.Client)
+	m := new(dns.Msg)
+	zone := "miek.nl"
+	m.SetQuestion(dns.Fqdn(zone), dns.TypeDNSKEY)
+	m.SetEdns0(4096, true)
+	r, _, err := c.Exchange(m, config.Servers[0]+":"+config.Port)
+	if err != nil {
+		return
+	}
+	if r.Rcode != dns.RcodeSuccess {
+		return
+	}
+	for _, k := range r.Answer {
+		if key, ok := k.(*dns.DNSKEY); ok {
+			for _, alg := range []uint8{dns.SHA1, dns.SHA256, dns.SHA384} {
+				fmt.Printf("%s; %d\n", key.ToDS(alg).String(), key.Flags)
+			}
+		}
+	}
+}
+
+const TypeAPAIR = 0x0F99
+
+type APAIR struct {
+	addr [2]net.IP
+}
+
+func NewAPAIR() dns.PrivateRdata { return new(APAIR) }
+
+func (rd *APAIR) String() string { return rd.addr[0].String() + " " + rd.addr[1].String() }
+func (rd *APAIR) Parse(txt []string) error {
+	if len(txt) != 2 {
+		return errors.New("two addresses required for APAIR")
+	}
+	for i, s := range txt {
+		ip := net.ParseIP(s)
+		if ip == nil {
+			return errors.New("invalid IP in APAIR text representation")
+		}
+		rd.addr[i] = ip
+	}
+	return nil
+}
+
+func (rd *APAIR) Pack(buf []byte) (int, error) {
+	b := append([]byte(rd.addr[0]), []byte(rd.addr[1])...)
+	n := copy(buf, b)
+	if n != len(b) {
+		return n, dns.ErrBuf
+	}
+	return n, nil
+}
+
+func (rd *APAIR) Unpack(buf []byte) (int, error) {
+	ln := net.IPv4len * 2
+	if len(buf) != ln {
+		return 0, errors.New("invalid length of APAIR rdata")
+	}
+	cp := make([]byte, ln)
+	copy(cp, buf) // clone bytes to use them in IPs
+
+	rd.addr[0] = net.IP(cp[:3])
+	rd.addr[1] = net.IP(cp[4:])
+
+	return len(buf), nil
+}
+
+func (rd *APAIR) Copy(dest dns.PrivateRdata) error {
+	cp := make([]byte, rd.Len())
+	_, err := rd.Pack(cp)
+	if err != nil {
+		return err
+	}
+
+	d := dest.(*APAIR)
+	d.addr[0] = net.IP(cp[:3])
+	d.addr[1] = net.IP(cp[4:])
+	return nil
+}
+
+func (rd *APAIR) Len() int {
+	return net.IPv4len * 2
+}
+
+func ExamplePrivateHandle() {
+	dns.PrivateHandle("APAIR", TypeAPAIR, NewAPAIR)
+	defer dns.PrivateHandleRemove(TypeAPAIR)
+
+	rr, err := dns.NewRR("miek.nl. APAIR (1.2.3.4    1.2.3.5)")
+	if err != nil {
+		log.Fatal("could not parse APAIR record: ", err)
+	}
+	fmt.Println(rr)
+	// Output: miek.nl.	3600	IN	APAIR	1.2.3.4 1.2.3.5
+
+	m := new(dns.Msg)
+	m.Id = 12345
+	m.SetQuestion("miek.nl.", TypeAPAIR)
+	m.Answer = append(m.Answer, rr)
+
+	fmt.Println(m)
+	// ;; opcode: QUERY, status: NOERROR, id: 12345
+	// ;; flags: rd; QUERY: 1, ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 0
+	//
+	// ;; QUESTION SECTION:
+	// ;miek.nl.	IN	 APAIR
+	//
+	// ;; ANSWER SECTION:
+	// miek.nl.	3600	IN	APAIR	1.2.3.4 1.2.3.5
+}
diff --git a/vendor/github.com/miekg/dns/format.go b/vendor/github.com/miekg/dns/format.go
new file mode 100644
index 0000000000..3f5303c201
--- /dev/null
+++ b/vendor/github.com/miekg/dns/format.go
@@ -0,0 +1,87 @@
+package dns
+
+import (
+	"net"
+	"reflect"
+	"strconv"
+)
+
+// NumField returns the number of rdata fields r has.
+func NumField(r RR) int {
+	return reflect.ValueOf(r).Elem().NumField() - 1 // Remove RR_Header
+}
+
+// Field returns the rdata field i as a string. Fields are indexed starting from 1.
+// RR types that holds slice data, for instance the NSEC type bitmap will return a single
+// string where the types are concatenated using a space.
+// Accessing non existing fields will cause a panic.
+func Field(r RR, i int) string {
+	if i == 0 {
+		return ""
+	}
+	d := reflect.ValueOf(r).Elem().Field(i)
+	switch k := d.Kind(); k {
+	case reflect.String:
+		return d.String()
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		return strconv.FormatInt(d.Int(), 10)
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		return strconv.FormatUint(d.Uint(), 10)
+	case reflect.Slice:
+		switch reflect.ValueOf(r).Elem().Type().Field(i).Tag {
+		case `dns:"a"`:
+			// TODO(miek): Hmm store this as 16 bytes
+			if d.Len() < net.IPv6len {
+				return net.IPv4(byte(d.Index(0).Uint()),
+					byte(d.Index(1).Uint()),
+					byte(d.Index(2).Uint()),
+					byte(d.Index(3).Uint())).String()
+			}
+			return net.IPv4(byte(d.Index(12).Uint()),
+				byte(d.Index(13).Uint()),
+				byte(d.Index(14).Uint()),
+				byte(d.Index(15).Uint())).String()
+		case `dns:"aaaa"`:
+			return net.IP{
+				byte(d.Index(0).Uint()),
+				byte(d.Index(1).Uint()),
+				byte(d.Index(2).Uint()),
+				byte(d.Index(3).Uint()),
+				byte(d.Index(4).Uint()),
+				byte(d.Index(5).Uint()),
+				byte(d.Index(6).Uint()),
+				byte(d.Index(7).Uint()),
+				byte(d.Index(8).Uint()),
+				byte(d.Index(9).Uint()),
+				byte(d.Index(10).Uint()),
+				byte(d.Index(11).Uint()),
+				byte(d.Index(12).Uint()),
+				byte(d.Index(13).Uint()),
+				byte(d.Index(14).Uint()),
+				byte(d.Index(15).Uint()),
+			}.String()
+		case `dns:"nsec"`:
+			if d.Len() == 0 {
+				return ""
+			}
+			s := Type(d.Index(0).Uint()).String()
+			for i := 1; i < d.Len(); i++ {
+				s += " " + Type(d.Index(i).Uint()).String()
+			}
+			return s
+		default:
+			// if it does not have a tag its a string slice
+			fallthrough
+		case `dns:"txt"`:
+			if d.Len() == 0 {
+				return ""
+			}
+			s := d.Index(0).String()
+			for i := 1; i < d.Len(); i++ {
+				s += " " + d.Index(i).String()
+			}
+			return s
+		}
+	}
+	return ""
+}
diff --git a/vendor/github.com/miekg/dns/fuzz_test.go b/vendor/github.com/miekg/dns/fuzz_test.go
new file mode 100644
index 0000000000..255869730e
--- /dev/null
+++ b/vendor/github.com/miekg/dns/fuzz_test.go
@@ -0,0 +1,25 @@
+package dns
+
+import "testing"
+
+func TestFuzzString(t *testing.T) {
+	testcases := []string{"", " MINFO ", "	RP ", "	NSEC 0 0", "	\" NSEC 0 0\"", "  \" MINFO \"",
+		";a ", ";a����������",
+		"	NSAP O ", "  NSAP N ",
+		" TYPE4 TYPE6a789a3bc0045c8a5fb42c7d1bd998f5444 IN 9579b47d46817afbd17273e6",
+		" TYPE45 3 3 4147994 TYPE\\(\\)\\)\\(\\)\\(\\(\\)\\(\\)\\)\\)\\(\\)\\(\\)\\(\\(\\R 948\"\")\\(\\)\\)\\)\\(\\ ",
+		"$GENERATE 0-3 ${441189,5039418474430,o}",
+		"$INCLUDE 00 TYPE00000000000n ",
+		"$INCLUDE PE4 TYPE061463623/727071511 \\(\\)\\$GENERATE 6-462/0",
+	}
+	for i, tc := range testcases {
+		rr, err := NewRR(tc)
+		if err == nil {
+			// rr can be nil because we can (for instance) just parse a comment
+			if rr == nil {
+				continue
+			}
+			t.Fatalf("parsed mailformed RR %d: %s", i, rr.String())
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/dns/generate.go b/vendor/github.com/miekg/dns/generate.go
new file mode 100644
index 0000000000..e4481a4b0d
--- /dev/null
+++ b/vendor/github.com/miekg/dns/generate.go
@@ -0,0 +1,159 @@
+package dns
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"strconv"
+	"strings"
+)
+
+// Parse the $GENERATE statement as used in BIND9 zones.
+// See http://www.zytrax.com/books/dns/ch8/generate.html for instance.
+// We are called after '$GENERATE '. After which we expect:
+// * the range (12-24/2)
+// * lhs (ownername)
+// * [[ttl][class]]
+// * type
+// * rhs (rdata)
+// But we are lazy here, only the range is parsed *all* occurrences
+// of $ after that are interpreted.
+// Any error are returned as a string value, the empty string signals
+// "no error".
+func generate(l lex, c chan lex, t chan *Token, o string) string {
+	step := 1
+	if i := strings.IndexAny(l.token, "/"); i != -1 {
+		if i+1 == len(l.token) {
+			return "bad step in $GENERATE range"
+		}
+		if s, err := strconv.Atoi(l.token[i+1:]); err == nil {
+			if s < 0 {
+				return "bad step in $GENERATE range"
+			}
+			step = s
+		} else {
+			return "bad step in $GENERATE range"
+		}
+		l.token = l.token[:i]
+	}
+	sx := strings.SplitN(l.token, "-", 2)
+	if len(sx) != 2 {
+		return "bad start-stop in $GENERATE range"
+	}
+	start, err := strconv.Atoi(sx[0])
+	if err != nil {
+		return "bad start in $GENERATE range"
+	}
+	end, err := strconv.Atoi(sx[1])
+	if err != nil {
+		return "bad stop in $GENERATE range"
+	}
+	if end < 0 || start < 0 || end < start {
+		return "bad range in $GENERATE range"
+	}
+
+	<-c // _BLANK
+	// Create a complete new string, which we then parse again.
+	s := ""
+BuildRR:
+	l = <-c
+	if l.value != zNewline && l.value != zEOF {
+		s += l.token
+		goto BuildRR
+	}
+	for i := start; i <= end; i += step {
+		var (
+			escape bool
+			dom    bytes.Buffer
+			mod    string
+			err    error
+			offset int
+		)
+
+		for j := 0; j < len(s); j++ { // No 'range' because we need to jump around
+			switch s[j] {
+			case '\\':
+				if escape {
+					dom.WriteByte('\\')
+					escape = false
+					continue
+				}
+				escape = true
+			case '$':
+				mod = "%d"
+				offset = 0
+				if escape {
+					dom.WriteByte('$')
+					escape = false
+					continue
+				}
+				escape = false
+				if j+1 >= len(s) { // End of the string
+					dom.WriteString(fmt.Sprintf(mod, i+offset))
+					continue
+				} else {
+					if s[j+1] == '$' {
+						dom.WriteByte('$')
+						j++
+						continue
+					}
+				}
+				// Search for { and }
+				if s[j+1] == '{' { // Modifier block
+					sep := strings.Index(s[j+2:], "}")
+					if sep == -1 {
+						return "bad modifier in $GENERATE"
+					}
+					mod, offset, err = modToPrintf(s[j+2 : j+2+sep])
+					if err != nil {
+						return err.Error()
+					}
+					j += 2 + sep // Jump to it
+				}
+				dom.WriteString(fmt.Sprintf(mod, i+offset))
+			default:
+				if escape { // Pretty useless here
+					escape = false
+					continue
+				}
+				dom.WriteByte(s[j])
+			}
+		}
+		// Re-parse the RR and send it on the current channel t
+		rx, err := NewRR("$ORIGIN " + o + "\n" + dom.String())
+		if err != nil {
+			return err.Error()
+		}
+		t <- &Token{RR: rx}
+		// Its more efficient to first built the rrlist and then parse it in
+		// one go! But is this a problem?
+	}
+	return ""
+}
+
+// Convert a $GENERATE modifier 0,0,d to something Printf can deal with.
+func modToPrintf(s string) (string, int, error) {
+	xs := strings.SplitN(s, ",", 3)
+	if len(xs) != 3 {
+		return "", 0, errors.New("bad modifier in $GENERATE")
+	}
+	// xs[0] is offset, xs[1] is width, xs[2] is base
+	if xs[2] != "o" && xs[2] != "d" && xs[2] != "x" && xs[2] != "X" {
+		return "", 0, errors.New("bad base in $GENERATE")
+	}
+	offset, err := strconv.Atoi(xs[0])
+	if err != nil || offset > 255 {
+		return "", 0, errors.New("bad offset in $GENERATE")
+	}
+	width, err := strconv.Atoi(xs[1])
+	if err != nil || width > 255 {
+		return "", offset, errors.New("bad width in $GENERATE")
+	}
+	switch {
+	case width < 0:
+		return "", offset, errors.New("bad width in $GENERATE")
+	case width == 0:
+		return "%" + xs[1] + xs[2], offset, nil
+	}
+	return "%0" + xs[1] + xs[2], offset, nil
+}
diff --git a/vendor/github.com/miekg/dns/idn/code_points.go b/vendor/github.com/miekg/dns/idn/code_points.go
new file mode 100644
index 0000000000..129c3742f5
--- /dev/null
+++ b/vendor/github.com/miekg/dns/idn/code_points.go
@@ -0,0 +1,2346 @@
+package idn
+
+const (
+	propertyUnknown    property = iota // unknown character property
+	propertyPVALID                     // allowed to be used in IDNs
+	propertyCONTEXTJ                   // invisible or problematic characters (join controls)
+	propertyCONTEXTO                   // invisible or problematic characters (others)
+	propertyDISALLOWED                 // should not be included in IDNs
+	propertyUNASSIGNED                 // code points that are not designated in the Unicode Standard
+)
+
+// property stores the property of a code point, as described in RFC 5892,
+// section 1
+type property int
+
+// codePoints list all code points in Unicode Character Database (UCD) Format
+// according to RFC 5892, appendix B.1. Thanks to libidn2 (GNU) -
+// http://www.gnu.org/software/libidn/libidn2/
+var codePoints = []struct {
+	start rune
+	end   rune
+	state property
+}{
+	{0x0000, 0x002C, propertyDISALLOWED},    // <control>..COMMA
+	{0x002D, 0x0, propertyPVALID},           // HYPHEN-MINUS
+	{0x002E, 0x002F, propertyDISALLOWED},    // FULL STOP..SOLIDUS
+	{0x0030, 0x0039, propertyPVALID},        // DIGIT ZERO..DIGIT NINE
+	{0x003A, 0x0060, propertyDISALLOWED},    // COLON..GRAVE ACCENT
+	{0x0041, 0x005A, propertyPVALID},        // LATIN CAPITAL LETTER A..LATIN CAPITAL LETTER Z
+	{0x0061, 0x007A, propertyPVALID},        // LATIN SMALL LETTER A..LATIN SMALL LETTER Z
+	{0x007B, 0x00B6, propertyDISALLOWED},    // LEFT CURLY BRACKET..PILCROW SIGN
+	{0x00B7, 0x0, propertyCONTEXTO},         // MIDDLE DOT
+	{0x00B8, 0x00DE, propertyDISALLOWED},    // CEDILLA..LATIN CAPITAL LETTER THORN
+	{0x00DF, 0x00F6, propertyPVALID},        // LATIN SMALL LETTER SHARP S..LATIN SMALL LETT
+	{0x00F7, 0x0, propertyDISALLOWED},       // DIVISION SIGN
+	{0x00F8, 0x00FF, propertyPVALID},        // LATIN SMALL LETTER O WITH STROKE..LATIN SMAL
+	{0x0100, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH MACRON
+	{0x0101, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH MACRON
+	{0x0102, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH BREVE
+	{0x0103, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH BREVE
+	{0x0104, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH OGONEK
+	{0x0105, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH OGONEK
+	{0x0106, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER C WITH ACUTE
+	{0x0107, 0x0, propertyPVALID},           // LATIN SMALL LETTER C WITH ACUTE
+	{0x0108, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER C WITH CIRCUMFLEX
+	{0x0109, 0x0, propertyPVALID},           // LATIN SMALL LETTER C WITH CIRCUMFLEX
+	{0x010A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER C WITH DOT ABOVE
+	{0x010B, 0x0, propertyPVALID},           // LATIN SMALL LETTER C WITH DOT ABOVE
+	{0x010C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER C WITH CARON
+	{0x010D, 0x0, propertyPVALID},           // LATIN SMALL LETTER C WITH CARON
+	{0x010E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER D WITH CARON
+	{0x010F, 0x0, propertyPVALID},           // LATIN SMALL LETTER D WITH CARON
+	{0x0110, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER D WITH STROKE
+	{0x0111, 0x0, propertyPVALID},           // LATIN SMALL LETTER D WITH STROKE
+	{0x0112, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH MACRON
+	{0x0113, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH MACRON
+	{0x0114, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH BREVE
+	{0x0115, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH BREVE
+	{0x0116, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH DOT ABOVE
+	{0x0117, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH DOT ABOVE
+	{0x0118, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH OGONEK
+	{0x0119, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH OGONEK
+	{0x011A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH CARON
+	{0x011B, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH CARON
+	{0x011C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER G WITH CIRCUMFLEX
+	{0x011D, 0x0, propertyPVALID},           // LATIN SMALL LETTER G WITH CIRCUMFLEX
+	{0x011E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER G WITH BREVE
+	{0x011F, 0x0, propertyPVALID},           // LATIN SMALL LETTER G WITH BREVE
+	{0x0120, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER G WITH DOT ABOVE
+	{0x0121, 0x0, propertyPVALID},           // LATIN SMALL LETTER G WITH DOT ABOVE
+	{0x0122, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER G WITH CEDILLA
+	{0x0123, 0x0, propertyPVALID},           // LATIN SMALL LETTER G WITH CEDILLA
+	{0x0124, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER H WITH CIRCUMFLEX
+	{0x0125, 0x0, propertyPVALID},           // LATIN SMALL LETTER H WITH CIRCUMFLEX
+	{0x0126, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER H WITH STROKE
+	{0x0127, 0x0, propertyPVALID},           // LATIN SMALL LETTER H WITH STROKE
+	{0x0128, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER I WITH TILDE
+	{0x0129, 0x0, propertyPVALID},           // LATIN SMALL LETTER I WITH TILDE
+	{0x012A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER I WITH MACRON
+	{0x012B, 0x0, propertyPVALID},           // LATIN SMALL LETTER I WITH MACRON
+	{0x012C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER I WITH BREVE
+	{0x012D, 0x0, propertyPVALID},           // LATIN SMALL LETTER I WITH BREVE
+	{0x012E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER I WITH OGONEK
+	{0x012F, 0x0, propertyPVALID},           // LATIN SMALL LETTER I WITH OGONEK
+	{0x0130, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER I WITH DOT ABOVE
+	{0x0131, 0x0, propertyPVALID},           // LATIN SMALL LETTER DOTLESS I
+	{0x0132, 0x0134, propertyDISALLOWED},    // LATIN CAPITAL LIGATURE IJ..LATIN CAPITAL LET
+	{0x0135, 0x0, propertyPVALID},           // LATIN SMALL LETTER J WITH CIRCUMFLEX
+	{0x0136, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER K WITH CEDILLA
+	{0x0137, 0x0138, propertyPVALID},        // LATIN SMALL LETTER K WITH CEDILLA..LATIN SMA
+	{0x0139, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER L WITH ACUTE
+	{0x013A, 0x0, propertyPVALID},           // LATIN SMALL LETTER L WITH ACUTE
+	{0x013B, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER L WITH CEDILLA
+	{0x013C, 0x0, propertyPVALID},           // LATIN SMALL LETTER L WITH CEDILLA
+	{0x013D, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER L WITH CARON
+	{0x013E, 0x0, propertyPVALID},           // LATIN SMALL LETTER L WITH CARON
+	{0x013F, 0x0141, propertyDISALLOWED},    // LATIN CAPITAL LETTER L WITH MIDDLE DOT..LATI
+	{0x0142, 0x0, propertyPVALID},           // LATIN SMALL LETTER L WITH STROKE
+	{0x0143, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER N WITH ACUTE
+	{0x0144, 0x0, propertyPVALID},           // LATIN SMALL LETTER N WITH ACUTE
+	{0x0145, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER N WITH CEDILLA
+	{0x0146, 0x0, propertyPVALID},           // LATIN SMALL LETTER N WITH CEDILLA
+	{0x0147, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER N WITH CARON
+	{0x0148, 0x0, propertyPVALID},           // LATIN SMALL LETTER N WITH CARON
+	{0x0149, 0x014A, propertyDISALLOWED},    // LATIN SMALL LETTER N PRECEDED BY APOSTROPHE.
+	{0x014B, 0x0, propertyPVALID},           // LATIN SMALL LETTER ENG
+	{0x014C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH MACRON
+	{0x014D, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH MACRON
+	{0x014E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH BREVE
+	{0x014F, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH BREVE
+	{0x0150, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+	{0x0151, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH DOUBLE ACUTE
+	{0x0152, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LIGATURE OE
+	{0x0153, 0x0, propertyPVALID},           // LATIN SMALL LIGATURE OE
+	{0x0154, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER R WITH ACUTE
+	{0x0155, 0x0, propertyPVALID},           // LATIN SMALL LETTER R WITH ACUTE
+	{0x0156, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER R WITH CEDILLA
+	{0x0157, 0x0, propertyPVALID},           // LATIN SMALL LETTER R WITH CEDILLA
+	{0x0158, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER R WITH CARON
+	{0x0159, 0x0, propertyPVALID},           // LATIN SMALL LETTER R WITH CARON
+	{0x015A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER S WITH ACUTE
+	{0x015B, 0x0, propertyPVALID},           // LATIN SMALL LETTER S WITH ACUTE
+	{0x015C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER S WITH CIRCUMFLEX
+	{0x015D, 0x0, propertyPVALID},           // LATIN SMALL LETTER S WITH CIRCUMFLEX
+	{0x015E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER S WITH CEDILLA
+	{0x015F, 0x0, propertyPVALID},           // LATIN SMALL LETTER S WITH CEDILLA
+	{0x0160, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER S WITH CARON
+	{0x0161, 0x0, propertyPVALID},           // LATIN SMALL LETTER S WITH CARON
+	{0x0162, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER T WITH CEDILLA
+	{0x0163, 0x0, propertyPVALID},           // LATIN SMALL LETTER T WITH CEDILLA
+	{0x0164, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER T WITH CARON
+	{0x0165, 0x0, propertyPVALID},           // LATIN SMALL LETTER T WITH CARON
+	{0x0166, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER T WITH STROKE
+	{0x0167, 0x0, propertyPVALID},           // LATIN SMALL LETTER T WITH STROKE
+	{0x0168, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH TILDE
+	{0x0169, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH TILDE
+	{0x016A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH MACRON
+	{0x016B, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH MACRON
+	{0x016C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH BREVE
+	{0x016D, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH BREVE
+	{0x016E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH RING ABOVE
+	{0x016F, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH RING ABOVE
+	{0x0170, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+	{0x0171, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH DOUBLE ACUTE
+	{0x0172, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH OGONEK
+	{0x0173, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH OGONEK
+	{0x0174, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER W WITH CIRCUMFLEX
+	{0x0175, 0x0, propertyPVALID},           // LATIN SMALL LETTER W WITH CIRCUMFLEX
+	{0x0176, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
+	{0x0177, 0x0, propertyPVALID},           // LATIN SMALL LETTER Y WITH CIRCUMFLEX
+	{0x0178, 0x0179, propertyDISALLOWED},    // LATIN CAPITAL LETTER Y WITH DIAERESIS..LATIN
+	{0x017A, 0x0, propertyPVALID},           // LATIN SMALL LETTER Z WITH ACUTE
+	{0x017B, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER Z WITH DOT ABOVE
+	{0x017C, 0x0, propertyPVALID},           // LATIN SMALL LETTER Z WITH DOT ABOVE
+	{0x017D, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER Z WITH CARON
+	{0x017E, 0x0, propertyPVALID},           // LATIN SMALL LETTER Z WITH CARON
+	{0x017F, 0x0, propertyDISALLOWED},       // LATIN SMALL LETTER LONG S
+	{0x0180, 0x0, propertyPVALID},           // LATIN SMALL LETTER B WITH STROKE
+	{0x0181, 0x0182, propertyDISALLOWED},    // LATIN CAPITAL LETTER B WITH HOOK..LATIN CAPI
+	{0x0183, 0x0, propertyPVALID},           // LATIN SMALL LETTER B WITH TOPBAR
+	{0x0184, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER TONE SIX
+	{0x0185, 0x0, propertyPVALID},           // LATIN SMALL LETTER TONE SIX
+	{0x0186, 0x0187, propertyDISALLOWED},    // LATIN CAPITAL LETTER OPEN O..LATIN CAPITAL L
+	{0x0188, 0x0, propertyPVALID},           // LATIN SMALL LETTER C WITH HOOK
+	{0x0189, 0x018B, propertyDISALLOWED},    // LATIN CAPITAL LETTER AFRICAN D..LATIN CAPITA
+	{0x018C, 0x018D, propertyPVALID},        // LATIN SMALL LETTER D WITH TOPBAR..LATIN SMAL
+	{0x018E, 0x0191, propertyDISALLOWED},    // LATIN CAPITAL LETTER REVERSED E..LATIN CAPIT
+	{0x0192, 0x0, propertyPVALID},           // LATIN SMALL LETTER F WITH HOOK
+	{0x0193, 0x0194, propertyDISALLOWED},    // LATIN CAPITAL LETTER G WITH HOOK..LATIN CAPI
+	{0x0195, 0x0, propertyPVALID},           // LATIN SMALL LETTER HV
+	{0x0196, 0x0198, propertyDISALLOWED},    // LATIN CAPITAL LETTER IOTA..LATIN CAPITAL LET
+	{0x0199, 0x019B, propertyPVALID},        // LATIN SMALL LETTER K WITH HOOK..LATIN SMALL
+	{0x019C, 0x019D, propertyDISALLOWED},    // LATIN CAPITAL LETTER TURNED M..LATIN CAPITAL
+	{0x019E, 0x0, propertyPVALID},           // LATIN SMALL LETTER N WITH LONG RIGHT LEG
+	{0x019F, 0x01A0, propertyDISALLOWED},    // LATIN CAPITAL LETTER O WITH MIDDLE TILDE..LA
+	{0x01A1, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH HORN
+	{0x01A2, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER OI
+	{0x01A3, 0x0, propertyPVALID},           // LATIN SMALL LETTER OI
+	{0x01A4, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER P WITH HOOK
+	{0x01A5, 0x0, propertyPVALID},           // LATIN SMALL LETTER P WITH HOOK
+	{0x01A6, 0x01A7, propertyDISALLOWED},    // LATIN LETTER YR..LATIN CAPITAL LETTER TONE T
+	{0x01A8, 0x0, propertyPVALID},           // LATIN SMALL LETTER TONE TWO
+	{0x01A9, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER ESH
+	{0x01AA, 0x01AB, propertyPVALID},        // LATIN LETTER REVERSED ESH LOOP..LATIN SMALL
+	{0x01AC, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER T WITH HOOK
+	{0x01AD, 0x0, propertyPVALID},           // LATIN SMALL LETTER T WITH HOOK
+	{0x01AE, 0x01AF, propertyDISALLOWED},    // LATIN CAPITAL LETTER T WITH RETROFLEX HOOK..
+	{0x01B0, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH HORN
+	{0x01B1, 0x01B3, propertyDISALLOWED},    // LATIN CAPITAL LETTER UPSILON..LATIN CAPITAL
+	{0x01B4, 0x0, propertyPVALID},           // LATIN SMALL LETTER Y WITH HOOK
+	{0x01B5, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER Z WITH STROKE
+	{0x01B6, 0x0, propertyPVALID},           // LATIN SMALL LETTER Z WITH STROKE
+	{0x01B7, 0x01B8, propertyDISALLOWED},    // LATIN CAPITAL LETTER EZH..LATIN CAPITAL LETT
+	{0x01B9, 0x01BB, propertyPVALID},        // LATIN SMALL LETTER EZH REVERSED..LATIN LETTE
+	{0x01BC, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER TONE FIVE
+	{0x01BD, 0x01C3, propertyPVALID},        // LATIN SMALL LETTER TONE FIVE..LATIN LETTER R
+	{0x01C4, 0x01CD, propertyDISALLOWED},    // LATIN CAPITAL LETTER DZ WITH CARON..LATIN CA
+	{0x01CE, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH CARON
+	{0x01CF, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER I WITH CARON
+	{0x01D0, 0x0, propertyPVALID},           // LATIN SMALL LETTER I WITH CARON
+	{0x01D1, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH CARON
+	{0x01D2, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH CARON
+	{0x01D3, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH CARON
+	{0x01D4, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH CARON
+	{0x01D5, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH DIAERESIS AND MA
+	{0x01D6, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH DIAERESIS AND MACR
+	{0x01D7, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH DIAERESIS AND AC
+	{0x01D8, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH DIAERESIS AND ACUT
+	{0x01D9, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH DIAERESIS AND CA
+	{0x01DA, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH DIAERESIS AND CARO
+	{0x01DB, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH DIAERESIS AND GR
+	{0x01DC, 0x01DD, propertyPVALID},        // LATIN SMALL LETTER U WITH DIAERESIS AND GRAV
+	{0x01DE, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH DIAERESIS AND MA
+	{0x01DF, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH DIAERESIS AND MACR
+	{0x01E0, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH DOT ABOVE AND MA
+	{0x01E1, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH DOT ABOVE AND MACR
+	{0x01E2, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER AE WITH MACRON
+	{0x01E3, 0x0, propertyPVALID},           // LATIN SMALL LETTER AE WITH MACRON
+	{0x01E4, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER G WITH STROKE
+	{0x01E5, 0x0, propertyPVALID},           // LATIN SMALL LETTER G WITH STROKE
+	{0x01E6, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER G WITH CARON
+	{0x01E7, 0x0, propertyPVALID},           // LATIN SMALL LETTER G WITH CARON
+	{0x01E8, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER K WITH CARON
+	{0x01E9, 0x0, propertyPVALID},           // LATIN SMALL LETTER K WITH CARON
+	{0x01EA, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH OGONEK
+	{0x01EB, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH OGONEK
+	{0x01EC, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH OGONEK AND MACRO
+	{0x01ED, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH OGONEK AND MACRON
+	{0x01EE, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER EZH WITH CARON
+	{0x01EF, 0x01F0, propertyPVALID},        // LATIN SMALL LETTER EZH WITH CARON..LATIN SMA
+	{0x01F1, 0x01F4, propertyDISALLOWED},    // LATIN CAPITAL LETTER DZ..LATIN CAPITAL LETTE
+	{0x01F5, 0x0, propertyPVALID},           // LATIN SMALL LETTER G WITH ACUTE
+	{0x01F6, 0x01F8, propertyDISALLOWED},    // LATIN CAPITAL LETTER HWAIR..LATIN CAPITAL LE
+	{0x01F9, 0x0, propertyPVALID},           // LATIN SMALL LETTER N WITH GRAVE
+	{0x01FA, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH RING ABOVE AND A
+	{0x01FB, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH RING ABOVE AND ACU
+	{0x01FC, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER AE WITH ACUTE
+	{0x01FD, 0x0, propertyPVALID},           // LATIN SMALL LETTER AE WITH ACUTE
+	{0x01FE, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
+	{0x01FF, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH STROKE AND ACUTE
+	{0x0200, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
+	{0x0201, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH DOUBLE GRAVE
+	{0x0202, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH INVERTED BREVE
+	{0x0203, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH INVERTED BREVE
+	{0x0204, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
+	{0x0205, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH DOUBLE GRAVE
+	{0x0206, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH INVERTED BREVE
+	{0x0207, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH INVERTED BREVE
+	{0x0208, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
+	{0x0209, 0x0, propertyPVALID},           // LATIN SMALL LETTER I WITH DOUBLE GRAVE
+	{0x020A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER I WITH INVERTED BREVE
+	{0x020B, 0x0, propertyPVALID},           // LATIN SMALL LETTER I WITH INVERTED BREVE
+	{0x020C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
+	{0x020D, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH DOUBLE GRAVE
+	{0x020E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH INVERTED BREVE
+	{0x020F, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH INVERTED BREVE
+	{0x0210, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
+	{0x0211, 0x0, propertyPVALID},           // LATIN SMALL LETTER R WITH DOUBLE GRAVE
+	{0x0212, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER R WITH INVERTED BREVE
+	{0x0213, 0x0, propertyPVALID},           // LATIN SMALL LETTER R WITH INVERTED BREVE
+	{0x0214, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
+	{0x0215, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH DOUBLE GRAVE
+	{0x0216, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH INVERTED BREVE
+	{0x0217, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH INVERTED BREVE
+	{0x0218, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER S WITH COMMA BELOW
+	{0x0219, 0x0, propertyPVALID},           // LATIN SMALL LETTER S WITH COMMA BELOW
+	{0x021A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER T WITH COMMA BELOW
+	{0x021B, 0x0, propertyPVALID},           // LATIN SMALL LETTER T WITH COMMA BELOW
+	{0x021C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER YOGH
+	{0x021D, 0x0, propertyPVALID},           // LATIN SMALL LETTER YOGH
+	{0x021E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER H WITH CARON
+	{0x021F, 0x0, propertyPVALID},           // LATIN SMALL LETTER H WITH CARON
+	{0x0220, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER N WITH LONG RIGHT LEG
+	{0x0221, 0x0, propertyPVALID},           // LATIN SMALL LETTER D WITH CURL
+	{0x0222, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER OU
+	{0x0223, 0x0, propertyPVALID},           // LATIN SMALL LETTER OU
+	{0x0224, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER Z WITH HOOK
+	{0x0225, 0x0, propertyPVALID},           // LATIN SMALL LETTER Z WITH HOOK
+	{0x0226, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH DOT ABOVE
+	{0x0227, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH DOT ABOVE
+	{0x0228, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH CEDILLA
+	{0x0229, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH CEDILLA
+	{0x022A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH DIAERESIS AND MA
+	{0x022B, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH DIAERESIS AND MACR
+	{0x022C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH TILDE AND MACRON
+	{0x022D, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH TILDE AND MACRON
+	{0x022E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH DOT ABOVE
+	{0x022F, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH DOT ABOVE
+	{0x0230, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH DOT ABOVE AND MA
+	{0x0231, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH DOT ABOVE AND MACR
+	{0x0232, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER Y WITH MACRON
+	{0x0233, 0x0239, propertyPVALID},        // LATIN SMALL LETTER Y WITH MACRON..LATIN SMAL
+	{0x023A, 0x023B, propertyDISALLOWED},    // LATIN CAPITAL LETTER A WITH STROKE..LATIN CA
+	{0x023C, 0x0, propertyPVALID},           // LATIN SMALL LETTER C WITH STROKE
+	{0x023D, 0x023E, propertyDISALLOWED},    // LATIN CAPITAL LETTER L WITH BAR..LATIN CAPIT
+	{0x023F, 0x0240, propertyPVALID},        // LATIN SMALL LETTER S WITH SWASH TAIL..LATIN
+	{0x0241, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER GLOTTAL STOP
+	{0x0242, 0x0, propertyPVALID},           // LATIN SMALL LETTER GLOTTAL STOP
+	{0x0243, 0x0246, propertyDISALLOWED},    // LATIN CAPITAL LETTER B WITH STROKE..LATIN CA
+	{0x0247, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH STROKE
+	{0x0248, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER J WITH STROKE
+	{0x0249, 0x0, propertyPVALID},           // LATIN SMALL LETTER J WITH STROKE
+	{0x024A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER SMALL Q WITH HOOK TAIL
+	{0x024B, 0x0, propertyPVALID},           // LATIN SMALL LETTER Q WITH HOOK TAIL
+	{0x024C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER R WITH STROKE
+	{0x024D, 0x0, propertyPVALID},           // LATIN SMALL LETTER R WITH STROKE
+	{0x024E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER Y WITH STROKE
+	{0x024F, 0x02AF, propertyPVALID},        // LATIN SMALL LETTER Y WITH STROKE..LATIN SMAL
+	{0x02B0, 0x02B8, propertyDISALLOWED},    // MODIFIER LETTER SMALL H..MODIFIER LETTER SMA
+	{0x02B9, 0x02C1, propertyPVALID},        // MODIFIER LETTER PRIME..MODIFIER LETTER REVER
+	{0x02C2, 0x02C5, propertyDISALLOWED},    // MODIFIER LETTER LEFT ARROWHEAD..MODIFIER LET
+	{0x02C6, 0x02D1, propertyPVALID},        // MODIFIER LETTER CIRCUMFLEX ACCENT..MODIFIER
+	{0x02D2, 0x02EB, propertyDISALLOWED},    // MODIFIER LETTER CENTRED RIGHT HALF RING..MOD
+	{0x02EC, 0x0, propertyPVALID},           // MODIFIER LETTER VOICING
+	{0x02ED, 0x0, propertyDISALLOWED},       // MODIFIER LETTER UNASPIRATED
+	{0x02EE, 0x0, propertyPVALID},           // MODIFIER LETTER DOUBLE APOSTROPHE
+	{0x02EF, 0x02FF, propertyDISALLOWED},    // MODIFIER LETTER LOW DOWN ARROWHEAD..MODIFIER
+	{0x0300, 0x033F, propertyPVALID},        // COMBINING GRAVE ACCENT..COMBINING DOUBLE OVE
+	{0x0340, 0x0341, propertyDISALLOWED},    // COMBINING GRAVE TONE MARK..COMBINING ACUTE T
+	{0x0342, 0x0, propertyPVALID},           // COMBINING GREEK PERISPOMENI
+	{0x0343, 0x0345, propertyDISALLOWED},    // COMBINING GREEK KORONIS..COMBINING GREEK YPO
+	{0x0346, 0x034E, propertyPVALID},        // COMBINING BRIDGE ABOVE..COMBINING UPWARDS AR
+	{0x034F, 0x0, propertyDISALLOWED},       // COMBINING GRAPHEME JOINER
+	{0x0350, 0x036F, propertyPVALID},        // COMBINING RIGHT ARROWHEAD ABOVE..COMBINING L
+	{0x0370, 0x0, propertyDISALLOWED},       // GREEK CAPITAL LETTER HETA
+	{0x0371, 0x0, propertyPVALID},           // GREEK SMALL LETTER HETA
+	{0x0372, 0x0, propertyDISALLOWED},       // GREEK CAPITAL LETTER ARCHAIC SAMPI
+	{0x0373, 0x0, propertyPVALID},           // GREEK SMALL LETTER ARCHAIC SAMPI
+	{0x0374, 0x0, propertyDISALLOWED},       // GREEK NUMERAL SIGN
+	{0x0375, 0x0, propertyCONTEXTO},         // GREEK LOWER NUMERAL SIGN
+	{0x0376, 0x0, propertyDISALLOWED},       // GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA
+	{0x0377, 0x0, propertyPVALID},           // GREEK SMALL LETTER PAMPHYLIAN DIGAMMA
+	{0x0378, 0x0379, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x037A, 0x0, propertyDISALLOWED},       // GREEK YPOGEGRAMMENI
+	{0x037B, 0x037D, propertyPVALID},        // GREEK SMALL REVERSED LUNATE SIGMA SYMBOL..GR
+	{0x037E, 0x0, propertyDISALLOWED},       // GREEK QUESTION MARK
+	{0x037F, 0x0383, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0384, 0x038A, propertyDISALLOWED},    // GREEK TONOS..GREEK CAPITAL LETTER IOTA WITH
+	{0x038B, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x038C, 0x0, propertyDISALLOWED},       // GREEK CAPITAL LETTER OMICRON WITH TONOS
+	{0x038D, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x038E, 0x038F, propertyDISALLOWED},    // GREEK CAPITAL LETTER UPSILON WITH TONOS..GRE
+	{0x0390, 0x0, propertyPVALID},           // GREEK SMALL LETTER IOTA WITH DIALYTIKA AND T
+	{0x0391, 0x03A1, propertyDISALLOWED},    // GREEK CAPITAL LETTER ALPHA..GREEK CAPITAL LE
+	{0x03A2, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x03A3, 0x03AB, propertyDISALLOWED},    // GREEK CAPITAL LETTER SIGMA..GREEK CAPITAL LE
+	{0x03AC, 0x03CE, propertyPVALID},        // GREEK SMALL LETTER ALPHA WITH TONOS..GREEK S
+	{0x03CF, 0x03D6, propertyDISALLOWED},    // GREEK CAPITAL KAI SYMBOL..GREEK PI SYMBOL
+	{0x03D7, 0x0, propertyPVALID},           // GREEK KAI SYMBOL
+	{0x03D8, 0x0, propertyDISALLOWED},       // GREEK LETTER ARCHAIC KOPPA
+	{0x03D9, 0x0, propertyPVALID},           // GREEK SMALL LETTER ARCHAIC KOPPA
+	{0x03DA, 0x0, propertyDISALLOWED},       // GREEK LETTER STIGMA
+	{0x03DB, 0x0, propertyPVALID},           // GREEK SMALL LETTER STIGMA
+	{0x03DC, 0x0, propertyDISALLOWED},       // GREEK LETTER DIGAMMA
+	{0x03DD, 0x0, propertyPVALID},           // GREEK SMALL LETTER DIGAMMA
+	{0x03DE, 0x0, propertyDISALLOWED},       // GREEK LETTER KOPPA
+	{0x03DF, 0x0, propertyPVALID},           // GREEK SMALL LETTER KOPPA
+	{0x03E0, 0x0, propertyDISALLOWED},       // GREEK LETTER SAMPI
+	{0x03E1, 0x0, propertyPVALID},           // GREEK SMALL LETTER SAMPI
+	{0x03E2, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER SHEI
+	{0x03E3, 0x0, propertyPVALID},           // COPTIC SMALL LETTER SHEI
+	{0x03E4, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER FEI
+	{0x03E5, 0x0, propertyPVALID},           // COPTIC SMALL LETTER FEI
+	{0x03E6, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER KHEI
+	{0x03E7, 0x0, propertyPVALID},           // COPTIC SMALL LETTER KHEI
+	{0x03E8, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER HORI
+	{0x03E9, 0x0, propertyPVALID},           // COPTIC SMALL LETTER HORI
+	{0x03EA, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER GANGIA
+	{0x03EB, 0x0, propertyPVALID},           // COPTIC SMALL LETTER GANGIA
+	{0x03EC, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER SHIMA
+	{0x03ED, 0x0, propertyPVALID},           // COPTIC SMALL LETTER SHIMA
+	{0x03EE, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER DEI
+	{0x03EF, 0x0, propertyPVALID},           // COPTIC SMALL LETTER DEI
+	{0x03F0, 0x03F2, propertyDISALLOWED},    // GREEK KAPPA SYMBOL..GREEK LUNATE SIGMA SYMBO
+	{0x03F3, 0x0, propertyPVALID},           // GREEK LETTER YOT
+	{0x03F4, 0x03F7, propertyDISALLOWED},    // GREEK CAPITAL THETA SYMBOL..GREEK CAPITAL LE
+	{0x03F8, 0x0, propertyPVALID},           // GREEK SMALL LETTER SHO
+	{0x03F9, 0x03FA, propertyDISALLOWED},    // GREEK CAPITAL LUNATE SIGMA SYMBOL..GREEK CAP
+	{0x03FB, 0x03FC, propertyPVALID},        // GREEK SMALL LETTER SAN..GREEK RHO WITH STROK
+	{0x03FD, 0x042F, propertyDISALLOWED},    // GREEK CAPITAL REVERSED LUNATE SIGMA SYMBOL..
+	{0x0430, 0x045F, propertyPVALID},        // CYRILLIC SMALL LETTER A..CYRILLIC SMALL LETT
+	{0x0460, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER OMEGA
+	{0x0461, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER OMEGA
+	{0x0462, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER YAT
+	{0x0463, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER YAT
+	{0x0464, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER IOTIFIED E
+	{0x0465, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER IOTIFIED E
+	{0x0466, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER LITTLE YUS
+	{0x0467, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER LITTLE YUS
+	{0x0468, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS
+	{0x0469, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER IOTIFIED LITTLE YUS
+	{0x046A, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER BIG YUS
+	{0x046B, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER BIG YUS
+	{0x046C, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS
+	{0x046D, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER IOTIFIED BIG YUS
+	{0x046E, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER KSI
+	{0x046F, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER KSI
+	{0x0470, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER PSI
+	{0x0471, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER PSI
+	{0x0472, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER FITA
+	{0x0473, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER FITA
+	{0x0474, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER IZHITSA
+	{0x0475, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER IZHITSA
+	{0x0476, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE
+	{0x0477, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GR
+	{0x0478, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER UK
+	{0x0479, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER UK
+	{0x047A, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER ROUND OMEGA
+	{0x047B, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER ROUND OMEGA
+	{0x047C, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER OMEGA WITH TITLO
+	{0x047D, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER OMEGA WITH TITLO
+	{0x047E, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER OT
+	{0x047F, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER OT
+	{0x0480, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER KOPPA
+	{0x0481, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER KOPPA
+	{0x0482, 0x0, propertyDISALLOWED},       // CYRILLIC THOUSANDS SIGN
+	{0x0483, 0x0487, propertyPVALID},        // COMBINING CYRILLIC TITLO..COMBINING CYRILLIC
+	{0x0488, 0x048A, propertyDISALLOWED},    // COMBINING CYRILLIC HUNDRED THOUSANDS SIGN..C
+	{0x048B, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER SHORT I WITH TAIL
+	{0x048C, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER SEMISOFT SIGN
+	{0x048D, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER SEMISOFT SIGN
+	{0x048E, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER ER WITH TICK
+	{0x048F, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER ER WITH TICK
+	{0x0490, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+	{0x0491, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER GHE WITH UPTURN
+	{0x0492, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER GHE WITH STROKE
+	{0x0493, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER GHE WITH STROKE
+	{0x0494, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK
+	{0x0495, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER GHE WITH MIDDLE HOOK
+	{0x0496, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER
+	{0x0497, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER ZHE WITH DESCENDER
+	{0x0498, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER ZE WITH DESCENDER
+	{0x0499, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER ZE WITH DESCENDER
+	{0x049A, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER KA WITH DESCENDER
+	{0x049B, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER KA WITH DESCENDER
+	{0x049C, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER KA WITH VERTICAL STR
+	{0x049D, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER KA WITH VERTICAL STROK
+	{0x049E, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER KA WITH STROKE
+	{0x049F, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER KA WITH STROKE
+	{0x04A0, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER BASHKIR KA
+	{0x04A1, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER BASHKIR KA
+	{0x04A2, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER EN WITH DESCENDER
+	{0x04A3, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER EN WITH DESCENDER
+	{0x04A4, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LIGATURE EN GHE
+	{0x04A5, 0x0, propertyPVALID},           // CYRILLIC SMALL LIGATURE EN GHE
+	{0x04A6, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK
+	{0x04A7, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER PE WITH MIDDLE HOOK
+	{0x04A8, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER ABKHASIAN HA
+	{0x04A9, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER ABKHASIAN HA
+	{0x04AA, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER ES WITH DESCENDER
+	{0x04AB, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER ES WITH DESCENDER
+	{0x04AC, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER TE WITH DESCENDER
+	{0x04AD, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER TE WITH DESCENDER
+	{0x04AE, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER STRAIGHT U
+	{0x04AF, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER STRAIGHT U
+	{0x04B0, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER STRAIGHT U WITH STRO
+	{0x04B1, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE
+	{0x04B2, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER HA WITH DESCENDER
+	{0x04B3, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER HA WITH DESCENDER
+	{0x04B4, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LIGATURE TE TSE
+	{0x04B5, 0x0, propertyPVALID},           // CYRILLIC SMALL LIGATURE TE TSE
+	{0x04B6, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER CHE WITH DESCENDER
+	{0x04B7, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER CHE WITH DESCENDER
+	{0x04B8, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER CHE WITH VERTICAL ST
+	{0x04B9, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER CHE WITH VERTICAL STRO
+	{0x04BA, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER SHHA
+	{0x04BB, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER SHHA
+	{0x04BC, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER ABKHASIAN CHE
+	{0x04BD, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER ABKHASIAN CHE
+	{0x04BE, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH D
+	{0x04BF, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER ABKHASIAN CHE WITH DES
+	{0x04C0, 0x04C1, propertyDISALLOWED},    // CYRILLIC LETTER PALOCHKA..CYRILLIC CAPITAL L
+	{0x04C2, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER ZHE WITH BREVE
+	{0x04C3, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER KA WITH HOOK
+	{0x04C4, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER KA WITH HOOK
+	{0x04C5, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER EL WITH TAIL
+	{0x04C6, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER EL WITH TAIL
+	{0x04C7, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER EN WITH HOOK
+	{0x04C8, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER EN WITH HOOK
+	{0x04C9, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER EN WITH TAIL
+	{0x04CA, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER EN WITH TAIL
+	{0x04CB, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER KHAKASSIAN CHE
+	{0x04CC, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER KHAKASSIAN CHE
+	{0x04CD, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER EM WITH TAIL
+	{0x04CE, 0x04CF, propertyPVALID},        // CYRILLIC SMALL LETTER EM WITH TAIL..CYRILLIC
+	{0x04D0, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER A WITH BREVE
+	{0x04D1, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER A WITH BREVE
+	{0x04D2, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER A WITH DIAERESIS
+	{0x04D3, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER A WITH DIAERESIS
+	{0x04D4, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LIGATURE A IE
+	{0x04D5, 0x0, propertyPVALID},           // CYRILLIC SMALL LIGATURE A IE
+	{0x04D6, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER IE WITH BREVE
+	{0x04D7, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER IE WITH BREVE
+	{0x04D8, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER SCHWA
+	{0x04D9, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER SCHWA
+	{0x04DA, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS
+	{0x04DB, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS
+	{0x04DC, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS
+	{0x04DD, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER ZHE WITH DIAERESIS
+	{0x04DE, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS
+	{0x04DF, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER ZE WITH DIAERESIS
+	{0x04E0, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER ABKHASIAN DZE
+	{0x04E1, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER ABKHASIAN DZE
+	{0x04E2, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER I WITH MACRON
+	{0x04E3, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER I WITH MACRON
+	{0x04E4, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER I WITH DIAERESIS
+	{0x04E5, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER I WITH DIAERESIS
+	{0x04E6, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER O WITH DIAERESIS
+	{0x04E7, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER O WITH DIAERESIS
+	{0x04E8, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER BARRED O
+	{0x04E9, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER BARRED O
+	{0x04EA, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER BARRED O WITH DIAERE
+	{0x04EB, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER BARRED O WITH DIAERESI
+	{0x04EC, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER E WITH DIAERESIS
+	{0x04ED, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER E WITH DIAERESIS
+	{0x04EE, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER U WITH MACRON
+	{0x04EF, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER U WITH MACRON
+	{0x04F0, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER U WITH DIAERESIS
+	{0x04F1, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER U WITH DIAERESIS
+	{0x04F2, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE
+	{0x04F3, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER U WITH DOUBLE ACUTE
+	{0x04F4, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS
+	{0x04F5, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER CHE WITH DIAERESIS
+	{0x04F6, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER GHE WITH DESCENDER
+	{0x04F7, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER GHE WITH DESCENDER
+	{0x04F8, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS
+	{0x04F9, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER YERU WITH DIAERESIS
+	{0x04FA, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER GHE WITH STROKE AND
+	{0x04FB, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER GHE WITH STROKE AND HO
+	{0x04FC, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER HA WITH HOOK
+	{0x04FD, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER HA WITH HOOK
+	{0x04FE, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER HA WITH STROKE
+	{0x04FF, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER HA WITH STROKE
+	{0x0500, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER KOMI DE
+	{0x0501, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER KOMI DE
+	{0x0502, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER KOMI DJE
+	{0x0503, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER KOMI DJE
+	{0x0504, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER KOMI ZJE
+	{0x0505, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER KOMI ZJE
+	{0x0506, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER KOMI DZJE
+	{0x0507, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER KOMI DZJE
+	{0x0508, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER KOMI LJE
+	{0x0509, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER KOMI LJE
+	{0x050A, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER KOMI NJE
+	{0x050B, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER KOMI NJE
+	{0x050C, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER KOMI SJE
+	{0x050D, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER KOMI SJE
+	{0x050E, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER KOMI TJE
+	{0x050F, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER KOMI TJE
+	{0x0510, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER REVERSED ZE
+	{0x0511, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER REVERSED ZE
+	{0x0512, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER EL WITH HOOK
+	{0x0513, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER EL WITH HOOK
+	{0x0514, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER LHA
+	{0x0515, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER LHA
+	{0x0516, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER RHA
+	{0x0517, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER RHA
+	{0x0518, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER YAE
+	{0x0519, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER YAE
+	{0x051A, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER QA
+	{0x051B, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER QA
+	{0x051C, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER WE
+	{0x051D, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER WE
+	{0x051E, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER ALEUT KA
+	{0x051F, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER ALEUT KA
+	{0x0520, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER EL WITH MIDDLE HOOK
+	{0x0521, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER EL WITH MIDDLE HOOK
+	{0x0522, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER EN WITH MIDDLE HOOK
+	{0x0523, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER EN WITH MIDDLE HOOK
+	{0x0524, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER PE WITH DESCENDER
+	{0x0525, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER PE WITH DESCENDER
+	{0x0526, 0x0530, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0531, 0x0556, propertyDISALLOWED},    // ARMENIAN CAPITAL LETTER AYB..ARMENIAN CAPITA
+	{0x0557, 0x0558, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0559, 0x0, propertyPVALID},           // ARMENIAN MODIFIER LETTER LEFT HALF RING
+	{0x055A, 0x055F, propertyDISALLOWED},    // ARMENIAN APOSTROPHE..ARMENIAN ABBREVIATION M
+	{0x0560, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0561, 0x0586, propertyPVALID},        // ARMENIAN SMALL LETTER AYB..ARMENIAN SMALL LE
+	{0x0587, 0x0, propertyDISALLOWED},       // ARMENIAN SMALL LIGATURE ECH YIWN
+	{0x0588, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0589, 0x058A, propertyDISALLOWED},    // ARMENIAN FULL STOP..ARMENIAN HYPHEN
+	{0x058B, 0x0590, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0591, 0x05BD, propertyPVALID},        // HEBREW ACCENT ETNAHTA..HEBREW POINT METEG
+	{0x05BE, 0x0, propertyDISALLOWED},       // HEBREW PUNCTUATION MAQAF
+	{0x05BF, 0x0, propertyPVALID},           // HEBREW POINT RAFE
+	{0x05C0, 0x0, propertyDISALLOWED},       // HEBREW PUNCTUATION PASEQ
+	{0x05C1, 0x05C2, propertyPVALID},        // HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT
+	{0x05C3, 0x0, propertyDISALLOWED},       // HEBREW PUNCTUATION SOF PASUQ
+	{0x05C4, 0x05C5, propertyPVALID},        // HEBREW MARK UPPER DOT..HEBREW MARK LOWER DOT
+	{0x05C6, 0x0, propertyDISALLOWED},       // HEBREW PUNCTUATION NUN HAFUKHA
+	{0x05C7, 0x0, propertyPVALID},           // HEBREW POINT QAMATS QATAN
+	{0x05C8, 0x05CF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x05D0, 0x05EA, propertyPVALID},        // HEBREW LETTER ALEF..HEBREW LETTER TAV
+	{0x05EB, 0x05EF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x05F0, 0x05F2, propertyPVALID},        // HEBREW LIGATURE YIDDISH DOUBLE VAV..HEBREW L
+	{0x05F3, 0x05F4, propertyCONTEXTO},      // HEBREW PUNCTUATION GERESH..HEBREW PUNCTUATIO
+	{0x05F5, 0x05FF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0600, 0x0603, propertyDISALLOWED},    // ARABIC NUMBER SIGN..ARABIC SIGN SAFHA
+	{0x0604, 0x0605, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0606, 0x060F, propertyDISALLOWED},    // ARABIC-INDIC CUBE ROOT..ARABIC SIGN MISRA
+	{0x0610, 0x061A, propertyPVALID},        // ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM..AR
+	{0x061B, 0x0, propertyDISALLOWED},       // ARABIC SEMICOLON
+	{0x061C, 0x061D, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x061E, 0x061F, propertyDISALLOWED},    // ARABIC TRIPLE DOT PUNCTUATION MARK..ARABIC Q
+	{0x0620, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0621, 0x063F, propertyPVALID},        // ARABIC LETTER HAMZA..ARABIC LETTER FARSI YEH
+	{0x0640, 0x0, propertyDISALLOWED},       // ARABIC TATWEEL
+	{0x0641, 0x065E, propertyPVALID},        // ARABIC LETTER FEH..ARABIC FATHA WITH TWO DOT
+	{0x065F, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0660, 0x0669, propertyCONTEXTO},      // ARABIC-INDIC DIGIT ZERO..ARABIC-INDIC DIGIT
+	{0x066A, 0x066D, propertyDISALLOWED},    // ARABIC PERCENT SIGN..ARABIC FIVE POINTED STA
+	{0x066E, 0x0674, propertyPVALID},        // ARABIC LETTER DOTLESS BEH..ARABIC LETTER HIG
+	{0x0675, 0x0678, propertyDISALLOWED},    // ARABIC LETTER HIGH HAMZA ALEF..ARABIC LETTER
+	{0x0679, 0x06D3, propertyPVALID},        // ARABIC LETTER TTEH..ARABIC LETTER YEH BARREE
+	{0x06D4, 0x0, propertyDISALLOWED},       // ARABIC FULL STOP
+	{0x06D5, 0x06DC, propertyPVALID},        // ARABIC LETTER AE..ARABIC SMALL HIGH SEEN
+	{0x06DD, 0x06DE, propertyDISALLOWED},    // ARABIC END OF AYAH..ARABIC START OF RUB EL H
+	{0x06DF, 0x06E8, propertyPVALID},        // ARABIC SMALL HIGH ROUNDED ZERO..ARABIC SMALL
+	{0x06E9, 0x0, propertyDISALLOWED},       // ARABIC PLACE OF SAJDAH
+	{0x06EA, 0x06EF, propertyPVALID},        // ARABIC EMPTY CENTRE LOW STOP..ARABIC LETTER
+	{0x06F0, 0x06F9, propertyCONTEXTO},      // EXTENDED ARABIC-INDIC DIGIT ZERO..EXTENDED A
+	{0x06FA, 0x06FF, propertyPVALID},        // ARABIC LETTER SHEEN WITH DOT BELOW..ARABIC L
+	{0x0700, 0x070D, propertyDISALLOWED},    // SYRIAC END OF PARAGRAPH..SYRIAC HARKLEAN AST
+	{0x070E, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x070F, 0x0, propertyDISALLOWED},       // SYRIAC ABBREVIATION MARK
+	{0x0710, 0x074A, propertyPVALID},        // SYRIAC LETTER ALAPH..SYRIAC BARREKH
+	{0x074B, 0x074C, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x074D, 0x07B1, propertyPVALID},        // SYRIAC LETTER SOGDIAN ZHAIN..THAANA LETTER N
+	{0x07B2, 0x07BF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x07C0, 0x07F5, propertyPVALID},        // NKO DIGIT ZERO..NKO LOW TONE APOSTROPHE
+	{0x07F6, 0x07FA, propertyDISALLOWED},    // NKO SYMBOL OO DENNEN..NKO LAJANYALAN
+	{0x07FB, 0x07FF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0800, 0x082D, propertyPVALID},        // SAMARITAN LETTER ALAF..SAMARITAN MARK NEQUDA
+	{0x082E, 0x082F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0830, 0x083E, propertyDISALLOWED},    // SAMARITAN PUNCTUATION NEQUDAA..SAMARITAN PUN
+	{0x083F, 0x08FF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0900, 0x0939, propertyPVALID},        // DEVANAGARI SIGN INVERTED CANDRABINDU..DEVANA
+	{0x093A, 0x093B, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x093C, 0x094E, propertyPVALID},        // DEVANAGARI SIGN NUKTA..DEVANAGARI VOWEL SIGN
+	{0x094F, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0950, 0x0955, propertyPVALID},        // DEVANAGARI OM..DEVANAGARI VOWEL SIGN CANDRA
+	{0x0956, 0x0957, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0958, 0x095F, propertyDISALLOWED},    // DEVANAGARI LETTER QA..DEVANAGARI LETTER YYA
+	{0x0960, 0x0963, propertyPVALID},        // DEVANAGARI LETTER VOCALIC RR..DEVANAGARI VOW
+	{0x0964, 0x0965, propertyDISALLOWED},    // DEVANAGARI DANDA..DEVANAGARI DOUBLE DANDA
+	{0x0966, 0x096F, propertyPVALID},        // DEVANAGARI DIGIT ZERO..DEVANAGARI DIGIT NINE
+	{0x0970, 0x0, propertyDISALLOWED},       // DEVANAGARI ABBREVIATION SIGN
+	{0x0971, 0x0972, propertyPVALID},        // DEVANAGARI SIGN HIGH SPACING DOT..DEVANAGARI
+	{0x0973, 0x0978, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0979, 0x097F, propertyPVALID},        // DEVANAGARI LETTER ZHA..DEVANAGARI LETTER BBA
+	{0x0980, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0981, 0x0983, propertyPVALID},        // BENGALI SIGN CANDRABINDU..BENGALI SIGN VISAR
+	{0x0984, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0985, 0x098C, propertyPVALID},        // BENGALI LETTER A..BENGALI LETTER VOCALIC L
+	{0x098D, 0x098E, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x098F, 0x0990, propertyPVALID},        // BENGALI LETTER E..BENGALI LETTER AI
+	{0x0991, 0x0992, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0993, 0x09A8, propertyPVALID},        // BENGALI LETTER O..BENGALI LETTER NA
+	{0x09A9, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x09AA, 0x09B0, propertyPVALID},        // BENGALI LETTER PA..BENGALI LETTER RA
+	{0x09B1, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x09B2, 0x0, propertyPVALID},           // BENGALI LETTER LA
+	{0x09B3, 0x09B5, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x09B6, 0x09B9, propertyPVALID},        // BENGALI LETTER SHA..BENGALI LETTER HA
+	{0x09BA, 0x09BB, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x09BC, 0x09C4, propertyPVALID},        // BENGALI SIGN NUKTA..BENGALI VOWEL SIGN VOCAL
+	{0x09C5, 0x09C6, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x09C7, 0x09C8, propertyPVALID},        // BENGALI VOWEL SIGN E..BENGALI VOWEL SIGN AI
+	{0x09C9, 0x09CA, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x09CB, 0x09CE, propertyPVALID},        // BENGALI VOWEL SIGN O..BENGALI LETTER KHANDA
+	{0x09CF, 0x09D6, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x09D7, 0x0, propertyPVALID},           // BENGALI AU LENGTH MARK
+	{0x09D8, 0x09DB, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x09DC, 0x09DD, propertyDISALLOWED},    // BENGALI LETTER RRA..BENGALI LETTER RHA
+	{0x09DE, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x09DF, 0x0, propertyDISALLOWED},       // BENGALI LETTER YYA
+	{0x09E0, 0x09E3, propertyPVALID},        // BENGALI LETTER VOCALIC RR..BENGALI VOWEL SIG
+	{0x09E4, 0x09E5, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x09E6, 0x09F1, propertyPVALID},        // BENGALI DIGIT ZERO..BENGALI LETTER RA WITH L
+	{0x09F2, 0x09FB, propertyDISALLOWED},    // BENGALI RUPEE MARK..BENGALI GANDA MARK
+	{0x09FC, 0x0A00, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0A01, 0x0A03, propertyPVALID},        // GURMUKHI SIGN ADAK BINDI..GURMUKHI SIGN VISA
+	{0x0A04, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0A05, 0x0A0A, propertyPVALID},        // GURMUKHI LETTER A..GURMUKHI LETTER UU
+	{0x0A0B, 0x0A0E, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0A0F, 0x0A10, propertyPVALID},        // GURMUKHI LETTER EE..GURMUKHI LETTER AI
+	{0x0A11, 0x0A12, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0A13, 0x0A28, propertyPVALID},        // GURMUKHI LETTER OO..GURMUKHI LETTER NA
+	{0x0A29, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0A2A, 0x0A30, propertyPVALID},        // GURMUKHI LETTER PA..GURMUKHI LETTER RA
+	{0x0A31, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0A32, 0x0, propertyPVALID},           // GURMUKHI LETTER LA
+	{0x0A33, 0x0, propertyDISALLOWED},       // GURMUKHI LETTER LLA
+	{0x0A34, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0A35, 0x0, propertyPVALID},           // GURMUKHI LETTER VA
+	{0x0A36, 0x0, propertyDISALLOWED},       // GURMUKHI LETTER SHA
+	{0x0A37, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0A38, 0x0A39, propertyPVALID},        // GURMUKHI LETTER SA..GURMUKHI LETTER HA
+	{0x0A3A, 0x0A3B, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0A3C, 0x0, propertyPVALID},           // GURMUKHI SIGN NUKTA
+	{0x0A3D, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0A3E, 0x0A42, propertyPVALID},        // GURMUKHI VOWEL SIGN AA..GURMUKHI VOWEL SIGN
+	{0x0A43, 0x0A46, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0A47, 0x0A48, propertyPVALID},        // GURMUKHI VOWEL SIGN EE..GURMUKHI VOWEL SIGN
+	{0x0A49, 0x0A4A, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0A4B, 0x0A4D, propertyPVALID},        // GURMUKHI VOWEL SIGN OO..GURMUKHI SIGN VIRAMA
+	{0x0A4E, 0x0A50, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0A51, 0x0, propertyPVALID},           // GURMUKHI SIGN UDAAT
+	{0x0A52, 0x0A58, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0A59, 0x0A5B, propertyDISALLOWED},    // GURMUKHI LETTER KHHA..GURMUKHI LETTER ZA
+	{0x0A5C, 0x0, propertyPVALID},           // GURMUKHI LETTER RRA
+	{0x0A5D, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0A5E, 0x0, propertyDISALLOWED},       // GURMUKHI LETTER FA
+	{0x0A5F, 0x0A65, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0A66, 0x0A75, propertyPVALID},        // GURMUKHI DIGIT ZERO..GURMUKHI SIGN YAKASH
+	{0x0A76, 0x0A80, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0A81, 0x0A83, propertyPVALID},        // GUJARATI SIGN CANDRABINDU..GUJARATI SIGN VIS
+	{0x0A84, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0A85, 0x0A8D, propertyPVALID},        // GUJARATI LETTER A..GUJARATI VOWEL CANDRA E
+	{0x0A8E, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0A8F, 0x0A91, propertyPVALID},        // GUJARATI LETTER E..GUJARATI VOWEL CANDRA O
+	{0x0A92, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0A93, 0x0AA8, propertyPVALID},        // GUJARATI LETTER O..GUJARATI LETTER NA
+	{0x0AA9, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0AAA, 0x0AB0, propertyPVALID},        // GUJARATI LETTER PA..GUJARATI LETTER RA
+	{0x0AB1, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0AB2, 0x0AB3, propertyPVALID},        // GUJARATI LETTER LA..GUJARATI LETTER LLA
+	{0x0AB4, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0AB5, 0x0AB9, propertyPVALID},        // GUJARATI LETTER VA..GUJARATI LETTER HA
+	{0x0ABA, 0x0ABB, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0ABC, 0x0AC5, propertyPVALID},        // GUJARATI SIGN NUKTA..GUJARATI VOWEL SIGN CAN
+	{0x0AC6, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0AC7, 0x0AC9, propertyPVALID},        // GUJARATI VOWEL SIGN E..GUJARATI VOWEL SIGN C
+	{0x0ACA, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0ACB, 0x0ACD, propertyPVALID},        // GUJARATI VOWEL SIGN O..GUJARATI SIGN VIRAMA
+	{0x0ACE, 0x0ACF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0AD0, 0x0, propertyPVALID},           // GUJARATI OM
+	{0x0AD1, 0x0ADF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0AE0, 0x0AE3, propertyPVALID},        // GUJARATI LETTER VOCALIC RR..GUJARATI VOWEL S
+	{0x0AE4, 0x0AE5, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0AE6, 0x0AEF, propertyPVALID},        // GUJARATI DIGIT ZERO..GUJARATI DIGIT NINE
+	{0x0AF0, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0AF1, 0x0, propertyDISALLOWED},       // GUJARATI RUPEE SIGN
+	{0x0AF2, 0x0B00, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0B01, 0x0B03, propertyPVALID},        // ORIYA SIGN CANDRABINDU..ORIYA SIGN VISARGA
+	{0x0B04, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0B05, 0x0B0C, propertyPVALID},        // ORIYA LETTER A..ORIYA LETTER VOCALIC L
+	{0x0B0D, 0x0B0E, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0B0F, 0x0B10, propertyPVALID},        // ORIYA LETTER E..ORIYA LETTER AI
+	{0x0B11, 0x0B12, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0B13, 0x0B28, propertyPVALID},        // ORIYA LETTER O..ORIYA LETTER NA
+	{0x0B29, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0B2A, 0x0B30, propertyPVALID},        // ORIYA LETTER PA..ORIYA LETTER RA
+	{0x0B31, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0B32, 0x0B33, propertyPVALID},        // ORIYA LETTER LA..ORIYA LETTER LLA
+	{0x0B34, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0B35, 0x0B39, propertyPVALID},        // ORIYA LETTER VA..ORIYA LETTER HA
+	{0x0B3A, 0x0B3B, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0B3C, 0x0B44, propertyPVALID},        // ORIYA SIGN NUKTA..ORIYA VOWEL SIGN VOCALIC R
+	{0x0B45, 0x0B46, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0B47, 0x0B48, propertyPVALID},        // ORIYA VOWEL SIGN E..ORIYA VOWEL SIGN AI
+	{0x0B49, 0x0B4A, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0B4B, 0x0B4D, propertyPVALID},        // ORIYA VOWEL SIGN O..ORIYA SIGN VIRAMA
+	{0x0B4E, 0x0B55, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0B56, 0x0B57, propertyPVALID},        // ORIYA AI LENGTH MARK..ORIYA AU LENGTH MARK
+	{0x0B58, 0x0B5B, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0B5C, 0x0B5D, propertyDISALLOWED},    // ORIYA LETTER RRA..ORIYA LETTER RHA
+	{0x0B5E, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0B5F, 0x0B63, propertyPVALID},        // ORIYA LETTER YYA..ORIYA VOWEL SIGN VOCALIC L
+	{0x0B64, 0x0B65, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0B66, 0x0B6F, propertyPVALID},        // ORIYA DIGIT ZERO..ORIYA DIGIT NINE
+	{0x0B70, 0x0, propertyDISALLOWED},       // ORIYA ISSHAR
+	{0x0B71, 0x0, propertyPVALID},           // ORIYA LETTER WA
+	{0x0B72, 0x0B81, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0B82, 0x0B83, propertyPVALID},        // TAMIL SIGN ANUSVARA..TAMIL SIGN VISARGA
+	{0x0B84, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0B85, 0x0B8A, propertyPVALID},        // TAMIL LETTER A..TAMIL LETTER UU
+	{0x0B8B, 0x0B8D, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0B8E, 0x0B90, propertyPVALID},        // TAMIL LETTER E..TAMIL LETTER AI
+	{0x0B91, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0B92, 0x0B95, propertyPVALID},        // TAMIL LETTER O..TAMIL LETTER KA
+	{0x0B96, 0x0B98, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0B99, 0x0B9A, propertyPVALID},        // TAMIL LETTER NGA..TAMIL LETTER CA
+	{0x0B9B, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0B9C, 0x0, propertyPVALID},           // TAMIL LETTER JA
+	{0x0B9D, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0B9E, 0x0B9F, propertyPVALID},        // TAMIL LETTER NYA..TAMIL LETTER TTA
+	{0x0BA0, 0x0BA2, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0BA3, 0x0BA4, propertyPVALID},        // TAMIL LETTER NNA..TAMIL LETTER TA
+	{0x0BA5, 0x0BA7, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0BA8, 0x0BAA, propertyPVALID},        // TAMIL LETTER NA..TAMIL LETTER PA
+	{0x0BAB, 0x0BAD, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0BAE, 0x0BB9, propertyPVALID},        // TAMIL LETTER MA..TAMIL LETTER HA
+	{0x0BBA, 0x0BBD, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0BBE, 0x0BC2, propertyPVALID},        // TAMIL VOWEL SIGN AA..TAMIL VOWEL SIGN UU
+	{0x0BC3, 0x0BC5, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0BC6, 0x0BC8, propertyPVALID},        // TAMIL VOWEL SIGN E..TAMIL VOWEL SIGN AI
+	{0x0BC9, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0BCA, 0x0BCD, propertyPVALID},        // TAMIL VOWEL SIGN O..TAMIL SIGN VIRAMA
+	{0x0BCE, 0x0BCF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0BD0, 0x0, propertyPVALID},           // TAMIL OM
+	{0x0BD1, 0x0BD6, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0BD7, 0x0, propertyPVALID},           // TAMIL AU LENGTH MARK
+	{0x0BD8, 0x0BE5, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0BE6, 0x0BEF, propertyPVALID},        // TAMIL DIGIT ZERO..TAMIL DIGIT NINE
+	{0x0BF0, 0x0BFA, propertyDISALLOWED},    // TAMIL NUMBER TEN..TAMIL NUMBER SIGN
+	{0x0BFB, 0x0C00, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0C01, 0x0C03, propertyPVALID},        // TELUGU SIGN CANDRABINDU..TELUGU SIGN VISARGA
+	{0x0C04, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0C05, 0x0C0C, propertyPVALID},        // TELUGU LETTER A..TELUGU LETTER VOCALIC L
+	{0x0C0D, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0C0E, 0x0C10, propertyPVALID},        // TELUGU LETTER E..TELUGU LETTER AI
+	{0x0C11, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0C12, 0x0C28, propertyPVALID},        // TELUGU LETTER O..TELUGU LETTER NA
+	{0x0C29, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0C2A, 0x0C33, propertyPVALID},        // TELUGU LETTER PA..TELUGU LETTER LLA
+	{0x0C34, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0C35, 0x0C39, propertyPVALID},        // TELUGU LETTER VA..TELUGU LETTER HA
+	{0x0C3A, 0x0C3C, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0C3D, 0x0C44, propertyPVALID},        // TELUGU SIGN AVAGRAHA..TELUGU VOWEL SIGN VOCA
+	{0x0C45, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0C46, 0x0C48, propertyPVALID},        // TELUGU VOWEL SIGN E..TELUGU VOWEL SIGN AI
+	{0x0C49, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0C4A, 0x0C4D, propertyPVALID},        // TELUGU VOWEL SIGN O..TELUGU SIGN VIRAMA
+	{0x0C4E, 0x0C54, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0C55, 0x0C56, propertyPVALID},        // TELUGU LENGTH MARK..TELUGU AI LENGTH MARK
+	{0x0C57, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0C58, 0x0C59, propertyPVALID},        // TELUGU LETTER TSA..TELUGU LETTER DZA
+	{0x0C5A, 0x0C5F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0C60, 0x0C63, propertyPVALID},        // TELUGU LETTER VOCALIC RR..TELUGU VOWEL SIGN
+	{0x0C64, 0x0C65, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0C66, 0x0C6F, propertyPVALID},        // TELUGU DIGIT ZERO..TELUGU DIGIT NINE
+	{0x0C70, 0x0C77, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0C78, 0x0C7F, propertyDISALLOWED},    // TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF
+	{0x0C80, 0x0C81, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0C82, 0x0C83, propertyPVALID},        // KANNADA SIGN ANUSVARA..KANNADA SIGN VISARGA
+	{0x0C84, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0C85, 0x0C8C, propertyPVALID},        // KANNADA LETTER A..KANNADA LETTER VOCALIC L
+	{0x0C8D, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0C8E, 0x0C90, propertyPVALID},        // KANNADA LETTER E..KANNADA LETTER AI
+	{0x0C91, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0C92, 0x0CA8, propertyPVALID},        // KANNADA LETTER O..KANNADA LETTER NA
+	{0x0CA9, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0CAA, 0x0CB3, propertyPVALID},        // KANNADA LETTER PA..KANNADA LETTER LLA
+	{0x0CB4, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0CB5, 0x0CB9, propertyPVALID},        // KANNADA LETTER VA..KANNADA LETTER HA
+	{0x0CBA, 0x0CBB, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0CBC, 0x0CC4, propertyPVALID},        // KANNADA SIGN NUKTA..KANNADA VOWEL SIGN VOCAL
+	{0x0CC5, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0CC6, 0x0CC8, propertyPVALID},        // KANNADA VOWEL SIGN E..KANNADA VOWEL SIGN AI
+	{0x0CC9, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0CCA, 0x0CCD, propertyPVALID},        // KANNADA VOWEL SIGN O..KANNADA SIGN VIRAMA
+	{0x0CCE, 0x0CD4, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0CD5, 0x0CD6, propertyPVALID},        // KANNADA LENGTH MARK..KANNADA AI LENGTH MARK
+	{0x0CD7, 0x0CDD, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0CDE, 0x0, propertyPVALID},           // KANNADA LETTER FA
+	{0x0CDF, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0CE0, 0x0CE3, propertyPVALID},        // KANNADA LETTER VOCALIC RR..KANNADA VOWEL SIG
+	{0x0CE4, 0x0CE5, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0CE6, 0x0CEF, propertyPVALID},        // KANNADA DIGIT ZERO..KANNADA DIGIT NINE
+	{0x0CF0, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0CF1, 0x0CF2, propertyDISALLOWED},    // KANNADA SIGN JIHVAMULIYA..KANNADA SIGN UPADH
+	{0x0CF3, 0x0D01, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0D02, 0x0D03, propertyPVALID},        // MALAYALAM SIGN ANUSVARA..MALAYALAM SIGN VISA
+	{0x0D04, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0D05, 0x0D0C, propertyPVALID},        // MALAYALAM LETTER A..MALAYALAM LETTER VOCALIC
+	{0x0D0D, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0D0E, 0x0D10, propertyPVALID},        // MALAYALAM LETTER E..MALAYALAM LETTER AI
+	{0x0D11, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0D12, 0x0D28, propertyPVALID},        // MALAYALAM LETTER O..MALAYALAM LETTER NA
+	{0x0D29, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0D2A, 0x0D39, propertyPVALID},        // MALAYALAM LETTER PA..MALAYALAM LETTER HA
+	{0x0D3A, 0x0D3C, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0D3D, 0x0D44, propertyPVALID},        // MALAYALAM SIGN AVAGRAHA..MALAYALAM VOWEL SIG
+	{0x0D45, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0D46, 0x0D48, propertyPVALID},        // MALAYALAM VOWEL SIGN E..MALAYALAM VOWEL SIGN
+	{0x0D49, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0D4A, 0x0D4D, propertyPVALID},        // MALAYALAM VOWEL SIGN O..MALAYALAM SIGN VIRAM
+	{0x0D4E, 0x0D56, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0D57, 0x0, propertyPVALID},           // MALAYALAM AU LENGTH MARK
+	{0x0D58, 0x0D5F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0D60, 0x0D63, propertyPVALID},        // MALAYALAM LETTER VOCALIC RR..MALAYALAM VOWEL
+	{0x0D64, 0x0D65, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0D66, 0x0D6F, propertyPVALID},        // MALAYALAM DIGIT ZERO..MALAYALAM DIGIT NINE
+	{0x0D70, 0x0D75, propertyDISALLOWED},    // MALAYALAM NUMBER TEN..MALAYALAM FRACTION THR
+	{0x0D76, 0x0D78, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0D79, 0x0, propertyDISALLOWED},       // MALAYALAM DATE MARK
+	{0x0D7A, 0x0D7F, propertyPVALID},        // MALAYALAM LETTER CHILLU NN..MALAYALAM LETTER
+	{0x0D80, 0x0D81, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0D82, 0x0D83, propertyPVALID},        // SINHALA SIGN ANUSVARAYA..SINHALA SIGN VISARG
+	{0x0D84, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0D85, 0x0D96, propertyPVALID},        // SINHALA LETTER AYANNA..SINHALA LETTER AUYANN
+	{0x0D97, 0x0D99, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0D9A, 0x0DB1, propertyPVALID},        // SINHALA LETTER ALPAPRAANA KAYANNA..SINHALA L
+	{0x0DB2, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0DB3, 0x0DBB, propertyPVALID},        // SINHALA LETTER SANYAKA DAYANNA..SINHALA LETT
+	{0x0DBC, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0DBD, 0x0, propertyPVALID},           // SINHALA LETTER DANTAJA LAYANNA
+	{0x0DBE, 0x0DBF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0DC0, 0x0DC6, propertyPVALID},        // SINHALA LETTER VAYANNA..SINHALA LETTER FAYAN
+	{0x0DC7, 0x0DC9, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0DCA, 0x0, propertyPVALID},           // SINHALA SIGN AL-LAKUNA
+	{0x0DCB, 0x0DCE, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0DCF, 0x0DD4, propertyPVALID},        // SINHALA VOWEL SIGN AELA-PILLA..SINHALA VOWEL
+	{0x0DD5, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0DD6, 0x0, propertyPVALID},           // SINHALA VOWEL SIGN DIGA PAA-PILLA
+	{0x0DD7, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0DD8, 0x0DDF, propertyPVALID},        // SINHALA VOWEL SIGN GAETTA-PILLA..SINHALA VOW
+	{0x0DE0, 0x0DF1, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0DF2, 0x0DF3, propertyPVALID},        // SINHALA VOWEL SIGN DIGA GAETTA-PILLA..SINHAL
+	{0x0DF4, 0x0, propertyDISALLOWED},       // SINHALA PUNCTUATION KUNDDALIYA
+	{0x0DF5, 0x0E00, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0E01, 0x0E32, propertyPVALID},        // THAI CHARACTER KO KAI..THAI CHARACTER SARA A
+	{0x0E33, 0x0, propertyDISALLOWED},       // THAI CHARACTER SARA AM
+	{0x0E34, 0x0E3A, propertyPVALID},        // THAI CHARACTER SARA I..THAI CHARACTER PHINTH
+	{0x0E3B, 0x0E3E, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0E3F, 0x0, propertyDISALLOWED},       // THAI CURRENCY SYMBOL BAHT
+	{0x0E40, 0x0E4E, propertyPVALID},        // THAI CHARACTER SARA E..THAI CHARACTER YAMAKK
+	{0x0E4F, 0x0, propertyDISALLOWED},       // THAI CHARACTER FONGMAN
+	{0x0E50, 0x0E59, propertyPVALID},        // THAI DIGIT ZERO..THAI DIGIT NINE
+	{0x0E5A, 0x0E5B, propertyDISALLOWED},    // THAI CHARACTER ANGKHANKHU..THAI CHARACTER KH
+	{0x0E5C, 0x0E80, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0E81, 0x0E82, propertyPVALID},        // LAO LETTER KO..LAO LETTER KHO SUNG
+	{0x0E83, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0E84, 0x0, propertyPVALID},           // LAO LETTER KHO TAM
+	{0x0E85, 0x0E86, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0E87, 0x0E88, propertyPVALID},        // LAO LETTER NGO..LAO LETTER CO
+	{0x0E89, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0E8A, 0x0, propertyPVALID},           // LAO LETTER SO TAM
+	{0x0E8B, 0x0E8C, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0E8D, 0x0, propertyPVALID},           // LAO LETTER NYO
+	{0x0E8E, 0x0E93, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0E94, 0x0E97, propertyPVALID},        // LAO LETTER DO..LAO LETTER THO TAM
+	{0x0E98, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0E99, 0x0E9F, propertyPVALID},        // LAO LETTER NO..LAO LETTER FO SUNG
+	{0x0EA0, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0EA1, 0x0EA3, propertyPVALID},        // LAO LETTER MO..LAO LETTER LO LING
+	{0x0EA4, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0EA5, 0x0, propertyPVALID},           // LAO LETTER LO LOOT
+	{0x0EA6, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0EA7, 0x0, propertyPVALID},           // LAO LETTER WO
+	{0x0EA8, 0x0EA9, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0EAA, 0x0EAB, propertyPVALID},        // LAO LETTER SO SUNG..LAO LETTER HO SUNG
+	{0x0EAC, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0EAD, 0x0EB2, propertyPVALID},        // LAO LETTER O..LAO VOWEL SIGN AA
+	{0x0EB3, 0x0, propertyDISALLOWED},       // LAO VOWEL SIGN AM
+	{0x0EB4, 0x0EB9, propertyPVALID},        // LAO VOWEL SIGN I..LAO VOWEL SIGN UU
+	{0x0EBA, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0EBB, 0x0EBD, propertyPVALID},        // LAO VOWEL SIGN MAI KON..LAO SEMIVOWEL SIGN N
+	{0x0EBE, 0x0EBF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0EC0, 0x0EC4, propertyPVALID},        // LAO VOWEL SIGN E..LAO VOWEL SIGN AI
+	{0x0EC5, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0EC6, 0x0, propertyPVALID},           // LAO KO LA
+	{0x0EC7, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0EC8, 0x0ECD, propertyPVALID},        // LAO TONE MAI EK..LAO NIGGAHITA
+	{0x0ECE, 0x0ECF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0ED0, 0x0ED9, propertyPVALID},        // LAO DIGIT ZERO..LAO DIGIT NINE
+	{0x0EDA, 0x0EDB, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0EDC, 0x0EDD, propertyDISALLOWED},    // LAO HO NO..LAO HO MO
+	{0x0EDE, 0x0EFF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0F00, 0x0, propertyPVALID},           // TIBETAN SYLLABLE OM
+	{0x0F01, 0x0F0A, propertyDISALLOWED},    // TIBETAN MARK GTER YIG MGO TRUNCATED A..TIBET
+	{0x0F0B, 0x0, propertyPVALID},           // TIBETAN MARK INTERSYLLABIC TSHEG
+	{0x0F0C, 0x0F17, propertyDISALLOWED},    // TIBETAN MARK DELIMITER TSHEG BSTAR..TIBETAN
+	{0x0F18, 0x0F19, propertyPVALID},        // TIBETAN ASTROLOGICAL SIGN -KHYUD PA..TIBETAN
+	{0x0F1A, 0x0F1F, propertyDISALLOWED},    // TIBETAN SIGN RDEL DKAR GCIG..TIBETAN SIGN RD
+	{0x0F20, 0x0F29, propertyPVALID},        // TIBETAN DIGIT ZERO..TIBETAN DIGIT NINE
+	{0x0F2A, 0x0F34, propertyDISALLOWED},    // TIBETAN DIGIT HALF ONE..TIBETAN MARK BSDUS R
+	{0x0F35, 0x0, propertyPVALID},           // TIBETAN MARK NGAS BZUNG NYI ZLA
+	{0x0F36, 0x0, propertyDISALLOWED},       // TIBETAN MARK CARET -DZUD RTAGS BZHI MIG CAN
+	{0x0F37, 0x0, propertyPVALID},           // TIBETAN MARK NGAS BZUNG SGOR RTAGS
+	{0x0F38, 0x0, propertyDISALLOWED},       // TIBETAN MARK CHE MGO
+	{0x0F39, 0x0, propertyPVALID},           // TIBETAN MARK TSA -PHRU
+	{0x0F3A, 0x0F3D, propertyDISALLOWED},    // TIBETAN MARK GUG RTAGS GYON..TIBETAN MARK AN
+	{0x0F3E, 0x0F42, propertyPVALID},        // TIBETAN SIGN YAR TSHES..TIBETAN LETTER GA
+	{0x0F43, 0x0, propertyDISALLOWED},       // TIBETAN LETTER GHA
+	{0x0F44, 0x0F47, propertyPVALID},        // TIBETAN LETTER NGA..TIBETAN LETTER JA
+	{0x0F48, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0F49, 0x0F4C, propertyPVALID},        // TIBETAN LETTER NYA..TIBETAN LETTER DDA
+	{0x0F4D, 0x0, propertyDISALLOWED},       // TIBETAN LETTER DDHA
+	{0x0F4E, 0x0F51, propertyPVALID},        // TIBETAN LETTER NNA..TIBETAN LETTER DA
+	{0x0F52, 0x0, propertyDISALLOWED},       // TIBETAN LETTER DHA
+	{0x0F53, 0x0F56, propertyPVALID},        // TIBETAN LETTER NA..TIBETAN LETTER BA
+	{0x0F57, 0x0, propertyDISALLOWED},       // TIBETAN LETTER BHA
+	{0x0F58, 0x0F5B, propertyPVALID},        // TIBETAN LETTER MA..TIBETAN LETTER DZA
+	{0x0F5C, 0x0, propertyDISALLOWED},       // TIBETAN LETTER DZHA
+	{0x0F5D, 0x0F68, propertyPVALID},        // TIBETAN LETTER WA..TIBETAN LETTER A
+	{0x0F69, 0x0, propertyDISALLOWED},       // TIBETAN LETTER KSSA
+	{0x0F6A, 0x0F6C, propertyPVALID},        // TIBETAN LETTER FIXED-FORM RA..TIBETAN LETTER
+	{0x0F6D, 0x0F70, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0F71, 0x0F72, propertyPVALID},        // TIBETAN VOWEL SIGN AA..TIBETAN VOWEL SIGN I
+	{0x0F73, 0x0, propertyDISALLOWED},       // TIBETAN VOWEL SIGN II
+	{0x0F74, 0x0, propertyPVALID},           // TIBETAN VOWEL SIGN U
+	{0x0F75, 0x0F79, propertyDISALLOWED},    // TIBETAN VOWEL SIGN UU..TIBETAN VOWEL SIGN VO
+	{0x0F7A, 0x0F80, propertyPVALID},        // TIBETAN VOWEL SIGN E..TIBETAN VOWEL SIGN REV
+	{0x0F81, 0x0, propertyDISALLOWED},       // TIBETAN VOWEL SIGN REVERSED II
+	{0x0F82, 0x0F84, propertyPVALID},        // TIBETAN SIGN NYI ZLA NAA DA..TIBETAN MARK HA
+	{0x0F85, 0x0, propertyDISALLOWED},       // TIBETAN MARK PALUTA
+	{0x0F86, 0x0F8B, propertyPVALID},        // TIBETAN SIGN LCI RTAGS..TIBETAN SIGN GRU MED
+	{0x0F8C, 0x0F8F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x0F90, 0x0F92, propertyPVALID},        // TIBETAN SUBJOINED LETTER KA..TIBETAN SUBJOIN
+	{0x0F93, 0x0, propertyDISALLOWED},       // TIBETAN SUBJOINED LETTER GHA
+	{0x0F94, 0x0F97, propertyPVALID},        // TIBETAN SUBJOINED LETTER NGA..TIBETAN SUBJOI
+	{0x0F98, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0F99, 0x0F9C, propertyPVALID},        // TIBETAN SUBJOINED LETTER NYA..TIBETAN SUBJOI
+	{0x0F9D, 0x0, propertyDISALLOWED},       // TIBETAN SUBJOINED LETTER DDHA
+	{0x0F9E, 0x0FA1, propertyPVALID},        // TIBETAN SUBJOINED LETTER NNA..TIBETAN SUBJOI
+	{0x0FA2, 0x0, propertyDISALLOWED},       // TIBETAN SUBJOINED LETTER DHA
+	{0x0FA3, 0x0FA6, propertyPVALID},        // TIBETAN SUBJOINED LETTER NA..TIBETAN SUBJOIN
+	{0x0FA7, 0x0, propertyDISALLOWED},       // TIBETAN SUBJOINED LETTER BHA
+	{0x0FA8, 0x0FAB, propertyPVALID},        // TIBETAN SUBJOINED LETTER MA..TIBETAN SUBJOIN
+	{0x0FAC, 0x0, propertyDISALLOWED},       // TIBETAN SUBJOINED LETTER DZHA
+	{0x0FAD, 0x0FB8, propertyPVALID},        // TIBETAN SUBJOINED LETTER WA..TIBETAN SUBJOIN
+	{0x0FB9, 0x0, propertyDISALLOWED},       // TIBETAN SUBJOINED LETTER KSSA
+	{0x0FBA, 0x0FBC, propertyPVALID},        // TIBETAN SUBJOINED LETTER FIXED-FORM WA..TIBE
+	{0x0FBD, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0FBE, 0x0FC5, propertyDISALLOWED},    // TIBETAN KU RU KHA..TIBETAN SYMBOL RDO RJE
+	{0x0FC6, 0x0, propertyPVALID},           // TIBETAN SYMBOL PADMA GDAN
+	{0x0FC7, 0x0FCC, propertyDISALLOWED},    // TIBETAN SYMBOL RDO RJE RGYA GRAM..TIBETAN SY
+	{0x0FCD, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x0FCE, 0x0FD8, propertyDISALLOWED},    // TIBETAN SIGN RDEL NAG RDEL DKAR..LEFT-FACING
+	{0x0FD9, 0x0FFF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1000, 0x1049, propertyPVALID},        // MYANMAR LETTER KA..MYANMAR DIGIT NINE
+	{0x104A, 0x104F, propertyDISALLOWED},    // MYANMAR SIGN LITTLE SECTION..MYANMAR SYMBOL
+	{0x1050, 0x109D, propertyPVALID},        // MYANMAR LETTER SHA..MYANMAR VOWEL SIGN AITON
+	{0x109E, 0x10C5, propertyDISALLOWED},    // MYANMAR SYMBOL SHAN ONE..GEORGIAN CAPITAL LE
+	{0x10C6, 0x10CF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x10D0, 0x10FA, propertyPVALID},        // GEORGIAN LETTER AN..GEORGIAN LETTER AIN
+	{0x10FB, 0x10FC, propertyDISALLOWED},    // GEORGIAN PARAGRAPH SEPARATOR..MODIFIER LETTE
+	{0x10FD, 0x10FF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1100, 0x11FF, propertyDISALLOWED},    // HANGUL CHOSEONG KIYEOK..HANGUL JONGSEONG SSA
+	{0x1200, 0x1248, propertyPVALID},        // ETHIOPIC SYLLABLE HA..ETHIOPIC SYLLABLE QWA
+	{0x1249, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x124A, 0x124D, propertyPVALID},        // ETHIOPIC SYLLABLE QWI..ETHIOPIC SYLLABLE QWE
+	{0x124E, 0x124F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1250, 0x1256, propertyPVALID},        // ETHIOPIC SYLLABLE QHA..ETHIOPIC SYLLABLE QHO
+	{0x1257, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x1258, 0x0, propertyPVALID},           // ETHIOPIC SYLLABLE QHWA
+	{0x1259, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x125A, 0x125D, propertyPVALID},        // ETHIOPIC SYLLABLE QHWI..ETHIOPIC SYLLABLE QH
+	{0x125E, 0x125F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1260, 0x1288, propertyPVALID},        // ETHIOPIC SYLLABLE BA..ETHIOPIC SYLLABLE XWA
+	{0x1289, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x128A, 0x128D, propertyPVALID},        // ETHIOPIC SYLLABLE XWI..ETHIOPIC SYLLABLE XWE
+	{0x128E, 0x128F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1290, 0x12B0, propertyPVALID},        // ETHIOPIC SYLLABLE NA..ETHIOPIC SYLLABLE KWA
+	{0x12B1, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x12B2, 0x12B5, propertyPVALID},        // ETHIOPIC SYLLABLE KWI..ETHIOPIC SYLLABLE KWE
+	{0x12B6, 0x12B7, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x12B8, 0x12BE, propertyPVALID},        // ETHIOPIC SYLLABLE KXA..ETHIOPIC SYLLABLE KXO
+	{0x12BF, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x12C0, 0x0, propertyPVALID},           // ETHIOPIC SYLLABLE KXWA
+	{0x12C1, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x12C2, 0x12C5, propertyPVALID},        // ETHIOPIC SYLLABLE KXWI..ETHIOPIC SYLLABLE KX
+	{0x12C6, 0x12C7, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x12C8, 0x12D6, propertyPVALID},        // ETHIOPIC SYLLABLE WA..ETHIOPIC SYLLABLE PHAR
+	{0x12D7, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x12D8, 0x1310, propertyPVALID},        // ETHIOPIC SYLLABLE ZA..ETHIOPIC SYLLABLE GWA
+	{0x1311, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x1312, 0x1315, propertyPVALID},        // ETHIOPIC SYLLABLE GWI..ETHIOPIC SYLLABLE GWE
+	{0x1316, 0x1317, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1318, 0x135A, propertyPVALID},        // ETHIOPIC SYLLABLE GGA..ETHIOPIC SYLLABLE FYA
+	{0x135B, 0x135E, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x135F, 0x0, propertyPVALID},           // ETHIOPIC COMBINING GEMINATION MARK
+	{0x1360, 0x137C, propertyDISALLOWED},    // ETHIOPIC SECTION MARK..ETHIOPIC NUMBER TEN T
+	{0x137D, 0x137F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1380, 0x138F, propertyPVALID},        // ETHIOPIC SYLLABLE SEBATBEIT MWA..ETHIOPIC SY
+	{0x1390, 0x1399, propertyDISALLOWED},    // ETHIOPIC TONAL MARK YIZET..ETHIOPIC TONAL MA
+	{0x139A, 0x139F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x13A0, 0x13F4, propertyPVALID},        // CHEROKEE LETTER A..CHEROKEE LETTER YV
+	{0x13F5, 0x13FF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1400, 0x0, propertyDISALLOWED},       // CANADIAN SYLLABICS HYPHEN
+	{0x1401, 0x166C, propertyPVALID},        // CANADIAN SYLLABICS E..CANADIAN SYLLABICS CAR
+	{0x166D, 0x166E, propertyDISALLOWED},    // CANADIAN SYLLABICS CHI SIGN..CANADIAN SYLLAB
+	{0x166F, 0x167F, propertyPVALID},        // CANADIAN SYLLABICS QAI..CANADIAN SYLLABICS B
+	{0x1680, 0x0, propertyDISALLOWED},       // OGHAM SPACE MARK
+	{0x1681, 0x169A, propertyPVALID},        // OGHAM LETTER BEITH..OGHAM LETTER PEITH
+	{0x169B, 0x169C, propertyDISALLOWED},    // OGHAM FEATHER MARK..OGHAM REVERSED FEATHER M
+	{0x169D, 0x169F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x16A0, 0x16EA, propertyPVALID},        // RUNIC LETTER FEHU FEOH FE F..RUNIC LETTER X
+	{0x16EB, 0x16F0, propertyDISALLOWED},    // RUNIC SINGLE PUNCTUATION..RUNIC BELGTHOR SYM
+	{0x16F1, 0x16FF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1700, 0x170C, propertyPVALID},        // TAGALOG LETTER A..TAGALOG LETTER YA
+	{0x170D, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x170E, 0x1714, propertyPVALID},        // TAGALOG LETTER LA..TAGALOG SIGN VIRAMA
+	{0x1715, 0x171F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1720, 0x1734, propertyPVALID},        // HANUNOO LETTER A..HANUNOO SIGN PAMUDPOD
+	{0x1735, 0x1736, propertyDISALLOWED},    // PHILIPPINE SINGLE PUNCTUATION..PHILIPPINE DO
+	{0x1737, 0x173F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1740, 0x1753, propertyPVALID},        // BUHID LETTER A..BUHID VOWEL SIGN U
+	{0x1754, 0x175F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1760, 0x176C, propertyPVALID},        // TAGBANWA LETTER A..TAGBANWA LETTER YA
+	{0x176D, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x176E, 0x1770, propertyPVALID},        // TAGBANWA LETTER LA..TAGBANWA LETTER SA
+	{0x1771, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x1772, 0x1773, propertyPVALID},        // TAGBANWA VOWEL SIGN I..TAGBANWA VOWEL SIGN U
+	{0x1774, 0x177F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1780, 0x17B3, propertyPVALID},        // KHMER LETTER KA..KHMER INDEPENDENT VOWEL QAU
+	{0x17B4, 0x17B5, propertyDISALLOWED},    // KHMER VOWEL INHERENT AQ..KHMER VOWEL INHEREN
+	{0x17B6, 0x17D3, propertyPVALID},        // KHMER VOWEL SIGN AA..KHMER SIGN BATHAMASAT
+	{0x17D4, 0x17D6, propertyDISALLOWED},    // KHMER SIGN KHAN..KHMER SIGN CAMNUC PII KUUH
+	{0x17D7, 0x0, propertyPVALID},           // KHMER SIGN LEK TOO
+	{0x17D8, 0x17DB, propertyDISALLOWED},    // KHMER SIGN BEYYAL..KHMER CURRENCY SYMBOL RIE
+	{0x17DC, 0x17DD, propertyPVALID},        // KHMER SIGN AVAKRAHASANYA..KHMER SIGN ATTHACA
+	{0x17DE, 0x17DF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x17E0, 0x17E9, propertyPVALID},        // KHMER DIGIT ZERO..KHMER DIGIT NINE
+	{0x17EA, 0x17EF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x17F0, 0x17F9, propertyDISALLOWED},    // KHMER SYMBOL LEK ATTAK SON..KHMER SYMBOL LEK
+	{0x17FA, 0x17FF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1800, 0x180E, propertyDISALLOWED},    // MONGOLIAN BIRGA..MONGOLIAN VOWEL SEPARATOR
+	{0x180F, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x1810, 0x1819, propertyPVALID},        // MONGOLIAN DIGIT ZERO..MONGOLIAN DIGIT NINE
+	{0x181A, 0x181F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1820, 0x1877, propertyPVALID},        // MONGOLIAN LETTER A..MONGOLIAN LETTER MANCHU
+	{0x1878, 0x187F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1880, 0x18AA, propertyPVALID},        // MONGOLIAN LETTER ALI GALI ANUSVARA ONE..MONG
+	{0x18AB, 0x18AF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x18B0, 0x18F5, propertyPVALID},        // CANADIAN SYLLABICS OY..CANADIAN SYLLABICS CA
+	{0x18F6, 0x18FF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1900, 0x191C, propertyPVALID},        // LIMBU VOWEL-CARRIER LETTER..LIMBU LETTER HA
+	{0x191D, 0x191F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1920, 0x192B, propertyPVALID},        // LIMBU VOWEL SIGN A..LIMBU SUBJOINED LETTER W
+	{0x192C, 0x192F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1930, 0x193B, propertyPVALID},        // LIMBU SMALL LETTER KA..LIMBU SIGN SA-I
+	{0x193C, 0x193F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1940, 0x0, propertyDISALLOWED},       // LIMBU SIGN LOO
+	{0x1941, 0x1943, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1944, 0x1945, propertyDISALLOWED},    // LIMBU EXCLAMATION MARK..LIMBU QUESTION MARK
+	{0x1946, 0x196D, propertyPVALID},        // LIMBU DIGIT ZERO..TAI LE LETTER AI
+	{0x196E, 0x196F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1970, 0x1974, propertyPVALID},        // TAI LE LETTER TONE-2..TAI LE LETTER TONE-6
+	{0x1975, 0x197F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1980, 0x19AB, propertyPVALID},        // NEW TAI LUE LETTER HIGH QA..NEW TAI LUE LETT
+	{0x19AC, 0x19AF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x19B0, 0x19C9, propertyPVALID},        // NEW TAI LUE VOWEL SIGN VOWEL SHORTENER..NEW
+	{0x19CA, 0x19CF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x19D0, 0x19DA, propertyPVALID},        // NEW TAI LUE DIGIT ZERO..NEW TAI LUE THAM DIG
+	{0x19DB, 0x19DD, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x19DE, 0x19FF, propertyDISALLOWED},    // NEW TAI LUE SIGN LAE..KHMER SYMBOL DAP-PRAM
+	{0x1A00, 0x1A1B, propertyPVALID},        // BUGINESE LETTER KA..BUGINESE VOWEL SIGN AE
+	{0x1A1C, 0x1A1D, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1A1E, 0x1A1F, propertyDISALLOWED},    // BUGINESE PALLAWA..BUGINESE END OF SECTION
+	{0x1A20, 0x1A5E, propertyPVALID},        // TAI THAM LETTER HIGH KA..TAI THAM CONSONANT
+	{0x1A5F, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x1A60, 0x1A7C, propertyPVALID},        // TAI THAM SIGN SAKOT..TAI THAM SIGN KHUEN-LUE
+	{0x1A7D, 0x1A7E, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1A7F, 0x1A89, propertyPVALID},        // TAI THAM COMBINING CRYPTOGRAMMIC DOT..TAI TH
+	{0x1A8A, 0x1A8F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1A90, 0x1A99, propertyPVALID},        // TAI THAM THAM DIGIT ZERO..TAI THAM THAM DIGI
+	{0x1A9A, 0x1A9F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1AA0, 0x1AA6, propertyDISALLOWED},    // TAI THAM SIGN WIANG..TAI THAM SIGN REVERSED
+	{0x1AA7, 0x0, propertyPVALID},           // TAI THAM SIGN MAI YAMOK
+	{0x1AA8, 0x1AAD, propertyDISALLOWED},    // TAI THAM SIGN KAAN..TAI THAM SIGN CAANG
+	{0x1AAE, 0x1AFF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1B00, 0x1B4B, propertyPVALID},        // BALINESE SIGN ULU RICEM..BALINESE LETTER ASY
+	{0x1B4C, 0x1B4F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1B50, 0x1B59, propertyPVALID},        // BALINESE DIGIT ZERO..BALINESE DIGIT NINE
+	{0x1B5A, 0x1B6A, propertyDISALLOWED},    // BALINESE PANTI..BALINESE MUSICAL SYMBOL DANG
+	{0x1B6B, 0x1B73, propertyPVALID},        // BALINESE MUSICAL SYMBOL COMBINING TEGEH..BAL
+	{0x1B74, 0x1B7C, propertyDISALLOWED},    // BALINESE MUSICAL SYMBOL RIGHT-HAND OPEN DUG.
+	{0x1B7D, 0x1B7F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1B80, 0x1BAA, propertyPVALID},        // SUNDANESE SIGN PANYECEK..SUNDANESE SIGN PAMA
+	{0x1BAB, 0x1BAD, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1BAE, 0x1BB9, propertyPVALID},        // SUNDANESE LETTER KHA..SUNDANESE DIGIT NINE
+	{0x1BBA, 0x1BFF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1C00, 0x1C37, propertyPVALID},        // LEPCHA LETTER KA..LEPCHA SIGN NUKTA
+	{0x1C38, 0x1C3A, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1C3B, 0x1C3F, propertyDISALLOWED},    // LEPCHA PUNCTUATION TA-ROL..LEPCHA PUNCTUATIO
+	{0x1C40, 0x1C49, propertyPVALID},        // LEPCHA DIGIT ZERO..LEPCHA DIGIT NINE
+	{0x1C4A, 0x1C4C, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1C4D, 0x1C7D, propertyPVALID},        // LEPCHA LETTER TTA..OL CHIKI AHAD
+	{0x1C7E, 0x1C7F, propertyDISALLOWED},    // OL CHIKI PUNCTUATION MUCAAD..OL CHIKI PUNCTU
+	{0x1C80, 0x1CCF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1CD0, 0x1CD2, propertyPVALID},        // VEDIC TONE KARSHANA..VEDIC TONE PRENKHA
+	{0x1CD3, 0x0, propertyDISALLOWED},       // VEDIC SIGN NIHSHVASA
+	{0x1CD4, 0x1CF2, propertyPVALID},        // VEDIC SIGN YAJURVEDIC MIDLINE SVARITA..VEDIC
+	{0x1CF3, 0x1CFF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1D00, 0x1D2B, propertyPVALID},        // LATIN LETTER SMALL CAPITAL A..CYRILLIC LETTE
+	{0x1D2C, 0x1D2E, propertyDISALLOWED},    // MODIFIER LETTER CAPITAL A..MODIFIER LETTER C
+	{0x1D2F, 0x0, propertyPVALID},           // MODIFIER LETTER CAPITAL BARRED B
+	{0x1D30, 0x1D3A, propertyDISALLOWED},    // MODIFIER LETTER CAPITAL D..MODIFIER LETTER C
+	{0x1D3B, 0x0, propertyPVALID},           // MODIFIER LETTER CAPITAL REVERSED N
+	{0x1D3C, 0x1D4D, propertyDISALLOWED},    // MODIFIER LETTER CAPITAL O..MODIFIER LETTER S
+	{0x1D4E, 0x0, propertyPVALID},           // MODIFIER LETTER SMALL TURNED I
+	{0x1D4F, 0x1D6A, propertyDISALLOWED},    // MODIFIER LETTER SMALL K..GREEK SUBSCRIPT SMA
+	{0x1D6B, 0x1D77, propertyPVALID},        // LATIN SMALL LETTER UE..LATIN SMALL LETTER TU
+	{0x1D78, 0x0, propertyDISALLOWED},       // MODIFIER LETTER CYRILLIC EN
+	{0x1D79, 0x1D9A, propertyPVALID},        // LATIN SMALL LETTER INSULAR G..LATIN SMALL LE
+	{0x1D9B, 0x1DBF, propertyDISALLOWED},    // MODIFIER LETTER SMALL TURNED ALPHA..MODIFIER
+	{0x1DC0, 0x1DE6, propertyPVALID},        // COMBINING DOTTED GRAVE ACCENT..COMBINING LAT
+	{0x1DE7, 0x1DFC, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1DFD, 0x1DFF, propertyPVALID},        // COMBINING ALMOST EQUAL TO BELOW..COMBINING R
+	{0x1E00, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH RING BELOW
+	{0x1E01, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH RING BELOW
+	{0x1E02, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER B WITH DOT ABOVE
+	{0x1E03, 0x0, propertyPVALID},           // LATIN SMALL LETTER B WITH DOT ABOVE
+	{0x1E04, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER B WITH DOT BELOW
+	{0x1E05, 0x0, propertyPVALID},           // LATIN SMALL LETTER B WITH DOT BELOW
+	{0x1E06, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER B WITH LINE BELOW
+	{0x1E07, 0x0, propertyPVALID},           // LATIN SMALL LETTER B WITH LINE BELOW
+	{0x1E08, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER C WITH CEDILLA AND ACUT
+	{0x1E09, 0x0, propertyPVALID},           // LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
+	{0x1E0A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER D WITH DOT ABOVE
+	{0x1E0B, 0x0, propertyPVALID},           // LATIN SMALL LETTER D WITH DOT ABOVE
+	{0x1E0C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER D WITH DOT BELOW
+	{0x1E0D, 0x0, propertyPVALID},           // LATIN SMALL LETTER D WITH DOT BELOW
+	{0x1E0E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER D WITH LINE BELOW
+	{0x1E0F, 0x0, propertyPVALID},           // LATIN SMALL LETTER D WITH LINE BELOW
+	{0x1E10, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER D WITH CEDILLA
+	{0x1E11, 0x0, propertyPVALID},           // LATIN SMALL LETTER D WITH CEDILLA
+	{0x1E12, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
+	{0x1E13, 0x0, propertyPVALID},           // LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW
+	{0x1E14, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
+	{0x1E15, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH MACRON AND GRAVE
+	{0x1E16, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
+	{0x1E17, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH MACRON AND ACUTE
+	{0x1E18, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
+	{0x1E19, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW
+	{0x1E1A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH TILDE BELOW
+	{0x1E1B, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH TILDE BELOW
+	{0x1E1C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH CEDILLA AND BREV
+	{0x1E1D, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH CEDILLA AND BREVE
+	{0x1E1E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER F WITH DOT ABOVE
+	{0x1E1F, 0x0, propertyPVALID},           // LATIN SMALL LETTER F WITH DOT ABOVE
+	{0x1E20, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER G WITH MACRON
+	{0x1E21, 0x0, propertyPVALID},           // LATIN SMALL LETTER G WITH MACRON
+	{0x1E22, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER H WITH DOT ABOVE
+	{0x1E23, 0x0, propertyPVALID},           // LATIN SMALL LETTER H WITH DOT ABOVE
+	{0x1E24, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER H WITH DOT BELOW
+	{0x1E25, 0x0, propertyPVALID},           // LATIN SMALL LETTER H WITH DOT BELOW
+	{0x1E26, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER H WITH DIAERESIS
+	{0x1E27, 0x0, propertyPVALID},           // LATIN SMALL LETTER H WITH DIAERESIS
+	{0x1E28, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER H WITH CEDILLA
+	{0x1E29, 0x0, propertyPVALID},           // LATIN SMALL LETTER H WITH CEDILLA
+	{0x1E2A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER H WITH BREVE BELOW
+	{0x1E2B, 0x0, propertyPVALID},           // LATIN SMALL LETTER H WITH BREVE BELOW
+	{0x1E2C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER I WITH TILDE BELOW
+	{0x1E2D, 0x0, propertyPVALID},           // LATIN SMALL LETTER I WITH TILDE BELOW
+	{0x1E2E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER I WITH DIAERESIS AND AC
+	{0x1E2F, 0x0, propertyPVALID},           // LATIN SMALL LETTER I WITH DIAERESIS AND ACUT
+	{0x1E30, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER K WITH ACUTE
+	{0x1E31, 0x0, propertyPVALID},           // LATIN SMALL LETTER K WITH ACUTE
+	{0x1E32, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER K WITH DOT BELOW
+	{0x1E33, 0x0, propertyPVALID},           // LATIN SMALL LETTER K WITH DOT BELOW
+	{0x1E34, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER K WITH LINE BELOW
+	{0x1E35, 0x0, propertyPVALID},           // LATIN SMALL LETTER K WITH LINE BELOW
+	{0x1E36, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER L WITH DOT BELOW
+	{0x1E37, 0x0, propertyPVALID},           // LATIN SMALL LETTER L WITH DOT BELOW
+	{0x1E38, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER L WITH DOT BELOW AND MA
+	{0x1E39, 0x0, propertyPVALID},           // LATIN SMALL LETTER L WITH DOT BELOW AND MACR
+	{0x1E3A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER L WITH LINE BELOW
+	{0x1E3B, 0x0, propertyPVALID},           // LATIN SMALL LETTER L WITH LINE BELOW
+	{0x1E3C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
+	{0x1E3D, 0x0, propertyPVALID},           // LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW
+	{0x1E3E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER M WITH ACUTE
+	{0x1E3F, 0x0, propertyPVALID},           // LATIN SMALL LETTER M WITH ACUTE
+	{0x1E40, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER M WITH DOT ABOVE
+	{0x1E41, 0x0, propertyPVALID},           // LATIN SMALL LETTER M WITH DOT ABOVE
+	{0x1E42, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER M WITH DOT BELOW
+	{0x1E43, 0x0, propertyPVALID},           // LATIN SMALL LETTER M WITH DOT BELOW
+	{0x1E44, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER N WITH DOT ABOVE
+	{0x1E45, 0x0, propertyPVALID},           // LATIN SMALL LETTER N WITH DOT ABOVE
+	{0x1E46, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER N WITH DOT BELOW
+	{0x1E47, 0x0, propertyPVALID},           // LATIN SMALL LETTER N WITH DOT BELOW
+	{0x1E48, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER N WITH LINE BELOW
+	{0x1E49, 0x0, propertyPVALID},           // LATIN SMALL LETTER N WITH LINE BELOW
+	{0x1E4A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
+	{0x1E4B, 0x0, propertyPVALID},           // LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW
+	{0x1E4C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
+	{0x1E4D, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH TILDE AND ACUTE
+	{0x1E4E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH TILDE AND DIAERE
+	{0x1E4F, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH TILDE AND DIAERESI
+	{0x1E50, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
+	{0x1E51, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH MACRON AND GRAVE
+	{0x1E52, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
+	{0x1E53, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH MACRON AND ACUTE
+	{0x1E54, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER P WITH ACUTE
+	{0x1E55, 0x0, propertyPVALID},           // LATIN SMALL LETTER P WITH ACUTE
+	{0x1E56, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER P WITH DOT ABOVE
+	{0x1E57, 0x0, propertyPVALID},           // LATIN SMALL LETTER P WITH DOT ABOVE
+	{0x1E58, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER R WITH DOT ABOVE
+	{0x1E59, 0x0, propertyPVALID},           // LATIN SMALL LETTER R WITH DOT ABOVE
+	{0x1E5A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER R WITH DOT BELOW
+	{0x1E5B, 0x0, propertyPVALID},           // LATIN SMALL LETTER R WITH DOT BELOW
+	{0x1E5C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER R WITH DOT BELOW AND MA
+	{0x1E5D, 0x0, propertyPVALID},           // LATIN SMALL LETTER R WITH DOT BELOW AND MACR
+	{0x1E5E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER R WITH LINE BELOW
+	{0x1E5F, 0x0, propertyPVALID},           // LATIN SMALL LETTER R WITH LINE BELOW
+	{0x1E60, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER S WITH DOT ABOVE
+	{0x1E61, 0x0, propertyPVALID},           // LATIN SMALL LETTER S WITH DOT ABOVE
+	{0x1E62, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER S WITH DOT BELOW
+	{0x1E63, 0x0, propertyPVALID},           // LATIN SMALL LETTER S WITH DOT BELOW
+	{0x1E64, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER S WITH ACUTE AND DOT AB
+	{0x1E65, 0x0, propertyPVALID},           // LATIN SMALL LETTER S WITH ACUTE AND DOT ABOV
+	{0x1E66, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER S WITH CARON AND DOT AB
+	{0x1E67, 0x0, propertyPVALID},           // LATIN SMALL LETTER S WITH CARON AND DOT ABOV
+	{0x1E68, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER S WITH DOT BELOW AND DO
+	{0x1E69, 0x0, propertyPVALID},           // LATIN SMALL LETTER S WITH DOT BELOW AND DOT
+	{0x1E6A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER T WITH DOT ABOVE
+	{0x1E6B, 0x0, propertyPVALID},           // LATIN SMALL LETTER T WITH DOT ABOVE
+	{0x1E6C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER T WITH DOT BELOW
+	{0x1E6D, 0x0, propertyPVALID},           // LATIN SMALL LETTER T WITH DOT BELOW
+	{0x1E6E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER T WITH LINE BELOW
+	{0x1E6F, 0x0, propertyPVALID},           // LATIN SMALL LETTER T WITH LINE BELOW
+	{0x1E70, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
+	{0x1E71, 0x0, propertyPVALID},           // LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW
+	{0x1E72, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
+	{0x1E73, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH DIAERESIS BELOW
+	{0x1E74, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH TILDE BELOW
+	{0x1E75, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH TILDE BELOW
+	{0x1E76, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
+	{0x1E77, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW
+	{0x1E78, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
+	{0x1E79, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH TILDE AND ACUTE
+	{0x1E7A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH MACRON AND DIAER
+	{0x1E7B, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH MACRON AND DIAERES
+	{0x1E7C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER V WITH TILDE
+	{0x1E7D, 0x0, propertyPVALID},           // LATIN SMALL LETTER V WITH TILDE
+	{0x1E7E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER V WITH DOT BELOW
+	{0x1E7F, 0x0, propertyPVALID},           // LATIN SMALL LETTER V WITH DOT BELOW
+	{0x1E80, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER W WITH GRAVE
+	{0x1E81, 0x0, propertyPVALID},           // LATIN SMALL LETTER W WITH GRAVE
+	{0x1E82, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER W WITH ACUTE
+	{0x1E83, 0x0, propertyPVALID},           // LATIN SMALL LETTER W WITH ACUTE
+	{0x1E84, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER W WITH DIAERESIS
+	{0x1E85, 0x0, propertyPVALID},           // LATIN SMALL LETTER W WITH DIAERESIS
+	{0x1E86, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER W WITH DOT ABOVE
+	{0x1E87, 0x0, propertyPVALID},           // LATIN SMALL LETTER W WITH DOT ABOVE
+	{0x1E88, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER W WITH DOT BELOW
+	{0x1E89, 0x0, propertyPVALID},           // LATIN SMALL LETTER W WITH DOT BELOW
+	{0x1E8A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER X WITH DOT ABOVE
+	{0x1E8B, 0x0, propertyPVALID},           // LATIN SMALL LETTER X WITH DOT ABOVE
+	{0x1E8C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER X WITH DIAERESIS
+	{0x1E8D, 0x0, propertyPVALID},           // LATIN SMALL LETTER X WITH DIAERESIS
+	{0x1E8E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER Y WITH DOT ABOVE
+	{0x1E8F, 0x0, propertyPVALID},           // LATIN SMALL LETTER Y WITH DOT ABOVE
+	{0x1E90, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER Z WITH CIRCUMFLEX
+	{0x1E91, 0x0, propertyPVALID},           // LATIN SMALL LETTER Z WITH CIRCUMFLEX
+	{0x1E92, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER Z WITH DOT BELOW
+	{0x1E93, 0x0, propertyPVALID},           // LATIN SMALL LETTER Z WITH DOT BELOW
+	{0x1E94, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER Z WITH LINE BELOW
+	{0x1E95, 0x1E99, propertyPVALID},        // LATIN SMALL LETTER Z WITH LINE BELOW..LATIN
+	{0x1E9A, 0x1E9B, propertyDISALLOWED},    // LATIN SMALL LETTER A WITH RIGHT HALF RING..L
+	{0x1E9C, 0x1E9D, propertyPVALID},        // LATIN SMALL LETTER LONG S WITH DIAGONAL STRO
+	{0x1E9E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER SHARP S
+	{0x1E9F, 0x0, propertyPVALID},           // LATIN SMALL LETTER DELTA
+	{0x1EA0, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH DOT BELOW
+	{0x1EA1, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH DOT BELOW
+	{0x1EA2, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH HOOK ABOVE
+	{0x1EA3, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH HOOK ABOVE
+	{0x1EA4, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND A
+	{0x1EA5, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACU
+	{0x1EA6, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND G
+	{0x1EA7, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRA
+	{0x1EA8, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND H
+	{0x1EA9, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOO
+	{0x1EAA, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND T
+	{0x1EAB, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH CIRCUMFLEX AND TIL
+	{0x1EAC, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND D
+	{0x1EAD, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT
+	{0x1EAE, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
+	{0x1EAF, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH BREVE AND ACUTE
+	{0x1EB0, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
+	{0x1EB1, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH BREVE AND GRAVE
+	{0x1EB2, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH BREVE AND HOOK A
+	{0x1EB3, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH BREVE AND HOOK ABO
+	{0x1EB4, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH BREVE AND TILDE
+	{0x1EB5, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH BREVE AND TILDE
+	{0x1EB6, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER A WITH BREVE AND DOT BE
+	{0x1EB7, 0x0, propertyPVALID},           // LATIN SMALL LETTER A WITH BREVE AND DOT BELO
+	{0x1EB8, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH DOT BELOW
+	{0x1EB9, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH DOT BELOW
+	{0x1EBA, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH HOOK ABOVE
+	{0x1EBB, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH HOOK ABOVE
+	{0x1EBC, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH TILDE
+	{0x1EBD, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH TILDE
+	{0x1EBE, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND A
+	{0x1EBF, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACU
+	{0x1EC0, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND G
+	{0x1EC1, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRA
+	{0x1EC2, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND H
+	{0x1EC3, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOO
+	{0x1EC4, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND T
+	{0x1EC5, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH CIRCUMFLEX AND TIL
+	{0x1EC6, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND D
+	{0x1EC7, 0x0, propertyPVALID},           // LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT
+	{0x1EC8, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER I WITH HOOK ABOVE
+	{0x1EC9, 0x0, propertyPVALID},           // LATIN SMALL LETTER I WITH HOOK ABOVE
+	{0x1ECA, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER I WITH DOT BELOW
+	{0x1ECB, 0x0, propertyPVALID},           // LATIN SMALL LETTER I WITH DOT BELOW
+	{0x1ECC, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH DOT BELOW
+	{0x1ECD, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH DOT BELOW
+	{0x1ECE, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH HOOK ABOVE
+	{0x1ECF, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH HOOK ABOVE
+	{0x1ED0, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND A
+	{0x1ED1, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACU
+	{0x1ED2, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND G
+	{0x1ED3, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRA
+	{0x1ED4, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND H
+	{0x1ED5, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOO
+	{0x1ED6, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND T
+	{0x1ED7, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH CIRCUMFLEX AND TIL
+	{0x1ED8, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND D
+	{0x1ED9, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT
+	{0x1EDA, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH HORN AND ACUTE
+	{0x1EDB, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH HORN AND ACUTE
+	{0x1EDC, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH HORN AND GRAVE
+	{0x1EDD, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH HORN AND GRAVE
+	{0x1EDE, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH HORN AND HOOK AB
+	{0x1EDF, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH HORN AND HOOK ABOV
+	{0x1EE0, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH HORN AND TILDE
+	{0x1EE1, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH HORN AND TILDE
+	{0x1EE2, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH HORN AND DOT BEL
+	{0x1EE3, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH HORN AND DOT BELOW
+	{0x1EE4, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH DOT BELOW
+	{0x1EE5, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH DOT BELOW
+	{0x1EE6, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH HOOK ABOVE
+	{0x1EE7, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH HOOK ABOVE
+	{0x1EE8, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH HORN AND ACUTE
+	{0x1EE9, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH HORN AND ACUTE
+	{0x1EEA, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH HORN AND GRAVE
+	{0x1EEB, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH HORN AND GRAVE
+	{0x1EEC, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH HORN AND HOOK AB
+	{0x1EED, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH HORN AND HOOK ABOV
+	{0x1EEE, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH HORN AND TILDE
+	{0x1EEF, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH HORN AND TILDE
+	{0x1EF0, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER U WITH HORN AND DOT BEL
+	{0x1EF1, 0x0, propertyPVALID},           // LATIN SMALL LETTER U WITH HORN AND DOT BELOW
+	{0x1EF2, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER Y WITH GRAVE
+	{0x1EF3, 0x0, propertyPVALID},           // LATIN SMALL LETTER Y WITH GRAVE
+	{0x1EF4, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER Y WITH DOT BELOW
+	{0x1EF5, 0x0, propertyPVALID},           // LATIN SMALL LETTER Y WITH DOT BELOW
+	{0x1EF6, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER Y WITH HOOK ABOVE
+	{0x1EF7, 0x0, propertyPVALID},           // LATIN SMALL LETTER Y WITH HOOK ABOVE
+	{0x1EF8, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER Y WITH TILDE
+	{0x1EF9, 0x0, propertyPVALID},           // LATIN SMALL LETTER Y WITH TILDE
+	{0x1EFA, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER MIDDLE-WELSH LL
+	{0x1EFB, 0x0, propertyPVALID},           // LATIN SMALL LETTER MIDDLE-WELSH LL
+	{0x1EFC, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER MIDDLE-WELSH V
+	{0x1EFD, 0x0, propertyPVALID},           // LATIN SMALL LETTER MIDDLE-WELSH V
+	{0x1EFE, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER Y WITH LOOP
+	{0x1EFF, 0x1F07, propertyPVALID},        // LATIN SMALL LETTER Y WITH LOOP..GREEK SMALL
+	{0x1F08, 0x1F0F, propertyDISALLOWED},    // GREEK CAPITAL LETTER ALPHA WITH PSILI..GREEK
+	{0x1F10, 0x1F15, propertyPVALID},        // GREEK SMALL LETTER EPSILON WITH PSILI..GREEK
+	{0x1F16, 0x1F17, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1F18, 0x1F1D, propertyDISALLOWED},    // GREEK CAPITAL LETTER EPSILON WITH PSILI..GRE
+	{0x1F1E, 0x1F1F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1F20, 0x1F27, propertyPVALID},        // GREEK SMALL LETTER ETA WITH PSILI..GREEK SMA
+	{0x1F28, 0x1F2F, propertyDISALLOWED},    // GREEK CAPITAL LETTER ETA WITH PSILI..GREEK C
+	{0x1F30, 0x1F37, propertyPVALID},        // GREEK SMALL LETTER IOTA WITH PSILI..GREEK SM
+	{0x1F38, 0x1F3F, propertyDISALLOWED},    // GREEK CAPITAL LETTER IOTA WITH PSILI..GREEK
+	{0x1F40, 0x1F45, propertyPVALID},        // GREEK SMALL LETTER OMICRON WITH PSILI..GREEK
+	{0x1F46, 0x1F47, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1F48, 0x1F4D, propertyDISALLOWED},    // GREEK CAPITAL LETTER OMICRON WITH PSILI..GRE
+	{0x1F4E, 0x1F4F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1F50, 0x1F57, propertyPVALID},        // GREEK SMALL LETTER UPSILON WITH PSILI..GREEK
+	{0x1F58, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x1F59, 0x0, propertyDISALLOWED},       // GREEK CAPITAL LETTER UPSILON WITH DASIA
+	{0x1F5A, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x1F5B, 0x0, propertyDISALLOWED},       // GREEK CAPITAL LETTER UPSILON WITH DASIA AND
+	{0x1F5C, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x1F5D, 0x0, propertyDISALLOWED},       // GREEK CAPITAL LETTER UPSILON WITH DASIA AND
+	{0x1F5E, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x1F5F, 0x0, propertyDISALLOWED},       // GREEK CAPITAL LETTER UPSILON WITH DASIA AND
+	{0x1F60, 0x1F67, propertyPVALID},        // GREEK SMALL LETTER OMEGA WITH PSILI..GREEK S
+	{0x1F68, 0x1F6F, propertyDISALLOWED},    // GREEK CAPITAL LETTER OMEGA WITH PSILI..GREEK
+	{0x1F70, 0x0, propertyPVALID},           // GREEK SMALL LETTER ALPHA WITH VARIA
+	{0x1F71, 0x0, propertyDISALLOWED},       // GREEK SMALL LETTER ALPHA WITH OXIA
+	{0x1F72, 0x0, propertyPVALID},           // GREEK SMALL LETTER EPSILON WITH VARIA
+	{0x1F73, 0x0, propertyDISALLOWED},       // GREEK SMALL LETTER EPSILON WITH OXIA
+	{0x1F74, 0x0, propertyPVALID},           // GREEK SMALL LETTER ETA WITH VARIA
+	{0x1F75, 0x0, propertyDISALLOWED},       // GREEK SMALL LETTER ETA WITH OXIA
+	{0x1F76, 0x0, propertyPVALID},           // GREEK SMALL LETTER IOTA WITH VARIA
+	{0x1F77, 0x0, propertyDISALLOWED},       // GREEK SMALL LETTER IOTA WITH OXIA
+	{0x1F78, 0x0, propertyPVALID},           // GREEK SMALL LETTER OMICRON WITH VARIA
+	{0x1F79, 0x0, propertyDISALLOWED},       // GREEK SMALL LETTER OMICRON WITH OXIA
+	{0x1F7A, 0x0, propertyPVALID},           // GREEK SMALL LETTER UPSILON WITH VARIA
+	{0x1F7B, 0x0, propertyDISALLOWED},       // GREEK SMALL LETTER UPSILON WITH OXIA
+	{0x1F7C, 0x0, propertyPVALID},           // GREEK SMALL LETTER OMEGA WITH VARIA
+	{0x1F7D, 0x0, propertyDISALLOWED},       // GREEK SMALL LETTER OMEGA WITH OXIA
+	{0x1F7E, 0x1F7F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1F80, 0x1FAF, propertyDISALLOWED},    // GREEK SMALL LETTER ALPHA WITH PSILI AND YPOG
+	{0x1FB0, 0x1FB1, propertyPVALID},        // GREEK SMALL LETTER ALPHA WITH VRACHY..GREEK
+	{0x1FB2, 0x1FB4, propertyDISALLOWED},    // GREEK SMALL LETTER ALPHA WITH VARIA AND YPOG
+	{0x1FB5, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x1FB6, 0x0, propertyPVALID},           // GREEK SMALL LETTER ALPHA WITH PERISPOMENI
+	{0x1FB7, 0x1FC4, propertyDISALLOWED},    // GREEK SMALL LETTER ALPHA WITH PERISPOMENI AN
+	{0x1FC5, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x1FC6, 0x0, propertyPVALID},           // GREEK SMALL LETTER ETA WITH PERISPOMENI
+	{0x1FC7, 0x1FCF, propertyDISALLOWED},    // GREEK SMALL LETTER ETA WITH PERISPOMENI AND
+	{0x1FD0, 0x1FD2, propertyPVALID},        // GREEK SMALL LETTER IOTA WITH VRACHY..GREEK S
+	{0x1FD3, 0x0, propertyDISALLOWED},       // GREEK SMALL LETTER IOTA WITH DIALYTIKA AND O
+	{0x1FD4, 0x1FD5, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1FD6, 0x1FD7, propertyPVALID},        // GREEK SMALL LETTER IOTA WITH PERISPOMENI..GR
+	{0x1FD8, 0x1FDB, propertyDISALLOWED},    // GREEK CAPITAL LETTER IOTA WITH VRACHY..GREEK
+	{0x1FDC, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x1FDD, 0x1FDF, propertyDISALLOWED},    // GREEK DASIA AND VARIA..GREEK DASIA AND PERIS
+	{0x1FE0, 0x1FE2, propertyPVALID},        // GREEK SMALL LETTER UPSILON WITH VRACHY..GREE
+	{0x1FE3, 0x0, propertyDISALLOWED},       // GREEK SMALL LETTER UPSILON WITH DIALYTIKA AN
+	{0x1FE4, 0x1FE7, propertyPVALID},        // GREEK SMALL LETTER RHO WITH PSILI..GREEK SMA
+	{0x1FE8, 0x1FEF, propertyDISALLOWED},    // GREEK CAPITAL LETTER UPSILON WITH VRACHY..GR
+	{0x1FF0, 0x1FF1, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x1FF2, 0x1FF4, propertyDISALLOWED},    // GREEK SMALL LETTER OMEGA WITH VARIA AND YPOG
+	{0x1FF5, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x1FF6, 0x0, propertyPVALID},           // GREEK SMALL LETTER OMEGA WITH PERISPOMENI
+	{0x1FF7, 0x1FFE, propertyDISALLOWED},    // GREEK SMALL LETTER OMEGA WITH PERISPOMENI AN
+	{0x1FFF, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x2000, 0x200B, propertyDISALLOWED},    // EN QUAD..ZERO WIDTH SPACE
+	{0x200C, 0x200D, propertyCONTEXTJ},      // ZERO WIDTH NON-JOINER..ZERO WIDTH JOINER
+	{0x200E, 0x2064, propertyDISALLOWED},    // LEFT-TO-RIGHT MARK..INVISIBLE PLUS
+	{0x2065, 0x2069, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x206A, 0x2071, propertyDISALLOWED},    // INHIBIT SYMMETRIC SWAPPING..SUPERSCRIPT LATI
+	{0x2072, 0x2073, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x2074, 0x208E, propertyDISALLOWED},    // SUPERSCRIPT FOUR..SUBSCRIPT RIGHT PARENTHESI
+	{0x208F, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x2090, 0x2094, propertyDISALLOWED},    // LATIN SUBSCRIPT SMALL LETTER A..LATIN SUBSCR
+	{0x2095, 0x209F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x20A0, 0x20B8, propertyDISALLOWED},    // EURO-CURRENCY SIGN..TENGE SIGN
+	{0x20B9, 0x20CF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x20D0, 0x20F0, propertyDISALLOWED},    // COMBINING LEFT HARPOON ABOVE..COMBINING ASTE
+	{0x20F1, 0x20FF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x2100, 0x214D, propertyDISALLOWED},    // ACCOUNT OF..AKTIESELSKAB
+	{0x214E, 0x0, propertyPVALID},           // TURNED SMALL F
+	{0x214F, 0x2183, propertyDISALLOWED},    // SYMBOL FOR SAMARITAN SOURCE..ROMAN NUMERAL R
+	{0x2184, 0x0, propertyPVALID},           // LATIN SMALL LETTER REVERSED C
+	{0x2185, 0x2189, propertyDISALLOWED},    // ROMAN NUMERAL SIX LATE FORM..VULGAR FRACTION
+	{0x218A, 0x218F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x2190, 0x23E8, propertyDISALLOWED},    // LEFTWARDS ARROW..DECIMAL EXPONENT SYMBOL
+	{0x23E9, 0x23FF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x2400, 0x2426, propertyDISALLOWED},    // SYMBOL FOR NULL..SYMBOL FOR SUBSTITUTE FORM
+	{0x2427, 0x243F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x2440, 0x244A, propertyDISALLOWED},    // OCR HOOK..OCR DOUBLE BACKSLASH
+	{0x244B, 0x245F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x2460, 0x26CD, propertyDISALLOWED},    // CIRCLED DIGIT ONE..DISABLED CAR
+	{0x26CE, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x26CF, 0x26E1, propertyDISALLOWED},    // PICK..RESTRICTED LEFT ENTRY-2
+	{0x26E2, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x26E3, 0x0, propertyDISALLOWED},       // HEAVY CIRCLE WITH STROKE AND TWO DOTS ABOVE
+	{0x26E4, 0x26E7, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x26E8, 0x26FF, propertyDISALLOWED},    // BLACK CROSS ON SHIELD..WHITE FLAG WITH HORIZ
+	{0x2700, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x2701, 0x2704, propertyDISALLOWED},    // UPPER BLADE SCISSORS..WHITE SCISSORS
+	{0x2705, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x2706, 0x2709, propertyDISALLOWED},    // TELEPHONE LOCATION SIGN..ENVELOPE
+	{0x270A, 0x270B, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x270C, 0x2727, propertyDISALLOWED},    // VICTORY HAND..WHITE FOUR POINTED STAR
+	{0x2728, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x2729, 0x274B, propertyDISALLOWED},    // STRESS OUTLINED WHITE STAR..HEAVY EIGHT TEAR
+	{0x274C, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x274D, 0x0, propertyDISALLOWED},       // SHADOWED WHITE CIRCLE
+	{0x274E, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x274F, 0x2752, propertyDISALLOWED},    // LOWER RIGHT DROP-SHADOWED WHITE SQUARE..UPPE
+	{0x2753, 0x2755, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x2756, 0x275E, propertyDISALLOWED},    // BLACK DIAMOND MINUS WHITE X..HEAVY DOUBLE CO
+	{0x275F, 0x2760, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x2761, 0x2794, propertyDISALLOWED},    // CURVED STEM PARAGRAPH SIGN ORNAMENT..HEAVY W
+	{0x2795, 0x2797, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x2798, 0x27AF, propertyDISALLOWED},    // HEAVY SOUTH EAST ARROW..NOTCHED LOWER RIGHT-
+	{0x27B0, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x27B1, 0x27BE, propertyDISALLOWED},    // NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHTWARD
+	{0x27BF, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x27C0, 0x27CA, propertyDISALLOWED},    // THREE DIMENSIONAL ANGLE..VERTICAL BAR WITH H
+	{0x27CB, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x27CC, 0x0, propertyDISALLOWED},       // LONG DIVISION
+	{0x27CD, 0x27CF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x27D0, 0x2B4C, propertyDISALLOWED},    // WHITE DIAMOND WITH CENTRED DOT..RIGHTWARDS A
+	{0x2B4D, 0x2B4F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x2B50, 0x2B59, propertyDISALLOWED},    // WHITE MEDIUM STAR..HEAVY CIRCLED SALTIRE
+	{0x2B5A, 0x2BFF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x2C00, 0x2C2E, propertyDISALLOWED},    // GLAGOLITIC CAPITAL LETTER AZU..GLAGOLITIC CA
+	{0x2C2F, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x2C30, 0x2C5E, propertyPVALID},        // GLAGOLITIC SMALL LETTER AZU..GLAGOLITIC SMAL
+	{0x2C5F, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x2C60, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER L WITH DOUBLE BAR
+	{0x2C61, 0x0, propertyPVALID},           // LATIN SMALL LETTER L WITH DOUBLE BAR
+	{0x2C62, 0x2C64, propertyDISALLOWED},    // LATIN CAPITAL LETTER L WITH MIDDLE TILDE..LA
+	{0x2C65, 0x2C66, propertyPVALID},        // LATIN SMALL LETTER A WITH STROKE..LATIN SMAL
+	{0x2C67, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER H WITH DESCENDER
+	{0x2C68, 0x0, propertyPVALID},           // LATIN SMALL LETTER H WITH DESCENDER
+	{0x2C69, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER K WITH DESCENDER
+	{0x2C6A, 0x0, propertyPVALID},           // LATIN SMALL LETTER K WITH DESCENDER
+	{0x2C6B, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER Z WITH DESCENDER
+	{0x2C6C, 0x0, propertyPVALID},           // LATIN SMALL LETTER Z WITH DESCENDER
+	{0x2C6D, 0x2C70, propertyDISALLOWED},    // LATIN CAPITAL LETTER ALPHA..LATIN CAPITAL LE
+	{0x2C71, 0x0, propertyPVALID},           // LATIN SMALL LETTER V WITH RIGHT HOOK
+	{0x2C72, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER W WITH HOOK
+	{0x2C73, 0x2C74, propertyPVALID},        // LATIN SMALL LETTER W WITH HOOK..LATIN SMALL
+	{0x2C75, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER HALF H
+	{0x2C76, 0x2C7B, propertyPVALID},        // LATIN SMALL LETTER HALF H..LATIN LETTER SMAL
+	{0x2C7C, 0x2C80, propertyDISALLOWED},    // LATIN SUBSCRIPT SMALL LETTER J..COPTIC CAPIT
+	{0x2C81, 0x0, propertyPVALID},           // COPTIC SMALL LETTER ALFA
+	{0x2C82, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER VIDA
+	{0x2C83, 0x0, propertyPVALID},           // COPTIC SMALL LETTER VIDA
+	{0x2C84, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER GAMMA
+	{0x2C85, 0x0, propertyPVALID},           // COPTIC SMALL LETTER GAMMA
+	{0x2C86, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER DALDA
+	{0x2C87, 0x0, propertyPVALID},           // COPTIC SMALL LETTER DALDA
+	{0x2C88, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER EIE
+	{0x2C89, 0x0, propertyPVALID},           // COPTIC SMALL LETTER EIE
+	{0x2C8A, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER SOU
+	{0x2C8B, 0x0, propertyPVALID},           // COPTIC SMALL LETTER SOU
+	{0x2C8C, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER ZATA
+	{0x2C8D, 0x0, propertyPVALID},           // COPTIC SMALL LETTER ZATA
+	{0x2C8E, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER HATE
+	{0x2C8F, 0x0, propertyPVALID},           // COPTIC SMALL LETTER HATE
+	{0x2C90, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER THETHE
+	{0x2C91, 0x0, propertyPVALID},           // COPTIC SMALL LETTER THETHE
+	{0x2C92, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER IAUDA
+	{0x2C93, 0x0, propertyPVALID},           // COPTIC SMALL LETTER IAUDA
+	{0x2C94, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER KAPA
+	{0x2C95, 0x0, propertyPVALID},           // COPTIC SMALL LETTER KAPA
+	{0x2C96, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER LAULA
+	{0x2C97, 0x0, propertyPVALID},           // COPTIC SMALL LETTER LAULA
+	{0x2C98, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER MI
+	{0x2C99, 0x0, propertyPVALID},           // COPTIC SMALL LETTER MI
+	{0x2C9A, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER NI
+	{0x2C9B, 0x0, propertyPVALID},           // COPTIC SMALL LETTER NI
+	{0x2C9C, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER KSI
+	{0x2C9D, 0x0, propertyPVALID},           // COPTIC SMALL LETTER KSI
+	{0x2C9E, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER O
+	{0x2C9F, 0x0, propertyPVALID},           // COPTIC SMALL LETTER O
+	{0x2CA0, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER PI
+	{0x2CA1, 0x0, propertyPVALID},           // COPTIC SMALL LETTER PI
+	{0x2CA2, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER RO
+	{0x2CA3, 0x0, propertyPVALID},           // COPTIC SMALL LETTER RO
+	{0x2CA4, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER SIMA
+	{0x2CA5, 0x0, propertyPVALID},           // COPTIC SMALL LETTER SIMA
+	{0x2CA6, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER TAU
+	{0x2CA7, 0x0, propertyPVALID},           // COPTIC SMALL LETTER TAU
+	{0x2CA8, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER UA
+	{0x2CA9, 0x0, propertyPVALID},           // COPTIC SMALL LETTER UA
+	{0x2CAA, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER FI
+	{0x2CAB, 0x0, propertyPVALID},           // COPTIC SMALL LETTER FI
+	{0x2CAC, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER KHI
+	{0x2CAD, 0x0, propertyPVALID},           // COPTIC SMALL LETTER KHI
+	{0x2CAE, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER PSI
+	{0x2CAF, 0x0, propertyPVALID},           // COPTIC SMALL LETTER PSI
+	{0x2CB0, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER OOU
+	{0x2CB1, 0x0, propertyPVALID},           // COPTIC SMALL LETTER OOU
+	{0x2CB2, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER DIALECT-P ALEF
+	{0x2CB3, 0x0, propertyPVALID},           // COPTIC SMALL LETTER DIALECT-P ALEF
+	{0x2CB4, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER OLD COPTIC AIN
+	{0x2CB5, 0x0, propertyPVALID},           // COPTIC SMALL LETTER OLD COPTIC AIN
+	{0x2CB6, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER CRYPTOGRAMMIC EIE
+	{0x2CB7, 0x0, propertyPVALID},           // COPTIC SMALL LETTER CRYPTOGRAMMIC EIE
+	{0x2CB8, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER DIALECT-P KAPA
+	{0x2CB9, 0x0, propertyPVALID},           // COPTIC SMALL LETTER DIALECT-P KAPA
+	{0x2CBA, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER DIALECT-P NI
+	{0x2CBB, 0x0, propertyPVALID},           // COPTIC SMALL LETTER DIALECT-P NI
+	{0x2CBC, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER CRYPTOGRAMMIC NI
+	{0x2CBD, 0x0, propertyPVALID},           // COPTIC SMALL LETTER CRYPTOGRAMMIC NI
+	{0x2CBE, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER OLD COPTIC OOU
+	{0x2CBF, 0x0, propertyPVALID},           // COPTIC SMALL LETTER OLD COPTIC OOU
+	{0x2CC0, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER SAMPI
+	{0x2CC1, 0x0, propertyPVALID},           // COPTIC SMALL LETTER SAMPI
+	{0x2CC2, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER CROSSED SHEI
+	{0x2CC3, 0x0, propertyPVALID},           // COPTIC SMALL LETTER CROSSED SHEI
+	{0x2CC4, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER OLD COPTIC SHEI
+	{0x2CC5, 0x0, propertyPVALID},           // COPTIC SMALL LETTER OLD COPTIC SHEI
+	{0x2CC6, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER OLD COPTIC ESH
+	{0x2CC7, 0x0, propertyPVALID},           // COPTIC SMALL LETTER OLD COPTIC ESH
+	{0x2CC8, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER AKHMIMIC KHEI
+	{0x2CC9, 0x0, propertyPVALID},           // COPTIC SMALL LETTER AKHMIMIC KHEI
+	{0x2CCA, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER DIALECT-P HORI
+	{0x2CCB, 0x0, propertyPVALID},           // COPTIC SMALL LETTER DIALECT-P HORI
+	{0x2CCC, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER OLD COPTIC HORI
+	{0x2CCD, 0x0, propertyPVALID},           // COPTIC SMALL LETTER OLD COPTIC HORI
+	{0x2CCE, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER OLD COPTIC HA
+	{0x2CCF, 0x0, propertyPVALID},           // COPTIC SMALL LETTER OLD COPTIC HA
+	{0x2CD0, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER L-SHAPED HA
+	{0x2CD1, 0x0, propertyPVALID},           // COPTIC SMALL LETTER L-SHAPED HA
+	{0x2CD2, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER OLD COPTIC HEI
+	{0x2CD3, 0x0, propertyPVALID},           // COPTIC SMALL LETTER OLD COPTIC HEI
+	{0x2CD4, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER OLD COPTIC HAT
+	{0x2CD5, 0x0, propertyPVALID},           // COPTIC SMALL LETTER OLD COPTIC HAT
+	{0x2CD6, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER OLD COPTIC GANGIA
+	{0x2CD7, 0x0, propertyPVALID},           // COPTIC SMALL LETTER OLD COPTIC GANGIA
+	{0x2CD8, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER OLD COPTIC DJA
+	{0x2CD9, 0x0, propertyPVALID},           // COPTIC SMALL LETTER OLD COPTIC DJA
+	{0x2CDA, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER OLD COPTIC SHIMA
+	{0x2CDB, 0x0, propertyPVALID},           // COPTIC SMALL LETTER OLD COPTIC SHIMA
+	{0x2CDC, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER OLD NUBIAN SHIMA
+	{0x2CDD, 0x0, propertyPVALID},           // COPTIC SMALL LETTER OLD NUBIAN SHIMA
+	{0x2CDE, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER OLD NUBIAN NGI
+	{0x2CDF, 0x0, propertyPVALID},           // COPTIC SMALL LETTER OLD NUBIAN NGI
+	{0x2CE0, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER OLD NUBIAN NYI
+	{0x2CE1, 0x0, propertyPVALID},           // COPTIC SMALL LETTER OLD NUBIAN NYI
+	{0x2CE2, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER OLD NUBIAN WAU
+	{0x2CE3, 0x2CE4, propertyPVALID},        // COPTIC SMALL LETTER OLD NUBIAN WAU..COPTIC S
+	{0x2CE5, 0x2CEB, propertyDISALLOWED},    // COPTIC SYMBOL MI RO..COPTIC CAPITAL LETTER C
+	{0x2CEC, 0x0, propertyPVALID},           // COPTIC SMALL LETTER CRYPTOGRAMMIC SHEI
+	{0x2CED, 0x0, propertyDISALLOWED},       // COPTIC CAPITAL LETTER CRYPTOGRAMMIC GANGIA
+	{0x2CEE, 0x2CF1, propertyPVALID},        // COPTIC SMALL LETTER CRYPTOGRAMMIC GANGIA..CO
+	{0x2CF2, 0x2CF8, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x2CF9, 0x2CFF, propertyDISALLOWED},    // COPTIC OLD NUBIAN FULL STOP..COPTIC MORPHOLO
+	{0x2D00, 0x2D25, propertyPVALID},        // GEORGIAN SMALL LETTER AN..GEORGIAN SMALL LET
+	{0x2D26, 0x2D2F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x2D30, 0x2D65, propertyPVALID},        // TIFINAGH LETTER YA..TIFINAGH LETTER YAZZ
+	{0x2D66, 0x2D6E, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x2D6F, 0x0, propertyDISALLOWED},       // TIFINAGH MODIFIER LETTER LABIALIZATION MARK
+	{0x2D70, 0x2D7F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x2D80, 0x2D96, propertyPVALID},        // ETHIOPIC SYLLABLE LOA..ETHIOPIC SYLLABLE GGW
+	{0x2D97, 0x2D9F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x2DA0, 0x2DA6, propertyPVALID},        // ETHIOPIC SYLLABLE SSA..ETHIOPIC SYLLABLE SSO
+	{0x2DA7, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x2DA8, 0x2DAE, propertyPVALID},        // ETHIOPIC SYLLABLE CCA..ETHIOPIC SYLLABLE CCO
+	{0x2DAF, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x2DB0, 0x2DB6, propertyPVALID},        // ETHIOPIC SYLLABLE ZZA..ETHIOPIC SYLLABLE ZZO
+	{0x2DB7, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x2DB8, 0x2DBE, propertyPVALID},        // ETHIOPIC SYLLABLE CCHA..ETHIOPIC SYLLABLE CC
+	{0x2DBF, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x2DC0, 0x2DC6, propertyPVALID},        // ETHIOPIC SYLLABLE QYA..ETHIOPIC SYLLABLE QYO
+	{0x2DC7, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x2DC8, 0x2DCE, propertyPVALID},        // ETHIOPIC SYLLABLE KYA..ETHIOPIC SYLLABLE KYO
+	{0x2DCF, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x2DD0, 0x2DD6, propertyPVALID},        // ETHIOPIC SYLLABLE XYA..ETHIOPIC SYLLABLE XYO
+	{0x2DD7, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x2DD8, 0x2DDE, propertyPVALID},        // ETHIOPIC SYLLABLE GYA..ETHIOPIC SYLLABLE GYO
+	{0x2DDF, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x2DE0, 0x2DFF, propertyPVALID},        // COMBINING CYRILLIC LETTER BE..COMBINING CYRI
+	{0x2E00, 0x2E2E, propertyDISALLOWED},    // RIGHT ANGLE SUBSTITUTION MARKER..REVERSED QU
+	{0x2E2F, 0x0, propertyPVALID},           // VERTICAL TILDE
+	{0x2E30, 0x2E31, propertyDISALLOWED},    // RING POINT..WORD SEPARATOR MIDDLE DOT
+	{0x2E32, 0x2E7F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x2E80, 0x2E99, propertyDISALLOWED},    // CJK RADICAL REPEAT..CJK RADICAL RAP
+	{0x2E9A, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x2E9B, 0x2EF3, propertyDISALLOWED},    // CJK RADICAL CHOKE..CJK RADICAL C-SIMPLIFIED
+	{0x2EF4, 0x2EFF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x2F00, 0x2FD5, propertyDISALLOWED},    // KANGXI RADICAL ONE..KANGXI RADICAL FLUTE
+	{0x2FD6, 0x2FEF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x2FF0, 0x2FFB, propertyDISALLOWED},    // IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RI
+	{0x2FFC, 0x2FFF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x3000, 0x3004, propertyDISALLOWED},    // IDEOGRAPHIC SPACE..JAPANESE INDUSTRIAL STAND
+	{0x3005, 0x3007, propertyPVALID},        // IDEOGRAPHIC ITERATION MARK..IDEOGRAPHIC NUMB
+	{0x3008, 0x3029, propertyDISALLOWED},    // LEFT ANGLE BRACKET..HANGZHOU NUMERAL NINE
+	{0x302A, 0x302D, propertyPVALID},        // IDEOGRAPHIC LEVEL TONE MARK..IDEOGRAPHIC ENT
+	{0x302E, 0x303B, propertyDISALLOWED},    // HANGUL SINGLE DOT TONE MARK..VERTICAL IDEOGR
+	{0x303C, 0x0, propertyPVALID},           // MASU MARK
+	{0x303D, 0x303F, propertyDISALLOWED},    // PART ALTERNATION MARK..IDEOGRAPHIC HALF FILL
+	{0x3040, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x3041, 0x3096, propertyPVALID},        // HIRAGANA LETTER SMALL A..HIRAGANA LETTER SMA
+	{0x3097, 0x3098, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x3099, 0x309A, propertyPVALID},        // COMBINING KATAKANA-HIRAGANA VOICED SOUND MAR
+	{0x309B, 0x309C, propertyDISALLOWED},    // KATAKANA-HIRAGANA VOICED SOUND MARK..KATAKAN
+	{0x309D, 0x309E, propertyPVALID},        // HIRAGANA ITERATION MARK..HIRAGANA VOICED ITE
+	{0x309F, 0x30A0, propertyDISALLOWED},    // HIRAGANA DIGRAPH YORI..KATAKANA-HIRAGANA DOU
+	{0x30A1, 0x30FA, propertyPVALID},        // KATAKANA LETTER SMALL A..KATAKANA LETTER VO
+	{0x30FB, 0x0, propertyCONTEXTO},         // KATAKANA MIDDLE DOT
+	{0x30FC, 0x30FE, propertyPVALID},        // KATAKANA-HIRAGANA PROLONGED SOUND MARK..KATA
+	{0x30FF, 0x0, propertyDISALLOWED},       // KATAKANA DIGRAPH KOTO
+	{0x3100, 0x3104, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x3105, 0x312D, propertyPVALID},        // BOPOMOFO LETTER B..BOPOMOFO LETTER IH
+	{0x312E, 0x3130, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x3131, 0x318E, propertyDISALLOWED},    // HANGUL LETTER KIYEOK..HANGUL LETTER ARAEAE
+	{0x318F, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x3190, 0x319F, propertyDISALLOWED},    // IDEOGRAPHIC ANNOTATION LINKING MARK..IDEOGRA
+	{0x31A0, 0x31B7, propertyPVALID},        // BOPOMOFO LETTER BU..BOPOMOFO FINAL LETTER H
+	{0x31B8, 0x31BF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x31C0, 0x31E3, propertyDISALLOWED},    // CJK STROKE T..CJK STROKE Q
+	{0x31E4, 0x31EF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x31F0, 0x31FF, propertyPVALID},        // KATAKANA LETTER SMALL KU..KATAKANA LETTER SM
+	{0x3200, 0x321E, propertyDISALLOWED},    // PARENTHESIZED HANGUL KIYEOK..PARENTHESIZED K
+	{0x321F, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x3220, 0x32FE, propertyDISALLOWED},    // PARENTHESIZED IDEOGRAPH ONE..CIRCLED KATAKAN
+	{0x32FF, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0x3300, 0x33FF, propertyDISALLOWED},    // SQUARE APAATO..SQUARE GAL
+	{0x3400, 0x4DB5, propertyPVALID},        // <CJK Ideograph Extension A>..<CJK Ideograph
+	{0x4DB6, 0x4DBF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0x4DC0, 0x4DFF, propertyDISALLOWED},    // HEXAGRAM FOR THE CREATIVE HEAVEN..HEXAGRAM F
+	{0x4E00, 0x9FCB, propertyPVALID},        // <CJK Ideograph>..<CJK Ideograph>
+	{0x9FCC, 0x9FFF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xA000, 0xA48C, propertyPVALID},        // YI SYLLABLE IT..YI SYLLABLE YYR
+	{0xA48D, 0xA48F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xA490, 0xA4C6, propertyDISALLOWED},    // YI RADICAL QOT..YI RADICAL KE
+	{0xA4C7, 0xA4CF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xA4D0, 0xA4FD, propertyPVALID},        // LISU LETTER BA..LISU LETTER TONE MYA JEU
+	{0xA4FE, 0xA4FF, propertyDISALLOWED},    // LISU PUNCTUATION COMMA..LISU PUNCTUATION FUL
+	{0xA500, 0xA60C, propertyPVALID},        // VAI SYLLABLE EE..VAI SYLLABLE LENGTHENER
+	{0xA60D, 0xA60F, propertyDISALLOWED},    // VAI COMMA..VAI QUESTION MARK
+	{0xA610, 0xA62B, propertyPVALID},        // VAI SYLLABLE NDOLE FA..VAI SYLLABLE NDOLE DO
+	{0xA62C, 0xA63F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xA640, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER ZEMLYA
+	{0xA641, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER ZEMLYA
+	{0xA642, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER DZELO
+	{0xA643, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER DZELO
+	{0xA644, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER REVERSED DZE
+	{0xA645, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER REVERSED DZE
+	{0xA646, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER IOTA
+	{0xA647, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER IOTA
+	{0xA648, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER DJERV
+	{0xA649, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER DJERV
+	{0xA64A, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER MONOGRAPH UK
+	{0xA64B, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER MONOGRAPH UK
+	{0xA64C, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER BROAD OMEGA
+	{0xA64D, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER BROAD OMEGA
+	{0xA64E, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER NEUTRAL YER
+	{0xA64F, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER NEUTRAL YER
+	{0xA650, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER YERU WITH BACK YER
+	{0xA651, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER YERU WITH BACK YER
+	{0xA652, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER IOTIFIED YAT
+	{0xA653, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER IOTIFIED YAT
+	{0xA654, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER REVERSED YU
+	{0xA655, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER REVERSED YU
+	{0xA656, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER IOTIFIED A
+	{0xA657, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER IOTIFIED A
+	{0xA658, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER CLOSED LITTLE YUS
+	{0xA659, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER CLOSED LITTLE YUS
+	{0xA65A, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER BLENDED YUS
+	{0xA65B, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER BLENDED YUS
+	{0xA65C, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER IOTIFIED CLOSED LITT
+	{0xA65D, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER IOTIFIED CLOSED LITTLE
+	{0xA65E, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER YN
+	{0xA65F, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER YN
+	{0xA660, 0xA661, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xA662, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER SOFT DE
+	{0xA663, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER SOFT DE
+	{0xA664, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER SOFT EL
+	{0xA665, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER SOFT EL
+	{0xA666, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER SOFT EM
+	{0xA667, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER SOFT EM
+	{0xA668, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER MONOCULAR O
+	{0xA669, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER MONOCULAR O
+	{0xA66A, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER BINOCULAR O
+	{0xA66B, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER BINOCULAR O
+	{0xA66C, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER DOUBLE MONOCULAR O
+	{0xA66D, 0xA66F, propertyPVALID},        // CYRILLIC SMALL LETTER DOUBLE MONOCULAR O..CO
+	{0xA670, 0xA673, propertyDISALLOWED},    // COMBINING CYRILLIC TEN MILLIONS SIGN..SLAVON
+	{0xA674, 0xA67B, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xA67C, 0xA67D, propertyPVALID},        // COMBINING CYRILLIC KAVYKA..COMBINING CYRILLI
+	{0xA67E, 0x0, propertyDISALLOWED},       // CYRILLIC KAVYKA
+	{0xA67F, 0x0, propertyPVALID},           // CYRILLIC PAYEROK
+	{0xA680, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER DWE
+	{0xA681, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER DWE
+	{0xA682, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER DZWE
+	{0xA683, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER DZWE
+	{0xA684, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER ZHWE
+	{0xA685, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER ZHWE
+	{0xA686, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER CCHE
+	{0xA687, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER CCHE
+	{0xA688, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER DZZE
+	{0xA689, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER DZZE
+	{0xA68A, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER TE WITH MIDDLE HOOK
+	{0xA68B, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER TE WITH MIDDLE HOOK
+	{0xA68C, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER TWE
+	{0xA68D, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER TWE
+	{0xA68E, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER TSWE
+	{0xA68F, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER TSWE
+	{0xA690, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER TSSE
+	{0xA691, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER TSSE
+	{0xA692, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER TCHE
+	{0xA693, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER TCHE
+	{0xA694, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER HWE
+	{0xA695, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER HWE
+	{0xA696, 0x0, propertyDISALLOWED},       // CYRILLIC CAPITAL LETTER SHWE
+	{0xA697, 0x0, propertyPVALID},           // CYRILLIC SMALL LETTER SHWE
+	{0xA698, 0xA69F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xA6A0, 0xA6E5, propertyPVALID},        // BAMUM LETTER A..BAMUM LETTER KI
+	{0xA6E6, 0xA6EF, propertyDISALLOWED},    // BAMUM LETTER MO..BAMUM LETTER KOGHOM
+	{0xA6F0, 0xA6F1, propertyPVALID},        // BAMUM COMBINING MARK KOQNDON..BAMUM COMBININ
+	{0xA6F2, 0xA6F7, propertyDISALLOWED},    // BAMUM NJAEMLI..BAMUM QUESTION MARK
+	{0xA6F8, 0xA6FF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xA700, 0xA716, propertyDISALLOWED},    // MODIFIER LETTER CHINESE TONE YIN PING..MODIF
+	{0xA717, 0xA71F, propertyPVALID},        // MODIFIER LETTER DOT VERTICAL BAR..MODIFIER L
+	{0xA720, 0xA722, propertyDISALLOWED},    // MODIFIER LETTER STRESS AND HIGH TONE..LATIN
+	{0xA723, 0x0, propertyPVALID},           // LATIN SMALL LETTER EGYPTOLOGICAL ALEF
+	{0xA724, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER EGYPTOLOGICAL AIN
+	{0xA725, 0x0, propertyPVALID},           // LATIN SMALL LETTER EGYPTOLOGICAL AIN
+	{0xA726, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER HENG
+	{0xA727, 0x0, propertyPVALID},           // LATIN SMALL LETTER HENG
+	{0xA728, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER TZ
+	{0xA729, 0x0, propertyPVALID},           // LATIN SMALL LETTER TZ
+	{0xA72A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER TRESILLO
+	{0xA72B, 0x0, propertyPVALID},           // LATIN SMALL LETTER TRESILLO
+	{0xA72C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER CUATRILLO
+	{0xA72D, 0x0, propertyPVALID},           // LATIN SMALL LETTER CUATRILLO
+	{0xA72E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER CUATRILLO WITH COMMA
+	{0xA72F, 0xA731, propertyPVALID},        // LATIN SMALL LETTER CUATRILLO WITH COMMA..LAT
+	{0xA732, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER AA
+	{0xA733, 0x0, propertyPVALID},           // LATIN SMALL LETTER AA
+	{0xA734, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER AO
+	{0xA735, 0x0, propertyPVALID},           // LATIN SMALL LETTER AO
+	{0xA736, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER AU
+	{0xA737, 0x0, propertyPVALID},           // LATIN SMALL LETTER AU
+	{0xA738, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER AV
+	{0xA739, 0x0, propertyPVALID},           // LATIN SMALL LETTER AV
+	{0xA73A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER AV WITH HORIZONTAL BAR
+	{0xA73B, 0x0, propertyPVALID},           // LATIN SMALL LETTER AV WITH HORIZONTAL BAR
+	{0xA73C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER AY
+	{0xA73D, 0x0, propertyPVALID},           // LATIN SMALL LETTER AY
+	{0xA73E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER REVERSED C WITH DOT
+	{0xA73F, 0x0, propertyPVALID},           // LATIN SMALL LETTER REVERSED C WITH DOT
+	{0xA740, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER K WITH STROKE
+	{0xA741, 0x0, propertyPVALID},           // LATIN SMALL LETTER K WITH STROKE
+	{0xA742, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER K WITH DIAGONAL STROKE
+	{0xA743, 0x0, propertyPVALID},           // LATIN SMALL LETTER K WITH DIAGONAL STROKE
+	{0xA744, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER K WITH STROKE AND DIAGO
+	{0xA745, 0x0, propertyPVALID},           // LATIN SMALL LETTER K WITH STROKE AND DIAGONA
+	{0xA746, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER BROKEN L
+	{0xA747, 0x0, propertyPVALID},           // LATIN SMALL LETTER BROKEN L
+	{0xA748, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER L WITH HIGH STROKE
+	{0xA749, 0x0, propertyPVALID},           // LATIN SMALL LETTER L WITH HIGH STROKE
+	{0xA74A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH LONG STROKE OVER
+	{0xA74B, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH LONG STROKE OVERLA
+	{0xA74C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER O WITH LOOP
+	{0xA74D, 0x0, propertyPVALID},           // LATIN SMALL LETTER O WITH LOOP
+	{0xA74E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER OO
+	{0xA74F, 0x0, propertyPVALID},           // LATIN SMALL LETTER OO
+	{0xA750, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER P WITH STROKE THROUGH D
+	{0xA751, 0x0, propertyPVALID},           // LATIN SMALL LETTER P WITH STROKE THROUGH DES
+	{0xA752, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER P WITH FLOURISH
+	{0xA753, 0x0, propertyPVALID},           // LATIN SMALL LETTER P WITH FLOURISH
+	{0xA754, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER P WITH SQUIRREL TAIL
+	{0xA755, 0x0, propertyPVALID},           // LATIN SMALL LETTER P WITH SQUIRREL TAIL
+	{0xA756, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER Q WITH STROKE THROUGH D
+	{0xA757, 0x0, propertyPVALID},           // LATIN SMALL LETTER Q WITH STROKE THROUGH DES
+	{0xA758, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER Q WITH DIAGONAL STROKE
+	{0xA759, 0x0, propertyPVALID},           // LATIN SMALL LETTER Q WITH DIAGONAL STROKE
+	{0xA75A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER R ROTUNDA
+	{0xA75B, 0x0, propertyPVALID},           // LATIN SMALL LETTER R ROTUNDA
+	{0xA75C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER RUM ROTUNDA
+	{0xA75D, 0x0, propertyPVALID},           // LATIN SMALL LETTER RUM ROTUNDA
+	{0xA75E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER V WITH DIAGONAL STROKE
+	{0xA75F, 0x0, propertyPVALID},           // LATIN SMALL LETTER V WITH DIAGONAL STROKE
+	{0xA760, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER VY
+	{0xA761, 0x0, propertyPVALID},           // LATIN SMALL LETTER VY
+	{0xA762, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER VISIGOTHIC Z
+	{0xA763, 0x0, propertyPVALID},           // LATIN SMALL LETTER VISIGOTHIC Z
+	{0xA764, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER THORN WITH STROKE
+	{0xA765, 0x0, propertyPVALID},           // LATIN SMALL LETTER THORN WITH STROKE
+	{0xA766, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER THORN WITH STROKE THROU
+	{0xA767, 0x0, propertyPVALID},           // LATIN SMALL LETTER THORN WITH STROKE THROUGH
+	{0xA768, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER VEND
+	{0xA769, 0x0, propertyPVALID},           // LATIN SMALL LETTER VEND
+	{0xA76A, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER ET
+	{0xA76B, 0x0, propertyPVALID},           // LATIN SMALL LETTER ET
+	{0xA76C, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER IS
+	{0xA76D, 0x0, propertyPVALID},           // LATIN SMALL LETTER IS
+	{0xA76E, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER CON
+	{0xA76F, 0x0, propertyPVALID},           // LATIN SMALL LETTER CON
+	{0xA770, 0x0, propertyDISALLOWED},       // MODIFIER LETTER US
+	{0xA771, 0xA778, propertyPVALID},        // LATIN SMALL LETTER DUM..LATIN SMALL LETTER U
+	{0xA779, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER INSULAR D
+	{0xA77A, 0x0, propertyPVALID},           // LATIN SMALL LETTER INSULAR D
+	{0xA77B, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER INSULAR F
+	{0xA77C, 0x0, propertyPVALID},           // LATIN SMALL LETTER INSULAR F
+	{0xA77D, 0xA77E, propertyDISALLOWED},    // LATIN CAPITAL LETTER INSULAR G..LATIN CAPITA
+	{0xA77F, 0x0, propertyPVALID},           // LATIN SMALL LETTER TURNED INSULAR G
+	{0xA780, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER TURNED L
+	{0xA781, 0x0, propertyPVALID},           // LATIN SMALL LETTER TURNED L
+	{0xA782, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER INSULAR R
+	{0xA783, 0x0, propertyPVALID},           // LATIN SMALL LETTER INSULAR R
+	{0xA784, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER INSULAR S
+	{0xA785, 0x0, propertyPVALID},           // LATIN SMALL LETTER INSULAR S
+	{0xA786, 0x0, propertyDISALLOWED},       // LATIN CAPITAL LETTER INSULAR T
+	{0xA787, 0xA788, propertyPVALID},        // LATIN SMALL LETTER INSULAR T..MODIFIER LETTE
+	{0xA789, 0xA78B, propertyDISALLOWED},    // MODIFIER LETTER COLON..LATIN CAPITAL LETTER
+	{0xA78C, 0x0, propertyPVALID},           // LATIN SMALL LETTER SALTILLO
+	{0xA78D, 0xA7FA, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xA7FB, 0xA827, propertyPVALID},        // LATIN EPIGRAPHIC LETTER REVERSED F..SYLOTI N
+	{0xA828, 0xA82B, propertyDISALLOWED},    // SYLOTI NAGRI POETRY MARK-1..SYLOTI NAGRI POE
+	{0xA82C, 0xA82F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xA830, 0xA839, propertyDISALLOWED},    // NORTH INDIC FRACTION ONE QUARTER..NORTH INDI
+	{0xA83A, 0xA83F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xA840, 0xA873, propertyPVALID},        // PHAGS-PA LETTER KA..PHAGS-PA LETTER CANDRABI
+	{0xA874, 0xA877, propertyDISALLOWED},    // PHAGS-PA SINGLE HEAD MARK..PHAGS-PA MARK DOU
+	{0xA878, 0xA87F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xA880, 0xA8C4, propertyPVALID},        // SAURASHTRA SIGN ANUSVARA..SAURASHTRA SIGN VI
+	{0xA8C5, 0xA8CD, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xA8CE, 0xA8CF, propertyDISALLOWED},    // SAURASHTRA DANDA..SAURASHTRA DOUBLE DANDA
+	{0xA8D0, 0xA8D9, propertyPVALID},        // SAURASHTRA DIGIT ZERO..SAURASHTRA DIGIT NINE
+	{0xA8DA, 0xA8DF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xA8E0, 0xA8F7, propertyPVALID},        // COMBINING DEVANAGARI DIGIT ZERO..DEVANAGARI
+	{0xA8F8, 0xA8FA, propertyDISALLOWED},    // DEVANAGARI SIGN PUSHPIKA..DEVANAGARI CARET
+	{0xA8FB, 0x0, propertyPVALID},           // DEVANAGARI HEADSTROKE
+	{0xA8FC, 0xA8FF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xA900, 0xA92D, propertyPVALID},        // KAYAH LI DIGIT ZERO..KAYAH LI TONE CALYA PLO
+	{0xA92E, 0xA92F, propertyDISALLOWED},    // KAYAH LI SIGN CWI..KAYAH LI SIGN SHYA
+	{0xA930, 0xA953, propertyPVALID},        // REJANG LETTER KA..REJANG VIRAMA
+	{0xA954, 0xA95E, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xA95F, 0xA97C, propertyDISALLOWED},    // REJANG SECTION MARK..HANGUL CHOSEONG SSANGYE
+	{0xA97D, 0xA97F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xA980, 0xA9C0, propertyPVALID},        // JAVANESE SIGN PANYANGGA..JAVANESE PANGKON
+	{0xA9C1, 0xA9CD, propertyDISALLOWED},    // JAVANESE LEFT RERENGGAN..JAVANESE TURNED PAD
+	{0xA9CE, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0xA9CF, 0xA9D9, propertyPVALID},        // JAVANESE PANGRANGKEP..JAVANESE DIGIT NINE
+	{0xA9DA, 0xA9DD, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xA9DE, 0xA9DF, propertyDISALLOWED},    // JAVANESE PADA TIRTA TUMETES..JAVANESE PADA I
+	{0xA9E0, 0xA9FF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xAA00, 0xAA36, propertyPVALID},        // CHAM LETTER A..CHAM CONSONANT SIGN WA
+	{0xAA37, 0xAA3F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xAA40, 0xAA4D, propertyPVALID},        // CHAM LETTER FINAL K..CHAM CONSONANT SIGN FIN
+	{0xAA4E, 0xAA4F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xAA50, 0xAA59, propertyPVALID},        // CHAM DIGIT ZERO..CHAM DIGIT NINE
+	{0xAA5A, 0xAA5B, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xAA5C, 0xAA5F, propertyDISALLOWED},    // CHAM PUNCTUATION SPIRAL..CHAM PUNCTUATION TR
+	{0xAA60, 0xAA76, propertyPVALID},        // MYANMAR LETTER KHAMTI GA..MYANMAR LOGOGRAM K
+	{0xAA77, 0xAA79, propertyDISALLOWED},    // MYANMAR SYMBOL AITON EXCLAMATION..MYANMAR SY
+	{0xAA7A, 0xAA7B, propertyPVALID},        // MYANMAR LETTER AITON RA..MYANMAR SIGN PAO KA
+	{0xAA7C, 0xAA7F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xAA80, 0xAAC2, propertyPVALID},        // TAI VIET LETTER LOW KO..TAI VIET TONE MAI SO
+	{0xAAC3, 0xAADA, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xAADB, 0xAADD, propertyPVALID},        // TAI VIET SYMBOL KON..TAI VIET SYMBOL SAM
+	{0xAADE, 0xAADF, propertyDISALLOWED},    // TAI VIET SYMBOL HO HOI..TAI VIET SYMBOL KOI
+	{0xAAE0, 0xABBF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xABC0, 0xABEA, propertyPVALID},        // MEETEI MAYEK LETTER KOK..MEETEI MAYEK VOWEL
+	{0xABEB, 0x0, propertyDISALLOWED},       // MEETEI MAYEK CHEIKHEI
+	{0xABEC, 0xABED, propertyPVALID},        // MEETEI MAYEK LUM IYEK..MEETEI MAYEK APUN IYE
+	{0xABEE, 0xABEF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xABF0, 0xABF9, propertyPVALID},        // MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DIGIT
+	{0xABFA, 0xABFF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xAC00, 0xD7A3, propertyPVALID},        // <Hangul Syllable>..<Hangul Syllable>
+	{0xD7A4, 0xD7AF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xD7B0, 0xD7C6, propertyDISALLOWED},    // HANGUL JUNGSEONG O-YEO..HANGUL JUNGSEONG ARA
+	{0xD7C7, 0xD7CA, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xD7CB, 0xD7FB, propertyDISALLOWED},    // HANGUL JONGSEONG NIEUN-RIEUL..HANGUL JONGSEO
+	{0xD7FC, 0xD7FF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xD800, 0xFA0D, propertyDISALLOWED},    // <Non Private Use High Surrogate>..CJK COMPAT
+	{0xFA0E, 0xFA0F, propertyPVALID},        // CJK COMPATIBILITY IDEOGRAPH-FA0E..CJK COMPAT
+	{0xFA10, 0x0, propertyDISALLOWED},       // CJK COMPATIBILITY IDEOGRAPH-FA10
+	{0xFA11, 0x0, propertyPVALID},           // CJK COMPATIBILITY IDEOGRAPH-FA11
+	{0xFA12, 0x0, propertyDISALLOWED},       // CJK COMPATIBILITY IDEOGRAPH-FA12
+	{0xFA13, 0xFA14, propertyPVALID},        // CJK COMPATIBILITY IDEOGRAPH-FA13..CJK COMPAT
+	{0xFA15, 0xFA1E, propertyDISALLOWED},    // CJK COMPATIBILITY IDEOGRAPH-FA15..CJK COMPAT
+	{0xFA1F, 0x0, propertyPVALID},           // CJK COMPATIBILITY IDEOGRAPH-FA1F
+	{0xFA20, 0x0, propertyDISALLOWED},       // CJK COMPATIBILITY IDEOGRAPH-FA20
+	{0xFA21, 0x0, propertyPVALID},           // CJK COMPATIBILITY IDEOGRAPH-FA21
+	{0xFA22, 0x0, propertyDISALLOWED},       // CJK COMPATIBILITY IDEOGRAPH-FA22
+	{0xFA23, 0xFA24, propertyPVALID},        // CJK COMPATIBILITY IDEOGRAPH-FA23..CJK COMPAT
+	{0xFA25, 0xFA26, propertyDISALLOWED},    // CJK COMPATIBILITY IDEOGRAPH-FA25..CJK COMPAT
+	{0xFA27, 0xFA29, propertyPVALID},        // CJK COMPATIBILITY IDEOGRAPH-FA27..CJK COMPAT
+	{0xFA2A, 0xFA2D, propertyDISALLOWED},    // CJK COMPATIBILITY IDEOGRAPH-FA2A..CJK COMPAT
+	{0xFA2E, 0xFA2F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xFA30, 0xFA6D, propertyDISALLOWED},    // CJK COMPATIBILITY IDEOGRAPH-FA30..CJK COMPAT
+	{0xFA6E, 0xFA6F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xFA70, 0xFAD9, propertyDISALLOWED},    // CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COMPAT
+	{0xFADA, 0xFAFF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xFB00, 0xFB06, propertyDISALLOWED},    // LATIN SMALL LIGATURE FF..LATIN SMALL LIGATUR
+	{0xFB07, 0xFB12, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xFB13, 0xFB17, propertyDISALLOWED},    // ARMENIAN SMALL LIGATURE MEN NOW..ARMENIAN SM
+	{0xFB18, 0xFB1C, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xFB1D, 0x0, propertyDISALLOWED},       // HEBREW LETTER YOD WITH HIRIQ
+	{0xFB1E, 0x0, propertyPVALID},           // HEBREW POINT JUDEO-SPANISH VARIKA
+	{0xFB1F, 0xFB36, propertyDISALLOWED},    // HEBREW LIGATURE YIDDISH YOD YOD PATAH..HEBRE
+	{0xFB37, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0xFB38, 0xFB3C, propertyDISALLOWED},    // HEBREW LETTER TET WITH DAGESH..HEBREW LETTER
+	{0xFB3D, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0xFB3E, 0x0, propertyDISALLOWED},       // HEBREW LETTER MEM WITH DAGESH
+	{0xFB3F, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0xFB40, 0xFB41, propertyDISALLOWED},    // HEBREW LETTER NUN WITH DAGESH..HEBREW LETTER
+	{0xFB42, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0xFB43, 0xFB44, propertyDISALLOWED},    // HEBREW LETTER FINAL PE WITH DAGESH..HEBREW L
+	{0xFB45, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0xFB46, 0xFBB1, propertyDISALLOWED},    // HEBREW LETTER TSADI WITH DAGESH..ARABIC LETT
+	{0xFBB2, 0xFBD2, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xFBD3, 0xFD3F, propertyDISALLOWED},    // ARABIC LETTER NG ISOLATED FORM..ORNATE RIGHT
+	{0xFD40, 0xFD4F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xFD50, 0xFD8F, propertyDISALLOWED},    // ARABIC LIGATURE TEH WITH JEEM WITH MEEM INIT
+	{0xFD90, 0xFD91, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xFD92, 0xFDC7, propertyDISALLOWED},    // ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INI
+	{0xFDC8, 0xFDCF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xFDD0, 0xFDFD, propertyDISALLOWED},    // <noncharacter>..ARABIC LIGATURE BISMILLAH AR
+	{0xFDFE, 0xFDFF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xFE00, 0xFE19, propertyDISALLOWED},    // VARIATION SELECTOR-1..PRESENTATION FORM FOR
+	{0xFE1A, 0xFE1F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xFE20, 0xFE26, propertyPVALID},        // COMBINING LIGATURE LEFT HALF..COMBINING CONJ
+	{0xFE27, 0xFE2F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xFE30, 0xFE52, propertyDISALLOWED},    // PRESENTATION FORM FOR VERTICAL TWO DOT LEADE
+	{0xFE53, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0xFE54, 0xFE66, propertyDISALLOWED},    // SMALL SEMICOLON..SMALL EQUALS SIGN
+	{0xFE67, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0xFE68, 0xFE6B, propertyDISALLOWED},    // SMALL REVERSE SOLIDUS..SMALL COMMERCIAL AT
+	{0xFE6C, 0xFE6F, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xFE70, 0xFE72, propertyDISALLOWED},    // ARABIC FATHATAN ISOLATED FORM..ARABIC DAMMAT
+	{0xFE73, 0x0, propertyPVALID},           // ARABIC TAIL FRAGMENT
+	{0xFE74, 0x0, propertyDISALLOWED},       // ARABIC KASRATAN ISOLATED FORM
+	{0xFE75, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0xFE76, 0xFEFC, propertyDISALLOWED},    // ARABIC FATHA ISOLATED FORM..ARABIC LIGATURE
+	{0xFEFD, 0xFEFE, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xFEFF, 0x0, propertyDISALLOWED},       // ZERO WIDTH NO-BREAK SPACE
+	{0xFF00, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0xFF01, 0xFFBE, propertyDISALLOWED},    // FULLWIDTH EXCLAMATION MARK..HALFWIDTH HANGUL
+	{0xFFBF, 0xFFC1, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xFFC2, 0xFFC7, propertyDISALLOWED},    // HALFWIDTH HANGUL LETTER A..HALFWIDTH HANGUL
+	{0xFFC8, 0xFFC9, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xFFCA, 0xFFCF, propertyDISALLOWED},    // HALFWIDTH HANGUL LETTER YEO..HALFWIDTH HANGU
+	{0xFFD0, 0xFFD1, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xFFD2, 0xFFD7, propertyDISALLOWED},    // HALFWIDTH HANGUL LETTER YO..HALFWIDTH HANGUL
+	{0xFFD8, 0xFFD9, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xFFDA, 0xFFDC, propertyDISALLOWED},    // HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL
+	{0xFFDD, 0xFFDF, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xFFE0, 0xFFE6, propertyDISALLOWED},    // FULLWIDTH CENT SIGN..FULLWIDTH WON SIGN
+	{0xFFE7, 0x0, propertyUNASSIGNED},       // <reserved>
+	{0xFFE8, 0xFFEE, propertyDISALLOWED},    // HALFWIDTH FORMS LIGHT VERTICAL..HALFWIDTH WH
+	{0xFFEF, 0xFFF8, propertyUNASSIGNED},    // <reserved>..<reserved>
+	{0xFFF9, 0xFFFF, propertyDISALLOWED},    // INTERLINEAR ANNOTATION ANCHOR..<noncharacter
+	{0x10000, 0x1000B, propertyPVALID},      // LINEAR B SYLLABLE B008 A..LINEAR B SYLLABLE
+	{0x1000C, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x1000D, 0x10026, propertyPVALID},      // LINEAR B SYLLABLE B036 JO..LINEAR B SYLLABLE
+	{0x10027, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x10028, 0x1003A, propertyPVALID},      // LINEAR B SYLLABLE B060 RA..LINEAR B SYLLABLE
+	{0x1003B, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x1003C, 0x1003D, propertyPVALID},      // LINEAR B SYLLABLE B017 ZA..LINEAR B SYLLABLE
+	{0x1003E, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x1003F, 0x1004D, propertyPVALID},      // LINEAR B SYLLABLE B020 ZO..LINEAR B SYLLABLE
+	{0x1004E, 0x1004F, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10050, 0x1005D, propertyPVALID},      // LINEAR B SYMBOL B018..LINEAR B SYMBOL B089
+	{0x1005E, 0x1007F, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10080, 0x100FA, propertyPVALID},      // LINEAR B IDEOGRAM B100 MAN..LINEAR B IDEOGRA
+	{0x100FB, 0x100FF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10100, 0x10102, propertyDISALLOWED},  // AEGEAN WORD SEPARATOR LINE..AEGEAN CHECK MAR
+	{0x10103, 0x10106, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10107, 0x10133, propertyDISALLOWED},  // AEGEAN NUMBER ONE..AEGEAN NUMBER NINETY THOU
+	{0x10134, 0x10136, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10137, 0x1018A, propertyDISALLOWED},  // AEGEAN WEIGHT BASE UNIT..GREEK ZERO SIGN
+	{0x1018B, 0x1018F, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10190, 0x1019B, propertyDISALLOWED},  // ROMAN SEXTANS SIGN..ROMAN CENTURIAL SIGN
+	{0x1019C, 0x101CF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x101D0, 0x101FC, propertyDISALLOWED},  // PHAISTOS DISC SIGN PEDESTRIAN..PHAISTOS DISC
+	{0x101FD, 0x0, propertyPVALID},          // PHAISTOS DISC SIGN COMBINING OBLIQUE STROKE
+	{0x101FE, 0x1027F, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10280, 0x1029C, propertyPVALID},      // LYCIAN LETTER A..LYCIAN LETTER X
+	{0x1029D, 0x1029F, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x102A0, 0x102D0, propertyPVALID},      // CARIAN LETTER A..CARIAN LETTER UUU3
+	{0x102D1, 0x102FF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10300, 0x1031E, propertyPVALID},      // OLD ITALIC LETTER A..OLD ITALIC LETTER UU
+	{0x1031F, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x10320, 0x10323, propertyDISALLOWED},  // OLD ITALIC NUMERAL ONE..OLD ITALIC NUMERAL F
+	{0x10324, 0x1032F, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10330, 0x10340, propertyPVALID},      // GOTHIC LETTER AHSA..GOTHIC LETTER PAIRTHRA
+	{0x10341, 0x0, propertyDISALLOWED},      // GOTHIC LETTER NINETY
+	{0x10342, 0x10349, propertyPVALID},      // GOTHIC LETTER RAIDA..GOTHIC LETTER OTHAL
+	{0x1034A, 0x0, propertyDISALLOWED},      // GOTHIC LETTER NINE HUNDRED
+	{0x1034B, 0x1037F, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10380, 0x1039D, propertyPVALID},      // UGARITIC LETTER ALPA..UGARITIC LETTER SSU
+	{0x1039E, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x1039F, 0x0, propertyDISALLOWED},      // UGARITIC WORD DIVIDER
+	{0x103A0, 0x103C3, propertyPVALID},      // OLD PERSIAN SIGN A..OLD PERSIAN SIGN HA
+	{0x103C4, 0x103C7, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x103C8, 0x103CF, propertyPVALID},      // OLD PERSIAN SIGN AURAMAZDAA..OLD PERSIAN SIG
+	{0x103D0, 0x103D5, propertyDISALLOWED},  // OLD PERSIAN WORD DIVIDER..OLD PERSIAN NUMBER
+	{0x103D6, 0x103FF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10400, 0x10427, propertyDISALLOWED},  // DESERET CAPITAL LETTER LONG I..DESERET CAPIT
+	{0x10428, 0x1049D, propertyPVALID},      // DESERET SMALL LETTER LONG I..OSMANYA LETTER
+	{0x1049E, 0x1049F, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x104A0, 0x104A9, propertyPVALID},      // OSMANYA DIGIT ZERO..OSMANYA DIGIT NINE
+	{0x104AA, 0x107FF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10800, 0x10805, propertyPVALID},      // CYPRIOT SYLLABLE A..CYPRIOT SYLLABLE JA
+	{0x10806, 0x10807, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10808, 0x0, propertyPVALID},          // CYPRIOT SYLLABLE JO
+	{0x10809, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x1080A, 0x10835, propertyPVALID},      // CYPRIOT SYLLABLE KA..CYPRIOT SYLLABLE WO
+	{0x10836, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x10837, 0x10838, propertyPVALID},      // CYPRIOT SYLLABLE XA..CYPRIOT SYLLABLE XE
+	{0x10839, 0x1083B, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1083C, 0x0, propertyPVALID},          // CYPRIOT SYLLABLE ZA
+	{0x1083D, 0x1083E, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1083F, 0x10855, propertyPVALID},      // CYPRIOT SYLLABLE ZO..IMPERIAL ARAMAIC LETTER
+	{0x10856, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x10857, 0x1085F, propertyDISALLOWED},  // IMPERIAL ARAMAIC SECTION SIGN..IMPERIAL ARAM
+	{0x10860, 0x108FF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10900, 0x10915, propertyPVALID},      // PHOENICIAN LETTER ALF..PHOENICIAN LETTER TAU
+	{0x10916, 0x1091B, propertyDISALLOWED},  // PHOENICIAN NUMBER ONE..PHOENICIAN NUMBER THR
+	{0x1091C, 0x1091E, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1091F, 0x0, propertyDISALLOWED},      // PHOENICIAN WORD SEPARATOR
+	{0x10920, 0x10939, propertyPVALID},      // LYDIAN LETTER A..LYDIAN LETTER C
+	{0x1093A, 0x1093E, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1093F, 0x0, propertyDISALLOWED},      // LYDIAN TRIANGULAR MARK
+	{0x10940, 0x109FF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10A00, 0x10A03, propertyPVALID},      // KHAROSHTHI LETTER A..KHAROSHTHI VOWEL SIGN V
+	{0x10A04, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x10A05, 0x10A06, propertyPVALID},      // KHAROSHTHI VOWEL SIGN E..KHAROSHTHI VOWEL SI
+	{0x10A07, 0x10A0B, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10A0C, 0x10A13, propertyPVALID},      // KHAROSHTHI VOWEL LENGTH MARK..KHAROSHTHI LET
+	{0x10A14, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x10A15, 0x10A17, propertyPVALID},      // KHAROSHTHI LETTER CA..KHAROSHTHI LETTER JA
+	{0x10A18, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x10A19, 0x10A33, propertyPVALID},      // KHAROSHTHI LETTER NYA..KHAROSHTHI LETTER TTT
+	{0x10A34, 0x10A37, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10A38, 0x10A3A, propertyPVALID},      // KHAROSHTHI SIGN BAR ABOVE..KHAROSHTHI SIGN D
+	{0x10A3B, 0x10A3E, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10A3F, 0x0, propertyPVALID},          // KHAROSHTHI VIRAMA
+	{0x10A40, 0x10A47, propertyDISALLOWED},  // KHAROSHTHI DIGIT ONE..KHAROSHTHI NUMBER ONE
+	{0x10A48, 0x10A4F, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10A50, 0x10A58, propertyDISALLOWED},  // KHAROSHTHI PUNCTUATION DOT..KHAROSHTHI PUNCT
+	{0x10A59, 0x10A5F, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10A60, 0x10A7C, propertyPVALID},      // OLD SOUTH ARABIAN LETTER HE..OLD SOUTH ARABI
+	{0x10A7D, 0x10A7F, propertyDISALLOWED},  // OLD SOUTH ARABIAN NUMBER ONE..OLD SOUTH ARAB
+	{0x10A80, 0x10AFF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10B00, 0x10B35, propertyPVALID},      // AVESTAN LETTER A..AVESTAN LETTER HE
+	{0x10B36, 0x10B38, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10B39, 0x10B3F, propertyDISALLOWED},  // AVESTAN ABBREVIATION MARK..LARGE ONE RING OV
+	{0x10B40, 0x10B55, propertyPVALID},      // INSCRIPTIONAL PARTHIAN LETTER ALEPH..INSCRIP
+	{0x10B56, 0x10B57, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10B58, 0x10B5F, propertyDISALLOWED},  // INSCRIPTIONAL PARTHIAN NUMBER ONE..INSCRIPTI
+	{0x10B60, 0x10B72, propertyPVALID},      // INSCRIPTIONAL PAHLAVI LETTER ALEPH..INSCRIPT
+	{0x10B73, 0x10B77, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10B78, 0x10B7F, propertyDISALLOWED},  // INSCRIPTIONAL PAHLAVI NUMBER ONE..INSCRIPTIO
+	{0x10B80, 0x10BFF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10C00, 0x10C48, propertyPVALID},      // OLD TURKIC LETTER ORKHON A..OLD TURKIC LETTE
+	{0x10C49, 0x10E5F, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x10E60, 0x10E7E, propertyDISALLOWED},  // RUMI DIGIT ONE..RUMI FRACTION TWO THIRDS
+	{0x10E7F, 0x1107F, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x11080, 0x110BA, propertyPVALID},      // KAITHI SIGN CANDRABINDU..KAITHI SIGN NUKTA
+	{0x110BB, 0x110C1, propertyDISALLOWED},  // KAITHI ABBREVIATION SIGN..KAITHI DOUBLE DAND
+	{0x110C2, 0x11FFF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x12000, 0x1236E, propertyPVALID},      // CUNEIFORM SIGN A..CUNEIFORM SIGN ZUM
+	{0x1236F, 0x123FF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x12400, 0x12462, propertyDISALLOWED},  // CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NU
+	{0x12463, 0x1246F, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x12470, 0x12473, propertyDISALLOWED},  // CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD
+	{0x12474, 0x12FFF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x13000, 0x1342E, propertyPVALID},      // EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYP
+	{0x1342F, 0x1CFFF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1D000, 0x1D0F5, propertyDISALLOWED},  // BYZANTINE MUSICAL SYMBOL PSILI..BYZANTINE MU
+	{0x1D0F6, 0x1D0FF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1D100, 0x1D126, propertyDISALLOWED},  // MUSICAL SYMBOL SINGLE BARLINE..MUSICAL SYMBO
+	{0x1D127, 0x1D128, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1D129, 0x1D1DD, propertyDISALLOWED},  // MUSICAL SYMBOL MULTIPLE MEASURE REST..MUSICA
+	{0x1D1DE, 0x1D1FF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1D200, 0x1D245, propertyDISALLOWED},  // GREEK VOCAL NOTATION SYMBOL-1..GREEK MUSICAL
+	{0x1D246, 0x1D2FF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1D300, 0x1D356, propertyDISALLOWED},  // MONOGRAM FOR EARTH..TETRAGRAM FOR FOSTERING
+	{0x1D357, 0x1D35F, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1D360, 0x1D371, propertyDISALLOWED},  // COUNTING ROD UNIT DIGIT ONE..COUNTING ROD TE
+	{0x1D372, 0x1D3FF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1D400, 0x1D454, propertyDISALLOWED},  // MATHEMATICAL BOLD CAPITAL A..MATHEMATICAL IT
+	{0x1D455, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x1D456, 0x1D49C, propertyDISALLOWED},  // MATHEMATICAL ITALIC SMALL I..MATHEMATICAL SC
+	{0x1D49D, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x1D49E, 0x1D49F, propertyDISALLOWED},  // MATHEMATICAL SCRIPT CAPITAL C..MATHEMATICAL
+	{0x1D4A0, 0x1D4A1, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1D4A2, 0x0, propertyDISALLOWED},      // MATHEMATICAL SCRIPT CAPITAL G
+	{0x1D4A3, 0x1D4A4, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1D4A5, 0x1D4A6, propertyDISALLOWED},  // MATHEMATICAL SCRIPT CAPITAL J..MATHEMATICAL
+	{0x1D4A7, 0x1D4A8, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1D4A9, 0x1D4AC, propertyDISALLOWED},  // MATHEMATICAL SCRIPT CAPITAL N..MATHEMATICAL
+	{0x1D4AD, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x1D4AE, 0x1D4B9, propertyDISALLOWED},  // MATHEMATICAL SCRIPT CAPITAL S..MATHEMATICAL
+	{0x1D4BA, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x1D4BB, 0x0, propertyDISALLOWED},      // MATHEMATICAL SCRIPT SMALL F
+	{0x1D4BC, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x1D4BD, 0x1D4C3, propertyDISALLOWED},  // MATHEMATICAL SCRIPT SMALL H..MATHEMATICAL SC
+	{0x1D4C4, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x1D4C5, 0x1D505, propertyDISALLOWED},  // MATHEMATICAL SCRIPT SMALL P..MATHEMATICAL FR
+	{0x1D506, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x1D507, 0x1D50A, propertyDISALLOWED},  // MATHEMATICAL FRAKTUR CAPITAL D..MATHEMATICAL
+	{0x1D50B, 0x1D50C, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1D50D, 0x1D514, propertyDISALLOWED},  // MATHEMATICAL FRAKTUR CAPITAL J..MATHEMATICAL
+	{0x1D515, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x1D516, 0x1D51C, propertyDISALLOWED},  // MATHEMATICAL FRAKTUR CAPITAL S..MATHEMATICAL
+	{0x1D51D, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x1D51E, 0x1D539, propertyDISALLOWED},  // MATHEMATICAL FRAKTUR SMALL A..MATHEMATICAL D
+	{0x1D53A, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x1D53B, 0x1D53E, propertyDISALLOWED},  // MATHEMATICAL DOUBLE-STRUCK CAPITAL D..MATHEM
+	{0x1D53F, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x1D540, 0x1D544, propertyDISALLOWED},  // MATHEMATICAL DOUBLE-STRUCK CAPITAL I..MATHEM
+	{0x1D545, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x1D546, 0x0, propertyDISALLOWED},      // MATHEMATICAL DOUBLE-STRUCK CAPITAL O
+	{0x1D547, 0x1D549, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1D54A, 0x1D550, propertyDISALLOWED},  // MATHEMATICAL DOUBLE-STRUCK CAPITAL S..MATHEM
+	{0x1D551, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x1D552, 0x1D6A5, propertyDISALLOWED},  // MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMAT
+	{0x1D6A6, 0x1D6A7, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1D6A8, 0x1D7CB, propertyDISALLOWED},  // MATHEMATICAL BOLD CAPITAL ALPHA..MATHEMATICA
+	{0x1D7CC, 0x1D7CD, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1D7CE, 0x1D7FF, propertyDISALLOWED},  // MATHEMATICAL BOLD DIGIT ZERO..MATHEMATICAL M
+	{0x1D800, 0x1EFFF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1F000, 0x1F02B, propertyDISALLOWED},  // MAHJONG TILE EAST WIND..MAHJONG TILE BACK
+	{0x1F02C, 0x1F02F, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1F030, 0x1F093, propertyDISALLOWED},  // DOMINO TILE HORIZONTAL BACK..DOMINO TILE VER
+	{0x1F094, 0x1F0FF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1F100, 0x1F10A, propertyDISALLOWED},  // DIGIT ZERO FULL STOP..DIGIT NINE COMMA
+	{0x1F10B, 0x1F10F, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1F110, 0x1F12E, propertyDISALLOWED},  // PARENTHESIZED LATIN CAPITAL LETTER A..CIRCLE
+	{0x1F12F, 0x1F130, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1F131, 0x0, propertyDISALLOWED},      // SQUARED LATIN CAPITAL LETTER B
+	{0x1F132, 0x1F13C, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1F13D, 0x0, propertyDISALLOWED},      // SQUARED LATIN CAPITAL LETTER N
+	{0x1F13E, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x1F13F, 0x0, propertyDISALLOWED},      // SQUARED LATIN CAPITAL LETTER P
+	{0x1F140, 0x1F141, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1F142, 0x0, propertyDISALLOWED},      // SQUARED LATIN CAPITAL LETTER S
+	{0x1F143, 0x1F145, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1F146, 0x0, propertyDISALLOWED},      // SQUARED LATIN CAPITAL LETTER W
+	{0x1F147, 0x1F149, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1F14A, 0x1F14E, propertyDISALLOWED},  // SQUARED HV..SQUARED PPV
+	{0x1F14F, 0x1F156, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1F157, 0x0, propertyDISALLOWED},      // NEGATIVE CIRCLED LATIN CAPITAL LETTER H
+	{0x1F158, 0x1F15E, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1F15F, 0x0, propertyDISALLOWED},      // NEGATIVE CIRCLED LATIN CAPITAL LETTER P
+	{0x1F160, 0x1F178, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1F179, 0x0, propertyDISALLOWED},      // NEGATIVE SQUARED LATIN CAPITAL LETTER J
+	{0x1F17A, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0x1F17B, 0x1F17C, propertyDISALLOWED},  // NEGATIVE SQUARED LATIN CAPITAL LETTER L..NEG
+	{0x1F17D, 0x1F17E, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1F17F, 0x0, propertyDISALLOWED},      // NEGATIVE SQUARED LATIN CAPITAL LETTER P
+	{0x1F180, 0x1F189, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1F18A, 0x1F18D, propertyDISALLOWED},  // CROSSED NEGATIVE SQUARED LATIN CAPITAL LETTE
+	{0x1F18E, 0x1F18F, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1F190, 0x0, propertyDISALLOWED},      // SQUARE DJ
+	{0x1F191, 0x1F1FF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1F200, 0x0, propertyDISALLOWED},      // SQUARE HIRAGANA HOKA
+	{0x1F201, 0x1F20F, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1F210, 0x1F231, propertyDISALLOWED},  // SQUARED CJK UNIFIED IDEOGRAPH-624B..SQUARED
+	{0x1F232, 0x1F23F, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1F240, 0x1F248, propertyDISALLOWED},  // TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRA
+	{0x1F249, 0x1FFFD, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x1FFFE, 0x1FFFF, propertyDISALLOWED},  // <noncharacter>..<noncharacter>
+	{0x20000, 0x2A6D6, propertyPVALID},      // <CJK Ideograph Extension B>..<CJK Ideograph
+	{0x2A6D7, 0x2A6FF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x2A700, 0x2B734, propertyPVALID},      // <CJK Ideograph Extension C>..<CJK Ideograph
+	{0x2B735, 0x2F7FF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x2F800, 0x2FA1D, propertyDISALLOWED},  // CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPA
+	{0x2FA1E, 0x2FFFD, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x2FFFE, 0x2FFFF, propertyDISALLOWED},  // <noncharacter>..<noncharacter>
+	{0x30000, 0x3FFFD, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x3FFFE, 0x3FFFF, propertyDISALLOWED},  // <noncharacter>..<noncharacter>
+	{0x40000, 0x4FFFD, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x4FFFE, 0x4FFFF, propertyDISALLOWED},  // <noncharacter>..<noncharacter>
+	{0x50000, 0x5FFFD, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x5FFFE, 0x5FFFF, propertyDISALLOWED},  // <noncharacter>..<noncharacter>
+	{0x60000, 0x6FFFD, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x6FFFE, 0x6FFFF, propertyDISALLOWED},  // <noncharacter>..<noncharacter>
+	{0x70000, 0x7FFFD, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x7FFFE, 0x7FFFF, propertyDISALLOWED},  // <noncharacter>..<noncharacter>
+	{0x80000, 0x8FFFD, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x8FFFE, 0x8FFFF, propertyDISALLOWED},  // <noncharacter>..<noncharacter>
+	{0x90000, 0x9FFFD, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0x9FFFE, 0x9FFFF, propertyDISALLOWED},  // <noncharacter>..<noncharacter>
+	{0xA0000, 0xAFFFD, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0xAFFFE, 0xAFFFF, propertyDISALLOWED},  // <noncharacter>..<noncharacter>
+	{0xB0000, 0xBFFFD, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0xBFFFE, 0xBFFFF, propertyDISALLOWED},  // <noncharacter>..<noncharacter>
+	{0xC0000, 0xCFFFD, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0xCFFFE, 0xCFFFF, propertyDISALLOWED},  // <noncharacter>..<noncharacter>
+	{0xD0000, 0xDFFFD, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0xDFFFE, 0xDFFFF, propertyDISALLOWED},  // <noncharacter>..<noncharacter>
+	{0xE0000, 0x0, propertyUNASSIGNED},      // <reserved>
+	{0xE0001, 0x0, propertyDISALLOWED},      // LANGUAGE TAG
+	{0xE0002, 0xE001F, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0xE0020, 0xE007F, propertyDISALLOWED},  // TAG SPACE..CANCEL TAG
+	{0xE0080, 0xE00FF, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0xE0100, 0xE01EF, propertyDISALLOWED},  // VARIATION SELECTOR-17..VARIATION SELECTOR-25
+	{0xE01F0, 0xEFFFD, propertyUNASSIGNED},  // <reserved>..<reserved>
+	{0xEFFFE, 0x10FFFF, propertyDISALLOWED}, // <noncharacter>..<noncharacter>
+}
diff --git a/vendor/github.com/miekg/dns/idn/example_test.go b/vendor/github.com/miekg/dns/idn/example_test.go
new file mode 100644
index 0000000000..8833cd91de
--- /dev/null
+++ b/vendor/github.com/miekg/dns/idn/example_test.go
@@ -0,0 +1,18 @@
+package idn_test
+
+import (
+	"fmt"
+	"github.com/miekg/dns/idn"
+)
+
+func ExampleToPunycode() {
+	name := "インターネット.テスト"
+	fmt.Printf("%s -> %s", name, idn.ToPunycode(name))
+	// Output: インターネット.テスト -> xn--eckucmux0ukc.xn--zckzah
+}
+
+func ExampleFromPunycode() {
+	name := "xn--mgbaja8a1hpac.xn--mgbachtv"
+	fmt.Printf("%s -> %s", name, idn.FromPunycode(name))
+	// Output: xn--mgbaja8a1hpac.xn--mgbachtv -> الانترنت.اختبار
+}
diff --git a/vendor/github.com/miekg/dns/idn/punycode.go b/vendor/github.com/miekg/dns/idn/punycode.go
new file mode 100644
index 0000000000..1d03bf6ae6
--- /dev/null
+++ b/vendor/github.com/miekg/dns/idn/punycode.go
@@ -0,0 +1,370 @@
+// Package idn implements encoding from and to punycode as speficied by RFC 3492.
+package idn
+
+import (
+	"bytes"
+	"strings"
+	"unicode"
+	"unicode/utf8"
+
+	"github.com/miekg/dns"
+)
+
+// Implementation idea from RFC itself and from from IDNA::Punycode created by
+// Tatsuhiko Miyagawa <miyagawa@bulknews.net> and released under Perl Artistic
+// License in 2002.
+
+const (
+	_MIN  rune = 1
+	_MAX  rune = 26
+	_SKEW rune = 38
+	_BASE rune = 36
+	_BIAS rune = 72
+	_N    rune = 128
+	_DAMP rune = 700
+
+	_DELIMITER = '-'
+	_PREFIX    = "xn--"
+)
+
+// ToPunycode converts unicode domain names to DNS-appropriate punycode names.
+// This function will return an empty string result for domain names with
+// invalid unicode strings. This function expects domain names in lowercase.
+func ToPunycode(s string) string {
+	// Early check to see if encoding is needed.
+	// This will prevent making heap allocations when not needed.
+	if !needToPunycode(s) {
+		return s
+	}
+
+	tokens := dns.SplitDomainName(s)
+	switch {
+	case s == "":
+		return ""
+	case tokens == nil: // s == .
+		return "."
+	case s[len(s)-1] == '.':
+		tokens = append(tokens, "")
+	}
+
+	for i := range tokens {
+		t := encode([]byte(tokens[i]))
+		if t == nil {
+			return ""
+		}
+		tokens[i] = string(t)
+	}
+	return strings.Join(tokens, ".")
+}
+
+// FromPunycode returns unicode domain name from provided punycode string.
+// This function expects punycode strings in lowercase.
+func FromPunycode(s string) string {
+	// Early check to see if decoding is needed.
+	// This will prevent making heap allocations when not needed.
+	if !needFromPunycode(s) {
+		return s
+	}
+
+	tokens := dns.SplitDomainName(s)
+	switch {
+	case s == "":
+		return ""
+	case tokens == nil: // s == .
+		return "."
+	case s[len(s)-1] == '.':
+		tokens = append(tokens, "")
+	}
+	for i := range tokens {
+		tokens[i] = string(decode([]byte(tokens[i])))
+	}
+	return strings.Join(tokens, ".")
+}
+
+// digitval converts single byte into meaningful value that's used to calculate decoded unicode character.
+const errdigit = 0xffff
+
+func digitval(code rune) rune {
+	switch {
+	case code >= 'A' && code <= 'Z':
+		return code - 'A'
+	case code >= 'a' && code <= 'z':
+		return code - 'a'
+	case code >= '0' && code <= '9':
+		return code - '0' + 26
+	}
+	return errdigit
+}
+
+// lettercode finds BASE36 byte (a-z0-9) based on calculated number.
+func lettercode(digit rune) rune {
+	switch {
+	case digit >= 0 && digit <= 25:
+		return digit + 'a'
+	case digit >= 26 && digit <= 36:
+		return digit - 26 + '0'
+	}
+	panic("dns: not reached")
+}
+
+// adapt calculates next bias to be used for next iteration delta.
+func adapt(delta rune, numpoints int, firsttime bool) rune {
+	if firsttime {
+		delta /= _DAMP
+	} else {
+		delta /= 2
+	}
+
+	var k rune
+	for delta = delta + delta/rune(numpoints); delta > (_BASE-_MIN)*_MAX/2; k += _BASE {
+		delta /= _BASE - _MIN
+	}
+
+	return k + ((_BASE-_MIN+1)*delta)/(delta+_SKEW)
+}
+
+// next finds minimal rune (one with lowest codepoint value) that should be equal or above boundary.
+func next(b []rune, boundary rune) rune {
+	if len(b) == 0 {
+		panic("dns: invalid set of runes to determine next one")
+	}
+	m := b[0]
+	for _, x := range b[1:] {
+		if x >= boundary && (m < boundary || x < m) {
+			m = x
+		}
+	}
+	return m
+}
+
+// preprune converts unicode rune to lower case. At this time it's not
+// supporting all things described in RFCs.
+func preprune(r rune) rune {
+	if unicode.IsUpper(r) {
+		r = unicode.ToLower(r)
+	}
+	return r
+}
+
+// tfunc is a function that helps calculate each character weight.
+func tfunc(k, bias rune) rune {
+	switch {
+	case k <= bias:
+		return _MIN
+	case k >= bias+_MAX:
+		return _MAX
+	}
+	return k - bias
+}
+
+// needToPunycode returns true for strings that require punycode encoding
+// (contain unicode characters).
+func needToPunycode(s string) bool {
+	// This function is very similar to bytes.Runes. We don't use bytes.Runes
+	// because it makes a heap allocation that's not needed here.
+	for i := 0; len(s) > 0; i++ {
+		r, l := utf8.DecodeRuneInString(s)
+		if r > 0x7f {
+			return true
+		}
+		s = s[l:]
+	}
+	return false
+}
+
+// needFromPunycode returns true for strings that require punycode decoding.
+func needFromPunycode(s string) bool {
+	if s == "." {
+		return false
+	}
+
+	off := 0
+	end := false
+	pl := len(_PREFIX)
+	sl := len(s)
+
+	// If s starts with _PREFIX.
+	if sl > pl && s[off:off+pl] == _PREFIX {
+		return true
+	}
+
+	for {
+		// Find the part after the next ".".
+		off, end = dns.NextLabel(s, off)
+		if end {
+			return false
+		}
+		// If this parts starts with _PREFIX.
+		if sl-off > pl && s[off:off+pl] == _PREFIX {
+			return true
+		}
+	}
+}
+
+// encode transforms Unicode input bytes (that represent DNS label) into
+// punycode bytestream. This function would return nil if there's an invalid
+// character in the label.
+func encode(input []byte) []byte {
+	n, bias := _N, _BIAS
+
+	b := bytes.Runes(input)
+	for i := range b {
+		if !isValidRune(b[i]) {
+			return nil
+		}
+
+		b[i] = preprune(b[i])
+	}
+
+	basic := make([]byte, 0, len(b))
+	for _, ltr := range b {
+		if ltr <= 0x7f {
+			basic = append(basic, byte(ltr))
+		}
+	}
+	basiclen := len(basic)
+	fulllen := len(b)
+	if basiclen == fulllen {
+		return basic
+	}
+
+	var out bytes.Buffer
+
+	out.WriteString(_PREFIX)
+	if basiclen > 0 {
+		out.Write(basic)
+		out.WriteByte(_DELIMITER)
+	}
+
+	var (
+		ltr, nextltr rune
+		delta, q     rune // delta calculation (see rfc)
+		t, k, cp     rune // weight and codepoint calculation
+	)
+
+	for h := basiclen; h < fulllen; n, delta = n+1, delta+1 {
+		nextltr = next(b, n)
+		delta, n = delta+(nextltr-n)*rune(h+1), nextltr
+
+		for _, ltr = range b {
+			if ltr < n {
+				delta++
+			}
+			if ltr == n {
+				q = delta
+				for k = _BASE; ; k += _BASE {
+					t = tfunc(k, bias)
+					if q < t {
+						break
+					}
+					cp = t + ((q - t) % (_BASE - t))
+					out.WriteRune(lettercode(cp))
+					q = (q - t) / (_BASE - t)
+				}
+
+				out.WriteRune(lettercode(q))
+
+				bias = adapt(delta, h+1, h == basiclen)
+				h, delta = h+1, 0
+			}
+		}
+	}
+	return out.Bytes()
+}
+
+// decode transforms punycode input bytes (that represent DNS label) into Unicode bytestream.
+func decode(b []byte) []byte {
+	src := b // b would move and we need to keep it
+
+	n, bias := _N, _BIAS
+	if !bytes.HasPrefix(b, []byte(_PREFIX)) {
+		return b
+	}
+	out := make([]rune, 0, len(b))
+	b = b[len(_PREFIX):]
+	for pos := len(b) - 1; pos >= 0; pos-- {
+		// only last delimiter is our interest
+		if b[pos] == _DELIMITER {
+			out = append(out, bytes.Runes(b[:pos])...)
+			b = b[pos+1:] // trim source string
+			break
+		}
+	}
+	if len(b) == 0 {
+		return src
+	}
+	var (
+		i, oldi, w rune
+		ch         byte
+		t, digit   rune
+		ln         int
+	)
+
+	for i = 0; len(b) > 0; i++ {
+		oldi, w = i, 1
+		for k := _BASE; len(b) > 0; k += _BASE {
+			ch, b = b[0], b[1:]
+			digit = digitval(rune(ch))
+			if digit == errdigit {
+				return src
+			}
+			i += digit * w
+			if i < 0 {
+				// safety check for rune overflow
+				return src
+			}
+
+			t = tfunc(k, bias)
+			if digit < t {
+				break
+			}
+
+			w *= _BASE - t
+		}
+		ln = len(out) + 1
+		bias = adapt(i-oldi, ln, oldi == 0)
+		n += i / rune(ln)
+		i = i % rune(ln)
+		// insert
+		out = append(out, 0)
+		copy(out[i+1:], out[i:])
+		out[i] = n
+	}
+
+	var ret bytes.Buffer
+	for _, r := range out {
+		ret.WriteRune(r)
+	}
+	return ret.Bytes()
+}
+
+// isValidRune checks if the character is valid. We will look for the
+// character property in the code points list. For now we aren't checking special
+// rules in case of contextual property
+func isValidRune(r rune) bool {
+	return findProperty(r) == propertyPVALID
+}
+
+// findProperty will try to check the code point property of the given
+// character. It will use a binary search algorithm as we have a slice of
+// ordered ranges (average case performance O(log n))
+func findProperty(r rune) property {
+	imin, imax := 0, len(codePoints)
+
+	for imax >= imin {
+		imid := (imin + imax) / 2
+
+		codePoint := codePoints[imid]
+		if (codePoint.start == r && codePoint.end == 0) || (codePoint.start <= r && codePoint.end >= r) {
+			return codePoint.state
+		}
+
+		if (codePoint.end > 0 && codePoint.end < r) || (codePoint.end == 0 && codePoint.start < r) {
+			imin = imid + 1
+		} else {
+			imax = imid - 1
+		}
+	}
+
+	return propertyUnknown
+}
diff --git a/vendor/github.com/miekg/dns/idn/punycode_test.go b/vendor/github.com/miekg/dns/idn/punycode_test.go
new file mode 100644
index 0000000000..9c9a15f0ba
--- /dev/null
+++ b/vendor/github.com/miekg/dns/idn/punycode_test.go
@@ -0,0 +1,116 @@
+package idn
+
+import (
+	"strings"
+	"testing"
+)
+
+var testcases = [][2]string{
+	{"", ""},
+	{"a", "a"},
+	{"a-b", "a-b"},
+	{"a-b-c", "a-b-c"},
+	{"abc", "abc"},
+	{"я", "xn--41a"},
+	{"zя", "xn--z-0ub"},
+	{"яZ", "xn--z-zub"},
+	{"а-я", "xn----7sb8g"},
+	{"إختبار", "xn--kgbechtv"},
+	{"آزمایشی", "xn--hgbk6aj7f53bba"},
+	{"测试", "xn--0zwm56d"},
+	{"測試", "xn--g6w251d"},
+	{"испытание", "xn--80akhbyknj4f"},
+	{"परीक्षा", "xn--11b5bs3a9aj6g"},
+	{"δοκιμή", "xn--jxalpdlp"},
+	{"테스트", "xn--9t4b11yi5a"},
+	{"טעסט", "xn--deba0ad"},
+	{"テスト", "xn--zckzah"},
+	{"பரிட்சை", "xn--hlcj6aya9esc7a"},
+	{"mamão-com-açúcar", "xn--mamo-com-acar-yeb1e6q"},
+	{"σ", "xn--4xa"},
+}
+
+func TestEncodeDecodePunycode(t *testing.T) {
+	for _, tst := range testcases {
+		enc := encode([]byte(tst[0]))
+		if string(enc) != tst[1] {
+			t.Errorf("%s encodeded as %s but should be %s", tst[0], enc, tst[1])
+		}
+		dec := decode([]byte(tst[1]))
+		if string(dec) != strings.ToLower(tst[0]) {
+			t.Errorf("%s decoded as %s but should be %s", tst[1], dec, strings.ToLower(tst[0]))
+		}
+	}
+}
+
+func TestToFromPunycode(t *testing.T) {
+	for _, tst := range testcases {
+		// assert unicode.com == punycode.com
+		full := ToPunycode(tst[0] + ".com")
+		if full != tst[1]+".com" {
+			t.Errorf("invalid result from string conversion to punycode, %s and should be %s.com", full, tst[1])
+		}
+		// assert punycode.punycode == unicode.unicode
+		decoded := FromPunycode(tst[1] + "." + tst[1])
+		if decoded != strings.ToLower(tst[0]+"."+tst[0]) {
+			t.Errorf("invalid result from string conversion to punycode, %s and should be %s.%s", decoded, tst[0], tst[0])
+		}
+	}
+}
+
+func TestEncodeDecodeFinalPeriod(t *testing.T) {
+	for _, tst := range testcases {
+		// assert unicode.com. == punycode.com.
+		full := ToPunycode(tst[0] + ".")
+		if full != tst[1]+"." {
+			t.Errorf("invalid result from string conversion to punycode when period added at the end, %#v and should be %#v", full, tst[1]+".")
+		}
+		// assert punycode.com. == unicode.com.
+		decoded := FromPunycode(tst[1] + ".")
+		if decoded != strings.ToLower(tst[0]+".") {
+			t.Errorf("invalid result from string conversion to punycode when period added, %#v and should be %#v", decoded, tst[0]+".")
+		}
+		full = ToPunycode(tst[0])
+		if full != tst[1] {
+			t.Errorf("invalid result from string conversion to punycode when no period added at the end, %#v and should be %#v", full, tst[1]+".")
+		}
+		// assert punycode.com. == unicode.com.
+		decoded = FromPunycode(tst[1])
+		if decoded != strings.ToLower(tst[0]) {
+			t.Errorf("invalid result from string conversion to punycode when no period added, %#v and should be %#v", decoded, tst[0]+".")
+		}
+	}
+}
+
+var invalidACEs = []string{
+	"xn--*",
+	"xn--",
+	"xn---",
+	"xn--a000000000",
+}
+
+func TestInvalidPunycode(t *testing.T) {
+	for _, d := range invalidACEs {
+		s := FromPunycode(d)
+		if s != d {
+			t.Errorf("Changed invalid name %s to %#v", d, s)
+		}
+	}
+}
+
+// You can verify the labels that are valid or not comparing to the Verisign
+// website: http://mct.verisign-grs.com/
+var invalidUnicodes = []string{
+	"Σ",
+	"ЯZ",
+	"Испытание",
+}
+
+func TestInvalidUnicodes(t *testing.T) {
+	for _, d := range invalidUnicodes {
+		s := ToPunycode(d)
+		if s != "" {
+			t.Errorf("Changed invalid name %s to %#v", d, s)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/dns/issue_test.go b/vendor/github.com/miekg/dns/issue_test.go
new file mode 100644
index 0000000000..3025fc98cb
--- /dev/null
+++ b/vendor/github.com/miekg/dns/issue_test.go
@@ -0,0 +1,23 @@
+package dns
+
+// Tests that solve that an specific issue.
+
+import "testing"
+
+func TestTCPRtt(t *testing.T) {
+	m := new(Msg)
+	m.RecursionDesired = true
+	m.SetQuestion("example.org.", TypeA)
+
+	c := &Client{}
+	for _, proto := range []string{"udp", "tcp"} {
+		c.Net = proto
+		_, rtt, err := c.Exchange(m, "8.8.4.4:53")
+		if err != nil {
+			t.Fatal(err)
+		}
+		if rtt == 0 {
+			t.Fatalf("expecting non zero rtt %s, got zero", c.Net)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/dns/labels.go b/vendor/github.com/miekg/dns/labels.go
new file mode 100644
index 0000000000..fca5c7dd2d
--- /dev/null
+++ b/vendor/github.com/miekg/dns/labels.go
@@ -0,0 +1,168 @@
+package dns
+
+// Holds a bunch of helper functions for dealing with labels.
+
+// SplitDomainName splits a name string into it's labels.
+// www.miek.nl. returns []string{"www", "miek", "nl"}
+// .www.miek.nl. returns []string{"", "www", "miek", "nl"},
+// The root label (.) returns nil. Note that using
+// strings.Split(s) will work in most cases, but does not handle
+// escaped dots (\.) for instance.
+// s must be a syntactically valid domain name, see IsDomainName.
+func SplitDomainName(s string) (labels []string) {
+	if len(s) == 0 {
+		return nil
+	}
+	fqdnEnd := 0 // offset of the final '.' or the length of the name
+	idx := Split(s)
+	begin := 0
+	if s[len(s)-1] == '.' {
+		fqdnEnd = len(s) - 1
+	} else {
+		fqdnEnd = len(s)
+	}
+
+	switch len(idx) {
+	case 0:
+		return nil
+	case 1:
+		// no-op
+	default:
+		end := 0
+		for i := 1; i < len(idx); i++ {
+			end = idx[i]
+			labels = append(labels, s[begin:end-1])
+			begin = end
+		}
+	}
+
+	labels = append(labels, s[begin:fqdnEnd])
+	return labels
+}
+
+// CompareDomainName compares the names s1 and s2 and
+// returns how many labels they have in common starting from the *right*.
+// The comparison stops at the first inequality. The names are not downcased
+// before the comparison.
+//
+// www.miek.nl. and miek.nl. have two labels in common: miek and nl
+// www.miek.nl. and www.bla.nl. have one label in common: nl
+//
+// s1 and s2 must be syntactically valid domain names.
+func CompareDomainName(s1, s2 string) (n int) {
+	s1 = Fqdn(s1)
+	s2 = Fqdn(s2)
+	l1 := Split(s1)
+	l2 := Split(s2)
+
+	// the first check: root label
+	if l1 == nil || l2 == nil {
+		return
+	}
+
+	j1 := len(l1) - 1 // end
+	i1 := len(l1) - 2 // start
+	j2 := len(l2) - 1
+	i2 := len(l2) - 2
+	// the second check can be done here: last/only label
+	// before we fall through into the for-loop below
+	if s1[l1[j1]:] == s2[l2[j2]:] {
+		n++
+	} else {
+		return
+	}
+	for {
+		if i1 < 0 || i2 < 0 {
+			break
+		}
+		if s1[l1[i1]:l1[j1]] == s2[l2[i2]:l2[j2]] {
+			n++
+		} else {
+			break
+		}
+		j1--
+		i1--
+		j2--
+		i2--
+	}
+	return
+}
+
+// CountLabel counts the the number of labels in the string s.
+// s must be a syntactically valid domain name.
+func CountLabel(s string) (labels int) {
+	if s == "." {
+		return
+	}
+	off := 0
+	end := false
+	for {
+		off, end = NextLabel(s, off)
+		labels++
+		if end {
+			return
+		}
+	}
+}
+
+// Split splits a name s into its label indexes.
+// www.miek.nl. returns []int{0, 4, 9}, www.miek.nl also returns []int{0, 4, 9}.
+// The root name (.) returns nil. Also see SplitDomainName.
+// s must be a syntactically valid domain name.
+func Split(s string) []int {
+	if s == "." {
+		return nil
+	}
+	idx := make([]int, 1, 3)
+	off := 0
+	end := false
+
+	for {
+		off, end = NextLabel(s, off)
+		if end {
+			return idx
+		}
+		idx = append(idx, off)
+	}
+}
+
+// NextLabel returns the index of the start of the next label in the
+// string s starting at offset.
+// The bool end is true when the end of the string has been reached.
+// Also see PrevLabel.
+func NextLabel(s string, offset int) (i int, end bool) {
+	quote := false
+	for i = offset; i < len(s)-1; i++ {
+		switch s[i] {
+		case '\\':
+			quote = !quote
+		default:
+			quote = false
+		case '.':
+			if quote {
+				quote = !quote
+				continue
+			}
+			return i + 1, false
+		}
+	}
+	return i + 1, true
+}
+
+// PrevLabel returns the index of the label when starting from the right and
+// jumping n labels to the left.
+// The bool start is true when the start of the string has been overshot.
+// Also see NextLabel.
+func PrevLabel(s string, n int) (i int, start bool) {
+	if n == 0 {
+		return len(s), false
+	}
+	lab := Split(s)
+	if lab == nil {
+		return 0, true
+	}
+	if n > len(lab) {
+		return 0, true
+	}
+	return lab[len(lab)-n], false
+}
diff --git a/vendor/github.com/miekg/dns/labels_test.go b/vendor/github.com/miekg/dns/labels_test.go
new file mode 100644
index 0000000000..536757d52f
--- /dev/null
+++ b/vendor/github.com/miekg/dns/labels_test.go
@@ -0,0 +1,200 @@
+package dns
+
+import "testing"
+
+func TestCompareDomainName(t *testing.T) {
+	s1 := "www.miek.nl."
+	s2 := "miek.nl."
+	s3 := "www.bla.nl."
+	s4 := "nl.www.bla."
+	s5 := "nl"
+	s6 := "miek.nl"
+
+	if CompareDomainName(s1, s2) != 2 {
+		t.Errorf("%s with %s should be %d", s1, s2, 2)
+	}
+	if CompareDomainName(s1, s3) != 1 {
+		t.Errorf("%s with %s should be %d", s1, s3, 1)
+	}
+	if CompareDomainName(s3, s4) != 0 {
+		t.Errorf("%s with %s should be %d", s3, s4, 0)
+	}
+	// Non qualified tests
+	if CompareDomainName(s1, s5) != 1 {
+		t.Errorf("%s with %s should be %d", s1, s5, 1)
+	}
+	if CompareDomainName(s1, s6) != 2 {
+		t.Errorf("%s with %s should be %d", s1, s5, 2)
+	}
+
+	if CompareDomainName(s1, ".") != 0 {
+		t.Errorf("%s with %s should be %d", s1, s5, 0)
+	}
+	if CompareDomainName(".", ".") != 0 {
+		t.Errorf("%s with %s should be %d", ".", ".", 0)
+	}
+}
+
+func TestSplit(t *testing.T) {
+	splitter := map[string]int{
+		"www.miek.nl.":   3,
+		"www.miek.nl":    3,
+		"www..miek.nl":   4,
+		`www\.miek.nl.`:  2,
+		`www\\.miek.nl.`: 3,
+		".":              0,
+		"nl.":            1,
+		"nl":             1,
+		"com.":           1,
+		".com.":          2,
+	}
+	for s, i := range splitter {
+		if x := len(Split(s)); x != i {
+			t.Errorf("labels should be %d, got %d: %s %v", i, x, s, Split(s))
+		} else {
+			t.Logf("%s %v", s, Split(s))
+		}
+	}
+}
+
+func TestSplit2(t *testing.T) {
+	splitter := map[string][]int{
+		"www.miek.nl.": {0, 4, 9},
+		"www.miek.nl":  {0, 4, 9},
+		"nl":           {0},
+	}
+	for s, i := range splitter {
+		x := Split(s)
+		switch len(i) {
+		case 1:
+			if x[0] != i[0] {
+				t.Errorf("labels should be %v, got %v: %s", i, x, s)
+			}
+		default:
+			if x[0] != i[0] || x[1] != i[1] || x[2] != i[2] {
+				t.Errorf("labels should be %v, got %v: %s", i, x, s)
+			}
+		}
+	}
+}
+
+func TestPrevLabel(t *testing.T) {
+	type prev struct {
+		string
+		int
+	}
+	prever := map[prev]int{
+		prev{"www.miek.nl.", 0}: 12,
+		prev{"www.miek.nl.", 1}: 9,
+		prev{"www.miek.nl.", 2}: 4,
+
+		prev{"www.miek.nl", 0}: 11,
+		prev{"www.miek.nl", 1}: 9,
+		prev{"www.miek.nl", 2}: 4,
+
+		prev{"www.miek.nl.", 5}: 0,
+		prev{"www.miek.nl", 5}:  0,
+
+		prev{"www.miek.nl.", 3}: 0,
+		prev{"www.miek.nl", 3}:  0,
+	}
+	for s, i := range prever {
+		x, ok := PrevLabel(s.string, s.int)
+		if i != x {
+			t.Errorf("label should be %d, got %d, %t: preving %d, %s", i, x, ok, s.int, s.string)
+		}
+	}
+}
+
+func TestCountLabel(t *testing.T) {
+	splitter := map[string]int{
+		"www.miek.nl.": 3,
+		"www.miek.nl":  3,
+		"nl":           1,
+		".":            0,
+	}
+	for s, i := range splitter {
+		x := CountLabel(s)
+		if x != i {
+			t.Errorf("CountLabel should have %d, got %d", i, x)
+		}
+	}
+}
+
+func TestSplitDomainName(t *testing.T) {
+	labels := map[string][]string{
+		"miek.nl":       {"miek", "nl"},
+		".":             nil,
+		"www.miek.nl.":  {"www", "miek", "nl"},
+		"www.miek.nl":   {"www", "miek", "nl"},
+		"www..miek.nl":  {"www", "", "miek", "nl"},
+		`www\.miek.nl`:  {`www\.miek`, "nl"},
+		`www\\.miek.nl`: {`www\\`, "miek", "nl"},
+		".www.miek.nl.": {"", "www", "miek", "nl"},
+	}
+domainLoop:
+	for domain, splits := range labels {
+		parts := SplitDomainName(domain)
+		if len(parts) != len(splits) {
+			t.Errorf("SplitDomainName returned %v for %s, expected %v", parts, domain, splits)
+			continue domainLoop
+		}
+		for i := range parts {
+			if parts[i] != splits[i] {
+				t.Errorf("SplitDomainName returned %v for %s, expected %v", parts, domain, splits)
+				continue domainLoop
+			}
+		}
+	}
+}
+
+func TestIsDomainName(t *testing.T) {
+	type ret struct {
+		ok  bool
+		lab int
+	}
+	names := map[string]*ret{
+		"..":               {false, 1},
+		"@.":               {true, 1},
+		"www.example.com":  {true, 3},
+		"www.e%ample.com":  {true, 3},
+		"www.example.com.": {true, 3},
+		"mi\\k.nl.":        {true, 2},
+		"mi\\k.nl":         {true, 2},
+	}
+	for d, ok := range names {
+		l, k := IsDomainName(d)
+		if ok.ok != k || ok.lab != l {
+			t.Errorf(" got %v %d for %s ", k, l, d)
+			t.Errorf("have %v %d for %s ", ok.ok, ok.lab, d)
+		}
+	}
+}
+
+func BenchmarkSplitLabels(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		Split("www.example.com")
+	}
+}
+
+func BenchmarkLenLabels(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		CountLabel("www.example.com")
+	}
+}
+
+func BenchmarkCompareLabels(b *testing.B) {
+	b.ReportAllocs()
+	for i := 0; i < b.N; i++ {
+		CompareDomainName("www.example.com", "aa.example.com")
+	}
+}
+
+func BenchmarkIsSubDomain(b *testing.B) {
+	b.ReportAllocs()
+	for i := 0; i < b.N; i++ {
+		IsSubDomain("www.example.com", "aa.example.com")
+		IsSubDomain("example.com", "aa.example.com")
+		IsSubDomain("miek.nl", "aa.example.com")
+	}
+}
diff --git a/vendor/github.com/miekg/dns/msg.go b/vendor/github.com/miekg/dns/msg.go
new file mode 100644
index 0000000000..57262a10c0
--- /dev/null
+++ b/vendor/github.com/miekg/dns/msg.go
@@ -0,0 +1,1143 @@
+// DNS packet assembly, see RFC 1035. Converting from - Unpack() -
+// and to - Pack() - wire format.
+// All the packers and unpackers take a (msg []byte, off int)
+// and return (off1 int, ok bool).  If they return ok==false, they
+// also return off1==len(msg), so that the next unpacker will
+// also fail.  This lets us avoid checks of ok until the end of a
+// packing sequence.
+
+package dns
+
+//go:generate go run msg_generate.go
+//go:generate go run compress_generate.go
+
+import (
+	crand "crypto/rand"
+	"encoding/binary"
+	"math/big"
+	"math/rand"
+	"strconv"
+	"sync"
+)
+
+const maxCompressionOffset = 2 << 13 // We have 14 bits for the compression pointer
+
+var (
+	ErrAlg           error = &Error{err: "bad algorithm"}                  // ErrAlg indicates an error with the (DNSSEC) algorithm.
+	ErrAuth          error = &Error{err: "bad authentication"}             // ErrAuth indicates an error in the TSIG authentication.
+	ErrBuf           error = &Error{err: "buffer size too small"}          // ErrBuf indicates that the buffer used it too small for the message.
+	ErrConnEmpty     error = &Error{err: "conn has no connection"}         // ErrConnEmpty indicates a connection is being uses before it is initialized.
+	ErrExtendedRcode error = &Error{err: "bad extended rcode"}             // ErrExtendedRcode ...
+	ErrFqdn          error = &Error{err: "domain must be fully qualified"} // ErrFqdn indicates that a domain name does not have a closing dot.
+	ErrId            error = &Error{err: "id mismatch"}                    // ErrId indicates there is a mismatch with the message's ID.
+	ErrKeyAlg        error = &Error{err: "bad key algorithm"}              // ErrKeyAlg indicates that the algorithm in the key is not valid.
+	ErrKey           error = &Error{err: "bad key"}
+	ErrKeySize       error = &Error{err: "bad key size"}
+	ErrNoSig         error = &Error{err: "no signature found"}
+	ErrPrivKey       error = &Error{err: "bad private key"}
+	ErrRcode         error = &Error{err: "bad rcode"}
+	ErrRdata         error = &Error{err: "bad rdata"}
+	ErrRRset         error = &Error{err: "bad rrset"}
+	ErrSecret        error = &Error{err: "no secrets defined"}
+	ErrShortRead     error = &Error{err: "short read"}
+	ErrSig           error = &Error{err: "bad signature"}                      // ErrSig indicates that a signature can not be cryptographically validated.
+	ErrSoa           error = &Error{err: "no SOA"}                             // ErrSOA indicates that no SOA RR was seen when doing zone transfers.
+	ErrTime          error = &Error{err: "bad time"}                           // ErrTime indicates a timing error in TSIG authentication.
+	ErrTruncated     error = &Error{err: "failed to unpack truncated message"} // ErrTruncated indicates that we failed to unpack a truncated message. We unpacked as much as we had so Msg can still be used, if desired.
+)
+
+// Id by default, returns a 16 bits random number to be used as a
+// message id. The random provided should be good enough. This being a
+// variable the function can be reassigned to a custom function.
+// For instance, to make it return a static value:
+//
+//	dns.Id = func() uint16 { return 3 }
+var Id func() uint16 = id
+
+var (
+	idLock sync.Mutex
+	idRand *rand.Rand
+)
+
+// id returns a 16 bits random number to be used as a
+// message id. The random provided should be good enough.
+func id() uint16 {
+	idLock.Lock()
+
+	if idRand == nil {
+		// This (partially) works around
+		// https://github.com/golang/go/issues/11833 by only
+		// seeding idRand upon the first call to id.
+
+		var seed int64
+		var buf [8]byte
+
+		if _, err := crand.Read(buf[:]); err == nil {
+			seed = int64(binary.LittleEndian.Uint64(buf[:]))
+		} else {
+			seed = rand.Int63()
+		}
+
+		idRand = rand.New(rand.NewSource(seed))
+	}
+
+	// The call to idRand.Uint32 must be within the
+	// mutex lock because *rand.Rand is not safe for
+	// concurrent use.
+	//
+	// There is no added performance overhead to calling
+	// idRand.Uint32 inside a mutex lock over just
+	// calling rand.Uint32 as the global math/rand rng
+	// is internally protected by a sync.Mutex.
+	id := uint16(idRand.Uint32())
+
+	idLock.Unlock()
+	return id
+}
+
+// MsgHdr is a a manually-unpacked version of (id, bits).
+type MsgHdr struct {
+	Id                 uint16
+	Response           bool
+	Opcode             int
+	Authoritative      bool
+	Truncated          bool
+	RecursionDesired   bool
+	RecursionAvailable bool
+	Zero               bool
+	AuthenticatedData  bool
+	CheckingDisabled   bool
+	Rcode              int
+}
+
+// Msg contains the layout of a DNS message.
+type Msg struct {
+	MsgHdr
+	Compress bool       `json:"-"` // If true, the message will be compressed when converted to wire format.
+	Question []Question // Holds the RR(s) of the question section.
+	Answer   []RR       // Holds the RR(s) of the answer section.
+	Ns       []RR       // Holds the RR(s) of the authority section.
+	Extra    []RR       // Holds the RR(s) of the additional section.
+}
+
+// ClassToString is a maps Classes to strings for each CLASS wire type.
+var ClassToString = map[uint16]string{
+	ClassINET:   "IN",
+	ClassCSNET:  "CS",
+	ClassCHAOS:  "CH",
+	ClassHESIOD: "HS",
+	ClassNONE:   "NONE",
+	ClassANY:    "ANY",
+}
+
+// OpcodeToString maps Opcodes to strings.
+var OpcodeToString = map[int]string{
+	OpcodeQuery:  "QUERY",
+	OpcodeIQuery: "IQUERY",
+	OpcodeStatus: "STATUS",
+	OpcodeNotify: "NOTIFY",
+	OpcodeUpdate: "UPDATE",
+}
+
+// RcodeToString maps Rcodes to strings.
+var RcodeToString = map[int]string{
+	RcodeSuccess:        "NOERROR",
+	RcodeFormatError:    "FORMERR",
+	RcodeServerFailure:  "SERVFAIL",
+	RcodeNameError:      "NXDOMAIN",
+	RcodeNotImplemented: "NOTIMPL",
+	RcodeRefused:        "REFUSED",
+	RcodeYXDomain:       "YXDOMAIN", // See RFC 2136
+	RcodeYXRrset:        "YXRRSET",
+	RcodeNXRrset:        "NXRRSET",
+	RcodeNotAuth:        "NOTAUTH",
+	RcodeNotZone:        "NOTZONE",
+	RcodeBadSig:         "BADSIG", // Also known as RcodeBadVers, see RFC 6891
+	//	RcodeBadVers:        "BADVERS",
+	RcodeBadKey:    "BADKEY",
+	RcodeBadTime:   "BADTIME",
+	RcodeBadMode:   "BADMODE",
+	RcodeBadName:   "BADNAME",
+	RcodeBadAlg:    "BADALG",
+	RcodeBadTrunc:  "BADTRUNC",
+	RcodeBadCookie: "BADCOOKIE",
+}
+
+// Domain names are a sequence of counted strings
+// split at the dots. They end with a zero-length string.
+
+// PackDomainName packs a domain name s into msg[off:].
+// If compression is wanted compress must be true and the compression
+// map needs to hold a mapping between domain names and offsets
+// pointing into msg.
+func PackDomainName(s string, msg []byte, off int, compression map[string]int, compress bool) (off1 int, err error) {
+	off1, _, err = packDomainName(s, msg, off, compression, compress)
+	return
+}
+
+func packDomainName(s string, msg []byte, off int, compression map[string]int, compress bool) (off1 int, labels int, err error) {
+	// special case if msg == nil
+	lenmsg := 256
+	if msg != nil {
+		lenmsg = len(msg)
+	}
+	ls := len(s)
+	if ls == 0 { // Ok, for instance when dealing with update RR without any rdata.
+		return off, 0, nil
+	}
+	// If not fully qualified, error out, but only if msg == nil #ugly
+	switch {
+	case msg == nil:
+		if s[ls-1] != '.' {
+			s += "."
+			ls++
+		}
+	case msg != nil:
+		if s[ls-1] != '.' {
+			return lenmsg, 0, ErrFqdn
+		}
+	}
+	// Each dot ends a segment of the name.
+	// We trade each dot byte for a length byte.
+	// Except for escaped dots (\.), which are normal dots.
+	// There is also a trailing zero.
+
+	// Compression
+	nameoffset := -1
+	pointer := -1
+	// Emit sequence of counted strings, chopping at dots.
+	begin := 0
+	bs := []byte(s)
+	roBs, bsFresh, escapedDot := s, true, false
+	for i := 0; i < ls; i++ {
+		if bs[i] == '\\' {
+			for j := i; j < ls-1; j++ {
+				bs[j] = bs[j+1]
+			}
+			ls--
+			if off+1 > lenmsg {
+				return lenmsg, labels, ErrBuf
+			}
+			// check for \DDD
+			if i+2 < ls && isDigit(bs[i]) && isDigit(bs[i+1]) && isDigit(bs[i+2]) {
+				bs[i] = dddToByte(bs[i:])
+				for j := i + 1; j < ls-2; j++ {
+					bs[j] = bs[j+2]
+				}
+				ls -= 2
+			}
+			escapedDot = bs[i] == '.'
+			bsFresh = false
+			continue
+		}
+
+		if bs[i] == '.' {
+			if i > 0 && bs[i-1] == '.' && !escapedDot {
+				// two dots back to back is not legal
+				return lenmsg, labels, ErrRdata
+			}
+			if i-begin >= 1<<6 { // top two bits of length must be clear
+				return lenmsg, labels, ErrRdata
+			}
+			// off can already (we're in a loop) be bigger than len(msg)
+			// this happens when a name isn't fully qualified
+			if off+1 > lenmsg {
+				return lenmsg, labels, ErrBuf
+			}
+			if msg != nil {
+				msg[off] = byte(i - begin)
+			}
+			offset := off
+			off++
+			for j := begin; j < i; j++ {
+				if off+1 > lenmsg {
+					return lenmsg, labels, ErrBuf
+				}
+				if msg != nil {
+					msg[off] = bs[j]
+				}
+				off++
+			}
+			if compress && !bsFresh {
+				roBs = string(bs)
+				bsFresh = true
+			}
+			// Don't try to compress '.'
+			// We should only compress when compress it true, but we should also still pick
+			// up names that can be used for *future* compression(s).
+			if compression != nil && roBs[begin:] != "." {
+				if p, ok := compression[roBs[begin:]]; !ok {
+					// Only offsets smaller than this can be used.
+					if offset < maxCompressionOffset {
+						compression[roBs[begin:]] = offset
+					}
+				} else {
+					// The first hit is the longest matching dname
+					// keep the pointer offset we get back and store
+					// the offset of the current name, because that's
+					// where we need to insert the pointer later
+
+					// If compress is true, we're allowed to compress this dname
+					if pointer == -1 && compress {
+						pointer = p         // Where to point to
+						nameoffset = offset // Where to point from
+						break
+					}
+				}
+			}
+			labels++
+			begin = i + 1
+		}
+		escapedDot = false
+	}
+	// Root label is special
+	if len(bs) == 1 && bs[0] == '.' {
+		return off, labels, nil
+	}
+	// If we did compression and we find something add the pointer here
+	if pointer != -1 {
+		// We have two bytes (14 bits) to put the pointer in
+		// if msg == nil, we will never do compression
+		binary.BigEndian.PutUint16(msg[nameoffset:], uint16(pointer^0xC000))
+		off = nameoffset + 1
+		goto End
+	}
+	if msg != nil && off < len(msg) {
+		msg[off] = 0
+	}
+End:
+	off++
+	return off, labels, nil
+}
+
+// Unpack a domain name.
+// In addition to the simple sequences of counted strings above,
+// domain names are allowed to refer to strings elsewhere in the
+// packet, to avoid repeating common suffixes when returning
+// many entries in a single domain.  The pointers are marked
+// by a length byte with the top two bits set.  Ignoring those
+// two bits, that byte and the next give a 14 bit offset from msg[0]
+// where we should pick up the trail.
+// Note that if we jump elsewhere in the packet,
+// we return off1 == the offset after the first pointer we found,
+// which is where the next record will start.
+// In theory, the pointers are only allowed to jump backward.
+// We let them jump anywhere and stop jumping after a while.
+
+// UnpackDomainName unpacks a domain name into a string.
+func UnpackDomainName(msg []byte, off int) (string, int, error) {
+	s := make([]byte, 0, 64)
+	off1 := 0
+	lenmsg := len(msg)
+	ptr := 0 // number of pointers followed
+Loop:
+	for {
+		if off >= lenmsg {
+			return "", lenmsg, ErrBuf
+		}
+		c := int(msg[off])
+		off++
+		switch c & 0xC0 {
+		case 0x00:
+			if c == 0x00 {
+				// end of name
+				break Loop
+			}
+			// literal string
+			if off+c > lenmsg {
+				return "", lenmsg, ErrBuf
+			}
+			for j := off; j < off+c; j++ {
+				switch b := msg[j]; b {
+				case '.', '(', ')', ';', ' ', '@':
+					fallthrough
+				case '"', '\\':
+					s = append(s, '\\', b)
+				default:
+					if b < 32 || b >= 127 { // unprintable use \DDD
+						var buf [3]byte
+						bufs := strconv.AppendInt(buf[:0], int64(b), 10)
+						s = append(s, '\\')
+						for i := 0; i < 3-len(bufs); i++ {
+							s = append(s, '0')
+						}
+						for _, r := range bufs {
+							s = append(s, r)
+						}
+					} else {
+						s = append(s, b)
+					}
+				}
+			}
+			s = append(s, '.')
+			off += c
+		case 0xC0:
+			// pointer to somewhere else in msg.
+			// remember location after first ptr,
+			// since that's how many bytes we consumed.
+			// also, don't follow too many pointers --
+			// maybe there's a loop.
+			if off >= lenmsg {
+				return "", lenmsg, ErrBuf
+			}
+			c1 := msg[off]
+			off++
+			if ptr == 0 {
+				off1 = off
+			}
+			if ptr++; ptr > 10 {
+				return "", lenmsg, &Error{err: "too many compression pointers"}
+			}
+			off = (c^0xC0)<<8 | int(c1)
+		default:
+			// 0x80 and 0x40 are reserved
+			return "", lenmsg, ErrRdata
+		}
+	}
+	if ptr == 0 {
+		off1 = off
+	}
+	if len(s) == 0 {
+		s = []byte(".")
+	}
+	return string(s), off1, nil
+}
+
+func packTxt(txt []string, msg []byte, offset int, tmp []byte) (int, error) {
+	if len(txt) == 0 {
+		if offset >= len(msg) {
+			return offset, ErrBuf
+		}
+		msg[offset] = 0
+		return offset, nil
+	}
+	var err error
+	for i := range txt {
+		if len(txt[i]) > len(tmp) {
+			return offset, ErrBuf
+		}
+		offset, err = packTxtString(txt[i], msg, offset, tmp)
+		if err != nil {
+			return offset, err
+		}
+	}
+	return offset, nil
+}
+
+func packTxtString(s string, msg []byte, offset int, tmp []byte) (int, error) {
+	lenByteOffset := offset
+	if offset >= len(msg) || len(s) > len(tmp) {
+		return offset, ErrBuf
+	}
+	offset++
+	bs := tmp[:len(s)]
+	copy(bs, s)
+	for i := 0; i < len(bs); i++ {
+		if len(msg) <= offset {
+			return offset, ErrBuf
+		}
+		if bs[i] == '\\' {
+			i++
+			if i == len(bs) {
+				break
+			}
+			// check for \DDD
+			if i+2 < len(bs) && isDigit(bs[i]) && isDigit(bs[i+1]) && isDigit(bs[i+2]) {
+				msg[offset] = dddToByte(bs[i:])
+				i += 2
+			} else {
+				msg[offset] = bs[i]
+			}
+		} else {
+			msg[offset] = bs[i]
+		}
+		offset++
+	}
+	l := offset - lenByteOffset - 1
+	if l > 255 {
+		return offset, &Error{err: "string exceeded 255 bytes in txt"}
+	}
+	msg[lenByteOffset] = byte(l)
+	return offset, nil
+}
+
+func packOctetString(s string, msg []byte, offset int, tmp []byte) (int, error) {
+	if offset >= len(msg) || len(s) > len(tmp) {
+		return offset, ErrBuf
+	}
+	bs := tmp[:len(s)]
+	copy(bs, s)
+	for i := 0; i < len(bs); i++ {
+		if len(msg) <= offset {
+			return offset, ErrBuf
+		}
+		if bs[i] == '\\' {
+			i++
+			if i == len(bs) {
+				break
+			}
+			// check for \DDD
+			if i+2 < len(bs) && isDigit(bs[i]) && isDigit(bs[i+1]) && isDigit(bs[i+2]) {
+				msg[offset] = dddToByte(bs[i:])
+				i += 2
+			} else {
+				msg[offset] = bs[i]
+			}
+		} else {
+			msg[offset] = bs[i]
+		}
+		offset++
+	}
+	return offset, nil
+}
+
+func unpackTxt(msg []byte, off0 int) (ss []string, off int, err error) {
+	off = off0
+	var s string
+	for off < len(msg) && err == nil {
+		s, off, err = unpackTxtString(msg, off)
+		if err == nil {
+			ss = append(ss, s)
+		}
+	}
+	return
+}
+
+func unpackTxtString(msg []byte, offset int) (string, int, error) {
+	if offset+1 > len(msg) {
+		return "", offset, &Error{err: "overflow unpacking txt"}
+	}
+	l := int(msg[offset])
+	if offset+l+1 > len(msg) {
+		return "", offset, &Error{err: "overflow unpacking txt"}
+	}
+	s := make([]byte, 0, l)
+	for _, b := range msg[offset+1 : offset+1+l] {
+		switch b {
+		case '"', '\\':
+			s = append(s, '\\', b)
+		default:
+			if b < 32 || b > 127 { // unprintable
+				var buf [3]byte
+				bufs := strconv.AppendInt(buf[:0], int64(b), 10)
+				s = append(s, '\\')
+				for i := 0; i < 3-len(bufs); i++ {
+					s = append(s, '0')
+				}
+				for _, r := range bufs {
+					s = append(s, r)
+				}
+			} else {
+				s = append(s, b)
+			}
+		}
+	}
+	offset += 1 + l
+	return string(s), offset, nil
+}
+
+// Helpers for dealing with escaped bytes
+func isDigit(b byte) bool { return b >= '0' && b <= '9' }
+
+func dddToByte(s []byte) byte {
+	return byte((s[0]-'0')*100 + (s[1]-'0')*10 + (s[2] - '0'))
+}
+
+// Helper function for packing and unpacking
+func intToBytes(i *big.Int, length int) []byte {
+	buf := i.Bytes()
+	if len(buf) < length {
+		b := make([]byte, length)
+		copy(b[length-len(buf):], buf)
+		return b
+	}
+	return buf
+}
+
+// PackRR packs a resource record rr into msg[off:].
+// See PackDomainName for documentation about the compression.
+func PackRR(rr RR, msg []byte, off int, compression map[string]int, compress bool) (off1 int, err error) {
+	if rr == nil {
+		return len(msg), &Error{err: "nil rr"}
+	}
+
+	off1, err = rr.pack(msg, off, compression, compress)
+	if err != nil {
+		return len(msg), err
+	}
+	// TODO(miek): Not sure if this is needed? If removed we can remove rawmsg.go as well.
+	if rawSetRdlength(msg, off, off1) {
+		return off1, nil
+	}
+	return off, ErrRdata
+}
+
+// UnpackRR unpacks msg[off:] into an RR.
+func UnpackRR(msg []byte, off int) (rr RR, off1 int, err error) {
+	h, off, msg, err := unpackHeader(msg, off)
+	if err != nil {
+		return nil, len(msg), err
+	}
+	end := off + int(h.Rdlength)
+
+	if fn, known := typeToUnpack[h.Rrtype]; !known {
+		rr, off, err = unpackRFC3597(h, msg, off)
+	} else {
+		rr, off, err = fn(h, msg, off)
+	}
+	if off != end {
+		return &h, end, &Error{err: "bad rdlength"}
+	}
+	return rr, off, err
+}
+
+// unpackRRslice unpacks msg[off:] into an []RR.
+// If we cannot unpack the whole array, then it will return nil
+func unpackRRslice(l int, msg []byte, off int) (dst1 []RR, off1 int, err error) {
+	var r RR
+	// Optimistically make dst be the length that was sent
+	dst := make([]RR, 0, l)
+	for i := 0; i < l; i++ {
+		off1 := off
+		r, off, err = UnpackRR(msg, off)
+		if err != nil {
+			off = len(msg)
+			break
+		}
+		// If offset does not increase anymore, l is a lie
+		if off1 == off {
+			l = i
+			break
+		}
+		dst = append(dst, r)
+	}
+	if err != nil && off == len(msg) {
+		dst = nil
+	}
+	return dst, off, err
+}
+
+// Convert a MsgHdr to a string, with dig-like headers:
+//
+//;; opcode: QUERY, status: NOERROR, id: 48404
+//
+//;; flags: qr aa rd ra;
+func (h *MsgHdr) String() string {
+	if h == nil {
+		return "<nil> MsgHdr"
+	}
+
+	s := ";; opcode: " + OpcodeToString[h.Opcode]
+	s += ", status: " + RcodeToString[h.Rcode]
+	s += ", id: " + strconv.Itoa(int(h.Id)) + "\n"
+
+	s += ";; flags:"
+	if h.Response {
+		s += " qr"
+	}
+	if h.Authoritative {
+		s += " aa"
+	}
+	if h.Truncated {
+		s += " tc"
+	}
+	if h.RecursionDesired {
+		s += " rd"
+	}
+	if h.RecursionAvailable {
+		s += " ra"
+	}
+	if h.Zero { // Hmm
+		s += " z"
+	}
+	if h.AuthenticatedData {
+		s += " ad"
+	}
+	if h.CheckingDisabled {
+		s += " cd"
+	}
+
+	s += ";"
+	return s
+}
+
+// Pack packs a Msg: it is converted to to wire format.
+// If the dns.Compress is true the message will be in compressed wire format.
+func (dns *Msg) Pack() (msg []byte, err error) {
+	return dns.PackBuffer(nil)
+}
+
+// PackBuffer packs a Msg, using the given buffer buf. If buf is too small
+// a new buffer is allocated.
+func (dns *Msg) PackBuffer(buf []byte) (msg []byte, err error) {
+	// We use a similar function in tsig.go's stripTsig.
+	var (
+		dh          Header
+		compression map[string]int
+	)
+
+	if dns.Compress {
+		compression = make(map[string]int) // Compression pointer mappings
+	}
+
+	if dns.Rcode < 0 || dns.Rcode > 0xFFF {
+		return nil, ErrRcode
+	}
+	if dns.Rcode > 0xF {
+		// Regular RCODE field is 4 bits
+		opt := dns.IsEdns0()
+		if opt == nil {
+			return nil, ErrExtendedRcode
+		}
+		opt.SetExtendedRcode(uint8(dns.Rcode >> 4))
+		dns.Rcode &= 0xF
+	}
+
+	// Convert convenient Msg into wire-like Header.
+	dh.Id = dns.Id
+	dh.Bits = uint16(dns.Opcode)<<11 | uint16(dns.Rcode)
+	if dns.Response {
+		dh.Bits |= _QR
+	}
+	if dns.Authoritative {
+		dh.Bits |= _AA
+	}
+	if dns.Truncated {
+		dh.Bits |= _TC
+	}
+	if dns.RecursionDesired {
+		dh.Bits |= _RD
+	}
+	if dns.RecursionAvailable {
+		dh.Bits |= _RA
+	}
+	if dns.Zero {
+		dh.Bits |= _Z
+	}
+	if dns.AuthenticatedData {
+		dh.Bits |= _AD
+	}
+	if dns.CheckingDisabled {
+		dh.Bits |= _CD
+	}
+
+	// Prepare variable sized arrays.
+	question := dns.Question
+	answer := dns.Answer
+	ns := dns.Ns
+	extra := dns.Extra
+
+	dh.Qdcount = uint16(len(question))
+	dh.Ancount = uint16(len(answer))
+	dh.Nscount = uint16(len(ns))
+	dh.Arcount = uint16(len(extra))
+
+	// We need the uncompressed length here, because we first pack it and then compress it.
+	msg = buf
+	uncompressedLen := compressedLen(dns, false)
+	if packLen := uncompressedLen + 1; len(msg) < packLen {
+		msg = make([]byte, packLen)
+	}
+
+	// Pack it in: header and then the pieces.
+	off := 0
+	off, err = dh.pack(msg, off, compression, dns.Compress)
+	if err != nil {
+		return nil, err
+	}
+	for i := 0; i < len(question); i++ {
+		off, err = question[i].pack(msg, off, compression, dns.Compress)
+		if err != nil {
+			return nil, err
+		}
+	}
+	for i := 0; i < len(answer); i++ {
+		off, err = PackRR(answer[i], msg, off, compression, dns.Compress)
+		if err != nil {
+			return nil, err
+		}
+	}
+	for i := 0; i < len(ns); i++ {
+		off, err = PackRR(ns[i], msg, off, compression, dns.Compress)
+		if err != nil {
+			return nil, err
+		}
+	}
+	for i := 0; i < len(extra); i++ {
+		off, err = PackRR(extra[i], msg, off, compression, dns.Compress)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return msg[:off], nil
+}
+
+// Unpack unpacks a binary message to a Msg structure.
+func (dns *Msg) Unpack(msg []byte) (err error) {
+	var (
+		dh  Header
+		off int
+	)
+	if dh, off, err = unpackMsgHdr(msg, off); err != nil {
+		return err
+	}
+
+	dns.Id = dh.Id
+	dns.Response = (dh.Bits & _QR) != 0
+	dns.Opcode = int(dh.Bits>>11) & 0xF
+	dns.Authoritative = (dh.Bits & _AA) != 0
+	dns.Truncated = (dh.Bits & _TC) != 0
+	dns.RecursionDesired = (dh.Bits & _RD) != 0
+	dns.RecursionAvailable = (dh.Bits & _RA) != 0
+	dns.Zero = (dh.Bits & _Z) != 0
+	dns.AuthenticatedData = (dh.Bits & _AD) != 0
+	dns.CheckingDisabled = (dh.Bits & _CD) != 0
+	dns.Rcode = int(dh.Bits & 0xF)
+
+	if off == len(msg) {
+		return ErrTruncated
+	}
+
+	// Optimistically use the count given to us in the header
+	dns.Question = make([]Question, 0, int(dh.Qdcount))
+
+	for i := 0; i < int(dh.Qdcount); i++ {
+		off1 := off
+		var q Question
+		q, off, err = unpackQuestion(msg, off)
+		if err != nil {
+			// Even if Truncated is set, we only will set ErrTruncated if we
+			// actually got the questions
+			return err
+		}
+		if off1 == off { // Offset does not increase anymore, dh.Qdcount is a lie!
+			dh.Qdcount = uint16(i)
+			break
+		}
+		dns.Question = append(dns.Question, q)
+	}
+
+	dns.Answer, off, err = unpackRRslice(int(dh.Ancount), msg, off)
+	// The header counts might have been wrong so we need to update it
+	dh.Ancount = uint16(len(dns.Answer))
+	if err == nil {
+		dns.Ns, off, err = unpackRRslice(int(dh.Nscount), msg, off)
+	}
+	// The header counts might have been wrong so we need to update it
+	dh.Nscount = uint16(len(dns.Ns))
+	if err == nil {
+		dns.Extra, off, err = unpackRRslice(int(dh.Arcount), msg, off)
+	}
+	// The header counts might have been wrong so we need to update it
+	dh.Arcount = uint16(len(dns.Extra))
+
+	if off != len(msg) {
+		// TODO(miek) make this an error?
+		// use PackOpt to let people tell how detailed the error reporting should be?
+		// println("dns: extra bytes in dns packet", off, "<", len(msg))
+	} else if dns.Truncated {
+		// Whether we ran into a an error or not, we want to return that it
+		// was truncated
+		err = ErrTruncated
+	}
+	return err
+}
+
+// Convert a complete message to a string with dig-like output.
+func (dns *Msg) String() string {
+	if dns == nil {
+		return "<nil> MsgHdr"
+	}
+	s := dns.MsgHdr.String() + " "
+	s += "QUERY: " + strconv.Itoa(len(dns.Question)) + ", "
+	s += "ANSWER: " + strconv.Itoa(len(dns.Answer)) + ", "
+	s += "AUTHORITY: " + strconv.Itoa(len(dns.Ns)) + ", "
+	s += "ADDITIONAL: " + strconv.Itoa(len(dns.Extra)) + "\n"
+	if len(dns.Question) > 0 {
+		s += "\n;; QUESTION SECTION:\n"
+		for i := 0; i < len(dns.Question); i++ {
+			s += dns.Question[i].String() + "\n"
+		}
+	}
+	if len(dns.Answer) > 0 {
+		s += "\n;; ANSWER SECTION:\n"
+		for i := 0; i < len(dns.Answer); i++ {
+			if dns.Answer[i] != nil {
+				s += dns.Answer[i].String() + "\n"
+			}
+		}
+	}
+	if len(dns.Ns) > 0 {
+		s += "\n;; AUTHORITY SECTION:\n"
+		for i := 0; i < len(dns.Ns); i++ {
+			if dns.Ns[i] != nil {
+				s += dns.Ns[i].String() + "\n"
+			}
+		}
+	}
+	if len(dns.Extra) > 0 {
+		s += "\n;; ADDITIONAL SECTION:\n"
+		for i := 0; i < len(dns.Extra); i++ {
+			if dns.Extra[i] != nil {
+				s += dns.Extra[i].String() + "\n"
+			}
+		}
+	}
+	return s
+}
+
+// Len returns the message length when in (un)compressed wire format.
+// If dns.Compress is true compression it is taken into account. Len()
+// is provided to be a faster way to get the size of the resulting packet,
+// than packing it, measuring the size and discarding the buffer.
+func (dns *Msg) Len() int { return compressedLen(dns, dns.Compress) }
+
+// compressedLen returns the message length when in compressed wire format
+// when compress is true, otherwise the uncompressed length is returned.
+func compressedLen(dns *Msg, compress bool) int {
+	// We always return one more than needed.
+	l := 12 // Message header is always 12 bytes
+	compression := map[string]int{}
+
+	for i := 0; i < len(dns.Question); i++ {
+		l += dns.Question[i].len()
+		if compress {
+			compressionLenHelper(compression, dns.Question[i].Name)
+		}
+	}
+	for i := 0; i < len(dns.Answer); i++ {
+		if dns.Answer[i] == nil {
+			continue
+		}
+		l += dns.Answer[i].len()
+		if compress {
+			k, ok := compressionLenSearch(compression, dns.Answer[i].Header().Name)
+			if ok {
+				l += 1 - k
+			}
+			compressionLenHelper(compression, dns.Answer[i].Header().Name)
+			k, ok = compressionLenSearchType(compression, dns.Answer[i])
+			if ok {
+				l += 1 - k
+			}
+			compressionLenHelperType(compression, dns.Answer[i])
+		}
+	}
+	for i := 0; i < len(dns.Ns); i++ {
+		if dns.Ns[i] == nil {
+			continue
+		}
+		l += dns.Ns[i].len()
+		if compress {
+			k, ok := compressionLenSearch(compression, dns.Ns[i].Header().Name)
+			if ok {
+				l += 1 - k
+			}
+			compressionLenHelper(compression, dns.Ns[i].Header().Name)
+			k, ok = compressionLenSearchType(compression, dns.Ns[i])
+			if ok {
+				l += 1 - k
+			}
+			compressionLenHelperType(compression, dns.Ns[i])
+		}
+	}
+	for i := 0; i < len(dns.Extra); i++ {
+		if dns.Extra[i] == nil {
+			continue
+		}
+		l += dns.Extra[i].len()
+		if compress {
+			k, ok := compressionLenSearch(compression, dns.Extra[i].Header().Name)
+			if ok {
+				l += 1 - k
+			}
+			compressionLenHelper(compression, dns.Extra[i].Header().Name)
+			k, ok = compressionLenSearchType(compression, dns.Extra[i])
+			if ok {
+				l += 1 - k
+			}
+			compressionLenHelperType(compression, dns.Extra[i])
+		}
+	}
+	return l
+}
+
+// Put the parts of the name in the compression map.
+func compressionLenHelper(c map[string]int, s string) {
+	pref := ""
+	lbs := Split(s)
+	for j := len(lbs) - 1; j >= 0; j-- {
+		pref = s[lbs[j]:]
+		if _, ok := c[pref]; !ok {
+			c[pref] = len(pref)
+		}
+	}
+}
+
+// Look for each part in the compression map and returns its length,
+// keep on searching so we get the longest match.
+func compressionLenSearch(c map[string]int, s string) (int, bool) {
+	off := 0
+	end := false
+	if s == "" { // don't bork on bogus data
+		return 0, false
+	}
+	for {
+		if _, ok := c[s[off:]]; ok {
+			return len(s[off:]), true
+		}
+		if end {
+			break
+		}
+		off, end = NextLabel(s, off)
+	}
+	return 0, false
+}
+
+// Copy returns a new RR which is a deep-copy of r.
+func Copy(r RR) RR { r1 := r.copy(); return r1 }
+
+// Len returns the length (in octets) of the uncompressed RR in wire format.
+func Len(r RR) int { return r.len() }
+
+// Copy returns a new *Msg which is a deep-copy of dns.
+func (dns *Msg) Copy() *Msg { return dns.CopyTo(new(Msg)) }
+
+// CopyTo copies the contents to the provided message using a deep-copy and returns the copy.
+func (dns *Msg) CopyTo(r1 *Msg) *Msg {
+	r1.MsgHdr = dns.MsgHdr
+	r1.Compress = dns.Compress
+
+	if len(dns.Question) > 0 {
+		r1.Question = make([]Question, len(dns.Question))
+		copy(r1.Question, dns.Question) // TODO(miek): Question is an immutable value, ok to do a shallow-copy
+	}
+
+	rrArr := make([]RR, len(dns.Answer)+len(dns.Ns)+len(dns.Extra))
+	var rri int
+
+	if len(dns.Answer) > 0 {
+		rrbegin := rri
+		for i := 0; i < len(dns.Answer); i++ {
+			rrArr[rri] = dns.Answer[i].copy()
+			rri++
+		}
+		r1.Answer = rrArr[rrbegin:rri:rri]
+	}
+
+	if len(dns.Ns) > 0 {
+		rrbegin := rri
+		for i := 0; i < len(dns.Ns); i++ {
+			rrArr[rri] = dns.Ns[i].copy()
+			rri++
+		}
+		r1.Ns = rrArr[rrbegin:rri:rri]
+	}
+
+	if len(dns.Extra) > 0 {
+		rrbegin := rri
+		for i := 0; i < len(dns.Extra); i++ {
+			rrArr[rri] = dns.Extra[i].copy()
+			rri++
+		}
+		r1.Extra = rrArr[rrbegin:rri:rri]
+	}
+
+	return r1
+}
+
+func (q *Question) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := PackDomainName(q.Name, msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(q.Qtype, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(q.Qclass, msg, off)
+	if err != nil {
+		return off, err
+	}
+	return off, nil
+}
+
+func unpackQuestion(msg []byte, off int) (Question, int, error) {
+	var (
+		q   Question
+		err error
+	)
+	q.Name, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return q, off, err
+	}
+	if off == len(msg) {
+		return q, off, nil
+	}
+	q.Qtype, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return q, off, err
+	}
+	if off == len(msg) {
+		return q, off, nil
+	}
+	q.Qclass, off, err = unpackUint16(msg, off)
+	if off == len(msg) {
+		return q, off, nil
+	}
+	return q, off, err
+}
+
+func (dh *Header) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := packUint16(dh.Id, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(dh.Bits, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(dh.Qdcount, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(dh.Ancount, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(dh.Nscount, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(dh.Arcount, msg, off)
+	return off, err
+}
+
+func unpackMsgHdr(msg []byte, off int) (Header, int, error) {
+	var (
+		dh  Header
+		err error
+	)
+	dh.Id, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return dh, off, err
+	}
+	dh.Bits, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return dh, off, err
+	}
+	dh.Qdcount, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return dh, off, err
+	}
+	dh.Ancount, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return dh, off, err
+	}
+	dh.Nscount, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return dh, off, err
+	}
+	dh.Arcount, off, err = unpackUint16(msg, off)
+	return dh, off, err
+}
diff --git a/vendor/github.com/miekg/dns/msg_generate.go b/vendor/github.com/miekg/dns/msg_generate.go
new file mode 100644
index 0000000000..c29447a100
--- /dev/null
+++ b/vendor/github.com/miekg/dns/msg_generate.go
@@ -0,0 +1,340 @@
+//+build ignore
+
+// msg_generate.go is meant to run with go generate. It will use
+// go/{importer,types} to track down all the RR struct types. Then for each type
+// it will generate pack/unpack methods based on the struct tags. The generated source is
+// written to zmsg.go, and is meant to be checked into git.
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"go/format"
+	"go/importer"
+	"go/types"
+	"log"
+	"os"
+	"strings"
+)
+
+var packageHdr = `
+// *** DO NOT MODIFY ***
+// AUTOGENERATED BY go generate from msg_generate.go
+
+package dns
+
+`
+
+// getTypeStruct will take a type and the package scope, and return the
+// (innermost) struct if the type is considered a RR type (currently defined as
+// those structs beginning with a RR_Header, could be redefined as implementing
+// the RR interface). The bool return value indicates if embedded structs were
+// resolved.
+func getTypeStruct(t types.Type, scope *types.Scope) (*types.Struct, bool) {
+	st, ok := t.Underlying().(*types.Struct)
+	if !ok {
+		return nil, false
+	}
+	if st.Field(0).Type() == scope.Lookup("RR_Header").Type() {
+		return st, false
+	}
+	if st.Field(0).Anonymous() {
+		st, _ := getTypeStruct(st.Field(0).Type(), scope)
+		return st, true
+	}
+	return nil, false
+}
+
+func main() {
+	// Import and type-check the package
+	pkg, err := importer.Default().Import("github.com/miekg/dns")
+	fatalIfErr(err)
+	scope := pkg.Scope()
+
+	// Collect actual types (*X)
+	var namedTypes []string
+	for _, name := range scope.Names() {
+		o := scope.Lookup(name)
+		if o == nil || !o.Exported() {
+			continue
+		}
+		if st, _ := getTypeStruct(o.Type(), scope); st == nil {
+			continue
+		}
+		if name == "PrivateRR" {
+			continue
+		}
+
+		// Check if corresponding TypeX exists
+		if scope.Lookup("Type"+o.Name()) == nil && o.Name() != "RFC3597" {
+			log.Fatalf("Constant Type%s does not exist.", o.Name())
+		}
+
+		namedTypes = append(namedTypes, o.Name())
+	}
+
+	b := &bytes.Buffer{}
+	b.WriteString(packageHdr)
+
+	fmt.Fprint(b, "// pack*() functions\n\n")
+	for _, name := range namedTypes {
+		o := scope.Lookup(name)
+		st, _ := getTypeStruct(o.Type(), scope)
+
+		fmt.Fprintf(b, "func (rr *%s) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {\n", name)
+		fmt.Fprint(b, `off, err := rr.Hdr.pack(msg, off, compression, compress)
+if err != nil {
+	return off, err
+}
+headerEnd := off
+`)
+		for i := 1; i < st.NumFields(); i++ {
+			o := func(s string) {
+				fmt.Fprintf(b, s, st.Field(i).Name())
+				fmt.Fprint(b, `if err != nil {
+return off, err
+}
+`)
+			}
+
+			if _, ok := st.Field(i).Type().(*types.Slice); ok {
+				switch st.Tag(i) {
+				case `dns:"-"`: // ignored
+				case `dns:"txt"`:
+					o("off, err = packStringTxt(rr.%s, msg, off)\n")
+				case `dns:"opt"`:
+					o("off, err = packDataOpt(rr.%s, msg, off)\n")
+				case `dns:"nsec"`:
+					o("off, err = packDataNsec(rr.%s, msg, off)\n")
+				case `dns:"domain-name"`:
+					o("off, err = packDataDomainNames(rr.%s, msg, off, compression, compress)\n")
+				default:
+					log.Fatalln(name, st.Field(i).Name(), st.Tag(i))
+				}
+				continue
+			}
+
+			switch {
+			case st.Tag(i) == `dns:"-"`: // ignored
+			case st.Tag(i) == `dns:"cdomain-name"`:
+				o("off, err = PackDomainName(rr.%s, msg, off, compression, compress)\n")
+			case st.Tag(i) == `dns:"domain-name"`:
+				o("off, err = PackDomainName(rr.%s, msg, off, compression, false)\n")
+			case st.Tag(i) == `dns:"a"`:
+				o("off, err = packDataA(rr.%s, msg, off)\n")
+			case st.Tag(i) == `dns:"aaaa"`:
+				o("off, err = packDataAAAA(rr.%s, msg, off)\n")
+			case st.Tag(i) == `dns:"uint48"`:
+				o("off, err = packUint48(rr.%s, msg, off)\n")
+			case st.Tag(i) == `dns:"txt"`:
+				o("off, err = packString(rr.%s, msg, off)\n")
+
+			case strings.HasPrefix(st.Tag(i), `dns:"size-base32`): // size-base32 can be packed just like base32
+				fallthrough
+			case st.Tag(i) == `dns:"base32"`:
+				o("off, err = packStringBase32(rr.%s, msg, off)\n")
+
+			case strings.HasPrefix(st.Tag(i), `dns:"size-base64`): // size-base64 can be packed just like base64
+				fallthrough
+			case st.Tag(i) == `dns:"base64"`:
+				o("off, err = packStringBase64(rr.%s, msg, off)\n")
+
+			case strings.HasPrefix(st.Tag(i), `dns:"size-hex:SaltLength`): // Hack to fix empty salt length for NSEC3
+				o("if rr.%s == \"-\" { /* do nothing, empty salt */ }\n")
+				continue
+			case strings.HasPrefix(st.Tag(i), `dns:"size-hex`): // size-hex can be packed just like hex
+				fallthrough
+			case st.Tag(i) == `dns:"hex"`:
+				o("off, err = packStringHex(rr.%s, msg, off)\n")
+
+			case st.Tag(i) == `dns:"octet"`:
+				o("off, err = packStringOctet(rr.%s, msg, off)\n")
+			case st.Tag(i) == "":
+				switch st.Field(i).Type().(*types.Basic).Kind() {
+				case types.Uint8:
+					o("off, err = packUint8(rr.%s, msg, off)\n")
+				case types.Uint16:
+					o("off, err = packUint16(rr.%s, msg, off)\n")
+				case types.Uint32:
+					o("off, err = packUint32(rr.%s, msg, off)\n")
+				case types.Uint64:
+					o("off, err = packUint64(rr.%s, msg, off)\n")
+				case types.String:
+					o("off, err = packString(rr.%s, msg, off)\n")
+				default:
+					log.Fatalln(name, st.Field(i).Name())
+				}
+			default:
+				log.Fatalln(name, st.Field(i).Name(), st.Tag(i))
+			}
+		}
+		// We have packed everything, only now we know the rdlength of this RR
+		fmt.Fprintln(b, "rr.Header().Rdlength = uint16(off-headerEnd)")
+		fmt.Fprintln(b, "return off, nil }\n")
+	}
+
+	fmt.Fprint(b, "// unpack*() functions\n\n")
+	for _, name := range namedTypes {
+		o := scope.Lookup(name)
+		st, _ := getTypeStruct(o.Type(), scope)
+
+		fmt.Fprintf(b, "func unpack%s(h RR_Header, msg []byte, off int) (RR, int, error) {\n", name)
+		fmt.Fprintf(b, "rr := new(%s)\n", name)
+		fmt.Fprint(b, "rr.Hdr = h\n")
+		fmt.Fprint(b, `if noRdata(h) {
+return rr, off, nil
+	}
+var err error
+rdStart := off
+_ = rdStart
+
+`)
+		for i := 1; i < st.NumFields(); i++ {
+			o := func(s string) {
+				fmt.Fprintf(b, s, st.Field(i).Name())
+				fmt.Fprint(b, `if err != nil {
+return rr, off, err
+}
+`)
+			}
+
+			// size-* are special, because they reference a struct member we should use for the length.
+			if strings.HasPrefix(st.Tag(i), `dns:"size-`) {
+				structMember := structMember(st.Tag(i))
+				structTag := structTag(st.Tag(i))
+				switch structTag {
+				case "hex":
+					fmt.Fprintf(b, "rr.%s, off, err = unpackStringHex(msg, off, off + int(rr.%s))\n", st.Field(i).Name(), structMember)
+				case "base32":
+					fmt.Fprintf(b, "rr.%s, off, err = unpackStringBase32(msg, off, off + int(rr.%s))\n", st.Field(i).Name(), structMember)
+				case "base64":
+					fmt.Fprintf(b, "rr.%s, off, err = unpackStringBase64(msg, off, off + int(rr.%s))\n", st.Field(i).Name(), structMember)
+				default:
+					log.Fatalln(name, st.Field(i).Name(), st.Tag(i))
+				}
+				fmt.Fprint(b, `if err != nil {
+return rr, off, err
+}
+`)
+				continue
+			}
+
+			if _, ok := st.Field(i).Type().(*types.Slice); ok {
+				switch st.Tag(i) {
+				case `dns:"-"`: // ignored
+				case `dns:"txt"`:
+					o("rr.%s, off, err = unpackStringTxt(msg, off)\n")
+				case `dns:"opt"`:
+					o("rr.%s, off, err = unpackDataOpt(msg, off)\n")
+				case `dns:"nsec"`:
+					o("rr.%s, off, err = unpackDataNsec(msg, off)\n")
+				case `dns:"domain-name"`:
+					o("rr.%s, off, err = unpackDataDomainNames(msg, off, rdStart + int(rr.Hdr.Rdlength))\n")
+				default:
+					log.Fatalln(name, st.Field(i).Name(), st.Tag(i))
+				}
+				continue
+			}
+
+			switch st.Tag(i) {
+			case `dns:"-"`: // ignored
+			case `dns:"cdomain-name"`:
+				fallthrough
+			case `dns:"domain-name"`:
+				o("rr.%s, off, err = UnpackDomainName(msg, off)\n")
+			case `dns:"a"`:
+				o("rr.%s, off, err = unpackDataA(msg, off)\n")
+			case `dns:"aaaa"`:
+				o("rr.%s, off, err = unpackDataAAAA(msg, off)\n")
+			case `dns:"uint48"`:
+				o("rr.%s, off, err = unpackUint48(msg, off)\n")
+			case `dns:"txt"`:
+				o("rr.%s, off, err = unpackString(msg, off)\n")
+			case `dns:"base32"`:
+				o("rr.%s, off, err = unpackStringBase32(msg, off, rdStart + int(rr.Hdr.Rdlength))\n")
+			case `dns:"base64"`:
+				o("rr.%s, off, err = unpackStringBase64(msg, off, rdStart + int(rr.Hdr.Rdlength))\n")
+			case `dns:"hex"`:
+				o("rr.%s, off, err = unpackStringHex(msg, off, rdStart + int(rr.Hdr.Rdlength))\n")
+			case `dns:"octet"`:
+				o("rr.%s, off, err = unpackStringOctet(msg, off)\n")
+			case "":
+				switch st.Field(i).Type().(*types.Basic).Kind() {
+				case types.Uint8:
+					o("rr.%s, off, err = unpackUint8(msg, off)\n")
+				case types.Uint16:
+					o("rr.%s, off, err = unpackUint16(msg, off)\n")
+				case types.Uint32:
+					o("rr.%s, off, err = unpackUint32(msg, off)\n")
+				case types.Uint64:
+					o("rr.%s, off, err = unpackUint64(msg, off)\n")
+				case types.String:
+					o("rr.%s, off, err = unpackString(msg, off)\n")
+				default:
+					log.Fatalln(name, st.Field(i).Name())
+				}
+			default:
+				log.Fatalln(name, st.Field(i).Name(), st.Tag(i))
+			}
+			// If we've hit len(msg) we return without error.
+			if i < st.NumFields()-1 {
+				fmt.Fprintf(b, `if off == len(msg) {
+return rr, off, nil
+	}
+`)
+			}
+		}
+		fmt.Fprintf(b, "return rr, off, err }\n\n")
+	}
+	// Generate typeToUnpack map
+	fmt.Fprintln(b, "var typeToUnpack = map[uint16]func(RR_Header, []byte, int) (RR, int, error){")
+	for _, name := range namedTypes {
+		if name == "RFC3597" {
+			continue
+		}
+		fmt.Fprintf(b, "Type%s: unpack%s,\n", name, name)
+	}
+	fmt.Fprintln(b, "}\n")
+
+	// gofmt
+	res, err := format.Source(b.Bytes())
+	if err != nil {
+		b.WriteTo(os.Stderr)
+		log.Fatal(err)
+	}
+
+	// write result
+	f, err := os.Create("zmsg.go")
+	fatalIfErr(err)
+	defer f.Close()
+	f.Write(res)
+}
+
+// structMember will take a tag like dns:"size-base32:SaltLength" and return the last part of this string.
+func structMember(s string) string {
+	fields := strings.Split(s, ":")
+	if len(fields) == 0 {
+		return ""
+	}
+	f := fields[len(fields)-1]
+	// f should have a closing "
+	if len(f) > 1 {
+		return f[:len(f)-1]
+	}
+	return f
+}
+
+// structTag will take a tag like dns:"size-base32:SaltLength" and return base32.
+func structTag(s string) string {
+	fields := strings.Split(s, ":")
+	if len(fields) < 2 {
+		return ""
+	}
+	return fields[1][len("\"size-"):]
+}
+
+func fatalIfErr(err error) {
+	if err != nil {
+		log.Fatal(err)
+	}
+}
diff --git a/vendor/github.com/miekg/dns/msg_helpers.go b/vendor/github.com/miekg/dns/msg_helpers.go
new file mode 100644
index 0000000000..494c053771
--- /dev/null
+++ b/vendor/github.com/miekg/dns/msg_helpers.go
@@ -0,0 +1,628 @@
+package dns
+
+import (
+	"encoding/base32"
+	"encoding/base64"
+	"encoding/binary"
+	"encoding/hex"
+	"net"
+	"strconv"
+)
+
+// helper functions called from the generated zmsg.go
+
+// These function are named after the tag to help pack/unpack, if there is no tag it is the name
+// of the type they pack/unpack (string, int, etc). We prefix all with unpackData or packData, so packDataA or
+// packDataDomainName.
+
+func unpackDataA(msg []byte, off int) (net.IP, int, error) {
+	if off+net.IPv4len > len(msg) {
+		return nil, len(msg), &Error{err: "overflow unpacking a"}
+	}
+	a := append(make(net.IP, 0, net.IPv4len), msg[off:off+net.IPv4len]...)
+	off += net.IPv4len
+	return a, off, nil
+}
+
+func packDataA(a net.IP, msg []byte, off int) (int, error) {
+	// It must be a slice of 4, even if it is 16, we encode only the first 4
+	if off+net.IPv4len > len(msg) {
+		return len(msg), &Error{err: "overflow packing a"}
+	}
+	switch len(a) {
+	case net.IPv4len, net.IPv6len:
+		copy(msg[off:], a.To4())
+		off += net.IPv4len
+	case 0:
+		// Allowed, for dynamic updates.
+	default:
+		return len(msg), &Error{err: "overflow packing a"}
+	}
+	return off, nil
+}
+
+func unpackDataAAAA(msg []byte, off int) (net.IP, int, error) {
+	if off+net.IPv6len > len(msg) {
+		return nil, len(msg), &Error{err: "overflow unpacking aaaa"}
+	}
+	aaaa := append(make(net.IP, 0, net.IPv6len), msg[off:off+net.IPv6len]...)
+	off += net.IPv6len
+	return aaaa, off, nil
+}
+
+func packDataAAAA(aaaa net.IP, msg []byte, off int) (int, error) {
+	if off+net.IPv6len > len(msg) {
+		return len(msg), &Error{err: "overflow packing aaaa"}
+	}
+
+	switch len(aaaa) {
+	case net.IPv6len:
+		copy(msg[off:], aaaa)
+		off += net.IPv6len
+	case 0:
+		// Allowed, dynamic updates.
+	default:
+		return len(msg), &Error{err: "overflow packing aaaa"}
+	}
+	return off, nil
+}
+
+// unpackHeader unpacks an RR header, returning the offset to the end of the header and a
+// re-sliced msg according to the expected length of the RR.
+func unpackHeader(msg []byte, off int) (rr RR_Header, off1 int, truncmsg []byte, err error) {
+	hdr := RR_Header{}
+	if off == len(msg) {
+		return hdr, off, msg, nil
+	}
+
+	hdr.Name, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return hdr, len(msg), msg, err
+	}
+	hdr.Rrtype, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return hdr, len(msg), msg, err
+	}
+	hdr.Class, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return hdr, len(msg), msg, err
+	}
+	hdr.Ttl, off, err = unpackUint32(msg, off)
+	if err != nil {
+		return hdr, len(msg), msg, err
+	}
+	hdr.Rdlength, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return hdr, len(msg), msg, err
+	}
+	msg, err = truncateMsgFromRdlength(msg, off, hdr.Rdlength)
+	return hdr, off, msg, nil
+}
+
+// pack packs an RR header, returning the offset to the end of the header.
+// See PackDomainName for documentation about the compression.
+func (hdr RR_Header) pack(msg []byte, off int, compression map[string]int, compress bool) (off1 int, err error) {
+	if off == len(msg) {
+		return off, nil
+	}
+
+	off, err = PackDomainName(hdr.Name, msg, off, compression, compress)
+	if err != nil {
+		return len(msg), err
+	}
+	off, err = packUint16(hdr.Rrtype, msg, off)
+	if err != nil {
+		return len(msg), err
+	}
+	off, err = packUint16(hdr.Class, msg, off)
+	if err != nil {
+		return len(msg), err
+	}
+	off, err = packUint32(hdr.Ttl, msg, off)
+	if err != nil {
+		return len(msg), err
+	}
+	off, err = packUint16(hdr.Rdlength, msg, off)
+	if err != nil {
+		return len(msg), err
+	}
+	return off, nil
+}
+
+// helper helper functions.
+
+// truncateMsgFromRdLength truncates msg to match the expected length of the RR.
+// Returns an error if msg is smaller than the expected size.
+func truncateMsgFromRdlength(msg []byte, off int, rdlength uint16) (truncmsg []byte, err error) {
+	lenrd := off + int(rdlength)
+	if lenrd > len(msg) {
+		return msg, &Error{err: "overflowing header size"}
+	}
+	return msg[:lenrd], nil
+}
+
+func fromBase32(s []byte) (buf []byte, err error) {
+	buflen := base32.HexEncoding.DecodedLen(len(s))
+	buf = make([]byte, buflen)
+	n, err := base32.HexEncoding.Decode(buf, s)
+	buf = buf[:n]
+	return
+}
+
+func toBase32(b []byte) string { return base32.HexEncoding.EncodeToString(b) }
+
+func fromBase64(s []byte) (buf []byte, err error) {
+	buflen := base64.StdEncoding.DecodedLen(len(s))
+	buf = make([]byte, buflen)
+	n, err := base64.StdEncoding.Decode(buf, s)
+	buf = buf[:n]
+	return
+}
+
+func toBase64(b []byte) string { return base64.StdEncoding.EncodeToString(b) }
+
+// dynamicUpdate returns true if the Rdlength is zero.
+func noRdata(h RR_Header) bool { return h.Rdlength == 0 }
+
+func unpackUint8(msg []byte, off int) (i uint8, off1 int, err error) {
+	if off+1 > len(msg) {
+		return 0, len(msg), &Error{err: "overflow unpacking uint8"}
+	}
+	return uint8(msg[off]), off + 1, nil
+}
+
+func packUint8(i uint8, msg []byte, off int) (off1 int, err error) {
+	if off+1 > len(msg) {
+		return len(msg), &Error{err: "overflow packing uint8"}
+	}
+	msg[off] = byte(i)
+	return off + 1, nil
+}
+
+func unpackUint16(msg []byte, off int) (i uint16, off1 int, err error) {
+	if off+2 > len(msg) {
+		return 0, len(msg), &Error{err: "overflow unpacking uint16"}
+	}
+	return binary.BigEndian.Uint16(msg[off:]), off + 2, nil
+}
+
+func packUint16(i uint16, msg []byte, off int) (off1 int, err error) {
+	if off+2 > len(msg) {
+		return len(msg), &Error{err: "overflow packing uint16"}
+	}
+	binary.BigEndian.PutUint16(msg[off:], i)
+	return off + 2, nil
+}
+
+func unpackUint32(msg []byte, off int) (i uint32, off1 int, err error) {
+	if off+4 > len(msg) {
+		return 0, len(msg), &Error{err: "overflow unpacking uint32"}
+	}
+	return binary.BigEndian.Uint32(msg[off:]), off + 4, nil
+}
+
+func packUint32(i uint32, msg []byte, off int) (off1 int, err error) {
+	if off+4 > len(msg) {
+		return len(msg), &Error{err: "overflow packing uint32"}
+	}
+	binary.BigEndian.PutUint32(msg[off:], i)
+	return off + 4, nil
+}
+
+func unpackUint48(msg []byte, off int) (i uint64, off1 int, err error) {
+	if off+6 > len(msg) {
+		return 0, len(msg), &Error{err: "overflow unpacking uint64 as uint48"}
+	}
+	// Used in TSIG where the last 48 bits are occupied, so for now, assume a uint48 (6 bytes)
+	i = (uint64(uint64(msg[off])<<40 | uint64(msg[off+1])<<32 | uint64(msg[off+2])<<24 | uint64(msg[off+3])<<16 |
+		uint64(msg[off+4])<<8 | uint64(msg[off+5])))
+	off += 6
+	return i, off, nil
+}
+
+func packUint48(i uint64, msg []byte, off int) (off1 int, err error) {
+	if off+6 > len(msg) {
+		return len(msg), &Error{err: "overflow packing uint64 as uint48"}
+	}
+	msg[off] = byte(i >> 40)
+	msg[off+1] = byte(i >> 32)
+	msg[off+2] = byte(i >> 24)
+	msg[off+3] = byte(i >> 16)
+	msg[off+4] = byte(i >> 8)
+	msg[off+5] = byte(i)
+	off += 6
+	return off, nil
+}
+
+func unpackUint64(msg []byte, off int) (i uint64, off1 int, err error) {
+	if off+8 > len(msg) {
+		return 0, len(msg), &Error{err: "overflow unpacking uint64"}
+	}
+	return binary.BigEndian.Uint64(msg[off:]), off + 8, nil
+}
+
+func packUint64(i uint64, msg []byte, off int) (off1 int, err error) {
+	if off+8 > len(msg) {
+		return len(msg), &Error{err: "overflow packing uint64"}
+	}
+	binary.BigEndian.PutUint64(msg[off:], i)
+	off += 8
+	return off, nil
+}
+
+func unpackString(msg []byte, off int) (string, int, error) {
+	if off+1 > len(msg) {
+		return "", off, &Error{err: "overflow unpacking txt"}
+	}
+	l := int(msg[off])
+	if off+l+1 > len(msg) {
+		return "", off, &Error{err: "overflow unpacking txt"}
+	}
+	s := make([]byte, 0, l)
+	for _, b := range msg[off+1 : off+1+l] {
+		switch b {
+		case '"', '\\':
+			s = append(s, '\\', b)
+		default:
+			if b < 32 || b > 127 { // unprintable
+				var buf [3]byte
+				bufs := strconv.AppendInt(buf[:0], int64(b), 10)
+				s = append(s, '\\')
+				for i := 0; i < 3-len(bufs); i++ {
+					s = append(s, '0')
+				}
+				for _, r := range bufs {
+					s = append(s, r)
+				}
+			} else {
+				s = append(s, b)
+			}
+		}
+	}
+	off += 1 + l
+	return string(s), off, nil
+}
+
+func packString(s string, msg []byte, off int) (int, error) {
+	txtTmp := make([]byte, 256*4+1)
+	off, err := packTxtString(s, msg, off, txtTmp)
+	if err != nil {
+		return len(msg), err
+	}
+	return off, nil
+}
+
+func unpackStringBase32(msg []byte, off, end int) (string, int, error) {
+	if end > len(msg) {
+		return "", len(msg), &Error{err: "overflow unpacking base32"}
+	}
+	s := toBase32(msg[off:end])
+	return s, end, nil
+}
+
+func packStringBase32(s string, msg []byte, off int) (int, error) {
+	b32, err := fromBase32([]byte(s))
+	if err != nil {
+		return len(msg), err
+	}
+	if off+len(b32) > len(msg) {
+		return len(msg), &Error{err: "overflow packing base32"}
+	}
+	copy(msg[off:off+len(b32)], b32)
+	off += len(b32)
+	return off, nil
+}
+
+func unpackStringBase64(msg []byte, off, end int) (string, int, error) {
+	// Rest of the RR is base64 encoded value, so we don't need an explicit length
+	// to be set. Thus far all RR's that have base64 encoded fields have those as their
+	// last one. What we do need is the end of the RR!
+	if end > len(msg) {
+		return "", len(msg), &Error{err: "overflow unpacking base64"}
+	}
+	s := toBase64(msg[off:end])
+	return s, end, nil
+}
+
+func packStringBase64(s string, msg []byte, off int) (int, error) {
+	b64, err := fromBase64([]byte(s))
+	if err != nil {
+		return len(msg), err
+	}
+	if off+len(b64) > len(msg) {
+		return len(msg), &Error{err: "overflow packing base64"}
+	}
+	copy(msg[off:off+len(b64)], b64)
+	off += len(b64)
+	return off, nil
+}
+
+func unpackStringHex(msg []byte, off, end int) (string, int, error) {
+	// Rest of the RR is hex encoded value, so we don't need an explicit length
+	// to be set. NSEC and TSIG have hex fields with a length field.
+	// What we do need is the end of the RR!
+	if end > len(msg) {
+		return "", len(msg), &Error{err: "overflow unpacking hex"}
+	}
+
+	s := hex.EncodeToString(msg[off:end])
+	return s, end, nil
+}
+
+func packStringHex(s string, msg []byte, off int) (int, error) {
+	h, err := hex.DecodeString(s)
+	if err != nil {
+		return len(msg), err
+	}
+	if off+(len(h)) > len(msg) {
+		return len(msg), &Error{err: "overflow packing hex"}
+	}
+	copy(msg[off:off+len(h)], h)
+	off += len(h)
+	return off, nil
+}
+
+func unpackStringTxt(msg []byte, off int) ([]string, int, error) {
+	txt, off, err := unpackTxt(msg, off)
+	if err != nil {
+		return nil, len(msg), err
+	}
+	return txt, off, nil
+}
+
+func packStringTxt(s []string, msg []byte, off int) (int, error) {
+	txtTmp := make([]byte, 256*4+1) // If the whole string consists out of \DDD we need this many.
+	off, err := packTxt(s, msg, off, txtTmp)
+	if err != nil {
+		return len(msg), err
+	}
+	return off, nil
+}
+
+func unpackDataOpt(msg []byte, off int) ([]EDNS0, int, error) {
+	var edns []EDNS0
+Option:
+	code := uint16(0)
+	if off+4 > len(msg) {
+		return nil, len(msg), &Error{err: "overflow unpacking opt"}
+	}
+	code = binary.BigEndian.Uint16(msg[off:])
+	off += 2
+	optlen := binary.BigEndian.Uint16(msg[off:])
+	off += 2
+	if off+int(optlen) > len(msg) {
+		return nil, len(msg), &Error{err: "overflow unpacking opt"}
+	}
+	switch code {
+	case EDNS0NSID:
+		e := new(EDNS0_NSID)
+		if err := e.unpack(msg[off : off+int(optlen)]); err != nil {
+			return nil, len(msg), err
+		}
+		edns = append(edns, e)
+		off += int(optlen)
+	case EDNS0SUBNET, EDNS0SUBNETDRAFT:
+		e := new(EDNS0_SUBNET)
+		if err := e.unpack(msg[off : off+int(optlen)]); err != nil {
+			return nil, len(msg), err
+		}
+		edns = append(edns, e)
+		off += int(optlen)
+		if code == EDNS0SUBNETDRAFT {
+			e.DraftOption = true
+		}
+	case EDNS0COOKIE:
+		e := new(EDNS0_COOKIE)
+		if err := e.unpack(msg[off : off+int(optlen)]); err != nil {
+			return nil, len(msg), err
+		}
+		edns = append(edns, e)
+		off += int(optlen)
+	case EDNS0UL:
+		e := new(EDNS0_UL)
+		if err := e.unpack(msg[off : off+int(optlen)]); err != nil {
+			return nil, len(msg), err
+		}
+		edns = append(edns, e)
+		off += int(optlen)
+	case EDNS0LLQ:
+		e := new(EDNS0_LLQ)
+		if err := e.unpack(msg[off : off+int(optlen)]); err != nil {
+			return nil, len(msg), err
+		}
+		edns = append(edns, e)
+		off += int(optlen)
+	case EDNS0DAU:
+		e := new(EDNS0_DAU)
+		if err := e.unpack(msg[off : off+int(optlen)]); err != nil {
+			return nil, len(msg), err
+		}
+		edns = append(edns, e)
+		off += int(optlen)
+	case EDNS0DHU:
+		e := new(EDNS0_DHU)
+		if err := e.unpack(msg[off : off+int(optlen)]); err != nil {
+			return nil, len(msg), err
+		}
+		edns = append(edns, e)
+		off += int(optlen)
+	case EDNS0N3U:
+		e := new(EDNS0_N3U)
+		if err := e.unpack(msg[off : off+int(optlen)]); err != nil {
+			return nil, len(msg), err
+		}
+		edns = append(edns, e)
+		off += int(optlen)
+	default:
+		e := new(EDNS0_LOCAL)
+		e.Code = code
+		if err := e.unpack(msg[off : off+int(optlen)]); err != nil {
+			return nil, len(msg), err
+		}
+		edns = append(edns, e)
+		off += int(optlen)
+	}
+
+	if off < len(msg) {
+		goto Option
+	}
+
+	return edns, off, nil
+}
+
+func packDataOpt(options []EDNS0, msg []byte, off int) (int, error) {
+	for _, el := range options {
+		b, err := el.pack()
+		if err != nil || off+3 > len(msg) {
+			return len(msg), &Error{err: "overflow packing opt"}
+		}
+		binary.BigEndian.PutUint16(msg[off:], el.Option())      // Option code
+		binary.BigEndian.PutUint16(msg[off+2:], uint16(len(b))) // Length
+		off += 4
+		if off+len(b) > len(msg) {
+			copy(msg[off:], b)
+			off = len(msg)
+			continue
+		}
+		// Actual data
+		copy(msg[off:off+len(b)], b)
+		off += len(b)
+	}
+	return off, nil
+}
+
+func unpackStringOctet(msg []byte, off int) (string, int, error) {
+	s := string(msg[off:])
+	return s, len(msg), nil
+}
+
+func packStringOctet(s string, msg []byte, off int) (int, error) {
+	txtTmp := make([]byte, 256*4+1)
+	off, err := packOctetString(s, msg, off, txtTmp)
+	if err != nil {
+		return len(msg), err
+	}
+	return off, nil
+}
+
+func unpackDataNsec(msg []byte, off int) ([]uint16, int, error) {
+	var nsec []uint16
+	length, window, lastwindow := 0, 0, -1
+	for off < len(msg) {
+		if off+2 > len(msg) {
+			return nsec, len(msg), &Error{err: "overflow unpacking nsecx"}
+		}
+		window = int(msg[off])
+		length = int(msg[off+1])
+		off += 2
+		if window <= lastwindow {
+			// RFC 4034: Blocks are present in the NSEC RR RDATA in
+			// increasing numerical order.
+			return nsec, len(msg), &Error{err: "out of order NSEC block"}
+		}
+		if length == 0 {
+			// RFC 4034: Blocks with no types present MUST NOT be included.
+			return nsec, len(msg), &Error{err: "empty NSEC block"}
+		}
+		if length > 32 {
+			return nsec, len(msg), &Error{err: "NSEC block too long"}
+		}
+		if off+length > len(msg) {
+			return nsec, len(msg), &Error{err: "overflowing NSEC block"}
+		}
+
+		// Walk the bytes in the window and extract the type bits
+		for j := 0; j < length; j++ {
+			b := msg[off+j]
+			// Check the bits one by one, and set the type
+			if b&0x80 == 0x80 {
+				nsec = append(nsec, uint16(window*256+j*8+0))
+			}
+			if b&0x40 == 0x40 {
+				nsec = append(nsec, uint16(window*256+j*8+1))
+			}
+			if b&0x20 == 0x20 {
+				nsec = append(nsec, uint16(window*256+j*8+2))
+			}
+			if b&0x10 == 0x10 {
+				nsec = append(nsec, uint16(window*256+j*8+3))
+			}
+			if b&0x8 == 0x8 {
+				nsec = append(nsec, uint16(window*256+j*8+4))
+			}
+			if b&0x4 == 0x4 {
+				nsec = append(nsec, uint16(window*256+j*8+5))
+			}
+			if b&0x2 == 0x2 {
+				nsec = append(nsec, uint16(window*256+j*8+6))
+			}
+			if b&0x1 == 0x1 {
+				nsec = append(nsec, uint16(window*256+j*8+7))
+			}
+		}
+		off += length
+		lastwindow = window
+	}
+	return nsec, off, nil
+}
+
+func packDataNsec(bitmap []uint16, msg []byte, off int) (int, error) {
+	if len(bitmap) == 0 {
+		return off, nil
+	}
+	var lastwindow, lastlength uint16
+	for j := 0; j < len(bitmap); j++ {
+		t := bitmap[j]
+		window := t / 256
+		length := (t-window*256)/8 + 1
+		if window > lastwindow && lastlength != 0 { // New window, jump to the new offset
+			off += int(lastlength) + 2
+			lastlength = 0
+		}
+		if window < lastwindow || length < lastlength {
+			return len(msg), &Error{err: "nsec bits out of order"}
+		}
+		if off+2+int(length) > len(msg) {
+			return len(msg), &Error{err: "overflow packing nsec"}
+		}
+		// Setting the window #
+		msg[off] = byte(window)
+		// Setting the octets length
+		msg[off+1] = byte(length)
+		// Setting the bit value for the type in the right octet
+		msg[off+1+int(length)] |= byte(1 << (7 - (t % 8)))
+		lastwindow, lastlength = window, length
+	}
+	off += int(lastlength) + 2
+	return off, nil
+}
+
+func unpackDataDomainNames(msg []byte, off, end int) ([]string, int, error) {
+	var (
+		servers []string
+		s       string
+		err     error
+	)
+	if end > len(msg) {
+		return nil, len(msg), &Error{err: "overflow unpacking domain names"}
+	}
+	for off < end {
+		s, off, err = UnpackDomainName(msg, off)
+		if err != nil {
+			return servers, len(msg), err
+		}
+		servers = append(servers, s)
+	}
+	return servers, off, nil
+}
+
+func packDataDomainNames(names []string, msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	var err error
+	for j := 0; j < len(names); j++ {
+		off, err = PackDomainName(names[j], msg, off, compression, false && compress)
+		if err != nil {
+			return len(msg), err
+		}
+	}
+	return off, nil
+}
diff --git a/vendor/github.com/miekg/dns/nsecx.go b/vendor/github.com/miekg/dns/nsecx.go
new file mode 100644
index 0000000000..51ce7f8b17
--- /dev/null
+++ b/vendor/github.com/miekg/dns/nsecx.go
@@ -0,0 +1,118 @@
+package dns
+
+import (
+	"crypto/sha1"
+	"hash"
+	"strings"
+)
+
+type saltWireFmt struct {
+	Salt string `dns:"size-hex"`
+}
+
+// HashName hashes a string (label) according to RFC 5155. It returns the hashed string in uppercase.
+func HashName(label string, ha uint8, iter uint16, salt string) string {
+	saltwire := new(saltWireFmt)
+	saltwire.Salt = salt
+	wire := make([]byte, DefaultMsgSize)
+	n, err := packSaltWire(saltwire, wire)
+	if err != nil {
+		return ""
+	}
+	wire = wire[:n]
+	name := make([]byte, 255)
+	off, err := PackDomainName(strings.ToLower(label), name, 0, nil, false)
+	if err != nil {
+		return ""
+	}
+	name = name[:off]
+	var s hash.Hash
+	switch ha {
+	case SHA1:
+		s = sha1.New()
+	default:
+		return ""
+	}
+
+	// k = 0
+	s.Write(name)
+	s.Write(wire)
+	nsec3 := s.Sum(nil)
+	// k > 0
+	for k := uint16(0); k < iter; k++ {
+		s.Reset()
+		s.Write(nsec3)
+		s.Write(wire)
+		nsec3 = s.Sum(nsec3[:0])
+	}
+	return toBase32(nsec3)
+}
+
+// Denialer is an interface that should be implemented by types that are used to denial
+// answers in DNSSEC.
+type Denialer interface {
+	// Cover will check if the (unhashed) name is being covered by this NSEC or NSEC3.
+	Cover(name string) bool
+	// Match will check if the ownername matches the (unhashed) name for this NSEC3 or NSEC3.
+	Match(name string) bool
+}
+
+// Cover implements the Denialer interface.
+func (rr *NSEC) Cover(name string) bool {
+	return true
+}
+
+// Match implements the Denialer interface.
+func (rr *NSEC) Match(name string) bool {
+	return true
+}
+
+// Cover implements the Denialer interface.
+func (rr *NSEC3) Cover(name string) bool {
+	// FIXME(miek): check if the zones match
+	// FIXME(miek): check if we're not dealing with parent nsec3
+	hname := HashName(name, rr.Hash, rr.Iterations, rr.Salt)
+	labels := Split(rr.Hdr.Name)
+	if len(labels) < 2 {
+		return false
+	}
+	hash := strings.ToUpper(rr.Hdr.Name[labels[0] : labels[1]-1]) // -1 to remove the dot
+	if hash == rr.NextDomain {
+		return false // empty interval
+	}
+	if hash > rr.NextDomain { // last name, points to apex
+		// hname > hash
+		// hname > rr.NextDomain
+		// TODO(miek)
+	}
+	if hname <= hash {
+		return false
+	}
+	if hname >= rr.NextDomain {
+		return false
+	}
+	return true
+}
+
+// Match implements the Denialer interface.
+func (rr *NSEC3) Match(name string) bool {
+	// FIXME(miek): Check if we are in the same zone
+	hname := HashName(name, rr.Hash, rr.Iterations, rr.Salt)
+	labels := Split(rr.Hdr.Name)
+	if len(labels) < 2 {
+		return false
+	}
+	hash := strings.ToUpper(rr.Hdr.Name[labels[0] : labels[1]-1]) // -1 to remove the .
+	if hash == hname {
+		return true
+	}
+	return false
+}
+
+func packSaltWire(sw *saltWireFmt, msg []byte) (int, error) {
+	off, err := packStringHex(sw.Salt, msg, 0)
+	if err != nil {
+		return off, err
+	}
+	return off, nil
+}
diff --git a/vendor/github.com/miekg/dns/nsecx_test.go b/vendor/github.com/miekg/dns/nsecx_test.go
new file mode 100644
index 0000000000..93e0c63fce
--- /dev/null
+++ b/vendor/github.com/miekg/dns/nsecx_test.go
@@ -0,0 +1,29 @@
+package dns
+
+import (
+	"testing"
+)
+
+func TestPackNsec3(t *testing.T) {
+	nsec3 := HashName("dnsex.nl.", SHA1, 0, "DEAD")
+	if nsec3 != "ROCCJAE8BJJU7HN6T7NG3TNM8ACRS87J" {
+		t.Error(nsec3)
+	}
+
+	nsec3 = HashName("a.b.c.example.org.", SHA1, 2, "DEAD")
+	if nsec3 != "6LQ07OAHBTOOEU2R9ANI2AT70K5O0RCG" {
+		t.Error(nsec3)
+	}
+}
+
+func TestNsec3(t *testing.T) {
+	// examples taken from .nl
+	nsec3, _ := NewRR("39p91242oslggest5e6a7cci4iaeqvnk.nl. IN NSEC3 1 1 5 F10E9F7EA83FC8F3 39P99DCGG0MDLARTCRMCF6OFLLUL7PR6 NS DS RRSIG")
+	if !nsec3.(*NSEC3).Cover("snasajsksasasa.nl.") { // 39p94jrinub66hnpem8qdpstrec86pg3
+		t.Error("39p94jrinub66hnpem8qdpstrec86pg3. should be covered by 39p91242oslggest5e6a7cci4iaeqvnk.nl. - 39P99DCGG0MDLARTCRMCF6OFLLUL7PR6")
+	}
+	nsec3, _ = NewRR("sk4e8fj94u78smusb40o1n0oltbblu2r.nl. IN NSEC3 1 1 5 F10E9F7EA83FC8F3 SK4F38CQ0ATIEI8MH3RGD0P5I4II6QAN NS SOA TXT RRSIG DNSKEY NSEC3PARAM")
+	if !nsec3.(*NSEC3).Match("nl.") { // sk4e8fj94u78smusb40o1n0oltbblu2r.nl.
+		t.Error("sk4e8fj94u78smusb40o1n0oltbblu2r.nl. should match sk4e8fj94u78smusb40o1n0oltbblu2r.nl.")
+	}
+}
diff --git a/vendor/github.com/miekg/dns/parse_test.go b/vendor/github.com/miekg/dns/parse_test.go
new file mode 100644
index 0000000000..c727c1301f
--- /dev/null
+++ b/vendor/github.com/miekg/dns/parse_test.go
@@ -0,0 +1,1511 @@
+package dns
+
+import (
+	"bytes"
+	"crypto/rsa"
+	"encoding/hex"
+	"fmt"
+	"math/rand"
+	"net"
+	"reflect"
+	"strconv"
+	"strings"
+	"testing"
+	"testing/quick"
+	"time"
+)
+
+func TestDotInName(t *testing.T) {
+	buf := make([]byte, 20)
+	PackDomainName("aa\\.bb.nl.", buf, 0, nil, false)
+	// index 3 must be a real dot
+	if buf[3] != '.' {
+		t.Error("dot should be a real dot")
+	}
+
+	if buf[6] != 2 {
+		t.Error("this must have the value 2")
+	}
+	dom, _, _ := UnpackDomainName(buf, 0)
+	// printing it should yield the backspace again
+	if dom != "aa\\.bb.nl." {
+		t.Error("dot should have been escaped: ", dom)
+	}
+}
+
+func TestDotLastInLabel(t *testing.T) {
+	sample := "aa\\..au."
+	buf := make([]byte, 20)
+	_, err := PackDomainName(sample, buf, 0, nil, false)
+	if err != nil {
+		t.Fatalf("unexpected error packing domain: %v", err)
+	}
+	dom, _, _ := UnpackDomainName(buf, 0)
+	if dom != sample {
+		t.Fatalf("unpacked domain `%s' doesn't match packed domain", dom)
+	}
+}
+
+func TestTooLongDomainName(t *testing.T) {
+	l := "aaabbbcccdddeeefffggghhhiiijjjkkklllmmmnnnooopppqqqrrrsssttt."
+	dom := l + l + l + l + l + l + l
+	_, err := NewRR(dom + " IN A 127.0.0.1")
+	if err == nil {
+		t.Error("should be too long")
+	} else {
+		t.Logf("error is %v", err)
+	}
+	_, err = NewRR("..com. IN A 127.0.0.1")
+	if err == nil {
+		t.Error("should fail")
+	} else {
+		t.Logf("error is %v", err)
+	}
+}
+
+func TestDomainName(t *testing.T) {
+	tests := []string{"r\\.gieben.miek.nl.", "www\\.www.miek.nl.",
+		"www.*.miek.nl.", "www.*.miek.nl.",
+	}
+	dbuff := make([]byte, 40)
+
+	for _, ts := range tests {
+		if _, err := PackDomainName(ts, dbuff, 0, nil, false); err != nil {
+			t.Error("not a valid domain name")
+			continue
+		}
+		n, _, err := UnpackDomainName(dbuff, 0)
+		if err != nil {
+			t.Error("failed to unpack packed domain name")
+			continue
+		}
+		if ts != n {
+			t.Errorf("must be equal: in: %s, out: %s", ts, n)
+		}
+	}
+}
+
+func TestDomainNameAndTXTEscapes(t *testing.T) {
+	tests := []byte{'.', '(', ')', ';', ' ', '@', '"', '\\', 9, 13, 10, 0, 255}
+	for _, b := range tests {
+		rrbytes := []byte{
+			1, b, 0, // owner
+			byte(TypeTXT >> 8), byte(TypeTXT),
+			byte(ClassINET >> 8), byte(ClassINET),
+			0, 0, 0, 1, // TTL
+			0, 2, 1, b, // Data
+		}
+		rr1, _, err := UnpackRR(rrbytes, 0)
+		if err != nil {
+			panic(err)
+		}
+		s := rr1.String()
+		rr2, err := NewRR(s)
+		if err != nil {
+			t.Errorf("Error parsing unpacked RR's string: %v", err)
+			t.Errorf(" Bytes: %v", rrbytes)
+			t.Errorf("String: %v", s)
+		}
+		repacked := make([]byte, len(rrbytes))
+		if _, err := PackRR(rr2, repacked, 0, nil, false); err != nil {
+			t.Errorf("error packing parsed RR: %v", err)
+			t.Errorf(" original Bytes: %v", rrbytes)
+			t.Errorf("unpacked Struct: %v", rr1)
+			t.Errorf("  parsed Struct: %v", rr2)
+		}
+		if !bytes.Equal(repacked, rrbytes) {
+			t.Error("packed bytes don't match original bytes")
+			t.Errorf(" original bytes: %v", rrbytes)
+			t.Errorf("   packed bytes: %v", repacked)
+			t.Errorf("unpacked struct: %v", rr1)
+			t.Errorf("  parsed struct: %v", rr2)
+		}
+	}
+}
+
+func TestTXTEscapeParsing(t *testing.T) {
+	test := [][]string{
+		{`";"`, `";"`},
+		{`\;`, `";"`},
+		{`"\t"`, `"t"`},
+		{`"\r"`, `"r"`},
+		{`"\ "`, `" "`},
+		{`"\;"`, `";"`},
+		{`"\;\""`, `";\""`},
+		{`"\(a\)"`, `"(a)"`},
+		{`"\(a)"`, `"(a)"`},
+		{`"(a\)"`, `"(a)"`},
+		{`"(a)"`, `"(a)"`},
+		{`"\048"`, `"0"`},
+		{`"\` + "\t" + `"`, `"\009"`},
+		{`"\` + "\n" + `"`, `"\010"`},
+		{`"\` + "\r" + `"`, `"\013"`},
+		{`"\` + "\x11" + `"`, `"\017"`},
+		{`"\'"`, `"'"`},
+	}
+	for _, s := range test {
+		rr, err := NewRR(fmt.Sprintf("example.com. IN TXT %v", s[0]))
+		if err != nil {
+			t.Errorf("could not parse %v TXT: %s", s[0], err)
+			continue
+		}
+
+		txt := sprintTxt(rr.(*TXT).Txt)
+		if txt != s[1] {
+			t.Errorf("mismatch after parsing `%v` TXT record: `%v` != `%v`", s[0], txt, s[1])
+		}
+	}
+}
+
+func GenerateDomain(r *rand.Rand, size int) []byte {
+	dnLen := size % 70 // artificially limit size so there's less to intrepret if a failure occurs
+	var dn []byte
+	done := false
+	for i := 0; i < dnLen && !done; {
+		max := dnLen - i
+		if max > 63 {
+			max = 63
+		}
+		lLen := max
+		if lLen != 0 {
+			lLen = int(r.Int31()) % max
+		}
+		done = lLen == 0
+		if done {
+			continue
+		}
+		l := make([]byte, lLen+1)
+		l[0] = byte(lLen)
+		for j := 0; j < lLen; j++ {
+			l[j+1] = byte(rand.Int31())
+		}
+		dn = append(dn, l...)
+		i += 1 + lLen
+	}
+	return append(dn, 0)
+}
+
+func TestDomainQuick(t *testing.T) {
+	r := rand.New(rand.NewSource(0))
+	f := func(l int) bool {
+		db := GenerateDomain(r, l)
+		ds, _, err := UnpackDomainName(db, 0)
+		if err != nil {
+			panic(err)
+		}
+		buf := make([]byte, 255)
+		off, err := PackDomainName(ds, buf, 0, nil, false)
+		if err != nil {
+			t.Errorf("error packing domain: %v", err)
+			t.Errorf(" bytes: %v", db)
+			t.Errorf("string: %v", ds)
+			return false
+		}
+		if !bytes.Equal(db, buf[:off]) {
+			t.Errorf("repacked domain doesn't match original:")
+			t.Errorf("src bytes: %v", db)
+			t.Errorf("   string: %v", ds)
+			t.Errorf("out bytes: %v", buf[:off])
+			return false
+		}
+		return true
+	}
+	if err := quick.Check(f, nil); err != nil {
+		t.Error(err)
+	}
+}
+
+func GenerateTXT(r *rand.Rand, size int) []byte {
+	rdLen := size % 300 // artificially limit size so there's less to intrepret if a failure occurs
+	var rd []byte
+	for i := 0; i < rdLen; {
+		max := rdLen - 1
+		if max > 255 {
+			max = 255
+		}
+		sLen := max
+		if max != 0 {
+			sLen = int(r.Int31()) % max
+		}
+		s := make([]byte, sLen+1)
+		s[0] = byte(sLen)
+		for j := 0; j < sLen; j++ {
+			s[j+1] = byte(rand.Int31())
+		}
+		rd = append(rd, s...)
+		i += 1 + sLen
+	}
+	return rd
+}
+
+// Ok, 2 things. 1) this test breaks with the new functionality of splitting up larger txt
+// chunks into 255 byte pieces. 2) I don't like the random nature of this thing, because I can't
+// place the quotes where they need to be.
+// So either add some code the places the quotes in just the right spots, make this non random
+// or do something else.
+// Disabled for now. (miek)
+func testTXTRRQuick(t *testing.T) {
+	s := rand.NewSource(0)
+	r := rand.New(s)
+	typeAndClass := []byte{
+		byte(TypeTXT >> 8), byte(TypeTXT),
+		byte(ClassINET >> 8), byte(ClassINET),
+		0, 0, 0, 1, // TTL
+	}
+	f := func(l int) bool {
+		owner := GenerateDomain(r, l)
+		rdata := GenerateTXT(r, l)
+		rrbytes := make([]byte, 0, len(owner)+2+2+4+2+len(rdata))
+		rrbytes = append(rrbytes, owner...)
+		rrbytes = append(rrbytes, typeAndClass...)
+		rrbytes = append(rrbytes, byte(len(rdata)>>8))
+		rrbytes = append(rrbytes, byte(len(rdata)))
+		rrbytes = append(rrbytes, rdata...)
+		rr, _, err := UnpackRR(rrbytes, 0)
+		if err != nil {
+			panic(err)
+		}
+		buf := make([]byte, len(rrbytes)*3)
+		off, err := PackRR(rr, buf, 0, nil, false)
+		if err != nil {
+			t.Errorf("pack Error: %v\nRR: %v", err, rr)
+			return false
+		}
+		buf = buf[:off]
+		if !bytes.Equal(buf, rrbytes) {
+			t.Errorf("packed bytes don't match original bytes")
+			t.Errorf("src bytes: %v", rrbytes)
+			t.Errorf("   struct: %v", rr)
+			t.Errorf("out bytes: %v", buf)
+			return false
+		}
+		if len(rdata) == 0 {
+			// string'ing won't produce any data to parse
+			return true
+		}
+		rrString := rr.String()
+		rr2, err := NewRR(rrString)
+		if err != nil {
+			t.Errorf("error parsing own output: %v", err)
+			t.Errorf("struct: %v", rr)
+			t.Errorf("string: %v", rrString)
+			return false
+		}
+		if rr2.String() != rrString {
+			t.Errorf("parsed rr.String() doesn't match original string")
+			t.Errorf("original: %v", rrString)
+			t.Errorf("  parsed: %v", rr2.String())
+			return false
+		}
+
+		buf = make([]byte, len(rrbytes)*3)
+		off, err = PackRR(rr2, buf, 0, nil, false)
+		if err != nil {
+			t.Errorf("error packing parsed rr: %v", err)
+			t.Errorf("unpacked Struct: %v", rr)
+			t.Errorf("         string: %v", rrString)
+			t.Errorf("  parsed Struct: %v", rr2)
+			return false
+		}
+		buf = buf[:off]
+		if !bytes.Equal(buf, rrbytes) {
+			t.Errorf("parsed packed bytes don't match original bytes")
+			t.Errorf("   source bytes: %v", rrbytes)
+			t.Errorf("unpacked struct: %v", rr)
+			t.Errorf("         string: %v", rrString)
+			t.Errorf("  parsed struct: %v", rr2)
+			t.Errorf(" repacked bytes: %v", buf)
+			return false
+		}
+		return true
+	}
+	c := &quick.Config{MaxCountScale: 10}
+	if err := quick.Check(f, c); err != nil {
+		t.Error(err)
+	}
+}
+
+func TestParseDirectiveMisc(t *testing.T) {
+	tests := map[string]string{
+		"$ORIGIN miek.nl.\na IN NS b": "a.miek.nl.\t3600\tIN\tNS\tb.miek.nl.",
+		"$TTL 2H\nmiek.nl. IN NS b.":  "miek.nl.\t7200\tIN\tNS\tb.",
+		"miek.nl. 1D IN NS b.":        "miek.nl.\t86400\tIN\tNS\tb.",
+		`name. IN SOA  a6.nstld.com. hostmaster.nic.name. (
+        203362132 ; serial
+        5m        ; refresh (5 minutes)
+        5m        ; retry (5 minutes)
+        2w        ; expire (2 weeks)
+        300       ; minimum (5 minutes)
+)`: "name.\t3600\tIN\tSOA\ta6.nstld.com. hostmaster.nic.name. 203362132 300 300 1209600 300",
+		". 3600000  IN  NS ONE.MY-ROOTS.NET.":        ".\t3600000\tIN\tNS\tONE.MY-ROOTS.NET.",
+		"ONE.MY-ROOTS.NET. 3600000 IN A 192.168.1.1": "ONE.MY-ROOTS.NET.\t3600000\tIN\tA\t192.168.1.1",
+	}
+	for i, o := range tests {
+		rr, err := NewRR(i)
+		if err != nil {
+			t.Error("failed to parse RR: ", err)
+			continue
+		}
+		if rr.String() != o {
+			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", i, o, rr.String())
+		} else {
+			t.Logf("RR is OK: `%s'", rr.String())
+		}
+	}
+}
+
+func TestNSEC(t *testing.T) {
+	nsectests := map[string]string{
+		"nl. IN NSEC3PARAM 1 0 5 30923C44C6CBBB8F":                                                                                                 "nl.\t3600\tIN\tNSEC3PARAM\t1 0 5 30923C44C6CBBB8F",
+		"p2209hipbpnm681knjnu0m1febshlv4e.nl. IN NSEC3 1 1 5 30923C44C6CBBB8F P90DG1KE8QEAN0B01613LHQDG0SOJ0TA NS SOA TXT RRSIG DNSKEY NSEC3PARAM": "p2209hipbpnm681knjnu0m1febshlv4e.nl.\t3600\tIN\tNSEC3\t1 1 5 30923C44C6CBBB8F P90DG1KE8QEAN0B01613LHQDG0SOJ0TA NS SOA TXT RRSIG DNSKEY NSEC3PARAM",
+		"localhost.dnssex.nl. IN NSEC www.dnssex.nl. A RRSIG NSEC":                                                                                 "localhost.dnssex.nl.\t3600\tIN\tNSEC\twww.dnssex.nl. A RRSIG NSEC",
+		"localhost.dnssex.nl. IN NSEC www.dnssex.nl. A RRSIG NSEC TYPE65534":                                                                       "localhost.dnssex.nl.\t3600\tIN\tNSEC\twww.dnssex.nl. A RRSIG NSEC TYPE65534",
+		"localhost.dnssex.nl. IN NSEC www.dnssex.nl. A RRSIG NSec Type65534":                                                                       "localhost.dnssex.nl.\t3600\tIN\tNSEC\twww.dnssex.nl. A RRSIG NSEC TYPE65534",
+		"44ohaq2njb0idnvolt9ggthvsk1e1uv8.skydns.test. NSEC3 1 0 0 - 44OHAQ2NJB0IDNVOLT9GGTHVSK1E1UVA":                                             "44ohaq2njb0idnvolt9ggthvsk1e1uv8.skydns.test.\t3600\tIN\tNSEC3\t1 0 0 - 44OHAQ2NJB0IDNVOLT9GGTHVSK1E1UVA",
+	}
+	for i, o := range nsectests {
+		rr, err := NewRR(i)
+		if err != nil {
+			t.Error("failed to parse RR: ", err)
+			continue
+		}
+		if rr.String() != o {
+			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", i, o, rr.String())
+		} else {
+			t.Logf("RR is OK: `%s'", rr.String())
+		}
+	}
+}
+
+func TestParseLOC(t *testing.T) {
+	lt := map[string]string{
+		"SW1A2AA.find.me.uk.	LOC	51 30 12.748 N 00 07 39.611 W 0.00m 0.00m 0.00m 0.00m": "SW1A2AA.find.me.uk.\t3600\tIN\tLOC\t51 30 12.748 N 00 07 39.611 W 0m 0.00m 0.00m 0.00m",
+		"SW1A2AA.find.me.uk.	LOC	51 0 0.0 N 00 07 39.611 W 0.00m 0.00m 0.00m 0.00m": "SW1A2AA.find.me.uk.\t3600\tIN\tLOC\t51 00 0.000 N 00 07 39.611 W 0m 0.00m 0.00m 0.00m",
+	}
+	for i, o := range lt {
+		rr, err := NewRR(i)
+		if err != nil {
+			t.Error("failed to parse RR: ", err)
+			continue
+		}
+		if rr.String() != o {
+			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", i, o, rr.String())
+		} else {
+			t.Logf("RR is OK: `%s'", rr.String())
+		}
+	}
+}
+
+func TestParseDS(t *testing.T) {
+	dt := map[string]string{
+		"example.net. 3600 IN DS 40692 12 3 22261A8B0E0D799183E35E24E2AD6BB58533CBA7E3B14D659E9CA09B 2071398F": "example.net.\t3600\tIN\tDS\t40692 12 3 22261A8B0E0D799183E35E24E2AD6BB58533CBA7E3B14D659E9CA09B2071398F",
+	}
+	for i, o := range dt {
+		rr, err := NewRR(i)
+		if err != nil {
+			t.Error("failed to parse RR: ", err)
+			continue
+		}
+		if rr.String() != o {
+			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", i, o, rr.String())
+		} else {
+			t.Logf("RR is OK: `%s'", rr.String())
+		}
+	}
+}
+
+func TestQuotes(t *testing.T) {
+	tests := map[string]string{
+		`t.example.com. IN TXT "a bc"`: "t.example.com.\t3600\tIN\tTXT\t\"a bc\"",
+		`t.example.com. IN TXT "a
+ bc"`: "t.example.com.\t3600\tIN\tTXT\t\"a\\010 bc\"",
+		`t.example.com. IN TXT ""`:                                                           "t.example.com.\t3600\tIN\tTXT\t\"\"",
+		`t.example.com. IN TXT "a"`:                                                          "t.example.com.\t3600\tIN\tTXT\t\"a\"",
+		`t.example.com. IN TXT "aa"`:                                                         "t.example.com.\t3600\tIN\tTXT\t\"aa\"",
+		`t.example.com. IN TXT "aaa" ;`:                                                      "t.example.com.\t3600\tIN\tTXT\t\"aaa\"",
+		`t.example.com. IN TXT "abc" "DEF"`:                                                  "t.example.com.\t3600\tIN\tTXT\t\"abc\" \"DEF\"",
+		`t.example.com. IN TXT "abc" ( "DEF" )`:                                              "t.example.com.\t3600\tIN\tTXT\t\"abc\" \"DEF\"",
+		`t.example.com. IN TXT aaa ;`:                                                        "t.example.com.\t3600\tIN\tTXT\t\"aaa\"",
+		`t.example.com. IN TXT aaa aaa;`:                                                     "t.example.com.\t3600\tIN\tTXT\t\"aaa\" \"aaa\"",
+		`t.example.com. IN TXT aaa aaa`:                                                      "t.example.com.\t3600\tIN\tTXT\t\"aaa\" \"aaa\"",
+		`t.example.com. IN TXT aaa`:                                                          "t.example.com.\t3600\tIN\tTXT\t\"aaa\"",
+		"cid.urn.arpa. NAPTR 100 50 \"s\" \"z3950+I2L+I2C\"    \"\" _z3950._tcp.gatech.edu.": "cid.urn.arpa.\t3600\tIN\tNAPTR\t100 50 \"s\" \"z3950+I2L+I2C\" \"\" _z3950._tcp.gatech.edu.",
+		"cid.urn.arpa. NAPTR 100 50 \"s\" \"rcds+I2C\"         \"\" _rcds._udp.gatech.edu.":  "cid.urn.arpa.\t3600\tIN\tNAPTR\t100 50 \"s\" \"rcds+I2C\" \"\" _rcds._udp.gatech.edu.",
+		"cid.urn.arpa. NAPTR 100 50 \"s\" \"http+I2L+I2C+I2R\" \"\" _http._tcp.gatech.edu.":  "cid.urn.arpa.\t3600\tIN\tNAPTR\t100 50 \"s\" \"http+I2L+I2C+I2R\" \"\" _http._tcp.gatech.edu.",
+		"cid.urn.arpa. NAPTR 100 10 \"\" \"\" \"/urn:cid:.+@([^\\.]+\\.)(.*)$/\\2/i\" .":     "cid.urn.arpa.\t3600\tIN\tNAPTR\t100 10 \"\" \"\" \"/urn:cid:.+@([^\\.]+\\.)(.*)$/\\2/i\" .",
+	}
+	for i, o := range tests {
+		rr, err := NewRR(i)
+		if err != nil {
+			t.Error("failed to parse RR: ", err)
+			continue
+		}
+		if rr.String() != o {
+			t.Errorf("`%s' should be equal to\n`%s', but is\n`%s'", i, o, rr.String())
+		} else {
+			t.Logf("RR is OK: `%s'", rr.String())
+		}
+	}
+}
+
+func TestParseClass(t *testing.T) {
+	tests := map[string]string{
+		"t.example.com. IN A 127.0.0.1": "t.example.com.	3600	IN	A	127.0.0.1",
+		"t.example.com. CS A 127.0.0.1": "t.example.com.	3600	CS	A	127.0.0.1",
+		"t.example.com. CH A 127.0.0.1": "t.example.com.	3600	CH	A	127.0.0.1",
+		// ClassANY can not occur in zone files
+		// "t.example.com. ANY A 127.0.0.1": "t.example.com.	3600	ANY	A	127.0.0.1",
+		"t.example.com. NONE A 127.0.0.1": "t.example.com.	3600	NONE	A	127.0.0.1",
+	}
+	for i, o := range tests {
+		rr, err := NewRR(i)
+		if err != nil {
+			t.Error("failed to parse RR: ", err)
+			continue
+		}
+		if rr.String() != o {
+			t.Errorf("`%s' should be equal to\n`%s', but is\n`%s'", i, o, rr.String())
+		} else {
+			t.Logf("RR is OK: `%s'", rr.String())
+		}
+	}
+}
+
+func TestBrace(t *testing.T) {
+	tests := map[string]string{
+		"(miek.nl.) 3600 IN A 127.0.1.1":                 "miek.nl.\t3600\tIN\tA\t127.0.1.1",
+		"miek.nl. (3600) IN MX (10) elektron.atoom.net.": "miek.nl.\t3600\tIN\tMX\t10 elektron.atoom.net.",
+		`miek.nl. IN (
+                        3600 A 127.0.0.1)`: "miek.nl.\t3600\tIN\tA\t127.0.0.1",
+		"(miek.nl.) (A) (127.0.2.1)":                          "miek.nl.\t3600\tIN\tA\t127.0.2.1",
+		"miek.nl A 127.0.3.1":                                 "miek.nl.\t3600\tIN\tA\t127.0.3.1",
+		"_ssh._tcp.local. 60 IN (PTR) stora._ssh._tcp.local.": "_ssh._tcp.local.\t60\tIN\tPTR\tstora._ssh._tcp.local.",
+		"miek.nl. NS ns.miek.nl":                              "miek.nl.\t3600\tIN\tNS\tns.miek.nl.",
+		`(miek.nl.) (
+                        (IN)
+                        (AAAA)
+                        (::1) )`: "miek.nl.\t3600\tIN\tAAAA\t::1",
+		`(miek.nl.) (
+                        (IN)
+                        (AAAA)
+                        (::1))`: "miek.nl.\t3600\tIN\tAAAA\t::1",
+		"miek.nl. IN AAAA ::2": "miek.nl.\t3600\tIN\tAAAA\t::2",
+		`((m)(i)ek.(n)l.) (SOA) (soa.) (soa.) (
+                                2009032802 ; serial
+                                21600      ; refresh (6 hours)
+                                7(2)00       ; retry (2 hours)
+                                604()800     ; expire (1 week)
+                                3600       ; minimum (1 hour)
+                        )`: "miek.nl.\t3600\tIN\tSOA\tsoa. soa. 2009032802 21600 7200 604800 3600",
+		"miek\\.nl. IN A 127.0.0.10": "miek\\.nl.\t3600\tIN\tA\t127.0.0.10",
+		"miek.nl. IN A 127.0.0.11":   "miek.nl.\t3600\tIN\tA\t127.0.0.11",
+		"miek.nl. A 127.0.0.12":      "miek.nl.\t3600\tIN\tA\t127.0.0.12",
+		`miek.nl.       86400 IN SOA elektron.atoom.net. miekg.atoom.net. (
+                                2009032802 ; serial
+                                21600      ; refresh (6 hours)
+                                7200       ; retry (2 hours)
+                                604800     ; expire (1 week)
+                                3600       ; minimum (1 hour)
+                        )`: "miek.nl.\t86400\tIN\tSOA\telektron.atoom.net. miekg.atoom.net. 2009032802 21600 7200 604800 3600",
+	}
+	for i, o := range tests {
+		rr, err := NewRR(i)
+		if err != nil {
+			t.Errorf("failed to parse RR: %v\n\t%s", err, i)
+			continue
+		}
+		if rr.String() != o {
+			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", i, o, rr.String())
+		} else {
+			t.Logf("RR is OK: `%s'", rr.String())
+		}
+	}
+}
+
+func TestParseFailure(t *testing.T) {
+	tests := []string{"miek.nl. IN A 327.0.0.1",
+		"miek.nl. IN AAAA ::x",
+		"miek.nl. IN MX a0 miek.nl.",
+		"miek.nl aap IN MX mx.miek.nl.",
+		"miek.nl 200 IN mxx 10 mx.miek.nl.",
+		"miek.nl. inn MX 10 mx.miek.nl.",
+		// "miek.nl. IN CNAME ", // actually valid nowadays, zero size rdata
+		"miek.nl. IN CNAME ..",
+		"miek.nl. PA MX 10 miek.nl.",
+		"miek.nl. ) IN MX 10 miek.nl.",
+	}
+
+	for _, s := range tests {
+		_, err := NewRR(s)
+		if err == nil {
+			t.Errorf("should have triggered an error: \"%s\"", s)
+		}
+	}
+}
+
+func TestZoneParsing(t *testing.T) {
+	// parse_test.db
+	db := `
+a.example.com.                IN A 127.0.0.1
+8db7._openpgpkey.example.com. IN OPENPGPKEY mQCNAzIG
+$ORIGIN a.example.com.
+test                          IN A 127.0.0.1
+                              IN SSHFP   1 2 (
+                                           BC6533CDC95A79078A39A56EA7635984ED655318ADA9
+                                           B6159E30723665DA95BB )
+$ORIGIN b.example.com.
+test                          IN CNAME test.a.example.com.
+`
+	start := time.Now().UnixNano()
+	to := ParseZone(strings.NewReader(db), "", "parse_test.db")
+	var i int
+	for x := range to {
+		i++
+		if x.Error != nil {
+			t.Error(x.Error)
+			continue
+		}
+		t.Log(x.RR)
+	}
+	delta := time.Now().UnixNano() - start
+	t.Logf("%d RRs parsed in %.2f s (%.2f RR/s)", i, float32(delta)/1e9, float32(i)/(float32(delta)/1e9))
+}
+
+func ExampleParseZone() {
+	zone := `$ORIGIN .
+$TTL 3600       ; 1 hour
+name                    IN SOA  a6.nstld.com. hostmaster.nic.name. (
+                                203362132  ; serial
+                                300        ; refresh (5 minutes)
+                                300        ; retry (5 minutes)
+                                1209600    ; expire (2 weeks)
+                                300        ; minimum (5 minutes)
+                                )
+$TTL 10800      ; 3 hours
+name.	10800	IN	NS	name.
+               IN       NS      g6.nstld.com.
+               7200     NS      h6.nstld.com.
+             3600 IN    NS      j6.nstld.com.
+             IN 3600    NS      k6.nstld.com.
+                        NS      l6.nstld.com.
+                        NS      a6.nstld.com.
+                        NS      c6.nstld.com.
+                        NS      d6.nstld.com.
+                        NS      f6.nstld.com.
+                        NS      m6.nstld.com.
+(
+			NS	m7.nstld.com.
+)
+$ORIGIN name.
+0-0onlus                NS      ns7.ehiweb.it.
+                        NS      ns8.ehiweb.it.
+0-g                     MX      10 mx01.nic
+                        MX      10 mx02.nic
+                        MX      10 mx03.nic
+                        MX      10 mx04.nic
+$ORIGIN 0-g.name
+moutamassey             NS      ns01.yahoodomains.jp.
+                        NS      ns02.yahoodomains.jp.
+`
+	to := ParseZone(strings.NewReader(zone), "", "testzone")
+	for x := range to {
+		fmt.Println(x.RR)
+	}
+	// Output:
+	// name.	3600	IN	SOA	a6.nstld.com. hostmaster.nic.name. 203362132 300 300 1209600 300
+	// name.	10800	IN	NS	name.
+	// name.	10800	IN	NS	g6.nstld.com.
+	// name.	7200	IN	NS	h6.nstld.com.
+	// name.	3600	IN	NS	j6.nstld.com.
+	// name.	3600	IN	NS	k6.nstld.com.
+	// name.	10800	IN	NS	l6.nstld.com.
+	// name.	10800	IN	NS	a6.nstld.com.
+	// name.	10800	IN	NS	c6.nstld.com.
+	// name.	10800	IN	NS	d6.nstld.com.
+	// name.	10800	IN	NS	f6.nstld.com.
+	// name.	10800	IN	NS	m6.nstld.com.
+	// name.	10800	IN	NS	m7.nstld.com.
+	// 0-0onlus.name.	10800	IN	NS	ns7.ehiweb.it.
+	// 0-0onlus.name.	10800	IN	NS	ns8.ehiweb.it.
+	// 0-g.name.	10800	IN	MX	10 mx01.nic.name.
+	// 0-g.name.	10800	IN	MX	10 mx02.nic.name.
+	// 0-g.name.	10800	IN	MX	10 mx03.nic.name.
+	// 0-g.name.	10800	IN	MX	10 mx04.nic.name.
+	// moutamassey.0-g.name.name.	10800	IN	NS	ns01.yahoodomains.jp.
+	// moutamassey.0-g.name.name.	10800	IN	NS	ns02.yahoodomains.jp.
+}
+
+func ExampleHIP() {
+	h := `www.example.com     IN  HIP ( 2 200100107B1A74DF365639CC39F1D578
+                AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p
+9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQ
+b1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D
+        rvs.example.com. )`
+	if hip, err := NewRR(h); err == nil {
+		fmt.Println(hip.String())
+	}
+	// Output:
+	// www.example.com.	3600	IN	HIP	2 200100107B1A74DF365639CC39F1D578 AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D rvs.example.com.
+}
+
+func TestHIP(t *testing.T) {
+	h := `www.example.com.      IN  HIP ( 2 200100107B1A74DF365639CC39F1D578
+                                AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p
+9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQ
+b1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D
+                                rvs1.example.com.
+                                rvs2.example.com. )`
+	rr, err := NewRR(h)
+	if err != nil {
+		t.Fatalf("failed to parse RR: %v", err)
+	}
+	t.Logf("RR: %s", rr)
+	msg := new(Msg)
+	msg.Answer = []RR{rr, rr}
+	bytes, err := msg.Pack()
+	if err != nil {
+		t.Fatalf("failed to pack msg: %v", err)
+	}
+	if err := msg.Unpack(bytes); err != nil {
+		t.Fatalf("failed to unpack msg: %v", err)
+	}
+	if len(msg.Answer) != 2 {
+		t.Fatalf("2 answers expected: %v", msg)
+	}
+	for i, rr := range msg.Answer {
+		rr := rr.(*HIP)
+		t.Logf("RR: %s", rr)
+		if l := len(rr.RendezvousServers); l != 2 {
+			t.Fatalf("2 servers expected, only %d in record %d:\n%v", l, i, msg)
+		}
+		for j, s := range []string{"rvs1.example.com.", "rvs2.example.com."} {
+			if rr.RendezvousServers[j] != s {
+				t.Fatalf("expected server %d of record %d to be %s:\n%v", j, i, s, msg)
+			}
+		}
+	}
+}
+
+func ExampleSOA() {
+	s := "example.com. 1000 SOA master.example.com. admin.example.com. 1 4294967294 4294967293 4294967295 100"
+	if soa, err := NewRR(s); err == nil {
+		fmt.Println(soa.String())
+	}
+	// Output:
+	// example.com.	1000	IN	SOA	master.example.com. admin.example.com. 1 4294967294 4294967293 4294967295 100
+}
+
+func TestLineNumberError(t *testing.T) {
+	s := "example.com. 1000 SOA master.example.com. admin.example.com. monkey 4294967294 4294967293 4294967295 100"
+	if _, err := NewRR(s); err != nil {
+		if err.Error() != "dns: bad SOA zone parameter: \"monkey\" at line: 1:68" {
+			t.Error("not expecting this error: ", err)
+		}
+	}
+}
+
+// Test with no known RR on the line
+func TestLineNumberError2(t *testing.T) {
+	tests := map[string]string{
+		"example.com. 1000 SO master.example.com. admin.example.com. 1 4294967294 4294967293 4294967295 100": "dns: expecting RR type or class, not this...: \"SO\" at line: 1:21",
+		"example.com 1000 IN TALINK a.example.com. b..example.com.":                                          "dns: bad TALINK NextName: \"b..example.com.\" at line: 1:57",
+		"example.com 1000 IN TALINK ( a.example.com. b..example.com. )":                                      "dns: bad TALINK NextName: \"b..example.com.\" at line: 1:60",
+		`example.com 1000 IN TALINK ( a.example.com.
+	bb..example.com. )`: "dns: bad TALINK NextName: \"bb..example.com.\" at line: 2:18",
+		// This is a bug, it should report an error on line 1, but the new is already processed.
+		`example.com 1000 IN TALINK ( a.example.com.  b...example.com.
+	)`: "dns: bad TALINK NextName: \"b...example.com.\" at line: 2:1"}
+
+	for in, errStr := range tests {
+		_, err := NewRR(in)
+		if err == nil {
+			t.Error("err is nil")
+		} else {
+			if err.Error() != errStr {
+				t.Errorf("%s: error should be %s is %v", in, errStr, err)
+			}
+		}
+	}
+}
+
+// Test if the calculations are correct
+func TestRfc1982(t *testing.T) {
+	// If the current time and the timestamp are more than 68 years apart
+	// it means the date has wrapped. 0 is 1970
+
+	// fall in the current 68 year span
+	strtests := []string{"20120525134203", "19700101000000", "20380119031408"}
+	for _, v := range strtests {
+		if x, _ := StringToTime(v); v != TimeToString(x) {
+			t.Errorf("1982 arithmetic string failure %s (%s:%d)", v, TimeToString(x), x)
+		}
+	}
+
+	inttests := map[uint32]string{0: "19700101000000",
+		1 << 31:   "20380119031408",
+		1<<32 - 1: "21060207062815",
+	}
+	for i, v := range inttests {
+		if TimeToString(i) != v {
+			t.Errorf("1982 arithmetic int failure %d:%s (%s)", i, v, TimeToString(i))
+		}
+	}
+
+	// Future tests, these dates get parsed to a date within the current 136 year span
+	future := map[string]string{"22680119031408": "20631123173144",
+		"19010101121212": "20370206184028",
+		"19210101121212": "20570206184028",
+		"19500101121212": "20860206184028",
+		"19700101000000": "19700101000000",
+		"19690101000000": "21050207062816",
+		"29210101121212": "21040522212236",
+	}
+	for from, to := range future {
+		x, _ := StringToTime(from)
+		y := TimeToString(x)
+		if y != to {
+			t.Errorf("1982 arithmetic future failure %s:%s (%s)", from, to, y)
+		}
+	}
+}
+
+func TestEmpty(t *testing.T) {
+	for range ParseZone(strings.NewReader(""), "", "") {
+		t.Errorf("should be empty")
+	}
+}
+
+func TestLowercaseTokens(t *testing.T) {
+	var testrecords = []string{
+		"example.org. 300 IN a 1.2.3.4",
+		"example.org. 300 in A 1.2.3.4",
+		"example.org. 300 in a 1.2.3.4",
+		"example.org. 300 a 1.2.3.4",
+		"example.org. 300 A 1.2.3.4",
+		"example.org. IN a 1.2.3.4",
+		"example.org. in A 1.2.3.4",
+		"example.org. in a 1.2.3.4",
+		"example.org. a 1.2.3.4",
+		"example.org. A 1.2.3.4",
+		"example.org. a 1.2.3.4",
+		"$ORIGIN example.org.\n a 1.2.3.4",
+		"$Origin example.org.\n a 1.2.3.4",
+		"$origin example.org.\n a 1.2.3.4",
+		"example.org. Class1 Type1 1.2.3.4",
+	}
+	for _, testrr := range testrecords {
+		_, err := NewRR(testrr)
+		if err != nil {
+			t.Errorf("failed to parse %#v, got %v", testrr, err)
+		}
+	}
+}
+
+func ExampleParseZone_generate() {
+	// From the manual: http://www.bind9.net/manual/bind/9.3.2/Bv9ARM.ch06.html#id2566761
+	zone := "$GENERATE 1-2 0 NS SERVER$.EXAMPLE.\n$GENERATE 1-8 $ CNAME $.0"
+	to := ParseZone(strings.NewReader(zone), "0.0.192.IN-ADDR.ARPA.", "")
+	for x := range to {
+		if x.Error == nil {
+			fmt.Println(x.RR.String())
+		}
+	}
+	// Output:
+	// 0.0.0.192.IN-ADDR.ARPA.	3600	IN	NS	SERVER1.EXAMPLE.
+	// 0.0.0.192.IN-ADDR.ARPA.	3600	IN	NS	SERVER2.EXAMPLE.
+	// 1.0.0.192.IN-ADDR.ARPA.	3600	IN	CNAME	1.0.0.0.192.IN-ADDR.ARPA.
+	// 2.0.0.192.IN-ADDR.ARPA.	3600	IN	CNAME	2.0.0.0.192.IN-ADDR.ARPA.
+	// 3.0.0.192.IN-ADDR.ARPA.	3600	IN	CNAME	3.0.0.0.192.IN-ADDR.ARPA.
+	// 4.0.0.192.IN-ADDR.ARPA.	3600	IN	CNAME	4.0.0.0.192.IN-ADDR.ARPA.
+	// 5.0.0.192.IN-ADDR.ARPA.	3600	IN	CNAME	5.0.0.0.192.IN-ADDR.ARPA.
+	// 6.0.0.192.IN-ADDR.ARPA.	3600	IN	CNAME	6.0.0.0.192.IN-ADDR.ARPA.
+	// 7.0.0.192.IN-ADDR.ARPA.	3600	IN	CNAME	7.0.0.0.192.IN-ADDR.ARPA.
+	// 8.0.0.192.IN-ADDR.ARPA.	3600	IN	CNAME	8.0.0.0.192.IN-ADDR.ARPA.
+}
+
+func TestSRVPacking(t *testing.T) {
+	msg := Msg{}
+
+	things := []string{"1.2.3.4:8484",
+		"45.45.45.45:8484",
+		"84.84.84.84:8484",
+	}
+
+	for i, n := range things {
+		h, p, err := net.SplitHostPort(n)
+		if err != nil {
+			continue
+		}
+		port, _ := strconv.ParseUint(p, 10, 16)
+
+		rr := &SRV{
+			Hdr: RR_Header{Name: "somename.",
+				Rrtype: TypeSRV,
+				Class:  ClassINET,
+				Ttl:    5},
+			Priority: uint16(i),
+			Weight:   5,
+			Port:     uint16(port),
+			Target:   h + ".",
+		}
+
+		msg.Answer = append(msg.Answer, rr)
+	}
+
+	_, err := msg.Pack()
+	if err != nil {
+		t.Fatalf("couldn't pack %v: %v", msg, err)
+	}
+}
+
+func TestParseBackslash(t *testing.T) {
+	if r, err := NewRR("nul\\000gap.test.globnix.net. 600 IN	A 192.0.2.10"); err != nil {
+		t.Errorf("could not create RR with \\000 in it")
+	} else {
+		t.Logf("parsed %s", r.String())
+	}
+	if r, err := NewRR(`nul\000gap.test.globnix.net. 600 IN TXT "Hello\123"`); err != nil {
+		t.Errorf("could not create RR with \\000 in it")
+	} else {
+		t.Logf("parsed %s", r.String())
+	}
+	if r, err := NewRR(`m\ @\ iek.nl. IN 3600 A 127.0.0.1`); err != nil {
+		t.Errorf("could not create RR with \\ and \\@ in it")
+	} else {
+		t.Logf("parsed %s", r.String())
+	}
+}
+
+func TestILNP(t *testing.T) {
+	tests := []string{
+		"host1.example.com.\t3600\tIN\tNID\t10 0014:4fff:ff20:ee64",
+		"host1.example.com.\t3600\tIN\tNID\t20 0015:5fff:ff21:ee65",
+		"host2.example.com.\t3600\tIN\tNID\t10 0016:6fff:ff22:ee66",
+		"host1.example.com.\t3600\tIN\tL32\t10 10.1.2.0",
+		"host1.example.com.\t3600\tIN\tL32\t20 10.1.4.0",
+		"host2.example.com.\t3600\tIN\tL32\t10 10.1.8.0",
+		"host1.example.com.\t3600\tIN\tL64\t10 2001:0DB8:1140:1000",
+		"host1.example.com.\t3600\tIN\tL64\t20 2001:0DB8:2140:2000",
+		"host2.example.com.\t3600\tIN\tL64\t10 2001:0DB8:4140:4000",
+		"host1.example.com.\t3600\tIN\tLP\t10 l64-subnet1.example.com.",
+		"host1.example.com.\t3600\tIN\tLP\t10 l64-subnet2.example.com.",
+		"host1.example.com.\t3600\tIN\tLP\t20 l32-subnet1.example.com.",
+	}
+	for _, t1 := range tests {
+		r, err := NewRR(t1)
+		if err != nil {
+			t.Fatalf("an error occurred: %v", err)
+		} else {
+			if t1 != r.String() {
+				t.Fatalf("strings should be equal %s %s", t1, r.String())
+			}
+		}
+	}
+}
+
+func TestGposEidNimloc(t *testing.T) {
+	dt := map[string]string{
+		"444433332222111199990123000000ff. NSAP-PTR foo.bar.com.": "444433332222111199990123000000ff.\t3600\tIN\tNSAP-PTR\tfoo.bar.com.",
+		"lillee. IN  GPOS -32.6882 116.8652 10.0":                 "lillee.\t3600\tIN\tGPOS\t-32.6882 116.8652 10.0",
+		"hinault. IN GPOS -22.6882 116.8652 250.0":                "hinault.\t3600\tIN\tGPOS\t-22.6882 116.8652 250.0",
+		"VENERA.   IN NIMLOC  75234159EAC457800920":               "VENERA.\t3600\tIN\tNIMLOC\t75234159EAC457800920",
+		"VAXA.     IN EID     3141592653589793":                   "VAXA.\t3600\tIN\tEID\t3141592653589793",
+	}
+	for i, o := range dt {
+		rr, err := NewRR(i)
+		if err != nil {
+			t.Error("failed to parse RR: ", err)
+			continue
+		}
+		if rr.String() != o {
+			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", i, o, rr.String())
+		} else {
+			t.Logf("RR is OK: `%s'", rr.String())
+		}
+	}
+}
+
+func TestPX(t *testing.T) {
+	dt := map[string]string{
+		"*.net2.it. IN PX 10 net2.it. PRMD-net2.ADMD-p400.C-it.":      "*.net2.it.\t3600\tIN\tPX\t10 net2.it. PRMD-net2.ADMD-p400.C-it.",
+		"ab.net2.it. IN PX 10 ab.net2.it. O-ab.PRMD-net2.ADMDb.C-it.": "ab.net2.it.\t3600\tIN\tPX\t10 ab.net2.it. O-ab.PRMD-net2.ADMDb.C-it.",
+	}
+	for i, o := range dt {
+		rr, err := NewRR(i)
+		if err != nil {
+			t.Error("failed to parse RR: ", err)
+			continue
+		}
+		if rr.String() != o {
+			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", i, o, rr.String())
+		} else {
+			t.Logf("RR is OK: `%s'", rr.String())
+		}
+	}
+}
+
+func TestComment(t *testing.T) {
+	// Comments we must see
+	comments := map[string]bool{"; this is comment 1": true,
+		"; this is comment 4": true, "; this is comment 6": true,
+		"; this is comment 7": true, "; this is comment 8": true}
+	zone := `
+foo. IN A 10.0.0.1 ; this is comment 1
+foo. IN A (
+	10.0.0.2 ; this is comment2
+)
+; this is comment3
+foo. IN A 10.0.0.3
+foo. IN A ( 10.0.0.4 ); this is comment 4
+
+foo. IN A 10.0.0.5
+; this is comment5
+
+foo. IN A 10.0.0.6
+
+foo. IN DNSKEY 256 3 5 AwEAAb+8l ; this is comment 6
+foo. IN NSEC miek.nl. TXT RRSIG NSEC; this is comment 7
+foo. IN TXT "THIS IS TEXT MAN"; this is comment 8
+`
+	for x := range ParseZone(strings.NewReader(zone), ".", "") {
+		if x.Error == nil {
+			if x.Comment != "" {
+				if _, ok := comments[x.Comment]; !ok {
+					t.Errorf("wrong comment %s", x.Comment)
+				}
+			}
+		}
+	}
+}
+
+func TestEUIxx(t *testing.T) {
+	tests := map[string]string{
+		"host.example. IN EUI48 00-00-5e-90-01-2a":       "host.example.\t3600\tIN\tEUI48\t00-00-5e-90-01-2a",
+		"host.example. IN EUI64 00-00-5e-ef-00-00-00-2a": "host.example.\t3600\tIN\tEUI64\t00-00-5e-ef-00-00-00-2a",
+	}
+	for i, o := range tests {
+		r, err := NewRR(i)
+		if err != nil {
+			t.Errorf("failed to parse %s: %v", i, err)
+		}
+		if r.String() != o {
+			t.Errorf("want %s, got %s", o, r.String())
+		}
+	}
+}
+
+func TestUserRR(t *testing.T) {
+	tests := map[string]string{
+		"host.example. IN UID 1234":              "host.example.\t3600\tIN\tUID\t1234",
+		"host.example. IN GID 1234556":           "host.example.\t3600\tIN\tGID\t1234556",
+		"host.example. IN UINFO \"Miek Gieben\"": "host.example.\t3600\tIN\tUINFO\t\"Miek Gieben\"",
+	}
+	for i, o := range tests {
+		r, err := NewRR(i)
+		if err != nil {
+			t.Errorf("failed to parse %s: %v", i, err)
+		}
+		if r.String() != o {
+			t.Errorf("want %s, got %s", o, r.String())
+		}
+	}
+}
+
+func TestTXT(t *testing.T) {
+	// Test single entry TXT record
+	rr, err := NewRR(`_raop._tcp.local. 60 IN TXT "single value"`)
+	if err != nil {
+		t.Error("failed to parse single value TXT record", err)
+	} else if rr, ok := rr.(*TXT); !ok {
+		t.Error("wrong type, record should be of type TXT")
+	} else {
+		if len(rr.Txt) != 1 {
+			t.Error("bad size of TXT value:", len(rr.Txt))
+		} else if rr.Txt[0] != "single value" {
+			t.Error("bad single value")
+		}
+		if rr.String() != `_raop._tcp.local.	60	IN	TXT	"single value"` {
+			t.Error("bad representation of TXT record:", rr.String())
+		}
+		if rr.len() != 28+1+12 {
+			t.Error("bad size of serialized record:", rr.len())
+		}
+	}
+
+	// Test multi entries TXT record
+	rr, err = NewRR(`_raop._tcp.local. 60 IN TXT "a=1" "b=2" "c=3" "d=4"`)
+	if err != nil {
+		t.Error("failed to parse multi-values TXT record", err)
+	} else if rr, ok := rr.(*TXT); !ok {
+		t.Error("wrong type, record should be of type TXT")
+	} else {
+		if len(rr.Txt) != 4 {
+			t.Error("bad size of TXT multi-value:", len(rr.Txt))
+		} else if rr.Txt[0] != "a=1" || rr.Txt[1] != "b=2" || rr.Txt[2] != "c=3" || rr.Txt[3] != "d=4" {
+			t.Error("bad values in TXT records")
+		}
+		if rr.String() != `_raop._tcp.local.	60	IN	TXT	"a=1" "b=2" "c=3" "d=4"` {
+			t.Error("bad representation of TXT multi value record:", rr.String())
+		}
+		if rr.len() != 28+1+3+1+3+1+3+1+3 {
+			t.Error("bad size of serialized multi value record:", rr.len())
+		}
+	}
+
+	// Test empty-string in TXT record
+	rr, err = NewRR(`_raop._tcp.local. 60 IN TXT ""`)
+	if err != nil {
+		t.Error("failed to parse empty-string TXT record", err)
+	} else if rr, ok := rr.(*TXT); !ok {
+		t.Error("wrong type, record should be of type TXT")
+	} else {
+		if len(rr.Txt) != 1 {
+			t.Error("bad size of TXT empty-string value:", len(rr.Txt))
+		} else if rr.Txt[0] != "" {
+			t.Error("bad value for empty-string TXT record")
+		}
+		if rr.String() != `_raop._tcp.local.	60	IN	TXT	""` {
+			t.Error("bad representation of empty-string TXT record:", rr.String())
+		}
+		if rr.len() != 28+1 {
+			t.Error("bad size of serialized record:", rr.len())
+		}
+	}
+
+	// Test TXT record with chunk larger than 255 bytes, they should be split up, by the parser
+	s := ""
+	for i := 0; i < 255; i++ {
+		s += "a"
+	}
+	s += "b"
+	rr, err = NewRR(`test.local. 60 IN TXT "` + s + `"`)
+	if err != nil {
+		t.Error("failed to parse empty-string TXT record", err)
+	}
+	if rr.(*TXT).Txt[1] != "b" {
+		t.Errorf("Txt should have two chunk, last one my be 'b', but is %s", rr.(*TXT).Txt[1])
+	}
+	t.Log(rr.String())
+}
+
+func TestTypeXXXX(t *testing.T) {
+	_, err := NewRR("example.com IN TYPE1234 \\# 4 aabbccdd")
+	if err != nil {
+		t.Errorf("failed to parse TYPE1234 RR: %v", err)
+	}
+	_, err = NewRR("example.com IN TYPE655341 \\# 8 aabbccddaabbccdd")
+	if err == nil {
+		t.Errorf("this should not work, for TYPE655341")
+	}
+	_, err = NewRR("example.com IN TYPE1 \\# 4 0a000001")
+	if err == nil {
+		t.Errorf("this should not work")
+	}
+}
+
+func TestPTR(t *testing.T) {
+	_, err := NewRR("144.2.0.192.in-addr.arpa. 900 IN PTR ilouse03146p0\\(.example.com.")
+	if err != nil {
+		t.Error("failed to parse ", err)
+	}
+}
+
+func TestDigit(t *testing.T) {
+	tests := map[string]byte{
+		"miek\\000.nl. 100 IN TXT \"A\"": 0,
+		"miek\\001.nl. 100 IN TXT \"A\"": 1,
+		"miek\\254.nl. 100 IN TXT \"A\"": 254,
+		"miek\\255.nl. 100 IN TXT \"A\"": 255,
+		"miek\\256.nl. 100 IN TXT \"A\"": 0,
+		"miek\\257.nl. 100 IN TXT \"A\"": 1,
+		"miek\\004.nl. 100 IN TXT \"A\"": 4,
+	}
+	for s, i := range tests {
+		r, err := NewRR(s)
+		buf := make([]byte, 40)
+		if err != nil {
+			t.Fatalf("failed to parse %v", err)
+		}
+		PackRR(r, buf, 0, nil, false)
+		t.Log(buf)
+		if buf[5] != i {
+			t.Fatalf("5 pos must be %d, is %d", i, buf[5])
+		}
+		r1, _, _ := UnpackRR(buf, 0)
+		if r1.Header().Ttl != 100 {
+			t.Fatalf("TTL should %d, is %d", 100, r1.Header().Ttl)
+		}
+	}
+}
+
+func TestParseRRSIGTimestamp(t *testing.T) {
+	tests := map[string]bool{
+		`miek.nl.  IN RRSIG SOA 8 2 43200 20140210031301 20140111031301 12051 miek.nl. MVZUyrYwq0iZhMFDDnVXD2BvuNiUJjSYlJAgzyAE6CF875BMvvZa+Sb0 RlSCL7WODQSQHhCx/fegHhVVF+Iz8N8kOLrmXD1+jO3Bm6Prl5UhcsPx WTBsg/kmxbp8sR1kvH4oZJtVfakG3iDerrxNaf0sQwhZzyfJQAqpC7pcBoc=`: true,
+		`miek.nl.  IN RRSIG SOA 8 2 43200 315565800 4102477800 12051 miek.nl. MVZUyrYwq0iZhMFDDnVXD2BvuNiUJjSYlJAgzyAE6CF875BMvvZa+Sb0 RlSCL7WODQSQHhCx/fegHhVVF+Iz8N8kOLrmXD1+jO3Bm6Prl5UhcsPx WTBsg/kmxbp8sR1kvH4oZJtVfakG3iDerrxNaf0sQwhZzyfJQAqpC7pcBoc=`:          true,
+	}
+	for r := range tests {
+		_, err := NewRR(r)
+		if err != nil {
+			t.Error(err)
+		}
+	}
+}
+
+func TestTxtEqual(t *testing.T) {
+	rr1 := new(TXT)
+	rr1.Hdr = RR_Header{Name: ".", Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}
+	rr1.Txt = []string{"a\"a", "\"", "b"}
+	rr2, _ := NewRR(rr1.String())
+	if rr1.String() != rr2.String() {
+		// This is not an error, but keep this test.
+		t.Errorf("these two TXT records should match:\n%s\n%s", rr1.String(), rr2.String())
+	}
+	t.Logf("%s\n%s", rr1.String(), rr2.String())
+}
+
+func TestTxtLong(t *testing.T) {
+	rr1 := new(TXT)
+	rr1.Hdr = RR_Header{Name: ".", Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}
+	// Make a long txt record, this breaks when sending the packet,
+	// but not earlier.
+	rr1.Txt = []string{"start-"}
+	for i := 0; i < 200; i++ {
+		rr1.Txt[0] += "start-"
+	}
+	str := rr1.String()
+	if len(str) < len(rr1.Txt[0]) {
+		t.Error("string conversion should work")
+	}
+}
+
+// Basically, don't crash.
+func TestMalformedPackets(t *testing.T) {
+	var packets = []string{
+		"0021641c0000000100000000000078787878787878787878787303636f6d0000100001",
+	}
+
+	// com = 63 6f 6d
+	for _, packet := range packets {
+		data, _ := hex.DecodeString(packet)
+		//		for _, v := range data {
+		//			t.Log(v)
+		//		}
+		var msg Msg
+		msg.Unpack(data)
+		//		println(msg.String())
+	}
+}
+
+type algorithm struct {
+	name uint8
+	bits int
+}
+
+func TestNewPrivateKey(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
+	algorithms := []algorithm{
+		{ECDSAP256SHA256, 256},
+		{ECDSAP384SHA384, 384},
+		{RSASHA1, 1024},
+		{RSASHA256, 2048},
+		{DSA, 1024},
+	}
+
+	for _, algo := range algorithms {
+		key := new(DNSKEY)
+		key.Hdr.Rrtype = TypeDNSKEY
+		key.Hdr.Name = "miek.nl."
+		key.Hdr.Class = ClassINET
+		key.Hdr.Ttl = 14400
+		key.Flags = 256
+		key.Protocol = 3
+		key.Algorithm = algo.name
+		privkey, err := key.Generate(algo.bits)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		newPrivKey, err := key.NewPrivateKey(key.PrivateKeyString(privkey))
+		if err != nil {
+			t.Error(key.String())
+			t.Error(key.PrivateKeyString(privkey))
+			t.Fatal(err)
+		}
+
+		switch newPrivKey := newPrivKey.(type) {
+		case *rsa.PrivateKey:
+			newPrivKey.Precompute()
+		}
+
+		if !reflect.DeepEqual(privkey, newPrivKey) {
+			t.Errorf("[%v] Private keys differ:\n%#v\n%#v", AlgorithmToString[algo.name], privkey, newPrivKey)
+		}
+	}
+}
+
+// special input test
+func TestNewRRSpecial(t *testing.T) {
+	var (
+		rr     RR
+		err    error
+		expect string
+	)
+
+	rr, err = NewRR("; comment")
+	expect = ""
+	if err != nil {
+		t.Errorf("unexpected err: %v", err)
+	}
+	if rr != nil {
+		t.Errorf("unexpected result: [%s] != [%s]", rr, expect)
+	}
+
+	rr, err = NewRR("")
+	expect = ""
+	if err != nil {
+		t.Errorf("unexpected err: %v", err)
+	}
+	if rr != nil {
+		t.Errorf("unexpected result: [%s] != [%s]", rr, expect)
+	}
+
+	rr, err = NewRR("$ORIGIN foo.")
+	expect = ""
+	if err != nil {
+		t.Errorf("unexpected err: %v", err)
+	}
+	if rr != nil {
+		t.Errorf("unexpected result: [%s] != [%s]", rr, expect)
+	}
+
+	rr, err = NewRR(" ")
+	expect = ""
+	if err != nil {
+		t.Errorf("unexpected err: %v", err)
+	}
+	if rr != nil {
+		t.Errorf("unexpected result: [%s] != [%s]", rr, expect)
+	}
+
+	rr, err = NewRR("\n")
+	expect = ""
+	if err != nil {
+		t.Errorf("unexpected err: %v", err)
+	}
+	if rr != nil {
+		t.Errorf("unexpected result: [%s] != [%s]", rr, expect)
+	}
+
+	rr, err = NewRR("foo. A 1.1.1.1\nbar. A 2.2.2.2")
+	expect = "foo.\t3600\tIN\tA\t1.1.1.1"
+	if err != nil {
+		t.Errorf("unexpected err: %v", err)
+	}
+	if rr == nil || rr.String() != expect {
+		t.Errorf("unexpected result: [%s] != [%s]", rr, expect)
+	}
+}
+
+func TestPrintfVerbsRdata(t *testing.T) {
+	x, _ := NewRR("www.miek.nl. IN MX 20 mx.miek.nl.")
+	if Field(x, 1) != "20" {
+		t.Errorf("should be 20")
+	}
+	if Field(x, 2) != "mx.miek.nl." {
+		t.Errorf("should be mx.miek.nl.")
+	}
+
+	x, _ = NewRR("www.miek.nl. IN A 127.0.0.1")
+	if Field(x, 1) != "127.0.0.1" {
+		t.Errorf("should be 127.0.0.1")
+	}
+
+	x, _ = NewRR("www.miek.nl. IN AAAA ::1")
+	if Field(x, 1) != "::1" {
+		t.Errorf("should be ::1")
+	}
+
+	x, _ = NewRR("www.miek.nl. IN NSEC a.miek.nl. A NS SOA MX AAAA")
+	if Field(x, 1) != "a.miek.nl." {
+		t.Errorf("should be a.miek.nl.")
+	}
+	if Field(x, 2) != "A NS SOA MX AAAA" {
+		t.Errorf("should be A NS SOA MX AAAA")
+	}
+
+	x, _ = NewRR("www.miek.nl. IN TXT \"first\" \"second\"")
+	if Field(x, 1) != "first second" {
+		t.Errorf("should be first second")
+	}
+	if Field(x, 0) != "" {
+		t.Errorf("should be empty")
+	}
+}
+
+func TestParseTokenOverflow(t *testing.T) {
+	_, err := NewRR("_443._tcp.example.org. IN TLSA 0 0 0 308205e8308204d0a00302010202100411de8f53b462f6a5a861b712ec6b59300d06092a864886f70d01010b05003070310b300906035504061302555331153013060355040a130c446967694365727420496e6331193017060355040b13107777772e64696769636572742e636f6d312f302d06035504031326446967694365727420534841322048696768204173737572616e636520536572766572204341301e170d3134313130363030303030305a170d3135313131333132303030305a3081a5310b3009060355040613025553311330110603550408130a43616c69666f726e6961311430120603550407130b4c6f7320416e67656c6573313c303a060355040a1333496e7465726e657420436f72706f726174696f6e20666f722041737369676e6564204e616d657320616e64204e756d6265727331133011060355040b130a546563686e6f6c6f6779311830160603550403130f7777772e6578616d706c652e6f726730820122300d06092a864886f70d01010105000382010f003082010a02820101009e663f52a3d18cb67cdfed547408a4e47e4036538988da2798da3b6655f7240d693ed1cb3fe6d6ad3a9e657ff6efa86b83b0cad24e5d31ff2bf70ec3b78b213f1b4bf61bdc669cbbc07d67154128ca92a9b3cbb4213a836fb823ddd4d7cc04918314d25f06086fa9970ba17e357cca9b458c27eb71760ab95e3f9bc898ae89050ae4d09ba2f7e4259d9ff1e072a6971b18355a8b9e53670c3d5dbdbd283f93a764e71b3a4140ca0746090c08510e2e21078d7d07844bf9c03865b531a0bf2ee766bc401f6451c5a1e6f6fb5d5c1d6a97a0abe91ae8b02e89241e07353909ccd5b41c46de207c06801e08f20713603827f2ae3e68cf15ef881d7e0608f70742e30203010001a382024630820242301f0603551d230418301680145168ff90af0207753cccd9656462a212b859723b301d0603551d0e04160414b000a7f422e9b1ce216117c4c46e7164c8e60c553081810603551d11047a3078820f7777772e6578616d706c652e6f7267820b6578616d706c652e636f6d820b6578616d706c652e656475820b6578616d706c652e6e6574820b6578616d706c652e6f7267820f7777772e6578616d706c652e636f6d820f7777772e6578616d706c652e656475820f7777772e6578616d706c652e6e6574300e0603551d0f0101ff0404030205a0301d0603551d250416301406082b0601050507030106082b0601050507030230750603551d1f046e306c3034a032a030862e687474703a2f2f63726c332e64696769636572742e636f6d2f736861322d68612d7365727665722d67332e63726c3034a032a030862e687474703a2f2f63726c342e64696769636572742e636f6d2f736861322d68612d7365727665722d67332e63726c30420603551d20043b3039303706096086480186fd6c0101302a302806082b06010505070201161c68747470733a2f2f7777772e64696769636572742e636f6d2f43505330818306082b0601050507010104773075302406082b060105050730018618687474703a2f2f6f6373702e64696769636572742e636f6d304d06082b060105050730028641687474703a2f2f636163657274732e64696769636572742e636f6d2f446967694365727453484132486967684173737572616e636553657276657243412e637274300c0603551d130101ff04023000300d06092a864886f70d01010b050003820101005eac2124dedb3978a86ff3608406acb542d3cb54cb83facd63aec88144d6a1bf15dbf1f215c4a73e241e582365cba9ea50dd306541653b3513af1a0756c1b2720e8d112b34fb67181efad9c4609bdc670fb025fa6e6d42188161b026cf3089a08369c2f3609fc84bcc3479140c1922ede430ca8dbac2b2a3cdacb305ba15dc7361c4c3a5e6daa99cb446cb221b28078a7a944efba70d96f31ac143d959bccd2fd50e30c325ea2624fb6b6dbe9344dbcf133bfbd5b4e892d635dbf31596451672c6b65ba5ac9b3cddea92b35dab1065cae3c8cb6bb450a62ea2f72ea7c6bdc7b65fa09b012392543734083c7687d243f8d0375304d99ccd2e148966a8637a6797")
+	if err == nil {
+		t.Fatalf("token overflow should return an error")
+	}
+	t.Logf("err: %s\n", err)
+}
+
+func TestParseTLSA(t *testing.T) {
+	lt := []string{
+		"_443._tcp.example.org.\t3600\tIN\tTLSA\t1 1 1 c22be239f483c08957bc106219cc2d3ac1a308dfbbdd0a365f17b9351234cf00",
+		"_443._tcp.example.org.\t3600\tIN\tTLSA\t2 1 2 4e85f45179e9cd6e0e68e2eb5be2e85ec9b92d91c609caf3ef0315213e3f92ece92c38397a607214de95c7fadc0ad0f1c604a469a0387959745032c0d51492f3",
+		"_443._tcp.example.org.\t3600\tIN\tTLSA\t3 0 2 69ec8d2277360b215d0cd956b0e2747108dff34b27d461a41c800629e38ee6c2d1230cc9e8e36711330adc6766e6ff7c5fbb37f106f248337c1a20ad682888d2",
+	}
+	for _, o := range lt {
+		rr, err := NewRR(o)
+		if err != nil {
+			t.Error("failed to parse RR: ", err)
+			continue
+		}
+		if rr.String() != o {
+			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", o, o, rr.String())
+		} else {
+			t.Logf("RR is OK: `%s'", rr.String())
+		}
+	}
+}
+
+func TestParseSMIMEA(t *testing.T) {
+	lt := map[string]string{
+		"2e85e1db3e62be6ea._smimecert.example.com.\t3600\tIN\tSMIMEA\t1 1 2 bd80f334566928fc18f58df7e4928c1886f48f71ca3fd41cd9b1854aca7c2180aaacad2819612ed68e7bd3701cc39be7f2529b017c0bc6a53e8fb3f0c7d48070":   "2e85e1db3e62be6ea._smimecert.example.com.\t3600\tIN\tSMIMEA\t1 1 2 bd80f334566928fc18f58df7e4928c1886f48f71ca3fd41cd9b1854aca7c2180aaacad2819612ed68e7bd3701cc39be7f2529b017c0bc6a53e8fb3f0c7d48070",
+		"2e85e1db3e62be6ea._smimecert.example.com.\t3600\tIN\tSMIMEA\t0 0 1 cdcf0fc66b182928c5217ddd42c826983f5a4b94160ee6c1c9be62d38199f710":                                                                   "2e85e1db3e62be6ea._smimecert.example.com.\t3600\tIN\tSMIMEA\t0 0 1 cdcf0fc66b182928c5217ddd42c826983f5a4b94160ee6c1c9be62d38199f710",
+		"2e85e1db3e62be6ea._smimecert.example.com.\t3600\tIN\tSMIMEA\t3 0 2 499a1eda2af8828b552cdb9d80c3744a25872fddd73f3898d8e4afa3549595d2dd4340126e759566fe8c26b251fa0c887ba4869f011a65f7e79967c2eb729f5b":   "2e85e1db3e62be6ea._smimecert.example.com.\t3600\tIN\tSMIMEA\t3 0 2 499a1eda2af8828b552cdb9d80c3744a25872fddd73f3898d8e4afa3549595d2dd4340126e759566fe8c26b251fa0c887ba4869f011a65f7e79967c2eb729f5b",
+		"2e85e1db3e62be6eb._smimecert.example.com.\t3600\tIN\tSMIMEA\t3 0 2 499a1eda2af8828b552cdb9d80c3744a25872fddd73f3898d8e4afa3549595d2dd4340126e759566fe8 c26b251fa0c887ba4869f01 1a65f7e79967c2eb729f5b": "2e85e1db3e62be6eb._smimecert.example.com.\t3600\tIN\tSMIMEA\t3 0 2 499a1eda2af8828b552cdb9d80c3744a25872fddd73f3898d8e4afa3549595d2dd4340126e759566fe8c26b251fa0c887ba4869f011a65f7e79967c2eb729f5b",
+	}
+	for i, o := range lt {
+		rr, err := NewRR(i)
+		if err != nil {
+			t.Error("failed to parse RR: ", err)
+			continue
+		}
+		if rr.String() != o {
+			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", o, o, rr.String())
+		} else {
+			t.Logf("RR is OK: `%s'", rr.String())
+		}
+	}
+}
+
+func TestParseSSHFP(t *testing.T) {
+	lt := []string{
+		"test.example.org.\t300\tSSHFP\t1 2 (\n" +
+			"\t\t\t\t\tBC6533CDC95A79078A39A56EA7635984ED655318ADA9\n" +
+			"\t\t\t\t\tB6159E30723665DA95BB )",
+		"test.example.org.\t300\tSSHFP\t1 2 ( BC6533CDC  95A79078A39A56EA7635984ED655318AD  A9B6159E3072366 5DA95BB )",
+	}
+	result := "test.example.org.\t300\tIN\tSSHFP\t1 2 BC6533CDC95A79078A39A56EA7635984ED655318ADA9B6159E30723665DA95BB"
+	for _, o := range lt {
+		rr, err := NewRR(o)
+		if err != nil {
+			t.Error("failed to parse RR: ", err)
+			continue
+		}
+		if rr.String() != result {
+			t.Errorf("`%s' should be equal to\n\n`%s', but is     \n`%s'", o, result, rr.String())
+		} else {
+			t.Logf("RR is OK: `%s'", rr.String())
+		}
+	}
+}
+
+func TestParseHINFO(t *testing.T) {
+	dt := map[string]string{
+		"example.net. HINFO A B": "example.net.	3600	IN	HINFO	\"A\" \"B\"",
+		"example.net. HINFO \"A\" \"B\"": "example.net.	3600	IN	HINFO	\"A\" \"B\"",
+		"example.net. HINFO A B C D E F": "example.net.	3600	IN	HINFO	\"A\" \"B C D E F\"",
+		"example.net. HINFO AB": "example.net.	3600	IN	HINFO	\"AB\" \"\"",
+		// "example.net. HINFO PC-Intel-700mhz \"Redhat Linux 7.1\"": "example.net.	3600	IN	HINFO	\"PC-Intel-700mhz\" \"Redhat Linux 7.1\"",
+		// This one is recommended in Pro Bind book http://www.zytrax.com/books/dns/ch8/hinfo.html
+		// but effectively, even Bind would replace it to correctly formed text when you AXFR
+		// TODO: remove this set of comments or figure support for quoted/unquoted combinations in endingToTxtSlice function
+	}
+	for i, o := range dt {
+		rr, err := NewRR(i)
+		if err != nil {
+			t.Error("failed to parse RR: ", err)
+			continue
+		}
+		if rr.String() != o {
+			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", i, o, rr.String())
+		} else {
+			t.Logf("RR is OK: `%s'", rr.String())
+		}
+	}
+}
+
+func TestParseCAA(t *testing.T) {
+	lt := map[string]string{
+		"example.net.	CAA	0 issue \"symantec.com\"": "example.net.\t3600\tIN\tCAA\t0 issue \"symantec.com\"",
+		"example.net.	CAA	0 issuewild \"symantec.com; stuff\"": "example.net.\t3600\tIN\tCAA\t0 issuewild \"symantec.com; stuff\"",
+		"example.net.	CAA	128 tbs \"critical\"": "example.net.\t3600\tIN\tCAA\t128 tbs \"critical\"",
+		"example.net.	CAA	2 auth \"0>09\\006\\010+\\006\\001\\004\\001\\214y\\002\\003\\001\\006\\009`\\134H\\001e\\003\\004\\002\\001\\004 y\\209\\012\\221r\\220\\156Q\\218\\150\\150{\\166\\245:\\231\\182%\\157:\\133\\179}\\1923r\\238\\151\\255\\128q\\145\\002\\001\\000\"": "example.net.\t3600\tIN\tCAA\t2 auth \"0>09\\006\\010+\\006\\001\\004\\001\\214y\\002\\003\\001\\006\\009`\\134H\\001e\\003\\004\\002\\001\\004 y\\209\\012\\221r\\220\\156Q\\218\\150\\150{\\166\\245:\\231\\182%\\157:\\133\\179}\\1923r\\238\\151\\255\\128q\\145\\002\\001\\000\"",
+		"example.net.   TYPE257	0 issue \"symantec.com\"": "example.net.\t3600\tIN\tCAA\t0 issue \"symantec.com\"",
+	}
+	for i, o := range lt {
+		rr, err := NewRR(i)
+		if err != nil {
+			t.Error("failed to parse RR: ", err)
+			continue
+		}
+		if rr.String() != o {
+			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", i, o, rr.String())
+		} else {
+			t.Logf("RR is OK: `%s'", rr.String())
+		}
+	}
+}
+
+func TestPackCAA(t *testing.T) {
+	m := new(Msg)
+	record := new(CAA)
+	record.Hdr = RR_Header{Name: "example.com.", Rrtype: TypeCAA, Class: ClassINET, Ttl: 0}
+	record.Tag = "issue"
+	record.Value = "symantec.com"
+	record.Flag = 1
+
+	m.Answer = append(m.Answer, record)
+	bytes, err := m.Pack()
+	if err != nil {
+		t.Fatalf("failed to pack msg: %v", err)
+	}
+	if err := m.Unpack(bytes); err != nil {
+		t.Fatalf("failed to unpack msg: %v", err)
+	}
+	if len(m.Answer) != 1 {
+		t.Fatalf("incorrect number of answers unpacked")
+	}
+	rr := m.Answer[0].(*CAA)
+	if rr.Tag != "issue" {
+		t.Fatalf("invalid tag for unpacked answer")
+	} else if rr.Value != "symantec.com" {
+		t.Fatalf("invalid value for unpacked answer")
+	} else if rr.Flag != 1 {
+		t.Fatalf("invalid flag for unpacked answer")
+	}
+}
+
+func TestParseURI(t *testing.T) {
+	lt := map[string]string{
+		"_http._tcp. IN URI   10 1 \"http://www.example.com/path\"": "_http._tcp.\t3600\tIN\tURI\t10 1 \"http://www.example.com/path\"",
+		"_http._tcp. IN URI   10 1 \"\"":                            "_http._tcp.\t3600\tIN\tURI\t10 1 \"\"",
+	}
+	for i, o := range lt {
+		rr, err := NewRR(i)
+		if err != nil {
+			t.Error("failed to parse RR: ", err)
+			continue
+		}
+		if rr.String() != o {
+			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", i, o, rr.String())
+		} else {
+			t.Logf("RR is OK: `%s'", rr.String())
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/dns/privaterr.go b/vendor/github.com/miekg/dns/privaterr.go
new file mode 100644
index 0000000000..6b08e6e959
--- /dev/null
+++ b/vendor/github.com/miekg/dns/privaterr.go
@@ -0,0 +1,149 @@
+package dns
+
+import (
+	"fmt"
+	"strings"
+)
+
+// PrivateRdata is an interface used for implementing "Private Use" RR types, see
+// RFC 6895. This allows one to experiment with new RR types, without requesting an
+// official type code. Also see dns.PrivateHandle and dns.PrivateHandleRemove.
+type PrivateRdata interface {
+	// String returns the text presentaton of the Rdata of the Private RR.
+	String() string
+	// Parse parses the Rdata of the private RR.
+	Parse([]string) error
+	// Pack is used when packing a private RR into a buffer.
+	Pack([]byte) (int, error)
+	// Unpack is used when unpacking a private RR from a buffer.
+	// TODO(miek): diff. signature than Pack, see edns0.go for instance.
+	Unpack([]byte) (int, error)
+	// Copy copies the Rdata.
+	Copy(PrivateRdata) error
+	// Len returns the length in octets of the Rdata.
+	Len() int
+}
+
+// PrivateRR represents an RR that uses a PrivateRdata user-defined type.
+// It mocks normal RRs and implements dns.RR interface.
+type PrivateRR struct {
+	Hdr  RR_Header
+	Data PrivateRdata
+}
+
+func mkPrivateRR(rrtype uint16) *PrivateRR {
+	// Panics if RR is not an instance of PrivateRR.
+	rrfunc, ok := TypeToRR[rrtype]
+	if !ok {
+		panic(fmt.Sprintf("dns: invalid operation with Private RR type %d", rrtype))
+	}
+
+	anyrr := rrfunc()
+	switch rr := anyrr.(type) {
+	case *PrivateRR:
+		return rr
+	}
+	panic(fmt.Sprintf("dns: RR is not a PrivateRR, TypeToRR[%d] generator returned %T", rrtype, anyrr))
+}
+
+// Header return the RR header of r.
+func (r *PrivateRR) Header() *RR_Header { return &r.Hdr }
+
+func (r *PrivateRR) String() string { return r.Hdr.String() + r.Data.String() }
+
+// Private len and copy parts to satisfy RR interface.
+func (r *PrivateRR) len() int { return r.Hdr.len() + r.Data.Len() }
+func (r *PrivateRR) copy() RR {
+	// make new RR like this:
+	rr := mkPrivateRR(r.Hdr.Rrtype)
+	newh := r.Hdr.copyHeader()
+	rr.Hdr = *newh
+
+	err := r.Data.Copy(rr.Data)
+	if err != nil {
+		panic("dns: got value that could not be used to copy Private rdata")
+	}
+	return rr
+}
+func (r *PrivateRR) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := r.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	n, err := r.Data.Pack(msg[off:])
+	if err != nil {
+		return len(msg), err
+	}
+	off += n
+	r.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+// PrivateHandle registers a private resource record type. It requires
+// string and numeric representation of private RR type and generator function as argument.
+func PrivateHandle(rtypestr string, rtype uint16, generator func() PrivateRdata) {
+	rtypestr = strings.ToUpper(rtypestr)
+
+	TypeToRR[rtype] = func() RR { return &PrivateRR{RR_Header{}, generator()} }
+	TypeToString[rtype] = rtypestr
+	StringToType[rtypestr] = rtype
+
+	typeToUnpack[rtype] = func(h RR_Header, msg []byte, off int) (RR, int, error) {
+		if noRdata(h) {
+			return &h, off, nil
+		}
+		var err error
+
+		rr := mkPrivateRR(h.Rrtype)
+		rr.Hdr = h
+
+		off1, err := rr.Data.Unpack(msg[off:])
+		off += off1
+		if err != nil {
+			return rr, off, err
+		}
+		return rr, off, err
+	}
+
+	setPrivateRR := func(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+		rr := mkPrivateRR(h.Rrtype)
+		rr.Hdr = h
+
+		var l lex
+		text := make([]string, 0, 2) // could be 0..N elements, median is probably 1
+	Fetch:
+		for {
+			// TODO(miek): we could also be returning _QUOTE, this might or might not
+			// be an issue (basically parsing TXT becomes hard)
+			switch l = <-c; l.value {
+			case zNewline, zEOF:
+				break Fetch
+			case zString:
+				text = append(text, l.token)
+			}
+		}
+
+		err := rr.Data.Parse(text)
+		if err != nil {
+			return nil, &ParseError{f, err.Error(), l}, ""
+		}
+
+		return rr, nil, ""
+	}
+
+	typeToparserFunc[rtype] = parserFunc{setPrivateRR, true}
+}
+
+// PrivateHandleRemove removes defenitions required to support private RR type.
+func PrivateHandleRemove(rtype uint16) {
+	rtypestr, ok := TypeToString[rtype]
+	if ok {
+		delete(TypeToRR, rtype)
+		delete(TypeToString, rtype)
+		delete(typeToparserFunc, rtype)
+		delete(StringToType, rtypestr)
+		delete(typeToUnpack, rtype)
+	}
+	return
+}
diff --git a/vendor/github.com/miekg/dns/privaterr_test.go b/vendor/github.com/miekg/dns/privaterr_test.go
new file mode 100644
index 0000000000..72ec8f5c01
--- /dev/null
+++ b/vendor/github.com/miekg/dns/privaterr_test.go
@@ -0,0 +1,171 @@
+package dns_test
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/miekg/dns"
+)
+
+const TypeISBN uint16 = 0xFF00
+
+// A crazy new RR type :)
+type ISBN struct {
+	x string // rdata with 10 or 13 numbers, dashes or spaces allowed
+}
+
+func NewISBN() dns.PrivateRdata { return &ISBN{""} }
+
+func (rd *ISBN) Len() int       { return len([]byte(rd.x)) }
+func (rd *ISBN) String() string { return rd.x }
+
+func (rd *ISBN) Parse(txt []string) error {
+	rd.x = strings.TrimSpace(strings.Join(txt, " "))
+	return nil
+}
+
+func (rd *ISBN) Pack(buf []byte) (int, error) {
+	b := []byte(rd.x)
+	n := copy(buf, b)
+	if n != len(b) {
+		return n, dns.ErrBuf
+	}
+	return n, nil
+}
+
+func (rd *ISBN) Unpack(buf []byte) (int, error) {
+	rd.x = string(buf)
+	return len(buf), nil
+}
+
+func (rd *ISBN) Copy(dest dns.PrivateRdata) error {
+	isbn, ok := dest.(*ISBN)
+	if !ok {
+		return dns.ErrRdata
+	}
+	isbn.x = rd.x
+	return nil
+}
+
+var testrecord = strings.Join([]string{"example.org.", "3600", "IN", "ISBN", "12-3 456789-0-123"}, "\t")
+
+func TestPrivateText(t *testing.T) {
+	dns.PrivateHandle("ISBN", TypeISBN, NewISBN)
+	defer dns.PrivateHandleRemove(TypeISBN)
+
+	rr, err := dns.NewRR(testrecord)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if rr.String() != testrecord {
+		t.Errorf("record string representation did not match original %#v != %#v", rr.String(), testrecord)
+	} else {
+		t.Log(rr.String())
+	}
+}
+
+func TestPrivateByteSlice(t *testing.T) {
+	dns.PrivateHandle("ISBN", TypeISBN, NewISBN)
+	defer dns.PrivateHandleRemove(TypeISBN)
+
+	rr, err := dns.NewRR(testrecord)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	buf := make([]byte, 100)
+	off, err := dns.PackRR(rr, buf, 0, nil, false)
+	if err != nil {
+		t.Errorf("got error packing ISBN: %v", err)
+	}
+
+	custrr := rr.(*dns.PrivateRR)
+	if ln := custrr.Data.Len() + len(custrr.Header().Name) + 11; ln != off {
+		t.Errorf("offset is not matching to length of Private RR: %d!=%d", off, ln)
+	}
+
+	rr1, off1, err := dns.UnpackRR(buf[:off], 0)
+	if err != nil {
+		t.Errorf("got error unpacking ISBN: %v", err)
+		return
+	}
+
+	if off1 != off {
+		t.Errorf("offset after unpacking differs: %d != %d", off1, off)
+	}
+
+	if rr1.String() != testrecord {
+		t.Errorf("record string representation did not match original %#v != %#v", rr1.String(), testrecord)
+	} else {
+		t.Log(rr1.String())
+	}
+}
+
+const TypeVERSION uint16 = 0xFF01
+
+type VERSION struct {
+	x string
+}
+
+func NewVersion() dns.PrivateRdata { return &VERSION{""} }
+
+func (rd *VERSION) String() string { return rd.x }
+func (rd *VERSION) Parse(txt []string) error {
+	rd.x = strings.TrimSpace(strings.Join(txt, " "))
+	return nil
+}
+
+func (rd *VERSION) Pack(buf []byte) (int, error) {
+	b := []byte(rd.x)
+	n := copy(buf, b)
+	if n != len(b) {
+		return n, dns.ErrBuf
+	}
+	return n, nil
+}
+
+func (rd *VERSION) Unpack(buf []byte) (int, error) {
+	rd.x = string(buf)
+	return len(buf), nil
+}
+
+func (rd *VERSION) Copy(dest dns.PrivateRdata) error {
+	isbn, ok := dest.(*VERSION)
+	if !ok {
+		return dns.ErrRdata
+	}
+	isbn.x = rd.x
+	return nil
+}
+
+func (rd *VERSION) Len() int {
+	return len([]byte(rd.x))
+}
+
+var smallzone = `$ORIGIN example.org.
+@ SOA	sns.dns.icann.org. noc.dns.icann.org. (
+		2014091518 7200 3600 1209600 3600
+)
+    A   1.2.3.4
+ok ISBN 1231-92110-12
+go VERSION (
+	1.3.1 ; comment
+)
+www ISBN 1231-92110-16
+*  CNAME @
+`
+
+func TestPrivateZoneParser(t *testing.T) {
+	dns.PrivateHandle("ISBN", TypeISBN, NewISBN)
+	dns.PrivateHandle("VERSION", TypeVERSION, NewVersion)
+	defer dns.PrivateHandleRemove(TypeISBN)
+	defer dns.PrivateHandleRemove(TypeVERSION)
+
+	r := strings.NewReader(smallzone)
+	for x := range dns.ParseZone(r, ".", "") {
+		if err := x.Error; err != nil {
+			t.Fatal(err)
+		}
+		t.Log(x.RR)
+	}
+}
diff --git a/vendor/github.com/miekg/dns/rawmsg.go b/vendor/github.com/miekg/dns/rawmsg.go
new file mode 100644
index 0000000000..6e21fba7e1
--- /dev/null
+++ b/vendor/github.com/miekg/dns/rawmsg.go
@@ -0,0 +1,49 @@
+package dns
+
+import "encoding/binary"
+
+// rawSetRdlength sets the rdlength in the header of
+// the RR. The offset 'off' must be positioned at the
+// start of the header of the RR, 'end' must be the
+// end of the RR.
+func rawSetRdlength(msg []byte, off, end int) bool {
+	l := len(msg)
+Loop:
+	for {
+		if off+1 > l {
+			return false
+		}
+		c := int(msg[off])
+		off++
+		switch c & 0xC0 {
+		case 0x00:
+			if c == 0x00 {
+				// End of the domainname
+				break Loop
+			}
+			if off+c > l {
+				return false
+			}
+			off += c
+
+		case 0xC0:
+			// pointer, next byte included, ends domainname
+			off++
+			break Loop
+		}
+	}
+	// The domainname has been seen, we at the start of the fixed part in the header.
+	// Type is 2 bytes, class is 2 bytes, ttl 4 and then 2 bytes for the length.
+	off += 2 + 2 + 4
+	if off+2 > l {
+		return false
+	}
+	//off+1 is the end of the header, 'end' is the end of the rr
+	//so 'end' - 'off+2' is the length of the rdata
+	rdatalen := end - (off + 2)
+	if rdatalen > 0xFFFF {
+		return false
+	}
+	binary.BigEndian.PutUint16(msg[off:], uint16(rdatalen))
+	return true
+}
diff --git a/vendor/github.com/miekg/dns/remote_test.go b/vendor/github.com/miekg/dns/remote_test.go
new file mode 100644
index 0000000000..4cf701fe43
--- /dev/null
+++ b/vendor/github.com/miekg/dns/remote_test.go
@@ -0,0 +1,19 @@
+package dns
+
+import "testing"
+
+const LinodeAddr = "176.58.119.54:53"
+
+func TestClientRemote(t *testing.T) {
+	m := new(Msg)
+	m.SetQuestion("go.dns.miek.nl.", TypeTXT)
+
+	c := new(Client)
+	r, _, err := c.Exchange(m, LinodeAddr)
+	if err != nil {
+		t.Errorf("failed to exchange: %v", err)
+	}
+	if r != nil && r.Rcode != RcodeSuccess {
+		t.Errorf("failed to get an valid answer\n%v", r)
+	}
+}
diff --git a/vendor/github.com/miekg/dns/reverse.go b/vendor/github.com/miekg/dns/reverse.go
new file mode 100644
index 0000000000..f6e7a47a6e
--- /dev/null
+++ b/vendor/github.com/miekg/dns/reverse.go
@@ -0,0 +1,38 @@
+package dns
+
+// StringToType is the reverse of TypeToString, needed for string parsing.
+var StringToType = reverseInt16(TypeToString)
+
+// StringToClass is the reverse of ClassToString, needed for string parsing.
+var StringToClass = reverseInt16(ClassToString)
+
+// StringToOpcode is a map of opcodes to strings.
+var StringToOpcode = reverseInt(OpcodeToString)
+
+// StringToRcode is a map of rcodes to strings.
+var StringToRcode = reverseInt(RcodeToString)
+
+// Reverse a map
+func reverseInt8(m map[uint8]string) map[string]uint8 {
+	n := make(map[string]uint8, len(m))
+	for u, s := range m {
+		n[s] = u
+	}
+	return n
+}
+
+func reverseInt16(m map[uint16]string) map[string]uint16 {
+	n := make(map[string]uint16, len(m))
+	for u, s := range m {
+		n[s] = u
+	}
+	return n
+}
+
+func reverseInt(m map[int]string) map[string]int {
+	n := make(map[string]int, len(m))
+	for u, s := range m {
+		n[s] = u
+	}
+	return n
+}
diff --git a/vendor/github.com/miekg/dns/sanitize.go b/vendor/github.com/miekg/dns/sanitize.go
new file mode 100644
index 0000000000..b489f3f050
--- /dev/null
+++ b/vendor/github.com/miekg/dns/sanitize.go
@@ -0,0 +1,84 @@
+package dns
+
+// Dedup removes identical RRs from rrs. It preserves the original ordering.
+// The lowest TTL of any duplicates is used in the remaining one. Dedup modifies
+// rrs.
+// m is used to store the RRs temporay. If it is nil a new map will be allocated.
+func Dedup(rrs []RR, m map[string]RR) []RR {
+	if m == nil {
+		m = make(map[string]RR)
+	}
+	// Save the keys, so we don't have to call normalizedString twice.
+	keys := make([]*string, 0, len(rrs))
+
+	for _, r := range rrs {
+		key := normalizedString(r)
+		keys = append(keys, &key)
+		if _, ok := m[key]; ok {
+			// Shortest TTL wins.
+			if m[key].Header().Ttl > r.Header().Ttl {
+				m[key].Header().Ttl = r.Header().Ttl
+			}
+			continue
+		}
+
+		m[key] = r
+	}
+	// If the length of the result map equals the amount of RRs we got,
+	// it means they were all different. We can then just return the original rrset.
+	if len(m) == len(rrs) {
+		return rrs
+	}
+
+	j := 0
+	for i, r := range rrs {
+		// If keys[i] lives in the map, we should copy and remove it.
+		if _, ok := m[*keys[i]]; ok {
+			delete(m, *keys[i])
+			rrs[j] = r
+			j++
+		}
+
+		if len(m) == 0 {
+			break
+		}
+	}
+
+	return rrs[:j]
+}
+
+// normalizedString returns a normalized string from r. The TTL
+// is removed and the domain name is lowercased. We go from this:
+// DomainName<TAB>TTL<TAB>CLASS<TAB>TYPE<TAB>RDATA to:
+// lowercasename<TAB>CLASS<TAB>TYPE...
+func normalizedString(r RR) string {
+	// A string Go DNS makes has: domainname<TAB>TTL<TAB>...
+	b := []byte(r.String())
+
+	// find the first non-escaped tab, then another, so we capture where the TTL lives.
+	esc := false
+	ttlStart, ttlEnd := 0, 0
+	for i := 0; i < len(b) && ttlEnd == 0; i++ {
+		switch {
+		case b[i] == '\\':
+			esc = !esc
+		case b[i] == '\t' && !esc:
+			if ttlStart == 0 {
+				ttlStart = i
+				continue
+			}
+			if ttlEnd == 0 {
+				ttlEnd = i
+			}
+		case b[i] >= 'A' && b[i] <= 'Z' && !esc:
+			b[i] += 32
+		default:
+			esc = false
+		}
+	}
+
+	// remove TTL.
+	copy(b[ttlStart:], b[ttlEnd:])
+	cut := ttlEnd - ttlStart
+	return string(b[:len(b)-cut])
+}
diff --git a/vendor/github.com/miekg/dns/sanitize_test.go b/vendor/github.com/miekg/dns/sanitize_test.go
new file mode 100644
index 0000000000..2ba3fe9a33
--- /dev/null
+++ b/vendor/github.com/miekg/dns/sanitize_test.go
@@ -0,0 +1,84 @@
+package dns
+
+import "testing"
+
+func TestDedup(t *testing.T) {
+	// make it []string
+	testcases := map[[3]RR][]string{
+		[...]RR{
+			newRR(t, "mIek.nl. IN A 127.0.0.1"),
+			newRR(t, "mieK.nl. IN A 127.0.0.1"),
+			newRR(t, "miek.Nl. IN A 127.0.0.1"),
+		}: {"mIek.nl.\t3600\tIN\tA\t127.0.0.1"},
+		[...]RR{
+			newRR(t, "miEk.nl. 2000 IN A 127.0.0.1"),
+			newRR(t, "mieK.Nl. 1000 IN A 127.0.0.1"),
+			newRR(t, "Miek.nL. 500 IN A 127.0.0.1"),
+		}: {"miEk.nl.\t500\tIN\tA\t127.0.0.1"},
+		[...]RR{
+			newRR(t, "miek.nl. IN A 127.0.0.1"),
+			newRR(t, "miek.nl. CH A 127.0.0.1"),
+			newRR(t, "miek.nl. IN A 127.0.0.1"),
+		}: {"miek.nl.\t3600\tIN\tA\t127.0.0.1",
+			"miek.nl.\t3600\tCH\tA\t127.0.0.1",
+		},
+		[...]RR{
+			newRR(t, "miek.nl. CH A 127.0.0.1"),
+			newRR(t, "miek.nl. IN A 127.0.0.1"),
+			newRR(t, "miek.de. IN A 127.0.0.1"),
+		}: {"miek.nl.\t3600\tCH\tA\t127.0.0.1",
+			"miek.nl.\t3600\tIN\tA\t127.0.0.1",
+			"miek.de.\t3600\tIN\tA\t127.0.0.1",
+		},
+		[...]RR{
+			newRR(t, "miek.de. IN A 127.0.0.1"),
+			newRR(t, "miek.nl. 200 IN A 127.0.0.1"),
+			newRR(t, "miek.nl. 300 IN A 127.0.0.1"),
+		}: {"miek.de.\t3600\tIN\tA\t127.0.0.1",
+			"miek.nl.\t200\tIN\tA\t127.0.0.1",
+		},
+	}
+
+	for rr, expected := range testcases {
+		out := Dedup([]RR{rr[0], rr[1], rr[2]}, nil)
+		for i, o := range out {
+			if o.String() != expected[i] {
+				t.Fatalf("expected %v, got %v", expected[i], o.String())
+			}
+		}
+	}
+}
+
+func BenchmarkDedup(b *testing.B) {
+	rrs := []RR{
+		newRR(nil, "miEk.nl. 2000 IN A 127.0.0.1"),
+		newRR(nil, "mieK.Nl. 1000 IN A 127.0.0.1"),
+		newRR(nil, "Miek.nL. 500 IN A 127.0.0.1"),
+	}
+	m := make(map[string]RR)
+	for i := 0; i < b.N; i++ {
+		Dedup(rrs, m)
+	}
+}
+
+func TestNormalizedString(t *testing.T) {
+	tests := map[RR]string{
+		newRR(t, "mIEk.Nl. 3600 IN A 127.0.0.1"):     "miek.nl.\tIN\tA\t127.0.0.1",
+		newRR(t, "m\\ iek.nL. 3600 IN A 127.0.0.1"):  "m\\ iek.nl.\tIN\tA\t127.0.0.1",
+		newRR(t, "m\\\tIeK.nl. 3600 in A 127.0.0.1"): "m\\009iek.nl.\tIN\tA\t127.0.0.1",
+	}
+	for tc, expected := range tests {
+		n := normalizedString(tc)
+		if n != expected {
+			t.Errorf("expected %s, got %s", expected, n)
+		}
+	}
+}
+
+func newRR(t *testing.T, s string) RR {
+	r, err := NewRR(s)
+	if err != nil {
+		t.Logf("newRR: %v", err)
+	}
+	return r
+}
diff --git a/vendor/github.com/miekg/dns/scan.go b/vendor/github.com/miekg/dns/scan.go
new file mode 100644
index 0000000000..de0db32f8d
--- /dev/null
+++ b/vendor/github.com/miekg/dns/scan.go
@@ -0,0 +1,981 @@
+package dns
+
+import (
+	"io"
+	"log"
+	"os"
+	"strconv"
+	"strings"
+)
+
+type debugging bool
+
+const debug debugging = false
+
+func (d debugging) Printf(format string, args ...interface{}) {
+	if d {
+		log.Printf(format, args...)
+	}
+}
+
+const maxTok = 2048 // Largest token we can return.
+const maxUint16 = 1<<16 - 1
+
+// Tokinize a RFC 1035 zone file. The tokenizer will normalize it:
+// * Add ownernames if they are left blank;
+// * Suppress sequences of spaces;
+// * Make each RR fit on one line (_NEWLINE is send as last)
+// * Handle comments: ;
+// * Handle braces - anywhere.
+const (
+	// Zonefile
+	zEOF = iota
+	zString
+	zBlank
+	zQuote
+	zNewline
+	zRrtpe
+	zOwner
+	zClass
+	zDirOrigin   // $ORIGIN
+	zDirTtl      // $TTL
+	zDirInclude  // $INCLUDE
+	zDirGenerate // $GENERATE
+
+	// Privatekey file
+	zValue
+	zKey
+
+	zExpectOwnerDir      // Ownername
+	zExpectOwnerBl       // Whitespace after the ownername
+	zExpectAny           // Expect rrtype, ttl or class
+	zExpectAnyNoClass    // Expect rrtype or ttl
+	zExpectAnyNoClassBl  // The whitespace after _EXPECT_ANY_NOCLASS
+	zExpectAnyNoTtl      // Expect rrtype or class
+	zExpectAnyNoTtlBl    // Whitespace after _EXPECT_ANY_NOTTL
+	zExpectRrtype        // Expect rrtype
+	zExpectRrtypeBl      // Whitespace BEFORE rrtype
+	zExpectRdata         // The first element of the rdata
+	zExpectDirTtlBl      // Space after directive $TTL
+	zExpectDirTtl        // Directive $TTL
+	zExpectDirOriginBl   // Space after directive $ORIGIN
+	zExpectDirOrigin     // Directive $ORIGIN
+	zExpectDirIncludeBl  // Space after directive $INCLUDE
+	zExpectDirInclude    // Directive $INCLUDE
+	zExpectDirGenerate   // Directive $GENERATE
+	zExpectDirGenerateBl // Space after directive $GENERATE
+)
+
+// ParseError is a parsing error. It contains the parse error and the location in the io.Reader
+// where the error occurred.
+type ParseError struct {
+	file string
+	err  string
+	lex  lex
+}
+
+func (e *ParseError) Error() (s string) {
+	if e.file != "" {
+		s = e.file + ": "
+	}
+	s += "dns: " + e.err + ": " + strconv.QuoteToASCII(e.lex.token) + " at line: " +
+		strconv.Itoa(e.lex.line) + ":" + strconv.Itoa(e.lex.column)
+	return
+}
+
+type lex struct {
+	token      string // text of the token
+	tokenUpper string // uppercase text of the token
+	length     int    // length of the token
+	err        bool   // when true, token text has lexer error
+	value      uint8  // value: zString, _BLANK, etc.
+	line       int    // line in the file
+	column     int    // column in the file
+	torc       uint16 // type or class as parsed in the lexer, we only need to look this up in the grammar
+	comment    string // any comment text seen
+}
+
+// Token holds the token that are returned when a zone file is parsed.
+type Token struct {
+	// The scanned resource record when error is not nil.
+	RR
+	// When an error occurred, this has the error specifics.
+	Error *ParseError
+	// A potential comment positioned after the RR and on the same line.
+	Comment string
+}
+
+// NewRR reads the RR contained in the string s. Only the first RR is
+// returned. If s contains no RR, return nil with no error. The class
+// defaults to IN and TTL defaults to 3600. The full zone file syntax
+// like $TTL, $ORIGIN, etc. is supported. All fields of the returned
+// RR are set, except RR.Header().Rdlength which is set to 0.
+func NewRR(s string) (RR, error) {
+	if len(s) > 0 && s[len(s)-1] != '\n' { // We need a closing newline
+		return ReadRR(strings.NewReader(s+"\n"), "")
+	}
+	return ReadRR(strings.NewReader(s), "")
+}
+
+// ReadRR reads the RR contained in q.
+// See NewRR for more documentation.
+func ReadRR(q io.Reader, filename string) (RR, error) {
+	r := <-parseZoneHelper(q, ".", filename, 1)
+	if r == nil {
+		return nil, nil
+	}
+
+	if r.Error != nil {
+		return nil, r.Error
+	}
+	return r.RR, nil
+}
+
+// ParseZone reads a RFC 1035 style zonefile from r. It returns *Tokens on the
+// returned channel, which consist out the parsed RR, a potential comment or an error.
+// If there is an error the RR is nil. The string file is only used
+// in error reporting. The string origin is used as the initial origin, as
+// if the file would start with: $ORIGIN origin .
+// The directives $INCLUDE, $ORIGIN, $TTL and $GENERATE are supported.
+// The channel t is closed by ParseZone when the end of r is reached.
+//
+// Basic usage pattern when reading from a string (z) containing the
+// zone data:
+//
+//	for x := range dns.ParseZone(strings.NewReader(z), "", "") {
+//		if x.Error != nil {
+//                  // log.Println(x.Error)
+//              } else {
+//                  // Do something with x.RR
+//              }
+//	}
+//
+// Comments specified after an RR (and on the same line!) are returned too:
+//
+//	foo. IN A 10.0.0.1 ; this is a comment
+//
+// The text "; this is comment" is returned in Token.Comment. Comments inside the
+// RR are discarded. Comments on a line by themselves are discarded too.
+func ParseZone(r io.Reader, origin, file string) chan *Token {
+	return parseZoneHelper(r, origin, file, 10000)
+}
+
+func parseZoneHelper(r io.Reader, origin, file string, chansize int) chan *Token {
+	t := make(chan *Token, chansize)
+	go parseZone(r, origin, file, t, 0)
+	return t
+}
+
+func parseZone(r io.Reader, origin, f string, t chan *Token, include int) {
+	defer func() {
+		if include == 0 {
+			close(t)
+		}
+	}()
+	s := scanInit(r)
+	c := make(chan lex)
+	// Start the lexer
+	go zlexer(s, c)
+	// 6 possible beginnings of a line, _ is a space
+	// 0. zRRTYPE                              -> all omitted until the rrtype
+	// 1. zOwner _ zRrtype                     -> class/ttl omitted
+	// 2. zOwner _ zString _ zRrtype           -> class omitted
+	// 3. zOwner _ zString _ zClass  _ zRrtype -> ttl/class
+	// 4. zOwner _ zClass  _ zRrtype           -> ttl omitted
+	// 5. zOwner _ zClass  _ zString _ zRrtype -> class/ttl (reversed)
+	// After detecting these, we know the zRrtype so we can jump to functions
+	// handling the rdata for each of these types.
+
+	if origin == "" {
+		origin = "."
+	}
+	origin = Fqdn(origin)
+	if _, ok := IsDomainName(origin); !ok {
+		t <- &Token{Error: &ParseError{f, "bad initial origin name", lex{}}}
+		return
+	}
+
+	st := zExpectOwnerDir // initial state
+	var h RR_Header
+	var defttl uint32 = defaultTtl
+	var prevName string
+	for l := range c {
+		// Lexer spotted an error already
+		if l.err == true {
+			t <- &Token{Error: &ParseError{f, l.token, l}}
+			return
+
+		}
+		switch st {
+		case zExpectOwnerDir:
+			// We can also expect a directive, like $TTL or $ORIGIN
+			h.Ttl = defttl
+			h.Class = ClassINET
+			switch l.value {
+			case zNewline:
+				st = zExpectOwnerDir
+			case zOwner:
+				h.Name = l.token
+				if l.token[0] == '@' {
+					h.Name = origin
+					prevName = h.Name
+					st = zExpectOwnerBl
+					break
+				}
+				if h.Name[l.length-1] != '.' {
+					h.Name = appendOrigin(h.Name, origin)
+				}
+				_, ok := IsDomainName(l.token)
+				if !ok {
+					t <- &Token{Error: &ParseError{f, "bad owner name", l}}
+					return
+				}
+				prevName = h.Name
+				st = zExpectOwnerBl
+			case zDirTtl:
+				st = zExpectDirTtlBl
+			case zDirOrigin:
+				st = zExpectDirOriginBl
+			case zDirInclude:
+				st = zExpectDirIncludeBl
+			case zDirGenerate:
+				st = zExpectDirGenerateBl
+			case zRrtpe:
+				h.Name = prevName
+				h.Rrtype = l.torc
+				st = zExpectRdata
+			case zClass:
+				h.Name = prevName
+				h.Class = l.torc
+				st = zExpectAnyNoClassBl
+			case zBlank:
+				// Discard, can happen when there is nothing on the
+				// line except the RR type
+			case zString:
+				ttl, ok := stringToTtl(l.token)
+				if !ok {
+					t <- &Token{Error: &ParseError{f, "not a TTL", l}}
+					return
+				}
+				h.Ttl = ttl
+				// Don't about the defttl, we should take the $TTL value
+				// defttl = ttl
+				st = zExpectAnyNoTtlBl
+
+			default:
+				t <- &Token{Error: &ParseError{f, "syntax error at beginning", l}}
+				return
+			}
+		case zExpectDirIncludeBl:
+			if l.value != zBlank {
+				t <- &Token{Error: &ParseError{f, "no blank after $INCLUDE-directive", l}}
+				return
+			}
+			st = zExpectDirInclude
+		case zExpectDirInclude:
+			if l.value != zString {
+				t <- &Token{Error: &ParseError{f, "expecting $INCLUDE value, not this...", l}}
+				return
+			}
+			neworigin := origin // There may be optionally a new origin set after the filename, if not use current one
+			l := <-c
+			switch l.value {
+			case zBlank:
+				l := <-c
+				if l.value == zString {
+					if _, ok := IsDomainName(l.token); !ok || l.length == 0 || l.err {
+						t <- &Token{Error: &ParseError{f, "bad origin name", l}}
+						return
+					}
+					// a new origin is specified.
+					if l.token[l.length-1] != '.' {
+						if origin != "." { // Prevent .. endings
+							neworigin = l.token + "." + origin
+						} else {
+							neworigin = l.token + origin
+						}
+					} else {
+						neworigin = l.token
+					}
+				}
+			case zNewline, zEOF:
+				// Ok
+			default:
+				t <- &Token{Error: &ParseError{f, "garbage after $INCLUDE", l}}
+				return
+			}
+			// Start with the new file
+			r1, e1 := os.Open(l.token)
+			if e1 != nil {
+				t <- &Token{Error: &ParseError{f, "failed to open `" + l.token + "'", l}}
+				return
+			}
+			if include+1 > 7 {
+				t <- &Token{Error: &ParseError{f, "too deeply nested $INCLUDE", l}}
+				return
+			}
+			parseZone(r1, l.token, neworigin, t, include+1)
+			st = zExpectOwnerDir
+		case zExpectDirTtlBl:
+			if l.value != zBlank {
+				t <- &Token{Error: &ParseError{f, "no blank after $TTL-directive", l}}
+				return
+			}
+			st = zExpectDirTtl
+		case zExpectDirTtl:
+			if l.value != zString {
+				t <- &Token{Error: &ParseError{f, "expecting $TTL value, not this...", l}}
+				return
+			}
+			if e, _ := slurpRemainder(c, f); e != nil {
+				t <- &Token{Error: e}
+				return
+			}
+			ttl, ok := stringToTtl(l.token)
+			if !ok {
+				t <- &Token{Error: &ParseError{f, "expecting $TTL value, not this...", l}}
+				return
+			}
+			defttl = ttl
+			st = zExpectOwnerDir
+		case zExpectDirOriginBl:
+			if l.value != zBlank {
+				t <- &Token{Error: &ParseError{f, "no blank after $ORIGIN-directive", l}}
+				return
+			}
+			st = zExpectDirOrigin
+		case zExpectDirOrigin:
+			if l.value != zString {
+				t <- &Token{Error: &ParseError{f, "expecting $ORIGIN value, not this...", l}}
+				return
+			}
+			if e, _ := slurpRemainder(c, f); e != nil {
+				t <- &Token{Error: e}
+			}
+			if _, ok := IsDomainName(l.token); !ok {
+				t <- &Token{Error: &ParseError{f, "bad origin name", l}}
+				return
+			}
+			if l.token[l.length-1] != '.' {
+				if origin != "." { // Prevent .. endings
+					origin = l.token + "." + origin
+				} else {
+					origin = l.token + origin
+				}
+			} else {
+				origin = l.token
+			}
+			st = zExpectOwnerDir
+		case zExpectDirGenerateBl:
+			if l.value != zBlank {
+				t <- &Token{Error: &ParseError{f, "no blank after $GENERATE-directive", l}}
+				return
+			}
+			st = zExpectDirGenerate
+		case zExpectDirGenerate:
+			if l.value != zString {
+				t <- &Token{Error: &ParseError{f, "expecting $GENERATE value, not this...", l}}
+				return
+			}
+			if errMsg := generate(l, c, t, origin); errMsg != "" {
+				t <- &Token{Error: &ParseError{f, errMsg, l}}
+				return
+			}
+			st = zExpectOwnerDir
+		case zExpectOwnerBl:
+			if l.value != zBlank {
+				t <- &Token{Error: &ParseError{f, "no blank after owner", l}}
+				return
+			}
+			st = zExpectAny
+		case zExpectAny:
+			switch l.value {
+			case zRrtpe:
+				h.Rrtype = l.torc
+				st = zExpectRdata
+			case zClass:
+				h.Class = l.torc
+				st = zExpectAnyNoClassBl
+			case zString:
+				ttl, ok := stringToTtl(l.token)
+				if !ok {
+					t <- &Token{Error: &ParseError{f, "not a TTL", l}}
+					return
+				}
+				h.Ttl = ttl
+				// defttl = ttl // don't set the defttl here
+				st = zExpectAnyNoTtlBl
+			default:
+				t <- &Token{Error: &ParseError{f, "expecting RR type, TTL or class, not this...", l}}
+				return
+			}
+		case zExpectAnyNoClassBl:
+			if l.value != zBlank {
+				t <- &Token{Error: &ParseError{f, "no blank before class", l}}
+				return
+			}
+			st = zExpectAnyNoClass
+		case zExpectAnyNoTtlBl:
+			if l.value != zBlank {
+				t <- &Token{Error: &ParseError{f, "no blank before TTL", l}}
+				return
+			}
+			st = zExpectAnyNoTtl
+		case zExpectAnyNoTtl:
+			switch l.value {
+			case zClass:
+				h.Class = l.torc
+				st = zExpectRrtypeBl
+			case zRrtpe:
+				h.Rrtype = l.torc
+				st = zExpectRdata
+			default:
+				t <- &Token{Error: &ParseError{f, "expecting RR type or class, not this...", l}}
+				return
+			}
+		case zExpectAnyNoClass:
+			switch l.value {
+			case zString:
+				ttl, ok := stringToTtl(l.token)
+				if !ok {
+					t <- &Token{Error: &ParseError{f, "not a TTL", l}}
+					return
+				}
+				h.Ttl = ttl
+				// defttl = ttl // don't set the def ttl anymore
+				st = zExpectRrtypeBl
+			case zRrtpe:
+				h.Rrtype = l.torc
+				st = zExpectRdata
+			default:
+				t <- &Token{Error: &ParseError{f, "expecting RR type or TTL, not this...", l}}
+				return
+			}
+		case zExpectRrtypeBl:
+			if l.value != zBlank {
+				t <- &Token{Error: &ParseError{f, "no blank before RR type", l}}
+				return
+			}
+			st = zExpectRrtype
+		case zExpectRrtype:
+			if l.value != zRrtpe {
+				t <- &Token{Error: &ParseError{f, "unknown RR type", l}}
+				return
+			}
+			h.Rrtype = l.torc
+			st = zExpectRdata
+		case zExpectRdata:
+			r, e, c1 := setRR(h, c, origin, f)
+			if e != nil {
+				// If e.lex is nil than we have encounter a unknown RR type
+				// in that case we substitute our current lex token
+				if e.lex.token == "" && e.lex.value == 0 {
+					e.lex = l // Uh, dirty
+				}
+				t <- &Token{Error: e}
+				return
+			}
+			t <- &Token{RR: r, Comment: c1}
+			st = zExpectOwnerDir
+		}
+	}
+	// If we get here, we and the h.Rrtype is still zero, we haven't parsed anything, this
+	// is not an error, because an empty zone file is still a zone file.
+}
+
+// zlexer scans the sourcefile and returns tokens on the channel c.
+func zlexer(s *scan, c chan lex) {
+	var l lex
+	str := make([]byte, maxTok) // Should be enough for any token
+	stri := 0                   // Offset in str (0 means empty)
+	com := make([]byte, maxTok) // Hold comment text
+	comi := 0
+	quote := false
+	escape := false
+	space := false
+	commt := false
+	rrtype := false
+	owner := true
+	brace := 0
+	x, err := s.tokenText()
+	defer close(c)
+	for err == nil {
+		l.column = s.position.Column
+		l.line = s.position.Line
+		if stri >= maxTok {
+			l.token = "token length insufficient for parsing"
+			l.err = true
+			debug.Printf("[%+v]", l.token)
+			c <- l
+			return
+		}
+		if comi >= maxTok {
+			l.token = "comment length insufficient for parsing"
+			l.err = true
+			debug.Printf("[%+v]", l.token)
+			c <- l
+			return
+		}
+
+		switch x {
+		case ' ', '\t':
+			if escape {
+				escape = false
+				str[stri] = x
+				stri++
+				break
+			}
+			if quote {
+				// Inside quotes this is legal
+				str[stri] = x
+				stri++
+				break
+			}
+			if commt {
+				com[comi] = x
+				comi++
+				break
+			}
+			if stri == 0 {
+				// Space directly in the beginning, handled in the grammar
+			} else if owner {
+				// If we have a string and its the first, make it an owner
+				l.value = zOwner
+				l.token = string(str[:stri])
+				l.tokenUpper = strings.ToUpper(l.token)
+				l.length = stri
+				// escape $... start with a \ not a $, so this will work
+				switch l.tokenUpper {
+				case "$TTL":
+					l.value = zDirTtl
+				case "$ORIGIN":
+					l.value = zDirOrigin
+				case "$INCLUDE":
+					l.value = zDirInclude
+				case "$GENERATE":
+					l.value = zDirGenerate
+				}
+				debug.Printf("[7 %+v]", l.token)
+				c <- l
+			} else {
+				l.value = zString
+				l.token = string(str[:stri])
+				l.tokenUpper = strings.ToUpper(l.token)
+				l.length = stri
+				if !rrtype {
+					if t, ok := StringToType[l.tokenUpper]; ok {
+						l.value = zRrtpe
+						l.torc = t
+						rrtype = true
+					} else {
+						if strings.HasPrefix(l.tokenUpper, "TYPE") {
+							t, ok := typeToInt(l.token)
+							if !ok {
+								l.token = "unknown RR type"
+								l.err = true
+								c <- l
+								return
+							}
+							l.value = zRrtpe
+							l.torc = t
+						}
+					}
+					if t, ok := StringToClass[l.tokenUpper]; ok {
+						l.value = zClass
+						l.torc = t
+					} else {
+						if strings.HasPrefix(l.tokenUpper, "CLASS") {
+							t, ok := classToInt(l.token)
+							if !ok {
+								l.token = "unknown class"
+								l.err = true
+								c <- l
+								return
+							}
+							l.value = zClass
+							l.torc = t
+						}
+					}
+				}
+				debug.Printf("[6 %+v]", l.token)
+				c <- l
+			}
+			stri = 0
+			// I reverse space stuff here
+			if !space && !commt {
+				l.value = zBlank
+				l.token = " "
+				l.length = 1
+				debug.Printf("[5 %+v]", l.token)
+				c <- l
+			}
+			owner = false
+			space = true
+		case ';':
+			if escape {
+				escape = false
+				str[stri] = x
+				stri++
+				break
+			}
+			if quote {
+				// Inside quotes this is legal
+				str[stri] = x
+				stri++
+				break
+			}
+			if stri > 0 {
+				l.value = zString
+				l.token = string(str[:stri])
+				l.tokenUpper = strings.ToUpper(l.token)
+				l.length = stri
+				debug.Printf("[4 %+v]", l.token)
+				c <- l
+				stri = 0
+			}
+			commt = true
+			com[comi] = ';'
+			comi++
+		case '\r':
+			escape = false
+			if quote {
+				str[stri] = x
+				stri++
+				break
+			}
+			// discard if outside of quotes
+		case '\n':
+			escape = false
+			// Escaped newline
+			if quote {
+				str[stri] = x
+				stri++
+				break
+			}
+			// inside quotes this is legal
+			if commt {
+				// Reset a comment
+				commt = false
+				rrtype = false
+				stri = 0
+				// If not in a brace this ends the comment AND the RR
+				if brace == 0 {
+					owner = true
+					owner = true
+					l.value = zNewline
+					l.token = "\n"
+					l.tokenUpper = l.token
+					l.length = 1
+					l.comment = string(com[:comi])
+					debug.Printf("[3 %+v %+v]", l.token, l.comment)
+					c <- l
+					l.comment = ""
+					comi = 0
+					break
+				}
+				com[comi] = ' ' // convert newline to space
+				comi++
+				break
+			}
+
+			if brace == 0 {
+				// If there is previous text, we should output it here
+				if stri != 0 {
+					l.value = zString
+					l.token = string(str[:stri])
+					l.tokenUpper = strings.ToUpper(l.token)
+
+					l.length = stri
+					if !rrtype {
+						if t, ok := StringToType[l.tokenUpper]; ok {
+							l.value = zRrtpe
+							l.torc = t
+							rrtype = true
+						}
+					}
+					debug.Printf("[2 %+v]", l.token)
+					c <- l
+				}
+				l.value = zNewline
+				l.token = "\n"
+				l.tokenUpper = l.token
+				l.length = 1
+				debug.Printf("[1 %+v]", l.token)
+				c <- l
+				stri = 0
+				commt = false
+				rrtype = false
+				owner = true
+				comi = 0
+			}
+		case '\\':
+			// comments do not get escaped chars, everything is copied
+			if commt {
+				com[comi] = x
+				comi++
+				break
+			}
+			// something already escaped must be in string
+			if escape {
+				str[stri] = x
+				stri++
+				escape = false
+				break
+			}
+			// something escaped outside of string gets added to string
+			str[stri] = x
+			stri++
+			escape = true
+		case '"':
+			if commt {
+				com[comi] = x
+				comi++
+				break
+			}
+			if escape {
+				str[stri] = x
+				stri++
+				escape = false
+				break
+			}
+			space = false
+			// send previous gathered text and the quote
+			if stri != 0 {
+				l.value = zString
+				l.token = string(str[:stri])
+				l.tokenUpper = strings.ToUpper(l.token)
+				l.length = stri
+
+				debug.Printf("[%+v]", l.token)
+				c <- l
+				stri = 0
+			}
+
+			// send quote itself as separate token
+			l.value = zQuote
+			l.token = "\""
+			l.tokenUpper = l.token
+			l.length = 1
+			c <- l
+			quote = !quote
+		case '(', ')':
+			if commt {
+				com[comi] = x
+				comi++
+				break
+			}
+			if escape {
+				str[stri] = x
+				stri++
+				escape = false
+				break
+			}
+			if quote {
+				str[stri] = x
+				stri++
+				break
+			}
+			switch x {
+			case ')':
+				brace--
+				if brace < 0 {
+					l.token = "extra closing brace"
+					l.tokenUpper = l.token
+					l.err = true
+					debug.Printf("[%+v]", l.token)
+					c <- l
+					return
+				}
+			case '(':
+				brace++
+			}
+		default:
+			escape = false
+			if commt {
+				com[comi] = x
+				comi++
+				break
+			}
+			str[stri] = x
+			stri++
+			space = false
+		}
+		x, err = s.tokenText()
+	}
+	if stri > 0 {
+		// Send remainder
+		l.token = string(str[:stri])
+		l.tokenUpper = strings.ToUpper(l.token)
+		l.length = stri
+		l.value = zString
+		debug.Printf("[%+v]", l.token)
+		c <- l
+	}
+}
+
+// Extract the class number from CLASSxx
+func classToInt(token string) (uint16, bool) {
+	offset := 5
+	if len(token) < offset+1 {
+		return 0, false
+	}
+	class, err := strconv.ParseUint(token[offset:], 10, 16)
+	if err != nil {
+		return 0, false
+	}
+	return uint16(class), true
+}
+
+// Extract the rr number from TYPExxx
+func typeToInt(token string) (uint16, bool) {
+	offset := 4
+	if len(token) < offset+1 {
+		return 0, false
+	}
+	typ, err := strconv.ParseUint(token[offset:], 10, 16)
+	if err != nil {
+		return 0, false
+	}
+	return uint16(typ), true
+}
+
+// Parse things like 2w, 2m, etc, Return the time in seconds.
+func stringToTtl(token string) (uint32, bool) {
+	s := uint32(0)
+	i := uint32(0)
+	for _, c := range token {
+		switch c {
+		case 's', 'S':
+			s += i
+			i = 0
+		case 'm', 'M':
+			s += i * 60
+			i = 0
+		case 'h', 'H':
+			s += i * 60 * 60
+			i = 0
+		case 'd', 'D':
+			s += i * 60 * 60 * 24
+			i = 0
+		case 'w', 'W':
+			s += i * 60 * 60 * 24 * 7
+			i = 0
+		case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
+			i *= 10
+			i += uint32(c) - '0'
+		default:
+			return 0, false
+		}
+	}
+	return s + i, true
+}
+
+// Parse LOC records' <digits>[.<digits>][mM] into a
+// mantissa exponent format. Token should contain the entire
+// string (i.e. no spaces allowed)
+func stringToCm(token string) (e, m uint8, ok bool) {
+	if token[len(token)-1] == 'M' || token[len(token)-1] == 'm' {
+		token = token[0 : len(token)-1]
+	}
+	s := strings.SplitN(token, ".", 2)
+	var meters, cmeters, val int
+	var err error
+	switch len(s) {
+	case 2:
+		if cmeters, err = strconv.Atoi(s[1]); err != nil {
+			return
+		}
+		fallthrough
+	case 1:
+		if meters, err = strconv.Atoi(s[0]); err != nil {
+			return
+		}
+	case 0:
+		// huh?
+		return 0, 0, false
+	}
+	ok = true
+	if meters > 0 {
+		e = 2
+		val = meters
+	} else {
+		e = 0
+		val = cmeters
+	}
+	for val > 10 {
+		e++
+		val /= 10
+	}
+	if e > 9 {
+		ok = false
+	}
+	m = uint8(val)
+	return
+}
+
+func appendOrigin(name, origin string) string {
+	if origin == "." {
+		return name + origin
+	}
+	return name + "." + origin
+}
+
+// LOC record helper function
+func locCheckNorth(token string, latitude uint32) (uint32, bool) {
+	switch token {
+	case "n", "N":
+		return LOC_EQUATOR + latitude, true
+	case "s", "S":
+		return LOC_EQUATOR - latitude, true
+	}
+	return latitude, false
+}
+
+// LOC record helper function
+func locCheckEast(token string, longitude uint32) (uint32, bool) {
+	switch token {
+	case "e", "E":
+		return LOC_EQUATOR + longitude, true
+	case "w", "W":
+		return LOC_EQUATOR - longitude, true
+	}
+	return longitude, false
+}
+
+// "Eat" the rest of the "line". Return potential comments
+func slurpRemainder(c chan lex, f string) (*ParseError, string) {
+	l := <-c
+	com := ""
+	switch l.value {
+	case zBlank:
+		l = <-c
+		com = l.comment
+		if l.value != zNewline && l.value != zEOF {
+			return &ParseError{f, "garbage after rdata", l}, ""
+		}
+	case zNewline:
+		com = l.comment
+	case zEOF:
+	default:
+		return &ParseError{f, "garbage after rdata", l}, ""
+	}
+	return nil, com
+}
+
+// Parse a 64 bit-like ipv6 address: "0014:4fff:ff20:ee64"
+// Used for NID and L64 record.
+func stringToNodeID(l lex) (uint64, *ParseError) {
+	if len(l.token) < 19 {
+		return 0, &ParseError{l.token, "bad NID/L64 NodeID/Locator64", l}
+	}
+	// There must be three colons at fixes postitions, if not its a parse error
+	if l.token[4] != ':' && l.token[9] != ':' && l.token[14] != ':' {
+		return 0, &ParseError{l.token, "bad NID/L64 NodeID/Locator64", l}
+	}
+	s := l.token[0:4] + l.token[5:9] + l.token[10:14] + l.token[15:19]
+	u, err := strconv.ParseUint(s, 16, 64)
+	if err != nil {
+		return 0, &ParseError{l.token, "bad NID/L64 NodeID/Locator64", l}
+	}
+	return u, nil
+}
diff --git a/vendor/github.com/miekg/dns/scan_rr.go b/vendor/github.com/miekg/dns/scan_rr.go
new file mode 100644
index 0000000000..f4c0d37675
--- /dev/null
+++ b/vendor/github.com/miekg/dns/scan_rr.go
@@ -0,0 +1,2171 @@
+package dns
+
+import (
+	"encoding/base64"
+	"net"
+	"strconv"
+	"strings"
+)
+
+type parserFunc struct {
+	// Func defines the function that parses the tokens and returns the RR
+	// or an error. The last string contains any comments in the line as
+	// they returned by the lexer as well.
+	Func func(h RR_Header, c chan lex, origin string, file string) (RR, *ParseError, string)
+	// Signals if the RR ending is of variable length, like TXT or records
+	// that have Hexadecimal or Base64 as their last element in the Rdata. Records
+	// that have a fixed ending or for instance A, AAAA, SOA and etc.
+	Variable bool
+}
+
+// Parse the rdata of each rrtype.
+// All data from the channel c is either zString or zBlank.
+// After the rdata there may come a zBlank and then a zNewline
+// or immediately a zNewline. If this is not the case we flag
+// an *ParseError: garbage after rdata.
+func setRR(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	parserfunc, ok := typeToparserFunc[h.Rrtype]
+	if ok {
+		r, e, cm := parserfunc.Func(h, c, o, f)
+		if parserfunc.Variable {
+			return r, e, cm
+		}
+		if e != nil {
+			return nil, e, ""
+		}
+		e, cm = slurpRemainder(c, f)
+		if e != nil {
+			return nil, e, ""
+		}
+		return r, nil, cm
+	}
+	// RFC3957 RR (Unknown RR handling)
+	return setRFC3597(h, c, o, f)
+}
+
+// A remainder of the rdata with embedded spaces, return the parsed string (sans the spaces)
+// or an error
+func endingToString(c chan lex, errstr, f string) (string, *ParseError, string) {
+	s := ""
+	l := <-c // zString
+	for l.value != zNewline && l.value != zEOF {
+		if l.err {
+			return s, &ParseError{f, errstr, l}, ""
+		}
+		switch l.value {
+		case zString:
+			s += l.token
+		case zBlank: // Ok
+		default:
+			return "", &ParseError{f, errstr, l}, ""
+		}
+		l = <-c
+	}
+	return s, nil, l.comment
+}
+
+// A remainder of the rdata with embedded spaces, split on unquoted whitespace
+// and return the parsed string slice or an error
+func endingToTxtSlice(c chan lex, errstr, f string) ([]string, *ParseError, string) {
+	// Get the remaining data until we see a zNewline
+	l := <-c
+	if l.err {
+		return nil, &ParseError{f, errstr, l}, ""
+	}
+
+	// Build the slice
+	s := make([]string, 0)
+	quote := false
+	empty := false
+	for l.value != zNewline && l.value != zEOF {
+		if l.err {
+			return nil, &ParseError{f, errstr, l}, ""
+		}
+		switch l.value {
+		case zString:
+			empty = false
+			if len(l.token) > 255 {
+				// split up tokens that are larger than 255 into 255-chunks
+				sx := []string{}
+				p, i := 0, 255
+				for {
+					if i <= len(l.token) {
+						sx = append(sx, l.token[p:i])
+					} else {
+						sx = append(sx, l.token[p:])
+						break
+
+					}
+					p, i = p+255, i+255
+				}
+				s = append(s, sx...)
+				break
+			}
+
+			s = append(s, l.token)
+		case zBlank:
+			if quote {
+				// zBlank can only be seen in between txt parts.
+				return nil, &ParseError{f, errstr, l}, ""
+			}
+		case zQuote:
+			if empty && quote {
+				s = append(s, "")
+			}
+			quote = !quote
+			empty = true
+		default:
+			return nil, &ParseError{f, errstr, l}, ""
+		}
+		l = <-c
+	}
+	if quote {
+		return nil, &ParseError{f, errstr, l}, ""
+	}
+	return s, nil, l.comment
+}
+
+func setA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(A)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 { // Dynamic updates.
+		return rr, nil, ""
+	}
+	rr.A = net.ParseIP(l.token)
+	if rr.A == nil || l.err {
+		return nil, &ParseError{f, "bad A A", l}, ""
+	}
+	return rr, nil, ""
+}
+
+func setAAAA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(AAAA)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	rr.AAAA = net.ParseIP(l.token)
+	if rr.AAAA == nil || l.err {
+		return nil, &ParseError{f, "bad AAAA AAAA", l}, ""
+	}
+	return rr, nil, ""
+}
+
+func setNS(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(NS)
+	rr.Hdr = h
+
+	l := <-c
+	rr.Ns = l.token
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	if l.token == "@" {
+		rr.Ns = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad NS Ns", l}, ""
+	}
+	if rr.Ns[l.length-1] != '.' {
+		rr.Ns = appendOrigin(rr.Ns, o)
+	}
+	return rr, nil, ""
+}
+
+func setPTR(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(PTR)
+	rr.Hdr = h
+
+	l := <-c
+	rr.Ptr = l.token
+	if l.length == 0 { // dynamic update rr.
+		return rr, nil, ""
+	}
+	if l.token == "@" {
+		rr.Ptr = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad PTR Ptr", l}, ""
+	}
+	if rr.Ptr[l.length-1] != '.' {
+		rr.Ptr = appendOrigin(rr.Ptr, o)
+	}
+	return rr, nil, ""
+}
+
+func setNSAPPTR(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(NSAPPTR)
+	rr.Hdr = h
+
+	l := <-c
+	rr.Ptr = l.token
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	if l.token == "@" {
+		rr.Ptr = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad NSAP-PTR Ptr", l}, ""
+	}
+	if rr.Ptr[l.length-1] != '.' {
+		rr.Ptr = appendOrigin(rr.Ptr, o)
+	}
+	return rr, nil, ""
+}
+
+func setRP(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(RP)
+	rr.Hdr = h
+
+	l := <-c
+	rr.Mbox = l.token
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	if l.token == "@" {
+		rr.Mbox = o
+	} else {
+		_, ok := IsDomainName(l.token)
+		if !ok || l.length == 0 || l.err {
+			return nil, &ParseError{f, "bad RP Mbox", l}, ""
+		}
+		if rr.Mbox[l.length-1] != '.' {
+			rr.Mbox = appendOrigin(rr.Mbox, o)
+		}
+	}
+	<-c // zBlank
+	l = <-c
+	rr.Txt = l.token
+	if l.token == "@" {
+		rr.Txt = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad RP Txt", l}, ""
+	}
+	if rr.Txt[l.length-1] != '.' {
+		rr.Txt = appendOrigin(rr.Txt, o)
+	}
+	return rr, nil, ""
+}
+
+func setMR(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(MR)
+	rr.Hdr = h
+
+	l := <-c
+	rr.Mr = l.token
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	if l.token == "@" {
+		rr.Mr = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad MR Mr", l}, ""
+	}
+	if rr.Mr[l.length-1] != '.' {
+		rr.Mr = appendOrigin(rr.Mr, o)
+	}
+	return rr, nil, ""
+}
+
+func setMB(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(MB)
+	rr.Hdr = h
+
+	l := <-c
+	rr.Mb = l.token
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	if l.token == "@" {
+		rr.Mb = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad MB Mb", l}, ""
+	}
+	if rr.Mb[l.length-1] != '.' {
+		rr.Mb = appendOrigin(rr.Mb, o)
+	}
+	return rr, nil, ""
+}
+
+func setMG(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(MG)
+	rr.Hdr = h
+
+	l := <-c
+	rr.Mg = l.token
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	if l.token == "@" {
+		rr.Mg = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad MG Mg", l}, ""
+	}
+	if rr.Mg[l.length-1] != '.' {
+		rr.Mg = appendOrigin(rr.Mg, o)
+	}
+	return rr, nil, ""
+}
+
+func setHINFO(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(HINFO)
+	rr.Hdr = h
+
+	chunks, e, c1 := endingToTxtSlice(c, "bad HINFO Fields", f)
+	if e != nil {
+		return nil, e, c1
+	}
+
+	if ln := len(chunks); ln == 0 {
+		return rr, nil, ""
+	} else if ln == 1 {
+		// Can we split it?
+		if out := strings.Fields(chunks[0]); len(out) > 1 {
+			chunks = out
+		} else {
+			chunks = append(chunks, "")
+		}
+	}
+
+	rr.Cpu = chunks[0]
+	rr.Os = strings.Join(chunks[1:], " ")
+
+	return rr, nil, ""
+}
+
+func setMINFO(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(MINFO)
+	rr.Hdr = h
+
+	l := <-c
+	rr.Rmail = l.token
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	if l.token == "@" {
+		rr.Rmail = o
+	} else {
+		_, ok := IsDomainName(l.token)
+		if !ok || l.length == 0 || l.err {
+			return nil, &ParseError{f, "bad MINFO Rmail", l}, ""
+		}
+		if rr.Rmail[l.length-1] != '.' {
+			rr.Rmail = appendOrigin(rr.Rmail, o)
+		}
+	}
+	<-c // zBlank
+	l = <-c
+	rr.Email = l.token
+	if l.token == "@" {
+		rr.Email = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad MINFO Email", l}, ""
+	}
+	if rr.Email[l.length-1] != '.' {
+		rr.Email = appendOrigin(rr.Email, o)
+	}
+	return rr, nil, ""
+}
+
+func setMF(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(MF)
+	rr.Hdr = h
+
+	l := <-c
+	rr.Mf = l.token
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	if l.token == "@" {
+		rr.Mf = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad MF Mf", l}, ""
+	}
+	if rr.Mf[l.length-1] != '.' {
+		rr.Mf = appendOrigin(rr.Mf, o)
+	}
+	return rr, nil, ""
+}
+
+func setMD(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(MD)
+	rr.Hdr = h
+
+	l := <-c
+	rr.Md = l.token
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	if l.token == "@" {
+		rr.Md = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad MD Md", l}, ""
+	}
+	if rr.Md[l.length-1] != '.' {
+		rr.Md = appendOrigin(rr.Md, o)
+	}
+	return rr, nil, ""
+}
+
+func setMX(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(MX)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	i, e := strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad MX Pref", l}, ""
+	}
+	rr.Preference = uint16(i)
+	<-c     // zBlank
+	l = <-c // zString
+	rr.Mx = l.token
+	if l.token == "@" {
+		rr.Mx = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad MX Mx", l}, ""
+	}
+	if rr.Mx[l.length-1] != '.' {
+		rr.Mx = appendOrigin(rr.Mx, o)
+	}
+	return rr, nil, ""
+}
+
+func setRT(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(RT)
+	rr.Hdr = h
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	i, e := strconv.ParseUint(l.token, 10, 16)
+	if e != nil {
+		return nil, &ParseError{f, "bad RT Preference", l}, ""
+	}
+	rr.Preference = uint16(i)
+	<-c     // zBlank
+	l = <-c // zString
+	rr.Host = l.token
+	if l.token == "@" {
+		rr.Host = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad RT Host", l}, ""
+	}
+	if rr.Host[l.length-1] != '.' {
+		rr.Host = appendOrigin(rr.Host, o)
+	}
+	return rr, nil, ""
+}
+
+func setAFSDB(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(AFSDB)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	i, e := strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad AFSDB Subtype", l}, ""
+	}
+	rr.Subtype = uint16(i)
+	<-c     // zBlank
+	l = <-c // zString
+	rr.Hostname = l.token
+	if l.token == "@" {
+		rr.Hostname = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad AFSDB Hostname", l}, ""
+	}
+	if rr.Hostname[l.length-1] != '.' {
+		rr.Hostname = appendOrigin(rr.Hostname, o)
+	}
+	return rr, nil, ""
+}
+
+func setX25(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(X25)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	if l.err {
+		return nil, &ParseError{f, "bad X25 PSDNAddress", l}, ""
+	}
+	rr.PSDNAddress = l.token
+	return rr, nil, ""
+}
+
+func setKX(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(KX)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	i, e := strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad KX Pref", l}, ""
+	}
+	rr.Preference = uint16(i)
+	<-c     // zBlank
+	l = <-c // zString
+	rr.Exchanger = l.token
+	if l.token == "@" {
+		rr.Exchanger = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad KX Exchanger", l}, ""
+	}
+	if rr.Exchanger[l.length-1] != '.' {
+		rr.Exchanger = appendOrigin(rr.Exchanger, o)
+	}
+	return rr, nil, ""
+}
+
+func setCNAME(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(CNAME)
+	rr.Hdr = h
+
+	l := <-c
+	rr.Target = l.token
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	if l.token == "@" {
+		rr.Target = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad CNAME Target", l}, ""
+	}
+	if rr.Target[l.length-1] != '.' {
+		rr.Target = appendOrigin(rr.Target, o)
+	}
+	return rr, nil, ""
+}
+
+func setDNAME(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(DNAME)
+	rr.Hdr = h
+
+	l := <-c
+	rr.Target = l.token
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	if l.token == "@" {
+		rr.Target = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad CNAME Target", l}, ""
+	}
+	if rr.Target[l.length-1] != '.' {
+		rr.Target = appendOrigin(rr.Target, o)
+	}
+	return rr, nil, ""
+}
+
+func setSOA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(SOA)
+	rr.Hdr = h
+
+	l := <-c
+	rr.Ns = l.token
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	<-c // zBlank
+	if l.token == "@" {
+		rr.Ns = o
+	} else {
+		_, ok := IsDomainName(l.token)
+		if !ok || l.length == 0 || l.err {
+			return nil, &ParseError{f, "bad SOA Ns", l}, ""
+		}
+		if rr.Ns[l.length-1] != '.' {
+			rr.Ns = appendOrigin(rr.Ns, o)
+		}
+	}
+
+	l = <-c
+	rr.Mbox = l.token
+	if l.token == "@" {
+		rr.Mbox = o
+	} else {
+		_, ok := IsDomainName(l.token)
+		if !ok || l.length == 0 || l.err {
+			return nil, &ParseError{f, "bad SOA Mbox", l}, ""
+		}
+		if rr.Mbox[l.length-1] != '.' {
+			rr.Mbox = appendOrigin(rr.Mbox, o)
+		}
+	}
+	<-c // zBlank
+
+	var (
+		v  uint32
+		ok bool
+	)
+	for i := 0; i < 5; i++ {
+		l = <-c
+		if l.err {
+			return nil, &ParseError{f, "bad SOA zone parameter", l}, ""
+		}
+		if j, e := strconv.ParseUint(l.token, 10, 32); e != nil {
+			if i == 0 {
+				// Serial should be a number
+				return nil, &ParseError{f, "bad SOA zone parameter", l}, ""
+			}
+			if v, ok = stringToTtl(l.token); !ok {
+				return nil, &ParseError{f, "bad SOA zone parameter", l}, ""
+
+			}
+		} else {
+			v = uint32(j)
+		}
+		switch i {
+		case 0:
+			rr.Serial = v
+			<-c // zBlank
+		case 1:
+			rr.Refresh = v
+			<-c // zBlank
+		case 2:
+			rr.Retry = v
+			<-c // zBlank
+		case 3:
+			rr.Expire = v
+			<-c // zBlank
+		case 4:
+			rr.Minttl = v
+		}
+	}
+	return rr, nil, ""
+}
+
+func setSRV(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(SRV)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	i, e := strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad SRV Priority", l}, ""
+	}
+	rr.Priority = uint16(i)
+	<-c     // zBlank
+	l = <-c // zString
+	i, e = strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad SRV Weight", l}, ""
+	}
+	rr.Weight = uint16(i)
+	<-c     // zBlank
+	l = <-c // zString
+	i, e = strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad SRV Port", l}, ""
+	}
+	rr.Port = uint16(i)
+	<-c     // zBlank
+	l = <-c // zString
+	rr.Target = l.token
+	if l.token == "@" {
+		rr.Target = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad SRV Target", l}, ""
+	}
+	if rr.Target[l.length-1] != '.' {
+		rr.Target = appendOrigin(rr.Target, o)
+	}
+	return rr, nil, ""
+}
+
+func setNAPTR(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(NAPTR)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	i, e := strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad NAPTR Order", l}, ""
+	}
+	rr.Order = uint16(i)
+	<-c     // zBlank
+	l = <-c // zString
+	i, e = strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad NAPTR Preference", l}, ""
+	}
+	rr.Preference = uint16(i)
+	// Flags
+	<-c     // zBlank
+	l = <-c // _QUOTE
+	if l.value != zQuote {
+		return nil, &ParseError{f, "bad NAPTR Flags", l}, ""
+	}
+	l = <-c // Either String or Quote
+	if l.value == zString {
+		rr.Flags = l.token
+		l = <-c // _QUOTE
+		if l.value != zQuote {
+			return nil, &ParseError{f, "bad NAPTR Flags", l}, ""
+		}
+	} else if l.value == zQuote {
+		rr.Flags = ""
+	} else {
+		return nil, &ParseError{f, "bad NAPTR Flags", l}, ""
+	}
+
+	// Service
+	<-c     // zBlank
+	l = <-c // _QUOTE
+	if l.value != zQuote {
+		return nil, &ParseError{f, "bad NAPTR Service", l}, ""
+	}
+	l = <-c // Either String or Quote
+	if l.value == zString {
+		rr.Service = l.token
+		l = <-c // _QUOTE
+		if l.value != zQuote {
+			return nil, &ParseError{f, "bad NAPTR Service", l}, ""
+		}
+	} else if l.value == zQuote {
+		rr.Service = ""
+	} else {
+		return nil, &ParseError{f, "bad NAPTR Service", l}, ""
+	}
+
+	// Regexp
+	<-c     // zBlank
+	l = <-c // _QUOTE
+	if l.value != zQuote {
+		return nil, &ParseError{f, "bad NAPTR Regexp", l}, ""
+	}
+	l = <-c // Either String or Quote
+	if l.value == zString {
+		rr.Regexp = l.token
+		l = <-c // _QUOTE
+		if l.value != zQuote {
+			return nil, &ParseError{f, "bad NAPTR Regexp", l}, ""
+		}
+	} else if l.value == zQuote {
+		rr.Regexp = ""
+	} else {
+		return nil, &ParseError{f, "bad NAPTR Regexp", l}, ""
+	}
+	// After quote no space??
+	<-c     // zBlank
+	l = <-c // zString
+	rr.Replacement = l.token
+	if l.token == "@" {
+		rr.Replacement = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad NAPTR Replacement", l}, ""
+	}
+	if rr.Replacement[l.length-1] != '.' {
+		rr.Replacement = appendOrigin(rr.Replacement, o)
+	}
+	return rr, nil, ""
+}
+
+func setTALINK(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(TALINK)
+	rr.Hdr = h
+
+	l := <-c
+	rr.PreviousName = l.token
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	if l.token == "@" {
+		rr.PreviousName = o
+	} else {
+		_, ok := IsDomainName(l.token)
+		if !ok || l.length == 0 || l.err {
+			return nil, &ParseError{f, "bad TALINK PreviousName", l}, ""
+		}
+		if rr.PreviousName[l.length-1] != '.' {
+			rr.PreviousName = appendOrigin(rr.PreviousName, o)
+		}
+	}
+	<-c // zBlank
+	l = <-c
+	rr.NextName = l.token
+	if l.token == "@" {
+		rr.NextName = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad TALINK NextName", l}, ""
+	}
+	if rr.NextName[l.length-1] != '.' {
+		rr.NextName = appendOrigin(rr.NextName, o)
+	}
+	return rr, nil, ""
+}
+
+func setLOC(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(LOC)
+	rr.Hdr = h
+	// Non zero defaults for LOC record, see RFC 1876, Section 3.
+	rr.HorizPre = 165 // 10000
+	rr.VertPre = 162  // 10
+	rr.Size = 18      // 1
+	ok := false
+	// North
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	i, e := strconv.ParseUint(l.token, 10, 32)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad LOC Latitude", l}, ""
+	}
+	rr.Latitude = 1000 * 60 * 60 * uint32(i)
+
+	<-c // zBlank
+	// Either number, 'N' or 'S'
+	l = <-c
+	if rr.Latitude, ok = locCheckNorth(l.token, rr.Latitude); ok {
+		goto East
+	}
+	i, e = strconv.ParseUint(l.token, 10, 32)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad LOC Latitude minutes", l}, ""
+	}
+	rr.Latitude += 1000 * 60 * uint32(i)
+
+	<-c // zBlank
+	l = <-c
+	if i, e := strconv.ParseFloat(l.token, 32); e != nil || l.err {
+		return nil, &ParseError{f, "bad LOC Latitude seconds", l}, ""
+	} else {
+		rr.Latitude += uint32(1000 * i)
+	}
+	<-c // zBlank
+	// Either number, 'N' or 'S'
+	l = <-c
+	if rr.Latitude, ok = locCheckNorth(l.token, rr.Latitude); ok {
+		goto East
+	}
+	// If still alive, flag an error
+	return nil, &ParseError{f, "bad LOC Latitude North/South", l}, ""
+
+East:
+	// East
+	<-c // zBlank
+	l = <-c
+	if i, e := strconv.ParseUint(l.token, 10, 32); e != nil || l.err {
+		return nil, &ParseError{f, "bad LOC Longitude", l}, ""
+	} else {
+		rr.Longitude = 1000 * 60 * 60 * uint32(i)
+	}
+	<-c // zBlank
+	// Either number, 'E' or 'W'
+	l = <-c
+	if rr.Longitude, ok = locCheckEast(l.token, rr.Longitude); ok {
+		goto Altitude
+	}
+	if i, e := strconv.ParseUint(l.token, 10, 32); e != nil || l.err {
+		return nil, &ParseError{f, "bad LOC Longitude minutes", l}, ""
+	} else {
+		rr.Longitude += 1000 * 60 * uint32(i)
+	}
+	<-c // zBlank
+	l = <-c
+	if i, e := strconv.ParseFloat(l.token, 32); e != nil || l.err {
+		return nil, &ParseError{f, "bad LOC Longitude seconds", l}, ""
+	} else {
+		rr.Longitude += uint32(1000 * i)
+	}
+	<-c // zBlank
+	// Either number, 'E' or 'W'
+	l = <-c
+	if rr.Longitude, ok = locCheckEast(l.token, rr.Longitude); ok {
+		goto Altitude
+	}
+	// If still alive, flag an error
+	return nil, &ParseError{f, "bad LOC Longitude East/West", l}, ""
+
+Altitude:
+	<-c // zBlank
+	l = <-c
+	if l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad LOC Altitude", l}, ""
+	}
+	if l.token[len(l.token)-1] == 'M' || l.token[len(l.token)-1] == 'm' {
+		l.token = l.token[0 : len(l.token)-1]
+	}
+	if i, e := strconv.ParseFloat(l.token, 32); e != nil {
+		return nil, &ParseError{f, "bad LOC Altitude", l}, ""
+	} else {
+		rr.Altitude = uint32(i*100.0 + 10000000.0 + 0.5)
+	}
+
+	// And now optionally the other values
+	l = <-c
+	count := 0
+	for l.value != zNewline && l.value != zEOF {
+		switch l.value {
+		case zString:
+			switch count {
+			case 0: // Size
+				e, m, ok := stringToCm(l.token)
+				if !ok {
+					return nil, &ParseError{f, "bad LOC Size", l}, ""
+				}
+				rr.Size = (e & 0x0f) | (m << 4 & 0xf0)
+			case 1: // HorizPre
+				e, m, ok := stringToCm(l.token)
+				if !ok {
+					return nil, &ParseError{f, "bad LOC HorizPre", l}, ""
+				}
+				rr.HorizPre = (e & 0x0f) | (m << 4 & 0xf0)
+			case 2: // VertPre
+				e, m, ok := stringToCm(l.token)
+				if !ok {
+					return nil, &ParseError{f, "bad LOC VertPre", l}, ""
+				}
+				rr.VertPre = (e & 0x0f) | (m << 4 & 0xf0)
+			}
+			count++
+		case zBlank:
+			// Ok
+		default:
+			return nil, &ParseError{f, "bad LOC Size, HorizPre or VertPre", l}, ""
+		}
+		l = <-c
+	}
+	return rr, nil, ""
+}
+
+func setHIP(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(HIP)
+	rr.Hdr = h
+
+	// HitLength is not represented
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, l.comment
+	}
+	i, e := strconv.ParseUint(l.token, 10, 8)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad HIP PublicKeyAlgorithm", l}, ""
+	}
+	rr.PublicKeyAlgorithm = uint8(i)
+	<-c     // zBlank
+	l = <-c // zString
+	if l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad HIP Hit", l}, ""
+	}
+	rr.Hit = l.token // This can not contain spaces, see RFC 5205 Section 6.
+	rr.HitLength = uint8(len(rr.Hit)) / 2
+
+	<-c     // zBlank
+	l = <-c // zString
+	if l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad HIP PublicKey", l}, ""
+	}
+	rr.PublicKey = l.token // This cannot contain spaces
+	rr.PublicKeyLength = uint16(base64.StdEncoding.DecodedLen(len(rr.PublicKey)))
+
+	// RendezvousServers (if any)
+	l = <-c
+	var xs []string
+	for l.value != zNewline && l.value != zEOF {
+		switch l.value {
+		case zString:
+			if l.token == "@" {
+				xs = append(xs, o)
+				l = <-c
+				continue
+			}
+			_, ok := IsDomainName(l.token)
+			if !ok || l.length == 0 || l.err {
+				return nil, &ParseError{f, "bad HIP RendezvousServers", l}, ""
+			}
+			if l.token[l.length-1] != '.' {
+				l.token = appendOrigin(l.token, o)
+			}
+			xs = append(xs, l.token)
+		case zBlank:
+			// Ok
+		default:
+			return nil, &ParseError{f, "bad HIP RendezvousServers", l}, ""
+		}
+		l = <-c
+	}
+	rr.RendezvousServers = xs
+	return rr, nil, l.comment
+}
+
+func setCERT(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(CERT)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, l.comment
+	}
+	if v, ok := StringToCertType[l.token]; ok {
+		rr.Type = v
+	} else if i, e := strconv.ParseUint(l.token, 10, 16); e != nil {
+		return nil, &ParseError{f, "bad CERT Type", l}, ""
+	} else {
+		rr.Type = uint16(i)
+	}
+	<-c     // zBlank
+	l = <-c // zString
+	i, e := strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad CERT KeyTag", l}, ""
+	}
+	rr.KeyTag = uint16(i)
+	<-c     // zBlank
+	l = <-c // zString
+	if v, ok := StringToAlgorithm[l.token]; ok {
+		rr.Algorithm = v
+	} else if i, e := strconv.ParseUint(l.token, 10, 8); e != nil {
+		return nil, &ParseError{f, "bad CERT Algorithm", l}, ""
+	} else {
+		rr.Algorithm = uint8(i)
+	}
+	s, e1, c1 := endingToString(c, "bad CERT Certificate", f)
+	if e1 != nil {
+		return nil, e1, c1
+	}
+	rr.Certificate = s
+	return rr, nil, c1
+}
+
+func setOPENPGPKEY(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(OPENPGPKEY)
+	rr.Hdr = h
+
+	s, e, c1 := endingToString(c, "bad OPENPGPKEY PublicKey", f)
+	if e != nil {
+		return nil, e, c1
+	}
+	rr.PublicKey = s
+	return rr, nil, c1
+}
+
+func setSIG(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	r, e, s := setRRSIG(h, c, o, f)
+	if r != nil {
+		return &SIG{*r.(*RRSIG)}, e, s
+	}
+	return nil, e, s
+}
+
+func setRRSIG(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(RRSIG)
+	rr.Hdr = h
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, l.comment
+	}
+	if t, ok := StringToType[l.tokenUpper]; !ok {
+		if strings.HasPrefix(l.tokenUpper, "TYPE") {
+			t, ok = typeToInt(l.tokenUpper)
+			if !ok {
+				return nil, &ParseError{f, "bad RRSIG Typecovered", l}, ""
+			}
+			rr.TypeCovered = t
+		} else {
+			return nil, &ParseError{f, "bad RRSIG Typecovered", l}, ""
+		}
+	} else {
+		rr.TypeCovered = t
+	}
+	<-c // zBlank
+	l = <-c
+	i, err := strconv.ParseUint(l.token, 10, 8)
+	if err != nil || l.err {
+		return nil, &ParseError{f, "bad RRSIG Algorithm", l}, ""
+	}
+	rr.Algorithm = uint8(i)
+	<-c // zBlank
+	l = <-c
+	i, err = strconv.ParseUint(l.token, 10, 8)
+	if err != nil || l.err {
+		return nil, &ParseError{f, "bad RRSIG Labels", l}, ""
+	}
+	rr.Labels = uint8(i)
+	<-c // zBlank
+	l = <-c
+	i, err = strconv.ParseUint(l.token, 10, 32)
+	if err != nil || l.err {
+		return nil, &ParseError{f, "bad RRSIG OrigTtl", l}, ""
+	}
+	rr.OrigTtl = uint32(i)
+	<-c // zBlank
+	l = <-c
+	if i, err := StringToTime(l.token); err != nil {
+		// Try to see if all numeric and use it as epoch
+		if i, err := strconv.ParseInt(l.token, 10, 64); err == nil {
+			// TODO(miek): error out on > MAX_UINT32, same below
+			rr.Expiration = uint32(i)
+		} else {
+			return nil, &ParseError{f, "bad RRSIG Expiration", l}, ""
+		}
+	} else {
+		rr.Expiration = i
+	}
+	<-c // zBlank
+	l = <-c
+	if i, err := StringToTime(l.token); err != nil {
+		if i, err := strconv.ParseInt(l.token, 10, 64); err == nil {
+			rr.Inception = uint32(i)
+		} else {
+			return nil, &ParseError{f, "bad RRSIG Inception", l}, ""
+		}
+	} else {
+		rr.Inception = i
+	}
+	<-c // zBlank
+	l = <-c
+	i, err = strconv.ParseUint(l.token, 10, 16)
+	if err != nil || l.err {
+		return nil, &ParseError{f, "bad RRSIG KeyTag", l}, ""
+	}
+	rr.KeyTag = uint16(i)
+	<-c // zBlank
+	l = <-c
+	rr.SignerName = l.token
+	if l.token == "@" {
+		rr.SignerName = o
+	} else {
+		_, ok := IsDomainName(l.token)
+		if !ok || l.length == 0 || l.err {
+			return nil, &ParseError{f, "bad RRSIG SignerName", l}, ""
+		}
+		if rr.SignerName[l.length-1] != '.' {
+			rr.SignerName = appendOrigin(rr.SignerName, o)
+		}
+	}
+	s, e, c1 := endingToString(c, "bad RRSIG Signature", f)
+	if e != nil {
+		return nil, e, c1
+	}
+	rr.Signature = s
+	return rr, nil, c1
+}
+
+func setNSEC(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(NSEC)
+	rr.Hdr = h
+
+	l := <-c
+	rr.NextDomain = l.token
+	if l.length == 0 {
+		return rr, nil, l.comment
+	}
+	if l.token == "@" {
+		rr.NextDomain = o
+	} else {
+		_, ok := IsDomainName(l.token)
+		if !ok || l.length == 0 || l.err {
+			return nil, &ParseError{f, "bad NSEC NextDomain", l}, ""
+		}
+		if rr.NextDomain[l.length-1] != '.' {
+			rr.NextDomain = appendOrigin(rr.NextDomain, o)
+		}
+	}
+
+	rr.TypeBitMap = make([]uint16, 0)
+	var (
+		k  uint16
+		ok bool
+	)
+	l = <-c
+	for l.value != zNewline && l.value != zEOF {
+		switch l.value {
+		case zBlank:
+			// Ok
+		case zString:
+			if k, ok = StringToType[l.tokenUpper]; !ok {
+				if k, ok = typeToInt(l.tokenUpper); !ok {
+					return nil, &ParseError{f, "bad NSEC TypeBitMap", l}, ""
+				}
+			}
+			rr.TypeBitMap = append(rr.TypeBitMap, k)
+		default:
+			return nil, &ParseError{f, "bad NSEC TypeBitMap", l}, ""
+		}
+		l = <-c
+	}
+	return rr, nil, l.comment
+}
+
+func setNSEC3(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(NSEC3)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, l.comment
+	}
+	i, e := strconv.ParseUint(l.token, 10, 8)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad NSEC3 Hash", l}, ""
+	}
+	rr.Hash = uint8(i)
+	<-c // zBlank
+	l = <-c
+	i, e = strconv.ParseUint(l.token, 10, 8)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad NSEC3 Flags", l}, ""
+	}
+	rr.Flags = uint8(i)
+	<-c // zBlank
+	l = <-c
+	i, e = strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad NSEC3 Iterations", l}, ""
+	}
+	rr.Iterations = uint16(i)
+	<-c
+	l = <-c
+	if len(l.token) == 0 || l.err {
+		return nil, &ParseError{f, "bad NSEC3 Salt", l}, ""
+	}
+	rr.SaltLength = uint8(len(l.token)) / 2
+	rr.Salt = l.token
+
+	<-c
+	l = <-c
+	if len(l.token) == 0 || l.err {
+		return nil, &ParseError{f, "bad NSEC3 NextDomain", l}, ""
+	}
+	rr.HashLength = 20 // Fix for NSEC3 (sha1 160 bits)
+	rr.NextDomain = l.token
+
+	rr.TypeBitMap = make([]uint16, 0)
+	var (
+		k  uint16
+		ok bool
+	)
+	l = <-c
+	for l.value != zNewline && l.value != zEOF {
+		switch l.value {
+		case zBlank:
+			// Ok
+		case zString:
+			if k, ok = StringToType[l.tokenUpper]; !ok {
+				if k, ok = typeToInt(l.tokenUpper); !ok {
+					return nil, &ParseError{f, "bad NSEC3 TypeBitMap", l}, ""
+				}
+			}
+			rr.TypeBitMap = append(rr.TypeBitMap, k)
+		default:
+			return nil, &ParseError{f, "bad NSEC3 TypeBitMap", l}, ""
+		}
+		l = <-c
+	}
+	return rr, nil, l.comment
+}
+
+func setNSEC3PARAM(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(NSEC3PARAM)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	i, e := strconv.ParseUint(l.token, 10, 8)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad NSEC3PARAM Hash", l}, ""
+	}
+	rr.Hash = uint8(i)
+	<-c // zBlank
+	l = <-c
+	i, e = strconv.ParseUint(l.token, 10, 8)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad NSEC3PARAM Flags", l}, ""
+	}
+	rr.Flags = uint8(i)
+	<-c // zBlank
+	l = <-c
+	i, e = strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad NSEC3PARAM Iterations", l}, ""
+	}
+	rr.Iterations = uint16(i)
+	<-c
+	l = <-c
+	rr.SaltLength = uint8(len(l.token))
+	rr.Salt = l.token
+	return rr, nil, ""
+}
+
+func setEUI48(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(EUI48)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	if l.length != 17 || l.err {
+		return nil, &ParseError{f, "bad EUI48 Address", l}, ""
+	}
+	addr := make([]byte, 12)
+	dash := 0
+	for i := 0; i < 10; i += 2 {
+		addr[i] = l.token[i+dash]
+		addr[i+1] = l.token[i+1+dash]
+		dash++
+		if l.token[i+1+dash] != '-' {
+			return nil, &ParseError{f, "bad EUI48 Address", l}, ""
+		}
+	}
+	addr[10] = l.token[15]
+	addr[11] = l.token[16]
+
+	i, e := strconv.ParseUint(string(addr), 16, 48)
+	if e != nil {
+		return nil, &ParseError{f, "bad EUI48 Address", l}, ""
+	}
+	rr.Address = i
+	return rr, nil, ""
+}
+
+func setEUI64(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(EUI64)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	if l.length != 23 || l.err {
+		return nil, &ParseError{f, "bad EUI64 Address", l}, ""
+	}
+	addr := make([]byte, 16)
+	dash := 0
+	for i := 0; i < 14; i += 2 {
+		addr[i] = l.token[i+dash]
+		addr[i+1] = l.token[i+1+dash]
+		dash++
+		if l.token[i+1+dash] != '-' {
+			return nil, &ParseError{f, "bad EUI64 Address", l}, ""
+		}
+	}
+	addr[14] = l.token[21]
+	addr[15] = l.token[22]
+
+	i, e := strconv.ParseUint(string(addr), 16, 64)
+	if e != nil {
+		return nil, &ParseError{f, "bad EUI68 Address", l}, ""
+	}
+	rr.Address = uint64(i)
+	return rr, nil, ""
+}
+
+func setSSHFP(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(SSHFP)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	i, e := strconv.ParseUint(l.token, 10, 8)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad SSHFP Algorithm", l}, ""
+	}
+	rr.Algorithm = uint8(i)
+	<-c // zBlank
+	l = <-c
+	i, e = strconv.ParseUint(l.token, 10, 8)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad SSHFP Type", l}, ""
+	}
+	rr.Type = uint8(i)
+	<-c // zBlank
+	s, e1, c1 := endingToString(c, "bad SSHFP Fingerprint", f)
+	if e1 != nil {
+		return nil, e1, c1
+	}
+	rr.FingerPrint = s
+	return rr, nil, ""
+}
+
+func setDNSKEYs(h RR_Header, c chan lex, o, f, typ string) (RR, *ParseError, string) {
+	rr := new(DNSKEY)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, l.comment
+	}
+	i, e := strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad " + typ + " Flags", l}, ""
+	}
+	rr.Flags = uint16(i)
+	<-c     // zBlank
+	l = <-c // zString
+	i, e = strconv.ParseUint(l.token, 10, 8)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad " + typ + " Protocol", l}, ""
+	}
+	rr.Protocol = uint8(i)
+	<-c     // zBlank
+	l = <-c // zString
+	i, e = strconv.ParseUint(l.token, 10, 8)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad " + typ + " Algorithm", l}, ""
+	}
+	rr.Algorithm = uint8(i)
+	s, e1, c1 := endingToString(c, "bad "+typ+" PublicKey", f)
+	if e1 != nil {
+		return nil, e1, c1
+	}
+	rr.PublicKey = s
+	return rr, nil, c1
+}
+
+func setKEY(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	r, e, s := setDNSKEYs(h, c, o, f, "KEY")
+	if r != nil {
+		return &KEY{*r.(*DNSKEY)}, e, s
+	}
+	return nil, e, s
+}
+
+func setDNSKEY(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	r, e, s := setDNSKEYs(h, c, o, f, "DNSKEY")
+	return r, e, s
+}
+
+func setCDNSKEY(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	r, e, s := setDNSKEYs(h, c, o, f, "CDNSKEY")
+	if r != nil {
+		return &CDNSKEY{*r.(*DNSKEY)}, e, s
+	}
+	return nil, e, s
+}
+
+func setRKEY(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(RKEY)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, l.comment
+	}
+	i, e := strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad RKEY Flags", l}, ""
+	}
+	rr.Flags = uint16(i)
+	<-c     // zBlank
+	l = <-c // zString
+	i, e = strconv.ParseUint(l.token, 10, 8)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad RKEY Protocol", l}, ""
+	}
+	rr.Protocol = uint8(i)
+	<-c     // zBlank
+	l = <-c // zString
+	i, e = strconv.ParseUint(l.token, 10, 8)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad RKEY Algorithm", l}, ""
+	}
+	rr.Algorithm = uint8(i)
+	s, e1, c1 := endingToString(c, "bad RKEY PublicKey", f)
+	if e1 != nil {
+		return nil, e1, c1
+	}
+	rr.PublicKey = s
+	return rr, nil, c1
+}
+
+func setEID(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(EID)
+	rr.Hdr = h
+	s, e, c1 := endingToString(c, "bad EID Endpoint", f)
+	if e != nil {
+		return nil, e, c1
+	}
+	rr.Endpoint = s
+	return rr, nil, c1
+}
+
+func setNIMLOC(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(NIMLOC)
+	rr.Hdr = h
+	s, e, c1 := endingToString(c, "bad NIMLOC Locator", f)
+	if e != nil {
+		return nil, e, c1
+	}
+	rr.Locator = s
+	return rr, nil, c1
+}
+
+func setGPOS(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(GPOS)
+	rr.Hdr = h
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	_, e := strconv.ParseFloat(l.token, 64)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad GPOS Longitude", l}, ""
+	}
+	rr.Longitude = l.token
+	<-c // zBlank
+	l = <-c
+	_, e = strconv.ParseFloat(l.token, 64)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad GPOS Latitude", l}, ""
+	}
+	rr.Latitude = l.token
+	<-c // zBlank
+	l = <-c
+	_, e = strconv.ParseFloat(l.token, 64)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad GPOS Altitude", l}, ""
+	}
+	rr.Altitude = l.token
+	return rr, nil, ""
+}
+
+func setDSs(h RR_Header, c chan lex, o, f, typ string) (RR, *ParseError, string) {
+	rr := new(DS)
+	rr.Hdr = h
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, l.comment
+	}
+	i, e := strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad " + typ + " KeyTag", l}, ""
+	}
+	rr.KeyTag = uint16(i)
+	<-c // zBlank
+	l = <-c
+	if i, e = strconv.ParseUint(l.token, 10, 8); e != nil {
+		i, ok := StringToAlgorithm[l.tokenUpper]
+		if !ok || l.err {
+			return nil, &ParseError{f, "bad " + typ + " Algorithm", l}, ""
+		}
+		rr.Algorithm = i
+	} else {
+		rr.Algorithm = uint8(i)
+	}
+	<-c // zBlank
+	l = <-c
+	i, e = strconv.ParseUint(l.token, 10, 8)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad " + typ + " DigestType", l}, ""
+	}
+	rr.DigestType = uint8(i)
+	s, e1, c1 := endingToString(c, "bad "+typ+" Digest", f)
+	if e1 != nil {
+		return nil, e1, c1
+	}
+	rr.Digest = s
+	return rr, nil, c1
+}
+
+func setDS(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	r, e, s := setDSs(h, c, o, f, "DS")
+	return r, e, s
+}
+
+func setDLV(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	r, e, s := setDSs(h, c, o, f, "DLV")
+	if r != nil {
+		return &DLV{*r.(*DS)}, e, s
+	}
+	return nil, e, s
+}
+
+func setCDS(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	r, e, s := setDSs(h, c, o, f, "CDS")
+	if r != nil {
+		return &CDS{*r.(*DS)}, e, s
+	}
+	return nil, e, s
+}
+
+func setTA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(TA)
+	rr.Hdr = h
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, l.comment
+	}
+	i, e := strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad TA KeyTag", l}, ""
+	}
+	rr.KeyTag = uint16(i)
+	<-c // zBlank
+	l = <-c
+	if i, e := strconv.ParseUint(l.token, 10, 8); e != nil {
+		i, ok := StringToAlgorithm[l.tokenUpper]
+		if !ok || l.err {
+			return nil, &ParseError{f, "bad TA Algorithm", l}, ""
+		}
+		rr.Algorithm = i
+	} else {
+		rr.Algorithm = uint8(i)
+	}
+	<-c // zBlank
+	l = <-c
+	i, e = strconv.ParseUint(l.token, 10, 8)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad TA DigestType", l}, ""
+	}
+	rr.DigestType = uint8(i)
+	s, e, c1 := endingToString(c, "bad TA Digest", f)
+	if e != nil {
+		return nil, e.(*ParseError), c1
+	}
+	rr.Digest = s
+	return rr, nil, c1
+}
+
+func setTLSA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(TLSA)
+	rr.Hdr = h
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, l.comment
+	}
+	i, e := strconv.ParseUint(l.token, 10, 8)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad TLSA Usage", l}, ""
+	}
+	rr.Usage = uint8(i)
+	<-c // zBlank
+	l = <-c
+	i, e = strconv.ParseUint(l.token, 10, 8)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad TLSA Selector", l}, ""
+	}
+	rr.Selector = uint8(i)
+	<-c // zBlank
+	l = <-c
+	i, e = strconv.ParseUint(l.token, 10, 8)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad TLSA MatchingType", l}, ""
+	}
+	rr.MatchingType = uint8(i)
+	// So this needs be e2 (i.e. different than e), because...??t
+	s, e2, c1 := endingToString(c, "bad TLSA Certificate", f)
+	if e2 != nil {
+		return nil, e2, c1
+	}
+	rr.Certificate = s
+	return rr, nil, c1
+}
+
+func setSMIMEA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(SMIMEA)
+	rr.Hdr = h
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, l.comment
+	}
+	i, e := strconv.ParseUint(l.token, 10, 8)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad SMIMEA Usage", l}, ""
+	}
+	rr.Usage = uint8(i)
+	<-c // zBlank
+	l = <-c
+	i, e = strconv.ParseUint(l.token, 10, 8)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad SMIMEA Selector", l}, ""
+	}
+	rr.Selector = uint8(i)
+	<-c // zBlank
+	l = <-c
+	i, e = strconv.ParseUint(l.token, 10, 8)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad SMIMEA MatchingType", l}, ""
+	}
+	rr.MatchingType = uint8(i)
+	// So this needs be e2 (i.e. different than e), because...??t
+	s, e2, c1 := endingToString(c, "bad SMIMEA Certificate", f)
+	if e2 != nil {
+		return nil, e2, c1
+	}
+	rr.Certificate = s
+	return rr, nil, c1
+}
+
+func setRFC3597(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(RFC3597)
+	rr.Hdr = h
+	l := <-c
+	if l.token != "\\#" {
+		return nil, &ParseError{f, "bad RFC3597 Rdata", l}, ""
+	}
+	<-c // zBlank
+	l = <-c
+	rdlength, e := strconv.Atoi(l.token)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad RFC3597 Rdata ", l}, ""
+	}
+
+	s, e1, c1 := endingToString(c, "bad RFC3597 Rdata", f)
+	if e1 != nil {
+		return nil, e1, c1
+	}
+	if rdlength*2 != len(s) {
+		return nil, &ParseError{f, "bad RFC3597 Rdata", l}, ""
+	}
+	rr.Rdata = s
+	return rr, nil, c1
+}
+
+func setSPF(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(SPF)
+	rr.Hdr = h
+
+	s, e, c1 := endingToTxtSlice(c, "bad SPF Txt", f)
+	if e != nil {
+		return nil, e, ""
+	}
+	rr.Txt = s
+	return rr, nil, c1
+}
+
+func setTXT(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(TXT)
+	rr.Hdr = h
+
+	// no zBlank reading here, because all this rdata is TXT
+	s, e, c1 := endingToTxtSlice(c, "bad TXT Txt", f)
+	if e != nil {
+		return nil, e, ""
+	}
+	rr.Txt = s
+	return rr, nil, c1
+}
+
+// identical to setTXT
+func setNINFO(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(NINFO)
+	rr.Hdr = h
+
+	s, e, c1 := endingToTxtSlice(c, "bad NINFO ZSData", f)
+	if e != nil {
+		return nil, e, ""
+	}
+	rr.ZSData = s
+	return rr, nil, c1
+}
+
+func setURI(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(URI)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 { // Dynamic updates.
+		return rr, nil, ""
+	}
+
+	i, e := strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad URI Priority", l}, ""
+	}
+	rr.Priority = uint16(i)
+	<-c // zBlank
+	l = <-c
+	i, e = strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad URI Weight", l}, ""
+	}
+	rr.Weight = uint16(i)
+
+	<-c // zBlank
+	s, err, c1 := endingToTxtSlice(c, "bad URI Target", f)
+	if err != nil {
+		return nil, err, ""
+	}
+	if len(s) > 1 {
+		return nil, &ParseError{f, "bad URI Target", l}, ""
+	}
+	rr.Target = s[0]
+	return rr, nil, c1
+}
+
+func setDHCID(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	// awesome record to parse!
+	rr := new(DHCID)
+	rr.Hdr = h
+
+	s, e, c1 := endingToString(c, "bad DHCID Digest", f)
+	if e != nil {
+		return nil, e, c1
+	}
+	rr.Digest = s
+	return rr, nil, c1
+}
+
+func setNID(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(NID)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	i, e := strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad NID Preference", l}, ""
+	}
+	rr.Preference = uint16(i)
+	<-c     // zBlank
+	l = <-c // zString
+	u, err := stringToNodeID(l)
+	if err != nil || l.err {
+		return nil, err, ""
+	}
+	rr.NodeID = u
+	return rr, nil, ""
+}
+
+func setL32(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(L32)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	i, e := strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad L32 Preference", l}, ""
+	}
+	rr.Preference = uint16(i)
+	<-c     // zBlank
+	l = <-c // zString
+	rr.Locator32 = net.ParseIP(l.token)
+	if rr.Locator32 == nil || l.err {
+		return nil, &ParseError{f, "bad L32 Locator", l}, ""
+	}
+	return rr, nil, ""
+}
+
+func setLP(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(LP)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	i, e := strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad LP Preference", l}, ""
+	}
+	rr.Preference = uint16(i)
+	<-c     // zBlank
+	l = <-c // zString
+	rr.Fqdn = l.token
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	if l.token == "@" {
+		rr.Fqdn = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad LP Fqdn", l}, ""
+	}
+	if rr.Fqdn[l.length-1] != '.' {
+		rr.Fqdn = appendOrigin(rr.Fqdn, o)
+	}
+	return rr, nil, ""
+}
+
+func setL64(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(L64)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	i, e := strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad L64 Preference", l}, ""
+	}
+	rr.Preference = uint16(i)
+	<-c     // zBlank
+	l = <-c // zString
+	u, err := stringToNodeID(l)
+	if err != nil || l.err {
+		return nil, err, ""
+	}
+	rr.Locator64 = u
+	return rr, nil, ""
+}
+
+func setUID(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(UID)
+	rr.Hdr = h
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	i, e := strconv.ParseUint(l.token, 10, 32)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad UID Uid", l}, ""
+	}
+	rr.Uid = uint32(i)
+	return rr, nil, ""
+}
+
+func setGID(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(GID)
+	rr.Hdr = h
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	i, e := strconv.ParseUint(l.token, 10, 32)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad GID Gid", l}, ""
+	}
+	rr.Gid = uint32(i)
+	return rr, nil, ""
+}
+
+func setUINFO(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(UINFO)
+	rr.Hdr = h
+	s, e, c1 := endingToTxtSlice(c, "bad UINFO Uinfo", f)
+	if e != nil {
+		return nil, e, c1
+	}
+	if ln := len(s); ln == 0 {
+		return rr, nil, c1
+	}
+	rr.Uinfo = s[0] // silently discard anything after the first character-string
+	return rr, nil, c1
+}
+
+func setPX(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(PX)
+	rr.Hdr = h
+
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	i, e := strconv.ParseUint(l.token, 10, 16)
+	if e != nil || l.err {
+		return nil, &ParseError{f, "bad PX Preference", l}, ""
+	}
+	rr.Preference = uint16(i)
+	<-c     // zBlank
+	l = <-c // zString
+	rr.Map822 = l.token
+	if l.length == 0 {
+		return rr, nil, ""
+	}
+	if l.token == "@" {
+		rr.Map822 = o
+		return rr, nil, ""
+	}
+	_, ok := IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad PX Map822", l}, ""
+	}
+	if rr.Map822[l.length-1] != '.' {
+		rr.Map822 = appendOrigin(rr.Map822, o)
+	}
+	<-c     // zBlank
+	l = <-c // zString
+	rr.Mapx400 = l.token
+	if l.token == "@" {
+		rr.Mapx400 = o
+		return rr, nil, ""
+	}
+	_, ok = IsDomainName(l.token)
+	if !ok || l.length == 0 || l.err {
+		return nil, &ParseError{f, "bad PX Mapx400", l}, ""
+	}
+	if rr.Mapx400[l.length-1] != '.' {
+		rr.Mapx400 = appendOrigin(rr.Mapx400, o)
+	}
+	return rr, nil, ""
+}
+
+func setCAA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+	rr := new(CAA)
+	rr.Hdr = h
+	l := <-c
+	if l.length == 0 {
+		return rr, nil, l.comment
+	}
+	i, err := strconv.ParseUint(l.token, 10, 8)
+	if err != nil || l.err {
+		return nil, &ParseError{f, "bad CAA Flag", l}, ""
+	}
+	rr.Flag = uint8(i)
+
+	<-c     // zBlank
+	l = <-c // zString
+	if l.value != zString {
+		return nil, &ParseError{f, "bad CAA Tag", l}, ""
+	}
+	rr.Tag = l.token
+
+	<-c // zBlank
+	s, e, c1 := endingToTxtSlice(c, "bad CAA Value", f)
+	if e != nil {
+		return nil, e, ""
+	}
+	if len(s) > 1 {
+		return nil, &ParseError{f, "bad CAA Value", l}, ""
+	}
+	rr.Value = s[0]
+	return rr, nil, c1
+}
+
+var typeToparserFunc = map[uint16]parserFunc{
+	TypeAAAA:       {setAAAA, false},
+	TypeAFSDB:      {setAFSDB, false},
+	TypeA:          {setA, false},
+	TypeCAA:        {setCAA, true},
+	TypeCDS:        {setCDS, true},
+	TypeCDNSKEY:    {setCDNSKEY, true},
+	TypeCERT:       {setCERT, true},
+	TypeCNAME:      {setCNAME, false},
+	TypeDHCID:      {setDHCID, true},
+	TypeDLV:        {setDLV, true},
+	TypeDNAME:      {setDNAME, false},
+	TypeKEY:        {setKEY, true},
+	TypeDNSKEY:     {setDNSKEY, true},
+	TypeDS:         {setDS, true},
+	TypeEID:        {setEID, true},
+	TypeEUI48:      {setEUI48, false},
+	TypeEUI64:      {setEUI64, false},
+	TypeGID:        {setGID, false},
+	TypeGPOS:       {setGPOS, false},
+	TypeHINFO:      {setHINFO, true},
+	TypeHIP:        {setHIP, true},
+	TypeKX:         {setKX, false},
+	TypeL32:        {setL32, false},
+	TypeL64:        {setL64, false},
+	TypeLOC:        {setLOC, true},
+	TypeLP:         {setLP, false},
+	TypeMB:         {setMB, false},
+	TypeMD:         {setMD, false},
+	TypeMF:         {setMF, false},
+	TypeMG:         {setMG, false},
+	TypeMINFO:      {setMINFO, false},
+	TypeMR:         {setMR, false},
+	TypeMX:         {setMX, false},
+	TypeNAPTR:      {setNAPTR, false},
+	TypeNID:        {setNID, false},
+	TypeNIMLOC:     {setNIMLOC, true},
+	TypeNINFO:      {setNINFO, true},
+	TypeNSAPPTR:    {setNSAPPTR, false},
+	TypeNSEC3PARAM: {setNSEC3PARAM, false},
+	TypeNSEC3:      {setNSEC3, true},
+	TypeNSEC:       {setNSEC, true},
+	TypeNS:         {setNS, false},
+	TypeOPENPGPKEY: {setOPENPGPKEY, true},
+	TypePTR:        {setPTR, false},
+	TypePX:         {setPX, false},
+	TypeSIG:        {setSIG, true},
+	TypeRKEY:       {setRKEY, true},
+	TypeRP:         {setRP, false},
+	TypeRRSIG:      {setRRSIG, true},
+	TypeRT:         {setRT, false},
+	TypeSMIMEA:     {setSMIMEA, true},
+	TypeSOA:        {setSOA, false},
+	TypeSPF:        {setSPF, true},
+	TypeSRV:        {setSRV, false},
+	TypeSSHFP:      {setSSHFP, true},
+	TypeTALINK:     {setTALINK, false},
+	TypeTA:         {setTA, true},
+	TypeTLSA:       {setTLSA, true},
+	TypeTXT:        {setTXT, true},
+	TypeUID:        {setUID, false},
+	TypeUINFO:      {setUINFO, true},
+	TypeURI:        {setURI, true},
+	TypeX25:        {setX25, false},
+}
diff --git a/vendor/github.com/miekg/dns/scanner.go b/vendor/github.com/miekg/dns/scanner.go
new file mode 100644
index 0000000000..c29bc2f388
--- /dev/null
+++ b/vendor/github.com/miekg/dns/scanner.go
@@ -0,0 +1,43 @@
+package dns
+
+// Implement a simple scanner, return a byte stream from an io reader.
+
+import (
+	"bufio"
+	"io"
+	"text/scanner"
+)
+
+type scan struct {
+	src      *bufio.Reader
+	position scanner.Position
+	eof      bool // Have we just seen a eof
+}
+
+func scanInit(r io.Reader) *scan {
+	s := new(scan)
+	s.src = bufio.NewReader(r)
+	s.position.Line = 1
+	return s
+}
+
+// tokenText returns the next byte from the input
+func (s *scan) tokenText() (byte, error) {
+	c, err := s.src.ReadByte()
+	if err != nil {
+		return c, err
+	}
+	// delay the newline handling until the next token is delivered,
+	// fixes off-by-one errors when reporting a parse error.
+	if s.eof == true {
+		s.position.Line++
+		s.position.Column = 0
+		s.eof = false
+	}
+	if c == '\n' {
+		s.eof = true
+		return c, nil
+	}
+	s.position.Column++
+	return c, nil
+}
diff --git a/vendor/github.com/miekg/dns/server.go b/vendor/github.com/miekg/dns/server.go
new file mode 100644
index 0000000000..0ca6e008c0
--- /dev/null
+++ b/vendor/github.com/miekg/dns/server.go
@@ -0,0 +1,734 @@
+// DNS server implementation.
+
+package dns
+
+import (
+	"bytes"
+	"crypto/tls"
+	"encoding/binary"
+	"io"
+	"net"
+	"sync"
+	"time"
+)
+
+// Maximum number of TCP queries before we close the socket.
+const maxTCPQueries = 128
+
+// Handler is implemented by any value that implements ServeDNS.
+type Handler interface {
+	ServeDNS(w ResponseWriter, r *Msg)
+}
+
+// A ResponseWriter interface is used by an DNS handler to
+// construct an DNS response.
+type ResponseWriter interface {
+	// LocalAddr returns the net.Addr of the server
+	LocalAddr() net.Addr
+	// RemoteAddr returns the net.Addr of the client that sent the current request.
+	RemoteAddr() net.Addr
+	// WriteMsg writes a reply back to the client.
+	WriteMsg(*Msg) error
+	// Write writes a raw buffer back to the client.
+	Write([]byte) (int, error)
+	// Close closes the connection.
+	Close() error
+	// TsigStatus returns the status of the Tsig.
+	TsigStatus() error
+	// TsigTimersOnly sets the tsig timers only boolean.
+	TsigTimersOnly(bool)
+	// Hijack lets the caller take over the connection.
+	// After a call to Hijack(), the DNS package will not do anything with the connection.
+	Hijack()
+}
+
+type response struct {
+	hijacked       bool // connection has been hijacked by handler
+	tsigStatus     error
+	tsigTimersOnly bool
+	tsigRequestMAC string
+	tsigSecret     map[string]string // the tsig secrets
+	udp            *net.UDPConn      // i/o connection if UDP was used
+	tcp            net.Conn          // i/o connection if TCP was used
+	udpSession     *SessionUDP       // oob data to get egress interface right
+	remoteAddr     net.Addr          // address of the client
+	writer         Writer            // writer to output the raw DNS bits
+}
+
+// ServeMux is an DNS request multiplexer. It matches the
+// zone name of each incoming request against a list of
+// registered patterns add calls the handler for the pattern
+// that most closely matches the zone name. ServeMux is DNSSEC aware, meaning
+// that queries for the DS record are redirected to the parent zone (if that
+// is also registered), otherwise the child gets the query.
+// ServeMux is also safe for concurrent access from multiple goroutines.
+type ServeMux struct {
+	z map[string]Handler
+	m *sync.RWMutex
+}
+
+// NewServeMux allocates and returns a new ServeMux.
+func NewServeMux() *ServeMux { return &ServeMux{z: make(map[string]Handler), m: new(sync.RWMutex)} }
+
+// DefaultServeMux is the default ServeMux used by Serve.
+var DefaultServeMux = NewServeMux()
+
+// The HandlerFunc type is an adapter to allow the use of
+// ordinary functions as DNS handlers.  If f is a function
+// with the appropriate signature, HandlerFunc(f) is a
+// Handler object that calls f.
+type HandlerFunc func(ResponseWriter, *Msg)
+
+// ServeDNS calls f(w, r).
+func (f HandlerFunc) ServeDNS(w ResponseWriter, r *Msg) {
+	f(w, r)
+}
+
+// HandleFailed returns a HandlerFunc that returns SERVFAIL for every request it gets.
+func HandleFailed(w ResponseWriter, r *Msg) {
+	m := new(Msg)
+	m.SetRcode(r, RcodeServerFailure)
+	// does not matter if this write fails
+	w.WriteMsg(m)
+}
+
+func failedHandler() Handler { return HandlerFunc(HandleFailed) }
+
+// ListenAndServe Starts a server on address and network specified Invoke handler
+// for incoming queries.
+func ListenAndServe(addr string, network string, handler Handler) error {
+	server := &Server{Addr: addr, Net: network, Handler: handler}
+	return server.ListenAndServe()
+}
+
+// ListenAndServeTLS acts like http.ListenAndServeTLS, more information in
+// http://golang.org/pkg/net/http/#ListenAndServeTLS
+func ListenAndServeTLS(addr, certFile, keyFile string, handler Handler) error {
+	cert, err := tls.LoadX509KeyPair(certFile, keyFile)
+	if err != nil {
+		return err
+	}
+
+	config := tls.Config{
+		Certificates: []tls.Certificate{cert},
+	}
+
+	server := &Server{
+		Addr:      addr,
+		Net:       "tcp-tls",
+		TLSConfig: &config,
+		Handler:   handler,
+	}
+
+	return server.ListenAndServe()
+}
+
+// ActivateAndServe activates a server with a listener from systemd,
+// l and p should not both be non-nil.
+// If both l and p are not nil only p will be used.
+// Invoke handler for incoming queries.
+func ActivateAndServe(l net.Listener, p net.PacketConn, handler Handler) error {
+	server := &Server{Listener: l, PacketConn: p, Handler: handler}
+	return server.ActivateAndServe()
+}
+
+func (mux *ServeMux) match(q string, t uint16) Handler {
+	mux.m.RLock()
+	defer mux.m.RUnlock()
+	var handler Handler
+	b := make([]byte, len(q)) // worst case, one label of length q
+	off := 0
+	end := false
+	for {
+		l := len(q[off:])
+		for i := 0; i < l; i++ {
+			b[i] = q[off+i]
+			if b[i] >= 'A' && b[i] <= 'Z' {
+				b[i] |= ('a' - 'A')
+			}
+		}
+		if h, ok := mux.z[string(b[:l])]; ok { // causes garbage, might want to change the map key
+			if t != TypeDS {
+				return h
+			}
+			// Continue for DS to see if we have a parent too, if so delegeate to the parent
+			handler = h
+		}
+		off, end = NextLabel(q, off)
+		if end {
+			break
+		}
+	}
+	// Wildcard match, if we have found nothing try the root zone as a last resort.
+	if h, ok := mux.z["."]; ok {
+		return h
+	}
+	return handler
+}
+
+// Handle adds a handler to the ServeMux for pattern.
+func (mux *ServeMux) Handle(pattern string, handler Handler) {
+	if pattern == "" {
+		panic("dns: invalid pattern " + pattern)
+	}
+	mux.m.Lock()
+	mux.z[Fqdn(pattern)] = handler
+	mux.m.Unlock()
+}
+
+// HandleFunc adds a handler function to the ServeMux for pattern.
+func (mux *ServeMux) HandleFunc(pattern string, handler func(ResponseWriter, *Msg)) {
+	mux.Handle(pattern, HandlerFunc(handler))
+}
+
+// HandleRemove deregistrars the handler specific for pattern from the ServeMux.
+func (mux *ServeMux) HandleRemove(pattern string) {
+	if pattern == "" {
+		panic("dns: invalid pattern " + pattern)
+	}
+	mux.m.Lock()
+	delete(mux.z, Fqdn(pattern))
+	mux.m.Unlock()
+}
+
+// ServeDNS dispatches the request to the handler whose
+// pattern most closely matches the request message. If DefaultServeMux
+// is used the correct thing for DS queries is done: a possible parent
+// is sought.
+// If no handler is found a standard SERVFAIL message is returned
+// If the request message does not have exactly one question in the
+// question section a SERVFAIL is returned, unlesss Unsafe is true.
+func (mux *ServeMux) ServeDNS(w ResponseWriter, request *Msg) {
+	var h Handler
+	if len(request.Question) < 1 { // allow more than one question
+		h = failedHandler()
+	} else {
+		if h = mux.match(request.Question[0].Name, request.Question[0].Qtype); h == nil {
+			h = failedHandler()
+		}
+	}
+	h.ServeDNS(w, request)
+}
+
+// Handle registers the handler with the given pattern
+// in the DefaultServeMux. The documentation for
+// ServeMux explains how patterns are matched.
+func Handle(pattern string, handler Handler) { DefaultServeMux.Handle(pattern, handler) }
+
+// HandleRemove deregisters the handle with the given pattern
+// in the DefaultServeMux.
+func HandleRemove(pattern string) { DefaultServeMux.HandleRemove(pattern) }
+
+// HandleFunc registers the handler function with the given pattern
+// in the DefaultServeMux.
+func HandleFunc(pattern string, handler func(ResponseWriter, *Msg)) {
+	DefaultServeMux.HandleFunc(pattern, handler)
+}
+
+// Writer writes raw DNS messages; each call to Write should send an entire message.
+type Writer interface {
+	io.Writer
+}
+
+// Reader reads raw DNS messages; each call to ReadTCP or ReadUDP should return an entire message.
+type Reader interface {
+	// ReadTCP reads a raw message from a TCP connection. Implementations may alter
+	// connection properties, for example the read-deadline.
+	ReadTCP(conn net.Conn, timeout time.Duration) ([]byte, error)
+	// ReadUDP reads a raw message from a UDP connection. Implementations may alter
+	// connection properties, for example the read-deadline.
+	ReadUDP(conn *net.UDPConn, timeout time.Duration) ([]byte, *SessionUDP, error)
+}
+
+// defaultReader is an adapter for the Server struct that implements the Reader interface
+// using the readTCP and readUDP func of the embedded Server.
+type defaultReader struct {
+	*Server
+}
+
+func (dr *defaultReader) ReadTCP(conn net.Conn, timeout time.Duration) ([]byte, error) {
+	return dr.readTCP(conn, timeout)
+}
+
+func (dr *defaultReader) ReadUDP(conn *net.UDPConn, timeout time.Duration) ([]byte, *SessionUDP, error) {
+	return dr.readUDP(conn, timeout)
+}
+
+// DecorateReader is a decorator hook for extending or supplanting the functionality of a Reader.
+// Implementations should never return a nil Reader.
+type DecorateReader func(Reader) Reader
+
+// DecorateWriter is a decorator hook for extending or supplanting the functionality of a Writer.
+// Implementations should never return a nil Writer.
+type DecorateWriter func(Writer) Writer
+
+// A Server defines parameters for running an DNS server.
+type Server struct {
+	// Address to listen on, ":dns" if empty.
+	Addr string
+	// if "tcp" or "tcp-tls" (DNS over TLS) it will invoke a TCP listener, otherwise an UDP one
+	Net string
+	// TCP Listener to use, this is to aid in systemd's socket activation.
+	Listener net.Listener
+	// TLS connection configuration
+	TLSConfig *tls.Config
+	// UDP "Listener" to use, this is to aid in systemd's socket activation.
+	PacketConn net.PacketConn
+	// Handler to invoke, dns.DefaultServeMux if nil.
+	Handler Handler
+	// Default buffer size to use to read incoming UDP messages. If not set
+	// it defaults to MinMsgSize (512 B).
+	UDPSize int
+	// The net.Conn.SetReadTimeout value for new connections, defaults to 2 * time.Second.
+	ReadTimeout time.Duration
+	// The net.Conn.SetWriteTimeout value for new connections, defaults to 2 * time.Second.
+	WriteTimeout time.Duration
+	// TCP idle timeout for multiple queries, if nil, defaults to 8 * time.Second (RFC 5966).
+	IdleTimeout func() time.Duration
+	// Secret(s) for Tsig map[<zonename>]<base64 secret>.
+	TsigSecret map[string]string
+	// Unsafe instructs the server to disregard any sanity checks and directly hand the message to
+	// the handler. It will specifically not check if the query has the QR bit not set.
+	Unsafe bool
+	// If NotifyStartedFunc is set it is called once the server has started listening.
+	NotifyStartedFunc func()
+	// DecorateReader is optional, allows customization of the process that reads raw DNS messages.
+	DecorateReader DecorateReader
+	// DecorateWriter is optional, allows customization of the process that writes raw DNS messages.
+	DecorateWriter DecorateWriter
+
+	// Graceful shutdown handling
+
+	inFlight sync.WaitGroup
+
+	lock    sync.RWMutex
+	started bool
+}
+
+// ListenAndServe starts a nameserver on the configured address in *Server.
+func (srv *Server) ListenAndServe() error {
+	srv.lock.Lock()
+	defer srv.lock.Unlock()
+	if srv.started {
+		return &Error{err: "server already started"}
+	}
+	addr := srv.Addr
+	if addr == "" {
+		addr = ":domain"
+	}
+	if srv.UDPSize == 0 {
+		srv.UDPSize = MinMsgSize
+	}
+	switch srv.Net {
+	case "tcp", "tcp4", "tcp6":
+		a, err := net.ResolveTCPAddr(srv.Net, addr)
+		if err != nil {
+			return err
+		}
+		l, err := net.ListenTCP(srv.Net, a)
+		if err != nil {
+			return err
+		}
+		srv.Listener = l
+		srv.started = true
+		srv.lock.Unlock()
+		err = srv.serveTCP(l)
+		srv.lock.Lock() // to satisfy the defer at the top
+		return err
+	case "tcp-tls", "tcp4-tls", "tcp6-tls":
+		network := "tcp"
+		if srv.Net == "tcp4-tls" {
+			network = "tcp4"
+		} else if srv.Net == "tcp6-tls" {
+			network = "tcp6"
+		}
+
+		l, err := tls.Listen(network, addr, srv.TLSConfig)
+		if err != nil {
+			return err
+		}
+		srv.Listener = l
+		srv.started = true
+		srv.lock.Unlock()
+		err = srv.serveTCP(l)
+		srv.lock.Lock() // to satisfy the defer at the top
+		return err
+	case "udp", "udp4", "udp6":
+		a, err := net.ResolveUDPAddr(srv.Net, addr)
+		if err != nil {
+			return err
+		}
+		l, err := net.ListenUDP(srv.Net, a)
+		if err != nil {
+			return err
+		}
+		if e := setUDPSocketOptions(l); e != nil {
+			return e
+		}
+		srv.PacketConn = l
+		srv.started = true
+		srv.lock.Unlock()
+		err = srv.serveUDP(l)
+		srv.lock.Lock() // to satisfy the defer at the top
+		return err
+	}
+	return &Error{err: "bad network"}
+}
+
+// ActivateAndServe starts a nameserver with the PacketConn or Listener
+// configured in *Server. Its main use is to start a server from systemd.
+func (srv *Server) ActivateAndServe() error {
+	srv.lock.Lock()
+	defer srv.lock.Unlock()
+	if srv.started {
+		return &Error{err: "server already started"}
+	}
+	pConn := srv.PacketConn
+	l := srv.Listener
+	if pConn != nil {
+		if srv.UDPSize == 0 {
+			srv.UDPSize = MinMsgSize
+		}
+		// Check PacketConn interface's type is valid and value
+		// is not nil
+		if t, ok := pConn.(*net.UDPConn); ok && t != nil {
+			if e := setUDPSocketOptions(t); e != nil {
+				return e
+			}
+			srv.started = true
+			srv.lock.Unlock()
+			e := srv.serveUDP(t)
+			srv.lock.Lock() // to satisfy the defer at the top
+			return e
+		}
+	}
+	if l != nil {
+		srv.started = true
+		srv.lock.Unlock()
+		e := srv.serveTCP(l)
+		srv.lock.Lock() // to satisfy the defer at the top
+		return e
+	}
+	return &Error{err: "bad listeners"}
+}
+
+// Shutdown gracefully shuts down a server. After a call to Shutdown, ListenAndServe and
+// ActivateAndServe will return. All in progress queries are completed before the server
+// is taken down. If the Shutdown is taking longer than the reading timeout an error
+// is returned.
+func (srv *Server) Shutdown() error {
+	srv.lock.Lock()
+	if !srv.started {
+		srv.lock.Unlock()
+		return &Error{err: "server not started"}
+	}
+	srv.started = false
+	srv.lock.Unlock()
+
+	if srv.PacketConn != nil {
+		srv.PacketConn.Close()
+	}
+	if srv.Listener != nil {
+		srv.Listener.Close()
+	}
+
+	fin := make(chan bool)
+	go func() {
+		srv.inFlight.Wait()
+		fin <- true
+	}()
+
+	select {
+	case <-time.After(srv.getReadTimeout()):
+		return &Error{err: "server shutdown is pending"}
+	case <-fin:
+		return nil
+	}
+}
+
+// getReadTimeout is a helper func to use system timeout if server did not intend to change it.
+func (srv *Server) getReadTimeout() time.Duration {
+	rtimeout := dnsTimeout
+	if srv.ReadTimeout != 0 {
+		rtimeout = srv.ReadTimeout
+	}
+	return rtimeout
+}
+
+// serveTCP starts a TCP listener for the server.
+// Each request is handled in a separate goroutine.
+func (srv *Server) serveTCP(l net.Listener) error {
+	defer l.Close()
+
+	if srv.NotifyStartedFunc != nil {
+		srv.NotifyStartedFunc()
+	}
+
+	reader := Reader(&defaultReader{srv})
+	if srv.DecorateReader != nil {
+		reader = srv.DecorateReader(reader)
+	}
+
+	handler := srv.Handler
+	if handler == nil {
+		handler = DefaultServeMux
+	}
+	rtimeout := srv.getReadTimeout()
+	// deadline is not used here
+	for {
+		rw, err := l.Accept()
+		if err != nil {
+			if neterr, ok := err.(net.Error); ok && neterr.Temporary() {
+				continue
+			}
+			return err
+		}
+		m, err := reader.ReadTCP(rw, rtimeout)
+		srv.lock.RLock()
+		if !srv.started {
+			srv.lock.RUnlock()
+			return nil
+		}
+		srv.lock.RUnlock()
+		if err != nil {
+			continue
+		}
+		srv.inFlight.Add(1)
+		go srv.serve(rw.RemoteAddr(), handler, m, nil, nil, rw)
+	}
+}
+
+// serveUDP starts a UDP listener for the server.
+// Each request is handled in a separate goroutine.
+func (srv *Server) serveUDP(l *net.UDPConn) error {
+	defer l.Close()
+
+	if srv.NotifyStartedFunc != nil {
+		srv.NotifyStartedFunc()
+	}
+
+	reader := Reader(&defaultReader{srv})
+	if srv.DecorateReader != nil {
+		reader = srv.DecorateReader(reader)
+	}
+
+	handler := srv.Handler
+	if handler == nil {
+		handler = DefaultServeMux
+	}
+	rtimeout := srv.getReadTimeout()
+	// deadline is not used here
+	for {
+		m, s, err := reader.ReadUDP(l, rtimeout)
+		srv.lock.RLock()
+		if !srv.started {
+			srv.lock.RUnlock()
+			return nil
+		}
+		srv.lock.RUnlock()
+		if err != nil {
+			continue
+		}
+		srv.inFlight.Add(1)
+		go srv.serve(s.RemoteAddr(), handler, m, l, s, nil)
+	}
+}
+
+// Serve a new connection.
+func (srv *Server) serve(a net.Addr, h Handler, m []byte, u *net.UDPConn, s *SessionUDP, t net.Conn) {
+	defer srv.inFlight.Done()
+
+	w := &response{tsigSecret: srv.TsigSecret, udp: u, tcp: t, remoteAddr: a, udpSession: s}
+	if srv.DecorateWriter != nil {
+		w.writer = srv.DecorateWriter(w)
+	} else {
+		w.writer = w
+	}
+
+	q := 0 // counter for the amount of TCP queries we get
+
+	reader := Reader(&defaultReader{srv})
+	if srv.DecorateReader != nil {
+		reader = srv.DecorateReader(reader)
+	}
+Redo:
+	req := new(Msg)
+	err := req.Unpack(m)
+	if err != nil { // Send a FormatError back
+		x := new(Msg)
+		x.SetRcodeFormatError(req)
+		w.WriteMsg(x)
+		goto Exit
+	}
+	if !srv.Unsafe && req.Response {
+		goto Exit
+	}
+
+	w.tsigStatus = nil
+	if w.tsigSecret != nil {
+		if t := req.IsTsig(); t != nil {
+			secret := t.Hdr.Name
+			if _, ok := w.tsigSecret[secret]; !ok {
+				w.tsigStatus = ErrKeyAlg
+			}
+			w.tsigStatus = TsigVerify(m, w.tsigSecret[secret], "", false)
+			w.tsigTimersOnly = false
+			w.tsigRequestMAC = req.Extra[len(req.Extra)-1].(*TSIG).MAC
+		}
+	}
+	h.ServeDNS(w, req) // Writes back to the client
+
+Exit:
+	if w.tcp == nil {
+		return
+	}
+	// TODO(miek): make this number configurable?
+	if q > maxTCPQueries { // close socket after this many queries
+		w.Close()
+		return
+	}
+
+	if w.hijacked {
+		return // client calls Close()
+	}
+	if u != nil { // UDP, "close" and return
+		w.Close()
+		return
+	}
+	idleTimeout := tcpIdleTimeout
+	if srv.IdleTimeout != nil {
+		idleTimeout = srv.IdleTimeout()
+	}
+	m, err = reader.ReadTCP(w.tcp, idleTimeout)
+	if err == nil {
+		q++
+		goto Redo
+	}
+	w.Close()
+	return
+}
+
+func (srv *Server) readTCP(conn net.Conn, timeout time.Duration) ([]byte, error) {
+	conn.SetReadDeadline(time.Now().Add(timeout))
+	l := make([]byte, 2)
+	n, err := conn.Read(l)
+	if err != nil || n != 2 {
+		if err != nil {
+			return nil, err
+		}
+		return nil, ErrShortRead
+	}
+	length := binary.BigEndian.Uint16(l)
+	if length == 0 {
+		return nil, ErrShortRead
+	}
+	m := make([]byte, int(length))
+	n, err = conn.Read(m[:int(length)])
+	if err != nil || n == 0 {
+		if err != nil {
+			return nil, err
+		}
+		return nil, ErrShortRead
+	}
+	i := n
+	for i < int(length) {
+		j, err := conn.Read(m[i:int(length)])
+		if err != nil {
+			return nil, err
+		}
+		i += j
+	}
+	n = i
+	m = m[:n]
+	return m, nil
+}
+
+func (srv *Server) readUDP(conn *net.UDPConn, timeout time.Duration) ([]byte, *SessionUDP, error) {
+	conn.SetReadDeadline(time.Now().Add(timeout))
+	m := make([]byte, srv.UDPSize)
+	n, s, err := ReadFromSessionUDP(conn, m)
+	if err != nil || n == 0 {
+		if err != nil {
+			return nil, nil, err
+		}
+		return nil, nil, ErrShortRead
+	}
+	m = m[:n]
+	return m, s, nil
+}
+
+// WriteMsg implements the ResponseWriter.WriteMsg method.
+func (w *response) WriteMsg(m *Msg) (err error) {
+	var data []byte
+	if w.tsigSecret != nil { // if no secrets, dont check for the tsig (which is a longer check)
+		if t := m.IsTsig(); t != nil {
+			data, w.tsigRequestMAC, err = TsigGenerate(m, w.tsigSecret[t.Hdr.Name], w.tsigRequestMAC, w.tsigTimersOnly)
+			if err != nil {
+				return err
+			}
+			_, err = w.writer.Write(data)
+			return err
+		}
+	}
+	data, err = m.Pack()
+	if err != nil {
+		return err
+	}
+	_, err = w.writer.Write(data)
+	return err
+}
+
+// Write implements the ResponseWriter.Write method.
+func (w *response) Write(m []byte) (int, error) {
+	switch {
+	case w.udp != nil:
+		n, err := WriteToSessionUDP(w.udp, m, w.udpSession)
+		return n, err
+	case w.tcp != nil:
+		lm := len(m)
+		if lm < 2 {
+			return 0, io.ErrShortBuffer
+		}
+		if lm > MaxMsgSize {
+			return 0, &Error{err: "message too large"}
+		}
+		l := make([]byte, 2, 2+lm)
+		binary.BigEndian.PutUint16(l, uint16(lm))
+		m = append(l, m...)
+
+		n, err := io.Copy(w.tcp, bytes.NewReader(m))
+		return int(n), err
+	}
+	panic("not reached")
+}
+
+// LocalAddr implements the ResponseWriter.LocalAddr method.
+func (w *response) LocalAddr() net.Addr {
+	if w.tcp != nil {
+		return w.tcp.LocalAddr()
+	}
+	return w.udp.LocalAddr()
+}
+
+// RemoteAddr implements the ResponseWriter.RemoteAddr method.
+func (w *response) RemoteAddr() net.Addr { return w.remoteAddr }
+
+// TsigStatus implements the ResponseWriter.TsigStatus method.
+func (w *response) TsigStatus() error { return w.tsigStatus }
+
+// TsigTimersOnly implements the ResponseWriter.TsigTimersOnly method.
+func (w *response) TsigTimersOnly(b bool) { w.tsigTimersOnly = b }
+
+// Hijack implements the ResponseWriter.Hijack method.
+func (w *response) Hijack() { w.hijacked = true }
+
+// Close implements the ResponseWriter.Close method
+func (w *response) Close() error {
+	// Can't close the udp conn, as that is actually the listener.
+	if w.tcp != nil {
+		e := w.tcp.Close()
+		w.tcp = nil
+		return e
+	}
+	return nil
+}
diff --git a/vendor/github.com/miekg/dns/server_test.go b/vendor/github.com/miekg/dns/server_test.go
new file mode 100644
index 0000000000..f17a2f90f7
--- /dev/null
+++ b/vendor/github.com/miekg/dns/server_test.go
@@ -0,0 +1,719 @@
+package dns
+
+import (
+	"crypto/tls"
+	"fmt"
+	"io"
+	"net"
+	"runtime"
+	"sync"
+	"testing"
+	"time"
+)
+
+func HelloServer(w ResponseWriter, req *Msg) {
+	m := new(Msg)
+	m.SetReply(req)
+
+	m.Extra = make([]RR, 1)
+	m.Extra[0] = &TXT{Hdr: RR_Header{Name: m.Question[0].Name, Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"Hello world"}}
+	w.WriteMsg(m)
+}
+
+func HelloServerBadID(w ResponseWriter, req *Msg) {
+	m := new(Msg)
+	m.SetReply(req)
+	m.Id++
+
+	m.Extra = make([]RR, 1)
+	m.Extra[0] = &TXT{Hdr: RR_Header{Name: m.Question[0].Name, Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"Hello world"}}
+	w.WriteMsg(m)
+}
+
+func AnotherHelloServer(w ResponseWriter, req *Msg) {
+	m := new(Msg)
+	m.SetReply(req)
+
+	m.Extra = make([]RR, 1)
+	m.Extra[0] = &TXT{Hdr: RR_Header{Name: m.Question[0].Name, Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"Hello example"}}
+	w.WriteMsg(m)
+}
+
+func RunLocalUDPServer(laddr string) (*Server, string, error) {
+	server, l, _, err := RunLocalUDPServerWithFinChan(laddr)
+
+	return server, l, err
+}
+
+func RunLocalUDPServerWithFinChan(laddr string) (*Server, string, chan struct{}, error) {
+	pc, err := net.ListenPacket("udp", laddr)
+	if err != nil {
+		return nil, "", nil, err
+	}
+	server := &Server{PacketConn: pc, ReadTimeout: time.Hour, WriteTimeout: time.Hour}
+
+	waitLock := sync.Mutex{}
+	waitLock.Lock()
+	server.NotifyStartedFunc = waitLock.Unlock
+
+	fin := make(chan struct{}, 0)
+
+	go func() {
+		server.ActivateAndServe()
+		close(fin)
+		pc.Close()
+	}()
+
+	waitLock.Lock()
+	return server, pc.LocalAddr().String(), fin, nil
+}
+
+func RunLocalUDPServerUnsafe(laddr string) (*Server, string, error) {
+	pc, err := net.ListenPacket("udp", laddr)
+	if err != nil {
+		return nil, "", err
+	}
+	server := &Server{PacketConn: pc, Unsafe: true,
+		ReadTimeout: time.Hour, WriteTimeout: time.Hour}
+
+	waitLock := sync.Mutex{}
+	waitLock.Lock()
+	server.NotifyStartedFunc = waitLock.Unlock
+
+	go func() {
+		server.ActivateAndServe()
+		pc.Close()
+	}()
+
+	waitLock.Lock()
+	return server, pc.LocalAddr().String(), nil
+}
+
+func RunLocalTCPServer(laddr string) (*Server, string, error) {
+	l, err := net.Listen("tcp", laddr)
+	if err != nil {
+		return nil, "", err
+	}
+
+	server := &Server{Listener: l, ReadTimeout: time.Hour, WriteTimeout: time.Hour}
+
+	waitLock := sync.Mutex{}
+	waitLock.Lock()
+	server.NotifyStartedFunc = waitLock.Unlock
+
+	go func() {
+		server.ActivateAndServe()
+		l.Close()
+	}()
+
+	waitLock.Lock()
+	return server, l.Addr().String(), nil
+}
+
+func RunLocalTLSServer(laddr string, config *tls.Config) (*Server, string, error) {
+	l, err := tls.Listen("tcp", laddr, config)
+	if err != nil {
+		return nil, "", err
+	}
+
+	server := &Server{Listener: l, ReadTimeout: time.Hour, WriteTimeout: time.Hour}
+
+	waitLock := sync.Mutex{}
+	waitLock.Lock()
+	server.NotifyStartedFunc = waitLock.Unlock
+
+	go func() {
+		server.ActivateAndServe()
+		l.Close()
+	}()
+
+	waitLock.Lock()
+	return server, l.Addr().String(), nil
+}
+
+func TestServing(t *testing.T) {
+	HandleFunc("miek.nl.", HelloServer)
+	HandleFunc("example.com.", AnotherHelloServer)
+	defer HandleRemove("miek.nl.")
+	defer HandleRemove("example.com.")
+
+	s, addrstr, err := RunLocalUDPServer("127.0.0.1:0")
+	if err != nil {
+		t.Fatalf("unable to run test server: %v", err)
+	}
+	defer s.Shutdown()
+
+	c := new(Client)
+	m := new(Msg)
+	m.SetQuestion("miek.nl.", TypeTXT)
+	r, _, err := c.Exchange(m, addrstr)
+	if err != nil || len(r.Extra) == 0 {
+		t.Fatal("failed to exchange miek.nl", err)
+	}
+	txt := r.Extra[0].(*TXT).Txt[0]
+	if txt != "Hello world" {
+		t.Error("unexpected result for miek.nl", txt, "!= Hello world")
+	}
+
+	m.SetQuestion("example.com.", TypeTXT)
+	r, _, err = c.Exchange(m, addrstr)
+	if err != nil {
+		t.Fatal("failed to exchange example.com", err)
+	}
+	txt = r.Extra[0].(*TXT).Txt[0]
+	if txt != "Hello example" {
+		t.Error("unexpected result for example.com", txt, "!= Hello example")
+	}
+
+	// Test Mixes cased as noticed by Ask.
+	m.SetQuestion("eXaMplE.cOm.", TypeTXT)
+	r, _, err = c.Exchange(m, addrstr)
+	if err != nil {
+		t.Error("failed to exchange eXaMplE.cOm", err)
+	}
+	txt = r.Extra[0].(*TXT).Txt[0]
+	if txt != "Hello example" {
+		t.Error("unexpected result for example.com", txt, "!= Hello example")
+	}
+}
+
+func TestServingTLS(t *testing.T) {
+	HandleFunc("miek.nl.", HelloServer)
+	HandleFunc("example.com.", AnotherHelloServer)
+	defer HandleRemove("miek.nl.")
+	defer HandleRemove("example.com.")
+
+	cert, err := tls.X509KeyPair(CertPEMBlock, KeyPEMBlock)
+	if err != nil {
+		t.Fatalf("unable to build certificate: %v", err)
+	}
+
+	config := tls.Config{
+		Certificates: []tls.Certificate{cert},
+	}
+
+	s, addrstr, err := RunLocalTLSServer("127.0.0.1:0", &config)
+	if err != nil {
+		t.Fatalf("unable to run test server: %v", err)
+	}
+	defer s.Shutdown()
+
+	c := new(Client)
+	c.Net = "tcp-tls"
+	c.TLSConfig = &tls.Config{
+		InsecureSkipVerify: true,
+	}
+
+	m := new(Msg)
+	m.SetQuestion("miek.nl.", TypeTXT)
+	r, _, err := c.Exchange(m, addrstr)
+	if err != nil || len(r.Extra) == 0 {
+		t.Fatal("failed to exchange miek.nl", err)
+	}
+	txt := r.Extra[0].(*TXT).Txt[0]
+	if txt != "Hello world" {
+		t.Error("unexpected result for miek.nl", txt, "!= Hello world")
+	}
+
+	m.SetQuestion("example.com.", TypeTXT)
+	r, _, err = c.Exchange(m, addrstr)
+	if err != nil {
+		t.Fatal("failed to exchange example.com", err)
+	}
+	txt = r.Extra[0].(*TXT).Txt[0]
+	if txt != "Hello example" {
+		t.Error("unexpected result for example.com", txt, "!= Hello example")
+	}
+
+	// Test Mixes cased as noticed by Ask.
+	m.SetQuestion("eXaMplE.cOm.", TypeTXT)
+	r, _, err = c.Exchange(m, addrstr)
+	if err != nil {
+		t.Error("failed to exchange eXaMplE.cOm", err)
+	}
+	txt = r.Extra[0].(*TXT).Txt[0]
+	if txt != "Hello example" {
+		t.Error("unexpected result for example.com", txt, "!= Hello example")
+	}
+}
+
+func BenchmarkServe(b *testing.B) {
+	b.StopTimer()
+	HandleFunc("miek.nl.", HelloServer)
+	defer HandleRemove("miek.nl.")
+	a := runtime.GOMAXPROCS(4)
+
+	s, addrstr, err := RunLocalUDPServer("127.0.0.1:0")
+	if err != nil {
+		b.Fatalf("unable to run test server: %v", err)
+	}
+	defer s.Shutdown()
+
+	c := new(Client)
+	m := new(Msg)
+	m.SetQuestion("miek.nl", TypeSOA)
+
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		c.Exchange(m, addrstr)
+	}
+	runtime.GOMAXPROCS(a)
+}
+
+func benchmarkServe6(b *testing.B) {
+	b.StopTimer()
+	HandleFunc("miek.nl.", HelloServer)
+	defer HandleRemove("miek.nl.")
+	a := runtime.GOMAXPROCS(4)
+	s, addrstr, err := RunLocalUDPServer("[::1]:0")
+	if err != nil {
+		b.Fatalf("unable to run test server: %v", err)
+	}
+	defer s.Shutdown()
+
+	c := new(Client)
+	m := new(Msg)
+	m.SetQuestion("miek.nl", TypeSOA)
+
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		c.Exchange(m, addrstr)
+	}
+	runtime.GOMAXPROCS(a)
+}
+
+func HelloServerCompress(w ResponseWriter, req *Msg) {
+	m := new(Msg)
+	m.SetReply(req)
+	m.Extra = make([]RR, 1)
+	m.Extra[0] = &TXT{Hdr: RR_Header{Name: m.Question[0].Name, Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"Hello world"}}
+	m.Compress = true
+	w.WriteMsg(m)
+}
+
+func BenchmarkServeCompress(b *testing.B) {
+	b.StopTimer()
+	HandleFunc("miek.nl.", HelloServerCompress)
+	defer HandleRemove("miek.nl.")
+	a := runtime.GOMAXPROCS(4)
+	s, addrstr, err := RunLocalUDPServer("127.0.0.1:0")
+	if err != nil {
+		b.Fatalf("unable to run test server: %v", err)
+	}
+	defer s.Shutdown()
+
+	c := new(Client)
+	m := new(Msg)
+	m.SetQuestion("miek.nl", TypeSOA)
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		c.Exchange(m, addrstr)
+	}
+	runtime.GOMAXPROCS(a)
+}
+
+func TestDotAsCatchAllWildcard(t *testing.T) {
+	mux := NewServeMux()
+	mux.Handle(".", HandlerFunc(HelloServer))
+	mux.Handle("example.com.", HandlerFunc(AnotherHelloServer))
+
+	handler := mux.match("www.miek.nl.", TypeTXT)
+	if handler == nil {
+		t.Error("wildcard match failed")
+	}
+
+	handler = mux.match("www.example.com.", TypeTXT)
+	if handler == nil {
+		t.Error("example.com match failed")
+	}
+
+	handler = mux.match("a.www.example.com.", TypeTXT)
+	if handler == nil {
+		t.Error("a.www.example.com match failed")
+	}
+
+	handler = mux.match("boe.", TypeTXT)
+	if handler == nil {
+		t.Error("boe. match failed")
+	}
+}
+
+func TestCaseFolding(t *testing.T) {
+	mux := NewServeMux()
+	mux.Handle("_udp.example.com.", HandlerFunc(HelloServer))
+
+	handler := mux.match("_dns._udp.example.com.", TypeSRV)
+	if handler == nil {
+		t.Error("case sensitive characters folded")
+	}
+
+	handler = mux.match("_DNS._UDP.EXAMPLE.COM.", TypeSRV)
+	if handler == nil {
+		t.Error("case insensitive characters not folded")
+	}
+}
+
+func TestRootServer(t *testing.T) {
+	mux := NewServeMux()
+	mux.Handle(".", HandlerFunc(HelloServer))
+
+	handler := mux.match(".", TypeNS)
+	if handler == nil {
+		t.Error("root match failed")
+	}
+}
+
+type maxRec struct {
+	max int
+	sync.RWMutex
+}
+
+var M = new(maxRec)
+
+func HelloServerLargeResponse(resp ResponseWriter, req *Msg) {
+	m := new(Msg)
+	m.SetReply(req)
+	m.Authoritative = true
+	m1 := 0
+	M.RLock()
+	m1 = M.max
+	M.RUnlock()
+	for i := 0; i < m1; i++ {
+		aRec := &A{
+			Hdr: RR_Header{
+				Name:   req.Question[0].Name,
+				Rrtype: TypeA,
+				Class:  ClassINET,
+				Ttl:    0,
+			},
+			A: net.ParseIP(fmt.Sprintf("127.0.0.%d", i+1)).To4(),
+		}
+		m.Answer = append(m.Answer, aRec)
+	}
+	resp.WriteMsg(m)
+}
+
+func TestServingLargeResponses(t *testing.T) {
+	HandleFunc("example.", HelloServerLargeResponse)
+	defer HandleRemove("example.")
+
+	s, addrstr, err := RunLocalUDPServer("127.0.0.1:0")
+	if err != nil {
+		t.Fatalf("unable to run test server: %v", err)
+	}
+	defer s.Shutdown()
+
+	// Create request
+	m := new(Msg)
+	m.SetQuestion("web.service.example.", TypeANY)
+
+	c := new(Client)
+	c.Net = "udp"
+	M.Lock()
+	M.max = 2
+	M.Unlock()
+	_, _, err = c.Exchange(m, addrstr)
+	if err != nil {
+		t.Errorf("failed to exchange: %v", err)
+	}
+	// This must fail
+	M.Lock()
+	M.max = 20
+	M.Unlock()
+	_, _, err = c.Exchange(m, addrstr)
+	if err == nil {
+		t.Error("failed to fail exchange, this should generate packet error")
+	}
+	// But this must work again
+	c.UDPSize = 7000
+	_, _, err = c.Exchange(m, addrstr)
+	if err != nil {
+		t.Errorf("failed to exchange: %v", err)
+	}
+}
+
+func TestServingResponse(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
+	HandleFunc("miek.nl.", HelloServer)
+	s, addrstr, err := RunLocalUDPServer("127.0.0.1:0")
+	if err != nil {
+		t.Fatalf("unable to run test server: %v", err)
+	}
+
+	c := new(Client)
+	m := new(Msg)
+	m.SetQuestion("miek.nl.", TypeTXT)
+	m.Response = false
+	_, _, err = c.Exchange(m, addrstr)
+	if err != nil {
+		t.Fatal("failed to exchange", err)
+	}
+	m.Response = true
+	_, _, err = c.Exchange(m, addrstr)
+	if err == nil {
+		t.Fatal("exchanged response message")
+	}
+
+	s.Shutdown()
+	s, addrstr, err = RunLocalUDPServerUnsafe("127.0.0.1:0")
+	if err != nil {
+		t.Fatalf("unable to run test server: %v", err)
+	}
+	defer s.Shutdown()
+
+	m.Response = true
+	_, _, err = c.Exchange(m, addrstr)
+	if err != nil {
+		t.Fatal("could exchanged response message in Unsafe mode")
+	}
+}
+
+func TestShutdownTCP(t *testing.T) {
+	s, _, err := RunLocalTCPServer("127.0.0.1:0")
+	if err != nil {
+		t.Fatalf("unable to run test server: %v", err)
+	}
+	err = s.Shutdown()
+	if err != nil {
+		t.Errorf("could not shutdown test TCP server, %v", err)
+	}
+}
+
+func TestShutdownTLS(t *testing.T) {
+	cert, err := tls.X509KeyPair(CertPEMBlock, KeyPEMBlock)
+	if err != nil {
+		t.Fatalf("unable to build certificate: %v", err)
+	}
+
+	config := tls.Config{
+		Certificates: []tls.Certificate{cert},
+	}
+
+	s, _, err := RunLocalTLSServer("127.0.0.1:0", &config)
+	if err != nil {
+		t.Fatalf("unable to run test server: %v", err)
+	}
+	err = s.Shutdown()
+	if err != nil {
+		t.Errorf("could not shutdown test TLS server, %v", err)
+	}
+}
+
+type trigger struct {
+	done bool
+	sync.RWMutex
+}
+
+func (t *trigger) Set() {
+	t.Lock()
+	defer t.Unlock()
+	t.done = true
+}
+func (t *trigger) Get() bool {
+	t.RLock()
+	defer t.RUnlock()
+	return t.done
+}
+
+func TestHandlerCloseTCP(t *testing.T) {
+
+	ln, err := net.Listen("tcp", "127.0.0.1:0")
+	if err != nil {
+		panic(err)
+	}
+	addr := ln.Addr().String()
+
+	server := &Server{Addr: addr, Net: "tcp", Listener: ln}
+
+	hname := "testhandlerclosetcp."
+	triggered := &trigger{}
+	HandleFunc(hname, func(w ResponseWriter, r *Msg) {
+		triggered.Set()
+		w.Close()
+	})
+	defer HandleRemove(hname)
+
+	go func() {
+		defer server.Shutdown()
+		c := &Client{Net: "tcp"}
+		m := new(Msg).SetQuestion(hname, 1)
+		tries := 0
+	exchange:
+		_, _, err := c.Exchange(m, addr)
+		if err != nil && err != io.EOF {
+			t.Logf("exchange failed: %s\n", err)
+			if tries == 3 {
+				return
+			}
+			time.Sleep(time.Second / 10)
+			tries++
+			goto exchange
+		}
+	}()
+	server.ActivateAndServe()
+	if !triggered.Get() {
+		t.Fatalf("handler never called")
+	}
+}
+
+func TestShutdownUDP(t *testing.T) {
+	s, _, fin, err := RunLocalUDPServerWithFinChan("127.0.0.1:0")
+	if err != nil {
+		t.Fatalf("unable to run test server: %v", err)
+	}
+	err = s.Shutdown()
+	if err != nil {
+		t.Errorf("could not shutdown test UDP server, %v", err)
+	}
+	select {
+	case <-fin:
+	case <-time.After(2 * time.Second):
+		t.Error("Could not shutdown test UDP server. Gave up waiting")
+	}
+}
+
+type ExampleFrameLengthWriter struct {
+	Writer
+}
+
+func (e *ExampleFrameLengthWriter) Write(m []byte) (int, error) {
+	fmt.Println("writing raw DNS message of length", len(m))
+	return e.Writer.Write(m)
+}
+
+func ExampleDecorateWriter() {
+	// instrument raw DNS message writing
+	wf := DecorateWriter(func(w Writer) Writer {
+		return &ExampleFrameLengthWriter{w}
+	})
+
+	// simple UDP server
+	pc, err := net.ListenPacket("udp", "127.0.0.1:0")
+	if err != nil {
+		fmt.Println(err.Error())
+		return
+	}
+	server := &Server{
+		PacketConn:     pc,
+		DecorateWriter: wf,
+		ReadTimeout:    time.Hour, WriteTimeout: time.Hour,
+	}
+
+	waitLock := sync.Mutex{}
+	waitLock.Lock()
+	server.NotifyStartedFunc = waitLock.Unlock
+	defer server.Shutdown()
+
+	go func() {
+		server.ActivateAndServe()
+		pc.Close()
+	}()
+
+	waitLock.Lock()
+
+	HandleFunc("miek.nl.", HelloServer)
+
+	c := new(Client)
+	m := new(Msg)
+	m.SetQuestion("miek.nl.", TypeTXT)
+	_, _, err = c.Exchange(m, pc.LocalAddr().String())
+	if err != nil {
+		fmt.Println("failed to exchange", err.Error())
+		return
+	}
+	// Output: writing raw DNS message of length 56
+}
+
+var (
+	// CertPEMBlock is a X509 data used to test TLS servers (used with tls.X509KeyPair)
+	CertPEMBlock = []byte(`-----BEGIN CERTIFICATE-----
+MIIDAzCCAeugAwIBAgIRAJFYMkcn+b8dpU15wjf++GgwDQYJKoZIhvcNAQELBQAw
+EjEQMA4GA1UEChMHQWNtZSBDbzAeFw0xNjAxMDgxMjAzNTNaFw0xNzAxMDcxMjAz
+NTNaMBIxEDAOBgNVBAoTB0FjbWUgQ28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDXjqO6skvP03k58CNjQggd9G/mt+Wa+xRU+WXiKCCHttawM8x+slq5
+yfsHCwxlwsGn79HmJqecNqgHb2GWBXAvVVokFDTcC1hUP4+gp2gu9Ny27UHTjlLm
+O0l/xZ5MN8tfKyYlFw18tXu3fkaPyHj8v/D1RDkuo4ARdFvGSe8TqisbhLk2+9ow
+xfIGbEM9Fdiw8qByC2+d+FfvzIKz3GfQVwn0VoRom8L6NBIANq1IGrB5JefZB6nv
+DnfuxkBmY7F1513HKuEJ8KsLWWZWV9OPU4j4I4Rt+WJNlKjbD2srHxyrS2RDsr91
+8nCkNoWVNO3sZq0XkWKecdc921vL4ginAgMBAAGjVDBSMA4GA1UdDwEB/wQEAwIC
+pDATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MBoGA1UdEQQT
+MBGCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQsFAAOCAQEAGcU3iyLBIVZj
+aDzSvEDHUd1bnLBl1C58Xu/CyKlPqVU7mLfK0JcgEaYQTSX6fCJVNLbbCrcGLsPJ
+fbjlBbyeLjTV413fxPVuona62pBFjqdtbli2Qe8FRH2KBdm41JUJGdo+SdsFu7nc
+BFOcubdw6LLIXvsTvwndKcHWx1rMX709QU1Vn1GAIsbJV/DWI231Jyyb+lxAUx/C
+8vce5uVxiKcGS+g6OjsN3D3TtiEQGSXLh013W6Wsih8td8yMCMZ3w8LQ38br1GUe
+ahLIgUJ9l6HDguM17R7kGqxNvbElsMUHfTtXXP7UDQUiYXDakg8xDP6n9DCDhJ8Y
+bSt7OLB7NQ==
+-----END CERTIFICATE-----`)
+
+	// KeyPEMBlock is a X509 data used to test TLS servers (used with tls.X509KeyPair)
+	KeyPEMBlock = []byte(`-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEA146jurJLz9N5OfAjY0IIHfRv5rflmvsUVPll4iggh7bWsDPM
+frJaucn7BwsMZcLBp+/R5iannDaoB29hlgVwL1VaJBQ03AtYVD+PoKdoLvTctu1B
+045S5jtJf8WeTDfLXysmJRcNfLV7t35Gj8h4/L/w9UQ5LqOAEXRbxknvE6orG4S5
+NvvaMMXyBmxDPRXYsPKgcgtvnfhX78yCs9xn0FcJ9FaEaJvC+jQSADatSBqweSXn
+2Qep7w537sZAZmOxdeddxyrhCfCrC1lmVlfTj1OI+COEbfliTZSo2w9rKx8cq0tk
+Q7K/dfJwpDaFlTTt7GatF5FinnHXPdtby+IIpwIDAQABAoIBAAJK4RDmPooqTJrC
+JA41MJLo+5uvjwCT9QZmVKAQHzByUFw1YNJkITTiognUI0CdzqNzmH7jIFs39ZeG
+proKusO2G6xQjrNcZ4cV2fgyb5g4QHStl0qhs94A+WojduiGm2IaumAgm6Mc5wDv
+ld6HmknN3Mku/ZCyanVFEIjOVn2WB7ZQLTBs6ZYaebTJG2Xv6p9t2YJW7pPQ9Xce
+s9ohAWohyM4X/OvfnfnLtQp2YLw/BxwehBsCR5SXM3ibTKpFNtxJC8hIfTuWtxZu
+2ywrmXShYBRB1WgtZt5k04bY/HFncvvcHK3YfI1+w4URKtwdaQgPUQRbVwDwuyBn
+flfkCJECgYEA/eWt01iEyE/lXkGn6V9lCocUU7lCU6yk5UT8VXVUc5If4KZKPfCk
+p4zJDOqwn2eM673aWz/mG9mtvAvmnugaGjcaVCyXOp/D/GDmKSoYcvW5B/yjfkLy
+dK6Yaa5LDRVYlYgyzcdCT5/9Qc626NzFwKCZNI4ncIU8g7ViATRxWJ8CgYEA2Ver
+vZ0M606sfgC0H3NtwNBxmuJ+lIF5LNp/wDi07lDfxRR1rnZMX5dnxjcpDr/zvm8J
+WtJJX3xMgqjtHuWKL3yKKony9J5ZPjichSbSbhrzfovgYIRZLxLLDy4MP9L3+CX/
+yBXnqMWuSnFX+M5fVGxdDWiYF3V+wmeOv9JvavkCgYEAiXAPDFzaY+R78O3xiu7M
+r0o3wqqCMPE/wav6O/hrYrQy9VSO08C0IM6g9pEEUwWmzuXSkZqhYWoQFb8Lc/GI
+T7CMXAxXQLDDUpbRgG79FR3Wr3AewHZU8LyiXHKwxcBMV4WGmsXGK3wbh8fyU1NO
+6NsGk+BvkQVOoK1LBAPzZ1kCgYEAsBSmD8U33T9s4dxiEYTrqyV0lH3g/SFz8ZHH
+pAyNEPI2iC1ONhyjPWKlcWHpAokiyOqeUpVBWnmSZtzC1qAydsxYB6ShT+sl9BHb
+RMix/QAauzBJhQhUVJ3OIys0Q1UBDmqCsjCE8SfOT4NKOUnA093C+YT+iyrmmktZ
+zDCJkckCgYEAndqM5KXGk5xYo+MAA1paZcbTUXwaWwjLU+XSRSSoyBEi5xMtfvUb
+7+a1OMhLwWbuz+pl64wFKrbSUyimMOYQpjVE/1vk/kb99pxbgol27hdKyTH1d+ov
+kFsxKCqxAnBVGEWAvVZAiiTOxleQFjz5RnL0BQp9Lg2cQe+dvuUmIAA=
+-----END RSA PRIVATE KEY-----`)
+)
+
+func testShutdownBindPort(t *testing.T, protocol string, port string) {
+	handler := NewServeMux()
+	handler.HandleFunc(".", func(w ResponseWriter, r *Msg) {})
+	startedCh := make(chan struct{})
+	s := &Server{
+		Addr:    net.JoinHostPort("127.0.0.1", port),
+		Net:     protocol,
+		Handler: handler,
+		NotifyStartedFunc: func() {
+			startedCh <- struct{}{}
+		},
+	}
+	go func() {
+		if err := s.ListenAndServe(); err != nil {
+			t.Log(err)
+		}
+	}()
+	<-startedCh
+	t.Logf("DNS server is started on: %s", s.Addr)
+	if err := s.Shutdown(); err != nil {
+		t.Fatal(err)
+	}
+	time.Sleep(100 * time.Millisecond)
+	go func() {
+		if err := s.ListenAndServe(); err != nil {
+			t.Fatal(err)
+		}
+	}()
+	<-startedCh
+	t.Logf("DNS server is started on: %s", s.Addr)
+}
+
+func TestShutdownBindPortUDP(t *testing.T) {
+	testShutdownBindPort(t, "udp", "1153")
+}
+
+func TestShutdownBindPortTCP(t *testing.T) {
+	testShutdownBindPort(t, "tcp", "1154")
+}
diff --git a/vendor/github.com/miekg/dns/sig0.go b/vendor/github.com/miekg/dns/sig0.go
new file mode 100644
index 0000000000..f31e9e6843
--- /dev/null
+++ b/vendor/github.com/miekg/dns/sig0.go
@@ -0,0 +1,218 @@
+package dns
+
+import (
+	"crypto"
+	"crypto/dsa"
+	"crypto/ecdsa"
+	"crypto/rsa"
+	"encoding/binary"
+	"math/big"
+	"strings"
+	"time"
+)
+
+// Sign signs a dns.Msg. It fills the signature with the appropriate data.
+// The SIG record should have the SignerName, KeyTag, Algorithm, Inception
+// and Expiration set.
+func (rr *SIG) Sign(k crypto.Signer, m *Msg) ([]byte, error) {
+	if k == nil {
+		return nil, ErrPrivKey
+	}
+	if rr.KeyTag == 0 || len(rr.SignerName) == 0 || rr.Algorithm == 0 {
+		return nil, ErrKey
+	}
+	rr.Header().Rrtype = TypeSIG
+	rr.Header().Class = ClassANY
+	rr.Header().Ttl = 0
+	rr.Header().Name = "."
+	rr.OrigTtl = 0
+	rr.TypeCovered = 0
+	rr.Labels = 0
+
+	buf := make([]byte, m.Len()+rr.len())
+	mbuf, err := m.PackBuffer(buf)
+	if err != nil {
+		return nil, err
+	}
+	if &buf[0] != &mbuf[0] {
+		return nil, ErrBuf
+	}
+	off, err := PackRR(rr, buf, len(mbuf), nil, false)
+	if err != nil {
+		return nil, err
+	}
+	buf = buf[:off:cap(buf)]
+
+	hash, ok := AlgorithmToHash[rr.Algorithm]
+	if !ok {
+		return nil, ErrAlg
+	}
+
+	hasher := hash.New()
+	// Write SIG rdata
+	hasher.Write(buf[len(mbuf)+1+2+2+4+2:])
+	// Write message
+	hasher.Write(buf[:len(mbuf)])
+
+	signature, err := sign(k, hasher.Sum(nil), hash, rr.Algorithm)
+	if err != nil {
+		return nil, err
+	}
+
+	rr.Signature = toBase64(signature)
+
+	buf = append(buf, signature...)
+	if len(buf) > int(^uint16(0)) {
+		return nil, ErrBuf
+	}
+	// Adjust sig data length
+	rdoff := len(mbuf) + 1 + 2 + 2 + 4
+	rdlen := binary.BigEndian.Uint16(buf[rdoff:])
+	rdlen += uint16(len(signature))
+	binary.BigEndian.PutUint16(buf[rdoff:], rdlen)
+	// Adjust additional count
+	adc := binary.BigEndian.Uint16(buf[10:])
+	adc++
+	binary.BigEndian.PutUint16(buf[10:], adc)
+	return buf, nil
+}
+
+// Verify validates the message buf using the key k.
+// It's assumed that buf is a valid message from which rr was unpacked.
+func (rr *SIG) Verify(k *KEY, buf []byte) error {
+	if k == nil {
+		return ErrKey
+	}
+	if rr.KeyTag == 0 || len(rr.SignerName) == 0 || rr.Algorithm == 0 {
+		return ErrKey
+	}
+
+	var hash crypto.Hash
+	switch rr.Algorithm {
+	case DSA, RSASHA1:
+		hash = crypto.SHA1
+	case RSASHA256, ECDSAP256SHA256:
+		hash = crypto.SHA256
+	case ECDSAP384SHA384:
+		hash = crypto.SHA384
+	case RSASHA512:
+		hash = crypto.SHA512
+	default:
+		return ErrAlg
+	}
+	hasher := hash.New()
+
+	buflen := len(buf)
+	qdc := binary.BigEndian.Uint16(buf[4:])
+	anc := binary.BigEndian.Uint16(buf[6:])
+	auc := binary.BigEndian.Uint16(buf[8:])
+	adc := binary.BigEndian.Uint16(buf[10:])
+	offset := 12
+	var err error
+	for i := uint16(0); i < qdc && offset < buflen; i++ {
+		_, offset, err = UnpackDomainName(buf, offset)
+		if err != nil {
+			return err
+		}
+		// Skip past Type and Class
+		offset += 2 + 2
+	}
+	for i := uint16(1); i < anc+auc+adc && offset < buflen; i++ {
+		_, offset, err = UnpackDomainName(buf, offset)
+		if err != nil {
+			return err
+		}
+		// Skip past Type, Class and TTL
+		offset += 2 + 2 + 4
+		if offset+1 >= buflen {
+			continue
+		}
+		var rdlen uint16
+		rdlen = binary.BigEndian.Uint16(buf[offset:])
+		offset += 2
+		offset += int(rdlen)
+	}
+	if offset >= buflen {
+		return &Error{err: "overflowing unpacking signed message"}
+	}
+
+	// offset should be just prior to SIG
+	bodyend := offset
+	// owner name SHOULD be root
+	_, offset, err = UnpackDomainName(buf, offset)
+	if err != nil {
+		return err
+	}
+	// Skip Type, Class, TTL, RDLen
+	offset += 2 + 2 + 4 + 2
+	sigstart := offset
+	// Skip Type Covered, Algorithm, Labels, Original TTL
+	offset += 2 + 1 + 1 + 4
+	if offset+4+4 >= buflen {
+		return &Error{err: "overflow unpacking signed message"}
+	}
+	expire := binary.BigEndian.Uint32(buf[offset:])
+	offset += 4
+	incept := binary.BigEndian.Uint32(buf[offset:])
+	offset += 4
+	now := uint32(time.Now().Unix())
+	if now < incept || now > expire {
+		return ErrTime
+	}
+	// Skip key tag
+	offset += 2
+	var signername string
+	signername, offset, err = UnpackDomainName(buf, offset)
+	if err != nil {
+		return err
+	}
+	// If key has come from the DNS name compression might
+	// have mangled the case of the name
+	if strings.ToLower(signername) != strings.ToLower(k.Header().Name) {
+		return &Error{err: "signer name doesn't match key name"}
+	}
+	sigend := offset
+	hasher.Write(buf[sigstart:sigend])
+	hasher.Write(buf[:10])
+	hasher.Write([]byte{
+		byte((adc - 1) << 8),
+		byte(adc - 1),
+	})
+	hasher.Write(buf[12:bodyend])
+
+	hashed := hasher.Sum(nil)
+	sig := buf[sigend:]
+	switch k.Algorithm {
+	case DSA:
+		pk := k.publicKeyDSA()
+		sig = sig[1:]
+		r := big.NewInt(0)
+		r.SetBytes(sig[:len(sig)/2])
+		s := big.NewInt(0)
+		s.SetBytes(sig[len(sig)/2:])
+		if pk != nil {
+			if dsa.Verify(pk, hashed, r, s) {
+				return nil
+			}
+			return ErrSig
+		}
+	case RSASHA1, RSASHA256, RSASHA512:
+		pk := k.publicKeyRSA()
+		if pk != nil {
+			return rsa.VerifyPKCS1v15(pk, hash, hashed, sig)
+		}
+	case ECDSAP256SHA256, ECDSAP384SHA384:
+		pk := k.publicKeyECDSA()
+		r := big.NewInt(0)
+		r.SetBytes(sig[:len(sig)/2])
+		s := big.NewInt(0)
+		s.SetBytes(sig[len(sig)/2:])
+		if pk != nil {
+			if ecdsa.Verify(pk, hashed, r, s) {
+				return nil
+			}
+			return ErrSig
+		}
+	}
+	return ErrKeyAlg
+}
diff --git a/vendor/github.com/miekg/dns/sig0_test.go b/vendor/github.com/miekg/dns/sig0_test.go
new file mode 100644
index 0000000000..122de6a8ec
--- /dev/null
+++ b/vendor/github.com/miekg/dns/sig0_test.go
@@ -0,0 +1,89 @@
+package dns
+
+import (
+	"crypto"
+	"testing"
+	"time"
+)
+
+func TestSIG0(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
+	m := new(Msg)
+	m.SetQuestion("example.org.", TypeSOA)
+	for _, alg := range []uint8{ECDSAP256SHA256, ECDSAP384SHA384, RSASHA1, RSASHA256, RSASHA512} {
+		algstr := AlgorithmToString[alg]
+		keyrr := new(KEY)
+		keyrr.Hdr.Name = algstr + "."
+		keyrr.Hdr.Rrtype = TypeKEY
+		keyrr.Hdr.Class = ClassINET
+		keyrr.Algorithm = alg
+		keysize := 1024
+		switch alg {
+		case ECDSAP256SHA256:
+			keysize = 256
+		case ECDSAP384SHA384:
+			keysize = 384
+		}
+		pk, err := keyrr.Generate(keysize)
+		if err != nil {
+			t.Errorf("failed to generate key for “%s”: %v", algstr, err)
+			continue
+		}
+		now := uint32(time.Now().Unix())
+		sigrr := new(SIG)
+		sigrr.Hdr.Name = "."
+		sigrr.Hdr.Rrtype = TypeSIG
+		sigrr.Hdr.Class = ClassANY
+		sigrr.Algorithm = alg
+		sigrr.Expiration = now + 300
+		sigrr.Inception = now - 300
+		sigrr.KeyTag = keyrr.KeyTag()
+		sigrr.SignerName = keyrr.Hdr.Name
+		mb, err := sigrr.Sign(pk.(crypto.Signer), m)
+		if err != nil {
+			t.Errorf("failed to sign message using “%s”: %v", algstr, err)
+			continue
+		}
+		m := new(Msg)
+		if err := m.Unpack(mb); err != nil {
+			t.Errorf("failed to unpack message signed using “%s”: %v", algstr, err)
+			continue
+		}
+		if len(m.Extra) != 1 {
+			t.Errorf("missing SIG for message signed using “%s”", algstr)
+			continue
+		}
+		var sigrrwire *SIG
+		switch rr := m.Extra[0].(type) {
+		case *SIG:
+			sigrrwire = rr
+		default:
+			t.Errorf("expected SIG RR, instead: %v", rr)
+			continue
+		}
+		for _, rr := range []*SIG{sigrr, sigrrwire} {
+			id := "sigrr"
+			if rr == sigrrwire {
+				id = "sigrrwire"
+			}
+			if err := rr.Verify(keyrr, mb); err != nil {
+				t.Errorf("failed to verify “%s” signed SIG(%s): %v", algstr, id, err)
+				continue
+			}
+		}
+		mb[13]++
+		if err := sigrr.Verify(keyrr, mb); err == nil {
+			t.Errorf("verify succeeded on an altered message using “%s”", algstr)
+			continue
+		}
+		sigrr.Expiration = 2
+		sigrr.Inception = 1
+		mb, _ = sigrr.Sign(pk.(crypto.Signer), m)
+		if err := sigrr.Verify(keyrr, mb); err == nil {
+			t.Errorf("verify succeeded on an expired message using “%s”", algstr)
+			continue
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/dns/singleinflight.go b/vendor/github.com/miekg/dns/singleinflight.go
new file mode 100644
index 0000000000..9573c7d0b8
--- /dev/null
+++ b/vendor/github.com/miekg/dns/singleinflight.go
@@ -0,0 +1,57 @@
+// Copyright 2013 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Adapted for dns package usage by Miek Gieben.
+
+package dns
+
+import "sync"
+import "time"
+
+// call is an in-flight or completed singleflight.Do call
+type call struct {
+	wg   sync.WaitGroup
+	val  *Msg
+	rtt  time.Duration
+	err  error
+	dups int
+}
+
+// singleflight represents a class of work and forms a namespace in
+// which units of work can be executed with duplicate suppression.
+type singleflight struct {
+	sync.Mutex                  // protects m
+	m          map[string]*call // lazily initialized
+}
+
+// Do executes and returns the results of the given function, making
+// sure that only one execution is in-flight for a given key at a
+// time. If a duplicate comes in, the duplicate caller waits for the
+// original to complete and receives the same results.
+// The return value shared indicates whether v was given to multiple callers.
+func (g *singleflight) Do(key string, fn func() (*Msg, time.Duration, error)) (v *Msg, rtt time.Duration, err error, shared bool) {
+	g.Lock()
+	if g.m == nil {
+		g.m = make(map[string]*call)
+	}
+	if c, ok := g.m[key]; ok {
+		c.dups++
+		g.Unlock()
+		c.wg.Wait()
+		return c.val, c.rtt, c.err, true
+	}
+	c := new(call)
+	c.wg.Add(1)
+	g.m[key] = c
+	g.Unlock()
+
+	c.val, c.rtt, c.err = fn()
+	c.wg.Done()
+
+	g.Lock()
+	delete(g.m, key)
+	g.Unlock()
+
+	return c.val, c.rtt, c.err, c.dups > 0
+}
diff --git a/vendor/github.com/miekg/dns/smimea.go b/vendor/github.com/miekg/dns/smimea.go
new file mode 100644
index 0000000000..4e7ded4b38
--- /dev/null
+++ b/vendor/github.com/miekg/dns/smimea.go
@@ -0,0 +1,47 @@
+package dns
+
+import (
+	"crypto/sha256"
+	"crypto/x509"
+	"encoding/hex"
+)
+
+// Sign creates a SMIMEA record from an SSL certificate.
+func (r *SMIMEA) Sign(usage, selector, matchingType int, cert *x509.Certificate) (err error) {
+	r.Hdr.Rrtype = TypeSMIMEA
+	r.Usage = uint8(usage)
+	r.Selector = uint8(selector)
+	r.MatchingType = uint8(matchingType)
+
+	r.Certificate, err = CertificateToDANE(r.Selector, r.MatchingType, cert)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// Verify verifies a SMIMEA record against an SSL certificate. If it is OK
+// a nil error is returned.
+func (r *SMIMEA) Verify(cert *x509.Certificate) error {
+	c, err := CertificateToDANE(r.Selector, r.MatchingType, cert)
+	if err != nil {
+		return err // Not also ErrSig?
+	}
+	if r.Certificate == c {
+		return nil
+	}
+	return ErrSig // ErrSig, really?
+}
+
+// SMIMEAName returns the ownername of a SMIMEA resource record as per the
+// format specified in RFC 'draft-ietf-dane-smime-12' Section 2 and 3
+func SMIMEAName(email, domain string) (string, error) {
+	hasher := sha256.New()
+	hasher.Write([]byte(email))
+
+	// RFC Section 3: "The local-part is hashed using the SHA2-256
+	// algorithm with the hash truncated to 28 octets and
+	// represented in its hexadecimal representation to become the
+	// left-most label in the prepared domain name"
+	return hex.EncodeToString(hasher.Sum(nil)[:28]) + "." + "_smimecert." + domain, nil
+}
diff --git a/vendor/github.com/miekg/dns/tlsa.go b/vendor/github.com/miekg/dns/tlsa.go
new file mode 100644
index 0000000000..431e2fb5af
--- /dev/null
+++ b/vendor/github.com/miekg/dns/tlsa.go
@@ -0,0 +1,47 @@
+package dns
+
+import (
+	"crypto/x509"
+	"net"
+	"strconv"
+)
+
+// Sign creates a TLSA record from an SSL certificate.
+func (r *TLSA) Sign(usage, selector, matchingType int, cert *x509.Certificate) (err error) {
+	r.Hdr.Rrtype = TypeTLSA
+	r.Usage = uint8(usage)
+	r.Selector = uint8(selector)
+	r.MatchingType = uint8(matchingType)
+
+	r.Certificate, err = CertificateToDANE(r.Selector, r.MatchingType, cert)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// Verify verifies a TLSA record against an SSL certificate. If it is OK
+// a nil error is returned.
+func (r *TLSA) Verify(cert *x509.Certificate) error {
+	c, err := CertificateToDANE(r.Selector, r.MatchingType, cert)
+	if err != nil {
+		return err // Not also ErrSig?
+	}
+	if r.Certificate == c {
+		return nil
+	}
+	return ErrSig // ErrSig, really?
+}
+
+// TLSAName returns the ownername of a TLSA resource record as per the
+// rules specified in RFC 6698, Section 3.
+func TLSAName(name, service, network string) (string, error) {
+	if !IsFqdn(name) {
+		return "", ErrFqdn
+	}
+	p, err := net.LookupPort(network, service)
+	if err != nil {
+		return "", err
+	}
+	return "_" + strconv.Itoa(p) + "._" + network + "." + name, nil
+}
diff --git a/vendor/github.com/miekg/dns/tsig.go b/vendor/github.com/miekg/dns/tsig.go
new file mode 100644
index 0000000000..24013096b0
--- /dev/null
+++ b/vendor/github.com/miekg/dns/tsig.go
@@ -0,0 +1,383 @@
+package dns
+
+import (
+	"crypto/hmac"
+	"crypto/md5"
+	"crypto/sha1"
+	"crypto/sha256"
+	"crypto/sha512"
+	"encoding/binary"
+	"encoding/hex"
+	"hash"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// HMAC hashing codes. These are transmitted as domain names.
+const (
+	HmacMD5    = "hmac-md5.sig-alg.reg.int."
+	HmacSHA1   = "hmac-sha1."
+	HmacSHA256 = "hmac-sha256."
+	HmacSHA512 = "hmac-sha512."
+)
+
+// TSIG is the RR the holds the transaction signature of a message.
+// See RFC 2845 and RFC 4635.
+type TSIG struct {
+	Hdr        RR_Header
+	Algorithm  string `dns:"domain-name"`
+	TimeSigned uint64 `dns:"uint48"`
+	Fudge      uint16
+	MACSize    uint16
+	MAC        string `dns:"size-hex:MACSize"`
+	OrigId     uint16
+	Error      uint16
+	OtherLen   uint16
+	OtherData  string `dns:"size-hex:OtherLen"`
+}
+
+// TSIG has no official presentation format, but this will suffice.
+
+func (rr *TSIG) String() string {
+	s := "\n;; TSIG PSEUDOSECTION:\n"
+	s += rr.Hdr.String() +
+		" " + rr.Algorithm +
+		" " + tsigTimeToString(rr.TimeSigned) +
+		" " + strconv.Itoa(int(rr.Fudge)) +
+		" " + strconv.Itoa(int(rr.MACSize)) +
+		" " + strings.ToUpper(rr.MAC) +
+		" " + strconv.Itoa(int(rr.OrigId)) +
+		" " + strconv.Itoa(int(rr.Error)) + // BIND prints NOERROR
+		" " + strconv.Itoa(int(rr.OtherLen)) +
+		" " + rr.OtherData
+	return s
+}
+
+// The following values must be put in wireformat, so that the MAC can be calculated.
+// RFC 2845, section 3.4.2. TSIG Variables.
+type tsigWireFmt struct {
+	// From RR_Header
+	Name  string `dns:"domain-name"`
+	Class uint16
+	Ttl   uint32
+	// Rdata of the TSIG
+	Algorithm  string `dns:"domain-name"`
+	TimeSigned uint64 `dns:"uint48"`
+	Fudge      uint16
+	// MACSize, MAC and OrigId excluded
+	Error     uint16
+	OtherLen  uint16
+	OtherData string `dns:"size-hex:OtherLen"`
+}
+
+// If we have the MAC use this type to convert it to wiredata. Section 3.4.3. Request MAC
+type macWireFmt struct {
+	MACSize uint16
+	MAC     string `dns:"size-hex:MACSize"`
+}
+
+// 3.3. Time values used in TSIG calculations
+type timerWireFmt struct {
+	TimeSigned uint64 `dns:"uint48"`
+	Fudge      uint16
+}
+
+// TsigGenerate fills out the TSIG record attached to the message.
+// The message should contain
+// a "stub" TSIG RR with the algorithm, key name (owner name of the RR),
+// time fudge (defaults to 300 seconds) and the current time
+// The TSIG MAC is saved in that Tsig RR.
+// When TsigGenerate is called for the first time requestMAC is set to the empty string and
+// timersOnly is false.
+// If something goes wrong an error is returned, otherwise it is nil.
+func TsigGenerate(m *Msg, secret, requestMAC string, timersOnly bool) ([]byte, string, error) {
+	if m.IsTsig() == nil {
+		panic("dns: TSIG not last RR in additional")
+	}
+	// If we barf here, the caller is to blame
+	rawsecret, err := fromBase64([]byte(secret))
+	if err != nil {
+		return nil, "", err
+	}
+
+	rr := m.Extra[len(m.Extra)-1].(*TSIG)
+	m.Extra = m.Extra[0 : len(m.Extra)-1] // kill the TSIG from the msg
+	mbuf, err := m.Pack()
+	if err != nil {
+		return nil, "", err
+	}
+	buf := tsigBuffer(mbuf, rr, requestMAC, timersOnly)
+
+	t := new(TSIG)
+	var h hash.Hash
+	switch strings.ToLower(rr.Algorithm) {
+	case HmacMD5:
+		h = hmac.New(md5.New, []byte(rawsecret))
+	case HmacSHA1:
+		h = hmac.New(sha1.New, []byte(rawsecret))
+	case HmacSHA256:
+		h = hmac.New(sha256.New, []byte(rawsecret))
+	case HmacSHA512:
+		h = hmac.New(sha512.New, []byte(rawsecret))
+	default:
+		return nil, "", ErrKeyAlg
+	}
+	h.Write(buf)
+	t.MAC = hex.EncodeToString(h.Sum(nil))
+	t.MACSize = uint16(len(t.MAC) / 2) // Size is half!
+
+	t.Hdr = RR_Header{Name: rr.Hdr.Name, Rrtype: TypeTSIG, Class: ClassANY, Ttl: 0}
+	t.Fudge = rr.Fudge
+	t.TimeSigned = rr.TimeSigned
+	t.Algorithm = rr.Algorithm
+	t.OrigId = m.Id
+
+	tbuf := make([]byte, t.len())
+	if off, err := PackRR(t, tbuf, 0, nil, false); err == nil {
+		tbuf = tbuf[:off] // reset to actual size used
+	} else {
+		return nil, "", err
+	}
+	mbuf = append(mbuf, tbuf...)
+	// Update the ArCount directly in the buffer.
+	binary.BigEndian.PutUint16(mbuf[10:], uint16(len(m.Extra)+1))
+
+	return mbuf, t.MAC, nil
+}
+
+// TsigVerify verifies the TSIG on a message.
+// If the signature does not validate err contains the
+// error, otherwise it is nil.
+func TsigVerify(msg []byte, secret, requestMAC string, timersOnly bool) error {
+	rawsecret, err := fromBase64([]byte(secret))
+	if err != nil {
+		return err
+	}
+	// Strip the TSIG from the incoming msg
+	stripped, tsig, err := stripTsig(msg)
+	if err != nil {
+		return err
+	}
+
+	msgMAC, err := hex.DecodeString(tsig.MAC)
+	if err != nil {
+		return err
+	}
+
+	buf := tsigBuffer(stripped, tsig, requestMAC, timersOnly)
+
+	// Fudge factor works both ways. A message can arrive before it was signed because
+	// of clock skew.
+	now := uint64(time.Now().Unix())
+	ti := now - tsig.TimeSigned
+	if now < tsig.TimeSigned {
+		ti = tsig.TimeSigned - now
+	}
+	if uint64(tsig.Fudge) < ti {
+		return ErrTime
+	}
+
+	var h hash.Hash
+	switch strings.ToLower(tsig.Algorithm) {
+	case HmacMD5:
+		h = hmac.New(md5.New, rawsecret)
+	case HmacSHA1:
+		h = hmac.New(sha1.New, rawsecret)
+	case HmacSHA256:
+		h = hmac.New(sha256.New, rawsecret)
+	case HmacSHA512:
+		h = hmac.New(sha512.New, rawsecret)
+	default:
+		return ErrKeyAlg
+	}
+	h.Write(buf)
+	if !hmac.Equal(h.Sum(nil), msgMAC) {
+		return ErrSig
+	}
+	return nil
+}
+
+// Create a wiredata buffer for the MAC calculation.
+func tsigBuffer(msgbuf []byte, rr *TSIG, requestMAC string, timersOnly bool) []byte {
+	var buf []byte
+	if rr.TimeSigned == 0 {
+		rr.TimeSigned = uint64(time.Now().Unix())
+	}
+	if rr.Fudge == 0 {
+		rr.Fudge = 300 // Standard (RFC) default.
+	}
+
+	if requestMAC != "" {
+		m := new(macWireFmt)
+		m.MACSize = uint16(len(requestMAC) / 2)
+		m.MAC = requestMAC
+		buf = make([]byte, len(requestMAC)) // long enough
+		n, _ := packMacWire(m, buf)
+		buf = buf[:n]
+	}
+
+	tsigvar := make([]byte, DefaultMsgSize)
+	if timersOnly {
+		tsig := new(timerWireFmt)
+		tsig.TimeSigned = rr.TimeSigned
+		tsig.Fudge = rr.Fudge
+		n, _ := packTimerWire(tsig, tsigvar)
+		tsigvar = tsigvar[:n]
+	} else {
+		tsig := new(tsigWireFmt)
+		tsig.Name = strings.ToLower(rr.Hdr.Name)
+		tsig.Class = ClassANY
+		tsig.Ttl = rr.Hdr.Ttl
+		tsig.Algorithm = strings.ToLower(rr.Algorithm)
+		tsig.TimeSigned = rr.TimeSigned
+		tsig.Fudge = rr.Fudge
+		tsig.Error = rr.Error
+		tsig.OtherLen = rr.OtherLen
+		tsig.OtherData = rr.OtherData
+		n, _ := packTsigWire(tsig, tsigvar)
+		tsigvar = tsigvar[:n]
+	}
+
+	if requestMAC != "" {
+		x := append(buf, msgbuf...)
+		buf = append(x, tsigvar...)
+	} else {
+		buf = append(msgbuf, tsigvar...)
+	}
+	return buf
+}
+
+// Strip the TSIG from the raw message.
+func stripTsig(msg []byte) ([]byte, *TSIG, error) {
+	// Copied from msg.go's Unpack() Header, but modified.
+	var (
+		dh  Header
+		err error
+	)
+	off, tsigoff := 0, 0
+
+	if dh, off, err = unpackMsgHdr(msg, off); err != nil {
+		return nil, nil, err
+	}
+	if dh.Arcount == 0 {
+		return nil, nil, ErrNoSig
+	}
+
+	// Rcode, see msg.go Unpack()
+	if int(dh.Bits&0xF) == RcodeNotAuth {
+		return nil, nil, ErrAuth
+	}
+
+	for i := 0; i < int(dh.Qdcount); i++ {
+		_, off, err = unpackQuestion(msg, off)
+		if err != nil {
+			return nil, nil, err
+		}
+	}
+
+	_, off, err = unpackRRslice(int(dh.Ancount), msg, off)
+	if err != nil {
+		return nil, nil, err
+	}
+	_, off, err = unpackRRslice(int(dh.Nscount), msg, off)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	rr := new(TSIG)
+	var extra RR
+	for i := 0; i < int(dh.Arcount); i++ {
+		tsigoff = off
+		extra, off, err = UnpackRR(msg, off)
+		if err != nil {
+			return nil, nil, err
+		}
+		if extra.Header().Rrtype == TypeTSIG {
+			rr = extra.(*TSIG)
+			// Adjust Arcount.
+			arcount := binary.BigEndian.Uint16(msg[10:])
+			binary.BigEndian.PutUint16(msg[10:], arcount-1)
+			break
+		}
+	}
+	if rr == nil {
+		return nil, nil, ErrNoSig
+	}
+	return msg[:tsigoff], rr, nil
+}
+
+// Translate the TSIG time signed into a date. There is no
+// need for RFC1982 calculations as this date is 48 bits.
+func tsigTimeToString(t uint64) string {
+	ti := time.Unix(int64(t), 0).UTC()
+	return ti.Format("20060102150405")
+}
+
+func packTsigWire(tw *tsigWireFmt, msg []byte) (int, error) {
+	// copied from zmsg.go TSIG packing
+	// RR_Header
+	off, err := PackDomainName(tw.Name, msg, 0, nil, false)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(tw.Class, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint32(tw.Ttl, msg, off)
+	if err != nil {
+		return off, err
+	}
+
+	off, err = PackDomainName(tw.Algorithm, msg, off, nil, false)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint48(tw.TimeSigned, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(tw.Fudge, msg, off)
+	if err != nil {
+		return off, err
+	}
+
+	off, err = packUint16(tw.Error, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(tw.OtherLen, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringHex(tw.OtherData, msg, off)
+	if err != nil {
+		return off, err
+	}
+	return off, nil
+}
+
+func packMacWire(mw *macWireFmt, msg []byte) (int, error) {
+	off, err := packUint16(mw.MACSize, msg, 0)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringHex(mw.MAC, msg, off)
+	if err != nil {
+		return off, err
+	}
+	return off, nil
+}
+
+func packTimerWire(tw *timerWireFmt, msg []byte) (int, error) {
+	off, err := packUint48(tw.TimeSigned, msg, 0)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(tw.Fudge, msg, off)
+	if err != nil {
+		return off, err
+	}
+	return off, nil
+}
diff --git a/vendor/github.com/miekg/dns/tsig_test.go b/vendor/github.com/miekg/dns/tsig_test.go
new file mode 100644
index 0000000000..48b9988b66
--- /dev/null
+++ b/vendor/github.com/miekg/dns/tsig_test.go
@@ -0,0 +1,37 @@
+package dns
+
+import (
+	"testing"
+	"time"
+)
+
+func newTsig(algo string) *Msg {
+	m := new(Msg)
+	m.SetQuestion("example.org.", TypeA)
+	m.SetTsig("example.", algo, 300, time.Now().Unix())
+	return m
+}
+
+func TestTsig(t *testing.T) {
+	m := newTsig(HmacMD5)
+	buf, _, err := TsigGenerate(m, "pRZgBrBvI4NAHZYhxmhs/Q==", "", false)
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = TsigVerify(buf, "pRZgBrBvI4NAHZYhxmhs/Q==", "", false)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestTsigCase(t *testing.T) {
+	m := newTsig("HmAc-mD5.sig-ALg.rEg.int.") // HmacMD5
+	buf, _, err := TsigGenerate(m, "pRZgBrBvI4NAHZYhxmhs/Q==", "", false)
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = TsigVerify(buf, "pRZgBrBvI4NAHZYhxmhs/Q==", "", false)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
diff --git a/vendor/github.com/miekg/dns/types.go b/vendor/github.com/miekg/dns/types.go
new file mode 100644
index 0000000000..c17251cb6e
--- /dev/null
+++ b/vendor/github.com/miekg/dns/types.go
@@ -0,0 +1,1279 @@
+package dns
+
+import (
+	"fmt"
+	"net"
+	"strconv"
+	"strings"
+	"time"
+)
+
+type (
+	// Type is a DNS type.
+	Type uint16
+	// Class is a DNS class.
+	Class uint16
+	// Name is a DNS domain name.
+	Name string
+)
+
+// Packet formats
+
+// Wire constants and supported types.
+const (
+	// valid RR_Header.Rrtype and Question.qtype
+
+	TypeNone       uint16 = 0
+	TypeA          uint16 = 1
+	TypeNS         uint16 = 2
+	TypeMD         uint16 = 3
+	TypeMF         uint16 = 4
+	TypeCNAME      uint16 = 5
+	TypeSOA        uint16 = 6
+	TypeMB         uint16 = 7
+	TypeMG         uint16 = 8
+	TypeMR         uint16 = 9
+	TypeNULL       uint16 = 10
+	TypePTR        uint16 = 12
+	TypeHINFO      uint16 = 13
+	TypeMINFO      uint16 = 14
+	TypeMX         uint16 = 15
+	TypeTXT        uint16 = 16
+	TypeRP         uint16 = 17
+	TypeAFSDB      uint16 = 18
+	TypeX25        uint16 = 19
+	TypeISDN       uint16 = 20
+	TypeRT         uint16 = 21
+	TypeNSAPPTR    uint16 = 23
+	TypeSIG        uint16 = 24
+	TypeKEY        uint16 = 25
+	TypePX         uint16 = 26
+	TypeGPOS       uint16 = 27
+	TypeAAAA       uint16 = 28
+	TypeLOC        uint16 = 29
+	TypeNXT        uint16 = 30
+	TypeEID        uint16 = 31
+	TypeNIMLOC     uint16 = 32
+	TypeSRV        uint16 = 33
+	TypeATMA       uint16 = 34
+	TypeNAPTR      uint16 = 35
+	TypeKX         uint16 = 36
+	TypeCERT       uint16 = 37
+	TypeDNAME      uint16 = 39
+	TypeOPT        uint16 = 41 // EDNS
+	TypeDS         uint16 = 43
+	TypeSSHFP      uint16 = 44
+	TypeRRSIG      uint16 = 46
+	TypeNSEC       uint16 = 47
+	TypeDNSKEY     uint16 = 48
+	TypeDHCID      uint16 = 49
+	TypeNSEC3      uint16 = 50
+	TypeNSEC3PARAM uint16 = 51
+	TypeTLSA       uint16 = 52
+	TypeSMIMEA     uint16 = 53
+	TypeHIP        uint16 = 55
+	TypeNINFO      uint16 = 56
+	TypeRKEY       uint16 = 57
+	TypeTALINK     uint16 = 58
+	TypeCDS        uint16 = 59
+	TypeCDNSKEY    uint16 = 60
+	TypeOPENPGPKEY uint16 = 61
+	TypeSPF        uint16 = 99
+	TypeUINFO      uint16 = 100
+	TypeUID        uint16 = 101
+	TypeGID        uint16 = 102
+	TypeUNSPEC     uint16 = 103
+	TypeNID        uint16 = 104
+	TypeL32        uint16 = 105
+	TypeL64        uint16 = 106
+	TypeLP         uint16 = 107
+	TypeEUI48      uint16 = 108
+	TypeEUI64      uint16 = 109
+	TypeURI        uint16 = 256
+	TypeCAA        uint16 = 257
+
+	TypeTKEY uint16 = 249
+	TypeTSIG uint16 = 250
+
+	// valid Question.Qtype only
+	TypeIXFR  uint16 = 251
+	TypeAXFR  uint16 = 252
+	TypeMAILB uint16 = 253
+	TypeMAILA uint16 = 254
+	TypeANY   uint16 = 255
+
+	TypeTA       uint16 = 32768
+	TypeDLV      uint16 = 32769
+	TypeReserved uint16 = 65535
+
+	// valid Question.Qclass
+	ClassINET   = 1
+	ClassCSNET  = 2
+	ClassCHAOS  = 3
+	ClassHESIOD = 4
+	ClassNONE   = 254
+	ClassANY    = 255
+
+	// Message Response Codes.
+	RcodeSuccess        = 0
+	RcodeFormatError    = 1
+	RcodeServerFailure  = 2
+	RcodeNameError      = 3
+	RcodeNotImplemented = 4
+	RcodeRefused        = 5
+	RcodeYXDomain       = 6
+	RcodeYXRrset        = 7
+	RcodeNXRrset        = 8
+	RcodeNotAuth        = 9
+	RcodeNotZone        = 10
+	RcodeBadSig         = 16 // TSIG
+	RcodeBadVers        = 16 // EDNS0
+	RcodeBadKey         = 17
+	RcodeBadTime        = 18
+	RcodeBadMode        = 19 // TKEY
+	RcodeBadName        = 20
+	RcodeBadAlg         = 21
+	RcodeBadTrunc       = 22 // TSIG
+	RcodeBadCookie      = 23 // DNS Cookies
+
+	// Message Opcodes. There is no 3.
+	OpcodeQuery  = 0
+	OpcodeIQuery = 1
+	OpcodeStatus = 2
+	OpcodeNotify = 4
+	OpcodeUpdate = 5
+)
+
+// Header is the wire format for the DNS packet header.
+type Header struct {
+	Id                                 uint16
+	Bits                               uint16
+	Qdcount, Ancount, Nscount, Arcount uint16
+}
+
+const (
+	headerSize = 12
+
+	// Header.Bits
+	_QR = 1 << 15 // query/response (response=1)
+	_AA = 1 << 10 // authoritative
+	_TC = 1 << 9  // truncated
+	_RD = 1 << 8  // recursion desired
+	_RA = 1 << 7  // recursion available
+	_Z  = 1 << 6  // Z
+	_AD = 1 << 5  // authticated data
+	_CD = 1 << 4  // checking disabled
+
+	LOC_EQUATOR       = 1 << 31 // RFC 1876, Section 2.
+	LOC_PRIMEMERIDIAN = 1 << 31 // RFC 1876, Section 2.
+
+	LOC_HOURS   = 60 * 1000
+	LOC_DEGREES = 60 * LOC_HOURS
+
+	LOC_ALTITUDEBASE = 100000
+)
+
+// Different Certificate Types, see RFC 4398, Section 2.1
+const (
+	CertPKIX = 1 + iota
+	CertSPKI
+	CertPGP
+	CertIPIX
+	CertISPKI
+	CertIPGP
+	CertACPKIX
+	CertIACPKIX
+	CertURI = 253
+	CertOID = 254
+)
+
+// CertTypeToString converts the Cert Type to its string representation.
+// See RFC 4398 and RFC 6944.
+var CertTypeToString = map[uint16]string{
+	CertPKIX:    "PKIX",
+	CertSPKI:    "SPKI",
+	CertPGP:     "PGP",
+	CertIPIX:    "IPIX",
+	CertISPKI:   "ISPKI",
+	CertIPGP:    "IPGP",
+	CertACPKIX:  "ACPKIX",
+	CertIACPKIX: "IACPKIX",
+	CertURI:     "URI",
+	CertOID:     "OID",
+}
+
+// StringToCertType is the reverseof CertTypeToString.
+var StringToCertType = reverseInt16(CertTypeToString)
+
+//go:generate go run types_generate.go
+
+// Question holds a DNS question. There can be multiple questions in the
+// question section of a message. Usually there is just one.
+type Question struct {
+	Name   string `dns:"cdomain-name"` // "cdomain-name" specifies encoding (and may be compressed)
+	Qtype  uint16
+	Qclass uint16
+}
+
+func (q *Question) len() int {
+	return len(q.Name) + 1 + 2 + 2
+}
+
+func (q *Question) String() (s string) {
+	// prefix with ; (as in dig)
+	s = ";" + sprintName(q.Name) + "\t"
+	s += Class(q.Qclass).String() + "\t"
+	s += " " + Type(q.Qtype).String()
+	return s
+}
+
+// ANY is a wildcard record. See RFC 1035, Section 3.2.3. ANY
+// is named "*" there.
+type ANY struct {
+	Hdr RR_Header
+	// Does not have any rdata
+}
+
+func (rr *ANY) String() string { return rr.Hdr.String() }
+
+type CNAME struct {
+	Hdr    RR_Header
+	Target string `dns:"cdomain-name"`
+}
+
+func (rr *CNAME) String() string { return rr.Hdr.String() + sprintName(rr.Target) }
+
+type HINFO struct {
+	Hdr RR_Header
+	Cpu string
+	Os  string
+}
+
+func (rr *HINFO) String() string {
+	return rr.Hdr.String() + sprintTxt([]string{rr.Cpu, rr.Os})
+}
+
+type MB struct {
+	Hdr RR_Header
+	Mb  string `dns:"cdomain-name"`
+}
+
+func (rr *MB) String() string { return rr.Hdr.String() + sprintName(rr.Mb) }
+
+type MG struct {
+	Hdr RR_Header
+	Mg  string `dns:"cdomain-name"`
+}
+
+func (rr *MG) String() string { return rr.Hdr.String() + sprintName(rr.Mg) }
+
+type MINFO struct {
+	Hdr   RR_Header
+	Rmail string `dns:"cdomain-name"`
+	Email string `dns:"cdomain-name"`
+}
+
+func (rr *MINFO) String() string {
+	return rr.Hdr.String() + sprintName(rr.Rmail) + " " + sprintName(rr.Email)
+}
+
+type MR struct {
+	Hdr RR_Header
+	Mr  string `dns:"cdomain-name"`
+}
+
+func (rr *MR) String() string {
+	return rr.Hdr.String() + sprintName(rr.Mr)
+}
+
+type MF struct {
+	Hdr RR_Header
+	Mf  string `dns:"cdomain-name"`
+}
+
+func (rr *MF) String() string {
+	return rr.Hdr.String() + sprintName(rr.Mf)
+}
+
+type MD struct {
+	Hdr RR_Header
+	Md  string `dns:"cdomain-name"`
+}
+
+func (rr *MD) String() string {
+	return rr.Hdr.String() + sprintName(rr.Md)
+}
+
+type MX struct {
+	Hdr        RR_Header
+	Preference uint16
+	Mx         string `dns:"cdomain-name"`
+}
+
+func (rr *MX) String() string {
+	return rr.Hdr.String() + strconv.Itoa(int(rr.Preference)) + " " + sprintName(rr.Mx)
+}
+
+type AFSDB struct {
+	Hdr      RR_Header
+	Subtype  uint16
+	Hostname string `dns:"cdomain-name"`
+}
+
+func (rr *AFSDB) String() string {
+	return rr.Hdr.String() + strconv.Itoa(int(rr.Subtype)) + " " + sprintName(rr.Hostname)
+}
+
+type X25 struct {
+	Hdr         RR_Header
+	PSDNAddress string
+}
+
+func (rr *X25) String() string {
+	return rr.Hdr.String() + rr.PSDNAddress
+}
+
+type RT struct {
+	Hdr        RR_Header
+	Preference uint16
+	Host       string `dns:"cdomain-name"`
+}
+
+func (rr *RT) String() string {
+	return rr.Hdr.String() + strconv.Itoa(int(rr.Preference)) + " " + sprintName(rr.Host)
+}
+
+type NS struct {
+	Hdr RR_Header
+	Ns  string `dns:"cdomain-name"`
+}
+
+func (rr *NS) String() string {
+	return rr.Hdr.String() + sprintName(rr.Ns)
+}
+
+type PTR struct {
+	Hdr RR_Header
+	Ptr string `dns:"cdomain-name"`
+}
+
+func (rr *PTR) String() string {
+	return rr.Hdr.String() + sprintName(rr.Ptr)
+}
+
+type RP struct {
+	Hdr  RR_Header
+	Mbox string `dns:"domain-name"`
+	Txt  string `dns:"domain-name"`
+}
+
+func (rr *RP) String() string {
+	return rr.Hdr.String() + rr.Mbox + " " + sprintTxt([]string{rr.Txt})
+}
+
+type SOA struct {
+	Hdr     RR_Header
+	Ns      string `dns:"cdomain-name"`
+	Mbox    string `dns:"cdomain-name"`
+	Serial  uint32
+	Refresh uint32
+	Retry   uint32
+	Expire  uint32
+	Minttl  uint32
+}
+
+func (rr *SOA) String() string {
+	return rr.Hdr.String() + sprintName(rr.Ns) + " " + sprintName(rr.Mbox) +
+		" " + strconv.FormatInt(int64(rr.Serial), 10) +
+		" " + strconv.FormatInt(int64(rr.Refresh), 10) +
+		" " + strconv.FormatInt(int64(rr.Retry), 10) +
+		" " + strconv.FormatInt(int64(rr.Expire), 10) +
+		" " + strconv.FormatInt(int64(rr.Minttl), 10)
+}
+
+type TXT struct {
+	Hdr RR_Header
+	Txt []string `dns:"txt"`
+}
+
+func (rr *TXT) String() string { return rr.Hdr.String() + sprintTxt(rr.Txt) }
+
+func sprintName(s string) string {
+	src := []byte(s)
+	dst := make([]byte, 0, len(src))
+	for i := 0; i < len(src); {
+		if i+1 < len(src) && src[i] == '\\' && src[i+1] == '.' {
+			dst = append(dst, src[i:i+2]...)
+			i += 2
+		} else {
+			b, n := nextByte(src, i)
+			if n == 0 {
+				i++ // dangling back slash
+			} else if b == '.' {
+				dst = append(dst, b)
+			} else {
+				dst = appendDomainNameByte(dst, b)
+			}
+			i += n
+		}
+	}
+	return string(dst)
+}
+
+func sprintTxtOctet(s string) string {
+	src := []byte(s)
+	dst := make([]byte, 0, len(src))
+	dst = append(dst, '"')
+	for i := 0; i < len(src); {
+		if i+1 < len(src) && src[i] == '\\' && src[i+1] == '.' {
+			dst = append(dst, src[i:i+2]...)
+			i += 2
+		} else {
+			b, n := nextByte(src, i)
+			if n == 0 {
+				i++ // dangling back slash
+			} else if b == '.' {
+				dst = append(dst, b)
+			} else {
+				if b < ' ' || b > '~' {
+					dst = appendByte(dst, b)
+				} else {
+					dst = append(dst, b)
+				}
+			}
+			i += n
+		}
+	}
+	dst = append(dst, '"')
+	return string(dst)
+}
+
+func sprintTxt(txt []string) string {
+	var out []byte
+	for i, s := range txt {
+		if i > 0 {
+			out = append(out, ` "`...)
+		} else {
+			out = append(out, '"')
+		}
+		bs := []byte(s)
+		for j := 0; j < len(bs); {
+			b, n := nextByte(bs, j)
+			if n == 0 {
+				break
+			}
+			out = appendTXTStringByte(out, b)
+			j += n
+		}
+		out = append(out, '"')
+	}
+	return string(out)
+}
+
+func appendDomainNameByte(s []byte, b byte) []byte {
+	switch b {
+	case '.', ' ', '\'', '@', ';', '(', ')': // additional chars to escape
+		return append(s, '\\', b)
+	}
+	return appendTXTStringByte(s, b)
+}
+
+func appendTXTStringByte(s []byte, b byte) []byte {
+	switch b {
+	case '"', '\\':
+		return append(s, '\\', b)
+	}
+	if b < ' ' || b > '~' {
+		return appendByte(s, b)
+	}
+	return append(s, b)
+}
+
+func appendByte(s []byte, b byte) []byte {
+	var buf [3]byte
+	bufs := strconv.AppendInt(buf[:0], int64(b), 10)
+	s = append(s, '\\')
+	for i := 0; i < 3-len(bufs); i++ {
+		s = append(s, '0')
+	}
+	for _, r := range bufs {
+		s = append(s, r)
+	}
+	return s
+}
+
+func nextByte(b []byte, offset int) (byte, int) {
+	if offset >= len(b) {
+		return 0, 0
+	}
+	if b[offset] != '\\' {
+		// not an escape sequence
+		return b[offset], 1
+	}
+	switch len(b) - offset {
+	case 1: // dangling escape
+		return 0, 0
+	case 2, 3: // too short to be \ddd
+	default: // maybe \ddd
+		if isDigit(b[offset+1]) && isDigit(b[offset+2]) && isDigit(b[offset+3]) {
+			return dddToByte(b[offset+1:]), 4
+		}
+	}
+	// not \ddd, just an RFC 1035 "quoted" character
+	return b[offset+1], 2
+}
+
+type SPF struct {
+	Hdr RR_Header
+	Txt []string `dns:"txt"`
+}
+
+func (rr *SPF) String() string { return rr.Hdr.String() + sprintTxt(rr.Txt) }
+
+type SRV struct {
+	Hdr      RR_Header
+	Priority uint16
+	Weight   uint16
+	Port     uint16
+	Target   string `dns:"domain-name"`
+}
+
+func (rr *SRV) String() string {
+	return rr.Hdr.String() +
+		strconv.Itoa(int(rr.Priority)) + " " +
+		strconv.Itoa(int(rr.Weight)) + " " +
+		strconv.Itoa(int(rr.Port)) + " " + sprintName(rr.Target)
+}
+
+type NAPTR struct {
+	Hdr         RR_Header
+	Order       uint16
+	Preference  uint16
+	Flags       string
+	Service     string
+	Regexp      string
+	Replacement string `dns:"domain-name"`
+}
+
+func (rr *NAPTR) String() string {
+	return rr.Hdr.String() +
+		strconv.Itoa(int(rr.Order)) + " " +
+		strconv.Itoa(int(rr.Preference)) + " " +
+		"\"" + rr.Flags + "\" " +
+		"\"" + rr.Service + "\" " +
+		"\"" + rr.Regexp + "\" " +
+		rr.Replacement
+}
+
+// The CERT resource record, see RFC 4398.
+type CERT struct {
+	Hdr         RR_Header
+	Type        uint16
+	KeyTag      uint16
+	Algorithm   uint8
+	Certificate string `dns:"base64"`
+}
+
+func (rr *CERT) String() string {
+	var (
+		ok                  bool
+		certtype, algorithm string
+	)
+	if certtype, ok = CertTypeToString[rr.Type]; !ok {
+		certtype = strconv.Itoa(int(rr.Type))
+	}
+	if algorithm, ok = AlgorithmToString[rr.Algorithm]; !ok {
+		algorithm = strconv.Itoa(int(rr.Algorithm))
+	}
+	return rr.Hdr.String() + certtype +
+		" " + strconv.Itoa(int(rr.KeyTag)) +
+		" " + algorithm +
+		" " + rr.Certificate
+}
+
+// The DNAME resource record, see RFC 2672.
+type DNAME struct {
+	Hdr    RR_Header
+	Target string `dns:"domain-name"`
+}
+
+func (rr *DNAME) String() string {
+	return rr.Hdr.String() + sprintName(rr.Target)
+}
+
+type A struct {
+	Hdr RR_Header
+	A   net.IP `dns:"a"`
+}
+
+func (rr *A) String() string {
+	if rr.A == nil {
+		return rr.Hdr.String()
+	}
+	return rr.Hdr.String() + rr.A.String()
+}
+
+type AAAA struct {
+	Hdr  RR_Header
+	AAAA net.IP `dns:"aaaa"`
+}
+
+func (rr *AAAA) String() string {
+	if rr.AAAA == nil {
+		return rr.Hdr.String()
+	}
+	return rr.Hdr.String() + rr.AAAA.String()
+}
+
+type PX struct {
+	Hdr        RR_Header
+	Preference uint16
+	Map822     string `dns:"domain-name"`
+	Mapx400    string `dns:"domain-name"`
+}
+
+func (rr *PX) String() string {
+	return rr.Hdr.String() + strconv.Itoa(int(rr.Preference)) + " " + sprintName(rr.Map822) + " " + sprintName(rr.Mapx400)
+}
+
+type GPOS struct {
+	Hdr       RR_Header
+	Longitude string
+	Latitude  string
+	Altitude  string
+}
+
+func (rr *GPOS) String() string {
+	return rr.Hdr.String() + rr.Longitude + " " + rr.Latitude + " " + rr.Altitude
+}
+
+type LOC struct {
+	Hdr       RR_Header
+	Version   uint8
+	Size      uint8
+	HorizPre  uint8
+	VertPre   uint8
+	Latitude  uint32
+	Longitude uint32
+	Altitude  uint32
+}
+
+// cmToM takes a cm value expressed in RFC1876 SIZE mantissa/exponent
+// format and returns a string in m (two decimals for the cm)
+func cmToM(m, e uint8) string {
+	if e < 2 {
+		if e == 1 {
+			m *= 10
+		}
+
+		return fmt.Sprintf("0.%02d", m)
+	}
+
+	s := fmt.Sprintf("%d", m)
+	for e > 2 {
+		s += "0"
+		e--
+	}
+	return s
+}
+
+func (rr *LOC) String() string {
+	s := rr.Hdr.String()
+
+	lat := rr.Latitude
+	ns := "N"
+	if lat > LOC_EQUATOR {
+		lat = lat - LOC_EQUATOR
+	} else {
+		ns = "S"
+		lat = LOC_EQUATOR - lat
+	}
+	h := lat / LOC_DEGREES
+	lat = lat % LOC_DEGREES
+	m := lat / LOC_HOURS
+	lat = lat % LOC_HOURS
+	s += fmt.Sprintf("%02d %02d %0.3f %s ", h, m, (float64(lat) / 1000), ns)
+
+	lon := rr.Longitude
+	ew := "E"
+	if lon > LOC_PRIMEMERIDIAN {
+		lon = lon - LOC_PRIMEMERIDIAN
+	} else {
+		ew = "W"
+		lon = LOC_PRIMEMERIDIAN - lon
+	}
+	h = lon / LOC_DEGREES
+	lon = lon % LOC_DEGREES
+	m = lon / LOC_HOURS
+	lon = lon % LOC_HOURS
+	s += fmt.Sprintf("%02d %02d %0.3f %s ", h, m, (float64(lon) / 1000), ew)
+
+	var alt = float64(rr.Altitude) / 100
+	alt -= LOC_ALTITUDEBASE
+	if rr.Altitude%100 != 0 {
+		s += fmt.Sprintf("%.2fm ", alt)
+	} else {
+		s += fmt.Sprintf("%.0fm ", alt)
+	}
+
+	s += cmToM((rr.Size&0xf0)>>4, rr.Size&0x0f) + "m "
+	s += cmToM((rr.HorizPre&0xf0)>>4, rr.HorizPre&0x0f) + "m "
+	s += cmToM((rr.VertPre&0xf0)>>4, rr.VertPre&0x0f) + "m"
+
+	return s
+}
+
+// SIG is identical to RRSIG and nowadays only used for SIG(0), RFC2931.
+type SIG struct {
+	RRSIG
+}
+
+type RRSIG struct {
+	Hdr         RR_Header
+	TypeCovered uint16
+	Algorithm   uint8
+	Labels      uint8
+	OrigTtl     uint32
+	Expiration  uint32
+	Inception   uint32
+	KeyTag      uint16
+	SignerName  string `dns:"domain-name"`
+	Signature   string `dns:"base64"`
+}
+
+func (rr *RRSIG) String() string {
+	s := rr.Hdr.String()
+	s += Type(rr.TypeCovered).String()
+	s += " " + strconv.Itoa(int(rr.Algorithm)) +
+		" " + strconv.Itoa(int(rr.Labels)) +
+		" " + strconv.FormatInt(int64(rr.OrigTtl), 10) +
+		" " + TimeToString(rr.Expiration) +
+		" " + TimeToString(rr.Inception) +
+		" " + strconv.Itoa(int(rr.KeyTag)) +
+		" " + sprintName(rr.SignerName) +
+		" " + rr.Signature
+	return s
+}
+
+type NSEC struct {
+	Hdr        RR_Header
+	NextDomain string   `dns:"domain-name"`
+	TypeBitMap []uint16 `dns:"nsec"`
+}
+
+func (rr *NSEC) String() string {
+	s := rr.Hdr.String() + sprintName(rr.NextDomain)
+	for i := 0; i < len(rr.TypeBitMap); i++ {
+		s += " " + Type(rr.TypeBitMap[i]).String()
+	}
+	return s
+}
+
+func (rr *NSEC) len() int {
+	l := rr.Hdr.len() + len(rr.NextDomain) + 1
+	lastwindow := uint32(2 ^ 32 + 1)
+	for _, t := range rr.TypeBitMap {
+		window := t / 256
+		if uint32(window) != lastwindow {
+			l += 1 + 32
+		}
+		lastwindow = uint32(window)
+	}
+	return l
+}
+
+type DLV struct {
+	DS
+}
+
+type CDS struct {
+	DS
+}
+
+type DS struct {
+	Hdr        RR_Header
+	KeyTag     uint16
+	Algorithm  uint8
+	DigestType uint8
+	Digest     string `dns:"hex"`
+}
+
+func (rr *DS) String() string {
+	return rr.Hdr.String() + strconv.Itoa(int(rr.KeyTag)) +
+		" " + strconv.Itoa(int(rr.Algorithm)) +
+		" " + strconv.Itoa(int(rr.DigestType)) +
+		" " + strings.ToUpper(rr.Digest)
+}
+
+type KX struct {
+	Hdr        RR_Header
+	Preference uint16
+	Exchanger  string `dns:"domain-name"`
+}
+
+func (rr *KX) String() string {
+	return rr.Hdr.String() + strconv.Itoa(int(rr.Preference)) +
+		" " + sprintName(rr.Exchanger)
+}
+
+type TA struct {
+	Hdr        RR_Header
+	KeyTag     uint16
+	Algorithm  uint8
+	DigestType uint8
+	Digest     string `dns:"hex"`
+}
+
+func (rr *TA) String() string {
+	return rr.Hdr.String() + strconv.Itoa(int(rr.KeyTag)) +
+		" " + strconv.Itoa(int(rr.Algorithm)) +
+		" " + strconv.Itoa(int(rr.DigestType)) +
+		" " + strings.ToUpper(rr.Digest)
+}
+
+type TALINK struct {
+	Hdr          RR_Header
+	PreviousName string `dns:"domain-name"`
+	NextName     string `dns:"domain-name"`
+}
+
+func (rr *TALINK) String() string {
+	return rr.Hdr.String() +
+		sprintName(rr.PreviousName) + " " + sprintName(rr.NextName)
+}
+
+type SSHFP struct {
+	Hdr         RR_Header
+	Algorithm   uint8
+	Type        uint8
+	FingerPrint string `dns:"hex"`
+}
+
+func (rr *SSHFP) String() string {
+	return rr.Hdr.String() + strconv.Itoa(int(rr.Algorithm)) +
+		" " + strconv.Itoa(int(rr.Type)) +
+		" " + strings.ToUpper(rr.FingerPrint)
+}
+
+type KEY struct {
+	DNSKEY
+}
+
+type CDNSKEY struct {
+	DNSKEY
+}
+
+type DNSKEY struct {
+	Hdr       RR_Header
+	Flags     uint16
+	Protocol  uint8
+	Algorithm uint8
+	PublicKey string `dns:"base64"`
+}
+
+func (rr *DNSKEY) String() string {
+	return rr.Hdr.String() + strconv.Itoa(int(rr.Flags)) +
+		" " + strconv.Itoa(int(rr.Protocol)) +
+		" " + strconv.Itoa(int(rr.Algorithm)) +
+		" " + rr.PublicKey
+}
+
+type RKEY struct {
+	Hdr       RR_Header
+	Flags     uint16
+	Protocol  uint8
+	Algorithm uint8
+	PublicKey string `dns:"base64"`
+}
+
+func (rr *RKEY) String() string {
+	return rr.Hdr.String() + strconv.Itoa(int(rr.Flags)) +
+		" " + strconv.Itoa(int(rr.Protocol)) +
+		" " + strconv.Itoa(int(rr.Algorithm)) +
+		" " + rr.PublicKey
+}
+
+type NSAPPTR struct {
+	Hdr RR_Header
+	Ptr string `dns:"domain-name"`
+}
+
+func (rr *NSAPPTR) String() string { return rr.Hdr.String() + sprintName(rr.Ptr) }
+
+type NSEC3 struct {
+	Hdr        RR_Header
+	Hash       uint8
+	Flags      uint8
+	Iterations uint16
+	SaltLength uint8
+	Salt       string `dns:"size-hex:SaltLength"`
+	HashLength uint8
+	NextDomain string   `dns:"size-base32:HashLength"`
+	TypeBitMap []uint16 `dns:"nsec"`
+}
+
+func (rr *NSEC3) String() string {
+	s := rr.Hdr.String()
+	s += strconv.Itoa(int(rr.Hash)) +
+		" " + strconv.Itoa(int(rr.Flags)) +
+		" " + strconv.Itoa(int(rr.Iterations)) +
+		" " + saltToString(rr.Salt) +
+		" " + rr.NextDomain
+	for i := 0; i < len(rr.TypeBitMap); i++ {
+		s += " " + Type(rr.TypeBitMap[i]).String()
+	}
+	return s
+}
+
+func (rr *NSEC3) len() int {
+	l := rr.Hdr.len() + 6 + len(rr.Salt)/2 + 1 + len(rr.NextDomain) + 1
+	lastwindow := uint32(2 ^ 32 + 1)
+	for _, t := range rr.TypeBitMap {
+		window := t / 256
+		if uint32(window) != lastwindow {
+			l += 1 + 32
+		}
+		lastwindow = uint32(window)
+	}
+	return l
+}
+
+type NSEC3PARAM struct {
+	Hdr        RR_Header
+	Hash       uint8
+	Flags      uint8
+	Iterations uint16
+	SaltLength uint8
+	Salt       string `dns:"size-hex:SaltLength"`
+}
+
+func (rr *NSEC3PARAM) String() string {
+	s := rr.Hdr.String()
+	s += strconv.Itoa(int(rr.Hash)) +
+		" " + strconv.Itoa(int(rr.Flags)) +
+		" " + strconv.Itoa(int(rr.Iterations)) +
+		" " + saltToString(rr.Salt)
+	return s
+}
+
+type TKEY struct {
+	Hdr        RR_Header
+	Algorithm  string `dns:"domain-name"`
+	Inception  uint32
+	Expiration uint32
+	Mode       uint16
+	Error      uint16
+	KeySize    uint16
+	Key        string
+	OtherLen   uint16
+	OtherData  string
+}
+
+func (rr *TKEY) String() string {
+	// It has no presentation format
+	return ""
+}
+
+// RFC3597 represents an unknown/generic RR.
+type RFC3597 struct {
+	Hdr   RR_Header
+	Rdata string `dns:"hex"`
+}
+
+func (rr *RFC3597) String() string {
+	// Let's call it a hack
+	s := rfc3597Header(rr.Hdr)
+
+	s += "\\# " + strconv.Itoa(len(rr.Rdata)/2) + " " + rr.Rdata
+	return s
+}
+
+func rfc3597Header(h RR_Header) string {
+	var s string
+
+	s += sprintName(h.Name) + "\t"
+	s += strconv.FormatInt(int64(h.Ttl), 10) + "\t"
+	s += "CLASS" + strconv.Itoa(int(h.Class)) + "\t"
+	s += "TYPE" + strconv.Itoa(int(h.Rrtype)) + "\t"
+	return s
+}
+
+type URI struct {
+	Hdr      RR_Header
+	Priority uint16
+	Weight   uint16
+	Target   string `dns:"octet"`
+}
+
+func (rr *URI) String() string {
+	return rr.Hdr.String() + strconv.Itoa(int(rr.Priority)) +
+		" " + strconv.Itoa(int(rr.Weight)) + " " + sprintTxtOctet(rr.Target)
+}
+
+type DHCID struct {
+	Hdr    RR_Header
+	Digest string `dns:"base64"`
+}
+
+func (rr *DHCID) String() string { return rr.Hdr.String() + rr.Digest }
+
+type TLSA struct {
+	Hdr          RR_Header
+	Usage        uint8
+	Selector     uint8
+	MatchingType uint8
+	Certificate  string `dns:"hex"`
+}
+
+func (rr *TLSA) String() string {
+	return rr.Hdr.String() +
+		strconv.Itoa(int(rr.Usage)) +
+		" " + strconv.Itoa(int(rr.Selector)) +
+		" " + strconv.Itoa(int(rr.MatchingType)) +
+		" " + rr.Certificate
+}
+
+type SMIMEA struct {
+	Hdr          RR_Header
+	Usage        uint8
+	Selector     uint8
+	MatchingType uint8
+	Certificate  string `dns:"hex"`
+}
+
+func (rr *SMIMEA) String() string {
+	s := rr.Hdr.String() +
+		strconv.Itoa(int(rr.Usage)) +
+		" " + strconv.Itoa(int(rr.Selector)) +
+		" " + strconv.Itoa(int(rr.MatchingType))
+
+	// Every Nth char needs a space on this output. If we output
+	// this as one giant line, we can't read it can in because in some cases
+	// the cert length overflows scan.maxTok (2048).
+	sx := splitN(rr.Certificate, 1024) // conservative value here
+	s += " " + strings.Join(sx, " ")
+	return s
+}
+
+type HIP struct {
+	Hdr                RR_Header
+	HitLength          uint8
+	PublicKeyAlgorithm uint8
+	PublicKeyLength    uint16
+	Hit                string   `dns:"size-hex:HitLength"`
+	PublicKey          string   `dns:"size-base64:PublicKeyLength"`
+	RendezvousServers  []string `dns:"domain-name"`
+}
+
+func (rr *HIP) String() string {
+	s := rr.Hdr.String() +
+		strconv.Itoa(int(rr.PublicKeyAlgorithm)) +
+		" " + rr.Hit +
+		" " + rr.PublicKey
+	for _, d := range rr.RendezvousServers {
+		s += " " + sprintName(d)
+	}
+	return s
+}
+
+type NINFO struct {
+	Hdr    RR_Header
+	ZSData []string `dns:"txt"`
+}
+
+func (rr *NINFO) String() string { return rr.Hdr.String() + sprintTxt(rr.ZSData) }
+
+type NID struct {
+	Hdr        RR_Header
+	Preference uint16
+	NodeID     uint64
+}
+
+func (rr *NID) String() string {
+	s := rr.Hdr.String() + strconv.Itoa(int(rr.Preference))
+	node := fmt.Sprintf("%0.16x", rr.NodeID)
+	s += " " + node[0:4] + ":" + node[4:8] + ":" + node[8:12] + ":" + node[12:16]
+	return s
+}
+
+type L32 struct {
+	Hdr        RR_Header
+	Preference uint16
+	Locator32  net.IP `dns:"a"`
+}
+
+func (rr *L32) String() string {
+	if rr.Locator32 == nil {
+		return rr.Hdr.String() + strconv.Itoa(int(rr.Preference))
+	}
+	return rr.Hdr.String() + strconv.Itoa(int(rr.Preference)) +
+		" " + rr.Locator32.String()
+}
+
+type L64 struct {
+	Hdr        RR_Header
+	Preference uint16
+	Locator64  uint64
+}
+
+func (rr *L64) String() string {
+	s := rr.Hdr.String() + strconv.Itoa(int(rr.Preference))
+	node := fmt.Sprintf("%0.16X", rr.Locator64)
+	s += " " + node[0:4] + ":" + node[4:8] + ":" + node[8:12] + ":" + node[12:16]
+	return s
+}
+
+type LP struct {
+	Hdr        RR_Header
+	Preference uint16
+	Fqdn       string `dns:"domain-name"`
+}
+
+func (rr *LP) String() string {
+	return rr.Hdr.String() + strconv.Itoa(int(rr.Preference)) + " " + sprintName(rr.Fqdn)
+}
+
+type EUI48 struct {
+	Hdr     RR_Header
+	Address uint64 `dns:"uint48"`
+}
+
+func (rr *EUI48) String() string { return rr.Hdr.String() + euiToString(rr.Address, 48) }
+
+type EUI64 struct {
+	Hdr     RR_Header
+	Address uint64
+}
+
+func (rr *EUI64) String() string { return rr.Hdr.String() + euiToString(rr.Address, 64) }
+
+type CAA struct {
+	Hdr   RR_Header
+	Flag  uint8
+	Tag   string
+	Value string `dns:"octet"`
+}
+
+func (rr *CAA) String() string {
+	return rr.Hdr.String() + strconv.Itoa(int(rr.Flag)) + " " + rr.Tag + " " + sprintTxtOctet(rr.Value)
+}
+
+type UID struct {
+	Hdr RR_Header
+	Uid uint32
+}
+
+func (rr *UID) String() string { return rr.Hdr.String() + strconv.FormatInt(int64(rr.Uid), 10) }
+
+type GID struct {
+	Hdr RR_Header
+	Gid uint32
+}
+
+func (rr *GID) String() string { return rr.Hdr.String() + strconv.FormatInt(int64(rr.Gid), 10) }
+
+type UINFO struct {
+	Hdr   RR_Header
+	Uinfo string
+}
+
+func (rr *UINFO) String() string { return rr.Hdr.String() + sprintTxt([]string{rr.Uinfo}) }
+
+type EID struct {
+	Hdr      RR_Header
+	Endpoint string `dns:"hex"`
+}
+
+func (rr *EID) String() string { return rr.Hdr.String() + strings.ToUpper(rr.Endpoint) }
+
+type NIMLOC struct {
+	Hdr     RR_Header
+	Locator string `dns:"hex"`
+}
+
+func (rr *NIMLOC) String() string { return rr.Hdr.String() + strings.ToUpper(rr.Locator) }
+
+type OPENPGPKEY struct {
+	Hdr       RR_Header
+	PublicKey string `dns:"base64"`
+}
+
+func (rr *OPENPGPKEY) String() string { return rr.Hdr.String() + rr.PublicKey }
+
+// TimeToString translates the RRSIG's incep. and expir. times to the
+// string representation used when printing the record.
+// It takes serial arithmetic (RFC 1982) into account.
+func TimeToString(t uint32) string {
+	mod := ((int64(t) - time.Now().Unix()) / year68) - 1
+	if mod < 0 {
+		mod = 0
+	}
+	ti := time.Unix(int64(t)-(mod*year68), 0).UTC()
+	return ti.Format("20060102150405")
+}
+
+// StringToTime translates the RRSIG's incep. and expir. times from
+// string values like "20110403154150" to an 32 bit integer.
+// It takes serial arithmetic (RFC 1982) into account.
+func StringToTime(s string) (uint32, error) {
+	t, err := time.Parse("20060102150405", s)
+	if err != nil {
+		return 0, err
+	}
+	mod := (t.Unix() / year68) - 1
+	if mod < 0 {
+		mod = 0
+	}
+	return uint32(t.Unix() - (mod * year68)), nil
+}
+
+// saltToString converts a NSECX salt to uppercase and returns "-" when it is empty.
+func saltToString(s string) string {
+	if len(s) == 0 {
+		return "-"
+	}
+	return strings.ToUpper(s)
+}
+
+func euiToString(eui uint64, bits int) (hex string) {
+	switch bits {
+	case 64:
+		hex = fmt.Sprintf("%16.16x", eui)
+		hex = hex[0:2] + "-" + hex[2:4] + "-" + hex[4:6] + "-" + hex[6:8] +
+			"-" + hex[8:10] + "-" + hex[10:12] + "-" + hex[12:14] + "-" + hex[14:16]
+	case 48:
+		hex = fmt.Sprintf("%12.12x", eui)
+		hex = hex[0:2] + "-" + hex[2:4] + "-" + hex[4:6] + "-" + hex[6:8] +
+			"-" + hex[8:10] + "-" + hex[10:12]
+	}
+	return
+}
+
+// copyIP returns a copy of ip.
+func copyIP(ip net.IP) net.IP {
+	p := make(net.IP, len(ip))
+	copy(p, ip)
+	return p
+}
+
+// SplitN splits a string into N sized string chunks.
+// This might become an exported function once.
+func splitN(s string, n int) []string {
+	if len(s) < n {
+		return []string{s}
+	}
+	sx := []string{}
+	p, i := 0, n
+	for {
+		if i <= len(s) {
+			sx = append(sx, s[p:i])
+		} else {
+			sx = append(sx, s[p:])
+			break
+
+		}
+		p, i = p+n, i+n
+	}
+
+	return sx
+}
diff --git a/vendor/github.com/miekg/dns/types_generate.go b/vendor/github.com/miekg/dns/types_generate.go
new file mode 100644
index 0000000000..dd1310942b
--- /dev/null
+++ b/vendor/github.com/miekg/dns/types_generate.go
@@ -0,0 +1,271 @@
+//+build ignore
+
+// types_generate.go is meant to run with go generate. It will use
+// go/{importer,types} to track down all the RR struct types. Then for each type
+// it will generate conversion tables (TypeToRR and TypeToString) and banal
+// methods (len, Header, copy) based on the struct tags. The generated source is
+// written to ztypes.go, and is meant to be checked into git.
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"go/format"
+	"go/importer"
+	"go/types"
+	"log"
+	"os"
+	"strings"
+	"text/template"
+)
+
+var skipLen = map[string]struct{}{
+	"NSEC":  {},
+	"NSEC3": {},
+	"OPT":   {},
+}
+
+var packageHdr = `
+// *** DO NOT MODIFY ***
+// AUTOGENERATED BY go generate from type_generate.go
+
+package dns
+
+import (
+	"encoding/base64"
+	"net"
+)
+
+`
+
+var TypeToRR = template.Must(template.New("TypeToRR").Parse(`
+// TypeToRR is a map of constructors for each RR type.
+var TypeToRR = map[uint16]func() RR{
+{{range .}}{{if ne . "RFC3597"}}  Type{{.}}:  func() RR { return new({{.}}) },
+{{end}}{{end}}                    }
+
+`))
+
+var typeToString = template.Must(template.New("typeToString").Parse(`
+// TypeToString is a map of strings for each RR type.
+var TypeToString = map[uint16]string{
+{{range .}}{{if ne . "NSAPPTR"}}  Type{{.}}: "{{.}}",
+{{end}}{{end}}                    TypeNSAPPTR:    "NSAP-PTR",
+}
+
+`))
+
+var headerFunc = template.Must(template.New("headerFunc").Parse(`
+// Header() functions
+{{range .}}  func (rr *{{.}}) Header() *RR_Header { return &rr.Hdr }
+{{end}}
+
+`))
+
+// getTypeStruct will take a type and the package scope, and return the
+// (innermost) struct if the type is considered a RR type (currently defined as
+// those structs beginning with a RR_Header, could be redefined as implementing
+// the RR interface). The bool return value indicates if embedded structs were
+// resolved.
+func getTypeStruct(t types.Type, scope *types.Scope) (*types.Struct, bool) {
+	st, ok := t.Underlying().(*types.Struct)
+	if !ok {
+		return nil, false
+	}
+	if st.Field(0).Type() == scope.Lookup("RR_Header").Type() {
+		return st, false
+	}
+	if st.Field(0).Anonymous() {
+		st, _ := getTypeStruct(st.Field(0).Type(), scope)
+		return st, true
+	}
+	return nil, false
+}
+
+func main() {
+	// Import and type-check the package
+	pkg, err := importer.Default().Import("github.com/miekg/dns")
+	fatalIfErr(err)
+	scope := pkg.Scope()
+
+	// Collect constants like TypeX
+	var numberedTypes []string
+	for _, name := range scope.Names() {
+		o := scope.Lookup(name)
+		if o == nil || !o.Exported() {
+			continue
+		}
+		b, ok := o.Type().(*types.Basic)
+		if !ok || b.Kind() != types.Uint16 {
+			continue
+		}
+		if !strings.HasPrefix(o.Name(), "Type") {
+			continue
+		}
+		name := strings.TrimPrefix(o.Name(), "Type")
+		if name == "PrivateRR" {
+			continue
+		}
+		numberedTypes = append(numberedTypes, name)
+	}
+
+	// Collect actual types (*X)
+	var namedTypes []string
+	for _, name := range scope.Names() {
+		o := scope.Lookup(name)
+		if o == nil || !o.Exported() {
+			continue
+		}
+		if st, _ := getTypeStruct(o.Type(), scope); st == nil {
+			continue
+		}
+		if name == "PrivateRR" {
+			continue
+		}
+
+		// Check if corresponding TypeX exists
+		if scope.Lookup("Type"+o.Name()) == nil && o.Name() != "RFC3597" {
+			log.Fatalf("Constant Type%s does not exist.", o.Name())
+		}
+
+		namedTypes = append(namedTypes, o.Name())
+	}
+
+	b := &bytes.Buffer{}
+	b.WriteString(packageHdr)
+
+	// Generate TypeToRR
+	fatalIfErr(TypeToRR.Execute(b, namedTypes))
+
+	// Generate typeToString
+	fatalIfErr(typeToString.Execute(b, numberedTypes))
+
+	// Generate headerFunc
+	fatalIfErr(headerFunc.Execute(b, namedTypes))
+
+	// Generate len()
+	fmt.Fprint(b, "// len() functions\n")
+	for _, name := range namedTypes {
+		if _, ok := skipLen[name]; ok {
+			continue
+		}
+		o := scope.Lookup(name)
+		st, isEmbedded := getTypeStruct(o.Type(), scope)
+		if isEmbedded {
+			continue
+		}
+		fmt.Fprintf(b, "func (rr *%s) len() int {\n", name)
+		fmt.Fprintf(b, "l := rr.Hdr.len()\n")
+		for i := 1; i < st.NumFields(); i++ {
+			o := func(s string) { fmt.Fprintf(b, s, st.Field(i).Name()) }
+
+			if _, ok := st.Field(i).Type().(*types.Slice); ok {
+				switch st.Tag(i) {
+				case `dns:"-"`:
+					// ignored
+				case `dns:"cdomain-name"`, `dns:"domain-name"`, `dns:"txt"`:
+					o("for _, x := range rr.%s { l += len(x) + 1 }\n")
+				default:
+					log.Fatalln(name, st.Field(i).Name(), st.Tag(i))
+				}
+				continue
+			}
+
+			switch {
+			case st.Tag(i) == `dns:"-"`:
+				// ignored
+			case st.Tag(i) == `dns:"cdomain-name"`, st.Tag(i) == `dns:"domain-name"`:
+				o("l += len(rr.%s) + 1\n")
+			case st.Tag(i) == `dns:"octet"`:
+				o("l += len(rr.%s)\n")
+			case strings.HasPrefix(st.Tag(i), `dns:"size-base64`):
+				fallthrough
+			case st.Tag(i) == `dns:"base64"`:
+				o("l += base64.StdEncoding.DecodedLen(len(rr.%s))\n")
+			case strings.HasPrefix(st.Tag(i), `dns:"size-hex`):
+				fallthrough
+			case st.Tag(i) == `dns:"hex"`:
+				o("l += len(rr.%s)/2 + 1\n")
+			case st.Tag(i) == `dns:"a"`:
+				o("l += net.IPv4len // %s\n")
+			case st.Tag(i) == `dns:"aaaa"`:
+				o("l += net.IPv6len // %s\n")
+			case st.Tag(i) == `dns:"txt"`:
+				o("for _, t := range rr.%s { l += len(t) + 1 }\n")
+			case st.Tag(i) == `dns:"uint48"`:
+				o("l += 6 // %s\n")
+			case st.Tag(i) == "":
+				switch st.Field(i).Type().(*types.Basic).Kind() {
+				case types.Uint8:
+					o("l++ // %s\n")
+				case types.Uint16:
+					o("l += 2 // %s\n")
+				case types.Uint32:
+					o("l += 4 // %s\n")
+				case types.Uint64:
+					o("l += 8 // %s\n")
+				case types.String:
+					o("l += len(rr.%s) + 1\n")
+				default:
+					log.Fatalln(name, st.Field(i).Name())
+				}
+			default:
+				log.Fatalln(name, st.Field(i).Name(), st.Tag(i))
+			}
+		}
+		fmt.Fprintf(b, "return l }\n")
+	}
+
+	// Generate copy()
+	fmt.Fprint(b, "// copy() functions\n")
+	for _, name := range namedTypes {
+		o := scope.Lookup(name)
+		st, isEmbedded := getTypeStruct(o.Type(), scope)
+		if isEmbedded {
+			continue
+		}
+		fmt.Fprintf(b, "func (rr *%s) copy() RR {\n", name)
+		fields := []string{"*rr.Hdr.copyHeader()"}
+		for i := 1; i < st.NumFields(); i++ {
+			f := st.Field(i).Name()
+			if sl, ok := st.Field(i).Type().(*types.Slice); ok {
+				t := sl.Underlying().String()
+				t = strings.TrimPrefix(t, "[]")
+				if strings.Contains(t, ".") {
+					splits := strings.Split(t, ".")
+					t = splits[len(splits)-1]
+				}
+				fmt.Fprintf(b, "%s := make([]%s, len(rr.%s)); copy(%s, rr.%s)\n",
+					f, t, f, f, f)
+				fields = append(fields, f)
+				continue
+			}
+			if st.Field(i).Type().String() == "net.IP" {
+				fields = append(fields, "copyIP(rr."+f+")")
+				continue
+			}
+			fields = append(fields, "rr."+f)
+		}
+		fmt.Fprintf(b, "return &%s{%s}\n", name, strings.Join(fields, ","))
+		fmt.Fprintf(b, "}\n")
+	}
+
+	// gofmt
+	res, err := format.Source(b.Bytes())
+	if err != nil {
+		b.WriteTo(os.Stderr)
+		log.Fatal(err)
+	}
+
+	// write result
+	f, err := os.Create("ztypes.go")
+	fatalIfErr(err)
+	defer f.Close()
+	f.Write(res)
+}
+
+func fatalIfErr(err error) {
+	if err != nil {
+		log.Fatal(err)
+	}
+}
diff --git a/vendor/github.com/miekg/dns/types_test.go b/vendor/github.com/miekg/dns/types_test.go
new file mode 100644
index 0000000000..c117cfbc7b
--- /dev/null
+++ b/vendor/github.com/miekg/dns/types_test.go
@@ -0,0 +1,74 @@
+package dns
+
+import (
+	"testing"
+)
+
+func TestCmToM(t *testing.T) {
+	s := cmToM(0, 0)
+	if s != "0.00" {
+		t.Error("0, 0")
+	}
+
+	s = cmToM(1, 0)
+	if s != "0.01" {
+		t.Error("1, 0")
+	}
+
+	s = cmToM(3, 1)
+	if s != "0.30" {
+		t.Error("3, 1")
+	}
+
+	s = cmToM(4, 2)
+	if s != "4" {
+		t.Error("4, 2")
+	}
+
+	s = cmToM(5, 3)
+	if s != "50" {
+		t.Error("5, 3")
+	}
+
+	s = cmToM(7, 5)
+	if s != "7000" {
+		t.Error("7, 5")
+	}
+
+	s = cmToM(9, 9)
+	if s != "90000000" {
+		t.Error("9, 9")
+	}
+}
+
+func TestSplitN(t *testing.T) {
+	xs := splitN("abc", 5)
+	if len(xs) != 1 && xs[0] != "abc" {
+		t.Errorf("Failure to split abc")
+	}
+
+	s := ""
+	for i := 0; i < 255; i++ {
+		s += "a"
+	}
+
+	xs = splitN(s, 255)
+	if len(xs) != 1 && xs[0] != s {
+		t.Errorf("failure to split 255 char long string")
+	}
+
+	s += "b"
+	xs = splitN(s, 255)
+	if len(xs) != 2 || xs[1] != "b" {
+		t.Errorf("failure to split 256 char long string: %d", len(xs))
+	}
+
+	// Make s longer
+	for i := 0; i < 255; i++ {
+		s += "a"
+	}
+	xs = splitN(s, 255)
+	if len(xs) != 3 || xs[2] != "a" {
+		t.Errorf("failure to split 510 char long string: %d", len(xs))
+	}
+}
diff --git a/vendor/github.com/miekg/dns/udp.go b/vendor/github.com/miekg/dns/udp.go
new file mode 100644
index 0000000000..af111b9a89
--- /dev/null
+++ b/vendor/github.com/miekg/dns/udp.go
@@ -0,0 +1,34 @@
+// +build !windows
+
+package dns
+
+import (
+	"net"
+)
+
+// SessionUDP holds the remote address and the associated
+// out-of-band data.
+type SessionUDP struct {
+	raddr   *net.UDPAddr
+	context []byte
+}
+
+// RemoteAddr returns the remote network address.
+func (s *SessionUDP) RemoteAddr() net.Addr { return s.raddr }
+
+// ReadFromSessionUDP acts just like net.UDPConn.ReadFrom(), but returns a session object instead of a
+// net.UDPAddr.
+func ReadFromSessionUDP(conn *net.UDPConn, b []byte) (int, *SessionUDP, error) {
+	oob := make([]byte, 40)
+	n, oobn, _, raddr, err := conn.ReadMsgUDP(b, oob)
+	if err != nil {
+		return n, nil, err
+	}
+	return n, &SessionUDP{raddr, oob[:oobn]}, err
+}
+
+// WriteToSessionUDP acts just like net.UDPConn.WritetTo(), but uses a *SessionUDP instead of a net.Addr.
+func WriteToSessionUDP(conn *net.UDPConn, b []byte, session *SessionUDP) (int, error) {
+	n, _, err := conn.WriteMsgUDP(b, session.context, session.raddr)
+	return n, err
+}
diff --git a/vendor/github.com/miekg/dns/udp_linux.go b/vendor/github.com/miekg/dns/udp_linux.go
new file mode 100644
index 0000000000..033df42399
--- /dev/null
+++ b/vendor/github.com/miekg/dns/udp_linux.go
@@ -0,0 +1,105 @@
+// +build linux,!appengine
+
+package dns
+
+// See:
+// * http://stackoverflow.com/questions/3062205/setting-the-source-ip-for-a-udp-socket and
+// * http://blog.powerdns.com/2012/10/08/on-binding-datagram-udp-sockets-to-the-any-addresses/
+//
+// Why do we need this: When listening on 0.0.0.0 with UDP so kernel decides what is the outgoing
+// interface, this might not always be the correct one. This code will make sure the egress
+// packet's interface matched the ingress' one.
+
+import (
+	"net"
+	"syscall"
+)
+
+// setUDPSocketOptions sets the UDP socket options.
+// This function is implemented on a per platform basis. See udp_*.go for more details
+func setUDPSocketOptions(conn *net.UDPConn) error {
+	sa, err := getUDPSocketName(conn)
+	if err != nil {
+		return err
+	}
+	switch sa.(type) {
+	case *syscall.SockaddrInet6:
+		v6only, err := getUDPSocketOptions6Only(conn)
+		if err != nil {
+			return err
+		}
+		setUDPSocketOptions6(conn)
+		if !v6only {
+			setUDPSocketOptions4(conn)
+		}
+	case *syscall.SockaddrInet4:
+		setUDPSocketOptions4(conn)
+	}
+	return nil
+}
+
+// setUDPSocketOptions4 prepares the v4 socket for sessions.
+func setUDPSocketOptions4(conn *net.UDPConn) error {
+	file, err := conn.File()
+	if err != nil {
+		return err
+	}
+	if err := syscall.SetsockoptInt(int(file.Fd()), syscall.IPPROTO_IP, syscall.IP_PKTINFO, 1); err != nil {
+		file.Close()
+		return err
+	}
+	// Calling File() above results in the connection becoming blocking, we must fix that.
+	// See https://github.com/miekg/dns/issues/279
+	err = syscall.SetNonblock(int(file.Fd()), true)
+	if err != nil {
+		file.Close()
+		return err
+	}
+	file.Close()
+	return nil
+}
+
+// setUDPSocketOptions6 prepares the v6 socket for sessions.
+func setUDPSocketOptions6(conn *net.UDPConn) error {
+	file, err := conn.File()
+	if err != nil {
+		return err
+	}
+	if err := syscall.SetsockoptInt(int(file.Fd()), syscall.IPPROTO_IPV6, syscall.IPV6_RECVPKTINFO, 1); err != nil {
+		file.Close()
+		return err
+	}
+	err = syscall.SetNonblock(int(file.Fd()), true)
+	if err != nil {
+		file.Close()
+		return err
+	}
+	file.Close()
+	return nil
+}
+
+// getUDPSocketOption6Only return true if the socket is v6 only and false when it is v4/v6 combined
+// (dualstack).
+func getUDPSocketOptions6Only(conn *net.UDPConn) (bool, error) {
+	file, err := conn.File()
+	if err != nil {
+		return false, err
+	}
+	// dual stack. See http://stackoverflow.com/questions/1618240/how-to-support-both-ipv4-and-ipv6-connections
+	v6only, err := syscall.GetsockoptInt(int(file.Fd()), syscall.IPPROTO_IPV6, syscall.IPV6_V6ONLY)
+	if err != nil {
+		file.Close()
+		return false, err
+	}
+	file.Close()
+	return v6only == 1, nil
+}
+
+func getUDPSocketName(conn *net.UDPConn) (syscall.Sockaddr, error) {
+	file, err := conn.File()
+	if err != nil {
+		return nil, err
+	}
+	defer file.Close()
+	return syscall.Getsockname(int(file.Fd()))
+}
diff --git a/vendor/github.com/miekg/dns/udp_other.go b/vendor/github.com/miekg/dns/udp_other.go
new file mode 100644
index 0000000000..488a282b26
--- /dev/null
+++ b/vendor/github.com/miekg/dns/udp_other.go
@@ -0,0 +1,15 @@
+// +build !linux appengine
+
+package dns
+
+import (
+	"net"
+)
+
+// These do nothing. See udp_linux.go for an example of how to implement this.
+
+// We tried to adhire to some kind of naming scheme.
+func setUDPSocketOptions(conn *net.UDPConn) error                  { return nil }
+func setUDPSocketOptions4(conn *net.UDPConn) error                 { return nil }
+func setUDPSocketOptions6(conn *net.UDPConn) error                 { return nil }
+func getUDPSocketOptions6Only(conn *net.UDPConn) (bool, error)     { return false, nil }
diff --git a/vendor/github.com/miekg/dns/udp_windows.go b/vendor/github.com/miekg/dns/udp_windows.go
new file mode 100644
index 0000000000..51e532ac2a
--- /dev/null
+++ b/vendor/github.com/miekg/dns/udp_windows.go
@@ -0,0 +1,29 @@
+// +build windows
+
+package dns
+
+import "net"
+
+type SessionUDP struct {
+	raddr *net.UDPAddr
+}
+
+func (s *SessionUDP) RemoteAddr() net.Addr { return s.raddr }
+
+// ReadFromSessionUDP acts just like net.UDPConn.ReadFrom(), but returns a session object instead of a
+// net.UDPAddr.
+func ReadFromSessionUDP(conn *net.UDPConn, b []byte) (int, *SessionUDP, error) {
+	n, raddr, err := conn.ReadFrom(b)
+	if err != nil {
+		return n, nil, err
+	}
+	session := &SessionUDP{raddr.(*net.UDPAddr)}
+	return n, session, err
+}
+
+// WriteToSessionUDP acts just like net.UDPConn.WritetTo(), but uses a *SessionUDP instead of a net.Addr.
+func WriteToSessionUDP(conn *net.UDPConn, b []byte, session *SessionUDP) (int, error) {
+	n, err := conn.WriteTo(b, session.raddr)
+	return n, err
+}
+
diff --git a/vendor/github.com/miekg/dns/update.go b/vendor/github.com/miekg/dns/update.go
new file mode 100644
index 0000000000..e90c5c968e
--- /dev/null
+++ b/vendor/github.com/miekg/dns/update.go
@@ -0,0 +1,106 @@
+package dns
+
+// NameUsed sets the RRs in the prereq section to
+// "Name is in use" RRs. RFC 2136 section 2.4.4.
+func (u *Msg) NameUsed(rr []RR) {
+	if u.Answer == nil {
+		u.Answer = make([]RR, 0, len(rr))
+	}
+	for _, r := range rr {
+		u.Answer = append(u.Answer, &ANY{Hdr: RR_Header{Name: r.Header().Name, Ttl: 0, Rrtype: TypeANY, Class: ClassANY}})
+	}
+}
+
+// NameNotUsed sets the RRs in the prereq section to
+// "Name is in not use" RRs. RFC 2136 section 2.4.5.
+func (u *Msg) NameNotUsed(rr []RR) {
+	if u.Answer == nil {
+		u.Answer = make([]RR, 0, len(rr))
+	}
+	for _, r := range rr {
+		u.Answer = append(u.Answer, &ANY{Hdr: RR_Header{Name: r.Header().Name, Ttl: 0, Rrtype: TypeANY, Class: ClassNONE}})
+	}
+}
+
+// Used sets the RRs in the prereq section to
+// "RRset exists (value dependent -- with rdata)" RRs. RFC 2136 section 2.4.2.
+func (u *Msg) Used(rr []RR) {
+	if len(u.Question) == 0 {
+		panic("dns: empty question section")
+	}
+	if u.Answer == nil {
+		u.Answer = make([]RR, 0, len(rr))
+	}
+	for _, r := range rr {
+		r.Header().Class = u.Question[0].Qclass
+		u.Answer = append(u.Answer, r)
+	}
+}
+
+// RRsetUsed sets the RRs in the prereq section to
+// "RRset exists (value independent -- no rdata)" RRs. RFC 2136 section 2.4.1.
+func (u *Msg) RRsetUsed(rr []RR) {
+	if u.Answer == nil {
+		u.Answer = make([]RR, 0, len(rr))
+	}
+	for _, r := range rr {
+		u.Answer = append(u.Answer, &ANY{Hdr: RR_Header{Name: r.Header().Name, Ttl: 0, Rrtype: r.Header().Rrtype, Class: ClassANY}})
+	}
+}
+
+// RRsetNotUsed sets the RRs in the prereq section to
+// "RRset does not exist" RRs. RFC 2136 section 2.4.3.
+func (u *Msg) RRsetNotUsed(rr []RR) {
+	if u.Answer == nil {
+		u.Answer = make([]RR, 0, len(rr))
+	}
+	for _, r := range rr {
+		u.Answer = append(u.Answer, &ANY{Hdr: RR_Header{Name: r.Header().Name, Ttl: 0, Rrtype: r.Header().Rrtype, Class: ClassNONE}})
+	}
+}
+
+// Insert creates a dynamic update packet that adds an complete RRset, see RFC 2136 section 2.5.1.
+func (u *Msg) Insert(rr []RR) {
+	if len(u.Question) == 0 {
+		panic("dns: empty question section")
+	}
+	if u.Ns == nil {
+		u.Ns = make([]RR, 0, len(rr))
+	}
+	for _, r := range rr {
+		r.Header().Class = u.Question[0].Qclass
+		u.Ns = append(u.Ns, r)
+	}
+}
+
+// RemoveRRset creates a dynamic update packet that deletes an RRset, see RFC 2136 section 2.5.2.
+func (u *Msg) RemoveRRset(rr []RR) {
+	if u.Ns == nil {
+		u.Ns = make([]RR, 0, len(rr))
+	}
+	for _, r := range rr {
+		u.Ns = append(u.Ns, &ANY{Hdr: RR_Header{Name: r.Header().Name, Ttl: 0, Rrtype: r.Header().Rrtype, Class: ClassANY}})
+	}
+}
+
+// RemoveName creates a dynamic update packet that deletes all RRsets of a name, see RFC 2136 section 2.5.3
+func (u *Msg) RemoveName(rr []RR) {
+	if u.Ns == nil {
+		u.Ns = make([]RR, 0, len(rr))
+	}
+	for _, r := range rr {
+		u.Ns = append(u.Ns, &ANY{Hdr: RR_Header{Name: r.Header().Name, Ttl: 0, Rrtype: TypeANY, Class: ClassANY}})
+	}
+}
+
+// Remove creates a dynamic update packet deletes RR from a RRSset, see RFC 2136 section 2.5.4
+func (u *Msg) Remove(rr []RR) {
+	if u.Ns == nil {
+		u.Ns = make([]RR, 0, len(rr))
+	}
+	for _, r := range rr {
+		r.Header().Class = ClassNONE
+		r.Header().Ttl = 0
+		u.Ns = append(u.Ns, r)
+	}
+}
diff --git a/vendor/github.com/miekg/dns/update_test.go b/vendor/github.com/miekg/dns/update_test.go
new file mode 100644
index 0000000000..12760a1ee5
--- /dev/null
+++ b/vendor/github.com/miekg/dns/update_test.go
@@ -0,0 +1,145 @@
+package dns
+
+import (
+	"bytes"
+	"testing"
+)
+
+func TestDynamicUpdateParsing(t *testing.T) {
+	prefix := "example.com. IN "
+	for _, typ := range TypeToString {
+		if typ == "OPT" || typ == "AXFR" || typ == "IXFR" || typ == "ANY" || typ == "TKEY" ||
+			typ == "TSIG" || typ == "ISDN" || typ == "UNSPEC" || typ == "NULL" || typ == "ATMA" ||
+			typ == "Reserved" || typ == "None" || typ == "NXT" || typ == "MAILB" || typ == "MAILA" {
+			continue
+		}
+		r, err := NewRR(prefix + typ)
+		if err != nil {
+			t.Errorf("failure to parse: %s %s: %v", prefix, typ, err)
+		} else {
+			t.Logf("parsed: %s", r.String())
+		}
+	}
+}
+
+func TestDynamicUpdateUnpack(t *testing.T) {
+	// From https://github.com/miekg/dns/issues/150#issuecomment-62296803
+	// It should be an update message for the zone "example.",
+	// deleting the A RRset "example." and then adding an A record at "example.".
+	// class ANY, TYPE A
+	buf := []byte{171, 68, 40, 0, 0, 1, 0, 0, 0, 2, 0, 0, 7, 101, 120, 97, 109, 112, 108, 101, 0, 0, 6, 0, 1, 192, 12, 0, 1, 0, 255, 0, 0, 0, 0, 0, 0, 192, 12, 0, 1, 0, 1, 0, 0, 0, 0, 0, 4, 127, 0, 0, 1}
+	msg := new(Msg)
+	err := msg.Unpack(buf)
+	if err != nil {
+		t.Errorf("failed to unpack: %v\n%s", err, msg.String())
+	}
+}
+
+func TestDynamicUpdateZeroRdataUnpack(t *testing.T) {
+	m := new(Msg)
+	rr := &RR_Header{Name: ".", Rrtype: 0, Class: 1, Ttl: ^uint32(0), Rdlength: 0}
+	m.Answer = []RR{rr, rr, rr, rr, rr}
+	m.Ns = m.Answer
+	for n, s := range TypeToString {
+		rr.Rrtype = n
+		bytes, err := m.Pack()
+		if err != nil {
+			t.Errorf("failed to pack %s: %v", s, err)
+			continue
+		}
+		if err := new(Msg).Unpack(bytes); err != nil {
+			t.Errorf("failed to unpack %s: %v", s, err)
+		}
+	}
+}
+
+func TestRemoveRRset(t *testing.T) {
+	// Should add a zero data RR in Class ANY with a TTL of 0
+	// for each set mentioned in the RRs provided to it.
+	rr, err := NewRR(". 100 IN A 127.0.0.1")
+	if err != nil {
+		t.Fatalf("error constructing RR: %v", err)
+	}
+	m := new(Msg)
+	m.Ns = []RR{&RR_Header{Name: ".", Rrtype: TypeA, Class: ClassANY, Ttl: 0, Rdlength: 0}}
+	expectstr := m.String()
+	expect, err := m.Pack()
+	if err != nil {
+		t.Fatalf("error packing expected msg: %v", err)
+	}
+
+	m.Ns = nil
+	m.RemoveRRset([]RR{rr})
+	actual, err := m.Pack()
+	if err != nil {
+		t.Fatalf("error packing actual msg: %v", err)
+	}
+	if !bytes.Equal(actual, expect) {
+		tmp := new(Msg)
+		if err := tmp.Unpack(actual); err != nil {
+			t.Fatalf("error unpacking actual msg: %v\nexpected: %v\ngot: %v\n", err, expect, actual)
+		}
+		t.Errorf("expected msg:\n%s", expectstr)
+		t.Errorf("actual msg:\n%v", tmp)
+	}
+}
+
+func TestPreReqAndRemovals(t *testing.T) {
+	// Build a list of multiple prereqs and then somes removes followed by an insert.
+	// We should be able to add multiple prereqs and updates.
+	m := new(Msg)
+	m.SetUpdate("example.org.")
+	m.Id = 1234
+
+	// Use a full set of RRs each time, so we are sure the rdata is stripped.
+	rrName1, _ := NewRR("name_used. 3600 IN A 127.0.0.1")
+	rrName2, _ := NewRR("name_not_used. 3600 IN A 127.0.0.1")
+	rrRemove1, _ := NewRR("remove1. 3600 IN A 127.0.0.1")
+	rrRemove2, _ := NewRR("remove2. 3600 IN A 127.0.0.1")
+	rrRemove3, _ := NewRR("remove3. 3600 IN A 127.0.0.1")
+	rrInsert, _ := NewRR("insert. 3600 IN A 127.0.0.1")
+	rrRrset1, _ := NewRR("rrset_used1. 3600 IN A 127.0.0.1")
+	rrRrset2, _ := NewRR("rrset_used2. 3600 IN A 127.0.0.1")
+	rrRrset3, _ := NewRR("rrset_not_used. 3600 IN A 127.0.0.1")
+
+	// Handle the prereqs.
+	m.NameUsed([]RR{rrName1})
+	m.NameNotUsed([]RR{rrName2})
+	m.RRsetUsed([]RR{rrRrset1})
+	m.Used([]RR{rrRrset2})
+	m.RRsetNotUsed([]RR{rrRrset3})
+
+	// and now the updates.
+	m.RemoveName([]RR{rrRemove1})
+	m.RemoveRRset([]RR{rrRemove2})
+	m.Remove([]RR{rrRemove3})
+	m.Insert([]RR{rrInsert})
+
+	// This test function isn't a Example function because we print these RR with tabs at the
+	// end and the Example function trim these, thus they never match.
+	// TODO(miek): don't print these tabs and make this into an Example function.
+	expect := `;; opcode: UPDATE, status: NOERROR, id: 1234
+;; flags:; QUERY: 1, ANSWER: 5, AUTHORITY: 4, ADDITIONAL: 0
+
+;; QUESTION SECTION:
+;example.org.	IN	 SOA
+
+;; ANSWER SECTION:
+name_used.	0	ANY	ANY	
+name_not_used.	0	NONE	ANY	
+rrset_used1.	0	ANY	A	
+rrset_used2.	3600	IN	A	127.0.0.1
+rrset_not_used.	0	NONE	A	
+
+;; AUTHORITY SECTION:
+remove1.	0	ANY	ANY	
+remove2.	0	ANY	A	
+remove3.	0	NONE	A	127.0.0.1
+insert.	3600	IN	A	127.0.0.1
+`
+
+	if m.String() != expect {
+		t.Errorf("expected msg:\n%s", expect)
+		t.Errorf("actual msg:\n%v", m.String())
+	}
+}
diff --git a/vendor/github.com/miekg/dns/xfr.go b/vendor/github.com/miekg/dns/xfr.go
new file mode 100644
index 0000000000..7346deffbb
--- /dev/null
+++ b/vendor/github.com/miekg/dns/xfr.go
@@ -0,0 +1,244 @@
+package dns
+
+import (
+	"time"
+)
+
+// Envelope is used when doing a zone transfer with a remote server.
+type Envelope struct {
+	RR    []RR  // The set of RRs in the answer section of the xfr reply message.
+	Error error // If something went wrong, this contains the error.
+}
+
+// A Transfer defines parameters that are used during a zone transfer.
+type Transfer struct {
+	*Conn
+	DialTimeout    time.Duration     // net.DialTimeout, defaults to 2 seconds
+	ReadTimeout    time.Duration     // net.Conn.SetReadTimeout value for connections, defaults to 2 seconds
+	WriteTimeout   time.Duration     // net.Conn.SetWriteTimeout value for connections, defaults to 2 seconds
+	TsigSecret     map[string]string // Secret(s) for Tsig map[<zonename>]<base64 secret>, zonename must be fully qualified
+	tsigTimersOnly bool
+}
+
+// Think we need to away to stop the transfer
+
+// In performs an incoming transfer with the server in a.
+// If you would like to set the source IP, or some other attribute
+// of a Dialer for a Transfer, you can do so by specifying the attributes
+// in the Transfer.Conn:
+//
+//	d := net.Dialer{LocalAddr: transfer_source}
+//	con, err := d.Dial("tcp", master)
+//	dnscon := &dns.Conn{Conn:con}
+//	transfer = &dns.Transfer{Conn: dnscon}
+//	channel, err := transfer.In(message, master)
+//
+func (t *Transfer) In(q *Msg, a string) (env chan *Envelope, err error) {
+	timeout := dnsTimeout
+	if t.DialTimeout != 0 {
+		timeout = t.DialTimeout
+	}
+	if t.Conn == nil {
+		t.Conn, err = DialTimeout("tcp", a, timeout)
+		if err != nil {
+			return nil, err
+		}
+	}
+	if err := t.WriteMsg(q); err != nil {
+		return nil, err
+	}
+	env = make(chan *Envelope)
+	go func() {
+		if q.Question[0].Qtype == TypeAXFR {
+			go t.inAxfr(q.Id, env)
+			return
+		}
+		if q.Question[0].Qtype == TypeIXFR {
+			go t.inIxfr(q.Id, env)
+			return
+		}
+	}()
+	return env, nil
+}
+
+func (t *Transfer) inAxfr(id uint16, c chan *Envelope) {
+	first := true
+	defer t.Close()
+	defer close(c)
+	timeout := dnsTimeout
+	if t.ReadTimeout != 0 {
+		timeout = t.ReadTimeout
+	}
+	for {
+		t.Conn.SetReadDeadline(time.Now().Add(timeout))
+		in, err := t.ReadMsg()
+		if err != nil {
+			c <- &Envelope{nil, err}
+			return
+		}
+		if id != in.Id {
+			c <- &Envelope{in.Answer, ErrId}
+			return
+		}
+		if first {
+			if !isSOAFirst(in) {
+				c <- &Envelope{in.Answer, ErrSoa}
+				return
+			}
+			first = !first
+			// only one answer that is SOA, receive more
+			if len(in.Answer) == 1 {
+				t.tsigTimersOnly = true
+				c <- &Envelope{in.Answer, nil}
+				continue
+			}
+		}
+
+		if !first {
+			t.tsigTimersOnly = true // Subsequent envelopes use this.
+			if isSOALast(in) {
+				c <- &Envelope{in.Answer, nil}
+				return
+			}
+			c <- &Envelope{in.Answer, nil}
+		}
+	}
+}
+
+func (t *Transfer) inIxfr(id uint16, c chan *Envelope) {
+	serial := uint32(0) // The first serial seen is the current server serial
+	first := true
+	defer t.Close()
+	defer close(c)
+	timeout := dnsTimeout
+	if t.ReadTimeout != 0 {
+		timeout = t.ReadTimeout
+	}
+	for {
+		t.SetReadDeadline(time.Now().Add(timeout))
+		in, err := t.ReadMsg()
+		if err != nil {
+			c <- &Envelope{nil, err}
+			return
+		}
+		if id != in.Id {
+			c <- &Envelope{in.Answer, ErrId}
+			return
+		}
+		if first {
+			// A single SOA RR signals "no changes"
+			if len(in.Answer) == 1 && isSOAFirst(in) {
+				c <- &Envelope{in.Answer, nil}
+				return
+			}
+
+			// Check if the returned answer is ok
+			if !isSOAFirst(in) {
+				c <- &Envelope{in.Answer, ErrSoa}
+				return
+			}
+			// This serial is important
+			serial = in.Answer[0].(*SOA).Serial
+			first = !first
+		}
+
+		// Now we need to check each message for SOA records, to see what we need to do
+		if !first {
+			t.tsigTimersOnly = true
+			// If the last record in the IXFR contains the servers' SOA,  we should quit
+			if v, ok := in.Answer[len(in.Answer)-1].(*SOA); ok {
+				if v.Serial == serial {
+					c <- &Envelope{in.Answer, nil}
+					return
+				}
+			}
+			c <- &Envelope{in.Answer, nil}
+		}
+	}
+}
+
+// Out performs an outgoing transfer with the client connecting in w.
+// Basic use pattern:
+//
+//	ch := make(chan *dns.Envelope)
+//	tr := new(dns.Transfer)
+//	go tr.Out(w, r, ch)
+//	ch <- &dns.Envelope{RR: []dns.RR{soa, rr1, rr2, rr3, soa}}
+//	close(ch)
+//	w.Hijack()
+//	// w.Close() // Client closes connection
+//
+// The server is responsible for sending the correct sequence of RRs through the
+// channel ch.
+func (t *Transfer) Out(w ResponseWriter, q *Msg, ch chan *Envelope) error {
+	for x := range ch {
+		r := new(Msg)
+		// Compress?
+		r.SetReply(q)
+		r.Authoritative = true
+		// assume it fits TODO(miek): fix
+		r.Answer = append(r.Answer, x.RR...)
+		if err := w.WriteMsg(r); err != nil {
+			return err
+		}
+	}
+	w.TsigTimersOnly(true)
+	return nil
+}
+
+// ReadMsg reads a message from the transfer connection t.
+func (t *Transfer) ReadMsg() (*Msg, error) {
+	m := new(Msg)
+	p := make([]byte, MaxMsgSize)
+	n, err := t.Read(p)
+	if err != nil && n == 0 {
+		return nil, err
+	}
+	p = p[:n]
+	if err := m.Unpack(p); err != nil {
+		return nil, err
+	}
+	if ts := m.IsTsig(); ts != nil && t.TsigSecret != nil {
+		if _, ok := t.TsigSecret[ts.Hdr.Name]; !ok {
+			return m, ErrSecret
+		}
+		// Need to work on the original message p, as that was used to calculate the tsig.
+		err = TsigVerify(p, t.TsigSecret[ts.Hdr.Name], t.tsigRequestMAC, t.tsigTimersOnly)
+		t.tsigRequestMAC = ts.MAC
+	}
+	return m, err
+}
+
+// WriteMsg writes a message through the transfer connection t.
+func (t *Transfer) WriteMsg(m *Msg) (err error) {
+	var out []byte
+	if ts := m.IsTsig(); ts != nil && t.TsigSecret != nil {
+		if _, ok := t.TsigSecret[ts.Hdr.Name]; !ok {
+			return ErrSecret
+		}
+		out, t.tsigRequestMAC, err = TsigGenerate(m, t.TsigSecret[ts.Hdr.Name], t.tsigRequestMAC, t.tsigTimersOnly)
+	} else {
+		out, err = m.Pack()
+	}
+	if err != nil {
+		return err
+	}
+	if _, err = t.Write(out); err != nil {
+		return err
+	}
+	return nil
+}
+
+func isSOAFirst(in *Msg) bool {
+	if len(in.Answer) > 0 {
+		return in.Answer[0].Header().Rrtype == TypeSOA
+	}
+	return false
+}
+
+func isSOALast(in *Msg) bool {
+	if len(in.Answer) > 0 {
+		return in.Answer[len(in.Answer)-1].Header().Rrtype == TypeSOA
+	}
+	return false
+}
diff --git a/vendor/github.com/miekg/dns/xfr_test.go b/vendor/github.com/miekg/dns/xfr_test.go
new file mode 100644
index 0000000000..1337eec654
--- /dev/null
+++ b/vendor/github.com/miekg/dns/xfr_test.go
@@ -0,0 +1,161 @@
+// +build net
+
+package dns
+
+import (
+	"net"
+	"testing"
+	"time"
+)
+
+func getIP(s string) string {
+	a, err := net.LookupAddr(s)
+	if err != nil {
+		return ""
+	}
+	return a[0]
+}
+
+// flaky, need to setup local server and test from
+// that.
+func TestAXFR_Miek(t *testing.T) {
+	// This test runs against a server maintained by Miek
+	if testing.Short() {
+		return
+	}
+	m := new(Msg)
+	m.SetAxfr("miek.nl.")
+
+	server := getIP("linode.atoom.net")
+
+	tr := new(Transfer)
+
+	if a, err := tr.In(m, net.JoinHostPort(server, "53")); err != nil {
+		t.Fatal("failed to setup axfr: ", err)
+	} else {
+		for ex := range a {
+			if ex.Error != nil {
+				t.Errorf("error %v", ex.Error)
+				break
+			}
+			for _, rr := range ex.RR {
+				t.Log(rr.String())
+			}
+		}
+	}
+}
+
+// fails.
+func TestAXFR_NLNL_MultipleEnvelopes(t *testing.T) {
+	// This test runs against a server maintained by NLnet Labs
+	if testing.Short() {
+		return
+	}
+	m := new(Msg)
+	m.SetAxfr("nlnetlabs.nl.")
+
+	server := getIP("open.nlnetlabs.nl.")
+
+	tr := new(Transfer)
+	if a, err := tr.In(m, net.JoinHostPort(server, "53")); err != nil {
+		t.Fatalf("failed to setup axfr %v for server: %v", err, server)
+	} else {
+		for ex := range a {
+			if ex.Error != nil {
+				t.Errorf("error %v", ex.Error)
+				break
+			}
+		}
+	}
+}
+
+func TestAXFR_Miek_Tsig(t *testing.T) {
+	// This test runs against a server maintained by Miek
+	if testing.Short() {
+		return
+	}
+	m := new(Msg)
+	m.SetAxfr("example.nl.")
+	m.SetTsig("axfr.", HmacMD5, 300, time.Now().Unix())
+
+	tr := new(Transfer)
+	tr.TsigSecret = map[string]string{"axfr.": "so6ZGir4GPAqINNh9U5c3A=="}
+
+	if a, err := tr.In(m, "176.58.119.54:53"); err != nil {
+		t.Fatal("failed to setup axfr: ", err)
+	} else {
+		for ex := range a {
+			if ex.Error != nil {
+				t.Errorf("error %v", ex.Error)
+				break
+			}
+			for _, rr := range ex.RR {
+				t.Log(rr.String())
+			}
+		}
+	}
+}
+
+func TestAXFR_SIDN_NSD3_NONE(t *testing.T)   { testAXFRSIDN(t, "nsd", "") }
+func TestAXFR_SIDN_NSD3_MD5(t *testing.T)    { testAXFRSIDN(t, "nsd", HmacMD5) }
+func TestAXFR_SIDN_NSD3_SHA1(t *testing.T)   { testAXFRSIDN(t, "nsd", HmacSHA1) }
+func TestAXFR_SIDN_NSD3_SHA256(t *testing.T) { testAXFRSIDN(t, "nsd", HmacSHA256) }
+
+func TestAXFR_SIDN_NSD4_NONE(t *testing.T)   { testAXFRSIDN(t, "nsd4", "") }
+func TestAXFR_SIDN_NSD4_MD5(t *testing.T)    { testAXFRSIDN(t, "nsd4", HmacMD5) }
+func TestAXFR_SIDN_NSD4_SHA1(t *testing.T)   { testAXFRSIDN(t, "nsd4", HmacSHA1) }
+func TestAXFR_SIDN_NSD4_SHA256(t *testing.T) { testAXFRSIDN(t, "nsd4", HmacSHA256) }
+
+func TestAXFR_SIDN_BIND9_NONE(t *testing.T)   { testAXFRSIDN(t, "bind9", "") }
+func TestAXFR_SIDN_BIND9_MD5(t *testing.T)    { testAXFRSIDN(t, "bind9", HmacMD5) }
+func TestAXFR_SIDN_BIND9_SHA1(t *testing.T)   { testAXFRSIDN(t, "bind9", HmacSHA1) }
+func TestAXFR_SIDN_BIND9_SHA256(t *testing.T) { testAXFRSIDN(t, "bind9", HmacSHA256) }
+
+func TestAXFR_SIDN_KNOT_NONE(t *testing.T)   { testAXFRSIDN(t, "knot", "") }
+func TestAXFR_SIDN_KNOT_MD5(t *testing.T)    { testAXFRSIDN(t, "knot", HmacMD5) }
+func TestAXFR_SIDN_KNOT_SHA1(t *testing.T)   { testAXFRSIDN(t, "knot", HmacSHA1) }
+func TestAXFR_SIDN_KNOT_SHA256(t *testing.T) { testAXFRSIDN(t, "knot", HmacSHA256) }
+
+func TestAXFR_SIDN_POWERDNS_NONE(t *testing.T)   { testAXFRSIDN(t, "powerdns", "") }
+func TestAXFR_SIDN_POWERDNS_MD5(t *testing.T)    { testAXFRSIDN(t, "powerdns", HmacMD5) }
+func TestAXFR_SIDN_POWERDNS_SHA1(t *testing.T)   { testAXFRSIDN(t, "powerdns", HmacSHA1) }
+func TestAXFR_SIDN_POWERDNS_SHA256(t *testing.T) { testAXFRSIDN(t, "powerdns", HmacSHA256) }
+
+func TestAXFR_SIDN_YADIFA_NONE(t *testing.T)   { testAXFRSIDN(t, "yadifa", "") }
+func TestAXFR_SIDN_YADIFA_MD5(t *testing.T)    { testAXFRSIDN(t, "yadifa", HmacMD5) }
+func TestAXFR_SIDN_YADIFA_SHA1(t *testing.T)   { testAXFRSIDN(t, "yadifa", HmacSHA1) }
+func TestAXFR_SIDN_YADIFA_SHA256(t *testing.T) { testAXFRSIDN(t, "yadifa", HmacSHA256) }
+
+func testAXFRSIDN(t *testing.T, host, alg string) {
+	// This tests run against a server maintained by SIDN labs, see:
+	// https://workbench.sidnlabs.nl/
+	if testing.Short() {
+		return
+	}
+	x := new(Transfer)
+	x.TsigSecret = map[string]string{
+		"wb_md5.":          "Wu/utSasZUkoeCNku152Zw==",
+		"wb_sha1_longkey.": "uhMpEhPq/RAD9Bt4mqhfmi+7ZdKmjLQb/lcrqYPXR4s/nnbsqw==",
+		"wb_sha256.":       "npfrIJjt/MJOjGJoBNZtsjftKMhkSpIYMv2RzRZt1f8=",
+	}
+	keyname := map[string]string{
+		HmacMD5:    "wb_md5.",
+		HmacSHA1:   "wb_sha1_longkey.",
+		HmacSHA256: "wb_sha256.",
+	}[alg]
+
+	m := new(Msg)
+	m.SetAxfr("types.wb.sidnlabs.nl.")
+	if keyname != "" {
+		m.SetTsig(keyname, alg, 300, time.Now().Unix())
+	}
+	c, err := x.In(m, host+".sidnlabs.nl:53")
+	if err != nil {
+		t.Fatal(err)
+	}
+	for e := range c {
+		if e.Error != nil {
+			t.Fatal(e.Error)
+		}
+	}
+}
diff --git a/vendor/github.com/miekg/dns/zcompress.go b/vendor/github.com/miekg/dns/zcompress.go
new file mode 100644
index 0000000000..86a31a9168
--- /dev/null
+++ b/vendor/github.com/miekg/dns/zcompress.go
@@ -0,0 +1,119 @@
+// *** DO NOT MODIFY ***
+// AUTOGENERATED BY go generate from compress_generate.go
+
+package dns
+
+func compressionLenHelperType(c map[string]int, r RR) {
+	switch x := r.(type) {
+	case *KX:
+		compressionLenHelper(c, x.Exchanger)
+	case *MX:
+		compressionLenHelper(c, x.Mx)
+	case *NSEC:
+		compressionLenHelper(c, x.NextDomain)
+	case *DNAME:
+		compressionLenHelper(c, x.Target)
+	case *HIP:
+		for i := range x.RendezvousServers {
+			compressionLenHelper(c, x.RendezvousServers[i])
+		}
+	case *CNAME:
+		compressionLenHelper(c, x.Target)
+	case *MR:
+		compressionLenHelper(c, x.Mr)
+	case *PX:
+		compressionLenHelper(c, x.Map822)
+		compressionLenHelper(c, x.Mapx400)
+	case *SIG:
+		compressionLenHelper(c, x.SignerName)
+	case *SRV:
+		compressionLenHelper(c, x.Target)
+	case *TALINK:
+		compressionLenHelper(c, x.PreviousName)
+		compressionLenHelper(c, x.NextName)
+	case *LP:
+		compressionLenHelper(c, x.Fqdn)
+	case *NAPTR:
+		compressionLenHelper(c, x.Replacement)
+	case *NS:
+		compressionLenHelper(c, x.Ns)
+	case *RP:
+		compressionLenHelper(c, x.Mbox)
+		compressionLenHelper(c, x.Txt)
+	case *RRSIG:
+		compressionLenHelper(c, x.SignerName)
+	case *TKEY:
+		compressionLenHelper(c, x.Algorithm)
+	case *TSIG:
+		compressionLenHelper(c, x.Algorithm)
+	case *AFSDB:
+		compressionLenHelper(c, x.Hostname)
+	case *MF:
+		compressionLenHelper(c, x.Mf)
+	case *RT:
+		compressionLenHelper(c, x.Host)
+	case *MINFO:
+		compressionLenHelper(c, x.Rmail)
+		compressionLenHelper(c, x.Email)
+	case *PTR:
+		compressionLenHelper(c, x.Ptr)
+	case *SOA:
+		compressionLenHelper(c, x.Ns)
+		compressionLenHelper(c, x.Mbox)
+	case *MD:
+		compressionLenHelper(c, x.Md)
+	case *NSAPPTR:
+		compressionLenHelper(c, x.Ptr)
+	case *MG:
+		compressionLenHelper(c, x.Mg)
+	case *MB:
+		compressionLenHelper(c, x.Mb)
+	}
+}
+
+func compressionLenSearchType(c map[string]int, r RR) (int, bool) {
+	switch x := r.(type) {
+	case *MF:
+		k1, ok1 := compressionLenSearch(c, x.Mf)
+		return k1, ok1
+	case *MG:
+		k1, ok1 := compressionLenSearch(c, x.Mg)
+		return k1, ok1
+	case *MINFO:
+		k1, ok1 := compressionLenSearch(c, x.Rmail)
+		k2, ok2 := compressionLenSearch(c, x.Email)
+		return k1 + k2, ok1 && ok2
+	case *MR:
+		k1, ok1 := compressionLenSearch(c, x.Mr)
+		return k1, ok1
+	case *PTR:
+		k1, ok1 := compressionLenSearch(c, x.Ptr)
+		return k1, ok1
+	case *AFSDB:
+		k1, ok1 := compressionLenSearch(c, x.Hostname)
+		return k1, ok1
+	case *CNAME:
+		k1, ok1 := compressionLenSearch(c, x.Target)
+		return k1, ok1
+	case *MD:
+		k1, ok1 := compressionLenSearch(c, x.Md)
+		return k1, ok1
+	case *RT:
+		k1, ok1 := compressionLenSearch(c, x.Host)
+		return k1, ok1
+	case *SOA:
+		k1, ok1 := compressionLenSearch(c, x.Ns)
+		k2, ok2 := compressionLenSearch(c, x.Mbox)
+		return k1 + k2, ok1 && ok2
+	case *MB:
+		k1, ok1 := compressionLenSearch(c, x.Mb)
+		return k1, ok1
+	case *MX:
+		k1, ok1 := compressionLenSearch(c, x.Mx)
+		return k1, ok1
+	case *NS:
+		k1, ok1 := compressionLenSearch(c, x.Ns)
+		return k1, ok1
+	}
+	return 0, false
+}
diff --git a/vendor/github.com/miekg/dns/zmsg.go b/vendor/github.com/miekg/dns/zmsg.go
new file mode 100644
index 0000000000..94627e35e3
--- /dev/null
+++ b/vendor/github.com/miekg/dns/zmsg.go
@@ -0,0 +1,3529 @@
+// *** DO NOT MODIFY ***
+// AUTOGENERATED BY go generate from msg_generate.go
+
+package dns
+
+// pack*() functions
+
+func (rr *A) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packDataA(rr.A, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *AAAA) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packDataAAAA(rr.AAAA, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *AFSDB) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.Subtype, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = PackDomainName(rr.Hostname, msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *ANY) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *CAA) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint8(rr.Flag, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packString(rr.Tag, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringOctet(rr.Value, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *CDNSKEY) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.Flags, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Protocol, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Algorithm, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringBase64(rr.PublicKey, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *CDS) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.KeyTag, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Algorithm, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.DigestType, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringHex(rr.Digest, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *CERT) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.Type, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(rr.KeyTag, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Algorithm, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringBase64(rr.Certificate, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *CNAME) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = PackDomainName(rr.Target, msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *DHCID) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packStringBase64(rr.Digest, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *DLV) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.KeyTag, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Algorithm, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.DigestType, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringHex(rr.Digest, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *DNAME) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = PackDomainName(rr.Target, msg, off, compression, false)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *DNSKEY) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.Flags, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Protocol, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Algorithm, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringBase64(rr.PublicKey, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *DS) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.KeyTag, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Algorithm, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.DigestType, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringHex(rr.Digest, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *EID) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packStringHex(rr.Endpoint, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *EUI48) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint48(rr.Address, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *EUI64) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint64(rr.Address, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *GID) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint32(rr.Gid, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *GPOS) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packString(rr.Longitude, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packString(rr.Latitude, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packString(rr.Altitude, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *HINFO) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packString(rr.Cpu, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packString(rr.Os, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *HIP) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint8(rr.HitLength, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.PublicKeyAlgorithm, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(rr.PublicKeyLength, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringHex(rr.Hit, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringBase64(rr.PublicKey, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packDataDomainNames(rr.RendezvousServers, msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *KEY) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.Flags, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Protocol, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Algorithm, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringBase64(rr.PublicKey, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *KX) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.Preference, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = PackDomainName(rr.Exchanger, msg, off, compression, false)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *L32) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.Preference, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packDataA(rr.Locator32, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *L64) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.Preference, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint64(rr.Locator64, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *LOC) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint8(rr.Version, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Size, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.HorizPre, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.VertPre, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint32(rr.Latitude, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint32(rr.Longitude, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint32(rr.Altitude, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *LP) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.Preference, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = PackDomainName(rr.Fqdn, msg, off, compression, false)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *MB) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = PackDomainName(rr.Mb, msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *MD) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = PackDomainName(rr.Md, msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *MF) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = PackDomainName(rr.Mf, msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *MG) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = PackDomainName(rr.Mg, msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *MINFO) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = PackDomainName(rr.Rmail, msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	off, err = PackDomainName(rr.Email, msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *MR) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = PackDomainName(rr.Mr, msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *MX) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.Preference, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = PackDomainName(rr.Mx, msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *NAPTR) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.Order, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(rr.Preference, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packString(rr.Flags, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packString(rr.Service, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packString(rr.Regexp, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = PackDomainName(rr.Replacement, msg, off, compression, false)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *NID) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.Preference, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint64(rr.NodeID, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *NIMLOC) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packStringHex(rr.Locator, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *NINFO) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packStringTxt(rr.ZSData, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *NS) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = PackDomainName(rr.Ns, msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *NSAPPTR) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = PackDomainName(rr.Ptr, msg, off, compression, false)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *NSEC) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = PackDomainName(rr.NextDomain, msg, off, compression, false)
+	if err != nil {
+		return off, err
+	}
+	off, err = packDataNsec(rr.TypeBitMap, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *NSEC3) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint8(rr.Hash, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Flags, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(rr.Iterations, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.SaltLength, msg, off)
+	if err != nil {
+		return off, err
+	}
+	if rr.Salt == "-" { /* do nothing, empty salt */
+	}
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.HashLength, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringBase32(rr.NextDomain, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packDataNsec(rr.TypeBitMap, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *NSEC3PARAM) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint8(rr.Hash, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Flags, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(rr.Iterations, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.SaltLength, msg, off)
+	if err != nil {
+		return off, err
+	}
+	if rr.Salt == "-" { /* do nothing, empty salt */
+	}
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *OPENPGPKEY) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packStringBase64(rr.PublicKey, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *OPT) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packDataOpt(rr.Option, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *PTR) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = PackDomainName(rr.Ptr, msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *PX) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.Preference, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = PackDomainName(rr.Map822, msg, off, compression, false)
+	if err != nil {
+		return off, err
+	}
+	off, err = PackDomainName(rr.Mapx400, msg, off, compression, false)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *RFC3597) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packStringHex(rr.Rdata, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *RKEY) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.Flags, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Protocol, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Algorithm, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringBase64(rr.PublicKey, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *RP) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = PackDomainName(rr.Mbox, msg, off, compression, false)
+	if err != nil {
+		return off, err
+	}
+	off, err = PackDomainName(rr.Txt, msg, off, compression, false)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *RRSIG) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.TypeCovered, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Algorithm, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Labels, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint32(rr.OrigTtl, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint32(rr.Expiration, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint32(rr.Inception, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(rr.KeyTag, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = PackDomainName(rr.SignerName, msg, off, compression, false)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringBase64(rr.Signature, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *RT) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.Preference, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = PackDomainName(rr.Host, msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *SIG) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.TypeCovered, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Algorithm, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Labels, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint32(rr.OrigTtl, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint32(rr.Expiration, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint32(rr.Inception, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(rr.KeyTag, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = PackDomainName(rr.SignerName, msg, off, compression, false)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringBase64(rr.Signature, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *SMIMEA) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint8(rr.Usage, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Selector, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.MatchingType, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringHex(rr.Certificate, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *SOA) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = PackDomainName(rr.Ns, msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	off, err = PackDomainName(rr.Mbox, msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint32(rr.Serial, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint32(rr.Refresh, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint32(rr.Retry, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint32(rr.Expire, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint32(rr.Minttl, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *SPF) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packStringTxt(rr.Txt, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *SRV) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.Priority, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(rr.Weight, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(rr.Port, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = PackDomainName(rr.Target, msg, off, compression, false)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *SSHFP) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint8(rr.Algorithm, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Type, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringHex(rr.FingerPrint, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *TA) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.KeyTag, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Algorithm, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.DigestType, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringHex(rr.Digest, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *TALINK) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = PackDomainName(rr.PreviousName, msg, off, compression, false)
+	if err != nil {
+		return off, err
+	}
+	off, err = PackDomainName(rr.NextName, msg, off, compression, false)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *TKEY) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = PackDomainName(rr.Algorithm, msg, off, compression, false)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint32(rr.Inception, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint32(rr.Expiration, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(rr.Mode, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(rr.Error, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(rr.KeySize, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packString(rr.Key, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(rr.OtherLen, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packString(rr.OtherData, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *TLSA) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint8(rr.Usage, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.Selector, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint8(rr.MatchingType, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringHex(rr.Certificate, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *TSIG) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = PackDomainName(rr.Algorithm, msg, off, compression, false)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint48(rr.TimeSigned, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(rr.Fudge, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(rr.MACSize, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringHex(rr.MAC, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(rr.OrigId, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(rr.Error, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(rr.OtherLen, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringHex(rr.OtherData, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *TXT) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packStringTxt(rr.Txt, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *UID) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint32(rr.Uid, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *UINFO) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packString(rr.Uinfo, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *URI) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packUint16(rr.Priority, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packUint16(rr.Weight, msg, off)
+	if err != nil {
+		return off, err
+	}
+	off, err = packStringOctet(rr.Target, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+func (rr *X25) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+	off, err := rr.Hdr.pack(msg, off, compression, compress)
+	if err != nil {
+		return off, err
+	}
+	headerEnd := off
+	off, err = packString(rr.PSDNAddress, msg, off)
+	if err != nil {
+		return off, err
+	}
+	rr.Header().Rdlength = uint16(off - headerEnd)
+	return off, nil
+}
+
+// unpack*() functions
+
+func unpackA(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(A)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.A, off, err = unpackDataA(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackAAAA(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(AAAA)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.AAAA, off, err = unpackDataAAAA(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackAFSDB(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(AFSDB)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Subtype, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Hostname, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackANY(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(ANY)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	return rr, off, err
+}
+
+func unpackCAA(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(CAA)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Flag, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Tag, off, err = unpackString(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Value, off, err = unpackStringOctet(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackCDNSKEY(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(CDNSKEY)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Flags, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Protocol, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Algorithm, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.PublicKey, off, err = unpackStringBase64(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackCDS(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(CDS)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.KeyTag, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Algorithm, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.DigestType, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Digest, off, err = unpackStringHex(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackCERT(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(CERT)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Type, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.KeyTag, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Algorithm, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Certificate, off, err = unpackStringBase64(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackCNAME(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(CNAME)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Target, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackDHCID(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(DHCID)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Digest, off, err = unpackStringBase64(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackDLV(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(DLV)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.KeyTag, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Algorithm, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.DigestType, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Digest, off, err = unpackStringHex(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackDNAME(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(DNAME)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Target, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackDNSKEY(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(DNSKEY)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Flags, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Protocol, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Algorithm, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.PublicKey, off, err = unpackStringBase64(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackDS(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(DS)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.KeyTag, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Algorithm, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.DigestType, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Digest, off, err = unpackStringHex(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackEID(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(EID)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Endpoint, off, err = unpackStringHex(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackEUI48(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(EUI48)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Address, off, err = unpackUint48(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackEUI64(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(EUI64)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Address, off, err = unpackUint64(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackGID(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(GID)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Gid, off, err = unpackUint32(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackGPOS(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(GPOS)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Longitude, off, err = unpackString(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Latitude, off, err = unpackString(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Altitude, off, err = unpackString(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackHINFO(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(HINFO)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Cpu, off, err = unpackString(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Os, off, err = unpackString(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackHIP(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(HIP)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.HitLength, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.PublicKeyAlgorithm, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.PublicKeyLength, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Hit, off, err = unpackStringHex(msg, off, off+int(rr.HitLength))
+	if err != nil {
+		return rr, off, err
+	}
+	rr.PublicKey, off, err = unpackStringBase64(msg, off, off+int(rr.PublicKeyLength))
+	if err != nil {
+		return rr, off, err
+	}
+	rr.RendezvousServers, off, err = unpackDataDomainNames(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackKEY(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(KEY)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Flags, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Protocol, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Algorithm, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.PublicKey, off, err = unpackStringBase64(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackKX(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(KX)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Preference, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Exchanger, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackL32(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(L32)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Preference, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Locator32, off, err = unpackDataA(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackL64(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(L64)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Preference, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Locator64, off, err = unpackUint64(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackLOC(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(LOC)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Version, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Size, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.HorizPre, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.VertPre, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Latitude, off, err = unpackUint32(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Longitude, off, err = unpackUint32(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Altitude, off, err = unpackUint32(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackLP(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(LP)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Preference, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Fqdn, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackMB(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(MB)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Mb, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackMD(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(MD)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Md, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackMF(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(MF)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Mf, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackMG(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(MG)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Mg, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackMINFO(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(MINFO)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Rmail, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Email, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackMR(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(MR)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Mr, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackMX(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(MX)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Preference, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Mx, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackNAPTR(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(NAPTR)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Order, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Preference, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Flags, off, err = unpackString(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Service, off, err = unpackString(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Regexp, off, err = unpackString(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Replacement, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackNID(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(NID)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Preference, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.NodeID, off, err = unpackUint64(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackNIMLOC(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(NIMLOC)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Locator, off, err = unpackStringHex(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackNINFO(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(NINFO)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.ZSData, off, err = unpackStringTxt(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackNS(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(NS)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Ns, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackNSAPPTR(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(NSAPPTR)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Ptr, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackNSEC(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(NSEC)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.NextDomain, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.TypeBitMap, off, err = unpackDataNsec(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackNSEC3(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(NSEC3)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Hash, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Flags, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Iterations, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.SaltLength, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Salt, off, err = unpackStringHex(msg, off, off+int(rr.SaltLength))
+	if err != nil {
+		return rr, off, err
+	}
+	rr.HashLength, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.NextDomain, off, err = unpackStringBase32(msg, off, off+int(rr.HashLength))
+	if err != nil {
+		return rr, off, err
+	}
+	rr.TypeBitMap, off, err = unpackDataNsec(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackNSEC3PARAM(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(NSEC3PARAM)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Hash, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Flags, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Iterations, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.SaltLength, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Salt, off, err = unpackStringHex(msg, off, off+int(rr.SaltLength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackOPENPGPKEY(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(OPENPGPKEY)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.PublicKey, off, err = unpackStringBase64(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackOPT(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(OPT)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Option, off, err = unpackDataOpt(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackPTR(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(PTR)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Ptr, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackPX(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(PX)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Preference, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Map822, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Mapx400, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackRFC3597(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(RFC3597)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Rdata, off, err = unpackStringHex(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackRKEY(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(RKEY)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Flags, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Protocol, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Algorithm, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.PublicKey, off, err = unpackStringBase64(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackRP(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(RP)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Mbox, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Txt, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackRRSIG(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(RRSIG)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.TypeCovered, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Algorithm, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Labels, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.OrigTtl, off, err = unpackUint32(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Expiration, off, err = unpackUint32(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Inception, off, err = unpackUint32(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.KeyTag, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.SignerName, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Signature, off, err = unpackStringBase64(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackRT(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(RT)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Preference, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Host, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackSIG(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(SIG)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.TypeCovered, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Algorithm, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Labels, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.OrigTtl, off, err = unpackUint32(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Expiration, off, err = unpackUint32(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Inception, off, err = unpackUint32(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.KeyTag, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.SignerName, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Signature, off, err = unpackStringBase64(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackSMIMEA(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(SMIMEA)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Usage, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Selector, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.MatchingType, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Certificate, off, err = unpackStringHex(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackSOA(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(SOA)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Ns, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Mbox, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Serial, off, err = unpackUint32(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Refresh, off, err = unpackUint32(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Retry, off, err = unpackUint32(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Expire, off, err = unpackUint32(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Minttl, off, err = unpackUint32(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackSPF(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(SPF)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Txt, off, err = unpackStringTxt(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackSRV(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(SRV)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Priority, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Weight, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Port, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Target, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackSSHFP(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(SSHFP)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Algorithm, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Type, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.FingerPrint, off, err = unpackStringHex(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackTA(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(TA)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.KeyTag, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Algorithm, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.DigestType, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Digest, off, err = unpackStringHex(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackTALINK(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(TALINK)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.PreviousName, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.NextName, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackTKEY(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(TKEY)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Algorithm, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Inception, off, err = unpackUint32(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Expiration, off, err = unpackUint32(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Mode, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Error, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.KeySize, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Key, off, err = unpackString(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.OtherLen, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.OtherData, off, err = unpackString(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackTLSA(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(TLSA)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Usage, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Selector, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.MatchingType, off, err = unpackUint8(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Certificate, off, err = unpackStringHex(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackTSIG(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(TSIG)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Algorithm, off, err = UnpackDomainName(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.TimeSigned, off, err = unpackUint48(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Fudge, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.MACSize, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.MAC, off, err = unpackStringHex(msg, off, off+int(rr.MACSize))
+	if err != nil {
+		return rr, off, err
+	}
+	rr.OrigId, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Error, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.OtherLen, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.OtherData, off, err = unpackStringHex(msg, off, off+int(rr.OtherLen))
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackTXT(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(TXT)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Txt, off, err = unpackStringTxt(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackUID(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(UID)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Uid, off, err = unpackUint32(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackUINFO(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(UINFO)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Uinfo, off, err = unpackString(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackURI(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(URI)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.Priority, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Weight, off, err = unpackUint16(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	if off == len(msg) {
+		return rr, off, nil
+	}
+	rr.Target, off, err = unpackStringOctet(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+func unpackX25(h RR_Header, msg []byte, off int) (RR, int, error) {
+	rr := new(X25)
+	rr.Hdr = h
+	if noRdata(h) {
+		return rr, off, nil
+	}
+	var err error
+	rdStart := off
+	_ = rdStart
+
+	rr.PSDNAddress, off, err = unpackString(msg, off)
+	if err != nil {
+		return rr, off, err
+	}
+	return rr, off, err
+}
+
+var typeToUnpack = map[uint16]func(RR_Header, []byte, int) (RR, int, error){
+	TypeA:          unpackA,
+	TypeAAAA:       unpackAAAA,
+	TypeAFSDB:      unpackAFSDB,
+	TypeANY:        unpackANY,
+	TypeCAA:        unpackCAA,
+	TypeCDNSKEY:    unpackCDNSKEY,
+	TypeCDS:        unpackCDS,
+	TypeCERT:       unpackCERT,
+	TypeCNAME:      unpackCNAME,
+	TypeDHCID:      unpackDHCID,
+	TypeDLV:        unpackDLV,
+	TypeDNAME:      unpackDNAME,
+	TypeDNSKEY:     unpackDNSKEY,
+	TypeDS:         unpackDS,
+	TypeEID:        unpackEID,
+	TypeEUI48:      unpackEUI48,
+	TypeEUI64:      unpackEUI64,
+	TypeGID:        unpackGID,
+	TypeGPOS:       unpackGPOS,
+	TypeHINFO:      unpackHINFO,
+	TypeHIP:        unpackHIP,
+	TypeKEY:        unpackKEY,
+	TypeKX:         unpackKX,
+	TypeL32:        unpackL32,
+	TypeL64:        unpackL64,
+	TypeLOC:        unpackLOC,
+	TypeLP:         unpackLP,
+	TypeMB:         unpackMB,
+	TypeMD:         unpackMD,
+	TypeMF:         unpackMF,
+	TypeMG:         unpackMG,
+	TypeMINFO:      unpackMINFO,
+	TypeMR:         unpackMR,
+	TypeMX:         unpackMX,
+	TypeNAPTR:      unpackNAPTR,
+	TypeNID:        unpackNID,
+	TypeNIMLOC:     unpackNIMLOC,
+	TypeNINFO:      unpackNINFO,
+	TypeNS:         unpackNS,
+	TypeNSAPPTR:    unpackNSAPPTR,
+	TypeNSEC:       unpackNSEC,
+	TypeNSEC3:      unpackNSEC3,
+	TypeNSEC3PARAM: unpackNSEC3PARAM,
+	TypeOPENPGPKEY: unpackOPENPGPKEY,
+	TypeOPT:        unpackOPT,
+	TypePTR:        unpackPTR,
+	TypePX:         unpackPX,
+	TypeRKEY:       unpackRKEY,
+	TypeRP:         unpackRP,
+	TypeRRSIG:      unpackRRSIG,
+	TypeRT:         unpackRT,
+	TypeSIG:        unpackSIG,
+	TypeSMIMEA:     unpackSMIMEA,
+	TypeSOA:        unpackSOA,
+	TypeSPF:        unpackSPF,
+	TypeSRV:        unpackSRV,
+	TypeSSHFP:      unpackSSHFP,
+	TypeTA:         unpackTA,
+	TypeTALINK:     unpackTALINK,
+	TypeTKEY:       unpackTKEY,
+	TypeTLSA:       unpackTLSA,
+	TypeTSIG:       unpackTSIG,
+	TypeTXT:        unpackTXT,
+	TypeUID:        unpackUID,
+	TypeUINFO:      unpackUINFO,
+	TypeURI:        unpackURI,
+	TypeX25:        unpackX25,
+}
diff --git a/vendor/github.com/miekg/dns/ztypes.go b/vendor/github.com/miekg/dns/ztypes.go
new file mode 100644
index 0000000000..311b8243b7
--- /dev/null
+++ b/vendor/github.com/miekg/dns/ztypes.go
@@ -0,0 +1,842 @@
+// *** DO NOT MODIFY ***
+// AUTOGENERATED BY go generate from type_generate.go
+
+package dns
+
+import (
+	"encoding/base64"
+	"net"
+)
+
+// TypeToRR is a map of constructors for each RR type.
+var TypeToRR = map[uint16]func() RR{
+	TypeA:          func() RR { return new(A) },
+	TypeAAAA:       func() RR { return new(AAAA) },
+	TypeAFSDB:      func() RR { return new(AFSDB) },
+	TypeANY:        func() RR { return new(ANY) },
+	TypeCAA:        func() RR { return new(CAA) },
+	TypeCDNSKEY:    func() RR { return new(CDNSKEY) },
+	TypeCDS:        func() RR { return new(CDS) },
+	TypeCERT:       func() RR { return new(CERT) },
+	TypeCNAME:      func() RR { return new(CNAME) },
+	TypeDHCID:      func() RR { return new(DHCID) },
+	TypeDLV:        func() RR { return new(DLV) },
+	TypeDNAME:      func() RR { return new(DNAME) },
+	TypeDNSKEY:     func() RR { return new(DNSKEY) },
+	TypeDS:         func() RR { return new(DS) },
+	TypeEID:        func() RR { return new(EID) },
+	TypeEUI48:      func() RR { return new(EUI48) },
+	TypeEUI64:      func() RR { return new(EUI64) },
+	TypeGID:        func() RR { return new(GID) },
+	TypeGPOS:       func() RR { return new(GPOS) },
+	TypeHINFO:      func() RR { return new(HINFO) },
+	TypeHIP:        func() RR { return new(HIP) },
+	TypeKEY:        func() RR { return new(KEY) },
+	TypeKX:         func() RR { return new(KX) },
+	TypeL32:        func() RR { return new(L32) },
+	TypeL64:        func() RR { return new(L64) },
+	TypeLOC:        func() RR { return new(LOC) },
+	TypeLP:         func() RR { return new(LP) },
+	TypeMB:         func() RR { return new(MB) },
+	TypeMD:         func() RR { return new(MD) },
+	TypeMF:         func() RR { return new(MF) },
+	TypeMG:         func() RR { return new(MG) },
+	TypeMINFO:      func() RR { return new(MINFO) },
+	TypeMR:         func() RR { return new(MR) },
+	TypeMX:         func() RR { return new(MX) },
+	TypeNAPTR:      func() RR { return new(NAPTR) },
+	TypeNID:        func() RR { return new(NID) },
+	TypeNIMLOC:     func() RR { return new(NIMLOC) },
+	TypeNINFO:      func() RR { return new(NINFO) },
+	TypeNS:         func() RR { return new(NS) },
+	TypeNSAPPTR:    func() RR { return new(NSAPPTR) },
+	TypeNSEC:       func() RR { return new(NSEC) },
+	TypeNSEC3:      func() RR { return new(NSEC3) },
+	TypeNSEC3PARAM: func() RR { return new(NSEC3PARAM) },
+	TypeOPENPGPKEY: func() RR { return new(OPENPGPKEY) },
+	TypeOPT:        func() RR { return new(OPT) },
+	TypePTR:        func() RR { return new(PTR) },
+	TypePX:         func() RR { return new(PX) },
+	TypeRKEY:       func() RR { return new(RKEY) },
+	TypeRP:         func() RR { return new(RP) },
+	TypeRRSIG:      func() RR { return new(RRSIG) },
+	TypeRT:         func() RR { return new(RT) },
+	TypeSIG:        func() RR { return new(SIG) },
+	TypeSMIMEA:     func() RR { return new(SMIMEA) },
+	TypeSOA:        func() RR { return new(SOA) },
+	TypeSPF:        func() RR { return new(SPF) },
+	TypeSRV:        func() RR { return new(SRV) },
+	TypeSSHFP:      func() RR { return new(SSHFP) },
+	TypeTA:         func() RR { return new(TA) },
+	TypeTALINK:     func() RR { return new(TALINK) },
+	TypeTKEY:       func() RR { return new(TKEY) },
+	TypeTLSA:       func() RR { return new(TLSA) },
+	TypeTSIG:       func() RR { return new(TSIG) },
+	TypeTXT:        func() RR { return new(TXT) },
+	TypeUID:        func() RR { return new(UID) },
+	TypeUINFO:      func() RR { return new(UINFO) },
+	TypeURI:        func() RR { return new(URI) },
+	TypeX25:        func() RR { return new(X25) },
+}
+
+// TypeToString is a map of strings for each RR type.
+var TypeToString = map[uint16]string{
+	TypeA:          "A",
+	TypeAAAA:       "AAAA",
+	TypeAFSDB:      "AFSDB",
+	TypeANY:        "ANY",
+	TypeATMA:       "ATMA",
+	TypeAXFR:       "AXFR",
+	TypeCAA:        "CAA",
+	TypeCDNSKEY:    "CDNSKEY",
+	TypeCDS:        "CDS",
+	TypeCERT:       "CERT",
+	TypeCNAME:      "CNAME",
+	TypeDHCID:      "DHCID",
+	TypeDLV:        "DLV",
+	TypeDNAME:      "DNAME",
+	TypeDNSKEY:     "DNSKEY",
+	TypeDS:         "DS",
+	TypeEID:        "EID",
+	TypeEUI48:      "EUI48",
+	TypeEUI64:      "EUI64",
+	TypeGID:        "GID",
+	TypeGPOS:       "GPOS",
+	TypeHINFO:      "HINFO",
+	TypeHIP:        "HIP",
+	TypeISDN:       "ISDN",
+	TypeIXFR:       "IXFR",
+	TypeKEY:        "KEY",
+	TypeKX:         "KX",
+	TypeL32:        "L32",
+	TypeL64:        "L64",
+	TypeLOC:        "LOC",
+	TypeLP:         "LP",
+	TypeMAILA:      "MAILA",
+	TypeMAILB:      "MAILB",
+	TypeMB:         "MB",
+	TypeMD:         "MD",
+	TypeMF:         "MF",
+	TypeMG:         "MG",
+	TypeMINFO:      "MINFO",
+	TypeMR:         "MR",
+	TypeMX:         "MX",
+	TypeNAPTR:      "NAPTR",
+	TypeNID:        "NID",
+	TypeNIMLOC:     "NIMLOC",
+	TypeNINFO:      "NINFO",
+	TypeNS:         "NS",
+	TypeNSEC:       "NSEC",
+	TypeNSEC3:      "NSEC3",
+	TypeNSEC3PARAM: "NSEC3PARAM",
+	TypeNULL:       "NULL",
+	TypeNXT:        "NXT",
+	TypeNone:       "None",
+	TypeOPENPGPKEY: "OPENPGPKEY",
+	TypeOPT:        "OPT",
+	TypePTR:        "PTR",
+	TypePX:         "PX",
+	TypeRKEY:       "RKEY",
+	TypeRP:         "RP",
+	TypeRRSIG:      "RRSIG",
+	TypeRT:         "RT",
+	TypeReserved:   "Reserved",
+	TypeSIG:        "SIG",
+	TypeSMIMEA:     "SMIMEA",
+	TypeSOA:        "SOA",
+	TypeSPF:        "SPF",
+	TypeSRV:        "SRV",
+	TypeSSHFP:      "SSHFP",
+	TypeTA:         "TA",
+	TypeTALINK:     "TALINK",
+	TypeTKEY:       "TKEY",
+	TypeTLSA:       "TLSA",
+	TypeTSIG:       "TSIG",
+	TypeTXT:        "TXT",
+	TypeUID:        "UID",
+	TypeUINFO:      "UINFO",
+	TypeUNSPEC:     "UNSPEC",
+	TypeURI:        "URI",
+	TypeX25:        "X25",
+	TypeNSAPPTR:    "NSAP-PTR",
+}
+
+// Header() functions
+func (rr *A) Header() *RR_Header          { return &rr.Hdr }
+func (rr *AAAA) Header() *RR_Header       { return &rr.Hdr }
+func (rr *AFSDB) Header() *RR_Header      { return &rr.Hdr }
+func (rr *ANY) Header() *RR_Header        { return &rr.Hdr }
+func (rr *CAA) Header() *RR_Header        { return &rr.Hdr }
+func (rr *CDNSKEY) Header() *RR_Header    { return &rr.Hdr }
+func (rr *CDS) Header() *RR_Header        { return &rr.Hdr }
+func (rr *CERT) Header() *RR_Header       { return &rr.Hdr }
+func (rr *CNAME) Header() *RR_Header      { return &rr.Hdr }
+func (rr *DHCID) Header() *RR_Header      { return &rr.Hdr }
+func (rr *DLV) Header() *RR_Header        { return &rr.Hdr }
+func (rr *DNAME) Header() *RR_Header      { return &rr.Hdr }
+func (rr *DNSKEY) Header() *RR_Header     { return &rr.Hdr }
+func (rr *DS) Header() *RR_Header         { return &rr.Hdr }
+func (rr *EID) Header() *RR_Header        { return &rr.Hdr }
+func (rr *EUI48) Header() *RR_Header      { return &rr.Hdr }
+func (rr *EUI64) Header() *RR_Header      { return &rr.Hdr }
+func (rr *GID) Header() *RR_Header        { return &rr.Hdr }
+func (rr *GPOS) Header() *RR_Header       { return &rr.Hdr }
+func (rr *HINFO) Header() *RR_Header      { return &rr.Hdr }
+func (rr *HIP) Header() *RR_Header        { return &rr.Hdr }
+func (rr *KEY) Header() *RR_Header        { return &rr.Hdr }
+func (rr *KX) Header() *RR_Header         { return &rr.Hdr }
+func (rr *L32) Header() *RR_Header        { return &rr.Hdr }
+func (rr *L64) Header() *RR_Header        { return &rr.Hdr }
+func (rr *LOC) Header() *RR_Header        { return &rr.Hdr }
+func (rr *LP) Header() *RR_Header         { return &rr.Hdr }
+func (rr *MB) Header() *RR_Header         { return &rr.Hdr }
+func (rr *MD) Header() *RR_Header         { return &rr.Hdr }
+func (rr *MF) Header() *RR_Header         { return &rr.Hdr }
+func (rr *MG) Header() *RR_Header         { return &rr.Hdr }
+func (rr *MINFO) Header() *RR_Header      { return &rr.Hdr }
+func (rr *MR) Header() *RR_Header         { return &rr.Hdr }
+func (rr *MX) Header() *RR_Header         { return &rr.Hdr }
+func (rr *NAPTR) Header() *RR_Header      { return &rr.Hdr }
+func (rr *NID) Header() *RR_Header        { return &rr.Hdr }
+func (rr *NIMLOC) Header() *RR_Header     { return &rr.Hdr }
+func (rr *NINFO) Header() *RR_Header      { return &rr.Hdr }
+func (rr *NS) Header() *RR_Header         { return &rr.Hdr }
+func (rr *NSAPPTR) Header() *RR_Header    { return &rr.Hdr }
+func (rr *NSEC) Header() *RR_Header       { return &rr.Hdr }
+func (rr *NSEC3) Header() *RR_Header      { return &rr.Hdr }
+func (rr *NSEC3PARAM) Header() *RR_Header { return &rr.Hdr }
+func (rr *OPENPGPKEY) Header() *RR_Header { return &rr.Hdr }
+func (rr *OPT) Header() *RR_Header        { return &rr.Hdr }
+func (rr *PTR) Header() *RR_Header        { return &rr.Hdr }
+func (rr *PX) Header() *RR_Header         { return &rr.Hdr }
+func (rr *RFC3597) Header() *RR_Header    { return &rr.Hdr }
+func (rr *RKEY) Header() *RR_Header       { return &rr.Hdr }
+func (rr *RP) Header() *RR_Header         { return &rr.Hdr }
+func (rr *RRSIG) Header() *RR_Header      { return &rr.Hdr }
+func (rr *RT) Header() *RR_Header         { return &rr.Hdr }
+func (rr *SIG) Header() *RR_Header        { return &rr.Hdr }
+func (rr *SMIMEA) Header() *RR_Header     { return &rr.Hdr }
+func (rr *SOA) Header() *RR_Header        { return &rr.Hdr }
+func (rr *SPF) Header() *RR_Header        { return &rr.Hdr }
+func (rr *SRV) Header() *RR_Header        { return &rr.Hdr }
+func (rr *SSHFP) Header() *RR_Header      { return &rr.Hdr }
+func (rr *TA) Header() *RR_Header         { return &rr.Hdr }
+func (rr *TALINK) Header() *RR_Header     { return &rr.Hdr }
+func (rr *TKEY) Header() *RR_Header       { return &rr.Hdr }
+func (rr *TLSA) Header() *RR_Header       { return &rr.Hdr }
+func (rr *TSIG) Header() *RR_Header       { return &rr.Hdr }
+func (rr *TXT) Header() *RR_Header        { return &rr.Hdr }
+func (rr *UID) Header() *RR_Header        { return &rr.Hdr }
+func (rr *UINFO) Header() *RR_Header      { return &rr.Hdr }
+func (rr *URI) Header() *RR_Header        { return &rr.Hdr }
+func (rr *X25) Header() *RR_Header        { return &rr.Hdr }
+
+// len() functions
+func (rr *A) len() int {
+	l := rr.Hdr.len()
+	l += net.IPv4len // A
+	return l
+}
+func (rr *AAAA) len() int {
+	l := rr.Hdr.len()
+	l += net.IPv6len // AAAA
+	return l
+}
+func (rr *AFSDB) len() int {
+	l := rr.Hdr.len()
+	l += 2 // Subtype
+	l += len(rr.Hostname) + 1
+	return l
+}
+func (rr *ANY) len() int {
+	l := rr.Hdr.len()
+	return l
+}
+func (rr *CAA) len() int {
+	l := rr.Hdr.len()
+	l++ // Flag
+	l += len(rr.Tag) + 1
+	l += len(rr.Value)
+	return l
+}
+func (rr *CERT) len() int {
+	l := rr.Hdr.len()
+	l += 2 // Type
+	l += 2 // KeyTag
+	l++    // Algorithm
+	l += base64.StdEncoding.DecodedLen(len(rr.Certificate))
+	return l
+}
+func (rr *CNAME) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Target) + 1
+	return l
+}
+func (rr *DHCID) len() int {
+	l := rr.Hdr.len()
+	l += base64.StdEncoding.DecodedLen(len(rr.Digest))
+	return l
+}
+func (rr *DNAME) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Target) + 1
+	return l
+}
+func (rr *DNSKEY) len() int {
+	l := rr.Hdr.len()
+	l += 2 // Flags
+	l++    // Protocol
+	l++    // Algorithm
+	l += base64.StdEncoding.DecodedLen(len(rr.PublicKey))
+	return l
+}
+func (rr *DS) len() int {
+	l := rr.Hdr.len()
+	l += 2 // KeyTag
+	l++    // Algorithm
+	l++    // DigestType
+	l += len(rr.Digest)/2 + 1
+	return l
+}
+func (rr *EID) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Endpoint)/2 + 1
+	return l
+}
+func (rr *EUI48) len() int {
+	l := rr.Hdr.len()
+	l += 6 // Address
+	return l
+}
+func (rr *EUI64) len() int {
+	l := rr.Hdr.len()
+	l += 8 // Address
+	return l
+}
+func (rr *GID) len() int {
+	l := rr.Hdr.len()
+	l += 4 // Gid
+	return l
+}
+func (rr *GPOS) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Longitude) + 1
+	l += len(rr.Latitude) + 1
+	l += len(rr.Altitude) + 1
+	return l
+}
+func (rr *HINFO) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Cpu) + 1
+	l += len(rr.Os) + 1
+	return l
+}
+func (rr *HIP) len() int {
+	l := rr.Hdr.len()
+	l++    // HitLength
+	l++    // PublicKeyAlgorithm
+	l += 2 // PublicKeyLength
+	l += len(rr.Hit)/2 + 1
+	l += base64.StdEncoding.DecodedLen(len(rr.PublicKey))
+	for _, x := range rr.RendezvousServers {
+		l += len(x) + 1
+	}
+	return l
+}
+func (rr *KX) len() int {
+	l := rr.Hdr.len()
+	l += 2 // Preference
+	l += len(rr.Exchanger) + 1
+	return l
+}
+func (rr *L32) len() int {
+	l := rr.Hdr.len()
+	l += 2           // Preference
+	l += net.IPv4len // Locator32
+	return l
+}
+func (rr *L64) len() int {
+	l := rr.Hdr.len()
+	l += 2 // Preference
+	l += 8 // Locator64
+	return l
+}
+func (rr *LOC) len() int {
+	l := rr.Hdr.len()
+	l++    // Version
+	l++    // Size
+	l++    // HorizPre
+	l++    // VertPre
+	l += 4 // Latitude
+	l += 4 // Longitude
+	l += 4 // Altitude
+	return l
+}
+func (rr *LP) len() int {
+	l := rr.Hdr.len()
+	l += 2 // Preference
+	l += len(rr.Fqdn) + 1
+	return l
+}
+func (rr *MB) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Mb) + 1
+	return l
+}
+func (rr *MD) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Md) + 1
+	return l
+}
+func (rr *MF) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Mf) + 1
+	return l
+}
+func (rr *MG) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Mg) + 1
+	return l
+}
+func (rr *MINFO) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Rmail) + 1
+	l += len(rr.Email) + 1
+	return l
+}
+func (rr *MR) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Mr) + 1
+	return l
+}
+func (rr *MX) len() int {
+	l := rr.Hdr.len()
+	l += 2 // Preference
+	l += len(rr.Mx) + 1
+	return l
+}
+func (rr *NAPTR) len() int {
+	l := rr.Hdr.len()
+	l += 2 // Order
+	l += 2 // Preference
+	l += len(rr.Flags) + 1
+	l += len(rr.Service) + 1
+	l += len(rr.Regexp) + 1
+	l += len(rr.Replacement) + 1
+	return l
+}
+func (rr *NID) len() int {
+	l := rr.Hdr.len()
+	l += 2 // Preference
+	l += 8 // NodeID
+	return l
+}
+func (rr *NIMLOC) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Locator)/2 + 1
+	return l
+}
+func (rr *NINFO) len() int {
+	l := rr.Hdr.len()
+	for _, x := range rr.ZSData {
+		l += len(x) + 1
+	}
+	return l
+}
+func (rr *NS) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Ns) + 1
+	return l
+}
+func (rr *NSAPPTR) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Ptr) + 1
+	return l
+}
+func (rr *NSEC3PARAM) len() int {
+	l := rr.Hdr.len()
+	l++    // Hash
+	l++    // Flags
+	l += 2 // Iterations
+	l++    // SaltLength
+	l += len(rr.Salt)/2 + 1
+	return l
+}
+func (rr *OPENPGPKEY) len() int {
+	l := rr.Hdr.len()
+	l += base64.StdEncoding.DecodedLen(len(rr.PublicKey))
+	return l
+}
+func (rr *PTR) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Ptr) + 1
+	return l
+}
+func (rr *PX) len() int {
+	l := rr.Hdr.len()
+	l += 2 // Preference
+	l += len(rr.Map822) + 1
+	l += len(rr.Mapx400) + 1
+	return l
+}
+func (rr *RFC3597) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Rdata)/2 + 1
+	return l
+}
+func (rr *RKEY) len() int {
+	l := rr.Hdr.len()
+	l += 2 // Flags
+	l++    // Protocol
+	l++    // Algorithm
+	l += base64.StdEncoding.DecodedLen(len(rr.PublicKey))
+	return l
+}
+func (rr *RP) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Mbox) + 1
+	l += len(rr.Txt) + 1
+	return l
+}
+func (rr *RRSIG) len() int {
+	l := rr.Hdr.len()
+	l += 2 // TypeCovered
+	l++    // Algorithm
+	l++    // Labels
+	l += 4 // OrigTtl
+	l += 4 // Expiration
+	l += 4 // Inception
+	l += 2 // KeyTag
+	l += len(rr.SignerName) + 1
+	l += base64.StdEncoding.DecodedLen(len(rr.Signature))
+	return l
+}
+func (rr *RT) len() int {
+	l := rr.Hdr.len()
+	l += 2 // Preference
+	l += len(rr.Host) + 1
+	return l
+}
+func (rr *SMIMEA) len() int {
+	l := rr.Hdr.len()
+	l++ // Usage
+	l++ // Selector
+	l++ // MatchingType
+	l += len(rr.Certificate)/2 + 1
+	return l
+}
+func (rr *SOA) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Ns) + 1
+	l += len(rr.Mbox) + 1
+	l += 4 // Serial
+	l += 4 // Refresh
+	l += 4 // Retry
+	l += 4 // Expire
+	l += 4 // Minttl
+	return l
+}
+func (rr *SPF) len() int {
+	l := rr.Hdr.len()
+	for _, x := range rr.Txt {
+		l += len(x) + 1
+	}
+	return l
+}
+func (rr *SRV) len() int {
+	l := rr.Hdr.len()
+	l += 2 // Priority
+	l += 2 // Weight
+	l += 2 // Port
+	l += len(rr.Target) + 1
+	return l
+}
+func (rr *SSHFP) len() int {
+	l := rr.Hdr.len()
+	l++ // Algorithm
+	l++ // Type
+	l += len(rr.FingerPrint)/2 + 1
+	return l
+}
+func (rr *TA) len() int {
+	l := rr.Hdr.len()
+	l += 2 // KeyTag
+	l++    // Algorithm
+	l++    // DigestType
+	l += len(rr.Digest)/2 + 1
+	return l
+}
+func (rr *TALINK) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.PreviousName) + 1
+	l += len(rr.NextName) + 1
+	return l
+}
+func (rr *TKEY) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Algorithm) + 1
+	l += 4 // Inception
+	l += 4 // Expiration
+	l += 2 // Mode
+	l += 2 // Error
+	l += 2 // KeySize
+	l += len(rr.Key) + 1
+	l += 2 // OtherLen
+	l += len(rr.OtherData) + 1
+	return l
+}
+func (rr *TLSA) len() int {
+	l := rr.Hdr.len()
+	l++ // Usage
+	l++ // Selector
+	l++ // MatchingType
+	l += len(rr.Certificate)/2 + 1
+	return l
+}
+func (rr *TSIG) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Algorithm) + 1
+	l += 6 // TimeSigned
+	l += 2 // Fudge
+	l += 2 // MACSize
+	l += len(rr.MAC)/2 + 1
+	l += 2 // OrigId
+	l += 2 // Error
+	l += 2 // OtherLen
+	l += len(rr.OtherData)/2 + 1
+	return l
+}
+func (rr *TXT) len() int {
+	l := rr.Hdr.len()
+	for _, x := range rr.Txt {
+		l += len(x) + 1
+	}
+	return l
+}
+func (rr *UID) len() int {
+	l := rr.Hdr.len()
+	l += 4 // Uid
+	return l
+}
+func (rr *UINFO) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.Uinfo) + 1
+	return l
+}
+func (rr *URI) len() int {
+	l := rr.Hdr.len()
+	l += 2 // Priority
+	l += 2 // Weight
+	l += len(rr.Target)
+	return l
+}
+func (rr *X25) len() int {
+	l := rr.Hdr.len()
+	l += len(rr.PSDNAddress) + 1
+	return l
+}
+
+// copy() functions
+func (rr *A) copy() RR {
+	return &A{*rr.Hdr.copyHeader(), copyIP(rr.A)}
+}
+func (rr *AAAA) copy() RR {
+	return &AAAA{*rr.Hdr.copyHeader(), copyIP(rr.AAAA)}
+}
+func (rr *AFSDB) copy() RR {
+	return &AFSDB{*rr.Hdr.copyHeader(), rr.Subtype, rr.Hostname}
+}
+func (rr *ANY) copy() RR {
+	return &ANY{*rr.Hdr.copyHeader()}
+}
+func (rr *CAA) copy() RR {
+	return &CAA{*rr.Hdr.copyHeader(), rr.Flag, rr.Tag, rr.Value}
+}
+func (rr *CERT) copy() RR {
+	return &CERT{*rr.Hdr.copyHeader(), rr.Type, rr.KeyTag, rr.Algorithm, rr.Certificate}
+}
+func (rr *CNAME) copy() RR {
+	return &CNAME{*rr.Hdr.copyHeader(), rr.Target}
+}
+func (rr *DHCID) copy() RR {
+	return &DHCID{*rr.Hdr.copyHeader(), rr.Digest}
+}
+func (rr *DNAME) copy() RR {
+	return &DNAME{*rr.Hdr.copyHeader(), rr.Target}
+}
+func (rr *DNSKEY) copy() RR {
+	return &DNSKEY{*rr.Hdr.copyHeader(), rr.Flags, rr.Protocol, rr.Algorithm, rr.PublicKey}
+}
+func (rr *DS) copy() RR {
+	return &DS{*rr.Hdr.copyHeader(), rr.KeyTag, rr.Algorithm, rr.DigestType, rr.Digest}
+}
+func (rr *EID) copy() RR {
+	return &EID{*rr.Hdr.copyHeader(), rr.Endpoint}
+}
+func (rr *EUI48) copy() RR {
+	return &EUI48{*rr.Hdr.copyHeader(), rr.Address}
+}
+func (rr *EUI64) copy() RR {
+	return &EUI64{*rr.Hdr.copyHeader(), rr.Address}
+}
+func (rr *GID) copy() RR {
+	return &GID{*rr.Hdr.copyHeader(), rr.Gid}
+}
+func (rr *GPOS) copy() RR {
+	return &GPOS{*rr.Hdr.copyHeader(), rr.Longitude, rr.Latitude, rr.Altitude}
+}
+func (rr *HINFO) copy() RR {
+	return &HINFO{*rr.Hdr.copyHeader(), rr.Cpu, rr.Os}
+}
+func (rr *HIP) copy() RR {
+	RendezvousServers := make([]string, len(rr.RendezvousServers))
+	copy(RendezvousServers, rr.RendezvousServers)
+	return &HIP{*rr.Hdr.copyHeader(), rr.HitLength, rr.PublicKeyAlgorithm, rr.PublicKeyLength, rr.Hit, rr.PublicKey, RendezvousServers}
+}
+func (rr *KX) copy() RR {
+	return &KX{*rr.Hdr.copyHeader(), rr.Preference, rr.Exchanger}
+}
+func (rr *L32) copy() RR {
+	return &L32{*rr.Hdr.copyHeader(), rr.Preference, copyIP(rr.Locator32)}
+}
+func (rr *L64) copy() RR {
+	return &L64{*rr.Hdr.copyHeader(), rr.Preference, rr.Locator64}
+}
+func (rr *LOC) copy() RR {
+	return &LOC{*rr.Hdr.copyHeader(), rr.Version, rr.Size, rr.HorizPre, rr.VertPre, rr.Latitude, rr.Longitude, rr.Altitude}
+}
+func (rr *LP) copy() RR {
+	return &LP{*rr.Hdr.copyHeader(), rr.Preference, rr.Fqdn}
+}
+func (rr *MB) copy() RR {
+	return &MB{*rr.Hdr.copyHeader(), rr.Mb}
+}
+func (rr *MD) copy() RR {
+	return &MD{*rr.Hdr.copyHeader(), rr.Md}
+}
+func (rr *MF) copy() RR {
+	return &MF{*rr.Hdr.copyHeader(), rr.Mf}
+}
+func (rr *MG) copy() RR {
+	return &MG{*rr.Hdr.copyHeader(), rr.Mg}
+}
+func (rr *MINFO) copy() RR {
+	return &MINFO{*rr.Hdr.copyHeader(), rr.Rmail, rr.Email}
+}
+func (rr *MR) copy() RR {
+	return &MR{*rr.Hdr.copyHeader(), rr.Mr}
+}
+func (rr *MX) copy() RR {
+	return &MX{*rr.Hdr.copyHeader(), rr.Preference, rr.Mx}
+}
+func (rr *NAPTR) copy() RR {
+	return &NAPTR{*rr.Hdr.copyHeader(), rr.Order, rr.Preference, rr.Flags, rr.Service, rr.Regexp, rr.Replacement}
+}
+func (rr *NID) copy() RR {
+	return &NID{*rr.Hdr.copyHeader(), rr.Preference, rr.NodeID}
+}
+func (rr *NIMLOC) copy() RR {
+	return &NIMLOC{*rr.Hdr.copyHeader(), rr.Locator}
+}
+func (rr *NINFO) copy() RR {
+	ZSData := make([]string, len(rr.ZSData))
+	copy(ZSData, rr.ZSData)
+	return &NINFO{*rr.Hdr.copyHeader(), ZSData}
+}
+func (rr *NS) copy() RR {
+	return &NS{*rr.Hdr.copyHeader(), rr.Ns}
+}
+func (rr *NSAPPTR) copy() RR {
+	return &NSAPPTR{*rr.Hdr.copyHeader(), rr.Ptr}
+}
+func (rr *NSEC) copy() RR {
+	TypeBitMap := make([]uint16, len(rr.TypeBitMap))
+	copy(TypeBitMap, rr.TypeBitMap)
+	return &NSEC{*rr.Hdr.copyHeader(), rr.NextDomain, TypeBitMap}
+}
+func (rr *NSEC3) copy() RR {
+	TypeBitMap := make([]uint16, len(rr.TypeBitMap))
+	copy(TypeBitMap, rr.TypeBitMap)
+	return &NSEC3{*rr.Hdr.copyHeader(), rr.Hash, rr.Flags, rr.Iterations, rr.SaltLength, rr.Salt, rr.HashLength, rr.NextDomain, TypeBitMap}
+}
+func (rr *NSEC3PARAM) copy() RR {
+	return &NSEC3PARAM{*rr.Hdr.copyHeader(), rr.Hash, rr.Flags, rr.Iterations, rr.SaltLength, rr.Salt}
+}
+func (rr *OPENPGPKEY) copy() RR {
+	return &OPENPGPKEY{*rr.Hdr.copyHeader(), rr.PublicKey}
+}
+func (rr *OPT) copy() RR {
+	Option := make([]EDNS0, len(rr.Option))
+	copy(Option, rr.Option)
+	return &OPT{*rr.Hdr.copyHeader(), Option}
+}
+func (rr *PTR) copy() RR {
+	return &PTR{*rr.Hdr.copyHeader(), rr.Ptr}
+}
+func (rr *PX) copy() RR {
+	return &PX{*rr.Hdr.copyHeader(), rr.Preference, rr.Map822, rr.Mapx400}
+}
+func (rr *RFC3597) copy() RR {
+	return &RFC3597{*rr.Hdr.copyHeader(), rr.Rdata}
+}
+func (rr *RKEY) copy() RR {
+	return &RKEY{*rr.Hdr.copyHeader(), rr.Flags, rr.Protocol, rr.Algorithm, rr.PublicKey}
+}
+func (rr *RP) copy() RR {
+	return &RP{*rr.Hdr.copyHeader(), rr.Mbox, rr.Txt}
+}
+func (rr *RRSIG) copy() RR {
+	return &RRSIG{*rr.Hdr.copyHeader(), rr.TypeCovered, rr.Algorithm, rr.Labels, rr.OrigTtl, rr.Expiration, rr.Inception, rr.KeyTag, rr.SignerName, rr.Signature}
+}
+func (rr *RT) copy() RR {
+	return &RT{*rr.Hdr.copyHeader(), rr.Preference, rr.Host}
+}
+func (rr *SMIMEA) copy() RR {
+	return &SMIMEA{*rr.Hdr.copyHeader(), rr.Usage, rr.Selector, rr.MatchingType, rr.Certificate}
+}
+func (rr *SOA) copy() RR {
+	return &SOA{*rr.Hdr.copyHeader(), rr.Ns, rr.Mbox, rr.Serial, rr.Refresh, rr.Retry, rr.Expire, rr.Minttl}
+}
+func (rr *SPF) copy() RR {
+	Txt := make([]string, len(rr.Txt))
+	copy(Txt, rr.Txt)
+	return &SPF{*rr.Hdr.copyHeader(), Txt}
+}
+func (rr *SRV) copy() RR {
+	return &SRV{*rr.Hdr.copyHeader(), rr.Priority, rr.Weight, rr.Port, rr.Target}
+}
+func (rr *SSHFP) copy() RR {
+	return &SSHFP{*rr.Hdr.copyHeader(), rr.Algorithm, rr.Type, rr.FingerPrint}
+}
+func (rr *TA) copy() RR {
+	return &TA{*rr.Hdr.copyHeader(), rr.KeyTag, rr.Algorithm, rr.DigestType, rr.Digest}
+}
+func (rr *TALINK) copy() RR {
+	return &TALINK{*rr.Hdr.copyHeader(), rr.PreviousName, rr.NextName}
+}
+func (rr *TKEY) copy() RR {
+	return &TKEY{*rr.Hdr.copyHeader(), rr.Algorithm, rr.Inception, rr.Expiration, rr.Mode, rr.Error, rr.KeySize, rr.Key, rr.OtherLen, rr.OtherData}
+}
+func (rr *TLSA) copy() RR {
+	return &TLSA{*rr.Hdr.copyHeader(), rr.Usage, rr.Selector, rr.MatchingType, rr.Certificate}
+}
+func (rr *TSIG) copy() RR {
+	return &TSIG{*rr.Hdr.copyHeader(), rr.Algorithm, rr.TimeSigned, rr.Fudge, rr.MACSize, rr.MAC, rr.OrigId, rr.Error, rr.OtherLen, rr.OtherData}
+}
+func (rr *TXT) copy() RR {
+	Txt := make([]string, len(rr.Txt))
+	copy(Txt, rr.Txt)
+	return &TXT{*rr.Hdr.copyHeader(), Txt}
+}
+func (rr *UID) copy() RR {
+	return &UID{*rr.Hdr.copyHeader(), rr.Uid}
+}
+func (rr *UINFO) copy() RR {
+	return &UINFO{*rr.Hdr.copyHeader(), rr.Uinfo}
+}
+func (rr *URI) copy() RR {
+	return &URI{*rr.Hdr.copyHeader(), rr.Priority, rr.Weight, rr.Target}
+}
+func (rr *X25) copy() RR {
+	return &X25{*rr.Hdr.copyHeader(), rr.PSDNAddress}
+}
diff --git a/vendor/github.com/vmware/govmomi/.drone.yml b/vendor/github.com/vmware/govmomi/.drone.yml
new file mode 100644
index 0000000000..dee4bf5b38
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/.drone.yml
@@ -0,0 +1,17 @@
+clone:
+  tags: true
+  path: github.com/vmware/govmomi
+build:
+  image: golang:1.7
+  pull: true
+  environment:
+    - GOVC_TEST_URL=$$GOVC_TEST_URL
+    - GOVC_INSECURE=1
+    - VCA=1
+  commands:
+    - make all install
+    - git clone https://github.com/sstephenson/bats.git /tmp/bats
+    - /tmp/bats/install.sh /usr/local
+    - apt-get -qq update && apt-get install -yqq uuid-runtime bsdmainutils jq
+    - govc/test/images/update.sh
+    - bats govc/test
diff --git a/vendor/github.com/vmware/govmomi/.gitignore b/vendor/github.com/vmware/govmomi/.gitignore
new file mode 100644
index 0000000000..769c244007
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/.gitignore
@@ -0,0 +1 @@
+secrets.yml
diff --git a/vendor/github.com/vmware/govmomi/.mailmap b/vendor/github.com/vmware/govmomi/.mailmap
new file mode 100644
index 0000000000..50618cb576
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/.mailmap
@@ -0,0 +1,14 @@
+Amit Bathla <abathla@.vmware.com> <abathla@promb-1s-dhcp216.eng.vmware.com>
+Bruce Downs <bruceadowns@gmail.com> <bdowns@vmware.com>
+Bruce Downs <bruceadowns@gmail.com> <bruce.downs@jivesoftware.com>
+Clint Greenwood <cgreenwood@vmware.com> <clint.greenwood@gmail.com>
+Cédric Blomart <cblomart@gmail.com> <cedric.blomart@minfin.fed.be>
+Cédric Blomart <cblomart@gmail.com> cedric <cblomart@gmail.com>
+Eric Yutao <eric.yutao@gmail.com> eric <eric.yutao@gmail.com>
+David Stark <dave@davidstark.name> <david.stark@bskyb.com>
+Henrik Hodne <henrik@travis-ci.com> <henrik@hodne.io>
+Pieter Noordhuis <pnoordhuis@vmware.com> <pcnoordhuis@gmail.com>
+Takaaki Furukawa <takaaki.frkw@gmail.com> takaaki.furukawa <takaaki.furukawa@mail.rakuten.com>
+Takaaki Furukawa <takaaki.frkw@gmail.com> tkak <takaaki.frkw@gmail.com>
+Vadim Egorov <vegorov@vmware.com> <egorovv@gmail.com>
+Zee Yang <zeey@vmware.com> <zee.yang@gmail.com>
diff --git a/vendor/github.com/vmware/govmomi/.travis.yml b/vendor/github.com/vmware/govmomi/.travis.yml
new file mode 100644
index 0000000000..a7fba0350b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/.travis.yml
@@ -0,0 +1,12 @@
+sudo: false
+
+language: go
+
+go:
+   - 1.7
+
+before_install:
+  - make vendor
+
+script:
+  - make check test
diff --git a/vendor/github.com/vmware/govmomi/CHANGELOG.md b/vendor/github.com/vmware/govmomi/CHANGELOG.md
new file mode 100644
index 0000000000..82580ff5d4
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/CHANGELOG.md
@@ -0,0 +1,228 @@
+# changelog
+
+### 0.13.0 (2017-03-02)
+
+* Add DatastoreFileManager API wrapper
+
+* Add HostVsanInternalSystem API wrappers
+
+* Add Container support to view package
+
+* Finder supports Folder recursion without specifying a path
+
+* Add VirtualMachine.QueryConfigTarget method
+
+* Add device option to VirtualMachine.WaitForNetIP
+
+* Remove _Task suffix from vapp methods
+
+### 0.12.1 (2016-12-19)
+
+* Add DiagnosticLog helper
+
+* Add DatastorePath helper
+
+### 0.12.0 (2016-12-01)
+
+* Disable use of service ticket for datastore HTTP access by default
+
+* Attach context to HTTP requests for cancellations
+
+* Update to vim25/6.5 API
+
+### 0.11.4 (2016-11-15)
+
+* Add object.AuthorizationManager methods: RetrieveRolePermissions, RetrieveAllPermissions, AddRole, RemoveRole, UpdateRole
+
+### 0.11.3 (2016-11-08)
+
+* Allow DatastoreFile.Follow reader to drain current body after stopping
+
+### 0.11.2 (2016-11-01)
+
+* Avoid possible NPE in VirtualMachine.Device method
+
+* Add support for OpaqueNetwork type to Finder
+
+* Add HostConfigManager.AccountManager support for ESX 5.5
+
+### 0.11.1 (2016-10-27)
+
+* Add Finder.ResourcePoolListAll method
+
+### 0.11.0 (2016-10-25)
+
+* Add object.DistributedVirtualPortgroup.Reconfigure method
+
+### 0.10.0 (2016-10-20)
+
+* Add option to set soap.Client.UserAgent
+
+* Add service ticket thumbprint validation
+
+* Update use of http.DefaultTransport fields to 1.7
+
+* Set default locale to en_US (override with GOVMOMI_LOCALE env var)
+
+* Add object.HostCertificateInfo (types.HostCertificateManagerCertificateInfo helpers)
+
+* Add object.HostCertificateManager type and HostConfigManager.CertificateManager method
+
+* Add soap.Client SetRootCAs and SetDialTLS methods
+
+### 0.9.0 (2016-09-09)
+
+* Add object.DatastoreFile helpers for streaming and tailing datastore files
+
+* Add object VirtualMachine.Unregister method
+
+* Add object.ListView methods: Add, Remove, Reset
+
+* Update to Go 1.7 - using stdlib's context package
+
+### 0.8.0 (2016-06-30)
+
+* Add session.Manager.AcquireLocalTicket
+
+* Include StoragePod in Finder.FolderList
+
+* Add Finder methods for finding by ManagedObjectReference: Element, ObjectReference
+
+* Add mo.ManagedObjectReference methods: Reference, String, FromString
+
+* Add support using SessionManagerGenericServiceTicket.HostName for Datastore HTTP access
+
+### 0.7.1 (2016-06-03)
+
+* Fix object.ObjectName method
+
+### 0.7.0 (2016-06-02)
+
+* Move InventoryPath field to object.Common
+
+* Add HostDatastoreSystem.CreateLocalDatastore method
+
+* Add DatastoreNamespaceManager methods: CreateDirectory, DeleteDirectory
+
+* Add HostServiceSystem
+
+* Add HostStorageSystem methods: MarkAsSdd, MarkAsNonSdd, MarkAsLocal, MarkAsNonLocal
+
+* Add HostStorageSystem.RescanAllHba method
+
+### 0.6.2 (2016-05-11)
+
+* Get complete file details in Datastore.Stat
+
+* SOAP decoding fixes
+
+* Add VirtualMachine.RemoveAllSnapshot
+
+### 0.6.1 (2016-04-30)
+
+* Fix mo.Entity interface
+
+### 0.6.0 (2016-04-29)
+
+* Add Common.Rename method
+
+* Add mo.Entity interface
+
+* Add OptionManager
+
+* Add Finder.FolderList method
+
+* Add VirtualMachine.WaitForNetIP method
+
+* Add VirtualMachine.RevertToSnapshot method
+
+* Add Datastore.Download method
+
+### 0.5.0 (2016-03-30)
+
+Generated fields using xsd type 'int' change to Go type 'int32'
+
+VirtualDevice.UnitNumber field changed to pointer type
+
+### 0.4.0 (2016-02-26)
+
+* Add method to convert virtual device list to array with virtual device
+  changes that can be used in the VirtualMachineConfigSpec.
+
+* Make datastore cluster traversable in lister
+
+* Add finder.DatastoreCluster methods (also known as storage pods)
+
+* Add Drone CI check
+
+* Add object.Datastore Type and AttachedClusterHosts methods
+
+* Add finder.*OrDefault methods
+
+### 0.3.0 (2016-01-16)
+
+* Add object.VirtualNicManager wrapper
+
+* Add object.HostVsanSystem wrapper
+
+* Add object.HostSystem methods: EnterMaintenanceMode, ExitMaintenanceMode, Disconnect, Reconnect
+
+* Add finder.Folder method
+
+* Add object.Common.Destroy method
+
+* Add object.ComputeResource.Reconfigure method
+
+* Add license.AssignmentManager wrapper
+
+* Add object.HostFirewallSystem wrapper
+
+* Add object.DiagnosticManager wrapper
+
+* Add LoginExtensionByCertificate support
+
+* Add object.ExtensionManager
+
+...
+
+### 0.2.0 (2015-09-15)
+
+* Update to vim25/6.0 API
+
+* Stop returning children from `ManagedObjectList`
+
+    Change the `ManagedObjectList` function in the `find` package to only
+    return the managed objects specified by the path argument and not their
+    children. The original behavior was used by govc's `ls` command and is
+    now available in the newly added function `ManagedObjectListChildren`.
+
+* Add retry functionality to vim25 package
+
+* Change finder functions to no longer take varargs
+
+    The `find` package had functions to return a list of objects, given a
+    variable number of patterns. This makes it impossible to distinguish which
+    patterns produced results and which ones didn't.
+
+    In particular for govc, where multiple arguments can be passed from the
+    command line, it is useful to let the user know which ones produce results
+    and which ones don't.
+
+    To evaluate multiple patterns, the user should call the find functions
+    multiple times (either serially or in parallel).
+
+* Make optional boolean fields pointers (`vim25/types`).
+
+    False is the zero value of a boolean field, which means they are not serialized
+    if the field is marked "omitempty". If the field is a pointer instead, the zero
+    value will be the nil pointer, and both true and false values are serialized.
+
+### 0.1.0 (2015-03-17)
+
+Prior to this version the API of this library was in flux.
+
+Notable changes w.r.t. the state of this library before March 2015 are:
+
+* All functions that may execute a request take a `context.Context` parameter.
+* The `vim25` package contains a minimal client implementation.
+* The property collector and its convenience functions live in the `property` package.
diff --git a/vendor/github.com/vmware/govmomi/CONTRIBUTING.md b/vendor/github.com/vmware/govmomi/CONTRIBUTING.md
new file mode 100644
index 0000000000..f87c606102
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/CONTRIBUTING.md
@@ -0,0 +1,91 @@
+# Contributing to govmomi
+
+## Getting started
+
+First, fork the repository on GitHub to your personal account.
+
+Note that _GOPATH_ can be any directory, the example below uses _$HOME/govmomi_.
+Change _$USER_ below to your github username if they are not the same.
+
+``` shell
+export GOPATH=$HOME/govmomi
+go get github.com/vmware/govmomi
+cd $GOPATH/src/github.com/vmware/govmomi
+git config push.default nothing # anything to avoid pushing to vmware/govmomi by default
+git remote rename origin vmware
+git remote add $USER git@github.com:$USER/govmomi.git
+git fetch $USER
+```
+
+## Contribution flow
+
+This is a rough outline of what a contributor's workflow looks like:
+
+- Create a topic branch from where you want to base your work.
+- Make commits of logical units.
+- Make sure your commit messages are in the proper format (see below).
+- Update CHANGELOG.md and/or govc/CHANGELOG.md when appropriate.
+- Push your changes to a topic branch in your fork of the repository.
+- Submit a pull request to vmware/govmomi.
+
+Example:
+
+``` shell
+git checkout -b my-new-feature vmware/master
+git commit -a
+git push $USER my-new-feature
+```
+
+### Stay in sync with upstream
+
+When your branch gets out of sync with the vmware/master branch, use the following to update:
+
+``` shell
+git checkout my-new-feature
+git fetch -a
+git rebase vmware/master
+git push --force-with-lease $USER my-new-feature
+```
+
+### Updating pull requests
+
+If your PR fails to pass CI or needs changes based on code review, you'll most likely want to squash these changes into
+existing commits.
+
+If your pull request contains a single commit or your changes are related to the most recent commit, you can simply
+amend the commit.
+
+``` shell
+git add .
+git commit --amend
+git push --force-with-lease $USER my-new-feature
+```
+
+If you need to squash changes into an earlier commit, you can use:
+
+``` shell
+git add .
+git commit --fixup <commit>
+git rebase -i --autosquash vmware/master
+git push --force-with-lease $USER my-new-feature
+```
+
+Be sure to add a comment to the PR indicating your new changes are ready to review, as github does not generate a
+notification when you git push.
+
+### Code style
+
+The coding style suggested by the Golang community is used in govmomi. See the
+[style doc](https://github.com/golang/go/wiki/CodeReviewComments) for details.
+
+Try to limit column width to 120 characters for both code and markdown documents such as this one.
+
+### Format of the Commit Message
+
+We follow the conventions on [How to Write a Git Commit Message](http://chris.beams.io/posts/git-commit/).
+
+Be sure to include any related GitHub issue references in the commit message.
+
+## Reporting Bugs and Creating Issues
+
+When opening a new issue, try to roughly follow the commit message format conventions above.
diff --git a/vendor/github.com/vmware/govmomi/CONTRIBUTORS b/vendor/github.com/vmware/govmomi/CONTRIBUTORS
new file mode 100644
index 0000000000..0e7a058aa0
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/CONTRIBUTORS
@@ -0,0 +1,53 @@
+# People who can (and typically have) contributed to this repository.
+#
+# This script is generated by contributors.sh
+#
+
+abrarshivani <abrarshivani@users.noreply.github.com>
+Alvaro Miranda <kikitux@gmail.com>
+Amit Bathla <abathla@.vmware.com>
+Andrew Chin <andrew@andrewtchin.com>
+Arran Walker <arran.walker@zopa.com>
+Austin Parker <aparker@apprenda.com>
+bastienbc <bastien.barbe.creuly@gmail.com>
+Bob Killen <killen.bob@gmail.com>
+Brad Fitzpatrick <bradfitz@golang.org>
+Bruce Downs <bruceadowns@gmail.com>
+Cédric Blomart <cblomart@gmail.com>
+Christian Höltje <docwhat@gerf.org>
+Clint Greenwood <cgreenwood@vmware.com>
+Danny Lockard <danny.lockard@banno.com>
+Dave Tucker <dave@dtucker.co.uk>
+Davide Agnello <dagnello@hp.com>
+David Stark <dave@davidstark.name>
+Doug MacEachern <dougm@vmware.com>
+Eloy Coto <eloy.coto@gmail.com>
+Eric Yutao <eric.yutao@gmail.com>
+Fabio Rapposelli <fabio@vmware.com>
+Faiyaz Ahmed <ahmedf@vmware.com>
+forkbomber <forkbomber@users.noreply.github.com>
+Gavin Gray <gavin@infinio.com>
+Gavrie Philipson <gavrie.philipson@elastifile.com>
+George Hicken <ghicken@vmware.com>
+Gerrit Renker <Gerrit.Renker@ctl.io>
+gthombare <gthombare@vmware.com>
+Hasan Mahmood <mahmoodh@vmware.com>
+Henrik Hodne <henrik@travis-ci.com>
+Isaac Rodman <isaac@eyz.us>
+Jason Kincl <jkincl@gmail.com>
+Jeremy Canady <jcanady@gmail.com>
+Louie Jiang <jiangl@vmware.com>
+Mevan Samaratunga <mevansam@gmail.com>
+Nicolas Lamirault <nicolas.lamirault@gmail.com>
+Pieter Noordhuis <pnoordhuis@vmware.com>
+runner.mei <runner.mei@gmail.com>
+S.Çağlar Onur <conur@vmware.com>
+Sergey Ignatov <sergey.ignatov@jetbrains.com>
+Steve Purcell <steve@sanityinc.com>
+Takaaki Furukawa <takaaki.frkw@gmail.com>
+Ted Zlatanov <tzz@lifelogs.com>
+Vadim Egorov <vegorov@vmware.com>
+Yang Yang <yangy@vmware.com>
+Yuya Kusakabe <yuya.kusakabe@gmail.com>
+Zach Tucker <ztucker@vmware.com>
+Zee Yang <zeey@vmware.com>
diff --git a/vendor/github.com/vmware/govmomi/LICENSE.txt b/vendor/github.com/vmware/govmomi/LICENSE.txt
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/vendor/github.com/vmware/govmomi/Makefile b/vendor/github.com/vmware/govmomi/Makefile
new file mode 100644
index 0000000000..cbaa362499
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/Makefile
@@ -0,0 +1,23 @@
+.PHONY: test
+
+all: check test
+
+check: goimports govet
+
+goimports:
+	@echo checking go imports...
+	@go get golang.org/x/tools/cmd/goimports
+	@! goimports -d . 2>&1 | egrep -v '^$$'
+
+govet:
+	@echo checking go vet...
+	@go tool vet -structtags=false -methods=false .
+
+test:
+	go test -v $(TEST_OPTS) ./...
+
+install:
+	go install github.com/vmware/govmomi/govc
+
+doc: install
+	./govc/usage.sh > ./govc/USAGE.md
diff --git a/vendor/github.com/vmware/govmomi/README.md b/vendor/github.com/vmware/govmomi/README.md
new file mode 100644
index 0000000000..ae3531961c
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/README.md
@@ -0,0 +1,68 @@
+[![Build Status](https://travis-ci.org/vmware/govmomi.png?branch=master)](https://travis-ci.org/vmware/govmomi)
+[![Go Report Card](https://goreportcard.com/badge/github.com/vmware/govmomi)](https://goreportcard.com/report/github.com/vmware/govmomi)
+
+# govmomi
+
+A Go library for interacting with VMware vSphere APIs (ESXi and/or vCenter).
+
+For `govc`, a CLI built on top of govmomi, check out the [govc](./govc) directory and [USAGE](./govc/USAGE.md) document.
+
+## Compatibility
+
+This library is built for and tested against ESXi and vCenter 5.5, 6.0 and 6.5.
+
+If you're able to use it against older versions of ESXi and/or vCenter, please
+leave a note and we'll include it in this compatibility list.
+
+## Documentation
+
+The APIs exposed by this library very closely follow the API described in the [VMware vSphere API Reference Documentation][apiref].
+Refer to this document to become familiar with the upstream API.
+
+The code in the `govmomi` package is a wrapper for the code that is generated from the vSphere API description.
+It primarily provides convenience functions for working with the vSphere API.
+See [godoc.org][godoc] for documentation.
+
+[apiref]:http://pubs.vmware.com/vsphere-60/index.jsp#com.vmware.wssdk.apiref.doc/right-pane.html
+[godoc]:http://godoc.org/github.com/vmware/govmomi
+[drone]:https://drone.io
+[dronesrc]:https://github.com/drone/drone
+[dronecli]:http://readme.drone.io/devs/cli/
+
+#### Building with CI
+Merges to this repository will trigger builds in both Travis and [Drone][drone].
+
+To build locally with Drone:
+- Ensure that you have Docker 1.6 or higher installed.
+- Install the [Drone command line tools][dronecli].
+- Run `drone exec` from within the root directory of the govmomi repository.
+
+## Discussion
+
+Contributors and users are encouraged to collaborate using GitHub issues and/or
+[Slack](https://vmwarecode.slack.com/messages/govmomi).
+Access to Slack requires a [VMware {code} membership](https://code.vmware.com/join/).
+
+## Status
+
+Changes to the API are subject to [semantic versioning](http://semver.org).
+
+Refer to the [CHANGELOG](CHANGELOG.md) for version to version changes.
+
+## Projects using govmomi
+
+* [Docker Machine](https://github.com/docker/machine/tree/master/drivers/vmwarevsphere)
+
+* [Kubernetes](https://github.com/kubernetes/kubernetes/tree/master/pkg/cloudprovider/providers/vsphere)
+
+* [Terraform](https://github.com/hashicorp/terraform/tree/master/builtin/providers/vsphere)
+
+* [VMware VIC Engine](https://github.com/vmware/vic)
+
+* [Travis CI](https://github.com/travis-ci/jupiter-brain)
+
+* [Gru](https://github.com/dnaeon/gru)
+
+## License
+
+govmomi is available under the [Apache 2 license](LICENSE).
diff --git a/vendor/github.com/vmware/govmomi/client.go b/vendor/github.com/vmware/govmomi/client.go
new file mode 100644
index 0000000000..e3dc7976a2
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/client.go
@@ -0,0 +1,167 @@
+/*
+Copyright (c) 2014-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.
+*/
+
+/*
+This package is the root package of the govmomi library.
+
+The library is structured as follows:
+
+Package vim25
+
+The minimal usable functionality is available through the vim25 package.
+It contains subpackages that contain generated types, managed objects, and all
+available methods. The vim25 package is entirely independent of the other
+packages in the govmomi tree -- it has no dependencies on its peers.
+
+The vim25 package itself contains a client structure that is
+passed around throughout the entire library. It abstracts a session and its
+immutable state. See the vim25 package for more information.
+
+Package session
+
+The session package contains an abstraction for the session manager that allows
+a user to login and logout. It also provides access to the current session
+(i.e. to determine if the user is in fact logged in)
+
+Package object
+
+The object package contains wrappers for a selection of managed objects. The
+constructors of these objects all take a *vim25.Client, which they pass along
+to derived objects, if applicable.
+
+Package govc
+
+The govc package contains the govc CLI. The code in this tree is not intended
+to be used as a library. Any functionality that govc contains that _could_ be
+used as a library function but isn't, _should_ live in a root level package.
+
+Other packages
+
+Other packages, such as "event", "guest", or "license", provide wrappers for
+the respective subsystems. They are typically not needed in normal workflows so
+are kept outside the object package.
+*/
+package govmomi
+
+import (
+	"context"
+	"crypto/tls"
+	"net/url"
+
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/session"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type Client struct {
+	*vim25.Client
+
+	SessionManager *session.Manager
+}
+
+// NewClient creates a new client from a URL. The client authenticates with the
+// server with username/password before returning if the URL contains user information.
+func NewClient(ctx context.Context, u *url.URL, insecure bool) (*Client, error) {
+	soapClient := soap.NewClient(u, insecure)
+	vimClient, err := vim25.NewClient(ctx, soapClient)
+	if err != nil {
+		return nil, err
+	}
+
+	c := &Client{
+		Client:         vimClient,
+		SessionManager: session.NewManager(vimClient),
+	}
+
+	// Only login if the URL contains user information.
+	if u.User != nil {
+		err = c.Login(ctx, u.User)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	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.
+	defer c.Client.CloseIdleConnections()
+	return c.SessionManager.Logout(ctx)
+}
+
+// PropertyCollector returns the session's default property collector.
+func (c *Client) PropertyCollector() *property.Collector {
+	return property.DefaultCollector(c.Client)
+}
+
+// RetrieveOne dispatches to the Retrieve function on the default property collector.
+func (c *Client) RetrieveOne(ctx context.Context, obj types.ManagedObjectReference, p []string, dst interface{}) error {
+	return c.PropertyCollector().RetrieveOne(ctx, obj, p, dst)
+}
+
+// Retrieve dispatches to the Retrieve function on the default property collector.
+func (c *Client) Retrieve(ctx context.Context, objs []types.ManagedObjectReference, p []string, dst interface{}) error {
+	return c.PropertyCollector().Retrieve(ctx, objs, p, dst)
+}
+
+// Wait dispatches to property.Wait.
+func (c *Client) Wait(ctx context.Context, obj types.ManagedObjectReference, ps []string, f func([]types.PropertyChange) bool) error {
+	return property.Wait(ctx, c.PropertyCollector(), obj, ps, f)
+}
+
+// IsVC returns true if we are connected to a vCenter
+func (c *Client) IsVC() bool {
+	return c.Client.IsVC()
+}
diff --git a/vendor/github.com/vmware/govmomi/client_test.go b/vendor/github.com/vmware/govmomi/client_test.go
new file mode 100644
index 0000000000..a28b272d7b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/client_test.go
@@ -0,0 +1,138 @@
+/*
+Copyright (c) 2014-2015 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 govmomi
+
+import (
+	"context"
+	"errors"
+	"net/http"
+	"net/url"
+	"testing"
+
+	"github.com/vmware/govmomi/test"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+func TestNewClient(t *testing.T) {
+	u := test.URL()
+	if u == nil {
+		t.SkipNow()
+	}
+
+	c, err := NewClient(context.Background(), u, true)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	f := func() error {
+		var x mo.Folder
+		err = mo.RetrieveProperties(context.Background(), c, c.ServiceContent.PropertyCollector, c.ServiceContent.RootFolder, &x)
+		if err != nil {
+			return err
+		}
+		if len(x.Name) == 0 {
+			return errors.New("empty response")
+		}
+		return nil
+	}
+
+	// check cookie is valid with an sdk request
+	if err := f(); err != nil {
+		t.Fatal(err)
+	}
+
+	// check cookie is valid with a non-sdk request
+	u.User = nil // turn off Basic auth
+	u.Path = "/folder"
+	r, err := c.Client.Get(u.String())
+	if err != nil {
+		t.Fatal(err)
+	}
+	if r.StatusCode != http.StatusOK {
+		t.Fatal(r)
+	}
+
+	// sdk request should fail w/o a valid cookie
+	c.Client.Jar = nil
+	if err := f(); err == nil {
+		t.Fatal("should fail")
+	}
+
+	// invalid login
+	u.Path = "/sdk"
+	u.User = url.UserPassword("ENOENT", "EINVAL")
+	_, err = NewClient(context.Background(), u, true)
+	if err == nil {
+		t.Fatal("should fail")
+	}
+}
+
+func TestInvalidSdk(t *testing.T) {
+	u := test.URL()
+	if u == nil {
+		t.SkipNow()
+	}
+
+	// a URL other than a valid /sdk should error, not panic
+	u.Path = "/mob"
+	_, err := NewClient(context.Background(), u, true)
+	if err == nil {
+		t.Fatal("should fail")
+	}
+}
+
+func TestPropertiesN(t *testing.T) {
+	u := test.URL()
+	if u == nil {
+		t.SkipNow()
+	}
+
+	c, err := NewClient(context.Background(), u, true)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var f mo.Folder
+	err = c.RetrieveOne(context.Background(), c.ServiceContent.RootFolder, nil, &f)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var dc mo.Datacenter
+	err = c.RetrieveOne(context.Background(), f.ChildEntity[0], nil, &dc)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var folderReferences = []types.ManagedObjectReference{
+		dc.DatastoreFolder,
+		dc.HostFolder,
+		dc.NetworkFolder,
+		dc.VmFolder,
+	}
+
+	var folders []mo.Folder
+	err = c.Retrieve(context.Background(), folderReferences, []string{"name"}, &folders)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(folders) != len(folderReferences) {
+		t.Fatalf("Expected %d, got %d", len(folderReferences), len(folders))
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/event/history_collector.go b/vendor/github.com/vmware/govmomi/event/history_collector.go
new file mode 100644
index 0000000000..f3165b7032
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/event/history_collector.go
@@ -0,0 +1,76 @@
+/*
+Copyright (c) 2015 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 event
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type HistoryCollector struct {
+	*object.HistoryCollector
+}
+
+func NewHistoryCollector(c *vim25.Client, ref types.ManagedObjectReference) *HistoryCollector {
+	return &HistoryCollector{
+		HistoryCollector: object.NewHistoryCollector(c, ref),
+	}
+}
+
+func (h HistoryCollector) LatestPage(ctx context.Context) ([]types.BaseEvent, error) {
+	var o mo.EventHistoryCollector
+
+	err := h.Properties(ctx, h.Reference(), []string{"latestPage"}, &o)
+	if err != nil {
+		return nil, err
+	}
+
+	return o.LatestPage, nil
+}
+
+func (h HistoryCollector) ReadNextEvents(ctx context.Context, maxCount int32) ([]types.BaseEvent, error) {
+	req := types.ReadNextEvents{
+		This:     h.Reference(),
+		MaxCount: maxCount,
+	}
+
+	res, err := methods.ReadNextEvents(ctx, h.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, nil
+}
+
+func (h HistoryCollector) ReadPreviousEvents(ctx context.Context, maxCount int32) ([]types.BaseEvent, error) {
+	req := types.ReadPreviousEvents{
+		This:     h.Reference(),
+		MaxCount: maxCount,
+	}
+
+	res, err := methods.ReadPreviousEvents(ctx, h.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/event/manager.go b/vendor/github.com/vmware/govmomi/event/manager.go
new file mode 100644
index 0000000000..00ab27f52b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/event/manager.go
@@ -0,0 +1,176 @@
+/*
+Copyright (c) 2015 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 event
+
+import (
+	"context"
+	"fmt"
+	"reflect"
+	"sync"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type Manager struct {
+	object.Common
+
+	eventCategory   map[string]string
+	eventCategoryMu *sync.Mutex
+	maxObjects      int
+}
+
+func NewManager(c *vim25.Client) *Manager {
+	m := Manager{
+		Common: object.NewCommon(c, *c.ServiceContent.EventManager),
+
+		eventCategory:   make(map[string]string),
+		eventCategoryMu: new(sync.Mutex),
+		maxObjects:      10,
+	}
+
+	return &m
+}
+
+func (m Manager) CreateCollectorForEvents(ctx context.Context, filter types.EventFilterSpec) (*HistoryCollector, error) {
+	req := types.CreateCollectorForEvents{
+		This:   m.Common.Reference(),
+		Filter: filter,
+	}
+
+	res, err := methods.CreateCollectorForEvents(ctx, m.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewHistoryCollector(m.Client(), res.Returnval), nil
+}
+
+func (m Manager) LogUserEvent(ctx context.Context, entity types.ManagedObjectReference, msg string) error {
+	req := types.LogUserEvent{
+		This:   m.Common.Reference(),
+		Entity: entity,
+		Msg:    msg,
+	}
+
+	_, err := methods.LogUserEvent(ctx, m.Client(), &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (m Manager) PostEvent(ctx context.Context, eventToPost types.BaseEvent, taskInfo types.TaskInfo) error {
+	req := types.PostEvent{
+		This:        m.Common.Reference(),
+		EventToPost: eventToPost,
+		TaskInfo:    &taskInfo,
+	}
+
+	_, err := methods.PostEvent(ctx, m.Client(), &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (m Manager) QueryEvents(ctx context.Context, filter types.EventFilterSpec) ([]types.BaseEvent, error) {
+	req := types.QueryEvents{
+		This:   m.Common.Reference(),
+		Filter: filter,
+	}
+
+	res, err := methods.QueryEvents(ctx, m.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, nil
+}
+
+func (m Manager) RetrieveArgumentDescription(ctx context.Context, eventTypeID string) ([]types.EventArgDesc, error) {
+	req := types.RetrieveArgumentDescription{
+		This:        m.Common.Reference(),
+		EventTypeId: eventTypeID,
+	}
+
+	res, err := methods.RetrieveArgumentDescription(ctx, m.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, nil
+}
+
+func (m Manager) eventCategoryMap(ctx context.Context) (map[string]string, error) {
+	m.eventCategoryMu.Lock()
+	defer m.eventCategoryMu.Unlock()
+
+	if len(m.eventCategory) != 0 {
+		return m.eventCategory, nil
+	}
+
+	var o mo.EventManager
+
+	ps := []string{"description.eventInfo"}
+	err := property.DefaultCollector(m.Client()).RetrieveOne(ctx, m.Common.Reference(), ps, &o)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, info := range o.Description.EventInfo {
+		m.eventCategory[info.Key] = info.Category
+	}
+
+	return m.eventCategory, nil
+}
+
+// EventCategory returns the category for an event, such as "info" or "error" for example.
+func (m Manager) EventCategory(ctx context.Context, event types.BaseEvent) (string, error) {
+	// Most of the event details are included in the Event.FullFormattedMessage, but the category
+	// is only available via the EventManager description.eventInfo property.  The value of this
+	// property is static, so we fetch and once and cache.
+	eventCategory, err := m.eventCategoryMap(ctx)
+	if err != nil {
+		return "", err
+	}
+
+	class := reflect.TypeOf(event).Elem().Name()
+
+	return eventCategory[class], nil
+}
+
+// Get the events from the specified object(s) and optionanlly tail the event stream
+func (m Manager) Events(ctx context.Context, objects []types.ManagedObjectReference, pageSize int32, tail bool, force bool, f func(types.ManagedObjectReference, []types.BaseEvent) error) error {
+
+	if len(objects) >= m.maxObjects && !force {
+		return fmt.Errorf("Maximum number of objects to monitor (%d) exceeded, refine search", m.maxObjects)
+	}
+
+	proc := newEventProcessor(m, pageSize, f)
+	for _, o := range objects {
+		proc.addObject(ctx, o)
+	}
+
+	return proc.run(ctx, tail)
+}
diff --git a/vendor/github.com/vmware/govmomi/event/processor.go b/vendor/github.com/vmware/govmomi/event/processor.go
new file mode 100644
index 0000000000..1f287b8dc6
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/event/processor.go
@@ -0,0 +1,195 @@
+/*
+Copyright (c) 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 event
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/view"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+const latestPageProp = "latestPage"
+
+type tailInfo struct {
+	t         *eventTailer
+	obj       types.ManagedObjectReference
+	collector types.ManagedObjectReference
+}
+
+type eventProcessor struct {
+	mgr      Manager
+	pageSize int32
+	tailers  map[types.ManagedObjectReference]*tailInfo // tailers by collector ref
+	callback func(types.ManagedObjectReference, []types.BaseEvent) error
+}
+
+func newEventProcessor(mgr Manager, pageSize int32, callback func(types.ManagedObjectReference, []types.BaseEvent) error) *eventProcessor {
+	return &eventProcessor{
+		mgr:      mgr,
+		tailers:  make(map[types.ManagedObjectReference]*tailInfo),
+		callback: callback,
+		pageSize: pageSize,
+	}
+}
+
+func (p *eventProcessor) addObject(ctx context.Context, obj types.ManagedObjectReference) error {
+	filter := types.EventFilterSpec{
+		Entity: &types.EventFilterSpecByEntity{
+			Entity:    obj,
+			Recursion: types.EventFilterSpecRecursionOptionAll,
+		},
+	}
+
+	collector, err := p.mgr.CreateCollectorForEvents(ctx, filter)
+	if err != nil {
+		return fmt.Errorf("[%#v] %s", obj, err)
+	}
+
+	err = collector.SetPageSize(ctx, p.pageSize)
+	if err != nil {
+		return err
+	}
+
+	p.tailers[collector.Reference()] = &tailInfo{
+		t:         newEventTailer(),
+		obj:       obj,
+		collector: collector.Reference(),
+	}
+
+	return nil
+}
+
+func (p *eventProcessor) run(ctx context.Context, tail bool) error {
+	if len(p.tailers) == 0 {
+		return nil
+	}
+
+	var err error
+	var collectors []types.ManagedObjectReference
+	for _, t := range p.tailers {
+		collectors = append(collectors, t.collector)
+	}
+
+	if len(p.tailers) > 1 {
+		// create and populate a ListView
+		viewMgr := view.NewManager(p.mgr.Client())
+		var listView *view.ListView
+		listView, err = viewMgr.CreateListView(ctx, collectors)
+		if err != nil {
+			return err
+		}
+
+		count := 0
+		// Retrieve the property from the objects in the ListView
+		err = property.WaitForView(ctx, property.DefaultCollector(p.mgr.Client()), listView.Reference(), collectors[0], []string{latestPageProp}, func(c types.ManagedObjectReference, pc []types.PropertyChange) bool {
+			if err = p.process(c, pc); err != nil {
+				return false
+			}
+
+			count++
+			if count == len(collectors) && !tail {
+				return true
+			}
+
+			return false
+		})
+
+		return err
+	}
+
+	// only one object to follow
+	err = property.Wait(ctx, property.DefaultCollector(p.mgr.Client()), collectors[0], []string{latestPageProp}, func(pc []types.PropertyChange) bool {
+		if err = p.process(collectors[0], pc); err != nil {
+			return false
+		}
+
+		if !tail {
+			return true
+		}
+
+		return false
+	})
+
+	return err
+}
+
+func (p *eventProcessor) process(c types.ManagedObjectReference, pc []types.PropertyChange) error {
+	t := p.tailers[c]
+	if t == nil {
+		return fmt.Errorf("unknown collector %s", c.String())
+	}
+
+	for _, u := range pc {
+		if u.Name != latestPageProp {
+			continue
+		}
+
+		evs := t.t.newEvents(u.Val.(types.ArrayOfEvent).Event)
+		if len(evs) == 0 {
+			continue
+		}
+
+		if err := p.callback(t.obj, evs); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+const invalidKey = int32(-1)
+
+type eventTailer struct {
+	lastKey int32
+}
+
+func newEventTailer() *eventTailer {
+	return &eventTailer{
+		lastKey: invalidKey,
+	}
+}
+
+func (t *eventTailer) newEvents(evs []types.BaseEvent) []types.BaseEvent {
+	var ret []types.BaseEvent
+	if t.lastKey == invalidKey {
+		ret = evs
+	} else {
+		found := false
+		for i := range evs {
+			if evs[i].GetEvent().Key != t.lastKey {
+				continue
+			}
+
+			found = true
+			ret = evs[:i]
+			break
+		}
+
+		if !found {
+			ret = evs
+		}
+	}
+
+	if len(ret) > 0 {
+		t.lastKey = ret[0].GetEvent().Key
+	}
+
+	return ret
+}
diff --git a/vendor/github.com/vmware/govmomi/event/sort.go b/vendor/github.com/vmware/govmomi/event/sort.go
new file mode 100644
index 0000000000..dab2b2c376
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/event/sort.go
@@ -0,0 +1,45 @@
+/*
+Copyright (c) 2015 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 event
+
+import (
+	"sort"
+
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+// Sort events in ascending order base on Key
+// From the EventHistoryCollector.latestPage sdk docs:
+//   The "oldest event" is the one with the smallest key (event ID).
+//   The events in the returned page are unordered.
+func Sort(events []types.BaseEvent) {
+	sort.Sort(baseEvent(events))
+}
+
+type baseEvent []types.BaseEvent
+
+func (d baseEvent) Len() int {
+	return len(d)
+}
+
+func (d baseEvent) Less(i, j int) bool {
+	return d[i].GetEvent().Key < d[j].GetEvent().Key
+}
+
+func (d baseEvent) Swap(i, j int) {
+	d[i], d[j] = d[j], d[i]
+}
diff --git a/vendor/github.com/vmware/govmomi/examples/datastores/main.go b/vendor/github.com/vmware/govmomi/examples/datastores/main.go
new file mode 100644
index 0000000000..87902e87df
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/examples/datastores/main.go
@@ -0,0 +1,180 @@
+/*
+Copyright (c) 2015 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.
+*/
+
+/*
+This example program shows how the `finder` and `property` packages can
+be used to navigate a vSphere inventory structure using govmomi.
+*/
+
+package main
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"net/url"
+	"os"
+	"strings"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi"
+	"github.com/vmware/govmomi/find"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/units"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+// GetEnvString returns string from environment variable.
+func GetEnvString(v string, def string) string {
+	r := os.Getenv(v)
+	if r == "" {
+		return def
+	}
+
+	return r
+}
+
+// GetEnvBool returns boolean from environment variable.
+func GetEnvBool(v string, def bool) bool {
+	r := os.Getenv(v)
+	if r == "" {
+		return def
+	}
+
+	switch strings.ToLower(r[0:1]) {
+	case "t", "y", "1":
+		return true
+	}
+
+	return false
+}
+
+const (
+	envURL      = "GOVMOMI_URL"
+	envUserName = "GOVMOMI_USERNAME"
+	envPassword = "GOVMOMI_PASSWORD"
+	envInsecure = "GOVMOMI_INSECURE"
+)
+
+var urlDescription = fmt.Sprintf("ESX or vCenter URL [%s]", envURL)
+var urlFlag = flag.String("url", GetEnvString(envURL, "https://username:password@host/sdk"), urlDescription)
+
+var insecureDescription = fmt.Sprintf("Don't verify the server's certificate chain [%s]", envInsecure)
+var insecureFlag = flag.Bool("insecure", GetEnvBool(envInsecure, false), insecureDescription)
+
+func processOverride(u *url.URL) {
+	envUsername := os.Getenv(envUserName)
+	envPassword := os.Getenv(envPassword)
+
+	// Override username if provided
+	if envUsername != "" {
+		var password string
+		var ok bool
+
+		if u.User != nil {
+			password, ok = u.User.Password()
+		}
+
+		if ok {
+			u.User = url.UserPassword(envUsername, password)
+		} else {
+			u.User = url.User(envUsername)
+		}
+	}
+
+	// Override password if provided
+	if envPassword != "" {
+		var username string
+
+		if u.User != nil {
+			username = u.User.Username()
+		}
+
+		u.User = url.UserPassword(username, envPassword)
+	}
+}
+
+func exit(err error) {
+	fmt.Fprintf(os.Stderr, "Error: %s\n", err)
+	os.Exit(1)
+}
+
+func main() {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	flag.Parse()
+
+	// Parse URL from string
+	u, err := url.Parse(*urlFlag)
+	if err != nil {
+		exit(err)
+	}
+
+	// Override username and/or password as required
+	processOverride(u)
+
+	// Connect and log in to ESX or vCenter
+	c, err := govmomi.NewClient(ctx, u, *insecureFlag)
+	if err != nil {
+		exit(err)
+	}
+
+	f := find.NewFinder(c.Client, true)
+
+	// Find one and only datacenter
+	dc, err := f.DefaultDatacenter(ctx)
+	if err != nil {
+		exit(err)
+	}
+
+	// Make future calls local to this datacenter
+	f.SetDatacenter(dc)
+
+	// Find datastores in datacenter
+	dss, err := f.DatastoreList(ctx, "*")
+	if err != nil {
+		exit(err)
+	}
+
+	pc := property.DefaultCollector(c.Client)
+
+	// Convert datastores into list of references
+	var refs []types.ManagedObjectReference
+	for _, ds := range dss {
+		refs = append(refs, ds.Reference())
+	}
+
+	// Retrieve summary property for all datastores
+	var dst []mo.Datastore
+	err = pc.Retrieve(ctx, refs, []string{"summary"}, &dst)
+	if err != nil {
+		exit(err)
+	}
+
+	// Print summary per datastore
+	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
+	fmt.Fprintf(tw, "Name:\tType:\tCapacity:\tFree:\n")
+	for _, ds := range dst {
+		fmt.Fprintf(tw, "%s\t", ds.Summary.Name)
+		fmt.Fprintf(tw, "%s\t", ds.Summary.Type)
+		fmt.Fprintf(tw, "%s\t", units.ByteSize(ds.Summary.Capacity))
+		fmt.Fprintf(tw, "%s\t", units.ByteSize(ds.Summary.FreeSpace))
+		fmt.Fprintf(tw, "\n")
+	}
+	tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/find/doc.go b/vendor/github.com/vmware/govmomi/find/doc.go
new file mode 100644
index 0000000000..75f05d81e4
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/find/doc.go
@@ -0,0 +1,34 @@
+/*
+Copyright (c) 2014-2017 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 find implements inventory listing and searching.
+
+The Finder is an alternative to the object.SearchIndex FindByInventoryPath() and FindChild() methods.
+SearchIndex.FindByInventoryPath requires an absolute path, whereas the Finder also supports relative paths
+and patterns via filepath.Match.
+SearchIndex.FindChild requires a parent to find the child, whereas the Finder also supports an ancestor via
+recursive object traversal.
+
+The various Finder methods accept a "path" argument, which can absolute or relative to the Folder for the object type.
+The Finder supports two modes, "list" and "find".  The "list" mode behaves like the "ls" command, only searching within
+the immediate path.  The "find" mode behaves like the "find" command, with the search starting at the immediate path but
+also recursing into sub Folders relative to the Datacenter.  The default mode is "list" if the given path contains a "/",
+otherwise "find" mode is used.
+
+See also: https://github.com/vmware/govmomi/blob/master/govc/README.md#usage
+*/
+package find
diff --git a/vendor/github.com/vmware/govmomi/find/error.go b/vendor/github.com/vmware/govmomi/find/error.go
new file mode 100644
index 0000000000..684526dab7
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/find/error.go
@@ -0,0 +1,64 @@
+/*
+Copyright (c) 2015 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 find
+
+import "fmt"
+
+type NotFoundError struct {
+	kind string
+	path string
+}
+
+func (e *NotFoundError) Error() string {
+	return fmt.Sprintf("%s '%s' not found", e.kind, e.path)
+}
+
+type MultipleFoundError struct {
+	kind string
+	path string
+}
+
+func (e *MultipleFoundError) Error() string {
+	return fmt.Sprintf("path '%s' resolves to multiple %ss", e.path, e.kind)
+}
+
+type DefaultNotFoundError struct {
+	kind string
+}
+
+func (e *DefaultNotFoundError) Error() string {
+	return fmt.Sprintf("no default %s found", e.kind)
+}
+
+type DefaultMultipleFoundError struct {
+	kind string
+}
+
+func (e DefaultMultipleFoundError) Error() string {
+	return fmt.Sprintf("default %s resolves to multiple instances, please specify", e.kind)
+}
+
+func toDefaultError(err error) error {
+	switch e := err.(type) {
+	case *NotFoundError:
+		return &DefaultNotFoundError{e.kind}
+	case *MultipleFoundError:
+		return &DefaultMultipleFoundError{e.kind}
+	default:
+		return err
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/find/finder.go b/vendor/github.com/vmware/govmomi/find/finder.go
new file mode 100644
index 0000000000..053b984fcb
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/find/finder.go
@@ -0,0 +1,984 @@
+/*
+Copyright (c) 2014-2017 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 find
+
+import (
+	"context"
+	"errors"
+	"path"
+	"strings"
+
+	"github.com/vmware/govmomi/list"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type Finder struct {
+	client  *vim25.Client
+	r       recurser
+	dc      *object.Datacenter
+	folders *object.DatacenterFolders
+}
+
+func NewFinder(client *vim25.Client, all bool) *Finder {
+	f := &Finder{
+		client: client,
+		r: recurser{
+			Collector: property.DefaultCollector(client),
+			All:       all,
+		},
+	}
+
+	return f
+}
+
+func (f *Finder) SetDatacenter(dc *object.Datacenter) *Finder {
+	f.dc = dc
+	f.folders = nil
+	return f
+}
+
+func (f *Finder) find(ctx context.Context, arg string, s *spec) ([]list.Element, error) {
+	isPath := strings.Contains(arg, "/")
+
+	root := list.Element{
+		Path:   "/",
+		Object: object.NewRootFolder(f.client),
+	}
+
+	parts := list.ToParts(arg)
+
+	if len(parts) > 0 {
+		switch parts[0] {
+		case "..": // Not supported; many edge case, little value
+			return nil, errors.New("cannot traverse up a tree")
+		case ".": // Relative to whatever
+			pivot, err := s.Relative(ctx)
+			if err != nil {
+				return nil, err
+			}
+
+			mes, err := mo.Ancestors(ctx, f.client, f.client.ServiceContent.PropertyCollector, pivot.Reference())
+			if err != nil {
+				return nil, err
+			}
+
+			for _, me := range mes {
+				// Skip root entity in building inventory path.
+				if me.Parent == nil {
+					continue
+				}
+				root.Path = path.Join(root.Path, me.Name)
+			}
+
+			root.Object = pivot
+			parts = parts[1:]
+		}
+	}
+
+	if s.listMode(isPath) {
+		return f.r.List(ctx, s, root, parts)
+	}
+
+	s.Parents = append(s.Parents, s.Nested...)
+
+	return f.r.Find(ctx, s, root, parts)
+}
+
+func (f *Finder) datacenter() (*object.Datacenter, error) {
+	if f.dc == nil {
+		return nil, errors.New("please specify a datacenter")
+	}
+
+	return f.dc, nil
+}
+
+// datacenterPath returns the absolute path to the Datacenter containing the given ref
+func (f *Finder) datacenterPath(ctx context.Context, ref types.ManagedObjectReference) (string, error) {
+	mes, err := mo.Ancestors(ctx, f.client, f.client.ServiceContent.PropertyCollector, ref)
+	if err != nil {
+		return "", err
+	}
+
+	// Chop leaves under the Datacenter
+	for i := len(mes) - 1; i > 0; i-- {
+		if mes[i].Self.Type == "Datacenter" {
+			break
+		}
+		mes = mes[:i]
+	}
+
+	var p string
+
+	for _, me := range mes {
+		// Skip root entity in building inventory path.
+		if me.Parent == nil {
+			continue
+		}
+
+		p = p + "/" + me.Name
+	}
+
+	return p, nil
+}
+
+func (f *Finder) dcFolders(ctx context.Context) (*object.DatacenterFolders, error) {
+	if f.folders != nil {
+		return f.folders, nil
+	}
+
+	dc, err := f.datacenter()
+	if err != nil {
+		return nil, err
+	}
+
+	folders, err := dc.Folders(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	f.folders = folders
+
+	return f.folders, nil
+}
+
+func (f *Finder) dcReference(_ context.Context) (object.Reference, error) {
+	dc, err := f.datacenter()
+	if err != nil {
+		return nil, err
+	}
+
+	return dc, nil
+}
+
+func (f *Finder) vmFolder(ctx context.Context) (object.Reference, error) {
+	folders, err := f.dcFolders(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	return folders.VmFolder, nil
+}
+
+func (f *Finder) hostFolder(ctx context.Context) (object.Reference, error) {
+	folders, err := f.dcFolders(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	return folders.HostFolder, nil
+}
+
+func (f *Finder) datastoreFolder(ctx context.Context) (object.Reference, error) {
+	folders, err := f.dcFolders(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	return folders.DatastoreFolder, nil
+}
+
+func (f *Finder) networkFolder(ctx context.Context) (object.Reference, error) {
+	folders, err := f.dcFolders(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	return folders.NetworkFolder, nil
+}
+
+func (f *Finder) rootFolder(_ context.Context) (object.Reference, error) {
+	return object.NewRootFolder(f.client), nil
+}
+
+func (f *Finder) managedObjectList(ctx context.Context, path string, tl bool, include []string) ([]list.Element, error) {
+	fn := f.rootFolder
+
+	if f.dc != nil {
+		fn = f.dcReference
+	}
+
+	if len(path) == 0 {
+		path = "."
+	}
+
+	s := &spec{
+		Relative: fn,
+		Parents:  []string{"ComputeResource", "ClusterComputeResource", "HostSystem", "VirtualApp", "StoragePod"},
+		Include:  include,
+	}
+
+	if tl {
+		if path == "/**" || path == "./..." {
+			// TODO: support switching to find mode for any path, not just relative to f.rootFolder or f.dcReference
+			path = "*"
+		} else {
+			s.Contents = true
+			s.ListMode = types.NewBool(true)
+		}
+	}
+
+	return f.find(ctx, path, s)
+}
+
+// Element returns an Element for the given ManagedObjectReference
+// This method is only useful for looking up the InventoryPath of a ManagedObjectReference.
+func (f *Finder) Element(ctx context.Context, ref types.ManagedObjectReference) (*list.Element, error) {
+	rl := func(_ context.Context) (object.Reference, error) {
+		return ref, nil
+	}
+
+	s := &spec{
+		Relative: rl,
+	}
+
+	e, err := f.find(ctx, "./", s)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(e) == 0 {
+		return nil, &NotFoundError{ref.Type, ref.Value}
+	}
+
+	if len(e) > 1 {
+		panic("ManagedObjectReference must be unique")
+	}
+
+	return &e[0], nil
+}
+
+// ObjectReference converts the given ManagedObjectReference to a type from the object package via object.NewReference
+// with the object.Common.InventoryPath field set.
+func (f *Finder) ObjectReference(ctx context.Context, ref types.ManagedObjectReference) (object.Reference, error) {
+	e, err := f.Element(ctx, ref)
+	if err != nil {
+		return nil, err
+	}
+
+	r := object.NewReference(f.client, ref)
+
+	type common interface {
+		SetInventoryPath(string)
+	}
+
+	r.(common).SetInventoryPath(e.Path)
+
+	if f.dc != nil {
+		if ds, ok := r.(*object.Datastore); ok {
+			ds.DatacenterPath = f.dc.InventoryPath
+		}
+	}
+
+	return r, nil
+}
+
+func (f *Finder) ManagedObjectList(ctx context.Context, path string, include ...string) ([]list.Element, error) {
+	return f.managedObjectList(ctx, path, false, include)
+}
+
+func (f *Finder) ManagedObjectListChildren(ctx context.Context, path string, include ...string) ([]list.Element, error) {
+	return f.managedObjectList(ctx, path, true, include)
+}
+
+func (f *Finder) DatacenterList(ctx context.Context, path string) ([]*object.Datacenter, error) {
+	s := &spec{
+		Relative: f.rootFolder,
+		Include:  []string{"Datacenter"},
+	}
+
+	es, err := f.find(ctx, path, s)
+	if err != nil {
+		return nil, err
+	}
+
+	var dcs []*object.Datacenter
+	for _, e := range es {
+		ref := e.Object.Reference()
+		if ref.Type == "Datacenter" {
+			dc := object.NewDatacenter(f.client, ref)
+			dc.InventoryPath = e.Path
+			dcs = append(dcs, dc)
+		}
+	}
+
+	if len(dcs) == 0 {
+		return nil, &NotFoundError{"datacenter", path}
+	}
+
+	return dcs, nil
+}
+
+func (f *Finder) Datacenter(ctx context.Context, path string) (*object.Datacenter, error) {
+	dcs, err := f.DatacenterList(ctx, path)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(dcs) > 1 {
+		return nil, &MultipleFoundError{"datacenter", path}
+	}
+
+	return dcs[0], nil
+}
+
+func (f *Finder) DefaultDatacenter(ctx context.Context) (*object.Datacenter, error) {
+	dc, err := f.Datacenter(ctx, "*")
+	if err != nil {
+		return nil, toDefaultError(err)
+	}
+
+	return dc, nil
+}
+
+func (f *Finder) DatacenterOrDefault(ctx context.Context, path string) (*object.Datacenter, error) {
+	if path != "" {
+		dc, err := f.Datacenter(ctx, path)
+		if err != nil {
+			return nil, err
+		}
+		return dc, nil
+	}
+
+	return f.DefaultDatacenter(ctx)
+}
+
+func (f *Finder) DatastoreList(ctx context.Context, path string) ([]*object.Datastore, error) {
+	s := &spec{
+		Relative: f.datastoreFolder,
+		Parents:  []string{"StoragePod"},
+	}
+
+	es, err := f.find(ctx, path, s)
+	if err != nil {
+		return nil, err
+	}
+
+	var dss []*object.Datastore
+	for _, e := range es {
+		ref := e.Object.Reference()
+		if ref.Type == "Datastore" {
+			ds := object.NewDatastore(f.client, ref)
+			ds.InventoryPath = e.Path
+
+			if f.dc == nil {
+				// In this case SetDatacenter was not called and path is absolute
+				ds.DatacenterPath, err = f.datacenterPath(ctx, ref)
+				if err != nil {
+					return nil, err
+				}
+			} else {
+				ds.DatacenterPath = f.dc.InventoryPath
+			}
+
+			dss = append(dss, ds)
+		}
+	}
+
+	if len(dss) == 0 {
+		return nil, &NotFoundError{"datastore", path}
+	}
+
+	return dss, nil
+}
+
+func (f *Finder) Datastore(ctx context.Context, path string) (*object.Datastore, error) {
+	dss, err := f.DatastoreList(ctx, path)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(dss) > 1 {
+		return nil, &MultipleFoundError{"datastore", path}
+	}
+
+	return dss[0], nil
+}
+
+func (f *Finder) DefaultDatastore(ctx context.Context) (*object.Datastore, error) {
+	ds, err := f.Datastore(ctx, "*")
+	if err != nil {
+		return nil, toDefaultError(err)
+	}
+
+	return ds, nil
+}
+
+func (f *Finder) DatastoreOrDefault(ctx context.Context, path string) (*object.Datastore, error) {
+	if path != "" {
+		ds, err := f.Datastore(ctx, path)
+		if err != nil {
+			return nil, err
+		}
+		return ds, nil
+	}
+
+	return f.DefaultDatastore(ctx)
+}
+
+func (f *Finder) DatastoreClusterList(ctx context.Context, path string) ([]*object.StoragePod, error) {
+	s := &spec{
+		Relative: f.datastoreFolder,
+	}
+
+	es, err := f.find(ctx, path, s)
+	if err != nil {
+		return nil, err
+	}
+
+	var sps []*object.StoragePod
+	for _, e := range es {
+		ref := e.Object.Reference()
+		if ref.Type == "StoragePod" {
+			sp := object.NewStoragePod(f.client, ref)
+			sp.InventoryPath = e.Path
+			sps = append(sps, sp)
+		}
+	}
+
+	if len(sps) == 0 {
+		return nil, &NotFoundError{"datastore cluster", path}
+	}
+
+	return sps, nil
+}
+
+func (f *Finder) DatastoreCluster(ctx context.Context, path string) (*object.StoragePod, error) {
+	sps, err := f.DatastoreClusterList(ctx, path)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(sps) > 1 {
+		return nil, &MultipleFoundError{"datastore cluster", path}
+	}
+
+	return sps[0], nil
+}
+
+func (f *Finder) DefaultDatastoreCluster(ctx context.Context) (*object.StoragePod, error) {
+	sp, err := f.DatastoreCluster(ctx, "*")
+	if err != nil {
+		return nil, toDefaultError(err)
+	}
+
+	return sp, nil
+}
+
+func (f *Finder) DatastoreClusterOrDefault(ctx context.Context, path string) (*object.StoragePod, error) {
+	if path != "" {
+		sp, err := f.DatastoreCluster(ctx, path)
+		if err != nil {
+			return nil, err
+		}
+		return sp, nil
+	}
+
+	return f.DefaultDatastoreCluster(ctx)
+}
+
+func (f *Finder) ComputeResourceList(ctx context.Context, path string) ([]*object.ComputeResource, error) {
+	s := &spec{
+		Relative: f.hostFolder,
+	}
+
+	es, err := f.find(ctx, path, s)
+	if err != nil {
+		return nil, err
+	}
+
+	var crs []*object.ComputeResource
+	for _, e := range es {
+		var cr *object.ComputeResource
+
+		switch o := e.Object.(type) {
+		case mo.ComputeResource, mo.ClusterComputeResource:
+			cr = object.NewComputeResource(f.client, o.Reference())
+		default:
+			continue
+		}
+
+		cr.InventoryPath = e.Path
+		crs = append(crs, cr)
+	}
+
+	if len(crs) == 0 {
+		return nil, &NotFoundError{"compute resource", path}
+	}
+
+	return crs, nil
+}
+
+func (f *Finder) ComputeResource(ctx context.Context, path string) (*object.ComputeResource, error) {
+	crs, err := f.ComputeResourceList(ctx, path)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(crs) > 1 {
+		return nil, &MultipleFoundError{"compute resource", path}
+	}
+
+	return crs[0], nil
+}
+
+func (f *Finder) DefaultComputeResource(ctx context.Context) (*object.ComputeResource, error) {
+	cr, err := f.ComputeResource(ctx, "*")
+	if err != nil {
+		return nil, toDefaultError(err)
+	}
+
+	return cr, nil
+}
+
+func (f *Finder) ComputeResourceOrDefault(ctx context.Context, path string) (*object.ComputeResource, error) {
+	if path != "" {
+		cr, err := f.ComputeResource(ctx, path)
+		if err != nil {
+			return nil, err
+		}
+		return cr, nil
+	}
+
+	return f.DefaultComputeResource(ctx)
+}
+
+func (f *Finder) ClusterComputeResourceList(ctx context.Context, path string) ([]*object.ClusterComputeResource, error) {
+	s := &spec{
+		Relative: f.hostFolder,
+	}
+
+	es, err := f.find(ctx, path, s)
+	if err != nil {
+		return nil, err
+	}
+
+	var ccrs []*object.ClusterComputeResource
+	for _, e := range es {
+		var ccr *object.ClusterComputeResource
+
+		switch o := e.Object.(type) {
+		case mo.ClusterComputeResource:
+			ccr = object.NewClusterComputeResource(f.client, o.Reference())
+		default:
+			continue
+		}
+
+		ccr.InventoryPath = e.Path
+		ccrs = append(ccrs, ccr)
+	}
+
+	if len(ccrs) == 0 {
+		return nil, &NotFoundError{"cluster", path}
+	}
+
+	return ccrs, nil
+}
+
+func (f *Finder) ClusterComputeResource(ctx context.Context, path string) (*object.ClusterComputeResource, error) {
+	ccrs, err := f.ClusterComputeResourceList(ctx, path)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(ccrs) > 1 {
+		return nil, &MultipleFoundError{"cluster", path}
+	}
+
+	return ccrs[0], nil
+}
+
+func (f *Finder) HostSystemList(ctx context.Context, path string) ([]*object.HostSystem, error) {
+	s := &spec{
+		Relative: f.hostFolder,
+		Parents:  []string{"ComputeResource", "ClusterComputeResource"},
+		Include:  []string{"HostSystem"},
+	}
+
+	es, err := f.find(ctx, path, s)
+	if err != nil {
+		return nil, err
+	}
+
+	var hss []*object.HostSystem
+	for _, e := range es {
+		var hs *object.HostSystem
+
+		switch o := e.Object.(type) {
+		case mo.HostSystem:
+			hs = object.NewHostSystem(f.client, o.Reference())
+
+			hs.InventoryPath = e.Path
+			hss = append(hss, hs)
+		case mo.ComputeResource, mo.ClusterComputeResource:
+			cr := object.NewComputeResource(f.client, o.Reference())
+
+			cr.InventoryPath = e.Path
+
+			hosts, err := cr.Hosts(ctx)
+			if err != nil {
+				return nil, err
+			}
+
+			hss = append(hss, hosts...)
+		}
+	}
+
+	if len(hss) == 0 {
+		return nil, &NotFoundError{"host", path}
+	}
+
+	return hss, nil
+}
+
+func (f *Finder) HostSystem(ctx context.Context, path string) (*object.HostSystem, error) {
+	hss, err := f.HostSystemList(ctx, path)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(hss) > 1 {
+		return nil, &MultipleFoundError{"host", path}
+	}
+
+	return hss[0], nil
+}
+
+func (f *Finder) DefaultHostSystem(ctx context.Context) (*object.HostSystem, error) {
+	hs, err := f.HostSystem(ctx, "*/*")
+	if err != nil {
+		return nil, toDefaultError(err)
+	}
+
+	return hs, nil
+}
+
+func (f *Finder) HostSystemOrDefault(ctx context.Context, path string) (*object.HostSystem, error) {
+	if path != "" {
+		hs, err := f.HostSystem(ctx, path)
+		if err != nil {
+			return nil, err
+		}
+		return hs, nil
+	}
+
+	return f.DefaultHostSystem(ctx)
+}
+
+func (f *Finder) NetworkList(ctx context.Context, path string) ([]object.NetworkReference, error) {
+	s := &spec{
+		Relative: f.networkFolder,
+	}
+
+	es, err := f.find(ctx, path, s)
+	if err != nil {
+		return nil, err
+	}
+
+	var ns []object.NetworkReference
+	for _, e := range es {
+		ref := e.Object.Reference()
+		switch ref.Type {
+		case "Network", "OpaqueNetwork":
+			r := object.NewNetwork(f.client, ref)
+			r.InventoryPath = e.Path
+			ns = append(ns, r)
+		case "DistributedVirtualPortgroup":
+			r := object.NewDistributedVirtualPortgroup(f.client, ref)
+			r.InventoryPath = e.Path
+			ns = append(ns, r)
+		case "DistributedVirtualSwitch", "VmwareDistributedVirtualSwitch":
+			r := object.NewDistributedVirtualSwitch(f.client, ref)
+			r.InventoryPath = e.Path
+			ns = append(ns, r)
+		}
+	}
+
+	if len(ns) == 0 {
+		return nil, &NotFoundError{"network", path}
+	}
+
+	return ns, nil
+}
+
+func (f *Finder) Network(ctx context.Context, path string) (object.NetworkReference, error) {
+	networks, err := f.NetworkList(ctx, path)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(networks) > 1 {
+		return nil, &MultipleFoundError{"network", path}
+	}
+
+	return networks[0], nil
+}
+
+func (f *Finder) DefaultNetwork(ctx context.Context) (object.NetworkReference, error) {
+	network, err := f.Network(ctx, "*")
+	if err != nil {
+		return nil, toDefaultError(err)
+	}
+
+	return network, nil
+}
+
+func (f *Finder) NetworkOrDefault(ctx context.Context, path string) (object.NetworkReference, error) {
+	if path != "" {
+		network, err := f.Network(ctx, path)
+		if err != nil {
+			return nil, err
+		}
+		return network, nil
+	}
+
+	return f.DefaultNetwork(ctx)
+}
+
+func (f *Finder) ResourcePoolList(ctx context.Context, path string) ([]*object.ResourcePool, error) {
+	s := &spec{
+		Relative: f.hostFolder,
+		Parents:  []string{"ComputeResource", "ClusterComputeResource", "VirtualApp"},
+		Nested:   []string{"ResourcePool"},
+		Contents: true,
+	}
+
+	es, err := f.find(ctx, path, s)
+	if err != nil {
+		return nil, err
+	}
+
+	var rps []*object.ResourcePool
+	for _, e := range es {
+		var rp *object.ResourcePool
+
+		switch o := e.Object.(type) {
+		case mo.ResourcePool:
+			rp = object.NewResourcePool(f.client, o.Reference())
+			rp.InventoryPath = e.Path
+			rps = append(rps, rp)
+		}
+	}
+
+	if len(rps) == 0 {
+		return nil, &NotFoundError{"resource pool", path}
+	}
+
+	return rps, nil
+}
+
+func (f *Finder) ResourcePool(ctx context.Context, path string) (*object.ResourcePool, error) {
+	rps, err := f.ResourcePoolList(ctx, path)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(rps) > 1 {
+		return nil, &MultipleFoundError{"resource pool", path}
+	}
+
+	return rps[0], nil
+}
+
+func (f *Finder) DefaultResourcePool(ctx context.Context) (*object.ResourcePool, error) {
+	rp, err := f.ResourcePool(ctx, "*/Resources")
+	if err != nil {
+		return nil, toDefaultError(err)
+	}
+
+	return rp, nil
+}
+
+func (f *Finder) ResourcePoolOrDefault(ctx context.Context, path string) (*object.ResourcePool, error) {
+	if path != "" {
+		rp, err := f.ResourcePool(ctx, path)
+		if err != nil {
+			return nil, err
+		}
+		return rp, nil
+	}
+
+	return f.DefaultResourcePool(ctx)
+}
+
+// ResourcePoolListAll combines ResourcePoolList and VirtualAppList
+// VirtualAppList is only called if ResourcePoolList does not find any pools with the given path.
+func (f *Finder) ResourcePoolListAll(ctx context.Context, path string) ([]*object.ResourcePool, error) {
+	pools, err := f.ResourcePoolList(ctx, path)
+	if err != nil {
+		if _, ok := err.(*NotFoundError); !ok {
+			return nil, err
+		}
+
+		vapps, _ := f.VirtualAppList(ctx, path)
+
+		if len(vapps) == 0 {
+			return nil, err
+		}
+
+		for _, vapp := range vapps {
+			pools = append(pools, vapp.ResourcePool)
+		}
+	}
+
+	return pools, nil
+}
+
+func (f *Finder) DefaultFolder(ctx context.Context) (*object.Folder, error) {
+	ref, err := f.vmFolder(ctx)
+	if err != nil {
+		return nil, toDefaultError(err)
+	}
+	folder := object.NewFolder(f.client, ref.Reference())
+
+	return folder, nil
+}
+
+func (f *Finder) FolderOrDefault(ctx context.Context, path string) (*object.Folder, error) {
+	if path != "" {
+		folder, err := f.Folder(ctx, path)
+		if err != nil {
+			return nil, err
+		}
+		return folder, nil
+	}
+	return f.DefaultFolder(ctx)
+}
+
+func (f *Finder) VirtualMachineList(ctx context.Context, path string) ([]*object.VirtualMachine, error) {
+	s := &spec{
+		Relative: f.vmFolder,
+		Parents:  []string{"VirtualApp"},
+	}
+
+	es, err := f.find(ctx, path, s)
+	if err != nil {
+		return nil, err
+	}
+
+	var vms []*object.VirtualMachine
+	for _, e := range es {
+		switch o := e.Object.(type) {
+		case mo.VirtualMachine:
+			vm := object.NewVirtualMachine(f.client, o.Reference())
+			vm.InventoryPath = e.Path
+			vms = append(vms, vm)
+		}
+	}
+
+	if len(vms) == 0 {
+		return nil, &NotFoundError{"vm", path}
+	}
+
+	return vms, nil
+}
+
+func (f *Finder) VirtualMachine(ctx context.Context, path string) (*object.VirtualMachine, error) {
+	vms, err := f.VirtualMachineList(ctx, path)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(vms) > 1 {
+		return nil, &MultipleFoundError{"vm", path}
+	}
+
+	return vms[0], nil
+}
+
+func (f *Finder) VirtualAppList(ctx context.Context, path string) ([]*object.VirtualApp, error) {
+	s := &spec{
+		Relative: f.vmFolder,
+	}
+
+	es, err := f.find(ctx, path, s)
+	if err != nil {
+		return nil, err
+	}
+
+	var apps []*object.VirtualApp
+	for _, e := range es {
+		switch o := e.Object.(type) {
+		case mo.VirtualApp:
+			app := object.NewVirtualApp(f.client, o.Reference())
+			app.InventoryPath = e.Path
+			apps = append(apps, app)
+		}
+	}
+
+	if len(apps) == 0 {
+		return nil, &NotFoundError{"app", path}
+	}
+
+	return apps, nil
+}
+
+func (f *Finder) VirtualApp(ctx context.Context, path string) (*object.VirtualApp, error) {
+	apps, err := f.VirtualAppList(ctx, path)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(apps) > 1 {
+		return nil, &MultipleFoundError{"app", path}
+	}
+
+	return apps[0], nil
+}
+
+func (f *Finder) FolderList(ctx context.Context, path string) ([]*object.Folder, error) {
+	es, err := f.ManagedObjectList(ctx, path)
+	if err != nil {
+		return nil, err
+	}
+
+	var folders []*object.Folder
+
+	for _, e := range es {
+		switch o := e.Object.(type) {
+		case mo.Folder, mo.StoragePod:
+			folder := object.NewFolder(f.client, o.Reference())
+			folder.InventoryPath = e.Path
+			folders = append(folders, folder)
+		case *object.Folder:
+			// RootFolder
+			folders = append(folders, o)
+		}
+	}
+
+	if len(folders) == 0 {
+		return nil, &NotFoundError{"folder", path}
+	}
+
+	return folders, nil
+}
+
+func (f *Finder) Folder(ctx context.Context, path string) (*object.Folder, error) {
+	folders, err := f.FolderList(ctx, path)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(folders) > 1 {
+		return nil, &MultipleFoundError{"folder", path}
+	}
+
+	return folders[0], nil
+}
diff --git a/vendor/github.com/vmware/govmomi/find/recurser.go b/vendor/github.com/vmware/govmomi/find/recurser.go
new file mode 100644
index 0000000000..533fa9e386
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/find/recurser.go
@@ -0,0 +1,246 @@
+/*
+Copyright (c) 2014-2017 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 find
+
+import (
+	"context"
+	"os"
+	"path"
+	"path/filepath"
+
+	"github.com/vmware/govmomi/list"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25/mo"
+)
+
+// spec is used to specify per-search configuration, independent of the Finder instance.
+type spec struct {
+	// Relative returns the root object to resolve Relative paths (starts with ".")
+	Relative func(ctx context.Context) (object.Reference, error)
+
+	// ListMode can be used to optionally force "ls" behavior, rather than "find" behavior
+	ListMode *bool
+
+	// Contents configures the Recurser to list the Contents of traversable leaf nodes.
+	// This is typically set to true when used from the ls command, where listing
+	// a folder means listing its Contents. This is typically set to false for
+	// commands that take managed entities that are not folders as input.
+	Contents bool
+
+	// Parents specifies the types which can contain the child types being searched for.
+	// for example, when searching for a HostSystem, parent types can be
+	// "ComputeResource" or "ClusterComputeResource".
+	Parents []string
+
+	// Include specifies which types to be included in the results, used only in "find" mode.
+	Include []string
+
+	// Nested should be set to types that can be Nested, used only in "find" mode.
+	Nested []string
+
+	// ChildType avoids traversing into folders that can't contain the Include types, used only in "find" mode.
+	ChildType []string
+}
+
+func (s *spec) traversable(o mo.Reference) bool {
+	ref := o.Reference()
+
+	switch ref.Type {
+	case "Datacenter":
+		if len(s.Include) == 1 && s.Include[0] == "Datacenter" {
+			// No point in traversing deeper as Datacenters cannot be nested
+			return false
+		}
+		return true
+	case "Folder":
+		if f, ok := o.(mo.Folder); ok {
+			// TODO: Not making use of this yet, but here we can optimize when searching the entire
+			// inventory across Datacenters for specific types, for example: 'govc ls -t VirtualMachine /**'
+			// should not traverse into a Datacenter's host, network or datatore folders.
+			if !s.traversableChildType(f.ChildType) {
+				return false
+			}
+		}
+
+		return true
+	}
+
+	for _, kind := range s.Parents {
+		if kind == ref.Type {
+			return true
+		}
+	}
+
+	return false
+}
+
+func (s *spec) traversableChildType(ctypes []string) bool {
+	if len(s.ChildType) == 0 {
+		return true
+	}
+
+	for _, t := range ctypes {
+		for _, c := range s.ChildType {
+			if t == c {
+				return true
+			}
+		}
+	}
+
+	return false
+}
+
+func (s *spec) wanted(e list.Element) bool {
+	if len(s.Include) == 0 {
+		return true
+	}
+
+	w := e.Object.Reference().Type
+
+	for _, kind := range s.Include {
+		if w == kind {
+			return true
+		}
+	}
+
+	return false
+}
+
+// listMode is a global option to revert to the original Finder behavior,
+// disabling the newer "find" mode.
+var listMode = os.Getenv("GOVMOMI_FINDER_LIST_MODE") == "true"
+
+func (s *spec) listMode(isPath bool) bool {
+	if listMode {
+		return true
+	}
+
+	if s.ListMode != nil {
+		return *s.ListMode
+	}
+
+	return isPath
+}
+
+type recurser struct {
+	Collector *property.Collector
+
+	// All configures the recurses to fetch complete objects for leaf nodes.
+	All bool
+}
+
+func (r recurser) List(ctx context.Context, s *spec, root list.Element, parts []string) ([]list.Element, error) {
+	if len(parts) == 0 {
+		// Include non-traversable leaf elements in result. For example, consider
+		// the pattern "./vm/my-vm-*", where the pattern should match the VMs and
+		// not try to traverse them.
+		//
+		// Include traversable leaf elements in result, if the contents
+		// field is set to false.
+		//
+		if !s.Contents || !s.traversable(root.Object.Reference()) {
+			return []list.Element{root}, nil
+		}
+	}
+
+	k := list.Lister{
+		Collector: r.Collector,
+		Reference: root.Object.Reference(),
+		Prefix:    root.Path,
+	}
+
+	if r.All && len(parts) < 2 {
+		k.All = true
+	}
+
+	in, err := k.List(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	// This folder is a leaf as far as the glob goes.
+	if len(parts) == 0 {
+		return in, nil
+	}
+
+	pattern := parts[0]
+	parts = parts[1:]
+
+	var out []list.Element
+	for _, e := range in {
+		matched, err := filepath.Match(pattern, path.Base(e.Path))
+		if err != nil {
+			return nil, err
+		}
+
+		if !matched {
+			continue
+		}
+
+		nres, err := r.List(ctx, s, e, parts)
+		if err != nil {
+			return nil, err
+		}
+
+		out = append(out, nres...)
+	}
+
+	return out, nil
+}
+
+func (r recurser) Find(ctx context.Context, s *spec, root list.Element, parts []string) ([]list.Element, error) {
+	var out []list.Element
+
+	if len(parts) > 0 {
+		pattern := parts[0]
+		matched, err := filepath.Match(pattern, path.Base(root.Path))
+		if err != nil {
+			return nil, err
+		}
+
+		if matched && s.wanted(root) {
+			out = append(out, root)
+		}
+	}
+
+	if !s.traversable(root.Object) {
+		return out, nil
+	}
+
+	k := list.Lister{
+		Collector: r.Collector,
+		Reference: root.Object.Reference(),
+		Prefix:    root.Path,
+	}
+
+	in, err := k.List(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, e := range in {
+		nres, err := r.Find(ctx, s, e, parts)
+		if err != nil {
+			return nil, err
+		}
+
+		out = append(out, nres...)
+	}
+
+	return out, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/gen/Gemfile b/vendor/github.com/vmware/govmomi/gen/Gemfile
new file mode 100644
index 0000000000..26a4f14774
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/gen/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "nokogiri"
diff --git a/vendor/github.com/vmware/govmomi/gen/Gemfile.lock b/vendor/github.com/vmware/govmomi/gen/Gemfile.lock
new file mode 100644
index 0000000000..6cdeaae5a3
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/gen/Gemfile.lock
@@ -0,0 +1,12 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    mini_portile (0.6.0)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  nokogiri
diff --git a/vendor/github.com/vmware/govmomi/gen/gen.sh b/vendor/github.com/vmware/govmomi/gen/gen.sh
new file mode 100755
index 0000000000..8373fcf82a
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/gen/gen.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# Copyright (c) 2014 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.
+
+set -e
+
+if [ ! -f rbvmomi/vmodl.db ]; then
+  git clone https://github.com/vmware/rbvmomi
+fi
+
+dst=../vim25
+
+pkgs=$(echo $dst/{types,methods,mo})
+mkdir -p $pkgs
+
+bundle exec ruby gen_from_wsdl.rb $dst
+bundle exec ruby gen_from_vmodl.rb $dst
+
+for p in $pkgs
+do
+  echo $p
+  cd $p
+  goimports -w *.go
+  go install
+  cd -
+done
diff --git a/vendor/github.com/vmware/govmomi/gen/gen_from_vmodl.rb b/vendor/github.com/vmware/govmomi/gen/gen_from_vmodl.rb
new file mode 100644
index 0000000000..33f72624c3
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/gen/gen_from_vmodl.rb
@@ -0,0 +1,227 @@
+# Copyright (c) 2014 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.
+
+$:.unshift(File.expand_path(File.dirname(__FILE__)))
+
+require "vim_wsdl"
+
+require "test/unit"
+
+PATH = File.expand_path("../rbvmomi", __FILE__)
+
+def read(file)
+  File.open(File.join(PATH, file))
+end
+
+class Prop
+  def initialize(vmodl, data)
+    @vmodl = vmodl
+    @data = data
+  end
+
+  def slice?
+    @data["is-array"]
+  end
+
+  def optional?
+    @data["is-optional"]
+  end
+
+  def name
+    @data["name"]
+  end
+
+  def var_field
+    n = name
+    n[0].capitalize + n[1..-1]
+  end
+
+  def var_type_prefix(base=false)
+    if slice?
+      "[]"
+    else
+      if optional? && !base
+        "*"
+      else
+        ""
+      end
+    end
+  end
+
+  def var_type
+    type = @data["wsdl_type"]
+    if @vmodl.managed_hash.has_key?(type)
+      type = "ManagedObjectReference"
+    end
+
+    # Fix up type from vmodl
+    case type
+    when "TypeName", "MethodName"
+      type = "xsd:string"
+    when "ManagedObject"
+      type = "ManagedObjectReference"
+    when "xsd:anyType"
+      type = "AnyType"
+    end
+
+    if type =~ /^xsd:(.*)$/
+      type = $1
+      case type
+      when "string"
+      when "int"
+        type = "int32"
+      when "boolean"
+        type ="bool"
+      when "long"
+        type ="int64"
+      when "dateTime"
+        type ="time.Time"
+        prefix += "*" if !slice? && optional?
+      when "byte"
+      when "double"
+        type ="float64"
+      when "float"
+        type ="float32"
+      when "short"
+        type ="int16"
+      when "base64Binary"
+        type ="[]byte"
+      else
+        raise "unknown type: %s" % type
+      end
+    else
+      if Peek.base?(type)
+        type = "Base" + type
+        base = true
+      end
+      type = "types." + type
+    end
+
+    var_type_prefix(base) + type
+  end
+
+  def var_tag
+    "mo:\"%s\"" % name
+  end
+
+  def dump(io)
+    io.print "%s %s `%s`\n" % [var_field, var_type, var_tag]
+  end
+end
+
+class Managed
+  def initialize(vmodl, name, data)
+    @vmodl = vmodl
+    @name = name
+    @data = data
+  end
+
+  def name
+    @name
+  end
+
+  def props
+    @data["props"].map do |p|
+      Prop.new(@vmodl, p)
+    end
+  end
+
+  def dump(io)
+    include_ref_getter = false
+    include_ent_getter = false
+
+    io.print "type %s struct {\n" % name
+
+    case @data["wsdl_base"]
+    when nil, "ManagedObject", "View"
+      include_ref_getter = true
+      io.print "Self types.ManagedObjectReference\n\n"
+    else
+      io.print "%s\n\n" % @data["wsdl_base"]
+      if @data["wsdl_base"] == "ManagedEntity"
+        include_ent_getter = true
+      end
+    end
+
+    props.each do |p|
+      p.dump(io)
+    end
+    io.print "}\n\n"
+
+    if include_ref_getter
+      io.print "func (m %s) Reference() types.ManagedObjectReference {\n" % [name]
+      io.print "return m.Self\n"
+      io.print "}\n\n"
+    end
+
+    if include_ent_getter
+      io.print "func (m *%s) Entity() *ManagedEntity {\n" % [name]
+      io.print "return &m.ManagedEntity\n"
+      io.print "}\n\n"
+    end
+  end
+
+  def dump_init(io)
+    io.print "func init() {\n"
+    io.print "t[\"%s\"] = reflect.TypeOf((*%s)(nil)).Elem()\n" % [name, name]
+    io.print "}\n\n"
+  end
+end
+
+class Vmodl
+  def initialize(data)
+    @data = Marshal.load(data)
+  end
+
+  def managed_hash
+    @managed_hash ||= begin
+                        h = {}
+                        managed.each do |m|
+                          h[m.name] = m
+                        end
+                        h
+                      end
+  end
+
+  def managed
+    @data.map do |k,v|
+      next if !v.is_a?(Hash)
+      next if v["kind"] != "managed"
+      next if k =~ /^pbm/i
+
+      Managed.new(self, k, v)
+    end.compact
+  end
+end
+
+if !File.directory?(ARGV.first)
+  raise "first argument not a directory"
+end
+
+wsdl = WSDL.new(WSDL.read "vim.wsdl")
+wsdl.validate_assumptions!
+wsdl.peek()
+
+File.open(File.join(ARGV.first, "mo/mo.go"), "w") do |io|
+  io.print WSDL.header("mo")
+
+  vmodl = Vmodl.new(read "vmodl.db")
+
+  vmodl.
+    managed.
+    sort_by { |m| m.name }.
+    each { |m| m.dump(io); m.dump_init(io); }
+end
+
+exit(0)
diff --git a/vendor/github.com/vmware/govmomi/gen/gen_from_wsdl.rb b/vendor/github.com/vmware/govmomi/gen/gen_from_wsdl.rb
new file mode 100644
index 0000000000..5004cfd0ff
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/gen/gen_from_wsdl.rb
@@ -0,0 +1,70 @@
+# Copyright (c) 2014 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.
+
+$:.unshift(File.expand_path(File.dirname(__FILE__)))
+
+require "vim_wsdl"
+
+if !File.directory?(ARGV.first)
+  raise "first argument not a directory"
+end
+
+wsdl = WSDL.new(WSDL.read "vim.wsdl")
+wsdl.validate_assumptions!
+wsdl.peek()
+
+ifs = Peek.types.keys.select { |name| Peek.base?(name) }.size()
+puts "%d classes, %d interfaces" % [Peek.types.size(), ifs]
+
+File.open(File.join(ARGV.first, "types/enum.go"), "w") do |io|
+  io.print WSDL.header("types")
+
+  wsdl.
+    types.
+    sort_by { |x| x.name }.
+    uniq { |x| x.name }.
+    select { |x| x.name[0] == x.name[0].upcase }. # Only capitalized methods for now...
+    select { |t| t.is_enum? }.
+    each { |e| e.dump(io); e.dump_init(io) }
+end
+
+File.open(File.join(ARGV.first, "types/types.go"), "w") do |io|
+  io.print WSDL.header("types")
+
+  wsdl.
+    types.
+    sort_by { |x| x.name }.
+    uniq { |x| x.name }.
+    select { |x| x.name[0] == x.name[0].upcase }. # Only capitalized methods for now...
+    select { |t| !t.is_enum? }.
+    each { |e| e.dump(io); e.dump_init(io) }
+end
+
+File.open(File.join(ARGV.first, "types/if.go"), "w") do |io|
+  io.print WSDL.header("types")
+
+  Peek.dump_interfaces(io)
+end
+
+File.open(File.join(ARGV.first, "methods/methods.go"), "w") do |io|
+  io.print WSDL.header("methods")
+
+  wsdl.
+    operations.
+    sort_by { |x| x.name }.
+    select { |x| x.name[0] == x.name[0].upcase }. # Only capitalized methods for now...
+    each { |e| e.dump(io) }
+end
+
+exit(0)
diff --git a/vendor/github.com/vmware/govmomi/gen/vim_wsdl.rb b/vendor/github.com/vmware/govmomi/gen/vim_wsdl.rb
new file mode 100644
index 0000000000..432d0709c1
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/gen/vim_wsdl.rb
@@ -0,0 +1,803 @@
+# Copyright (c) 2014-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.
+
+require "nokogiri"
+require "test/unit"
+
+class Peek
+  class Type
+    attr_accessor :parent, :children, :klass
+
+    def initialize(name)
+      @name = name
+      @children = []
+    end
+
+    def base?
+      return !children.empty?
+    end
+  end
+
+  @@types = {}
+  @@refs = {}
+  @@enums = {}
+
+  def self.types
+    return @@types
+  end
+
+  def self.refs
+    return @@refs
+  end
+
+  def self.enums
+    return @@enums
+  end
+
+  def self.ref(type)
+    refs[type] = true
+  end
+
+  def self.enum(type)
+    enums[type] = true
+  end
+
+  def self.enum?(type)
+    enums[type]
+  end
+
+  def self.register(name)
+    raise unless name
+    types[name] ||= Type.new(name)
+  end
+
+  def self.base?(name)
+    return unless c = types[name]
+    c.base?
+  end
+
+  def self.dump_interfaces(io)
+    types.keys.sort.each do |name|
+      next unless base?(name)
+
+      types[name].klass.dump_interface(io, name)
+    end
+  end
+end
+
+class EnumValue
+  def initialize(type, value)
+    @type = type
+    @value = value
+  end
+
+  def type_name
+    @type.name
+  end
+
+  def var_name
+    n = @type.name
+    v = var_value
+    if v == ""
+      n += "Null"
+    else
+      n += (v[0].capitalize + v[1..-1])
+    end
+
+    return n
+  end
+
+  def var_value
+    @value
+  end
+
+  def dump(io)
+    io.print "%s = %s(\"%s\")\n" % [var_name, type_name, var_value]
+  end
+end
+
+class Simple
+  include Test::Unit::Assertions
+
+  attr_accessor :name, :type
+
+  def initialize(node)
+    @node = node
+  end
+
+  def name
+    @name || @node["name"]
+  end
+
+  def type
+    @type || @node["type"]
+  end
+
+  def is_enum?
+    false
+  end
+
+  def dump_init(io)
+    # noop
+  end
+
+  def var_name
+    n = self.name
+    n = n[1..-1] if n[0] == "_" # Strip leading _
+    n = n[0].capitalize + n[1..-1] # Capitalize
+    return n
+  end
+
+  def vim_type?
+    ns, _ = self.type.split(":", 2)
+    ns == "vim25" or ns == "internalvim25" or ns == "internalreflect"
+  end
+
+  def vim_type(t = self.type)
+    ns, t = t.split(":", 2)
+    if ns != "vim25" and ns != "internalvim25" and ns != "internalreflect"
+        raise
+    end
+    t
+  end
+
+  def base_type?
+    vim_type? && Peek.base?(vim_type)
+  end
+
+  def enum_type?
+    vim_type? && Peek.enum?(vim_type)
+  end
+
+  def any_type?
+    self.type == "xsd:anyType"
+  end
+
+  def pointer_type?
+    ["UnitNumber"].include?(var_name)
+  end
+
+  def var_type
+    t = self.type
+    prefix = ""
+
+    prefix += "[]" if slice?
+
+    if t =~ /^xsd:(.*)$/
+      t = $1
+      case t
+      when "string"
+      when "int"
+        if pointer_type?
+          prefix += "*"
+          self.need_omitempty = false
+        end
+        t = "int32"
+      when "boolean"
+        t = "bool"
+        if !slice? && optional?
+          prefix += "*"
+          self.need_omitempty = false
+        end
+      when "long"
+        t = "int64"
+      when "dateTime"
+        t = "time.Time"
+        if !slice? && optional?
+          prefix += "*"
+          self.need_omitempty = false
+        end
+      when "anyType"
+        t = "AnyType"
+      when "byte"
+      when "double"
+        t = "float64"
+      when "float"
+        t = "float32"
+      when "short"
+        t = "int16"
+      when "base64Binary"
+        t = "[]byte"
+      when "anyURI"
+        t = "url.URL"
+      else
+        raise "unknown type: %s" % t
+      end
+    else
+      t = vim_type
+      if base_type?
+        prefix += "Base"
+      else
+        prefix += "*" if !slice? && !enum_type? && optional?
+      end
+    end
+
+    prefix + t
+  end
+
+  def slice?
+    test_attr("maxOccurs", "unbounded")
+  end
+
+  def optional?
+    test_attr("minOccurs", "0")
+  end
+
+  def need_omitempty=(v)
+    @need_omitempty = v
+  end
+
+  def need_omitempty?
+    var_type # HACK: trigger setting need_omitempty if necessary
+    if @need_omitempty.nil?
+      @need_omitempty = optional?
+    else
+      @need_omitempty
+    end
+  end
+
+  def need_typeattr?
+    base_type? || any_type?
+  end
+
+  protected
+
+  def test_attr(attr, expected)
+    actual = @node.attr(attr)
+    if actual != nil
+      case actual
+      when expected
+        true
+      else
+        raise "%s=%s" % [value, type.attr(value)]
+      end
+    else
+      false
+    end
+  end
+end
+
+class Element < Simple
+  def initialize(node)
+    super(node)
+  end
+
+  def has_type?
+    !@node["type"].nil?
+  end
+
+  def child
+    cs = @node.element_children
+    assert_equal 1, cs.length
+    assert_equal "complexType", cs.first.name
+
+    t = ComplexType.new(cs.first)
+    t.name = self.name
+    t
+  end
+
+  def dump(io)
+    if has_type?
+      io.print "type %s %s\n\n" % [name, var_type]
+    else
+      child.dump(io)
+    end
+  end
+
+  def dump_init(io)
+    if has_type?
+      io.print "func init() {\n"
+      io.print "t[\"%s\"] = reflect.TypeOf((*%s)(nil)).Elem()\n" % [name, name]
+      io.print "}\n\n"
+    end
+  end
+
+  def dump_field(io)
+    tag = name
+    tag += ",omitempty" if need_omitempty?
+    tag += ",typeattr" if need_typeattr?
+    io.print "%s %s `xml:\"%s\"`\n" % [var_name, var_type, tag]
+  end
+
+  def peek(type=nil)
+    if has_type?
+      return if self.type =~ /^xsd:/
+
+      Peek.ref(vim_type)
+    else
+      child.peek()
+    end
+  end
+end
+
+class Attribute < Simple
+  def dump_field(io)
+    tag = name
+    tag += ",omitempty" if need_omitempty?
+    tag += ",attr"
+    io.print "%s %s `xml:\"%s\"`\n" % [var_name, var_type, tag]
+  end
+end
+
+class SimpleType < Simple
+  def is_enum?
+    true
+  end
+
+  def dump(io)
+    enums = @node.xpath(".//xsd:enumeration").map do |n|
+      EnumValue.new(self, n["value"])
+    end
+
+    io.print "type %s string\n\n" % name
+    io.print "const (\n"
+    enums.each { |e| e.dump(io) }
+    io.print ")\n\n"
+  end
+
+  def dump_init(io)
+    io.print "func init() {\n"
+    io.print "t[\"%s\"] = reflect.TypeOf((*%s)(nil)).Elem()\n" % [name, name]
+    io.print "}\n\n"
+  end
+
+  def peek
+    Peek.enum(name)
+  end
+end
+
+class ComplexType < Simple
+  class SimpleContent < Simple
+    def dump(io)
+      attr = Attribute.new(@node.at_xpath(".//xsd:attribute"))
+      attr.dump_field(io)
+
+      # HACK DELUXE(PN)
+      extension = @node.at_xpath(".//xsd:extension")
+      type = extension["base"].split(":", 2)[1]
+      io.print "Value %s `xml:\",chardata\"`\n" % type
+    end
+
+    def peek
+    end
+  end
+
+  class ComplexContent < Simple
+    def base
+      extension = @node.at_xpath(".//xsd:extension")
+      assert_not_nil extension
+
+      base = extension["base"]
+      assert_not_nil base
+
+      vim_type(base)
+    end
+
+    def dump(io)
+      Sequence.new(@node).dump(io, base)
+    end
+
+    def dump_interface(io, name)
+      Sequence.new(@node).dump_interface(io, name)
+    end
+
+    def peek
+      Sequence.new(@node).peek(base)
+    end
+  end
+
+  class Sequence < Simple
+    def sequence
+      sequence = @node.at_xpath(".//xsd:sequence")
+      if sequence != nil
+        sequence.element_children.map do |n|
+          Element.new(n)
+        end
+      else
+        nil
+      end
+    end
+
+    def dump(io, base = nil)
+      return unless elements = sequence
+
+      io.print "%s\n\n" % base
+
+      elements.each do |e|
+        e.dump_field(io)
+      end
+    end
+
+    def dump_interface(io, name)
+      method = "Get%s() *%s" % [name, name]
+      io.print "func (b *%s) %s { return b }\n" % [name, method]
+      io.print "type Base%s interface {\n" % name
+      io.print "%s\n" % method
+      io.print "}\n\n"
+      io.print "func init() {\n"
+      io.print "t[\"Base%s\"] = reflect.TypeOf((*%s)(nil)).Elem()\n" % [name, name]
+      io.print "}\n\n"
+    end
+
+    def peek(base = nil)
+      return unless elements = sequence
+      name = @node.attr("name")
+      return unless name
+
+      elements.each do |e|
+        e.peek(name)
+      end
+
+      c = Peek.register(name)
+      if base
+        c.parent = base
+        Peek.register(c.parent).children << name
+      end
+    end
+  end
+
+  def klass
+    @klass ||= begin
+                 cs = @node.element_children
+                 if !cs.empty?
+                   assert_equal 1, cs.length
+
+                   case cs.first.name
+                   when "simpleContent"
+                     SimpleContent.new(@node)
+                   when "complexContent"
+                     ComplexContent.new(@node)
+                   when "sequence"
+                     Sequence.new(@node)
+                   else
+                     raise "don't know what to do for element: %s..." % cs.first.name
+                   end
+                 end
+               end
+  end
+
+  def dump_init(io)
+    io.print "func init() {\n"
+    io.print "t[\"%s\"] = reflect.TypeOf((*%s)(nil)).Elem()\n" % [name, name]
+    io.print "}\n\n"
+  end
+
+  def dump(io)
+    io.print "type %s struct {\n" % name
+    klass.dump(io) if klass
+    io.print "}\n\n"
+  end
+
+  def peek
+    Peek.register(name).klass = klass
+    klass.peek if klass
+  end
+end
+
+class Schema
+  include Test::Unit::Assertions
+
+  def initialize(xml, parent = nil)
+    @xml = Nokogiri::XML.parse(xml)
+  end
+
+  def targetNamespace
+    @xml.root["targetNamespace"]
+  end
+
+  # We have some assumptions about structure, make sure they hold.
+  def validate_assumptions!
+    # Every enumeration is part of a restriction
+    @xml.xpath(".//xsd:enumeration").each do |n|
+      assert_equal "restriction", n.parent.name
+    end
+
+    # See type == enum
+    @xml.xpath(".//xsd:restriction").each do |n|
+      # Every restriction has type xsd:string (it's an enum)
+      assert_equal "xsd:string", n["base"]
+
+      # Every restriction is part of a simpleType
+      assert_equal "simpleType", n.parent.name
+
+      # Every restriction is alone
+      assert_equal 1, n.parent.element_children.size
+    end
+
+    # See type == complex_content
+    @xml.xpath(".//xsd:complexContent").each do |n|
+      # complexContent is child of complexType
+      assert_equal "complexType", n.parent.name
+
+    end
+
+    # See type == complex_type
+    @xml.xpath(".//xsd:complexType").each do |n|
+      cc = n.element_children
+
+      # OK to have an empty complexType
+      next if cc.size == 0
+
+      # Require 1 element otherwise
+      assert_equal 1, cc.size
+
+      case cc.first.name
+      when "complexContent"
+        # complexContent has 1 "extension" element
+        cc = cc.first.element_children
+        assert_equal 1, cc.size
+        assert_equal "extension", cc.first.name
+
+        # extension has 1 "sequence" element
+        ec = cc.first.element_children
+        assert_equal 1, ec.size
+        assert_equal "sequence", ec.first.name
+
+        # sequence has N "element" elements
+        sc = ec.first.element_children
+        assert sc.all? { |e| e.name == "element" }
+      when "simpleContent"
+        # simpleContent has 1 "extension" element
+        cc = cc.first.element_children
+        assert_equal 1, cc.size
+        assert_equal "extension", cc.first.name
+
+        # extension has 1 or more "attribute" elements
+        ec = cc.first.element_children
+        assert_not_equal 0, ec.size
+        assert_equal "attribute", ec.first.name
+      when "sequence"
+        # sequence has N "element" elements
+        sc = cc.first.element_children
+        assert sc.all? { |e| e.name == "element" }
+      else
+        raise "unknown element: %s" % cc.first.name
+      end
+    end
+
+    imports.each do |i|
+      i.validate_assumptions!
+    end
+
+    includes.each do |i|
+      i.validate_assumptions!
+    end
+  end
+
+  def types
+    return to_enum(:types) unless block_given?
+
+    imports.each do |i|
+      i.types do |t|
+        yield t
+      end
+    end
+
+    includes.each do |i|
+      i.types do |t|
+        yield t
+      end
+    end
+
+    @xml.root.children.each do |n|
+      case n.class.to_s
+      when "Nokogiri::XML::Text"
+        next
+      when "Nokogiri::XML::Element"
+        case n.name
+        when "include", "import"
+          next
+        when "element"
+          yield Element.new(n)
+        when "simpleType"
+          yield SimpleType.new(n)
+        when "complexType"
+          yield ComplexType.new(n)
+        else
+          raise "unknown child: %s" % n.name
+        end
+      else
+        raise "unknown type: %s" % n.class
+      end
+    end
+  end
+
+  def imports
+    @imports ||= @xml.root.xpath(".//xmlns:import").map do |n|
+      Schema.new(WSDL.read n["schemaLocation"])
+    end
+  end
+
+  def includes
+    @includes ||= @xml.root.xpath(".//xmlns:include").map do |n|
+      Schema.new(WSDL.read n["schemaLocation"])
+    end
+  end
+end
+
+
+class Operation
+  include Test::Unit::Assertions
+
+  def initialize(wsdl, operation_node)
+    @wsdl = wsdl
+    @operation_node = operation_node
+  end
+
+  def name
+    @operation_node["name"]
+  end
+
+  def namespace
+    type = @operation_node.at_xpath("./xmlns:input").attr("message")
+    keep_ns(type)
+  end
+
+  def remove_ns(x)
+    ns, x = x.split(":", 2)
+    if ns != "vim25" and ns != "internalvim25" and ns != "internalreflect"
+        raise
+    end
+    x
+  end
+
+  def keep_ns(x)
+    ns, x = x.split(":", 2)
+    if ns != "vim25" and ns != "internalvim25" and ns != "internalreflect"
+        raise
+    end
+    ns
+  end
+
+  def find_type_for(type)
+    type = remove_ns(type)
+
+    message = @wsdl.message(type)
+    assert_not_nil message
+
+    part = message.at_xpath("./xmlns:part")
+    assert_not_nil message
+
+    remove_ns(part["element"])
+  end
+
+  def input
+    type = @operation_node.at_xpath("./xmlns:input").attr("message")
+    find_type_for(type)
+  end
+
+  def go_input
+    "types." + input
+  end
+
+  def output
+    type = @operation_node.at_xpath("./xmlns:output").attr("message")
+    find_type_for(type)
+  end
+
+  def go_output
+    "types." + output
+  end
+
+  def dump(io)
+    io.print <<EOS
+  type #{name}Body struct{
+    Req *#{go_input} `xml:"urn:#{namespace} #{input},omitempty"`
+    Res *#{go_output} `xml:"urn:#{namespace} #{output},omitempty"`
+    Fault_ *soap.Fault `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+  }
+
+  func (b *#{name}Body) Fault() *soap.Fault { return b.Fault_ }
+
+EOS
+
+    io.print "func %s(ctx context.Context, r soap.RoundTripper, req *%s) (*%s, error) {\n" % [name, go_input, go_output]
+    io.print <<EOS
+  var reqBody, resBody #{name}Body
+
+  reqBody.Req = req
+
+  if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+    return nil, err
+  }
+
+  return resBody.Res, nil
+EOS
+
+    io.print "}\n\n"
+  end
+end
+
+class WSDL
+  attr_reader :xml
+
+  PATH = File.expand_path("../sdk", __FILE__)
+
+  def self.read(file)
+    File.open(File.join(PATH, file))
+  end
+
+  def initialize(xml)
+    @xml = Nokogiri::XML.parse(xml)
+  end
+
+  def validate_assumptions!
+    schemas.each do |s|
+      s.validate_assumptions!
+    end
+  end
+
+  def types(&blk)
+    return to_enum(:types) unless block_given?
+
+    schemas.each do |s|
+      s.types(&blk)
+    end
+  end
+
+  def schemas
+    @schemas ||= @xml.xpath('.//xmlns:types/xsd:schema').map do |n|
+      Schema.new(n.to_xml)
+    end
+  end
+
+  def operations
+    @operations ||= @xml.xpath('.//xmlns:portType/xmlns:operation').map do |o|
+      Operation.new(self, o)
+    end
+  end
+
+  def message(type)
+    @messages ||= begin
+                    h = {}
+                    @xml.xpath('.//xmlns:message').each do |n|
+                      h[n.attr("name")] = n
+                    end
+                    h
+                  end
+
+    @messages[type]
+  end
+
+  def peek
+    types.
+      sort_by { |x| x.name }.
+      uniq { |x| x.name }.
+      select { |x| x.name[0] == x.name[0].upcase }. # Only capitalized methods for now...
+      each { |e| e.peek() }
+  end
+
+  def self.header(name)
+    return <<EOF
+/*
+Copyright (c) 2014-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 #{name}
+
+EOF
+  end
+end
diff --git a/vendor/github.com/vmware/govmomi/govc/.gitignore b/vendor/github.com/vmware/govmomi/govc/.gitignore
new file mode 100644
index 0000000000..0bbfe4231d
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/.gitignore
@@ -0,0 +1 @@
+/govc*
diff --git a/vendor/github.com/vmware/govmomi/govc/CHANGELOG.md b/vendor/github.com/vmware/govmomi/govc/CHANGELOG.md
new file mode 100644
index 0000000000..1ee5a81e72
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/CHANGELOG.md
@@ -0,0 +1,263 @@
+# changelog
+
+### 0.13.0 (2017-03-02)
+
+* Add vm.guest.tools command
+
+* Add datastore.disk.create command
+
+* Add datastore.vsan.dom.ls and datastore.vsan.dom.rm commands
+
+* Add vm.disk.change command
+
+* Add vm.rdm attach and ls commands
+
+* Add '-n' option to vm.ip to wait for a specific NIC
+
+* Add '-annotation' option to vm.create and vm.clone commands
+
+* Add '-sync-time-with-host-' flag to vm.change command
+
+* Add object.collect command (MOB for cli + Emacs)
+
+### 0.12.1 (2016-12-19)
+
+* Add '-f' flag to logs command
+
+* Add storage support to vm.migrate
+
+* Add support for file backed serialport devices
+
+### 0.12.0 (2016-12-01)
+
+* Add optional '-host' flag to datastore download/tail commands
+
+* Support InjectOvfEnv without PowerOn when importing
+
+* Support stdin as import options source
+
+* Add basic NVME controller support
+
+### 0.11.4 (2016-11-15)
+
+* Add role create, remove, update, ls and usage commands
+
+### 0.11.3 (2016-11-08)
+
+* Add `-product-version` flag to dvs.create
+
+* datastore.tail -f will exit without error if the file no longer exists
+
+### 0.11.2 (2016-11-01)
+
+* Add object.reload command
+
+* Add ESX 5.5 support to host.account commands
+
+### 0.11.1 (2016-10-27)
+
+* Add support for VirtualApp in pool.change command
+
+### 0.11.0 (2016-10-25)
+
+* Add object.destroy and object.rename commands
+
+* Remove datacenter.destroy command (use object.destroy instead)
+
+* Remove folder.destroy command (use object.destroy instead)
+
+* Rename folder.move_into -> object.mv
+
+* Add dvs.portgroup.change command
+
+* Add vlan flag to dvs.portgroup.add command
+
+### 0.10.0 (2016-10-20)
+
+* Add generated govc/USAGE.md
+
+* Add host.date info and change commands
+
+* Add session ls and rm commands
+
+* Add `-tls-known-hosts` and `-tls-ca-certs` flags
+
+* Add host.cert commands : info, csr, import
+
+* Add about.cert command (similar to the Chrome Certificate Viewer)
+
+* Add `-vspc-proxy` flag to device.serial.connect command
+
+* Rename license.list -> license.ls, license.assigned.list -> license.assigned.ls
+
+### 0.9.0 (2016-09-09)
+
+* Add `-R` option to datastore.ls
+
+* Add datastore.tail command
+
+* Add vm.migrate command
+
+* Add govc vm.register and vm.unregister commands
+
+* Add govc vm snapshot commands: create, remove, revert, tree
+
+* Add device.usb.add command
+
+* Support stdin/stdout in datastore upload/download
+
+* Add host.portgroup.change command
+
+* Add host.portgroup.info command
+
+* Add HostNetworkPolicy to host.vswitch.info
+
+* Add `-json` support to host.vswitch.info command
+
+* Support instance uuid in SearchFlag
+
+* Add `-json` support to esxcli command
+
+* Add `-unclaimed` flag to host.storage.info command
+
+* Support Network mapping in import.{ova,ovf} commands
+
+### 0.8.0 (2016-06-30)
+
+* If username (`-u` / GOVC_USERNAME) is empty, attempt login via local ticket (Workstation)
+
+* Add StoragePod support to govc folder.create
+
+* Add `-folder` flag to datacenter.create command
+
+* Logout when session persistence is disabled
+
+* Add `-L` flag to ls command for resolving by managed object reference
+
+* Add `-i` flag to ls command for listing the managed object reference
+
+* Add vm.markasvm command
+
+* Add vm.markastemplate command
+
+### 0.7.1 (2016-06-03)
+
+* Fix datastore.{upload,download} against VirtualCenter
+
+### 0.7.0 (2016-06-02)
+
+* Add `-require` flag to version command
+
+* Add support for local type in the datastore.create command
+
+* Add `-namespace` option to datastore.mkdir and datastore.rm to create/remove namespaces on VSANs
+
+* Add host.service command
+
+* Add host.storage.mark command
+
+* Add `-rescan` option to host.storage.info command
+
+### 0.6.0 (2016-04-29)
+
+* Add folder commands: info, create, destroy, rename, moveinto
+
+* Add datastore.info command
+
+* Add `-a` and `-v4` flags to vm.ip command
+
+* Add host.account.{create,update,remove} commands
+
+* Add env command
+
+* Add vm.clone command
+
+### 0.5.0 (2016-03-30)
+
+* Add dvs.portgroup.info command
+
+* Add `-folder` flag to vm.create command
+
+* Add `-dump` flag to OutputFlag
+
+* Add `-f` flag to events command
+
+* Add `-mode` flag to vm.disk.create command
+
+* Add `-net` flag to device.info command
+
+* Add `-eager` and `-thick` options to vm.create command
+
+### 0.4.0 (2016-02-26)
+
+* Add support for placement in datastore cluster to vm.create command
+
+* Add support for creating new disks in vm.create command
+
+* Add `-p` and `-a` options to govc datastore.ls command
+
+### 0.3.0 (2016-01-16)
+
+* Add permissions.{ls,set,remove} commands
+
+* Add datastore.{create,remove} commands.
+  The new create command supports both creating NAS and VMFS datastores.
+
+* Add dvs.{create,add} and dvs.portgroup.add commands
+
+* Add host.vnic.{service,info} commands
+
+* Add cluster.{create,change,add} commands
+
+* Add host.{disconnect,reconnect,remove,maintenance.enter,maintenance.exit} commands
+
+* Add license.decode, license.assigned.list and license.assign commands
+
+* Add firewall.ruleset.find command
+
+* Add logs, logs.ls and logs.download commands
+
+* Add support for LoginExtensionByCertificate with new `-cert` and `-key` flags
+
+* Add govc extension.{info,register,unregister,setcert} commands
+
+* Add govc vapp.{info,destroy,power} commands
+
+### 0.2.0 (2015-09-15)
+
+* The `vm.power` guest `-s` and `-r` options will fallback to hard `-off` / `-reset` if tools is unavailable and `-force` flag is given
+
+* Add `PowerOn, InjectOvfEnv, WaitForIP` options to `import.ovf` and `import.ova` option spec file
+
+* Add `import.spec` to produce an example json document
+
+* Add `-options` to `import.ovf` and `import.ova`
+
+* Add `-folder` to `import.ovf` and `import.ova`
+
+* Add `fields` command to manage custom fields
+
+* Add `datastore.info` command
+
+* Add `events` command
+
+* Add `-net.address` (Hardware Address) option to `vm.change` and `vm.create`
+
+* Add `host.add` command to add host to datacenter.
+
+* Add `GOVC_USERNAME` and `GOVC_PASSWORD` to allow overriding username and/or
+  password (used when they contain special characters that prevent them from
+  being embedded in the URL).
+
+* Add `-e' (ExtraConfig) option to `vm.change` and `vm.info`
+
+* Retry twice on temporary network errors.
+
+* Add `host.autostart` commands to manage VM autostart.
+
+* Add `-persist-session` flag to control whether or not the session is
+  persisted to disk (defaults to true).
+
+### 0.1.0 (2015-03-17)
+
+Prior to this version the changes to govc's command set were not documented.
diff --git a/vendor/github.com/vmware/govmomi/govc/README.md b/vendor/github.com/vmware/govmomi/govc/README.md
new file mode 100644
index 0000000000..d284bf00a5
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/README.md
@@ -0,0 +1,155 @@
+# govc
+
+govc is a vSphere CLI built on top of govmomi.
+
+## Installation
+
+You can find prebuilt govc binaries on the [releases page](https://github.com/vmware/govmomi/releases).
+
+Download and install a binary locally like this:
+
+```sh
+curl -L $URL_TO_BINARY | gunzip > /usr/local/bin/govc
+chmod +x /usr/local/bin/govc
+```
+
+### Source
+
+You can install the latest govc version from source if you have the Go toolchain installed.
+
+```sh
+go get github.com/vmware/govmomi/govc
+```
+
+(make sure `$GOPATH/bin` is in your `PATH`)
+
+## Usage
+
+For the complete list of commands and flags, refer to the [USAGE](USAGE.md) document.
+
+Common flags include:
+
+* `-u`: ESXi or vCenter URL (ex: `user:pass@host`)
+* `-debug`: Trace requests and responses (to `~/.govmomi/debug`)
+
+Managed entities can be referred to by their absolute path or by their relative
+path. For example, when specifying a datastore to use for a subcommand, you can
+either specify it as `/mydatacenter/datastore/mydatastore`, or as
+`mydatastore`. If you're not sure about the name of the datastore, or even the
+full path to the datastore, you can specify a pattern to match. Both
+`/*center/*/my*` (absolute) and `my*store` (relative) will resolve to the same
+datastore, given there are no other datastores that match those globs.
+
+The relative path in this example can only be used if the command can
+umambigously resolve a datacenter to use as origin for the query. If no
+datacenter is specified, govc defaults to the only datacenter, if there is only
+one. The datacenter itself can be specified as a pattern as well, enabling the
+following arguments: `-dc='my*' -ds='*store'`. The datastore pattern is looked
+up and matched relative to the datacenter which itself is specified as a
+pattern.
+
+Besides specifying managed entities as arguments, they can also be specified
+using environment variables. The following environment variables are used by govc
+to set defaults:
+
+* `GOVC_URL`: URL of ESXi or vCenter instance to connect to.
+
+  > The URL scheme defaults to `https` and the URL path defaults to `/sdk`.
+  > This means that specifying `user:pass@host` is equivalent to
+  > `https://user:pass@host/sdk`.
+
+  > If password include special characters like `#` or `:` you can use
+  > `GOVC_USERNAME` and `GOVC_PASSWORD` to have a simple `GOVC_URL`
+
+  > When using govc against VMware Workstation, GOVC_URL can be set to "localhost"
+  > without a user or pass, in which case local ticket based authentication is used.
+
+* `GOVC_USERNAME`: USERNAME to use if not specified in GOVC_URL.
+
+* `GOVC_PASSWORD`: PASSWORD to use if not specified in GOVC_URL.
+
+* `GOVC_TLS_CA_CERTS`: Override system root certificate authorities.
+
+  > export GOVC_TLS_CA_CERTS=~/.govc_ca.crt
+  > Use path separator to specify multiple files:
+  > export GOVC_TLS_CA_CERTS=~/ca-certificates/bar.crt:~/ca-certificates/foo.crt
+
+* `GOVC_TLS_KNOWN_HOSTS`: File(s) for thumbprint based certificate verification.
+
+  > Thumbprint based verification can be used in addition to or as an alternative to
+  > GOVC_TLS_CA_CERTS for self-signed certificates.  Example:
+  > export GOVC_TLS_KNOWN_HOSTS=~/.govc_known_hosts
+  > govc about.cert -u host -k -thumbprint | tee -a $GOVC_TLS_KNOWN_HOSTS
+  > govc about -u user:pass@host
+
+* `GOVC_INSECURE`: Disable certificate verification.
+
+  > This option sets Go's tls.Config.InsecureSkipVerify flag and is false by default.
+  > Quoting https://golang.org/pkg/crypto/tls/#Config:
+  > > InsecureSkipVerify controls whether a client verifies the
+  > > server's certificate chain and host name.
+  > > If InsecureSkipVerify is true, TLS accepts any certificate
+  > > presented by the server and any host name in that certificate.
+  > > In this mode, TLS is susceptible to man-in-the-middle attacks.
+  > > This should be used only for testing.
+
+* `GOVC_DATACENTER`
+
+* `GOVC_DATASTORE`
+
+* `GOVC_NETWORK`
+
+* `GOVC_RESOURCE_POOL`
+
+* `GOVC_HOST`
+
+* `GOVC_GUEST_LOGIN`: Guest credentials for guest operations
+
+* `GOVC_VIM_NAMESPACE`: Vim namespace defaults to `urn:vim25`
+
+* `GOVC_VIM_VERSION`: Vim version defaults to `6.0`
+
+## Examples
+
+Several examples are embedded in the govc command [help](USAGE.md)
+
+* [Upload ssh public key to a VM](examples/lib/ssh.sh)
+
+* [Create and configure a vCenter VM](examples/vcsa.sh)
+
+* [Create a CoreOS VM](https://github.com/vmware/vic/blob/master/pkg/vsphere/toolbox/toolbox-test.sh)
+
+* [Create a Debian VM](https://github.com/kubernetes/kubernetes/tree/master/cluster/vsphere)
+
+* [Create a Windows VM](https://github.com/dougm/govc-windows-box/blob/master/provision-esx.sh)
+
+* [Create an ESX VM](https://github.com/vmware/vic/blob/master/infra/machines/vcsa/create-esxi-vm.sh)
+
+* [Create a vCenter VM](https://github.com/vmware/vic/blob/master/infra/machines/vcsa/create-vcsa-vm.sh)
+
+* [Create a Cluster](https://github.com/vmware/vic/blob/master/infra/machines/vcsa/create-cluster.sh)
+
+## Status
+
+Changes to the cli are subject to [semantic versioning](http://semver.org).
+
+Refer to the [CHANGELOG](CHANGELOG.md) for version to version changes.
+
+When new govc commands or flags are added, the PATCH version will be incremented.  This enables you to require a minimum
+version from within a script, for example:
+
+```
+govc version -require 0.7.1
+```
+
+## Projects using govc
+
+* [Emacs govc package](./emacs)
+
+* [Kubernetes vSphere Provider](https://github.com/kubernetes/kubernetes/tree/master/cluster/vsphere)
+
+* [VMware VIC Engine](https://github.com/vmware/vic)
+
+## License
+
+govc is available under the [Apache 2 license](../LICENSE).
diff --git a/vendor/github.com/vmware/govmomi/govc/USAGE.md b/vendor/github.com/vmware/govmomi/govc/USAGE.md
new file mode 100644
index 0000000000..295a0f1140
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/USAGE.md
@@ -0,0 +1,2623 @@
+# govc usage
+
+This document is generated from `govc -h` and `govc $cmd -h` commands.
+
+The following common options are filtered out in this document,
+but appear via `govc $cmd -h`:
+
+```
+  -cert=                    Certificate [GOVC_CERTIFICATE]
+  -debug=false              Store debug logs [GOVC_DEBUG]
+  -dump=false               Enable output dump
+  -json=false               Enable JSON output
+  -k=false                  Skip verification of server certificate [GOVC_INSECURE]
+  -key=                     Private key [GOVC_PRIVATE_KEY]
+  -persist-session=true     Persist session to disk [GOVC_PERSIST_SESSION]
+  -tls-ca-certs=            TLS CA certificates file [GOVC_TLS_CA_CERTS]
+  -tls-known-hosts=         TLS known hosts file [GOVC_TLS_KNOWN_HOSTS]
+  -u=                       ESX or vCenter URL [GOVC_URL]
+  -vim-namespace=urn:vim25  Vim namespace [GOVC_VIM_NAMESPACE]
+  -vim-version=6.0          Vim version [GOVC_VIM_VERSION]
+  -dc=                      Datacenter [GOVC_DATACENTER]
+  -host.dns=                Find host by FQDN
+  -host.ip=                 Find host by IP address
+  -host.ipath=              Find host by inventory path
+  -host.uuid=               Find host by UUID
+  -vm.dns=                  Find VM by FQDN
+  -vm.ip=                   Find VM by IP address
+  -vm.ipath=                Find VM by inventory path
+  -vm.path=                 Find VM by path to .vmx file
+  -vm.uuid=                 Find VM by UUID
+```
+
+## about
+
+```
+Usage: govc about [OPTIONS]
+
+Display About info for HOST.
+
+System information including the name, type, version, and build number.
+
+Examples:
+  govc about
+  govc about -json | jq -r .About.ProductLineId
+
+Options:
+  -l=false                  Include service content
+```
+
+## about.cert
+
+```
+Usage: govc about.cert [OPTIONS]
+
+Display TLS certificate info for HOST.
+
+If the HOST certificate cannot be verified, about.cert will return with exit code 60 (as curl does).
+If the '-k' flag is provided, about.cert will return with exit code 0 in this case.
+The SHA1 thumbprint can also be used as '-thumbprint' for the 'host.add' and 'cluster.add' commands.
+
+Examples:
+  govc about.cert -k -json | jq -r .ThumbprintSHA1
+  govc about.cert -k -show | sudo tee /usr/local/share/ca-certificates/host.crt
+  govc about.cert -k -thumbprint | tee -a ~/.govmomi/known_hosts
+
+Options:
+  -show=false               Show PEM encoded server certificate only
+  -thumbprint=false         Output host hash and thumbprint only
+```
+
+## cluster.add
+
+```
+Usage: govc cluster.add [OPTIONS]
+
+Add HOST to CLUSTER.
+
+The host is added to the cluster specified by the 'cluster' flag.
+
+Examples:
+  thumbprint=$(govc about.cert -k -u host.example.com -thumbprint | awk '{print $2}')
+  govc cluster.add -cluster ClusterA -hostname host.example.com -username root -password pass -thumbprint $thumbprint
+  govc cluster.add -cluster ClusterB -hostname 10.0.6.1 -username root -password pass -noverify
+
+Options:
+  -cluster=*                Path to cluster
+  -connect=true             Immediately connect to host
+  -force=false              Force when host is managed by another VC
+  -hostname=                Hostname or IP address of the host
+  -license=                 Assign license key
+  -noverify=false           Accept host thumbprint without verification
+  -password=                Password of administration account on the host
+  -thumbprint=              SHA-1 thumbprint of the host's SSL certificate
+  -username=                Username of administration account on the host
+```
+
+## cluster.change
+
+```
+Usage: govc cluster.change [OPTIONS] CLUSTER...
+
+Change configuration of the given clusters.
+
+Examples:
+  govc cluster.change -drs-enabled -vsan-enabled -vsan-autoclaim ClusterA
+  govc cluster.change -drs-enabled=false ClusterB
+
+Options:
+  -drs-enabled=<nil>        Enable DRS
+  -drs-mode=                DRS behavior for virtual machines: manual, partiallyAutomated, fullyAutomated
+  -ha-enabled=<nil>         Enable HA
+  -vsan-autoclaim=<nil>     Autoclaim storage on cluster hosts
+  -vsan-enabled=<nil>       Enable vSAN
+```
+
+## cluster.create
+
+```
+Usage: govc cluster.create [OPTIONS] CLUSTER
+
+Create CLUSTER in datacenter.
+
+The cluster is added to the folder specified by the 'folder' flag. If not given,
+this defaults to the host folder in the specified or default datacenter.
+
+Examples:
+  govc cluster.create ClusterA
+  govc cluster.create -folder /dc2/test-folder ClusterB
+
+Options:
+  -folder=                  Inventory folder [GOVC_FOLDER]
+```
+
+## datacenter.create
+
+```
+Usage: govc datacenter.create [OPTIONS] NAME...
+
+Options:
+  -folder=                  Inventory folder [GOVC_FOLDER]
+```
+
+## datacenter.info
+
+```
+Usage: govc datacenter.info [OPTIONS] [PATH]...
+
+Options:
+```
+
+## datastore.cp
+
+```
+Usage: govc datastore.cp [OPTIONS] SRC DST
+
+Copy SRC to DST on DATASTORE.
+
+Examples:
+  govc datastore.cp foo/foo.vmx foo/foo.vmx.old
+  govc datastore.cp -f my.vmx foo/foo.vmx
+
+Options:
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -f=false                  If true, overwrite any identically named file at the destination
+```
+
+## datastore.create
+
+```
+Usage: govc datastore.create [OPTIONS] HOST...
+
+Create datastore on HOST.
+
+Examples:
+  govc datastore.create -type nfs -name nfsDatastore -remote-host 10.143.2.232 -remote-path /share cluster1
+  govc datastore.create -type vmfs -name vmfsDatastore -disk=mpx.vmhba0:C0:T0:L0 cluster1
+  govc datastore.create -type local -name localDatastore -path /var/datastore host1
+
+Options:
+  -disk=                    Canonical name of disk (VMFS only)
+  -force=false              Ignore DuplicateName error if datastore is already mounted on a host
+  -host=                    Host system [GOVC_HOST]
+  -mode=readOnly            Access mode for the mount point (readOnly|readWrite)
+  -name=                    Datastore name
+  -password=                Password to use when connecting (CIFS only)
+  -path=                    Local directory path for the datastore (local only)
+  -remote-host=             Remote hostname of the NAS datastore
+  -remote-path=             Remote path of the NFS mount point
+  -type=                    Datastore type (NFS|NFS41|CIFS|VMFS|local)
+  -username=                Username to use when connecting (CIFS only)
+```
+
+## datastore.disk.create
+
+```
+Usage: govc datastore.disk.create [OPTIONS] VMDK
+
+Create VMDK on DS.
+
+Examples:
+  govc datastore.mkdir disks
+  govc datastore.disk.create -size 24G disks/disk1.vmdk
+
+Options:
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -size=10.0GB              Size of new disk
+```
+
+## datastore.download
+
+```
+Usage: govc datastore.download [OPTIONS] SOURCE DEST
+
+Copy SOURCE from DS to DEST on the local system.
+
+If DEST name is "-", source is written to stdout.
+
+Examples:
+  govc datastore.download vm-name/vmware.log ./local.log
+  govc datastore.download vm-name/vmware.log - | grep -i error
+
+Options:
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -host=                    Host system [GOVC_HOST]
+```
+
+## datastore.info
+
+```
+Usage: govc datastore.info [OPTIONS] [PATH]...
+
+Options:
+```
+
+## datastore.ls
+
+```
+Usage: govc datastore.ls [OPTIONS] [FILE]...
+
+Options:
+  -R=false                  List subdirectories recursively
+  -a=false                  Do not ignore entries starting with .
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -l=false                  Long listing format
+  -p=false                  Append / indicator to directories
+```
+
+## datastore.mkdir
+
+```
+Usage: govc datastore.mkdir [OPTIONS] DIRECTORY
+
+Options:
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -namespace=false          Return uuid of namespace created on vsan datastore
+  -p=false                  Create intermediate directories as needed
+```
+
+## datastore.mv
+
+```
+Usage: govc datastore.mv [OPTIONS] SRC DST
+
+Move SRC to DST on DATASTORE.
+
+Examples:
+  govc datastore.mv foo/foo.vmx foo/foo.vmx.old
+  govc datastore.mv -f my.vmx foo/foo.vmx
+
+Options:
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -f=false                  If true, overwrite any identically named file at the destination
+```
+
+## datastore.remove
+
+```
+Usage: govc datastore.remove [OPTIONS] HOST...
+
+Remove datastore from HOST.
+
+Examples:
+  govc datastore.remove -ds nfsDatastore cluster1
+  govc datastore.remove -ds nasDatastore host1 host2 host3
+
+Options:
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -host=                    Host system [GOVC_HOST]
+```
+
+## datastore.rm
+
+```
+Usage: govc datastore.rm [OPTIONS] FILE
+
+Remove FILE from DATASTORE.
+
+Examples:
+  govc datastore.rm vm/vmware.log
+  govc datastore.rm vm
+  govc datastore.rm -f images/base.vmdk
+
+Options:
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -f=false                  Force; ignore nonexistent files and arguments
+  -namespace=false          Path is uuid of namespace on vsan datastore
+  -t=true                   Use file type to choose disk or file manager
+```
+
+## datastore.tail
+
+```
+Usage: govc datastore.tail [OPTIONS] PATH
+
+Output the last part of datastore files.
+
+Examples:
+  govc datastore.tail -n 100 vm-name/vmware.log
+  govc datastore.tail -n 0 -f vm-name/vmware.log
+
+Options:
+  -c=-1                     Output the last NUM bytes
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -f=false                  Output appended data as the file grows
+  -host=                    Host system [GOVC_HOST]
+  -n=10                     Output the last NUM lines
+```
+
+## datastore.upload
+
+```
+Usage: govc datastore.upload [OPTIONS] SOURCE DEST
+
+Copy SOURCE from the local system to DEST on DS.
+
+If SOURCE name is "-", read source from stdin.
+
+Examples:
+  govc datastore.upload -ds datastore1 ./config.iso vm-name/config.iso
+  genisoimage ... | govc datastore.upload -ds datastore1 - vm-name/config.iso
+
+Options:
+  -ds=                      Datastore [GOVC_DATASTORE]
+```
+
+## datastore.vsan.dom.ls
+
+```
+Usage: govc datastore.vsan.dom.ls [OPTIONS] [UUID]...
+
+List vSAN DOM objects in DS.
+
+Examples:
+  govc datastore.vsan.dom.ls
+  govc datastore.vsan.dom.ls -ds vsanDatastore -l
+  govc datastore.vsan.dom.ls -l d85aa758-63f5-500a-3150-0200308e589c
+
+Options:
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -l=false                  Long listing
+  -o=false                  List orphan objects
+```
+
+## datastore.vsan.dom.rm
+
+```
+Usage: govc datastore.vsan.dom.rm [OPTIONS] UUID...
+
+Remove vSAN DOM objects in DS.
+
+Examples:
+  govc datastore.vsan.dom.rm d85aa758-63f5-500a-3150-0200308e589c
+  govc datastore.vsan.dom.rm -f d85aa758-63f5-500a-3150-0200308e589c
+  govc datastore.vsan.dom.ls -o | xargs govc datastore.vsan.dom.rm
+
+Options:
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -f=false                  Force delete
+  -v=false                  Print deleted UUIDs to stdout, failed to stderr
+```
+
+## device.boot
+
+```
+Usage: govc device.boot [OPTIONS]
+
+Configure VM boot settings.
+
+Examples:
+  govc device.boot -vm $vm -delay 1000 -order floppy,cdrom,ethernet,disk
+
+Options:
+  -delay=0                  Delay in ms before starting the boot sequence
+  -order=                   Boot device order
+  -retry=false              If true, retry boot after retry-delay
+  -retry-delay=0            Delay in ms before a boot retry
+  -setup=false              If true, enter BIOS setup on next boot
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## device.cdrom.add
+
+```
+Usage: govc device.cdrom.add [OPTIONS]
+
+Add CD-ROM device to VM.
+
+Examples:
+  govc device.cdrom.add -vm $vm
+  govc device.ls -vm $vm | grep ide-
+  govc device.cdrom.add -vm $vm -controller ide-200
+  govc device.info cdrom-*
+
+Options:
+  -controller=              IDE controller name
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## device.cdrom.eject
+
+```
+Usage: govc device.cdrom.eject [OPTIONS]
+
+Eject media from CD-ROM device.
+
+If device is not specified, the first CD-ROM device is used.
+
+Examples:
+  govc device.cdrom.eject -vm vm-1
+  govc device.cdrom.eject -vm vm-1 -device floppy-1
+
+Options:
+  -device=                  CD-ROM device name
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## device.cdrom.insert
+
+```
+Usage: govc device.cdrom.insert [OPTIONS] ISO
+
+Insert media on datastore into CD-ROM device.
+
+If device is not specified, the first CD-ROM device is used.
+
+Examples:
+  govc device.cdrom.insert -vm vm-1 -device cdrom-3000 images/boot.iso
+
+Options:
+  -device=                  CD-ROM device name
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## device.connect
+
+```
+Usage: govc device.connect [OPTIONS] DEVICE...
+
+Options:
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## device.disconnect
+
+```
+Usage: govc device.disconnect [OPTIONS] DEVICE...
+
+Options:
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## device.floppy.add
+
+```
+Usage: govc device.floppy.add [OPTIONS]
+
+Add floppy device to VM.
+
+Examples:
+  govc device.floppy.add -vm $vm
+  govc device.info floppy-*
+
+Options:
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## device.floppy.eject
+
+```
+Usage: govc device.floppy.eject [OPTIONS]
+
+Eject image from floppy device.
+
+If device is not specified, the first floppy device is used.
+
+Examples:
+  govc device.floppy.eject -vm vm-1
+
+Options:
+  -device=                  Floppy device name
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## device.floppy.insert
+
+```
+Usage: govc device.floppy.insert [OPTIONS] IMG
+
+Insert IMG on datastore into floppy device.
+
+If device is not specified, the first floppy device is used.
+
+Examples:
+  govc device.floppy.insert -vm vm-1 vm-1/config.img
+
+Options:
+  -device=                  Floppy device name
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## device.info
+
+```
+Usage: govc device.info [OPTIONS] [DEVICE]...
+
+Options:
+  -net=                     Network [GOVC_NETWORK]
+  -net.adapter=e1000        Network adapter type
+  -net.address=             Network hardware address
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## device.ls
+
+```
+Usage: govc device.ls [OPTIONS]
+
+Options:
+  -boot=false               List devices configured in the VM's boot options
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## device.remove
+
+```
+Usage: govc device.remove [OPTIONS] DEVICE...
+
+Options:
+  -keep=false               Keep files in datastore
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## device.scsi.add
+
+```
+Usage: govc device.scsi.add [OPTIONS]
+
+Add SCSI controller to VM.
+
+Examples:
+  govc device.scsi.add -vm $vm
+  govc device.scsi.add -vm $vm -type pvscsi
+  govc device.info -vm $vm {lsi,pv}*
+
+Options:
+  -hot=false                Enable hot-add/remove
+  -sharing=noSharing        SCSI sharing
+  -type=lsilogic            SCSI controller type (lsilogic|buslogic|pvscsi|lsilogic-sas)
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## device.serial.add
+
+```
+Usage: govc device.serial.add [OPTIONS]
+
+Add serial port to VM.
+
+Examples:
+  govc device.serial.add -vm $vm
+  govc device.info -vm $vm serialport-*
+
+Options:
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## device.serial.connect
+
+```
+Usage: govc device.serial.connect [OPTIONS] URI
+
+Connect service URI to serial port.
+
+If "-" is given as URI, connects file backed device with file name of
+device name + .log suffix in the VM Config.Files.LogDirectory.
+
+Defaults to the first serial port if no DEVICE is given.
+
+Examples:
+  govc device.ls | grep serialport-
+  govc device.serial.connect -vm $vm -device serialport-8000 telnet://:33233
+  govc device.info -vm $vm serialport-*
+  govc device.serial.connect -vm $vm "[datastore1] $vm/console.log"
+  govc device.serial.connect -vm $vm -
+  govc datastore.tail -f $vm/serialport-8000.log
+
+Options:
+  -client=false             Use client direction
+  -device=                  serial port device name
+  -vm=                      Virtual machine [GOVC_VM]
+  -vspc-proxy=              vSPC proxy URI
+```
+
+## device.serial.disconnect
+
+```
+Usage: govc device.serial.disconnect [OPTIONS]
+
+Disconnect service URI from serial port.
+
+Examples:
+  govc device.ls | grep serialport-
+  govc device.serial.disconnect -vm $vm -device serialport-8000
+  govc device.info -vm $vm serialport-*
+
+Options:
+  -device=                  serial port device name
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## device.usb.add
+
+```
+Usage: govc device.usb.add [OPTIONS]
+
+Add USB device to VM.
+
+Examples:
+  govc device.usb.add -vm $vm
+  govc device.usb.add -type xhci -vm $vm
+  govc device.info usb*
+
+Options:
+  -auto=true                Enable ability to hot plug devices
+  -ehci=true                Enable enhanced host controller interface (USB 2.0)
+  -type=usb                 USB controller type (usb|xhci)
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## dvs.add
+
+```
+Usage: govc dvs.add [OPTIONS] HOST...
+
+Add hosts to DVS.
+
+Examples:
+  govc dvs.add -dvs dvsName -pnic vmnic1 hostA hostB hostC
+
+Options:
+  -dvs=                     DVS path
+  -host=                    Host system [GOVC_HOST]
+  -pnic=vmnic0              Name of the host physical NIC
+```
+
+## dvs.create
+
+```
+Usage: govc dvs.create [OPTIONS] DVS
+
+Create DVS (DistributedVirtualSwitch) in datacenter.
+
+The dvs is added to the folder specified by the 'folder' flag. If not given,
+this defaults to the network folder in the specified or default datacenter.
+
+Examples:
+  govc dvs.create DSwitch
+  govc dvs.create -product-version 5.5.0 DSwitch
+
+Options:
+  -folder=                  Inventory folder [GOVC_FOLDER]
+  -product-version=         DVS product version
+```
+
+## dvs.portgroup.add
+
+```
+Usage: govc dvs.portgroup.add [OPTIONS] NAME
+
+Add portgroup to DVS.
+
+Examples:
+  govc dvs.create DSwitch
+  govc dvs.portgroup.add -dvs DSwitch -type earlyBinding -nports 16 ExternalNetwork
+  govc dvs.portgroup.add -dvs DSwitch -type ephemeral InternalNetwork
+
+Options:
+  -dvs=                     DVS path
+  -nports=128               Number of ports
+  -type=earlyBinding        Portgroup type (earlyBinding|lateBinding|ephemeral)
+  -vlan=0                   VLAN ID
+```
+
+## dvs.portgroup.change
+
+```
+Usage: govc dvs.portgroup.change [OPTIONS] PATH
+
+Change DVS portgroup configuration.
+
+Examples:
+  govc dvs.portgroup.change -nports 26 ExternalNetwork
+  govc dvs.portgroup.change -vlan 3214 ExternalNetwork
+
+Options:
+  -nports=0                 Number of ports
+  -type=earlyBinding        Portgroup type (earlyBinding|lateBinding|ephemeral)
+  -vlan=0                   VLAN ID
+```
+
+## dvs.portgroup.info
+
+```
+Usage: govc dvs.portgroup.info [OPTIONS]
+
+Options:
+  -active=false             Filter by port active or inactive status
+  -connected=false          Filter by port connected or disconnected status
+  -count=0                  Number of matches to return (0 = unlimited)
+  -inside=true              Filter by port inside or outside status
+  -pg=                      Distributed Virtual Portgroup
+  -uplinkPort=false         Filter for uplink ports
+  -vlan=0                   Filter by VLAN ID (0 = unfiltered)
+```
+
+## env
+
+```
+Usage: govc env [OPTIONS]
+
+Output the environment variables for this client.
+
+If credentials are included in the url, they are split into separate variables.
+Useful as bash scripting helper to parse GOVC_URL.
+
+Options:
+  -x=false                  Output variables for each GOVC_URL component
+```
+
+## events
+
+```
+Usage: govc events [OPTIONS] [PATH]...
+
+Display events.
+
+Examples:
+  govc events vm/my-vm1 vm/my-vm2
+  govc events /dc1/vm/* /dc2/vm/*
+  govc ls -t HostSystem host/* | xargs govc events | grep -i vsan
+
+Options:
+  -f=false                  Follow event stream
+  -force=false              Disable number objects to monitor limit
+  -n=25                     Output the last N events
+```
+
+## extension.info
+
+```
+Usage: govc extension.info [OPTIONS] [KEY]...
+
+Options:
+```
+
+## extension.register
+
+```
+Usage: govc extension.register [OPTIONS]
+
+Options:
+  -update=false             Update extension
+```
+
+## extension.setcert
+
+```
+Usage: govc extension.setcert [OPTIONS] ID
+
+Set certificate for the extension ID.
+
+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
+
+Options:
+  -cert-pem=-               PEM encoded certificate
+  -org=VMware               Organization for generated certificate
+```
+
+## extension.unregister
+
+```
+Usage: govc extension.unregister [OPTIONS]
+
+Options:
+```
+
+## fields.add
+
+```
+Usage: govc fields.add [OPTIONS] NAME
+
+Options:
+```
+
+## fields.ls
+
+```
+Usage: govc fields.ls [OPTIONS]
+
+Options:
+```
+
+## fields.rename
+
+```
+Usage: govc fields.rename [OPTIONS] KEY NAME
+
+Options:
+```
+
+## fields.rm
+
+```
+Usage: govc fields.rm [OPTIONS] KEY...
+
+Options:
+```
+
+## fields.set
+
+```
+Usage: govc fields.set [OPTIONS] KEY VALUE PATH...
+
+Options:
+```
+
+## firewall.ruleset.find
+
+```
+Usage: govc firewall.ruleset.find [OPTIONS]
+
+Find firewall rulesets matching the given rule.
+
+For a complete list of rulesets: govc host.esxcli network firewall ruleset list
+For a complete list of rules:    govc host.esxcli network firewall ruleset rule list
+
+Examples:
+  govc firewall.ruleset.find -direction inbound -port 22
+  govc firewall.ruleset.find -direction outbound -port 2377
+
+Options:
+  -c=true                   Check if esx firewall is enabled
+  -direction=outbound       Direction
+  -enabled=true             Find enabled rule sets if true, disabled if false
+  -host=                    Host system [GOVC_HOST]
+  -port=0                   Port
+  -proto=tcp                Protocol
+  -type=dst                 Port type
+```
+
+## folder.create
+
+```
+Usage: govc folder.create [OPTIONS] PATH...
+
+Create folder with PATH.
+
+Examples:
+  govc folder.create /dc1/vm/folder-foo
+  govc object.mv /dc1/vm/vm-foo-* /dc1/vm/folder-foo
+  govc folder.create -pod /dc1/datastore/sdrs
+  govc object.mv /dc1/datastore/iscsi-* /dc1/datastore/sdrs
+
+Options:
+  -pod=false                Create folder(s) of type StoragePod (DatastoreCluster)
+```
+
+## folder.info
+
+```
+Usage: govc folder.info [OPTIONS] [PATH]...
+
+Options:
+```
+
+## guest.chmod
+
+```
+Usage: govc guest.chmod [OPTIONS]
+
+Options:
+  -gid=0                    Group ID
+  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
+  -perm=0                   File permissions
+  -uid=0                    User ID
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## guest.download
+
+```
+Usage: govc guest.download [OPTIONS] SOURCE DEST
+
+Copy SOURCE from the guest VM to DEST on the local system.
+
+If DEST name is "-", source is written to stdout.
+
+Examples:
+  govc guest.download -l user:pass -vm=my-vm /var/log/my.log ./local.log
+  govc guest.download -l user:pass -vm=my-vm /etc/motd -
+
+Options:
+  -f=false                  If set, the local destination file is clobbered
+  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## guest.getenv
+
+```
+Usage: govc guest.getenv [OPTIONS]
+
+Options:
+  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## guest.kill
+
+```
+Usage: govc guest.kill [OPTIONS]
+
+Options:
+  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
+  -p=[]                     Process ID
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## guest.ls
+
+```
+Usage: govc guest.ls [OPTIONS]
+
+Options:
+  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## guest.mkdir
+
+```
+Usage: govc guest.mkdir [OPTIONS]
+
+Options:
+  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
+  -p=false                  Create intermediate directories as needed
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## guest.mktemp
+
+```
+Usage: govc guest.mktemp [OPTIONS]
+
+Options:
+  -d=false                  Make a directory instead of a file
+  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
+  -s=                       Suffix
+  -t=                       Prefix
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## guest.ps
+
+```
+Usage: govc guest.ps [OPTIONS]
+
+Options:
+  -U=                       Select by process UID
+  -X=false                  Wait for process to exit
+  -e=false                  Select all processes
+  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
+  -p=[]                     Select by process ID
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## guest.rm
+
+```
+Usage: govc guest.rm [OPTIONS]
+
+Options:
+  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## guest.rmdir
+
+```
+Usage: govc guest.rmdir [OPTIONS]
+
+Options:
+  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
+  -r=false                  Recursive removal
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## guest.start
+
+```
+Usage: govc guest.start [OPTIONS]
+
+Options:
+  -C=                       The absolute path of the working directory for the program to start
+  -e=[]                     Set environment variable (key=val)
+  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## guest.upload
+
+```
+Usage: govc guest.upload [OPTIONS] SOURCE DEST
+
+Copy SOURCE from the local system to DEST in the guest VM.
+
+If SOURCE name is "-", read source from stdin.
+
+Examples:
+  govc guest.upload -l user:pass -vm=my-vm ~/.ssh/id_rsa.pub /home/$USER/.ssh/authorized_keys
+  cowsay "have a great day" | govc guest.upload -l user:pass -vm=my-vm - /etc/motd
+
+Options:
+  -f=false                  If set, the guest destination file is clobbered
+  -gid=0                    Group ID
+  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
+  -perm=0                   File permissions
+  -uid=0                    User ID
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## host.account.create
+
+```
+Usage: govc host.account.create [OPTIONS]
+
+Create local account on HOST.
+
+Examples:
+  govc host.account.create -id $USER -password password-for-esx60
+
+Options:
+  -description=             The description of the specified account
+  -host=                    Host system [GOVC_HOST]
+  -id=                      The ID of the specified account
+  -password=                The password for the specified account id
+```
+
+## host.account.remove
+
+```
+Usage: govc host.account.remove [OPTIONS]
+
+Remove local account on HOST.
+
+Examples:
+  govc host.account.remove -id $USER
+
+Options:
+  -description=             The description of the specified account
+  -host=                    Host system [GOVC_HOST]
+  -id=                      The ID of the specified account
+  -password=                The password for the specified account id
+```
+
+## host.account.update
+
+```
+Usage: govc host.account.update [OPTIONS]
+
+Update local account on HOST.
+
+Examples:
+  govc host.account.update -id root -password password-for-esx60
+
+Options:
+  -description=             The description of the specified account
+  -host=                    Host system [GOVC_HOST]
+  -id=                      The ID of the specified account
+  -password=                The password for the specified account id
+```
+
+## host.add
+
+```
+Usage: govc host.add [OPTIONS]
+
+Add host to datacenter.
+
+The host is added to the folder specified by the 'folder' flag. If not given,
+this defaults to the host folder in the specified or default datacenter.
+
+Examples:
+  thumbprint=$(govc about.cert -k -u host.example.com -thumbprint | awk '{print $2}')
+  govc host.add -hostname host.example.com -username root -password pass -thumbprint $thumbprint
+  govc host.add -hostname 10.0.6.1 -username root -password pass -noverify
+
+Options:
+  -connect=true             Immediately connect to host
+  -folder=                  Inventory folder [GOVC_FOLDER]
+  -force=false              Force when host is managed by another VC
+  -hostname=                Hostname or IP address of the host
+  -noverify=false           Accept host thumbprint without verification
+  -password=                Password of administration account on the host
+  -thumbprint=              SHA-1 thumbprint of the host's SSL certificate
+  -username=                Username of administration account on the host
+```
+
+## host.autostart.add
+
+```
+Usage: govc host.autostart.add [OPTIONS] VM...
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+```
+
+## host.autostart.configure
+
+```
+Usage: govc host.autostart.configure [OPTIONS] 
+
+Options:
+  -enabled=<nil>             
+  -host=                     Host system [GOVC_HOST]
+  -start-delay=0             
+  -stop-action=              
+  -stop-delay=0              
+  -wait-for-heartbeat=<nil>  
+```
+
+## host.autostart.info
+
+```
+Usage: govc host.autostart.info [OPTIONS] 
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+```
+
+## host.autostart.remove
+
+```
+Usage: govc host.autostart.remove [OPTIONS] VM...
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+```
+
+## host.cert.csr
+
+```
+Usage: govc host.cert.csr [OPTIONS]
+
+Generate a certificate-signing request (CSR) for HOST.
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+  -ip=false                 Use IP address as CN
+```
+
+## host.cert.import
+
+```
+Usage: govc host.cert.import [OPTIONS] FILE
+
+Install SSL certificate FILE on HOST.
+
+If FILE name is "-", read certificate from stdin.
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+```
+
+## host.cert.info
+
+```
+Usage: govc host.cert.info [OPTIONS]
+
+Display SSL certificate info for HOST.
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+```
+
+## host.date.change
+
+```
+Usage: govc host.date.change [OPTIONS]
+
+Change date and time for HOST.
+
+Examples:
+  govc host.date.change -date "$(date -u)"
+  govc host.date.change -server time.vmware.com
+  govc host.service enable ntpd
+  govc host.service start ntpd
+
+Options:
+  -date=                    Update the date/time on the host
+  -host=                    Host system [GOVC_HOST]
+  -server=                  IP or FQDN for NTP server(s)
+  -tz=                      Change timezone of the host
+```
+
+## host.date.info
+
+```
+Usage: govc host.date.info [OPTIONS]
+
+Display date and time info for HOST.
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+```
+
+## host.disconnect
+
+```
+Usage: govc host.disconnect [OPTIONS]
+
+Disconnect HOST from vCenter.
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+```
+
+## host.esxcli
+
+```
+Usage: govc host.esxcli [OPTIONS] COMMAND [ARG]...
+
+Invoke esxcli command on HOST.
+
+Output is rendered in table form when possible, unless disabled with '-hints=false'.
+
+Examples:
+  govc host.esxcli network ip connection list
+  govc host.esxcli system settings advanced set -o /Net/GuestIPHack -i 1
+  govc host.esxcli network firewall ruleset set -r remoteSerialPort -e true
+  govc host.esxcli network firewall set -e false
+
+Options:
+  -hints=true               Use command info hints when formatting output
+  -host=                    Host system [GOVC_HOST]
+```
+
+## host.info
+
+```
+Usage: govc host.info [OPTIONS]
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+```
+
+## host.maintenance.enter
+
+```
+Usage: govc host.maintenance.enter [OPTIONS] HOST...
+
+Put HOST in maintenance mode.
+
+While this task is running and when the host is in maintenance mode,
+no VMs can be powered on and no provisioning operations can be performed on the host.
+
+Options:
+  -evacuate=false           Evacuate powered off VMs
+  -host=                    Host system [GOVC_HOST]
+  -timeout=0                Timeout
+```
+
+## host.maintenance.exit
+
+```
+Usage: govc host.maintenance.exit [OPTIONS] HOST...
+
+Take HOST out of maintenance mode.
+
+This blocks if any concurrent running maintenance-only host configurations operations are being performed.
+For example, if VMFS volumes are being upgraded.
+
+The 'timeout' flag is the number of seconds to wait for the exit maintenance mode to succeed.
+If the timeout is less than or equal to zero, there is no timeout.
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+  -timeout=0                Timeout
+```
+
+## host.option.ls
+
+```
+Usage: govc host.option.ls [OPTIONS] NAME
+
+List option with the given NAME.
+
+If NAME ends with a dot, all options for that subtree are listed.
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+```
+
+## host.option.set
+
+```
+Usage: govc host.option.set [OPTIONS] NAME VALUE
+
+Set host option NAME to VALUE.
+
+Examples:
+  govc host.option.set Config.HostAgent.plugins.solo.enableMob true
+  govc host.option.set Config.HostAgent.log.level verbose
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+```
+
+## host.portgroup.add
+
+```
+Usage: govc host.portgroup.add [OPTIONS] NAME
+
+Add portgroup to HOST.
+
+Examples:
+  govc host.portgroup.add -vswitch vSwitch0 -vlan 3201 bridge
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+  -vlan=0                   VLAN ID
+  -vswitch=                 vSwitch Name
+```
+
+## host.portgroup.change
+
+```
+Usage: govc host.portgroup.change [OPTIONS] NAME
+
+Change configuration of HOST portgroup NAME.
+
+Examples:
+  govc host.portgroup.change -allow-promiscuous -forged-transmits -mac-changes "VM Network"
+  govc host.portgroup.change -vswitch-name vSwitch1 "Management Network"
+
+Options:
+  -allow-promiscuous=<nil>  Allow promiscuous mode
+  -forged-transmits=<nil>   Allow forged transmits
+  -host=                    Host system [GOVC_HOST]
+  -mac-changes=<nil>        Allow MAC changes
+  -name=                    Portgroup name
+  -vlan-id=-1               VLAN ID
+  -vswitch-name=            vSwitch name
+```
+
+## host.portgroup.info
+
+```
+Usage: govc host.portgroup.info [OPTIONS]
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+```
+
+## host.portgroup.remove
+
+```
+Usage: govc host.portgroup.remove [OPTIONS] NAME
+
+Remove portgroup from HOST.
+
+Examples:
+  govc host.portgroup.remove bridge
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+```
+
+## host.reconnect
+
+```
+Usage: govc host.reconnect [OPTIONS]
+
+Reconnect HOST to vCenter.
+
+This command can also be used to change connection properties (hostname, fingerprint, username, password),
+without disconnecting the host.
+
+Options:
+  -force=false              Force when host is managed by another VC
+  -host=                    Host system [GOVC_HOST]
+  -hostname=                Hostname or IP address of the host
+  -noverify=false           Accept host thumbprint without verification
+  -password=                Password of administration account on the host
+  -sync-state=false         Sync state
+  -thumbprint=              SHA-1 thumbprint of the host's SSL certificate
+  -username=                Username of administration account on the host
+```
+
+## host.remove
+
+```
+Usage: govc host.remove [OPTIONS] HOST...
+
+Remove HOST from vCenter.
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+```
+
+## host.service
+
+```
+Usage: govc host.service [OPTIONS] ACTION ID
+
+Apply host service ACTION to service ID.
+
+Where ACTION is one of: start, stop, restart, status, enable, disable
+
+Examples:
+  govc host.service enable TSM-SSH
+  govc host.service start TSM-SSH
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+```
+
+## host.service.ls
+
+```
+Usage: govc host.service.ls [OPTIONS]
+
+List HOST services.
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+```
+
+## host.storage.info
+
+```
+Usage: govc host.storage.info [OPTIONS]
+
+Show HOST storage system information.
+
+Examples:
+  govc ls -t HostSystem host/* | xargs -n1 govc host.storage.info -unclaimed -host
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+  -rescan=false             Rescan for new storage devices
+  -t=lun                    Type (hba,lun)
+  -unclaimed=false          Only show disks that can be used as new VMFS datastores
+```
+
+## host.storage.mark
+
+```
+Usage: govc host.storage.mark [OPTIONS] DEVICE_PATH
+
+Mark device at DEVICE_PATH.
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+  -local=<nil>              Mark as local
+  -ssd=<nil>                Mark as SSD
+```
+
+## host.storage.partition
+
+```
+Usage: govc host.storage.partition [OPTIONS] DEVICE_PATH
+
+Show partition table for device at DEVICE_PATH.
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+```
+
+## host.vnic.info
+
+```
+Usage: govc host.vnic.info [OPTIONS]
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+```
+
+## host.vnic.service
+
+```
+Usage: govc host.vnic.service [OPTIONS] SERVICE DEVICE
+
+
+Enable or disable service on a virtual nic device.
+
+Where SERVICE is one of: vmotion|faultToleranceLogging|vSphereReplication|vSphereReplicationNFC|management|vsan|vSphereProvisioning
+Where DEVICE is one of: vmk0|vmk1|...
+
+Examples:
+  govc host.vnic.service -host hostname -enable vsan vmk0
+
+
+Options:
+  -disable=false            Disable service
+  -enable=false             Enable service
+  -host=                    Host system [GOVC_HOST]
+```
+
+## host.vswitch.add
+
+```
+Usage: govc host.vswitch.add [OPTIONS] NAME
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+  -mtu=0                    MTU
+  -nic=                     Bridge nic device
+  -ports=128                Number of ports
+```
+
+## host.vswitch.info
+
+```
+Usage: govc host.vswitch.info [OPTIONS]
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+```
+
+## host.vswitch.remove
+
+```
+Usage: govc host.vswitch.remove [OPTIONS] NAME
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+```
+
+## import.ova
+
+```
+Usage: govc import.ova [OPTIONS] PATH_TO_OVA
+
+Options:
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -folder=                  Path to folder to add the VM to
+  -host=                    Host system [GOVC_HOST]
+  -name=                    Name to use for new entity
+  -options=                 Options spec file path for VM deployment
+  -pool=                    Resource pool [GOVC_RESOURCE_POOL]
+```
+
+## import.ovf
+
+```
+Usage: govc import.ovf [OPTIONS] PATH_TO_OVF
+
+Options:
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -folder=                  Path to folder to add the VM to
+  -host=                    Host system [GOVC_HOST]
+  -name=                    Name to use for new entity
+  -options=                 Options spec file path for VM deployment
+  -pool=                    Resource pool [GOVC_RESOURCE_POOL]
+```
+
+## import.spec
+
+```
+Usage: govc import.spec [OPTIONS] PATH_TO_OVF_OR_OVA
+
+Options:
+  -verbose=false  Verbose spec output
+```
+
+## import.vmdk
+
+```
+Usage: govc import.vmdk [OPTIONS] PATH_TO_VMDK [REMOTE_DIRECTORY]
+
+Options:
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -force=false              Overwrite existing disk
+  -keep=false               Keep uploaded disk after import
+  -pool=                    Resource pool [GOVC_RESOURCE_POOL]
+  -upload=true              Upload specified disk
+```
+
+## license.add
+
+```
+Usage: govc license.add [OPTIONS] KEY...
+
+Options:
+```
+
+## license.assign
+
+```
+Usage: govc license.assign [OPTIONS] KEY
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+  -name=                    Display name
+  -remove=false             Remove assignment
+```
+
+## license.assigned.ls
+
+```
+Usage: govc license.assigned.ls [OPTIONS]
+
+Options:
+  -id=                      Entity ID
+```
+
+## license.decode
+
+```
+Usage: govc license.decode [OPTIONS] KEY...
+
+Options:
+  -feature=                 List licenses with given feature
+```
+
+## license.ls
+
+```
+Usage: govc license.ls [OPTIONS]
+
+Options:
+  -feature=                 List licenses with given feature
+```
+
+## license.remove
+
+```
+Usage: govc license.remove [OPTIONS] KEY...
+
+Options:
+```
+
+## logs
+
+```
+Usage: govc logs [OPTIONS]
+
+View VPX and ESX logs.
+
+The '-log' option defaults to "hostd" when connected directly to a host or
+when connected to VirtualCenter and a '-host' option is given.  Otherwise,
+the '-log' option defaults to "vpxd:vpxd.log".  The '-host' option is ignored
+when connected directly to a host.  See 'govc logs.ls' for other '-log' options.
+
+Examples:
+  govc logs -n 1000 -f
+  govc logs -host esx1
+  govc logs -host esx1 -log vmkernel
+
+Options:
+  -f=false                  Follow log file changes
+  -host=                    Host system [GOVC_HOST]
+  -log=                     Log file key
+  -n=25                     Output the last N log lines
+```
+
+## logs.download
+
+```
+Usage: govc logs.download [OPTIONS] [PATH]...
+
+Generate diagnostic bundles.
+
+A diagnostic bundle includes log files and other configuration information.
+
+Use PATH to include a specific set of hosts to include.
+
+Examples:
+  govc logs.download
+  govc logs.download host-a host-b
+
+Options:
+  -default=true             Specifies if the bundle should include the default server
+```
+
+## logs.ls
+
+```
+Usage: govc logs.ls [OPTIONS]
+
+List diagnostic log keys.
+
+Examples:
+  govc logs.ls
+  govc logs.ls -host host-a
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+```
+
+## ls
+
+```
+Usage: govc ls [OPTIONS] [PATH]...
+
+List inventory items.
+
+Examples:
+  govc ls -l '*'
+  govc ls -t ClusterComputeResource host
+  govc ls -t Datastore host/ClusterA/* | grep -v local | xargs -n1 basename | sort | uniq
+
+Options:
+  -L=false                  Follow managed object references
+  -i=false                  Print the managed object reference
+  -l=false                  Long listing format
+  -t=                       Object type
+```
+
+## object.collect
+
+```
+Usage: govc object.collect [OPTIONS] [MOID] [PROPERTY]...
+
+Collect managed object properties.
+
+MOID can be an inventory path or ManagedObjectReference.
+MOID defaults to '-', an alias for 'ServiceInstance:ServiceInstance'.
+
+By default only the current property value(s) are collected.  Use the '-n' flag to wait for updates.
+
+Examples:
+  govc object.collect - content
+  govc object.collect -s HostSystem:ha-host hardware.systemInfo.uuid
+  govc object.collect -s /ha-datacenter/vm/foo overallStatus
+  govc object.collect -json -n=-1 EventManager:ha-eventmgr latestEvent | jq .
+  govc object.collect -json -s $(govc object.collect -s - content.perfManager) description.counterType | jq .
+
+Options:
+  -n=0                      Wait for N property updates
+  -s=false                  Output property value only
+```
+
+## object.destroy
+
+```
+Usage: govc object.destroy [OPTIONS] PATH...
+
+Destroy managed objects.
+
+Examples:
+  govc object.destroy /dc1/network/dvs /dc1/host/cluster
+
+Options:
+```
+
+## object.mv
+
+```
+Usage: govc object.mv [OPTIONS] PATH... FOLDER
+
+Move managed entities to FOLDER.
+
+Examples:
+  govc folder.create /dc1/host/example
+  govc object.mv /dc2/host/*.example.com /dc1/host/example
+
+Options:
+```
+
+## object.reload
+
+```
+Usage: govc object.reload [OPTIONS] PATH...
+
+Reload managed object state.
+
+Examples:
+  govc datastore.upload $vm.vmx $vm/$vm.vmx
+  govc object.reload /dc1/vm/$vm
+
+Options:
+```
+
+## object.rename
+
+```
+Usage: govc object.rename [OPTIONS] PATH NAME
+
+Rename managed objects.
+
+Examples:
+  govc object.rename /dc1/network/dvs1 Switch1
+
+Options:
+```
+
+## permissions.ls
+
+```
+Usage: govc permissions.ls [OPTIONS] [PATH]...
+
+List the permissions defined on or effective on managed entities.
+
+Examples:
+  govc permissions.ls
+  govc permissions.ls /dc1/host/cluster1
+
+Options:
+  -a=true                   Include inherited permissions defined by parent entities
+  -i=false                  Use moref instead of inventory path
+```
+
+## permissions.remove
+
+```
+Usage: govc permissions.remove [OPTIONS] [PATH]...
+
+Removes a permission rule from managed entities.
+
+Examples:
+  govc permissions.remove -principal root
+  govc permissions.remove -principal $USER@vsphere.local -role Admin /dc1/host/cluster1
+
+Options:
+  -group=false              True, if principal refers to a group name; false, for a user name
+  -i=false                  Use moref instead of inventory path
+  -principal=               User or group for which the permission is defined
+```
+
+## permissions.set
+
+```
+Usage: govc permissions.set [OPTIONS] [PATH]...
+
+Set the permissions managed entities.
+
+Examples:
+  govc permissions.set -principal root -role Admin
+  govc permissions.set -principal $USER@vsphere.local -role Admin /dc1/host/cluster1
+
+Options:
+  -group=false              True, if principal refers to a group name; false, for a user name
+  -i=false                  Use moref instead of inventory path
+  -principal=               User or group for which the permission is defined
+  -propagate=true           Whether or not this permission propagates down the hierarchy to sub-entities
+  -role=Admin               Permission role name
+```
+
+## pool.change
+
+```
+Usage: govc pool.change [OPTIONS] POOL...
+
+Change the configuration of one or more resource POOLs.
+
+POOL may be an absolute or relative path to a resource pool or a (clustered)
+compute host. If it resolves to a compute host, the associated root resource
+pool is returned. If a relative path is specified, it is resolved with respect
+to the current datacenter's "host" folder (i.e. /ha-datacenter/host).
+
+Paths to nested resource pools must traverse through the root resource pool of
+the selected compute host, i.e. "compute-host/Resources/nested-pool".
+
+The same globbing rules that apply to the "ls" command apply here. For example,
+POOL may be specified as "*/Resources/*" to expand to all resource pools that
+are nested one level under the root resource pool, on all (clustered) compute
+hosts in the current datacenter.
+
+Options:
+  -cpu.expandable=<nil>     CPU expandable reservation
+  -cpu.limit=0              CPU limit in MHz
+  -cpu.reservation=0        CPU reservation in MHz
+  -cpu.shares=              CPU shares level or number
+  -mem.expandable=<nil>     Memory expandable reservation
+  -mem.limit=0              Memory limit in MB
+  -mem.reservation=0        Memory reservation in MB
+  -mem.shares=              Memory shares level or number
+  -name=                    Resource pool name
+```
+
+## pool.create
+
+```
+Usage: govc pool.create [OPTIONS] POOL...
+
+Create one or more resource POOLs.
+
+POOL may be an absolute or relative path to a resource pool. The parent of the
+specified POOL must be an existing resource pool. If a relative path is
+specified, it is resolved with respect to the current datacenter's "host"
+folder (i.e. /ha-datacenter/host). The basename of the specified POOL is used
+as the name for the new resource pool.
+
+The same globbing rules that apply to the "ls" command apply here. For example,
+the path to the parent resource pool in POOL may be specified as "*/Resources"
+to expand to the root resource pools on all (clustered) compute hosts in the
+current datacenter.
+
+For example:
+  */Resources/test             Create resource pool "test" on all (clustered)
+                               compute hosts in the current datacenter.
+  somehost/Resources/*/nested  Create resource pool "nested" in every
+                               resource pool that is a direct descendant of
+                               the root resource pool on "somehost".
+
+Options:
+  -cpu.expandable=true      CPU expandable reservation
+  -cpu.limit=0              CPU limit in MHz
+  -cpu.reservation=0        CPU reservation in MHz
+  -cpu.shares=normal        CPU shares level or number
+  -mem.expandable=true      Memory expandable reservation
+  -mem.limit=0              Memory limit in MB
+  -mem.reservation=0        Memory reservation in MB
+  -mem.shares=normal        Memory shares level or number
+```
+
+## pool.destroy
+
+```
+Usage: govc pool.destroy [OPTIONS] POOL...
+
+Destroy one or more resource POOLs.
+
+POOL may be an absolute or relative path to a resource pool or a (clustered)
+compute host. If it resolves to a compute host, the associated root resource
+pool is returned. If a relative path is specified, it is resolved with respect
+to the current datacenter's "host" folder (i.e. /ha-datacenter/host).
+
+Paths to nested resource pools must traverse through the root resource pool of
+the selected compute host, i.e. "compute-host/Resources/nested-pool".
+
+The same globbing rules that apply to the "ls" command apply here. For example,
+POOL may be specified as "*/Resources/*" to expand to all resource pools that
+are nested one level under the root resource pool, on all (clustered) compute
+hosts in the current datacenter.
+
+Options:
+  -children=false           Remove all children pools
+```
+
+## pool.info
+
+```
+Usage: govc pool.info [OPTIONS] POOL...
+
+Retrieve information about one or more resource POOLs.
+
+POOL may be an absolute or relative path to a resource pool or a (clustered)
+compute host. If it resolves to a compute host, the associated root resource
+pool is returned. If a relative path is specified, it is resolved with respect
+to the current datacenter's "host" folder (i.e. /ha-datacenter/host).
+
+Paths to nested resource pools must traverse through the root resource pool of
+the selected compute host, i.e. "compute-host/Resources/nested-pool".
+
+The same globbing rules that apply to the "ls" command apply here. For example,
+POOL may be specified as "*/Resources/*" to expand to all resource pools that
+are nested one level under the root resource pool, on all (clustered) compute
+hosts in the current datacenter.
+
+Options:
+  -a=false                  List virtual app resource pools
+  -p=true                   List resource pools
+```
+
+## role.create
+
+```
+Usage: govc role.create [OPTIONS] NAME [PRIVILEGE]...
+
+Create authorization role.
+
+Optionally populate the role with the given PRIVILEGE(s).
+
+Examples:
+  govc role.create MyRole
+  govc role.create NoDC $(govc role.ls Admin | grep -v Datacenter.)
+
+Options:
+  -i=false                  Use moref instead of inventory path
+```
+
+## role.ls
+
+```
+Usage: govc role.ls [OPTIONS] [NAME]
+
+List authorization roles.
+
+If NAME is provided, list privileges for the role.
+
+Examples:
+  govc role.ls
+  govc role.ls Admin
+
+Options:
+  -i=false                  Use moref instead of inventory path
+```
+
+## role.remove
+
+```
+Usage: govc role.remove [OPTIONS] NAME
+
+Remove authorization role.
+
+Examples:
+  govc role.remove MyRole
+  govc role.remove MyRole -force
+
+Options:
+  -force=false              Force removal if role is in use
+  -i=false                  Use moref instead of inventory path
+```
+
+## role.update
+
+```
+Usage: govc role.update [OPTIONS] NAME [PRIVILEGE]...
+
+Update authorization role.
+
+Set, Add or Remove role PRIVILEGE(s).
+
+Examples:
+  govc role.update MyRole $(govc role.ls Admin | grep VirtualMachine.)
+  govc role.update -r MyRole $(govc role.ls Admin | grep VirtualMachine.GuestOperations.)
+  govc role.update -a MyRole $(govc role.ls Admin | grep Datastore.)
+  govc role.update -name RockNRole MyRole
+
+Options:
+  -a=false                  Remove given PRIVILEGE(s)
+  -i=false                  Use moref instead of inventory path
+  -name=                    Change role name
+  -r=false                  Remove given PRIVILEGE(s)
+```
+
+## role.usage
+
+```
+Usage: govc role.usage [OPTIONS] NAME...
+
+List usage for role NAME.
+
+Examples:
+  govc role.usage
+  govc role.usage Admin
+
+Options:
+  -i=false                  Use moref instead of inventory path
+```
+
+## session.ls
+
+```
+Usage: govc session.ls [OPTIONS]
+
+List active sessions.
+
+Examples:
+  govc session.ls
+  govc session.ls -json | jq -r .CurrentSession.Key
+
+Options:
+```
+
+## session.rm
+
+```
+Usage: govc session.rm [OPTIONS] KEY...
+
+Remove active sessions.
+
+Examples:
+  govc session.ls | grep root
+  govc session.rm 5279e245-e6f1-4533-4455-eb94353b213a
+
+Options:
+```
+
+## snapshot.create
+
+```
+Usage: govc snapshot.create [OPTIONS] NAME
+
+Create snapshot of VM with NAME.
+
+Examples:
+  govc snapshot.create -vm my-vm happy-vm-state
+
+Options:
+  -d=                       Snapshot description
+  -m=true                   Include memory state
+  -q=false                  Quiesce guest file system
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## snapshot.remove
+
+```
+Usage: govc snapshot.remove [OPTIONS] NAME
+
+Remove snapshot of VM with given NAME.
+
+NAME can be the snapshot name, tree path, moid or '*' to remove all snapshots.
+
+Examples:
+  govc snapshot.remove -vm my-vm happy-vm-state
+
+Options:
+  -c=true                   Consolidate disks
+  -r=false                  Remove snapshot children
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## snapshot.revert
+
+```
+Usage: govc snapshot.revert [OPTIONS] [NAME]
+
+Revert to snapshot of VM with given NAME.
+
+If NAME is not provided, revert to the current snapshot.
+Otherwise, NAME can be the snapshot name, tree path or moid.
+
+Examples:
+  govc snapshot.revert -vm my-vm happy-vm-state
+
+Options:
+  -s=false                  Suppress power on
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## snapshot.tree
+
+```
+Usage: govc snapshot.tree [OPTIONS]
+
+List VM snapshots in a tree-like format.
+
+The command will exit 0 with no output if VM does not have any snapshots.
+
+Examples:
+  govc snapshot.tree -vm my-vm
+  govc snapshot.tree -vm my-vm -D -i
+
+Options:
+  -D=false                  Print the snapshot creation date
+  -c=true                   Print the current snapshot
+  -f=false                  Print the full path prefix for snapshot
+  -i=false                  Print the snapshot id
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## vapp.destroy
+
+```
+Usage: govc vapp.destroy [OPTIONS] VAPP...
+
+Options:
+```
+
+## vapp.power
+
+```
+Usage: govc vapp.power [OPTIONS]
+
+Options:
+  -force=false              Force (If force is false, the shutdown order in the vApp is executed. If force is true, all virtual machines are powered-off (regardless of shutdown order))
+  -off=false                Power off
+  -on=false                 Power on
+  -suspend=false            Power suspend
+  -vapp.ipath=              Find vapp by inventory path
+```
+
+## version
+
+```
+Usage: govc version [OPTIONS]
+
+Options:
+  -require=  Require govc version >= this value
+```
+
+## vm.change
+
+```
+Usage: govc vm.change [OPTIONS]
+
+Change VM configuration.
+
+Examples:
+  govc vm.change -vm $vm -e smc.present=TRUE -e ich7m.present=TRUE
+
+Options:
+  -c=0                        Number of CPUs
+  -e=[]                       ExtraConfig. <key>=<value>
+  -g=                         Guest OS
+  -m=0                        Size in MB of memory
+  -name=                      Display name
+  -nested-hv-enabled=<nil>    Enable nested hardware-assisted virtualization
+  -sync-time-with-host=<nil>  Enable SyncTimeWithHost
+  -vm=                        Virtual machine [GOVC_VM]
+```
+
+## vm.clone
+
+```
+Usage: govc vm.clone [OPTIONS] NAME
+
+Clone VM to NAME.
+
+Examples:
+  govc vm.clone -vm template-vm new-vm
+
+Options:
+  -annotation=              VM description
+  -c=0                      Number of CPUs
+  -customization=           Customization Specification Name
+  -datastore-cluster=       Datastore cluster [GOVC_DATASTORE_CLUSTER]
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -folder=                  Inventory folder [GOVC_FOLDER]
+  -force=false              Create VM if vmx already exists
+  -host=                    Host system [GOVC_HOST]
+  -m=0                      Size in MB of memory
+  -net=                     Network [GOVC_NETWORK]
+  -net.adapter=e1000        Network adapter type
+  -net.address=             Network hardware address
+  -on=true                  Power on VM
+  -pool=                    Resource pool [GOVC_RESOURCE_POOL]
+  -template=false           Create a Template
+  -vm=                      Virtual machine [GOVC_VM]
+  -waitip=false             Wait for VM to acquire IP address
+```
+
+## vm.create
+
+```
+Usage: govc vm.create [OPTIONS]
+
+Options:
+  -annotation=              VM description
+  -c=1                      Number of CPUs
+  -datastore-cluster=       Datastore cluster [GOVC_DATASTORE_CLUSTER]
+  -disk=                    Disk path (to use existing) OR size (to create new, e.g. 20GB)
+  -disk-datastore=          Datastore for disk file
+  -disk.controller=scsi     Disk controller type
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -folder=                  Inventory folder [GOVC_FOLDER]
+  -force=false              Create VM if vmx already exists
+  -g=otherGuest             Guest OS
+  -host=                    Host system [GOVC_HOST]
+  -iso=                     ISO path
+  -iso-datastore=           Datastore for ISO file
+  -link=true                Link specified disk
+  -m=1024                   Size in MB of memory
+  -net=                     Network [GOVC_NETWORK]
+  -net.adapter=e1000        Network adapter type
+  -net.address=             Network hardware address
+  -on=true                  Power on VM. Default is true if -disk argument is given.
+  -pool=                    Resource pool [GOVC_RESOURCE_POOL]
+```
+
+## vm.destroy
+
+```
+Usage: govc vm.destroy [OPTIONS]
+
+Options:
+```
+
+## vm.disk.attach
+
+```
+Usage: govc vm.disk.attach [OPTIONS]
+
+Options:
+  -controller=              Disk controller
+  -disk=                    Disk path name
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -link=true                Link specified disk
+  -persist=true             Persist attached disk
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## vm.disk.change
+
+```
+Usage: govc vm.disk.change [OPTIONS]
+
+Change some properties of a VM's DISK
+
+In particular, you can change the DISK mode, and the size (as long as it is bigger)
+
+Examples:
+  govc vm.disk.change -vm VM -disk.key 2001 -size 10G
+  govc vm.disk.change -vm VM -disk.label "BDD disk" -size 10G
+  govc vm.disk.change -vm VM -disk.name "hard-1000-0" -size 12G
+  govc vm.disk.change -vm VM -disk.filePath "[DS] VM/VM-1.vmdk" -mode nonpersistent
+
+Options:
+  -disk.filePath=           Disk file name
+  -disk.key=0               Disk unique key
+  -disk.label=              Disk label
+  -disk.name=               Disk name
+  -mode=                    Disk mode (persistent|nonpersistent|undoable|independent_persistent|independent_nonpersistent|append)
+  -size=0B                  New disk size
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## vm.disk.create
+
+```
+Usage: govc vm.disk.create [OPTIONS]
+
+Create disk and attach to VM.
+
+Examples:
+  govc vm.disk.create -vm $name -name $name/disk1 -size 10G
+
+Options:
+  -controller=              Disk controller
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -eager=false              Eagerly scrub new disk
+  -mode=persistent          Disk mode (persistent|nonpersistent|undoable|independent_persistent|independent_nonpersistent|append)
+  -name=                    Name for new disk
+  -size=10.0GB              Size of new disk
+  -thick=false              Thick provision new disk
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## vm.guest.tools
+
+```
+Usage: govc vm.guest.tools [OPTIONS] VM...
+
+Manage guest tools in VM.
+
+Examples:
+  govc vm.guest.tools -mount VM
+  govc vm.guest.tools -unmount VM
+  govc vm.guest.tools -upgrade -options "opt1 opt2" VM
+
+Options:
+  -mount=false              Mount tools CD installer in the guest
+  -options=                 Installer options
+  -unmount=false            Unmount tools CD installer in the guest
+  -upgrade=false            Upgrade tools in the guest
+```
+
+## vm.info
+
+```
+Usage: govc vm.info [OPTIONS]
+
+Options:
+  -e=false                  Show ExtraConfig
+  -g=true                   Show general summary
+  -r=false                  Show resource summary
+  -t=false                  Show ToolsConfigInfo
+  -waitip=false             Wait for VM to acquire IP address
+```
+
+## vm.ip
+
+```
+Usage: govc vm.ip [OPTIONS] VM...
+
+List IPs for VM.
+
+By default the vm.ip command depends on vmware-tools to report the 'guest.ipAddress' field and will
+wait until it has done so.  This value can also be obtained using:
+
+  govc vm.info -json $vm | jq -r .VirtualMachines[].Guest.IpAddress
+
+When given the '-a' flag, only IP addresses for which there is a corresponding virtual nic are listed.
+If there are multiple nics, the listed addresses will be comma delimited.  The '-a' flag depends on
+vmware-tools to report the 'guest.net' field and will wait until it has done so for all nics.
+Note that this list includes IPv6 addresses if any, use '-v4' to filter them out.  IP addresses reported
+by tools for which there is no virtual nic are not included, for example that of the 'docker0' interface.
+
+These values can also be obtained using:
+
+  govc vm.info -json $vm | jq -r .VirtualMachines[].Guest.Net[].IpConfig.IpAddress[].IpAddress
+
+When given the '-n' flag, filters '-a' behavior to the nic specified by MAC address or device name.
+
+The 'esxcli' flag does not require vmware-tools to be installed, but does require the ESX host to
+have the /Net/GuestIPHack setting enabled.
+
+Examples:
+  govc vm.ip $vm
+  govc vm.ip -a -v4 $vm
+  govc vm.ip -n 00:0c:29:57:7b:c3 $vm
+  govc vm.ip -n ethernet-0 $vm
+  govc host.esxcli system settings advanced set -o /Net/GuestIPHack -i 1
+  govc vm.ip -esxcli $vm
+
+Options:
+  -a=false                  Wait for an IP address on all NICs
+  -esxcli=false             Use esxcli instead of guest tools
+  -n=                       Wait for IP address on NIC, specified by device name or MAC
+  -v4=false                 Only report IPv4 addresses
+```
+
+## vm.markastemplate
+
+```
+Usage: govc vm.markastemplate [OPTIONS] VM...
+
+Mark VM as a virtual machine template.
+
+Examples:
+  govc vm.markastemplate $name
+
+Options:
+```
+
+## vm.markasvm
+
+```
+Usage: govc vm.markasvm [OPTIONS] VM...
+
+Mark VM template as a virtual machine.
+
+Examples:
+  govc vm.markasvm $name -host host1
+  govc vm.markasvm $name -pool cluster1/Resources
+
+Options:
+  -host=                    Host system [GOVC_HOST]
+  -pool=                    Resource pool [GOVC_RESOURCE_POOL]
+```
+
+## vm.migrate
+
+```
+Usage: govc vm.migrate [OPTIONS] VM...
+
+Migrates VM to a specific resource pool, host or datastore.
+
+Examples:
+  govc vm.migrate -host another-host vm-1 vm-2 vm-3
+  govc vm.migrate -ds another-ds vm-1 vm-2 vm-3
+
+Options:
+  -ds=                       Datastore [GOVC_DATASTORE]
+  -host=                     Host system [GOVC_HOST]
+  -pool=                     Resource pool [GOVC_RESOURCE_POOL]
+  -priority=defaultPriority  The task priority
+```
+
+## vm.network.add
+
+```
+Usage: govc vm.network.add [OPTIONS]
+
+Add network adapter to VM.
+
+Examples:
+  govc vm.network.add -vm $vm -net "VM Network" -net.adapter e1000e
+  govc device.info -vm $vm ethernet-*
+
+Options:
+  -net=                     Network [GOVC_NETWORK]
+  -net.adapter=e1000        Network adapter type
+  -net.address=             Network hardware address
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## vm.network.change
+
+```
+Usage: govc vm.network.change [OPTIONS] DEVICE
+
+Change network DEVICE configuration.
+
+Examples:
+  govc vm.network.change -vm $vm -net PG2 ethernet-0
+  govc vm.network.change -vm $vm -net.address 00:00:0f:2e:5d:69 ethernet-0
+  govc device.info -vm $vm ethernet-*
+
+Options:
+  -net=                     Network [GOVC_NETWORK]
+  -net.adapter=e1000        Network adapter type
+  -net.address=             Network hardware address
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## vm.power
+
+```
+Usage: govc vm.power [OPTIONS]
+
+Options:
+  -force=false              Force (ignore state error and hard shutdown/reboot if tools unavailable)
+  -off=false                Power off
+  -on=false                 Power on
+  -r=false                  Reboot guest
+  -reset=false              Power reset
+  -s=false                  Shutdown guest
+  -suspend=false            Power suspend
+```
+
+## vm.question
+
+```
+Usage: govc vm.question [OPTIONS]
+
+Options:
+  -answer=                  Answer to question
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## vm.rdm.attach
+
+```
+Usage: govc vm.rdm.attach [OPTIONS]
+
+Attach DEVICE to VM with RDM.
+
+Examples:
+  govc vm.rdm.attach -vm VM -device /vmfs/devices/disks/naa.000000000000000000000000000000000
+
+Options:
+  -device=                  Device Name
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## vm.rdm.ls
+
+```
+Usage: govc vm.rdm.ls [OPTIONS]
+
+List available devices that could be attach to VM with RDM.
+
+Examples:
+  govc vm.rdm.ls -vm VM
+
+Options:
+  -vm=                      Virtual machine [GOVC_VM]
+```
+
+## vm.register
+
+```
+Usage: govc vm.register [OPTIONS] VMX
+
+Add an existing VM to the inventory.
+
+VMX is a path to the vm config file, relative to DATASTORE.
+
+Examples:
+  govc vm.register path/name.vmx
+
+Options:
+  -as-template=false        Mark VM as template
+  -ds=                      Datastore [GOVC_DATASTORE]
+  -folder=                  Inventory folder [GOVC_FOLDER]
+  -host=                    Host system [GOVC_HOST]
+  -name=                    Name of the VM
+  -pool=                    Resource pool [GOVC_RESOURCE_POOL]
+```
+
+## vm.unregister
+
+```
+Usage: govc vm.unregister [OPTIONS] VM...
+
+Remove VM from inventory without removing any of the VM files on disk.
+
+Options:
+```
+
+## vm.vnc
+
+```
+Usage: govc vm.vnc [OPTIONS] VM...
+
+Enable or disable VNC for VM.
+
+Port numbers are automatically chosen if not specified.
+
+If neither -enable or -disable is specified, the current state is returned.
+
+Examples:
+  govc vm.vnc -enable -password 1234 $vm | awk '{print $2}' | xargs open
+
+Options:
+  -disable=false            Disable VNC
+  -enable=false             Enable VNC
+  -password=                VNC password
+  -port=-1                  VNC port (-1 for auto-select)
+  -port-range=5900-5999     VNC port auto-select range
+```
+
diff --git a/vendor/github.com/vmware/govmomi/govc/about/cert.go b/vendor/github.com/vmware/govmomi/govc/about/cert.go
new file mode 100644
index 0000000000..37bea94a03
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/about/cert.go
@@ -0,0 +1,120 @@
+/*
+Copyright (c) 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 about
+
+import (
+	"context"
+	"encoding/pem"
+	"flag"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/soap"
+)
+
+type cert struct {
+	*flags.ClientFlag
+	*flags.OutputFlag
+
+	show       bool
+	thumbprint bool
+}
+
+func init() {
+	cli.Register("about.cert", &cert{})
+}
+
+func (cmd *cert) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.show, "show", false, "Show PEM encoded server certificate only")
+	f.BoolVar(&cmd.thumbprint, "thumbprint", false, "Output host hash and thumbprint only")
+}
+
+func (cmd *cert) Description() string {
+	return `Display TLS certificate info for HOST.
+
+If the HOST certificate cannot be verified, about.cert will return with exit code 60 (as curl does).
+If the '-k' flag is provided, about.cert will return with exit code 0 in this case.
+The SHA1 thumbprint can also be used as '-thumbprint' for the 'host.add' and 'cluster.add' commands.
+
+Examples:
+  govc about.cert -k -json | jq -r .ThumbprintSHA1
+  govc about.cert -k -show | sudo tee /usr/local/share/ca-certificates/host.crt
+  govc about.cert -k -thumbprint | tee -a ~/.govmomi/known_hosts`
+}
+
+func (cmd *cert) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+type certResult struct {
+	cmd  *cert
+	info object.HostCertificateInfo
+}
+
+func (r *certResult) Write(w io.Writer) error {
+	if r.cmd.show {
+		return pem.Encode(w, &pem.Block{Type: "CERTIFICATE", Bytes: r.info.Certificate.Raw})
+	}
+
+	if r.cmd.thumbprint {
+		u := r.cmd.URLWithoutPassword()
+		_, err := fmt.Fprintf(w, "%s %s\n", u.Host, r.info.ThumbprintSHA1)
+		return err
+	}
+
+	return r.cmd.WriteResult(&r.info)
+}
+
+func (cmd *cert) Run(ctx context.Context, f *flag.FlagSet) error {
+	u := cmd.URLWithoutPassword()
+	c := soap.NewClient(u, false)
+	t := c.Client.Transport.(*http.Transport)
+	r := certResult{cmd: cmd}
+
+	if err := cmd.SetRootCAs(c); err != nil {
+		return err
+	}
+
+	if err := r.info.FromURL(u, t.TLSClientConfig); err != nil {
+		return err
+	}
+
+	if r.info.Err != nil && r.cmd.IsSecure() {
+		cmd.Out = os.Stderr
+		// using same exit code as curl:
+		defer os.Exit(60)
+	}
+
+	return r.Write(cmd.Out)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/about/command.go b/vendor/github.com/vmware/govmomi/govc/about/command.go
new file mode 100644
index 0000000000..a03c44e549
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/about/command.go
@@ -0,0 +1,109 @@
+/*
+Copyright (c) 2014-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 about
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type about struct {
+	*flags.ClientFlag
+	*flags.OutputFlag
+
+	Long bool
+}
+
+func init() {
+	cli.Register("about", &about{})
+}
+
+func (cmd *about) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.Long, "l", false, "Include service content")
+}
+
+func (cmd *about) Description() string {
+	return `Display About info for HOST.
+
+System information including the name, type, version, and build number.
+
+Examples:
+  govc about
+  govc about -json | jq -r .About.ProductLineId`
+}
+
+func (cmd *about) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *about) Run(ctx context.Context, f *flag.FlagSet) error {
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	res := infoResult{
+		a: &c.ServiceContent.About,
+	}
+
+	if cmd.Long {
+		res.Content = &c.ServiceContent
+	} else {
+		res.About = res.a
+	}
+
+	return cmd.WriteResult(&res)
+}
+
+type infoResult struct {
+	Content *types.ServiceContent `json:",omitempty"`
+	About   *types.AboutInfo      `json:",omitempty"`
+	a       *types.AboutInfo
+}
+
+func (r *infoResult) Write(w io.Writer) error {
+	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
+	fmt.Fprintf(tw, "Name:\t%s\n", r.a.Name)
+	fmt.Fprintf(tw, "Vendor:\t%s\n", r.a.Vendor)
+	fmt.Fprintf(tw, "Version:\t%s\n", r.a.Version)
+	fmt.Fprintf(tw, "Build:\t%s\n", r.a.Build)
+	fmt.Fprintf(tw, "OS type:\t%s\n", r.a.OsType)
+	fmt.Fprintf(tw, "API type:\t%s\n", r.a.ApiType)
+	fmt.Fprintf(tw, "API version:\t%s\n", r.a.ApiVersion)
+	fmt.Fprintf(tw, "Product ID:\t%s\n", r.a.ProductLineId)
+	fmt.Fprintf(tw, "UUID:\t%s\n", r.a.InstanceUuid)
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/build.sh b/vendor/github.com/vmware/govmomi/govc/build.sh
new file mode 100755
index 0000000000..dcde210af1
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/build.sh
@@ -0,0 +1,34 @@
+#!/bin/bash -e
+
+git_version=$(git describe)
+if git_status=$(git status --porcelain 2>/dev/null) && [ -n "${git_status}" ]; then
+  git_version="${git_version}-dirty"
+fi
+
+ldflags="-X github.com/vmware/govmomi/govc/version.gitVersion=${git_version}"
+
+BUILD_OS=${BUILD_OS:-darwin linux windows freebsd}
+BUILD_ARCH=${BUILD_ARCH:-386 amd64}
+
+for os in ${BUILD_OS}; do
+  export GOOS="${os}"
+  for arch in ${BUILD_ARCH}; do
+    export GOARCH="${arch}"
+
+    out="govc_${os}_${arch}"
+    if [ "${os}" == "windows" ]; then
+      out="${out}.exe"
+    fi
+
+    set -x
+    go build \
+      -o="${out}" \
+      -pkgdir="./_pkg" \
+      -compiler='gc' \
+      -ldflags="${ldflags}" \
+      github.com/vmware/govmomi/govc &
+    set +x
+  done
+done
+
+wait
diff --git a/vendor/github.com/vmware/govmomi/govc/cli/command.go b/vendor/github.com/vmware/govmomi/govc/cli/command.go
new file mode 100644
index 0000000000..bac2289622
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/cli/command.go
@@ -0,0 +1,172 @@
+/*
+Copyright (c) 2014-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 cli
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"sort"
+	"text/tabwriter"
+)
+
+type HasFlags interface {
+	// Register may be called more than once and should be idempotent.
+	Register(ctx context.Context, f *flag.FlagSet)
+
+	// Process may be called more than once and should be idempotent.
+	Process(ctx context.Context) error
+}
+
+type Command interface {
+	HasFlags
+
+	Run(ctx context.Context, f *flag.FlagSet) error
+}
+
+func generalHelp(w io.Writer) {
+	fmt.Fprintf(w, "Usage of %s:\n", os.Args[0])
+
+	cmds := []string{}
+	for name := range commands {
+		cmds = append(cmds, name)
+	}
+
+	sort.Strings(cmds)
+
+	for _, name := range cmds {
+		fmt.Fprintf(w, "  %s\n", name)
+	}
+}
+
+func commandHelp(w io.Writer, name string, cmd Command, f *flag.FlagSet) {
+	type HasUsage interface {
+		Usage() string
+	}
+
+	fmt.Fprintf(w, "Usage: %s %s [OPTIONS]", os.Args[0], name)
+	if u, ok := cmd.(HasUsage); ok {
+		fmt.Fprintf(w, " %s", u.Usage())
+	}
+	fmt.Fprintf(w, "\n")
+
+	type HasDescription interface {
+		Description() string
+	}
+
+	if u, ok := cmd.(HasDescription); ok {
+		fmt.Fprintf(w, "\n%s\n", u.Description())
+	}
+
+	n := 0
+	f.VisitAll(func(_ *flag.Flag) {
+		n += 1
+	})
+
+	if n > 0 {
+		fmt.Fprintf(w, "\nOptions:\n")
+		tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
+		f.VisitAll(func(f *flag.Flag) {
+			fmt.Fprintf(tw, "\t-%s=%s\t%s\n", f.Name, f.DefValue, f.Usage)
+		})
+		tw.Flush()
+	}
+}
+
+func clientLogout(ctx context.Context, cmd Command) error {
+	type logout interface {
+		Logout(context.Context) error
+	}
+
+	if l, ok := cmd.(logout); ok {
+		return l.Logout(ctx)
+	}
+
+	return nil
+}
+
+func Run(args []string) int {
+	hw := os.Stderr
+	rc := 1
+	hwrc := func(arg string) {
+		if arg == "-h" {
+			hw = os.Stdout
+			rc = 0
+		}
+	}
+
+	var err error
+
+	if len(args) == 0 {
+		generalHelp(hw)
+		return rc
+	}
+
+	// Look up real command name in aliases table.
+	name, ok := aliases[args[0]]
+	if !ok {
+		name = args[0]
+	}
+
+	cmd, ok := commands[name]
+	if !ok {
+		hwrc(name)
+		generalHelp(hw)
+		return rc
+	}
+
+	fs := flag.NewFlagSet("", flag.ContinueOnError)
+	fs.SetOutput(ioutil.Discard)
+
+	ctx := context.Background()
+	cmd.Register(ctx, fs)
+
+	if err = fs.Parse(args[1:]); err != nil {
+		goto error
+	}
+
+	if err = cmd.Process(ctx); err != nil {
+		goto error
+	}
+
+	if err = cmd.Run(ctx, fs); err != nil {
+		goto error
+	}
+
+	if err = clientLogout(ctx, cmd); err != nil {
+		goto error
+	}
+
+	return 0
+
+error:
+	if err == flag.ErrHelp {
+		if len(args) == 2 {
+			hwrc(args[1])
+		}
+		commandHelp(hw, args[0], cmd, fs)
+	} else {
+		fmt.Fprintf(os.Stderr, "%s: %s\n", os.Args[0], err)
+	}
+
+	_ = clientLogout(ctx, cmd)
+
+	return rc
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/cli/register.go b/vendor/github.com/vmware/govmomi/govc/cli/register.go
new file mode 100644
index 0000000000..a20fc3ad0e
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/cli/register.go
@@ -0,0 +1,33 @@
+/*
+Copyright (c) 2014-2015 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 cli
+
+var commands = map[string]Command{}
+
+var aliases = map[string]string{}
+
+func Register(name string, c Command) {
+	commands[name] = c
+}
+
+func Alias(name string, alias string) {
+	aliases[alias] = name
+}
+
+func Commands() map[string]Command {
+	return commands
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/cluster/add.go b/vendor/github.com/vmware/govmomi/govc/cluster/add.go
new file mode 100644
index 0000000000..e29af5ab80
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/cluster/add.go
@@ -0,0 +1,122 @@
+/*
+Copyright (c) 2015 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 cluster
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type add struct {
+	*flags.DatacenterFlag
+	*flags.HostConnectFlag
+
+	cluster string
+	connect bool
+	license string
+}
+
+func init() {
+	cli.Register("cluster.add", &add{})
+}
+
+func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+
+	cmd.HostConnectFlag, ctx = flags.NewHostConnectFlag(ctx)
+	cmd.HostConnectFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.cluster, "cluster", "*", "Path to cluster")
+
+	f.StringVar(&cmd.license, "license", "", "Assign license key")
+
+	f.BoolVar(&cmd.connect, "connect", true, "Immediately connect to host")
+}
+
+func (cmd *add) Process(ctx context.Context) error {
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostConnectFlag.Process(ctx); err != nil {
+		return err
+	}
+	if cmd.HostName == "" {
+		return flag.ErrHelp
+	}
+	if cmd.UserName == "" {
+		return flag.ErrHelp
+	}
+	if cmd.Password == "" {
+		return flag.ErrHelp
+	}
+	return nil
+}
+
+func (cmd *add) Description() string {
+	return `Add HOST to CLUSTER.
+
+The host is added to the cluster specified by the 'cluster' flag.
+
+Examples:
+  thumbprint=$(govc about.cert -k -u host.example.com -thumbprint | awk '{print $2}')
+  govc cluster.add -cluster ClusterA -hostname host.example.com -username root -password pass -thumbprint $thumbprint
+  govc cluster.add -cluster ClusterB -hostname 10.0.6.1 -username root -password pass -noverify`
+}
+
+func (cmd *add) Add(ctx context.Context, cluster *object.ClusterComputeResource) error {
+	spec := cmd.HostConnectSpec
+
+	var license *string
+	if cmd.license != "" {
+		license = &cmd.license
+	}
+
+	task, err := cluster.AddHost(ctx, cmd.Spec(cluster.Client()), cmd.connect, license, nil)
+	if err != nil {
+		return err
+	}
+
+	logger := cmd.ProgressLogger(fmt.Sprintf("adding %s to cluster %s... ", spec.HostName, cluster.InventoryPath))
+	defer logger.Wait()
+
+	_, err = task.WaitForResult(ctx, logger)
+	return err
+}
+
+func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 0 {
+		return flag.ErrHelp
+	}
+
+	finder, err := cmd.Finder()
+	if err != nil {
+		return err
+	}
+
+	cluster, err := finder.ClusterComputeResource(ctx, cmd.cluster)
+	if err != nil {
+		return err
+	}
+
+	return cmd.Fault(cmd.Add(ctx, cluster))
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/cluster/change.go b/vendor/github.com/vmware/govmomi/govc/cluster/change.go
new file mode 100644
index 0000000000..2ef8fe5fa2
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/cluster/change.go
@@ -0,0 +1,112 @@
+/*
+Copyright (c) 2015 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 cluster
+
+import (
+	"context"
+	"flag"
+	"strings"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type change struct {
+	*flags.DatacenterFlag
+
+	types.ClusterConfigSpecEx
+}
+
+func init() {
+	cli.Register("cluster.change", &change{})
+}
+
+func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+
+	cmd.DrsConfig = new(types.ClusterDrsConfigInfo)
+	cmd.DasConfig = new(types.ClusterDasConfigInfo)
+	cmd.VsanConfig = new(types.VsanClusterConfigInfo)
+	cmd.VsanConfig.DefaultConfig = new(types.VsanClusterConfigInfoHostDefaultInfo)
+
+	// DRS
+	f.Var(flags.NewOptionalBool(&cmd.DrsConfig.Enabled), "drs-enabled", "Enable DRS")
+
+	drsModes := []string{
+		string(types.DrsBehaviorManual),
+		string(types.DrsBehaviorPartiallyAutomated),
+		string(types.DrsBehaviorFullyAutomated),
+	}
+	f.StringVar((*string)(&cmd.DrsConfig.DefaultVmBehavior), "drs-mode", "",
+		"DRS behavior for virtual machines: "+strings.Join(drsModes, ", "))
+
+	// HA
+	f.Var(flags.NewOptionalBool(&cmd.DasConfig.Enabled), "ha-enabled", "Enable HA")
+
+	// vSAN
+	f.Var(flags.NewOptionalBool(&cmd.VsanConfig.Enabled), "vsan-enabled", "Enable vSAN")
+	f.Var(flags.NewOptionalBool(&cmd.VsanConfig.DefaultConfig.AutoClaimStorage), "vsan-autoclaim", "Autoclaim storage on cluster hosts")
+}
+
+func (cmd *change) Process(ctx context.Context) error {
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *change) Usage() string {
+	return "CLUSTER..."
+}
+
+func (cmd *change) Description() string {
+	return `Change configuration of the given clusters.
+
+Examples:
+  govc cluster.change -drs-enabled -vsan-enabled -vsan-autoclaim ClusterA
+  govc cluster.change -drs-enabled=false ClusterB`
+}
+
+func (cmd *change) Run(ctx context.Context, f *flag.FlagSet) error {
+	finder, err := cmd.Finder()
+	if err != nil {
+		return err
+	}
+
+	for _, path := range f.Args() {
+		clusters, err := finder.ClusterComputeResourceList(ctx, path)
+		if err != nil {
+			return err
+		}
+
+		for _, cluster := range clusters {
+			task, err := cluster.Reconfigure(ctx, &cmd.ClusterConfigSpecEx, true)
+			if err != nil {
+				return err
+			}
+
+			_, err = task.WaitForResult(ctx, nil)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/cluster/create.go b/vendor/github.com/vmware/govmomi/govc/cluster/create.go
new file mode 100644
index 0000000000..265e9d301f
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/cluster/create.go
@@ -0,0 +1,78 @@
+/*
+Copyright (c) 2015 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 cluster
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type create struct {
+	*flags.FolderFlag
+
+	types.ClusterConfigSpecEx
+}
+
+func init() {
+	cli.Register("cluster.create", &create{})
+}
+
+func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.FolderFlag, ctx = flags.NewFolderFlag(ctx)
+	cmd.FolderFlag.Register(ctx, f)
+}
+
+func (cmd *create) Usage() string {
+	return "CLUSTER"
+}
+
+func (cmd *create) Description() string {
+	return `Create CLUSTER in datacenter.
+
+The cluster is added to the folder specified by the 'folder' flag. If not given,
+this defaults to the host folder in the specified or default datacenter.
+
+Examples:
+  govc cluster.create ClusterA
+  govc cluster.create -folder /dc2/test-folder ClusterB`
+}
+
+func (cmd *create) Process(ctx context.Context) error {
+	if err := cmd.FolderFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 1 {
+		return flag.ErrHelp
+	}
+
+	folder, err := cmd.FolderOrDefault("host")
+	if err != nil {
+		return err
+	}
+
+	_, err = folder.CreateCluster(ctx, f.Arg(0), cmd.ClusterConfigSpecEx)
+
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/datacenter/create.go b/vendor/github.com/vmware/govmomi/govc/datacenter/create.go
new file mode 100644
index 0000000000..733bc7af63
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/datacenter/create.go
@@ -0,0 +1,69 @@
+/*
+Copyright (c) 2014-2015 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 datacenter
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type create struct {
+	*flags.FolderFlag
+}
+
+func init() {
+	cli.Register("datacenter.create", &create{})
+}
+
+func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.FolderFlag, ctx = flags.NewFolderFlag(ctx)
+	cmd.FolderFlag.Register(ctx, f)
+}
+
+func (cmd *create) Usage() string {
+	return "NAME..."
+}
+
+func (cmd *create) Process(ctx context.Context) error {
+	if err := cmd.FolderFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
+	folder, err := cmd.FolderOrDefault("/")
+	if err != nil {
+		return err
+	}
+
+	if f.NArg() == 0 {
+		return flag.ErrHelp
+	}
+
+	for _, name := range f.Args() {
+		_, err := folder.CreateDatacenter(ctx, name)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/datacenter/info.go b/vendor/github.com/vmware/govmomi/govc/datacenter/info.go
new file mode 100644
index 0000000000..e0fd0d0ce6
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/datacenter/info.go
@@ -0,0 +1,174 @@
+/*
+Copyright (c) 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 datacenter
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"path"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/find"
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type info struct {
+	*flags.ClientFlag
+	*flags.OutputFlag
+	*flags.DatacenterFlag
+}
+
+func init() {
+	cli.Register("datacenter.info", &info{})
+}
+
+func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+}
+
+func (cmd *info) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *info) Usage() string {
+	return "[PATH]..."
+}
+
+func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	finder, err := cmd.Finder()
+	if err != nil {
+		return err
+	}
+
+	args := f.Args()
+	if len(args) == 0 {
+		args = []string{"*"}
+	}
+
+	var props []string
+	res := infoResult{
+		finder: finder,
+		ctx:    ctx,
+	}
+
+	if !cmd.OutputFlag.JSON {
+		props = []string{
+			"name",
+			"vmFolder",
+			"hostFolder",
+			"datastoreFolder",
+			"networkFolder",
+			"datastore",
+			"network",
+		}
+	}
+
+	for _, arg := range args {
+		objects, err := finder.DatacenterList(ctx, arg)
+		if err != nil {
+			return err
+		}
+		res.objects = append(res.objects, objects...)
+	}
+
+	if len(res.objects) != 0 {
+		refs := make([]types.ManagedObjectReference, 0, len(res.objects))
+		for _, o := range res.objects {
+			refs = append(refs, o.Reference())
+		}
+
+		pc := property.DefaultCollector(c)
+		err = pc.Retrieve(ctx, refs, props, &res.Datacenters)
+		if err != nil {
+			return err
+		}
+	}
+
+	return cmd.WriteResult(&res)
+}
+
+type infoResult struct {
+	Datacenters []mo.Datacenter
+	objects     []*object.Datacenter
+	finder      *find.Finder
+	ctx         context.Context
+}
+
+func (r *infoResult) Write(w io.Writer) error {
+	// Maintain order via r.objects as Property collector does not always return results in order.
+	objects := make(map[types.ManagedObjectReference]mo.Datacenter, len(r.Datacenters))
+	for _, o := range r.Datacenters {
+		objects[o.Reference()] = o
+	}
+
+	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
+
+	for _, o := range r.objects {
+		dc := objects[o.Reference()]
+		fmt.Fprintf(tw, "Name:\t%s\n", dc.Name)
+		fmt.Fprintf(tw, "  Path:\t%s\n", o.InventoryPath)
+
+		folders, err := o.Folders(r.ctx)
+		if err != nil {
+			return err
+		}
+
+		r.finder.SetDatacenter(o)
+
+		hosts, _ := r.finder.HostSystemList(r.ctx, path.Join(folders.HostFolder.InventoryPath, "*"))
+		fmt.Fprintf(tw, "  Hosts:\t%d\n", len(hosts))
+
+		clusters, _ := r.finder.ClusterComputeResourceList(r.ctx, path.Join(folders.HostFolder.InventoryPath, "*"))
+		fmt.Fprintf(tw, "  Clusters:\t%d\n", len(clusters))
+
+		vms, _ := r.finder.VirtualMachineList(r.ctx, path.Join(folders.VmFolder.InventoryPath, "*"))
+		fmt.Fprintf(tw, "  Virtual Machines:\t%d\n", len(vms))
+
+		fmt.Fprintf(tw, "  Networks:\t%d\n", len(dc.Network))
+		fmt.Fprintf(tw, "  Datastores:\t%d\n", len(dc.Datastore))
+	}
+
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/datastore/cp.go b/vendor/github.com/vmware/govmomi/govc/datastore/cp.go
new file mode 100644
index 0000000000..83c4955358
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/datastore/cp.go
@@ -0,0 +1,107 @@
+/*
+Copyright (c) 2014-2015 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 datastore
+
+import (
+	"context"
+	"errors"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type cp struct {
+	*flags.OutputFlag
+	*flags.DatastoreFlag
+
+	force bool
+}
+
+func init() {
+	cli.Register("datastore.cp", &cp{})
+}
+
+func (cmd *cp) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.force, "f", false, "If true, overwrite any identically named file at the destination")
+}
+
+func (cmd *cp) Process(ctx context.Context) error {
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *cp) Usage() string {
+	return "SRC DST"
+}
+
+func (cmd *cp) Description() string {
+	return `Copy SRC to DST on DATASTORE.
+
+Examples:
+  govc datastore.cp foo/foo.vmx foo/foo.vmx.old
+  govc datastore.cp -f my.vmx foo/foo.vmx`
+}
+
+func (cmd *cp) Run(ctx context.Context, f *flag.FlagSet) error {
+	args := f.Args()
+	if len(args) != 2 {
+		return errors.New("SRC and DST arguments are required")
+	}
+
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	dc, err := cmd.Datacenter()
+	if err != nil {
+		return err
+	}
+
+	// TODO: support cross-datacenter copy
+
+	src, err := cmd.DatastorePath(args[0])
+	if err != nil {
+		return err
+	}
+
+	dst, err := cmd.DatastorePath(args[1])
+	if err != nil {
+		return err
+	}
+
+	m := object.NewFileManager(c)
+	task, err := m.CopyDatastoreFile(ctx, src, dc, dst, dc, cmd.force)
+	if err != nil {
+		return err
+	}
+
+	return task.Wait(ctx)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/datastore/create.go b/vendor/github.com/vmware/govmomi/govc/datastore/create.go
new file mode 100644
index 0000000000..2e9890152b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/datastore/create.go
@@ -0,0 +1,321 @@
+/*
+Copyright (c) 2015-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 datastore
+
+import (
+	"context"
+	"errors"
+	"flag"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type create struct {
+	*flags.HostSystemFlag
+
+	// Generic options
+	Type  typeFlag
+	Name  string
+	Force bool
+
+	// Options for NAS
+	RemoteHost string
+	RemotePath string
+	AccessMode string
+	UserName   string
+	Password   string
+
+	// Options for VMFS
+	DiskCanonicalName string
+
+	// Options for local
+	Path string
+}
+
+func init() {
+	cli.Register("datastore.create", &create{})
+}
+
+var nasTypes = []string{
+	string(types.HostFileSystemVolumeFileSystemTypeNFS),
+	string(types.HostFileSystemVolumeFileSystemTypeNFS41),
+	string(types.HostFileSystemVolumeFileSystemTypeCIFS),
+}
+
+var vmfsTypes = []string{
+	string(types.HostFileSystemVolumeFileSystemTypeVMFS),
+}
+
+var localTypes = []string{
+	"local",
+}
+
+var allTypes = []string{}
+
+func init() {
+	allTypes = append(allTypes, nasTypes...)
+	allTypes = append(allTypes, vmfsTypes...)
+	allTypes = append(allTypes, localTypes...)
+}
+
+type typeFlag string
+
+func (t *typeFlag) Set(s string) error {
+	s = strings.ToLower(s)
+	for _, e := range allTypes {
+		if s == strings.ToLower(e) {
+			*t = typeFlag(e)
+			return nil
+		}
+	}
+
+	return fmt.Errorf("unknown type")
+}
+
+func (t *typeFlag) String() string {
+	return string(*t)
+}
+
+func (t *typeFlag) partOf(m []string) bool {
+	for _, e := range m {
+		if t.String() == e {
+			return true
+		}
+	}
+	return false
+}
+
+func (t *typeFlag) IsNasType() bool {
+	return t.partOf(nasTypes)
+}
+
+func (t *typeFlag) IsVmfsType() bool {
+	return t.partOf(vmfsTypes)
+}
+
+func (t *typeFlag) IsLocalType() bool {
+	return t.partOf(localTypes)
+}
+
+func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	modes := []string{
+		string(types.HostMountModeReadOnly),
+		string(types.HostMountModeReadWrite),
+	}
+
+	f.StringVar(&cmd.Name, "name", "", "Datastore name")
+	f.Var(&cmd.Type, "type", fmt.Sprintf("Datastore type (%s)", strings.Join(allTypes, "|")))
+	f.BoolVar(&cmd.Force, "force", false, "Ignore DuplicateName error if datastore is already mounted on a host")
+
+	// Options for NAS
+	f.StringVar(&cmd.RemoteHost, "remote-host", "", "Remote hostname of the NAS datastore")
+	f.StringVar(&cmd.RemotePath, "remote-path", "", "Remote path of the NFS mount point")
+	f.StringVar(&cmd.AccessMode, "mode", modes[0],
+		fmt.Sprintf("Access mode for the mount point (%s)", strings.Join(modes, "|")))
+	f.StringVar(&cmd.UserName, "username", "", "Username to use when connecting (CIFS only)")
+	f.StringVar(&cmd.Password, "password", "", "Password to use when connecting (CIFS only)")
+
+	// Options for VMFS
+	f.StringVar(&cmd.DiskCanonicalName, "disk", "", "Canonical name of disk (VMFS only)")
+
+	// Options for Local
+	f.StringVar(&cmd.Path, "path", "", "Local directory path for the datastore (local only)")
+}
+
+func (cmd *create) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *create) Usage() string {
+	return "HOST..."
+}
+
+func (cmd *create) Description() string {
+	return `Create datastore on HOST.
+
+Examples:
+  govc datastore.create -type nfs -name nfsDatastore -remote-host 10.143.2.232 -remote-path /share cluster1
+  govc datastore.create -type vmfs -name vmfsDatastore -disk=mpx.vmhba0:C0:T0:L0 cluster1
+  govc datastore.create -type local -name localDatastore -path /var/datastore host1`
+}
+
+func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
+	hosts, err := cmd.HostSystems(f.Args())
+	if err != nil {
+		return err
+	}
+
+	switch {
+	case cmd.Type.IsNasType():
+		return cmd.CreateNasDatastore(ctx, hosts)
+	case cmd.Type.IsVmfsType():
+		return cmd.CreateVmfsDatastore(ctx, hosts)
+	case cmd.Type.IsLocalType():
+		return cmd.CreateLocalDatastore(ctx, hosts)
+	default:
+		return fmt.Errorf("unhandled type %#v", cmd.Type)
+	}
+}
+
+func (cmd *create) GetHostNasVolumeSpec() types.HostNasVolumeSpec {
+	localPath := cmd.Path
+	if localPath == "" {
+		localPath = cmd.Name
+	}
+
+	s := types.HostNasVolumeSpec{
+		LocalPath:  localPath,
+		Type:       cmd.Type.String(),
+		RemoteHost: cmd.RemoteHost,
+		RemotePath: cmd.RemotePath,
+		AccessMode: cmd.AccessMode,
+		UserName:   cmd.UserName,
+		Password:   cmd.Password,
+	}
+
+	return s
+}
+
+func (cmd *create) CreateNasDatastore(ctx context.Context, hosts []*object.HostSystem) error {
+	object := types.ManagedObjectReference{
+		Type:  "Datastore",
+		Value: fmt.Sprintf("%s:%s", cmd.RemoteHost, cmd.RemotePath),
+	}
+
+	spec := cmd.GetHostNasVolumeSpec()
+
+	for _, host := range hosts {
+		ds, err := host.ConfigManager().DatastoreSystem(ctx)
+		if err != nil {
+			return err
+		}
+
+		_, err = ds.CreateNasDatastore(ctx, spec)
+		if err != nil {
+			if soap.IsSoapFault(err) {
+				switch fault := soap.ToSoapFault(err).VimFault().(type) {
+				case types.PlatformConfigFault:
+					if len(fault.FaultMessage) != 0 {
+						return errors.New(fault.FaultMessage[0].Message)
+					}
+				case types.DuplicateName:
+					if cmd.Force && fault.Object == object {
+						fmt.Fprintf(os.Stderr, "%s: '%s' already mounted\n",
+							host.InventoryPath, cmd.Name)
+						continue
+					}
+				}
+			}
+
+			return fmt.Errorf("%s: %s", host.InventoryPath, err)
+		}
+	}
+
+	return nil
+}
+
+func (cmd *create) CreateVmfsDatastore(ctx context.Context, hosts []*object.HostSystem) error {
+	for _, host := range hosts {
+		ds, err := host.ConfigManager().DatastoreSystem(ctx)
+		if err != nil {
+			return err
+		}
+
+		// Find the specified disk
+		disks, err := ds.QueryAvailableDisksForVmfs(ctx)
+		if err != nil {
+			return err
+		}
+
+		var disk *types.HostScsiDisk
+		for _, e := range disks {
+			if e.CanonicalName == cmd.DiskCanonicalName {
+				disk = &e
+				break
+			}
+		}
+
+		if disk == nil {
+			return fmt.Errorf("no eligible disk found for name %#v", cmd.DiskCanonicalName)
+		}
+
+		// Query for creation options and pick the right one
+		options, err := ds.QueryVmfsDatastoreCreateOptions(ctx, disk.DevicePath)
+		if err != nil {
+			return err
+		}
+
+		var option *types.VmfsDatastoreOption
+		for _, e := range options {
+			if _, ok := e.Info.(*types.VmfsDatastoreAllExtentOption); ok {
+				option = &e
+				break
+			}
+		}
+
+		if option == nil {
+			return fmt.Errorf("cannot use entire disk for datastore for name %#v", cmd.DiskCanonicalName)
+		}
+
+		spec := *option.Spec.(*types.VmfsDatastoreCreateSpec)
+		spec.Vmfs.VolumeName = cmd.Name
+		_, err = ds.CreateVmfsDatastore(ctx, spec)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (cmd *create) CreateLocalDatastore(ctx context.Context, hosts []*object.HostSystem) error {
+	for _, host := range hosts {
+		ds, err := host.ConfigManager().DatastoreSystem(ctx)
+		if err != nil {
+			return err
+		}
+
+		if cmd.Path == "" {
+			cmd.Path = cmd.Name
+		}
+
+		if cmd.Name == "" {
+			cmd.Name = filepath.Base(cmd.Path)
+		}
+
+		_, err = ds.CreateLocalDatastore(ctx, cmd.Name, cmd.Path)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/datastore/disk/create.go b/vendor/github.com/vmware/govmomi/govc/datastore/disk/create.go
new file mode 100644
index 0000000000..c629c2a2ce
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/datastore/disk/create.go
@@ -0,0 +1,98 @@
+/*
+Copyright (c) 2017 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 disk
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/units"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type create struct {
+	*flags.DatastoreFlag
+
+	Bytes units.ByteSize
+}
+
+func init() {
+	cli.Register("datastore.disk.create", &create{})
+}
+
+func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+
+	_ = cmd.Bytes.Set("10G")
+	f.Var(&cmd.Bytes, "size", "Size of new disk")
+}
+
+func (cmd *create) Process(ctx context.Context) error {
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *create) Usage() string {
+	return "VMDK"
+}
+
+func (cmd *create) Description() string {
+	return `Create VMDK on DS.
+
+Examples:
+  govc datastore.mkdir disks
+  govc datastore.disk.create -size 24G disks/disk1.vmdk`
+}
+
+func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() == 0 {
+		return flag.ErrHelp
+	}
+
+	dc, err := cmd.Datacenter()
+	if err != nil {
+		return err
+	}
+
+	ds, err := cmd.Datastore()
+	if err != nil {
+		return err
+	}
+
+	m := object.NewVirtualDiskManager(ds.Client())
+
+	spec := &types.FileBackedVirtualDiskSpec{
+		VirtualDiskSpec: types.VirtualDiskSpec{
+			AdapterType: string(types.VirtualDiskAdapterTypeLsiLogic),
+			DiskType:    string(types.VirtualDiskTypeThin),
+		},
+		CapacityKb: int64(cmd.Bytes) / 1024,
+	}
+
+	task, err := m.CreateVirtualDisk(ctx, ds.Path(f.Arg(0)), dc, spec)
+	if err != nil {
+		return err
+	}
+
+	return task.Wait(ctx)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/datastore/download.go b/vendor/github.com/vmware/govmomi/govc/datastore/download.go
new file mode 100644
index 0000000000..bb4cb8e7de
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/datastore/download.go
@@ -0,0 +1,117 @@
+/*
+Copyright (c) 2014-2015 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 datastore
+
+import (
+	"context"
+	"errors"
+	"flag"
+	"fmt"
+	"io"
+	"os"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/soap"
+)
+
+type download struct {
+	*flags.DatastoreFlag
+	*flags.HostSystemFlag
+}
+
+func init() {
+	cli.Register("datastore.download", &download{})
+}
+
+func (cmd *download) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+}
+
+func (cmd *download) Process(ctx context.Context) error {
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *download) Usage() string {
+	return "SOURCE DEST"
+}
+
+func (cmd *download) Description() string {
+	return `Copy SOURCE from DS to DEST on the local system.
+
+If DEST name is "-", source is written to stdout.
+
+Examples:
+  govc datastore.download vm-name/vmware.log ./local.log
+  govc datastore.download vm-name/vmware.log - | grep -i error`
+}
+
+func (cmd *download) Run(ctx context.Context, f *flag.FlagSet) error {
+	args := f.Args()
+	if len(args) != 2 {
+		return errors.New("invalid arguments")
+	}
+
+	ds, err := cmd.Datastore()
+	if err != nil {
+		return err
+	}
+
+	h, err := cmd.HostSystemIfSpecified()
+	if err != nil {
+		return err
+	}
+
+	var via string
+
+	if h != nil {
+		via = fmt.Sprintf(" via %s", h.InventoryPath)
+		ctx = ds.HostContext(ctx, h)
+	}
+
+	p := soap.DefaultDownload
+
+	src := args[0]
+	dst := args[1]
+
+	if dst == "-" {
+		f, _, err := ds.Download(ctx, src, &p)
+		if err != nil {
+			return err
+		}
+		_, err = io.Copy(os.Stdout, f)
+		return err
+	}
+
+	if cmd.DatastoreFlag.OutputFlag.TTY {
+		logger := cmd.DatastoreFlag.ProgressLogger(fmt.Sprintf("Downloading%s... ", via))
+		p.Progress = logger
+		defer logger.Wait()
+	}
+
+	return ds.DownloadFile(ctx, src, dst, &p)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/datastore/info.go b/vendor/github.com/vmware/govmomi/govc/datastore/info.go
new file mode 100644
index 0000000000..db8c83b958
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/datastore/info.go
@@ -0,0 +1,153 @@
+/*
+Copyright (c) 2015 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 datastore
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"os"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type info struct {
+	*flags.ClientFlag
+	*flags.OutputFlag
+	*flags.DatacenterFlag
+}
+
+func init() {
+	cli.Register("datastore.info", &info{})
+}
+
+func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+}
+
+func (cmd *info) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *info) Usage() string {
+	return "[PATH]..."
+}
+
+func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	finder, err := cmd.Finder()
+	if err != nil {
+		return err
+	}
+
+	args := f.Args()
+	if len(args) == 0 {
+		args = []string{"*"}
+	}
+
+	var res infoResult
+	var props []string
+
+	if cmd.OutputFlag.JSON {
+		props = nil // Load everything
+	} else {
+		props = []string{"info", "summary"} // Load summary
+	}
+
+	for _, arg := range args {
+		objects, err := finder.DatastoreList(ctx, arg)
+		if err != nil {
+			return err
+		}
+		res.objects = append(res.objects, objects...)
+	}
+
+	if len(res.objects) != 0 {
+		refs := make([]types.ManagedObjectReference, 0, len(res.objects))
+		for _, o := range res.objects {
+			refs = append(refs, o.Reference())
+		}
+
+		pc := property.DefaultCollector(c)
+		err = pc.Retrieve(ctx, refs, props, &res.Datastores)
+		if err != nil {
+			return err
+		}
+	}
+
+	return cmd.WriteResult(&res)
+}
+
+type infoResult struct {
+	Datastores []mo.Datastore
+	objects    []*object.Datastore
+}
+
+func (r *infoResult) Write(w io.Writer) error {
+	// Maintain order via r.objects as Property collector does not always return results in order.
+	objects := make(map[types.ManagedObjectReference]mo.Datastore, len(r.Datastores))
+	for _, o := range r.Datastores {
+		objects[o.Reference()] = o
+	}
+
+	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
+
+	for _, o := range r.objects {
+		ds := objects[o.Reference()]
+		s := ds.Summary
+		fmt.Fprintf(tw, "Name:\t%s\n", s.Name)
+		fmt.Fprintf(tw, "  Path:\t%s\n", o.InventoryPath)
+		fmt.Fprintf(tw, "  Type:\t%s\n", s.Type)
+		fmt.Fprintf(tw, "  URL:\t%s\n", s.Url)
+		fmt.Fprintf(tw, "  Capacity:\t%.1f GB\n", float64(s.Capacity)/(1<<30))
+		fmt.Fprintf(tw, "  Free:\t%.1f GB\n", float64(s.FreeSpace)/(1<<30))
+
+		switch info := ds.Info.(type) {
+		case *types.NasDatastoreInfo:
+			fmt.Fprintf(tw, "  Remote:\t%s:%s\n", info.Nas.RemoteHost, info.Nas.RemotePath)
+		}
+	}
+
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/datastore/ls.go b/vendor/github.com/vmware/govmomi/govc/datastore/ls.go
new file mode 100644
index 0000000000..6c33a27f0e
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/datastore/ls.go
@@ -0,0 +1,277 @@
+/*
+Copyright (c) 2014-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 datastore
+
+import (
+	"context"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"io"
+	"path"
+	"strings"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/units"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type ls struct {
+	*flags.DatastoreFlag
+	*flags.OutputFlag
+
+	long    bool
+	slash   bool
+	all     bool
+	recurse bool
+}
+
+func init() {
+	cli.Register("datastore.ls", &ls{})
+}
+
+func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.long, "l", false, "Long listing format")
+	f.BoolVar(&cmd.slash, "p", false, "Append / indicator to directories")
+	f.BoolVar(&cmd.all, "a", false, "Do not ignore entries starting with .")
+	f.BoolVar(&cmd.recurse, "R", false, "List subdirectories recursively")
+}
+
+func (cmd *ls) Process(ctx context.Context) error {
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *ls) Usage() string {
+	return "[FILE]..."
+}
+
+func isInvalid(err error) bool {
+	if f, ok := err.(types.HasFault); ok {
+		switch f.Fault().(type) {
+		case *types.InvalidArgument:
+			return true
+		}
+	}
+
+	return false
+}
+
+func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
+	ds, err := cmd.Datastore()
+	if err != nil {
+		return err
+	}
+
+	b, err := ds.Browser(ctx)
+	if err != nil {
+		return err
+	}
+
+	args := f.Args()
+	if len(args) == 0 {
+		args = []string{""}
+	}
+
+	result := &listOutput{
+		rs:  make([]types.HostDatastoreBrowserSearchResults, 0),
+		cmd: cmd,
+	}
+
+	for _, arg := range args {
+		spec := types.HostDatastoreBrowserSearchSpec{
+			MatchPattern: []string{"*"},
+		}
+
+		if cmd.long {
+			spec.Details = &types.FileQueryFlags{
+				FileType:     true,
+				FileSize:     true,
+				FileOwner:    types.NewBool(true), // TODO: omitempty is generated, but seems to be required
+				Modification: true,
+			}
+		}
+
+		for i := 0; ; i++ {
+			r, err := cmd.ListPath(b, arg, spec)
+			if err != nil {
+				// Treat the argument as a match pattern if not found as directory
+				if i == 0 && types.IsFileNotFound(err) || isInvalid(err) {
+					spec.MatchPattern[0] = path.Base(arg)
+					arg = path.Dir(arg)
+					continue
+				}
+
+				return err
+			}
+
+			// Treat an empty result against match pattern as file not found
+			if i == 1 && len(r) == 1 && len(r[0].File) == 0 {
+				return fmt.Errorf("File %s/%s was not found", r[0].FolderPath, spec.MatchPattern[0])
+			}
+
+			for n := range r {
+				result.add(r[n])
+			}
+
+			break
+		}
+	}
+
+	return cmd.WriteResult(result)
+}
+
+func (cmd *ls) ListPath(b *object.HostDatastoreBrowser, path string, spec types.HostDatastoreBrowserSearchSpec) ([]types.HostDatastoreBrowserSearchResults, error) {
+	ctx := context.TODO()
+
+	path, err := cmd.DatastorePath(path)
+	if err != nil {
+		return nil, err
+	}
+
+	search := b.SearchDatastore
+	if cmd.recurse {
+		search = b.SearchDatastoreSubFolders
+	}
+
+	task, err := search(ctx, path, &spec)
+	if err != nil {
+		return nil, err
+	}
+
+	info, err := task.WaitForResult(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	switch r := info.Result.(type) {
+	case types.HostDatastoreBrowserSearchResults:
+		return []types.HostDatastoreBrowserSearchResults{r}, nil
+	case types.ArrayOfHostDatastoreBrowserSearchResults:
+		return r.HostDatastoreBrowserSearchResults, nil
+	default:
+		panic(fmt.Sprintf("unknown result type: %T", r))
+	}
+}
+
+type listOutput struct {
+	rs  []types.HostDatastoreBrowserSearchResults
+	cmd *ls
+}
+
+func (o *listOutput) add(r types.HostDatastoreBrowserSearchResults) {
+	if o.cmd.recurse && !o.cmd.all {
+		// filter out ".hidden" directories
+		path := strings.SplitN(r.FolderPath, " ", 2)
+		if len(path) == 2 {
+			path = strings.Split(path[1], "/")
+			if path[0] == "." {
+				path = path[1:]
+			}
+
+			for _, p := range path {
+				if len(p) != 0 && p[0] == '.' {
+					return
+				}
+			}
+		}
+	}
+
+	res := r
+	res.File = nil
+
+	for _, f := range r.File {
+		if f.GetFileInfo().Path[0] == '.' && !o.cmd.all {
+			continue
+		}
+
+		if o.cmd.slash {
+			if d, ok := f.(*types.FolderFileInfo); ok {
+				d.Path += "/"
+			}
+		}
+
+		res.File = append(res.File, f)
+	}
+
+	o.rs = append(o.rs, res)
+}
+
+// hasMultiplePaths returns whether or not the slice of search results contains
+// results from more than one folder path.
+func (o *listOutput) hasMultiplePaths() bool {
+	if len(o.rs) == 0 {
+		return false
+	}
+
+	p := o.rs[0].FolderPath
+
+	// Multiple paths if any entry is not equal to the first one.
+	for _, e := range o.rs {
+		if e.FolderPath != p {
+			return true
+		}
+	}
+
+	return false
+}
+
+func (o *listOutput) MarshalJSON() ([]byte, error) {
+	return json.Marshal(o.rs)
+}
+
+func (o *listOutput) Write(w io.Writer) error {
+	// Only include path header if we're dealing with more than one path.
+	includeHeader := false
+	if o.hasMultiplePaths() {
+		includeHeader = true
+	}
+
+	tw := tabwriter.NewWriter(w, 3, 0, 2, ' ', 0)
+	for i, r := range o.rs {
+		if includeHeader {
+			if i > 0 {
+				fmt.Fprintf(tw, "\n")
+			}
+			fmt.Fprintf(tw, "%s:\n", r.FolderPath)
+		}
+		for _, file := range r.File {
+			info := file.GetFileInfo()
+			if o.cmd.long {
+				fmt.Fprintf(tw, "%s\t%s\t%s\n", units.ByteSize(info.FileSize), info.Modification.Format("Mon Jan 2 15:04:05 2006"), info.Path)
+			} else {
+				fmt.Fprintf(tw, "%s\n", info.Path)
+			}
+		}
+	}
+	tw.Flush()
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/datastore/mkdir.go b/vendor/github.com/vmware/govmomi/govc/datastore/mkdir.go
new file mode 100644
index 0000000000..7cc21e766b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/datastore/mkdir.go
@@ -0,0 +1,118 @@
+/*
+Copyright (c) 2014-2015 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 datastore
+
+import (
+	"context"
+	"errors"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type mkdir struct {
+	*flags.DatastoreFlag
+
+	createParents bool
+	isNamespace   bool
+}
+
+func init() {
+	cli.Register("datastore.mkdir", &mkdir{})
+}
+
+func (cmd *mkdir) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.createParents, "p", false, "Create intermediate directories as needed")
+	f.BoolVar(&cmd.isNamespace, "namespace", false, "Return uuid of namespace created on vsan datastore")
+}
+
+func (cmd *mkdir) Process(ctx context.Context) error {
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *mkdir) Usage() string {
+	return "DIRECTORY"
+}
+
+func (cmd *mkdir) Run(ctx context.Context, f *flag.FlagSet) error {
+	args := f.Args()
+	if len(args) == 0 {
+		return errors.New("missing operand")
+	}
+
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	if cmd.isNamespace {
+		var uuid string
+		var ds *object.Datastore
+
+		if ds, err = cmd.Datastore(); err != nil {
+			return err
+		}
+
+		path := args[0]
+
+		nm := object.NewDatastoreNamespaceManager(c)
+		if uuid, err = nm.CreateDirectory(ctx, ds, path, ""); err != nil {
+			return err
+		}
+
+		fmt.Println(uuid)
+	} else {
+		var dc *object.Datacenter
+		var path string
+
+		dc, err = cmd.Datacenter()
+		if err != nil {
+			return err
+		}
+
+		path, err = cmd.DatastorePath(args[0])
+		if err != nil {
+			return err
+		}
+
+		m := object.NewFileManager(c)
+		err = m.MakeDirectory(ctx, path, dc, cmd.createParents)
+
+		// ignore EEXIST if -p flag is given
+		if err != nil && cmd.createParents {
+			if soap.IsSoapFault(err) {
+				soapFault := soap.ToSoapFault(err)
+				if _, ok := soapFault.VimFault().(types.FileAlreadyExists); ok {
+					return nil
+				}
+			}
+		}
+	}
+
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/datastore/mv.go b/vendor/github.com/vmware/govmomi/govc/datastore/mv.go
new file mode 100644
index 0000000000..ee11c37660
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/datastore/mv.go
@@ -0,0 +1,100 @@
+/*
+Copyright (c) 2014-2015 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 datastore
+
+import (
+	"context"
+	"errors"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type mv struct {
+	*flags.DatastoreFlag
+
+	force bool
+}
+
+func init() {
+	cli.Register("datastore.mv", &mv{})
+}
+
+func (cmd *mv) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.force, "f", false, "If true, overwrite any identically named file at the destination")
+}
+
+func (cmd *mv) Process(ctx context.Context) error {
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *mv) Usage() string {
+	return "SRC DST"
+}
+
+func (cmd *mv) Description() string {
+	return `Move SRC to DST on DATASTORE.
+
+Examples:
+  govc datastore.mv foo/foo.vmx foo/foo.vmx.old
+  govc datastore.mv -f my.vmx foo/foo.vmx`
+}
+
+func (cmd *mv) Run(ctx context.Context, f *flag.FlagSet) error {
+	args := f.Args()
+	if len(args) != 2 {
+		return errors.New("SRC and DST arguments are required")
+	}
+
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	dc, err := cmd.Datacenter()
+	if err != nil {
+		return err
+	}
+
+	// TODO: support cross-datacenter move
+
+	src, err := cmd.DatastorePath(args[0])
+	if err != nil {
+		return err
+	}
+
+	dst, err := cmd.DatastorePath(args[1])
+	if err != nil {
+		return err
+	}
+
+	m := object.NewFileManager(c)
+	task, err := m.MoveDatastoreFile(ctx, src, dc, dst, dc, cmd.force)
+	if err != nil {
+		return err
+	}
+
+	return task.Wait(ctx)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/datastore/remove.go b/vendor/github.com/vmware/govmomi/govc/datastore/remove.go
new file mode 100644
index 0000000000..12ec9a467a
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/datastore/remove.go
@@ -0,0 +1,90 @@
+/*
+Copyright (c) 2015 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 datastore
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type remove struct {
+	*flags.HostSystemFlag
+	*flags.DatastoreFlag
+}
+
+func init() {
+	cli.Register("datastore.remove", &remove{})
+}
+
+func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+}
+
+func (cmd *remove) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *remove) Usage() string {
+	return "HOST..."
+}
+
+func (cmd *remove) Description() string {
+	return `Remove datastore from HOST.
+
+Examples:
+  govc datastore.remove -ds nfsDatastore cluster1
+  govc datastore.remove -ds nasDatastore host1 host2 host3`
+}
+
+func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
+	ds, err := cmd.Datastore()
+	if err != nil {
+		return err
+	}
+
+	hosts, err := cmd.HostSystems(f.Args())
+	if err != nil {
+		return err
+	}
+
+	for _, host := range hosts {
+		hds, err := host.ConfigManager().DatastoreSystem(ctx)
+		if err != nil {
+			return err
+		}
+
+		err = hds.Remove(ctx, ds)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/datastore/rm.go b/vendor/github.com/vmware/govmomi/govc/datastore/rm.go
new file mode 100644
index 0000000000..9c292024f7
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/datastore/rm.go
@@ -0,0 +1,117 @@
+/*
+Copyright (c) 2014-2015 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 datastore
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type rm struct {
+	*flags.DatastoreFlag
+
+	kind        bool
+	force       bool
+	isNamespace bool
+}
+
+func init() {
+	cli.Register("datastore.rm", &rm{})
+	cli.Alias("datastore.rm", "datastore.delete")
+}
+
+func (cmd *rm) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.kind, "t", true, "Use file type to choose disk or file manager")
+	f.BoolVar(&cmd.force, "f", false, "Force; ignore nonexistent files and arguments")
+	f.BoolVar(&cmd.isNamespace, "namespace", false, "Path is uuid of namespace on vsan datastore")
+}
+
+func (cmd *rm) Process(ctx context.Context) error {
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *rm) Usage() string {
+	return "FILE"
+}
+
+func (cmd *rm) Description() string {
+	return `Remove FILE from DATASTORE.
+
+Examples:
+  govc datastore.rm vm/vmware.log
+  govc datastore.rm vm
+  govc datastore.rm -f images/base.vmdk`
+}
+
+func (cmd *rm) Run(ctx context.Context, f *flag.FlagSet) error {
+	args := f.Args()
+	if len(args) == 0 {
+		return flag.ErrHelp
+	}
+
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	var dc *object.Datacenter
+	dc, err = cmd.Datacenter()
+	if err != nil {
+		return err
+	}
+
+	ds, err := cmd.Datastore()
+	if err != nil {
+		return err
+	}
+
+	if cmd.isNamespace {
+		path := args[0]
+
+		nm := object.NewDatastoreNamespaceManager(c)
+		err = nm.DeleteDirectory(ctx, dc, path)
+	} else {
+		fm := ds.NewFileManager(dc, cmd.force)
+
+		remove := fm.DeleteFile // File delete
+		if cmd.kind {
+			remove = fm.Delete // VirtualDisk or File delete
+		}
+
+		err = remove(ctx, args[0])
+	}
+
+	if err != nil {
+		if types.IsFileNotFound(err) && cmd.force {
+			// Ignore error
+			return nil
+		}
+	}
+
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/datastore/tail.go b/vendor/github.com/vmware/govmomi/govc/datastore/tail.go
new file mode 100644
index 0000000000..3ce1e2cdd5
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/datastore/tail.go
@@ -0,0 +1,135 @@
+/*
+Copyright (c) 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 datastore
+
+import (
+	"context"
+	"flag"
+	"io"
+	"os"
+	"time"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type tail struct {
+	*flags.DatastoreFlag
+	*flags.HostSystemFlag
+
+	count  int64
+	lines  int
+	follow bool
+}
+
+func init() {
+	cli.Register("datastore.tail", &tail{})
+}
+
+func (cmd *tail) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	f.Int64Var(&cmd.count, "c", -1, "Output the last NUM bytes")
+	f.IntVar(&cmd.lines, "n", 10, "Output the last NUM lines")
+	f.BoolVar(&cmd.follow, "f", false, "Output appended data as the file grows")
+}
+
+func (cmd *tail) Description() string {
+	return `Output the last part of datastore files.
+
+Examples:
+  govc datastore.tail -n 100 vm-name/vmware.log
+  govc datastore.tail -n 0 -f vm-name/vmware.log`
+}
+
+func (cmd *tail) Process(ctx context.Context) error {
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *tail) Usage() string {
+	return "PATH"
+}
+
+func (cmd *tail) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 1 {
+		return flag.ErrHelp
+	}
+
+	ds, err := cmd.Datastore()
+	if err != nil {
+		return err
+	}
+
+	h, err := cmd.HostSystemIfSpecified()
+	if err != nil {
+		return err
+	}
+
+	if h != nil {
+		ctx = ds.HostContext(ctx, h)
+	}
+
+	file, err := ds.Open(ctx, f.Arg(0))
+	if err != nil {
+		return err
+	}
+
+	var reader io.ReadCloser = file
+
+	var offset int64
+
+	if cmd.count >= 0 {
+		info, serr := file.Stat()
+		if serr != nil {
+			return serr
+		}
+
+		if info.Size() > cmd.count {
+			offset = info.Size() - cmd.count
+
+			_, err = file.Seek(offset, io.SeekStart)
+			if err != nil {
+				return err
+			}
+		}
+	} else if cmd.lines >= 0 {
+		err = file.Tail(cmd.lines)
+		if err != nil {
+			return err
+		}
+	}
+
+	if cmd.follow {
+		reader = file.Follow(time.Second)
+	}
+
+	_, err = io.Copy(os.Stdout, reader)
+
+	_ = reader.Close()
+
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/datastore/upload.go b/vendor/github.com/vmware/govmomi/govc/datastore/upload.go
new file mode 100644
index 0000000000..2d9420d28f
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/datastore/upload.go
@@ -0,0 +1,98 @@
+/*
+Copyright (c) 2014-2015 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 datastore
+
+import (
+	"context"
+	"errors"
+	"flag"
+	"os"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/soap"
+)
+
+type upload struct {
+	*flags.OutputFlag
+	*flags.DatastoreFlag
+}
+
+func init() {
+	cli.Register("datastore.upload", &upload{})
+}
+
+func (cmd *upload) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+}
+
+func (cmd *upload) Process(ctx context.Context) error {
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *upload) Usage() string {
+	return "SOURCE DEST"
+}
+
+func (cmd *upload) Description() string {
+	return `Copy SOURCE from the local system to DEST on DS.
+
+If SOURCE name is "-", read source from stdin.
+
+Examples:
+  govc datastore.upload -ds datastore1 ./config.iso vm-name/config.iso
+  genisoimage ... | govc datastore.upload -ds datastore1 - vm-name/config.iso`
+}
+
+func (cmd *upload) Run(ctx context.Context, f *flag.FlagSet) error {
+	args := f.Args()
+	if len(args) != 2 {
+		return errors.New("invalid arguments")
+	}
+
+	ds, err := cmd.Datastore()
+	if err != nil {
+		return err
+	}
+
+	p := soap.DefaultUpload
+
+	src := args[0]
+	dst := args[1]
+
+	if src == "-" {
+		return ds.Upload(ctx, os.Stdin, dst, &p)
+	}
+
+	if cmd.OutputFlag.TTY {
+		logger := cmd.ProgressLogger("Uploading... ")
+		p.Progress = logger
+		defer logger.Wait()
+	}
+
+	return ds.UploadFile(ctx, src, dst, &p)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/datastore/vsan/ls.go b/vendor/github.com/vmware/govmomi/govc/datastore/vsan/ls.go
new file mode 100644
index 0000000000..3b7b50f180
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/datastore/vsan/ls.go
@@ -0,0 +1,156 @@
+/*
+Copyright (c) 2017 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 vsan
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"net/url"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/mo"
+)
+
+type ls struct {
+	*flags.DatastoreFlag
+
+	long   bool
+	orphan bool
+}
+
+func init() {
+	cli.Register("datastore.vsan.dom.ls", &ls{})
+}
+
+func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.long, "l", false, "Long listing")
+	f.BoolVar(&cmd.orphan, "o", false, "List orphan objects")
+}
+
+func (cmd *ls) Process(ctx context.Context) error {
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *ls) Usage() string {
+	return "[UUID]..."
+}
+
+func (cmd *ls) Description() string {
+	return `List vSAN DOM objects in DS.
+
+Examples:
+  govc datastore.vsan.dom.ls
+  govc datastore.vsan.dom.ls -ds vsanDatastore -l
+  govc datastore.vsan.dom.ls -l d85aa758-63f5-500a-3150-0200308e589c`
+}
+
+func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
+	ds, err := cmd.Datastore()
+	if err != nil {
+		return err
+	}
+
+	var mds mo.Datastore
+	err = ds.Properties(ctx, ds.Reference(), []string{"summary"}, &mds)
+	if err != nil {
+		return err
+	}
+
+	if mds.Summary.Type != "vsan" {
+		return flag.ErrHelp
+	}
+
+	hosts, err := ds.AttachedHosts(ctx)
+	if err != nil {
+		return err
+	}
+
+	if len(hosts) == 0 {
+		return flag.ErrHelp
+	}
+
+	m, err := hosts[0].ConfigManager().VsanInternalSystem(ctx)
+	if err != nil {
+		return err
+	}
+
+	ids, err := m.QueryVsanObjectUuidsByFilter(ctx, f.Args(), 0, 0)
+	if err != nil {
+		return err
+	}
+
+	if len(ids) == 0 {
+		return nil
+	}
+
+	if !cmd.long && !cmd.orphan {
+		for _, id := range ids {
+			fmt.Fprintln(cmd.Out, id)
+		}
+
+		return nil
+	}
+
+	objs, err := m.GetVsanObjExtAttrs(ctx, ids)
+	if err != nil {
+		return err
+	}
+
+	u, err := url.Parse(mds.Summary.Url)
+	if err != nil {
+		return err
+	}
+
+	tw := tabwriter.NewWriter(cmd.Out, 2, 0, 2, ' ', 0)
+	cmd.Out = tw
+
+	for id, obj := range objs {
+		path := obj.DatastorePath(u.Path)
+
+		if cmd.orphan {
+			_, err = ds.Stat(ctx, path)
+			if err == nil {
+				continue
+			}
+
+			switch err.(type) {
+			case object.DatastoreNoSuchDirectoryError, object.DatastoreNoSuchFileError:
+			default:
+				return err
+			}
+
+			if !cmd.long {
+				fmt.Fprintln(cmd.Out, id)
+				continue
+			}
+		}
+
+		fmt.Fprintf(cmd.Out, "%s\t%s\t%s\n", id, obj.Class, path)
+	}
+
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/datastore/vsan/rm.go b/vendor/github.com/vmware/govmomi/govc/datastore/vsan/rm.go
new file mode 100644
index 0000000000..2302471609
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/datastore/vsan/rm.go
@@ -0,0 +1,108 @@
+/*
+Copyright (c) 2017 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 vsan
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type rm struct {
+	*flags.DatastoreFlag
+
+	force   bool
+	verbose bool
+}
+
+func init() {
+	cli.Register("datastore.vsan.dom.rm", &rm{})
+}
+
+func (cmd *rm) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.force, "f", false, "Force delete")
+	f.BoolVar(&cmd.verbose, "v", false, "Print deleted UUIDs to stdout, failed to stderr")
+}
+
+func (cmd *rm) Process(ctx context.Context) error {
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *rm) Usage() string {
+	return "UUID..."
+}
+
+func (cmd *rm) Description() string {
+	return `Remove vSAN DOM objects in DS.
+
+Examples:
+  govc datastore.vsan.dom.rm d85aa758-63f5-500a-3150-0200308e589c
+  govc datastore.vsan.dom.rm -f d85aa758-63f5-500a-3150-0200308e589c
+  govc datastore.vsan.dom.ls -o | xargs govc datastore.vsan.dom.rm`
+}
+
+func (cmd *rm) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() == 0 {
+		return flag.ErrHelp
+	}
+
+	ds, err := cmd.Datastore()
+	if err != nil {
+		return err
+	}
+
+	hosts, err := ds.AttachedHosts(ctx)
+	if err != nil {
+		return err
+	}
+
+	if len(hosts) == 0 {
+		return flag.ErrHelp
+	}
+
+	m, err := hosts[0].ConfigManager().VsanInternalSystem(ctx)
+	if err != nil {
+		return err
+	}
+
+	res, err := m.DeleteVsanObjects(ctx, f.Args(), &cmd.force)
+	if err != nil {
+		return err
+	}
+
+	if cmd.verbose {
+		for _, r := range res {
+			if r.Success {
+				fmt.Fprintln(cmd.Out, r.Uuid)
+			} else {
+				fmt.Fprintf(os.Stderr, "%s %s\n", r.Uuid, r.FailureReason[0].Message)
+			}
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/device/boot.go b/vendor/github.com/vmware/govmomi/govc/device/boot.go
new file mode 100644
index 0000000000..970b0594d5
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/device/boot.go
@@ -0,0 +1,90 @@
+/*
+Copyright (c) 2014-2015 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 device
+
+import (
+	"context"
+	"flag"
+	"strings"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type boot struct {
+	*flags.VirtualMachineFlag
+
+	order string
+	types.VirtualMachineBootOptions
+}
+
+func init() {
+	cli.Register("device.boot", &boot{})
+}
+
+func (cmd *boot) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	f.Int64Var(&cmd.BootDelay, "delay", 0, "Delay in ms before starting the boot sequence")
+	f.StringVar(&cmd.order, "order", "", "Boot device order")
+	f.Int64Var(&cmd.BootRetryDelay, "retry-delay", 0, "Delay in ms before a boot retry")
+
+	cmd.BootRetryEnabled = types.NewBool(false)
+	f.BoolVar(cmd.BootRetryEnabled, "retry", false, "If true, retry boot after retry-delay")
+
+	cmd.EnterBIOSSetup = types.NewBool(false)
+	f.BoolVar(cmd.EnterBIOSSetup, "setup", false, "If true, enter BIOS setup on next boot")
+}
+
+func (cmd *boot) Description() string {
+	return `Configure VM boot settings.
+
+Examples:
+  govc device.boot -vm $vm -delay 1000 -order floppy,cdrom,ethernet,disk`
+}
+
+func (cmd *boot) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *boot) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	if cmd.order != "" {
+		o := strings.Split(cmd.order, ",")
+		cmd.BootOrder = devices.BootOrder(o)
+	}
+
+	return vm.SetBootOptions(ctx, &cmd.VirtualMachineBootOptions)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/device/cdrom/add.go b/vendor/github.com/vmware/govmomi/govc/device/cdrom/add.go
new file mode 100644
index 0000000000..e42c6b1f11
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/device/cdrom/add.go
@@ -0,0 +1,105 @@
+/*
+Copyright (c) 2014-2015 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 cdrom
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type add struct {
+	*flags.VirtualMachineFlag
+
+	controller string
+}
+
+func init() {
+	cli.Register("device.cdrom.add", &add{})
+}
+
+func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.controller, "controller", "", "IDE controller name")
+}
+
+func (cmd *add) Description() string {
+	return `Add CD-ROM device to VM.
+
+Examples:
+  govc device.cdrom.add -vm $vm
+  govc device.ls -vm $vm | grep ide-
+  govc device.cdrom.add -vm $vm -controller ide-200
+  govc device.info cdrom-*`
+}
+
+func (cmd *add) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	c, err := devices.FindIDEController(cmd.controller)
+	if err != nil {
+		return err
+	}
+
+	d, err := devices.CreateCdrom(c)
+	if err != nil {
+		return err
+	}
+
+	err = vm.AddDevice(ctx, d)
+	if err != nil {
+		return err
+	}
+
+	// output name of device we just created
+	devices, err = vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	devices = devices.SelectByType(d)
+
+	name := devices.Name(devices[len(devices)-1])
+
+	fmt.Println(name)
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/device/cdrom/eject.go b/vendor/github.com/vmware/govmomi/govc/device/cdrom/eject.go
new file mode 100644
index 0000000000..78cce90d1a
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/device/cdrom/eject.go
@@ -0,0 +1,82 @@
+/*
+Copyright (c) 2014-2015 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 cdrom
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type eject struct {
+	*flags.VirtualMachineFlag
+
+	device string
+}
+
+func init() {
+	cli.Register("device.cdrom.eject", &eject{})
+}
+
+func (cmd *eject) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.device, "device", "", "CD-ROM device name")
+}
+
+func (cmd *eject) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *eject) Description() string {
+	return `Eject media from CD-ROM device.
+
+If device is not specified, the first CD-ROM device is used.
+
+Examples:
+  govc device.cdrom.eject -vm vm-1
+  govc device.cdrom.eject -vm vm-1 -device floppy-1`
+}
+
+func (cmd *eject) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	c, err := devices.FindCdrom(cmd.device)
+	if err != nil {
+		return err
+	}
+
+	return vm.EditDevice(ctx, devices.EjectIso(c))
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/device/cdrom/insert.go b/vendor/github.com/vmware/govmomi/govc/device/cdrom/insert.go
new file mode 100644
index 0000000000..4ff8142ce7
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/device/cdrom/insert.go
@@ -0,0 +1,96 @@
+/*
+Copyright (c) 2014-2015 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 cdrom
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type insert struct {
+	*flags.DatastoreFlag
+	*flags.VirtualMachineFlag
+
+	device string
+}
+
+func init() {
+	cli.Register("device.cdrom.insert", &insert{})
+}
+
+func (cmd *insert) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.device, "device", "", "CD-ROM device name")
+}
+
+func (cmd *insert) Process(ctx context.Context) error {
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *insert) Usage() string {
+	return "ISO"
+}
+
+func (cmd *insert) Description() string {
+	return `Insert media on datastore into CD-ROM device.
+
+If device is not specified, the first CD-ROM device is used.
+
+Examples:
+  govc device.cdrom.insert -vm vm-1 -device cdrom-3000 images/boot.iso`
+}
+
+func (cmd *insert) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil || f.NArg() != 1 {
+		return flag.ErrHelp
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	c, err := devices.FindCdrom(cmd.device)
+	if err != nil {
+		return err
+	}
+
+	iso, err := cmd.DatastorePath(f.Arg(0))
+	if err != nil {
+		return nil
+	}
+
+	return vm.EditDevice(ctx, devices.InsertIso(c, iso))
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/device/connect.go b/vendor/github.com/vmware/govmomi/govc/device/connect.go
new file mode 100644
index 0000000000..bb6b06611c
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/device/connect.go
@@ -0,0 +1,83 @@
+/*
+Copyright (c) 2014-2015 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 device
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type connect struct {
+	*flags.VirtualMachineFlag
+}
+
+func init() {
+	cli.Register("device.connect", &connect{})
+}
+
+func (cmd *connect) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+}
+
+func (cmd *connect) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *connect) Usage() string {
+	return "DEVICE..."
+}
+
+func (cmd *connect) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	for _, name := range f.Args() {
+		device := devices.Find(name)
+		if device == nil {
+			return fmt.Errorf("device '%s' not found", name)
+		}
+
+		if err = devices.Connect(device); err != nil {
+			return err
+		}
+
+		if err = vm.EditDevice(ctx, device); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/device/disconnect.go b/vendor/github.com/vmware/govmomi/govc/device/disconnect.go
new file mode 100644
index 0000000000..95a22ca717
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/device/disconnect.go
@@ -0,0 +1,83 @@
+/*
+Copyright (c) 2014-2015 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 device
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type disconnect struct {
+	*flags.VirtualMachineFlag
+}
+
+func init() {
+	cli.Register("device.disconnect", &disconnect{})
+}
+
+func (cmd *disconnect) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+}
+
+func (cmd *disconnect) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *disconnect) Usage() string {
+	return "DEVICE..."
+}
+
+func (cmd *disconnect) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	for _, name := range f.Args() {
+		device := devices.Find(name)
+		if device == nil {
+			return fmt.Errorf("device '%s' not found", name)
+		}
+
+		if err = devices.Disconnect(device); err != nil {
+			return err
+		}
+
+		if err = vm.EditDevice(ctx, device); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/device/floppy/add.go b/vendor/github.com/vmware/govmomi/govc/device/floppy/add.go
new file mode 100644
index 0000000000..9c3716d022
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/device/floppy/add.go
@@ -0,0 +1,94 @@
+/*
+Copyright (c) 2014-2015 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 floppy
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type add struct {
+	*flags.VirtualMachineFlag
+}
+
+func init() {
+	cli.Register("device.floppy.add", &add{})
+}
+
+func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+}
+
+func (cmd *add) Description() string {
+	return `Add floppy device to VM.
+
+Examples:
+  govc device.floppy.add -vm $vm
+  govc device.info floppy-*`
+}
+
+func (cmd *add) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	d, err := devices.CreateFloppy()
+	if err != nil {
+		return err
+	}
+
+	err = vm.AddDevice(ctx, d)
+	if err != nil {
+		return err
+	}
+
+	// output name of device we just created
+	devices, err = vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	devices = devices.SelectByType(d)
+
+	name := devices.Name(devices[len(devices)-1])
+
+	fmt.Println(name)
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/device/floppy/eject.go b/vendor/github.com/vmware/govmomi/govc/device/floppy/eject.go
new file mode 100644
index 0000000000..5ef9b08bd0
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/device/floppy/eject.go
@@ -0,0 +1,81 @@
+/*
+Copyright (c) 2014-2015 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 floppy
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type eject struct {
+	*flags.VirtualMachineFlag
+
+	device string
+}
+
+func init() {
+	cli.Register("device.floppy.eject", &eject{})
+}
+
+func (cmd *eject) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.device, "device", "", "Floppy device name")
+}
+
+func (cmd *eject) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *eject) Description() string {
+	return `Eject image from floppy device.
+
+If device is not specified, the first floppy device is used.
+
+Examples:
+  govc device.floppy.eject -vm vm-1`
+}
+
+func (cmd *eject) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	c, err := devices.FindFloppy(cmd.device)
+	if err != nil {
+		return err
+	}
+
+	return vm.EditDevice(ctx, devices.EjectImg(c))
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/device/floppy/insert.go b/vendor/github.com/vmware/govmomi/govc/device/floppy/insert.go
new file mode 100644
index 0000000000..f61ea4ff48
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/device/floppy/insert.go
@@ -0,0 +1,96 @@
+/*
+Copyright (c) 2014-2015 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 floppy
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type insert struct {
+	*flags.DatastoreFlag
+	*flags.VirtualMachineFlag
+
+	device string
+}
+
+func init() {
+	cli.Register("device.floppy.insert", &insert{})
+}
+
+func (cmd *insert) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.device, "device", "", "Floppy device name")
+}
+
+func (cmd *insert) Process(ctx context.Context) error {
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *insert) Usage() string {
+	return "IMG"
+}
+
+func (cmd *insert) Description() string {
+	return `Insert IMG on datastore into floppy device.
+
+If device is not specified, the first floppy device is used.
+
+Examples:
+  govc device.floppy.insert -vm vm-1 vm-1/config.img`
+}
+
+func (cmd *insert) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil || f.NArg() != 1 {
+		return flag.ErrHelp
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	c, err := devices.FindFloppy(cmd.device)
+	if err != nil {
+		return err
+	}
+
+	img, err := cmd.DatastorePath(f.Arg(0))
+	if err != nil {
+		return nil
+	}
+
+	return vm.EditDevice(ctx, devices.InsertImg(c, img))
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/device/info.go b/vendor/github.com/vmware/govmomi/govc/device/info.go
new file mode 100644
index 0000000000..a2eae50069
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/device/info.go
@@ -0,0 +1,207 @@
+/*
+Copyright (c) 2014-2015 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 device
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"strings"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type info struct {
+	*flags.VirtualMachineFlag
+	*flags.OutputFlag
+	*flags.NetworkFlag
+}
+
+func init() {
+	cli.Register("device.info", &info{})
+}
+
+func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	cmd.NetworkFlag, ctx = flags.NewNetworkFlag(ctx)
+	cmd.NetworkFlag.Register(ctx, f)
+}
+
+func (cmd *info) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.NetworkFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *info) Usage() string {
+	return "[DEVICE]..."
+}
+
+func (cmd *info) match(p string, devices object.VirtualDeviceList) object.VirtualDeviceList {
+	var matches object.VirtualDeviceList
+	match := func(name string) bool {
+		matched, _ := filepath.Match(p, name)
+		return matched
+	}
+
+	for _, device := range devices {
+		name := devices.Name(device)
+		eq := name == p
+		if eq || match(name) {
+			matches = append(matches, device)
+		}
+		if eq {
+			break
+		}
+	}
+
+	return matches
+}
+
+func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	res := infoResult{
+		list: devices,
+	}
+
+	if cmd.NetworkFlag.IsSet() {
+		net, err := cmd.Network()
+		if err != nil {
+			return err
+		}
+
+		backing, err := net.EthernetCardBackingInfo(ctx)
+		if err != nil {
+			return err
+		}
+
+		devices = devices.SelectByBackingInfo(backing)
+	}
+
+	if f.NArg() == 0 {
+		res.Devices = devices
+	} else {
+		for _, name := range f.Args() {
+			matches := cmd.match(name, devices)
+			if len(matches) == 0 {
+				return fmt.Errorf("device '%s' not found", name)
+			}
+
+			res.Devices = append(res.Devices, matches...)
+		}
+	}
+
+	return cmd.WriteResult(&res)
+}
+
+type infoResult struct {
+	Devices object.VirtualDeviceList
+	// need the full list of devices to lookup attached devices and controllers
+	list object.VirtualDeviceList
+}
+
+func (r *infoResult) Write(w io.Writer) error {
+	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
+
+	for _, device := range r.Devices {
+		d := device.GetVirtualDevice()
+		info := d.DeviceInfo.GetDescription()
+
+		fmt.Fprintf(tw, "Name:\t%s\n", r.Devices.Name(device))
+		fmt.Fprintf(tw, "  Type:\t%s\n", r.Devices.TypeName(device))
+		fmt.Fprintf(tw, "  Label:\t%s\n", info.Label)
+		fmt.Fprintf(tw, "  Summary:\t%s\n", info.Summary)
+		fmt.Fprintf(tw, "  Key:\t%d\n", d.Key)
+
+		if c, ok := device.(types.BaseVirtualController); ok {
+			var attached []string
+			for _, key := range c.GetVirtualController().Device {
+				attached = append(attached, r.Devices.Name(r.list.FindByKey(key)))
+			}
+			fmt.Fprintf(tw, "  Devices:\t%s\n", strings.Join(attached, ", "))
+		} else {
+			if c := r.list.FindByKey(d.ControllerKey); c != nil {
+				fmt.Fprintf(tw, "  Controller:\t%s\n", r.Devices.Name(c))
+				if d.UnitNumber != nil {
+					fmt.Fprintf(tw, "  Unit number:\t%d\n", *d.UnitNumber)
+				} else {
+					fmt.Fprintf(tw, "  Unit number:\t<nil>\n")
+				}
+			}
+		}
+
+		if ca := d.Connectable; ca != nil {
+			fmt.Fprintf(tw, "  Connected:\t%t\n", ca.Connected)
+			fmt.Fprintf(tw, "  Start connected:\t%t\n", ca.StartConnected)
+			fmt.Fprintf(tw, "  Guest control:\t%t\n", ca.AllowGuestControl)
+			fmt.Fprintf(tw, "  Status:\t%s\n", ca.Status)
+		}
+
+		switch md := device.(type) {
+		case types.BaseVirtualEthernetCard:
+			fmt.Fprintf(tw, "  MAC Address:\t%s\n", md.GetVirtualEthernetCard().MacAddress)
+			fmt.Fprintf(tw, "  Address type:\t%s\n", md.GetVirtualEthernetCard().AddressType)
+		case *types.VirtualDisk:
+			if b, ok := md.Backing.(types.BaseVirtualDeviceFileBackingInfo); ok {
+				fmt.Fprintf(tw, "  File:\t%s\n", b.GetVirtualDeviceFileBackingInfo().FileName)
+			}
+			if b, ok := md.Backing.(*types.VirtualDiskFlatVer2BackingInfo); ok && b.Parent != nil {
+				fmt.Fprintf(tw, "  Parent:\t%s\n", b.Parent.GetVirtualDeviceFileBackingInfo().FileName)
+			}
+		case *types.VirtualSerialPort:
+			if b, ok := md.Backing.(*types.VirtualSerialPortURIBackingInfo); ok {
+				fmt.Fprintf(tw, "  Direction:\t%s\n", b.Direction)
+				fmt.Fprintf(tw, "  Service URI:\t%s\n", b.ServiceURI)
+				fmt.Fprintf(tw, "  Proxy URI:\t%s\n", b.ProxyURI)
+			}
+		}
+	}
+
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/device/ls.go b/vendor/github.com/vmware/govmomi/govc/device/ls.go
new file mode 100644
index 0000000000..a71add2375
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/device/ls.go
@@ -0,0 +1,86 @@
+/*
+Copyright (c) 2014-2015 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 device
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type ls struct {
+	*flags.VirtualMachineFlag
+
+	boot bool
+}
+
+func init() {
+	cli.Register("device.ls", &ls{})
+}
+
+func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.boot, "boot", false, "List devices configured in the VM's boot options")
+}
+
+func (cmd *ls) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	if cmd.boot {
+		options, err := vm.BootOptions(ctx)
+		if err != nil {
+			return err
+		}
+
+		devices = devices.SelectBootOrder(options.BootOrder)
+	}
+
+	tw := tabwriter.NewWriter(os.Stdout, 3, 0, 2, ' ', 0)
+
+	for _, device := range devices {
+		fmt.Fprintf(tw, "%s\t%s\t%s\n", devices.Name(device), devices.TypeName(device),
+			device.GetVirtualDevice().DeviceInfo.GetDescription().Summary)
+	}
+
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/device/remove.go b/vendor/github.com/vmware/govmomi/govc/device/remove.go
new file mode 100644
index 0000000000..cb531b3e87
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/device/remove.go
@@ -0,0 +1,81 @@
+/*
+Copyright (c) 2014-2015 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 device
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type remove struct {
+	*flags.VirtualMachineFlag
+	keepFiles bool
+}
+
+func init() {
+	cli.Register("device.remove", &remove{})
+}
+
+func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+	f.BoolVar(&cmd.keepFiles, "keep", false, "Keep files in datastore")
+}
+
+func (cmd *remove) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *remove) Usage() string {
+	return "DEVICE..."
+}
+
+func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	for _, name := range f.Args() {
+		device := devices.Find(name)
+		if device == nil {
+			return fmt.Errorf("device '%s' not found", name)
+		}
+
+		if err = vm.RemoveDevice(ctx, cmd.keepFiles, device); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/device/scsi/add.go b/vendor/github.com/vmware/govmomi/govc/device/scsi/add.go
new file mode 100644
index 0000000000..490d94c2e5
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/device/scsi/add.go
@@ -0,0 +1,116 @@
+/*
+Copyright (c) 2014-2015 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 scsi
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"strings"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type add struct {
+	*flags.VirtualMachineFlag
+
+	controller   string
+	sharedBus    string
+	hotAddRemove bool
+}
+
+func init() {
+	cli.Register("device.scsi.add", &add{})
+}
+
+func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	var ctypes []string
+	ct := object.SCSIControllerTypes()
+	for _, t := range ct {
+		ctypes = append(ctypes, ct.Type(t))
+	}
+	f.StringVar(&cmd.controller, "type", ct.Type(ct[0]),
+		fmt.Sprintf("SCSI controller type (%s)", strings.Join(ctypes, "|")))
+	f.StringVar(&cmd.sharedBus, "sharing", string(types.VirtualSCSISharingNoSharing), "SCSI sharing")
+	f.BoolVar(&cmd.hotAddRemove, "hot", false, "Enable hot-add/remove")
+}
+
+func (cmd *add) Description() string {
+	return `Add SCSI controller to VM.
+
+Examples:
+  govc device.scsi.add -vm $vm
+  govc device.scsi.add -vm $vm -type pvscsi
+  govc device.info -vm $vm {lsi,pv}*`
+}
+
+func (cmd *add) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	d, err := devices.CreateSCSIController(cmd.controller)
+	if err != nil {
+		return err
+	}
+
+	c := d.(types.BaseVirtualSCSIController).GetVirtualSCSIController()
+	c.HotAddRemove = &cmd.hotAddRemove
+	c.SharedBus = types.VirtualSCSISharing(cmd.sharedBus)
+
+	err = vm.AddDevice(ctx, d)
+	if err != nil {
+		return err
+	}
+
+	// output name of device we just created
+	devices, err = vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	devices = devices.SelectByType(d)
+
+	name := devices.Name(devices[len(devices)-1])
+
+	fmt.Println(name)
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/device/serial/add.go b/vendor/github.com/vmware/govmomi/govc/device/serial/add.go
new file mode 100644
index 0000000000..b8303388ec
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/device/serial/add.go
@@ -0,0 +1,94 @@
+/*
+Copyright (c) 2014-2015 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 serial
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type add struct {
+	*flags.VirtualMachineFlag
+}
+
+func init() {
+	cli.Register("device.serial.add", &add{})
+}
+
+func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+}
+
+func (cmd *add) Description() string {
+	return `Add serial port to VM.
+
+Examples:
+  govc device.serial.add -vm $vm
+  govc device.info -vm $vm serialport-*`
+}
+
+func (cmd *add) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	d, err := devices.CreateSerialPort()
+	if err != nil {
+		return err
+	}
+
+	err = vm.AddDevice(ctx, d)
+	if err != nil {
+		return err
+	}
+
+	// output name of device we just created
+	devices, err = vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	devices = devices.SelectByType(d)
+
+	name := devices.Name(devices[len(devices)-1])
+
+	fmt.Println(name)
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/device/serial/connect.go b/vendor/github.com/vmware/govmomi/govc/device/serial/connect.go
new file mode 100644
index 0000000000..84cb994847
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/device/serial/connect.go
@@ -0,0 +1,116 @@
+/*
+Copyright (c) 2014-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 serial
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"path"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/mo"
+)
+
+type connect struct {
+	*flags.VirtualMachineFlag
+
+	proxy  string
+	device string
+	client bool
+}
+
+func init() {
+	cli.Register("device.serial.connect", &connect{})
+}
+
+func (cmd *connect) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.proxy, "vspc-proxy", "", "vSPC proxy URI")
+	f.StringVar(&cmd.device, "device", "", "serial port device name")
+	f.BoolVar(&cmd.client, "client", false, "Use client direction")
+}
+
+func (cmd *connect) Usage() string {
+	return "URI"
+}
+
+func (cmd *connect) Description() string {
+	return `Connect service URI to serial port.
+
+If "-" is given as URI, connects file backed device with file name of
+device name + .log suffix in the VM Config.Files.LogDirectory.
+
+Defaults to the first serial port if no DEVICE is given.
+
+Examples:
+  govc device.ls | grep serialport-
+  govc device.serial.connect -vm $vm -device serialport-8000 telnet://:33233
+  govc device.info -vm $vm serialport-*
+  govc device.serial.connect -vm $vm "[datastore1] $vm/console.log"
+  govc device.serial.connect -vm $vm -
+  govc datastore.tail -f $vm/serialport-8000.log`
+}
+
+func (cmd *connect) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *connect) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 1 {
+		return flag.ErrHelp
+	}
+
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	d, err := devices.FindSerialPort(cmd.device)
+	if err != nil {
+		return err
+	}
+
+	uri := f.Arg(0)
+
+	if uri == "-" {
+		var mvm mo.VirtualMachine
+		err = vm.Properties(ctx, vm.Reference(), []string{"config.files.logDirectory"}, &mvm)
+		if err != nil {
+			return err
+		}
+
+		uri = path.Join(mvm.Config.Files.LogDirectory, fmt.Sprintf("%s.log", devices.Name(d)))
+	}
+
+	return vm.EditDevice(ctx, devices.ConnectSerialPort(d, uri, cmd.client, cmd.proxy))
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/device/serial/disconnect.go b/vendor/github.com/vmware/govmomi/govc/device/serial/disconnect.go
new file mode 100644
index 0000000000..6da1609bc3
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/device/serial/disconnect.go
@@ -0,0 +1,81 @@
+/*
+Copyright (c) 2014-2015 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 serial
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type disconnect struct {
+	*flags.VirtualMachineFlag
+
+	device string
+}
+
+func init() {
+	cli.Register("device.serial.disconnect", &disconnect{})
+}
+
+func (cmd *disconnect) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.device, "device", "", "serial port device name")
+}
+
+func (cmd *disconnect) Description() string {
+	return `Disconnect service URI from serial port.
+
+Examples:
+  govc device.ls | grep serialport-
+  govc device.serial.disconnect -vm $vm -device serialport-8000
+  govc device.info -vm $vm serialport-*`
+}
+
+func (cmd *disconnect) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *disconnect) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	d, err := devices.FindSerialPort(cmd.device)
+	if err != nil {
+		return err
+	}
+
+	return vm.EditDevice(ctx, devices.DisconnectSerialPort(d))
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/device/usb/add.go b/vendor/github.com/vmware/govmomi/govc/device/usb/add.go
new file mode 100644
index 0000000000..582348bea3
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/device/usb/add.go
@@ -0,0 +1,114 @@
+/*
+Copyright (c) 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 usb
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"strings"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type add struct {
+	*flags.VirtualMachineFlag
+
+	controller  string
+	autoConnect bool
+	ehciEnabled bool
+}
+
+func init() {
+	cli.Register("device.usb.add", &add{})
+}
+
+func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	ctypes := []string{"usb", "xhci"}
+	f.StringVar(&cmd.controller, "type", ctypes[0],
+		fmt.Sprintf("USB controller type (%s)", strings.Join(ctypes, "|")))
+
+	f.BoolVar(&cmd.autoConnect, "auto", true, "Enable ability to hot plug devices")
+	f.BoolVar(&cmd.ehciEnabled, "ehci", true, "Enable enhanced host controller interface (USB 2.0)")
+}
+
+func (cmd *add) Description() string {
+	return `Add USB device to VM.
+
+Examples:
+  govc device.usb.add -vm $vm
+  govc device.usb.add -type xhci -vm $vm
+  govc device.info usb*`
+}
+
+func (cmd *add) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	var d types.BaseVirtualDevice
+
+	switch cmd.controller {
+	case "usb":
+		c := new(types.VirtualUSBController)
+		c.AutoConnectDevices = &cmd.autoConnect
+		c.EhciEnabled = &cmd.ehciEnabled
+		d = c
+	case "xhci":
+		c := new(types.VirtualUSBXHCIController)
+		c.AutoConnectDevices = &cmd.autoConnect
+		d = c
+	default:
+		return flag.ErrHelp
+	}
+
+	err = vm.AddDevice(ctx, d)
+	if err != nil {
+		return err
+	}
+
+	// output name of device we just created
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	devices = devices.SelectByType(d)
+
+	name := devices.Name(devices[len(devices)-1])
+
+	fmt.Println(name)
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/dvs/add.go b/vendor/github.com/vmware/govmomi/govc/dvs/add.go
new file mode 100644
index 0000000000..f51ded6507
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/dvs/add.go
@@ -0,0 +1,147 @@
+/*
+Copyright (c) 2015 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 dvs
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type add struct {
+	*flags.HostSystemFlag
+
+	path string
+	pnic string
+}
+
+func init() {
+	cli.Register("dvs.add", &add{})
+}
+
+func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.path, "dvs", "", "DVS path")
+	f.StringVar(&cmd.pnic, "pnic", "vmnic0", "Name of the host physical NIC")
+}
+
+func (cmd *add) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *add) Usage() string {
+	return "HOST..."
+}
+
+func (cmd *add) Description() string {
+	return `Add hosts to DVS.
+
+Examples:
+  govc dvs.add -dvs dvsName -pnic vmnic1 hostA hostB hostC`
+}
+
+func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() == 0 {
+		return flag.ErrHelp
+	}
+
+	finder, err := cmd.Finder()
+	if err != nil {
+		return err
+	}
+
+	net, err := finder.Network(ctx, cmd.path)
+	if err != nil {
+		return err
+	}
+
+	dvs, ok := net.(*object.DistributedVirtualSwitch)
+	if !ok {
+		return fmt.Errorf("%s (%T) is not of type %T", cmd.path, net, dvs)
+	}
+
+	var s mo.VmwareDistributedVirtualSwitch
+	err = dvs.Properties(ctx, dvs.Reference(), []string{"config"}, &s)
+	if err != nil {
+		return err
+	}
+
+	backing := new(types.DistributedVirtualSwitchHostMemberPnicBacking)
+
+	for _, vmnic := range strings.Split(cmd.pnic, ",") {
+		backing.PnicSpec = append(backing.PnicSpec, types.DistributedVirtualSwitchHostMemberPnicSpec{
+			PnicDevice: strings.TrimSpace(vmnic),
+		})
+	}
+
+	config := &types.DVSConfigSpec{
+		ConfigVersion: s.Config.GetDVSConfigInfo().ConfigVersion,
+	}
+
+	hosts, err := cmd.HostSystems(f.Args())
+	if err != nil {
+		return err
+	}
+
+	existing := make(map[string]bool)
+	// TODO: host.pnic.info command
+	for _, member := range s.Config.GetDVSConfigInfo().Host {
+		existing[member.Config.Host.Value] = true
+	}
+
+	for _, host := range hosts {
+		ref := host.Reference()
+		if existing[ref.Value] {
+			fmt.Fprintf(os.Stderr, "%s is already a member of %s\n", host.InventoryPath, dvs.InventoryPath)
+			continue
+		}
+
+		config.Host = append(config.Host, types.DistributedVirtualSwitchHostMemberConfigSpec{
+			Operation: "add",
+			Host:      ref,
+			Backing:   backing,
+		})
+	}
+
+	if len(config.Host) == 0 {
+		return nil
+	}
+
+	task, err := dvs.Reconfigure(ctx, config)
+	if err != nil {
+		return err
+	}
+
+	logger := cmd.ProgressLogger(fmt.Sprintf("adding %d hosts to dvs %s... ", len(config.Host), dvs.InventoryPath))
+	defer logger.Wait()
+
+	_, err = task.WaitForResult(ctx, logger)
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/dvs/create.go b/vendor/github.com/vmware/govmomi/govc/dvs/create.go
new file mode 100644
index 0000000000..fe7df7f17d
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/dvs/create.go
@@ -0,0 +1,99 @@
+/*
+Copyright (c) 2015 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 dvs
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type create struct {
+	*flags.FolderFlag
+
+	types.DVSCreateSpec
+
+	configSpec *types.VMwareDVSConfigSpec
+}
+
+func init() {
+	cli.Register("dvs.create", &create{})
+}
+
+func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.FolderFlag, ctx = flags.NewFolderFlag(ctx)
+	cmd.FolderFlag.Register(ctx, f)
+
+	cmd.configSpec = new(types.VMwareDVSConfigSpec)
+
+	cmd.DVSCreateSpec.ConfigSpec = cmd.configSpec
+	cmd.DVSCreateSpec.ProductInfo = new(types.DistributedVirtualSwitchProductSpec)
+
+	f.StringVar(&cmd.ProductInfo.Version, "product-version", "", "DVS product version")
+}
+
+func (cmd *create) Usage() string {
+	return "DVS"
+}
+
+func (cmd *create) Description() string {
+	return `Create DVS (DistributedVirtualSwitch) in datacenter.
+
+The dvs is added to the folder specified by the 'folder' flag. If not given,
+this defaults to the network folder in the specified or default datacenter.
+
+Examples:
+  govc dvs.create DSwitch
+  govc dvs.create -product-version 5.5.0 DSwitch`
+}
+
+func (cmd *create) Process(ctx context.Context) error {
+	if err := cmd.FolderFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 1 {
+		return flag.ErrHelp
+	}
+
+	name := f.Arg(0)
+
+	cmd.configSpec.Name = name
+
+	folder, err := cmd.FolderOrDefault("network")
+	if err != nil {
+		return err
+	}
+
+	task, err := folder.CreateDVS(ctx, cmd.DVSCreateSpec)
+	if err != nil {
+		return err
+	}
+
+	logger := cmd.ProgressLogger(fmt.Sprintf("adding %s to folder %s... ", name, folder.InventoryPath))
+	defer logger.Wait()
+
+	_, err = task.WaitForResult(ctx, logger)
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/add.go b/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/add.go
new file mode 100644
index 0000000000..689ea3f6d0
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/add.go
@@ -0,0 +1,107 @@
+/*
+Copyright (c) 2015 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 portgroup
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type add struct {
+	*flags.DatacenterFlag
+
+	DVPortgroupConfigSpec
+
+	path string
+}
+
+func init() {
+	cli.Register("dvs.portgroup.add", &add{})
+}
+
+func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.path, "dvs", "", "DVS path")
+
+	cmd.DVPortgroupConfigSpec.NumPorts = 128 // default
+
+	cmd.DVPortgroupConfigSpec.Register(ctx, f)
+}
+
+func (cmd *add) Description() string {
+	return `Add portgroup to DVS.
+
+Examples:
+  govc dvs.create DSwitch
+  govc dvs.portgroup.add -dvs DSwitch -type earlyBinding -nports 16 ExternalNetwork
+  govc dvs.portgroup.add -dvs DSwitch -type ephemeral InternalNetwork`
+}
+
+func (cmd *add) Process(ctx context.Context) error {
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *add) Usage() string {
+	return "NAME"
+}
+
+func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() == 0 {
+		return flag.ErrHelp
+	}
+
+	name := f.Arg(0)
+
+	finder, err := cmd.Finder()
+	if err != nil {
+		return err
+	}
+
+	net, err := finder.Network(ctx, cmd.path)
+	if err != nil {
+		return err
+	}
+
+	dvs, ok := net.(*object.DistributedVirtualSwitch)
+	if !ok {
+		return fmt.Errorf("%s (%T) is not of type %T", cmd.path, net, dvs)
+	}
+
+	cmd.DVPortgroupConfigSpec.Name = name
+
+	task, err := dvs.AddPortgroup(ctx, []types.DVPortgroupConfigSpec{cmd.Spec()})
+	if err != nil {
+		return err
+	}
+
+	logger := cmd.ProgressLogger(fmt.Sprintf("adding %s portgroup to dvs %s... ", name, dvs.InventoryPath))
+	defer logger.Wait()
+
+	_, err = task.WaitForResult(ctx, logger)
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/change.go b/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/change.go
new file mode 100644
index 0000000000..e3c1643a2d
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/change.go
@@ -0,0 +1,107 @@
+/*
+Copyright (c) 2015 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 portgroup
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/mo"
+)
+
+type change struct {
+	*flags.DatacenterFlag
+
+	DVPortgroupConfigSpec
+}
+
+func init() {
+	cli.Register("dvs.portgroup.change", &change{})
+}
+
+func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+
+	cmd.DVPortgroupConfigSpec.Register(ctx, f)
+}
+
+func (cmd *change) Description() string {
+	return `Change DVS portgroup configuration.
+
+Examples:
+  govc dvs.portgroup.change -nports 26 ExternalNetwork
+  govc dvs.portgroup.change -vlan 3214 ExternalNetwork`
+}
+
+func (cmd *change) Process(ctx context.Context) error {
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *change) Usage() string {
+	return "PATH"
+}
+
+func (cmd *change) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 1 {
+		return flag.ErrHelp
+	}
+
+	path := f.Arg(0)
+
+	finder, err := cmd.Finder()
+	if err != nil {
+		return err
+	}
+
+	net, err := finder.Network(ctx, path)
+	if err != nil {
+		return err
+	}
+
+	pg, ok := net.(*object.DistributedVirtualPortgroup)
+	if !ok {
+		return fmt.Errorf("%s (%T) is not of type %T", path, net, pg)
+	}
+
+	var s mo.DistributedVirtualPortgroup
+	err = pg.Properties(ctx, pg.Reference(), []string{"config.configVersion"}, &s)
+	if err != nil {
+		return err
+	}
+
+	spec := cmd.Spec()
+	spec.ConfigVersion = s.Config.ConfigVersion
+
+	task, err := pg.Reconfigure(ctx, spec)
+	if err != nil {
+		return err
+	}
+
+	logger := cmd.ProgressLogger(fmt.Sprintf("changing %s portgroup configuration %s... ", pg.Name(), pg.InventoryPath))
+	defer logger.Wait()
+
+	_, err = task.WaitForResult(ctx, logger)
+	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
new file mode 100644
index 0000000000..8c3df62512
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/info.go
@@ -0,0 +1,165 @@
+/*
+Copyright (c) 2015-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 portgroup
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type info struct {
+	*flags.DatacenterFlag
+
+	pg         string
+	active     bool
+	connected  bool
+	inside     bool
+	uplinkPort bool
+	vlanID     int
+	count      uint
+}
+
+func init() {
+	cli.Register("dvs.portgroup.info", &info{})
+}
+
+func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.pg, "pg", "", "Distributed Virtual Portgroup")
+	f.BoolVar(&cmd.active, "active", false, "Filter by port active or inactive status")
+	f.BoolVar(&cmd.connected, "connected", false, "Filter by port connected or disconnected status")
+	f.BoolVar(&cmd.inside, "inside", true, "Filter by port inside or outside status")
+	f.BoolVar(&cmd.uplinkPort, "uplinkPort", false, "Filter for uplink ports")
+	f.IntVar(&cmd.vlanID, "vlan", 0, "Filter by VLAN ID (0 = unfiltered)")
+	f.UintVar(&cmd.count, "count", 0, "Number of matches to return (0 = unlimited)")
+}
+
+func (cmd *info) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 1 {
+		return flag.ErrHelp
+	}
+
+	client, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	finder, err := cmd.Finder()
+	if err != nil {
+		return err
+	}
+
+	// Retrieve DVS reference
+	net, err := finder.Network(ctx, f.Arg(0))
+	if err != nil {
+		return err
+	}
+
+	// Convert to DVS object type
+	dvs, ok := net.(*object.DistributedVirtualSwitch)
+	if !ok {
+		return fmt.Errorf("%s (%s) is not a DVS", f.Arg(0), net.Reference().Type)
+	}
+
+	// Set base search criteria
+	criteria := types.DistributedVirtualSwitchPortCriteria{
+		Connected:  types.NewBool(cmd.connected),
+		Active:     types.NewBool(cmd.active),
+		UplinkPort: types.NewBool(cmd.uplinkPort),
+		Inside:     types.NewBool(cmd.inside),
+	}
+
+	// If a distributed virtual portgroup path is set, then add its portgroup key to the base criteria
+	if len(cmd.pg) > 0 {
+		// Retrieve distributed virtual portgroup reference
+		net, err = finder.Network(ctx, cmd.pg)
+		if err != nil {
+			return err
+		}
+
+		// Convert distributed virtual portgroup object type
+		dvpg, ok := net.(*object.DistributedVirtualPortgroup)
+		if !ok {
+			return fmt.Errorf("%s (%s) is not a DVPG", cmd.pg, net.Reference().Type)
+		}
+
+		// Obtain portgroup key property
+		var dvp mo.DistributedVirtualPortgroup
+		if err := dvpg.Properties(ctx, dvpg.Reference(), []string{"key"}, &dvp); err != nil {
+			return err
+		}
+
+		// Add portgroup key to port search criteria
+		criteria.PortgroupKey = []string{dvp.Key}
+	}
+
+	// Prepare request
+	req := types.FetchDVPorts{
+		This:     dvs.Reference(),
+		Criteria: &criteria,
+	}
+
+	// Fetch ports
+	res, err := methods.FetchDVPorts(ctx, client, &req)
+	if err != nil {
+		return err
+	}
+
+	var returnedPorts uint
+
+	// Iterate over returned ports
+	for _, port := range res.Returnval {
+		portConfigSetting := port.Config.Setting.(*types.VMwareDVSPortSetting)
+		portVlan := portConfigSetting.Vlan.(*types.VmwareDistributedVirtualSwitchVlanIdSpec)
+		portVlanID := portVlan.VlanId
+
+		// Show port info if: VLAN ID is not defined, or VLAN ID matches requested VLAN
+		if cmd.vlanID == 0 || portVlanID == int32(cmd.vlanID) {
+			returnedPorts++
+
+			fmt.Printf("PortgroupKey: %s\n", port.PortgroupKey)
+			fmt.Printf("DvsUuid:      %s\n", port.DvsUuid)
+			fmt.Printf("VlanId:       %d\n", portVlanID)
+			fmt.Printf("PortKey:      %s\n\n", port.Key)
+
+			// If we are limiting the count and have reached the count, then stop returning output
+			if cmd.count > 0 && returnedPorts == cmd.count {
+				break
+			}
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/spec.go b/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/spec.go
new file mode 100644
index 0000000000..fb643d2020
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/spec.go
@@ -0,0 +1,55 @@
+/*
+Copyright (c) 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 portgroup
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"strings"
+
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type DVPortgroupConfigSpec struct {
+	types.DVPortgroupConfigSpec
+}
+
+func (spec *DVPortgroupConfigSpec) Register(ctx context.Context, f *flag.FlagSet) {
+	ptypes := []string{
+		string(types.DistributedVirtualPortgroupPortgroupTypeEarlyBinding),
+		string(types.DistributedVirtualPortgroupPortgroupTypeLateBinding),
+		string(types.DistributedVirtualPortgroupPortgroupTypeEphemeral),
+	}
+
+	f.StringVar(&spec.Type, "type", ptypes[0],
+		fmt.Sprintf("Portgroup type (%s)", strings.Join(ptypes, "|")))
+
+	f.Var(flags.NewInt32(&spec.NumPorts), "nports", "Number of ports")
+
+	config := new(types.VMwareDVSPortSetting)
+	vlan := new(types.VmwareDistributedVirtualSwitchVlanIdSpec)
+	spec.DefaultPortConfig = config
+	config.Vlan = vlan
+
+	f.Var(flags.NewInt32(&vlan.VlanId), "vlan", "VLAN ID")
+}
+
+func (spec *DVPortgroupConfigSpec) Spec() types.DVPortgroupConfigSpec {
+	return spec.DVPortgroupConfigSpec
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/emacs/.gitignore b/vendor/github.com/vmware/govmomi/govc/emacs/.gitignore
new file mode 100644
index 0000000000..56179efce3
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/emacs/.gitignore
@@ -0,0 +1,3 @@
+.cask
+elpa
+*.elc
diff --git a/vendor/github.com/vmware/govmomi/govc/emacs/Cask b/vendor/github.com/vmware/govmomi/govc/emacs/Cask
new file mode 100644
index 0000000000..aa7cf639cf
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/emacs/Cask
@@ -0,0 +1,10 @@
+(source gnu)
+(source melpa)
+
+(package-file "govc.el")
+
+(development
+ (depends-on "dash")
+ (depends-on "json-mode")
+ (depends-on "magit")
+ (depends-on "s"))
diff --git a/vendor/github.com/vmware/govmomi/govc/emacs/Makefile b/vendor/github.com/vmware/govmomi/govc/emacs/Makefile
new file mode 100644
index 0000000000..0508993db4
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/emacs/Makefile
@@ -0,0 +1,27 @@
+CASK = cask
+EMACS_BIN ?= emacs
+EMACS_FLAGS =
+EMACS_EXEC = $(CASK) exec $(EMACS_BIN) --no-site-file --no-site-lisp --batch $(EMACS_FLAGS)
+
+OBJECTS = govc.elc
+
+elpa:
+	$(CASK) install
+	$(CASK) update
+	touch $@
+
+.PHONY: build test docs clean
+
+build: elpa $(OBJECTS)
+
+test: build docs
+	$(EMACS_EXEC) -l test/make.el -f make-test
+
+docs: build
+	$(EMACS_EXEC) -l test/make.el -f make-docs
+clean:
+	rm -f $(OBJECTS) elpa
+	rm -rf .cask
+
+%.elc: %.el
+	$(EMACS_EXEC) -f batch-byte-compile $<
diff --git a/vendor/github.com/vmware/govmomi/govc/emacs/README.md b/vendor/github.com/vmware/govmomi/govc/emacs/README.md
new file mode 100644
index 0000000000..7dcb782477
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/emacs/README.md
@@ -0,0 +1,233 @@
+# govc.el
+
+Interface to govc for managing VMware ESXi and vCenter.
+
+
+The goal of this package is to provide a simple interface for commonly used
+govc commands within Emacs.  This includes table based inventory/state modes
+for vms, hosts, datastores and pools.  The keymap for each mode provides
+shortcuts for easily feeding the data in view to other govc commands.
+
+Within the various govc modes, press `?` to see a popup menu of options.
+A menu bar is enabled for certain modes, such as `govc-vm-mode` and `govc-host-mode`.
+There is also a `govc` menu at all times under the `Tools` menu.
+
+The recommended way to install govc.el is via MELPA (http://melpa.org/).
+
+## govc-mode
+
+Running `govc-global-mode` creates key bindings to the various govc modes.
+The default prefix is `C-c ;` and can be changed by setting `govc-keymap-prefix`.
+
+### govc-command-map
+
+Keybinding     | Description
+---------------|------------------------------------------------------------
+<kbd>h</kbd>   | Host info via govc
+<kbd>p</kbd>   | Pool info via govc
+<kbd>v</kbd>   | VM info via govc
+<kbd>s</kbd>   | Datastore info via govc
+
+### govc-urls
+
+List of URLs for use with `govc-session`.
+The `govc-session-name` displayed by `govc-mode-line` uses `url-target` (anchor)
+if set, otherwise `url-host` is used.
+
+Example:
+```
+  (setq govc-urls `("root:vagrant@localhost:18443#Vagrant-ESXi"
+                    "root:password@192.168.1.192#Intel-NUC"
+                    "Administrator@vsphere.local:password!@vcva-clovervm"))
+```
+To enter a URL that is not in the list, prefix `universal-argument`, for example:
+
+  `C-u M-x govc-vm`
+
+When in `govc-vm` or `govc-host` mode, a default URL is composed with the
+current session credentials and the IP address of the current vm/host and
+the vm/host name as the session name.  This makes it easier to connect to
+nested ESX/vCenter VMs or directly to an ESX host.
+
+### govc-session-url
+
+ESX or vCenter URL set by `govc-session` via `govc-urls` selection.
+
+### govc-session-insecure
+
+Skip verification of server certificate when true.
+This variable is set to the value of the `GOVC_INSECURE` env var by default.
+It can also be set per-url via the query string (insecure=true).  For example:
+```
+  (setq govc-urls `("root:password@hostname?insecure=true"))
+```
+
+### govc-session-datacenter
+
+Datacenter to use for the current `govc-session`.
+If the endpoint has a single Datacenter it will be used by default, otherwise
+`govc-session` will prompt for selection.  It can also be set per-url via the
+query string.  For example:
+```
+  (setq govc-urls `("root:password@hostname?datacenter=dc1"))
+```
+
+### govc-session-datastore
+
+Datastore to use for the current `govc-session`.
+If the endpoint has a single Datastore it will be used by default, otherwise
+`govc-session` will prompt for selection.  It can also be set per-url via the
+query string.  For example:
+```
+  (setq govc-urls `("root:password@hostname?datastore=vsanDatastore"))
+```
+
+### govc-session-network
+
+Network to use for the current `govc-session`.
+
+## govc-tabulated-list-mode
+
+Generic table bindings to mark/unmark rows.
+
+In addition to any hooks its parent mode `tabulated-list-mode` might have run,
+this mode runs the hook `govc-tabulated-list-mode-hook`, as the final step
+during initialization.
+
+### govc-tabulated-list-mode-map
+
+Keybinding     | Description
+---------------|------------------------------------------------------------
+<kbd>m</kbd>   | Mark and move to the next line
+<kbd>u</kbd>   | Unmark and move to the next line
+<kbd>t</kbd>   | Toggle mark
+<kbd>U</kbd>   | Unmark all
+<kbd>M-&</kbd> | Shell CMD with current `govc-session` exported as GOVC_ env vars
+<kbd>M-w</kbd> | Copy current selection or region to the kill ring
+<kbd>M-E</kbd> | Export session to `process-environment` and `kill-ring`
+
+## govc-host-mode
+
+Major mode for handling a list of govc hosts.
+
+In addition to any hooks its parent mode `govc-tabulated-list-mode` might have run,
+this mode runs the hook `govc-host-mode-hook`, as the final step
+during initialization.
+
+### govc-host-mode-map
+
+Keybinding     | Description
+---------------|------------------------------------------------------------
+<kbd>E</kbd>   | Events via govc events -n `govc-max-events`
+<kbd>L</kbd>   | Logs via govc logs -n `govc-max-events`
+<kbd>J</kbd>   | JSON via govc host
+<kbd>N</kbd>   | Netstat via `govc-esxcli-netstat-info` with current host id
+<kbd>c</kbd>   | Connect new session for the current govc mode
+<kbd>p</kbd>   | Pool-mode with current session
+<kbd>s</kbd>   | Datastore-mode with current session
+<kbd>v</kbd>   | VM-mode with current session
+
+## govc-pool-mode
+
+Major mode for handling a list of govc pools.
+
+In addition to any hooks its parent mode `govc-tabulated-list-mode` might have run,
+this mode runs the hook `govc-pool-mode-hook`, as the final step
+during initialization.
+
+### govc-pool-mode-map
+
+Keybinding     | Description
+---------------|------------------------------------------------------------
+<kbd>E</kbd>   | Events via govc events -n `govc-max-events`
+<kbd>J</kbd>   | JSON via govc pool
+<kbd>D</kbd>   | Destroy via `govc-pool-destroy` on the pool selection
+<kbd>c</kbd>   | Connect new session for the current govc mode
+<kbd>h</kbd>   | Host-mode with current session
+<kbd>s</kbd>   | Datastore-mode with current session
+<kbd>v</kbd>   | VM-mode with current session
+
+## govc-datastore-mode
+
+Major mode for govc datastore.info.
+
+In addition to any hooks its parent mode `tabulated-list-mode` might have run,
+this mode runs the hook `govc-datastore-mode-hook`, as the final step
+during initialization.
+
+### govc-datastore-mode-map
+
+Keybinding     | Description
+---------------|------------------------------------------------------------
+<kbd>J</kbd>   | JSON via govc datastore
+<kbd>RET</kbd> | Browse datastore
+<kbd>c</kbd>   | Connect new session for the current govc mode
+<kbd>h</kbd>   | Host-mode with current session
+<kbd>p</kbd>   | Pool-mode with current session
+<kbd>v</kbd>   | VM-mode with current session
+
+## govc-datastore-ls-mode
+
+Major mode govc datastore.ls.
+
+In addition to any hooks its parent mode `govc-tabulated-list-mode` might have run,
+this mode runs the hook `govc-datastore-ls-mode-hook`, as the final step
+during initialization.
+
+### govc-datastore-ls-mode-map
+
+Keybinding     | Description
+---------------|------------------------------------------------------------
+<kbd>J</kbd>   | JSON via govc datastore
+<kbd>S</kbd>   | Search via govc datastore
+<kbd>D</kbd>   | Delete selected datastore paths
+<kbd>T</kbd>   | Tail datastore file
+<kbd>+</kbd>   | Mkdir via govc datastore
+<kbd>DEL</kbd> | Up to parent folder
+<kbd>RET</kbd> | Open datastore folder or file
+
+## govc-vm-mode
+
+Major mode for handling a list of govc vms.
+
+In addition to any hooks its parent mode `govc-tabulated-list-mode` might have run,
+this mode runs the hook `govc-vm-mode-hook`, as the final step
+during initialization.
+
+### govc-vm-mode-map
+
+Keybinding     | Description
+---------------|------------------------------------------------------------
+<kbd>E</kbd>   | Events via govc events -n `govc-max-events`
+<kbd>J</kbd>   | JSON via govc vm
+<kbd>X</kbd>   | ExtraConfig via `govc-vm-extra-config` on the current selection
+<kbd>RET</kbd> | Devices via `govc-device` on the current selection
+<kbd>C</kbd>   | Console screenshot via `govc-vm-screen` on the current selection
+<kbd>V</kbd>   | VNC via `govc-vm-vnc` on the current selection
+<kbd>D</kbd>   | Destroy via `govc-vm-destroy` on the current selection
+<kbd>^</kbd>   | Start via `govc-vm-start` on the current selection
+<kbd>!</kbd>   | Shutdown via `govc-vm-shutdown` on the current selection
+<kbd>@</kbd>   | Reboot via `govc-vm-reboot` on the current selection
+<kbd>&</kbd>   | Suspend via `govc-vm-suspend` on the current selection
+<kbd>H</kbd>   | Host info via `govc-host` with host(s) of current selection
+<kbd>S</kbd>   | Datastore via `govc-datastore-ls` with datastore of current selection
+<kbd>P</kbd>   | Ping VM
+<kbd>c</kbd>   | Connect new session for the current govc mode
+<kbd>h</kbd>   | Host-mode with current session
+<kbd>p</kbd>   | Pool-mode with current session
+<kbd>s</kbd>   | Datastore-mode with current session
+
+## govc-device-mode
+
+Major mode for handling a govc device.
+
+In addition to any hooks its parent mode `govc-tabulated-list-mode` might have run,
+this mode runs the hook `govc-device-mode-hook`, as the final step
+during initialization.
+
+### govc-device-mode-map
+
+Keybinding     | Description
+---------------|------------------------------------------------------------
+<kbd>J</kbd>   | JSON via govc device
+<kbd>RET</kbd> | Tabulated govc device
diff --git a/vendor/github.com/vmware/govmomi/govc/emacs/govc.el b/vendor/github.com/vmware/govmomi/govc/emacs/govc.el
new file mode 100644
index 0000000000..809bf66ab5
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/emacs/govc.el
@@ -0,0 +1,1478 @@
+;;; govc.el --- Interface to govc for managing VMware ESXi and vCenter
+
+;; Author: The govc developers
+;; URL: https://github.com/vmware/govmomi/tree/master/govc/emacs
+;; Keywords: convenience
+;; Version: 0.13.0
+;; Package-Requires: ((emacs "24.3") (dash "1.5.0") (s "1.9.0") (magit-popup "2.0.50") (json-mode "1.6.0"))
+
+;; This file is NOT part of GNU Emacs.
+
+;; Copyright (c) 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.
+
+;;; Commentary:
+
+;; The goal of this package is to provide a simple interface for commonly used
+;; govc commands within Emacs.  This includes table based inventory/state modes
+;; for vms, hosts, datastores and pools.  The keymap for each mode provides
+;; shortcuts for easily feeding the data in view to other govc commands.
+;;
+;; Within the various govc modes, press `?' to see a popup menu of options.
+;; A menu bar is enabled for certain modes, such as `govc-vm-mode' and `govc-host-mode'.
+;; There is also a `govc' menu at all times under the `Tools' menu.
+;;
+;; The recommended way to install govc.el is via MELPA (http://melpa.org/).
+
+;;; Code:
+
+(eval-when-compile
+  (require 'cl))
+(require 'dash)
+(require 'diff)
+(require 'dired)
+(require 'json-mode)
+(require 'magit-popup)
+(require 'url-parse)
+(require 's)
+
+(autoload 'auth-source-search "auth-source")
+
+(defgroup govc nil
+  "Emacs customization group for govc."
+  :group 'convenience)
+
+(defcustom govc-keymap-prefix "C-c ;"
+  "Prefix for `govc-mode'."
+  :group 'govc)
+
+(defcustom govc-command "govc"
+  "Executable path to the govc utility."
+  :type 'string
+  :group 'govc)
+
+(defvar govc-command-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "h" 'govc-host)
+    (define-key map "p" 'govc-pool)
+    (define-key map "v" 'govc-vm)
+    (define-key map "s" 'govc-datastore)
+    (define-key map "?" 'govc-popup)
+    map)
+  "Keymap for `govc-mode' after `govc-keymap-prefix' was pressed.")
+
+(defvar govc-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd govc-keymap-prefix) govc-command-map)
+    map)
+  "Keymap for `govc-mode'.")
+
+;;;###autoload
+(define-minor-mode govc-mode
+  "Running `govc-global-mode' creates key bindings to the various govc modes.
+The default prefix is `C-c ;' and can be changed by setting `govc-keymap-prefix'.
+
+\\{govc-mode-map\}"
+  nil govc-mode-line govc-mode-map
+  :group 'govc)
+
+;;;###autoload
+(define-globalized-minor-mode govc-global-mode govc-mode govc-mode)
+
+(defcustom govc-mode-line
+  '(:eval (format " govc[%s]" (or (govc-session-name) "-")))
+  "Mode line lighter for govc."
+  :group 'govc
+  :type 'sexp
+  :risky t)
+
+
+;;; Tabulated list mode extensions (derived from https://github.com/Silex/docker.el tabulated-list-ext.el)
+(defun govc-tabulated-list-mark ()
+  "Mark and move to the next line."
+  (interactive)
+  (tabulated-list-put-tag (char-to-string dired-marker-char) t))
+
+(defun govc-tabulated-list-unmark ()
+  "Unmark and move to the next line."
+  (interactive)
+  (tabulated-list-put-tag "" t))
+
+(defun govc-tabulated-list-toggle-marks ()
+  "Toggle mark."
+  (interactive)
+  (save-excursion
+    (goto-char (point-min))
+    (let ((cmd))
+      (while (not (eobp))
+        (setq cmd (char-after))
+        (tabulated-list-put-tag
+         (if (eq cmd dired-marker-char)
+             ""
+           (char-to-string dired-marker-char)) t)))))
+
+(defun govc-tabulated-list-unmark-all ()
+  "Unmark all."
+  (interactive)
+  (save-excursion
+    (goto-char (point-min))
+    (while (not (eobp))
+      (tabulated-list-put-tag "" t))))
+
+(defun govc-selection ()
+  "Get the current selection as a list of names."
+  (let ((selection))
+    (save-excursion
+      (goto-char (point-min))
+      (while (not (eobp))
+        (when (eq (char-after) ?*)
+          (add-to-list 'selection (tabulated-list-get-id)))
+        (forward-line)))
+    (or selection (let ((id (tabulated-list-get-id)))
+                    (if id
+                        (list id))))))
+
+(defun govc-do-selection (fn action)
+  "Call FN with `govc-selection' confirming ACTION."
+  (let* ((selection (govc-selection))
+         (count (length selection))
+         (prompt (if (= count 1)
+                     (car selection)
+                   (format "* [%d] marked" count))))
+    (if (yes-or-no-p (format "%s %s ?" action prompt))
+        (funcall fn selection))))
+
+(defun govc-copy-selection ()
+  "Copy current selection or region to the kill ring."
+  (interactive)
+  (if (region-active-p)
+      (copy-region-as-kill (mark) (point) 'region)
+    (kill-new (message "%s" (s-join " " (--map (format "'%s'" it) (govc-selection)))))))
+
+(defvar govc-font-lock-keywords
+  (list
+   (list dired-re-mark '(0 dired-mark-face))
+   (list "types.ManagedObjectReference\\(.*\\)" '(1 dired-directory-face))
+   (list "[^ ]*/$" '(0 dired-directory-face))
+   (list "\\.\\.\\.$" '(0 dired-symlink-face))))
+
+(defvar govc-tabulated-list-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "m" 'govc-tabulated-list-mark)
+    (define-key map "u" 'govc-tabulated-list-unmark)
+    (define-key map "t" 'govc-tabulated-list-toggle-marks)
+    (define-key map "U" 'govc-tabulated-list-unmark-all)
+    (define-key map (kbd "M-&") 'govc-shell-command)
+    (define-key map (kbd "M-w") 'govc-copy-selection)
+    (define-key map (kbd "M-E") 'govc-copy-environment)
+    map)
+  "Keymap for `govc-tabulated-list-mode'.")
+
+(define-derived-mode govc-tabulated-list-mode tabulated-list-mode "Tabulated govc"
+  "Generic table bindings to mark/unmark rows."
+  (setq-local font-lock-defaults
+              '(govc-font-lock-keywords t nil nil beginning-of-line)))
+
+
+;;; Keymap helpers for generating menus and popups
+(defun govc-keymap-list (keymap)
+  "Return a list of (key name function) for govc bindings in the given KEYMAP.
+The name returned is the first word of the function `documentation'."
+  (let ((map))
+    (map-keymap
+     (lambda (k f)
+       (when (keymapp f)
+         (setq map (append map
+                           (--map (and (setcar it (kbd (format "M-%s" (char-to-string (car it))))) it)
+                                  (govc-keymap-list f)))))
+       (when (and (symbolp f)
+                  (s-starts-with? "govc-" (symbol-name f)))
+         (if (not (eq ?? k))
+             (add-to-list 'map (list k (car (split-string (documentation f))) f))))) keymap)
+    map))
+
+(defun govc-keymap-menu (keymap)
+  "Return a list of [key function t] for govc bindings in the given KEYMAP.
+For use with `easy-menu-define'."
+  (-map (lambda (item)
+          (vector (nth 1 item) (nth 2 item) t))
+        (govc-keymap-list keymap)))
+
+(defun govc-key-description (key)
+  "Call `key-description' ensuring KEY is a sequence."
+  (key-description (if (integerp key) (list key) key)))
+
+(defun govc-keymap-list-to-help (keymap)
+  "Convert KEYMAP to list of help text."
+  (--map (list (govc-key-description (car it))
+               (car (split-string (documentation (nth 2 it)) "\\.")))
+         keymap))
+
+(defun govc-keymap-popup-help ()
+  "Default keymap help for `govc-keymap-popup'."
+  (append (govc-keymap-list-to-help (govc-keymap-list govc-tabulated-list-mode-map))
+          '(("g" "Refresh current buffer")
+            ("C-h m" "Show all key bindings"))))
+
+(defun govc-keymap-popup (keymap)
+  "Convert a `govc-keymap-list' using KEYMAP for use with `magit-define-popup'.
+Keys in the ASCII range of 32-97 are mapped to popup commands, all others are listed as help text."
+  (let* ((maps (--separate (and (integerp (car it))
+                                (>= (car it) 32)
+                                (<= (car it) 97))
+                           (govc-keymap-list keymap)))
+         (help (govc-keymap-list-to-help (cadr maps))))
+    (append
+     '("Commands")
+     (car maps)
+     (list (s-join "\n" (--map (format " %-6s %s" (car it) (cadr it))
+                               (append help (govc-keymap-popup-help))))
+           nil))))
+
+
+;;; govc process helpers
+(defcustom govc-urls nil
+  "List of URLs for use with `govc-session'.
+The `govc-session-name' displayed by `govc-mode-line' uses `url-target' (anchor)
+if set, otherwise `url-host' is used.
+
+Example:
+```
+  (setq govc-urls '(\"root:vagrant@localhost:18443#Vagrant-ESXi\"
+                    \"root:password@192.168.1.192#Intel-NUC\"
+                    \"Administrator@vsphere.local:password!@vcva-clovervm\"))
+```
+To enter a URL that is not in the list, prefix `universal-argument', for example:
+
+  `\\[universal-argument] \\[govc-vm]'
+
+To avoid putting your credentials in a variable, you can use the
+auth-source search integration.
+
+```
+  (setq govc-urls '(\"myserver-vmware-2\"))
+```
+
+And then put this line in your `auth-sources' (e.g. `~/.authinfo.gpg'):
+```
+    machine myserver-vmware-2 login tzz password mypass url \"myserver-vmware-2.some.domain.here:443?insecure=true\"
+```
+
+Which will result in the URL \"tzz:mypass@myserver-vmware-2.some.domain.here:443?insecure=true\".
+For more details on `auth-sources', see Info node `(auth) Help for users'.
+
+When in `govc-vm' or `govc-host' mode, a default URL is composed with the
+current session credentials and the IP address of the current vm/host and
+the vm/host name as the session name.  This makes it easier to connect to
+nested ESX/vCenter VMs or directly to an ESX host."
+  :group 'govc
+  :type '(repeat (string :tag "vcenter URL or auth-source machine reference")))
+
+(defvar-local govc-session-url nil
+  "ESX or vCenter URL set by `govc-session' via `govc-urls' selection.")
+
+(defvar-local govc-session-path nil)
+
+(defvar-local govc-session-insecure nil
+  "Skip verification of server certificate when true.
+This variable is set to the value of the `GOVC_INSECURE' env var by default.
+It can also be set per-url via the query string (insecure=true).  For example:
+```
+  (setq govc-urls '(\"root:password@hostname?insecure=true\"))
+```")
+
+(defvar-local govc-session-datacenter nil
+  "Datacenter to use for the current `govc-session'.
+If the endpoint has a single Datacenter it will be used by default, otherwise
+`govc-session' will prompt for selection.  It can also be set per-url via the
+query string.  For example:
+```
+  (setq govc-urls '(\"root:password@hostname?datacenter=dc1\"))
+```")
+
+(defvar-local govc-session-datastore nil
+  "Datastore to use for the current `govc-session'.
+If the endpoint has a single Datastore it will be used by default, otherwise
+`govc-session' will prompt for selection.  It can also be set per-url via the
+query string.  For example:
+```
+  (setq govc-urls '(\"root:password@hostname?datastore=vsanDatastore\"))
+```")
+
+(defvar-local govc-session-network nil
+  "Network to use for the current `govc-session'.")
+
+(defvar-local govc-filter nil
+  "Resource path filter.")
+
+(defvar-local govc-args nil
+  "Additional govc arguments.")
+
+(defun govc-session-name ()
+  "Return a name for the current session.
+Derived from `govc-session-url' if set, otherwise from the 'GOVC_URL' env var.
+Return value is the url anchor if set, otherwise the hostname is returned."
+  (let* ((u (or govc-session-url (getenv "GOVC_URL")))
+         (url (if u (govc-url-parse u))))
+    (if url
+        (concat (or (url-target url) (url-host url)) govc-session-path))))
+
+(defun govc-format-command (command &rest args)
+  "Format govc COMMAND ARGS."
+  (format "%s %s %s" govc-command command
+          (s-join " " (--map (format "'%s'" it)
+                             (-flatten (-non-nil args))))))
+
+(defconst govc-environment-map (--map (cons (concat "GOVC_" (upcase it))
+                                            (intern (concat "govc-session-" it)))
+                                      '("url" "insecure" "datacenter" "datastore" "network"))
+
+  "Map of `GOVC_*' environment variable names to `govc-session-*' symbol names.")
+
+(defun govc-environment (&optional unset)
+  "Return `process-environment' for govc.
+Optionally clear govc env if UNSET is non-nil."
+  (let ((process-environment (copy-sequence process-environment)))
+    (dolist (e govc-environment-map)
+      (setenv (car e) (unless unset (symbol-value (cdr e)))))
+    process-environment))
+
+(defun govc-export-environment (arg)
+  "Set if ARG is \\[universal-argument], unset if ARG is \\[negative-argument]."
+  (if (equal arg '-)
+      (progn (setq process-environment (govc-environment t))
+             (cons "unset" (--map (car it)
+                                  govc-environment-map)))
+    (progn (setq process-environment (govc-environment))
+           (cons "export" (--map (format "%s='%s'" (car it) (or (symbol-value (cdr it)) ""))
+                                 govc-environment-map)))))
+
+(defun govc-copy-environment (&optional arg)
+  "Export session to `process-environment' and `kill-ring'.
+Optionally set `GOVC_*' vars in `process-environment' using prefix
+\\[universal-argument] ARG or unset with prefix \\[negative-argument] ARG."
+  (interactive "P")
+  (message (kill-new (if arg (s-join " " (govc-export-environment arg)) govc-session-url))))
+
+(defun govc-process (command handler)
+  "Run COMMAND, calling HANDLER upon successful exit of the process."
+  (message command)
+  (let ((process-environment (govc-environment))
+        (exit-code))
+    (add-to-list 'govc-command-history command)
+    (with-temp-buffer
+      (setq exit-code (call-process-shell-command command nil (current-buffer)))
+      (if (zerop exit-code)
+          (funcall handler)
+        (error (buffer-string))))))
+
+(defun govc (command &rest args)
+  "Execute govc COMMAND with ARGS.
+Return value is `buffer-string' split on newlines."
+  (govc-process (govc-format-command command args)
+                (lambda ()
+                  (split-string (buffer-string) "\n" t))))
+
+(defun govc-json (command &rest args)
+  "Execute govc COMMAND passing arguments ARGS.
+Return value is `json-read'."
+  (govc-process (govc-format-command command (cons "-json" args))
+                (lambda ()
+                  (goto-char (point-min))
+                  (let ((json-object-type 'plist))
+                    (json-read)))))
+
+(defun govc-ls-datacenter ()
+  "List datacenters."
+  (govc "ls" "-t" "Datacenter" "./..."))
+
+(defun govc-object-prompt (prompt ls)
+  "PROMPT for object name via LS function.  Return object without PROMPT if there is just one instance."
+  (let ((objs (if (listp ls) ls (funcall ls))))
+    (if (eq 1 (length objs))
+        (car objs)
+      (completing-read prompt objs))))
+
+(defun govc-url-parse (url)
+  "A `url-generic-parse-url' wrapper to handle URL with password, but no scheme.
+Also fixes the case where user contains an '@'."
+  (let* ((full (s-contains? "://" url))
+         (u (url-generic-parse-url (concat (unless full "https://") url))))
+    (unless full
+      (setf (url-type u) nil)
+      (setf (url-fullness u) nil))
+    (if (s-contains? "@" (url-host u))
+        (let* ((h (split-string (url-host u) "@"))
+               (p (split-string (car h) ":")))
+          (setf (url-host u) (cadr h))
+          (setf (url-user u) (concat (url-user u) "@" (car p)))
+          (setf (url-password u) (cadr p))))
+    u))
+
+(defun govc-url-default ()
+  "Default URL when creating a new session."
+  (if govc-session-url
+      (let ((url (govc-url-parse govc-session-url)))
+        (if (equal major-mode 'govc-host-mode)
+            (progn (setf (url-host url) (govc-table-column-value "Name"))
+                   (setf (url-target url) nil))
+          (progn (setf (url-host url) (govc-table-column-value "IP address"))
+                 (setf (url-target url) (govc-table-column-value "Name"))))
+        (setf (url-filename url) "") ; erase query string
+        (if (string-empty-p (url-user url))
+            (setf (url-user url) "root")) ; local workstation url has no user set
+        (url-recreate-url url))))
+
+(defun govc-urls-completing-read ()
+  "A wrapper for `completing-read' to mask credentials in `govc-urls'."
+  (let ((alist))
+    (dolist (ent govc-urls)
+      (let ((u (govc-url-parse ent)))
+        (setf (url-password u) nil)
+        (add-to-list 'alist `(,(url-recreate-url u) . ,ent) t)))
+    (let ((u (completing-read "govc url: " (-map 'car alist))))
+      (cdr (assoc u alist)))))
+
+(defun govc-session-url-lookup-auth-source (url-or-address)
+  "Check if URL-OR-ADDRESS is a logical name in the authinfo file.
+Given URL-OR-ADDRESS `myserver-vmware-2' this function will find
+a line like
+    machine myserver-vmware-2 login tzz password mypass url \"myserver-vmware-2.some.domain.here:443?insecure=true\"
+
+and will return the URL \"tzz:mypass@myserver-vmware-2.some.domain.here:443?insecure=true\".
+
+If the line is not found, the original URL-OR-ADDRESS is
+returned, assuming that's what the user wanted."
+  (let ((found (nth 0 (auth-source-search :max 1
+                                          :host url-or-address
+                                          :require '(:user :secret :url)
+                                          :create nil))))
+    (if found
+        (format "%s:%s@%s"
+                (plist-get found :user)
+                (let ((secret (plist-get found :secret)))
+                  (if (functionp secret)
+                      (funcall secret)
+                    secret))
+                (plist-get found :url))
+      url-or-address)))
+
+(defun govc-session-set-url (url)
+  "Set `govc-session-url' to URL and optionally set other govc-session-* variables via URL query."
+  ;; Replace the original URL with the auth-source lookup if there is no user.
+  (unless (url-user (govc-url-parse url))
+    (setq url (govc-session-url-lookup-auth-source url)))
+
+  (let ((q (cdr (url-path-and-query (govc-url-parse url)))))
+    (dolist (opt (if q (url-parse-query-string q)))
+      (let ((var (intern (concat "govc-session-" (car opt)))))
+        (if (boundp var)
+            (set var (cadr opt))))))
+  (setq govc-session-url url))
+
+(defun govc-session ()
+  "Initialize a govc session."
+  (interactive)
+  (let ((url (if (or current-prefix-arg (eq 0 (length govc-urls)))
+                 (read-string "govc url: " (govc-url-default))
+               (if (eq 1 (length govc-urls))
+                   (car govc-urls)
+                 (govc-urls-completing-read)))))
+    ;; Wait until this point to clear so current session is preserved in the
+    ;; event of `keyboard-quit' in `read-string'.
+    (setq govc-session-datacenter nil
+          govc-session-datastore nil
+          govc-session-network nil
+          govc-filter nil)
+    (govc-session-set-url url))
+  (unless govc-session-insecure
+    (setq govc-session-insecure (or (getenv "GOVC_INSECURE")
+                                    (completing-read "govc insecure: " '("true" "false")))))
+  (unless govc-session-datacenter
+    (setq govc-session-datacenter (govc-object-prompt "govc datacenter: " 'govc-ls-datacenter)))
+  (add-to-list 'govc-urls govc-session-url))
+
+(defalias 'govc-current-session 'buffer-local-variables)
+
+(defun govc-session-clone (session)
+  "Clone a session from SESSION buffer locals."
+  (dolist (v session)
+    (let ((s (car v)))
+      (when (s-starts-with? "govc-session-" (symbol-name s))
+        (set s (assoc-default s session))))))
+
+(defvar govc-command-history nil
+  "History list for govc commands used by `govc-shell-command'.")
+
+(defun govc-shell-command (&optional cmd)
+  "Shell CMD with current `govc-session' exported as GOVC_ env vars."
+  (interactive)
+  (let ((process-environment (govc-environment))
+        (current-prefix-arg "*govc*")
+        (url govc-session-url)
+        (shell-command-history govc-command-history))
+    (if cmd
+        (async-shell-command cmd current-prefix-arg)
+      (call-interactively 'async-shell-command))
+    (setq govc-command-history shell-command-history)
+    (with-current-buffer (get-buffer current-prefix-arg)
+      (setq govc-session-url url))))
+
+(defcustom govc-max-events 100
+  "Limit events output to the last N events."
+  :type 'integer
+  :group 'govc)
+
+(defun govc-events ()
+  "Events via govc events -n `govc-max-events'."
+  (interactive)
+  (govc-shell-command
+   (govc-format-command "events"
+                        (list "-n" govc-max-events (if current-prefix-arg "-f") (govc-selection)))))
+
+(defun govc-logs ()
+  "Logs via govc logs -n `govc-max-events'."
+  (interactive)
+  (govc-shell-command
+   (let ((host (govc-selection)))
+     (govc-format-command "logs"
+                          (list "-n" govc-max-events (if current-prefix-arg "-f") (if host (list "-host" host)))))))
+
+(defun govc-parse-info (output)
+  "Parse govc info command OUTPUT."
+  (let* ((entries)
+         (entry)
+         (entry-key))
+    (-each output
+      (lambda (line)
+        (let* ((ix (s-index-of ":" line))
+               (key (s-trim (substring line 0 ix)))
+               (val (s-trim (substring line (+ ix 1)))))
+          (unless entry-key
+            (setq entry-key key))
+          (when (s-equals? key entry-key)
+            (setq entry (make-hash-table :test 'equal))
+            (add-to-list 'entries entry))
+          (puthash key val entry))))
+    entries))
+
+(defun govc-table-column-names ()
+  "Return a list of column names from `tabulated-list-format'."
+  (--map (car (aref tabulated-list-format it))
+         (number-sequence 0 (- (length tabulated-list-format) 1))))
+
+(defun govc-table-column-value (key)
+  "Return current column value for given KEY."
+  (let ((names (govc-table-column-names))
+        (entry (tabulated-list-get-entry))
+        (value))
+    (dotimes (ix (- (length names) 1))
+      (if (s-equals? key (nth ix names))
+          (setq value (elt entry ix))))
+    value))
+
+(defun govc-table-info (command &optional args)
+  "Convert `govc-parse-info' COMMAND ARGS output to `tabulated-list-entries' format."
+  (let ((names (govc-table-column-names)))
+    (-map (lambda (info)
+            (let ((id (or (gethash "Path" info)
+                          (gethash (car names) info))))
+              (list id (vconcat
+                        (--map (or (gethash it info) "-")
+                               names)))))
+          (govc-parse-info (govc command args)))))
+
+(defun govc-map-info (command &optional args)
+  "Populate key=val map table with govc COMMAND ARGS output."
+  (-map (lambda (line)
+          (let* ((ix (s-index-of ":" line))
+                 (key (s-trim (substring line 0 ix)))
+                 (val (s-trim (substring line (+ ix 1)))))
+            (list key (vector key val))))
+        (govc command args)))
+
+(defun govc-map-info-table (entries)
+  "Tabulated `govc-map-info' data via ENTRIES."
+  (let ((session (govc-current-session))
+        (args (append govc-args (govc-selection)))
+        (buffer (get-buffer-create "*govc-info*")))
+    (pop-to-buffer buffer)
+    (tabulated-list-mode)
+    (setq govc-args args)
+    (govc-session-clone session)
+    (setq tabulated-list-format [("Name" 50)
+                                 ("Value" 50)]
+          tabulated-list-padding 2
+          tabulated-list-entries entries)
+    (tabulated-list-print)))
+
+(defun govc-type-list-entries (command)
+  "Convert govc COMMAND type table output to `tabulated-list-entries'."
+  (-map (lambda (line)
+          (let* ((entry (s-split-up-to " " (s-collapse-whitespace line) 2))
+                 (name (car entry))
+                 (type (nth 1 entry))
+                 (value (car (last entry))))
+            (list name (vector name type value))))
+        (govc command govc-args)))
+
+(defun govc-json-info-selection (command)
+  "Run govc COMMAND -json on `govc-selection'."
+  (if current-prefix-arg
+      (--each (govc-selection) (govc-json-info command it))
+    (govc-json-info command (govc-selection))))
+
+(defun govc-json-diff ()
+  "Diff two *govc-json* buffers in view."
+  (let ((buffers))
+    (-each (window-list-1)
+      (lambda (w)
+        (with-current-buffer (window-buffer w)
+          (if (and (eq major-mode 'json-mode)
+                   (s-starts-with? "*govc-json*" (buffer-name)))
+              (push (current-buffer) buffers)))) )
+    (if (= (length buffers) 2)
+        (pop-to-buffer
+         (diff-no-select (car buffers) (cadr buffers))))))
+
+(defun govc-json-info (command selection)
+  "Run govc COMMAND -json on SELECTION."
+  (govc-process (govc-format-command command "-json" govc-args selection)
+                (lambda ()
+                  (let ((buffer (get-buffer-create (concat "*govc-json*" (if current-prefix-arg selection)))))
+                    (copy-to-buffer buffer (point-min) (point-max))
+                    (with-current-buffer buffer
+                      (json-mode)
+                      ;; We use `json-mode-beautify' as `json-pretty-print-buffer' does not work for `govc-host-json-info'
+                      (json-mode-beautify))
+                    (display-buffer buffer))))
+  (if current-prefix-arg
+      (govc-json-diff)))
+
+(defun govc-mode-new-session ()
+  "Connect new session for the current govc mode."
+  (interactive)
+  (call-interactively 'govc-session)
+  (revert-buffer))
+
+(defun govc-host-with-session ()
+  "Host-mode with current session."
+  (interactive)
+  (govc-host nil (govc-current-session)))
+
+(defun govc-vm-with-session ()
+  "VM-mode with current session."
+  (interactive)
+  (govc-vm nil (govc-current-session)))
+
+(defun govc-datastore-with-session ()
+  "Datastore-mode with current session."
+  (interactive)
+  (govc-datastore nil (govc-current-session)))
+
+(defun govc-pool-with-session ()
+  "Pool-mode with current session."
+  (interactive)
+  (govc-pool nil (govc-current-session)))
+
+
+;;; govc object mode
+(defvar-local govc-object-history '("-")
+  "History list of visited objects.")
+
+(defun govc-object-collect ()
+  "Wrapper for govc object.collect."
+  (interactive)
+  (let ((id (car govc-args)))
+    (add-to-list 'govc-object-history id)
+    (setq govc-session-path id))
+  (govc-type-list-entries "object.collect"))
+
+(defun govc-object-collect-selection (&optional json)
+  "Expand object selection via govc object.collect.
+Optionally specify JSON encoding."
+  (interactive)
+  (let* ((entry (or (tabulated-list-get-entry) (error "No entry")))
+         (name (elt entry 0))
+         (type (elt entry 1))
+         (val (elt entry 2)))
+
+    (setq govc-args (list (car govc-args) name))
+
+    (cond
+     ((s-blank? val))
+     ((and (not json) (s-ends-with? "types.ManagedObjectReference" type))
+      (let ((ids (govc "ls" "-L" (split-string val ","))))
+        (setq govc-args (list (govc-object-prompt "moid: " ids)))))
+     ((string= val "...")
+      (if (s-starts-with? "[]" type) (setq json t))))
+
+    (if json
+        (govc-json-info "object.collect" nil)
+      (tabulated-list-revert))))
+
+(defun govc-object-collect-selection-json ()
+  "JSON object selection via govc object.collect."
+  (interactive)
+  (govc-object-collect-selection t))
+
+(defun govc-object-next ()
+  "Next managed object reference."
+  (interactive)
+  (if (search-forward "types.ManagedObjectReference" nil t)
+      (progn (govc-tabulated-list-unmark-all)
+             (tabulated-list-put-tag (char-to-string dired-marker-char)))
+    (goto-char (point-min))))
+
+(defun govc-object-collect-parent ()
+  "Parent object selection if reachable, otherwise prompt with `govc-object-history'."
+  (interactive)
+  (if (cadr govc-args)
+      (let ((prop (butlast (split-string (cadr govc-args) "\\."))))
+        (setq govc-args (list (car govc-args) (if prop (s-join "." prop)))))
+    (save-excursion
+      (goto-char (point-min))
+      (if (re-search-forward "^[[:space:]]*parent" nil t)
+          (govc-object-collect-selection)
+        (let ((id (govc-object-prompt "moid: " govc-object-history)))
+          (setq govc-args (list id (if (string= id "-") "content")))))))
+  (tabulated-list-revert))
+
+(defun govc-object (&optional moid property session)
+  "Object browser aka MOB (Managed Object Browser).
+Optionally starting at MOID and PROPERTY if given.
+Inherit SESSION if given."
+  (interactive)
+  (let ((buffer (get-buffer-create "*govc-object*")))
+    (if (called-interactively-p 'interactive)
+        (switch-to-buffer buffer)
+      (pop-to-buffer buffer))
+    (govc-object-mode)
+    (if session
+        (govc-session-clone session)
+      (call-interactively 'govc-session))
+    (setq govc-args (list (or moid "-") property))
+    (tabulated-list-print)))
+
+(defun govc-object-info ()
+  "Object browser via govc object.collect on `govc-selection'."
+  (interactive)
+  (if (equal major-mode 'govc-object-mode)
+      (progn
+        (setq govc-args (list (govc-object-prompt "moid: " govc-object-history)))
+        (tabulated-list-revert))
+    (govc-object (tabulated-list-get-id) nil (govc-current-session))))
+
+(defvar govc-object-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "J" 'govc-object-collect-selection-json)
+    (define-key map "N" 'govc-object-next)
+    (define-key map "O" 'govc-object-info)
+    (define-key map (kbd "DEL") 'govc-object-collect-parent)
+    (define-key map (kbd "RET") 'govc-object-collect-selection)
+    (define-key map "?" 'govc-object-popup)
+    map)
+  "Keymap for `govc-object-mode'.")
+
+(define-derived-mode govc-object-mode govc-tabulated-list-mode "Object"
+  "Major mode for handling a govc object."
+  (setq tabulated-list-format [("Name" 40 t)
+                               ("Type" 40 t)
+                               ("Value" 40 t)]
+        tabulated-list-padding 2
+        tabulated-list-entries #'govc-object-collect)
+  (tabulated-list-init-header))
+
+(magit-define-popup govc-object-popup
+  "Object popup."
+  :actions (govc-keymap-popup govc-object-mode-map))
+
+
+;;; govc host mode
+(defun govc-ls-host ()
+  "List hosts."
+  (govc "ls" "-t" "HostSystem" "host/*"))
+
+(defun govc-esxcli-netstat-info ()
+  "Wrapper for govc host.esxcli network ip connection list."
+  (govc-table-info "host.esxcli"
+                   (append govc-args '("-hints=false" "--" "network" "ip" "connection" "list"))))
+
+(defun govc-esxcli-netstat (host)
+  "Tabulated `govc-esxcli-netstat-info' HOST."
+  (interactive (list (govc-object-prompt "Host: " 'govc-ls-host)))
+  (let ((session (govc-current-session))
+        (buffer (get-buffer-create "*govc-esxcli*")))
+    (pop-to-buffer buffer)
+    (tabulated-list-mode)
+    (setq govc-args (list "-host" host))
+    (govc-session-clone session)
+    (setq tabulated-list-format [("CCAlgo" 10 t)
+                                 ("ForeignAddress" 20 t)
+                                 ("LocalAddress" 20 t)
+                                 ("Proto" 5 t)
+                                 ("RecvQ" 5 t)
+                                 ("SendQ" 5 t)
+                                 ("State" 15 t)
+                                 ("WorldID" 7 t)
+                                 ("WorldName" 10 t)]
+          tabulated-list-padding 2
+          tabulated-list-entries #'govc-esxcli-netstat-info)
+    (tabulated-list-init-header)
+    (tabulated-list-print)))
+
+(defun govc-host-esxcli-netstat ()
+  "Netstat via `govc-esxcli-netstat-info' with current host id."
+  (interactive)
+  (govc-esxcli-netstat (tabulated-list-get-id)))
+
+(defun govc-host-info ()
+  "Wrapper for govc host.info."
+  (govc-table-info "host.info" (or govc-filter "*")))
+
+(defun govc-host-json-info ()
+  "JSON via govc host.info -json on current selection."
+  (interactive)
+  (govc-json-info-selection "host.info"))
+
+(defvar govc-host-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "E" 'govc-events)
+    (define-key map "L" 'govc-logs)
+    (define-key map "J" 'govc-host-json-info)
+    (define-key map "N" 'govc-host-esxcli-netstat)
+    (define-key map "O" 'govc-object-info)
+    (define-key map "c" 'govc-mode-new-session)
+    (define-key map "p" 'govc-pool-with-session)
+    (define-key map "s" 'govc-datastore-with-session)
+    (define-key map "v" 'govc-vm-with-session)
+    (define-key map "?" 'govc-host-popup)
+    map)
+  "Keymap for `govc-host-mode'.")
+
+(defun govc-host (&optional filter session)
+  "Host info via govc.
+Optionally filter by FILTER and inherit SESSION."
+  (interactive)
+  (let ((buffer (get-buffer-create "*govc-host*")))
+    (pop-to-buffer buffer)
+    (govc-host-mode)
+    (if session
+        (govc-session-clone session)
+      (call-interactively 'govc-session))
+    (setq govc-filter filter)
+    (tabulated-list-print)))
+
+(define-derived-mode govc-host-mode govc-tabulated-list-mode "Host"
+  "Major mode for handling a list of govc hosts."
+  (setq tabulated-list-format [("Name" 30 t)
+                               ("Logical CPUs" 20 t)
+                               ("CPU usage" 25 t)
+                               ("Memory" 10 t)
+                               ("Memory usage" 25 t)
+                               ("Manufacturer" 13 t)
+                               ("Boot time" 15 t)]
+        tabulated-list-sort-key (cons "Name" nil)
+        tabulated-list-padding 2
+        tabulated-list-entries #'govc-host-info)
+  (tabulated-list-init-header))
+
+(magit-define-popup govc-host-popup
+  "Host popup."
+  :actions (govc-keymap-popup govc-host-mode-map))
+
+(easy-menu-define govc-host-mode-menu govc-host-mode-map
+  "Host menu."
+  (cons "Host" (govc-keymap-menu govc-host-mode-map)))
+
+
+;;; govc pool mode
+(defun govc-pool-destroy (name)
+  "Destroy pool with given NAME."
+  (interactive (list (completing-read "Destroy pool: " (govc "ls" "-t" "ResourcePool" "host/*"))))
+  (govc "pool.destroy" name))
+
+(defun govc-pool-destroy-selection ()
+  "Destroy via `govc-pool-destroy' on the pool selection."
+  (interactive)
+  (govc-do-selection 'govc-pool-destroy "Delete")
+  (tabulated-list-revert))
+
+(defun govc-pool-info ()
+  "Wrapper for govc pool.info."
+  (govc-table-info "pool.info" (list "-a" (or govc-filter (setq govc-filter "*")))))
+
+(defun govc-pool-json-info ()
+  "JSON via govc pool.info -json on current selection."
+  (interactive)
+  (govc-json-info-selection "pool.info"))
+
+(defvar govc-pool-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "E" 'govc-events)
+    (define-key map "J" 'govc-pool-json-info)
+    (define-key map "O" 'govc-object-info)
+    (define-key map "D" 'govc-pool-destroy-selection)
+    (define-key map "c" 'govc-mode-new-session)
+    (define-key map "h" 'govc-host-with-session)
+    (define-key map "s" 'govc-datastore-with-session)
+    (define-key map "v" 'govc-vm-with-session)
+    (define-key map "?" 'govc-pool-popup)
+    map)
+  "Keymap for `govc-pool-mode'.")
+
+(defun govc-pool (&optional filter session)
+  "Pool info via govc.
+Optionally filter by FILTER and inherit SESSION."
+  (interactive)
+  (let ((buffer (get-buffer-create "*govc-pool*")))
+    (pop-to-buffer buffer)
+    (govc-pool-mode)
+    (if session
+        (govc-session-clone session)
+      (call-interactively 'govc-session))
+    (setq govc-filter filter)
+    (tabulated-list-print)))
+
+(define-derived-mode govc-pool-mode govc-tabulated-list-mode "Pool"
+  "Major mode for handling a list of govc pools."
+  (setq tabulated-list-format [("Name" 30 t)
+                               ("CPU Usage" 25 t)
+                               ("CPU Shares" 25 t)
+                               ("CPU Reservation" 25 t)
+                               ("CPU Limit" 10 t)
+                               ("Mem Usage" 25 t)
+                               ("Mem Shares" 25 t)
+                               ("Mem Reservation" 25 t)
+                               ("Mem Limit" 10 t)]
+        tabulated-list-sort-key (cons "Name" nil)
+        tabulated-list-padding 2
+        tabulated-list-entries #'govc-pool-info)
+  (tabulated-list-init-header))
+
+(magit-define-popup govc-pool-popup
+  "Pool popup."
+  :actions (govc-keymap-popup govc-pool-mode-map))
+
+(easy-menu-define govc-host-mode-menu govc-pool-mode-map
+  "Pool menu."
+  (cons "Pool" (govc-keymap-menu govc-pool-mode-map)))
+
+
+;;; govc datastore mode
+(defun govc-ls-datastore ()
+  "List datastores."
+  (govc "ls" "datastore"))
+
+(defun govc-datastore-ls-entries ()
+  "Wrapper for govc datastore.ls."
+  (let* ((data (govc-json "datastore.ls" "-l" "-p" govc-filter))
+         (file (plist-get (elt data 0) :File)))
+    (-map (lambda (ent)
+            (let ((name (plist-get ent :Path))
+                  (size (plist-get ent :FileSize))
+                  (time (plist-get ent :Modification))
+                  (user (plist-get ent :Owner)))
+              (list (concat govc-filter name)
+                    (vector (file-size-human-readable size)
+                            (current-time-string (date-to-time time))
+                            name)))) file)))
+
+(defun govc-datastore-ls-parent ()
+  "Up to parent folder."
+  (interactive)
+  (if (s-blank? govc-filter)
+      (let ((session (govc-current-session)))
+        (govc-datastore-mode)
+        (govc-session-clone session))
+    (setq govc-filter (file-name-directory (directory-file-name govc-filter))))
+  (tabulated-list-revert))
+
+(defun govc-datastore-ls-child ()
+  "Open datastore folder or file."
+  (interactive)
+  (let ((id (tabulated-list-get-id)))
+    (if current-prefix-arg
+        (govc-shell-command (govc-format-command "datastore.ls" "-l" "-p" "-R" id))
+      (if (s-ends-with? "/" id)
+          (progn (setq govc-filter id)
+                 (tabulated-list-revert))
+        (govc-datastore-open)))))
+
+(defun govc-datastore-open ()
+  "Open datastore file."
+  (lexical-let* ((srcfile (tabulated-list-get-id))
+                 (srcpath (format "[%s] %s" (file-name-nondirectory govc-session-datastore) (s-chop-prefix "/" srcfile)))
+                 (suffix (file-name-extension srcfile t))
+                 (tmpfile (make-temp-file "govc-ds" nil suffix))
+                 (session (govc-current-session)))
+    (when (yes-or-no-p (concat "Open " srcpath "?"))
+      (govc "datastore.download" srcfile tmpfile)
+      (with-current-buffer (pop-to-buffer (find-file-noselect tmpfile))
+        (govc-session-clone session)
+        (add-hook 'kill-buffer-hook (lambda ()
+                                      (with-demoted-errors
+                                          (delete-file tmpfile))) t t)
+        (add-hook 'after-save-hook (lambda ()
+                                     (if (yes-or-no-p (concat "Upload changes to " srcpath "?"))
+                                         (with-demoted-errors
+                                             (govc "datastore.upload" tmpfile srcfile)))) t t)))))
+
+(defun govc-datastore-tail ()
+  "Tail datastore file."
+  (interactive)
+  (govc-shell-command
+   (govc-format-command "datastore.tail"
+                        (list "-n" govc-max-events (if current-prefix-arg "-f")) (govc-selection))))
+
+(defun govc-datastore-ls-json ()
+  "JSON via govc datastore.ls -json on current selection."
+  (interactive)
+  (let ((govc-args '("-l" "-p")))
+    (govc-json-info-selection "datastore.ls")))
+
+(defun govc-datastore-ls-r-json ()
+  "Search via govc datastore.ls -json -R on current selection."
+  (interactive)
+  (let ((govc-args '("-l" "-p" "-R")))
+    (govc-json-info-selection "datastore.ls")))
+
+(defun govc-datastore-mkdir (name)
+  "Mkdir via govc datastore.mkdir with given NAME."
+  (interactive (list (read-from-minibuffer "Create directory: " govc-filter)))
+  (govc "datastore.mkdir" name)
+  (tabulated-list-revert))
+
+(defun govc-datastore-rm (paths)
+  "Delete datastore PATHS."
+  (--each paths (govc "datastore.rm" (if current-prefix-arg "-f") it)))
+
+(defun govc-datastore-rm-selection ()
+  "Delete selected datastore paths."
+  (interactive)
+  (govc-do-selection 'govc-datastore-rm "Delete")
+  (tabulated-list-revert))
+
+(defvar govc-datastore-ls-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "J" 'govc-datastore-ls-json)
+    (define-key map "S" 'govc-datastore-ls-r-json)
+    (define-key map "D" 'govc-datastore-rm-selection)
+    (define-key map "T" 'govc-datastore-tail)
+    (define-key map "+" 'govc-datastore-mkdir)
+    (define-key map (kbd "DEL") 'govc-datastore-ls-parent)
+    (define-key map (kbd "RET") 'govc-datastore-ls-child)
+    (define-key map "?" 'govc-datastore-ls-popup)
+    map)
+  "Keymap for `govc-datastore-ls-mode'.")
+
+(defun govc-datastore-ls (&optional datastore session filter)
+  "List govc datastore.  Optionally specify DATASTORE, SESSION and FILTER."
+  (interactive)
+  (let ((buffer (get-buffer-create "*govc-datastore*")))
+    (pop-to-buffer buffer)
+    (govc-datastore-ls-mode)
+    (if session
+        (govc-session-clone session)
+      (call-interactively 'govc-session))
+    (setq govc-session-datastore (or datastore (govc-object-prompt "govc datastore: " 'govc-ls-datastore)))
+    (setq govc-filter filter)
+    (tabulated-list-print)))
+
+(define-derived-mode govc-datastore-ls-mode govc-tabulated-list-mode "Datastore"
+  "Major mode govc datastore.ls."
+  (setq tabulated-list-format [("Size" 10 t)
+                               ("Modification time" 25 t)
+                               ("Name" 40 t)]
+        tabulated-list-sort-key (cons "Name" nil)
+        tabulated-list-padding 2
+        tabulated-list-entries #'govc-datastore-ls-entries)
+  (tabulated-list-init-header))
+
+(magit-define-popup govc-datastore-ls-popup
+  "Datastore ls popup."
+  :actions (govc-keymap-popup govc-datastore-ls-mode-map))
+
+(easy-menu-define govc-datastore-ls-mode-menu govc-datastore-ls-mode-map
+  "Datastore ls menu."
+  (cons "Datastore" (govc-keymap-menu govc-datastore-ls-mode-map)))
+
+(defvar govc-datastore-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "J" 'govc-datastore-json-info)
+    (define-key map "O" 'govc-object-info)
+    (define-key map (kbd "RET") 'govc-datastore-ls-selection)
+    (define-key map "c" 'govc-mode-new-session)
+    (define-key map "h" 'govc-host-with-session)
+    (define-key map "p" 'govc-pool-with-session)
+    (define-key map "v" 'govc-vm-with-session)
+    (define-key map "?" 'govc-datastore-popup)
+    map)
+  "Keymap for `govc-datastore-mode'.")
+
+(defun govc-datastore-json-info ()
+  "JSON via govc datastore.info -json on current selection."
+  (interactive)
+  (govc-json-info-selection "datastore.info"))
+
+(defun govc-datastore-info ()
+  "Wrapper for govc datastore.info."
+  (govc-table-info "datastore.info" (or govc-filter "*")))
+
+(defun govc-datastore-ls-selection ()
+  "Browse datastore."
+  (interactive)
+  (govc-datastore-ls (tabulated-list-get-id) (govc-current-session)))
+
+(defun govc-datastore (&optional filter session)
+  "Datastore info via govc.
+Optionally filter by FILTER and inherit SESSION."
+  (interactive)
+  (let ((buffer (get-buffer-create "*govc-datastore*")))
+    (pop-to-buffer buffer)
+    (govc-datastore-mode)
+    (if session
+        (govc-session-clone session)
+      (call-interactively 'govc-session))
+    (setq govc-filter filter)
+    (tabulated-list-print)
+    (if (and govc-session-datastore (search-forward govc-session-datastore nil t))
+        (beginning-of-line))))
+
+(define-derived-mode govc-datastore-mode tabulated-list-mode "Datastore"
+  "Major mode for govc datastore.info."
+  (setq tabulated-list-format [("Name" 15 t)
+                               ("Type" 10 t)
+                               ("Capacity" 10 t)
+                               ("Free" 10 t)
+                               ("Remote" 30 t)]
+        tabulated-list-sort-key (cons "Name" nil)
+        tabulated-list-padding 2
+        tabulated-list-entries #'govc-datastore-info)
+  (tabulated-list-init-header))
+
+(magit-define-popup govc-datastore-popup
+  "Datastore popup."
+  :actions (govc-keymap-popup govc-datastore-mode-map))
+
+(easy-menu-define govc-datastore-mode-menu govc-datastore-mode-map
+  "Datastore menu."
+  (cons "Datastore" (govc-keymap-menu govc-datastore-mode-map)))
+
+
+;;; govc vm mode
+(defun govc-vm-prompt (prompt)
+  "PROMPT for a vm name."
+  (completing-read prompt (govc "ls" "vm")))
+
+(defun govc-vm-start (name)
+  "Start vm with given NAME."
+  (interactive (list (govc-vm-prompt "Start vm: ")))
+  (govc "vm.power" "-on" name))
+
+(defun govc-vm-shutdown (name)
+  "Shutdown vm with given NAME."
+  (interactive (list (govc-vm-prompt "Shutdown vm: ")))
+  (govc "vm.power" "-s" "-force" name))
+
+(defun govc-vm-reboot (name)
+  "Reboot vm with given NAME."
+  (interactive (list (govc-vm-prompt "Reboot vm: ")))
+  (govc "vm.power" "-r" "-force" name))
+
+(defun govc-vm-suspend (name)
+  "Suspend vm with given NAME."
+  (interactive (list (govc-vm-prompt "Suspend vm: ")))
+  (govc "vm.power" "-suspend" name))
+
+(defun govc-vm-destroy (name)
+  "Destroy vm with given NAME."
+  (interactive (list (govc-vm-prompt "Destroy vm: ")))
+  (govc "vm.destroy" name))
+
+(defun govc-vm-vnc-enable (name)
+  "Enable vnc on vm with given NAME."
+  (--map (last (split-string it))
+         (govc "vm.vnc" "-enable"
+               "-port" "-1"
+               "-password" (format "%08x" (random (expt 16 8))) name)))
+
+(defun govc-vm-vnc (name &optional arg)
+  "VNC for vm with given NAME.
+By default, enable and open VNC for the given vm NAME.
+With prefix \\[negative-argument] ARG, VNC will be disabled.
+With prefix \\[universal-argument] ARG, VNC will be enabled but not opened."
+  (interactive (list (govc-vm-prompt "VNC vm: ")
+                     current-prefix-arg))
+  (if (equal arg '-)
+      (govc "vm.vnc" "-disable" name)
+    (let ((urls (govc-vm-vnc-enable name)))
+      (unless arg
+        (-each (-flatten urls) 'browse-url)))))
+
+(defun govc-vm-screen (name &optional arg)
+  "Console screenshot of vm NAME console.
+Open via `eww' by default, via `browse-url' if ARG is non-nil."
+  (interactive (list (govc-vm-prompt "Console screenshot vm: ")
+                     current-prefix-arg))
+  (let* ((data (govc-json "vm.info" name))
+         (vms (plist-get data :VirtualMachines))
+         (url (govc-url-parse govc-session-url)))
+    (mapc
+     (lambda (vm)
+       (let* ((moid (plist-get (plist-get vm :Self) :Value))
+              (on (string= "poweredOn" (plist-get (plist-get vm :Runtime) :PowerState)))
+              (host (format "%s:%d" (url-host url) (or (url-port url) 443)))
+              (path (concat "/screen?id=" moid))
+              (auth (concat (url-user url) ":" (url-password url))))
+         (if current-prefix-arg
+             (browse-url (concat "https://" auth "@" host path))
+           (let ((creds `((,host ("VMware HTTP server" . ,(base64-encode-string auth)))))
+                 (url-basic-auth-storage 'creds)
+                 (u (concat "https://" host path)))
+             (require 'eww)
+             (if on
+                 (url-retrieve u 'eww-render (list u))
+               (kill-new (message u)))))))
+     vms)))
+
+(defun govc-vm-start-selection ()
+  "Start via `govc-vm-start' on the current selection."
+  (interactive)
+  (govc-vm-start (govc-selection))
+  (tabulated-list-revert))
+
+(defun govc-vm-shutdown-selection ()
+  "Shutdown via `govc-vm-shutdown' on the current selection."
+  (interactive)
+  (govc-vm-shutdown (govc-selection))
+  (tabulated-list-revert))
+
+(defun govc-vm-reboot-selection ()
+  "Reboot via `govc-vm-reboot' on the current selection."
+  (interactive)
+  (govc-vm-reboot (govc-selection))
+  (tabulated-list-revert))
+
+(defun govc-vm-suspend-selection ()
+  "Suspend via `govc-vm-suspend' on the current selection."
+  (interactive)
+  (govc-vm-suspend (govc-selection))
+  (tabulated-list-revert))
+
+(defun govc-vm-destroy-selection ()
+  "Destroy via `govc-vm-destroy' on the current selection."
+  (interactive)
+  (govc-do-selection 'govc-vm-destroy "Destroy")
+  (tabulated-list-revert))
+
+(defun govc-vm-vnc-selection ()
+  "VNC via `govc-vm-vnc' on the current selection."
+  (interactive)
+  (govc-vm-vnc (govc-selection) current-prefix-arg))
+
+(defun govc-vm-screen-selection ()
+  "Console screenshot via `govc-vm-screen' on the current selection."
+  (interactive)
+  (govc-vm-screen (govc-selection) current-prefix-arg))
+
+(defun govc-vm-info ()
+  "Wrapper for govc vm.info."
+  (govc-table-info "vm.info" (list "-r" (or govc-filter (setq govc-filter "*")))))
+
+(defun govc-vm-host ()
+  "Host info via `govc-host' with host(s) of current selection."
+  (interactive)
+  (govc-host (concat "*/" (govc-table-column-value "Host"))
+             (govc-current-session)))
+
+(defun govc-vm-datastore ()
+  "Datastore via `govc-datastore-ls' with datastore of current selection."
+  (interactive)
+  (if current-prefix-arg
+      (govc-datastore (s-split ", " (govc-table-column-value "Storage") t)
+                      (govc-current-session))
+    (let* ((data (govc-json "vm.info" (tabulated-list-get-id)))
+           (vm (elt (plist-get data :VirtualMachines) 0))
+           (dir (plist-get (plist-get (plist-get vm :Config) :Files) :LogDirectory))
+           (args (s-split "\\[\\|\\]" dir t)))
+      (govc-datastore-ls (first args) (govc-current-session) (concat (s-trim (second args)) "/")))))
+
+(defun govc-vm-ping ()
+  "Ping VM."
+  (interactive)
+  (let ((ping-program-options '("-c" "20")))
+    (ping (govc-table-column-value "IP address"))))
+
+(defun govc-vm-device-ls ()
+  "Devices via `govc-device' on the current selection."
+  (interactive)
+  (govc-device (tabulated-list-get-id)
+               (govc-current-session)))
+
+(defun govc-vm-extra-config ()
+  "Populate table with govc vm.info -e output."
+  (let* ((data (govc-json "vm.info" govc-args))
+         (vms (plist-get data :VirtualMachines))
+         (info))
+    (mapc
+     (lambda (vm)
+       (let* ((config (plist-get vm :Config))
+              (name (plist-get config :Name)))
+         (mapc (lambda (x)
+                 (let ((key (plist-get x :Key))
+                       (val (plist-get x :Value)))
+                   (push (list key (vector key val)) info)))
+               (plist-get config :ExtraConfig))
+         (if (> (length vms) 1)
+             (push (list name (vector "vm.name" name)) info))))
+     vms)
+    info))
+
+(defun govc-vm-extra-config-table ()
+  "ExtraConfig via `govc-vm-extra-config' on the current selection."
+  (interactive)
+  (govc-map-info-table #'govc-vm-extra-config))
+
+(defun govc-vm-json-info ()
+  "JSON via govc vm.info -json on current selection."
+  (interactive)
+  (govc-json-info-selection "vm.info"))
+
+(defvar govc-vm-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "E" 'govc-events)
+    (define-key map "J" 'govc-vm-json-info)
+    (define-key map "O" 'govc-object-info)
+    (define-key map "X" 'govc-vm-extra-config-table)
+    (define-key map (kbd "RET") 'govc-vm-device-ls)
+    (define-key map "C" 'govc-vm-screen-selection)
+    (define-key map "V" 'govc-vm-vnc-selection)
+    (define-key map "D" 'govc-vm-destroy-selection)
+    (define-key map "^" 'govc-vm-start-selection)
+    (define-key map "!" 'govc-vm-shutdown-selection)
+    (define-key map "@" 'govc-vm-reboot-selection)
+    (define-key map "&" 'govc-vm-suspend-selection)
+    (define-key map "H" 'govc-vm-host)
+    (define-key map "S" 'govc-vm-datastore)
+    (define-key map "P" 'govc-vm-ping)
+    (define-key map "c" 'govc-mode-new-session)
+    (define-key map "h" 'govc-host-with-session)
+    (define-key map "p" 'govc-pool-with-session)
+    (define-key map "s" 'govc-datastore-with-session)
+    (define-key map "?" 'govc-vm-popup)
+    map)
+  "Keymap for `govc-vm-mode'.")
+
+(defun govc-vm (&optional filter session)
+  "VM info via govc.
+Optionally filter by FILTER and inherit SESSION."
+  (interactive)
+  (let ((buffer (get-buffer-create "*govc-vm*")))
+    (pop-to-buffer buffer)
+    (govc-vm-mode)
+    (if session
+        (govc-session-clone session)
+      (call-interactively 'govc-session))
+    (setq govc-filter filter)
+    (tabulated-list-print)))
+
+(define-derived-mode govc-vm-mode govc-tabulated-list-mode "VM"
+  "Major mode for handling a list of govc vms."
+  (setq tabulated-list-format [("Name" 40 t)
+                               ("Power state" 12 t)
+                               ("Boot time" 13 t)
+                               ("IP address" 15 t)
+                               ("Guest name" 20 t)
+                               ("Host" 20 t)
+                               ("CPU usage" 15 t)
+                               ("Host memory usage" 18 t)
+                               ("Guest memory usage" 19 t)
+                               ("Storage committed" 18 t)
+                               ("Storage" 10 t)
+                               ("Network" 10 t)]
+        tabulated-list-sort-key (cons "Name" nil)
+        tabulated-list-padding 2
+        tabulated-list-entries #'govc-vm-info)
+  (tabulated-list-init-header))
+
+(magit-define-popup govc-vm-popup
+  "VM popup."
+  :actions (govc-keymap-popup govc-vm-mode-map))
+
+(easy-menu-define govc-vm-mode-menu govc-vm-mode-map
+  "VM menu."
+  (cons "VM" (govc-keymap-menu govc-vm-mode-map)))
+
+
+;;; govc device mode
+(defun govc-device-ls ()
+  "Wrapper for govc device.ls -vm VM."
+  (govc-type-list-entries "device.ls"))
+
+(defun govc-device-info ()
+  "Populate table with govc device.info output."
+  (govc-map-info "device.info" govc-args))
+
+(defun govc-device-info-table ()
+  "Tabulated govc device.info."
+  (interactive)
+  (govc-map-info-table #'govc-device-info))
+
+(defun govc-device-json-info ()
+  "JSON via govc device.info -json on current selection."
+  (interactive)
+  (govc-json-info-selection "device.info"))
+
+(defvar govc-device-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "J") 'govc-device-json-info)
+    (define-key map (kbd "RET") 'govc-device-info-table)
+    map)
+  "Keymap for `govc-device-mode'.")
+
+(defun govc-device (&optional vm session)
+  "List govc devices for VM.  Optionally inherit SESSION."
+  (interactive)
+  (let ((buffer (get-buffer-create "*govc-device*")))
+    (pop-to-buffer buffer)
+    (govc-device-mode)
+    (if session
+        (govc-session-clone session)
+      (call-interactively 'govc-session))
+    (setq govc-args (list "-vm" (or vm (govc-vm-prompt "vm: "))))
+    (tabulated-list-print)))
+
+(define-derived-mode govc-device-mode govc-tabulated-list-mode "Device"
+  "Major mode for handling a govc device."
+  (setq tabulated-list-format [("Name" 15 t)
+                               ("Type" 30 t)
+                               ("Summary" 40 t)]
+        tabulated-list-sort-key (cons "Name" nil)
+        tabulated-list-padding 2
+        tabulated-list-entries #'govc-device-ls)
+  (tabulated-list-init-header))
+
+(magit-define-popup govc-popup
+  "govc popup."
+  :actions (govc-keymap-list govc-command-map))
+
+(easy-menu-change
+ '("Tools") "govc"
+ (govc-keymap-menu govc-command-map)
+ "Search Files (Grep)...")
+
+(provide 'govc)
+
+;;; govc.el ends here
diff --git a/vendor/github.com/vmware/govmomi/govc/emacs/test/govc-test.el b/vendor/github.com/vmware/govmomi/govc/emacs/test/govc-test.el
new file mode 100644
index 0000000000..dd0fb3b844
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/emacs/test/govc-test.el
@@ -0,0 +1,138 @@
+(defconst testsuite-dir
+  (if load-file-name
+      (file-name-directory load-file-name)
+    ;; Fall back to default directory (in case of M-x eval-buffer)
+    default-directory)
+  "Directory of the test suite.")
+
+(defconst govc-test-helper-path
+  (concat (expand-file-name (concat testsuite-dir "/../../test/test_helper.bash"))))
+
+(load (expand-file-name "../govc" testsuite-dir) nil :no-message)
+
+(ert-deftest test-govc-url-parse ()
+  (dolist (u '("root:vagrant@localhost:18443"
+               "Administrator@vsphere.local:vagrant@localhost"
+               "https://root:vagrant@localhost:18443/sdk"
+               "https://Administrator@vsphere.local:vagrant@localhost/sdk"))
+    (should (equal u (url-recreate-url (govc-url-parse u))))))
+
+(ert-deftest test-govc-session-set-url ()
+  (should (equal govc-session-insecure nil))
+  (should (equal govc-session-datacenter nil))
+  (with-temp-buffer
+    (govc-session-set-url "vc.example.com?insecure=true&datacenter=foo&ignored=true")
+    (should (equal govc-session-insecure "true"))
+    (should (equal govc-session-datacenter "foo"))
+    (should (equal govc-session-datastore nil))))
+
+(ert-deftest test-govc-copy-environment ()
+  (let ((process-environment)
+        (govc-session-url "vc.example.com")
+        (govc-session-insecure "false")
+        (govc-session-datacenter "dc1")
+        (govc-session-datastore "ds1")
+        (govc-session-network "net1"))
+    (govc-export-environment '-)
+    (dolist (e govc-environment-map)
+      (should (equal nil (getenv (car e)))))
+    (govc-export-environment (universal-argument))
+    (dolist (e govc-environment-map)
+      (should (not (equal nil (getenv (car e))))))))
+
+(defun govc-test-env ()
+  (let ((url (getenv "GOVC_TEST_URL")))
+    (unless url
+      (ert-skip "env GOVC_TEST_URL not set"))
+    (setq govc-session-url url
+          govc-session-insecure "true")))
+
+(defun govc-test-helper (arg)
+  (shell-command-to-string (format "bash -c \"source %s; %s\"" govc-test-helper-path arg)))
+
+(defun govc-test-new-vm ()
+  (s-trim-right (govc-test-helper "new_empty_vm")))
+
+(defun govc-test-new-id ()
+  (s-trim-right (govc-test-helper "new_id")))
+
+(defun govc-test-teardown ()
+  (ignore-errors
+    (govc-test-helper "teardown")))
+
+(ert-deftest test-govc-vm-info ()
+  (govc-test-env)
+  (unwind-protect
+      (let ((id (govc-test-new-vm)))
+        (govc-json-info "vm.info" (list id))
+        (with-current-buffer "*govc-json*"
+          (goto-char (point-min))
+          (let ((data (json-read)))
+            (should (= (length data) 1))
+            (should (cdr (assq 'VirtualMachines data)))))
+
+        (govc-json-info "vm.info" (list "ENOENT"))
+        (with-current-buffer "*govc-json*"
+          (goto-char (point-min))
+          (let ((data (json-read)))
+            (should (= (length data) 1))
+            (should (not (cdr (assq 'VirtualMachines data))))))
+
+        (let ((govc-args (list id))
+              (len1)
+              (len2))
+          (setq len1 (length (govc-vm-extra-config)))
+          (should (>= len1 1))
+          (govc "vm.change" "-vm" id
+                "-e" "govc-test-one=1"
+                "-e" "govc-test-two:2.2=2"
+                ;; test that we don't choke on \n
+                "-e" "foo=bar
+baz")
+          (setq len2 (length (govc-vm-extra-config)))
+
+          (should (= (- len2 len1) 3)))
+
+        (let ((govc-filter "*"))
+          (should (>= (length (govc-vm-info)) 1)))
+
+        (let ((govc-filter "ENOENT"))
+          (should (= (length (govc-vm-info)) 0)))
+
+        (govc-vm-screen id))
+    (govc-test-teardown)))
+
+(ert-deftest test-govc-datastore-ls-entries ()
+  (govc-test-env)
+  (unwind-protect
+      (let ((id (govc-test-new-id)))
+        (should (>= (length (govc-datastore-ls-entries)) 1))
+
+        (let ((govc-filter (concat id "/")))
+          (should-error (govc-datastore-ls-entries))
+          (govc "datastore.mkdir" id)
+          (should (= (length (govc-datastore-ls-entries)) 0))
+          (dotimes (i 3)
+            (govc "datastore.mkdir" (format "%s/dir %d" id i)))
+          (let ((entries (govc-datastore-ls-entries)))
+            (should (= (length entries) 3))
+            (should (s-starts-with? (concat id "/dir ") (caar entries))))))
+    (govc-test-teardown)))
+
+(ert-deftest test-govc-pool-ls ()
+  (govc-test-env)
+  (unwind-protect
+      (let* ((pools (govc-ls-pool))
+             (num (length pools))
+             (path (concat (car pools) "/" (govc-test-new-id))))
+        (should (>= num 1))
+        (message "%d existing pools [%S]" num pools)
+        (govc "pool.create" path)
+        (setq pools (govc-ls-pool))
+        (govc-pool-destroy path)
+        (should (= (- (length pools) num) 1)))
+    (govc-test-teardown)))
+
+(ert-deftest test-govc-about ()
+  (govc-test-env)
+  (govc "about"))
diff --git a/vendor/github.com/vmware/govmomi/govc/emacs/test/make.el b/vendor/github.com/vmware/govmomi/govc/emacs/test/make.el
new file mode 100755
index 0000000000..a455b8b94e
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/emacs/test/make.el
@@ -0,0 +1,59 @@
+#!/usr/bin/env emacs --script
+
+(let ((current-directory (file-name-directory load-file-name)))
+  (setq project-test-path (expand-file-name "." current-directory))
+  (setq project-root-path (expand-file-name ".." current-directory)))
+
+(add-to-list 'load-path project-root-path)
+(add-to-list 'load-path project-test-path)
+
+(require 'lisp-mnt)
+(require 'govc)
+(require 's)
+
+(defun make-test ()
+  (dolist (test-file (or argv (directory-files project-test-path t "-test.el$")))
+    (load test-file nil t))
+  (ert-run-tests-batch-and-exit t))
+
+(defun govc-help ()
+  "Summary of govc modes in markdown format."
+  (interactive)
+  (with-help-window (help-buffer) ; TODO: this turned into a mess, but does the job of generating README.md from govc.el
+    (dolist (kind '(govc-mode govc-urls
+                    govc-session-url govc-session-insecure govc-session-datacenter govc-session-datastore govc-session-network
+                    tabulated-list host pool datastore datastore-ls vm device))
+      (let* ((name (if (boundp kind) (symbol-name kind) (format "govc-%s-mode" kind)))
+             (map (if (equal 'govc-mode kind) 'govc-command-map (intern (concat name "-map"))))
+             (doc (lambda (f &optional all)
+                    (let* ((txt (if (functionp f) (documentation f t) (documentation-property f 'variable-documentation)))
+                           (ix (if all (length txt) (s-index-of "." txt))))
+                      (s-replace (format "\n\n\\\{%s\}" (concat name "-map")) ""
+                                 (s-replace "'" "`" (substring txt 0 ix)))))))
+        (princ (concat (s-repeat (if (and (boundp kind) (not (fboundp kind))) 3 2) "#") " " name "\n"))
+        (princ (concat "\n" (funcall doc (intern name) t) "\n\n"))
+        (when (boundp map)
+          (princ (concat "### " (symbol-name map) "\n\n"))
+          (princ "Keybinding     | Description\n")
+          (princ "---------------|------------------------------------------------------------\n")
+          (dolist (kl (govc-keymap-list (symbol-value map)))
+            (let ((key (govc-key-description (car kl))))
+              (princ (format "<kbd>%s</kbd>%s| %s\n" key (s-repeat (- 4 (length key)) " ") (funcall doc (nth 2 kl))))))
+          (princ "\n"))))))
+
+(defun make-docs ()
+  (let ((commentary)
+        (summary))
+    (with-current-buffer (find-file-noselect (concat project-root-path "/govc.el"))
+      (setq commentary (s-replace ";;; Commentary:" "" (lm-commentary))
+            summary (lm-summary)))
+    (let ((readme (find-file-noselect (concat project-root-path "/README.md"))))
+      (with-current-buffer readme
+        (erase-buffer)
+        (govc-help)
+        (with-current-buffer (help-buffer)
+          (copy-to-buffer readme (point-min) (point-max)))
+        (goto-char (point-min))
+        (insert (concat "# govc.el\n\n" summary ".\n"))
+        (insert (s-replace "'" "`" (replace-regexp-in-string ";; ?" "" commentary t t)))
+        (save-buffer 0)))))
diff --git a/vendor/github.com/vmware/govmomi/govc/env/command.go b/vendor/github.com/vmware/govmomi/govc/env/command.go
new file mode 100644
index 0000000000..b48f5d1c4f
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/env/command.go
@@ -0,0 +1,103 @@
+/*
+Copyright (c) 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 env
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"strings"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type env struct {
+	*flags.OutputFlag
+	*flags.ClientFlag
+
+	extra bool
+}
+
+func init() {
+	cli.Register("env", &env{})
+}
+
+func (cmd *env) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.extra, "x", false, "Output variables for each GOVC_URL component")
+}
+
+func (cmd *env) Process(ctx context.Context) error {
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *env) Description() string {
+	return `Output the environment variables for this client.
+
+If credentials are included in the url, they are split into separate variables.
+Useful as bash scripting helper to parse GOVC_URL.`
+}
+
+func (cmd *env) Run(ctx context.Context, f *flag.FlagSet) error {
+	env := envResult(cmd.ClientFlag.Environ(cmd.extra))
+
+	if f.NArg() > 1 {
+		return flag.ErrHelp
+	}
+
+	// Option to just output the value, example use:
+	// password=$(govc env GOVC_PASSWORD)
+	if f.NArg() == 1 {
+		var output []string
+
+		prefix := fmt.Sprintf("%s=", f.Arg(0))
+
+		for _, e := range env {
+			if strings.HasPrefix(e, prefix) {
+				output = append(output, e[len(prefix):])
+				break
+			}
+		}
+
+		return cmd.WriteResult(envResult(output))
+	}
+
+	return cmd.WriteResult(env)
+}
+
+type envResult []string
+
+func (r envResult) Write(w io.Writer) error {
+	for _, e := range r {
+		fmt.Println(e)
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/events/command.go b/vendor/github.com/vmware/govmomi/govc/events/command.go
new file mode 100644
index 0000000000..35191739d0
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/events/command.go
@@ -0,0 +1,142 @@
+/*
+Copyright (c) 2015 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 events
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+	"strings"
+	"time"
+
+	"github.com/vmware/govmomi/event"
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type events struct {
+	*flags.DatacenterFlag
+
+	Max   int32
+	Tail  bool
+	Force bool
+}
+
+func init() {
+	// initialize with the maximum allowed objects set
+	cli.Register("events", &events{})
+}
+
+func (cmd *events) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+
+	cmd.Max = 25 // default
+	f.Var(flags.NewInt32(&cmd.Max), "n", "Output the last N events")
+	f.BoolVar(&cmd.Tail, "f", false, "Follow event stream")
+	f.BoolVar(&cmd.Force, "force", false, "Disable number objects to monitor limit")
+}
+
+func (cmd *events) Description() string {
+	return `Display events.
+
+Examples:
+  govc events vm/my-vm1 vm/my-vm2
+  govc events /dc1/vm/* /dc2/vm/*
+  govc ls -t HostSystem host/* | xargs govc events | grep -i vsan`
+}
+
+func (cmd *events) Usage() string {
+	return "[PATH]..."
+}
+
+func (cmd *events) Process(ctx context.Context) error {
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *events) printEvents(ctx context.Context, obj *types.ManagedObjectReference, page []types.BaseEvent, m *event.Manager) error {
+	event.Sort(page)
+	if obj != nil {
+		// print the object reference
+		fmt.Fprintf(os.Stdout, "\n==> %s <==\n", obj.String())
+	}
+	for _, e := range page {
+		cat, err := m.EventCategory(ctx, e)
+		if err != nil {
+			return err
+		}
+
+		event := e.GetEvent()
+		msg := strings.TrimSpace(event.FullFormattedMessage)
+
+		// if this is a TaskEvent gather a little more information
+		if t, ok := e.(*types.TaskEvent); ok {
+			// some tasks won't have this information, so just use the event message
+			if t.Info.Entity != nil {
+				msg = fmt.Sprintf("%s (target=%s %s)", msg, t.Info.Entity.Type, t.Info.EntityName)
+			}
+		}
+
+		fmt.Fprintf(os.Stdout, "[%s] [%s] %s\n",
+			event.CreatedTime.Local().Format(time.ANSIC),
+			cat,
+			msg)
+	}
+	return nil
+}
+
+func (cmd *events) Run(ctx context.Context, f *flag.FlagSet) error {
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	objs, err := cmd.ManagedObjects(ctx, f.Args())
+	if err != nil {
+		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
+			}
+			err = cmd.printEvents(ctx, o, ee, m)
+			if err != nil {
+				return err
+			}
+			return nil
+		})
+
+		if err != nil {
+			return err
+		}
+
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/examples/lib/ssh.sh b/vendor/github.com/vmware/govmomi/govc/examples/lib/ssh.sh
new file mode 100644
index 0000000000..60910e9fb3
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/examples/lib/ssh.sh
@@ -0,0 +1,44 @@
+function public-key {
+  local dir=${HOME}/.ssh
+
+  for f in $HOME/.ssh/{id_{rsa,dsa},*}.pub; do
+    if [ -r $f ]; then
+      echo $f
+      return
+    fi
+  done
+
+  echo "Can't find public key file..."
+  exit 1
+}
+
+PUBLIC_KEY_FILE=${PUBLIC_KEY_FILE-$(public-key)}
+SSH_OPTS="-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oLogLevel=quiet"
+
+function upload-public-key {
+  local vm_name=$1
+  local dir=$2
+
+  if [ -z "$dir" ]
+  then
+    uid=$(echo $GOVC_GUEST_LOGIN | awk -F: '{print $1}')
+    dir=$(govc guest.getenv -vm ${vm_name} HOME | awk -F= '{print $2}')
+
+    if [ -z "$dir" ]
+    then
+      echo "Can't find ${uid}'s HOME dir..."
+      exit 1
+    fi
+  fi
+
+  govc guest.mkdir \
+       -vm ${vm_name} \
+       -p \
+       ${dir}/.ssh
+
+  govc guest.upload \
+       -vm ${vm_name} \
+       -f \
+       ${PUBLIC_KEY_FILE} \
+       ${dir}/.ssh/authorized_keys
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/examples/vcsa.sh b/vendor/github.com/vmware/govmomi/govc/examples/vcsa.sh
new file mode 100755
index 0000000000..19e4d6b21e
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/examples/vcsa.sh
@@ -0,0 +1,57 @@
+#!/bin/bash -e
+
+lib=$(readlink -nf $(dirname $0))/lib
+. $lib/ssh.sh
+
+ova=$1
+
+if [ -z "$ova" ]
+then
+  ova=./VMware-vCenter-Server-Appliance-5.5.0.10300-2000350_OVF10.ova
+fi
+
+# default to local Vagrant esxbox for testing
+export GOVC_URL=${GOVC_URL-"https://root:vagrant@localhost:8443/sdk"}
+
+# default VCSA credentials
+export GOVC_GUEST_LOGIN=root:vmware
+
+# VM name as defined in the VCSA .ovf
+vm_name=VMware_vCenter_Server_Appliance
+
+echo "Importing $ova..."
+govc import.ova $ova
+
+echo "Powering on $vm_name..."
+govc vm.power -on $vm_name
+
+echo "Waiting for $vm_name's IP address..."
+vc=$(govc vm.ip $vm_name)
+
+govc vm.info $vm_name
+
+echo "Uploading ssh public key to $vm_name..."
+upload-public-key $vm_name
+
+echo "Configuring vCenter Server Appliance..."
+
+# http://www.virtuallyghetto.com/2012/02/automating-vcenter-server-appliance.html
+ssh ${SSH_OPTS} root@$vc <<EOF
+echo "Accepting EULA ..."
+/usr/sbin/vpxd_servicecfg eula accept
+
+echo "Configuring Embedded DB ..."
+/usr/sbin/vpxd_servicecfg db write embedded
+
+echo "Configuring SSO..."
+/usr/sbin/vpxd_servicecfg sso write embedded
+
+echo "Starting VCSA ..."
+/usr/sbin/vpxd_servicecfg service start
+EOF
+
+vc_url=https://${GOVC_GUEST_LOGIN}@${vc}/sdk
+
+echo "VCSA configured and ready..."
+
+govc about -u $vc_url
diff --git a/vendor/github.com/vmware/govmomi/govc/extension/info.go b/vendor/github.com/vmware/govmomi/govc/extension/info.go
new file mode 100644
index 0000000000..feff009942
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/extension/info.go
@@ -0,0 +1,120 @@
+/*
+Copyright (c) 2015 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 extension
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"os"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type info struct {
+	*flags.ClientFlag
+	*flags.OutputFlag
+}
+
+func init() {
+	cli.Register("extension.info", &info{})
+}
+
+func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+}
+
+func (cmd *info) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *info) Usage() string {
+	return "[KEY]..."
+}
+
+func (cmd *info) 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
+	}
+
+	list, err := m.List(ctx)
+	if err != nil {
+		return err
+	}
+
+	var res infoResult
+
+	if f.NArg() == 0 {
+		res.Extensions = list
+	} else {
+		exts := make(map[string]types.Extension)
+		for _, e := range list {
+			exts[e.Key] = e
+		}
+
+		for _, key := range f.Args() {
+			if e, ok := exts[key]; ok {
+				res.Extensions = append(res.Extensions, e)
+			} else {
+				return fmt.Errorf("extension %s not found", key)
+			}
+		}
+	}
+
+	return cmd.WriteResult(&res)
+}
+
+type infoResult struct {
+	Extensions []types.Extension
+}
+
+func (r *infoResult) Write(w io.Writer) error {
+	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
+
+	for _, e := range r.Extensions {
+		fmt.Fprintf(tw, "Name:\t%s\n", e.Key)
+		fmt.Fprintf(tw, "  Version:\t%s\n", e.Version)
+		fmt.Fprintf(tw, "  Description:\t%s\n", e.Description.GetDescription().Summary)
+		fmt.Fprintf(tw, "  Company:\t%s\n", e.Company)
+		fmt.Fprintf(tw, "  Last heartbeat time:\t%s\n", e.LastHeartbeatTime)
+		fmt.Fprintf(tw, "  Subject name:\t%s\n", e.SubjectName)
+		fmt.Fprintf(tw, "  Type:\t%s\n", e.Type)
+	}
+
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/extension/register.go b/vendor/github.com/vmware/govmomi/govc/extension/register.go
new file mode 100644
index 0000000000..10186c1ee4
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/extension/register.go
@@ -0,0 +1,81 @@
+/*
+Copyright (c) 2015 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 extension
+
+import (
+	"context"
+	"encoding/json"
+	"flag"
+	"os"
+	"time"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type register struct {
+	*flags.ClientFlag
+
+	update bool
+}
+
+func init() {
+	cli.Register("extension.register", &register{})
+}
+
+func (cmd *register) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.update, "update", false, "Update extension")
+}
+
+func (cmd *register) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *register) 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
+	}
+
+	var e types.Extension
+	e.Description = new(types.Description)
+
+	if err = json.NewDecoder(os.Stdin).Decode(&e); err != nil {
+		return err
+	}
+
+	e.LastHeartbeatTime = time.Now().UTC()
+
+	if cmd.update {
+		return m.Update(ctx, e)
+	}
+
+	return m.Register(ctx, e)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/extension/setcert.go b/vendor/github.com/vmware/govmomi/govc/extension/setcert.go
new file mode 100644
index 0000000000..6c58f09d87
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/extension/setcert.go
@@ -0,0 +1,172 @@
+/*
+Copyright (c) 2015 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 extension
+
+import (
+	"bytes"
+	"context"
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/x509"
+	"crypto/x509/pkix"
+	"encoding/pem"
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"math/big"
+	"os"
+	"time"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type setcert struct {
+	*flags.ClientFlag
+
+	cert string
+	org  string
+
+	encodedCert bytes.Buffer
+}
+
+func init() {
+	cli.Register("extension.setcert", &setcert{})
+}
+
+func (cmd *setcert) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.cert, "cert-pem", "-", "PEM encoded certificate")
+	f.StringVar(&cmd.org, "org", "VMware", "Organization for generated certificate")
+}
+
+func (cmd *setcert) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *setcert) Usage() string {
+	return "ID"
+}
+
+func (cmd *setcert) Description() string {
+	return `Set certificate for the extension ID.
+
+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`
+}
+
+func (cmd *setcert) create(id string) error {
+	certFile, err := os.Create(id + ".crt")
+	if err != nil {
+		return err
+	}
+	defer certFile.Close()
+
+	keyFile, err := os.Create(id + ".key")
+	if err != nil {
+		return err
+	}
+	defer keyFile.Close()
+
+	priv, err := rsa.GenerateKey(rand.Reader, 2048)
+	if err != nil {
+		return err
+	}
+
+	notBefore := time.Now()
+	notAfter := notBefore.Add(5 * 365 * 24 * time.Hour) // 5 years
+
+	serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)
+	serialNumber, err := rand.Int(rand.Reader, serialNumberLimit)
+	if err != nil {
+		return err
+	}
+
+	template := x509.Certificate{
+		SerialNumber: serialNumber,
+		Subject: pkix.Name{
+			Organization: []string{cmd.org},
+		},
+		NotBefore:             notBefore,
+		NotAfter:              notAfter,
+		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
+		BasicConstraintsValid: true,
+	}
+
+	derBytes, err := x509.CreateCertificate(rand.Reader, &template, &template, &priv.PublicKey, priv)
+	if err != nil {
+		return err
+	}
+
+	err = pem.Encode(&cmd.encodedCert, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes})
+	if err != nil {
+		return err
+	}
+
+	_, err = certFile.Write(cmd.encodedCert.Bytes())
+	if err != nil {
+		return err
+	}
+
+	err = pem.Encode(keyFile, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)})
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+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
+	}
+
+	key := f.Arg(0)
+
+	if cmd.cert == "-" {
+		b, err := ioutil.ReadAll(os.Stdin)
+		if err != nil {
+			return err
+		}
+		cmd.cert = string(b)
+	} else if cmd.cert == "+" {
+		if err := cmd.create(key); err != nil {
+			return fmt.Errorf("creating certificate: %s", err)
+		}
+		cmd.cert = cmd.encodedCert.String()
+	}
+
+	return m.SetCertificate(ctx, key, cmd.cert)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/extension/unregister.go b/vendor/github.com/vmware/govmomi/govc/extension/unregister.go
new file mode 100644
index 0000000000..f3b5692a92
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/extension/unregister.go
@@ -0,0 +1,66 @@
+/*
+Copyright (c) 2015 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 extension
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type unregister struct {
+	*flags.ClientFlag
+}
+
+func init() {
+	cli.Register("extension.unregister", &unregister{})
+}
+
+func (cmd *unregister) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+}
+
+func (cmd *unregister) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *unregister) 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
+	}
+
+	for _, key := range f.Args() {
+		if err = m.Unregister(ctx, key); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/fields/add.go b/vendor/github.com/vmware/govmomi/govc/fields/add.go
new file mode 100644
index 0000000000..053ba4f151
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/fields/add.go
@@ -0,0 +1,78 @@
+/*
+Copyright (c) 2015 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 fields
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type add struct {
+	*flags.ClientFlag
+}
+
+func init() {
+	cli.Register("fields.add", &add{})
+}
+
+func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+}
+
+func (cmd *add) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *add) Usage() string {
+	return "NAME"
+}
+
+func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 1 {
+		return flag.ErrHelp
+	}
+
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	m, err := object.GetCustomFieldsManager(c)
+	if err != nil {
+		return err
+	}
+
+	name := f.Arg(0)
+
+	def, err := m.Add(ctx, name, "", nil, nil)
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("%d\n", def.Key)
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/fields/ls.go b/vendor/github.com/vmware/govmomi/govc/fields/ls.go
new file mode 100644
index 0000000000..085c7684e9
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/fields/ls.go
@@ -0,0 +1,74 @@
+/*
+Copyright (c) 2015 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 fields
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type ls struct {
+	*flags.ClientFlag
+}
+
+func init() {
+	cli.Register("fields.ls", &ls{})
+}
+
+func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+}
+
+func (cmd *ls) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	m, err := object.GetCustomFieldsManager(c)
+	if err != nil {
+		return err
+	}
+
+	field, err := m.Field(ctx)
+	if err != nil {
+		return err
+	}
+
+	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
+
+	for _, def := range field {
+		fmt.Fprintf(tw, "%d\t%s\n", def.Key, def.Name)
+	}
+
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/fields/rename.go b/vendor/github.com/vmware/govmomi/govc/fields/rename.go
new file mode 100644
index 0000000000..c59a1628e9
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/fields/rename.go
@@ -0,0 +1,75 @@
+/*
+Copyright (c) 2015 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 fields
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type rename struct {
+	*flags.ClientFlag
+}
+
+func init() {
+	cli.Register("fields.rename", &rename{})
+}
+
+func (cmd *rename) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+}
+
+func (cmd *rename) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *rename) Usage() string {
+	return "KEY NAME"
+}
+
+func (cmd *rename) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 2 {
+		return flag.ErrHelp
+	}
+
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	m, err := object.GetCustomFieldsManager(c)
+	if err != nil {
+		return err
+	}
+
+	key, err := m.FindKey(ctx, f.Arg(0))
+	if err != nil {
+		return err
+	}
+
+	name := f.Arg(1)
+
+	return m.Rename(ctx, key, name)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/fields/rm.go b/vendor/github.com/vmware/govmomi/govc/fields/rm.go
new file mode 100644
index 0000000000..74da4a04ae
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/fields/rm.go
@@ -0,0 +1,75 @@
+/*
+Copyright (c) 2015 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 fields
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type rm struct {
+	*flags.ClientFlag
+}
+
+func init() {
+	cli.Register("fields.rm", &rm{})
+}
+
+func (cmd *rm) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+}
+
+func (cmd *rm) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *rm) Usage() string {
+	return "KEY..."
+}
+
+func (cmd *rm) Run(ctx context.Context, f *flag.FlagSet) error {
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	m, err := object.GetCustomFieldsManager(c)
+	if err != nil {
+		return err
+	}
+
+	for _, name := range f.Args() {
+		key, err := m.FindKey(ctx, name)
+		if err != nil {
+			return err
+		}
+
+		if err := m.Remove(ctx, key); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/fields/set.go b/vendor/github.com/vmware/govmomi/govc/fields/set.go
new file mode 100644
index 0000000000..33c9456f66
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/fields/set.go
@@ -0,0 +1,89 @@
+/*
+Copyright (c) 2015 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 fields
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type set struct {
+	*flags.DatacenterFlag
+}
+
+func init() {
+	cli.Register("fields.set", &set{})
+}
+
+func (cmd *set) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+}
+
+func (cmd *set) Process(ctx context.Context) error {
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *set) Usage() string {
+	return "KEY VALUE PATH..."
+}
+
+func (cmd *set) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() < 3 {
+		return flag.ErrHelp
+	}
+
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	m, err := object.GetCustomFieldsManager(c)
+	if err != nil {
+		return err
+	}
+
+	args := f.Args()
+
+	key, err := m.FindKey(ctx, args[0])
+	if err != nil {
+		return err
+	}
+
+	val := args[1]
+
+	objs, err := cmd.ManagedObjects(ctx, args[2:])
+	if err != nil {
+		return err
+	}
+
+	for _, ref := range objs {
+		err := m.Set(ctx, ref, key, val)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/client.go b/vendor/github.com/vmware/govmomi/govc/flags/client.go
new file mode 100644
index 0000000000..78de789ca4
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/client.go
@@ -0,0 +1,602 @@
+/*
+Copyright (c) 2014-2015 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 flags
+
+import (
+	"context"
+	"crypto/sha1"
+	"crypto/tls"
+	"encoding/json"
+	"errors"
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"net/url"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/vmware/govmomi/session"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+const (
+	envURL           = "GOVC_URL"
+	envUsername      = "GOVC_USERNAME"
+	envPassword      = "GOVC_PASSWORD"
+	envCertificate   = "GOVC_CERTIFICATE"
+	envPrivateKey    = "GOVC_PRIVATE_KEY"
+	envInsecure      = "GOVC_INSECURE"
+	envPersist       = "GOVC_PERSIST_SESSION"
+	envMinAPIVersion = "GOVC_MIN_API_VERSION"
+	envVimNamespace  = "GOVC_VIM_NAMESPACE"
+	envVimVersion    = "GOVC_VIM_VERSION"
+	envTLSCaCerts    = "GOVC_TLS_CA_CERTS"
+	envTLSKnownHosts = "GOVC_TLS_KNOWN_HOSTS"
+)
+
+const cDescr = "ESX or vCenter URL"
+
+type ClientFlag struct {
+	common
+
+	*DebugFlag
+
+	url           *url.URL
+	username      string
+	password      string
+	cert          string
+	key           string
+	insecure      bool
+	persist       bool
+	minAPIVersion string
+	vimNamespace  string
+	vimVersion    string
+	tlsCaCerts    string
+	tlsKnownHosts string
+	tlsHostHash   string
+
+	client *vim25.Client
+}
+
+var (
+	home          = os.Getenv("GOVMOMI_HOME")
+	clientFlagKey = flagKey("client")
+)
+
+func init() {
+	if home == "" {
+		home = filepath.Join(os.Getenv("HOME"), ".govmomi")
+	}
+}
+
+func NewClientFlag(ctx context.Context) (*ClientFlag, context.Context) {
+	if v := ctx.Value(clientFlagKey); v != nil {
+		return v.(*ClientFlag), ctx
+	}
+
+	v := &ClientFlag{}
+	v.DebugFlag, ctx = NewDebugFlag(ctx)
+	ctx = context.WithValue(ctx, clientFlagKey, v)
+	return v, ctx
+}
+
+func (flag *ClientFlag) URLWithoutPassword() *url.URL {
+	if flag.url == nil {
+		return nil
+	}
+
+	withoutCredentials := *flag.url
+	withoutCredentials.User = url.User(flag.url.User.Username())
+	return &withoutCredentials
+}
+
+func (flag *ClientFlag) IsSecure() bool {
+	return !flag.insecure
+}
+
+func (flag *ClientFlag) String() string {
+	url := flag.URLWithoutPassword()
+	if url == nil {
+		return ""
+	}
+
+	return url.String()
+}
+
+func (flag *ClientFlag) Set(s string) error {
+	var err error
+
+	flag.url, err = soap.ParseURL(s)
+
+	return err
+}
+
+func (flag *ClientFlag) Register(ctx context.Context, f *flag.FlagSet) {
+	flag.RegisterOnce(func() {
+		flag.DebugFlag.Register(ctx, f)
+
+		{
+			flag.Set(os.Getenv(envURL))
+			usage := fmt.Sprintf("%s [%s]", cDescr, envURL)
+			f.Var(flag, "u", usage)
+		}
+
+		{
+			flag.username = os.Getenv(envUsername)
+			flag.password = os.Getenv(envPassword)
+		}
+
+		{
+			value := os.Getenv(envCertificate)
+			usage := fmt.Sprintf("Certificate [%s]", envCertificate)
+			f.StringVar(&flag.cert, "cert", value, usage)
+		}
+
+		{
+			value := os.Getenv(envPrivateKey)
+			usage := fmt.Sprintf("Private key [%s]", envPrivateKey)
+			f.StringVar(&flag.key, "key", value, usage)
+		}
+
+		{
+			insecure := false
+			switch env := strings.ToLower(os.Getenv(envInsecure)); env {
+			case "1", "true":
+				insecure = true
+			}
+
+			usage := fmt.Sprintf("Skip verification of server certificate [%s]", envInsecure)
+			f.BoolVar(&flag.insecure, "k", insecure, usage)
+		}
+
+		{
+			persist := true
+			switch env := strings.ToLower(os.Getenv(envPersist)); env {
+			case "0", "false":
+				persist = false
+			}
+
+			usage := fmt.Sprintf("Persist session to disk [%s]", envPersist)
+			f.BoolVar(&flag.persist, "persist-session", persist, usage)
+		}
+
+		{
+			env := os.Getenv(envMinAPIVersion)
+			if env == "" {
+				env = soap.DefaultMinVimVersion
+			}
+
+			flag.minAPIVersion = env
+		}
+
+		{
+			value := os.Getenv(envVimNamespace)
+			if value == "" {
+				value = soap.DefaultVimNamespace
+			}
+			usage := fmt.Sprintf("Vim namespace [%s]", envVimNamespace)
+			f.StringVar(&flag.vimNamespace, "vim-namespace", value, usage)
+		}
+
+		{
+			value := os.Getenv(envVimVersion)
+			if value == "" {
+				value = soap.DefaultVimVersion
+			}
+			usage := fmt.Sprintf("Vim version [%s]", envVimVersion)
+			f.StringVar(&flag.vimVersion, "vim-version", value, usage)
+		}
+
+		{
+			value := os.Getenv(envTLSCaCerts)
+			usage := fmt.Sprintf("TLS CA certificates file [%s]", envTLSCaCerts)
+			f.StringVar(&flag.tlsCaCerts, "tls-ca-certs", value, usage)
+		}
+
+		{
+			value := os.Getenv(envTLSKnownHosts)
+			usage := fmt.Sprintf("TLS known hosts file [%s]", envTLSKnownHosts)
+			f.StringVar(&flag.tlsKnownHosts, "tls-known-hosts", value, usage)
+		}
+	})
+}
+
+func (flag *ClientFlag) Process(ctx context.Context) error {
+	return flag.ProcessOnce(func() error {
+		if err := flag.DebugFlag.Process(ctx); err != nil {
+			return err
+		}
+
+		if flag.url == nil {
+			return errors.New("specify an " + cDescr)
+		}
+
+		// Override username if set
+		if flag.username != "" {
+			var password string
+			var ok bool
+
+			if flag.url.User != nil {
+				password, ok = flag.url.User.Password()
+			}
+
+			if ok {
+				flag.url.User = url.UserPassword(flag.username, password)
+			} else {
+				flag.url.User = url.User(flag.username)
+			}
+		}
+
+		// Override password if set
+		if flag.password != "" {
+			var username string
+
+			if flag.url.User != nil {
+				username = flag.url.User.Username()
+			}
+
+			flag.url.User = url.UserPassword(username, flag.password)
+		}
+
+		return nil
+	})
+}
+
+// configure TLS and retry settings before making any connections
+func (flag *ClientFlag) configure(sc *soap.Client) (soap.RoundTripper, error) {
+	// Set namespace and version
+	sc.Namespace = flag.vimNamespace
+	sc.Version = flag.vimVersion
+
+	sc.UserAgent = fmt.Sprintf("govc/%s", Version)
+
+	if err := flag.SetRootCAs(sc); err != nil {
+		return nil, err
+	}
+
+	if err := sc.LoadThumbprints(flag.tlsKnownHosts); err != nil {
+		return nil, err
+	}
+
+	// Retry twice when a temporary I/O error occurs.
+	// This means a maximum of 3 attempts.
+	return vim25.Retry(sc, vim25.TemporaryNetworkError(3)), nil
+}
+
+func (flag *ClientFlag) sessionFile() string {
+	url := flag.URLWithoutPassword()
+
+	// Key session file off of full URI and insecure setting.
+	// Hash key to get a predictable, canonical format.
+	key := fmt.Sprintf("%s#insecure=%t", url.String(), flag.insecure)
+	name := fmt.Sprintf("%040x", sha1.Sum([]byte(key)))
+	return filepath.Join(home, "sessions", name)
+}
+
+func (flag *ClientFlag) saveClient(c *vim25.Client) error {
+	if !flag.persist {
+		return nil
+	}
+
+	p := flag.sessionFile()
+	err := os.MkdirAll(filepath.Dir(p), 0700)
+	if err != nil {
+		return err
+	}
+
+	f, err := os.OpenFile(p, os.O_CREATE|os.O_WRONLY, 0600)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	err = json.NewEncoder(f).Encode(c)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (flag *ClientFlag) restoreClient(c *vim25.Client) (bool, error) {
+	if !flag.persist {
+		return false, nil
+	}
+
+	f, err := os.Open(flag.sessionFile())
+	if err != nil {
+		if os.IsNotExist(err) {
+			return false, nil
+		}
+
+		return false, err
+	}
+
+	defer f.Close()
+
+	dec := json.NewDecoder(f)
+	err = dec.Decode(c)
+	if err != nil {
+		return false, err
+	}
+
+	return true, nil
+}
+
+func (flag *ClientFlag) loadClient() (*vim25.Client, error) {
+	c := new(vim25.Client)
+	ok, err := flag.restoreClient(c)
+	if err != nil {
+		return nil, err
+	}
+
+	if !ok || !c.Valid() {
+		return nil, nil
+	}
+
+	c.RoundTripper, err = flag.configure(c.Client)
+	if err != nil {
+		return nil, err
+	}
+
+	m := session.NewManager(c)
+	u, err := m.UserSession(context.TODO())
+	if err != nil {
+		if soap.IsSoapFault(err) {
+			fault := soap.ToSoapFault(err).VimFault()
+			// If the PropertyCollector is not found, the saved session for this URL is not valid
+			if _, ok := fault.(types.ManagedObjectNotFound); ok {
+				return nil, nil
+			}
+		}
+
+		return nil, err
+	}
+
+	// If the session is nil, the client is not authenticated
+	if u == nil {
+		return nil, nil
+	}
+
+	return c, nil
+}
+
+func (flag *ClientFlag) SetRootCAs(c *soap.Client) error {
+	if flag.tlsCaCerts != "" {
+		return c.SetRootCAs(flag.tlsCaCerts)
+	}
+	return nil
+}
+
+func (flag *ClientFlag) newClient() (*vim25.Client, error) {
+	ctx := context.TODO()
+	sc := soap.NewClient(flag.url, flag.insecure)
+	isTunnel := false
+
+	if flag.cert != "" {
+		isTunnel = true
+		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
+	}
+
+	c, err := vim25.NewClient(ctx, rt)
+	if err != nil {
+		return nil, err
+	}
+
+	// Set client, since we didn't pass it in the constructor
+	c.Client = sc
+
+	m := session.NewManager(c)
+	u := flag.url.User
+
+	if u.Username() == "" {
+		// Assume we are running on an ESX or Workstation host if no username is provided
+		u, err = flag.localTicket(ctx, m)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if isTunnel {
+		err = m.LoginExtensionByCertificate(ctx, u.Username(), "")
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		err = m.Login(ctx, u)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	err = flag.saveClient(c)
+	if err != nil {
+		return nil, err
+	}
+
+	return c, nil
+}
+
+func (flag *ClientFlag) localTicket(ctx context.Context, m *session.Manager) (*url.Userinfo, error) {
+	ticket, err := m.AcquireLocalTicket(ctx, os.Getenv("USER"))
+	if err != nil {
+		return nil, err
+	}
+
+	password, err := ioutil.ReadFile(ticket.PasswordFilePath)
+	if err != nil {
+		return nil, err
+	}
+
+	return url.UserPassword(ticket.UserName, string(password)), nil
+}
+
+// apiVersionValid returns whether or not the API version supported by the
+// server the client is connected to is not recent enough.
+func apiVersionValid(c *vim25.Client, minVersionString string) error {
+	if minVersionString == "-" {
+		// Disable version check
+		return nil
+	}
+
+	apiVersion := c.ServiceContent.About.ApiVersion
+	if strings.HasSuffix(apiVersion, ".x") {
+		// Skip version check for development builds
+		return nil
+	}
+
+	realVersion, err := ParseVersion(apiVersion)
+	if err != nil {
+		return err
+	}
+
+	minVersion, err := ParseVersion(minVersionString)
+	if err != nil {
+		return err
+	}
+
+	if !minVersion.Lte(realVersion) {
+		err = fmt.Errorf("Require API version %s, connected to API version %s (set %s to override)",
+			minVersionString,
+			c.ServiceContent.About.ApiVersion,
+			envMinAPIVersion)
+		return err
+	}
+
+	return nil
+}
+
+func (flag *ClientFlag) Client() (*vim25.Client, error) {
+	if flag.client != nil {
+		return flag.client, nil
+	}
+
+	c, err := flag.loadClient()
+	if err != nil {
+		return nil, err
+	}
+
+	// loadClient returns nil if it was unable to load a session from disk
+	if c == nil {
+		c, err = flag.newClient()
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	// Check that the endpoint has the right API version
+	err = apiVersionValid(c, flag.minAPIVersion)
+	if err != nil {
+		return nil, err
+	}
+
+	flag.client = c
+	return flag.client, nil
+}
+
+func (flag *ClientFlag) Logout(ctx context.Context) error {
+	if flag.persist || flag.client == nil {
+		return nil
+	}
+
+	m := session.NewManager(flag.client)
+
+	return m.Logout(ctx)
+}
+
+// Environ returns the govc environment variables for this connection
+func (flag *ClientFlag) Environ(extra bool) []string {
+	var env []string
+	add := func(k, v string) {
+		env = append(env, fmt.Sprintf("%s=%s", k, v))
+	}
+
+	u := *flag.url
+	if u.User != nil {
+		add(envUsername, u.User.Username())
+
+		if p, ok := u.User.Password(); ok {
+			add(envPassword, p)
+		}
+
+		u.User = nil
+	}
+
+	if u.Path == "/sdk" {
+		u.Path = ""
+	}
+	u.Fragment = ""
+	u.RawQuery = ""
+
+	val := u.String()
+	prefix := "https://"
+	if strings.HasPrefix(val, prefix) {
+		val = val[len(prefix):]
+	}
+	add(envURL, val)
+
+	keys := []string{
+		envCertificate,
+		envPrivateKey,
+		envInsecure,
+		envPersist,
+		envMinAPIVersion,
+		envVimNamespace,
+		envVimVersion,
+	}
+
+	for _, k := range keys {
+		if v := os.Getenv(k); v != "" {
+			add(k, v)
+		}
+	}
+
+	if extra {
+		add("GOVC_URL_SCHEME", flag.url.Scheme)
+
+		v := strings.SplitN(u.Host, ":", 2)
+		add("GOVC_URL_HOST", v[0])
+		if len(v) == 2 {
+			add("GOVC_URL_PORT", v[1])
+		}
+
+		add("GOVC_URL_PATH", flag.url.Path)
+
+		if f := flag.url.Fragment; f != "" {
+			add("GOVC_URL_FRAGMENT", f)
+		}
+
+		if q := flag.url.RawQuery; q != "" {
+			add("GOVC_URL_QUERY", q)
+		}
+	}
+
+	return env
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/common.go b/vendor/github.com/vmware/govmomi/govc/flags/common.go
new file mode 100644
index 0000000000..2b133b885e
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/common.go
@@ -0,0 +1,38 @@
+/*
+Copyright (c) 2015-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 flags
+
+import "sync"
+
+// Key type for storing flag instances in a context.Context.
+type flagKey string
+
+// Type to help flags out with only registering/processing once.
+type common struct {
+	register sync.Once
+	process  sync.Once
+}
+
+func (c *common) RegisterOnce(fn func()) {
+	c.register.Do(fn)
+}
+
+func (c *common) ProcessOnce(fn func() error) (err error) {
+	c.process.Do(func() {
+		err = fn()
+	})
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/datacenter.go b/vendor/github.com/vmware/govmomi/govc/flags/datacenter.go
new file mode 100644
index 0000000000..a776ed6e90
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/datacenter.go
@@ -0,0 +1,163 @@
+/*
+Copyright (c) 2014-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 flags
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+
+	"github.com/vmware/govmomi/find"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type DatacenterFlag struct {
+	common
+
+	*ClientFlag
+	*OutputFlag
+
+	path   string
+	dc     *object.Datacenter
+	finder *find.Finder
+	err    error
+}
+
+var datacenterFlagKey = flagKey("datacenter")
+
+func NewDatacenterFlag(ctx context.Context) (*DatacenterFlag, context.Context) {
+	if v := ctx.Value(datacenterFlagKey); v != nil {
+		return v.(*DatacenterFlag), ctx
+	}
+
+	v := &DatacenterFlag{}
+	v.ClientFlag, ctx = NewClientFlag(ctx)
+	v.OutputFlag, ctx = NewOutputFlag(ctx)
+	ctx = context.WithValue(ctx, datacenterFlagKey, v)
+	return v, ctx
+}
+
+func (flag *DatacenterFlag) Register(ctx context.Context, f *flag.FlagSet) {
+	flag.RegisterOnce(func() {
+		flag.ClientFlag.Register(ctx, f)
+		flag.OutputFlag.Register(ctx, f)
+
+		env := "GOVC_DATACENTER"
+		value := os.Getenv(env)
+		usage := fmt.Sprintf("Datacenter [%s]", env)
+		f.StringVar(&flag.path, "dc", value, usage)
+	})
+}
+
+func (flag *DatacenterFlag) Process(ctx context.Context) error {
+	return flag.ProcessOnce(func() error {
+		if err := flag.ClientFlag.Process(ctx); err != nil {
+			return err
+		}
+		if err := flag.OutputFlag.Process(ctx); err != nil {
+			return err
+		}
+		return nil
+	})
+}
+
+func (flag *DatacenterFlag) Finder() (*find.Finder, error) {
+	if flag.finder != nil {
+		return flag.finder, nil
+	}
+
+	c, err := flag.Client()
+	if err != nil {
+		return nil, err
+	}
+
+	finder := find.NewFinder(c, flag.JSON || flag.Dump)
+
+	// Datacenter is not required (ls command for example).
+	// Set for relative func if dc flag is given or
+	// if there is a single (default) Datacenter
+	ctx := context.TODO()
+	if flag.path == "" {
+		flag.dc, flag.err = finder.DefaultDatacenter(ctx)
+	} else {
+		if flag.dc, err = finder.Datacenter(ctx, flag.path); err != nil {
+			return nil, err
+		}
+	}
+
+	finder.SetDatacenter(flag.dc)
+
+	flag.finder = finder
+
+	return flag.finder, nil
+}
+
+func (flag *DatacenterFlag) Datacenter() (*object.Datacenter, error) {
+	if flag.dc != nil {
+		return flag.dc, nil
+	}
+
+	_, err := flag.Finder()
+	if err != nil {
+		return nil, err
+	}
+
+	if flag.err != nil {
+		// Should only happen if no dc is specified and len(dcs) > 1
+		return nil, flag.err
+	}
+
+	return flag.dc, err
+}
+
+func (flag *DatacenterFlag) ManagedObjects(ctx context.Context, args []string) ([]types.ManagedObjectReference, error) {
+	var refs []types.ManagedObjectReference
+
+	c, err := flag.Client()
+	if err != nil {
+		return nil, err
+	}
+
+	if len(args) == 0 {
+		refs = append(refs, c.ServiceContent.RootFolder)
+		return refs, nil
+	}
+
+	finder, err := flag.Finder()
+	if err != nil {
+		return nil, err
+	}
+
+	for _, arg := range args {
+		elements, err := finder.ManagedObjectList(ctx, arg)
+		if err != nil {
+			return nil, err
+		}
+
+		if len(elements) == 0 {
+			return nil, fmt.Errorf("object '%s' not found", arg)
+		}
+
+		for _, e := range elements {
+			refs = append(refs, e.Object.Reference())
+		}
+	}
+
+	return refs, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/datastore.go b/vendor/github.com/vmware/govmomi/govc/flags/datastore.go
new file mode 100644
index 0000000000..90e691c8d8
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/datastore.go
@@ -0,0 +1,120 @@
+/*
+Copyright (c) 2014-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 flags
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type DatastoreFlag struct {
+	common
+
+	*DatacenterFlag
+
+	Name string
+
+	ds *object.Datastore
+}
+
+var datastoreFlagKey = flagKey("datastore")
+
+// NewCustomDatastoreFlag creates and returns a new DatastoreFlag without
+// trying to retrieve an existing one from the specified context.
+func NewCustomDatastoreFlag(ctx context.Context) (*DatastoreFlag, context.Context) {
+	v := &DatastoreFlag{}
+	v.DatacenterFlag, ctx = NewDatacenterFlag(ctx)
+	return v, ctx
+}
+
+func NewDatastoreFlag(ctx context.Context) (*DatastoreFlag, context.Context) {
+	if v := ctx.Value(datastoreFlagKey); v != nil {
+		return v.(*DatastoreFlag), ctx
+	}
+
+	v, ctx := NewCustomDatastoreFlag(ctx)
+	ctx = context.WithValue(ctx, datastoreFlagKey, v)
+	return v, ctx
+}
+
+func (f *DatastoreFlag) Register(ctx context.Context, fs *flag.FlagSet) {
+	f.RegisterOnce(func() {
+		f.DatacenterFlag.Register(ctx, fs)
+
+		env := "GOVC_DATASTORE"
+		value := os.Getenv(env)
+		usage := fmt.Sprintf("Datastore [%s]", env)
+		fs.StringVar(&f.Name, "ds", value, usage)
+	})
+}
+
+func (f *DatastoreFlag) Process(ctx context.Context) error {
+	return f.ProcessOnce(func() error {
+		if err := f.DatacenterFlag.Process(ctx); err != nil {
+			return err
+		}
+		return nil
+	})
+}
+
+func (f *DatastoreFlag) Datastore() (*object.Datastore, error) {
+	if f.ds != nil {
+		return f.ds, nil
+	}
+
+	finder, err := f.Finder()
+	if err != nil {
+		return nil, err
+	}
+
+	if f.ds, err = finder.DatastoreOrDefault(context.TODO(), f.Name); err != nil {
+		return nil, err
+	}
+
+	return f.ds, nil
+}
+
+func (flag *DatastoreFlag) DatastoreIfSpecified() (*object.Datastore, error) {
+	if flag.Name == "" {
+		return nil, nil
+	}
+	return flag.Datastore()
+}
+
+func (f *DatastoreFlag) DatastorePath(name string) (string, error) {
+	ds, err := f.Datastore()
+	if err != nil {
+		return "", err
+	}
+
+	return ds.Path(name), nil
+}
+
+func (f *DatastoreFlag) Stat(ctx context.Context, file string) (types.BaseFileInfo, error) {
+	ds, err := f.Datastore()
+	if err != nil {
+		return nil, err
+	}
+
+	return ds.Stat(ctx, file)
+
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/debug.go b/vendor/github.com/vmware/govmomi/govc/flags/debug.go
new file mode 100644
index 0000000000..16a5413c52
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/debug.go
@@ -0,0 +1,99 @@
+/*
+Copyright (c) 2014-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 flags
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/vmware/govmomi/vim25/debug"
+)
+
+type DebugFlag struct {
+	common
+
+	enable bool
+}
+
+var debugFlagKey = flagKey("debug")
+
+func NewDebugFlag(ctx context.Context) (*DebugFlag, context.Context) {
+	if v := ctx.Value(debugFlagKey); v != nil {
+		return v.(*DebugFlag), ctx
+	}
+
+	v := &DebugFlag{}
+	ctx = context.WithValue(ctx, debugFlagKey, v)
+	return v, ctx
+}
+
+func (flag *DebugFlag) Register(ctx context.Context, f *flag.FlagSet) {
+	flag.RegisterOnce(func() {
+		env := "GOVC_DEBUG"
+		enable := false
+		switch env := strings.ToLower(os.Getenv(env)); env {
+		case "1", "true":
+			enable = true
+		}
+
+		usage := fmt.Sprintf("Store debug logs [%s]", env)
+		f.BoolVar(&flag.enable, "debug", enable, usage)
+	})
+}
+
+func (flag *DebugFlag) Process(ctx context.Context) error {
+	if !flag.enable {
+		return nil
+	}
+
+	return flag.ProcessOnce(func() error {
+		// Base path for storing debug logs.
+		r := os.Getenv("GOVC_DEBUG_PATH")
+		if r == "" {
+			r = home
+		}
+		r = filepath.Join(r, "debug")
+
+		// Path for this particular run.
+		run := os.Getenv("GOVC_DEBUG_PATH_RUN")
+		if run == "" {
+			now := time.Now().Format("2006-01-02T15-04-05.999999999")
+			r = filepath.Join(r, now)
+		} else {
+			// reuse the same path
+			r = filepath.Join(r, run)
+			_ = os.RemoveAll(r)
+		}
+
+		err := os.MkdirAll(r, 0700)
+		if err != nil {
+			return err
+		}
+
+		p := debug.FileProvider{
+			Path: r,
+		}
+
+		debug.SetProvider(&p)
+		return nil
+	})
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/empty.go b/vendor/github.com/vmware/govmomi/govc/flags/empty.go
new file mode 100644
index 0000000000..8b17241ba1
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/empty.go
@@ -0,0 +1,31 @@
+/*
+Copyright (c) 2014-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 flags
+
+import (
+	"context"
+	"flag"
+)
+
+type EmptyFlag struct{}
+
+func (flag *EmptyFlag) Register(ctx context.Context, f *flag.FlagSet) {
+}
+
+func (flag *EmptyFlag) Process(ctx context.Context) error {
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/folder.go b/vendor/github.com/vmware/govmomi/govc/flags/folder.go
new file mode 100644
index 0000000000..2617ae7627
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/folder.go
@@ -0,0 +1,131 @@
+/*
+Copyright (c) 2014-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 flags
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+
+	"github.com/vmware/govmomi/object"
+)
+
+type FolderFlag struct {
+	common
+
+	*DatacenterFlag
+
+	name   string
+	folder *object.Folder
+}
+
+var folderFlagKey = flagKey("folder")
+
+func NewFolderFlag(ctx context.Context) (*FolderFlag, context.Context) {
+	if v := ctx.Value(folderFlagKey); v != nil {
+		return v.(*FolderFlag), ctx
+	}
+
+	v := &FolderFlag{}
+	v.DatacenterFlag, ctx = NewDatacenterFlag(ctx)
+	ctx = context.WithValue(ctx, folderFlagKey, v)
+	return v, ctx
+}
+
+func (flag *FolderFlag) Register(ctx context.Context, f *flag.FlagSet) {
+	flag.RegisterOnce(func() {
+		flag.DatacenterFlag.Register(ctx, f)
+
+		env := "GOVC_FOLDER"
+		value := os.Getenv(env)
+		usage := fmt.Sprintf("Inventory folder [%s]", env)
+		f.StringVar(&flag.name, "folder", value, usage)
+	})
+}
+
+func (flag *FolderFlag) Process(ctx context.Context) error {
+	return flag.ProcessOnce(func() error {
+		if err := flag.DatacenterFlag.Process(ctx); err != nil {
+			return err
+		}
+		return nil
+	})
+}
+
+func (flag *FolderFlag) Folder() (*object.Folder, error) {
+	if flag.folder != nil {
+		return flag.folder, nil
+	}
+
+	finder, err := flag.Finder()
+	if err != nil {
+		return nil, err
+	}
+
+	if flag.folder, err = finder.FolderOrDefault(context.TODO(), flag.name); err != nil {
+		return nil, err
+	}
+
+	return flag.folder, nil
+}
+
+func (flag *FolderFlag) FolderOrDefault(kind string) (*object.Folder, error) {
+	if flag.folder != nil {
+		return flag.folder, nil
+	}
+
+	if flag.name != "" {
+		return flag.Folder()
+	}
+
+	// RootFolder, no dc required
+	if kind == "/" {
+		client, err := flag.Client()
+		if err != nil {
+			return nil, err
+		}
+
+		flag.folder = object.NewRootFolder(client)
+		return flag.folder, nil
+	}
+
+	dc, err := flag.Datacenter()
+	if err != nil {
+		return nil, err
+	}
+
+	folders, err := dc.Folders(context.TODO())
+	if err != nil {
+		return nil, err
+	}
+
+	switch kind {
+	case "vm":
+		flag.folder = folders.VmFolder
+	case "host":
+		flag.folder = folders.HostFolder
+	case "datastore":
+		flag.folder = folders.DatastoreFolder
+	case "network":
+		flag.folder = folders.NetworkFolder
+	default:
+		panic(kind)
+	}
+
+	return flag.folder, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/host_connect.go b/vendor/github.com/vmware/govmomi/govc/flags/host_connect.go
new file mode 100644
index 0000000000..221f63c1d1
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/host_connect.go
@@ -0,0 +1,101 @@
+/*
+Copyright (c) 2015 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 flags
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"net/http"
+	"net/url"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type HostConnectFlag struct {
+	common
+
+	types.HostConnectSpec
+
+	noverify bool
+}
+
+var hostConnectFlagKey = flagKey("hostConnect")
+
+func NewHostConnectFlag(ctx context.Context) (*HostConnectFlag, context.Context) {
+	if v := ctx.Value(hostConnectFlagKey); v != nil {
+		return v.(*HostConnectFlag), ctx
+	}
+
+	v := &HostConnectFlag{}
+	ctx = context.WithValue(ctx, hostConnectFlagKey, v)
+	return v, ctx
+}
+
+func (flag *HostConnectFlag) Register(ctx context.Context, f *flag.FlagSet) {
+	flag.RegisterOnce(func() {
+		f.StringVar(&flag.HostName, "hostname", "", "Hostname or IP address of the host")
+		f.StringVar(&flag.UserName, "username", "", "Username of administration account on the host")
+		f.StringVar(&flag.Password, "password", "", "Password of administration account on the host")
+		f.StringVar(&flag.SslThumbprint, "thumbprint", "", "SHA-1 thumbprint of the host's SSL certificate")
+		f.BoolVar(&flag.Force, "force", false, "Force when host is managed by another VC")
+
+		f.BoolVar(&flag.noverify, "noverify", false, "Accept host thumbprint without verification")
+	})
+}
+
+func (flag *HostConnectFlag) Process(ctx context.Context) error {
+	return nil
+}
+
+// Spec attempts to fill in SslThumbprint if empty.
+// First checks GOVC_TLS_KNOWN_HOSTS, if not found and noverify=true then
+// use object.HostCertificateInfo to get the thumbprint.
+func (flag *HostConnectFlag) Spec(c *vim25.Client) types.HostConnectSpec {
+	spec := flag.HostConnectSpec
+
+	if spec.SslThumbprint == "" {
+		spec.SslThumbprint = c.Thumbprint(spec.HostName)
+
+		if spec.SslThumbprint == "" && flag.noverify {
+			var info object.HostCertificateInfo
+			t := c.Transport.(*http.Transport)
+			_ = info.FromURL(&url.URL{Host: spec.HostName}, t.TLSClientConfig)
+			spec.SslThumbprint = info.ThumbprintSHA1
+		}
+	}
+
+	return spec
+}
+
+// Fault checks if error is SSLVerifyFault, including the thumbprint if so
+func (flag *HostConnectFlag) Fault(err error) error {
+	if err == nil {
+		return nil
+	}
+
+	if f, ok := err.(types.HasFault); ok {
+		switch fault := f.Fault().(type) {
+		case *types.SSLVerifyFault:
+			return fmt.Errorf("%s thumbprint=%s", err, fault.Thumbprint)
+		}
+	}
+
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/host_system.go b/vendor/github.com/vmware/govmomi/govc/flags/host_system.go
new file mode 100644
index 0000000000..56dba96c55
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/host_system.go
@@ -0,0 +1,141 @@
+/*
+Copyright (c) 2014-2015 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 flags
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+
+	"github.com/vmware/govmomi/object"
+)
+
+type HostSystemFlag struct {
+	common
+
+	*ClientFlag
+	*DatacenterFlag
+	*SearchFlag
+
+	name string
+	host *object.HostSystem
+	pool *object.ResourcePool
+}
+
+var hostSystemFlagKey = flagKey("hostSystem")
+
+func NewHostSystemFlag(ctx context.Context) (*HostSystemFlag, context.Context) {
+	if v := ctx.Value(hostSystemFlagKey); v != nil {
+		return v.(*HostSystemFlag), ctx
+	}
+
+	v := &HostSystemFlag{}
+	v.ClientFlag, ctx = NewClientFlag(ctx)
+	v.DatacenterFlag, ctx = NewDatacenterFlag(ctx)
+	v.SearchFlag, ctx = NewSearchFlag(ctx, SearchHosts)
+	ctx = context.WithValue(ctx, hostSystemFlagKey, v)
+	return v, ctx
+}
+
+func (flag *HostSystemFlag) Register(ctx context.Context, f *flag.FlagSet) {
+	flag.RegisterOnce(func() {
+		flag.ClientFlag.Register(ctx, f)
+		flag.DatacenterFlag.Register(ctx, f)
+		flag.SearchFlag.Register(ctx, f)
+
+		env := "GOVC_HOST"
+		value := os.Getenv(env)
+		usage := fmt.Sprintf("Host system [%s]", env)
+		f.StringVar(&flag.name, "host", value, usage)
+	})
+}
+
+func (flag *HostSystemFlag) Process(ctx context.Context) error {
+	return flag.ProcessOnce(func() error {
+		if err := flag.ClientFlag.Process(ctx); err != nil {
+			return err
+		}
+		if err := flag.DatacenterFlag.Process(ctx); err != nil {
+			return err
+		}
+		if err := flag.SearchFlag.Process(ctx); err != nil {
+			return err
+		}
+		return nil
+	})
+}
+
+func (flag *HostSystemFlag) HostSystemIfSpecified() (*object.HostSystem, error) {
+	if flag.host != nil {
+		return flag.host, nil
+	}
+
+	// Use search flags if specified.
+	if flag.SearchFlag.IsSet() {
+		host, err := flag.SearchFlag.HostSystem()
+		if err != nil {
+			return nil, err
+		}
+
+		flag.host = host
+		return flag.host, nil
+	}
+
+	// Never look for a default host system.
+	// A host system parameter is optional for vm creation. It uses a mandatory
+	// resource pool parameter to determine where the vm should be placed.
+	if flag.name == "" {
+		return nil, nil
+	}
+
+	finder, err := flag.Finder()
+	if err != nil {
+		return nil, err
+	}
+
+	flag.host, err = finder.HostSystem(context.TODO(), flag.name)
+	return flag.host, err
+}
+
+func (flag *HostSystemFlag) HostSystem() (*object.HostSystem, error) {
+	host, err := flag.HostSystemIfSpecified()
+	if err != nil {
+		return nil, err
+	}
+
+	if host != nil {
+		return host, nil
+	}
+
+	finder, err := flag.Finder()
+	if err != nil {
+		return nil, err
+	}
+
+	flag.host, err = finder.DefaultHostSystem(context.TODO())
+	return flag.host, err
+}
+
+func (flag *HostSystemFlag) HostNetworkSystem() (*object.HostNetworkSystem, error) {
+	host, err := flag.HostSystem()
+	if err != nil {
+		return nil, err
+	}
+
+	return host.ConfigManager().NetworkSystem(context.TODO())
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/int32.go b/vendor/github.com/vmware/govmomi/govc/flags/int32.go
new file mode 100644
index 0000000000..5ab58aa047
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/int32.go
@@ -0,0 +1,46 @@
+/*
+Copyright (c) 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 flags
+
+import (
+	"flag"
+	"fmt"
+	"strconv"
+)
+
+// This flag type is internal to stdlib:
+// https://github.com/golang/go/blob/master/src/cmd/internal/obj/flag.go
+type int32Value int32
+
+func (i *int32Value) Set(s string) error {
+	v, err := strconv.ParseInt(s, 0, 64)
+	*i = int32Value(v)
+	return err
+}
+
+func (i *int32Value) Get() interface{} {
+	return int32(*i)
+}
+
+func (i *int32Value) String() string {
+	return fmt.Sprintf("%v", *i)
+}
+
+// NewInt32 behaves as flag.IntVar, but using an int32 type.
+func NewInt32(v *int32) flag.Value {
+	return (*int32Value)(v)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/network.go b/vendor/github.com/vmware/govmomi/govc/flags/network.go
new file mode 100644
index 0000000000..d2f4643f65
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/network.go
@@ -0,0 +1,131 @@
+/*
+Copyright (c) 2014-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 flags
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type NetworkFlag struct {
+	common
+
+	*DatacenterFlag
+
+	name    string
+	net     object.NetworkReference
+	adapter string
+	address string
+	isset   bool
+}
+
+var networkFlagKey = flagKey("network")
+
+func NewNetworkFlag(ctx context.Context) (*NetworkFlag, context.Context) {
+	if v := ctx.Value(networkFlagKey); v != nil {
+		return v.(*NetworkFlag), ctx
+	}
+
+	v := &NetworkFlag{}
+	v.DatacenterFlag, ctx = NewDatacenterFlag(ctx)
+	ctx = context.WithValue(ctx, networkFlagKey, v)
+	return v, ctx
+}
+
+func (flag *NetworkFlag) Register(ctx context.Context, f *flag.FlagSet) {
+	flag.RegisterOnce(func() {
+		flag.DatacenterFlag.Register(ctx, f)
+
+		env := "GOVC_NETWORK"
+		value := os.Getenv(env)
+		flag.name = value
+		usage := fmt.Sprintf("Network [%s]", env)
+		f.Var(flag, "net", usage)
+		f.StringVar(&flag.adapter, "net.adapter", "e1000", "Network adapter type")
+		f.StringVar(&flag.address, "net.address", "", "Network hardware address")
+	})
+}
+
+func (flag *NetworkFlag) Process(ctx context.Context) error {
+	return flag.ProcessOnce(func() error {
+		if err := flag.DatacenterFlag.Process(ctx); err != nil {
+			return err
+		}
+		return nil
+	})
+}
+
+func (flag *NetworkFlag) String() string {
+	return flag.name
+}
+
+func (flag *NetworkFlag) Set(name string) error {
+	flag.name = name
+	flag.isset = true
+	return nil
+}
+
+func (flag *NetworkFlag) IsSet() bool {
+	return flag.isset
+}
+
+func (flag *NetworkFlag) Network() (object.NetworkReference, error) {
+	if flag.net != nil {
+		return flag.net, nil
+	}
+
+	finder, err := flag.Finder()
+	if err != nil {
+		return nil, err
+	}
+
+	if flag.net, err = finder.NetworkOrDefault(context.TODO(), flag.name); err != nil {
+		return nil, err
+	}
+
+	return flag.net, nil
+}
+
+func (flag *NetworkFlag) Device() (types.BaseVirtualDevice, error) {
+	net, err := flag.Network()
+	if err != nil {
+		return nil, err
+	}
+
+	backing, err := net.EthernetCardBackingInfo(context.TODO())
+	if err != nil {
+		return nil, err
+	}
+
+	device, err := object.EthernetCardTypes().CreateEthernetCard(flag.adapter, backing)
+	if err != nil {
+		return nil, err
+	}
+
+	if flag.address != "" {
+		card := device.(types.BaseVirtualEthernetCard).GetVirtualEthernetCard()
+		card.AddressType = string(types.VirtualEthernetCardMacTypeManual)
+		card.MacAddress = flag.address
+	}
+
+	return device, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/optional_bool.go b/vendor/github.com/vmware/govmomi/govc/flags/optional_bool.go
new file mode 100644
index 0000000000..db1b81f89b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/optional_bool.go
@@ -0,0 +1,55 @@
+/*
+Copyright (c) 2015 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 flags
+
+import (
+	"flag"
+	"fmt"
+	"strconv"
+)
+
+type optionalBool struct {
+	val **bool
+}
+
+func (b *optionalBool) Set(s string) error {
+	v, err := strconv.ParseBool(s)
+	*b.val = &v
+	return err
+}
+
+func (b *optionalBool) Get() interface{} {
+	if *b.val == nil {
+		return nil
+	}
+	return **b.val
+}
+
+func (b *optionalBool) String() string {
+	if b.val == nil || *b.val == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("%v", **b.val)
+}
+
+func (b *optionalBool) IsBoolFlag() bool { return true }
+
+// NewOptionalBool returns a flag.Value implementation where there is no default value.
+// This avoids sending a default value over the wire as using flag.BoolVar() would.
+func NewOptionalBool(v **bool) flag.Value {
+	return &optionalBool{v}
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/optional_bool_test.go b/vendor/github.com/vmware/govmomi/govc/flags/optional_bool_test.go
new file mode 100644
index 0000000000..4080312199
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/optional_bool_test.go
@@ -0,0 +1,71 @@
+/*
+Copyright (c) 2015 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 flags
+
+import (
+	"flag"
+	"testing"
+)
+
+func TestOptionalBool(t *testing.T) {
+	fs := flag.NewFlagSet("", flag.ContinueOnError)
+	var val *bool
+
+	fs.Var(NewOptionalBool(&val), "obool", "optional bool")
+
+	b := fs.Lookup("obool")
+
+	if b.DefValue != "<nil>" {
+		t.Fail()
+	}
+
+	if b.Value.String() != "<nil>" {
+		t.Fail()
+	}
+
+	if b.Value.(flag.Getter).Get() != nil {
+		t.Fail()
+	}
+
+	b.Value.Set("true")
+
+	if b.Value.String() != "true" {
+		t.Fail()
+	}
+
+	if b.Value.(flag.Getter).Get() != true {
+		t.Fail()
+	}
+
+	if val == nil || *val != true {
+		t.Fail()
+	}
+
+	b.Value.Set("false")
+
+	if b.Value.String() != "false" {
+		t.Fail()
+	}
+
+	if b.Value.(flag.Getter).Get() != false {
+		t.Fail()
+	}
+
+	if val == nil || *val != false {
+		t.Fail()
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/output.go b/vendor/github.com/vmware/govmomi/govc/flags/output.go
new file mode 100644
index 0000000000..0ad0d95bcc
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/output.go
@@ -0,0 +1,216 @@
+/*
+Copyright (c) 2014-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 flags
+
+import (
+	"context"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"io"
+	"os"
+	"sync"
+	"time"
+
+	"github.com/vmware/govmomi/vim25/progress"
+
+	"github.com/davecgh/go-spew/spew"
+)
+
+type OutputWriter interface {
+	Write(io.Writer) error
+}
+
+type OutputFlag struct {
+	common
+
+	JSON bool
+	TTY  bool
+	Dump bool
+	Out  io.Writer
+}
+
+var outputFlagKey = flagKey("output")
+
+func NewOutputFlag(ctx context.Context) (*OutputFlag, context.Context) {
+	if v := ctx.Value(outputFlagKey); v != nil {
+		return v.(*OutputFlag), ctx
+	}
+
+	v := &OutputFlag{Out: os.Stdout}
+	ctx = context.WithValue(ctx, outputFlagKey, v)
+	return v, ctx
+}
+
+func (flag *OutputFlag) Register(ctx context.Context, f *flag.FlagSet) {
+	flag.RegisterOnce(func() {
+		f.BoolVar(&flag.JSON, "json", false, "Enable JSON output")
+		f.BoolVar(&flag.Dump, "dump", false, "Enable output dump")
+	})
+}
+
+func (flag *OutputFlag) Process(ctx context.Context) error {
+	return flag.ProcessOnce(func() error {
+		if !flag.JSON {
+			// Assume we have a tty if not outputting JSON
+			flag.TTY = true
+		}
+
+		return nil
+	})
+}
+
+// Log outputs the specified string, prefixed with the current time.
+// A newline is not automatically added. If the specified string
+// starts with a '\r', the current line is cleared first.
+func (flag *OutputFlag) Log(s string) (int, error) {
+	if len(s) > 0 && s[0] == '\r' {
+		flag.Write([]byte{'\r', 033, '[', 'K'})
+		s = s[1:]
+	}
+
+	return flag.WriteString(time.Now().Format("[02-01-06 15:04:05] ") + s)
+}
+
+func (flag *OutputFlag) Write(b []byte) (int, error) {
+	if !flag.TTY {
+		return 0, nil
+	}
+
+	n, err := os.Stdout.Write(b)
+	os.Stdout.Sync()
+	return n, err
+}
+
+func (flag *OutputFlag) WriteString(s string) (int, error) {
+	return flag.Write([]byte(s))
+}
+
+func (flag *OutputFlag) WriteResult(result OutputWriter) error {
+	var err error
+
+	if flag.JSON {
+		err = json.NewEncoder(flag.Out).Encode(result)
+	} else if flag.Dump {
+		scs := spew.ConfigState{Indent: "    "}
+		scs.Fdump(flag.Out, result)
+	} else {
+		err = result.Write(flag.Out)
+	}
+
+	return err
+}
+
+type progressLogger struct {
+	flag   *OutputFlag
+	prefix string
+
+	wg sync.WaitGroup
+
+	sink chan chan progress.Report
+	done chan struct{}
+}
+
+func newProgressLogger(flag *OutputFlag, prefix string) *progressLogger {
+	p := &progressLogger{
+		flag:   flag,
+		prefix: prefix,
+
+		sink: make(chan chan progress.Report),
+		done: make(chan struct{}),
+	}
+
+	p.wg.Add(1)
+
+	go p.loopA()
+
+	return p
+}
+
+// loopA runs before Sink() has been called.
+func (p *progressLogger) loopA() {
+	var err error
+
+	defer p.wg.Done()
+
+	tick := time.NewTicker(100 * time.Millisecond)
+	defer tick.Stop()
+
+	for stop := false; !stop; {
+		select {
+		case ch := <-p.sink:
+			err = p.loopB(tick, ch)
+			stop = true
+		case <-p.done:
+			stop = true
+		case <-tick.C:
+			line := fmt.Sprintf("\r%s", p.prefix)
+			p.flag.Log(line)
+		}
+	}
+
+	if err != nil && err != io.EOF {
+		p.flag.Log(fmt.Sprintf("\r%sError: %s\n", p.prefix, err))
+	} else {
+		p.flag.Log(fmt.Sprintf("\r%sOK\n", p.prefix))
+	}
+}
+
+// loopA runs after Sink() has been called.
+func (p *progressLogger) loopB(tick *time.Ticker, ch <-chan progress.Report) error {
+	var r progress.Report
+	var ok bool
+	var err error
+
+	for ok = true; ok; {
+		select {
+		case r, ok = <-ch:
+			if !ok {
+				break
+			}
+			err = r.Error()
+		case <-tick.C:
+			line := fmt.Sprintf("\r%s", p.prefix)
+			if r != nil {
+				line += fmt.Sprintf("(%.0f%%", r.Percentage())
+				detail := r.Detail()
+				if detail != "" {
+					line += fmt.Sprintf(", %s", detail)
+				}
+				line += ")"
+			}
+			p.flag.Log(line)
+		}
+	}
+
+	return err
+}
+
+func (p *progressLogger) Sink() chan<- progress.Report {
+	ch := make(chan progress.Report)
+	p.sink <- ch
+	return ch
+}
+
+func (p *progressLogger) Wait() {
+	close(p.done)
+	p.wg.Wait()
+}
+
+func (flag *OutputFlag) ProgressLogger(prefix string) *progressLogger {
+	return newProgressLogger(flag, prefix)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/resource_pool.go b/vendor/github.com/vmware/govmomi/govc/flags/resource_pool.go
new file mode 100644
index 0000000000..38379654ef
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/resource_pool.go
@@ -0,0 +1,92 @@
+/*
+Copyright (c) 2014-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 flags
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+
+	"github.com/vmware/govmomi/object"
+)
+
+type ResourcePoolFlag struct {
+	common
+
+	*DatacenterFlag
+
+	name string
+	pool *object.ResourcePool
+}
+
+var resourcePoolFlagKey = flagKey("resourcePool")
+
+func NewResourcePoolFlag(ctx context.Context) (*ResourcePoolFlag, context.Context) {
+	if v := ctx.Value(resourcePoolFlagKey); v != nil {
+		return v.(*ResourcePoolFlag), ctx
+	}
+
+	v := &ResourcePoolFlag{}
+	v.DatacenterFlag, ctx = NewDatacenterFlag(ctx)
+	ctx = context.WithValue(ctx, resourcePoolFlagKey, v)
+	return v, ctx
+}
+
+func (flag *ResourcePoolFlag) Register(ctx context.Context, f *flag.FlagSet) {
+	flag.RegisterOnce(func() {
+		flag.DatacenterFlag.Register(ctx, f)
+
+		env := "GOVC_RESOURCE_POOL"
+		value := os.Getenv(env)
+		usage := fmt.Sprintf("Resource pool [%s]", env)
+		f.StringVar(&flag.name, "pool", value, usage)
+	})
+}
+
+func (flag *ResourcePoolFlag) Process(ctx context.Context) error {
+	return flag.ProcessOnce(func() error {
+		if err := flag.DatacenterFlag.Process(ctx); err != nil {
+			return err
+		}
+		return nil
+	})
+}
+
+func (flag *ResourcePoolFlag) ResourcePool() (*object.ResourcePool, error) {
+	if flag.pool != nil {
+		return flag.pool, nil
+	}
+
+	finder, err := flag.Finder()
+	if err != nil {
+		return nil, err
+	}
+
+	if flag.pool, err = finder.ResourcePoolOrDefault(context.TODO(), flag.name); err != nil {
+		return nil, err
+	}
+
+	return flag.pool, nil
+}
+
+func (flag *ResourcePoolFlag) ResourcePoolIfSpecified() (*object.ResourcePool, error) {
+	if flag.name == "" {
+		return nil, nil
+	}
+	return flag.ResourcePool()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/search.go b/vendor/github.com/vmware/govmomi/govc/flags/search.go
new file mode 100644
index 0000000000..dd18b16a52
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/search.go
@@ -0,0 +1,434 @@
+/*
+Copyright (c) 2014-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 flags
+
+import (
+	"context"
+	"errors"
+	"flag"
+	"fmt"
+	"strings"
+
+	"github.com/vmware/govmomi/find"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+const (
+	SearchVirtualMachines = iota + 1
+	SearchHosts
+	SearchVirtualApps
+)
+
+type SearchFlag struct {
+	common
+
+	*ClientFlag
+	*DatacenterFlag
+
+	t      int
+	entity string
+
+	byDatastorePath string
+	byDNSName       string
+	byInventoryPath string
+	byIP            string
+	byUUID          string
+
+	isset bool
+}
+
+var searchFlagKey = flagKey("search")
+
+func NewSearchFlag(ctx context.Context, t int) (*SearchFlag, context.Context) {
+	if v := ctx.Value(searchFlagKey); v != nil {
+		return v.(*SearchFlag), ctx
+	}
+
+	v := &SearchFlag{
+		t: t,
+	}
+
+	v.ClientFlag, ctx = NewClientFlag(ctx)
+	v.DatacenterFlag, ctx = NewDatacenterFlag(ctx)
+
+	switch t {
+	case SearchVirtualMachines:
+		v.entity = "VM"
+	case SearchHosts:
+		v.entity = "host"
+	case SearchVirtualApps:
+		v.entity = "vapp"
+	default:
+		panic("invalid search type")
+	}
+
+	ctx = context.WithValue(ctx, searchFlagKey, v)
+	return v, ctx
+}
+
+func (flag *SearchFlag) Register(ctx context.Context, fs *flag.FlagSet) {
+	flag.RegisterOnce(func() {
+		flag.ClientFlag.Register(ctx, fs)
+		flag.DatacenterFlag.Register(ctx, fs)
+
+		register := func(v *string, f string, d string) {
+			f = fmt.Sprintf("%s.%s", strings.ToLower(flag.entity), f)
+			d = fmt.Sprintf(d, flag.entity)
+			fs.StringVar(v, f, "", d)
+		}
+
+		switch flag.t {
+		case SearchVirtualMachines:
+			register(&flag.byDatastorePath, "path", "Find %s by path to .vmx file")
+		}
+
+		switch flag.t {
+		case SearchVirtualMachines, SearchHosts:
+			register(&flag.byDNSName, "dns", "Find %s by FQDN")
+			register(&flag.byIP, "ip", "Find %s by IP address")
+			register(&flag.byUUID, "uuid", "Find %s by UUID")
+		}
+
+		register(&flag.byInventoryPath, "ipath", "Find %s by inventory path")
+	})
+}
+
+func (flag *SearchFlag) Process(ctx context.Context) error {
+	return flag.ProcessOnce(func() error {
+		if err := flag.ClientFlag.Process(ctx); err != nil {
+			return err
+		}
+		if err := flag.DatacenterFlag.Process(ctx); err != nil {
+			return err
+		}
+
+		flags := []string{
+			flag.byDatastorePath,
+			flag.byDNSName,
+			flag.byInventoryPath,
+			flag.byIP,
+			flag.byUUID,
+		}
+
+		flag.isset = false
+		for _, f := range flags {
+			if f != "" {
+				if flag.isset {
+					return errors.New("cannot use more than one search flag")
+				}
+				flag.isset = true
+			}
+		}
+
+		return nil
+	})
+}
+
+func (flag *SearchFlag) IsSet() bool {
+	return flag.isset
+}
+
+func (flag *SearchFlag) searchIndex(c *vim25.Client) *object.SearchIndex {
+	return object.NewSearchIndex(c)
+}
+
+func (flag *SearchFlag) searchByDatastorePath(c *vim25.Client, dc *object.Datacenter) (object.Reference, error) {
+	ctx := context.TODO()
+	switch flag.t {
+	case SearchVirtualMachines:
+		return flag.searchIndex(c).FindByDatastorePath(ctx, dc, flag.byDatastorePath)
+	default:
+		panic("unsupported type")
+	}
+}
+
+func (flag *SearchFlag) searchByDNSName(c *vim25.Client, dc *object.Datacenter) (object.Reference, error) {
+	ctx := context.TODO()
+	switch flag.t {
+	case SearchVirtualMachines:
+		return flag.searchIndex(c).FindByDnsName(ctx, dc, flag.byDNSName, true)
+	case SearchHosts:
+		return flag.searchIndex(c).FindByDnsName(ctx, dc, flag.byDNSName, false)
+	default:
+		panic("unsupported type")
+	}
+}
+
+func (flag *SearchFlag) searchByInventoryPath(c *vim25.Client, dc *object.Datacenter) (object.Reference, error) {
+	// TODO(PN): The datacenter flag should not be set because it is ignored.
+	ctx := context.TODO()
+	return flag.searchIndex(c).FindByInventoryPath(ctx, flag.byInventoryPath)
+}
+
+func (flag *SearchFlag) searchByIP(c *vim25.Client, dc *object.Datacenter) (object.Reference, error) {
+	ctx := context.TODO()
+	switch flag.t {
+	case SearchVirtualMachines:
+		return flag.searchIndex(c).FindByIp(ctx, dc, flag.byIP, true)
+	case SearchHosts:
+		return flag.searchIndex(c).FindByIp(ctx, dc, flag.byIP, false)
+	default:
+		panic("unsupported type")
+	}
+}
+
+func (flag *SearchFlag) searchByUUID(c *vim25.Client, dc *object.Datacenter) (object.Reference, error) {
+	ctx := context.TODO()
+	isVM := false
+	switch flag.t {
+	case SearchVirtualMachines:
+		isVM = true
+	case SearchHosts:
+	default:
+		panic("unsupported type")
+	}
+
+	var ref object.Reference
+	var err error
+
+	for _, iu := range []*bool{nil, types.NewBool(true)} {
+		ref, err = flag.searchIndex(c).FindByUuid(ctx, dc, flag.byUUID, isVM, iu)
+		if err != nil {
+			if soap.IsSoapFault(err) {
+				fault := soap.ToSoapFault(err).VimFault()
+				if _, ok := fault.(types.InvalidArgument); ok {
+					continue
+				}
+			}
+			return nil, err
+		}
+		if ref != nil {
+			break
+		}
+	}
+
+	return ref, nil
+}
+
+func (flag *SearchFlag) search() (object.Reference, error) {
+	ctx := context.TODO()
+	var ref object.Reference
+	var err error
+
+	c, err := flag.Client()
+	if err != nil {
+		return nil, err
+	}
+
+	dc, err := flag.Datacenter()
+	if err != nil {
+		return nil, err
+	}
+
+	switch {
+	case flag.byDatastorePath != "":
+		ref, err = flag.searchByDatastorePath(c, dc)
+	case flag.byDNSName != "":
+		ref, err = flag.searchByDNSName(c, dc)
+	case flag.byInventoryPath != "":
+		ref, err = flag.searchByInventoryPath(c, dc)
+	case flag.byIP != "":
+		ref, err = flag.searchByIP(c, dc)
+	case flag.byUUID != "":
+		ref, err = flag.searchByUUID(c, dc)
+	default:
+		err = errors.New("no search flag specified")
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	if ref == nil {
+		return nil, fmt.Errorf("no such %s", flag.entity)
+	}
+
+	// set the InventoryPath field
+	finder, err := flag.Finder()
+	if err != nil {
+		return nil, err
+	}
+	ref, err = finder.ObjectReference(ctx, ref.Reference())
+	if err != nil {
+		return nil, err
+	}
+
+	return ref, nil
+}
+
+func (flag *SearchFlag) VirtualMachine() (*object.VirtualMachine, error) {
+	ref, err := flag.search()
+	if err != nil {
+		return nil, err
+	}
+
+	vm, ok := ref.(*object.VirtualMachine)
+	if !ok {
+		return nil, fmt.Errorf("expected VirtualMachine entity, got %s", ref.Reference().Type)
+	}
+
+	return vm, nil
+}
+
+func (flag *SearchFlag) VirtualMachines(args []string) ([]*object.VirtualMachine, error) {
+	ctx := context.TODO()
+	var out []*object.VirtualMachine
+
+	if flag.IsSet() {
+		vm, err := flag.VirtualMachine()
+		if err != nil {
+			return nil, err
+		}
+
+		out = append(out, vm)
+		return out, nil
+	}
+
+	// List virtual machines
+	if len(args) == 0 {
+		return nil, errors.New("no argument")
+	}
+
+	finder, err := flag.Finder()
+	if err != nil {
+		return nil, err
+	}
+
+	var nfe error
+
+	// List virtual machines for every argument
+	for _, arg := range args {
+		vms, err := finder.VirtualMachineList(ctx, arg)
+		if err != nil {
+			if _, ok := err.(*find.NotFoundError); ok {
+				// Let caller decide how to handle NotFoundError
+				nfe = err
+				continue
+			}
+			return nil, err
+		}
+
+		out = append(out, vms...)
+	}
+
+	return out, nfe
+}
+
+func (flag *SearchFlag) VirtualApp() (*object.VirtualApp, error) {
+	ref, err := flag.search()
+	if err != nil {
+		return nil, err
+	}
+
+	app, ok := ref.(*object.VirtualApp)
+	if !ok {
+		return nil, fmt.Errorf("expected VirtualApp entity, got %s", ref.Reference().Type)
+	}
+
+	return app, nil
+}
+
+func (flag *SearchFlag) VirtualApps(args []string) ([]*object.VirtualApp, error) {
+	ctx := context.TODO()
+	var out []*object.VirtualApp
+
+	if flag.IsSet() {
+		app, err := flag.VirtualApp()
+		if err != nil {
+			return nil, err
+		}
+
+		out = append(out, app)
+		return out, nil
+	}
+
+	// List virtual apps
+	if len(args) == 0 {
+		return nil, errors.New("no argument")
+	}
+
+	finder, err := flag.Finder()
+	if err != nil {
+		return nil, err
+	}
+
+	// List virtual apps for every argument
+	for _, arg := range args {
+		apps, err := finder.VirtualAppList(ctx, arg)
+		if err != nil {
+			return nil, err
+		}
+
+		out = append(out, apps...)
+	}
+
+	return out, nil
+}
+
+func (flag *SearchFlag) HostSystem() (*object.HostSystem, error) {
+	ref, err := flag.search()
+	if err != nil {
+		return nil, err
+	}
+
+	host, ok := ref.(*object.HostSystem)
+	if !ok {
+		return nil, fmt.Errorf("expected HostSystem entity, got %s", ref.Reference().Type)
+	}
+
+	return host, nil
+}
+
+func (flag *SearchFlag) HostSystems(args []string) ([]*object.HostSystem, error) {
+	ctx := context.TODO()
+	var out []*object.HostSystem
+
+	if flag.IsSet() {
+		host, err := flag.HostSystem()
+		if err != nil {
+			return nil, err
+		}
+
+		out = append(out, host)
+		return out, nil
+	}
+
+	// List host system
+	if len(args) == 0 {
+		return nil, errors.New("no argument")
+	}
+
+	finder, err := flag.Finder()
+	if err != nil {
+		return nil, err
+	}
+
+	// List host systems for every argument
+	for _, arg := range args {
+		vms, err := finder.HostSystemList(ctx, arg)
+		if err != nil {
+			return nil, err
+		}
+
+		out = append(out, vms...)
+	}
+
+	return out, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/storage_pod.go b/vendor/github.com/vmware/govmomi/govc/flags/storage_pod.go
new file mode 100644
index 0000000000..0be337f5bf
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/storage_pod.go
@@ -0,0 +1,78 @@
+package flags
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+
+	"github.com/vmware/govmomi/object"
+)
+
+type StoragePodFlag struct {
+	common
+
+	*DatacenterFlag
+
+	Name string
+
+	sp *object.StoragePod
+}
+
+var storagePodFlagKey = flagKey("storagePod")
+
+func NewStoragePodFlag(ctx context.Context) (*StoragePodFlag, context.Context) {
+	if v := ctx.Value(storagePodFlagKey); v != nil {
+		return v.(*StoragePodFlag), ctx
+	}
+
+	v := &StoragePodFlag{}
+	v.DatacenterFlag, ctx = NewDatacenterFlag(ctx)
+	ctx = context.WithValue(ctx, storagePodFlagKey, v)
+	return v, ctx
+}
+
+func (f *StoragePodFlag) Register(ctx context.Context, fs *flag.FlagSet) {
+	f.RegisterOnce(func() {
+		f.DatacenterFlag.Register(ctx, fs)
+
+		env := "GOVC_DATASTORE_CLUSTER"
+		value := os.Getenv(env)
+		usage := fmt.Sprintf("Datastore cluster [%s]", env)
+		fs.StringVar(&f.Name, "datastore-cluster", value, usage)
+	})
+}
+
+func (f *StoragePodFlag) Process(ctx context.Context) error {
+	return f.DatacenterFlag.Process(ctx)
+}
+
+func (f *StoragePodFlag) Isset() bool {
+	return f.Name != ""
+}
+
+func (f *StoragePodFlag) StoragePod() (*object.StoragePod, error) {
+	ctx := context.TODO()
+	if f.sp != nil {
+		return f.sp, nil
+	}
+
+	finder, err := f.Finder()
+	if err != nil {
+		return nil, err
+	}
+
+	if f.Isset() {
+		f.sp, err = finder.DatastoreCluster(ctx, f.Name)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		f.sp, err = finder.DefaultDatastoreCluster(ctx)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return f.sp, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/version.go b/vendor/github.com/vmware/govmomi/govc/flags/version.go
new file mode 100644
index 0000000000..3f3e13103e
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/version.go
@@ -0,0 +1,63 @@
+/*
+Copyright (c) 2014 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 flags
+
+import (
+	"strconv"
+	"strings"
+)
+
+const Version = "0.13.0"
+
+type version []int
+
+func ParseVersion(s string) (version, error) {
+	v := make(version, 0)
+	ps := strings.Split(s, ".")
+	for _, p := range ps {
+		i, err := strconv.Atoi(p)
+		if err != nil {
+			return nil, err
+		}
+
+		v = append(v, i)
+	}
+
+	return v, nil
+}
+
+func (v version) Lte(u version) bool {
+	lv := len(v)
+	lu := len(u)
+
+	for i := 0; i < lv; i++ {
+		// Everything up to here has been equal and v has more elements than u.
+		if i >= lu {
+			return false
+		}
+
+		// Move to next digit if equal.
+		if v[i] == u[i] {
+			continue
+		}
+
+		return v[i] < u[i]
+	}
+
+	// Equal.
+	return true
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/version_test.go b/vendor/github.com/vmware/govmomi/govc/flags/version_test.go
new file mode 100644
index 0000000000..dc155e9a5a
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/version_test.go
@@ -0,0 +1,63 @@
+/*
+Copyright (c) 2014 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 flags
+
+import "testing"
+
+func TestParseVersion(t *testing.T) {
+	var v version
+	var err error
+
+	v, err = ParseVersion("5.5.5.5")
+	if err != nil {
+		t.Error(err)
+	}
+
+	if len(v) != 4 {
+		t.Errorf("Expected %d elements, got %d", 4, len(v))
+	}
+
+	for i := 0; i < len(v); i++ {
+		if v[i] != 5 {
+			t.Errorf("Expected %d, got %d", 5, v[i])
+		}
+	}
+}
+
+func TestLte(t *testing.T) {
+	v1, err := ParseVersion("5.5")
+	if err != nil {
+		panic(err)
+	}
+
+	v2, err := ParseVersion("5.6")
+	if err != nil {
+		panic(err)
+	}
+
+	if !v1.Lte(v1) {
+		t.Errorf("Expected 5.5 <= 5.5")
+	}
+
+	if !v1.Lte(v2) {
+		t.Errorf("Expected 5.5 <= 5.6")
+	}
+
+	if v2.Lte(v1) {
+		t.Errorf("Expected not 5.6 <= 5.5")
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/virtual_app.go b/vendor/github.com/vmware/govmomi/govc/flags/virtual_app.go
new file mode 100644
index 0000000000..88a0b9cbfe
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/virtual_app.go
@@ -0,0 +1,106 @@
+/*
+Copyright (c) 2015 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 flags
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+
+	"github.com/vmware/govmomi/object"
+)
+
+type VirtualAppFlag struct {
+	common
+
+	*DatacenterFlag
+	*SearchFlag
+
+	name string
+	app  *object.VirtualApp
+}
+
+var virtualAppFlagKey = flagKey("virtualApp")
+
+func NewVirtualAppFlag(ctx context.Context) (*VirtualAppFlag, context.Context) {
+	if v := ctx.Value(virtualAppFlagKey); v != nil {
+		return v.(*VirtualAppFlag), ctx
+	}
+
+	v := &VirtualAppFlag{}
+	v.DatacenterFlag, ctx = NewDatacenterFlag(ctx)
+	v.SearchFlag, ctx = NewSearchFlag(ctx, SearchVirtualApps)
+	ctx = context.WithValue(ctx, virtualAppFlagKey, v)
+	return v, ctx
+}
+
+func (flag *VirtualAppFlag) Register(ctx context.Context, f *flag.FlagSet) {
+	flag.RegisterOnce(func() {
+		flag.DatacenterFlag.Register(ctx, f)
+		flag.SearchFlag.Register(ctx, f)
+
+		env := "GOVC_VAPP"
+		value := os.Getenv(env)
+		usage := fmt.Sprintf("Virtual App [%s]", env)
+		f.StringVar(&flag.name, "vapp", value, usage)
+	})
+}
+
+func (flag *VirtualAppFlag) Process(ctx context.Context) error {
+	return flag.ProcessOnce(func() error {
+		if err := flag.DatacenterFlag.Process(ctx); err != nil {
+			return err
+		}
+		if err := flag.SearchFlag.Process(ctx); err != nil {
+			return err
+		}
+		return nil
+	})
+}
+
+func (flag *VirtualAppFlag) VirtualApp() (*object.VirtualApp, error) {
+	ctx := context.TODO()
+
+	if flag.app != nil {
+		return flag.app, nil
+	}
+
+	// Use search flags if specified.
+	if flag.SearchFlag.IsSet() {
+		app, err := flag.SearchFlag.VirtualApp()
+		if err != nil {
+			return nil, err
+		}
+
+		flag.app = app
+		return flag.app, nil
+	}
+
+	// Never look for a default virtual app.
+	if flag.name == "" {
+		return nil, nil
+	}
+
+	finder, err := flag.Finder()
+	if err != nil {
+		return nil, err
+	}
+
+	flag.app, err = finder.VirtualApp(ctx, flag.name)
+	return flag.app, err
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/virtual_machine.go b/vendor/github.com/vmware/govmomi/govc/flags/virtual_machine.go
new file mode 100644
index 0000000000..e0b1acae8c
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/flags/virtual_machine.go
@@ -0,0 +1,112 @@
+/*
+Copyright (c) 2014-2015 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 flags
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+
+	"github.com/vmware/govmomi/object"
+)
+
+type VirtualMachineFlag struct {
+	common
+
+	*ClientFlag
+	*DatacenterFlag
+	*SearchFlag
+
+	name string
+	vm   *object.VirtualMachine
+}
+
+var virtualMachineFlagKey = flagKey("virtualMachine")
+
+func NewVirtualMachineFlag(ctx context.Context) (*VirtualMachineFlag, context.Context) {
+	if v := ctx.Value(virtualMachineFlagKey); v != nil {
+		return v.(*VirtualMachineFlag), ctx
+	}
+
+	v := &VirtualMachineFlag{}
+	v.ClientFlag, ctx = NewClientFlag(ctx)
+	v.DatacenterFlag, ctx = NewDatacenterFlag(ctx)
+	v.SearchFlag, ctx = NewSearchFlag(ctx, SearchVirtualMachines)
+	ctx = context.WithValue(ctx, virtualMachineFlagKey, v)
+	return v, ctx
+}
+
+func (flag *VirtualMachineFlag) Register(ctx context.Context, f *flag.FlagSet) {
+	flag.RegisterOnce(func() {
+		flag.ClientFlag.Register(ctx, f)
+		flag.DatacenterFlag.Register(ctx, f)
+		flag.SearchFlag.Register(ctx, f)
+
+		env := "GOVC_VM"
+		value := os.Getenv(env)
+		usage := fmt.Sprintf("Virtual machine [%s]", env)
+		f.StringVar(&flag.name, "vm", value, usage)
+	})
+}
+
+func (flag *VirtualMachineFlag) Process(ctx context.Context) error {
+	return flag.ProcessOnce(func() error {
+		if err := flag.ClientFlag.Process(ctx); err != nil {
+			return err
+		}
+		if err := flag.DatacenterFlag.Process(ctx); err != nil {
+			return err
+		}
+		if err := flag.SearchFlag.Process(ctx); err != nil {
+			return err
+		}
+		return nil
+	})
+}
+
+func (flag *VirtualMachineFlag) VirtualMachine() (*object.VirtualMachine, error) {
+	ctx := context.TODO()
+
+	if flag.vm != nil {
+		return flag.vm, nil
+	}
+
+	// Use search flags if specified.
+	if flag.SearchFlag.IsSet() {
+		vm, err := flag.SearchFlag.VirtualMachine()
+		if err != nil {
+			return nil, err
+		}
+
+		flag.vm = vm
+		return flag.vm, nil
+	}
+
+	// Never look for a default virtual machine.
+	if flag.name == "" {
+		return nil, nil
+	}
+
+	finder, err := flag.Finder()
+	if err != nil {
+		return nil, err
+	}
+
+	flag.vm, err = finder.VirtualMachine(ctx, flag.name)
+	return flag.vm, err
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/folder/create.go b/vendor/github.com/vmware/govmomi/govc/folder/create.go
new file mode 100644
index 0000000000..b0356019a1
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/folder/create.go
@@ -0,0 +1,105 @@
+/*
+Copyright (c) 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 folder
+
+import (
+	"context"
+	"flag"
+	"path"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type create struct {
+	*flags.DatacenterFlag
+
+	pod bool
+}
+
+func init() {
+	cli.Register("folder.create", &create{})
+}
+
+func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.pod, "pod", false, "Create folder(s) of type StoragePod (DatastoreCluster)")
+}
+
+func (cmd *create) Usage() string {
+	return "PATH..."
+}
+
+func (cmd *create) Description() string {
+	return `Create folder with PATH.
+
+Examples:
+  govc folder.create /dc1/vm/folder-foo
+  govc object.mv /dc1/vm/vm-foo-* /dc1/vm/folder-foo
+  govc folder.create -pod /dc1/datastore/sdrs
+  govc object.mv /dc1/datastore/iscsi-* /dc1/datastore/sdrs`
+}
+
+func (cmd *create) Process(ctx context.Context) error {
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
+	finder, err := cmd.Finder()
+	if err != nil {
+		return err
+	}
+
+	for _, arg := range f.Args() {
+		dir := path.Dir(arg)
+		name := path.Base(arg)
+
+		if dir == "" {
+			dir = "/"
+		}
+
+		folder, err := finder.Folder(ctx, dir)
+		if err != nil {
+			return err
+		}
+
+		var create func() error
+		if cmd.pod {
+			create = func() error {
+				_, err = folder.CreateStoragePod(ctx, name)
+				return err
+			}
+		} else {
+			create = func() error {
+				_, err = folder.CreateFolder(ctx, name)
+				return err
+			}
+		}
+
+		err = create()
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/folder/info.go b/vendor/github.com/vmware/govmomi/govc/folder/info.go
new file mode 100644
index 0000000000..046cd16db8
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/folder/info.go
@@ -0,0 +1,147 @@
+/*
+Copyright (c) 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 folder
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"strings"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type info struct {
+	*flags.ClientFlag
+	*flags.OutputFlag
+	*flags.DatacenterFlag
+}
+
+func init() {
+	cli.Register("folder.info", &info{})
+}
+
+func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+}
+
+func (cmd *info) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *info) Usage() string {
+	return "[PATH]..."
+}
+
+func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	finder, err := cmd.Finder()
+	if err != nil {
+		return err
+	}
+
+	args := f.Args()
+	if len(args) == 0 {
+		args = []string{"/"}
+	}
+
+	var props []string
+	var res infoResult
+
+	if !cmd.OutputFlag.JSON {
+		props = []string{
+			"name",
+			"childEntity",
+			"childType",
+		}
+	}
+
+	for _, arg := range args {
+		object, err := finder.FolderList(ctx, arg)
+		if err != nil {
+			return err
+		}
+		res.objects = append(res.objects, object...)
+	}
+
+	if len(res.objects) != 0 {
+		refs := make([]types.ManagedObjectReference, 0, len(res.objects))
+		for _, o := range res.objects {
+			refs = append(refs, o.Reference())
+		}
+
+		pc := property.DefaultCollector(c)
+		err = pc.Retrieve(ctx, refs, props, &res.Folders)
+		if err != nil {
+			return err
+		}
+	}
+
+	return cmd.WriteResult(&res)
+}
+
+type infoResult struct {
+	Folders []mo.Folder
+	objects []*object.Folder
+}
+
+func (r *infoResult) Write(w io.Writer) error {
+	// Maintain order via r.objects as Property collector does not always return results in order.
+	objects := make(map[types.ManagedObjectReference]mo.Folder, len(r.Folders))
+	for _, o := range r.Folders {
+		objects[o.Reference()] = o
+	}
+
+	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
+
+	for _, o := range r.objects {
+		info := objects[o.Reference()]
+		fmt.Fprintf(tw, "Name:\t%s\n", info.Name)
+		fmt.Fprintf(tw, "  Path:\t%s\n", o.InventoryPath)
+		fmt.Fprintf(tw, "  Types:\t%v\n", strings.Join(info.ChildType, ","))
+		fmt.Fprintf(tw, "  Children:\t%d\n", len(info.ChildEntity))
+	}
+
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/account/account.go b/vendor/github.com/vmware/govmomi/govc/host/account/account.go
new file mode 100644
index 0000000000..61cc9597ee
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/account/account.go
@@ -0,0 +1,74 @@
+/*
+Copyright (c) 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 account
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type AccountFlag struct {
+	*flags.ClientFlag
+	*flags.DatacenterFlag
+	*flags.HostSystemFlag
+
+	types.HostAccountSpec
+}
+
+func newAccountFlag(ctx context.Context) (*AccountFlag, context.Context) {
+	f := &AccountFlag{}
+	f.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	f.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	f.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	return f, ctx
+}
+
+func (f *AccountFlag) Register(ctx context.Context, fs *flag.FlagSet) {
+	f.ClientFlag.Register(ctx, fs)
+	f.DatacenterFlag.Register(ctx, fs)
+	f.HostSystemFlag.Register(ctx, fs)
+
+	fs.StringVar(&f.Id, "id", "", "The ID of the specified account")
+	fs.StringVar(&f.Password, "password", "", "The password for the specified account id")
+	fs.StringVar(&f.Description, "description", "", "The description of the specified account")
+}
+
+func (f *AccountFlag) Process(ctx context.Context) error {
+	if err := f.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := f.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := f.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (f *AccountFlag) HostAccountManager(ctx context.Context) (*object.HostAccountManager, error) {
+	h, err := f.HostSystem()
+	if err != nil {
+		return nil, err
+	}
+
+	return h.ConfigManager().AccountManager(ctx)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/account/create.go b/vendor/github.com/vmware/govmomi/govc/host/account/create.go
new file mode 100644
index 0000000000..ade5a9d4b7
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/account/create.go
@@ -0,0 +1,59 @@
+/*
+Copyright (c) 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 account
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+)
+
+type create struct {
+	*AccountFlag
+}
+
+func init() {
+	cli.Register("host.account.create", &create{})
+}
+
+func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.AccountFlag, ctx = newAccountFlag(ctx)
+	cmd.AccountFlag.Register(ctx, f)
+}
+
+func (cmd *create) Description() string {
+	return `Create local account on HOST.
+
+Examples:
+  govc host.account.create -id $USER -password password-for-esx60`
+}
+
+func (cmd *create) Process(ctx context.Context) error {
+	if err := cmd.AccountFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
+	m, err := cmd.AccountFlag.HostAccountManager(ctx)
+	if err != nil {
+		return err
+	}
+	return m.Create(ctx, &cmd.HostAccountSpec)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/account/remove.go b/vendor/github.com/vmware/govmomi/govc/host/account/remove.go
new file mode 100644
index 0000000000..a600c64be8
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/account/remove.go
@@ -0,0 +1,59 @@
+/*
+Copyright (c) 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 account
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+)
+
+type remove struct {
+	*AccountFlag
+}
+
+func init() {
+	cli.Register("host.account.remove", &remove{})
+}
+
+func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.AccountFlag, ctx = newAccountFlag(ctx)
+	cmd.AccountFlag.Register(ctx, f)
+}
+
+func (cmd *remove) Description() string {
+	return `Remove local account on HOST.
+
+Examples:
+  govc host.account.remove -id $USER`
+}
+
+func (cmd *remove) Process(ctx context.Context) error {
+	if err := cmd.AccountFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
+	m, err := cmd.AccountFlag.HostAccountManager(ctx)
+	if err != nil {
+		return err
+	}
+	return m.Remove(ctx, cmd.HostAccountSpec.Id)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/account/update.go b/vendor/github.com/vmware/govmomi/govc/host/account/update.go
new file mode 100644
index 0000000000..e6ac5e1457
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/account/update.go
@@ -0,0 +1,59 @@
+/*
+Copyright (c) 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 account
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+)
+
+type update struct {
+	*AccountFlag
+}
+
+func init() {
+	cli.Register("host.account.update", &update{})
+}
+
+func (cmd *update) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.AccountFlag, ctx = newAccountFlag(ctx)
+	cmd.AccountFlag.Register(ctx, f)
+}
+
+func (cmd *update) Description() string {
+	return `Update local account on HOST.
+
+Examples:
+  govc host.account.update -id root -password password-for-esx60`
+}
+
+func (cmd *update) Process(ctx context.Context) error {
+	if err := cmd.AccountFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *update) Run(ctx context.Context, f *flag.FlagSet) error {
+	m, err := cmd.AccountFlag.HostAccountManager(ctx)
+	if err != nil {
+		return err
+	}
+	return m.Update(ctx, &cmd.HostAccountSpec)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/add.go b/vendor/github.com/vmware/govmomi/govc/host/add.go
new file mode 100644
index 0000000000..2a5807a536
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/add.go
@@ -0,0 +1,116 @@
+/*
+Copyright (c) 2015-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 host
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type add struct {
+	*flags.FolderFlag
+	*flags.HostConnectFlag
+
+	connect bool
+}
+
+func init() {
+	cli.Register("host.add", &add{})
+}
+
+func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.FolderFlag, ctx = flags.NewFolderFlag(ctx)
+	cmd.FolderFlag.Register(ctx, f)
+
+	cmd.HostConnectFlag, ctx = flags.NewHostConnectFlag(ctx)
+	cmd.HostConnectFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.connect, "connect", true, "Immediately connect to host")
+}
+
+func (cmd *add) Process(ctx context.Context) error {
+	if err := cmd.FolderFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostConnectFlag.Process(ctx); err != nil {
+		return err
+	}
+	if cmd.HostName == "" {
+		return flag.ErrHelp
+	}
+	if cmd.UserName == "" {
+		return flag.ErrHelp
+	}
+	if cmd.Password == "" {
+		return flag.ErrHelp
+	}
+	return nil
+}
+
+func (cmd *add) Description() string {
+	return `Add host to datacenter.
+
+The host is added to the folder specified by the 'folder' flag. If not given,
+this defaults to the host folder in the specified or default datacenter.
+
+Examples:
+  thumbprint=$(govc about.cert -k -u host.example.com -thumbprint | awk '{print $2}')
+  govc host.add -hostname host.example.com -username root -password pass -thumbprint $thumbprint
+  govc host.add -hostname 10.0.6.1 -username root -password pass -noverify`
+}
+
+func (cmd *add) Add(ctx context.Context, parent *object.Folder) error {
+	spec := cmd.Spec(parent.Client())
+
+	req := types.AddStandaloneHost_Task{
+		This:         parent.Reference(),
+		Spec:         spec,
+		AddConnected: cmd.connect,
+	}
+
+	res, err := methods.AddStandaloneHost_Task(ctx, parent.Client(), &req)
+	if err != nil {
+		return err
+	}
+
+	logger := cmd.ProgressLogger(fmt.Sprintf("adding %s to folder %s... ", spec.HostName, parent.InventoryPath))
+	defer logger.Wait()
+
+	task := object.NewTask(parent.Client(), res.Returnval)
+	_, err = task.WaitForResult(ctx, logger)
+	return err
+}
+
+func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 0 {
+		return flag.ErrHelp
+	}
+
+	folder, err := cmd.FolderOrDefault("host")
+	if err != nil {
+		return err
+	}
+
+	return cmd.Fault(cmd.Add(ctx, folder))
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/autostart/add.go b/vendor/github.com/vmware/govmomi/govc/host/autostart/add.go
new file mode 100644
index 0000000000..b453c7e180
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/autostart/add.go
@@ -0,0 +1,62 @@
+/*
+Copyright (c) 2015 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 autostart
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type add struct {
+	*AutostartFlag
+}
+
+func init() {
+	cli.Register("host.autostart.add", &add{})
+}
+
+func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.AutostartFlag, ctx = newAutostartFlag(ctx)
+	cmd.AutostartFlag.Register(ctx, f)
+}
+
+func (cmd *add) Process(ctx context.Context) error {
+	if err := cmd.AutostartFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *add) Usage() string {
+	return "VM..."
+}
+
+func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
+	var powerInfo = types.AutoStartPowerInfo{
+		StartAction:      "powerOn",
+		StartDelay:       -1,
+		StartOrder:       -1,
+		StopAction:       "systemDefault",
+		StopDelay:        -1,
+		WaitForHeartbeat: types.AutoStartWaitHeartbeatSettingSystemDefault,
+	}
+
+	return cmd.ReconfigureVMs(f.Args(), powerInfo)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/autostart/autostart.go b/vendor/github.com/vmware/govmomi/govc/host/autostart/autostart.go
new file mode 100644
index 0000000000..b22b67d98a
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/autostart/autostart.go
@@ -0,0 +1,177 @@
+/*
+Copyright (c) 2015 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 autostart
+
+import (
+	"context"
+	"errors"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type AutostartFlag struct {
+	*flags.ClientFlag
+	*flags.DatacenterFlag
+	*flags.HostSystemFlag
+}
+
+func newAutostartFlag(ctx context.Context) (*AutostartFlag, context.Context) {
+	f := &AutostartFlag{}
+	f.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	f.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	f.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	return f, ctx
+}
+
+func (f *AutostartFlag) Register(ctx context.Context, fs *flag.FlagSet) {
+	f.ClientFlag.Register(ctx, fs)
+	f.DatacenterFlag.Register(ctx, fs)
+	f.HostSystemFlag.Register(ctx, fs)
+}
+
+func (f *AutostartFlag) Process(ctx context.Context) error {
+	if err := f.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := f.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := f.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+// VirtualMachines returns list of virtual machine objects based on the
+// arguments specified on the command line. This helper is defined in
+// flags.SearchFlag as well, but that pulls in other virtual machine flags that
+// are not relevant here.
+func (f *AutostartFlag) VirtualMachines(args []string) ([]*object.VirtualMachine, error) {
+	ctx := context.TODO()
+	if len(args) == 0 {
+		return nil, errors.New("no argument")
+	}
+
+	finder, err := f.Finder()
+	if err != nil {
+		return nil, err
+	}
+
+	var out []*object.VirtualMachine
+	for _, arg := range args {
+		vms, err := finder.VirtualMachineList(ctx, arg)
+		if err != nil {
+			return nil, err
+		}
+
+		out = append(out, vms...)
+	}
+
+	return out, nil
+}
+
+func (f *AutostartFlag) HostAutoStartManager() (*mo.HostAutoStartManager, error) {
+	ctx := context.TODO()
+	h, err := f.HostSystem()
+	if err != nil {
+		return nil, err
+	}
+
+	var mhs mo.HostSystem
+	err = h.Properties(ctx, h.Reference(), []string{"configManager.autoStartManager"}, &mhs)
+	if err != nil {
+		return nil, err
+	}
+
+	var mhas mo.HostAutoStartManager
+	err = h.Properties(ctx, *mhs.ConfigManager.AutoStartManager, nil, &mhas)
+	if err != nil {
+		return nil, err
+	}
+
+	return &mhas, nil
+}
+
+func (f *AutostartFlag) ReconfigureDefaults(template types.AutoStartDefaults) error {
+	ctx := context.TODO()
+	c, err := f.Client()
+	if err != nil {
+		return err
+	}
+
+	mhas, err := f.HostAutoStartManager()
+	if err != nil {
+		return err
+	}
+
+	req := types.ReconfigureAutostart{
+		This: mhas.Reference(),
+		Spec: types.HostAutoStartManagerConfig{
+			Defaults: &template,
+		},
+	}
+
+	_, err = methods.ReconfigureAutostart(ctx, c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (f *AutostartFlag) ReconfigureVMs(args []string, template types.AutoStartPowerInfo) error {
+	ctx := context.TODO()
+	c, err := f.Client()
+	if err != nil {
+		return err
+	}
+
+	mhas, err := f.HostAutoStartManager()
+	if err != nil {
+		return err
+	}
+
+	req := types.ReconfigureAutostart{
+		This: mhas.Reference(),
+		Spec: types.HostAutoStartManagerConfig{
+			PowerInfo: make([]types.AutoStartPowerInfo, 0),
+		},
+	}
+
+	vms, err := f.VirtualMachines(args)
+	if err != nil {
+		return err
+	}
+
+	for _, vm := range vms {
+		pi := template
+		pi.Key = vm.Reference()
+		req.Spec.PowerInfo = append(req.Spec.PowerInfo, pi)
+	}
+
+	_, err = methods.ReconfigureAutostart(ctx, c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/autostart/configure.go b/vendor/github.com/vmware/govmomi/govc/host/autostart/configure.go
new file mode 100644
index 0000000000..a391055a43
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/autostart/configure.go
@@ -0,0 +1,62 @@
+/*
+Copyright (c) 2015 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 autostart
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type configure struct {
+	*AutostartFlag
+
+	types.AutoStartDefaults
+}
+
+func init() {
+	cli.Register("host.autostart.configure", &configure{})
+}
+
+func (cmd *configure) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.AutostartFlag, ctx = newAutostartFlag(ctx)
+	cmd.AutostartFlag.Register(ctx, f)
+
+	f.Var(flags.NewOptionalBool(&cmd.Enabled), "enabled", "")
+	f.Var(flags.NewInt32(&cmd.StartDelay), "start-delay", "")
+	f.StringVar(&cmd.StopAction, "stop-action", "", "")
+	f.Var(flags.NewInt32(&cmd.StopDelay), "stop-delay", "")
+	f.Var(flags.NewOptionalBool(&cmd.WaitForHeartbeat), "wait-for-heartbeat", "")
+}
+
+func (cmd *configure) Process(ctx context.Context) error {
+	if err := cmd.AutostartFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *configure) Usage() string {
+	return ""
+}
+
+func (cmd *configure) Run(ctx context.Context, f *flag.FlagSet) error {
+	return cmd.ReconfigureDefaults(cmd.AutoStartDefaults)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/autostart/info.go b/vendor/github.com/vmware/govmomi/govc/host/autostart/info.go
new file mode 100644
index 0000000000..9c66cab1f3
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/autostart/info.go
@@ -0,0 +1,144 @@
+/*
+Copyright (c) 2015 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 autostart
+
+import (
+	"context"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"io"
+	"os"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/mo"
+)
+
+type info struct {
+	cli.Command
+
+	*AutostartFlag
+	*flags.OutputFlag
+}
+
+func init() {
+	cli.Register("host.autostart.info", &info{})
+}
+
+func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.AutostartFlag, ctx = newAutostartFlag(ctx)
+	cmd.AutostartFlag.Register(ctx, f)
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+}
+
+func (cmd *info) Process(ctx context.Context) error {
+	if err := cmd.AutostartFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *info) Usage() string {
+	return ""
+}
+
+func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
+	client, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	mhas, err := cmd.HostAutoStartManager()
+	if err != nil {
+		return err
+	}
+
+	return cmd.WriteResult(&infoResult{client, mhas})
+}
+
+type infoResult struct {
+	client *vim25.Client
+	mhas   *mo.HostAutoStartManager
+}
+
+func (r *infoResult) MarshalJSON() ([]byte, error) {
+	return json.Marshal(r.mhas)
+}
+
+// vmPaths resolves the paths for the VMs in the result.
+func (r *infoResult) vmPaths() (map[string]string, error) {
+	ctx := context.TODO()
+	paths := make(map[string]string)
+	for _, info := range r.mhas.Config.PowerInfo {
+		mes, err := mo.Ancestors(ctx, r.client, r.client.ServiceContent.PropertyCollector, info.Key)
+		if err != nil {
+			return nil, err
+		}
+
+		path := ""
+		for _, me := range mes {
+			// Skip root entity in building inventory path.
+			if me.Parent == nil {
+				continue
+			}
+			path += "/" + me.Name
+		}
+
+		paths[info.Key.Value] = path
+	}
+
+	return paths, nil
+}
+
+func (r *infoResult) Write(w io.Writer) error {
+	paths, err := r.vmPaths()
+	if err != nil {
+		return err
+	}
+
+	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
+
+	fmt.Fprintf(tw, "VM")
+	fmt.Fprintf(tw, "\tStartAction")
+	fmt.Fprintf(tw, "\tStartDelay")
+	fmt.Fprintf(tw, "\tStartOrder")
+	fmt.Fprintf(tw, "\tStopAction")
+	fmt.Fprintf(tw, "\tStopDelay")
+	fmt.Fprintf(tw, "\tWaitForHeartbeat")
+	fmt.Fprintf(tw, "\n")
+
+	for _, info := range r.mhas.Config.PowerInfo {
+		fmt.Fprintf(tw, "%s", paths[info.Key.Value])
+		fmt.Fprintf(tw, "\t%s", info.StartAction)
+		fmt.Fprintf(tw, "\t%d", info.StartDelay)
+		fmt.Fprintf(tw, "\t%d", info.StartOrder)
+		fmt.Fprintf(tw, "\t%s", info.StopAction)
+		fmt.Fprintf(tw, "\t%d", info.StopDelay)
+		fmt.Fprintf(tw, "\t%s", info.WaitForHeartbeat)
+		fmt.Fprintf(tw, "\n")
+	}
+
+	_ = tw.Flush()
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/autostart/remove.go b/vendor/github.com/vmware/govmomi/govc/host/autostart/remove.go
new file mode 100644
index 0000000000..af120b3380
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/autostart/remove.go
@@ -0,0 +1,62 @@
+/*
+Copyright (c) 2015 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 autostart
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type remove struct {
+	*AutostartFlag
+}
+
+func init() {
+	cli.Register("host.autostart.remove", &remove{})
+}
+
+func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.AutostartFlag, ctx = newAutostartFlag(ctx)
+	cmd.AutostartFlag.Register(ctx, f)
+}
+
+func (cmd *remove) Process(ctx context.Context) error {
+	if err := cmd.AutostartFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *remove) Usage() string {
+	return "VM..."
+}
+
+func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
+	var powerInfo = types.AutoStartPowerInfo{
+		StartAction:      "none",
+		StartDelay:       -1,
+		StartOrder:       -1,
+		StopAction:       "none",
+		StopDelay:        -1,
+		WaitForHeartbeat: types.AutoStartWaitHeartbeatSettingSystemDefault,
+	}
+
+	return cmd.ReconfigureVMs(f.Args(), powerInfo)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/cert/csr.go b/vendor/github.com/vmware/govmomi/govc/host/cert/csr.go
new file mode 100644
index 0000000000..8cd543378b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/cert/csr.go
@@ -0,0 +1,74 @@
+/*
+Copyright (c) 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 cert
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type csr struct {
+	*flags.HostSystemFlag
+
+	ip bool
+}
+
+func init() {
+	cli.Register("host.cert.csr", &csr{})
+}
+
+func (cmd *csr) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.ip, "ip", false, "Use IP address as CN")
+}
+
+func (cmd *csr) Description() string {
+	return `Generate a certificate-signing request (CSR) for HOST.`
+}
+
+func (cmd *csr) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *csr) Run(ctx context.Context, f *flag.FlagSet) error {
+	host, err := cmd.HostSystem()
+	if err != nil {
+		return err
+	}
+
+	m, err := host.ConfigManager().CertificateManager(ctx)
+	if err != nil {
+		return err
+	}
+
+	output, err := m.GenerateCertificateSigningRequest(ctx, cmd.ip)
+	if err != nil {
+		return err
+	}
+
+	_, err = fmt.Println(output)
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/cert/info.go b/vendor/github.com/vmware/govmomi/govc/host/cert/info.go
new file mode 100644
index 0000000000..ffec1ab00f
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/cert/info.go
@@ -0,0 +1,75 @@
+/*
+Copyright (c) 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 cert
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type info struct {
+	*flags.HostSystemFlag
+	*flags.OutputFlag
+}
+
+func init() {
+	cli.Register("host.cert.info", &info{})
+}
+
+func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+}
+
+func (cmd *info) Description() string {
+	return `Display SSL certificate info for HOST.`
+}
+
+func (cmd *info) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
+	host, err := cmd.HostSystem()
+	if err != nil {
+		return err
+	}
+
+	m, err := host.ConfigManager().CertificateManager(ctx)
+	if err != nil {
+		return err
+	}
+
+	info, err := m.CertificateInfo(ctx)
+	if err != nil {
+		return err
+	}
+
+	return cmd.WriteResult(info)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/cert/install.go b/vendor/github.com/vmware/govmomi/govc/host/cert/install.go
new file mode 100644
index 0000000000..8daea9900a
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/cert/install.go
@@ -0,0 +1,90 @@
+/*
+Copyright (c) 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 cert
+
+import (
+	"bytes"
+	"context"
+	"flag"
+	"io"
+	"io/ioutil"
+	"os"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type install struct {
+	*flags.HostSystemFlag
+}
+
+func init() {
+	cli.Register("host.cert.import", &install{})
+}
+
+func (cmd *install) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+}
+
+func (cmd *install) Usage() string {
+	return "FILE"
+}
+
+func (cmd *install) Description() string {
+	return `Install SSL certificate FILE on HOST.
+
+If FILE name is "-", read certificate from stdin.`
+}
+
+func (cmd *install) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *install) Run(ctx context.Context, f *flag.FlagSet) error {
+	host, err := cmd.HostSystem()
+	if err != nil {
+		return err
+	}
+
+	m, err := host.ConfigManager().CertificateManager(ctx)
+	if err != nil {
+		return err
+	}
+
+	var cert string
+
+	name := f.Arg(0)
+	if name == "-" || name == "" {
+		var buf bytes.Buffer
+		if _, err := io.Copy(&buf, os.Stdin); err != nil {
+			return err
+		}
+		cert = buf.String()
+	} else {
+		b, err := ioutil.ReadFile(name)
+		if err != nil {
+			return err
+		}
+		cert = string(b)
+	}
+
+	return m.InstallServerCertificate(ctx, cert)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/date/change.go b/vendor/github.com/vmware/govmomi/govc/host/date/change.go
new file mode 100644
index 0000000000..3287014ad7
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/date/change.go
@@ -0,0 +1,103 @@
+/*
+Copyright (c) 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 date
+
+import (
+	"context"
+	"flag"
+	"strings"
+	"time"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type change struct {
+	*flags.HostSystemFlag
+
+	types.HostNtpConfig
+	types.HostDateTimeConfig
+	date string
+}
+
+func init() {
+	cli.Register("host.date.change", &change{})
+}
+
+type serverConfig types.HostNtpConfig
+
+func (s *serverConfig) String() string {
+	return strings.Join(s.Server, ",")
+}
+
+func (s *serverConfig) Set(v string) error {
+	s.Server = append(s.Server, v)
+	return nil
+}
+
+func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	f.Var((*serverConfig)(&cmd.HostNtpConfig), "server", "IP or FQDN for NTP server(s)")
+	f.StringVar(&cmd.TimeZone, "tz", "", "Change timezone of the host")
+	f.StringVar(&cmd.date, "date", "", "Update the date/time on the host")
+}
+
+func (cmd *change) Description() string {
+	return `Change date and time for HOST.
+
+Examples:
+  govc host.date.change -date "$(date -u)"
+  govc host.date.change -server time.vmware.com
+  govc host.service enable ntpd
+  govc host.service start ntpd`
+}
+
+func (cmd *change) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *change) Run(ctx context.Context, f *flag.FlagSet) error {
+	host, err := cmd.HostSystem()
+	if err != nil {
+		return err
+	}
+
+	s, err := host.ConfigManager().DateTimeSystem(ctx)
+	if err != nil {
+		return err
+	}
+
+	if cmd.date != "" {
+		d, err := time.Parse(time.UnixDate, cmd.date)
+		if err != nil {
+			return err
+		}
+		return s.Update(ctx, d)
+	}
+
+	if len(cmd.HostNtpConfig.Server) > 0 {
+		cmd.NtpConfig = &cmd.HostNtpConfig
+	}
+
+	return s.UpdateConfig(ctx, cmd.HostDateTimeConfig)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/date/info.go b/vendor/github.com/vmware/govmomi/govc/host/date/info.go
new file mode 100644
index 0000000000..7494e186d1
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/date/info.go
@@ -0,0 +1,133 @@
+/*
+Copyright (c) 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 date
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"strings"
+	"text/tabwriter"
+	"time"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/govc/host/service"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type info struct {
+	*flags.HostSystemFlag
+	*flags.OutputFlag
+}
+
+func init() {
+	cli.Register("host.date.info", &info{})
+}
+
+func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+}
+
+func (cmd *info) Description() string {
+	return `Display date and time info for HOST.`
+}
+
+func (cmd *info) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+type dateInfo struct {
+	types.HostDateTimeInfo
+	Service *types.HostService
+	Current *time.Time
+}
+
+func (info *dateInfo) servers() string {
+	if len(info.NtpConfig.Server) == 0 {
+		return "None"
+	}
+	return strings.Join(info.NtpConfig.Server, ", ")
+}
+
+func (info *dateInfo) Write(w io.Writer) error {
+	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
+
+	fmt.Fprintf(tw, "Current date and time:\t%s\n", info.Current.Format(time.UnixDate))
+	if info.Service != nil {
+		fmt.Fprintf(tw, "NTP client status:\t%s\n", service.Policy(*info.Service))
+		fmt.Fprintf(tw, "NTP service status:\t%s\n", service.Status(*info.Service))
+	}
+	fmt.Fprintf(tw, "NTP servers:\t%s\n", info.servers())
+
+	return tw.Flush()
+}
+
+func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
+	host, err := cmd.HostSystem()
+	if err != nil {
+		return err
+	}
+
+	s, err := host.ConfigManager().DateTimeSystem(ctx)
+	if err != nil {
+		return err
+	}
+
+	var hs mo.HostDateTimeSystem
+	if err = s.Properties(ctx, s.Reference(), nil, &hs); err != nil {
+		return nil
+	}
+
+	ss, err := host.ConfigManager().ServiceSystem(ctx)
+	if err != nil {
+		return err
+	}
+
+	services, err := ss.Service(ctx)
+	if err != nil {
+		return err
+	}
+
+	res := &dateInfo{HostDateTimeInfo: hs.DateTimeInfo}
+
+	for i, service := range services {
+		if service.Key == "ntpd" {
+			res.Service = &services[i]
+			break
+		}
+	}
+
+	res.Current, err = s.Query(ctx)
+	if err != nil {
+		return err
+	}
+
+	return cmd.WriteResult(res)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/disconnect.go b/vendor/github.com/vmware/govmomi/govc/host/disconnect.go
new file mode 100644
index 0000000000..7a67b5cbcf
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/disconnect.go
@@ -0,0 +1,80 @@
+/*
+Copyright (c) 2015 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 host
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type disconnect struct {
+	*flags.HostSystemFlag
+}
+
+func init() {
+	cli.Register("host.disconnect", &disconnect{})
+}
+
+func (cmd *disconnect) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+}
+
+func (cmd *disconnect) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *disconnect) Description() string {
+	return `Disconnect HOST from vCenter.`
+}
+
+func (cmd *disconnect) Disconnect(ctx context.Context, host *object.HostSystem) error {
+	task, err := host.Disconnect(ctx)
+	if err != nil {
+		return err
+	}
+
+	logger := cmd.ProgressLogger(fmt.Sprintf("%s disconnecting... ", host.InventoryPath))
+	defer logger.Wait()
+
+	_, err = task.WaitForResult(ctx, logger)
+	return err
+}
+
+func (cmd *disconnect) Run(ctx context.Context, f *flag.FlagSet) error {
+	hosts, err := cmd.HostSystems(f.Args())
+	if err != nil {
+		return err
+	}
+
+	for _, host := range hosts {
+		err = cmd.Disconnect(ctx, host)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/esxcli/command.go b/vendor/github.com/vmware/govmomi/govc/host/esxcli/command.go
new file mode 100644
index 0000000000..c36e89a409
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/esxcli/command.go
@@ -0,0 +1,149 @@
+/*
+Copyright (c) 2014 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 esxcli
+
+import (
+	"flag"
+	"fmt"
+	"strings"
+
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type Command struct {
+	name []string
+	args []string
+}
+
+type CommandInfoItem struct {
+	Name        string `xml:"name"`
+	DisplayName string `xml:"displayName"`
+	Help        string `xml:"help"`
+}
+
+type CommandInfoParam struct {
+	CommandInfoItem
+	Aliases []string `xml:"aliases"`
+	Flag    bool     `xml:"flag"`
+}
+
+type CommandInfoHint struct {
+	Key   string `xml:"key"`
+	Value string `xml:"value"`
+}
+
+type CommandInfoHints []CommandInfoHint
+
+type CommandInfoMethod struct {
+	CommandInfoItem
+	Param []CommandInfoParam `xml:"param"`
+	Hints CommandInfoHints   `xml:"hints"`
+}
+
+type CommandInfo struct {
+	CommandInfoItem
+	Method []*CommandInfoMethod `xml:"method"`
+}
+
+func NewCommand(args []string) *Command {
+	c := &Command{}
+
+	for i, arg := range args {
+		if strings.HasPrefix(arg, "-") {
+			c.args = args[i:]
+			break
+		} else {
+			c.name = append(c.name, arg)
+		}
+	}
+
+	return c
+}
+
+func (c *Command) Namespace() string {
+	return strings.Join(c.name[:len(c.name)-1], ".")
+}
+
+func (c *Command) Name() string {
+	return c.name[len(c.name)-1]
+}
+
+func (c *Command) Method() string {
+	return "vim.EsxCLI." + strings.Join(c.name, ".")
+}
+
+func (c *Command) Moid() string {
+	return "ha-cli-handler-" + strings.Join(c.name[:len(c.name)-1], "-")
+}
+
+// Parse generates a flag.FlagSet based on the given []CommandInfoParam and
+// returns arguments for use with methods.ExecuteSoap
+func (c *Command) Parse(params []CommandInfoParam) ([]types.ReflectManagedMethodExecuterSoapArgument, error) {
+	flags := flag.NewFlagSet(strings.Join(c.name, " "), flag.ExitOnError)
+	vals := make([]string, len(params))
+
+	for i, p := range params {
+		v := &vals[i]
+		for _, a := range p.Aliases {
+			a = strings.TrimPrefix(a[1:], "-")
+			flags.StringVar(v, a, "", p.Help)
+		}
+	}
+
+	err := flags.Parse(c.args)
+	if err != nil {
+		return nil, err
+	}
+
+	args := []types.ReflectManagedMethodExecuterSoapArgument{}
+
+	for i, p := range params {
+		if vals[i] == "" {
+			continue
+		}
+		args = append(args, c.Argument(p.Name, vals[i]))
+	}
+
+	return args, nil
+}
+
+func (c *Command) Argument(name string, val string) types.ReflectManagedMethodExecuterSoapArgument {
+	return types.ReflectManagedMethodExecuterSoapArgument{
+		Name: name,
+		Val:  fmt.Sprintf("<%s>%s</%s>", name, val, name),
+	}
+}
+
+func (h CommandInfoHints) Formatter() string {
+	for _, hint := range h {
+		if hint.Key == "formatter" {
+			return hint.Value
+		}
+	}
+
+	return "simple"
+}
+
+func (h CommandInfoHints) Fields() []string {
+	for _, hint := range h {
+		if strings.HasPrefix(hint.Key, "fields:") {
+			return strings.Split(hint.Value, ",")
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/esxcli/command_test.go b/vendor/github.com/vmware/govmomi/govc/host/esxcli/command_test.go
new file mode 100644
index 0000000000..210da8459a
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/esxcli/command_test.go
@@ -0,0 +1,124 @@
+/*
+Copyright (c) 2014 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 esxcli
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+func TestSystemSettingsAdvancedSetCommand(t *testing.T) {
+	c := NewCommand([]string{"system", "settings", "advanced", "set", "-o", "/Net/GuestIPHack", "-i", "1"})
+
+	tests := []struct {
+		f      func() string
+		expect string
+	}{
+		{c.Name, "set"},
+		{c.Namespace, "system.settings.advanced"},
+		{c.Method, "vim.EsxCLI.system.settings.advanced.set"},
+		{c.Moid, "ha-cli-handler-system-settings-advanced"},
+	}
+
+	for _, test := range tests {
+		actual := test.f()
+		if actual != test.expect {
+			t.Errorf("%s != %s", actual, test.expect)
+		}
+	}
+
+	params := []CommandInfoParam{
+		{
+			CommandInfoItem: CommandInfoItem{Name: "default", DisplayName: "default", Help: "Reset the option to its default value."},
+			Aliases:         []string{"-d", "--default"},
+			Flag:            true,
+		},
+		{
+			CommandInfoItem: CommandInfoItem{Name: "intvalue", DisplayName: "int-value", Help: "If the option is an integer value use this option."},
+			Aliases:         []string{"-i", "--int-value"},
+			Flag:            false,
+		},
+		{
+			CommandInfoItem: CommandInfoItem{Name: "option", DisplayName: "option", Help: "The name of the option to set the value of. Example: \"/Misc/HostName\""},
+			Aliases:         []string{"-o", "--option"},
+			Flag:            false,
+		},
+		{
+			CommandInfoItem: CommandInfoItem{Name: "stringvalue", DisplayName: "string-value", Help: "If the option is a string use this option."},
+			Aliases:         []string{"-s", "--string-value"},
+			Flag:            false,
+		},
+	}
+
+	args, err := c.Parse(params)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	expect := []types.ReflectManagedMethodExecuterSoapArgument{
+		{
+			DynamicData: types.DynamicData{},
+			Name:        "intvalue",
+			Val:         "<intvalue>1</intvalue>",
+		},
+		{
+			DynamicData: types.DynamicData{},
+			Name:        "option",
+			Val:         "<option>/Net/GuestIPHack</option>",
+		},
+	}
+
+	if !reflect.DeepEqual(args, expect) {
+		t.Errorf("%s != %s", args, expect)
+	}
+}
+
+func TestNetworkVmListCommand(t *testing.T) {
+	c := NewCommand([]string{"network", "vm", "list"})
+
+	tests := []struct {
+		f      func() string
+		expect string
+	}{
+		{c.Name, "list"},
+		{c.Namespace, "network.vm"},
+		{c.Method, "vim.EsxCLI.network.vm.list"},
+		{c.Moid, "ha-cli-handler-network-vm"},
+	}
+
+	for _, test := range tests {
+		actual := test.f()
+		if actual != test.expect {
+			t.Errorf("%s != %s", actual, test.expect)
+		}
+	}
+
+	var params []CommandInfoParam
+
+	args, err := c.Parse(params)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	expect := []types.ReflectManagedMethodExecuterSoapArgument{}
+
+	if !reflect.DeepEqual(args, expect) {
+		t.Errorf("%s != %s", args, expect)
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/esxcli/esxcli.go b/vendor/github.com/vmware/govmomi/govc/host/esxcli/esxcli.go
new file mode 100644
index 0000000000..740193a25c
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/esxcli/esxcli.go
@@ -0,0 +1,172 @@
+/*
+Copyright (c) 2014-2015 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 esxcli
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"sort"
+	"strings"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type esxcli struct {
+	*flags.HostSystemFlag
+
+	hints bool
+}
+
+func init() {
+	cli.Register("host.esxcli", &esxcli{})
+}
+
+func (cmd *esxcli) Usage() string {
+	return "COMMAND [ARG]..."
+}
+
+func (cmd *esxcli) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.hints, "hints", true, "Use command info hints when formatting output")
+}
+
+func (cmd *esxcli) Description() string {
+	return `Invoke esxcli command on HOST.
+
+Output is rendered in table form when possible, unless disabled with '-hints=false'.
+
+Examples:
+  govc host.esxcli network ip connection list
+  govc host.esxcli system settings advanced set -o /Net/GuestIPHack -i 1
+  govc host.esxcli network firewall ruleset set -r remoteSerialPort -e true
+  govc host.esxcli network firewall set -e false`
+}
+
+func (cmd *esxcli) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *esxcli) Run(ctx context.Context, f *flag.FlagSet) error {
+	c, err := cmd.Client()
+	if err != nil {
+		return nil
+	}
+
+	host, err := cmd.HostSystem()
+	if err != nil {
+		return err
+	}
+
+	e, err := NewExecutor(c, host)
+	if err != nil {
+		return err
+	}
+
+	res, err := e.Run(f.Args())
+	if err != nil {
+		return err
+	}
+
+	if len(res.Values) == 0 {
+		return nil
+	}
+
+	return cmd.WriteResult(&result{res, cmd})
+}
+
+type result struct {
+	*Response
+	cmd *esxcli
+}
+
+func (r *result) Write(w io.Writer) error {
+	var formatType string
+	if r.cmd.hints {
+		formatType = r.Info.Hints.Formatter()
+	}
+
+	switch formatType {
+	case "table":
+		r.cmd.formatTable(w, r.Response)
+	default:
+		r.cmd.formatSimple(w, r.Response)
+	}
+
+	return nil
+}
+
+func (cmd *esxcli) formatSimple(w io.Writer, res *Response) {
+	var keys []string
+	for key := range res.Values[0] {
+		keys = append(keys, key)
+	}
+	sort.Strings(keys)
+
+	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
+
+	for i, rv := range res.Values {
+		if i > 0 {
+			fmt.Fprintln(tw)
+			_ = tw.Flush()
+		}
+		for _, key := range keys {
+			fmt.Fprintf(tw, "%s:\t%s\n", key, strings.Join(rv[key], ", "))
+		}
+	}
+
+	_ = tw.Flush()
+}
+
+func (cmd *esxcli) formatTable(w io.Writer, res *Response) {
+	fields := res.Info.Hints.Fields()
+
+	tw := tabwriter.NewWriter(w, len(fields), 0, 2, ' ', 0)
+
+	var hr []string
+	for _, name := range fields {
+		hr = append(hr, strings.Repeat("-", len(name)))
+	}
+
+	fmt.Fprintln(tw, strings.Join(fields, "\t"))
+	fmt.Fprintln(tw, strings.Join(hr, "\t"))
+
+	for _, vals := range res.Values {
+		var row []string
+
+		for _, name := range fields {
+			key := strings.Replace(name, " ", "", -1)
+			if val, ok := vals[key]; ok {
+				row = append(row, strings.Join(val, ", "))
+			} else {
+				row = append(row, "")
+			}
+		}
+
+		fmt.Fprintln(tw, strings.Join(row, "\t"))
+	}
+
+	_ = tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/esxcli/executor.go b/vendor/github.com/vmware/govmomi/govc/host/esxcli/executor.go
new file mode 100644
index 0000000000..12d148eb8b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/esxcli/executor.go
@@ -0,0 +1,168 @@
+/*
+Copyright (c) 2014-2015 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 esxcli
+
+import (
+	"context"
+	"errors"
+	"fmt"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+	"github.com/vmware/govmomi/vim25/xml"
+)
+
+type Executor struct {
+	c    *vim25.Client
+	host *object.HostSystem
+	mme  *types.ReflectManagedMethodExecuter
+	dtm  *types.InternalDynamicTypeManager
+	info map[string]*CommandInfo
+}
+
+func NewExecutor(c *vim25.Client, host *object.HostSystem) (*Executor, error) {
+	ctx := context.TODO()
+	e := &Executor{
+		c:    c,
+		host: host,
+		info: make(map[string]*CommandInfo),
+	}
+
+	{
+		req := types.RetrieveManagedMethodExecuter{
+			This: host.Reference(),
+		}
+
+		res, err := methods.RetrieveManagedMethodExecuter(ctx, c, &req)
+		if err != nil {
+			return nil, err
+		}
+
+		e.mme = res.Returnval
+	}
+
+	{
+		req := types.RetrieveDynamicTypeManager{
+			This: host.Reference(),
+		}
+
+		res, err := methods.RetrieveDynamicTypeManager(ctx, c, &req)
+		if err != nil {
+			return nil, err
+		}
+
+		e.dtm = res.Returnval
+	}
+
+	return e, nil
+}
+
+func (e *Executor) CommandInfo(c *Command) (*CommandInfoMethod, error) {
+	ns := c.Namespace()
+	var info *CommandInfo
+	var ok bool
+
+	if info, ok = e.info[ns]; !ok {
+		req := types.ExecuteSoap{
+			Moid:   "ha-dynamic-type-manager-local-cli-cliinfo",
+			Method: "vim.CLIInfo.FetchCLIInfo",
+			Argument: []types.ReflectManagedMethodExecuterSoapArgument{
+				c.Argument("typeName", "vim.EsxCLI."+ns),
+			},
+		}
+
+		info = new(CommandInfo)
+		if err := e.Execute(&req, info); err != nil {
+			return nil, err
+		}
+
+		e.info[ns] = info
+	}
+
+	name := c.Name()
+	for _, method := range info.Method {
+		if method.Name == name {
+			return method, nil
+		}
+	}
+
+	return nil, fmt.Errorf("method '%s' not found in name space '%s'", name, c.Namespace())
+}
+
+func (e *Executor) NewRequest(args []string) (*types.ExecuteSoap, *CommandInfoMethod, error) {
+	c := NewCommand(args)
+
+	info, err := e.CommandInfo(c)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	sargs, err := c.Parse(info.Param)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	sreq := types.ExecuteSoap{
+		Moid:     c.Moid(),
+		Method:   c.Method(),
+		Argument: sargs,
+	}
+
+	return &sreq, info, nil
+}
+
+func (e *Executor) Execute(req *types.ExecuteSoap, res interface{}) error {
+	ctx := context.TODO()
+	req.This = e.mme.ManagedObjectReference
+	req.Version = "urn:vim25/5.0"
+
+	x, err := methods.ExecuteSoap(ctx, e.c, req)
+	if err != nil {
+		return err
+	}
+
+	if x.Returnval != nil {
+		if x.Returnval.Fault != nil {
+			return errors.New(x.Returnval.Fault.FaultMsg)
+		}
+
+		if err := xml.Unmarshal([]byte(x.Returnval.Response), res); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (e *Executor) Run(args []string) (*Response, error) {
+	req, info, err := e.NewRequest(args)
+	if err != nil {
+		return nil, err
+	}
+
+	res := &Response{
+		Info: info,
+	}
+
+	if err := e.Execute(req, res); err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/esxcli/firewall_info.go b/vendor/github.com/vmware/govmomi/govc/host/esxcli/firewall_info.go
new file mode 100644
index 0000000000..a3feaf5ba8
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/esxcli/firewall_info.go
@@ -0,0 +1,48 @@
+/*
+Copyright (c) 2015 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 esxcli
+
+import "github.com/vmware/govmomi/object"
+
+type FirewallInfo struct {
+	Loaded        bool
+	Enabled       bool
+	DefaultAction string
+}
+
+// GetFirewallInfo via 'esxcli network firewall get'
+// The HostFirewallSystem type does not expose this data.
+// This helper can be useful in particular to determine if the firewall is enabled or disabled.
+func GetFirewallInfo(s *object.HostSystem) (*FirewallInfo, error) {
+	x, err := NewExecutor(s.Client(), s)
+	if err != nil {
+		return nil, err
+	}
+
+	res, err := x.Run([]string{"network", "firewall", "get"})
+	if err != nil {
+		return nil, err
+	}
+
+	info := &FirewallInfo{
+		Loaded:        res.Values[0]["Loaded"][0] == "true",
+		Enabled:       res.Values[0]["Enabled"][0] == "true",
+		DefaultAction: res.Values[0]["DefaultAction"][0],
+	}
+
+	return info, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/esxcli/fixtures/network_vm_list.xml b/vendor/github.com/vmware/govmomi/govc/host/esxcli/fixtures/network_vm_list.xml
new file mode 100644
index 0000000000..087144974c
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/esxcli/fixtures/network_vm_list.xml
@@ -0,0 +1,15 @@
+<obj xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:vim25" versionId="5.0" xsi:type="ArrayOfDataObject">
+ <DataObject xsi:type="VimEsxCLInetworkvmlistVM">
+  <Name>foo</Name>
+  <Networks>VM Network</Networks>
+  <Networks>dougm</Networks>
+  <NumPorts>2</NumPorts>
+  <WorldID>98842</WorldID>
+ </DataObject>
+ <DataObject xsi:type="VimEsxCLInetworkvmlistVM">
+  <Name>bar</Name>
+  <Networks>VM Network</Networks>
+  <NumPorts>1</NumPorts>
+  <WorldID>236235</WorldID>
+ </DataObject>
+</obj>
diff --git a/vendor/github.com/vmware/govmomi/govc/host/esxcli/fixtures/network_vm_port_list.xml b/vendor/github.com/vmware/govmomi/govc/host/esxcli/fixtures/network_vm_port_list.xml
new file mode 100644
index 0000000000..b9e3474a79
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/esxcli/fixtures/network_vm_port_list.xml
@@ -0,0 +1,12 @@
+<obj xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:vim25" versionId="5.0" xsi:type="ArrayOfDataObject">
+ <DataObject xsi:type="VimEsxCLInetworkvmportlistPort">
+  <DVPortID></DVPortID>
+  <IPAddress>192.168.247.149</IPAddress>
+  <MACAddress>00:0c:29:12:b2:cf</MACAddress>
+  <PortID>33554438</PortID>
+  <Portgroup>VM Network</Portgroup>
+  <TeamUplink>vmnic0</TeamUplink>
+  <UplinkPortID>33554434</UplinkPortID>
+  <vSwitch>vSwitch0</vSwitch>
+ </DataObject>
+</obj>
diff --git a/vendor/github.com/vmware/govmomi/govc/host/esxcli/fixtures/system_hostname_get.xml b/vendor/github.com/vmware/govmomi/govc/host/esxcli/fixtures/system_hostname_get.xml
new file mode 100644
index 0000000000..9c1e9462f8
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/esxcli/fixtures/system_hostname_get.xml
@@ -0,0 +1,5 @@
+<obj xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:vim25" versionId="5.0" xsi:type="VimEsxCLIsystemhostnamegetFullyQualifiedHostName">
+ <DomainName>localdomain</DomainName>
+ <FullyQualifiedDomainName>esxbox.localdomain</FullyQualifiedDomainName>
+ <HostName>esxbox</HostName>
+</obj>
diff --git a/vendor/github.com/vmware/govmomi/govc/host/esxcli/guest_info.go b/vendor/github.com/vmware/govmomi/govc/host/esxcli/guest_info.go
new file mode 100644
index 0000000000..c310a843d1
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/esxcli/guest_info.go
@@ -0,0 +1,120 @@
+/*
+Copyright (c) 2014-2015 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 esxcli
+
+import (
+	"context"
+	"strings"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type hostInfo struct {
+	*Executor
+	wids map[string]string
+}
+
+type GuestInfo struct {
+	c     *vim25.Client
+	hosts map[string]*hostInfo
+}
+
+func NewGuestInfo(c *vim25.Client) *GuestInfo {
+	return &GuestInfo{
+		c:     c,
+		hosts: make(map[string]*hostInfo),
+	}
+}
+
+func (g *GuestInfo) hostInfo(ref *types.ManagedObjectReference) (*hostInfo, error) {
+	// cache exectuor and uuid -> worldid map
+	if h, ok := g.hosts[ref.Value]; ok {
+		return h, nil
+	}
+
+	host := object.NewHostSystem(g.c, *ref)
+
+	e, err := NewExecutor(g.c, host)
+	if err != nil {
+		return nil, err
+	}
+
+	res, err := e.Run([]string{"vm", "process", "list"})
+	if err != nil {
+		return nil, err
+	}
+
+	ids := make(map[string]string, len(res.Values))
+
+	for _, process := range res.Values {
+		// Normalize uuid, esxcli and mo.VirtualMachine have different formats
+		uuid := strings.Replace(process["UUID"][0], " ", "", -1)
+		uuid = strings.Replace(uuid, "-", "", -1)
+
+		ids[uuid] = process["WorldID"][0]
+	}
+
+	h := &hostInfo{e, ids}
+	g.hosts[ref.Value] = h
+
+	return h, nil
+}
+
+// IpAddress attempts to find the guest IP address using esxcli.
+// ESX hosts must be configured with the /Net/GuestIPHack enabled.
+// For example:
+// $ govc host.esxcli -- system settings advanced set -o /Net/GuestIPHack -i 1
+func (g *GuestInfo) IpAddress(vm *object.VirtualMachine) (string, error) {
+	ctx := context.TODO()
+	const any = "0.0.0.0"
+	var mvm mo.VirtualMachine
+
+	pc := property.DefaultCollector(g.c)
+	err := pc.RetrieveOne(ctx, vm.Reference(), []string{"runtime.host", "config.uuid"}, &mvm)
+	if err != nil {
+		return "", err
+	}
+
+	h, err := g.hostInfo(mvm.Runtime.Host)
+	if err != nil {
+		return "", err
+	}
+
+	// Normalize uuid, esxcli and mo.VirtualMachine have different formats
+	uuid := strings.Replace(mvm.Config.Uuid, "-", "", -1)
+
+	if wid, ok := h.wids[uuid]; ok {
+		res, err := h.Run([]string{"network", "vm", "port", "list", "--world-id", wid})
+		if err != nil {
+			return "", err
+		}
+
+		for _, val := range res.Values {
+			if ip, ok := val["IPAddress"]; ok {
+				if ip[0] != any {
+					return ip[0], nil
+				}
+			}
+		}
+	}
+
+	return any, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/esxcli/response.go b/vendor/github.com/vmware/govmomi/govc/host/esxcli/response.go
new file mode 100644
index 0000000000..2957748c6c
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/esxcli/response.go
@@ -0,0 +1,97 @@
+/*
+Copyright (c) 2014-2015 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 esxcli
+
+import (
+	"io"
+
+	"github.com/vmware/govmomi/vim25/xml"
+)
+
+type Values map[string][]string
+
+type Response struct {
+	Info   *CommandInfoMethod
+	Values []Values
+}
+
+func (v Values) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
+	for {
+		t, err := d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+
+		if s, ok := t.(xml.StartElement); ok {
+			t, err = d.Token()
+			if err != nil {
+				return err
+			}
+
+			key := s.Name.Local
+			var val string
+			if c, ok := t.(xml.CharData); ok {
+				val = string(c)
+			}
+			v[key] = append(v[key], val)
+		}
+	}
+}
+
+func (r *Response) Type(start xml.StartElement) string {
+	for _, a := range start.Attr {
+		if a.Name.Local == "type" {
+			return a.Value
+		}
+	}
+	return ""
+}
+
+func (r *Response) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
+	stype := r.Type(start)
+
+	if stype != "ArrayOfDataObject" {
+		v := Values{}
+		if err := d.DecodeElement(&v, &start); err != nil {
+			return err
+		}
+		r.Values = append(r.Values, v)
+		return nil
+	}
+
+	for {
+		t, err := d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+
+		if s, ok := t.(xml.StartElement); ok {
+			if s.Name.Local == "DataObject" {
+				v := Values{}
+				if err := d.DecodeElement(&v, &s); err != nil {
+					return err
+				}
+				r.Values = append(r.Values, v)
+			}
+		}
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/esxcli/response_test.go b/vendor/github.com/vmware/govmomi/govc/host/esxcli/response_test.go
new file mode 100644
index 0000000000..2d96ccef2b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/esxcli/response_test.go
@@ -0,0 +1,105 @@
+/*
+Copyright (c) 2014 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 esxcli
+
+import (
+	"os"
+	"reflect"
+	"testing"
+
+	"github.com/vmware/govmomi/vim25/types"
+	"github.com/vmware/govmomi/vim25/xml"
+)
+
+func load(name string) *Response {
+	f, err := os.Open(name)
+	if err != nil {
+		panic(err)
+	}
+
+	defer f.Close()
+
+	var b Response
+
+	dec := xml.NewDecoder(f)
+	dec.TypeFunc = types.TypeFunc()
+	if err := dec.Decode(&b); err != nil {
+		panic(err)
+	}
+
+	return &b
+}
+
+func TestSystemHostnameGetResponse(t *testing.T) {
+	res := load("fixtures/system_hostname_get.xml")
+
+	expect := []Values{
+		{
+			"DomainName":               {"localdomain"},
+			"FullyQualifiedDomainName": {"esxbox.localdomain"},
+			"HostName":                 {"esxbox"},
+		},
+	}
+
+	if !reflect.DeepEqual(res.Values, expect) {
+		t.Errorf("%s != %s", res.Values, expect)
+	}
+}
+
+func TestNetworkVmList(t *testing.T) {
+	res := load("fixtures/network_vm_list.xml")
+
+	expect := []Values{
+		{
+			"Name":     {"foo"},
+			"Networks": {"VM Network", "dougm"},
+			"NumPorts": {"2"},
+			"WorldID":  {"98842"},
+		},
+		{
+			"Name":     {"bar"},
+			"Networks": {"VM Network"},
+			"NumPorts": {"1"},
+			"WorldID":  {"236235"},
+		},
+	}
+
+	if !reflect.DeepEqual(res.Values, expect) {
+		t.Errorf("%s != %s", res.Values, expect)
+	}
+}
+
+func TestNetworkVmPortList(t *testing.T) {
+	r := load("fixtures/network_vm_port_list.xml")
+
+	expect := []Values{
+		{
+			"IPAddress":    {"192.168.247.149"},
+			"MACAddress":   {"00:0c:29:12:b2:cf"},
+			"PortID":       {"33554438"},
+			"Portgroup":    {"VM Network"},
+			"TeamUplink":   {"vmnic0"},
+			"UplinkPortID": {"33554434"},
+			"vSwitch":      {"vSwitch0"},
+			"DVPortID":     {""},
+		},
+	}
+
+	if !reflect.DeepEqual(r.Values, expect) {
+		t.Errorf("%s != %s", r.Values, expect)
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/firewall/find.go b/vendor/github.com/vmware/govmomi/govc/host/firewall/find.go
new file mode 100644
index 0000000000..7492df79d4
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/firewall/find.go
@@ -0,0 +1,131 @@
+/*
+Copyright (c) 2015 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 firewall
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/govc/host/esxcli"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type find struct {
+	*flags.ClientFlag
+	*flags.OutputFlag
+	*flags.HostSystemFlag
+
+	enabled bool
+	check   bool
+
+	types.HostFirewallRule
+}
+
+func init() {
+	cli.Register("firewall.ruleset.find", &find{})
+}
+
+func (cmd *find) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.check, "c", true, "Check if esx firewall is enabled")
+	f.BoolVar(&cmd.enabled, "enabled", true, "Find enabled rule sets if true, disabled if false")
+	f.StringVar((*string)(&cmd.Direction), "direction", string(types.HostFirewallRuleDirectionOutbound), "Direction")
+	f.StringVar((*string)(&cmd.PortType), "type", string(types.HostFirewallRulePortTypeDst), "Port type")
+	f.StringVar((*string)(&cmd.Protocol), "proto", string(types.HostFirewallRuleProtocolTcp), "Protocol")
+	f.Var(flags.NewInt32(&cmd.Port), "port", "Port")
+}
+
+func (cmd *find) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *find) Description() string {
+	return `Find firewall rulesets matching the given rule.
+
+For a complete list of rulesets: govc host.esxcli network firewall ruleset list
+For a complete list of rules:    govc host.esxcli network firewall ruleset rule list
+
+Examples:
+  govc firewall.ruleset.find -direction inbound -port 22
+  govc firewall.ruleset.find -direction outbound -port 2377`
+}
+
+func (cmd *find) Run(ctx context.Context, f *flag.FlagSet) error {
+	host, err := cmd.HostSystem()
+	if err != nil {
+		return err
+	}
+
+	fs, err := host.ConfigManager().FirewallSystem(ctx)
+	if err != nil {
+		return err
+	}
+
+	if cmd.check {
+		esxfw, err := esxcli.GetFirewallInfo(host)
+		if err != nil {
+			return err
+		}
+
+		if !esxfw.Enabled {
+			fmt.Fprintln(os.Stderr, "host firewall is disabled")
+		}
+	}
+
+	info, err := fs.Info(ctx)
+	if err != nil {
+		return err
+	}
+
+	if f.NArg() != 0 {
+		// TODO: f.Args() -> types.HostFirewallRulesetIpList
+		return flag.ErrHelp
+	}
+
+	rs := object.HostFirewallRulesetList(info.Ruleset)
+	matched, err := rs.EnabledByRule(cmd.HostFirewallRule, cmd.enabled)
+
+	if err != nil {
+		return err
+	}
+
+	for _, r := range matched {
+		fmt.Println(r.Key)
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/info.go b/vendor/github.com/vmware/govmomi/govc/host/info.go
new file mode 100644
index 0000000000..ee05fcdf63
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/info.go
@@ -0,0 +1,158 @@
+/*
+Copyright (c) 2014-2015 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 host
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"os"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type info struct {
+	*flags.ClientFlag
+	*flags.OutputFlag
+	*flags.HostSystemFlag
+}
+
+func init() {
+	cli.Register("host.info", &info{})
+}
+
+func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+}
+
+func (cmd *info) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	var res infoResult
+	var props []string
+
+	if cmd.OutputFlag.JSON {
+		props = nil // Load everything
+	} else {
+		props = []string{"summary"} // Load summary
+	}
+
+	// We could do without the -host flag, leaving it for compat
+	host, err := cmd.HostSystemIfSpecified()
+	if err != nil {
+		return err
+	}
+
+	// Default only if there is a single host
+	if host == nil && f.NArg() == 0 {
+		host, err = cmd.HostSystem()
+		if err != nil {
+			return err
+		}
+	}
+
+	if host != nil {
+		res.objects = append(res.objects, host)
+	} else {
+		res.objects, err = cmd.HostSystems(f.Args())
+		if err != nil {
+			return err
+		}
+	}
+
+	if len(res.objects) != 0 {
+		refs := make([]types.ManagedObjectReference, 0, len(res.objects))
+		for _, o := range res.objects {
+			refs = append(refs, o.Reference())
+		}
+
+		pc := property.DefaultCollector(c)
+		err = pc.Retrieve(ctx, refs, props, &res.HostSystems)
+		if err != nil {
+			return err
+		}
+	}
+
+	return cmd.WriteResult(&res)
+}
+
+type infoResult struct {
+	HostSystems []mo.HostSystem
+	objects     []*object.HostSystem
+}
+
+func (r *infoResult) Write(w io.Writer) error {
+	// Maintain order via r.objects as Property collector does not always return results in order.
+	objects := make(map[types.ManagedObjectReference]mo.HostSystem, len(r.HostSystems))
+	for _, o := range r.HostSystems {
+		objects[o.Reference()] = o
+	}
+
+	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
+
+	for _, o := range r.objects {
+		host := objects[o.Reference()]
+		s := host.Summary
+		h := s.Hardware
+		z := s.QuickStats
+		ncpu := int32(h.NumCpuPkgs * h.NumCpuCores)
+		cpuUsage := 100 * float64(z.OverallCpuUsage) / float64(ncpu*h.CpuMhz)
+		memUsage := 100 * float64(z.OverallMemoryUsage<<20) / float64(h.MemorySize)
+
+		fmt.Fprintf(tw, "Name:\t%s\n", s.Config.Name)
+		fmt.Fprintf(tw, "  Path:\t%s\n", o.InventoryPath)
+		fmt.Fprintf(tw, "  Manufacturer:\t%s\n", h.Vendor)
+		fmt.Fprintf(tw, "  Logical CPUs:\t%d CPUs @ %dMHz\n", ncpu, h.CpuMhz)
+		fmt.Fprintf(tw, "  Processor type:\t%s\n", h.CpuModel)
+		fmt.Fprintf(tw, "  CPU usage:\t%d MHz (%.1f%%)\n", z.OverallCpuUsage, cpuUsage)
+		fmt.Fprintf(tw, "  Memory:\t%dMB\n", h.MemorySize/(1024*1024))
+		fmt.Fprintf(tw, "  Memory usage:\t%d MB (%.1f%%)\n", z.OverallMemoryUsage, memUsage)
+		fmt.Fprintf(tw, "  Boot time:\t%s\n", s.Runtime.BootTime)
+	}
+
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/maintenance/enter.go b/vendor/github.com/vmware/govmomi/govc/host/maintenance/enter.go
new file mode 100644
index 0000000000..697580799d
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/maintenance/enter.go
@@ -0,0 +1,93 @@
+/*
+Copyright (c) 2015 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 maintenancec
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type enter struct {
+	*flags.HostSystemFlag
+
+	timeout  int32
+	evacuate bool
+}
+
+func init() {
+	cli.Register("host.maintenance.enter", &enter{})
+}
+
+func (cmd *enter) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	f.Var(flags.NewInt32(&cmd.timeout), "timeout", "Timeout")
+	f.BoolVar(&cmd.evacuate, "evacuate", false, "Evacuate powered off VMs")
+}
+
+func (cmd *enter) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *enter) Usage() string {
+	return "HOST..."
+}
+
+func (cmd *enter) Description() string {
+	return `Put HOST in maintenance mode.
+
+While this task is running and when the host is in maintenance mode,
+no VMs can be powered on and no provisioning operations can be performed on the host.`
+}
+
+func (cmd *enter) EnterMaintenanceMode(ctx context.Context, host *object.HostSystem) error {
+	task, err := host.EnterMaintenanceMode(ctx, cmd.timeout, cmd.evacuate, nil) // TODO: spec param
+	if err != nil {
+		return err
+	}
+
+	logger := cmd.ProgressLogger(fmt.Sprintf("%s entering maintenance mode... ", host.InventoryPath))
+	defer logger.Wait()
+
+	_, err = task.WaitForResult(ctx, logger)
+	return err
+}
+
+func (cmd *enter) Run(ctx context.Context, f *flag.FlagSet) error {
+	hosts, err := cmd.HostSystems(f.Args())
+	if err != nil {
+		return err
+	}
+
+	for _, host := range hosts {
+		err = cmd.EnterMaintenanceMode(ctx, host)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/maintenance/exit.go b/vendor/github.com/vmware/govmomi/govc/host/maintenance/exit.go
new file mode 100644
index 0000000000..879a4e1723
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/maintenance/exit.go
@@ -0,0 +1,94 @@
+/*
+Copyright (c) 2015 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 maintenancec
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type exit struct {
+	*flags.HostSystemFlag
+
+	timeout int32
+}
+
+func init() {
+	cli.Register("host.maintenance.exit", &exit{})
+}
+
+func (cmd *exit) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	f.Var(flags.NewInt32(&cmd.timeout), "timeout", "Timeout")
+}
+
+func (cmd *exit) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *exit) Usage() string {
+	return "HOST..."
+}
+
+func (cmd *exit) Description() string {
+	return `Take HOST out of maintenance mode.
+
+This blocks if any concurrent running maintenance-only host configurations operations are being performed.
+For example, if VMFS volumes are being upgraded.
+
+The 'timeout' flag is the number of seconds to wait for the exit maintenance mode to succeed.
+If the timeout is less than or equal to zero, there is no timeout.`
+}
+
+func (cmd *exit) ExitMaintenanceMode(ctx context.Context, host *object.HostSystem) error {
+	task, err := host.ExitMaintenanceMode(ctx, cmd.timeout)
+	if err != nil {
+		return err
+	}
+
+	logger := cmd.ProgressLogger(fmt.Sprintf("%s exiting maintenance mode... ", host.InventoryPath))
+	defer logger.Wait()
+
+	_, err = task.WaitForResult(ctx, logger)
+	return err
+}
+
+func (cmd *exit) Run(ctx context.Context, f *flag.FlagSet) error {
+	hosts, err := cmd.HostSystems(f.Args())
+	if err != nil {
+		return err
+	}
+
+	for _, host := range hosts {
+		err = cmd.ExitMaintenanceMode(ctx, host)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/option/ls.go b/vendor/github.com/vmware/govmomi/govc/host/option/ls.go
new file mode 100644
index 0000000000..50f07648b0
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/option/ls.go
@@ -0,0 +1,108 @@
+/*
+Copyright (c) 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 option
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"os"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type ls struct {
+	*flags.ClientFlag
+	*flags.OutputFlag
+	*flags.HostSystemFlag
+}
+
+func init() {
+	cli.Register("host.option.ls", &ls{})
+}
+
+func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+}
+
+func (cmd *ls) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *ls) Usage() string {
+	return "NAME"
+}
+
+func (cmd *ls) Description() string {
+	return `List option with the given NAME.
+
+If NAME ends with a dot, all options for that subtree are listed.`
+}
+
+func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 1 {
+		return flag.ErrHelp
+	}
+
+	host, err := cmd.HostSystem()
+	if err != nil {
+		return err
+	}
+
+	m, err := host.ConfigManager().OptionManager(ctx)
+	if err != nil {
+		return err
+	}
+
+	opts, err := m.Query(ctx, f.Arg(0))
+	if err != nil {
+		return err
+	}
+
+	return cmd.WriteResult(optionResult(opts))
+}
+
+type optionResult []types.BaseOptionValue
+
+func (r optionResult) Write(w io.Writer) error {
+	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
+	for _, opt := range r {
+		o := opt.GetOptionValue()
+		fmt.Fprintf(tw, "%s:\t%v\n", o.Key, o.Value)
+	}
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/option/set.go b/vendor/github.com/vmware/govmomi/govc/host/option/set.go
new file mode 100644
index 0000000000..5e4f24a5dc
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/option/set.go
@@ -0,0 +1,123 @@
+/*
+Copyright (c) 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 option
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"strconv"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type set struct {
+	*flags.ClientFlag
+	*flags.HostSystemFlag
+}
+
+func init() {
+	cli.Register("host.option.set", &set{})
+}
+
+func (cmd *set) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+}
+
+func (cmd *set) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *set) Usage() string {
+	return "NAME VALUE"
+}
+
+func (cmd *set) Description() string {
+	return `Set host option NAME to VALUE.
+
+Examples:
+  govc host.option.set Config.HostAgent.plugins.solo.enableMob true
+  govc host.option.set Config.HostAgent.log.level verbose`
+}
+
+func (cmd *set) Run(ctx context.Context, f *flag.FlagSet) error {
+	host, err := cmd.HostSystem()
+	if err != nil {
+		return err
+	}
+
+	m, err := host.ConfigManager().OptionManager(ctx)
+	if err != nil {
+		return err
+	}
+
+	if f.NArg() != 2 {
+		return flag.ErrHelp
+	}
+
+	name := f.Arg(0)
+	opts, err := m.Query(ctx, name)
+	if err != nil {
+		return err
+	}
+
+	if len(opts) != 1 {
+		return flag.ErrHelp
+	}
+
+	val := f.Arg(1)
+	var set types.AnyType
+
+	switch x := opts[0].GetOptionValue().Value.(type) {
+	case string:
+		set = val
+	case bool:
+		set, err = strconv.ParseBool(val)
+		if err != nil {
+			return err
+		}
+	case int32:
+		s, err := strconv.ParseInt(val, 10, 32)
+		if err != nil {
+			return err
+		}
+		set = s
+	case int64:
+		set, err = strconv.ParseInt(val, 10, 64)
+		if err != nil {
+			return err
+		}
+	default:
+		return fmt.Errorf("type %T conversion not supported", x)
+	}
+
+	opts[0].GetOptionValue().Value = set
+
+	return m.Update(ctx, opts)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/portgroup/add.go b/vendor/github.com/vmware/govmomi/govc/host/portgroup/add.go
new file mode 100644
index 0000000000..40ccf9121c
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/portgroup/add.go
@@ -0,0 +1,73 @@
+/*
+Copyright (c) 2014-2015 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 portgroup
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type add struct {
+	*flags.HostSystemFlag
+
+	spec types.HostPortGroupSpec
+}
+
+func init() {
+	cli.Register("host.portgroup.add", &add{})
+}
+
+func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.spec.VswitchName, "vswitch", "", "vSwitch Name")
+	f.Var(flags.NewInt32(&cmd.spec.VlanId), "vlan", "VLAN ID")
+}
+
+func (cmd *add) Description() string {
+	return `Add portgroup to HOST.
+
+Examples:
+  govc host.portgroup.add -vswitch vSwitch0 -vlan 3201 bridge`
+}
+
+func (cmd *add) Usage() string {
+	return "NAME"
+}
+
+func (cmd *add) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
+	ns, err := cmd.HostNetworkSystem()
+	if err != nil {
+		return err
+	}
+
+	cmd.spec.Name = f.Arg(0)
+
+	return ns.AddPortGroup(ctx, cmd.spec)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/portgroup/change.go b/vendor/github.com/vmware/govmomi/govc/host/portgroup/change.go
new file mode 100644
index 0000000000..75babb532e
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/portgroup/change.go
@@ -0,0 +1,118 @@
+/*
+Copyright (c) 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 portgroup
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type change struct {
+	*flags.ClientFlag
+	*flags.HostSystemFlag
+
+	types.HostPortGroupSpec
+	types.HostNetworkSecurityPolicy
+}
+
+func init() {
+	cli.Register("host.portgroup.change", &change{})
+}
+
+func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	cmd.VlanId = -1
+	f.Var(flags.NewInt32(&cmd.VlanId), "vlan-id", "VLAN ID")
+	f.StringVar(&cmd.Name, "name", "", "Portgroup name")
+	f.StringVar(&cmd.VswitchName, "vswitch-name", "", "vSwitch name")
+
+	f.Var(flags.NewOptionalBool(&cmd.AllowPromiscuous), "allow-promiscuous", "Allow promiscuous mode")
+	f.Var(flags.NewOptionalBool(&cmd.ForgedTransmits), "forged-transmits", "Allow forged transmits")
+	f.Var(flags.NewOptionalBool(&cmd.MacChanges), "mac-changes", "Allow MAC changes")
+}
+
+func (cmd *change) Description() string {
+	return `Change configuration of HOST portgroup NAME.
+
+Examples:
+  govc host.portgroup.change -allow-promiscuous -forged-transmits -mac-changes "VM Network"
+  govc host.portgroup.change -vswitch-name vSwitch1 "Management Network"`
+}
+
+func (cmd *change) Usage() string {
+	return "NAME"
+}
+
+func (cmd *change) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *change) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 1 {
+		return flag.ErrHelp
+	}
+
+	pg, err := networkInfoPortgroup(ctx, cmd.ClientFlag, cmd.HostSystemFlag)
+	if err != nil {
+		return err
+	}
+
+	ns, err := cmd.HostNetworkSystem()
+	if err != nil {
+		return err
+	}
+
+	name := f.Arg(0)
+	var current *types.HostPortGroupSpec
+
+	for _, g := range pg {
+		if g.Spec.Name == name {
+			current = &g.Spec
+			break
+		}
+	}
+
+	if current != nil {
+		if cmd.Name == "" {
+			cmd.Name = current.Name
+		}
+		if cmd.VswitchName == "" {
+			cmd.VswitchName = current.VswitchName
+		}
+		if cmd.VlanId < 0 {
+			cmd.VlanId = current.VlanId
+		}
+	}
+
+	cmd.HostPortGroupSpec.Policy.Security = &cmd.HostNetworkSecurityPolicy
+
+	return ns.UpdatePortGroup(ctx, name, cmd.HostPortGroupSpec)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/portgroup/info.go b/vendor/github.com/vmware/govmomi/govc/host/portgroup/info.go
new file mode 100644
index 0000000000..e821c3c3c2
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/portgroup/info.go
@@ -0,0 +1,118 @@
+/*
+Copyright (c) 2014-2015 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 portgroup
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/govc/host/vswitch"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type info struct {
+	*flags.ClientFlag
+	*flags.OutputFlag
+	*flags.HostSystemFlag
+}
+
+func init() {
+	cli.Register("host.portgroup.info", &info{})
+}
+
+func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+}
+
+func (cmd *info) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func networkInfoPortgroup(ctx context.Context, c *flags.ClientFlag, h *flags.HostSystemFlag) ([]types.HostPortGroup, error) {
+	client, err := c.Client()
+	if err != nil {
+		return nil, err
+	}
+
+	ns, err := h.HostNetworkSystem()
+	if err != nil {
+		return nil, err
+	}
+
+	var mns mo.HostNetworkSystem
+
+	pc := property.DefaultCollector(client)
+	err = pc.RetrieveOne(ctx, ns.Reference(), []string{"networkInfo.portgroup"}, &mns)
+	if err != nil {
+		return nil, err
+	}
+
+	return mns.NetworkInfo.Portgroup, nil
+}
+
+func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
+	pg, err := networkInfoPortgroup(ctx, cmd.ClientFlag, cmd.HostSystemFlag)
+	if err != nil {
+		return err
+	}
+
+	r := &infoResult{pg}
+
+	return cmd.WriteResult(r)
+}
+
+type infoResult struct {
+	Portgroup []types.HostPortGroup
+}
+
+func (r *infoResult) Write(w io.Writer) error {
+	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
+
+	for i, s := range r.Portgroup {
+		if i > 0 {
+			fmt.Fprintln(tw)
+		}
+		fmt.Fprintf(tw, "Name:\t%s\n", s.Spec.Name)
+		fmt.Fprintf(tw, "Virtual switch:\t%s\n", s.Spec.VswitchName)
+		fmt.Fprintf(tw, "VLAN ID:\t%d\n", s.Spec.VlanId)
+		fmt.Fprintf(tw, "Active ports:\t%d\n", len(s.Port))
+		vswitch.HostNetworkPolicy(tw, &s.ComputedPolicy)
+	}
+
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/portgroup/remove.go b/vendor/github.com/vmware/govmomi/govc/host/portgroup/remove.go
new file mode 100644
index 0000000000..6249d575f0
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/portgroup/remove.go
@@ -0,0 +1,65 @@
+/*
+Copyright (c) 2014-2015 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 portgroup
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type remove struct {
+	*flags.HostSystemFlag
+}
+
+func init() {
+	cli.Register("host.portgroup.remove", &remove{})
+}
+
+func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+}
+
+func (cmd *remove) Description() string {
+	return `Remove portgroup from HOST.
+
+Examples:
+  govc host.portgroup.remove bridge`
+}
+
+func (cmd *remove) Usage() string {
+	return "NAME"
+}
+
+func (cmd *remove) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
+	ns, err := cmd.HostNetworkSystem()
+	if err != nil {
+		return err
+	}
+
+	return ns.RemovePortGroup(ctx, f.Arg(0))
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/reconnect.go b/vendor/github.com/vmware/govmomi/govc/host/reconnect.go
new file mode 100644
index 0000000000..f26906c368
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/reconnect.go
@@ -0,0 +1,96 @@
+/*
+Copyright (c) 2015 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 host
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type reconnect struct {
+	*flags.HostSystemFlag
+	*flags.HostConnectFlag
+
+	types.HostSystemReconnectSpec
+}
+
+func init() {
+	cli.Register("host.reconnect", &reconnect{})
+}
+
+func (cmd *reconnect) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	cmd.HostConnectFlag, ctx = flags.NewHostConnectFlag(ctx)
+	cmd.HostConnectFlag.Register(ctx, f)
+
+	cmd.HostSystemReconnectSpec.SyncState = types.NewBool(false)
+	f.BoolVar(cmd.HostSystemReconnectSpec.SyncState, "sync-state", false, "Sync state")
+}
+
+func (cmd *reconnect) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostConnectFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *reconnect) Description() string {
+	return `Reconnect HOST to vCenter.
+
+This command can also be used to change connection properties (hostname, fingerprint, username, password),
+without disconnecting the host.`
+}
+
+func (cmd *reconnect) Reconnect(ctx context.Context, host *object.HostSystem) error {
+	task, err := host.Reconnect(ctx, &cmd.HostConnectSpec, &cmd.HostSystemReconnectSpec)
+	if err != nil {
+		return err
+	}
+
+	logger := cmd.ProgressLogger(fmt.Sprintf("%s reconnecting... ", host.InventoryPath))
+	defer logger.Wait()
+
+	_, err = task.WaitForResult(ctx, logger)
+	return err
+}
+
+func (cmd *reconnect) Run(ctx context.Context, f *flag.FlagSet) error {
+	hosts, err := cmd.HostSystems(f.Args())
+	if err != nil {
+		return err
+	}
+
+	for _, host := range hosts {
+		err = cmd.Reconnect(ctx, host)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/remove.go b/vendor/github.com/vmware/govmomi/govc/host/remove.go
new file mode 100644
index 0000000000..6c2ef70800
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/remove.go
@@ -0,0 +1,100 @@
+/*
+Copyright (c) 2015 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 host
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/mo"
+)
+
+type remove struct {
+	*flags.HostSystemFlag
+}
+
+func init() {
+	cli.Register("host.remove", &remove{})
+}
+
+func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+}
+
+func (cmd *remove) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *remove) Usage() string {
+	return "HOST..."
+}
+
+func (cmd *remove) Description() string {
+	return `Remove HOST from vCenter.`
+}
+
+func (cmd *remove) Remove(ctx context.Context, host *object.HostSystem) error {
+	var h mo.HostSystem
+	err := host.Properties(ctx, host.Reference(), []string{"parent"}, &h)
+	if err != nil {
+		return err
+	}
+
+	remove := host.Destroy
+
+	if h.Parent.Type == "ComputeResource" {
+		// Standalone host.  From the docs:
+		// "Invoking remove on a HostSystem of standalone type throws a NotSupported fault.
+		//  A standalone HostSystem can be removeed only by invoking remove on its parent ComputeResource."
+		remove = object.NewComputeResource(host.Client(), *h.Parent).Destroy
+	}
+
+	task, err := remove(ctx)
+	if err != nil {
+		return err
+	}
+
+	logger := cmd.ProgressLogger(fmt.Sprintf("%s removing... ", host.InventoryPath))
+	defer logger.Wait()
+
+	_, err = task.WaitForResult(ctx, logger)
+	return err
+}
+
+func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
+	hosts, err := cmd.HostSystems(f.Args())
+	if err != nil {
+		return err
+	}
+
+	for _, host := range hosts {
+		err = cmd.Remove(ctx, host)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/service/command.go b/vendor/github.com/vmware/govmomi/govc/host/service/command.go
new file mode 100644
index 0000000000..8290d1391c
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/service/command.go
@@ -0,0 +1,125 @@
+/*
+Copyright (c) 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 service
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type service struct {
+	*flags.ClientFlag
+	*flags.HostSystemFlag
+}
+
+func init() {
+	cli.Register("host.service", &service{})
+}
+
+func (cmd *service) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+}
+
+func (cmd *service) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *service) Usage() string {
+	return "ACTION ID"
+}
+
+func (cmd *service) Description() string {
+	return `Apply host service ACTION to service ID.
+
+Where ACTION is one of: start, stop, restart, status, enable, disable
+
+Examples:
+  govc host.service enable TSM-SSH
+  govc host.service start TSM-SSH`
+}
+
+func (cmd *service) status(ctx context.Context, s *object.HostServiceSystem, id string) (string, error) {
+	services, err := s.Service(ctx)
+	if err != nil {
+		return "", err
+	}
+
+	for _, service := range services {
+		if id == service.Key {
+			return Status(service), nil
+		}
+	}
+
+	return "N/A", nil
+}
+
+func (cmd *service) Run(ctx context.Context, f *flag.FlagSet) error {
+	host, err := cmd.HostSystem()
+	if err != nil {
+		return err
+	}
+
+	if f.NArg() != 2 {
+		return flag.ErrHelp
+	}
+
+	arg := f.Arg(0)
+	id := f.Arg(1)
+
+	s, err := host.ConfigManager().ServiceSystem(ctx)
+	if err != nil {
+		return err
+	}
+
+	switch arg {
+	case "start":
+		return s.Start(ctx, id)
+	case "stop":
+		return s.Stop(ctx, id)
+	case "restart":
+		return s.Restart(ctx, id)
+	case "status":
+		ss, err := cmd.status(ctx, s, id)
+		if err != nil {
+			return err
+		}
+		fmt.Println(ss)
+		return nil
+	case "enable":
+		return s.UpdatePolicy(ctx, id, string(types.HostServicePolicyOn))
+	case "disable":
+		return s.UpdatePolicy(ctx, id, string(types.HostServicePolicyOff))
+	}
+
+	return flag.ErrHelp
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/service/ls.go b/vendor/github.com/vmware/govmomi/govc/host/service/ls.go
new file mode 100644
index 0000000000..f5a65708ca
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/service/ls.go
@@ -0,0 +1,120 @@
+/*
+Copyright (c) 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 service
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type ls struct {
+	*flags.ClientFlag
+	*flags.OutputFlag
+	*flags.HostSystemFlag
+}
+
+func init() {
+	cli.Register("host.service.ls", &ls{})
+}
+
+func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+}
+
+func (cmd *ls) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *ls) Description() string {
+	return `List HOST services.`
+}
+
+func Status(s types.HostService) string {
+	if s.Running {
+		return "Running"
+	}
+	return "Stopped"
+}
+
+func Policy(s types.HostService) string {
+	switch types.HostServicePolicy(s.Policy) {
+	case types.HostServicePolicyOff:
+		return "Disabled"
+	case types.HostServicePolicyOn:
+		return "Enabled"
+	case types.HostServicePolicyAutomatic:
+		return "Automatic"
+	default:
+		return s.Policy
+	}
+}
+
+func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
+	host, err := cmd.HostSystem()
+	if err != nil {
+		return err
+	}
+
+	s, err := host.ConfigManager().ServiceSystem(ctx)
+	if err != nil {
+		return err
+	}
+
+	services, err := s.Service(ctx)
+	if err != nil {
+		return err
+	}
+
+	return cmd.WriteResult(optionResult(services))
+}
+
+type optionResult []types.HostService
+
+func (services optionResult) Write(w io.Writer) error {
+	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
+
+	fmt.Fprintf(tw, "%s\t%s\t%v\t%s\n", "Key", "Policy", "Status", "Label")
+
+	for _, s := range services {
+		fmt.Fprintf(tw, "%s\t%s\t%s\t%s\n", s.Key, s.Policy, Status(s), s.Label)
+	}
+
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/storage/info.go b/vendor/github.com/vmware/govmomi/govc/host/storage/info.go
new file mode 100644
index 0000000000..4d73d876e3
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/storage/info.go
@@ -0,0 +1,227 @@
+/*
+Copyright (c) 2015 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 storage
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"strings"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/units"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+var infoTypes = []string{"hba", "lun"}
+
+type infoType string
+
+func (t *infoType) Set(s string) error {
+	s = strings.ToLower(s)
+
+	for _, e := range infoTypes {
+		if s == e {
+			*t = infoType(s)
+			return nil
+		}
+	}
+
+	return fmt.Errorf("invalid type")
+}
+
+func (t *infoType) String() string {
+	return string(*t)
+}
+
+func (t *infoType) Result(hss mo.HostStorageSystem) flags.OutputWriter {
+	switch string(*t) {
+	case "hba":
+		return hbaResult(hss)
+	case "lun":
+		return lunResult(hss)
+	default:
+		panic("unsupported")
+	}
+}
+
+type info struct {
+	*flags.HostSystemFlag
+	*flags.OutputFlag
+
+	typ       infoType
+	rescan    bool
+	unclaimed bool
+}
+
+func init() {
+	cli.Register("host.storage.info", &info{})
+}
+
+func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	err := cmd.typ.Set("lun")
+	if err != nil {
+		panic(err)
+	}
+
+	f.Var(&cmd.typ, "t", fmt.Sprintf("Type (%s)", strings.Join(infoTypes, ",")))
+
+	f.BoolVar(&cmd.rescan, "rescan", false, "Rescan for new storage devices")
+	f.BoolVar(&cmd.unclaimed, "unclaimed", false, "Only show disks that can be used as new VMFS datastores")
+}
+
+func (cmd *info) Description() string {
+	return `Show HOST storage system information.
+
+Examples:
+  govc ls -t HostSystem host/* | xargs -n1 govc host.storage.info -unclaimed -host`
+}
+
+func (cmd *info) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
+	host, err := cmd.HostSystem()
+	if err != nil {
+		return err
+	}
+
+	ss, err := host.ConfigManager().StorageSystem(ctx)
+	if err != nil {
+		return err
+	}
+
+	if cmd.rescan {
+		err = ss.RescanAllHba(ctx)
+		if err != nil {
+			return err
+		}
+	}
+
+	var hss mo.HostStorageSystem
+	err = ss.Properties(ctx, ss.Reference(), nil, &hss)
+	if err != nil {
+		return nil
+	}
+
+	if cmd.unclaimed {
+		ds, err := host.ConfigManager().DatastoreSystem(ctx)
+		if err != nil {
+			return err
+		}
+
+		disks, err := ds.QueryAvailableDisksForVmfs(ctx)
+		if err != nil {
+			return err
+		}
+
+		var luns []types.BaseScsiLun
+		for i := range disks {
+			luns = append(luns, &disks[i])
+		}
+		hss.StorageDeviceInfo.ScsiLun = luns
+	}
+
+	return cmd.WriteResult(cmd.typ.Result(hss))
+}
+
+type hbaResult mo.HostStorageSystem
+
+func (r hbaResult) Write(w io.Writer) error {
+	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
+
+	fmt.Fprintf(tw, "Device\t")
+	fmt.Fprintf(tw, "PCI\t")
+	fmt.Fprintf(tw, "Driver\t")
+	fmt.Fprintf(tw, "Status\t")
+	fmt.Fprintf(tw, "Model\t")
+	fmt.Fprintf(tw, "\n")
+
+	for _, e := range r.StorageDeviceInfo.HostBusAdapter {
+		hba := e.GetHostHostBusAdapter()
+
+		fmt.Fprintf(tw, "%s\t", hba.Device)
+		fmt.Fprintf(tw, "%s\t", hba.Pci)
+		fmt.Fprintf(tw, "%s\t", hba.Driver)
+		fmt.Fprintf(tw, "%s\t", hba.Status)
+		fmt.Fprintf(tw, "%s\t", hba.Model)
+		fmt.Fprintf(tw, "\n")
+	}
+
+	return tw.Flush()
+}
+
+type lunResult mo.HostStorageSystem
+
+func (r lunResult) Write(w io.Writer) error {
+	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
+
+	fmt.Fprintf(tw, "Name\t")
+	fmt.Fprintf(tw, "Type\t")
+	fmt.Fprintf(tw, "Capacity\t")
+	fmt.Fprintf(tw, "Model\t")
+	fmt.Fprintf(tw, "\n")
+
+	for _, e := range r.StorageDeviceInfo.ScsiLun {
+		var tags []string
+		var capacity int64
+
+		lun := e.GetScsiLun()
+		if disk, ok := e.(*types.HostScsiDisk); ok {
+			capacity = int64(disk.Capacity.Block) * int64(disk.Capacity.BlockSize)
+			if disk.LocalDisk != nil && *disk.LocalDisk {
+				tags = append(tags, "local")
+			}
+			if disk.Ssd != nil && *disk.Ssd {
+				tags = append(tags, "ssd")
+			}
+		}
+
+		fmt.Fprintf(tw, "%s\t", lun.DeviceName)
+		fmt.Fprintf(tw, "%s\t", lun.DeviceType)
+
+		if capacity == 0 {
+			fmt.Fprintf(tw, "-\t")
+		} else {
+			fmt.Fprintf(tw, "%s\t", units.ByteSize(capacity))
+		}
+
+		fmt.Fprintf(tw, "%s", lun.Model)
+		if len(tags) > 0 {
+			fmt.Fprintf(tw, " (%s)", strings.Join(tags, ","))
+		}
+		fmt.Fprintf(tw, "\n")
+	}
+
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/storage/mark.go b/vendor/github.com/vmware/govmomi/govc/host/storage/mark.go
new file mode 100644
index 0000000000..badb2a720f
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/storage/mark.go
@@ -0,0 +1,141 @@
+/*
+Copyright (c) 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 storage
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type mark struct {
+	*flags.HostSystemFlag
+
+	ssd   *bool
+	local *bool
+}
+
+func init() {
+	cli.Register("host.storage.mark", &mark{})
+}
+
+func (cmd *mark) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	f.Var(flags.NewOptionalBool(&cmd.ssd), "ssd", "Mark as SSD")
+	f.Var(flags.NewOptionalBool(&cmd.local), "local", "Mark as local")
+}
+
+func (cmd *mark) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *mark) Usage() string {
+	return "DEVICE_PATH"
+}
+
+func (cmd *mark) Description() string {
+	return `Mark device at DEVICE_PATH.`
+}
+
+func (cmd *mark) Mark(ctx context.Context, ss *object.HostStorageSystem, uuid string) error {
+	var err error
+	var task *object.Task
+
+	if cmd.ssd != nil {
+		if *cmd.ssd {
+			task, err = ss.MarkAsSsd(ctx, uuid)
+		} else {
+			task, err = ss.MarkAsNonSsd(ctx, uuid)
+		}
+
+		if err != nil {
+			return err
+		}
+
+		err = task.Wait(ctx)
+		if err != nil {
+			return err
+		}
+	}
+
+	if cmd.local != nil {
+		if *cmd.local {
+			task, err = ss.MarkAsLocal(ctx, uuid)
+		} else {
+			task, err = ss.MarkAsNonLocal(ctx, uuid)
+		}
+
+		if err != nil {
+			return err
+		}
+
+		err = task.Wait(ctx)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (cmd *mark) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 1 {
+		return fmt.Errorf("specify device path")
+	}
+
+	path := f.Args()[0]
+
+	host, err := cmd.HostSystem()
+	if err != nil {
+		return err
+	}
+
+	ss, err := host.ConfigManager().StorageSystem(ctx)
+	if err != nil {
+		return err
+	}
+
+	var hss mo.HostStorageSystem
+	err = ss.Properties(ctx, ss.Reference(), nil, &hss)
+	if err != nil {
+		return nil
+	}
+
+	for _, e := range hss.StorageDeviceInfo.ScsiLun {
+		disk, ok := e.(*types.HostScsiDisk)
+		if !ok {
+			continue
+		}
+
+		if disk.DevicePath == path {
+			return cmd.Mark(ctx, ss, disk.Uuid)
+		}
+	}
+
+	return fmt.Errorf("%s not found", path)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/storage/partition.go b/vendor/github.com/vmware/govmomi/govc/host/storage/partition.go
new file mode 100644
index 0000000000..7ed6e17209
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/storage/partition.go
@@ -0,0 +1,126 @@
+/*
+Copyright (c) 2015 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 storage
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/units"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type partition struct {
+	*flags.HostSystemFlag
+	*flags.OutputFlag
+}
+
+func init() {
+	cli.Register("host.storage.partition", &partition{})
+}
+
+func (cmd *partition) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+}
+
+func (cmd *partition) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *partition) Usage() string {
+	return "DEVICE_PATH"
+}
+
+func (cmd *partition) Description() string {
+	return `Show partition table for device at DEVICE_PATH.`
+}
+
+func (cmd *partition) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 1 {
+		return fmt.Errorf("specify device path")
+	}
+
+	path := f.Args()[0]
+
+	host, err := cmd.HostSystem()
+	if err != nil {
+		return err
+	}
+
+	ss, err := host.ConfigManager().StorageSystem(ctx)
+	if err != nil {
+		return err
+	}
+
+	var hss mo.HostStorageSystem
+	err = ss.Properties(ctx, ss.Reference(), nil, &hss)
+	if err != nil {
+		return nil
+	}
+
+	info, err := ss.RetrieveDiskPartitionInfo(ctx, path)
+	if err != nil {
+		return err
+	}
+
+	return cmd.WriteResult(partitionInfo(*info))
+}
+
+type partitionInfo types.HostDiskPartitionInfo
+
+func (p partitionInfo) Write(w io.Writer) error {
+	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
+
+	fmt.Fprintf(tw, "Table format: %s\n", p.Spec.PartitionFormat)
+	fmt.Fprintf(tw, "Number of sectors: %d\n", p.Spec.TotalSectors)
+	fmt.Fprintf(tw, "\n")
+
+	fmt.Fprintf(tw, "Number\t")
+	fmt.Fprintf(tw, "Start\t")
+	fmt.Fprintf(tw, "End\t")
+	fmt.Fprintf(tw, "Size\t")
+	fmt.Fprintf(tw, "Type\t")
+	fmt.Fprintf(tw, "\n")
+
+	for _, e := range p.Spec.Partition {
+		sectors := e.EndSector - e.StartSector
+
+		fmt.Fprintf(tw, "%d\t", e.Partition)
+		fmt.Fprintf(tw, "%d\t", e.StartSector)
+		fmt.Fprintf(tw, "%d\t", e.EndSector)
+		fmt.Fprintf(tw, "%s\t", units.ByteSize(sectors*512))
+		fmt.Fprintf(tw, "%s\t", e.Type)
+		fmt.Fprintf(tw, "\n")
+	}
+
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/vnic/info.go b/vendor/github.com/vmware/govmomi/govc/host/vnic/info.go
new file mode 100644
index 0000000000..3b6ed0a1ce
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/vnic/info.go
@@ -0,0 +1,146 @@
+/*
+Copyright (c) 2015 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 vnic
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+	"strings"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type info struct {
+	*flags.HostSystemFlag
+}
+
+func init() {
+	cli.Register("host.vnic.info", &info{})
+}
+
+func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+}
+
+func (cmd *info) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
+	host, err := cmd.HostSystem()
+	if err != nil {
+		return err
+	}
+
+	ns, err := cmd.HostNetworkSystem()
+	if err != nil {
+		return err
+	}
+
+	var mns mo.HostNetworkSystem
+
+	m, err := host.ConfigManager().VirtualNicManager(ctx)
+	if err != nil {
+		return err
+	}
+
+	info, err := m.Info(ctx)
+	if err != nil {
+		return err
+	}
+
+	err = ns.Properties(ctx, ns.Reference(), []string{"networkInfo"}, &mns)
+	if err != nil {
+		return err
+	}
+
+	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
+
+	type dnet struct {
+		dvp mo.DistributedVirtualPortgroup
+		dvs mo.VmwareDistributedVirtualSwitch
+	}
+
+	dnets := make(map[string]*dnet)
+
+	for _, nic := range mns.NetworkInfo.Vnic {
+		fmt.Fprintf(tw, "Device:\t%s\n", nic.Device)
+
+		if dvp := nic.Spec.DistributedVirtualPort; dvp != nil {
+			dn, ok := dnets[dvp.PortgroupKey]
+
+			if !ok {
+				dn = new(dnet)
+				o := object.NewDistributedVirtualPortgroup(host.Client(), types.ManagedObjectReference{
+					Type:  "DistributedVirtualPortgroup",
+					Value: dvp.PortgroupKey,
+				})
+
+				err = o.Properties(ctx, o.Reference(), []string{"name", "config.distributedVirtualSwitch"}, &dn.dvp)
+				if err != nil {
+					return err
+				}
+
+				err = o.Properties(ctx, *dn.dvp.Config.DistributedVirtualSwitch, []string{"name"}, &dn.dvs)
+				if err != nil {
+					return err
+				}
+
+				dnets[dvp.PortgroupKey] = dn
+			}
+
+			fmt.Fprintf(tw, "Network label:\t%s\n", dn.dvp.Name)
+			fmt.Fprintf(tw, "Switch:\t%s\n", dn.dvs.Name)
+		} else {
+			fmt.Fprintf(tw, "Network label:\t%s\n", nic.Portgroup)
+			for _, pg := range mns.NetworkInfo.Portgroup {
+				if pg.Spec.Name == nic.Portgroup {
+					fmt.Fprintf(tw, "Switch:\t%s\n", pg.Spec.VswitchName)
+					break
+				}
+			}
+		}
+
+		fmt.Fprintf(tw, "IP address:\t%s\n", nic.Spec.Ip.IpAddress)
+		fmt.Fprintf(tw, "TCP/IP stack:\t%s\n", nic.Spec.NetStackInstanceKey)
+
+		var services []string
+		for _, nc := range info.NetConfig {
+			for _, dev := range nc.SelectedVnic {
+				key := nc.NicType + "." + nic.Key
+				if dev == key {
+					services = append(services, nc.NicType)
+				}
+			}
+
+		}
+		fmt.Fprintf(tw, "Enabled services:\t%s\n", strings.Join(services, ", "))
+	}
+
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/vnic/service.go b/vendor/github.com/vmware/govmomi/govc/host/vnic/service.go
new file mode 100644
index 0000000000..c80071f45c
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/vnic/service.go
@@ -0,0 +1,120 @@
+/*
+Copyright (c) 2015 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 vnic
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"strings"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type service struct {
+	*flags.HostSystemFlag
+
+	Enable  bool
+	Disable bool
+}
+
+func init() {
+	cli.Register("host.vnic.service", &service{})
+}
+
+func (cmd *service) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.Enable, "enable", false, "Enable service")
+	f.BoolVar(&cmd.Disable, "disable", false, "Disable service")
+}
+
+func (cmd *service) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	// Either may be true or none may be true.
+	if cmd.Enable && cmd.Disable {
+		return flag.ErrHelp
+	}
+
+	return nil
+}
+
+func (cmd *service) Usage() string {
+	return "SERVICE DEVICE"
+}
+
+func (cmd *service) Description() string {
+	nicTypes := []string{
+		string(types.HostVirtualNicManagerNicTypeVmotion),
+		string(types.HostVirtualNicManagerNicTypeFaultToleranceLogging),
+		string(types.HostVirtualNicManagerNicTypeVSphereReplication),
+		string(types.HostVirtualNicManagerNicTypeVSphereReplicationNFC),
+		string(types.HostVirtualNicManagerNicTypeManagement),
+		string(types.HostVirtualNicManagerNicTypeVsan),
+		string(types.HostVirtualNicManagerNicTypeVSphereProvisioning),
+	}
+
+	return fmt.Sprintf(`
+Enable or disable service on a virtual nic device.
+
+Where SERVICE is one of: %s
+Where DEVICE is one of: %s
+
+Examples:
+  govc host.vnic.service -host hostname -enable vsan vmk0
+`,
+		strings.Join(nicTypes, "|"),
+		strings.Join([]string{"vmk0", "vmk1", "..."}, "|"))
+}
+
+func (cmd *service) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 2 {
+		return flag.ErrHelp
+	}
+
+	service := f.Arg(0)
+	device := f.Arg(1)
+
+	host, err := cmd.HostSystem()
+	if err != nil {
+		return err
+	}
+
+	m, err := host.ConfigManager().VirtualNicManager(ctx)
+	if err != nil {
+		return err
+	}
+
+	var method func(context.Context, string, string) error
+
+	if cmd.Enable {
+		method = m.SelectVnic
+	} else if cmd.Disable {
+		method = m.DeselectVnic
+	}
+
+	if method == nil {
+		return flag.ErrHelp
+	}
+
+	return method(ctx, service, device)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/vswitch/add.go b/vendor/github.com/vmware/govmomi/govc/host/vswitch/add.go
new file mode 100644
index 0000000000..ebbe5301a0
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/vswitch/add.go
@@ -0,0 +1,73 @@
+/*
+Copyright (c) 2014-2015 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 vswitch
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type add struct {
+	*flags.HostSystemFlag
+
+	nic  string
+	spec types.HostVirtualSwitchSpec
+}
+
+func init() {
+	cli.Register("host.vswitch.add", &add{})
+}
+
+func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	cmd.spec.NumPorts = 128 // default
+	f.Var(flags.NewInt32(&cmd.spec.NumPorts), "ports", "Number of ports")
+	f.Var(flags.NewInt32(&cmd.spec.Mtu), "mtu", "MTU")
+	f.StringVar(&cmd.nic, "nic", "", "Bridge nic device")
+}
+
+func (cmd *add) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *add) Usage() string {
+	return "NAME"
+}
+
+func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
+	ns, err := cmd.HostNetworkSystem()
+	if err != nil {
+		return err
+	}
+
+	if cmd.nic != "" {
+		cmd.spec.Bridge = &types.HostVirtualSwitchBondBridge{
+			NicDevice: []string{cmd.nic},
+		}
+	}
+
+	return ns.AddVirtualSwitch(ctx, f.Arg(0), &cmd.spec)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/vswitch/info.go b/vendor/github.com/vmware/govmomi/govc/host/vswitch/info.go
new file mode 100644
index 0000000000..f60a77b22d
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/vswitch/info.go
@@ -0,0 +1,134 @@
+/*
+Copyright (c) 2014-2015 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 vswitch
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"strings"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type info struct {
+	*flags.ClientFlag
+	*flags.OutputFlag
+	*flags.HostSystemFlag
+}
+
+func init() {
+	cli.Register("host.vswitch.info", &info{})
+}
+
+func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+}
+
+func (cmd *info) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
+	client, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	ns, err := cmd.HostNetworkSystem()
+	if err != nil {
+		return err
+	}
+
+	var mns mo.HostNetworkSystem
+
+	pc := property.DefaultCollector(client)
+	err = pc.RetrieveOne(ctx, ns.Reference(), []string{"networkInfo.vswitch"}, &mns)
+	if err != nil {
+		return err
+	}
+
+	r := &infoResult{mns.NetworkInfo.Vswitch}
+
+	return cmd.WriteResult(r)
+}
+
+type infoResult struct {
+	Vswitch []types.HostVirtualSwitch
+}
+
+func (r *infoResult) Write(w io.Writer) error {
+	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
+
+	for i, s := range r.Vswitch {
+		if i > 0 {
+			fmt.Fprintln(tw)
+		}
+		fmt.Fprintf(tw, "Name:\t%s\n", s.Name)
+		fmt.Fprintf(tw, "Portgroup:\t%s\n", keys("key-vim.host.PortGroup-", s.Portgroup))
+		fmt.Fprintf(tw, "Pnic:\t%s\n", keys("key-vim.host.PhysicalNic-", s.Pnic))
+		fmt.Fprintf(tw, "MTU:\t%d\n", s.Mtu)
+		fmt.Fprintf(tw, "Ports:\t%d\n", s.NumPorts)
+		fmt.Fprintf(tw, "Ports Available:\t%d\n", s.NumPortsAvailable)
+		HostNetworkPolicy(tw, s.Spec.Policy)
+	}
+
+	return tw.Flush()
+}
+
+func keys(key string, vals []string) string {
+	for i, val := range vals {
+		vals[i] = strings.TrimPrefix(val, key)
+	}
+	return strings.Join(vals, ", ")
+}
+
+func enabled(b *bool) string {
+	if b != nil && *b {
+		return "Yes"
+	}
+	return "No"
+}
+
+func HostNetworkPolicy(w io.Writer, p *types.HostNetworkPolicy) {
+	if p == nil || p.Security == nil {
+		return // e.g. Workstation
+	}
+	fmt.Fprintf(w, "Allow promiscuous mode:\t%s\n", enabled(p.Security.AllowPromiscuous))
+	fmt.Fprintf(w, "Allow forged transmits:\t%s\n", enabled(p.Security.ForgedTransmits))
+	fmt.Fprintf(w, "Allow MAC changes:\t%s\n", enabled(p.Security.MacChanges))
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/host/vswitch/remove.go b/vendor/github.com/vmware/govmomi/govc/host/vswitch/remove.go
new file mode 100644
index 0000000000..0810670074
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/host/vswitch/remove.go
@@ -0,0 +1,58 @@
+/*
+Copyright (c) 2014-2015 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 vswitch
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type remove struct {
+	*flags.HostSystemFlag
+}
+
+func init() {
+	cli.Register("host.vswitch.remove", &remove{})
+}
+
+func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+}
+
+func (cmd *remove) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *remove) Usage() string {
+	return "NAME"
+}
+
+func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
+	ns, err := cmd.HostNetworkSystem()
+	if err != nil {
+		return err
+	}
+
+	return ns.RemoveVirtualSwitch(ctx, f.Arg(0))
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/importx/archive.go b/vendor/github.com/vmware/govmomi/govc/importx/archive.go
new file mode 100644
index 0000000000..e49d14d6e2
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/importx/archive.go
@@ -0,0 +1,149 @@
+/*
+Copyright (c) 2014-2015 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 importx
+
+import (
+	"archive/tar"
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"path"
+	"path/filepath"
+
+	"github.com/vmware/govmomi/ovf"
+)
+
+// ArchiveFlag doesn't register any flags;
+// only encapsulates some common archive related functionality.
+type ArchiveFlag struct {
+	Archive
+}
+
+func newArchiveFlag(ctx context.Context) (*ArchiveFlag, context.Context) {
+	return &ArchiveFlag{}, ctx
+}
+
+func (f *ArchiveFlag) Register(ctx context.Context, fs *flag.FlagSet) {
+}
+
+func (f *ArchiveFlag) Process(ctx context.Context) error {
+	return nil
+}
+
+func (f *ArchiveFlag) ReadOvf(fpath string) ([]byte, error) {
+	r, _, err := f.Archive.Open(fpath)
+	if err != nil {
+		return nil, err
+	}
+	defer r.Close()
+
+	return ioutil.ReadAll(r)
+}
+
+func (f *ArchiveFlag) ReadEnvelope(fpath string) (*ovf.Envelope, error) {
+	if fpath == "" {
+		return &ovf.Envelope{}, nil
+	}
+
+	r, _, err := f.Open(fpath)
+	if err != nil {
+		return nil, err
+	}
+	defer r.Close()
+
+	e, err := ovf.Unmarshal(r)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse ovf: %s", err.Error())
+	}
+
+	return e, nil
+}
+
+type Archive interface {
+	Open(string) (io.ReadCloser, int64, error)
+}
+
+type TapeArchive struct {
+	path string
+}
+
+type TapeArchiveEntry struct {
+	io.Reader
+	f *os.File
+}
+
+func (t *TapeArchiveEntry) Close() error {
+	return t.f.Close()
+}
+
+func (t *TapeArchive) Open(name string) (io.ReadCloser, int64, error) {
+	f, err := os.Open(t.path)
+	if err != nil {
+		return nil, 0, err
+	}
+
+	r := tar.NewReader(f)
+
+	for {
+		h, err := r.Next()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return nil, 0, err
+		}
+
+		matched, err := filepath.Match(name, path.Base(h.Name))
+		if err != nil {
+			return nil, 0, err
+		}
+
+		if matched {
+			return &TapeArchiveEntry{r, f}, h.Size, nil
+		}
+	}
+
+	_ = f.Close()
+
+	return nil, 0, os.ErrNotExist
+}
+
+type FileArchive struct {
+	path string
+}
+
+func (t *FileArchive) Open(name string) (io.ReadCloser, int64, error) {
+	fpath := name
+	if name != t.path {
+		fpath = filepath.Join(filepath.Dir(t.path), name)
+	}
+
+	s, err := os.Stat(fpath)
+	if err != nil {
+		return nil, 0, err
+	}
+
+	f, err := os.Open(fpath)
+	if err != nil {
+		return nil, 0, err
+	}
+
+	return f, s.Size(), nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/importx/folder.go b/vendor/github.com/vmware/govmomi/govc/importx/folder.go
new file mode 100644
index 0000000000..427c29b10d
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/importx/folder.go
@@ -0,0 +1,91 @@
+/*
+Copyright (c) 2015 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 importx
+
+import (
+	"context"
+	"errors"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type FolderFlag struct {
+	*flags.DatacenterFlag
+
+	folder string
+}
+
+func newFolderFlag(ctx context.Context) (*FolderFlag, context.Context) {
+	f := &FolderFlag{}
+	f.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	return f, ctx
+}
+
+func (flag *FolderFlag) Register(ctx context.Context, f *flag.FlagSet) {
+	flag.DatacenterFlag.Register(ctx, f)
+
+	f.StringVar(&flag.folder, "folder", "", "Path to folder to add the VM to")
+}
+
+func (flag *FolderFlag) Process(ctx context.Context) error {
+	return flag.DatacenterFlag.Process(ctx)
+}
+
+func (flag *FolderFlag) Folder() (*object.Folder, error) {
+	ctx := context.TODO()
+	if len(flag.folder) == 0 {
+		dc, err := flag.Datacenter()
+		if err != nil {
+			return nil, err
+		}
+		folders, err := dc.Folders(ctx)
+		if err != nil {
+			return nil, err
+		}
+		return folders.VmFolder, nil
+	}
+
+	finder, err := flag.Finder()
+	if err != nil {
+		return nil, err
+	}
+
+	mo, err := finder.ManagedObjectList(ctx, flag.folder)
+	if err != nil {
+		return nil, err
+	}
+	if len(mo) == 0 {
+		return nil, errors.New("folder argument does not resolve to object")
+	}
+	if len(mo) > 1 {
+		return nil, errors.New("folder argument resolves to more than one object")
+	}
+
+	ref := mo[0].Object.Reference()
+	if ref.Type != "Folder" {
+		return nil, errors.New("folder argument does not resolve to folder")
+	}
+
+	c, err := flag.Client()
+	if err != nil {
+		return nil, err
+	}
+
+	return object.NewFolder(c, ref), nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/importx/importable.go b/vendor/github.com/vmware/govmomi/govc/importx/importable.go
new file mode 100644
index 0000000000..14e31670b0
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/importx/importable.go
@@ -0,0 +1,59 @@
+/*
+Copyright (c) 2014 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 importx
+
+import (
+	"fmt"
+	"path"
+)
+
+type importable struct {
+	localPath  string
+	remotePath string
+}
+
+func (i importable) Ext() string {
+	return path.Ext(i.localPath)
+}
+
+func (i importable) Base() string {
+	return path.Base(i.localPath)
+}
+
+func (i importable) BaseClean() string {
+	b := i.Base()
+	e := i.Ext()
+	return b[:len(b)-len(e)]
+}
+
+func (i importable) RemoteSrcVMDK() string {
+	file := fmt.Sprintf("%s-src.vmdk", i.BaseClean())
+	return i.toRemotePath(file)
+}
+
+func (i importable) RemoteDstVMDK() string {
+	file := fmt.Sprintf("%s.vmdk", i.BaseClean())
+	return i.toRemotePath(file)
+}
+
+func (i importable) toRemotePath(p string) string {
+	if i.remotePath == "" {
+		return p
+	}
+
+	return path.Join(i.remotePath, p)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/importx/lease_updater.go b/vendor/github.com/vmware/govmomi/govc/importx/lease_updater.go
new file mode 100644
index 0000000000..aa05bd494d
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/importx/lease_updater.go
@@ -0,0 +1,131 @@
+/*
+Copyright (c) 2014-2015 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 importx
+
+import (
+	"context"
+	"fmt"
+	"net/url"
+	"sync"
+	"sync/atomic"
+	"time"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/progress"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type ovfFileItem struct {
+	url  *url.URL
+	item types.OvfFileItem
+	ch   chan progress.Report
+}
+
+func (o ovfFileItem) Sink() chan<- progress.Report {
+	return o.ch
+}
+
+type leaseUpdater struct {
+	client *vim25.Client
+	lease  *object.HttpNfcLease
+
+	pos   int64 // Number of bytes
+	total int64 // Total number of bytes
+
+	done chan struct{} // When lease updater should stop
+
+	wg sync.WaitGroup // Track when update loop is done
+}
+
+func newLeaseUpdater(client *vim25.Client, lease *object.HttpNfcLease, items []ovfFileItem) *leaseUpdater {
+	l := leaseUpdater{
+		client: client,
+		lease:  lease,
+
+		done: make(chan struct{}),
+	}
+
+	for _, item := range items {
+		l.total += item.item.Size
+		go l.waitForProgress(item)
+	}
+
+	// Kickstart update loop
+	l.wg.Add(1)
+	go l.run()
+
+	return &l
+}
+
+func (l *leaseUpdater) waitForProgress(item ovfFileItem) {
+	var pos, total int64
+
+	total = item.item.Size
+
+	for {
+		select {
+		case <-l.done:
+			return
+		case p, ok := <-item.ch:
+			// Return in case of error
+			if ok && p.Error() != nil {
+				return
+			}
+
+			if !ok {
+				// Last element on the channel, add to total
+				atomic.AddInt64(&l.pos, total-pos)
+				return
+			}
+
+			// Approximate progress in number of bytes
+			x := int64(float32(total) * (p.Percentage() / 100.0))
+			atomic.AddInt64(&l.pos, x-pos)
+			pos = x
+		}
+	}
+}
+
+func (l *leaseUpdater) run() {
+	defer l.wg.Done()
+
+	tick := time.NewTicker(2 * time.Second)
+	defer tick.Stop()
+
+	for {
+		select {
+		case <-l.done:
+			return
+		case <-tick.C:
+			// From the vim api HttpNfcLeaseProgress(percent) doc, percent ==
+			// "Completion status represented as an integer in the 0-100 range."
+			// Always report the current value of percent, as it will renew the
+			// lease even if the value hasn't changed or is 0.
+			percent := int32(float32(100*atomic.LoadInt64(&l.pos)) / float32(l.total))
+			err := l.lease.HttpNfcLeaseProgress(context.TODO(), percent)
+			if err != nil {
+				fmt.Printf("from lease updater: %s\n", err)
+			}
+		}
+	}
+}
+
+func (l *leaseUpdater) Done() {
+	close(l.done)
+	l.wg.Wait()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/importx/options.go b/vendor/github.com/vmware/govmomi/govc/importx/options.go
new file mode 100644
index 0000000000..f302b32e8b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/importx/options.go
@@ -0,0 +1,95 @@
+/*
+Copyright (c) 2015 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 importx
+
+import (
+	"context"
+	"encoding/json"
+	"flag"
+	"os"
+
+	"github.com/vmware/govmomi/ovf"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type Property struct {
+	types.KeyValue
+	Spec *ovf.Property `json:",omitempty"`
+}
+
+type Network struct {
+	Name    string
+	Network string
+}
+
+type Options struct {
+	AllDeploymentOptions []string `json:",omitempty"`
+	Deployment           string
+
+	AllDiskProvisioningOptions []string `json:",omitempty"`
+	DiskProvisioning           string
+
+	AllIPAllocationPolicyOptions []string `json:",omitempty"`
+	IPAllocationPolicy           string
+
+	AllIPProtocolOptions []string `json:",omitempty"`
+	IPProtocol           string
+
+	PropertyMapping []Property `json:",omitempty"`
+
+	NetworkMapping []Network `json:",omitempty"`
+
+	Annotation string `json:",omitempty"`
+
+	PowerOn      bool
+	InjectOvfEnv bool
+	WaitForIP    bool
+	Name         *string
+}
+
+type OptionsFlag struct {
+	Options Options
+
+	path string
+}
+
+func newOptionsFlag(ctx context.Context) (*OptionsFlag, context.Context) {
+	return &OptionsFlag{}, ctx
+}
+
+func (flag *OptionsFlag) Register(ctx context.Context, f *flag.FlagSet) {
+	f.StringVar(&flag.path, "options", "", "Options spec file path for VM deployment")
+}
+
+func (flag *OptionsFlag) Process(ctx context.Context) error {
+	if len(flag.path) == 0 {
+		return nil
+	}
+
+	var err error
+	in := os.Stdin
+
+	if flag.path != "-" {
+		in, err = os.Open(flag.path)
+		if err != nil {
+			return err
+		}
+		defer in.Close()
+	}
+
+	return json.NewDecoder(in).Decode(&flag.Options)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/importx/ova.go b/vendor/github.com/vmware/govmomi/govc/importx/ova.go
new file mode 100644
index 0000000000..7aeabe85b0
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/importx/ova.go
@@ -0,0 +1,60 @@
+/*
+Copyright (c) 2014-2015 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 importx
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type ova struct {
+	*ovfx
+}
+
+func init() {
+	cli.Register("import.ova", &ova{&ovfx{}})
+}
+
+func (cmd *ova) Usage() string {
+	return "PATH_TO_OVA"
+}
+
+func (cmd *ova) Run(ctx context.Context, f *flag.FlagSet) error {
+	fpath, err := cmd.Prepare(f)
+	if err != nil {
+		return err
+	}
+
+	cmd.Archive = &TapeArchive{fpath}
+
+	moref, err := cmd.Import(fpath)
+	if err != nil {
+		return err
+	}
+
+	vm := object.NewVirtualMachine(cmd.Client, *moref)
+	return cmd.Deploy(vm)
+}
+
+func (cmd *ova) Import(fpath string) (*types.ManagedObjectReference, error) {
+	ovf := "*.ovf"
+	return cmd.ovfx.Import(ovf)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/importx/ovf.go b/vendor/github.com/vmware/govmomi/govc/importx/ovf.go
new file mode 100644
index 0000000000..dd1b211a27
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/importx/ovf.go
@@ -0,0 +1,452 @@
+/*
+Copyright (c) 2014-2015 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 importx
+
+import (
+	"context"
+	"errors"
+	"flag"
+	"fmt"
+	"path"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/ovf"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/progress"
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type ovfx struct {
+	*flags.DatastoreFlag
+	*flags.HostSystemFlag
+	*flags.OutputFlag
+	*flags.ResourcePoolFlag
+
+	*ArchiveFlag
+	*OptionsFlag
+	*FolderFlag
+
+	Name string
+
+	Client       *vim25.Client
+	Datacenter   *object.Datacenter
+	Datastore    *object.Datastore
+	ResourcePool *object.ResourcePool
+}
+
+func init() {
+	cli.Register("import.ovf", &ovfx{})
+}
+
+func (cmd *ovfx) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+	cmd.ResourcePoolFlag, ctx = flags.NewResourcePoolFlag(ctx)
+	cmd.ResourcePoolFlag.Register(ctx, f)
+
+	cmd.ArchiveFlag, ctx = newArchiveFlag(ctx)
+	cmd.ArchiveFlag.Register(ctx, f)
+	cmd.OptionsFlag, ctx = newOptionsFlag(ctx)
+	cmd.OptionsFlag.Register(ctx, f)
+	cmd.FolderFlag, ctx = newFolderFlag(ctx)
+	cmd.FolderFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.Name, "name", "", "Name to use for new entity")
+}
+
+func (cmd *ovfx) Process(ctx context.Context) error {
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.ResourcePoolFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.ArchiveFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OptionsFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.FolderFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *ovfx) Usage() string {
+	return "PATH_TO_OVF"
+}
+
+func (cmd *ovfx) Run(ctx context.Context, f *flag.FlagSet) error {
+	fpath, err := cmd.Prepare(f)
+	if err != nil {
+		return err
+	}
+
+	cmd.Archive = &FileArchive{fpath}
+
+	moref, err := cmd.Import(fpath)
+	if err != nil {
+		return err
+	}
+
+	vm := object.NewVirtualMachine(cmd.Client, *moref)
+	return cmd.Deploy(vm)
+}
+
+func (cmd *ovfx) Prepare(f *flag.FlagSet) (string, error) {
+	var err error
+
+	args := f.Args()
+	if len(args) != 1 {
+		return "", errors.New("no file specified")
+	}
+
+	cmd.Client, err = cmd.DatastoreFlag.Client()
+	if err != nil {
+		return "", err
+	}
+
+	cmd.Datacenter, err = cmd.DatastoreFlag.Datacenter()
+	if err != nil {
+		return "", err
+	}
+
+	cmd.Datastore, err = cmd.DatastoreFlag.Datastore()
+	if err != nil {
+		return "", err
+	}
+
+	cmd.ResourcePool, err = cmd.ResourcePoolFlag.ResourcePool()
+	if err != nil {
+		return "", err
+	}
+
+	return f.Arg(0), nil
+}
+
+func (cmd *ovfx) Deploy(vm *object.VirtualMachine) error {
+	if err := cmd.InjectOvfEnv(vm); err != nil {
+		return err
+	}
+
+	if err := cmd.PowerOn(vm); err != nil {
+		return err
+	}
+
+	if err := cmd.WaitForIP(vm); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (cmd *ovfx) Map(op []Property) (p []types.KeyValue) {
+	for _, v := range op {
+		p = append(p, v.KeyValue)
+	}
+
+	return
+}
+
+func (cmd *ovfx) NetworkMap(e *ovf.Envelope) (p []types.OvfNetworkMapping) {
+	ctx := context.TODO()
+	finder, err := cmd.DatastoreFlag.Finder()
+	if err != nil {
+		return
+	}
+
+	networks := map[string]string{}
+
+	if e.Network != nil {
+		for _, net := range e.Network.Networks {
+			networks[net.Name] = net.Name
+		}
+	}
+
+	for _, net := range cmd.Options.NetworkMapping {
+		networks[net.Name] = net.Network
+	}
+
+	for src, dst := range networks {
+		if net, err := finder.Network(ctx, dst); err == nil {
+			p = append(p, types.OvfNetworkMapping{
+				Name:    src,
+				Network: net.Reference(),
+			})
+		}
+	}
+	return
+}
+
+func (cmd *ovfx) Import(fpath string) (*types.ManagedObjectReference, error) {
+	ctx := context.TODO()
+	o, err := cmd.ReadOvf(fpath)
+	if err != nil {
+		return nil, err
+	}
+
+	e, err := cmd.ReadEnvelope(fpath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse ovf: %s", err.Error())
+	}
+
+	name := "Govc Virtual Appliance"
+	if e.VirtualSystem != nil {
+		name = e.VirtualSystem.ID
+		if e.VirtualSystem.Name != nil {
+			name = *e.VirtualSystem.Name
+		}
+	}
+
+	// Override name from options if specified
+	if cmd.Options.Name != nil {
+		name = *cmd.Options.Name
+	}
+
+	// Override name from arguments if specified
+	if cmd.Name != "" {
+		name = cmd.Name
+	}
+
+	cisp := types.OvfCreateImportSpecParams{
+		DiskProvisioning:   cmd.Options.DiskProvisioning,
+		EntityName:         name,
+		IpAllocationPolicy: cmd.Options.IPAllocationPolicy,
+		IpProtocol:         cmd.Options.IPProtocol,
+		OvfManagerCommonParams: types.OvfManagerCommonParams{
+			DeploymentOption: cmd.Options.Deployment,
+			Locale:           "US"},
+		PropertyMapping: cmd.Map(cmd.Options.PropertyMapping),
+		NetworkMapping:  cmd.NetworkMap(e),
+	}
+
+	m := object.NewOvfManager(cmd.Client)
+	spec, err := m.CreateImportSpec(ctx, string(o), cmd.ResourcePool, cmd.Datastore, cisp)
+	if err != nil {
+		return nil, err
+	}
+	if spec.Error != nil {
+		return nil, errors.New(spec.Error[0].LocalizedMessage)
+	}
+	if spec.Warning != nil {
+		for _, w := range spec.Warning {
+			_, _ = cmd.Log(fmt.Sprintf("Warning: %s\n", w.LocalizedMessage))
+		}
+	}
+
+	if cmd.Options.Annotation != "" {
+		switch s := spec.ImportSpec.(type) {
+		case *types.VirtualMachineImportSpec:
+			s.ConfigSpec.Annotation = cmd.Options.Annotation
+		case *types.VirtualAppImportSpec:
+			s.VAppConfigSpec.Annotation = cmd.Options.Annotation
+		}
+	}
+
+	var host *object.HostSystem
+	if cmd.SearchFlag.IsSet() {
+		if host, err = cmd.HostSystem(); err != nil {
+			return nil, err
+		}
+	}
+
+	folder, err := cmd.Folder()
+	if err != nil {
+		return nil, err
+	}
+
+	lease, err := cmd.ResourcePool.ImportVApp(ctx, spec.ImportSpec, folder, host)
+	if err != nil {
+		return nil, err
+	}
+
+	info, err := lease.Wait(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	// Build slice of items and URLs first, so that the lease updater can know
+	// about every item that needs to be uploaded, and thereby infer progress.
+	var items []ovfFileItem
+
+	for _, device := range info.DeviceUrl {
+		for _, item := range spec.FileItem {
+			if device.ImportKey != item.DeviceId {
+				continue
+			}
+
+			u, err := cmd.Client.ParseURL(device.Url)
+			if err != nil {
+				return nil, err
+			}
+
+			i := ovfFileItem{
+				url:  u,
+				item: item,
+				ch:   make(chan progress.Report),
+			}
+
+			items = append(items, i)
+		}
+	}
+
+	u := newLeaseUpdater(cmd.Client, lease, items)
+	defer u.Done()
+
+	for _, i := range items {
+		err = cmd.Upload(lease, i)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return &info.Entity, lease.HttpNfcLeaseComplete(ctx)
+}
+
+func (cmd *ovfx) Upload(lease *object.HttpNfcLease, ofi ovfFileItem) error {
+	item := ofi.item
+	file := item.Path
+
+	f, size, err := cmd.Open(file)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	logger := cmd.ProgressLogger(fmt.Sprintf("Uploading %s... ", path.Base(file)))
+	defer logger.Wait()
+
+	opts := soap.Upload{
+		ContentLength: size,
+		Progress:      progress.Tee(ofi, logger),
+	}
+
+	// Non-disk files (such as .iso) use the PUT method.
+	// Overwrite: t header is also required in this case (ovftool does the same)
+	if item.Create {
+		opts.Method = "PUT"
+		opts.Headers = map[string]string{
+			"Overwrite": "t",
+		}
+	} else {
+		opts.Method = "POST"
+		opts.Type = "application/x-vnd.vmware-streamVmdk"
+	}
+
+	return cmd.Client.Client.Upload(f, ofi.url, &opts)
+}
+
+func (cmd *ovfx) PowerOn(vm *object.VirtualMachine) error {
+	ctx := context.TODO()
+	if !cmd.Options.PowerOn {
+		return nil
+	}
+
+	cmd.Log("Powering on VM...\n")
+
+	task, err := vm.PowerOn(ctx)
+	if err != nil {
+		return err
+	}
+
+	if _, err = task.WaitForResult(ctx, nil); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (cmd *ovfx) InjectOvfEnv(vm *object.VirtualMachine) error {
+	if !cmd.Options.InjectOvfEnv {
+		return nil
+	}
+
+	cmd.Log("Injecting OVF environment...\n")
+
+	var opts []types.BaseOptionValue
+
+	a := cmd.Client.ServiceContent.About
+
+	// build up Environment in order to marshal to xml
+	var props []ovf.EnvProperty
+	for _, p := range cmd.Options.PropertyMapping {
+		props = append(props, ovf.EnvProperty{
+			Key:   p.Key,
+			Value: p.Value,
+		})
+	}
+
+	env := ovf.Env{
+		EsxID: vm.Reference().Value,
+		Platform: &ovf.PlatformSection{
+			Kind:    a.Name,
+			Version: a.Version,
+			Vendor:  a.Vendor,
+			Locale:  "US",
+		},
+		Property: &ovf.PropertySection{
+			Properties: props,
+		},
+	}
+
+	opts = append(opts, &types.OptionValue{
+		Key:   "guestinfo.ovfEnv",
+		Value: env.MarshalManual(),
+	})
+
+	ctx := context.Background()
+
+	task, err := vm.Reconfigure(ctx, types.VirtualMachineConfigSpec{
+		ExtraConfig: opts,
+	})
+
+	if err != nil {
+		return err
+	}
+
+	return task.Wait(ctx)
+}
+
+func (cmd *ovfx) WaitForIP(vm *object.VirtualMachine) error {
+	ctx := context.TODO()
+	if !cmd.Options.PowerOn || !cmd.Options.WaitForIP {
+		return nil
+	}
+
+	cmd.Log("Waiting for IP address...\n")
+	ip, err := vm.WaitForIP(ctx)
+	if err != nil {
+		return err
+	}
+
+	cmd.Log(fmt.Sprintf("Received IP address: %s\n", ip))
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/importx/spec.go b/vendor/github.com/vmware/govmomi/govc/importx/spec.go
new file mode 100644
index 0000000000..c490a28b88
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/importx/spec.go
@@ -0,0 +1,184 @@
+/*
+Copyright (c) 2015-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 importx
+
+import (
+	"context"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"path"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/ovf"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+var (
+	// all possible ovf property values
+	// the first element being the default value
+	allDeploymentOptions         = []string{"small", "medium", "large"}
+	allDiskProvisioningOptions   = []string{"thin", "monolithicSparse", "monolithicFlat", "twoGbMaxExtentSparse", "twoGbMaxExtentFlat", "seSparse", "eagerZeroedThick", "thick", "sparse", "flat"}
+	allIPAllocationPolicyOptions = []string{"dhcpPolicy", "transientPolicy", "fixedPolicy", "fixedAllocatedPolicy"}
+	allIPProtocolOptions         = []string{"IPv4", "IPv6"}
+)
+
+type spec struct {
+	*ArchiveFlag
+
+	verbose bool
+}
+
+func init() {
+	cli.Register("import.spec", &spec{})
+}
+
+func (cmd *spec) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ArchiveFlag, ctx = newArchiveFlag(ctx)
+	cmd.ArchiveFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.verbose, "verbose", false, "Verbose spec output")
+}
+
+func (cmd *spec) Process(ctx context.Context) error {
+	if err := cmd.ArchiveFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *spec) Usage() string {
+	return "PATH_TO_OVF_OR_OVA"
+}
+
+func (cmd *spec) Run(ctx context.Context, f *flag.FlagSet) error {
+	fpath := ""
+	args := f.Args()
+	if len(args) == 1 {
+		fpath = f.Arg(0)
+	}
+
+	if len(fpath) > 0 {
+		switch path.Ext(fpath) {
+		case ".ovf":
+			cmd.Archive = &FileArchive{fpath}
+		case "", ".ova":
+			cmd.Archive = &TapeArchive{fpath}
+			fpath = "*.ovf"
+		default:
+			return fmt.Errorf("invalid file extension %s", path.Ext(fpath))
+		}
+	}
+
+	return cmd.Spec(fpath)
+}
+
+func (cmd *spec) Map(e *ovf.Envelope) (res []Property) {
+	if e == nil || e.VirtualSystem == nil {
+		return nil
+	}
+
+	for _, p := range e.VirtualSystem.Product {
+		for i, v := range p.Property {
+			d := ""
+			if v.Default != nil {
+				d = *v.Default
+			}
+
+			// From OVF spec, section 9.5.1:
+			// key-value-env = [class-value "."] key-value-prod ["." instance-value]
+			k := v.Key
+			if p.Class != nil {
+				k = fmt.Sprintf("%s.%s", *p.Class, k)
+			}
+			if p.Instance != nil {
+				k = fmt.Sprintf("%s.%s", k, *p.Instance)
+			}
+
+			np := Property{KeyValue: types.KeyValue{Key: k, Value: d}}
+			if cmd.verbose {
+				np.Spec = &p.Property[i]
+			}
+
+			res = append(res, np)
+		}
+	}
+
+	return
+}
+
+func (cmd *spec) Spec(fpath string) error {
+	e, err := cmd.ReadEnvelope(fpath)
+	if err != nil {
+		return err
+	}
+
+	var deploymentOptions = allDeploymentOptions
+	if e.DeploymentOption != nil && e.DeploymentOption.Configuration != nil {
+		deploymentOptions = nil
+
+		// add default first
+		for _, c := range e.DeploymentOption.Configuration {
+			if c.Default != nil && *c.Default {
+				deploymentOptions = append(deploymentOptions, c.ID)
+			}
+		}
+
+		for _, c := range e.DeploymentOption.Configuration {
+			if c.Default == nil || !*c.Default {
+				deploymentOptions = append(deploymentOptions, c.ID)
+			}
+		}
+	}
+
+	o := Options{
+		Deployment:         deploymentOptions[0],
+		DiskProvisioning:   allDiskProvisioningOptions[0],
+		IPAllocationPolicy: allIPAllocationPolicyOptions[0],
+		IPProtocol:         allIPProtocolOptions[0],
+		PowerOn:            false,
+		WaitForIP:          false,
+		InjectOvfEnv:       false,
+		PropertyMapping:    cmd.Map(e)}
+
+	if e.VirtualSystem != nil && e.VirtualSystem.Annotation != nil {
+		for _, a := range e.VirtualSystem.Annotation {
+			o.Annotation += a.Annotation
+		}
+	}
+
+	if e.Network != nil {
+		for _, net := range e.Network.Networks {
+			o.NetworkMapping = append(o.NetworkMapping, Network{net.Name, ""})
+		}
+	}
+
+	if cmd.verbose {
+		o.AllDeploymentOptions = deploymentOptions
+		o.AllDiskProvisioningOptions = allDiskProvisioningOptions
+		o.AllIPAllocationPolicyOptions = allIPAllocationPolicyOptions
+		o.AllIPProtocolOptions = allIPProtocolOptions
+	}
+
+	j, err := json.Marshal(&o)
+	if err != nil {
+		return err
+	}
+
+	fmt.Println(string(j))
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/importx/vmdk.go b/vendor/github.com/vmware/govmomi/govc/importx/vmdk.go
new file mode 100644
index 0000000000..270e37b01b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/importx/vmdk.go
@@ -0,0 +1,504 @@
+/*
+Copyright (c) 2014-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 importx
+
+import (
+	"context"
+	"errors"
+	"flag"
+	"fmt"
+	"path"
+	"reflect"
+	"regexp"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/progress"
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type vmdk struct {
+	*flags.DatastoreFlag
+	*flags.ResourcePoolFlag
+	*flags.OutputFlag
+
+	upload bool
+	force  bool
+	keep   bool
+
+	Client       *vim25.Client
+	Datacenter   *object.Datacenter
+	Datastore    *object.Datastore
+	ResourcePool *object.ResourcePool
+}
+
+func init() {
+	cli.Register("import.vmdk", &vmdk{})
+	cli.Alias("import.vmdk", "datastore.import")
+}
+
+func (cmd *vmdk) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+	cmd.ResourcePoolFlag, ctx = flags.NewResourcePoolFlag(ctx)
+	cmd.ResourcePoolFlag.Register(ctx, f)
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.upload, "upload", true, "Upload specified disk")
+	f.BoolVar(&cmd.force, "force", false, "Overwrite existing disk")
+	f.BoolVar(&cmd.keep, "keep", false, "Keep uploaded disk after import")
+}
+
+func (cmd *vmdk) Process(ctx context.Context) error {
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.ResourcePoolFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *vmdk) Usage() string {
+	return "PATH_TO_VMDK [REMOTE_DIRECTORY]"
+}
+
+func (cmd *vmdk) Run(ctx context.Context, f *flag.FlagSet) error {
+	var err error
+
+	args := f.Args()
+	if len(args) < 1 {
+		return errors.New("no file to import")
+	}
+
+	file := importable{
+		localPath: f.Arg(0),
+	}
+
+	// Include remote path if specified
+	if len(args) >= 2 {
+		file.remotePath = f.Arg(1)
+	}
+
+	cmd.Client, err = cmd.DatastoreFlag.Client()
+	if err != nil {
+		return err
+	}
+
+	cmd.Datacenter, err = cmd.DatastoreFlag.Datacenter()
+	if err != nil {
+		return err
+	}
+
+	cmd.Datastore, err = cmd.DatastoreFlag.Datastore()
+	if err != nil {
+		return err
+	}
+
+	cmd.ResourcePool, err = cmd.ResourcePoolFlag.ResourcePool()
+	if err != nil {
+		return err
+	}
+
+	err = cmd.PrepareDestination(file)
+	if err != nil {
+		return err
+	}
+
+	if cmd.upload {
+		err = cmd.Upload(file)
+		if err != nil {
+			return err
+		}
+	}
+
+	return cmd.Import(file)
+}
+
+// PrepareDestination makes sure that the destination VMDK does not yet exist.
+// If the force flag is passed, it removes the existing VMDK. This functions
+// exists to give a meaningful error if the remote VMDK already exists.
+//
+// CopyVirtualDisk can return a "<src> file does not exist" error while in fact
+// the source file *does* exist and the *destination* file also exist.
+//
+func (cmd *vmdk) PrepareDestination(i importable) error {
+	ctx := context.TODO()
+	vmdkPath := i.RemoteDstVMDK()
+	res, err := cmd.Datastore.Stat(ctx, vmdkPath)
+	if err != nil {
+		switch err.(type) {
+		case object.DatastoreNoSuchDirectoryError:
+			// The base path doesn't exist. Create it.
+			dsPath := cmd.Datastore.Path(path.Dir(vmdkPath))
+			m := object.NewFileManager(cmd.Client)
+			return m.MakeDirectory(ctx, dsPath, cmd.Datacenter, true)
+		case object.DatastoreNoSuchFileError:
+			// Destination path doesn't exist; all good to continue with import.
+			return nil
+		}
+
+		return err
+	}
+
+	// Check that the returned entry has the right type.
+	switch res.(type) {
+	case *types.VmDiskFileInfo:
+	default:
+		expected := "VmDiskFileInfo"
+		actual := reflect.TypeOf(res)
+		panic(fmt.Sprintf("Expected: %s, actual: %s", expected, actual))
+	}
+
+	if !cmd.force {
+		dsPath := cmd.Datastore.Path(vmdkPath)
+		err = fmt.Errorf("File %s already exists", dsPath)
+		return err
+	}
+
+	// Delete existing disk.
+	err = cmd.DeleteDisk(vmdkPath)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (cmd *vmdk) Upload(i importable) error {
+	ctx := context.TODO()
+	p := soap.DefaultUpload
+	if cmd.OutputFlag.TTY {
+		logger := cmd.ProgressLogger("Uploading... ")
+		p.Progress = logger
+		defer logger.Wait()
+	}
+
+	return cmd.Datastore.UploadFile(ctx, i.localPath, i.RemoteSrcVMDK(), &p)
+}
+
+func (cmd *vmdk) Import(i importable) error {
+	err := cmd.Copy(i)
+	if err != nil {
+		return err
+	}
+
+	if !cmd.keep {
+		err = cmd.DeleteDisk(i.RemoteSrcVMDK())
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (cmd *vmdk) Copy(i importable) error {
+	var err error
+
+	logger := cmd.ProgressLogger("Importing... ")
+	defer logger.Wait()
+
+	agg := progress.NewAggregator(logger)
+	defer agg.Done()
+
+	switch p := cmd.Client.ServiceContent.About.ApiType; p {
+	case "HostAgent":
+		err = cmd.CopyHostAgent(i, agg)
+	case "VirtualCenter":
+		err = cmd.CopyVirtualCenter(i, agg)
+	default:
+		return fmt.Errorf("unsupported ApiType: %s", p)
+	}
+
+	return err
+}
+
+func (cmd *vmdk) CopyHostAgent(i importable, s progress.Sinker) error {
+	ctx := context.TODO()
+	spec := &types.VirtualDiskSpec{
+		AdapterType: "lsiLogic",
+		DiskType:    "thin",
+	}
+
+	dc := cmd.Datacenter
+	src := cmd.Datastore.Path(i.RemoteSrcVMDK())
+	dst := cmd.Datastore.Path(i.RemoteDstVMDK())
+	vdm := object.NewVirtualDiskManager(cmd.Client)
+	task, err := vdm.CopyVirtualDisk(ctx, src, dc, dst, dc, spec, false)
+	if err != nil {
+		return err
+	}
+
+	ps := progress.Prefix(s, "copying disk")
+	_, err = task.WaitForResult(ctx, ps)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (cmd *vmdk) CopyVirtualCenter(i importable, s progress.Sinker) error {
+	var err error
+
+	srcName := i.BaseClean() + "-srcvm"
+	dstName := i.BaseClean() + "-dstvm"
+
+	spec := &configSpec{
+		Name:    srcName,
+		GuestId: "otherGuest",
+		Files: &types.VirtualMachineFileInfo{
+			VmPathName: fmt.Sprintf("[%s]", cmd.Datastore.Name()),
+		},
+	}
+
+	spec.AddDisk(cmd.Datastore, i.RemoteSrcVMDK())
+
+	src, err := cmd.CreateVM(spec)
+	if err != nil {
+		return err
+	}
+
+	dst, err := cmd.CloneVM(src, dstName)
+	if err != nil {
+		return err
+	}
+
+	err = cmd.DestroyVM(src)
+	if err != nil {
+		return err
+	}
+
+	vmdk, err := cmd.DetachDisk(dst)
+	if err != nil {
+		return err
+	}
+
+	err = cmd.MoveDisk(vmdk, i.RemoteDstVMDK())
+	if err != nil {
+		return err
+	}
+
+	err = cmd.DestroyVM(dst)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (cmd *vmdk) MoveDisk(src, dst string) error {
+	ctx := context.TODO()
+	dsSrc := cmd.Datastore.Path(src)
+	dsDst := cmd.Datastore.Path(dst)
+	vdm := object.NewVirtualDiskManager(cmd.Client)
+	task, err := vdm.MoveVirtualDisk(ctx, dsSrc, cmd.Datacenter, dsDst, cmd.Datacenter, true)
+	if err != nil {
+		return err
+	}
+
+	return task.Wait(ctx)
+}
+
+func (cmd *vmdk) DeleteDisk(path string) error {
+	ctx := context.TODO()
+	vdm := object.NewVirtualDiskManager(cmd.Client)
+	task, err := vdm.DeleteVirtualDisk(ctx, cmd.Datastore.Path(path), cmd.Datacenter)
+	if err != nil {
+		return err
+	}
+
+	return task.Wait(ctx)
+}
+
+func (cmd *vmdk) DetachDisk(vm *object.VirtualMachine) (string, error) {
+	ctx := context.TODO()
+	var mvm mo.VirtualMachine
+
+	pc := property.DefaultCollector(cmd.Client)
+	err := pc.RetrieveOne(ctx, vm.Reference(), []string{"config.hardware"}, &mvm)
+	if err != nil {
+		return "", err
+	}
+
+	spec := new(configSpec)
+	dsFile := spec.RemoveDisk(&mvm)
+
+	task, err := vm.Reconfigure(ctx, spec.ToSpec())
+	if err != nil {
+		return "", err
+	}
+
+	err = task.Wait(ctx)
+	if err != nil {
+		return "", err
+	}
+
+	return dsFile, nil
+}
+
+func (cmd *vmdk) CreateVM(spec *configSpec) (*object.VirtualMachine, error) {
+	ctx := context.TODO()
+	folders, err := cmd.Datacenter.Folders(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	task, err := folders.VmFolder.CreateVM(ctx, spec.ToSpec(), cmd.ResourcePool, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	info, err := task.WaitForResult(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	return object.NewVirtualMachine(cmd.Client, info.Result.(types.ManagedObjectReference)), nil
+}
+
+func (cmd *vmdk) CloneVM(vm *object.VirtualMachine, name string) (*object.VirtualMachine, error) {
+	ctx := context.TODO()
+	folders, err := cmd.Datacenter.Folders(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	spec := types.VirtualMachineCloneSpec{
+		Config:   &types.VirtualMachineConfigSpec{},
+		Location: types.VirtualMachineRelocateSpec{},
+	}
+
+	task, err := vm.Clone(ctx, folders.VmFolder, name, spec)
+	if err != nil {
+		return nil, err
+	}
+
+	info, err := task.WaitForResult(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	return object.NewVirtualMachine(cmd.Client, info.Result.(types.ManagedObjectReference)), nil
+}
+
+func (cmd *vmdk) DestroyVM(vm *object.VirtualMachine) error {
+	ctx := context.TODO()
+	_, err := cmd.DetachDisk(vm)
+	if err != nil {
+		return err
+	}
+
+	task, err := vm.Destroy(ctx)
+	if err != nil {
+		return err
+	}
+
+	err = task.Wait(ctx)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+type configSpec types.VirtualMachineConfigSpec
+
+func (c *configSpec) ToSpec() types.VirtualMachineConfigSpec {
+	return types.VirtualMachineConfigSpec(*c)
+}
+
+func (c *configSpec) AddChange(d types.BaseVirtualDeviceConfigSpec) {
+	c.DeviceChange = append(c.DeviceChange, d)
+}
+
+func (c *configSpec) AddDisk(ds *object.Datastore, path string) {
+	var devices object.VirtualDeviceList
+
+	controller, err := devices.CreateSCSIController("")
+	if err != nil {
+		panic(err)
+	}
+	devices = append(devices, controller)
+
+	disk := devices.CreateDisk(controller.(types.BaseVirtualController), ds.Reference(), ds.Path(path))
+	devices = append(devices, disk)
+
+	spec, err := devices.ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd)
+	if err != nil {
+		panic(err)
+	}
+
+	c.DeviceChange = append(c.DeviceChange, spec...)
+}
+
+var dsPathRegexp = regexp.MustCompile(`^\[.*\] (.*)$`)
+
+func (c *configSpec) RemoveDisk(vm *mo.VirtualMachine) string {
+	var file string
+
+	for _, d := range vm.Config.Hardware.Device {
+		switch device := d.(type) {
+		case *types.VirtualDisk:
+			if file != "" {
+				panic("expected VM to have only one disk")
+			}
+
+			switch backing := device.Backing.(type) {
+			case *types.VirtualDiskFlatVer1BackingInfo:
+				file = backing.FileName
+			case *types.VirtualDiskFlatVer2BackingInfo:
+				file = backing.FileName
+			case *types.VirtualDiskSeSparseBackingInfo:
+				file = backing.FileName
+			case *types.VirtualDiskSparseVer1BackingInfo:
+				file = backing.FileName
+			case *types.VirtualDiskSparseVer2BackingInfo:
+				file = backing.FileName
+			default:
+				name := reflect.TypeOf(device.Backing).String()
+				panic(fmt.Sprintf("unexpected backing type: %s", name))
+			}
+
+			// Remove [datastore] prefix
+			m := dsPathRegexp.FindStringSubmatch(file)
+			if len(m) != 2 {
+				panic(fmt.Sprintf("expected regexp match for %#v", file))
+			}
+			file = m[1]
+
+			removeOp := &types.VirtualDeviceConfigSpec{
+				Operation: types.VirtualDeviceConfigSpecOperationRemove,
+				Device:    device,
+			}
+
+			c.AddChange(removeOp)
+		}
+	}
+
+	return file
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/license/add.go b/vendor/github.com/vmware/govmomi/govc/license/add.go
new file mode 100644
index 0000000000..97af99523d
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/license/add.go
@@ -0,0 +1,96 @@
+/*
+Copyright (c) 2014-2015 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 license
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/license"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type add struct {
+	*flags.ClientFlag
+	*flags.OutputFlag
+}
+
+func init() {
+	cli.Register("license.add", &add{})
+}
+
+func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+}
+
+func (cmd *add) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *add) Usage() string {
+	return "KEY..."
+}
+
+func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
+	client, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	m := license.NewManager(client)
+
+	// From the vSphere 5.5 documentation:
+	//
+	//     To specify the edition type and any optional functions, use
+	//     updateLicense for ESX Server and addLicense follow by
+	//     LicenseAssingmentManager.updateAssignedLicense for VirtualCenter.
+	//
+	var addFunc func(ctx context.Context, key string, labels map[string]string) (types.LicenseManagerLicenseInfo, error)
+	switch t := client.ServiceContent.About.ApiType; t {
+	case "HostAgent":
+		addFunc = m.Update
+	case "VirtualCenter":
+		addFunc = m.Add
+	default:
+		return fmt.Errorf("unsupported ApiType: %s", t)
+	}
+
+	result := make(licenseOutput, 0)
+	for _, v := range f.Args() {
+		license, err := addFunc(ctx, v, nil)
+		if err != nil {
+			return err
+		}
+
+		result = append(result, license)
+	}
+
+	return cmd.WriteResult(licenseOutput(result))
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/license/assign.go b/vendor/github.com/vmware/govmomi/govc/license/assign.go
new file mode 100644
index 0000000000..d8b064b662
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/license/assign.go
@@ -0,0 +1,114 @@
+/*
+Copyright (c) 2015 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 license
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/license"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type assign struct {
+	*flags.ClientFlag
+	*flags.OutputFlag
+	*flags.HostSystemFlag
+
+	name   string
+	remove bool
+}
+
+func init() {
+	cli.Register("license.assign", &assign{})
+}
+
+func (cmd *assign) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.name, "name", "", "Display name")
+	f.BoolVar(&cmd.remove, "remove", false, "Remove assignment")
+}
+
+func (cmd *assign) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *assign) Usage() string {
+	return "KEY"
+}
+
+func (cmd *assign) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 1 {
+		return flag.ErrHelp
+	}
+
+	key := f.Arg(0)
+
+	client, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	m, err := license.NewManager(client).AssignmentManager(ctx)
+	if err != nil {
+		return err
+	}
+
+	host, err := cmd.HostSystemIfSpecified()
+	if err != nil {
+		return err
+	}
+
+	var id string
+
+	if host == nil {
+		// Default to vCenter UUID
+		id = client.ServiceContent.About.InstanceUuid
+	} else {
+		id = host.Reference().Value
+	}
+
+	if cmd.remove {
+		return m.Remove(ctx, id)
+	}
+
+	info, err := m.Update(ctx, id, key, cmd.name)
+	if err != nil {
+		return err
+	}
+
+	return cmd.WriteResult(licenseOutput([]types.LicenseManagerLicenseInfo{*info}))
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/license/assigned.go b/vendor/github.com/vmware/govmomi/govc/license/assigned.go
new file mode 100644
index 0000000000..9546ca5837
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/license/assigned.go
@@ -0,0 +1,96 @@
+/*
+Copyright (c) 2015 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 license
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"os"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/license"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type assigned struct {
+	*flags.ClientFlag
+	*flags.OutputFlag
+
+	id string
+}
+
+func init() {
+	cli.Register("license.assigned.ls", &assigned{})
+}
+
+func (cmd *assigned) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.id, "id", "", "Entity ID")
+}
+
+func (cmd *assigned) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *assigned) Run(ctx context.Context, f *flag.FlagSet) error {
+	client, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	m, err := license.NewManager(client).AssignmentManager(ctx)
+	if err != nil {
+		return err
+	}
+
+	assigned, err := m.QueryAssigned(ctx, cmd.id)
+	if err != nil {
+		return err
+	}
+
+	return cmd.WriteResult(assignedOutput(assigned))
+}
+
+type assignedOutput []types.LicenseAssignmentManagerLicenseAssignment
+
+func (res assignedOutput) Write(w io.Writer) error {
+	tw := tabwriter.NewWriter(os.Stdout, 4, 0, 2, ' ', 0)
+	fmt.Fprintf(tw, "Id:\tScope:\tName:\tLicense:\n")
+	for _, v := range res {
+		fmt.Fprintf(tw, "%s\t", v.EntityId)
+		fmt.Fprintf(tw, "%s\t", v.Scope)
+		fmt.Fprintf(tw, "%s\t", v.EntityDisplayName)
+		fmt.Fprintf(tw, "%s\t", v.AssignedLicense.LicenseKey)
+		fmt.Fprintf(tw, "\n")
+	}
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/license/decode.go b/vendor/github.com/vmware/govmomi/govc/license/decode.go
new file mode 100644
index 0000000000..4cccc5be89
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/license/decode.go
@@ -0,0 +1,85 @@
+/*
+Copyright (c) 2015 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 license
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/license"
+)
+
+type decode struct {
+	*flags.ClientFlag
+	*flags.OutputFlag
+
+	feature string
+}
+
+func init() {
+	cli.Register("license.decode", &decode{})
+}
+
+func (cmd *decode) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.feature, "feature", "", featureUsage)
+}
+
+func (cmd *decode) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *decode) Usage() string {
+	return "KEY..."
+}
+
+func (cmd *decode) Run(ctx context.Context, f *flag.FlagSet) error {
+	client, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	var result license.InfoList
+	m := license.NewManager(client)
+	for _, v := range f.Args() {
+		license, err := m.Decode(ctx, v)
+		if err != nil {
+			return err
+		}
+
+		result = append(result, license)
+	}
+
+	if cmd.feature != "" {
+		result = result.WithFeature(cmd.feature)
+	}
+
+	return cmd.WriteResult(licenseOutput(result))
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/license/ls.go b/vendor/github.com/vmware/govmomi/govc/license/ls.go
new file mode 100644
index 0000000000..8ee1e08fc5
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/license/ls.go
@@ -0,0 +1,78 @@
+/*
+Copyright (c) 2014-2015 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 license
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/license"
+)
+
+var featureUsage = "List licenses with given feature"
+
+type ls struct {
+	*flags.ClientFlag
+	*flags.OutputFlag
+
+	feature string
+}
+
+func init() {
+	cli.Register("license.ls", &ls{})
+}
+
+func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.feature, "feature", "", featureUsage)
+}
+
+func (cmd *ls) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
+	client, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	m := license.NewManager(client)
+	result, err := m.List(ctx)
+	if err != nil {
+		return err
+	}
+
+	if cmd.feature != "" {
+		result = result.WithFeature(cmd.feature)
+	}
+
+	return cmd.WriteResult(licenseOutput(result))
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/license/output.go b/vendor/github.com/vmware/govmomi/govc/license/output.go
new file mode 100644
index 0000000000..e4cfe42a5f
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/license/output.go
@@ -0,0 +1,41 @@
+/*
+Copyright (c) 2014-2015 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 license
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type licenseOutput []types.LicenseManagerLicenseInfo
+
+func (res licenseOutput) Write(w io.Writer) error {
+	tw := tabwriter.NewWriter(os.Stdout, 4, 0, 2, ' ', 0)
+	fmt.Fprintf(tw, "Key:\tEdition:\tUsed:\tTotal:\n")
+	for _, v := range res {
+		fmt.Fprintf(tw, "%s\t", v.LicenseKey)
+		fmt.Fprintf(tw, "%s\t", v.EditionKey)
+		fmt.Fprintf(tw, "%d\t", v.Used)
+		fmt.Fprintf(tw, "%d\t", v.Total)
+		fmt.Fprintf(tw, "\n")
+	}
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/license/remove.go b/vendor/github.com/vmware/govmomi/govc/license/remove.go
new file mode 100644
index 0000000000..79b5eac469
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/license/remove.go
@@ -0,0 +1,74 @@
+/*
+Copyright (c) 2014-2015 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 license
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/license"
+)
+
+type remove struct {
+	*flags.ClientFlag
+	*flags.OutputFlag
+}
+
+func init() {
+	cli.Register("license.remove", &remove{})
+}
+
+func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+}
+
+func (cmd *remove) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *remove) Usage() string {
+	return "KEY..."
+}
+
+func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
+	client, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	m := license.NewManager(client)
+	for _, v := range f.Args() {
+		err = m.Remove(ctx, v)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/logs/command.go b/vendor/github.com/vmware/govmomi/govc/logs/command.go
new file mode 100644
index 0000000000..a921432988
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/logs/command.go
@@ -0,0 +1,121 @@
+/*
+Copyright (c) 2015-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 logs
+
+import (
+	"context"
+	"flag"
+	"time"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type logs struct {
+	*flags.HostSystemFlag
+
+	Max int32
+	Key string
+
+	follow bool
+}
+
+func init() {
+	cli.Register("logs", &logs{})
+}
+
+func (cmd *logs) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	cmd.Max = 25 // default
+	f.Var(flags.NewInt32(&cmd.Max), "n", "Output the last N log lines")
+	f.StringVar(&cmd.Key, "log", "", "Log file key")
+	f.BoolVar(&cmd.follow, "f", false, "Follow log file changes")
+}
+
+func (cmd *logs) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *logs) Description() string {
+	return `View VPX and ESX logs.
+
+The '-log' option defaults to "hostd" when connected directly to a host or
+when connected to VirtualCenter and a '-host' option is given.  Otherwise,
+the '-log' option defaults to "vpxd:vpxd.log".  The '-host' option is ignored
+when connected directly to a host.  See 'govc logs.ls' for other '-log' options.
+
+Examples:
+  govc logs -n 1000 -f
+  govc logs -host esx1
+  govc logs -host esx1 -log vmkernel`
+}
+
+func (cmd *logs) Run(ctx context.Context, f *flag.FlagSet) error {
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	defaultKey := "hostd"
+	var host *object.HostSystem
+
+	if c.IsVC() {
+		host, err = cmd.HostSystemIfSpecified()
+		if err != nil {
+			return err
+		}
+
+		if host == nil {
+			defaultKey = "vpxd:vpxd.log"
+		}
+	}
+
+	m := object.NewDiagnosticManager(c)
+
+	key := cmd.Key
+	if key == "" {
+		key = defaultKey
+	}
+
+	l := m.Log(ctx, host, key)
+
+	err = l.Seek(ctx, cmd.Max)
+	if err != nil {
+		return err
+	}
+
+	for {
+		_, err = l.Copy(ctx, cmd.Out)
+		if err != nil {
+			return nil
+		}
+
+		if !cmd.follow {
+			break
+		}
+
+		<-time.After(time.Second)
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/logs/download.go b/vendor/github.com/vmware/govmomi/govc/logs/download.go
new file mode 100644
index 0000000000..62f95a5075
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/logs/download.go
@@ -0,0 +1,145 @@
+/*
+Copyright (c) 2015 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 logs
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"path"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type download struct {
+	*flags.DatacenterFlag
+
+	IncludeDefault bool
+}
+
+func init() {
+	cli.Register("logs.download", &download{})
+}
+
+func (cmd *download) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.IncludeDefault, "default", true, "Specifies if the bundle should include the default server")
+}
+
+func (cmd *download) Process(ctx context.Context) error {
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *download) Usage() string {
+	return "[PATH]..."
+}
+
+func (cmd *download) Description() string {
+	return `Generate diagnostic bundles.
+
+A diagnostic bundle includes log files and other configuration information.
+
+Use PATH to include a specific set of hosts to include.
+
+Examples:
+  govc logs.download
+  govc logs.download host-a host-b`
+}
+
+func (cmd *download) DownloadFile(c *vim25.Client, b string) error {
+	u, err := c.Client.ParseURL(b)
+	if err != nil {
+		return err
+	}
+
+	dst := path.Base(u.Path)
+	p := soap.DefaultDownload
+	if cmd.OutputFlag.TTY {
+		logger := cmd.ProgressLogger(fmt.Sprintf("Downloading %s... ", dst))
+		defer logger.Wait()
+		p.Progress = logger
+	}
+
+	return c.Client.DownloadFile(dst, u, &p)
+}
+
+func (cmd *download) GenerateLogBundles(m *object.DiagnosticManager, host []*object.HostSystem) ([]types.DiagnosticManagerBundleInfo, error) {
+	ctx := context.TODO()
+	logger := cmd.ProgressLogger("Generating log bundles... ")
+	defer logger.Wait()
+
+	task, err := m.GenerateLogBundles(ctx, cmd.IncludeDefault, host)
+	if err != nil {
+		return nil, err
+	}
+
+	r, err := task.WaitForResult(ctx, logger)
+	if err != nil {
+		return nil, err
+	}
+
+	return r.Result.(types.ArrayOfDiagnosticManagerBundleInfo).DiagnosticManagerBundleInfo, nil
+}
+
+func (cmd *download) Run(ctx context.Context, f *flag.FlagSet) error {
+	finder, err := cmd.Finder()
+	if err != nil {
+		return err
+	}
+
+	var host []*object.HostSystem
+
+	for _, arg := range f.Args() {
+		hs, err := finder.HostSystemList(ctx, arg)
+		if err != nil {
+			return err
+		}
+
+		host = append(host, hs...)
+	}
+
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	m := object.NewDiagnosticManager(c)
+
+	bundles, err := cmd.GenerateLogBundles(m, host)
+	if err != nil {
+		return err
+	}
+
+	for _, bundle := range bundles {
+		err := cmd.DownloadFile(c, bundle.Url)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/logs/ls.go b/vendor/github.com/vmware/govmomi/govc/logs/ls.go
new file mode 100644
index 0000000000..49a2aa369e
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/logs/ls.go
@@ -0,0 +1,88 @@
+/*
+Copyright (c) 2015-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 logs
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type ls struct {
+	*flags.HostSystemFlag
+}
+
+func init() {
+	cli.Register("logs.ls", &ls{})
+}
+
+func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+}
+
+func (cmd *ls) Process(ctx context.Context) error {
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *ls) Description() string {
+	return `List diagnostic log keys.
+
+Examples:
+  govc logs.ls
+  govc logs.ls -host host-a`
+}
+
+func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	var host *object.HostSystem
+
+	if c.IsVC() {
+		host, err = cmd.HostSystemIfSpecified()
+		if err != nil {
+			return err
+		}
+	}
+
+	m := object.NewDiagnosticManager(c)
+
+	desc, err := m.QueryDescriptions(ctx, host)
+	if err != nil {
+		return err
+	}
+
+	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
+
+	for _, d := range desc {
+		fmt.Fprintf(tw, "%s\t%s\n", d.Key, d.FileName)
+	}
+
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/ls/command.go b/vendor/github.com/vmware/govmomi/govc/ls/command.go
new file mode 100644
index 0000000000..06a9b409fb
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/ls/command.go
@@ -0,0 +1,175 @@
+/*
+Copyright (c) 2014-2015 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 ls
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"strings"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/list"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type ls struct {
+	*flags.DatacenterFlag
+
+	Long  bool
+	Type  string
+	ToRef bool
+	DeRef bool
+}
+
+func init() {
+	cli.Register("ls", &ls{})
+}
+
+func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.Long, "l", false, "Long listing format")
+	f.BoolVar(&cmd.ToRef, "i", false, "Print the managed object reference")
+	f.BoolVar(&cmd.DeRef, "L", false, "Follow managed object references")
+	f.StringVar(&cmd.Type, "t", "", "Object type")
+}
+
+func (cmd *ls) Description() string {
+	return `List inventory items.
+
+Examples:
+  govc ls -l '*'
+  govc ls -t ClusterComputeResource host
+  govc ls -t Datastore host/ClusterA/* | grep -v local | xargs -n1 basename | sort | uniq`
+}
+
+func (cmd *ls) Process(ctx context.Context) error {
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *ls) Usage() string {
+	return "[PATH]..."
+}
+
+func (cmd *ls) typeMatch(ref types.ManagedObjectReference) bool {
+	if cmd.Type == "" {
+		return true
+	}
+
+	return strings.ToLower(cmd.Type) == strings.ToLower(ref.Type)
+}
+
+func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
+	finder, err := cmd.Finder()
+	if err != nil {
+		return err
+	}
+
+	lr := listResult{
+		ls:       cmd,
+		Elements: nil,
+	}
+
+	args := f.Args()
+	if len(args) == 0 {
+		args = []string{"."}
+	}
+
+	var ref = new(types.ManagedObjectReference)
+
+	var types []string
+	if cmd.Type != "" {
+		// TODO: support multiple -t flags
+		types = []string{cmd.Type}
+	}
+
+	for _, arg := range args {
+		if cmd.DeRef && ref.FromString(arg) {
+			e, err := finder.Element(ctx, *ref)
+			if err == nil {
+				if cmd.typeMatch(*ref) {
+					if e.Path == "/" && ref.Type != "Folder" {
+						// Special case: when given a moref with no ancestors,
+						// just echo the moref.
+						e.Path = ref.String()
+					}
+					lr.Elements = append(lr.Elements, *e)
+				}
+				continue
+			}
+		}
+
+		es, err := finder.ManagedObjectListChildren(ctx, arg, types...)
+		if err != nil {
+			return err
+		}
+
+		for _, e := range es {
+			if cmd.typeMatch(e.Object.Reference()) {
+				lr.Elements = append(lr.Elements, e)
+			}
+		}
+	}
+
+	return cmd.WriteResult(lr)
+}
+
+type listResult struct {
+	*ls
+	Elements []list.Element `json:"elements"`
+}
+
+func (l listResult) Write(w io.Writer) error {
+	var err error
+
+	for _, e := range l.Elements {
+		if l.ToRef {
+			fmt.Fprint(w, e.Object.Reference().String())
+			if l.Long {
+				fmt.Fprintf(w, " %s", e.Path)
+			}
+			fmt.Fprintln(w)
+			continue
+		}
+
+		if !l.Long {
+			fmt.Fprintf(w, "%s\n", e.Path)
+			continue
+		}
+
+		switch e.Object.(type) {
+		case mo.Folder:
+			if _, err = fmt.Fprintf(w, "%s/\n", e.Path); err != nil {
+				return err
+			}
+		default:
+			if _, err = fmt.Fprintf(w, "%s (%s)\n", e.Path, e.Object.Reference().Type); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/main.go b/vendor/github.com/vmware/govmomi/govc/main.go
new file mode 100644
index 0000000000..8d762dd0e7
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/main.go
@@ -0,0 +1,78 @@
+/*
+Copyright (c) 2014-2015 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 (
+	"os"
+
+	"github.com/vmware/govmomi/govc/cli"
+
+	_ "github.com/vmware/govmomi/govc/about"
+	_ "github.com/vmware/govmomi/govc/cluster"
+	_ "github.com/vmware/govmomi/govc/datacenter"
+	_ "github.com/vmware/govmomi/govc/datastore"
+	_ "github.com/vmware/govmomi/govc/datastore/disk"
+	_ "github.com/vmware/govmomi/govc/datastore/vsan"
+	_ "github.com/vmware/govmomi/govc/device"
+	_ "github.com/vmware/govmomi/govc/device/cdrom"
+	_ "github.com/vmware/govmomi/govc/device/floppy"
+	_ "github.com/vmware/govmomi/govc/device/scsi"
+	_ "github.com/vmware/govmomi/govc/device/serial"
+	_ "github.com/vmware/govmomi/govc/device/usb"
+	_ "github.com/vmware/govmomi/govc/dvs"
+	_ "github.com/vmware/govmomi/govc/dvs/portgroup"
+	_ "github.com/vmware/govmomi/govc/env"
+	_ "github.com/vmware/govmomi/govc/events"
+	_ "github.com/vmware/govmomi/govc/extension"
+	_ "github.com/vmware/govmomi/govc/fields"
+	_ "github.com/vmware/govmomi/govc/folder"
+	_ "github.com/vmware/govmomi/govc/host"
+	_ "github.com/vmware/govmomi/govc/host/account"
+	_ "github.com/vmware/govmomi/govc/host/autostart"
+	_ "github.com/vmware/govmomi/govc/host/cert"
+	_ "github.com/vmware/govmomi/govc/host/date"
+	_ "github.com/vmware/govmomi/govc/host/esxcli"
+	_ "github.com/vmware/govmomi/govc/host/firewall"
+	_ "github.com/vmware/govmomi/govc/host/maintenance"
+	_ "github.com/vmware/govmomi/govc/host/option"
+	_ "github.com/vmware/govmomi/govc/host/portgroup"
+	_ "github.com/vmware/govmomi/govc/host/service"
+	_ "github.com/vmware/govmomi/govc/host/storage"
+	_ "github.com/vmware/govmomi/govc/host/vnic"
+	_ "github.com/vmware/govmomi/govc/host/vswitch"
+	_ "github.com/vmware/govmomi/govc/importx"
+	_ "github.com/vmware/govmomi/govc/license"
+	_ "github.com/vmware/govmomi/govc/logs"
+	_ "github.com/vmware/govmomi/govc/ls"
+	_ "github.com/vmware/govmomi/govc/object"
+	_ "github.com/vmware/govmomi/govc/permissions"
+	_ "github.com/vmware/govmomi/govc/pool"
+	_ "github.com/vmware/govmomi/govc/role"
+	_ "github.com/vmware/govmomi/govc/session"
+	_ "github.com/vmware/govmomi/govc/vapp"
+	_ "github.com/vmware/govmomi/govc/version"
+	_ "github.com/vmware/govmomi/govc/vm"
+	_ "github.com/vmware/govmomi/govc/vm/disk"
+	_ "github.com/vmware/govmomi/govc/vm/guest"
+	_ "github.com/vmware/govmomi/govc/vm/network"
+	_ "github.com/vmware/govmomi/govc/vm/rdm"
+	_ "github.com/vmware/govmomi/govc/vm/snapshot"
+)
+
+func main() {
+	os.Exit(cli.Run(os.Args[1:]))
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/main_test.go b/vendor/github.com/vmware/govmomi/govc/main_test.go
new file mode 100644
index 0000000000..7cc28d800d
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/main_test.go
@@ -0,0 +1,38 @@
+/*
+Copyright (c) 2015 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 (
+	"context"
+	"flag"
+	"testing"
+
+	"github.com/vmware/govmomi/govc/cli"
+)
+
+func TestMain(t *testing.T) {
+	// Execute flag registration for every command to verify there are no
+	// commands with flag name collisions
+	for _, cmd := range cli.Commands() {
+		fs := flag.NewFlagSet("", flag.ContinueOnError)
+
+		// Use fresh context for every command
+		ctx, cancel := context.WithCancel(context.Background())
+		defer cancel()
+		cmd.Register(ctx, fs)
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/object/collect.go b/vendor/github.com/vmware/govmomi/govc/object/collect.go
new file mode 100644
index 0000000000..48b2290955
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/object/collect.go
@@ -0,0 +1,239 @@
+/*
+Copyright (c) 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 object
+
+import (
+	"context"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"io"
+	"reflect"
+	"strings"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type collect struct {
+	*flags.DatacenterFlag
+
+	single bool
+	simple bool
+	n      int
+}
+
+func init() {
+	cli.Register("object.collect", &collect{})
+}
+
+func (cmd *collect) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.simple, "s", false, "Output property value only")
+	f.IntVar(&cmd.n, "n", 0, "Wait for N property updates")
+}
+
+func (cmd *collect) Usage() string {
+	return "[MOID] [PROPERTY]..."
+}
+
+func (cmd *collect) Description() string {
+	return `Collect managed object properties.
+
+MOID can be an inventory path or ManagedObjectReference.
+MOID defaults to '-', an alias for 'ServiceInstance:ServiceInstance'.
+
+By default only the current property value(s) are collected.  Use the '-n' flag to wait for updates.
+
+Examples:
+  govc object.collect - content
+  govc object.collect -s HostSystem:ha-host hardware.systemInfo.uuid
+  govc object.collect -s /ha-datacenter/vm/foo overallStatus
+  govc object.collect -json -n=-1 EventManager:ha-eventmgr latestEvent | jq .
+  govc object.collect -json -s $(govc object.collect -s - content.perfManager) description.counterType | jq .`
+}
+
+func (cmd *collect) Process(ctx context.Context) error {
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+var stringer = reflect.TypeOf((*fmt.Stringer)(nil)).Elem()
+
+type change struct {
+	cmd            *collect
+	PropertyChange []types.PropertyChange
+}
+
+func (pc *change) MarshalJSON() ([]byte, error) {
+	return json.Marshal(pc.PropertyChange)
+}
+
+func (pc *change) output(name string, rval reflect.Value, rtype reflect.Type) {
+	s := "..."
+
+	kind := rval.Kind()
+
+	if kind == reflect.Ptr || kind == reflect.Interface {
+		if rval.IsNil() {
+			s = ""
+		} else {
+			rval = rval.Elem()
+			kind = rval.Kind()
+		}
+	}
+
+	switch kind {
+	case reflect.Ptr, reflect.Interface:
+	case reflect.Slice:
+		if rval.Len() == 0 {
+			s = ""
+			break
+		}
+
+		etype := rtype.Elem()
+
+		if etype.Kind() != reflect.Interface && etype.Kind() != reflect.Struct || etype.Implements(stringer) {
+			var val []string
+
+			for i := 0; i < rval.Len(); i++ {
+				v := rval.Index(i).Interface()
+
+				if fstr, ok := v.(fmt.Stringer); ok {
+					s = fstr.String()
+				} else {
+					s = fmt.Sprintf("%v", v)
+				}
+
+				val = append(val, s)
+			}
+
+			s = strings.Join(val, ",")
+		}
+	case reflect.Struct:
+		if rtype.Implements(stringer) {
+			s = rval.Interface().(fmt.Stringer).String()
+		}
+	default:
+		s = fmt.Sprintf("%v", rval.Interface())
+	}
+
+	if pc.cmd.simple {
+		fmt.Fprintln(pc.cmd.Out, s)
+		return
+	}
+
+	fmt.Fprintf(pc.cmd.Out, "%s\t%s\t%s\n", name, rtype, s)
+}
+
+func (pc *change) Write(w io.Writer) error {
+	tw := tabwriter.NewWriter(pc.cmd.Out, 4, 0, 2, ' ', 0)
+	pc.cmd.Out = tw
+
+	for _, c := range pc.PropertyChange {
+		if c.Val == nil {
+			// type is unknown in this case, as xsi:type was not provided - just skip for now
+			continue
+		}
+
+		rval := reflect.ValueOf(c.Val)
+		rtype := rval.Type()
+
+		if strings.HasPrefix(rtype.Name(), "ArrayOf") {
+			rval = rval.Field(0)
+			rtype = rval.Type()
+		}
+
+		if pc.cmd.single && rtype.Kind() == reflect.Struct && !rtype.Implements(stringer) {
+			for i := 0; i < rval.NumField(); i++ {
+				fval := rval.Field(i)
+				field := rtype.Field(i)
+
+				if field.Anonymous {
+					continue
+				}
+
+				fname := fmt.Sprintf("%s.%s%s", c.Name, strings.ToLower(field.Name[:1]), field.Name[1:])
+				pc.output(fname, fval, field.Type)
+			}
+			continue
+		}
+
+		pc.output(c.Name, rval, rtype)
+	}
+
+	return tw.Flush()
+}
+
+func (cmd *collect) Run(ctx context.Context, f *flag.FlagSet) error {
+	client, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	finder, err := cmd.Finder()
+	if err != nil {
+		return err
+	}
+
+	ref := methods.ServiceInstance
+	arg := f.Arg(0)
+
+	switch arg {
+	case "", "-":
+	default:
+		if !ref.FromString(arg) {
+			l, ferr := finder.ManagedObjectList(ctx, arg)
+			if ferr != nil {
+				return err
+			}
+
+			switch len(l) {
+			case 0:
+				return fmt.Errorf("%s not found", arg)
+			case 1:
+				ref = l[0].Object.Reference()
+			default:
+				return flag.ErrHelp
+			}
+		}
+	}
+
+	p := property.DefaultCollector(client)
+
+	var props []string
+	if f.NArg() > 1 {
+		props = f.Args()[1:]
+		cmd.single = len(props) == 1
+	}
+
+	return property.Wait(ctx, p, ref, props, func(pc []types.PropertyChange) bool {
+		_ = cmd.WriteResult(&change{cmd, pc})
+
+		cmd.n--
+
+		return cmd.n == -1
+	})
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/object/destroy.go b/vendor/github.com/vmware/govmomi/govc/object/destroy.go
new file mode 100644
index 0000000000..7429bc51eb
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/object/destroy.go
@@ -0,0 +1,90 @@
+/*
+Copyright (c) 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 object
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type destroy struct {
+	*flags.DatacenterFlag
+}
+
+func init() {
+	cli.Register("object.destroy", &destroy{})
+}
+
+func (cmd *destroy) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+}
+
+func (cmd *destroy) Usage() string {
+	return "PATH..."
+}
+
+func (cmd *destroy) Description() string {
+	return `Destroy managed objects.
+
+Examples:
+  govc object.destroy /dc1/network/dvs /dc1/host/cluster`
+}
+
+func (cmd *destroy) Process(ctx context.Context) error {
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *destroy) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() == 0 {
+		return flag.ErrHelp
+	}
+
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	objs, err := cmd.ManagedObjects(ctx, f.Args())
+	if err != nil {
+		return err
+	}
+
+	for _, obj := range objs {
+		task, err := object.NewCommon(c, obj).Destroy(ctx)
+		if err != nil {
+			return err
+		}
+
+		logger := cmd.ProgressLogger(fmt.Sprintf("destroying %s... ", obj))
+		_, err = task.WaitForResult(ctx, logger)
+		logger.Wait()
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/object/mv.go b/vendor/github.com/vmware/govmomi/govc/object/mv.go
new file mode 100644
index 0000000000..42c288246b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/object/mv.go
@@ -0,0 +1,92 @@
+/*
+Copyright (c) 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 object
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type mv struct {
+	*flags.DatacenterFlag
+}
+
+func init() {
+	cli.Register("object.mv", &mv{})
+}
+
+func (cmd *mv) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+}
+
+func (cmd *mv) Usage() string {
+	return "PATH... FOLDER"
+}
+
+func (cmd *mv) Description() string {
+	return `Move managed entities to FOLDER.
+
+Examples:
+  govc folder.create /dc1/host/example
+  govc object.mv /dc2/host/*.example.com /dc1/host/example`
+}
+
+func (cmd *mv) Process(ctx context.Context) error {
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *mv) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() < 2 {
+		return flag.ErrHelp
+	}
+
+	finder, err := cmd.Finder()
+	if err != nil {
+		return err
+	}
+
+	n := f.NArg() - 1
+
+	folder, err := finder.Folder(ctx, f.Arg(n))
+	if err != nil {
+		return err
+	}
+
+	objs, err := cmd.ManagedObjects(ctx, f.Args()[:n])
+	if err != nil {
+		return err
+	}
+
+	task, err := folder.MoveInto(ctx, objs)
+	if err != nil {
+		return err
+	}
+
+	logger := cmd.ProgressLogger(fmt.Sprintf("moving %d objects to %s... ", len(objs), folder.InventoryPath))
+	_, err = task.WaitForResult(ctx, logger)
+	logger.Wait()
+
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/object/reload.go b/vendor/github.com/vmware/govmomi/govc/object/reload.go
new file mode 100644
index 0000000000..6546a7d38b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/object/reload.go
@@ -0,0 +1,88 @@
+/*
+Copyright (c) 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 object
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type reload struct {
+	*flags.DatacenterFlag
+}
+
+func init() {
+	cli.Register("object.reload", &reload{})
+}
+
+func (cmd *reload) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+}
+
+func (cmd *reload) Usage() string {
+	return "PATH..."
+}
+
+func (cmd *reload) Description() string {
+	return `Reload managed object state.
+
+Examples:
+  govc datastore.upload $vm.vmx $vm/$vm.vmx
+  govc object.reload /dc1/vm/$vm`
+}
+
+func (cmd *reload) Process(ctx context.Context) error {
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *reload) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() == 0 {
+		return flag.ErrHelp
+	}
+
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	objs, err := cmd.ManagedObjects(ctx, f.Args())
+	if err != nil {
+		return err
+	}
+
+	for _, obj := range objs {
+		req := types.Reload{
+			This: obj,
+		}
+
+		_, err = methods.Reload(ctx, c, &req)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/object/rename.go b/vendor/github.com/vmware/govmomi/govc/object/rename.go
new file mode 100644
index 0000000000..4684cb91d2
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/object/rename.go
@@ -0,0 +1,85 @@
+/*
+Copyright (c) 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 object
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type rename struct {
+	*flags.DatacenterFlag
+}
+
+func init() {
+	cli.Register("object.rename", &rename{})
+}
+
+func (cmd *rename) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+}
+
+func (cmd *rename) Usage() string {
+	return "PATH NAME"
+}
+
+func (cmd *rename) Description() string {
+	return `Rename managed objects.
+
+Examples:
+  govc object.rename /dc1/network/dvs1 Switch1`
+}
+
+func (cmd *rename) Process(ctx context.Context) error {
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *rename) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 2 {
+		return flag.ErrHelp
+	}
+
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	objs, err := cmd.ManagedObjects(ctx, f.Args()[:1])
+	if err != nil {
+		return err
+	}
+
+	task, err := object.NewCommon(c, objs[0]).Rename(ctx, f.Arg(1))
+	if err != nil {
+		return err
+	}
+
+	logger := cmd.ProgressLogger(fmt.Sprintf("renaming %s... ", objs[0]))
+	_, err = task.WaitForResult(ctx, logger)
+	logger.Wait()
+
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/permissions/ls.go b/vendor/github.com/vmware/govmomi/govc/permissions/ls.go
new file mode 100644
index 0000000000..b121d08bbb
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/permissions/ls.go
@@ -0,0 +1,83 @@
+/*
+Copyright (c) 2015 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 permissions
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+)
+
+type ls struct {
+	*PermissionFlag
+
+	inherited bool
+}
+
+func init() {
+	cli.Register("permissions.ls", &ls{})
+}
+
+func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.PermissionFlag, ctx = NewPermissionFlag(ctx)
+	cmd.PermissionFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.inherited, "a", true, "Include inherited permissions defined by parent entities")
+}
+
+func (cmd *ls) Process(ctx context.Context) error {
+	if err := cmd.PermissionFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *ls) Usage() string {
+	return "[PATH]..."
+}
+
+func (cmd *ls) Description() string {
+	return `List the permissions defined on or effective on managed entities.
+
+Examples:
+  govc permissions.ls
+  govc permissions.ls /dc1/host/cluster1`
+}
+
+func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
+	refs, err := cmd.ManagedObjects(ctx, f.Args())
+	if err != nil {
+		return err
+	}
+
+	m, err := cmd.Manager(ctx)
+	if err != nil {
+		return err
+	}
+
+	for _, ref := range refs {
+		perms, err := m.RetrieveEntityPermissions(ctx, ref, cmd.inherited)
+		if err != nil {
+			return err
+		}
+
+		cmd.List.Add(perms)
+	}
+
+	return cmd.WriteResult(&cmd.List)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/permissions/permissions.go b/vendor/github.com/vmware/govmomi/govc/permissions/permissions.go
new file mode 100644
index 0000000000..31b3de3232
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/permissions/permissions.go
@@ -0,0 +1,165 @@
+/*
+Copyright (c) 2015 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 permissions
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type List struct {
+	Roles object.AuthorizationRoleList `json:",omitempty"`
+
+	Permissions []types.Permission `json:",omitempty"`
+
+	f *PermissionFlag
+}
+
+type PermissionFlag struct {
+	*flags.DatacenterFlag
+	*flags.OutputFlag
+
+	asRef bool
+
+	m *object.AuthorizationManager
+
+	List
+}
+
+func NewPermissionFlag(ctx context.Context) (*PermissionFlag, context.Context) {
+	f := &PermissionFlag{}
+	f.List.f = f
+	f.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	f.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	return f, ctx
+}
+
+func (f *PermissionFlag) Register(ctx context.Context, fs *flag.FlagSet) {
+	f.DatacenterFlag.Register(ctx, fs)
+	f.OutputFlag.Register(ctx, fs)
+
+	fs.BoolVar(&f.asRef, "i", false, "Use moref instead of inventory path")
+}
+
+func (f *PermissionFlag) Process(ctx context.Context) error {
+	if err := f.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := f.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (f *PermissionFlag) Manager(ctx context.Context) (*object.AuthorizationManager, error) {
+	if f.m != nil {
+		return f.m, nil
+	}
+
+	c, err := f.Client()
+	if err != nil {
+		return nil, err
+	}
+
+	f.m = object.NewAuthorizationManager(c)
+	f.Roles, err = f.m.RoleList(ctx)
+
+	return f.m, err
+}
+
+func (f *PermissionFlag) Role(name string) (*types.AuthorizationRole, error) {
+	role := f.Roles.ByName(name)
+	if role == nil {
+		return nil, fmt.Errorf("role %q not found", name)
+	}
+	return role, nil
+}
+
+func (f *PermissionFlag) ManagedObjects(ctx context.Context, args []string) ([]types.ManagedObjectReference, error) {
+	if !f.asRef {
+		return f.DatacenterFlag.ManagedObjects(ctx, args)
+	}
+
+	var refs []types.ManagedObjectReference
+
+	for _, arg := range args {
+		var ref types.ManagedObjectReference
+		if ref.FromString(arg) {
+			refs = append(refs, ref)
+		} else {
+			return nil, fmt.Errorf("invalid moref: %s", arg)
+		}
+	}
+
+	return refs, nil
+}
+
+func (l *List) Write(w io.Writer) error {
+	ctx := context.Background()
+	finder, err := l.f.Finder()
+	if err != nil {
+		return err
+	}
+
+	refs := make(map[types.ManagedObjectReference]string)
+
+	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
+
+	fmt.Fprintf(tw, "%s\t%s\t%s\t%s\n", "Role", "Entity", "Principal", "Propagate")
+
+	for _, perm := range l.Permissions {
+		propagate := "No"
+		if perm.Propagate {
+			propagate = "Yes"
+		}
+
+		name := l.Roles.ById(perm.RoleId).Name
+
+		p := "-"
+		if perm.Entity != nil {
+			if l.f.asRef {
+				p = perm.Entity.String()
+			} else {
+				// convert moref to inventory path
+				if p = refs[*perm.Entity]; p == "" {
+					e, err := finder.Element(ctx, *perm.Entity)
+					if err == nil {
+						p = e.Path
+					}
+
+					refs[*perm.Entity] = p
+				}
+			}
+		}
+
+		fmt.Fprintf(tw, "%s\t%s\t%s\t%s\n", name, p, perm.Principal, propagate)
+	}
+
+	return tw.Flush()
+}
+
+func (l *List) Add(perms []types.Permission) {
+	l.Permissions = append(l.Permissions, perms...)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/permissions/remove.go b/vendor/github.com/vmware/govmomi/govc/permissions/remove.go
new file mode 100644
index 0000000000..0ef10abc78
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/permissions/remove.go
@@ -0,0 +1,85 @@
+/*
+Copyright (c) 2015 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 permissions
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type remove struct {
+	*PermissionFlag
+
+	types.Permission
+
+	role string
+}
+
+func init() {
+	cli.Register("permissions.remove", &remove{})
+}
+
+func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.PermissionFlag, ctx = NewPermissionFlag(ctx)
+	cmd.PermissionFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.Principal, "principal", "", "User or group for which the permission is defined")
+	f.BoolVar(&cmd.Group, "group", false, "True, if principal refers to a group name; false, for a user name")
+}
+
+func (cmd *remove) Process(ctx context.Context) error {
+	if err := cmd.PermissionFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *remove) Usage() string {
+	return "[PATH]..."
+}
+
+func (cmd *remove) Description() string {
+	return `Removes a permission rule from managed entities.
+
+Examples:
+  govc permissions.remove -principal root
+  govc permissions.remove -principal $USER@vsphere.local -role Admin /dc1/host/cluster1`
+}
+
+func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
+	refs, err := cmd.ManagedObjects(ctx, f.Args())
+	if err != nil {
+		return err
+	}
+
+	m, err := cmd.Manager(ctx)
+	if err != nil {
+		return err
+	}
+
+	for _, ref := range refs {
+		err = m.RemoveEntityPermission(ctx, ref, cmd.Principal, cmd.Group)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/permissions/set.go b/vendor/github.com/vmware/govmomi/govc/permissions/set.go
new file mode 100644
index 0000000000..ffcc9f0aef
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/permissions/set.go
@@ -0,0 +1,96 @@
+/*
+Copyright (c) 2015 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 permissions
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type set struct {
+	*PermissionFlag
+
+	types.Permission
+
+	role string
+}
+
+func init() {
+	cli.Register("permissions.set", &set{})
+}
+
+func (cmd *set) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.PermissionFlag, ctx = NewPermissionFlag(ctx)
+	cmd.PermissionFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.Principal, "principal", "", "User or group for which the permission is defined")
+	f.BoolVar(&cmd.Group, "group", false, "True, if principal refers to a group name; false, for a user name")
+	f.BoolVar(&cmd.Propagate, "propagate", true, "Whether or not this permission propagates down the hierarchy to sub-entities")
+	f.StringVar(&cmd.role, "role", "Admin", "Permission role name")
+}
+
+func (cmd *set) Process(ctx context.Context) error {
+	if err := cmd.PermissionFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *set) Usage() string {
+	return "[PATH]..."
+}
+
+func (cmd *set) Description() string {
+	return `Set the permissions managed entities.
+
+Examples:
+  govc permissions.set -principal root -role Admin
+  govc permissions.set -principal $USER@vsphere.local -role Admin /dc1/host/cluster1`
+}
+
+func (cmd *set) Run(ctx context.Context, f *flag.FlagSet) error {
+	refs, err := cmd.ManagedObjects(ctx, f.Args())
+	if err != nil {
+		return err
+	}
+
+	m, err := cmd.Manager(ctx)
+	if err != nil {
+		return err
+	}
+
+	role, err := cmd.Role(cmd.role)
+	if err != nil {
+		return err
+	}
+
+	cmd.Permission.RoleId = role.RoleId
+
+	perms := []types.Permission{cmd.Permission}
+
+	for _, ref := range refs {
+		err = m.SetEntityPermissions(ctx, ref, perms)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/pool/change.go b/vendor/github.com/vmware/govmomi/govc/pool/change.go
new file mode 100644
index 0000000000..a8d50e6818
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/pool/change.go
@@ -0,0 +1,98 @@
+/*
+Copyright (c) 2015 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 pool
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type change struct {
+	*flags.DatacenterFlag
+	*ResourceConfigSpecFlag
+
+	name string
+}
+
+func init() {
+	cli.Register("pool.change", &change{})
+}
+
+func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+	cmd.ResourceConfigSpecFlag = NewResourceConfigSpecFlag()
+	cmd.ResourceConfigSpecFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.name, "name", "", "Resource pool name")
+}
+
+func (cmd *change) Process(ctx context.Context) error {
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.ResourceConfigSpecFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *change) Usage() string {
+	return "POOL..."
+}
+
+func (cmd *change) Description() string {
+	return "Change the configuration of one or more resource POOLs.\n" + poolNameHelp
+}
+
+func (cmd *change) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() == 0 {
+		return flag.ErrHelp
+	}
+
+	finder, err := cmd.Finder()
+	if err != nil {
+		return err
+	}
+
+	cmd.SetAllocation(func(a types.BaseResourceAllocationInfo) {
+		ra := a.GetResourceAllocationInfo()
+		if ra.Shares.Level == "" {
+			ra.Shares = nil
+		}
+	})
+
+	for _, arg := range f.Args() {
+		pools, err := finder.ResourcePoolListAll(ctx, arg)
+		if err != nil {
+			return err
+		}
+
+		for _, pool := range pools {
+			err := pool.UpdateConfig(ctx, cmd.name, &cmd.ResourceConfigSpec)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/pool/create.go b/vendor/github.com/vmware/govmomi/govc/pool/create.go
new file mode 100644
index 0000000000..45432bfcdf
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/pool/create.go
@@ -0,0 +1,101 @@
+/*
+Copyright (c) 2015 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 pool
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"path"
+
+	"github.com/vmware/govmomi/find"
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type create struct {
+	*flags.DatacenterFlag
+	*ResourceConfigSpecFlag
+}
+
+func init() {
+	cli.Register("pool.create", &create{})
+}
+
+func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+
+	cmd.ResourceConfigSpecFlag = NewResourceConfigSpecFlag()
+	cmd.ResourceConfigSpecFlag.SetAllocation(func(a types.BaseResourceAllocationInfo) {
+		ra := a.GetResourceAllocationInfo()
+		ra.Shares.Level = types.SharesLevelNormal
+		ra.ExpandableReservation = types.NewBool(true)
+	})
+	cmd.ResourceConfigSpecFlag.Register(ctx, f)
+}
+
+func (cmd *create) Process(ctx context.Context) error {
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.ResourceConfigSpecFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *create) Usage() string {
+	return "POOL..."
+}
+
+func (cmd *create) Description() string {
+	return "Create one or more resource POOLs.\n" + poolCreateHelp
+}
+
+func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() == 0 {
+		return flag.ErrHelp
+	}
+
+	finder, err := cmd.Finder()
+	if err != nil {
+		return err
+	}
+
+	for _, arg := range f.Args() {
+		dir := path.Dir(arg)
+		base := path.Base(arg)
+		parents, err := finder.ResourcePoolList(ctx, dir)
+		if err != nil {
+			if _, ok := err.(*find.NotFoundError); ok {
+				return fmt.Errorf("cannot create resource pool '%s': parent not found", base)
+			}
+			return err
+		}
+
+		for _, parent := range parents {
+			_, err = parent.Create(ctx, base, cmd.ResourceConfigSpec)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/pool/destroy.go b/vendor/github.com/vmware/govmomi/govc/pool/destroy.go
new file mode 100644
index 0000000000..32a042f5c6
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/pool/destroy.go
@@ -0,0 +1,101 @@
+/*
+Copyright (c) 2015 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 pool
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/find"
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type destroy struct {
+	*flags.DatacenterFlag
+
+	children bool
+}
+
+func init() {
+	cli.Register("pool.destroy", &destroy{})
+}
+
+func (cmd *destroy) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.children, "children", false, "Remove all children pools")
+}
+
+func (cmd *destroy) Process(ctx context.Context) error {
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *destroy) Usage() string {
+	return "POOL..."
+}
+
+func (cmd *destroy) Description() string {
+	return "Destroy one or more resource POOLs.\n" + poolNameHelp
+}
+
+func (cmd *destroy) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() == 0 {
+		return flag.ErrHelp
+	}
+
+	finder, err := cmd.Finder()
+	if err != nil {
+		return err
+	}
+
+	for _, arg := range f.Args() {
+		pools, err := finder.ResourcePoolList(ctx, arg)
+		if err != nil {
+			if _, ok := err.(*find.NotFoundError); ok {
+				// Ignore if pool cannot be found
+				continue
+			}
+
+			return err
+		}
+
+		for _, pool := range pools {
+			if cmd.children {
+				err = pool.DestroyChildren(ctx)
+				if err != nil {
+					return err
+				}
+			} else {
+				task, err := pool.Destroy(ctx)
+				if err != nil {
+					return err
+				}
+				err = task.Wait(ctx)
+				if err != nil {
+					return err
+				}
+			}
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/pool/help.go b/vendor/github.com/vmware/govmomi/govc/pool/help.go
new file mode 100644
index 0000000000..dbd8ca23bd
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/pool/help.go
@@ -0,0 +1,50 @@
+/*
+Copyright (c) 2015 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 pool
+
+var poolNameHelp = `
+POOL may be an absolute or relative path to a resource pool or a (clustered)
+compute host. If it resolves to a compute host, the associated root resource
+pool is returned. If a relative path is specified, it is resolved with respect
+to the current datacenter's "host" folder (i.e. /ha-datacenter/host).
+
+Paths to nested resource pools must traverse through the root resource pool of
+the selected compute host, i.e. "compute-host/Resources/nested-pool".
+
+The same globbing rules that apply to the "ls" command apply here. For example,
+POOL may be specified as "*/Resources/*" to expand to all resource pools that
+are nested one level under the root resource pool, on all (clustered) compute
+hosts in the current datacenter.`
+
+var poolCreateHelp = `
+POOL may be an absolute or relative path to a resource pool. The parent of the
+specified POOL must be an existing resource pool. If a relative path is
+specified, it is resolved with respect to the current datacenter's "host"
+folder (i.e. /ha-datacenter/host). The basename of the specified POOL is used
+as the name for the new resource pool.
+
+The same globbing rules that apply to the "ls" command apply here. For example,
+the path to the parent resource pool in POOL may be specified as "*/Resources"
+to expand to the root resource pools on all (clustered) compute hosts in the
+current datacenter.
+
+For example:
+  */Resources/test             Create resource pool "test" on all (clustered)
+                               compute hosts in the current datacenter.
+  somehost/Resources/*/nested  Create resource pool "nested" in every
+                               resource pool that is a direct descendant of
+                               the root resource pool on "somehost".`
diff --git a/vendor/github.com/vmware/govmomi/govc/pool/info.go b/vendor/github.com/vmware/govmomi/govc/pool/info.go
new file mode 100644
index 0000000000..649b1ce4f6
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/pool/info.go
@@ -0,0 +1,212 @@
+/*
+Copyright (c) 2015-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 pool
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/find"
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type info struct {
+	*flags.DatacenterFlag
+	*flags.OutputFlag
+
+	pools bool
+	apps  bool
+}
+
+func init() {
+	cli.Register("pool.info", &info{})
+}
+
+func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.pools, "p", true, "List resource pools")
+	f.BoolVar(&cmd.apps, "a", false, "List virtual app resource pools")
+}
+
+func (cmd *info) Process(ctx context.Context) error {
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *info) Usage() string {
+	return "POOL..."
+}
+
+func (cmd *info) Description() string {
+	return "Retrieve information about one or more resource POOLs.\n" + poolNameHelp
+}
+
+func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() == 0 {
+		return flag.ErrHelp
+	}
+
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	finder, err := cmd.Finder()
+	if err != nil {
+		return err
+	}
+
+	var res infoResult
+	var props []string
+
+	if cmd.OutputFlag.JSON {
+		props = nil
+	} else {
+		props = []string{
+			"name",
+			"config.cpuAllocation",
+			"config.memoryAllocation",
+			"runtime.cpu",
+			"runtime.memory",
+		}
+	}
+
+	var vapps []*object.VirtualApp
+
+	for _, arg := range f.Args() {
+		if cmd.pools {
+			objects, err := finder.ResourcePoolList(ctx, arg)
+			if err != nil {
+				if _, ok := err.(*find.NotFoundError); !ok {
+					return err
+				}
+			}
+			res.objects = append(res.objects, objects...)
+		}
+
+		if cmd.apps {
+			apps, err := finder.VirtualAppList(ctx, arg)
+			if err != nil {
+				if _, ok := err.(*find.NotFoundError); !ok {
+					return err
+				}
+			}
+			vapps = append(vapps, apps...)
+		}
+	}
+
+	if len(res.objects) != 0 {
+		refs := make([]types.ManagedObjectReference, 0, len(res.objects))
+		for _, o := range res.objects {
+			refs = append(refs, o.Reference())
+		}
+
+		pc := property.DefaultCollector(c)
+		err = pc.Retrieve(ctx, refs, props, &res.ResourcePools)
+		if err != nil {
+			return err
+		}
+	}
+
+	if len(vapps) != 0 {
+		var apps []mo.VirtualApp
+		refs := make([]types.ManagedObjectReference, 0, len(vapps))
+		for _, o := range vapps {
+			refs = append(refs, o.Reference())
+			p := object.NewResourcePool(c, o.Reference())
+			p.InventoryPath = o.InventoryPath
+			res.objects = append(res.objects, p)
+		}
+
+		pc := property.DefaultCollector(c)
+		err = pc.Retrieve(ctx, refs, props, &apps)
+		if err != nil {
+			return err
+		}
+
+		for _, app := range apps {
+			res.ResourcePools = append(res.ResourcePools, app.ResourcePool)
+		}
+	}
+
+	return cmd.WriteResult(&res)
+}
+
+type infoResult struct {
+	ResourcePools []mo.ResourcePool
+	objects       []*object.ResourcePool
+}
+
+func (r *infoResult) Write(w io.Writer) error {
+	// Maintain order via r.objects as Property collector does not always return results in order.
+	objects := make(map[types.ManagedObjectReference]mo.ResourcePool, len(r.ResourcePools))
+	for _, o := range r.ResourcePools {
+		objects[o.Reference()] = o
+	}
+
+	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
+
+	for _, o := range r.objects {
+		pool := objects[o.Reference()]
+		fmt.Fprintf(tw, "Name:\t%s\n", pool.Name)
+		fmt.Fprintf(tw, "  Path:\t%s\n", o.InventoryPath)
+
+		writeInfo(tw, "CPU", "MHz", &pool.Runtime.Cpu, pool.Config.CpuAllocation)
+		pool.Runtime.Memory.MaxUsage >>= 20
+		pool.Runtime.Memory.OverallUsage >>= 20
+		writeInfo(tw, "Mem", "MB", &pool.Runtime.Memory, pool.Config.MemoryAllocation)
+	}
+
+	return tw.Flush()
+}
+
+func writeInfo(w io.Writer, name string, units string, ru *types.ResourcePoolResourceUsage, b types.BaseResourceAllocationInfo) {
+	ra := b.GetResourceAllocationInfo()
+	usage := 100.0 * float64(ru.OverallUsage) / float64(ru.MaxUsage)
+	shares := ""
+	limit := "unlimited"
+
+	if ra.Shares.Level == types.SharesLevelCustom {
+		shares = fmt.Sprintf(" (%d)", ra.Shares.Shares)
+	}
+
+	if ra.Limit != -1 {
+		limit = fmt.Sprintf("%d%s", ra.Limit, units)
+	}
+
+	fmt.Fprintf(w, "  %s Usage:\t%d%s (%0.1f%%)\n", name, ru.OverallUsage, units, usage)
+	fmt.Fprintf(w, "  %s Shares:\t%s%s\n", name, ra.Shares.Level, shares)
+	fmt.Fprintf(w, "  %s Reservation:\t%d%s (expandable=%v)\n", name, ra.Reservation, units, *ra.ExpandableReservation)
+	fmt.Fprintf(w, "  %s Limit:\t%s\n", name, limit)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/pool/resource_config_spec.go b/vendor/github.com/vmware/govmomi/govc/pool/resource_config_spec.go
new file mode 100644
index 0000000000..6a8a50936a
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/pool/resource_config_spec.go
@@ -0,0 +1,97 @@
+/*
+Copyright (c) 2015 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 pool
+
+import (
+	"context"
+	"flag"
+	"strconv"
+	"strings"
+
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type sharesInfo types.SharesInfo
+
+func (s *sharesInfo) String() string {
+	return string(s.Level)
+}
+
+func (s *sharesInfo) Set(val string) error {
+	switch val {
+	case string(types.SharesLevelNormal), string(types.SharesLevelLow), string(types.SharesLevelHigh):
+		s.Level = types.SharesLevel(val)
+	default:
+		n, err := strconv.Atoi(val)
+		if err != nil {
+			return err
+		}
+
+		s.Level = types.SharesLevelCustom
+		s.Shares = int32(n)
+	}
+
+	return nil
+}
+
+func NewResourceConfigSpecFlag() *ResourceConfigSpecFlag {
+	f := new(ResourceConfigSpecFlag)
+	f.MemoryAllocation = new(types.ResourceAllocationInfo)
+	f.CpuAllocation = new(types.ResourceAllocationInfo)
+
+	f.SetAllocation(func(a types.BaseResourceAllocationInfo) {
+		a.GetResourceAllocationInfo().Shares = new(types.SharesInfo)
+	})
+	return f
+}
+
+type ResourceConfigSpecFlag struct {
+	types.ResourceConfigSpec
+}
+
+func (s *ResourceConfigSpecFlag) Register(ctx context.Context, f *flag.FlagSet) {
+	opts := []struct {
+		name  string
+		units string
+		types.BaseResourceAllocationInfo
+	}{
+		{"CPU", "MHz", s.CpuAllocation},
+		{"Memory", "MB", s.MemoryAllocation},
+	}
+
+	for _, opt := range opts {
+		prefix := strings.ToLower(opt.name)[:3]
+		ra := opt.GetResourceAllocationInfo()
+		shares := (*sharesInfo)(ra.Shares)
+
+		f.Int64Var(&ra.Limit, prefix+".limit", 0, opt.name+" limit in "+opt.units)
+		f.Int64Var(&ra.Reservation, prefix+".reservation", 0, opt.name+" reservation in "+opt.units)
+		f.Var(flags.NewOptionalBool(&ra.ExpandableReservation), prefix+".expandable", opt.name+" expandable reservation")
+		f.Var(shares, prefix+".shares", opt.name+" shares level or number")
+	}
+}
+
+func (s *ResourceConfigSpecFlag) Process(ctx context.Context) error {
+	return nil
+}
+
+func (s *ResourceConfigSpecFlag) SetAllocation(f func(types.BaseResourceAllocationInfo)) {
+	for _, a := range []types.BaseResourceAllocationInfo{s.CpuAllocation, s.MemoryAllocation} {
+		f(a)
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/release.sh b/vendor/github.com/vmware/govmomi/govc/release.sh
new file mode 100755
index 0000000000..9d2de7d260
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/release.sh
@@ -0,0 +1,109 @@
+#!/bin/bash -e
+
+if ! which github-release > /dev/null; then
+  echo 'Please install github-release...'
+  echo ''
+  echo '  $ go get github.com/aktau/github-release'
+  echo ''
+  exit 1
+fi
+
+if [ -z "${GITHUB_TOKEN}" ]; then
+  echo 'Please set GITHUB_TOKEN...'
+  exit 1
+fi
+
+export GITHUB_USER="${GITHUB_USER:-vmware}"
+export GITHUB_REPO="${GITHUB_REPO:-govmomi}"
+
+name="$(git describe)"
+release=(github-release release --draft --name "${name}")
+
+case "$1" in
+  release)
+    tag="${name}"
+    ;;
+  prerelease)
+    tag="prerelease-${name}"
+    release+=(--pre-release)
+    ;;
+  dryrun)
+    ;;
+  *)
+    echo "Usage: $0 [release|prerelease]"
+    exit 1
+    ;;
+esac
+
+echo "Building govc..."
+rm -f ./govc_*
+./build.sh
+
+for name in govc_* ; do
+  if [ "${name: -4}" == ".exe" ] ; then
+    zip "${name}.zip" "$name" &
+  else
+    gzip -f "$name" &
+  fi
+done
+
+wait
+
+if [ -n "$tag" ] ; then
+  echo "Pushing tag ${tag}..."
+  git tag -f "${tag}"
+  git push origin "refs/tags/${tag}"
+fi
+
+# Generate description
+description=$(
+if [[ "${tag}" == "prerelease-"* ]]; then
+  echo '**This is a PRERELEASE version.**'
+fi
+
+echo "
+Documentation:
+
+* [CHANGELOG](https://github.com/vmware/govmomi/blob/$tag/govc/CHANGELOG.md)
+
+* [README](https://github.com/vmware/govmomi/blob/$tag/govc/README.md)
+
+* [USAGE](https://github.com/vmware/govmomi/blob/$tag/govc/USAGE.md)
+
+The binaries below are provided without warranty, following the [Apache license](LICENSE).
+"
+
+echo '
+Instructions:
+* Download the file relevant to your operating system
+* Decompress (i.e. `gzip -d govc_linux_amd64.gz`)
+* Set the executable bit (i.e. `chmod +x govc_linux_amd64`)
+* Move the file to a directory in your `$PATH` (i.e. `mv govc_linux_amd64 /usr/local/bin/govc`)
+'
+
+echo '```'
+echo '$ sha1sum govc_*.gz'
+sha1sum govc_*.gz
+echo '$ sha1sum govc_*.zip'
+sha1sum govc_*.zip
+echo '```'
+)
+
+release+=(--tag "${tag}" --description "${description}")
+
+if [ -n "$tag" ] ; then
+  echo "Creating release..."
+  "${release[@]}"
+else
+  echo "${release[@]}"
+fi
+
+# Upload build artifacts
+for f in govc_*.{gz,zip}; do
+  echo "Uploading $f..."
+  if [ -n "$tag" ] ; then
+    github-release upload --tag "${tag}" --name "${f}" --file "${f}"
+  fi
+done
+
+echo "Remember to publish the draft release!"
diff --git a/vendor/github.com/vmware/govmomi/govc/role/create.go b/vendor/github.com/vmware/govmomi/govc/role/create.go
new file mode 100644
index 0000000000..eff65b2aa5
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/role/create.go
@@ -0,0 +1,73 @@
+/*
+Copyright (c) 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 role
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/permissions"
+)
+
+type create struct {
+	*permissions.PermissionFlag
+}
+
+func init() {
+	cli.Register("role.create", &create{})
+}
+
+func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.PermissionFlag, ctx = permissions.NewPermissionFlag(ctx)
+	cmd.PermissionFlag.Register(ctx, f)
+}
+
+func (cmd *create) Process(ctx context.Context) error {
+	if err := cmd.PermissionFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *create) Usage() string {
+	return "NAME [PRIVILEGE]..."
+}
+
+func (cmd *create) Description() string {
+	return `Create authorization role.
+
+Optionally populate the role with the given PRIVILEGE(s).
+
+Examples:
+  govc role.create MyRole
+  govc role.create NoDC $(govc role.ls Admin | grep -v Datacenter.)`
+}
+
+func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() == 0 {
+		return flag.ErrHelp
+	}
+
+	m, err := cmd.Manager(ctx)
+	if err != nil {
+		return err
+	}
+
+	_, err = m.AddRole(ctx, f.Arg(0), f.Args()[1:])
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/role/ls.go b/vendor/github.com/vmware/govmomi/govc/role/ls.go
new file mode 100644
index 0000000000..6c701f517a
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/role/ls.go
@@ -0,0 +1,107 @@
+/*
+Copyright (c) 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 role
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/permissions"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type ls struct {
+	*permissions.PermissionFlag
+}
+
+func init() {
+	cli.Register("role.ls", &ls{})
+}
+
+func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.PermissionFlag, ctx = permissions.NewPermissionFlag(ctx)
+	cmd.PermissionFlag.Register(ctx, f)
+}
+
+func (cmd *ls) Process(ctx context.Context) error {
+	if err := cmd.PermissionFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *ls) Usage() string {
+	return "[NAME]"
+}
+
+func (cmd *ls) Description() string {
+	return `List authorization roles.
+
+If NAME is provided, list privileges for the role.
+
+Examples:
+  govc role.ls
+  govc role.ls Admin`
+}
+
+type lsRoleList object.AuthorizationRoleList
+
+func (rl lsRoleList) Write(w io.Writer) error {
+	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
+
+	for _, role := range rl {
+		fmt.Fprintf(tw, "%s\t%s\n", role.Name, role.Info.GetDescription().Summary)
+	}
+
+	return tw.Flush()
+}
+
+type lsRole types.AuthorizationRole
+
+func (r lsRole) Write(w io.Writer) error {
+	for _, p := range r.Privilege {
+		fmt.Println(p)
+	}
+	return nil
+}
+
+func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() > 1 {
+		return flag.ErrHelp
+	}
+
+	_, err := cmd.Manager(ctx)
+	if err != nil {
+		return err
+	}
+
+	if f.NArg() == 1 {
+		role, err := cmd.Role(f.Arg(0))
+		if err != nil {
+			return err
+		}
+
+		return cmd.WriteResult(lsRole(*role))
+	}
+
+	return cmd.WriteResult(lsRoleList(cmd.Roles))
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/role/remove.go b/vendor/github.com/vmware/govmomi/govc/role/remove.go
new file mode 100644
index 0000000000..0614ca90ee
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/role/remove.go
@@ -0,0 +1,79 @@
+/*
+Copyright (c) 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 role
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/permissions"
+)
+
+type remove struct {
+	*permissions.PermissionFlag
+
+	force bool
+}
+
+func init() {
+	cli.Register("role.remove", &remove{})
+}
+
+func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.PermissionFlag, ctx = permissions.NewPermissionFlag(ctx)
+	cmd.PermissionFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.force, "force", false, "Force removal if role is in use")
+}
+
+func (cmd *remove) Process(ctx context.Context) error {
+	if err := cmd.PermissionFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *remove) Usage() string {
+	return "NAME"
+}
+
+func (cmd *remove) Description() string {
+	return `Remove authorization role.
+
+Examples:
+  govc role.remove MyRole
+  govc role.remove MyRole -force`
+}
+
+func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 1 {
+		return flag.ErrHelp
+	}
+
+	m, err := cmd.Manager(ctx)
+	if err != nil {
+		return err
+	}
+
+	role, err := cmd.Role(f.Arg(0))
+	if err != nil {
+		return err
+	}
+
+	return m.RemoveRole(ctx, role.RoleId, !cmd.force)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/role/update.go b/vendor/github.com/vmware/govmomi/govc/role/update.go
new file mode 100644
index 0000000000..3937626a27
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/role/update.go
@@ -0,0 +1,112 @@
+/*
+Copyright (c) 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 role
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/permissions"
+)
+
+type update struct {
+	*permissions.PermissionFlag
+
+	name   string
+	remove bool
+	add    bool
+}
+
+func init() {
+	cli.Register("role.update", &update{})
+}
+
+func (cmd *update) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.PermissionFlag, ctx = permissions.NewPermissionFlag(ctx)
+	cmd.PermissionFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.name, "name", "", "Change role name")
+	f.BoolVar(&cmd.remove, "r", false, "Remove given PRIVILEGE(s)")
+	f.BoolVar(&cmd.add, "a", false, "Remove given PRIVILEGE(s)")
+}
+
+func (cmd *update) Process(ctx context.Context) error {
+	if err := cmd.PermissionFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *update) Usage() string {
+	return "NAME [PRIVILEGE]..."
+}
+
+func (cmd *update) Description() string {
+	return `Update authorization role.
+
+Set, Add or Remove role PRIVILEGE(s).
+
+Examples:
+  govc role.update MyRole $(govc role.ls Admin | grep VirtualMachine.)
+  govc role.update -r MyRole $(govc role.ls Admin | grep VirtualMachine.GuestOperations.)
+  govc role.update -a MyRole $(govc role.ls Admin | grep Datastore.)
+  govc role.update -name RockNRole MyRole`
+}
+
+func (cmd *update) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() == 0 {
+		return flag.ErrHelp
+	}
+
+	m, err := cmd.Manager(ctx)
+	if err != nil {
+		return err
+	}
+
+	role, err := cmd.Role(f.Arg(0))
+	if err != nil {
+		return err
+	}
+
+	ids := role.Privilege
+	args := f.Args()[1:]
+
+	if cmd.add {
+		ids = append(ids, args...)
+	} else if cmd.remove {
+		ids = nil
+		rm := make(map[string]bool, len(args))
+		for _, arg := range args {
+			rm[arg] = true
+		}
+
+		for _, id := range role.Privilege {
+			if !rm[id] {
+				ids = append(ids, id)
+			}
+		}
+	} else if len(args) != 0 {
+		ids = args
+	}
+
+	if cmd.name == "" {
+		cmd.name = role.Name
+	}
+
+	return m.UpdateRole(ctx, role.RoleId, cmd.name, ids)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/role/usage.go b/vendor/github.com/vmware/govmomi/govc/role/usage.go
new file mode 100644
index 0000000000..cafa77d79a
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/role/usage.go
@@ -0,0 +1,87 @@
+/*
+Copyright (c) 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 role
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/permissions"
+)
+
+type usage struct {
+	*permissions.PermissionFlag
+}
+
+func init() {
+	cli.Register("role.usage", &usage{})
+}
+
+func (cmd *usage) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.PermissionFlag, ctx = permissions.NewPermissionFlag(ctx)
+	cmd.PermissionFlag.Register(ctx, f)
+}
+
+func (cmd *usage) Process(ctx context.Context) error {
+	if err := cmd.PermissionFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *usage) Usage() string {
+	return "NAME..."
+}
+
+func (cmd *usage) Description() string {
+	return `List usage for role NAME.
+
+Examples:
+  govc role.usage
+  govc role.usage Admin`
+}
+
+func (cmd *usage) Run(ctx context.Context, f *flag.FlagSet) error {
+	m, err := cmd.Manager(ctx)
+	if err != nil {
+		return err
+	}
+
+	if f.NArg() == 0 {
+		cmd.List.Permissions, err = m.RetrieveAllPermissions(ctx)
+		if err != nil {
+			return err
+		}
+	} else {
+		for _, name := range f.Args() {
+			role, err := cmd.Role(name)
+			if err != nil {
+				return err
+			}
+
+			perms, err := m.RetrieveRolePermissions(ctx, role.RoleId)
+			if err != nil {
+				return err
+			}
+
+			cmd.List.Add(perms)
+		}
+	}
+
+	return cmd.WriteResult(&cmd.List)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/session/ls.go b/vendor/github.com/vmware/govmomi/govc/session/ls.go
new file mode 100644
index 0000000000..ae077decec
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/session/ls.go
@@ -0,0 +1,121 @@
+/*
+Copyright (c) 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 session
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"text/tabwriter"
+	"time"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25/mo"
+)
+
+type ls struct {
+	*flags.ClientFlag
+	*flags.OutputFlag
+}
+
+func init() {
+	cli.Register("session.ls", &ls{})
+}
+
+func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+}
+
+func (cmd *ls) Description() string {
+	return `List active sessions.
+
+Examples:
+  govc session.ls
+  govc session.ls -json | jq -r .CurrentSession.Key`
+}
+
+func (cmd *ls) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+type sessionInfo struct {
+	cmd *ls
+	mo.SessionManager
+}
+
+func (s *sessionInfo) Write(w io.Writer) error {
+	tw := tabwriter.NewWriter(w, 4, 0, 2, ' ', 0)
+
+	fmt.Fprintf(tw, "Key\t")
+	fmt.Fprintf(tw, "Name\t")
+	fmt.Fprintf(tw, "Time\t")
+	fmt.Fprintf(tw, "Idle\t")
+	fmt.Fprintf(tw, "Host\t")
+	fmt.Fprintf(tw, "Agent\t")
+	fmt.Fprintf(tw, "\t")
+	fmt.Fprint(tw, "\n")
+
+	for _, v := range s.SessionList {
+		idle := "  ."
+		if v.Key != s.CurrentSession.Key {
+			since := time.Since(v.LastActiveTime)
+			if since > time.Hour {
+				idle = "old"
+			} else {
+				idle = (time.Duration(since.Seconds()) * time.Second).String()
+			}
+		}
+		fmt.Fprintf(tw, "%s\t", v.Key)
+		fmt.Fprintf(tw, "%s\t", v.UserName)
+		fmt.Fprintf(tw, "%s\t", v.LoginTime.Format("2006-01-02 15:04"))
+		fmt.Fprintf(tw, "%s\t", idle)
+		fmt.Fprintf(tw, "%s\t", v.IpAddress)
+		fmt.Fprintf(tw, "%s\t", v.UserAgent)
+		fmt.Fprint(tw, "\n")
+	}
+
+	return tw.Flush()
+}
+
+func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	var m mo.SessionManager
+	pc := property.DefaultCollector(c)
+	err = pc.RetrieveOne(ctx, *c.ServiceContent.SessionManager, nil, &m)
+	if err != nil {
+		return nil
+	}
+
+	return cmd.WriteResult(&sessionInfo{cmd, m})
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/session/rm.go b/vendor/github.com/vmware/govmomi/govc/session/rm.go
new file mode 100644
index 0000000000..9792dbe786
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/session/rm.go
@@ -0,0 +1,67 @@
+/*
+Copyright (c) 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 session
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/session"
+)
+
+type rm struct {
+	*flags.ClientFlag
+}
+
+func init() {
+	cli.Register("session.rm", &rm{})
+}
+
+func (cmd *rm) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+}
+
+func (cmd *rm) Usage() string {
+	return "KEY..."
+}
+
+func (cmd *rm) Description() string {
+	return `Remove active sessions.
+
+Examples:
+  govc session.ls | grep root
+  govc session.rm 5279e245-e6f1-4533-4455-eb94353b213a`
+}
+
+func (cmd *rm) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *rm) Run(ctx context.Context, f *flag.FlagSet) error {
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	return session.NewManager(c).TerminateSession(ctx, f.Args())
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/.gitignore b/vendor/github.com/vmware/govmomi/govc/test/.gitignore
new file mode 100644
index 0000000000..9b6adf2f29
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/.gitignore
@@ -0,0 +1,2 @@
+.vagrant
+govc_ca.*
diff --git a/vendor/github.com/vmware/govmomi/govc/test/README.md b/vendor/github.com/vmware/govmomi/govc/test/README.md
new file mode 100644
index 0000000000..137f78bfdf
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/README.md
@@ -0,0 +1,73 @@
+# Functional tests for govc
+
+## Bats
+
+Install [Bats](https://github.com/sstephenson/bats/)
+
+## coreutils
+
+Install gxargs, greadlink and gmktemp on Darwin
+
+```
+brew install coreutils
+brew install findutils
+```
+
+## Download test images
+
+Some tests depend on ttylinux images, these can be downloaded by running:
+
+```
+./images/update.sh
+```
+
+These images are uploaded to the esxbox as needed by tests and can be
+removed with the following command:
+
+```
+./clean.sh
+```
+
+## GOVC_TEST_URL
+
+The govc tests need an ESX instance to run against.  The default
+`GOVC_TEST_URL` is that of the vagrant box in the *esxbox* directory:
+
+```
+(cd esxbox && vagrant up)
+```
+
+Any other ESX box can be used by exporting the following variable:
+
+```
+export GOVC_TEST_URL=user:pass@hostname
+```
+
+## vCenter Simulator
+
+Some tests require vCenter and depend on the Vagrant box in the
+*vcsim* directory.  These tests are skipped if the vcsim box is not
+running.  To enable these tests:
+
+```
+(cd vcsim && vagrant up)
+```
+
+## Running tests
+
+The test helper prepends ../govc to `PATH`.
+
+The tests can be run from any directory, as *govc* is found related to
+`PATH` and *images* are found relative to `$BATS_TEST_DIRNAME`.
+
+The entire suite can be run with the following command:
+
+```
+bats .
+```
+
+Or individually, for example:
+
+```
+./cli.bats
+```
diff --git a/vendor/github.com/vmware/govmomi/govc/test/boot_order_test.sh b/vendor/github.com/vmware/govmomi/govc/test/boot_order_test.sh
new file mode 100755
index 0000000000..cc97f6ee46
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/boot_order_test.sh
@@ -0,0 +1,74 @@
+#!/bin/bash -e
+
+# This test is not run via bats.
+# A VNC session will be opened to observe the VM boot order:
+# 1) from floppy  (followed by: eject floppy, reboot)
+# 2) from cdrom   (followed by: eject cdrom, reboot)
+# 3) from network (will timeout)
+# 4) from disk
+
+. $(dirname $0)/test_helper.bash
+
+upload_img
+upload_iso
+
+id=$(new_ttylinux_vm)
+
+function cleanup() {
+  quit_vnc $vnc
+  govc vm.destroy $id
+  pkill -TERM -g $$ ^nc
+}
+
+trap cleanup EXIT
+
+govc device.cdrom.add -vm $id > /dev/null
+govc device.cdrom.insert -vm $id $GOVC_TEST_ISO
+
+govc device.floppy.add -vm $id > /dev/null
+govc device.floppy.insert -vm $id $GOVC_TEST_IMG
+
+govc device.boot -vm $id -delay 1000 -order floppy,cdrom,ethernet,disk
+
+vnc=$(govc vm.vnc -port 21122 -password govmomi -enable "${id}" | awk '{print $2}')
+
+echo "booting from floppy..."
+govc vm.power -on $id
+
+open_vnc $vnc
+
+sleep 10
+
+govc vm.power -off $id
+
+govc device.floppy.eject -vm $id
+
+# this is ttylinux-live, notice the 'boot:' prompt vs 'login:' prompt when booted from disk
+echo "booting from cdrom..."
+govc vm.power -on $id
+
+sleep 10
+
+govc vm.power -off $id
+
+govc device.cdrom.eject -vm $id
+
+govc device.serial.add -vm $id > /dev/null
+govc device.serial.connect -vm $id -
+
+echo "booting from network, will timeout then boot from disk..."
+govc vm.power -on $id
+
+# serial console log
+device=$(govc device.ls -vm "$id" | grep serialport- | awk '{print $1}')
+govc datastore.tail -f "$id/$device.log" &
+
+ip=$(govc vm.ip $id)
+
+echo "VM booted from disk (ip=$ip)"
+
+sleep 5
+
+govc vm.power -s $id
+
+sleep 5
diff --git a/vendor/github.com/vmware/govmomi/govc/test/clean.sh b/vendor/github.com/vmware/govmomi/govc/test/clean.sh
new file mode 100755
index 0000000000..f910e5dabb
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/clean.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+#
+# Cleanup any artifacts created by govc
+#
+
+. $(dirname $0)/test_helper.bash
+
+teardown
+
+datastore_rm() {
+  name=$1
+  govc datastore.rm $name 2> /dev/null
+}
+
+datastore_rm $GOVC_TEST_IMG
+datastore_rm $GOVC_TEST_ISO
+datastore_rm $GOVC_TEST_VMDK
+datastore_rm $(echo $GOVC_TEST_VMDK | sed 's/.vmdk/-flat.vmdk/')
+datastore_rm $(dirname $GOVC_TEST_VMDK)
+
+# Recursively destroy all resource pools created by the test suite
+govc ls host/*/Resources/govc-test-* | \
+  xargs -rt govc pool.destroy -r
+
+govc datastore.ls
diff --git a/vendor/github.com/vmware/govmomi/govc/test/cli.bats b/vendor/github.com/vmware/govmomi/govc/test/cli.bats
new file mode 100755
index 0000000000..c6ae3105b0
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/cli.bats
@@ -0,0 +1,120 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "about" {
+  run govc about
+  assert_success
+  assert_line "Vendor: VMware, Inc."
+
+  run govc about -json
+  assert_success
+
+  run govc about -json -l
+  assert_success
+}
+
+@test "about.cert" {
+  run govc about.cert
+  assert_success
+
+  run govc about.cert -json
+  assert_success
+
+  run govc about.cert -show
+  assert_success
+
+  # with -k=true we get thumbprint output and exit 0
+  thumbprint=$(govc about.cert -k=true -thumbprint)
+
+  # with -k=true we get thumbprint output and exit 60
+  run govc about.cert -k=false -thumbprint
+  if [ "$status" -ne 60 ]; then
+    flunk $(printf "expected failed exit status=60, got status=%d" $status)
+  fi
+  assert_output "$thumbprint"
+
+  run govc about -k=false
+  assert_failure
+
+  run govc about -k=false -tls-known-hosts <(echo "$thumbprint")
+  assert_success
+
+  run govc about -k=false -tls-known-hosts <(echo "nope nope")
+  assert_failure
+}
+
+@test "version" {
+    run govc version
+    assert_success
+
+    v=$(govc version | awk '{print $NF}')
+    run govc version -require "$v"
+    assert_success
+
+    run govc version -require "not-a-version-string"
+    assert_failure
+
+    run govc version -require 100.0.0
+    assert_failure
+}
+
+@test "login attempt without credentials" {
+  host=$(govc env -x GOVC_URL_HOST)
+  run govc about -u "enoent@$host"
+  assert_failure "govc: ServerFaultCode: Cannot complete login due to an incorrect user name or password."
+}
+
+@test "login attempt with GOVC_URL, GOVC_USERNAME, and GOVC_PASSWORD" {
+  govc_url_to_vars
+  run govc about
+  assert_success
+}
+
+@test "connect to an endpoint with a non-supported API version" {
+  run env GOVC_MIN_API_VERSION=24.4 govc about
+  assert grep -q "^govc: Require API version 24.4," <<<${output}
+}
+
+@test "connect to an endpoint with user provided Vim namespace and Vim version" {
+  run govc about -vim-namespace urn:vim25 -vim-version 6.0
+  assert_success
+}
+
+@test "govc env" {
+  output="$(govc env -x -u 'user:pass@enoent:99999?key=val#anchor')"
+  assert grep -q GOVC_URL=enoent:99999 <<<${output}
+  assert grep -q GOVC_USERNAME=user <<<${output}
+  assert grep -q GOVC_PASSWORD=pass <<<${output}
+
+  assert grep -q GOVC_URL_SCHEME=https <<<${output}
+  assert grep -q GOVC_URL_HOST=enoent <<<${output}
+  assert grep -q GOVC_URL_PORT=99999 <<<${output}
+  assert grep -q GOVC_URL_PATH=/sdk <<<${output}
+  assert grep -q GOVC_URL_QUERY=key=val <<<${output}
+  assert grep -q GOVC_URL_FRAGMENT=anchor <<<${output}
+
+  password="pa\$sword\!ok"
+  run govc env -u "user:${password}@enoent:99999" GOVC_PASSWORD
+  assert_output "$password"
+}
+
+@test "govc help" {
+  run govc
+  assert_failure
+
+  run govc -h
+  assert_success
+
+  run govc -enoent
+  assert_failure
+
+  run govc vm.create
+  assert_failure
+
+  run govc vm.create -h
+  assert_success
+
+  run govc vm.create -enoent
+  assert_failure
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/datacenter.bats b/vendor/github.com/vmware/govmomi/govc/test/datacenter.bats
new file mode 100755
index 0000000000..0b338c397a
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/datacenter.bats
@@ -0,0 +1,81 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "datacenter.info" {
+    dc=$(govc ls -t Datacenter / | head -n1)
+    run govc datacenter.info "$dc"
+    assert_success
+
+    run govc datacenter.info -json "$dc"
+    assert_success
+
+    run govc datacenter.info /enoent
+    assert_failure
+}
+
+@test "create and destroy datacenters" {
+  vcsim_env
+
+  dcs=($(new_id) $(new_id))
+  run govc datacenter.create "${dcs[@]}"
+  assert_success
+
+  for dc in ${dcs[*]}; do
+    run govc ls "/$dc"
+    assert_success
+    # /<datacenter>/{vm,network,host,datastore}
+    [ ${#lines[@]} -eq 4 ]
+
+    run govc datacenter.info "/$dc"
+    assert_success
+  done
+
+  run govc object.destroy "${dcs[@]}"
+  assert_success
+
+  for dc in ${dcs[*]}; do
+    run govc ls "/$dc"
+    assert_success
+    [ ${#lines[@]} -eq 0 ]
+  done
+}
+
+@test "destroy datacenter using glob" {
+  vcsim_env
+  unset GOVC_DATACENTER GOVC_DATASTORE
+
+  folder=$(new_id)
+  dcs=($(new_id) $(new_id))
+
+  run govc folder.create "$folder"
+  assert_success
+
+  run govc datacenter.create -folder "$folder" "${dcs[@]}"
+  assert_success
+
+  run govc object.destroy "$folder/*"
+  assert_success
+
+  for dc in ${dcs[*]}; do
+    run govc ls "/$dc"
+    assert_success
+    [ ${#lines[@]} -eq 0 ]
+  done
+
+  run govc folder.destroy "$folder"
+  assert_success
+}
+
+@test "fails when datacenter name not specified" {
+  run govc datacenter.create
+  assert_failure
+}
+
+@test "datacenter commands fail against ESX" {
+  run govc datacenter.create something
+  assert_failure "govc: ServerFaultCode: The operation is not supported on the object."
+
+  run govc object.destroy /ha-datacenter
+  assert_failure
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/datastore.bats b/vendor/github.com/vmware/govmomi/govc/test/datastore.bats
new file mode 100755
index 0000000000..2d37179d05
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/datastore.bats
@@ -0,0 +1,238 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+upload_file() {
+  name=$(new_id)
+
+  echo "Hello world" | govc datastore.upload - "$name"
+  assert_success
+
+  echo "$name"
+}
+
+@test "datastore.ls" {
+  name=$(upload_file)
+
+  # Single argument
+  run govc datastore.ls "${name}"
+  assert_success
+  [ ${#lines[@]} -eq 1 ]
+
+  # Multiple arguments
+  run govc datastore.ls "${name}" "${name}"
+  assert_success
+  [ ${#lines[@]} -eq 2 ]
+
+  # Pattern argument
+  run govc datastore.ls "./govc-test-*"
+  assert_success
+  [ ${#lines[@]} -ge 1 ]
+
+  # Long listing
+  run govc datastore.ls -l "./govc-test-*"
+  assert_success
+  assert_equal "12B" $(awk '{ print $1 }' <<<${output})
+}
+
+@test "datastore.ls-R" {
+  dir=$(new_id)
+
+  run govc datastore.mkdir "$dir"
+  assert_success
+
+  for name in one two three ; do
+    echo "$name world" | govc datastore.upload - "$dir/file-$name"
+    run govc datastore.mkdir -p "$dir/dir-$name/subdir-$name"
+    run govc datastore.mkdir -p "$dir/dir-$name/.hidden"
+    assert_success
+    echo "$name world" | govc datastore.upload - "$dir/dir-$name/.hidden/other-$name"
+    echo "$name world" | govc datastore.upload - "$dir/dir-$name/other-$name"
+    echo "$name world" | govc datastore.upload - "$dir/dir-$name/subdir-$name/last-$name"
+  done
+
+  # without -R
+  json=$(govc datastore.ls -json -l -p "$dir")
+  result=$(jq -r .[].File[].Path <<<"$json" | wc -l)
+  [ "$result" -eq 6 ]
+
+  result=$(jq -r .[].FolderPath <<<"$json" | wc -l)
+  [ "$result" -eq 1 ]
+
+  # with -R
+  json=$(govc datastore.ls -json -l -p -R "$dir")
+  result=$(jq -r .[].File[].Path <<<"$json" | wc -l)
+  [ "$result" -eq 15 ]
+
+  result=$(jq -r .[].FolderPath <<<"$json" | wc -l)
+  [ "$result" -eq 7 ]
+
+  # with -R -a
+  json=$(govc datastore.ls -json -l -p -R -a "$dir")
+  result=$(jq -r .[].File[].Path <<<"$json" | wc -l)
+  [ "$result" -eq 21 ]
+
+  result=$(jq -r .[].FolderPath <<<"$json" | wc -l)
+  [ "$result" -eq 10 ]
+}
+
+@test "datastore.rm" {
+  name=$(upload_file)
+
+  # Not found is a failure
+  run govc datastore.rm "${name}.notfound"
+  assert_failure
+  assert_matches "govc: File .* was not found" "${output}"
+
+  # Not found is NOT a failure with the force flag
+  run govc datastore.rm -f "${name}.notfound"
+  assert_success
+  assert_empty "${output}"
+
+  # Verify the file is present
+  run govc datastore.ls "${name}"
+  assert_success
+
+  # Delete the file
+  run govc datastore.rm "${name}"
+  assert_success
+  assert_empty "${output}"
+
+  # Verify the file is gone
+  run govc datastore.ls "${name}"
+  assert_failure
+}
+
+@test "datastore.info" {
+  run govc datastore.info enoent
+  assert_failure
+
+  run govc datastore.info
+  assert_success
+  [ ${#lines[@]} -gt 1 ]
+}
+
+
+@test "datastore.mkdir" {
+  name=$(new_id)
+
+  # Not supported datastore type is a failure
+  run govc datastore.mkdir -namespace "notfound"
+  assert_failure
+  assert_matches "govc: ServerFaultCode: .*" "${output}"
+
+  run govc datastore.mkdir "${name}"
+  assert_success
+  assert_empty "${output}"
+
+  # Verify the dir is present
+  run govc datastore.ls "${name}"
+  assert_success
+
+  # Delete the dir on an unsupported datastore type is a failure
+  run govc datastore.rm -namespace "${name}"
+  assert_failure
+  assert_matches "govc: ServerFaultCode: .*" "${output}"
+
+  # Delete the dir
+  run govc datastore.rm "${name}"
+  assert_success
+  assert_empty "${output}"
+
+  # Verify the dir is gone
+  run govc datastore.ls "${name}"
+  assert_failure
+}
+
+@test "datastore.download" {
+  name=$(upload_file)
+  run govc datastore.download "$name" -
+  assert_success
+  assert_output "Hello world"
+
+  run govc datastore.download "$name" "$TMPDIR/$name"
+  assert_success
+  run cat "$TMPDIR/$name"
+  assert_output "Hello world"
+  rm "$TMPDIR/$name"
+}
+
+@test "datastore.upload" {
+  name=$(new_id)
+  echo -n "Hello world" | govc datastore.upload - "$name"
+
+  run govc datastore.download "$name" -
+  assert_success
+  assert_output "Hello world"
+}
+
+@test "datastore.tail" {
+  run govc datastore.tail "enoent/enoent.log"
+  assert_failure
+
+  id=$(new_id)
+  govc vm.create "$id"
+  govc vm.power -off "$id"
+
+  # test with .log (> bufSize) and .vmx (< bufSize)
+  for file in "$id/vmware.log" "$id/$id.vmx" ; do
+    log=$(govc datastore.download "$file" -)
+
+    for n in 0 1 5 10 123 456 7890 ; do
+      expect=$(tail -n $n <<<"$log")
+
+      run govc datastore.tail -n $n "$file"
+      assert_output "$expect"
+
+      expect=$(tail -c $n <<<"$log")
+
+      run govc datastore.tail -c $n "$file"
+      assert_output "$expect"
+    done
+  done
+}
+
+@test "datastore.disk" {
+  id=$(new_id)
+  vmdk="$id/$id.vmdk"
+
+  run govc datastore.mkdir "$id"
+  assert_success
+
+  run govc datastore.disk.create "$vmdk"
+  assert_success
+
+  run govc datastore.rm "$vmdk"
+  assert_success
+
+  run govc datastore.mkdir -p "$id"
+  assert_success
+
+  run govc datastore.disk.create "$vmdk"
+  assert_success
+
+  id=$(new_id)
+  run govc vm.create -on=false -link -disk "$vmdk" "$id"
+  assert_success
+
+  # should fail due to: ddb.deletable=false
+  run govc datastore.rm "$vmdk"
+  assert_failure
+
+  run govc datastore.rm -f "$vmdk"
+  assert_success
+
+  # one more time, but rm the directory w/o -f
+  run govc datastore.mkdir -p "$id"
+  assert_success
+
+  run govc datastore.disk.create "$vmdk"
+  assert_success
+
+  id=$(new_id)
+  run govc vm.create -on=false -link -disk "$vmdk" "$id"
+  assert_success
+
+  run govc datastore.rm "$(dirname "$vmdk")"
+  assert_success
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/datastore_file_manager_test.sh b/vendor/github.com/vmware/govmomi/govc/test/datastore_file_manager_test.sh
new file mode 100755
index 0000000000..c19de8b502
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/datastore_file_manager_test.sh
@@ -0,0 +1,102 @@
+#!/bin/bash -e
+
+# This test is not run via bats
+
+# See also: datastore.bats@test "datastore.disk"
+
+export GOVC_TEST_URL=$GOVC_URL
+
+. "$(dirname "$0")"/test_helper.bash
+
+echo -n "checking datastore type..."
+type=$(govc object.collect -s "datastore/$GOVC_DATASTORE" summary.type)
+echo "$type"
+
+if [ "$type" = "vsan" ] ; then
+  echo -n "checking for orphan objects..."
+  objs=($(govc datastore.vsan.dom.ls -o))
+  echo "${#objs[@]}"
+
+  if [ "${#objs[@]}" -ne "0" ] ; then
+    govc datastore.vsan.dom.rm "${objs[@]}"
+  fi
+fi
+
+dir=govc-test-dfm
+
+echo "uploading plain file..."
+cal | govc datastore.upload - $dir/cal.txt
+echo "removing plain file..."
+govc datastore.rm $dir/cal.txt
+
+scratch=$dir/govc-test-scratch/govc-test-scratch.vmdk
+
+govc datastore.mkdir -p "$(dirname $scratch)"
+
+echo "creating disk $scratch..."
+govc datastore.disk.create -size 1M $scratch
+
+id=$(new_id)
+
+echo "creating $id VM with disk linked to $scratch..."
+govc vm.create -on=false -link -disk $scratch "$id"
+info=$(govc device.info -vm "$id" disk-*)
+echo "$info"
+
+disk="$(grep Name: <<<"$info" | awk '{print $2}')"
+vmdk="$id/$id.vmdk"
+
+echo "removing $disk device but keeping the .vmdk backing file..."
+govc device.remove -vm "$id" -keep "$disk"
+
+echo -n "checking delta disk ddb.deletable..."
+govc datastore.download "$vmdk" - | grep -q -v ddb.deletable
+echo "yes"
+
+echo -n "checking scratch disk ddb.deletable..."
+govc datastore.download "$scratch" - | grep ddb.deletable | grep -q false
+echo "no"
+
+echo "removing $vmdk"
+govc datastore.rm "$vmdk"
+
+echo -n "checking that rm $scratch fails..."
+govc datastore.rm "$scratch" 2>/dev/null || echo "yes"
+
+echo -n "checking that rm -f $scratch deletes..."
+govc datastore.rm -f "$scratch" && echo "yes"
+
+echo "removing disk Directory via FileManager..."
+govc datastore.mkdir -p "$(dirname $scratch)"
+govc datastore.disk.create -size 1M $scratch
+govc datastore.rm "$(dirname $scratch)"
+
+echo -n "checking for remaining files..."
+govc datastore.ls -p -R $dir
+
+teardown
+
+status=0
+
+if [ "$type" = "vsan" ] ; then
+  echo -n "checking for leaked objects..."
+  objs=($(govc datastore.vsan.dom.ls -l -o | awk '{print $3}'))
+  echo "${#objs[@]}"
+
+  if [ "${#objs[@]}" -ne "0" ] ; then
+    printf "%s\n" "${objs[@]}"
+    status=1
+  else
+    # this is expected to leak on vSAN currently
+    echo -n "checking if FileManager.Delete still leaks..."
+    govc datastore.mkdir -p "$(dirname $scratch)"
+    govc datastore.disk.create -size 1M $scratch
+    # '-t=false' forces use of FileManager instead of VirtualDiskManager
+    govc datastore.rm -t=false $scratch
+    govc datastore.rm $dir
+
+    govc datastore.vsan.dom.ls -o | xargs -r govc datastore.vsan.dom.rm -v
+  fi
+fi
+
+exit $status
diff --git a/vendor/github.com/vmware/govmomi/govc/test/datastore_tail_test.sh b/vendor/github.com/vmware/govmomi/govc/test/datastore_tail_test.sh
new file mode 100755
index 0000000000..6b7cfce2bd
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/datastore_tail_test.sh
@@ -0,0 +1,26 @@
+#!/bin/bash -xe
+
+# This test is not run via bats as the bats pipeline hangs when we background a process
+
+. "$(dirname "$0")"/test_helper.bash
+
+name=$(new_id)
+n=16
+tmp=$(mktemp --tmpdir "${name}-XXXXX")
+
+echo -n | govc datastore.upload - "$name"
+govc datastore.tail -f "$name" > "$tmp" &
+pid=$!
+
+sleep 1
+yes | dd bs=${n}K count=1 2>/dev/null | govc datastore.upload - "$name"
+sleep 2
+
+# stops following when the file has gone away
+govc datastore.mv "$name" "${name}.old"
+wait $pid
+
+govc datastore.download "${name}.old" - | cmp "$tmp" -
+
+rm "$tmp"
+teardown
diff --git a/vendor/github.com/vmware/govmomi/govc/test/device.bats b/vendor/github.com/vmware/govmomi/govc/test/device.bats
new file mode 100755
index 0000000000..ab252e3423
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/device.bats
@@ -0,0 +1,288 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "device.ls" {
+  vm=$(new_empty_vm)
+
+  result=$(govc device.ls -vm $vm | grep ethernet-0 | wc -l)
+  [ $result -eq 1 ]
+}
+
+@test "device.info" {
+  vm=$(new_empty_vm)
+
+  run govc device.info -vm $vm ide-200
+  assert_success
+
+  run govc device.info -vm $vm ide-20000
+  assert_failure
+
+  run govc device.info -vm $vm -net enoent
+  assert_failure
+
+  run govc device.info -vm $vm -net "VM Network" ide-200
+  assert_failure
+
+  result=$(govc device.info -vm $vm -net "VM Network" | grep "MAC Address" | wc -l)
+  [ $result -eq 1 ]
+}
+
+@test "device.boot" {
+  vm=$(new_ttylinux_vm)
+
+  result=$(govc device.ls -vm $vm -boot | wc -l)
+  [ $result -eq 0 ]
+
+  run govc device.boot -vm $vm -order floppy,cdrom,ethernet,disk
+  assert_success
+
+  result=$(govc device.ls -vm $vm -boot | wc -l)
+  [ $result -eq 2 ]
+
+  run govc device.cdrom.add -vm $vm
+  assert_success
+
+  run govc device.floppy.add -vm $vm
+  assert_success
+
+  run govc device.boot -vm $vm -order floppy,cdrom,ethernet,disk
+  assert_success
+
+  result=$(govc device.ls -vm $vm -boot | wc -l)
+  [ $result -eq 4 ]
+}
+
+@test "device.cdrom" {
+  vm=$(new_empty_vm)
+
+  result=$(govc device.ls -vm $vm | grep cdrom- | wc -l)
+  [ $result -eq 0 ]
+
+  run govc device.cdrom.add -vm $vm
+  assert_success
+  id=$output
+
+  result=$(govc device.ls -vm $vm | grep $id | wc -l)
+  [ $result -eq 1 ]
+
+  run govc device.info -vm $vm $id
+  assert_success
+
+  run govc device.cdrom.insert -vm $vm -device $id x.iso
+  assert_success
+
+  run govc device.info -vm $vm $id
+  assert_line "Summary: ISO [${GOVC_DATASTORE}] x.iso"
+
+  run govc device.disconnect -vm $vm $id
+  assert_success
+
+  run govc device.connect -vm $vm $id
+  assert_success
+
+  run govc device.remove -vm $vm $id
+  assert_success
+
+  run govc device.disconnect -vm $vm $id
+  assert_failure "govc: device '$id' not found"
+
+  run govc device.cdrom.insert -vm $vm -device $id x.iso
+  assert_failure "govc: device '$id' not found"
+
+  run govc device.remove -vm $vm $id
+  assert_failure "govc: device '$id' not found"
+}
+
+@test "device.floppy" {
+  vm=$(new_empty_vm)
+
+  result=$(govc device.ls -vm $vm | grep floppy- | wc -l)
+  [ $result -eq 0 ]
+
+  run govc device.floppy.add -vm $vm
+  assert_success
+  id=$output
+
+  result=$(govc device.ls -vm $vm | grep $id | wc -l)
+  [ $result -eq 1 ]
+
+  run govc device.info -vm $vm $id
+  assert_success
+
+  run govc device.floppy.insert -vm $vm -device $id x.img
+  assert_success
+
+  run govc device.info -vm $vm $id
+  assert_line "Summary: Image [${GOVC_DATASTORE}] x.img"
+
+  run govc device.disconnect -vm $vm $id
+  assert_success
+
+  run govc device.connect -vm $vm $id
+  assert_success
+
+  run govc device.remove -vm $vm $id
+  assert_success
+
+  run govc device.disconnect -vm $vm $id
+  assert_failure "govc: device '$id' not found"
+
+  run govc device.floppy.insert -vm $vm -device $id x.img
+  assert_failure "govc: device '$id' not found"
+
+  run govc device.remove -vm $vm $id
+  assert_failure "govc: device '$id' not found"
+}
+
+@test "device.serial" {
+  vm=$(new_empty_vm)
+
+  result=$(govc device.ls -vm $vm | grep serial- | wc -l)
+  [ $result -eq 0 ]
+
+  run govc device.serial.add -vm $vm
+  assert_success
+  id=$output
+
+  result=$(govc device.ls -vm $vm | grep $id | wc -l)
+  [ $result -eq 1 ]
+
+  run govc device.info -vm $vm $id
+  assert_success
+
+  run govc device.serial.connect -vm $vm -
+  assert_success
+
+  run govc device.info -vm $vm $id
+  assert_line "Summary: File [$GOVC_DATASTORE] $vm/${id}.log"
+
+  uri=telnet://:33233
+  run govc device.serial.connect -vm $vm -device $id $uri
+  assert_success
+
+  run govc device.info -vm $vm $id
+  assert_line "Summary: Remote $uri"
+
+  run govc device.serial.disconnect -vm $vm -device $id
+  assert_success
+
+  run govc device.info -vm $vm $id
+  assert_line "Summary: Remote localhost:0"
+
+  run govc device.disconnect -vm $vm $id
+  assert_success
+
+  run govc device.connect -vm $vm $id
+  assert_success
+
+  run govc device.remove -vm $vm $id
+  assert_success
+
+  run govc device.disconnect -vm $vm $id
+  assert_failure "govc: device '$id' not found"
+
+  run govc device.serial.connect -vm $vm -device $id $uri
+  assert_failure "govc: device '$id' not found"
+
+  run govc device.remove -vm $vm $id
+  assert_failure "govc: device '$id' not found"
+}
+
+@test "device.scsi" {
+  vm=$(new_empty_vm)
+
+  result=$(govc device.ls -vm $vm | grep lsilogic- | wc -l)
+  [ $result -eq 1 ]
+
+  run govc device.scsi.add -vm $vm
+  assert_success
+  id=$output
+
+  result=$(govc device.ls -vm $vm | grep $id | wc -l)
+  [ $result -eq 1 ]
+
+  result=$(govc device.ls -vm $vm | grep lsilogic- | wc -l)
+  [ $result -eq 2 ]
+
+  run govc device.scsi.add -vm $vm -type pvscsi
+  assert_success
+  id=$output
+
+  result=$(govc device.ls -vm $vm | grep $id | wc -l)
+  [ $result -eq 1 ]
+}
+
+@test "device.usb" {
+  vm=$(new_empty_vm)
+
+  result=$(govc device.ls -vm $vm | grep usb | wc -l)
+  [ $result -eq 0 ]
+
+  run govc device.usb.add -type enoent -vm $vm
+  assert_failure
+
+  run govc device.usb.add -vm $vm
+  assert_success
+  id=$output
+
+  result=$(govc device.ls -vm $vm | grep $id | wc -l)
+  [ $result -eq 1 ]
+
+  run govc device.usb.add -vm $vm
+  assert_failure # 1 per vm max
+
+  run govc device.usb.add -type xhci -vm $vm
+  assert_success
+  id=$output
+
+  result=$(govc device.ls -vm $vm | grep $id | wc -l)
+  [ $result -eq 1 ]
+
+  run govc device.usb.add -type xhci -vm $vm
+  assert_failure # 1 per vm max
+}
+
+@test "device.scsi slots" {
+  vm=$(new_empty_vm)
+
+  for i in $(seq 1 15) ; do
+    name="disk-${i}"
+    run govc vm.disk.create -vm "$vm" -name "$name" -size 1K
+    assert_success
+    result=$(govc device.ls -vm "$vm" | grep disk- | wc -l)
+    [ "$result" -eq "$i" ]
+  done
+
+  # We're at the max, so this will fail
+  run govc vm.disk.create -vm "$vm" -name disk-16 -size 1K
+  assert_failure
+
+  # Remove disk #2
+  run govc device.remove -vm "$vm" disk-1000-2
+  assert_success
+
+  # No longer at the max, this should use the UnitNumber released by the remove above
+  run govc vm.disk.create -vm "$vm" -name disk-16 -size 1K
+  assert_success
+}
+
+
+@test "device nil config" {
+  vm=$(new_empty_vm)
+
+  run govc device.ls -vm "$vm"
+  assert_success
+
+  run govc datastore.rm "$vm"
+  assert_success
+
+  run govc object.reload "vm/$vm"
+  assert_success
+
+  run govc device.ls -vm "$vm"
+  assert_failure
+
+  run govc vm.unregister "$vm"
+  assert_success
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/esxbox/Vagrantfile b/vendor/github.com/vmware/govmomi/govc/test/esxbox/Vagrantfile
new file mode 100644
index 0000000000..df9a01576f
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/esxbox/Vagrantfile
@@ -0,0 +1,27 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure("2") do |config|
+  config.ssh.insert_key = false
+  config.ssh.default.username = "root"
+  config.ssh.shell = "sh"
+  config.vm.hostname = "esxbox"
+
+  config.vm.box = "esxi55"
+  config.vm.synced_folder ".", "/vagrant", disabled: true
+  config.vm.network "forwarded_port", guest: 443, host: 18443
+
+  [:vmware_fusion, :vmware_workstation].each do |name|
+    config.vm.provider name do |v,override|
+      v.vmx["memsize"] = "4096"
+    end
+  end
+
+  config.vm.provision "shell", privileged: false, :inline => <<EOS
+# Turn off the firewall
+esxcli network firewall set --enabled false
+
+# Enable option so we can get VM ip address w/o vmware-tools
+esxcli system settings advanced set -o /Net/GuestIPHack -i 1
+EOS
+end
diff --git a/vendor/github.com/vmware/govmomi/govc/test/esxcli.bats b/vendor/github.com/vmware/govmomi/govc/test/esxcli.bats
new file mode 100755
index 0000000000..66c23d7b04
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/esxcli.bats
@@ -0,0 +1,43 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "network vm list" {
+  # make sure there's at least 1 VM so we get a table header to count against
+  vm=$(new_empty_vm)
+  govc vm.power -on $vm
+
+  nlines=$(govc host.esxcli network vm list | wc -l)
+
+  vm=$(new_empty_vm)
+  govc vm.power -on $vm
+
+  xlines=$(govc host.esxcli network vm list | wc -l)
+
+  # test that we see a new row
+  [ $(($nlines + 1)) -eq $xlines ]
+
+  run govc host.esxcli network vm list enoent
+  assert_failure
+}
+
+@test "network ip connection list" {
+  run govc host.esxcli -- network ip connection list -t tcp
+  assert_success
+
+  # test that we get the expected number of table columns
+  nf=$(echo "${lines[3]}" | awk '{print NF}')
+  [ $nf -eq 9 ]
+
+  run govc host.esxcli -- network ip connection list -t enoent
+  assert_failure
+}
+
+@test "system settings advanced list" {
+  run govc host.esxcli -- system settings advanced list -o /Net/GuestIPHack
+  assert_success
+  assert_line "Path: /Net/GuestIPHack"
+
+  run govc host.esxcli -- system settings advanced list -o /Net/ENOENT
+  assert_failure
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/events.bats b/vendor/github.com/vmware/govmomi/govc/test/events.bats
new file mode 100755
index 0000000000..be689b48e1
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/events.bats
@@ -0,0 +1,51 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "events dc" {
+  run govc events
+  assert_success
+  nevents=${#lines[@]}
+  # there should be plenty more than 1 event at the top (dc) level
+  [ $nevents -ge 1 ]
+
+  # test -n flag
+  run govc events -n $((nevents - 1))
+  assert_success
+  [ ${#lines[@]} -le $nevents ]
+}
+
+@test "events host" {
+  run govc events 'host/*'
+  assert_success
+  [ ${#lines[@]} -ge 1 ]
+}
+
+@test "events vm" {
+  vm=$(new_id)
+
+  run govc vm.create -on=false $vm
+  assert_success
+
+  run govc events vm/$vm
+  assert_success
+  nevents=${#lines[@]}
+  [ $nevents -gt 1 ]
+
+  # glob should have same # of events
+  run govc events vm/${vm}*
+  assert_success
+  [ ${#lines[@]} -eq $nevents ]
+
+  # create a new vm, glob should match more events
+  run govc vm.create -on=false "${vm}-2"
+  assert_success
+  run govc events vm/${vm}*
+  assert_success
+  [ ${#lines[@]} -gt $nevents ]
+  nevents=${#lines[@]}
+
+  run govc events vm
+  assert_success
+  [ ${#lines[@]} -ge $nevents ]
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/extension.bats b/vendor/github.com/vmware/govmomi/govc/test/extension.bats
new file mode 100755
index 0000000000..92b32f2d36
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/extension.bats
@@ -0,0 +1,75 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "extension" {
+  vcsim_env
+
+  govc extension.info | grep Name: | grep govc-test | awk '{print $2}' | $xargs -r govc extension.unregister
+
+  run govc extension.info enoent
+  assert_failure
+
+  id=$(new_id)
+
+  result=$(govc extension.info | grep $id | wc -l)
+  [ $result -eq 0 ]
+
+  # register extension
+  run govc extension.register $id <<EOS
+  {
+    "Description": {
+      "Label": "govc",
+      "Summary": "Go interface to vCenter"
+    },
+    "Key": "${id}",
+    "Company": "VMware, Inc.",
+    "Version": "0.2.0"
+  }
+EOS
+  assert_success
+
+  # check info output is legit
+  run govc extension.info $id
+  assert_line "Name: $id"
+
+  json=$(govc extension.info -json $id)
+  label=$(jq -r .Extensions[].Description.Label <<<"$json")
+  assert_equal "govc" "$label"
+
+  # change label and update extension
+  json=$(jq -r '.Extensions[] | .Description.Label = "novc"' <<<"$json")
+  run govc extension.register -update $id <<<"$json"
+  assert_success
+
+  # check label changed in info output
+  json=$(govc extension.info -json $id)
+  label=$(jq -r .Extensions[].Description.Label <<<"$json")
+  assert_equal "novc" "$label"
+
+  # set extension certificate to generated certificate
+  run govc extension.setcert -cert-pem '+' $id
+  assert_success
+
+  # test client certificate authentication
+  (
+    # remove password from env, set user to extension id and turn of session cache
+    govc_url_to_vars
+    unset GOVC_PASSWORD
+    GOVC_USERNAME=$id
+    export GOVC_PERSIST_SESSION=false
+    # vagrant port forwards to VC's port 80
+    export GOVC_TUNNEL_PROXY_PORT=16080
+    run govc about -cert "${id}.crt" -key "${id}.key"
+    assert_success
+  )
+
+  # remove generated cert and key
+  rm ${id}.{crt,key}
+
+  run govc extension.unregister $id
+  assert_success
+
+  result=$(govc extension.info | grep $id | wc -l)
+  [ $result -eq 0 ]
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/fields.bats b/vendor/github.com/vmware/govmomi/govc/test/fields.bats
new file mode 100755
index 0000000000..4cfe4e8816
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/fields.bats
@@ -0,0 +1,48 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "fields" {
+  vcsim_env
+
+  vm_id=$(new_id)
+  run govc vm.create $vm_id
+  assert_success
+
+  field=$(new_id)
+
+  result=$(govc fields.ls | grep $field | wc -l)
+  [ $result -eq 0 ]
+
+  key=$(govc fields.add $field)
+
+  result=$(govc fields.ls | grep $field | wc -l)
+  [ $result -eq 1 ]
+
+  key=$(govc fields.ls | grep $field | awk '{print $1}')
+
+  val="foo"
+  run govc fields.set $field $val vm/$vm_id
+  assert_success
+
+  info=$(govc vm.info -json $vm_id | jq .VirtualMachines[0].CustomValue[0])
+
+  ikey=$(jq -r .Key <<<"$info")
+  assert_equal $key $ikey
+
+  ival=$(jq -r .Value <<<"$info")
+  assert_equal $val $ival
+
+  old_field=$field
+  field=$(new_id)
+  run govc fields.rename $key $field
+  assert_success
+  result=$(govc fields.ls | grep $old_field | wc -l)
+  [ $result -eq 0 ]
+
+  run govc fields.rm $field
+  assert_success
+
+  result=$(govc fields.ls | grep $field | wc -l)
+  [ $result -eq 0 ]
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/firewall.bats b/vendor/github.com/vmware/govmomi/govc/test/firewall.bats
new file mode 100755
index 0000000000..d32af46448
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/firewall.bats
@@ -0,0 +1,20 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "firewall.ruleset.find" {
+  # Assumes sshServer ruleset is enabled
+  run govc firewall.ruleset.find -direction inbound -port 22
+  assert_success
+
+  run govc firewall.ruleset.find -direction outbound -port 22
+  if [ "$status" -eq 1 ] ; then
+    # If outbound port 22 is blocked, we should be able to list disabled rules via:
+    run govc firewall.ruleset.find -direction outbound -port 22 -enabled=false
+    assert_success
+
+    # find disabled should include sshClient ruleset in output
+    result=$(govc firewall.ruleset.find -direction outbound -port 22 -enabled=false | grep sshClient | wc -l)
+    [ $result -eq 1 ]
+  fi
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/folder.bats b/vendor/github.com/vmware/govmomi/govc/test/folder.bats
new file mode 100755
index 0000000000..e9524f9b5f
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/folder.bats
@@ -0,0 +1,74 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "folder.info" {
+    for name in / vm host network datastore ; do
+        run govc folder.info $name
+        assert_success
+
+        govc folder.info -json $name
+        assert_success
+    done
+
+    result=$(govc folder.info '*' | grep Name: | wc -l)
+    [ $result -eq 4 ]
+
+    run govc info.info /enoent
+    assert_failure
+}
+
+@test "folder.create" {
+    vcsim_env
+
+    name=$(new_id)
+
+    # relative to $GOVC_DATACENTER
+    run govc folder.create $name
+    assert_failure
+
+    run govc folder.create vm/$name
+    assert_success
+
+    run govc folder.info vm/$name
+    assert_success
+
+    run govc folder.info /$GOVC_DATACENTER/vm/$name
+    assert_success
+
+    run govc object.destroy vm/$name
+    assert_success
+
+    unset GOVC_DATACENTER
+    # relative to /
+
+    run govc folder.create $name
+    assert_success
+
+    run govc folder.info /$name
+    assert_success
+
+    child=$(new_id)
+    run govc folder.create $child
+    assert_success
+
+    run govc folder.info /$name/$child
+    assert_failure
+
+    run govc object.mv $child /$name
+    assert_success
+
+    run govc folder.info /$name/$child
+    assert_success
+
+    new=$(new_id)
+    run govc object.rename /$name $new
+    assert_success
+    name=$new
+
+    run govc folder.info /$name
+    assert_success
+
+    run govc object.destroy $name
+    assert_success
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/govc-sim b/vendor/github.com/vmware/govmomi/govc/test/govc-sim
new file mode 100755
index 0000000000..76dca7c88b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/govc-sim
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+. $(dirname $0)/test_helper.bash
+
+vcsim_env
+
+govc "$@"
diff --git a/vendor/github.com/vmware/govmomi/govc/test/guest_operations_test.sh b/vendor/github.com/vmware/govmomi/govc/test/guest_operations_test.sh
new file mode 100755
index 0000000000..f86057e25a
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/guest_operations_test.sh
@@ -0,0 +1,106 @@
+#!/bin/bash -e
+
+# This test is not run via bats.
+# 1) Test guest operations (govc guest.* commands)
+# 2) Test vm disk persistence
+
+. "$(dirname "$0")"/test_helper.bash
+
+import_ttylinux_vmdk
+
+export GOVC_GUEST_LOGIN=root:password
+
+for persist in true false ; do
+  id=govc-test-persist-$persist
+  govc ls vm/$id | xargs -r govc vm.destroy
+
+  if [ "$persist" = "true" ] ; then
+    grepf=-v
+    mode=persistent
+  else
+    mode=independent_nonpersistent
+  fi
+
+  echo "Creating vm..."
+  govc vm.create -m 32 -disk.controller ide -on=false $id
+
+  # Save some noise by defaulting to '-vm $id'
+  export GOVC_VM=$id
+
+  echo "Attaching linked disk..."
+  govc vm.disk.attach -controller ide -persist=$persist -link=true -disk "$GOVC_TEST_VMDK"
+
+  echo "Creating data disk..."
+  govc vm.disk.create -controller ide -mode=$mode -name "$id"/data -size "10M"
+
+  echo "Powering on vm..."
+  govc vm.power -on $id 1>/dev/null
+  echo "Waiting for tools to initialize..."
+  govc vm.ip $id 1>/dev/null
+
+  echo "Formatting the data disk..."
+  govc guest.mkdir /data
+  script=$(govc guest.mktemp)
+
+  govc guest.upload -f - "$script" <<'EOF'
+#!/bin/sh -xe
+
+opts=(n p 1 1 ' ' w)
+printf "%s\n" "${opts[@]}" | fdisk /dev/hdb
+mkfs.ext3 /dev/hdb1
+mount /dev/hdb1 /data
+df -h
+cp /etc/motd /data
+EOF
+
+  govc guest.chmod -perm 755 "$script"
+  pid=$(govc guest.start "$script" '>&' /tmp/disk.log)
+  status=$(govc guest.ps -p "$pid" -json -X | jq .ProcessInfo[].ExitCode)
+  govc guest.download /tmp/disk.log -
+  if [ "$status" -ne "0" ] ; then
+    exit 1
+  fi
+
+  echo "Writing some data to the disks..."
+  for d in /etc /data ; do
+    govc guest.download $d/motd - | grep Chop
+  done
+  govc version | govc guest.upload -f - /etc/motd
+  govc guest.download /etc/motd - | grep -v Chop
+
+  pid=$(govc guest.start /bin/sync)
+  status=$(govc guest.ps -p "$pid" -json -X | jq .ProcessInfo[].ExitCode)
+  if [ "$status" -ne "0" ] ; then
+    exit 1
+  fi
+
+  echo "Rebooting vm..."
+  govc vm.power -off $id
+  govc vm.power -on $id
+  echo "Waiting for tools to initialize..."
+  govc vm.ip $id 1>/dev/null
+
+  echo "Verifying data persistence..."
+  govc guest.download /etc/motd - | grep $grepf Chop
+  pid=$(govc guest.start /bin/mount /dev/hdb1 /data)
+  status=$(govc guest.ps -p "$pid" -json -X | jq .ProcessInfo[].ExitCode)
+
+  if [ "$persist" = "true" ] ; then
+    govc guest.ls /data
+    govc guest.download /data/motd - | grep -v Chop
+    govc guest.rm /data/motd
+
+    govc guest.mkdir /data/foo/bar/baz 2>/dev/null && exit 1 # should fail
+    govc guest.mkdir -p /data/foo/bar/baz
+
+    govc guest.rmdir /data/foo 2>/dev/null && exit 1 # should fail
+    govc guest.rmdir /data/foo/bar/baz
+    govc guest.rmdir -r /data/foo
+    govc guest.ls /data | grep -v foo
+  else
+    if [ "$status" -eq "0" ] ; then
+      echo "expected failure"
+      exit 1
+    fi
+  fi
+done
diff --git a/vendor/github.com/vmware/govmomi/govc/test/host.bats b/vendor/github.com/vmware/govmomi/govc/test/host.bats
new file mode 100755
index 0000000000..a78f567913
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/host.bats
@@ -0,0 +1,189 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "host info esx" {
+  run govc host.info
+  assert_success
+  grep -q Manufacturer: <<<$output
+
+  run govc host.info -host enoent
+  assert_failure "govc: host 'enoent' not found"
+
+  for opt in dns ip ipath uuid
+  do
+    run govc host.info "-host.$opt" enoent
+    assert_failure "govc: no such host"
+  done
+
+  # avoid hardcoding the esxbox hostname
+  local name=$(govc ls '/*/host/*' | grep -v Resources)
+
+  run govc host.info -host $name
+  assert_success
+  grep -q Manufacturer: <<<$output
+
+  run govc host.info -host ${name##*/}
+  assert_success
+  grep -q Manufacturer: <<<$output
+
+  run govc host.info -host.ipath $name
+  assert_success
+
+  run govc host.info -host.dns $(basename $(dirname $name))
+  assert_success
+
+  uuid=$(govc host.info -json | jq -r .HostSystems[].Hardware.SystemInfo.Uuid)
+  run govc host.info -host.uuid $uuid
+  assert_success
+
+  run govc host.info "*"
+  assert_success
+}
+
+@test "host info vc" {
+  vcsim_env
+
+  run govc host.info
+  assert_success
+  grep -q Manufacturer: <<<$output
+
+  run govc host.info -host enoent
+  assert_failure "govc: host 'enoent' not found"
+
+  for opt in dns ip ipath uuid
+  do
+    run govc host.info "-host.$opt" enoent
+    assert_failure "govc: no such host"
+  done
+
+  local name=$GOVC_HOST
+
+  unset GOVC_HOST
+  run govc host.info
+  assert_failure "govc: default host resolves to multiple instances, please specify"
+
+  run govc host.info -host $name
+  assert_success
+  grep -q Manufacturer: <<<$output
+
+  run govc host.info -host.ipath $name
+  assert_success
+
+  run govc host.info -host.dns $(basename $name)
+  assert_success
+
+  uuid=$(govc host.info -host $name -json | jq -r .HostSystems[].Hardware.SystemInfo.Uuid)
+  run govc host.info -host.uuid $uuid
+  assert_success
+}
+
+@test "host.vnic.info" {
+  run govc host.vnic.info
+  assert_success
+}
+
+@test "host.vswitch.info" {
+  run govc host.vswitch.info
+  assert_success
+
+  run govc host.vswitch.info -json
+  assert_success
+}
+
+@test "host.portgroup.info" {
+  run govc host.portgroup.info
+  assert_success
+
+  run govc host.portgroup.info -json
+  assert_success
+}
+
+@test "host.options" {
+    run govc host.option.ls Config.HostAgent.plugins.solo.enableMob
+    assert_success
+
+    run govc host.option.ls Config.HostAgent.plugins.
+    assert_success
+
+    run govc host.option.ls -json Config.HostAgent.plugins.
+    assert_success
+
+    run govc host.option.ls Config.HostAgent.plugins.solo.ENOENT
+    assert_failure
+}
+
+@test "host.service" {
+    run govc host.service.ls
+    assert_success
+
+    run govc host.service.ls -json
+    assert_success
+
+    run govc host.service status TSM-SSH
+    assert_success
+}
+
+@test "host.cert.info" {
+  run govc host.cert.info
+  assert_success
+
+  run govc host.cert.info -json
+  assert_success
+
+  expires=$(govc host.cert.info -json | jq -r .NotAfter)
+  about_expires=$(govc about.cert -json | jq -r .NotAfter)
+  assert_equal "$expires" "$about_expires"
+}
+
+@test "host.cert.csr" {
+  #   Requested Extensions:
+  #       X509v3 Subject Alternative Name:
+  #       IP Address:...
+  result=$(govc host.cert.csr -ip | openssl req -text -noout)
+  assert_matches "IP Address:" "$result"
+  ! assert_matches "DNS:" "$result"
+
+  #   Requested Extensions:
+  #       X509v3 Subject Alternative Name:
+  #       DNS:...
+  result=$(govc host.cert.csr | openssl req -text -noout)
+  ! assert_matches "IP Address:" "$result"
+  assert_matches "DNS:" "$result"
+}
+
+@test "host.cert.import" {
+  issuer=$(govc host.cert.info -json | jq -r .Issuer)
+  expires=$(govc host.cert.info -json | jq -r .NotAfter)
+
+  # only mess with the cert if its already been signed by our test CA
+  if [[ "$issuer" != CN=govc-ca,* ]] ; then
+    skip "host cert not signed by govc-ca"
+  fi
+
+  govc host.cert.csr -ip | ./host_cert_sign.sh | govc host.cert.import
+  expires2=$(govc host.cert.info -json | jq -r .NotAfter)
+
+  # cert expiration should have changed
+  [ "$expires" != "$expires2" ]
+
+  # verify hostd is using the new cert too
+  expires=$(govc about.cert -json | jq -r .NotAfter)
+  assert_equal "$expires" "$expires2"
+
+  # our cert is not trusted against the system CA list
+  status=$(govc about.cert | grep Status:)
+  assert_matches ERROR "$status"
+
+  # with our CA trusted, the cert should be too
+  status=$(govc about.cert -tls-ca-certs ./govc_ca.pem | grep Status:)
+  assert_matches good "$status"
+}
+
+@test "host.date.info" {
+  run govc host.date.info
+  assert_success
+
+  run govc host.date.info -json
+  assert_success
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/host_cert_sign.sh b/vendor/github.com/vmware/govmomi/govc/test/host_cert_sign.sh
new file mode 100755
index 0000000000..3bbf5b597f
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/host_cert_sign.sh
@@ -0,0 +1,30 @@
+#!/bin/bash -e
+
+# Usage: govc host.cert.csr | ./host_cert_sign.sh | govc host.cert.import
+
+pushd "$(dirname "$0")" >/dev/null
+
+days=$((365 * 5))
+
+if [ ! -e govc_ca.key ] ; then
+  echo "Generating CA private key..." 1>&2
+  openssl genrsa -out govc_ca.key 2048
+
+  echo "Generating CA self signed certificate..." 1>&2
+  openssl req -x509 -new -nodes -key govc_ca.key -out govc_ca.pem -subj /C=US/ST=CA/L=SF/O=VMware/OU=Eng/CN=govc-ca -days $days
+fi
+
+echo "Signing CSR with the CA certificate..." 1>&2
+
+# The hostd generated CSR includes:
+#   Requested Extensions:
+#       X509v3 Subject Alternative Name:
+#       IP Address:$ip
+# But seems it doesn't get copied by default, so we end up with:
+#   x509: cannot validate certificate for $ip because it doesn't contain any IP SANs (x509.HostnameError)
+# Using -extfile to add it to the signed cert.
+
+ip=$(govc env -x GOVC_URL_HOST)
+openssl x509 -req -CA govc_ca.pem -CAkey govc_ca.key -CAcreateserial -days $days -extfile <(echo "subjectAltName=IP:$ip")
+
+popd >/dev/null
diff --git a/vendor/github.com/vmware/govmomi/govc/test/images/.gitignore b/vendor/github.com/vmware/govmomi/govc/test/images/.gitignore
new file mode 100644
index 0000000000..170208c81f
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/images/.gitignore
@@ -0,0 +1,3 @@
+ttylinux-*
+floppybird.img
+
diff --git a/vendor/github.com/vmware/govmomi/govc/test/images/update.sh b/vendor/github.com/vmware/govmomi/govc/test/images/update.sh
new file mode 100755
index 0000000000..1dfe23b1e6
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/images/update.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+pushd $(dirname $0)
+
+# Sadly, the ttylinux project was abandoned in late 2015.
+# But this release still serves us well.
+base_url=http://dl.bintray.com/dougm/ttylinux
+ttylinux="ttylinux-pc_i486-16.1"
+files="${ttylinux}.iso ${ttylinux}-live.ova ${ttylinux}.ova"
+
+for name in $files ; do
+  wget -qO $name $base_url/$name
+done
+
+wget -qN https://github.com/icebreaker/floppybird/raw/master/build/floppybird.img
+
+# extract ova so we can also use the .vmdk and .ovf files directly
+tar -xvf ${ttylinux}.ova
+
+popd
diff --git a/vendor/github.com/vmware/govmomi/govc/test/import.bats b/vendor/github.com/vmware/govmomi/govc/test/import.bats
new file mode 100755
index 0000000000..2e752c734e
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/import.bats
@@ -0,0 +1,60 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "import.ova" {
+  run govc import.ova $GOVC_IMAGES/${TTYLINUX_NAME}.ova
+  assert_success
+
+  run govc vm.destroy ${TTYLINUX_NAME}
+  assert_success
+}
+
+@test "import.ova with iso" {
+  run govc import.ova $GOVC_IMAGES/${TTYLINUX_NAME}-live.ova
+  assert_success
+
+  run govc vm.destroy ${TTYLINUX_NAME}-live
+  assert_success
+}
+
+@test "import.ovf" {
+  run govc import.ovf $GOVC_IMAGES/${TTYLINUX_NAME}.ovf
+  assert_success
+
+  run govc vm.destroy ${TTYLINUX_NAME}
+  assert_success
+
+  # test w/ relative dir
+  pushd $BATS_TEST_DIRNAME >/dev/null
+  run govc import.ovf ./images/${TTYLINUX_NAME}.ovf
+  assert_success
+  popd >/dev/null
+
+  run govc vm.destroy ${TTYLINUX_NAME}
+  assert_success
+}
+
+@test "import.ovf with name in options" {
+  name=$(new_id)
+  file=$($mktemp --tmpdir govc-test-XXXXX)
+  echo "{ \"Name\": \"${name}\"}" > ${file}
+
+  run govc import.ovf -options="${file}" $GOVC_IMAGES/${TTYLINUX_NAME}.ovf
+  assert_success
+
+  run govc vm.destroy "${name}"
+  assert_success
+
+  rm -f ${file}
+}
+
+@test "import.ovf with name as argument" {
+  name=$(new_id)
+
+  run govc import.ova -name="${name}" $GOVC_IMAGES/${TTYLINUX_NAME}.ova
+  assert_success
+
+  run govc vm.destroy "${name}"
+  assert_success
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/license.bats b/vendor/github.com/vmware/govmomi/govc/test/license.bats
new file mode 100755
index 0000000000..a80a9e1ba5
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/license.bats
@@ -0,0 +1,53 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+# These tests should only run against a server running an evaluation license.
+verify_evaluation() {
+  if [ "$(govc license.ls -json | jq -r .[0].EditionKey)" != "eval" ]; then
+    skip "requires evaluation license"
+  fi
+}
+
+get_key() {
+  jq ".[] | select(.LicenseKey == \"$1\")"
+}
+
+get_property() {
+  jq -r ".Properties[] | select(.Key == \"$1\") | .Value"
+}
+
+@test "license.add" {
+  verify_evaluation
+
+  run govc license.add -json 00000-00000-00000-00000-00001 00000-00000-00000-00000-00002
+  assert_success
+
+  # Expect to see an entry for both the first and the second key
+  assert_equal "License is not valid for this product" $(get_key 00000-00000-00000-00000-00001 <<<${output} | get_property diagnostic)
+  assert_equal "License is not valid for this product" $(get_key 00000-00000-00000-00000-00002 <<<${output} | get_property diagnostic)
+}
+
+@test "license.remove" {
+  verify_evaluation
+
+  run govc license.remove -json 00000-00000-00000-00000-00001
+  assert_success
+}
+
+@test "license.ls" {
+  verify_evaluation
+
+  run govc license.ls -json
+  assert_success
+
+  # Expect the test instance to run in evaluation mode
+  assert_equal "Evaluation Mode" $(get_key 00000-00000-00000-00000-00000 <<<$output | jq -r ".Name")
+}
+
+@test "license.decode" {
+  verify_evaluation
+
+  key=00000-00000-00000-00000-00000
+  assert_equal "eval" $(govc license.decode $key | grep $key | awk '{print $2}')
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/logs.bats b/vendor/github.com/vmware/govmomi/govc/test/logs.bats
new file mode 100755
index 0000000000..f03489b34e
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/logs.bats
@@ -0,0 +1,42 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "logs" {
+  run govc logs
+  assert_success
+  nlogs=${#lines[@]}
+  # there should be plenty more than 1 line of hostd logs
+  [ $nlogs -ge 1 ]
+
+  # test -n flag
+  run govc logs -n $((nlogs - 10))
+  assert_success
+  [ ${#lines[@]} -le $nlogs ]
+
+  run govc logs -log vmkernel
+  assert_success
+  nlogs=${#lines[@]}
+  # there should be plenty more than 1 line of vmkernel logs
+  [ $nlogs -ge 1 ]
+
+  # test > 1 call to BrowseLog()
+  run govc logs -n 2002
+  assert_success
+
+  # -host ignored against ESX
+  run govc logs -host enoent
+  assert_success
+
+  run govc logs -log enoent
+  assert_failure
+}
+
+@test "logs.ls" {
+  run govc logs.ls
+  assert_success
+
+  # -host ignored against ESX
+  run govc logs.ls -host enoent
+  assert_success
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/ls.bats b/vendor/github.com/vmware/govmomi/govc/test/ls.bats
new file mode 100755
index 0000000000..33ceff8497
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/ls.bats
@@ -0,0 +1,146 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "ls" {
+  run govc ls
+  assert_success
+  # /dc/{vm,network,host,datastore}
+  n=${#lines[@]}
+  [ $n -ge 4 ]
+
+  # list entire inventory
+  run govc ls '/**'
+  assert_success
+  [ ${#lines[@]} -ge $n ]
+
+  run govc ls ./...
+  assert_success
+  [ ${#lines[@]} -ge $n ]
+
+  run govc ls -t HostSystem '*'
+  assert_success
+  [ ${#lines[@]} -eq 0 ]
+
+  # search entire inventory
+  run govc ls -t HostSystem '/**'
+  assert_success
+  [ ${#lines[@]} -eq 1 ]
+
+  run govc ls -t HostSystem ./...
+  assert_success
+  [ ${#lines[@]} -eq 1 ]
+
+  run govc ls host
+  assert_success
+  [ ${#lines[@]} -ge 1 ]
+
+  run govc ls enoent
+  assert_success
+  [ ${#lines[@]} -eq 0 ]
+}
+
+@test "ls vm" {
+  vm=$(new_empty_vm)
+
+  run govc ls vm
+  assert_success
+  [ ${#lines[@]} -ge 1 ]
+
+  run govc ls vm/$vm
+  assert_success
+  [ ${#lines[@]} -eq 1 ]
+
+  run govc ls /*/vm/$vm
+  assert_success
+  [ ${#lines[@]} -eq 1 ]
+}
+
+@test "ls network" {
+  run govc ls network
+  assert_success
+  [ ${#lines[@]} -ge 1 ]
+
+  local path=${lines[0]}
+  run govc ls "$path"
+  assert_success
+  [ ${#lines[@]} -eq 1 ]
+
+  run govc ls "network/$(basename "$path")"
+  assert_success
+  [ ${#lines[@]} -eq 1 ]
+
+  run govc ls "/*/network/$(basename "$path")"
+  assert_success
+  [ ${#lines[@]} -eq 1 ]
+}
+
+@test "ls multi ds" {
+  vcsim_env
+
+  run govc ls
+  assert_success
+  # /DC0/{vm,network,host,datastore}
+  [ ${#lines[@]} -eq 4 ]
+
+  run govc ls /DC*
+  assert_success
+  # /DC[0,1]/{vm,network,host,datastore}
+  [ ${#lines[@]} -eq 8 ]
+
+  # here 'vm' is relative to /DC0
+  run govc ls vm
+  assert_success
+  [ ${#lines[@]} -gt 0 ]
+
+  unset GOVC_DATACENTER
+
+  run govc ls
+  assert_success
+  # /DC[0,1]
+  [ ${#lines[@]} -eq 2 ]
+
+  run govc ls -dc enoent
+  assert_failure
+  [ ${#lines[@]} -gt 0 ]
+
+  # here 'vm' is relative to '/' - so there are no matches
+  run govc ls vm
+  assert_success
+  [ ${#lines[@]} -eq 0 ]
+
+  # ls all vms in all datacenters
+  run govc ls */vm
+  assert_success
+  [ ${#lines[@]} -gt 0 ]
+}
+
+@test "ls moref" {
+    # ensure the vm folder isn't empty
+    run govc vm.create -on=false "$(new_id)"
+    assert_success
+
+    # list dc folder paths
+    folders1=$(govc ls)
+    # list dc folder refs | govc ls -L ; should output the same paths
+    folders2=$(govc ls -i | xargs govc ls -L)
+
+    assert_equal "$folders1" "$folders2"
+
+    for folder in $folders1
+    do
+        # list paths in $folder
+        items1=$(govc ls "$folder")
+        # list refs in $folder | govc ls -L ; should output the same paths
+        items2=$(govc ls -i "$folder" | xargs -d '\n' govc ls -L)
+
+        assert_equal "$items1" "$items2"
+    done
+
+    ref=ViewManager:ViewManager
+    path=$(govc ls -L $ref)
+    assert_equal "$ref" "$path"
+
+    path=$(govc ls -L Folder:ha-folder-root)
+    assert_equal "/" "$path"
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/network.bats b/vendor/github.com/vmware/govmomi/govc/test/network.bats
new file mode 100755
index 0000000000..025a718055
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/network.bats
@@ -0,0 +1,170 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "network dvs backing" {
+  vcsim_env
+
+  # DVS backed network by default (from vcsim_env)
+  vm=$(new_empty_vm)
+
+  eth0=$(govc device.ls -vm $vm | grep ethernet- | awk '{print $1}')
+  run govc device.info -vm $vm $eth0
+  assert_success
+
+  summary=$(govc device.info -vm $vm $eth0 | grep Summary: | awk '{print $2}')
+  assert_equal "DVSwitch:" $summary
+
+  run govc device.remove -vm $vm $eth0
+  assert_success
+
+  eth0=$(govc device.ls -vm $vm | grep ethernet- | awk '{print $1}')
+  [ -z "$eth0" ]
+
+  # Standard network backing
+  run govc vm.network.add -vm $vm -net "VM Network"
+  assert_success
+
+  eth0=$(govc device.ls -vm $vm | grep ethernet- | awk '{print $1}')
+
+  run govc device.info -vm $vm $eth0
+  assert_success
+
+  summary=$(govc device.info -vm $vm $eth0 | grep Summary: | awk -F: '{print $2}')
+  assert_equal "VM Network" $(collapse_ws $summary)
+
+  run govc device.remove -vm $vm $eth0
+  assert_success
+
+  run govc device.remove -vm $vm $eth0
+  assert_failure "govc: device '$eth0' not found"
+}
+
+@test "network change backing" {
+  vcsim_env
+
+  vm=$(new_empty_vm)
+
+  eth0=$(govc device.ls -vm $vm | grep ethernet- | awk '{print $1}')
+  run govc vm.network.change -vm $vm $eth0 enoent
+  assert_failure "govc: network 'enoent' not found"
+
+  run govc vm.network.change -vm $vm enoent "VM Network"
+  assert_failure "govc: device 'enoent' not found"
+
+  run govc vm.network.change -vm $vm $eth0 "VM Network"
+  assert_success
+
+  run govc vm.network.change -vm $vm $eth0
+  assert_success
+
+  unset GOVC_NETWORK
+  run govc vm.network.change -vm $vm $eth0
+  assert_failure "govc: default network resolves to multiple instances, please specify"
+
+  run govc vm.power -on $vm
+  assert_success
+  run govc vm.power -off $vm
+
+  mac=$(vm_mac $vm)
+  run govc vm.network.change -vm $vm -net "VM Network" $eth0
+  assert_success
+
+  # verify we didn't change the mac address
+  run govc vm.power -on $vm
+  assert_success
+  assert_equal $mac $(vm_mac $vm)
+}
+
+@test "network standard backing" {
+  vm=$(new_empty_vm)
+
+  run govc device.info -vm $vm ethernet-0
+  assert_success
+
+  run govc device.remove -vm $vm ethernet-0
+  assert_success
+
+  run govc device.info -vm $vm ethernet-0
+  assert_failure
+
+  run govc vm.network.add -vm $vm enoent
+  assert_failure "govc: network 'enoent' not found"
+
+  run govc vm.network.add -vm $vm "VM Network"
+  assert_success
+
+  run govc device.info -vm $vm ethernet-0
+  assert_success
+}
+
+@test "network adapter" {
+  vm=$(new_id)
+  run govc vm.create -on=false -net.adapter=enoent $vm
+  assert_failure "govc: unknown ethernet card type 'enoent'"
+
+  vm=$(new_id)
+  run govc vm.create -on=false -net.adapter=vmxnet3 $vm
+  assert_success
+
+  eth0=$(govc device.ls -vm $vm | grep ethernet- | awk '{print $1}')
+  type=$(govc device.info -vm $vm $eth0 | grep Type: | awk -F: '{print $2}')
+  assert_equal "VirtualVmxnet3" $(collapse_ws $type)
+
+  run govc vm.network.add -vm $vm -net.adapter e1000e "VM Network"
+  assert_success
+
+  eth1=$(govc device.ls -vm $vm | grep ethernet- | grep -v $eth0 | awk '{print $1}')
+  type=$(govc device.info -vm $vm $eth1 | grep Type: | awk -F: '{print $2}')
+  assert_equal "VirtualE1000e" $(collapse_ws $type)
+}
+
+@test "network flag required" {
+  vcsim_env
+
+  # -net flag is required when there are multiple networks
+  unset GOVC_NETWORK
+  run govc vm.create -on=false $(new_id)
+  assert_failure "govc: default network resolves to multiple instances, please specify"
+}
+
+@test "network change hardware address" {
+  mac="00:00:0f$(dd bs=1 count=3 if=/dev/random 2>/dev/null | hexdump -v -e '/1 ":%02x"')"
+  vm=$(new_id)
+  run govc vm.create -on=false $vm
+  assert_success
+
+  run govc vm.network.change -vm $vm -net.address $mac ethernet-0
+  assert_success
+
+  run govc vm.power -on $vm
+  assert_success
+
+  assert_equal $mac $(vm_mac $vm)
+}
+
+@test "dvs.portgroup" {
+  vcsim_env
+  id=$(new_id)
+
+  run govc dvs.create "$id"
+  assert_success
+
+  run govc dvs.portgroup.add -dvs "$id" -type earlyBinding -nports 16 "${id}-ExternalNetwork"
+  assert_success
+
+  run govc dvs.portgroup.add -dvs "$id" -type ephemeral -vlan 3122 "${id}-InternalNetwork"
+  assert_success
+
+  info=$(govc dvs.portgroup.info "$id" | grep VlanId: | uniq | grep 3122)
+  [ -n "$info" ]
+
+  run govc dvs.portgroup.change -vlan 3123 "${id}-InternalNetwork"
+  assert_success
+
+  info=$(govc dvs.portgroup.info "$id" | grep VlanId: | uniq | grep 3123)
+  [ -n "$info" ]
+
+  run govc object.destroy "network/${id}-ExternalNetwork" "network/${id}-InternalNetwork" "network/${id}"
+  assert_success
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/object.bats b/vendor/github.com/vmware/govmomi/govc/test/object.bats
new file mode 100755
index 0000000000..85fbf51736
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/object.bats
@@ -0,0 +1,128 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "object.destroy" {
+    run govc object.destroy "/enoent"
+    assert_failure
+
+    run govc object.destroy
+    assert_failure
+
+    vm=$(new_id)
+    run govc vm.create "$vm"
+    assert_success
+
+    # fails when powered on
+    run govc object.destroy "vm/$vm"
+    assert_failure
+
+    run govc vm.power -off "$vm"
+    assert_success
+
+    run govc object.destroy "vm/$vm"
+    assert_success
+}
+
+@test "object.rename" {
+  run govc object.rename "/enoent" "nope"
+  assert_failure
+
+  vm=$(new_id)
+  run govc vm.create -on=false "$vm"
+  assert_success
+
+  run govc object.rename "vm/$vm" "${vm}-renamed"
+  assert_success
+
+  run govc object.rename "vm/$vm" "${vm}-renamed"
+  assert_failure
+
+  run govc object.destroy "vm/${vm}-renamed"
+  assert_success
+}
+
+@test "object.mv" {
+  vcsim_env
+
+  folder=$(new_id)
+
+  run govc folder.create "vm/$folder"
+  assert_success
+
+  for _ in $(seq 1 3) ; do
+    vm=$(new_id)
+    run govc vm.create -folder "$folder" "$vm"
+    assert_success
+  done
+
+  result=$(govc ls "vm/$folder" | wc -l)
+  [ "$result" -eq "3" ]
+
+  run govc folder.create "vm/${folder}-2"
+  assert_success
+
+  run govc object.mv "vm/$folder/*" "vm/${folder}-2"
+  assert_success
+
+  result=$(govc ls "vm/${folder}-2" | wc -l)
+  [ "$result" -eq "3" ]
+
+  result=$(govc ls "vm/$folder" | wc -l)
+  [ "$result" -eq "0" ]
+}
+
+@test "object.collect" {
+  run govc object.collect
+  assert_success
+
+  run govc object.collect -json
+  assert_success
+
+  run govc object.collect -
+  assert_success
+
+  run govc object.collect -json -
+  assert_success
+
+  run govc object.collect - content
+  assert_success
+
+  run govc object.collect -json - content
+  assert_success
+
+  root=$(govc object.collect - content | grep content.rootFolder | awk '{print $3}')
+
+  dc=$(govc object.collect "$root" childEntity | awk '{print $3}' | cut -d, -f1)
+
+  hostFolder=$(govc object.collect "$dc" hostFolder | awk '{print $3}')
+
+  cr=$(govc object.collect "$hostFolder" childEntity | awk '{print $3}' | cut -d, -f1)
+
+  host=$(govc object.collect "$cr" host | awk '{print $3}' | cut -d, -f1)
+
+  run govc object.collect "$host"
+  assert_success
+
+  run govc object.collect "$host" hardware
+  assert_success
+
+  run govc object.collect "$host" hardware.systemInfo
+  assert_success
+
+  uuid=$(govc object.collect "$host" hardware.systemInfo.uuid | awk '{print $3}')
+  uuid_s=$(govc object.collect -s "$host" hardware.systemInfo.uuid)
+  assert_equal "$uuid" "$uuid_s"
+
+  run govc object.collect "$(govc ls host | head -n1)"
+  assert_success
+
+  # test against slice of interface
+  perfman=$(govc object.collect -s - content.perfManager)
+  result=$(govc object.collect -s "$perfman" description.counterType)
+  assert_equal "..." "$result"
+
+  # test against an interface field
+  run govc object.collect '/ha-datacenter/network/VM Network' summary
+  assert_success
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/pool.bats b/vendor/github.com/vmware/govmomi/govc/test/pool.bats
new file mode 100755
index 0000000000..12470e4ce0
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/pool.bats
@@ -0,0 +1,301 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "pool.create" {
+  path="*/Resources/$(new_id)/$(new_id)"
+  run govc pool.create $path
+  assert_failure
+  assert_line "govc: cannot create resource pool '$(basename ${path})': parent not found"
+
+  id=$(new_id)
+  path="*/Resources/$id"
+  run govc pool.create -cpu.shares low -mem.reservation 500 $path
+  assert_success
+
+  run govc pool.info $path
+  assert_success
+
+  assert_line "Name: $id"
+  assert_line "CPU Shares: low"
+  assert_line "Mem Reservation: 500MB (expandable=true)"
+
+  run govc pool.destroy $path
+  assert_success
+}
+
+@test "pool.create multiple" {
+  id=$(new_id)
+  path="*/Resources/$id"
+  govc pool.create $path
+
+  # Finder.List($path)
+  run govc pool.info "$path"
+  assert_success
+
+  # Finder.Find($name)
+  run govc pool.info "$id"
+  assert_success
+
+  # Create multiple parent pools with multiple arguments (without globbing)
+  run govc pool.create $path/a $path/b
+  assert_success
+  result=$(govc ls "host/$path/*" | wc -l)
+  [ $result -eq 2 ]
+
+  # Create multiple child pools with one argument (with globbing)
+  run govc pool.create $path/*/{a,b}
+  assert_success
+  result=$(govc ls "host/$path/*/*" | wc -l)
+  [ $result -eq 4 ]
+
+  # Clean up
+  run govc pool.destroy $path/*/* $path/* $path
+  assert_success
+}
+
+@test "pool.change" {
+  id=$(new_id)
+  path="*/Resources/$id"
+  govc pool.create $path
+
+  run govc pool.change -mem.shares high $path
+  assert_success
+  run govc pool.info $path
+  assert_success
+  assert_line "Mem Shares: high"
+  assert_line "CPU Shares: normal"
+
+  nid=$(new_id)
+  run govc pool.change -name $nid $path
+  assert_success
+  path="*/Resources/$nid"
+
+  run govc pool.info $path
+  assert_success
+  assert_line "Name: $nid"
+
+  run govc pool.destroy $path
+  assert_success
+}
+
+@test "pool.change multiple" {
+  id=$(new_id)
+  path="*/Resources/$id"
+  govc pool.create $path
+
+  # Create some nested pools so that we can test changing multiple in one call
+  govc pool.create $path/{a,b} $path/{a,b}/test
+
+  # Test precondition
+  run govc pool.info $path/a/test
+  assert_success
+  assert_line "Name: test"
+  run govc pool.info $path/b/test
+  assert_success
+  assert_line "Name: test"
+
+  # Change name of both test pools
+  run govc pool.change -name hello $path/*/test
+  assert_success
+
+  # Test postcondition
+  run govc pool.info $path/a/hello
+  assert_success
+  assert_line "Name: hello"
+  run govc pool.info $path/b/hello
+  assert_success
+  assert_line "Name: hello"
+
+  # Clean up
+  govc pool.destroy $path/a/hello
+  govc pool.destroy $path/a
+  govc pool.destroy $path/b/hello
+  govc pool.destroy $path/b
+  govc pool.destroy $path
+}
+
+@test "pool.destroy" {
+  id=$(new_id)
+
+  # parent pool
+  path="*/Resources/$id"
+  run govc pool.create $path
+  assert_success
+
+  result=$(govc ls "host/$path/*" | wc -l)
+  [ $result -eq 0 ]
+
+  # child pools
+  id1=$(new_id)
+  run govc pool.create $path/$id1
+  assert_success
+
+  id2=$(new_id)
+  run govc pool.create $path/$id2
+  assert_success
+
+  # 2 child pools
+  result=$(govc ls "host/$path/*" | wc -l)
+  [ $result -eq 2 ]
+
+  # 1 parent pool
+  result=$(govc ls "host/$path" | wc -l)
+  [ $result -eq 1 ]
+
+  run govc pool.destroy $path
+  assert_success
+
+  # no more parent pool
+  result=$(govc ls "host/$path" | wc -l)
+  [ $result -eq 0 ]
+
+  # the child pools are not present anymore
+  # the only place they could pop into is the parent pool
+
+  # first child pool
+  result=$(govc ls "host/*/Resources/$id1" | wc -l)
+  [ $result -eq 0 ]
+
+  # second child pool
+  result=$(govc ls "host/*/Resources/$id2" | wc -l)
+  [ $result -eq 0 ]
+}
+
+@test "pool.destroy children" {
+  id=$(new_id)
+
+  # parent pool
+  path="*/Resources/$id"
+  run govc pool.create $path
+  assert_success
+
+  result=$(govc ls "host/$path/*" | wc -l)
+  [ $result -eq 0 ]
+
+  # child pools
+  run govc pool.create $path/$(new_id)
+  assert_success
+
+  run govc pool.create $path/$(new_id)
+  assert_success
+
+  # 2 child pools
+  result=$(govc ls "host/$path/*" | wc -l)
+  [ $result -eq 2 ]
+
+  # 1 parent pool
+  result=$(govc ls "host/*/Resources/govc-test-*" | wc -l)
+  [ $result -eq 1 ]
+
+  # delete childs
+  run govc pool.destroy -children $path
+  assert_success
+
+  # no more child pools
+  result=$(govc ls "host/$path/*" | wc -l)
+  [ $result -eq 0 ]
+
+  # cleanup
+  run govc pool.destroy $path
+  assert_success
+
+  # cleanup check
+  result=$(govc ls "host/$path" | wc -l)
+  [ $result -eq 0 ]
+}
+
+@test "pool.destroy multiple" {
+  id=$(new_id)
+  path="*/Resources/$id"
+  govc pool.create $path
+
+  # Create some nested pools so that we can test destroying multiple in one call
+  govc pool.create $path/{a,b}
+
+  # Test precondition
+  result=$(govc ls "host/$path/*" | wc -l)
+  [ $result -eq 2 ]
+
+  # Destroy both pools
+  run govc pool.destroy $path/{a,b}
+  assert_success
+
+  # Test postcondition
+  result=$(govc ls "host/$path/*" | wc -l)
+  [ $result -eq 0 ]
+
+  # Clean up
+  govc pool.destroy $path
+}
+
+@test "vm.create -pool" {
+  # test with full inventory path to pools
+  parent_path=$(govc ls 'host/*/Resources')
+  parent_name=$(basename $parent_path)
+  [ "$parent_name" = "Resources" ]
+
+  child_name=$(new_id)
+  child_path="$parent_path/$child_name"
+
+  grand_child_name=$(new_id)
+  grand_child_path="$child_path/$grand_child_name"
+
+  run govc pool.create $parent_path/$child_name{,/$grand_child_name}
+  assert_success
+
+  for path in $parent_path $child_path $grand_child_path
+  do
+    run govc vm.create -pool $path $(new_id)
+    assert_success
+  done
+
+  run govc pool.change -mem.limit 100 -mem.expandable=false $child_path
+  assert_failure
+
+  run govc pool.change -mem.limit 100 $child_path
+  assert_success
+
+  run govc pool.change -mem.limit 120 -mem.expandable $child_path
+  assert_success
+
+  # test with glob inventory path to pools
+  parent_path="*/$parent_name"
+  child_path="$parent_path/$child_name"
+  grand_child_path="$child_path/$grand_child_name"
+
+  for path in $grand_child_path $child_path
+  do
+    run govc pool.destroy $path
+    assert_success
+  done
+}
+
+@test "vm.create -pool host" {
+  id=$(new_id)
+
+  path=$(govc ls host)
+
+  run govc vm.create -on=false -pool enoent $id
+  assert_failure "govc: resource pool 'enoent' not found"
+
+  run govc vm.create -on=false -pool $path $id
+  assert_success
+}
+
+@test "vm.create -pool cluster" {
+  vcsim_env
+
+  id=$(new_id)
+
+  path=$(dirname $GOVC_HOST)
+
+  unset GOVC_HOST
+  unset GOVC_RESOURCE_POOL
+
+  run govc vm.create -on=false -pool enoent $id
+  assert_failure "govc: resource pool 'enoent' not found"
+
+  run govc vm.create -on=false -pool $path $id
+  assert_success
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/role.bats b/vendor/github.com/vmware/govmomi/govc/test/role.bats
new file mode 100755
index 0000000000..fe396b41ca
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/role.bats
@@ -0,0 +1,96 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "permissions.ls" {
+  run govc permissions.ls
+  assert_success
+
+  run govc permissions.ls -json
+  assert_success
+}
+
+@test "role.ls" {
+  run govc role.ls
+  assert_success
+
+  run govc role.ls -json
+  assert_success
+
+  run govc role.ls Admin
+  assert_success
+
+  run govc role.ls -json Admin
+  assert_success
+
+  run govc role.ls enoent
+  assert_failure
+}
+
+@test "role.usage" {
+  run govc role.usage
+  assert_success
+
+  run govc role.usage -json
+  assert_success
+
+  run govc role.usage Admin
+  assert_success
+
+  run govc role.usage -json Admin
+  assert_success
+
+  run govc role.usage enoent
+  assert_failure
+}
+
+@test "role.create" {
+  id=$(new_id)
+  run govc role.create "$id"
+  assert_success
+
+  run govc role.ls "$id"
+  assert_success
+
+  priv=$(govc role.ls "$id" | wc -l)
+  vm_priv=($(govc role.ls Admin | grep VirtualMachine.))
+
+  # Test set
+  run govc role.update "$id" "${vm_priv[@]}"
+  assert_success
+
+  npriv=$(govc role.ls "$id" | wc -l)
+  [ "$npriv" -gt "$priv" ]
+  priv=$npriv
+
+  op_priv=($(govc role.ls "$id" | grep VirtualMachine.GuestOperations.))
+  # Test remove
+  run govc role.update -r "$id" "${op_priv[@]}"
+  assert_success
+
+  npriv=$(govc role.ls "$id" | wc -l)
+  [ "$npriv" -lt "$priv" ]
+  priv=$npriv
+
+  # Test add
+  run govc role.update -a "$id" "${op_priv[@]}"
+  assert_success
+
+  npriv=$(govc role.ls "$id" | wc -l)
+  [ "$npriv" -gt "$priv" ]
+  priv=$npriv
+
+  # Test rename
+  run govc role.update -name "${id}-N" "$id"
+  assert_success
+
+  id="${id}-N"
+  # Test we didn't drop any privileges during rename
+  [ "$priv" -eq "$(govc role.ls "$id" | wc -l)" ]
+
+  run govc role.remove "${id}"
+  assert_success
+
+  run govc role.ls "$id"
+  assert_failure
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/session.bats b/vendor/github.com/vmware/govmomi/govc/test/session.bats
new file mode 100755
index 0000000000..a5fc17a0b5
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/session.bats
@@ -0,0 +1,36 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "session.ls" {
+  run govc session.ls
+  assert_success
+
+  run govc session.ls -json
+  assert_success
+
+  # Test User-Agent
+  govc session.ls | grep "$(govc version | tr ' ' /)"
+}
+
+@test "session.rm" {
+  run govc session.rm enoent
+  assert_failure
+  assert_output "govc: ServerFaultCode: The object or item referred to could not be found."
+
+  # Can't remove the current session
+  id=$(govc session.ls -json | jq -r .CurrentSession.Key)
+  run govc session.rm "$id"
+  assert_failure
+
+  thumbprint=$(govc about.cert -thumbprint)
+  # persist session just to avoid the Logout() so we can session.rm below
+  dir=$(mktemp -d govc-test-XXXXX)
+
+  id=$(GOVMOMI_HOME="$dir" govc session.ls -json -k=false -persist-session -tls-known-hosts <(echo "$thumbprint") | jq -r .CurrentSession.Key)
+
+  rm -rf "$dir"
+
+  run govc session.rm "$id"
+  assert_success
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/test_helper.bash b/vendor/github.com/vmware/govmomi/govc/test/test_helper.bash
new file mode 100644
index 0000000000..f3831aa47e
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/test_helper.bash
@@ -0,0 +1,254 @@
+# set the following variables only if they've not been set
+GOVC_TEST_URL=${GOVC_TEST_URL-"https://root:vagrant@localhost:18443/sdk"}
+export GOVC_URL=$GOVC_TEST_URL
+export GOVC_DATASTORE=${GOVC_DATASTORE-datastore1}
+export GOVC_NETWORK=${GOVC_NETWORK-"VM Network"}
+
+export GOVC_INSECURE=true
+export GOVC_PERSIST_SESSION=false
+unset GOVC_DEBUG
+unset GOVC_TLS_KNOWN_HOSTS
+unset GOVC_DATACENTER
+unset GOVC_HOST
+unset GOVC_USERNAME
+unset GOVC_PASSWORD
+
+if [ -z "$BATS_TEST_DIRNAME" ]; then
+  BATS_TEST_DIRNAME=$(dirname ${BASH_SOURCE})
+fi
+
+# gnu core utils
+readlink=$(type -p greadlink readlink | head -1)
+xargs=$(type -p gxargs xargs | head -1)
+mktemp=$(type -p gmktemp mktemp | head -1)
+
+BATS_TEST_DIRNAME=$($readlink -nf $BATS_TEST_DIRNAME)
+
+GOVC_IMAGES=$BATS_TEST_DIRNAME/images
+TTYLINUX_NAME=ttylinux-pc_i486-16.1
+
+GOVC_TEST_VMDK_SRC=$GOVC_IMAGES/${TTYLINUX_NAME}-disk1.vmdk
+GOVC_TEST_VMDK=govc-images/$(basename $GOVC_TEST_VMDK_SRC)
+
+GOVC_TEST_ISO_SRC=$GOVC_IMAGES/${TTYLINUX_NAME}.iso
+GOVC_TEST_ISO=govc-images/$(basename $GOVC_TEST_ISO_SRC)
+
+GOVC_TEST_IMG_SRC=$GOVC_IMAGES/floppybird.img
+GOVC_TEST_IMG=govc-images/$(basename $GOVC_TEST_IMG_SRC)
+
+PATH="$(dirname $BATS_TEST_DIRNAME):$PATH"
+
+teardown() {
+  govc ls vm | grep govc-test- | $xargs -r govc vm.destroy
+  govc datastore.ls | grep govc-test- | awk '{print ($NF)}' | $xargs -n1 -r govc datastore.rm
+  govc ls "host/*/Resources/govc-test-*" | $xargs -r govc pool.destroy
+}
+
+new_id() {
+  echo "govc-test-$(uuidgen)"
+}
+
+import_ttylinux_vmdk() {
+  govc datastore.mkdir -p govc-images
+  govc datastore.ls "$GOVC_TEST_VMDK" >/dev/null 2>&1 || \
+    govc import.vmdk "$GOVC_TEST_VMDK_SRC" govc-images > /dev/null
+}
+
+datastore_upload() {
+  src=$1
+  dst=govc-images/$(basename $src)
+
+  govc datastore.mkdir -p govc-images
+  govc datastore.ls "$dst" >/dev/null 2>&1 || \
+    govc datastore.upload "$src" "$dst" > /dev/null
+}
+
+upload_img() {
+  datastore_upload $GOVC_TEST_IMG_SRC
+}
+
+upload_iso() {
+  datastore_upload $GOVC_TEST_ISO_SRC
+}
+
+new_ttylinux_vm() {
+  import_ttylinux_vmdk # TODO: make this part of vagrant provision
+  id=$(new_id)
+  govc vm.create -m 32 -disk $GOVC_TEST_VMDK -disk.controller ide -on=false $id
+  echo $id
+}
+
+new_empty_vm() {
+  id=$(new_id)
+  govc vm.create -on=false $id
+  echo $id
+}
+
+vm_power_state() {
+  govc vm.info "$1" | grep "Power state:" | awk -F: '{print $2}' | collapse_ws
+}
+
+vm_mac() {
+  govc device.info -vm "$1" ethernet-0 | grep "MAC Address" | awk '{print $NF}'
+}
+
+# exports an environment for using vcsim if running, otherwise skips the calling test.
+vcsim_env() {
+  if [ "$(uname)" == "Darwin" ]; then
+    PATH="/Applications/VMware Fusion.app/Contents/Library:$PATH"
+  fi
+
+  if [ "$(vmrun list | grep $BATS_TEST_DIRNAME/vcsim | wc -l)" -eq 1 ]; then
+    export GOVC_URL=https://root:vmware@localhost:16443/sdk \
+           GOVC_DATACENTER=DC0 \
+           GOVC_DATASTORE=GlobalDS_0 \
+           GOVC_HOST=/DC0/host/DC0_C0/DC0_C0_H0 \
+           GOVC_RESOURCE_POOL=/DC0/host/DC0_C0/Resources \
+           GOVC_NETWORK=/DC0/network/DC0_DVPG0
+  else
+    skip "requires vcsim"
+  fi
+}
+
+# remove username/password from $GOVC_URL and set $GOVC_{USERNAME,PASSWORD}
+govc_url_to_vars() {
+  GOVC_USERNAME="$(govc env GOVC_USERNAME)"
+  GOVC_PASSWORD="$(govc env GOVC_PASSWORD)"
+  GOVC_URL="$(govc env GOVC_URL)"
+  export GOVC_URL GOVC_USERNAME GOVC_PASSWORD
+
+  # double check that we removed user/pass
+  grep -q -v @ <<<"$GOVC_URL"
+}
+
+quit_vnc() {
+  if [ "$(uname)" = "Darwin" ]; then
+    osascript <<EOF
+tell application "Screen Sharing"
+   quit
+end tell
+EOF
+  fi
+}
+
+open_vnc() {
+  url=$1
+  echo "open $url"
+
+  if [ "$(uname)" = "Darwin" ]; then
+    open $url
+  fi
+}
+
+# collapse spaces, for example testing against Go's tabwriter output
+collapse_ws() {
+  local line
+  if [ $# -eq 0 ]; then line="$(cat -)"
+  else line="$@"
+  fi
+  echo "$line" | tr -s ' ' | sed -e 's/^ //'
+}
+
+# the following helpers are borrowed from the test_helper.bash in https://github.com/sstephenson/rbenv
+
+flunk() {
+  { if [ "$#" -eq 0 ]; then cat -
+    else echo "$@"
+    fi
+  } >&2
+  return 1
+}
+
+assert_success() {
+  if [ "$status" -ne 0 ]; then
+    flunk "command failed with exit status $status: $output"
+  elif [ "$#" -gt 0 ]; then
+    assert_output "$1"
+  fi
+}
+
+assert_failure() {
+  if [ "$status" -ne 1 ]; then
+    flunk $(printf "expected failed exit status=1, got status=%d" $status)
+  elif [ "$#" -gt 0 ]; then
+    assert_output "$1"
+  fi
+}
+
+assert_equal() {
+  if [ "$1" != "$2" ]; then
+    { echo "expected: $1"
+      echo "actual:   $2"
+    } | flunk
+  fi
+}
+
+assert_output() {
+  local expected
+  if [ $# -eq 0 ]; then expected="$(cat -)"
+  else expected="$1"
+  fi
+  assert_equal "$expected" "$output"
+}
+
+assert_matches() {
+  local pattern="${1}"
+  local actual="${2}"
+
+  if [ $# -eq 1 ]; then
+    actual="$(cat -)"
+  fi
+
+  if ! grep -q "${pattern}" <<<"${actual}"; then
+    { echo "pattern: ${pattern}"
+      echo "actual:  ${actual}"
+    } | flunk
+  fi
+}
+
+assert_empty() {
+  local actual="${1}"
+
+  if [ $# -eq 0 ]; then
+    actual="$(cat -)"
+  fi
+
+  if [ -n "${actual}" ]; then
+    { echo "actual: ${actual}"
+    } | flunk
+  fi
+}
+
+assert_line() {
+  if [ "$1" -ge 0 ] 2>/dev/null; then
+    assert_equal "$2" "$(collapse_ws ${lines[$1]})"
+  else
+    local line
+    for line in "${lines[@]}"; do
+      if [ "$(collapse_ws $line)" = "$1" ]; then return 0; fi
+    done
+    flunk "expected line \`$1'"
+  fi
+}
+
+refute_line() {
+  if [ "$1" -ge 0 ] 2>/dev/null; then
+    local num_lines="${#lines[@]}"
+    if [ "$1" -lt "$num_lines" ]; then
+      flunk "output has $num_lines lines"
+    fi
+  else
+    local line
+    for line in "${lines[@]}"; do
+      if [ "$line" = "$1" ]; then
+        flunk "expected to not find line \`$line'"
+      fi
+    done
+  fi
+}
+
+assert() {
+  if ! "$@"; then
+    flunk "failed: $@"
+  fi
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/test/vcsim/Vagrantfile b/vendor/github.com/vmware/govmomi/govc/test/vcsim/Vagrantfile
new file mode 100644
index 0000000000..76a3b6d3fb
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/vcsim/Vagrantfile
@@ -0,0 +1,24 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# VCSA with VC simulator enabled.
+# 'vagrant provision' will erase any existing inventory and
+# populate with the config in ./provision.sh
+
+Vagrant.configure("2") do |config|
+  config.vm.hostname = "vcsim"
+
+  config.vm.box = "vcsa"
+  config.vm.synced_folder ".", "/vagrant", disabled: true
+
+  config.vm.provision "shell", path: "provision.sh"
+
+  config.vm.network "forwarded_port", guest: 443, host: 16443
+  config.vm.network "forwarded_port", guest: 80, host: 16080
+
+  [:vmware_fusion, :vmware_workstation].each do |name|
+    config.vm.provider name do |v,override|
+      v.vmx["memsize"] = "4096"
+    end
+  end
+end
diff --git a/vendor/github.com/vmware/govmomi/govc/test/vcsim/provision.sh b/vendor/github.com/vmware/govmomi/govc/test/vcsim/provision.sh
new file mode 100644
index 0000000000..9732c277ca
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/vcsim/provision.sh
@@ -0,0 +1,30 @@
+PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
+
+echo "Creating vcsim model..."
+cat > /etc/vmware-vpx/vcsim/model/initInventory-govc.cfg <<EOF
+<config>
+  <inventory>
+    <dc>2</dc>
+    <host-per-dc>3</host-per-dc>
+    <vm-per-host>3</vm-per-host>
+    <poweron-vm-per-host>2</poweron-vm-per-host>
+    <cluster-per-dc>2</cluster-per-dc>
+    <host-per-cluster>3</host-per-cluster>
+    <rp-per-cluster>3</rp-per-cluster>
+    <vm-per-rp>4</vm-per-rp>
+    <poweron-vm-per-rp>3</poweron-vm-per-rp>
+    <dv-portgroups>2</dv-portgroups>
+  </inventory>
+</config>
+EOF
+
+cat > /etc/vmware-vpx/vcsim/model/vcsim-default.cfg <<EOF
+<simulator>
+<enabled>true</enabled>
+<initInventory>vcsim/model/initInventory-govc.cfg</initInventory>
+</simulator>
+EOF
+
+echo "Starting VC simulator..."
+vmware-vcsim-stop
+vmware-vcsim-start default
diff --git a/vendor/github.com/vmware/govmomi/govc/test/vm.bats b/vendor/github.com/vmware/govmomi/govc/test/vm.bats
new file mode 100755
index 0000000000..bc9313ea42
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/test/vm.bats
@@ -0,0 +1,591 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "vm.ip" {
+  id=$(new_ttylinux_vm)
+
+  run govc vm.power -on $id
+  assert_success
+
+  run govc vm.ip $id
+  assert_success
+
+  run govc vm.ip -a -v4 $id
+  assert_success
+
+  run govc vm.ip -n $(vm_mac $id) $id
+  assert_success
+
+  run govc vm.ip -n ethernet-0 $id
+  assert_success
+
+  ip=$(govc vm.ip $id)
+
+  # add a second nic
+  run govc vm.network.add -vm $id "VM Network"
+  assert_success
+
+  res=$(govc vm.ip -n ethernet-0 $id)
+  assert_equal $ip $res
+}
+
+@test "vm.ip -esxcli" {
+  ok=$(govc host.esxcli system settings advanced list -o /Net/GuestIPHack | grep ^IntValue: | awk '{print $2}')
+  if [ "$ok" != "1" ] ; then
+    skip "/Net/GuestIPHack=0"
+  fi
+  id=$(new_ttylinux_vm)
+
+  run govc vm.power -on $id
+  assert_success
+
+  run govc vm.ip -esxcli $id
+  assert_success
+
+  ip_esxcli=$output
+
+  run govc vm.ip $id
+  assert_success
+  ip_tools=$output
+
+  assert_equal $ip_esxcli $ip_tools
+}
+
+@test "vm.create" {
+  id=$(new_ttylinux_vm)
+
+  run govc vm.power -on $id
+  assert_success
+
+  result=$(govc device.ls -vm $vm | grep disk- | wc -l)
+  [ $result -eq 0 ]
+
+  result=$(govc device.ls -vm $vm | grep cdrom- | wc -l)
+  [ $result -eq 0 ]
+}
+
+@test "vm.change" {
+  id=$(new_ttylinux_vm)
+
+  run govc vm.change -g ubuntu64Guest -m 1024 -c 2 -vm $id
+  assert_success
+
+  run govc vm.info $id
+  assert_success
+  assert_line "Guest name: Ubuntu Linux (64-bit)"
+  assert_line "Memory: 1024MB"
+  assert_line "CPU: 2 vCPU(s)"
+
+  run govc vm.change -e "guestinfo.a=1" -e "guestinfo.b=2" -vm $id
+  assert_success
+
+  run govc vm.info -e $id
+  assert_success
+  assert_line "guestinfo.a: 1"
+  assert_line "guestinfo.b: 2"
+
+  run govc vm.change -sync-time-with-host=false -vm $id
+  assert_success
+
+  run govc vm.info -t $id
+  assert_success
+  assert_line "SyncTimeWithHost: false"
+
+  run govc vm.change -sync-time-with-host=true -vm $id
+  assert_success
+
+  run govc vm.info -t $id
+  assert_success
+  assert_line "SyncTimeWithHost: true"
+
+  nid=$(new_id)
+  run govc vm.change -name $nid -vm $id
+  assert_success
+
+  run govc vm.info $id
+  [ ${#lines[@]} -eq 0 ]
+
+  run govc vm.info $nid
+  [ ${#lines[@]} -gt 0 ]
+}
+
+@test "vm.power" {
+  vm=$(new_ttylinux_vm)
+
+  run vm_power_state $vm
+  assert_success "poweredOff"
+
+  run govc vm.power $vm
+  assert_failure
+
+  run govc vm.power -on -off $vm
+  assert_failure
+
+  run govc vm.power -on $vm
+  assert_success
+  run vm_power_state $vm
+  assert_success "poweredOn"
+
+  run govc vm.power -suspend $vm
+  assert_success
+  run vm_power_state $vm
+  assert_success "suspended"
+
+  run govc vm.power -on $vm
+  assert_success
+  run vm_power_state $vm
+  assert_success "poweredOn"
+}
+
+@test "vm.power -force" {
+  vm=$(new_id)
+  govc vm.create $vm
+
+  run govc vm.power -r $vm
+  assert_failure
+
+  run govc vm.power -r -force $vm
+  assert_success
+
+  run govc vm.power -s $vm
+  assert_failure
+
+  run govc vm.power -s -force $vm
+  assert_success
+
+  run govc vm.power -off $vm
+  assert_failure
+
+  run govc vm.power -off -force $vm
+  assert_success
+
+  run govc vm.destroy $vm
+  assert_success
+
+  run govc vm.power -off $vm
+  assert_failure
+
+  run govc vm.power -off -force $vm
+  assert_failure
+}
+
+@test "vm.create pvscsi" {
+  vm=$(new_id)
+  govc vm.create -on=false -disk.controller pvscsi $vm
+
+  result=$(govc device.ls -vm $vm | grep pvscsi- | wc -l)
+  [ $result -eq 1 ]
+
+  result=$(govc device.ls -vm $vm | grep lsilogic- | wc -l)
+  [ $result -eq 0 ]
+
+  vm=$(new_id)
+  govc vm.create -on=false -disk.controller pvscsi -disk=1GB $vm
+}
+
+@test "vm.create in cluster" {
+  vcsim_env
+
+  # using GOVC_HOST and its resource pool
+  run govc vm.create -on=false $(new_id)
+  assert_success
+
+  # using no -host and the default resource pool for DC0
+  unset GOVC_HOST
+  run govc vm.create -on=false $(new_id)
+  assert_success
+}
+
+@test "vm.info" {
+  local num=3
+
+  local prefix=$(new_id)
+
+  for x in $(seq $num)
+  do
+    local id="${prefix}-${x}"
+
+    # If VM is not found: No output, exit code==0
+    run govc vm.info $id
+    assert_success
+    [ ${#lines[@]} -eq 0 ]
+
+    # If VM is not found (using -json flag): Valid json output, exit code==0
+    run govc vm.info -json $id
+    assert_success
+    assert_line "{\"VirtualMachines\":null}"
+
+    run govc vm.create -on=false $id
+    assert_success
+
+    local info=$(govc vm.info -r $id)
+    local found=$(grep Name: <<<"$info" | wc -l)
+    [ "$found" -eq 1 ]
+
+    # test that mo names are printed
+    found=$(grep Host: <<<"$info" | awk '{print $2}')
+    [ -n "$found" ]
+    found=$(grep Storage: <<<"$info" | awk '{print $2}')
+    [ -n "$found" ]
+    found=$(grep Network: <<<"$info" | awk '{print $2}')
+    [ -n "$found" ]
+  done
+
+  # test find slice
+  local slice=$(govc vm.info ${prefix}-*)
+  local found=$(grep Name: <<<"$slice" | wc -l)
+  [ "$found" -eq $num ]
+
+  # test -r
+  found=$(grep Storage: <<<"$slice" | wc -l)
+  [ "$found" -eq 0 ]
+  found=$(grep Network: <<<"$slice" | wc -l)
+  [ "$found" -eq 0 ]
+  slice=$(govc vm.info -r ${prefix}-*)
+  found=$(grep Storage: <<<"$slice" | wc -l)
+  [ "$found" -eq $num ]
+  found=$(grep Network: <<<"$slice" | wc -l)
+  [ "$found" -eq $num ]
+
+  # test extraConfig
+  run govc vm.change -e "guestinfo.a=2" -vm $id
+  assert_success
+  run govc vm.info -e $id
+  assert_success
+  assert_line "guestinfo.a: 2"
+}
+
+@test "vm.create linked ide disk" {
+  import_ttylinux_vmdk
+
+  vm=$(new_id)
+
+  run govc vm.create -disk $GOVC_TEST_VMDK -disk.controller ide -on=false $vm
+  assert_success
+
+  run govc device.info -vm $vm disk-200-0
+  assert_success
+  assert_line "Controller: ide-200"
+}
+
+@test "vm.create linked scsi disk" {
+  import_ttylinux_vmdk
+
+  vm=$(new_id)
+
+  run govc vm.create -disk enoent -on=false $vm
+  assert_failure "govc: cannot stat '[${GOVC_DATASTORE##*/}] enoent': No such file"
+
+  run govc vm.create -disk $GOVC_TEST_VMDK -on=false $vm
+  assert_success
+
+  run govc device.info -vm $vm disk-1000-0
+  assert_success
+  assert_line "Controller: lsilogic-1000"
+  assert_line "Parent: [${GOVC_DATASTORE##*/}] $GOVC_TEST_VMDK"
+  assert_line "File: [${GOVC_DATASTORE##*/}] $vm/${vm}.vmdk"
+}
+
+@test "vm.create scsi disk" {
+  import_ttylinux_vmdk
+
+  vm=$(new_id)
+
+  run govc vm.create -disk enoent -on=false $vm
+  assert_failure "govc: cannot stat '[${GOVC_DATASTORE##*/}] enoent': No such file"
+
+
+  run govc vm.create -disk $GOVC_TEST_VMDK -on=false -link=false $vm
+  assert_success
+
+  run govc device.info -vm $vm disk-1000-0
+  assert_success
+  assert_line "Controller: lsilogic-1000"
+  refute_line "Parent: [${GOVC_DATASTORE##*/}] $GOVC_TEST_VMDK"
+  assert_line "File: [${GOVC_DATASTORE##*/}] $GOVC_TEST_VMDK"
+}
+
+@test "vm.create scsi disk with datastore argument" {
+  import_ttylinux_vmdk
+
+  vm=$(new_id)
+
+  run govc vm.create -disk="${GOVC_TEST_VMDK}" -disk-datastore="${GOVC_DATASTORE}" -on=false -link=false $vm
+  assert_success
+
+  run govc device.info -vm $vm disk-1000-0
+  assert_success
+  assert_line "File: [${GOVC_DATASTORE##*/}] $GOVC_TEST_VMDK"
+}
+
+@test "vm.create iso" {
+  upload_iso
+
+  vm=$(new_id)
+
+  run govc vm.create -iso enoent -on=false $vm
+  assert_failure "govc: cannot stat '[${GOVC_DATASTORE##*/}] enoent': No such file"
+
+  run govc vm.create -iso $GOVC_TEST_ISO -on=false $vm
+  assert_success
+
+  run govc device.info -vm $vm cdrom-3000
+  assert_success
+  assert_line "Controller: ide-200"
+  assert_line "Summary: ISO [${GOVC_DATASTORE##*/}] $GOVC_TEST_ISO"
+}
+
+@test "vm.create iso with datastore argument" {
+  upload_iso
+
+  vm=$(new_id)
+
+  run govc vm.create -iso="${GOVC_TEST_ISO}" -iso-datastore="${GOVC_DATASTORE}" -on=false $vm
+  assert_success
+
+  run govc device.info -vm $vm cdrom-3000
+  assert_success
+  assert_line "Summary: ISO [${GOVC_DATASTORE##*/}] $GOVC_TEST_ISO"
+}
+
+@test "vm.disk.create empty vm" {
+  vm=$(new_empty_vm)
+
+  local name=$(new_id)
+
+  run govc vm.disk.create -vm $vm -name $name -size 1G
+  assert_success
+  result=$(govc device.ls -vm $vm | grep disk- | wc -l)
+  [ $result -eq 1 ]
+
+  name=$(new_id)
+
+  run govc vm.disk.create -vm $vm -name $name -controller lsilogic-1000 -size 2G
+  assert_success
+  result=$(govc device.ls -vm $vm | grep disk- | wc -l)
+  [ $result -eq 2 ]
+}
+
+@test "vm.disk.create" {
+  import_ttylinux_vmdk
+
+  vm=$(new_id)
+
+  govc vm.create -disk $GOVC_TEST_VMDK -on=false $vm
+  result=$(govc device.ls -vm $vm | grep disk- | wc -l)
+  [ $result -eq 1 ]
+
+  local name=$(new_id)
+
+  run govc vm.disk.create -vm $vm -name $name -size 1G
+  assert_success
+  result=$(govc device.ls -vm $vm | grep disk- | wc -l)
+  [ $result -eq 2 ]
+
+  run govc vm.disk.create -vm $vm -name $name -size 1G
+  assert_success # TODO: should fail?
+  result=$(govc device.ls -vm $vm | grep disk- | wc -l)
+  [ $result -eq 2 ]
+}
+
+@test "vm.disk.attach" {
+  import_ttylinux_vmdk
+
+  vm=$(new_id)
+
+  govc vm.create -disk $GOVC_TEST_VMDK -on=false $vm
+  result=$(govc device.ls -vm $vm | grep disk- | wc -l)
+  [ $result -eq 1 ]
+
+  run govc import.vmdk $GOVC_TEST_VMDK_SRC $vm
+  assert_success
+
+  run govc vm.disk.attach -vm $vm -link=false -disk enoent.vmdk
+  assert_failure "govc: File [${GOVC_DATASTORE##*/}] enoent.vmdk was not found"
+
+  run govc vm.disk.attach -vm $vm -disk enoent.vmdk
+  assert_failure "govc: Invalid configuration for device '0'."
+
+  run govc vm.disk.attach -vm $vm -disk $vm/$(basename $GOVC_TEST_VMDK) -controller lsilogic-1000
+  assert_success
+  result=$(govc device.ls -vm $vm | grep disk- | wc -l)
+  [ $result -eq 2 ]
+}
+
+@test "vm.create new disk with datastore argument" {
+  vm=$(new_id)
+
+  run govc vm.create -disk="1GiB" -ds="${GOVC_DATASTORE}" -on=false -link=false $vm
+  assert_success
+
+  run govc device.info -vm $vm disk-1000-0
+  assert_success
+  assert_line "File: [${GOVC_DATASTORE##*/}] ${vm}/${vm}.vmdk"
+}
+
+@test "vm.create new disk with datastore cluster argument" {
+  if [ -z "${GOVC_DATASTORE_CLUSTER}" ]; then
+    skip "requires datastore cluster"
+  fi
+
+  vm=$(new_id)
+
+  run govc vm.create -disk="1GiB" -datastore-cluster="${GOVC_DATASTORE_CLUSTER}" -on=false -link=false $vm
+  assert_success
+
+  run govc device.info -vm $vm disk-1000-0
+  assert_success
+}
+
+@test "vm.register" {
+  run govc vm.unregister enoent
+  assert_failure
+
+  vm=$(new_empty_vm)
+
+  run govc vm.change -vm "$vm" -e foo=bar
+  assert_success
+
+  run govc vm.unregister "$vm"
+  assert_success
+
+  run govc vm.change -vm "$vm" -e foo=bar
+  assert_failure
+
+  run govc vm.register "$vm/${vm}.vmx"
+  assert_success
+
+  run govc vm.change -vm "$vm" -e foo=bar
+  assert_success
+}
+
+@test "vm.clone" {
+  vcsim_env
+  vm=$(new_empty_vm)
+  clone=$(new_id)
+
+  run govc vm.clone -vm $vm $clone
+  assert_success
+
+  result=$(govc device.ls -vm $clone | grep disk- | wc -l)
+  [ $result -eq 0 ]
+
+  result=$(govc device.ls -vm $clone | grep cdrom- | wc -l)
+  [ $result -eq 0 ]
+}
+
+@test "vm.clone change resources" {
+  vcsim_env
+  vm=$(new_ttylinux_vm)
+  clone=$(new_id)
+
+  run govc vm.clone -m 1024 -c 2 -vm $vm $clone
+  assert_success
+
+  run govc vm.info $clone
+  assert_success
+  assert_line "Memory: 1024MB"
+  assert_line "CPU: 2 vCPU(s)"
+}
+
+@test "vm.clone usage" {
+  # validate we require -vm flag
+  run govc vm.clone enoent
+  assert_failure
+}
+
+@test "vm.migrate" {
+  vcsim_env
+  vm=$(new_empty_vm)
+
+  # migrate from H0 to H1
+  run govc vm.migrate -host DC0_C0/DC0_C0_H1 "$vm"
+  assert_success
+
+  # migrate from C0 to C1
+  run govc vm.migrate -pool DC0_C1/Resources "$vm"
+  assert_success
+}
+
+@test "vm.snapshot" {
+  vm=$(new_ttylinux_vm)
+  id=$(new_id)
+
+  # No snapshots == no output
+  run govc snapshot.tree -vm "$vm"
+  assert_success ""
+
+  run govc snapshot.remove -vm "$vm" '*'
+  assert_success
+
+  run govc snapshot.revert -vm "$vm"
+  assert_failure
+
+  run govc snapshot.create -vm "$vm" "$id"
+  assert_success
+
+  run govc snapshot.revert -vm "$vm" enoent
+  assert_failure
+
+  run govc snapshot.revert -vm "$vm"
+  assert_success
+
+  run govc snapshot.remove -vm "$vm" "$id"
+  assert_success
+
+  run govc snapshot.create -vm "$vm" root
+  assert_success
+
+  run govc snapshot.create -vm "$vm" child
+  assert_success
+
+  run govc snapshot.create -vm "$vm" grand
+  assert_success
+
+  run govc snapshot.create -vm "$vm" child
+  assert_success
+
+  result=$(govc snapshot.tree -vm "$vm" -f | grep -c root/child/grand/child)
+  [ "$result" -eq 1 ]
+
+  run govc snapshot.revert -vm "$vm" root
+  assert_success
+
+  run govc snapshot.create -vm "$vm" child
+  assert_success
+
+  # 3 snapshots named "child"
+  result=$(govc snapshot.tree -vm "$vm" | grep -c child)
+  [ "$result" -eq 3 ]
+
+  run govc snapshot.remove -vm "$vm" child
+  assert_failure
+
+  # 2 snapshots with path "root/child"
+  result=$(govc snapshot.tree -vm "$vm" -f | egrep -c 'root/child$')
+  [ "$result" -eq 2 ]
+
+  run govc snapshot.remove -vm "$vm" root/child
+  assert_failure
+
+  # path is unique
+  run govc snapshot.remove -vm "$vm" root/child/grand/child
+  assert_success
+
+  # name is unique
+  run govc snapshot.remove -vm "$vm" grand
+  assert_success
+
+  result=$(govc snapshot.tree -vm "$vm" -f | grep root/child/grand/child | wc -l)
+  [ "$result" -eq 0 ]
+
+  id=$(govc snapshot.tree -vm "$vm" -f -i | egrep 'root/child$' | head -n1 | awk '{print $1}' | tr -d '[]')
+  # moid is unique
+  run govc snapshot.remove -vm "$vm" "$id"
+  assert_success
+
+  # now root/child is unique
+  run govc snapshot.remove -vm "$vm" root/child
+  assert_success
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/usage.sh b/vendor/github.com/vmware/govmomi/govc/usage.sh
new file mode 100755
index 0000000000..d153441537
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/usage.sh
@@ -0,0 +1,56 @@
+#!/bin/bash -e
+
+for var in $(env | grep GOVC_) ; do
+  eval "unset ${var/=*}"
+done
+
+common_opts=$(cat <<EOF
+  -cert=                    Certificate [GOVC_CERTIFICATE]
+  -debug=false              Store debug logs [GOVC_DEBUG]
+  -dump=false               Enable output dump
+  -json=false               Enable JSON output
+  -k=false                  Skip verification of server certificate [GOVC_INSECURE]
+  -key=                     Private key [GOVC_PRIVATE_KEY]
+  -persist-session=true     Persist session to disk [GOVC_PERSIST_SESSION]
+  -tls-ca-certs=            TLS CA certificates file [GOVC_TLS_CA_CERTS]
+  -tls-known-hosts=         TLS known hosts file [GOVC_TLS_KNOWN_HOSTS]
+  -u=                       ESX or vCenter URL [GOVC_URL]
+  -vim-namespace=urn:vim25  Vim namespace [GOVC_VIM_NAMESPACE]
+  -vim-version=6.0          Vim version [GOVC_VIM_VERSION]
+  -dc=                      Datacenter [GOVC_DATACENTER]
+  -host.dns=                Find host by FQDN
+  -host.ip=                 Find host by IP address
+  -host.ipath=              Find host by inventory path
+  -host.uuid=               Find host by UUID
+  -vm.dns=                  Find VM by FQDN
+  -vm.ip=                   Find VM by IP address
+  -vm.ipath=                Find VM by inventory path
+  -vm.path=                 Find VM by path to .vmx file
+  -vm.uuid=                 Find VM by UUID
+EOF
+)
+
+cat <<'EOF'
+# govc usage
+
+This document is generated from `govc -h` and `govc $cmd -h` commands.
+
+The following common options are filtered out in this document,
+but appear via `govc $cmd -h`:
+
+```
+EOF
+
+printf "%s\n\`\`\`\n\n" "${common_opts}"
+
+cmds=($(govc -h | grep -v Usage))
+
+opts=($(cut -s -d= -f1 <<<"$common_opts" | xargs -n1 | sed -e 's/^/\\/'))
+filter=$(printf "|%s=" "${opts[@]}")
+
+for cmd in "${cmds[@]}" ; do
+    printf "## %s\n\n" "$cmd"
+    printf "\`\`\`\n"
+    govc "$cmd" -h | egrep -v "${filter:1}"
+    printf "\`\`\`\n\n"
+done
diff --git a/vendor/github.com/vmware/govmomi/govc/vapp/destroy.go b/vendor/github.com/vmware/govmomi/govc/vapp/destroy.go
new file mode 100644
index 0000000000..a7af0582b2
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vapp/destroy.go
@@ -0,0 +1,115 @@
+/*
+Copyright (c) 2015 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 vapp
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/find"
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type destroy struct {
+	*flags.DatacenterFlag
+}
+
+func init() {
+	cli.Register("vapp.destroy", &destroy{})
+}
+
+func (cmd *destroy) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+}
+
+func (cmd *destroy) Process(ctx context.Context) error {
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *destroy) Usage() string {
+	return "VAPP..."
+}
+
+func (cmd *destroy) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() == 0 {
+		return flag.ErrHelp
+	}
+
+	finder, err := cmd.Finder()
+	if err != nil {
+		return err
+	}
+
+	for _, arg := range f.Args() {
+		vapps, err := finder.VirtualAppList(ctx, arg)
+		if err != nil {
+			if _, ok := err.(*find.NotFoundError); ok {
+				// Ignore if vapp cannot be found
+				continue
+			}
+
+			return err
+		}
+
+		for _, vapp := range vapps {
+			powerOff := func() error {
+				task, err := vapp.PowerOff(ctx, false)
+				if err != nil {
+					return err
+				}
+				err = task.Wait(ctx)
+				if err != nil {
+					// it's safe to ignore if the vapp is already powered off
+					if f, ok := err.(types.HasFault); ok {
+						switch f.Fault().(type) {
+						case *types.InvalidPowerState:
+							return nil
+						}
+					}
+					return err
+				}
+				return nil
+			}
+			if err := powerOff(); err != nil {
+				return err
+			}
+
+			destroy := func() error {
+				task, err := vapp.Destroy(ctx)
+				if err != nil {
+					return err
+				}
+				err = task.Wait(ctx)
+				if err != nil {
+					return err
+				}
+				return nil
+			}
+			if err := destroy(); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vapp/power.go b/vendor/github.com/vmware/govmomi/govc/vapp/power.go
new file mode 100644
index 0000000000..e531b332f4
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vapp/power.go
@@ -0,0 +1,112 @@
+/*
+Copyright (c) 2015 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 vapp
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type power struct {
+	*flags.SearchFlag
+
+	On      bool
+	Off     bool
+	Suspend bool
+	Force   bool
+}
+
+func init() {
+	cli.Register("vapp.power", &power{})
+}
+
+func (cmd *power) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualApps)
+	cmd.SearchFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.On, "on", false, "Power on")
+	f.BoolVar(&cmd.Off, "off", false, "Power off")
+	f.BoolVar(&cmd.Suspend, "suspend", false, "Power suspend")
+	f.BoolVar(&cmd.Force, "force", false, "Force (If force is false, the shutdown order in the vApp is executed. If force is true, all virtual machines are powered-off (regardless of shutdown order))")
+}
+
+func (cmd *power) Process(ctx context.Context) error {
+	if err := cmd.SearchFlag.Process(ctx); err != nil {
+		return err
+	}
+	opts := []bool{cmd.On, cmd.Off, cmd.Suspend}
+	selected := false
+
+	for _, opt := range opts {
+		if opt {
+			if selected {
+				return flag.ErrHelp
+			}
+			selected = opt
+		}
+	}
+
+	if !selected {
+		return flag.ErrHelp
+	}
+
+	return nil
+}
+
+func (cmd *power) Run(ctx context.Context, f *flag.FlagSet) error {
+	vapps, err := cmd.VirtualApps(f.Args())
+	if err != nil {
+		return err
+	}
+
+	for _, vapp := range vapps {
+		var task *object.Task
+
+		switch {
+		case cmd.On:
+			fmt.Fprintf(cmd, "Powering on %s... ", vapp.Reference())
+			task, err = vapp.PowerOn(ctx)
+		case cmd.Off:
+			fmt.Fprintf(cmd, "Powering off %s... ", vapp.Reference())
+			task, err = vapp.PowerOff(ctx, cmd.Force)
+		case cmd.Suspend:
+			fmt.Fprintf(cmd, "Suspend %s... ", vapp.Reference())
+			task, err = vapp.Suspend(ctx)
+		}
+
+		if err != nil {
+			return err
+		}
+
+		if task != nil {
+			err = task.Wait(ctx)
+		}
+		if err == nil {
+			fmt.Fprintf(cmd, "OK\n")
+			continue
+		}
+
+		return err
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/version/command.go b/vendor/github.com/vmware/govmomi/govc/version/command.go
new file mode 100644
index 0000000000..627cff2a1a
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/version/command.go
@@ -0,0 +1,69 @@
+/*
+Copyright (c) 2014-2015 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 version
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"log"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+var gitVersion string
+
+type version struct {
+	*flags.EmptyFlag
+
+	require string
+}
+
+func init() {
+	// Check that git tag in the release builds match the hardcoded version
+	if gitVersion != "" && gitVersion[1:] != flags.Version {
+		log.Panicf("version mismatch: git=%s vs govc=%s", gitVersion[1:], flags.Version)
+	}
+
+	cli.Register("version", &version{})
+}
+
+func (cmd *version) Register(ctx context.Context, f *flag.FlagSet) {
+	f.StringVar(&cmd.require, "require", "", "Require govc version >= this value")
+}
+
+func (cmd *version) Run(ctx context.Context, f *flag.FlagSet) error {
+	if cmd.require != "" {
+		v, err := flags.ParseVersion(flags.Version)
+		if err != nil {
+			panic(err)
+		}
+
+		rv, err := flags.ParseVersion(cmd.require)
+		if err != nil {
+			return fmt.Errorf("failed to parse required version '%s': %s", cmd.require, err)
+		}
+
+		if !rv.Lte(v) {
+			return fmt.Errorf("version %s or higher is required, this is version %s", cmd.require, flags.Version)
+		}
+	}
+
+	fmt.Printf("govc %s\n", flags.Version)
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/change.go b/vendor/github.com/vmware/govmomi/govc/vm/change.go
new file mode 100644
index 0000000000..bbfcecf4f9
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/change.go
@@ -0,0 +1,107 @@
+/*
+Copyright (c) 2015 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 vm
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"strings"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type extraConfig []types.BaseOptionValue
+
+func (e *extraConfig) String() string {
+	return fmt.Sprintf("%v", *e)
+}
+
+func (e *extraConfig) Set(v string) error {
+	r := strings.SplitN(v, "=", 2)
+	if len(r) < 2 {
+		return fmt.Errorf("failed to parse extraConfig: %s", v)
+	} else if r[1] == "" {
+		return fmt.Errorf("empty value: %s", v)
+	}
+	*e = append(*e, &types.OptionValue{Key: r[0], Value: r[1]})
+	return nil
+}
+
+type change struct {
+	*flags.VirtualMachineFlag
+
+	types.VirtualMachineConfigSpec
+	extraConfig extraConfig
+}
+
+func init() {
+	cli.Register("vm.change", &change{})
+}
+
+func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	f.Int64Var(&cmd.MemoryMB, "m", 0, "Size in MB of memory")
+	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.Var(&cmd.extraConfig, "e", "ExtraConfig. <key>=<value>")
+
+	f.Var(flags.NewOptionalBool(&cmd.NestedHVEnabled), "nested-hv-enabled", "Enable nested hardware-assisted virtualization")
+	cmd.Tools = &types.ToolsConfigInfo{}
+	f.Var(flags.NewOptionalBool(&cmd.Tools.SyncTimeWithHost), "sync-time-with-host", "Enable SyncTimeWithHost")
+}
+
+func (cmd *change) Description() string {
+	return `Change VM configuration.
+
+Examples:
+  govc vm.change -vm $vm -e smc.present=TRUE -e ich7m.present=TRUE`
+}
+
+func (cmd *change) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *change) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	if len(cmd.extraConfig) > 0 {
+		cmd.VirtualMachineConfigSpec.ExtraConfig = cmd.extraConfig
+	}
+
+	task, err := vm.Reconfigure(ctx, cmd.VirtualMachineConfigSpec)
+	if err != nil {
+		return err
+	}
+
+	return task.Wait(ctx)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/clone.go b/vendor/github.com/vmware/govmomi/govc/vm/clone.go
new file mode 100644
index 0000000000..f15f3e7eda
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/clone.go
@@ -0,0 +1,410 @@
+/*
+Copyright (c) 2014-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 vm
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type clone struct {
+	*flags.ClientFlag
+	*flags.DatacenterFlag
+	*flags.DatastoreFlag
+	*flags.StoragePodFlag
+	*flags.ResourcePoolFlag
+	*flags.HostSystemFlag
+	*flags.NetworkFlag
+	*flags.FolderFlag
+	*flags.VirtualMachineFlag
+
+	name          string
+	memory        int
+	cpus          int
+	on            bool
+	force         bool
+	template      bool
+	customization string
+	waitForIP     bool
+	annotation    string
+
+	Client         *vim25.Client
+	Datacenter     *object.Datacenter
+	Datastore      *object.Datastore
+	StoragePod     *object.StoragePod
+	ResourcePool   *object.ResourcePool
+	HostSystem     *object.HostSystem
+	Folder         *object.Folder
+	VirtualMachine *object.VirtualMachine
+}
+
+func init() {
+	cli.Register("vm.clone", &clone{})
+}
+
+func (cmd *clone) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+
+	cmd.StoragePodFlag, ctx = flags.NewStoragePodFlag(ctx)
+	cmd.StoragePodFlag.Register(ctx, f)
+
+	cmd.ResourcePoolFlag, ctx = flags.NewResourcePoolFlag(ctx)
+	cmd.ResourcePoolFlag.Register(ctx, f)
+
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	cmd.NetworkFlag, ctx = flags.NewNetworkFlag(ctx)
+	cmd.NetworkFlag.Register(ctx, f)
+
+	cmd.FolderFlag, ctx = flags.NewFolderFlag(ctx)
+	cmd.FolderFlag.Register(ctx, f)
+
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	f.IntVar(&cmd.memory, "m", 0, "Size in MB of memory")
+	f.IntVar(&cmd.cpus, "c", 0, "Number of CPUs")
+	f.BoolVar(&cmd.on, "on", true, "Power on VM")
+	f.BoolVar(&cmd.force, "force", false, "Create VM if vmx already exists")
+	f.BoolVar(&cmd.template, "template", false, "Create a Template")
+	f.StringVar(&cmd.customization, "customization", "", "Customization Specification Name")
+	f.BoolVar(&cmd.waitForIP, "waitip", false, "Wait for VM to acquire IP address")
+	f.StringVar(&cmd.annotation, "annotation", "", "VM description")
+}
+
+func (cmd *clone) Usage() string {
+	return "NAME"
+}
+
+func (cmd *clone) Description() string {
+	return `Clone VM to NAME.
+
+Examples:
+  govc vm.clone -vm template-vm new-vm`
+}
+
+func (cmd *clone) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.StoragePodFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.ResourcePoolFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.NetworkFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.FolderFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (cmd *clone) Run(ctx context.Context, f *flag.FlagSet) error {
+	var err error
+
+	if len(f.Args()) != 1 {
+		return flag.ErrHelp
+	}
+
+	cmd.name = f.Arg(0)
+	if cmd.name == "" {
+		return flag.ErrHelp
+	}
+
+	cmd.Client, err = cmd.ClientFlag.Client()
+	if err != nil {
+		return err
+	}
+
+	cmd.Datacenter, err = cmd.DatacenterFlag.Datacenter()
+	if err != nil {
+		return err
+	}
+
+	if cmd.StoragePodFlag.Isset() {
+		cmd.StoragePod, err = cmd.StoragePodFlag.StoragePod()
+		if err != nil {
+			return err
+		}
+	} else {
+		cmd.Datastore, err = cmd.DatastoreFlag.Datastore()
+		if err != nil {
+			return err
+		}
+	}
+
+	cmd.HostSystem, err = cmd.HostSystemFlag.HostSystemIfSpecified()
+	if err != nil {
+		return err
+	}
+
+	if cmd.HostSystem != nil {
+		if cmd.ResourcePool, err = cmd.HostSystem.ResourcePool(ctx); err != nil {
+			return err
+		}
+	} else {
+		// -host is optional
+		if cmd.ResourcePool, err = cmd.ResourcePoolFlag.ResourcePool(); err != nil {
+			return err
+		}
+	}
+
+	if cmd.Folder, err = cmd.FolderFlag.Folder(); err != nil {
+		return err
+	}
+
+	if cmd.VirtualMachine, err = cmd.VirtualMachineFlag.VirtualMachine(); err != nil {
+		return err
+	}
+
+	if cmd.VirtualMachine == nil {
+		return flag.ErrHelp
+	}
+
+	task, err := cmd.cloneVM(ctx)
+	if err != nil {
+		return err
+	}
+
+	info, err := task.WaitForResult(ctx, nil)
+	if err != nil {
+		return err
+	}
+
+	vm := object.NewVirtualMachine(cmd.Client, info.Result.(types.ManagedObjectReference))
+
+	if cmd.cpus > 0 || cmd.memory > 0 {
+		vmConfigSpec := types.VirtualMachineConfigSpec{}
+		if cmd.cpus > 0 {
+			vmConfigSpec.NumCPUs = int32(cmd.cpus)
+		}
+		if cmd.memory > 0 {
+			vmConfigSpec.MemoryMB = int64(cmd.memory)
+		}
+		vmConfigSpec.Annotation = cmd.annotation
+		task, err := vm.Reconfigure(ctx, vmConfigSpec)
+		if err != nil {
+			return err
+		}
+		_, err = task.WaitForResult(ctx, nil)
+		if err != nil {
+			return err
+		}
+	}
+
+	if cmd.on {
+		task, err := vm.PowerOn(ctx)
+		if err != nil {
+			return err
+		}
+
+		_, err = task.WaitForResult(ctx, nil)
+		if err != nil {
+			return err
+		}
+
+		if cmd.waitForIP {
+			_, err = vm.WaitForIP(ctx)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+func (cmd *clone) cloneVM(ctx context.Context) (*object.Task, error) {
+
+	// search for the first network card of the source
+	devices, err := cmd.VirtualMachine.Device(ctx)
+	if err != nil {
+		return nil, err
+	}
+	var card *types.VirtualEthernetCard
+	for _, device := range devices {
+		if c, ok := device.(types.BaseVirtualEthernetCard); ok {
+			card = c.GetVirtualEthernetCard()
+			break
+		}
+	}
+	if card == nil {
+		return nil, fmt.Errorf("No network device found.")
+	}
+
+	// get the new backing information
+	dev, err := cmd.NetworkFlag.Device()
+	if err != nil {
+		return nil, err
+	}
+
+	//set backing info
+	card.Backing = dev.(types.BaseVirtualEthernetCard).GetVirtualEthernetCard().Backing
+
+	// prepare virtual device config spec for network card
+	configSpecs := []types.BaseVirtualDeviceConfigSpec{
+		&types.VirtualDeviceConfigSpec{
+			Operation: types.VirtualDeviceConfigSpecOperationEdit,
+			Device:    card,
+		},
+	}
+
+	folderref := cmd.Folder.Reference()
+	poolref := cmd.ResourcePool.Reference()
+
+	relocateSpec := types.VirtualMachineRelocateSpec{
+		DeviceChange: configSpecs,
+		Folder:       &folderref,
+		Pool:         &poolref,
+	}
+
+	if cmd.HostSystem != nil {
+		hostref := cmd.HostSystem.Reference()
+		relocateSpec.Host = &hostref
+	}
+
+	cloneSpec := &types.VirtualMachineCloneSpec{
+		Location: relocateSpec,
+		PowerOn:  false,
+		Template: cmd.template,
+	}
+
+	// clone to storage pod
+	datastoreref := types.ManagedObjectReference{}
+	if cmd.StoragePod != nil && cmd.Datastore == nil {
+		storagePod := cmd.StoragePod.Reference()
+
+		// Build pod selection spec from config spec
+		podSelectionSpec := types.StorageDrsPodSelectionSpec{
+			StoragePod: &storagePod,
+		}
+
+		// Get the virtual machine reference
+		vmref := cmd.VirtualMachine.Reference()
+
+		// Build the placement spec
+		storagePlacementSpec := types.StoragePlacementSpec{
+			Folder:           &folderref,
+			Vm:               &vmref,
+			CloneName:        cmd.name,
+			CloneSpec:        cloneSpec,
+			PodSelectionSpec: podSelectionSpec,
+			Type:             string(types.StoragePlacementSpecPlacementTypeClone),
+		}
+
+		// Get the storage placement result
+		storageResourceManager := object.NewStorageResourceManager(cmd.Client)
+		result, err := storageResourceManager.RecommendDatastores(ctx, storagePlacementSpec)
+		if err != nil {
+			return nil, err
+		}
+
+		// Get the recommendations
+		recommendations := result.Recommendations
+		if len(recommendations) == 0 {
+			return nil, fmt.Errorf("no recommendations")
+		}
+
+		// Get the first recommendation
+		datastoreref = recommendations[0].Action[0].(*types.StoragePlacementAction).Destination
+	} else if cmd.StoragePod == nil && cmd.Datastore != nil {
+		datastoreref = cmd.Datastore.Reference()
+	} else {
+		return nil, fmt.Errorf("Please provide either a datastore or a storagepod")
+	}
+
+	// Set the destination datastore
+	cloneSpec.Location.Datastore = &datastoreref
+
+	// Check if vmx already exists
+	if !cmd.force {
+		vmxPath := fmt.Sprintf("%s/%s.vmx", cmd.name, cmd.name)
+
+		var mds mo.Datastore
+		err = property.DefaultCollector(cmd.Client).RetrieveOne(ctx, datastoreref, []string{"name"}, &mds)
+		if err != nil {
+			return nil, err
+		}
+
+		datastore := object.NewDatastore(cmd.Client, datastoreref)
+		datastore.InventoryPath = mds.Name
+
+		_, err := datastore.Stat(ctx, vmxPath)
+		if err == nil {
+			dsPath := cmd.Datastore.Path(vmxPath)
+			return nil, fmt.Errorf("File %s already exists", dsPath)
+		}
+	}
+
+	// check if customization specification requested
+	if len(cmd.customization) > 0 {
+		// get the customization spec manager
+		customizationSpecManager := object.NewCustomizationSpecManager(cmd.Client)
+		// check if customization specification exists
+		exists, err := customizationSpecManager.DoesCustomizationSpecExist(ctx, cmd.customization)
+		if err != nil {
+			return nil, err
+		}
+		if exists == false {
+			return nil, fmt.Errorf("Customization specification %s does not exists.", cmd.customization)
+		}
+		// get the customization specification
+		customSpecItem, err := customizationSpecManager.GetCustomizationSpec(ctx, cmd.customization)
+		if err != nil {
+			return nil, err
+		}
+		customSpec := customSpecItem.Spec
+		// set the customization
+		cloneSpec.Customization = &customSpec
+	}
+
+	// clone virtualmachine
+	return cmd.VirtualMachine.Clone(ctx, cmd.Folder, cmd.name, *cloneSpec)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/create.go b/vendor/github.com/vmware/govmomi/govc/vm/create.go
new file mode 100644
index 0000000000..03889555cd
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/create.go
@@ -0,0 +1,507 @@
+/*
+Copyright (c) 2014-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 vm
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/units"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type create struct {
+	*flags.ClientFlag
+	*flags.DatacenterFlag
+	*flags.DatastoreFlag
+	*flags.StoragePodFlag
+	*flags.ResourcePoolFlag
+	*flags.HostSystemFlag
+	*flags.NetworkFlag
+	*flags.FolderFlag
+
+	name       string
+	memory     int
+	cpus       int
+	guestID    string
+	link       bool
+	on         bool
+	force      bool
+	controller string
+	annotation string
+
+	iso              string
+	isoDatastoreFlag *flags.DatastoreFlag
+	isoDatastore     *object.Datastore
+
+	disk              string
+	diskDatastoreFlag *flags.DatastoreFlag
+	diskDatastore     *object.Datastore
+
+	// Only set if the disk argument is a byte size, which means the disk
+	// doesn't exist yet and should be created
+	diskByteSize int64
+
+	Client       *vim25.Client
+	Datacenter   *object.Datacenter
+	Datastore    *object.Datastore
+	StoragePod   *object.StoragePod
+	ResourcePool *object.ResourcePool
+	HostSystem   *object.HostSystem
+	Folder       *object.Folder
+}
+
+func init() {
+	cli.Register("vm.create", &create{})
+}
+
+func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+
+	cmd.StoragePodFlag, ctx = flags.NewStoragePodFlag(ctx)
+	cmd.StoragePodFlag.Register(ctx, f)
+
+	cmd.ResourcePoolFlag, ctx = flags.NewResourcePoolFlag(ctx)
+	cmd.ResourcePoolFlag.Register(ctx, f)
+
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	cmd.NetworkFlag, ctx = flags.NewNetworkFlag(ctx)
+	cmd.NetworkFlag.Register(ctx, f)
+
+	cmd.FolderFlag, ctx = flags.NewFolderFlag(ctx)
+	cmd.FolderFlag.Register(ctx, f)
+
+	f.IntVar(&cmd.memory, "m", 1024, "Size in MB of memory")
+	f.IntVar(&cmd.cpus, "c", 1, "Number of CPUs")
+	f.StringVar(&cmd.guestID, "g", "otherGuest", "Guest OS")
+	f.BoolVar(&cmd.link, "link", true, "Link specified disk")
+	f.BoolVar(&cmd.on, "on", true, "Power on VM. Default is true if -disk argument is given.")
+	f.BoolVar(&cmd.force, "force", false, "Create VM if vmx already exists")
+	f.StringVar(&cmd.controller, "disk.controller", "scsi", "Disk controller type")
+	f.StringVar(&cmd.annotation, "annotation", "", "VM description")
+
+	f.StringVar(&cmd.iso, "iso", "", "ISO path")
+	cmd.isoDatastoreFlag, ctx = flags.NewCustomDatastoreFlag(ctx)
+	f.StringVar(&cmd.isoDatastoreFlag.Name, "iso-datastore", "", "Datastore for ISO file")
+
+	f.StringVar(&cmd.disk, "disk", "", "Disk path (to use existing) OR size (to create new, e.g. 20GB)")
+	cmd.diskDatastoreFlag, _ = flags.NewCustomDatastoreFlag(ctx)
+	f.StringVar(&cmd.diskDatastoreFlag.Name, "disk-datastore", "", "Datastore for disk file")
+}
+
+func (cmd *create) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.StoragePodFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.ResourcePoolFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.NetworkFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.FolderFlag.Process(ctx); err != nil {
+		return err
+	}
+
+	// Default iso/disk datastores to the VM's datastore
+	if cmd.isoDatastoreFlag.Name == "" {
+		cmd.isoDatastoreFlag = cmd.DatastoreFlag
+	}
+	if cmd.diskDatastoreFlag.Name == "" {
+		cmd.diskDatastoreFlag = cmd.DatastoreFlag
+	}
+
+	return nil
+}
+
+func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
+	var err error
+
+	if len(f.Args()) != 1 {
+		return flag.ErrHelp
+	}
+
+	cmd.name = f.Arg(0)
+	if cmd.name == "" {
+		return flag.ErrHelp
+	}
+
+	cmd.Client, err = cmd.ClientFlag.Client()
+	if err != nil {
+		return err
+	}
+
+	cmd.Datacenter, err = cmd.DatacenterFlag.Datacenter()
+	if err != nil {
+		return err
+	}
+
+	if cmd.StoragePodFlag.Isset() {
+		cmd.StoragePod, err = cmd.StoragePodFlag.StoragePod()
+		if err != nil {
+			return err
+		}
+	} else {
+		cmd.Datastore, err = cmd.DatastoreFlag.Datastore()
+		if err != nil {
+			return err
+		}
+	}
+
+	cmd.HostSystem, err = cmd.HostSystemFlag.HostSystemIfSpecified()
+	if err != nil {
+		return err
+	}
+
+	if cmd.HostSystem != nil {
+		if cmd.ResourcePool, err = cmd.HostSystem.ResourcePool(ctx); err != nil {
+			return err
+		}
+	} else {
+		// -host is optional
+		if cmd.ResourcePool, err = cmd.ResourcePoolFlag.ResourcePool(); err != nil {
+			return err
+		}
+	}
+
+	if cmd.Folder, err = cmd.FolderFlag.Folder(); err != nil {
+		return err
+	}
+
+	// Verify ISO exists
+	if cmd.iso != "" {
+		_, err = cmd.isoDatastoreFlag.Stat(ctx, cmd.iso)
+		if err != nil {
+			return err
+		}
+
+		cmd.isoDatastore, err = cmd.isoDatastoreFlag.Datastore()
+		if err != nil {
+			return err
+		}
+	}
+
+	// Verify disk exists
+	if cmd.disk != "" {
+		var b units.ByteSize
+
+		// If disk can be parsed as byte units, don't stat
+		err = b.Set(cmd.disk)
+		if err == nil {
+			cmd.diskByteSize = int64(b)
+		} else {
+			_, err = cmd.diskDatastoreFlag.Stat(ctx, cmd.disk)
+			if err != nil {
+				return err
+			}
+
+			cmd.diskDatastore, err = cmd.diskDatastoreFlag.Datastore()
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	task, err := cmd.createVM(ctx)
+	if err != nil {
+		return err
+	}
+
+	info, err := task.WaitForResult(ctx, nil)
+	if err != nil {
+		return err
+	}
+
+	vm := object.NewVirtualMachine(cmd.Client, info.Result.(types.ManagedObjectReference))
+
+	if cmd.on {
+		task, err := vm.PowerOn(ctx)
+		if err != nil {
+			return err
+		}
+
+		_, err = task.WaitForResult(ctx, nil)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (cmd *create) createVM(ctx context.Context) (*object.Task, error) {
+	var devices object.VirtualDeviceList
+	var err error
+
+	spec := &types.VirtualMachineConfigSpec{
+		Name:       cmd.name,
+		GuestId:    cmd.guestID,
+		NumCPUs:    int32(cmd.cpus),
+		MemoryMB:   int64(cmd.memory),
+		Annotation: cmd.annotation,
+	}
+
+	devices, err = cmd.addStorage(nil)
+	if err != nil {
+		return nil, err
+	}
+
+	devices, err = cmd.addNetwork(devices)
+	if err != nil {
+		return nil, err
+	}
+
+	deviceChange, err := devices.ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd)
+	if err != nil {
+		return nil, err
+	}
+
+	spec.DeviceChange = deviceChange
+
+	var datastore *object.Datastore
+
+	// If storage pod is specified, collect placement recommendations
+	if cmd.StoragePod != nil {
+		datastore, err = cmd.recommendDatastore(ctx, spec)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		datastore = cmd.Datastore
+	}
+
+	if !cmd.force {
+		vmxPath := fmt.Sprintf("%s/%s.vmx", cmd.name, cmd.name)
+
+		_, err := datastore.Stat(ctx, vmxPath)
+		if err == nil {
+			dsPath := cmd.Datastore.Path(vmxPath)
+			return nil, fmt.Errorf("File %s already exists", dsPath)
+		}
+	}
+
+	folder := cmd.Folder
+
+	spec.Files = &types.VirtualMachineFileInfo{
+		VmPathName: fmt.Sprintf("[%s]", datastore.Name()),
+	}
+
+	return folder.CreateVM(ctx, *spec, cmd.ResourcePool, cmd.HostSystem)
+}
+
+func (cmd *create) addStorage(devices object.VirtualDeviceList) (object.VirtualDeviceList, error) {
+	if cmd.controller != "ide" {
+		if cmd.controller == "nvme" {
+			nvme, err := devices.CreateNVMEController()
+			if err != nil {
+				return nil, err
+			}
+
+			devices = append(devices, nvme)
+			cmd.controller = devices.Name(nvme)
+		} else {
+			scsi, err := devices.CreateSCSIController(cmd.controller)
+			if err != nil {
+				return nil, err
+			}
+
+			devices = append(devices, scsi)
+			cmd.controller = devices.Name(scsi)
+		}
+	}
+
+	// If controller is specified to be IDE or if an ISO is specified, add IDE controller.
+	if cmd.controller == "ide" || cmd.iso != "" {
+		ide, err := devices.CreateIDEController()
+		if err != nil {
+			return nil, err
+		}
+
+		devices = append(devices, ide)
+	}
+
+	if cmd.diskByteSize != 0 {
+		controller, err := devices.FindDiskController(cmd.controller)
+		if err != nil {
+			return nil, err
+		}
+
+		disk := &types.VirtualDisk{
+			VirtualDevice: types.VirtualDevice{
+				Key: devices.NewKey(),
+				Backing: &types.VirtualDiskFlatVer2BackingInfo{
+					DiskMode:        string(types.VirtualDiskModePersistent),
+					ThinProvisioned: types.NewBool(true),
+				},
+			},
+			CapacityInKB: cmd.diskByteSize / 1024,
+		}
+
+		devices.AssignController(disk, controller)
+		devices = append(devices, disk)
+	} else if cmd.disk != "" {
+		controller, err := devices.FindDiskController(cmd.controller)
+		if err != nil {
+			return nil, err
+		}
+
+		ds := cmd.diskDatastore.Reference()
+		path := cmd.diskDatastore.Path(cmd.disk)
+		disk := devices.CreateDisk(controller, ds, path)
+
+		if cmd.link {
+			disk = devices.ChildDisk(disk)
+		}
+
+		devices = append(devices, disk)
+	}
+
+	if cmd.iso != "" {
+		ide, err := devices.FindIDEController("")
+		if err != nil {
+			return nil, err
+		}
+
+		cdrom, err := devices.CreateCdrom(ide)
+		if err != nil {
+			return nil, err
+		}
+
+		cdrom = devices.InsertIso(cdrom, cmd.isoDatastore.Path(cmd.iso))
+		devices = append(devices, cdrom)
+	}
+
+	return devices, nil
+}
+
+func (cmd *create) addNetwork(devices object.VirtualDeviceList) (object.VirtualDeviceList, error) {
+	netdev, err := cmd.NetworkFlag.Device()
+	if err != nil {
+		return nil, err
+	}
+
+	devices = append(devices, netdev)
+	return devices, nil
+}
+
+func (cmd *create) recommendDatastore(ctx context.Context, spec *types.VirtualMachineConfigSpec) (*object.Datastore, error) {
+	sp := cmd.StoragePod.Reference()
+
+	// Build pod selection spec from config spec
+	podSelectionSpec := types.StorageDrsPodSelectionSpec{
+		StoragePod: &sp,
+	}
+
+	// Keep list of disks that need to be placed
+	var disks []*types.VirtualDisk
+
+	// Collect disks eligible for placement
+	for _, deviceConfigSpec := range spec.DeviceChange {
+		s := deviceConfigSpec.GetVirtualDeviceConfigSpec()
+		if s.Operation != types.VirtualDeviceConfigSpecOperationAdd {
+			continue
+		}
+
+		if s.FileOperation != types.VirtualDeviceConfigSpecFileOperationCreate {
+			continue
+		}
+
+		d, ok := s.Device.(*types.VirtualDisk)
+		if !ok {
+			continue
+		}
+
+		podConfigForPlacement := types.VmPodConfigForPlacement{
+			StoragePod: sp,
+			Disk: []types.PodDiskLocator{
+				{
+					DiskId:          d.Key,
+					DiskBackingInfo: d.Backing,
+				},
+			},
+		}
+
+		podSelectionSpec.InitialVmConfig = append(podSelectionSpec.InitialVmConfig, podConfigForPlacement)
+		disks = append(disks, d)
+	}
+
+	sps := types.StoragePlacementSpec{
+		Type:             string(types.StoragePlacementSpecPlacementTypeCreate),
+		ResourcePool:     types.NewReference(cmd.ResourcePool.Reference()),
+		PodSelectionSpec: podSelectionSpec,
+		ConfigSpec:       spec,
+	}
+
+	srm := object.NewStorageResourceManager(cmd.Client)
+	result, err := srm.RecommendDatastores(ctx, sps)
+	if err != nil {
+		return nil, err
+	}
+
+	// Use result to pin disks to recommended datastores
+	recs := result.Recommendations
+	if len(recs) == 0 {
+		return nil, fmt.Errorf("no recommendations")
+	}
+
+	ds := recs[0].Action[0].(*types.StoragePlacementAction).Destination
+
+	var mds mo.Datastore
+	err = property.DefaultCollector(cmd.Client).RetrieveOne(ctx, ds, []string{"name"}, &mds)
+	if err != nil {
+		return nil, err
+	}
+
+	datastore := object.NewDatastore(cmd.Client, ds)
+	datastore.InventoryPath = mds.Name
+
+	// Apply recommendation to eligible disks
+	for _, disk := range disks {
+		backing := disk.Backing.(*types.VirtualDiskFlatVer2BackingInfo)
+		backing.Datastore = &ds
+	}
+
+	return datastore, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/destroy.go b/vendor/github.com/vmware/govmomi/govc/vm/destroy.go
new file mode 100644
index 0000000000..4dc6b04979
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/destroy.go
@@ -0,0 +1,82 @@
+/*
+Copyright (c) 2014-2015 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 vm
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type destroy struct {
+	*flags.ClientFlag
+	*flags.SearchFlag
+}
+
+func init() {
+	cli.Register("vm.destroy", &destroy{})
+}
+
+func (cmd *destroy) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualMachines)
+	cmd.SearchFlag.Register(ctx, f)
+}
+
+func (cmd *destroy) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.SearchFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *destroy) Run(ctx context.Context, f *flag.FlagSet) error {
+	vms, err := cmd.VirtualMachines(f.Args())
+	if err != nil {
+		return err
+	}
+
+	for _, vm := range vms {
+		task, err := vm.PowerOff(ctx)
+		if err != nil {
+			return err
+		}
+
+		// Ignore error since the VM may already been in powered off state.
+		// vm.Destroy will fail if the VM is still powered on.
+		_ = task.Wait(ctx)
+
+		task, err = vm.Destroy(ctx)
+		if err != nil {
+			return err
+		}
+
+		err = task.Wait(ctx)
+		if err != nil {
+			return err
+		}
+	}
+
+	return 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
new file mode 100644
index 0000000000..883ba60061
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/disk/attach.go
@@ -0,0 +1,110 @@
+/*
+Copyright (c) 2014-2015 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 disk
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type attach struct {
+	*flags.DatastoreFlag
+	*flags.VirtualMachineFlag
+
+	persist    bool
+	link       bool
+	disk       string
+	controller string
+}
+
+func init() {
+	cli.Register("vm.disk.attach", &attach{})
+}
+
+func (cmd *attach) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.persist, "persist", true, "Persist attached disk")
+	f.BoolVar(&cmd.link, "link", true, "Link specified disk")
+	f.StringVar(&cmd.controller, "controller", "", "Disk controller")
+	f.StringVar(&cmd.disk, "disk", "", "Disk path name")
+}
+
+func (cmd *attach) Process(ctx context.Context) error {
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *attach) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	ds, err := cmd.Datastore()
+	if err != nil {
+		return err
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	controller, err := devices.FindDiskController(cmd.controller)
+	if err != nil {
+		return err
+	}
+
+	disk := devices.CreateDisk(controller, ds.Reference(), ds.Path(cmd.disk))
+	backing := disk.Backing.(*types.VirtualDiskFlatVer2BackingInfo)
+
+	if cmd.link {
+		if cmd.persist {
+			backing.DiskMode = string(types.VirtualDiskModeIndependent_persistent)
+		} else {
+			backing.DiskMode = string(types.VirtualDiskModeIndependent_nonpersistent)
+		}
+
+		disk = devices.ChildDisk(disk)
+		return vm.AddDevice(ctx, disk)
+	}
+
+	if cmd.persist {
+		backing.DiskMode = string(types.VirtualDiskModePersistent)
+	} else {
+		backing.DiskMode = string(types.VirtualDiskModeNonpersistent)
+	}
+
+	return vm.AddDevice(ctx, disk)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/disk/change.go b/vendor/github.com/vmware/govmomi/govc/vm/disk/change.go
new file mode 100644
index 0000000000..2157f0aa53
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/disk/change.go
@@ -0,0 +1,174 @@
+/*
+Copyright (c) 2017 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 disk
+
+import (
+	"context"
+	"errors"
+	"flag"
+	"fmt"
+	"strings"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/units"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type change struct {
+	*flags.VirtualMachineFlag
+
+	name     string
+	key      int
+	label    string
+	filePath string
+
+	bytes units.ByteSize
+	mode  string
+}
+
+func init() {
+	cli.Register("vm.disk.change", &change{})
+}
+
+func (cmd *change) Description() string {
+	return `Change some properties of a VM's DISK
+
+In particular, you can change the DISK mode, and the size (as long as it is bigger)
+
+Examples:
+  govc vm.disk.change -vm VM -disk.key 2001 -size 10G
+  govc vm.disk.change -vm VM -disk.label "BDD disk" -size 10G
+  govc vm.disk.change -vm VM -disk.name "hard-1000-0" -size 12G
+  govc vm.disk.change -vm VM -disk.filePath "[DS] VM/VM-1.vmdk" -mode nonpersistent`
+}
+
+func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+	err := (&cmd.bytes).Set("0G")
+	if err != nil {
+		panic(err)
+	}
+	f.Var(&cmd.bytes, "size", "New disk size")
+	f.StringVar(&cmd.name, "disk.name", "", "Disk name")
+	f.StringVar(&cmd.label, "disk.label", "", "Disk label")
+	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, "|")))
+}
+
+func (cmd *change) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *change) FindDisk(ctx context.Context, list object.VirtualDeviceList) (*types.VirtualDisk, error) {
+	var disks []*types.VirtualDisk
+	for _, device := range list {
+		switch md := device.(type) {
+		case *types.VirtualDisk:
+			if cmd.CheckDiskProperties(ctx, list.Name(device), md) {
+				disks = append(disks, md)
+			}
+		default:
+			continue
+		}
+	}
+
+	switch len(disks) {
+	case 0:
+		return nil, errors.New("No disk found using the given values")
+	case 1:
+		return disks[0], nil
+	}
+	return nil, errors.New("The given disk values match multiple disks")
+}
+
+func (cmd *change) CheckDiskProperties(ctx context.Context, name string, disk *types.VirtualDisk) bool {
+	switch {
+	case cmd.key != 0 && disk.Key != int32(cmd.key):
+		fallthrough
+	case cmd.name != "" && name != cmd.name:
+		fallthrough
+	case cmd.label != "" && disk.DeviceInfo.GetDescription().Label != cmd.label:
+		return false
+	case cmd.filePath != "":
+		if b, ok := disk.Backing.(types.BaseVirtualDeviceFileBackingInfo); ok {
+			if b.GetVirtualDeviceFileBackingInfo().FileName != cmd.filePath {
+				return false
+			}
+		}
+	}
+	return true
+}
+
+func (cmd *change) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	editdisk, err := cmd.FindDisk(ctx, devices)
+	if err != nil {
+		return err
+	}
+
+	if int64(cmd.bytes) != 0 {
+		editdisk.CapacityInKB = int64(cmd.bytes) / 1024
+	}
+
+	backing := editdisk.Backing.(*types.VirtualDiskFlatVer2BackingInfo)
+
+	if len(cmd.mode) != 0 {
+		backing.DiskMode = cmd.mode
+	}
+
+	spec := types.VirtualMachineConfigSpec{}
+
+	config := &types.VirtualDeviceConfigSpec{
+		Device:    editdisk,
+		Operation: types.VirtualDeviceConfigSpecOperationEdit,
+	}
+
+	config.FileOperation = ""
+
+	spec.DeviceChange = append(spec.DeviceChange, config)
+
+	task, err := vm.Reconfigure(ctx, spec)
+	if err != nil {
+		return err
+	}
+
+	err = task.Wait(ctx)
+	if err != nil {
+		return fmt.Errorf("Error resizing main disk\nLogged Item:  %s", err)
+	}
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/disk/create.go b/vendor/github.com/vmware/govmomi/govc/vm/disk/create.go
new file mode 100644
index 0000000000..4c0aac4eb2
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/disk/create.go
@@ -0,0 +1,159 @@
+/*
+Copyright (c) 2014-2015 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 disk
+
+import (
+	"context"
+	"errors"
+	"flag"
+	"fmt"
+	"strings"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/units"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type create struct {
+	*flags.DatastoreFlag
+	*flags.OutputFlag
+	*flags.VirtualMachineFlag
+
+	controller string
+	Name       string
+	Bytes      units.ByteSize
+	Thick      bool
+	Eager      bool
+	DiskMode   string
+}
+
+var vdmTypes = []string{
+	string(types.VirtualDiskModePersistent),
+	string(types.VirtualDiskModeNonpersistent),
+	string(types.VirtualDiskModeUndoable),
+	string(types.VirtualDiskModeIndependent_persistent),
+	string(types.VirtualDiskModeIndependent_nonpersistent),
+	string(types.VirtualDiskModeAppend),
+}
+
+func init() {
+	cli.Register("vm.disk.create", &create{})
+}
+
+func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	err := (&cmd.Bytes).Set("10G")
+	if err != nil {
+		panic(err)
+	}
+
+	f.StringVar(&cmd.controller, "controller", "", "Disk controller")
+	f.StringVar(&cmd.Name, "name", "", "Name for new disk")
+	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, "|")))
+}
+
+func (cmd *create) Process(ctx context.Context) error {
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *create) Description() string {
+	return `Create disk and attach to VM.
+
+Examples:
+  govc vm.disk.create -vm $name -name $name/disk1 -size 10G`
+}
+
+func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
+	if len(cmd.Name) == 0 {
+		return errors.New("please specify a disk name")
+	}
+
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+	if vm == nil {
+		return errors.New("please specify a vm")
+	}
+
+	ds, err := cmd.Datastore()
+	if err != nil {
+		return err
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	controller, err := devices.FindDiskController(cmd.controller)
+	if err != nil {
+		return err
+	}
+
+	vdmMatch := false
+	for _, vdm := range vdmTypes {
+		if cmd.DiskMode == vdm {
+			vdmMatch = true
+		}
+	}
+
+	if vdmMatch == false {
+		return errors.New("please specify a valid disk mode")
+	}
+
+	disk := devices.CreateDisk(controller, ds.Reference(), ds.Path(cmd.Name))
+
+	existing := devices.SelectByBackingInfo(disk.Backing)
+
+	if len(existing) > 0 {
+		cmd.Log("Disk already present\n")
+		return nil
+	}
+
+	backing := disk.Backing.(*types.VirtualDiskFlatVer2BackingInfo)
+
+	if cmd.Thick {
+		backing.ThinProvisioned = types.NewBool(false)
+		backing.EagerlyScrub = types.NewBool(cmd.Eager)
+	}
+
+	backing.DiskMode = cmd.DiskMode
+
+	cmd.Log("Creating disk\n")
+	disk.CapacityInKB = int64(cmd.Bytes) / 1024
+	return vm.AddDevice(ctx, disk)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/guest/auth.go b/vendor/github.com/vmware/govmomi/govc/vm/guest/auth.go
new file mode 100644
index 0000000000..c392eab14b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/guest/auth.go
@@ -0,0 +1,67 @@
+/*
+Copyright (c) 2014-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 guest
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type AuthFlag struct {
+	auth types.NamePasswordAuthentication
+}
+
+func newAuthFlag(ctx context.Context) (*AuthFlag, context.Context) {
+	return &AuthFlag{}, ctx
+}
+
+func (flag *AuthFlag) String() string {
+	return fmt.Sprintf("%s:%s", flag.auth.Username, strings.Repeat("x", len(flag.auth.Password)))
+}
+
+func (flag *AuthFlag) Set(s string) error {
+	c := strings.Split(s, ":")
+	if len(c) > 0 {
+		flag.auth.Username = c[0]
+		if len(c) > 1 {
+			flag.auth.Password = c[1]
+		}
+	}
+
+	return nil
+}
+
+func (flag *AuthFlag) Register(ctx context.Context, f *flag.FlagSet) {
+	env := "GOVC_GUEST_LOGIN"
+	value := os.Getenv(env)
+	flag.Set(value)
+	usage := fmt.Sprintf("Guest VM credentials [%s]", env)
+	f.Var(flag, "l", usage)
+}
+
+func (flag *AuthFlag) Process(ctx context.Context) error {
+	return nil
+}
+
+func (flag *AuthFlag) Auth() types.BaseGuestAuthentication {
+	return &flag.auth
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/guest/chmod.go b/vendor/github.com/vmware/govmomi/govc/vm/guest/chmod.go
new file mode 100644
index 0000000000..ed634c2358
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/guest/chmod.go
@@ -0,0 +1,59 @@
+/*
+Copyright (c) 2014-2015 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 guest
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+)
+
+type chmod struct {
+	*GuestFlag
+	*FileAttrFlag
+}
+
+func init() {
+	cli.Register("guest.chmod", &chmod{})
+}
+
+func (cmd *chmod) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.GuestFlag, ctx = newGuestFlag(ctx)
+	cmd.GuestFlag.Register(ctx, f)
+	cmd.FileAttrFlag, ctx = newFileAttrFlag(ctx)
+	cmd.FileAttrFlag.Register(ctx, f)
+}
+
+func (cmd *chmod) Process(ctx context.Context) error {
+	if err := cmd.GuestFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.FileAttrFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *chmod) Run(ctx context.Context, f *flag.FlagSet) error {
+	m, err := cmd.FileManager()
+	if err != nil {
+		return err
+	}
+
+	return m.ChangeFileAttributes(ctx, cmd.Auth(), f.Arg(0), cmd.Attr())
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/guest/download.go b/vendor/github.com/vmware/govmomi/govc/vm/guest/download.go
new file mode 100644
index 0000000000..9e336d0b2f
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/guest/download.go
@@ -0,0 +1,119 @@
+/*
+Copyright (c) 2014-2015 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 guest
+
+import (
+	"flag"
+	"io"
+
+	"context"
+	"os"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/vim25/soap"
+)
+
+type download struct {
+	*GuestFlag
+
+	overwrite bool
+}
+
+func init() {
+	cli.Register("guest.download", &download{})
+}
+
+func (cmd *download) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.GuestFlag, ctx = newGuestFlag(ctx)
+	cmd.GuestFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.overwrite, "f", false, "If set, the local destination file is clobbered")
+}
+
+func (cmd *download) Usage() string {
+	return "SOURCE DEST"
+}
+
+func (cmd *download) Description() string {
+	return `Copy SOURCE from the guest VM to DEST on the local system.
+
+If DEST name is "-", source is written to stdout.
+
+Examples:
+  govc guest.download -l user:pass -vm=my-vm /var/log/my.log ./local.log
+  govc guest.download -l user:pass -vm=my-vm /etc/motd -`
+}
+
+func (cmd *download) Process(ctx context.Context) error {
+	if err := cmd.GuestFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *download) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 2 {
+		return flag.ErrHelp
+	}
+
+	m, err := cmd.FileManager()
+	if err != nil {
+		return err
+	}
+
+	src := f.Arg(0)
+	dst := f.Arg(1)
+
+	_, err = os.Stat(dst)
+	if err == nil && !cmd.overwrite {
+		return os.ErrExist
+	}
+
+	info, err := m.InitiateFileTransferFromGuest(ctx, cmd.Auth(), src)
+	if err != nil {
+		return err
+	}
+
+	u, err := cmd.ParseURL(info.Url)
+	if err != nil {
+		return err
+	}
+
+	c, err := cmd.Client()
+	if err != nil {
+		return nil
+	}
+
+	p := soap.DefaultDownload
+
+	if dst == "-" {
+		f, _, err := c.Client.Download(u, &p)
+		if err != nil {
+			return err
+		}
+		_, err = io.Copy(os.Stdout, f)
+		return err
+	}
+
+	if cmd.OutputFlag.TTY {
+		logger := cmd.ProgressLogger("Downloading... ")
+		p.Progress = logger
+		defer logger.Wait()
+	}
+
+	return c.Client.DownloadFile(dst, u, &p)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/guest/file_attr.go b/vendor/github.com/vmware/govmomi/govc/vm/guest/file_attr.go
new file mode 100644
index 0000000000..3ff3b6bb3f
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/guest/file_attr.go
@@ -0,0 +1,47 @@
+/*
+Copyright (c) 2014-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 guest
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type FileAttrFlag struct {
+	types.GuestPosixFileAttributes
+}
+
+func newFileAttrFlag(ctx context.Context) (*FileAttrFlag, context.Context) {
+	return &FileAttrFlag{}, ctx
+}
+
+func (flag *FileAttrFlag) Register(ctx context.Context, f *flag.FlagSet) {
+	f.Var(flags.NewInt32(&flag.OwnerId), "uid", "User ID")
+	f.Var(flags.NewInt32(&flag.GroupId), "gid", "Group ID")
+	f.Int64Var(&flag.Permissions, "perm", 0, "File permissions")
+}
+
+func (flag *FileAttrFlag) Process(ctx context.Context) error {
+	return nil
+}
+
+func (flag *FileAttrFlag) Attr() types.BaseGuestFileAttributes {
+	return &flag.GuestPosixFileAttributes
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/guest/getenv.go b/vendor/github.com/vmware/govmomi/govc/vm/guest/getenv.go
new file mode 100644
index 0000000000..7d850aca89
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/guest/getenv.go
@@ -0,0 +1,63 @@
+/*
+Copyright (c) 2014-2015 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 guest
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+)
+
+type getenv struct {
+	*GuestFlag
+}
+
+func init() {
+	cli.Register("guest.getenv", &getenv{})
+}
+
+func (cmd *getenv) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.GuestFlag, ctx = newGuestFlag(ctx)
+	cmd.GuestFlag.Register(ctx, f)
+}
+
+func (cmd *getenv) Process(ctx context.Context) error {
+	if err := cmd.GuestFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *getenv) Run(ctx context.Context, f *flag.FlagSet) error {
+	m, err := cmd.ProcessManager()
+	if err != nil {
+		return err
+	}
+
+	vars, err := m.ReadEnvironmentVariable(ctx, cmd.Auth(), f.Args())
+	if err != nil {
+		return err
+	}
+
+	for _, v := range vars {
+		fmt.Printf("%s\n", v)
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/guest/guest.go b/vendor/github.com/vmware/govmomi/govc/vm/guest/guest.go
new file mode 100644
index 0000000000..4018bf0bb7
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/guest/guest.go
@@ -0,0 +1,115 @@
+/*
+Copyright (c) 2014-2015 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 guest
+
+import (
+	"errors"
+	"flag"
+
+	"context"
+	"net/url"
+
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/guest"
+	"github.com/vmware/govmomi/object"
+)
+
+type GuestFlag struct {
+	*flags.ClientFlag
+	*flags.VirtualMachineFlag
+
+	*AuthFlag
+}
+
+func newGuestFlag(ctx context.Context) (*GuestFlag, context.Context) {
+	f := &GuestFlag{}
+	f.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	f.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	f.AuthFlag, ctx = newAuthFlag(ctx)
+	return f, ctx
+}
+
+func (flag *GuestFlag) Register(ctx context.Context, f *flag.FlagSet) {
+	flag.ClientFlag.Register(ctx, f)
+	flag.VirtualMachineFlag.Register(ctx, f)
+	flag.AuthFlag.Register(ctx, f)
+}
+
+func (flag *GuestFlag) Process(ctx context.Context) error {
+	if err := flag.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := flag.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := flag.AuthFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (flag *GuestFlag) FileManager() (*guest.FileManager, error) {
+	ctx := context.TODO()
+	c, err := flag.Client()
+	if err != nil {
+		return nil, err
+	}
+
+	vm, err := flag.VirtualMachine()
+	if err != nil {
+		return nil, err
+	}
+
+	o := guest.NewOperationsManager(c, vm.Reference())
+	return o.FileManager(ctx)
+}
+
+func (flag *GuestFlag) ProcessManager() (*guest.ProcessManager, error) {
+	ctx := context.TODO()
+	c, err := flag.Client()
+	if err != nil {
+		return nil, err
+	}
+
+	vm, err := flag.VirtualMachine()
+	if err != nil {
+		return nil, err
+	}
+
+	o := guest.NewOperationsManager(c, vm.Reference())
+	return o.ProcessManager(ctx)
+}
+
+func (flag *GuestFlag) ParseURL(urlStr string) (*url.URL, error) {
+	c, err := flag.Client()
+	if err != nil {
+		return nil, err
+	}
+
+	return c.Client.ParseURL(urlStr)
+}
+
+func (flag *GuestFlag) VirtualMachine() (*object.VirtualMachine, error) {
+	vm, err := flag.VirtualMachineFlag.VirtualMachine()
+	if err != nil {
+		return nil, err
+	}
+	if vm == nil {
+		return nil, errors.New("no vm specified")
+	}
+	return vm, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/guest/kill.go b/vendor/github.com/vmware/govmomi/govc/vm/guest/kill.go
new file mode 100644
index 0000000000..0f008f210c
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/guest/kill.go
@@ -0,0 +1,63 @@
+/*
+Copyright (c) 2014-2015 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 guest
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+)
+
+type kill struct {
+	*GuestFlag
+
+	pids pidSelector
+}
+
+func init() {
+	cli.Register("guest.kill", &kill{})
+}
+
+func (cmd *kill) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.GuestFlag, ctx = newGuestFlag(ctx)
+	cmd.GuestFlag.Register(ctx, f)
+
+	f.Var(&cmd.pids, "p", "Process ID")
+}
+
+func (cmd *kill) Process(ctx context.Context) error {
+	if err := cmd.GuestFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *kill) Run(ctx context.Context, f *flag.FlagSet) error {
+	m, err := cmd.ProcessManager()
+	if err != nil {
+		return err
+	}
+
+	for _, pid := range cmd.pids {
+		if err := m.TerminateProcess(ctx, cmd.Auth(), pid); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/guest/ls.go b/vendor/github.com/vmware/govmomi/govc/vm/guest/ls.go
new file mode 100644
index 0000000000..dc95ab0242
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/guest/ls.go
@@ -0,0 +1,78 @@
+/*
+Copyright (c) 2014-2015 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 guest
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+)
+
+type ls struct {
+	*GuestFlag
+}
+
+func init() {
+	cli.Register("guest.ls", &ls{})
+}
+
+func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.GuestFlag, ctx = newGuestFlag(ctx)
+	cmd.GuestFlag.Register(ctx, f)
+}
+
+func (cmd *ls) Process(ctx context.Context) error {
+	if err := cmd.GuestFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
+	m, err := cmd.FileManager()
+	if err != nil {
+		return err
+	}
+
+	var offset int32
+	tw := tabwriter.NewWriter(os.Stdout, 3, 0, 2, ' ', 0)
+
+	for {
+		info, err := m.ListFiles(ctx, cmd.Auth(), f.Arg(0), offset, 0, f.Arg(1))
+		if err != nil {
+			return err
+		}
+
+		for _, f := range info.Files {
+			attr := f.Attributes.GetGuestFileAttributes() // TODO: GuestPosixFileAttributes
+			fmt.Fprintf(tw, "%d\t%s\t%s\n", f.Size, attr.ModificationTime.Format("Mon Jan 2 15:04:05 2006"), f.Path)
+		}
+
+		_ = tw.Flush()
+
+		if info.Remaining == 0 {
+			break
+		}
+		offset += int32(len(info.Files))
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/guest/mkdir.go b/vendor/github.com/vmware/govmomi/govc/vm/guest/mkdir.go
new file mode 100644
index 0000000000..7b31710863
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/guest/mkdir.go
@@ -0,0 +1,71 @@
+/*
+Copyright (c) 2014-2015 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 guest
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type mkdir struct {
+	*GuestFlag
+
+	createParents bool
+}
+
+func init() {
+	cli.Register("guest.mkdir", &mkdir{})
+}
+
+func (cmd *mkdir) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.GuestFlag, ctx = newGuestFlag(ctx)
+	cmd.GuestFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.createParents, "p", false, "Create intermediate directories as needed")
+}
+
+func (cmd *mkdir) Process(ctx context.Context) error {
+	if err := cmd.GuestFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *mkdir) Run(ctx context.Context, f *flag.FlagSet) error {
+	m, err := cmd.FileManager()
+	if err != nil {
+		return err
+	}
+
+	err = m.MakeDirectory(ctx, cmd.Auth(), f.Arg(0), cmd.createParents)
+
+	// ignore EEXIST if -p flag is given
+	if err != nil && cmd.createParents {
+		if soap.IsSoapFault(err) {
+			soapFault := soap.ToSoapFault(err)
+			if _, ok := soapFault.VimFault().(types.FileAlreadyExists); ok {
+				return nil
+			}
+		}
+	}
+
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/guest/mktemp.go b/vendor/github.com/vmware/govmomi/govc/vm/guest/mktemp.go
new file mode 100644
index 0000000000..2769e88360
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/guest/mktemp.go
@@ -0,0 +1,74 @@
+/*
+Copyright (c) 2014-2015 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 guest
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+)
+
+type mktemp struct {
+	*GuestFlag
+
+	dir    bool
+	prefix string
+	suffix string
+}
+
+func init() {
+	cli.Register("guest.mktemp", &mktemp{})
+}
+
+func (cmd *mktemp) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.GuestFlag, ctx = newGuestFlag(ctx)
+	cmd.GuestFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.dir, "d", false, "Make a directory instead of a file")
+	f.StringVar(&cmd.prefix, "t", "", "Prefix")
+	f.StringVar(&cmd.suffix, "s", "", "Suffix")
+}
+
+func (cmd *mktemp) Process(ctx context.Context) error {
+	if err := cmd.GuestFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *mktemp) Run(ctx context.Context, f *flag.FlagSet) error {
+	m, err := cmd.FileManager()
+	if err != nil {
+		return err
+	}
+
+	mk := m.CreateTemporaryFile
+	if cmd.dir {
+		mk = m.CreateTemporaryDirectory
+	}
+
+	name, err := mk(ctx, cmd.Auth(), cmd.prefix, cmd.suffix)
+	if err != nil {
+		return err
+	}
+
+	fmt.Println(name)
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/guest/ps.go b/vendor/github.com/vmware/govmomi/govc/vm/guest/ps.go
new file mode 100644
index 0000000000..f7a9915424
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/guest/ps.go
@@ -0,0 +1,163 @@
+/*
+Copyright (c) 2014-2015 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 guest
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"os"
+	"strconv"
+	"text/tabwriter"
+	"time"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type ps struct {
+	*flags.OutputFlag
+	*GuestFlag
+
+	every bool
+	wait  bool
+
+	pids pidSelector
+	uids uidSelector
+}
+
+type pidSelector []int64
+
+func (s *pidSelector) String() string {
+	return fmt.Sprint(*s)
+}
+
+func (s *pidSelector) Set(value string) error {
+	v, err := strconv.ParseInt(value, 0, 64)
+	if err != nil {
+		return err
+	}
+	*s = append(*s, v)
+	return nil
+}
+
+type uidSelector map[string]bool
+
+func (s uidSelector) String() string {
+	return ""
+}
+
+func (s uidSelector) Set(value string) error {
+	s[value] = true
+	return nil
+}
+
+func init() {
+	cli.Register("guest.ps", &ps{})
+}
+
+func (cmd *ps) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	cmd.GuestFlag, ctx = newGuestFlag(ctx)
+	cmd.GuestFlag.Register(ctx, f)
+
+	cmd.uids = make(map[string]bool)
+	f.BoolVar(&cmd.every, "e", false, "Select all processes")
+	f.BoolVar(&cmd.wait, "X", false, "Wait for process to exit")
+	f.Var(&cmd.pids, "p", "Select by process ID")
+	f.Var(&cmd.uids, "U", "Select by process UID")
+}
+
+func (cmd *ps) Process(ctx context.Context) error {
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.GuestFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func running(procs []types.GuestProcessInfo) bool {
+	for _, p := range procs {
+		if p.EndTime == nil {
+			return true
+		}
+	}
+	return false
+}
+
+func (cmd *ps) list(ctx context.Context) ([]types.GuestProcessInfo, error) {
+	m, err := cmd.ProcessManager()
+	if err != nil {
+		return nil, err
+	}
+
+	auth := cmd.Auth()
+
+	for {
+		procs, err := m.ListProcesses(ctx, auth, cmd.pids)
+		if err != nil {
+			return nil, err
+		}
+
+		if cmd.wait && running(procs) {
+			<-time.After(time.Millisecond * 250)
+			continue
+		}
+
+		return procs, nil
+	}
+}
+
+func (cmd *ps) Run(ctx context.Context, f *flag.FlagSet) error {
+	procs, err := cmd.list(ctx)
+	if err != nil {
+		return err
+	}
+
+	r := &psResult{cmd, procs}
+
+	return cmd.WriteResult(r)
+}
+
+type psResult struct {
+	cmd         *ps
+	ProcessInfo []types.GuestProcessInfo
+}
+
+func (r *psResult) Write(w io.Writer) error {
+	tw := tabwriter.NewWriter(os.Stdout, 4, 0, 2, ' ', 0)
+
+	fmt.Fprintf(tw, "%s\t%s\t%s\t%s\n", "UID", "PID", "STIME", "CMD")
+
+	if !r.cmd.every && len(r.cmd.uids) == 0 {
+		r.cmd.uids[r.cmd.auth.Username] = true
+	}
+
+	for _, p := range r.ProcessInfo {
+		if r.cmd.every || r.cmd.uids[p.Owner] {
+			fmt.Fprintf(tw, "%s\t%d\t%s\t%s\n", p.Owner, p.Pid, p.StartTime.Format("15:04"), p.CmdLine)
+		}
+	}
+
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/guest/rm.go b/vendor/github.com/vmware/govmomi/govc/vm/guest/rm.go
new file mode 100644
index 0000000000..9592f1460b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/guest/rm.go
@@ -0,0 +1,53 @@
+/*
+Copyright (c) 2014-2015 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 guest
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+)
+
+type rm struct {
+	*GuestFlag
+}
+
+func init() {
+	cli.Register("guest.rm", &rm{})
+}
+
+func (cmd *rm) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.GuestFlag, ctx = newGuestFlag(ctx)
+	cmd.GuestFlag.Register(ctx, f)
+}
+
+func (cmd *rm) Process(ctx context.Context) error {
+	if err := cmd.GuestFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *rm) Run(ctx context.Context, f *flag.FlagSet) error {
+	m, err := cmd.FileManager()
+	if err != nil {
+		return err
+	}
+
+	return m.DeleteFile(ctx, cmd.Auth(), f.Arg(0))
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/guest/rmdir.go b/vendor/github.com/vmware/govmomi/govc/vm/guest/rmdir.go
new file mode 100644
index 0000000000..0843a4df14
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/guest/rmdir.go
@@ -0,0 +1,57 @@
+/*
+Copyright (c) 2014-2015 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 guest
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+)
+
+type rmdir struct {
+	*GuestFlag
+
+	recursive bool
+}
+
+func init() {
+	cli.Register("guest.rmdir", &rmdir{})
+}
+
+func (cmd *rmdir) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.GuestFlag, ctx = newGuestFlag(ctx)
+	cmd.GuestFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.recursive, "r", false, "Recursive removal")
+}
+
+func (cmd *rmdir) Process(ctx context.Context) error {
+	if err := cmd.GuestFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *rmdir) Run(ctx context.Context, f *flag.FlagSet) error {
+	m, err := cmd.FileManager()
+	if err != nil {
+		return err
+	}
+
+	return m.DeleteDirectory(ctx, cmd.Auth(), f.Arg(0), cmd.recursive)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/guest/start.go b/vendor/github.com/vmware/govmomi/govc/vm/guest/start.go
new file mode 100644
index 0000000000..98bfd895fc
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/guest/start.go
@@ -0,0 +1,87 @@
+/*
+Copyright (c) 2014-2015 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 guest
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"strings"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type start struct {
+	*GuestFlag
+
+	dir  string
+	vars env
+}
+
+type env []string
+
+func (e *env) String() string {
+	return fmt.Sprint(*e)
+}
+
+func (e *env) Set(value string) error {
+	*e = append(*e, value)
+	return nil
+}
+
+func init() {
+	cli.Register("guest.start", &start{})
+}
+
+func (cmd *start) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.GuestFlag, ctx = newGuestFlag(ctx)
+	cmd.GuestFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.dir, "C", "", "The absolute path of the working directory for the program to start")
+	f.Var(&cmd.vars, "e", "Set environment variable (key=val)")
+}
+
+func (cmd *start) Process(ctx context.Context) error {
+	if err := cmd.GuestFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *start) Run(ctx context.Context, f *flag.FlagSet) error {
+	m, err := cmd.ProcessManager()
+	if err != nil {
+		return err
+	}
+
+	spec := types.GuestProgramSpec{
+		ProgramPath:      f.Arg(0),
+		Arguments:        strings.Join(f.Args()[1:], " "),
+		WorkingDirectory: cmd.dir,
+		EnvVariables:     cmd.vars,
+	}
+
+	pid, err := m.StartProgram(ctx, cmd.Auth(), &spec)
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("%d\n", pid)
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/guest/tools.go b/vendor/github.com/vmware/govmomi/govc/vm/guest/tools.go
new file mode 100644
index 0000000000..1e1e36a283
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/guest/tools.go
@@ -0,0 +1,116 @@
+/*
+Copyright (c) 2017 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 guest
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type tools struct {
+	*flags.ClientFlag
+	*flags.SearchFlag
+
+	mount   bool
+	upgrade bool
+	options string
+	unmount bool
+}
+
+func init() {
+	cli.Register("vm.guest.tools", &tools{})
+}
+
+func (cmd *tools) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualMachines)
+	cmd.SearchFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.mount, "mount", false, "Mount tools CD installer in the guest")
+	f.BoolVar(&cmd.upgrade, "upgrade", false, "Upgrade tools in the guest")
+	f.StringVar(&cmd.options, "options", "", "Installer options")
+	f.BoolVar(&cmd.unmount, "unmount", false, "Unmount tools CD installer in the guest")
+}
+
+func (cmd *tools) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.SearchFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *tools) Usage() string {
+	return "VM..."
+}
+
+func (cmd *tools) Description() string {
+	return `Manage guest tools in VM.
+
+Examples:
+  govc vm.guest.tools -mount VM
+  govc vm.guest.tools -unmount VM
+  govc vm.guest.tools -upgrade -options "opt1 opt2" VM`
+}
+
+func (cmd *tools) Upgrade(ctx context.Context, vm *object.VirtualMachine) error {
+	task, err := vm.UpgradeTools(ctx, cmd.options)
+	if err != nil {
+		return err
+	}
+
+	return task.Wait(ctx)
+}
+
+func (cmd *tools) Run(ctx context.Context, f *flag.FlagSet) error {
+	vms, err := cmd.VirtualMachines(f.Args())
+	if err != nil {
+		return err
+	}
+
+	for _, vm := range vms {
+		switch {
+		case cmd.mount:
+			err = vm.MountToolsInstaller(ctx)
+			if err != nil {
+				return err
+			}
+		case cmd.upgrade:
+			err = cmd.Upgrade(ctx, vm)
+			if err != nil {
+				return err
+			}
+		case cmd.unmount:
+			err = vm.UnmountToolsInstaller(ctx)
+			if err != nil {
+				return err
+			}
+		default:
+			return flag.ErrHelp
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/guest/upload.go b/vendor/github.com/vmware/govmomi/govc/vm/guest/upload.go
new file mode 100644
index 0000000000..55dbc620a8
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/guest/upload.go
@@ -0,0 +1,133 @@
+/*
+Copyright (c) 2014-2015 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 guest
+
+import (
+	"bytes"
+	"context"
+	"flag"
+	"io"
+	"os"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/vim25/soap"
+)
+
+type upload struct {
+	*GuestFlag
+	*FileAttrFlag
+
+	overwrite bool
+}
+
+func init() {
+	cli.Register("guest.upload", &upload{})
+}
+
+func (cmd *upload) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.GuestFlag, ctx = newGuestFlag(ctx)
+	cmd.GuestFlag.Register(ctx, f)
+	cmd.FileAttrFlag, ctx = newFileAttrFlag(ctx)
+	cmd.FileAttrFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.overwrite, "f", false, "If set, the guest destination file is clobbered")
+}
+
+func (cmd *upload) Usage() string {
+	return "SOURCE DEST"
+}
+
+func (cmd *upload) Description() string {
+	return `Copy SOURCE from the local system to DEST in the guest VM.
+
+If SOURCE name is "-", read source from stdin.
+
+Examples:
+  govc guest.upload -l user:pass -vm=my-vm ~/.ssh/id_rsa.pub /home/$USER/.ssh/authorized_keys
+  cowsay "have a great day" | govc guest.upload -l user:pass -vm=my-vm - /etc/motd`
+}
+
+func (cmd *upload) Process(ctx context.Context) error {
+	if err := cmd.GuestFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.FileAttrFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *upload) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 2 {
+		return flag.ErrHelp
+	}
+
+	m, err := cmd.FileManager()
+	if err != nil {
+		return err
+	}
+
+	src := f.Arg(0)
+	dst := f.Arg(1)
+
+	var size int64
+	var buf *bytes.Buffer
+
+	if src == "-" {
+		buf = new(bytes.Buffer)
+		size, err = io.Copy(buf, os.Stdin)
+		if err != nil {
+			return err
+		}
+	} else {
+		s, err := os.Stat(src)
+		if err != nil {
+			return err
+		}
+		size = s.Size()
+	}
+
+	url, err := m.InitiateFileTransferToGuest(ctx, cmd.Auth(), dst, cmd.Attr(), size, cmd.overwrite)
+	if err != nil {
+		return err
+	}
+
+	u, err := cmd.ParseURL(url)
+	if err != nil {
+		return err
+	}
+
+	c, err := cmd.Client()
+	if err != nil {
+		return nil
+	}
+
+	p := soap.DefaultUpload
+
+	if buf != nil {
+		p.ContentLength = size
+		return c.Client.Upload(buf, u, &p)
+	}
+
+	if cmd.OutputFlag.TTY {
+		logger := cmd.ProgressLogger("Uploading... ")
+		p.Progress = logger
+		defer logger.Wait()
+	}
+
+	return c.Client.UploadFile(src, u, nil)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/info.go b/vendor/github.com/vmware/govmomi/govc/vm/info.go
new file mode 100644
index 0000000000..2b4535c798
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/info.go
@@ -0,0 +1,345 @@
+/*
+Copyright (c) 2014-2015 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 vm
+
+import (
+	"flag"
+	"fmt"
+	"io"
+	"os"
+	"strings"
+	"text/tabwriter"
+
+	"context"
+
+	"github.com/vmware/govmomi/find"
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/property"
+
+	"github.com/vmware/govmomi/units"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type info struct {
+	*flags.ClientFlag
+	*flags.OutputFlag
+	*flags.SearchFlag
+
+	WaitForIP       bool
+	General         bool
+	ExtraConfig     bool
+	Resources       bool
+	ToolsConfigInfo bool
+}
+
+func init() {
+	cli.Register("vm.info", &info{})
+}
+
+func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualMachines)
+	cmd.SearchFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.WaitForIP, "waitip", false, "Wait for VM to acquire IP address")
+	f.BoolVar(&cmd.General, "g", true, "Show general summary")
+	f.BoolVar(&cmd.ExtraConfig, "e", false, "Show ExtraConfig")
+	f.BoolVar(&cmd.Resources, "r", false, "Show resource summary")
+	f.BoolVar(&cmd.ToolsConfigInfo, "t", false, "Show ToolsConfigInfo")
+}
+
+func (cmd *info) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.SearchFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	vms, err := cmd.VirtualMachines(f.Args())
+	if err != nil {
+		if _, ok := err.(*find.NotFoundError); ok {
+			// Continue with empty VM slice
+		} else {
+			return err
+		}
+	}
+
+	refs := make([]types.ManagedObjectReference, 0, len(vms))
+	for _, vm := range vms {
+		refs = append(refs, vm.Reference())
+	}
+
+	var res infoResult
+	var props []string
+
+	if cmd.OutputFlag.JSON {
+		props = nil // Load everything
+	} else {
+		props = []string{"summary"} // Load summary
+		if cmd.General {
+			props = append(props, "guest.ipAddress")
+		}
+		if cmd.ExtraConfig {
+			props = append(props, "config.extraConfig")
+		}
+		if cmd.Resources {
+			props = append(props, "datastore", "network")
+		}
+		if cmd.ToolsConfigInfo {
+			props = append(props, "config.tools")
+		}
+	}
+
+	pc := property.DefaultCollector(c)
+	if len(refs) != 0 {
+		err = pc.Retrieve(ctx, refs, props, &res.VirtualMachines)
+		if err != nil {
+			return err
+		}
+	}
+
+	if cmd.WaitForIP {
+		for i, vm := range res.VirtualMachines {
+			if vm.Guest == nil || vm.Guest.IpAddress == "" {
+				_, err = vms[i].WaitForIP(ctx)
+				if err != nil {
+					return err
+				}
+				// Reload virtual machine object
+				err = pc.RetrieveOne(ctx, vms[i].Reference(), props, &res.VirtualMachines[i])
+				if err != nil {
+					return err
+				}
+			}
+		}
+	}
+
+	if !cmd.OutputFlag.JSON {
+		res.objects = vms
+		res.cmd = cmd
+		if err = res.collectReferences(pc, ctx); err != nil {
+			return err
+		}
+	}
+
+	return cmd.WriteResult(&res)
+}
+
+type infoResult struct {
+	VirtualMachines []mo.VirtualMachine
+	objects         []*object.VirtualMachine
+	entities        map[types.ManagedObjectReference]string
+	cmd             *info
+}
+
+// collectReferences builds a unique set of MORs to the set of VirtualMachines,
+// so we can collect properties in a single call for each reference type {host,datastore,network}.
+func (r *infoResult) collectReferences(pc *property.Collector, ctx context.Context) error {
+	r.entities = make(map[types.ManagedObjectReference]string) // MOR -> Name map
+
+	var host []mo.HostSystem
+	var network []mo.Network
+	var opaque []mo.OpaqueNetwork
+	var dvp []mo.DistributedVirtualPortgroup
+	var datastore []mo.Datastore
+	// Table to drive inflating refs to their mo.* counterparts (dest)
+	// and save() the Name to r.entities w/o using reflection here.
+	// Note that we cannot use a []mo.ManagedEntity here, since mo.Network has its own 'Name' field,
+	// the mo.Network.ManagedEntity.Name field will not be set.
+	vrefs := map[string]*struct {
+		dest interface{}
+		refs []types.ManagedObjectReference
+		save func()
+	}{
+		"HostSystem": {
+			&host, nil, func() {
+				for _, e := range host {
+					r.entities[e.Reference()] = e.Name
+				}
+			},
+		},
+		"Network": {
+			&network, nil, func() {
+				for _, e := range network {
+					r.entities[e.Reference()] = e.Name
+				}
+			},
+		},
+		"OpaqueNetwork": {
+			&opaque, nil, func() {
+				for _, e := range opaque {
+					r.entities[e.Reference()] = e.Name
+				}
+			},
+		},
+		"DistributedVirtualPortgroup": {
+			&dvp, nil, func() {
+				for _, e := range dvp {
+					r.entities[e.Reference()] = e.Name
+				}
+			},
+		},
+		"Datastore": {
+			&datastore, nil, func() {
+				for _, e := range datastore {
+					r.entities[e.Reference()] = e.Name
+				}
+			},
+		},
+	}
+
+	xrefs := make(map[types.ManagedObjectReference]bool)
+	// Add MOR to vrefs[kind].refs avoiding any duplicates.
+	addRef := func(refs ...types.ManagedObjectReference) {
+		for _, ref := range refs {
+			if _, exists := xrefs[ref]; exists {
+				return
+			}
+			xrefs[ref] = true
+			vref := vrefs[ref.Type]
+			vref.refs = append(vref.refs, ref)
+		}
+	}
+
+	for _, vm := range r.VirtualMachines {
+		if r.cmd.General {
+			if ref := vm.Summary.Runtime.Host; ref != nil {
+				addRef(*ref)
+			}
+		}
+
+		if r.cmd.Resources {
+			addRef(vm.Datastore...)
+			addRef(vm.Network...)
+		}
+	}
+
+	for _, vref := range vrefs {
+		if vref.refs == nil {
+			continue
+		}
+		err := pc.Retrieve(ctx, vref.refs, []string{"name"}, vref.dest)
+		if err != nil {
+			return err
+		}
+		vref.save()
+	}
+
+	return nil
+}
+
+func (r *infoResult) entityNames(refs []types.ManagedObjectReference) string {
+	var names []string
+	for _, ref := range refs {
+		names = append(names, r.entities[ref])
+	}
+	return strings.Join(names, ", ")
+}
+
+func (r *infoResult) Write(w io.Writer) error {
+	// Maintain order via r.objects as Property collector does not always return results in order.
+	objects := make(map[types.ManagedObjectReference]mo.VirtualMachine, len(r.VirtualMachines))
+	for _, o := range r.VirtualMachines {
+		objects[o.Reference()] = o
+	}
+
+	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
+
+	for _, o := range r.objects {
+		vm := objects[o.Reference()]
+		s := vm.Summary
+
+		fmt.Fprintf(tw, "Name:\t%s\n", s.Config.Name)
+
+		if r.cmd.General {
+			hostName := "<unavailable>"
+
+			if href := vm.Summary.Runtime.Host; href != nil {
+				if name, ok := r.entities[*href]; ok {
+					hostName = name
+				}
+			}
+
+			fmt.Fprintf(tw, "  Path:\t%s\n", o.InventoryPath)
+			fmt.Fprintf(tw, "  UUID:\t%s\n", s.Config.Uuid)
+			fmt.Fprintf(tw, "  Guest name:\t%s\n", s.Config.GuestFullName)
+			fmt.Fprintf(tw, "  Memory:\t%dMB\n", s.Config.MemorySizeMB)
+			fmt.Fprintf(tw, "  CPU:\t%d vCPU(s)\n", s.Config.NumCpu)
+			fmt.Fprintf(tw, "  Power state:\t%s\n", s.Runtime.PowerState)
+			fmt.Fprintf(tw, "  Boot time:\t%s\n", s.Runtime.BootTime)
+			fmt.Fprintf(tw, "  IP address:\t%s\n", s.Guest.IpAddress)
+			fmt.Fprintf(tw, "  Host:\t%s\n", hostName)
+		}
+
+		if r.cmd.Resources {
+			if s.Storage == nil {
+				s.Storage = new(types.VirtualMachineStorageSummary)
+			}
+			fmt.Fprintf(tw, "  CPU usage:\t%dMHz\n", s.QuickStats.OverallCpuUsage)
+			fmt.Fprintf(tw, "  Host memory usage:\t%dMB\n", s.QuickStats.HostMemoryUsage)
+			fmt.Fprintf(tw, "  Guest memory usage:\t%dMB\n", s.QuickStats.GuestMemoryUsage)
+			fmt.Fprintf(tw, "  Storage uncommitted:\t%s\n", units.ByteSize(s.Storage.Uncommitted))
+			fmt.Fprintf(tw, "  Storage committed:\t%s\n", units.ByteSize(s.Storage.Committed))
+			fmt.Fprintf(tw, "  Storage unshared:\t%s\n", units.ByteSize(s.Storage.Unshared))
+			fmt.Fprintf(tw, "  Storage:\t%s\n", r.entityNames(vm.Datastore))
+			fmt.Fprintf(tw, "  Network:\t%s\n", r.entityNames(vm.Network))
+		}
+
+		if r.cmd.ExtraConfig {
+			fmt.Fprintf(tw, "  ExtraConfig:\n")
+			for _, v := range vm.Config.ExtraConfig {
+				fmt.Fprintf(tw, "    %s:\t%s\n", v.GetOptionValue().Key, v.GetOptionValue().Value)
+			}
+		}
+
+		if r.cmd.ToolsConfigInfo {
+			t := vm.Config.Tools
+			fmt.Fprintf(tw, "  ToolsConfigInfo:\n")
+			fmt.Fprintf(tw, "    ToolsVersion:\t%d\n", t.ToolsVersion)
+			fmt.Fprintf(tw, "    AfterPowerOn:\t%s\n", flags.NewOptionalBool(&t.AfterPowerOn).String())
+			fmt.Fprintf(tw, "    AfterResume:\t%s\n", flags.NewOptionalBool(&t.AfterResume).String())
+			fmt.Fprintf(tw, "    BeforeGuestStandby:\t%s\n", flags.NewOptionalBool(&t.BeforeGuestStandby).String())
+			fmt.Fprintf(tw, "    BeforeGuestShutdown:\t%s\n", flags.NewOptionalBool(&t.BeforeGuestShutdown).String())
+			fmt.Fprintf(tw, "    BeforeGuestReboot:\t%s\n", flags.NewOptionalBool(&t.BeforeGuestReboot).String())
+			fmt.Fprintf(tw, "    ToolsUpgradePolicy:\t%s\n", t.ToolsUpgradePolicy)
+			fmt.Fprintf(tw, "    PendingCustomization:\t%s\n", t.PendingCustomization)
+			fmt.Fprintf(tw, "    SyncTimeWithHost:\t%s\n", flags.NewOptionalBool(&t.SyncTimeWithHost).String())
+		}
+	}
+
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/ip.go b/vendor/github.com/vmware/govmomi/govc/vm/ip.go
new file mode 100644
index 0000000000..696d2f7082
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/ip.go
@@ -0,0 +1,175 @@
+/*
+Copyright (c) 2014-2015 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 vm
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/govc/host/esxcli"
+	"github.com/vmware/govmomi/object"
+)
+
+type ip struct {
+	*flags.OutputFlag
+	*flags.SearchFlag
+
+	esx bool
+	all bool
+	v4  bool
+	nic string
+}
+
+func init() {
+	cli.Register("vm.ip", &ip{})
+}
+
+func (cmd *ip) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+
+	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualMachines)
+	cmd.SearchFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.esx, "esxcli", false, "Use esxcli instead of guest tools")
+	f.BoolVar(&cmd.all, "a", false, "Wait for an IP address on all NICs")
+	f.StringVar(&cmd.nic, "n", "", "Wait for IP address on NIC, specified by device name or MAC")
+	f.BoolVar(&cmd.v4, "v4", false, "Only report IPv4 addresses")
+}
+
+func (cmd *ip) Usage() string {
+	return "VM..."
+}
+
+func (cmd *ip) Description() string {
+	return `List IPs for VM.
+
+By default the vm.ip command depends on vmware-tools to report the 'guest.ipAddress' field and will
+wait until it has done so.  This value can also be obtained using:
+
+  govc vm.info -json $vm | jq -r .VirtualMachines[].Guest.IpAddress
+
+When given the '-a' flag, only IP addresses for which there is a corresponding virtual nic are listed.
+If there are multiple nics, the listed addresses will be comma delimited.  The '-a' flag depends on
+vmware-tools to report the 'guest.net' field and will wait until it has done so for all nics.
+Note that this list includes IPv6 addresses if any, use '-v4' to filter them out.  IP addresses reported
+by tools for which there is no virtual nic are not included, for example that of the 'docker0' interface.
+
+These values can also be obtained using:
+
+  govc vm.info -json $vm | jq -r .VirtualMachines[].Guest.Net[].IpConfig.IpAddress[].IpAddress
+
+When given the '-n' flag, filters '-a' behavior to the nic specified by MAC address or device name.
+
+The 'esxcli' flag does not require vmware-tools to be installed, but does require the ESX host to
+have the /Net/GuestIPHack setting enabled.
+
+Examples:
+  govc vm.ip $vm
+  govc vm.ip -a -v4 $vm
+  govc vm.ip -n 00:0c:29:57:7b:c3 $vm
+  govc vm.ip -n ethernet-0 $vm
+  govc host.esxcli system settings advanced set -o /Net/GuestIPHack -i 1
+  govc vm.ip -esxcli $vm`
+}
+
+func (cmd *ip) Process(ctx context.Context) error {
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.SearchFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *ip) Run(ctx context.Context, f *flag.FlagSet) error {
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	vms, err := cmd.VirtualMachines(f.Args())
+	if err != nil {
+		return err
+	}
+
+	var get func(*object.VirtualMachine) (string, error)
+
+	if cmd.esx {
+		get = func(vm *object.VirtualMachine) (string, error) {
+			guest := esxcli.NewGuestInfo(c)
+
+			ticker := time.NewTicker(time.Millisecond * 500)
+			defer ticker.Stop()
+
+			for {
+				select {
+				case <-ticker.C:
+					ip, err := guest.IpAddress(vm)
+					if err != nil {
+						return "", err
+					}
+
+					if ip != "0.0.0.0" {
+						return ip, nil
+					}
+				}
+			}
+		}
+	} else {
+		var hwaddr []string
+		if cmd.nic != "" {
+			hwaddr = strings.Split(cmd.nic, ",")
+		}
+
+		get = func(vm *object.VirtualMachine) (string, error) {
+			if cmd.all || hwaddr != nil {
+				macs, err := vm.WaitForNetIP(ctx, cmd.v4, hwaddr...)
+				if err != nil {
+					return "", err
+				}
+
+				var ips []string
+				for _, addrs := range macs {
+					for _, ip := range addrs {
+						ips = append(ips, ip)
+					}
+				}
+				return strings.Join(ips, ","), nil
+			}
+			return vm.WaitForIP(ctx)
+		}
+	}
+
+	for _, vm := range vms {
+		ip, err := get(vm)
+		if err != nil {
+			return err
+		}
+
+		// TODO(PN): Display inventory path to VM
+		fmt.Fprintf(cmd, "%s\n", ip)
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/markastemplate.go b/vendor/github.com/vmware/govmomi/govc/vm/markastemplate.go
new file mode 100644
index 0000000000..eccfb77e01
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/markastemplate.go
@@ -0,0 +1,72 @@
+/*
+Copyright (c) 2014-2015 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 vm
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type markastemplate struct {
+	*flags.SearchFlag
+}
+
+func init() {
+	cli.Register("vm.markastemplate", &markastemplate{})
+}
+
+func (cmd *markastemplate) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualMachines)
+	cmd.SearchFlag.Register(ctx, f)
+}
+
+func (cmd *markastemplate) Process(ctx context.Context) error {
+	if err := cmd.SearchFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *markastemplate) Usage() string {
+	return "VM..."
+}
+
+func (cmd *markastemplate) Description() string {
+	return `Mark VM as a virtual machine template.
+
+Examples:
+  govc vm.markastemplate $name`
+}
+
+func (cmd *markastemplate) Run(ctx context.Context, f *flag.FlagSet) error {
+	vms, err := cmd.VirtualMachines(f.Args())
+	if err != nil {
+		return err
+	}
+
+	for _, vm := range vms {
+		err := vm.MarkAsTemplate(ctx)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/markasvm.go b/vendor/github.com/vmware/govmomi/govc/vm/markasvm.go
new file mode 100644
index 0000000000..0297863059
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/markasvm.go
@@ -0,0 +1,106 @@
+/*
+Copyright (c) 2014-2015 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 vm
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type markasvm struct {
+	*flags.SearchFlag
+	*flags.ResourcePoolFlag
+	*flags.HostSystemFlag
+}
+
+func init() {
+	cli.Register("vm.markasvm", &markasvm{})
+}
+
+func (cmd *markasvm) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualMachines)
+	cmd.SearchFlag.Register(ctx, f)
+	cmd.ResourcePoolFlag, ctx = flags.NewResourcePoolFlag(ctx)
+	cmd.ResourcePoolFlag.Register(ctx, f)
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+}
+
+func (cmd *markasvm) Process(ctx context.Context) error {
+	if err := cmd.SearchFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.ResourcePoolFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *markasvm) Usage() string {
+	return "VM..."
+}
+
+func (cmd *markasvm) Description() string {
+	return `Mark VM template as a virtual machine.
+
+Examples:
+  govc vm.markasvm $name -host host1
+  govc vm.markasvm $name -pool cluster1/Resources`
+}
+
+func (cmd *markasvm) Run(ctx context.Context, f *flag.FlagSet) error {
+	vms, err := cmd.VirtualMachines(f.Args())
+	if err != nil {
+		return err
+	}
+
+	pool, err := cmd.ResourcePoolIfSpecified()
+	if err != nil {
+		return err
+	}
+
+	host, err := cmd.HostSystemFlag.HostSystemIfSpecified()
+	if err != nil {
+		return err
+	}
+
+	if pool == nil {
+		if host == nil {
+			return flag.ErrHelp
+		}
+
+		pool, err = host.ResourcePool(ctx)
+		if err != nil {
+			return err
+		}
+	}
+
+	for _, vm := range vms {
+		err := vm.MarkAsVirtualMachine(ctx, *pool, host)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/migrate.go b/vendor/github.com/vmware/govmomi/govc/vm/migrate.go
new file mode 100644
index 0000000000..86d114a766
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/migrate.go
@@ -0,0 +1,147 @@
+/*
+Copyright (c) 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 vm
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type migrate struct {
+	*flags.ResourcePoolFlag
+	*flags.HostSystemFlag
+	*flags.DatastoreFlag
+	*flags.SearchFlag
+
+	priority types.VirtualMachineMovePriority
+	spec     types.VirtualMachineRelocateSpec
+}
+
+func init() {
+	cli.Register("vm.migrate", &migrate{})
+}
+
+func (cmd *migrate) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualMachines)
+	cmd.SearchFlag.Register(ctx, f)
+
+	cmd.ResourcePoolFlag, ctx = flags.NewResourcePoolFlag(ctx)
+	cmd.ResourcePoolFlag.Register(ctx, f)
+
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+
+	f.StringVar((*string)(&cmd.priority), "priority", string(types.VirtualMachineMovePriorityDefaultPriority), "The task priority")
+}
+
+func (cmd *migrate) Process(ctx context.Context) error {
+	if err := cmd.ResourcePoolFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (cmd *migrate) Usage() string {
+	return "VM..."
+}
+
+func (cmd *migrate) Description() string {
+	return `Migrates VM to a specific resource pool, host or datastore.
+
+Examples:
+  govc vm.migrate -host another-host vm-1 vm-2 vm-3
+  govc vm.migrate -ds another-ds vm-1 vm-2 vm-3`
+}
+
+func (cmd *migrate) relocate(ctx context.Context, vm *object.VirtualMachine) error {
+	task, err := vm.Relocate(ctx, cmd.spec, cmd.priority)
+	if err != nil {
+		return err
+	}
+
+	logger := cmd.DatastoreFlag.ProgressLogger(fmt.Sprintf("migrating %s... ", vm.Reference()))
+	_, err = task.WaitForResult(ctx, logger)
+	if err != nil {
+		return err
+	}
+
+	logger.Wait()
+
+	return nil
+}
+
+func (cmd *migrate) Run(ctx context.Context, f *flag.FlagSet) error {
+	vms, err := cmd.VirtualMachines(f.Args())
+	if err != nil {
+		return err
+	}
+
+	host, err := cmd.HostSystemFlag.HostSystemIfSpecified()
+	if err != nil {
+		return err
+	}
+
+	if host != nil {
+		ref := host.Reference()
+		cmd.spec.Host = &ref
+	}
+
+	pool, err := cmd.ResourcePoolFlag.ResourcePoolIfSpecified()
+	if err != nil {
+		return err
+	}
+
+	if pool != nil {
+		ref := pool.Reference()
+		cmd.spec.Pool = &ref
+	}
+
+	ds, err := cmd.DatastoreFlag.DatastoreIfSpecified()
+	if err != nil {
+		return err
+	}
+
+	if ds != nil {
+		ref := ds.Reference()
+		cmd.spec.Datastore = &ref
+	}
+
+	for _, vm := range vms {
+		err = cmd.relocate(ctx, vm)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/network/add.go b/vendor/github.com/vmware/govmomi/govc/vm/network/add.go
new file mode 100644
index 0000000000..73330fe8c0
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/network/add.go
@@ -0,0 +1,83 @@
+/*
+Copyright (c) 2014-2015 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 network
+
+import (
+	"context"
+	"errors"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type add struct {
+	*flags.VirtualMachineFlag
+	*flags.NetworkFlag
+}
+
+func init() {
+	cli.Register("vm.network.add", &add{})
+}
+
+func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+	cmd.NetworkFlag, ctx = flags.NewNetworkFlag(ctx)
+	cmd.NetworkFlag.Register(ctx, f)
+}
+
+func (cmd *add) Description() string {
+	return `Add network adapter to VM.
+
+Examples:
+  govc vm.network.add -vm $vm -net "VM Network" -net.adapter e1000e
+  govc device.info -vm $vm ethernet-*`
+}
+
+func (cmd *add) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.NetworkFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachineFlag.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return errors.New("please specify a vm")
+	}
+
+	// Set network if specified as extra argument.
+	if f.NArg() > 0 {
+		_ = cmd.NetworkFlag.Set(f.Arg(0))
+	}
+
+	net, err := cmd.NetworkFlag.Device()
+	if err != nil {
+		return err
+	}
+
+	return vm.AddDevice(ctx, net)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/network/change.go b/vendor/github.com/vmware/govmomi/govc/vm/network/change.go
new file mode 100644
index 0000000000..00e4708a51
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/network/change.go
@@ -0,0 +1,120 @@
+/*
+Copyright (c) 2014-2015 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 network
+
+import (
+	"context"
+	"errors"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type change struct {
+	*flags.VirtualMachineFlag
+	*flags.NetworkFlag
+}
+
+func init() {
+	cli.Register("vm.network.change", &change{})
+}
+
+func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+	cmd.NetworkFlag, ctx = flags.NewNetworkFlag(ctx)
+	cmd.NetworkFlag.Register(ctx, f)
+}
+
+func (cmd *change) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.NetworkFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *change) Usage() string {
+	return "DEVICE"
+}
+
+func (cmd *change) Description() string {
+	return `Change network DEVICE configuration.
+
+Examples:
+  govc vm.network.change -vm $vm -net PG2 ethernet-0
+  govc vm.network.change -vm $vm -net.address 00:00:0f:2e:5d:69 ethernet-0
+  govc device.info -vm $vm ethernet-*`
+}
+
+func (cmd *change) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachineFlag.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return errors.New("please specify a vm")
+	}
+
+	name := f.Arg(0)
+
+	if name == "" {
+		return errors.New("please specify a device name")
+	}
+
+	// Set network if specified as extra argument.
+	if f.NArg() > 1 {
+		_ = cmd.NetworkFlag.Set(f.Arg(1))
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	net := devices.Find(name)
+
+	if net == nil {
+		return fmt.Errorf("device '%s' not found", name)
+	}
+
+	dev, err := cmd.NetworkFlag.Device()
+	if err != nil {
+		return err
+	}
+
+	current := net.(types.BaseVirtualEthernetCard).GetVirtualEthernetCard()
+	changed := dev.(types.BaseVirtualEthernetCard).GetVirtualEthernetCard()
+
+	current.Backing = changed.Backing
+
+	if changed.MacAddress != "" {
+		current.MacAddress = changed.MacAddress
+	}
+
+	if changed.AddressType != "" {
+		current.AddressType = changed.AddressType
+	}
+
+	return vm.EditDevice(ctx, net)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/power.go b/vendor/github.com/vmware/govmomi/govc/vm/power.go
new file mode 100644
index 0000000000..f38380b0cf
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/power.go
@@ -0,0 +1,160 @@
+/*
+Copyright (c) 2014-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 vm
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type power struct {
+	*flags.ClientFlag
+	*flags.SearchFlag
+
+	On       bool
+	Off      bool
+	Reset    bool
+	Reboot   bool
+	Shutdown bool
+	Suspend  bool
+	Force    bool
+}
+
+func init() {
+	cli.Register("vm.power", &power{})
+}
+
+func (cmd *power) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualMachines)
+	cmd.SearchFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.On, "on", false, "Power on")
+	f.BoolVar(&cmd.Off, "off", false, "Power off")
+	f.BoolVar(&cmd.Reset, "reset", false, "Power reset")
+	f.BoolVar(&cmd.Suspend, "suspend", false, "Power suspend")
+	f.BoolVar(&cmd.Reboot, "r", false, "Reboot guest")
+	f.BoolVar(&cmd.Shutdown, "s", false, "Shutdown guest")
+	f.BoolVar(&cmd.Force, "force", false, "Force (ignore state error and hard shutdown/reboot if tools unavailable)")
+}
+
+func (cmd *power) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.SearchFlag.Process(ctx); err != nil {
+		return err
+	}
+	opts := []bool{cmd.On, cmd.Off, cmd.Reset, cmd.Suspend, cmd.Reboot, cmd.Shutdown}
+	selected := false
+
+	for _, opt := range opts {
+		if opt {
+			if selected {
+				return flag.ErrHelp
+			}
+			selected = opt
+		}
+	}
+
+	if !selected {
+		return flag.ErrHelp
+	}
+
+	return nil
+}
+
+func isToolsUnavailable(err error) bool {
+	if soap.IsSoapFault(err) {
+		soapFault := soap.ToSoapFault(err)
+		if _, ok := soapFault.VimFault().(types.ToolsUnavailable); ok {
+			return ok
+		}
+	}
+
+	return false
+}
+
+func (cmd *power) Run(ctx context.Context, f *flag.FlagSet) error {
+	vms, err := cmd.VirtualMachines(f.Args())
+	if err != nil {
+		return err
+	}
+
+	for _, vm := range vms {
+		var task *object.Task
+
+		switch {
+		case cmd.On:
+			fmt.Fprintf(cmd, "Powering on %s... ", vm.Reference())
+			task, err = vm.PowerOn(ctx)
+		case cmd.Off:
+			fmt.Fprintf(cmd, "Powering off %s... ", vm.Reference())
+			task, err = vm.PowerOff(ctx)
+		case cmd.Reset:
+			fmt.Fprintf(cmd, "Reset %s... ", vm.Reference())
+			task, err = vm.Reset(ctx)
+		case cmd.Suspend:
+			fmt.Fprintf(cmd, "Suspend %s... ", vm.Reference())
+			task, err = vm.Suspend(ctx)
+		case cmd.Reboot:
+			fmt.Fprintf(cmd, "Reboot guest %s... ", vm.Reference())
+			err = vm.RebootGuest(ctx)
+
+			if err != nil && cmd.Force && isToolsUnavailable(err) {
+				task, err = vm.Reset(ctx)
+			}
+		case cmd.Shutdown:
+			fmt.Fprintf(cmd, "Shutdown guest %s... ", vm.Reference())
+			err = vm.ShutdownGuest(ctx)
+
+			if err != nil && cmd.Force && isToolsUnavailable(err) {
+				task, err = vm.PowerOff(ctx)
+			}
+		}
+
+		if err != nil {
+			return err
+		}
+
+		if task != nil {
+			err = task.Wait(ctx)
+		}
+		if err == nil {
+			fmt.Fprintf(cmd, "OK\n")
+			continue
+		}
+
+		if cmd.Force {
+			fmt.Fprintf(cmd, "Error: %s\n", err)
+			continue
+		}
+
+		return err
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/question.go b/vendor/github.com/vmware/govmomi/govc/vm/question.go
new file mode 100644
index 0000000000..a8bcd296c7
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/question.go
@@ -0,0 +1,98 @@
+/*
+Copyright (c) 2014-2015 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 vm
+
+import (
+	"context"
+	"errors"
+	"flag"
+	"fmt"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type question struct {
+	*flags.VirtualMachineFlag
+
+	answer string
+}
+
+func init() {
+	cli.Register("vm.question", &question{})
+}
+
+func (cmd *question) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.answer, "answer", "", "Answer to question")
+}
+
+func (cmd *question) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *question) Run(ctx context.Context, f *flag.FlagSet) error {
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return errors.New("No VM specified")
+	}
+
+	var mvm mo.VirtualMachine
+
+	pc := property.DefaultCollector(c)
+	err = pc.RetrieveOne(ctx, vm.Reference(), []string{"runtime.question"}, &mvm)
+	if err != nil {
+		return err
+	}
+
+	q := mvm.Runtime.Question
+	if q == nil {
+		fmt.Printf("No pending question\n")
+		return nil
+	}
+
+	// Print question if no answer is specified
+	if cmd.answer == "" {
+		fmt.Printf("Question:\n%s\n\n", q.Text)
+		fmt.Printf("Possible answers:\n")
+		for _, e := range q.Choice.ChoiceInfo {
+			ed := e.(*types.ElementDescription)
+			fmt.Printf("%s) %s\n", ed.Key, ed.Description.Label)
+		}
+		return nil
+	}
+
+	// Answer question
+	return vm.Answer(ctx, q.Id, cmd.answer)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/rdm/attach.go b/vendor/github.com/vmware/govmomi/govc/vm/rdm/attach.go
new file mode 100644
index 0000000000..9c7ee28634
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/rdm/attach.go
@@ -0,0 +1,149 @@
+/*
+Copyright (c) 2017 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 rdm
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"strings"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type attach struct {
+	*flags.VirtualMachineFlag
+
+	device string
+}
+
+func init() {
+	cli.Register("vm.rdm.attach", &attach{})
+}
+
+func (cmd *attach) Register(ctx context.Context, f *flag.FlagSet) {
+
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.device, "device", "", "Device Name")
+}
+
+func (cmd *attach) Description() string {
+	return `Attach DEVICE to VM with RDM.
+
+Examples:
+  govc vm.rdm.attach -vm VM -device /vmfs/devices/disks/naa.000000000000000000000000000000000`
+}
+
+func (cmd *attach) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+//This piece of code was developped mainly thanks to the project govmax on github.com
+//This file in particular https://github.com/codedellemc/govmax/blob/master/api/v1/vmomi.go
+func (cmd *attach) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	controller, err := devices.FindSCSIController("")
+	if err != nil {
+		return err
+	}
+
+	vmConfigOptions, err := vm.QueryConfigTarget(ctx)
+	if err != nil {
+		return err
+	}
+
+	for _, scsiDisk := range vmConfigOptions.ScsiDisk {
+		if !strings.Contains(scsiDisk.Disk.CanonicalName, cmd.device) {
+			continue
+		}
+		var backing types.VirtualDiskRawDiskMappingVer1BackingInfo
+		backing.CompatibilityMode = string(types.VirtualDiskCompatibilityModePhysicalMode)
+		backing.DeviceName = scsiDisk.Disk.DeviceName
+		for _, descriptor := range scsiDisk.Disk.Descriptor {
+			if strings.HasPrefix(descriptor.Id, "vml.") {
+				backing.LunUuid = descriptor.Id
+				break
+			}
+		}
+		var device types.VirtualDisk
+		device.Backing = &backing
+		device.ControllerKey = controller.VirtualController.Key
+
+		var unitNumber *int32
+		scsiCtrlUnitNumber := controller.VirtualController.UnitNumber
+		var u int32
+		for u = 0; u < 16; u++ {
+			free := true
+			for _, d := range devices {
+				if d.GetVirtualDevice().ControllerKey == device.GetVirtualDevice().ControllerKey {
+					if u == *(d.GetVirtualDevice().UnitNumber) || u == *scsiCtrlUnitNumber {
+						free = false
+					}
+				}
+			}
+			if free {
+				unitNumber = &u
+				break
+			}
+		}
+		device.UnitNumber = unitNumber
+
+		spec := types.VirtualMachineConfigSpec{}
+
+		config := &types.VirtualDeviceConfigSpec{
+			Device:    &device,
+			Operation: types.VirtualDeviceConfigSpecOperationAdd,
+		}
+
+		config.FileOperation = types.VirtualDeviceConfigSpecFileOperationCreate
+
+		spec.DeviceChange = append(spec.DeviceChange, config)
+
+		task, err := vm.Reconfigure(ctx, spec)
+		if err != nil {
+			return err
+		}
+
+		err = task.Wait(ctx)
+		if err != nil {
+			return fmt.Errorf("Error adding device %+v \n with backing %+v \nLogged Item:  %s", device, backing, err)
+		}
+		return nil
+
+	}
+	return fmt.Errorf("Error: No LUN with device name containing %s found", cmd.device)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/rdm/ls.go b/vendor/github.com/vmware/govmomi/govc/vm/rdm/ls.go
new file mode 100644
index 0000000000..1d5373f5dc
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/rdm/ls.go
@@ -0,0 +1,109 @@
+/*
+Copyright (c) 2017 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 rdm
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"os"
+	"strings"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type ls struct {
+	*flags.VirtualMachineFlag
+	*flags.OutputFlag
+}
+
+func init() {
+	cli.Register("vm.rdm.ls", &ls{})
+}
+
+func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
+
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
+	cmd.OutputFlag.Register(ctx, f)
+}
+
+func (cmd *ls) Description() string {
+	return `List available devices that could be attach to VM with RDM.
+
+Examples:
+  govc vm.rdm.ls -vm VM`
+}
+
+func (cmd *ls) Process(ctx context.Context) error {
+
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.OutputFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	vmConfigOptions, err := vm.QueryConfigTarget(ctx)
+	if err != nil {
+		return err
+	}
+
+	res := infoResult{
+		Disks: vmConfigOptions.ScsiDisk,
+	}
+	return cmd.WriteResult(&res)
+}
+
+type infoResult struct {
+	Disks []types.VirtualMachineScsiDiskDeviceInfo
+}
+
+func (r *infoResult) Write(w io.Writer) error {
+	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
+	for _, disk := range r.Disks {
+		fmt.Fprintf(tw, "Name:\t%s\n", disk.Name)
+		fmt.Fprintf(tw, "  Device name:\t%s\n", disk.Disk.DeviceName)
+		fmt.Fprintf(tw, "  Device path:\t%s\n", disk.Disk.DevicePath)
+		fmt.Fprintf(tw, "  Canonical Name:\t%s\n", disk.Disk.CanonicalName)
+
+		var uids []string
+		for _, descriptor := range disk.Disk.Descriptor {
+			uids = append(uids, descriptor.Id)
+		}
+
+		fmt.Fprintf(tw, "  UIDS:\t%s\n", strings.Join(uids, " ,"))
+	}
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/register.go b/vendor/github.com/vmware/govmomi/govc/vm/register.go
new file mode 100644
index 0000000000..56dcc6a842
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/register.go
@@ -0,0 +1,160 @@
+/*
+Copyright (c) 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 vm
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25"
+)
+
+type register struct {
+	*flags.ClientFlag
+	*flags.DatacenterFlag
+	*flags.DatastoreFlag
+	*flags.ResourcePoolFlag
+	*flags.HostSystemFlag
+	*flags.FolderFlag
+
+	name     string
+	template bool
+
+	Client       *vim25.Client
+	Datacenter   *object.Datacenter
+	Datastore    *object.Datastore
+	ResourcePool *object.ResourcePool
+	HostSystem   *object.HostSystem
+	Folder       *object.Folder
+}
+
+func init() {
+	cli.Register("vm.register", &register{})
+}
+
+func (cmd *register) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
+	cmd.DatacenterFlag.Register(ctx, f)
+
+	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
+	cmd.DatastoreFlag.Register(ctx, f)
+
+	cmd.ResourcePoolFlag, ctx = flags.NewResourcePoolFlag(ctx)
+	cmd.ResourcePoolFlag.Register(ctx, f)
+
+	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
+	cmd.HostSystemFlag.Register(ctx, f)
+
+	cmd.FolderFlag, ctx = flags.NewFolderFlag(ctx)
+	cmd.FolderFlag.Register(ctx, f)
+
+	f.StringVar(&cmd.name, "name", "", "Name of the VM")
+	f.BoolVar(&cmd.template, "as-template", false, "Mark VM as template")
+}
+
+func (cmd *register) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.ResourcePoolFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.FolderFlag.Process(ctx); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (cmd *register) Usage() string {
+	return "VMX"
+}
+
+func (cmd *register) Description() string {
+	return `Add an existing VM to the inventory.
+
+VMX is a path to the vm config file, relative to DATASTORE.
+
+Examples:
+  govc vm.register path/name.vmx`
+}
+
+func (cmd *register) Run(ctx context.Context, f *flag.FlagSet) error {
+	var err error
+
+	if len(f.Args()) != 1 {
+		return flag.ErrHelp
+	}
+
+	cmd.Client, err = cmd.ClientFlag.Client()
+	if err != nil {
+		return err
+	}
+
+	cmd.Datacenter, err = cmd.DatacenterFlag.Datacenter()
+	if err != nil {
+		return err
+	}
+
+	cmd.Datastore, err = cmd.DatastoreFlag.Datastore()
+	if err != nil {
+		return err
+	}
+
+	cmd.HostSystem, err = cmd.HostSystemFlag.HostSystemIfSpecified()
+	if err != nil {
+		return err
+	}
+
+	if cmd.HostSystem != nil {
+		if cmd.ResourcePool, err = cmd.HostSystem.ResourcePool(ctx); err != nil {
+			return err
+		}
+	} else if !cmd.template {
+		if cmd.ResourcePool, err = cmd.ResourcePoolFlag.ResourcePool(); err != nil {
+			return err
+		}
+	}
+
+	if cmd.Folder, err = cmd.FolderFlag.Folder(); err != nil {
+		return err
+	}
+
+	path := cmd.Datastore.Path(f.Arg(0))
+
+	task, err := cmd.Folder.RegisterVM(ctx, path, cmd.name, cmd.template, cmd.ResourcePool, cmd.HostSystem)
+	if err != nil {
+		return err
+	}
+
+	return task.Wait(ctx)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/snapshot/create.go b/vendor/github.com/vmware/govmomi/govc/vm/snapshot/create.go
new file mode 100644
index 0000000000..bc50c3e36b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/snapshot/create.go
@@ -0,0 +1,86 @@
+/*
+Copyright (c) 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 snapshot
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type create struct {
+	*flags.VirtualMachineFlag
+
+	description string
+	memory      bool
+	quiesce     bool
+}
+
+func init() {
+	cli.Register("snapshot.create", &create{})
+}
+
+func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.memory, "m", true, "Include memory state")
+	f.BoolVar(&cmd.quiesce, "q", false, "Quiesce guest file system")
+	f.StringVar(&cmd.description, "d", "", "Snapshot description")
+}
+
+func (cmd *create) Usage() string {
+	return "NAME"
+}
+
+func (cmd *create) Description() string {
+	return `Create snapshot of VM with NAME.
+
+Examples:
+  govc snapshot.create -vm my-vm happy-vm-state`
+}
+
+func (cmd *create) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 1 {
+		return flag.ErrHelp
+	}
+
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	task, err := vm.CreateSnapshot(ctx, f.Arg(0), cmd.description, cmd.memory, cmd.quiesce)
+	if err != nil {
+		return err
+	}
+
+	return task.Wait(ctx)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/snapshot/remove.go b/vendor/github.com/vmware/govmomi/govc/vm/snapshot/remove.go
new file mode 100644
index 0000000000..b71fd9f06c
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/snapshot/remove.go
@@ -0,0 +1,94 @@
+/*
+Copyright (c) 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 snapshot
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type remove struct {
+	*flags.VirtualMachineFlag
+
+	recursive   bool
+	consolidate bool
+}
+
+func init() {
+	cli.Register("snapshot.remove", &remove{})
+}
+
+func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.recursive, "r", false, "Remove snapshot children")
+	f.BoolVar(&cmd.consolidate, "c", true, "Consolidate disks")
+}
+
+func (cmd *remove) Usage() string {
+	return "NAME"
+}
+
+func (cmd *remove) Description() string {
+	return `Remove snapshot of VM with given NAME.
+
+NAME can be the snapshot name, tree path, moid or '*' to remove all snapshots.
+
+Examples:
+  govc snapshot.remove -vm my-vm happy-vm-state`
+}
+
+func (cmd *remove) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 1 {
+		return flag.ErrHelp
+	}
+
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	var task *object.Task
+
+	if f.Arg(0) == "*" {
+		task, err = vm.RemoveAllSnapshot(ctx, &cmd.consolidate)
+	} else {
+		task, err = vm.RemoveSnapshot(ctx, f.Arg(0), cmd.recursive, &cmd.consolidate)
+	}
+
+	if err != nil {
+		return err
+	}
+
+	return task.Wait(ctx)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/snapshot/revert.go b/vendor/github.com/vmware/govmomi/govc/vm/snapshot/revert.go
new file mode 100644
index 0000000000..da89b0ccf6
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/snapshot/revert.go
@@ -0,0 +1,93 @@
+/*
+Copyright (c) 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 snapshot
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+)
+
+type revert struct {
+	*flags.VirtualMachineFlag
+
+	suppressPowerOn bool
+}
+
+func init() {
+	cli.Register("snapshot.revert", &revert{})
+}
+
+func (cmd *revert) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.suppressPowerOn, "s", false, "Suppress power on")
+}
+
+func (cmd *revert) Usage() string {
+	return "[NAME]"
+}
+
+func (cmd *revert) Description() string {
+	return `Revert to snapshot of VM with given NAME.
+
+If NAME is not provided, revert to the current snapshot.
+Otherwise, NAME can be the snapshot name, tree path or moid.
+
+Examples:
+  govc snapshot.revert -vm my-vm happy-vm-state`
+}
+
+func (cmd *revert) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *revert) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() > 1 {
+		return flag.ErrHelp
+	}
+
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	var task *object.Task
+
+	if f.NArg() == 1 {
+		task, err = vm.RevertToSnapshot(ctx, f.Arg(0), cmd.suppressPowerOn)
+	} else {
+		task, err = vm.RevertToCurrentSnapshot(ctx, cmd.suppressPowerOn)
+	}
+
+	if err != nil {
+		return err
+	}
+
+	return task.Wait(ctx)
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/snapshot/tree.go b/vendor/github.com/vmware/govmomi/govc/vm/snapshot/tree.go
new file mode 100644
index 0000000000..9dcae0bf8f
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/snapshot/tree.go
@@ -0,0 +1,145 @@
+/*
+Copyright (c) 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 snapshot
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"path"
+	"strings"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type tree struct {
+	*flags.VirtualMachineFlag
+
+	fullPath bool
+	current  bool
+	date     bool
+	id       bool
+
+	info *types.VirtualMachineSnapshotInfo
+}
+
+func init() {
+	cli.Register("snapshot.tree", &tree{})
+}
+
+func (cmd *tree) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.fullPath, "f", false, "Print the full path prefix for snapshot")
+	f.BoolVar(&cmd.current, "c", true, "Print the current snapshot")
+	f.BoolVar(&cmd.date, "D", false, "Print the snapshot creation date")
+	f.BoolVar(&cmd.id, "i", false, "Print the snapshot id")
+}
+
+func (cmd *tree) Description() string {
+	return `List VM snapshots in a tree-like format.
+
+The command will exit 0 with no output if VM does not have any snapshots.
+
+Examples:
+  govc snapshot.tree -vm my-vm
+  govc snapshot.tree -vm my-vm -D -i`
+}
+
+func (cmd *tree) Process(ctx context.Context) error {
+	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *tree) write(level int, parent string, st []types.VirtualMachineSnapshotTree) {
+	for _, s := range st {
+		sname := s.Name
+
+		if cmd.fullPath && parent != "" {
+			sname = path.Join(parent, sname)
+		}
+
+		names := []string{sname}
+
+		if cmd.current && s.Snapshot == *cmd.info.CurrentSnapshot {
+			names = append(names, ".")
+		}
+
+		for _, name := range names {
+			var attr []string
+			var meta string
+
+			if cmd.id {
+				attr = append(attr, s.Snapshot.Value)
+			}
+
+			if cmd.date {
+				attr = append(attr, s.CreateTime.Format("Jan 2 15:04"))
+			}
+
+			if len(attr) > 0 {
+				meta = fmt.Sprintf("[%s]  ", strings.Join(attr, " "))
+			}
+
+			fmt.Printf("%s%s%s\n", strings.Repeat(" ", level), meta, name)
+		}
+
+		cmd.write(level+2, sname, s.ChildSnapshotList)
+	}
+}
+
+func (cmd *tree) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 0 {
+		return flag.ErrHelp
+	}
+
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	var o mo.VirtualMachine
+
+	err = vm.Properties(ctx, vm.Reference(), []string{"snapshot"}, &o)
+	if err != nil {
+		return err
+	}
+
+	if o.Snapshot == nil {
+		return nil
+	}
+
+	if cmd.current && o.Snapshot.CurrentSnapshot == nil {
+		cmd.current = false
+	}
+
+	cmd.info = o.Snapshot
+
+	cmd.write(0, "", o.Snapshot.RootSnapshotList)
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/unregister.go b/vendor/github.com/vmware/govmomi/govc/vm/unregister.go
new file mode 100644
index 0000000000..789d1eea58
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/unregister.go
@@ -0,0 +1,76 @@
+/*
+Copyright (c) 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 vm
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+)
+
+type unregister struct {
+	*flags.ClientFlag
+	*flags.SearchFlag
+}
+
+func init() {
+	cli.Register("vm.unregister", &unregister{})
+}
+
+func (cmd *unregister) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualMachines)
+	cmd.SearchFlag.Register(ctx, f)
+}
+
+func (cmd *unregister) Process(ctx context.Context) error {
+	if err := cmd.ClientFlag.Process(ctx); err != nil {
+		return err
+	}
+	if err := cmd.SearchFlag.Process(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *unregister) Usage() string {
+	return "VM..."
+}
+
+func (cmd *unregister) Description() string {
+	return `Remove VM from inventory without removing any of the VM files on disk.`
+}
+
+func (cmd *unregister) Run(ctx context.Context, f *flag.FlagSet) error {
+	vms, err := cmd.VirtualMachines(f.Args())
+	if err != nil {
+		return err
+	}
+
+	for _, vm := range vms {
+		err := vm.Unregister(ctx)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/vnc.go b/vendor/github.com/vmware/govmomi/govc/vm/vnc.go
new file mode 100644
index 0000000000..1e268ae5f8
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/govc/vm/vnc.go
@@ -0,0 +1,487 @@
+/*
+Copyright (c) 2014-2015 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 vm
+
+import (
+	"context"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"io"
+	"reflect"
+	"regexp"
+	"strconv"
+	"strings"
+
+	"github.com/vmware/govmomi/govc/cli"
+	"github.com/vmware/govmomi/govc/flags"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type intRange struct {
+	low, high int
+}
+
+var intRangeRegexp = regexp.MustCompile("^([0-9]+)-([0-9]+)$")
+
+func (i *intRange) Set(s string) error {
+	m := intRangeRegexp.FindStringSubmatch(s)
+	if m == nil {
+		return fmt.Errorf("invalid range: %s", s)
+	}
+
+	low, _ := strconv.Atoi(m[1])
+	high, _ := strconv.Atoi(m[2])
+	if low > high {
+		return fmt.Errorf("invalid range: low > high")
+	}
+
+	i.low = low
+	i.high = high
+	return nil
+}
+
+func (i *intRange) String() string {
+	return fmt.Sprintf("%d-%d", i.low, i.high)
+}
+
+type vnc struct {
+	*flags.SearchFlag
+
+	Enable    bool
+	Disable   bool
+	Port      int
+	PortRange intRange
+	Password  string
+}
+
+func init() {
+	cmd := &vnc{}
+	cmd.PortRange.Set("5900-5999")
+	cli.Register("vm.vnc", cmd)
+}
+
+func (cmd *vnc) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualMachines)
+	cmd.SearchFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.Enable, "enable", false, "Enable VNC")
+	f.BoolVar(&cmd.Disable, "disable", false, "Disable VNC")
+	f.IntVar(&cmd.Port, "port", -1, "VNC port (-1 for auto-select)")
+	f.Var(&cmd.PortRange, "port-range", "VNC port auto-select range")
+	f.StringVar(&cmd.Password, "password", "", "VNC password")
+}
+
+func (cmd *vnc) Process(ctx context.Context) error {
+	if err := cmd.SearchFlag.Process(ctx); err != nil {
+		return err
+	}
+	// Either may be true or none may be true.
+	if cmd.Enable && cmd.Disable {
+		return flag.ErrHelp
+	}
+
+	return nil
+}
+
+func (cmd *vnc) Usage() string {
+	return "VM..."
+}
+
+func (cmd *vnc) Description() string {
+	return `Enable or disable VNC for VM.
+
+Port numbers are automatically chosen if not specified.
+
+If neither -enable or -disable is specified, the current state is returned.
+
+Examples:
+  govc vm.vnc -enable -password 1234 $vm | awk '{print $2}' | xargs open`
+}
+
+func (cmd *vnc) Run(ctx context.Context, f *flag.FlagSet) error {
+	vms, err := cmd.loadVMs(f.Args())
+	if err != nil {
+		return err
+	}
+
+	// Actuate settings in VMs
+	for _, vm := range vms {
+		switch {
+		case cmd.Enable:
+			vm.enable(cmd.Port, cmd.Password)
+		case cmd.Disable:
+			vm.disable()
+		}
+	}
+
+	// Reconfigure VMs to reflect updates
+	for _, vm := range vms {
+		err = vm.reconfigure()
+		if err != nil {
+			return err
+		}
+	}
+
+	return cmd.WriteResult(vncResult(vms))
+}
+
+func (cmd *vnc) loadVMs(args []string) ([]*vncVM, error) {
+	c, err := cmd.Client()
+	if err != nil {
+		return nil, err
+	}
+
+	vms, err := cmd.VirtualMachines(args)
+	if err != nil {
+		return nil, err
+	}
+
+	var vncVMs []*vncVM
+	for _, vm := range vms {
+		v, err := newVNCVM(c, vm)
+		if err != nil {
+			return nil, err
+		}
+		vncVMs = append(vncVMs, v)
+	}
+
+	// Assign vncHosts to vncVMs
+	hosts := make(map[string]*vncHost)
+	for _, vm := range vncVMs {
+		if h, ok := hosts[vm.hostReference().Value]; ok {
+			vm.host = h
+			continue
+		}
+
+		hs := object.NewHostSystem(c, vm.hostReference())
+		h, err := newVNCHost(c, hs, cmd.PortRange.low, cmd.PortRange.high)
+		if err != nil {
+			return nil, err
+		}
+
+		hosts[vm.hostReference().Value] = h
+		vm.host = h
+	}
+
+	return vncVMs, nil
+}
+
+type vncVM struct {
+	c    *vim25.Client
+	vm   *object.VirtualMachine
+	mvm  mo.VirtualMachine
+	host *vncHost
+
+	curOptions vncOptions
+	newOptions vncOptions
+}
+
+func newVNCVM(c *vim25.Client, vm *object.VirtualMachine) (*vncVM, error) {
+	v := &vncVM{
+		c:  c,
+		vm: vm,
+	}
+
+	virtualMachineProperties := []string{
+		"name",
+		"config.extraConfig",
+		"runtime.host",
+	}
+
+	pc := property.DefaultCollector(c)
+	ctx := context.TODO()
+	err := pc.RetrieveOne(ctx, vm.Reference(), virtualMachineProperties, &v.mvm)
+	if err != nil {
+		return nil, err
+	}
+
+	v.curOptions = vncOptionsFromExtraConfig(v.mvm.Config.ExtraConfig)
+	v.newOptions = vncOptionsFromExtraConfig(v.mvm.Config.ExtraConfig)
+
+	return v, nil
+}
+
+func (v *vncVM) hostReference() types.ManagedObjectReference {
+	return *v.mvm.Runtime.Host
+}
+
+func (v *vncVM) enable(port int, password string) error {
+	v.newOptions["enabled"] = "true"
+	v.newOptions["port"] = fmt.Sprintf("%d", port)
+	v.newOptions["password"] = password
+
+	// Find port if auto-select
+	if port == -1 {
+		// Reuse port if If VM already has a port, reuse it.
+		// Otherwise, find unused VNC port on host.
+		if p, ok := v.curOptions["port"]; ok && p != "" {
+			v.newOptions["port"] = p
+		} else {
+			port, err := v.host.popUnusedPort()
+			if err != nil {
+				return err
+			}
+			v.newOptions["port"] = fmt.Sprintf("%d", port)
+		}
+	}
+	return nil
+}
+
+func (v *vncVM) disable() error {
+	v.newOptions["enabled"] = "false"
+	v.newOptions["port"] = ""
+	v.newOptions["password"] = ""
+	return nil
+}
+
+func (v *vncVM) reconfigure() error {
+	if reflect.DeepEqual(v.curOptions, v.newOptions) {
+		// No changes to settings
+		return nil
+	}
+
+	spec := types.VirtualMachineConfigSpec{
+		ExtraConfig: v.newOptions.ToExtraConfig(),
+	}
+
+	ctx := context.TODO()
+	task, err := v.vm.Reconfigure(ctx, spec)
+	if err != nil {
+		return err
+	}
+
+	return task.Wait(ctx)
+}
+
+func (v *vncVM) uri() (string, error) {
+	ip, err := v.host.managementIP()
+	if err != nil {
+		return "", err
+	}
+
+	uri := fmt.Sprintf("vnc://:%s@%s:%s",
+		v.newOptions["password"],
+		ip,
+		v.newOptions["port"])
+
+	return uri, nil
+}
+
+func (v *vncVM) write(w io.Writer) error {
+	if strings.EqualFold(v.newOptions["enabled"], "true") {
+		uri, err := v.uri()
+		if err != nil {
+			return err
+		}
+		fmt.Printf("%s: %s\n", v.mvm.Name, uri)
+	} else {
+		fmt.Printf("%s: disabled\n", v.mvm.Name)
+	}
+	return nil
+}
+
+type vncHost struct {
+	c     *vim25.Client
+	host  *object.HostSystem
+	ports map[int]struct{}
+	ip    string // This field is populated by `managementIP`
+}
+
+func newVNCHost(c *vim25.Client, host *object.HostSystem, low, high int) (*vncHost, error) {
+	ports := make(map[int]struct{})
+	for i := low; i <= high; i++ {
+		ports[i] = struct{}{}
+	}
+
+	used, err := loadUsedPorts(c, host.Reference())
+	if err != nil {
+		return nil, err
+	}
+
+	// Remove used ports from range
+	for _, u := range used {
+		delete(ports, u)
+	}
+
+	h := &vncHost{
+		c:     c,
+		host:  host,
+		ports: ports,
+	}
+
+	return h, nil
+}
+
+func loadUsedPorts(c *vim25.Client, host types.ManagedObjectReference) ([]int, error) {
+	ctx := context.TODO()
+	ospec := types.ObjectSpec{
+		Obj: host,
+		SelectSet: []types.BaseSelectionSpec{
+			&types.TraversalSpec{
+				Type: "HostSystem",
+				Path: "vm",
+				Skip: types.NewBool(false),
+			},
+		},
+		Skip: types.NewBool(false),
+	}
+
+	pspec := types.PropertySpec{
+		Type:    "VirtualMachine",
+		PathSet: []string{"config.extraConfig"},
+	}
+
+	req := types.RetrieveProperties{
+		This: c.ServiceContent.PropertyCollector,
+		SpecSet: []types.PropertyFilterSpec{
+			{
+				ObjectSet: []types.ObjectSpec{ospec},
+				PropSet:   []types.PropertySpec{pspec},
+			},
+		},
+	}
+
+	var vms []mo.VirtualMachine
+	err := mo.RetrievePropertiesForRequest(ctx, c, req, &vms)
+	if err != nil {
+		return nil, err
+	}
+
+	var ports []int
+	for _, vm := range vms {
+		if vm.Config == nil || vm.Config.ExtraConfig == nil {
+			continue
+		}
+
+		options := vncOptionsFromExtraConfig(vm.Config.ExtraConfig)
+		if ps, ok := options["port"]; ok && ps != "" {
+			pi, err := strconv.Atoi(ps)
+			if err == nil {
+				ports = append(ports, pi)
+			}
+		}
+	}
+
+	return ports, nil
+}
+
+func (h *vncHost) popUnusedPort() (int, error) {
+	if len(h.ports) == 0 {
+		return 0, fmt.Errorf("no unused ports in range")
+	}
+
+	// Return first port we get when iterating
+	var port int
+	for port = range h.ports {
+		break
+	}
+	delete(h.ports, port)
+	return port, nil
+}
+
+func (h *vncHost) managementIP() (string, error) {
+	ctx := context.TODO()
+	if h.ip != "" {
+		return h.ip, nil
+	}
+
+	ips, err := h.host.ManagementIPs(ctx)
+	if err != nil {
+		return "", err
+	}
+
+	if len(ips) > 0 {
+		h.ip = ips[0].String()
+	} else {
+		h.ip = "<unknown>"
+	}
+
+	return h.ip, nil
+}
+
+type vncResult []*vncVM
+
+func (vms vncResult) MarshalJSON() ([]byte, error) {
+	out := make(map[string]string)
+	for _, vm := range vms {
+		uri, err := vm.uri()
+		if err != nil {
+			return nil, err
+		}
+		out[vm.mvm.Name] = uri
+	}
+	return json.Marshal(out)
+}
+
+func (vms vncResult) Write(w io.Writer) error {
+	for _, vm := range vms {
+		err := vm.write(w)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+type vncOptions map[string]string
+
+var vncPrefix = "RemoteDisplay.vnc."
+
+func vncOptionsFromExtraConfig(ov []types.BaseOptionValue) vncOptions {
+	vo := make(vncOptions)
+	for _, b := range ov {
+		o := b.GetOptionValue()
+		if strings.HasPrefix(o.Key, vncPrefix) {
+			key := o.Key[len(vncPrefix):]
+			if key != "key" {
+				vo[key] = o.Value.(string)
+			}
+		}
+	}
+	return vo
+}
+
+func (vo vncOptions) ToExtraConfig() []types.BaseOptionValue {
+	ov := make([]types.BaseOptionValue, 0, 0)
+	for k, v := range vo {
+		key := vncPrefix + k
+		value := v
+
+		o := types.OptionValue{
+			Key:   key,
+			Value: &value, // Pass pointer to avoid omitempty
+		}
+
+		ov = append(ov, &o)
+	}
+
+	// Don't know how to deal with the key option, set it to be empty...
+	o := types.OptionValue{
+		Key:   vncPrefix + "key",
+		Value: new(string), // Pass pointer to avoid omitempty
+	}
+
+	ov = append(ov, &o)
+
+	return ov
+}
diff --git a/vendor/github.com/vmware/govmomi/guest/auth_manager.go b/vendor/github.com/vmware/govmomi/guest/auth_manager.go
new file mode 100644
index 0000000000..ed2ebd1696
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/guest/auth_manager.go
@@ -0,0 +1,80 @@
+/*
+Copyright (c) 2015 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 guest
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type AuthManager struct {
+	types.ManagedObjectReference
+
+	vm types.ManagedObjectReference
+
+	c *vim25.Client
+}
+
+func (m AuthManager) Reference() types.ManagedObjectReference {
+	return m.ManagedObjectReference
+}
+
+func (m AuthManager) AcquireCredentials(ctx context.Context, requestedAuth types.BaseGuestAuthentication, sessionID int64) (types.BaseGuestAuthentication, error) {
+	req := types.AcquireCredentialsInGuest{
+		This:          m.Reference(),
+		Vm:            m.vm,
+		RequestedAuth: requestedAuth,
+		SessionID:     sessionID,
+	}
+
+	res, err := methods.AcquireCredentialsInGuest(ctx, m.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, nil
+}
+
+func (m AuthManager) ReleaseCredentials(ctx context.Context, auth types.BaseGuestAuthentication) error {
+	req := types.ReleaseCredentialsInGuest{
+		This: m.Reference(),
+		Vm:   m.vm,
+		Auth: auth,
+	}
+
+	_, err := methods.ReleaseCredentialsInGuest(ctx, m.c, &req)
+
+	return err
+}
+
+func (m AuthManager) ValidateCredentials(ctx context.Context, auth types.BaseGuestAuthentication) error {
+	req := types.ValidateCredentialsInGuest{
+		This: m.Reference(),
+		Vm:   m.vm,
+		Auth: auth,
+	}
+
+	_, err := methods.ValidateCredentialsInGuest(ctx, m.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/guest/file_manager.go b/vendor/github.com/vmware/govmomi/guest/file_manager.go
new file mode 100644
index 0000000000..e2bf3e23cf
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/guest/file_manager.go
@@ -0,0 +1,203 @@
+/*
+Copyright (c) 2015 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 guest
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type FileManager struct {
+	types.ManagedObjectReference
+
+	vm types.ManagedObjectReference
+
+	c *vim25.Client
+}
+
+func (m FileManager) Reference() types.ManagedObjectReference {
+	return m.ManagedObjectReference
+}
+
+func (m FileManager) ChangeFileAttributes(ctx context.Context, auth types.BaseGuestAuthentication, guestFilePath string, fileAttributes types.BaseGuestFileAttributes) error {
+	req := types.ChangeFileAttributesInGuest{
+		This:           m.Reference(),
+		Vm:             m.vm,
+		Auth:           auth,
+		GuestFilePath:  guestFilePath,
+		FileAttributes: fileAttributes,
+	}
+
+	_, err := methods.ChangeFileAttributesInGuest(ctx, m.c, &req)
+	return err
+}
+
+func (m FileManager) CreateTemporaryDirectory(ctx context.Context, auth types.BaseGuestAuthentication, prefix, suffix string) (string, error) {
+	req := types.CreateTemporaryDirectoryInGuest{
+		This:   m.Reference(),
+		Vm:     m.vm,
+		Auth:   auth,
+		Prefix: prefix,
+		Suffix: suffix,
+	}
+
+	res, err := methods.CreateTemporaryDirectoryInGuest(ctx, m.c, &req)
+	if err != nil {
+		return "", err
+	}
+
+	return res.Returnval, nil
+}
+
+func (m FileManager) CreateTemporaryFile(ctx context.Context, auth types.BaseGuestAuthentication, prefix, suffix string) (string, error) {
+	req := types.CreateTemporaryFileInGuest{
+		This:   m.Reference(),
+		Vm:     m.vm,
+		Auth:   auth,
+		Prefix: prefix,
+		Suffix: suffix,
+	}
+
+	res, err := methods.CreateTemporaryFileInGuest(ctx, m.c, &req)
+	if err != nil {
+		return "", err
+	}
+
+	return res.Returnval, nil
+}
+
+func (m FileManager) DeleteDirectory(ctx context.Context, auth types.BaseGuestAuthentication, directoryPath string, recursive bool) error {
+	req := types.DeleteDirectoryInGuest{
+		This:          m.Reference(),
+		Vm:            m.vm,
+		Auth:          auth,
+		DirectoryPath: directoryPath,
+		Recursive:     recursive,
+	}
+
+	_, err := methods.DeleteDirectoryInGuest(ctx, m.c, &req)
+	return err
+}
+
+func (m FileManager) DeleteFile(ctx context.Context, auth types.BaseGuestAuthentication, filePath string) error {
+	req := types.DeleteFileInGuest{
+		This:     m.Reference(),
+		Vm:       m.vm,
+		Auth:     auth,
+		FilePath: filePath,
+	}
+
+	_, err := methods.DeleteFileInGuest(ctx, m.c, &req)
+	return err
+}
+
+func (m FileManager) InitiateFileTransferFromGuest(ctx context.Context, auth types.BaseGuestAuthentication, guestFilePath string) (*types.FileTransferInformation, error) {
+	req := types.InitiateFileTransferFromGuest{
+		This:          m.Reference(),
+		Vm:            m.vm,
+		Auth:          auth,
+		GuestFilePath: guestFilePath,
+	}
+
+	res, err := methods.InitiateFileTransferFromGuest(ctx, m.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return &res.Returnval, nil
+}
+
+func (m FileManager) InitiateFileTransferToGuest(ctx context.Context, auth types.BaseGuestAuthentication, guestFilePath string, fileAttributes types.BaseGuestFileAttributes, fileSize int64, overwrite bool) (string, error) {
+	req := types.InitiateFileTransferToGuest{
+		This:           m.Reference(),
+		Vm:             m.vm,
+		Auth:           auth,
+		GuestFilePath:  guestFilePath,
+		FileAttributes: fileAttributes,
+		FileSize:       fileSize,
+		Overwrite:      overwrite,
+	}
+
+	res, err := methods.InitiateFileTransferToGuest(ctx, m.c, &req)
+	if err != nil {
+		return "", err
+	}
+
+	return res.Returnval, nil
+}
+
+func (m FileManager) ListFiles(ctx context.Context, auth types.BaseGuestAuthentication, filePath string, index int32, maxResults int32, matchPattern string) (*types.GuestListFileInfo, error) {
+	req := types.ListFilesInGuest{
+		This:         m.Reference(),
+		Vm:           m.vm,
+		Auth:         auth,
+		FilePath:     filePath,
+		Index:        index,
+		MaxResults:   maxResults,
+		MatchPattern: matchPattern,
+	}
+
+	res, err := methods.ListFilesInGuest(ctx, m.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return &res.Returnval, nil
+}
+
+func (m FileManager) MakeDirectory(ctx context.Context, auth types.BaseGuestAuthentication, directoryPath string, createParentDirectories bool) error {
+	req := types.MakeDirectoryInGuest{
+		This:                    m.Reference(),
+		Vm:                      m.vm,
+		Auth:                    auth,
+		DirectoryPath:           directoryPath,
+		CreateParentDirectories: createParentDirectories,
+	}
+
+	_, err := methods.MakeDirectoryInGuest(ctx, m.c, &req)
+	return err
+}
+
+func (m FileManager) MoveDirectory(ctx context.Context, auth types.BaseGuestAuthentication, srcDirectoryPath string, dstDirectoryPath string) error {
+	req := types.MoveDirectoryInGuest{
+		This:             m.Reference(),
+		Vm:               m.vm,
+		Auth:             auth,
+		SrcDirectoryPath: srcDirectoryPath,
+		DstDirectoryPath: dstDirectoryPath,
+	}
+
+	_, err := methods.MoveDirectoryInGuest(ctx, m.c, &req)
+	return err
+}
+
+func (m FileManager) MoveFile(ctx context.Context, auth types.BaseGuestAuthentication, srcFilePath string, dstFilePath string, overwrite bool) error {
+	req := types.MoveFileInGuest{
+		This:        m.Reference(),
+		Vm:          m.vm,
+		Auth:        auth,
+		SrcFilePath: srcFilePath,
+		DstFilePath: dstFilePath,
+		Overwrite:   overwrite,
+	}
+
+	_, err := methods.MoveFileInGuest(ctx, m.c, &req)
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/guest/operations_manager.go b/vendor/github.com/vmware/govmomi/guest/operations_manager.go
new file mode 100644
index 0000000000..016503c803
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/guest/operations_manager.go
@@ -0,0 +1,73 @@
+/*
+Copyright (c) 2015 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 guest
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type OperationsManager struct {
+	c  *vim25.Client
+	vm types.ManagedObjectReference
+}
+
+func NewOperationsManager(c *vim25.Client, vm types.ManagedObjectReference) *OperationsManager {
+	return &OperationsManager{c, vm}
+}
+
+func (m OperationsManager) retrieveOne(ctx context.Context, p string, dst *mo.GuestOperationsManager) error {
+	pc := property.DefaultCollector(m.c)
+	return pc.RetrieveOne(ctx, *m.c.ServiceContent.GuestOperationsManager, []string{p}, dst)
+}
+
+func (m OperationsManager) AuthManager(ctx context.Context) (*AuthManager, error) {
+	var g mo.GuestOperationsManager
+
+	err := m.retrieveOne(ctx, "authManager", &g)
+	if err != nil {
+		return nil, err
+	}
+
+	return &AuthManager{*g.AuthManager, m.vm, m.c}, nil
+}
+
+func (m OperationsManager) FileManager(ctx context.Context) (*FileManager, error) {
+	var g mo.GuestOperationsManager
+
+	err := m.retrieveOne(ctx, "fileManager", &g)
+	if err != nil {
+		return nil, err
+	}
+
+	return &FileManager{*g.FileManager, m.vm, m.c}, nil
+}
+
+func (m OperationsManager) ProcessManager(ctx context.Context) (*ProcessManager, error) {
+	var g mo.GuestOperationsManager
+
+	err := m.retrieveOne(ctx, "processManager", &g)
+	if err != nil {
+		return nil, err
+	}
+
+	return &ProcessManager{*g.ProcessManager, m.vm, m.c}, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/guest/process_manager.go b/vendor/github.com/vmware/govmomi/guest/process_manager.go
new file mode 100644
index 0000000000..55db1e3947
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/guest/process_manager.go
@@ -0,0 +1,97 @@
+/*
+Copyright (c) 2015 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 guest
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type ProcessManager struct {
+	types.ManagedObjectReference
+
+	vm types.ManagedObjectReference
+
+	c *vim25.Client
+}
+
+func (m ProcessManager) Reference() types.ManagedObjectReference {
+	return m.ManagedObjectReference
+}
+
+func (m ProcessManager) ListProcesses(ctx context.Context, auth types.BaseGuestAuthentication, pids []int64) ([]types.GuestProcessInfo, error) {
+	req := types.ListProcessesInGuest{
+		This: m.Reference(),
+		Vm:   m.vm,
+		Auth: auth,
+		Pids: pids,
+	}
+
+	res, err := methods.ListProcessesInGuest(ctx, m.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, err
+}
+
+func (m ProcessManager) ReadEnvironmentVariable(ctx context.Context, auth types.BaseGuestAuthentication, names []string) ([]string, error) {
+	req := types.ReadEnvironmentVariableInGuest{
+		This:  m.Reference(),
+		Vm:    m.vm,
+		Auth:  auth,
+		Names: names,
+	}
+
+	res, err := methods.ReadEnvironmentVariableInGuest(ctx, m.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, err
+}
+
+func (m ProcessManager) StartProgram(ctx context.Context, auth types.BaseGuestAuthentication, spec types.BaseGuestProgramSpec) (int64, error) {
+	req := types.StartProgramInGuest{
+		This: m.Reference(),
+		Vm:   m.vm,
+		Auth: auth,
+		Spec: spec,
+	}
+
+	res, err := methods.StartProgramInGuest(ctx, m.c, &req)
+	if err != nil {
+		return 0, err
+	}
+
+	return res.Returnval, err
+}
+
+func (m ProcessManager) TerminateProcess(ctx context.Context, auth types.BaseGuestAuthentication, pid int64) error {
+	req := types.TerminateProcessInGuest{
+		This: m.Reference(),
+		Vm:   m.vm,
+		Auth: auth,
+		Pid:  pid,
+	}
+
+	_, err := methods.TerminateProcessInGuest(ctx, m.c, &req)
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/license/assignment_manager.go b/vendor/github.com/vmware/govmomi/license/assignment_manager.go
new file mode 100644
index 0000000000..46aeb085e2
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/license/assignment_manager.go
@@ -0,0 +1,70 @@
+/*
+Copyright (c) 2015 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 license
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type AssignmentManager struct {
+	object.Common
+}
+
+func (m AssignmentManager) QueryAssigned(ctx context.Context, id string) ([]types.LicenseAssignmentManagerLicenseAssignment, error) {
+	req := types.QueryAssignedLicenses{
+		This:     m.Reference(),
+		EntityId: id,
+	}
+
+	res, err := methods.QueryAssignedLicenses(ctx, m.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, nil
+}
+
+func (m AssignmentManager) Remove(ctx context.Context, id string) error {
+	req := types.RemoveAssignedLicense{
+		This:     m.Reference(),
+		EntityId: id,
+	}
+
+	_, err := methods.RemoveAssignedLicense(ctx, m.Client(), &req)
+
+	return err
+}
+
+func (m AssignmentManager) Update(ctx context.Context, id string, key string, name string) (*types.LicenseManagerLicenseInfo, error) {
+	req := types.UpdateAssignedLicense{
+		This:              m.Reference(),
+		Entity:            id,
+		LicenseKey:        key,
+		EntityDisplayName: name,
+	}
+
+	res, err := methods.UpdateAssignedLicense(ctx, m.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return &res.Returnval, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/license/manager.go b/vendor/github.com/vmware/govmomi/license/manager.go
new file mode 100644
index 0000000000..9c38e91473
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/license/manager.go
@@ -0,0 +1,195 @@
+/*
+Copyright (c) 2015 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 license
+
+import (
+	"context"
+	"strconv"
+	"strings"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type Manager struct {
+	object.Common
+}
+
+func NewManager(c *vim25.Client) *Manager {
+	m := Manager{
+		object.NewCommon(c, *c.ServiceContent.LicenseManager),
+	}
+
+	return &m
+}
+
+func mapToKeyValueSlice(m map[string]string) []types.KeyValue {
+	r := make([]types.KeyValue, len(m))
+	for k, v := range m {
+		r = append(r, types.KeyValue{Key: k, Value: v})
+	}
+	return r
+}
+
+func (m Manager) Add(ctx context.Context, key string, labels map[string]string) (types.LicenseManagerLicenseInfo, error) {
+	req := types.AddLicense{
+		This:       m.Reference(),
+		LicenseKey: key,
+		Labels:     mapToKeyValueSlice(labels),
+	}
+
+	res, err := methods.AddLicense(ctx, m.Client(), &req)
+	if err != nil {
+		return types.LicenseManagerLicenseInfo{}, err
+	}
+
+	return res.Returnval, nil
+}
+
+func (m Manager) Decode(ctx context.Context, key string) (types.LicenseManagerLicenseInfo, error) {
+	req := types.DecodeLicense{
+		This:       m.Reference(),
+		LicenseKey: key,
+	}
+
+	res, err := methods.DecodeLicense(ctx, m.Client(), &req)
+	if err != nil {
+		return types.LicenseManagerLicenseInfo{}, err
+	}
+
+	return res.Returnval, nil
+}
+
+func (m Manager) Remove(ctx context.Context, key string) error {
+	req := types.RemoveLicense{
+		This:       m.Reference(),
+		LicenseKey: key,
+	}
+
+	_, err := methods.RemoveLicense(ctx, m.Client(), &req)
+	return err
+}
+
+func (m Manager) Update(ctx context.Context, key string, labels map[string]string) (types.LicenseManagerLicenseInfo, error) {
+	req := types.UpdateLicense{
+		This:       m.Reference(),
+		LicenseKey: key,
+		Labels:     mapToKeyValueSlice(labels),
+	}
+
+	res, err := methods.UpdateLicense(ctx, m.Client(), &req)
+	if err != nil {
+		return types.LicenseManagerLicenseInfo{}, err
+	}
+
+	return res.Returnval, nil
+}
+
+func (m Manager) List(ctx context.Context) (InfoList, error) {
+	var mlm mo.LicenseManager
+
+	err := m.Properties(ctx, m.Reference(), []string{"licenses"}, &mlm)
+	if err != nil {
+		return nil, err
+	}
+
+	return InfoList(mlm.Licenses), nil
+}
+
+func (m Manager) AssignmentManager(ctx context.Context) (*AssignmentManager, error) {
+	var mlm mo.LicenseManager
+
+	err := m.Properties(ctx, m.Reference(), []string{"licenseAssignmentManager"}, &mlm)
+	if err != nil {
+		return nil, err
+	}
+
+	if mlm.LicenseAssignmentManager == nil {
+		return nil, object.ErrNotSupported
+	}
+
+	am := AssignmentManager{
+		object.NewCommon(m.Client(), *mlm.LicenseAssignmentManager),
+	}
+
+	return &am, nil
+}
+
+type licenseFeature struct {
+	name  string
+	level int
+}
+
+func parseLicenseFeature(feature string) *licenseFeature {
+	lf := new(licenseFeature)
+
+	f := strings.Split(feature, ":")
+
+	lf.name = f[0]
+
+	if len(f) > 1 {
+		var err error
+		lf.level, err = strconv.Atoi(f[1])
+		if err != nil {
+			lf.name = feature
+		}
+	}
+
+	return lf
+}
+
+func HasFeature(license types.LicenseManagerLicenseInfo, key string) bool {
+	feature := parseLicenseFeature(key)
+
+	for _, p := range license.Properties {
+		if p.Key != "feature" {
+			continue
+		}
+
+		kv, ok := p.Value.(types.KeyValue)
+
+		if !ok {
+			continue
+		}
+
+		lf := parseLicenseFeature(kv.Key)
+
+		if lf.name == feature.name && lf.level >= feature.level {
+			return true
+		}
+	}
+
+	return false
+}
+
+// InfoList provides helper methods for []types.LicenseManagerLicenseInfo
+type InfoList []types.LicenseManagerLicenseInfo
+
+func (l InfoList) WithFeature(key string) InfoList {
+	var result InfoList
+
+	for _, license := range l {
+		if HasFeature(license, key) {
+			result = append(result, license)
+		}
+	}
+
+	return result
+}
diff --git a/vendor/github.com/vmware/govmomi/list/lister.go b/vendor/github.com/vmware/govmomi/list/lister.go
new file mode 100644
index 0000000000..2ee32e6bc1
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/list/lister.go
@@ -0,0 +1,563 @@
+/*
+Copyright (c) 2014-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 list
+
+import (
+	"context"
+	"fmt"
+	"path"
+	"reflect"
+
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type Element struct {
+	Path   string
+	Object mo.Reference
+}
+
+func (e Element) String() string {
+	return fmt.Sprintf("%s @ %s", e.Object.Reference(), e.Path)
+}
+
+func ToElement(r mo.Reference, prefix string) Element {
+	var name string
+
+	// Comments about types to be expected in folders copied from the
+	// documentation of the Folder managed object:
+	// http://pubs.vmware.com/vsphere-55/topic/com.vmware.wssdk.apiref.doc/vim.Folder.html
+	switch m := r.(type) {
+	case mo.Folder:
+		name = m.Name
+	case mo.StoragePod:
+		name = m.Name
+
+	// { "vim.Datacenter" } - Identifies the root folder and its descendant
+	// folders. Data center folders can contain child data center folders and
+	// Datacenter managed objects. Datacenter objects contain virtual machine,
+	// compute resource, network entity, and datastore folders.
+	case mo.Datacenter:
+		name = m.Name
+
+	// { "vim.Virtualmachine", "vim.VirtualApp" } - Identifies a virtual machine
+	// folder. A virtual machine folder may contain child virtual machine
+	// folders. It also can contain VirtualMachine managed objects, templates,
+	// and VirtualApp managed objects.
+	case mo.VirtualMachine:
+		name = m.Name
+	case mo.VirtualApp:
+		name = m.Name
+
+	// { "vim.ComputeResource" } - Identifies a compute resource
+	// folder, which contains child compute resource folders and ComputeResource
+	// hierarchies.
+	case mo.ComputeResource:
+		name = m.Name
+	case mo.ClusterComputeResource:
+		name = m.Name
+	case mo.HostSystem:
+		name = m.Name
+	case mo.ResourcePool:
+		name = m.Name
+
+	// { "vim.Network" } - Identifies a network entity folder.
+	// Network entity folders on a vCenter Server can contain Network,
+	// DistributedVirtualSwitch, and DistributedVirtualPortgroup managed objects.
+	// Network entity folders on an ESXi host can contain only Network objects.
+	case mo.Network:
+		name = m.Name
+	case mo.OpaqueNetwork:
+		name = m.Name
+	case mo.DistributedVirtualSwitch:
+		name = m.Name
+	case mo.DistributedVirtualPortgroup:
+		name = m.Name
+	case mo.VmwareDistributedVirtualSwitch:
+		name = m.Name
+
+	// { "vim.Datastore" } - Identifies a datastore folder. Datastore folders can
+	// contain child datastore folders and Datastore managed objects.
+	case mo.Datastore:
+		name = m.Name
+
+	default:
+		panic("not implemented for type " + reflect.TypeOf(r).String())
+	}
+
+	e := Element{
+		Path:   path.Join(prefix, name),
+		Object: r,
+	}
+
+	return e
+}
+
+type Lister struct {
+	Collector *property.Collector
+	Reference types.ManagedObjectReference
+	Prefix    string
+	All       bool
+}
+
+func (l Lister) retrieveProperties(ctx context.Context, req types.RetrieveProperties, dst *[]interface{}) error {
+	res, err := l.Collector.RetrieveProperties(ctx, req)
+	if err != nil {
+		return err
+	}
+
+	// Instead of using mo.LoadRetrievePropertiesResponse, use a custom loop to
+	// iterate over the results and ignore entries that have properties that
+	// could not be retrieved (a non-empty `missingSet` property). Since the
+	// returned objects are enumerated by vSphere in the first place, any object
+	// that has a non-empty `missingSet` property is indicative of a race
+	// condition in vSphere where the object was enumerated initially, but was
+	// removed before its properties could be collected.
+	for _, p := range res.Returnval {
+		v, err := mo.ObjectContentToType(p)
+		if err != nil {
+			// Ignore fault if it is ManagedObjectNotFound
+			if soap.IsVimFault(err) {
+				switch soap.ToVimFault(err).(type) {
+				case *types.ManagedObjectNotFound:
+					continue
+				}
+			}
+
+			return err
+		}
+
+		*dst = append(*dst, v)
+	}
+
+	return nil
+}
+
+func (l Lister) List(ctx context.Context) ([]Element, error) {
+	switch l.Reference.Type {
+	case "Folder", "StoragePod":
+		return l.ListFolder(ctx)
+	case "Datacenter":
+		return l.ListDatacenter(ctx)
+	case "ComputeResource", "ClusterComputeResource":
+		// Treat ComputeResource and ClusterComputeResource as one and the same.
+		// It doesn't matter from the perspective of the lister.
+		return l.ListComputeResource(ctx)
+	case "ResourcePool":
+		return l.ListResourcePool(ctx)
+	case "HostSystem":
+		return l.ListHostSystem(ctx)
+	case "VirtualApp":
+		return l.ListVirtualApp(ctx)
+	default:
+		return nil, fmt.Errorf("cannot traverse type " + l.Reference.Type)
+	}
+}
+
+func (l Lister) ListFolder(ctx context.Context) ([]Element, error) {
+	spec := types.PropertyFilterSpec{
+		ObjectSet: []types.ObjectSpec{
+			{
+				Obj: l.Reference,
+				SelectSet: []types.BaseSelectionSpec{
+					&types.TraversalSpec{
+						Path: "childEntity",
+						Skip: types.NewBool(false),
+						Type: "Folder",
+					},
+				},
+				Skip: types.NewBool(true),
+			},
+		},
+	}
+
+	// Retrieve all objects that we can deal with
+	childTypes := []string{
+		"Folder",
+		"Datacenter",
+		"VirtualApp",
+		"VirtualMachine",
+		"Network",
+		"ComputeResource",
+		"ClusterComputeResource",
+		"Datastore",
+		"DistributedVirtualSwitch",
+	}
+
+	for _, t := range childTypes {
+		pspec := types.PropertySpec{
+			Type: t,
+		}
+
+		if l.All {
+			pspec.All = types.NewBool(true)
+		} else {
+			pspec.PathSet = []string{"name"}
+
+			// Additional basic properties.
+			switch t {
+			case "Folder":
+				pspec.PathSet = append(pspec.PathSet, "childType")
+			case "ComputeResource", "ClusterComputeResource":
+				// The ComputeResource and ClusterComputeResource are dereferenced in
+				// the ResourcePoolFlag. Make sure they always have their resourcePool
+				// field populated.
+				pspec.PathSet = append(pspec.PathSet, "resourcePool")
+			}
+		}
+
+		spec.PropSet = append(spec.PropSet, pspec)
+	}
+
+	req := types.RetrieveProperties{
+		SpecSet: []types.PropertyFilterSpec{spec},
+	}
+
+	var dst []interface{}
+
+	err := l.retrieveProperties(ctx, req, &dst)
+	if err != nil {
+		return nil, err
+	}
+
+	es := []Element{}
+	for _, v := range dst {
+		es = append(es, ToElement(v.(mo.Reference), l.Prefix))
+	}
+
+	return es, nil
+}
+
+func (l Lister) ListDatacenter(ctx context.Context) ([]Element, error) {
+	ospec := types.ObjectSpec{
+		Obj:  l.Reference,
+		Skip: types.NewBool(true),
+	}
+
+	// Include every datastore folder in the select set
+	fields := []string{
+		"vmFolder",
+		"hostFolder",
+		"datastoreFolder",
+		"networkFolder",
+	}
+
+	for _, f := range fields {
+		tspec := types.TraversalSpec{
+			Path: f,
+			Skip: types.NewBool(false),
+			Type: "Datacenter",
+		}
+
+		ospec.SelectSet = append(ospec.SelectSet, &tspec)
+	}
+
+	pspec := types.PropertySpec{
+		Type: "Folder",
+	}
+
+	if l.All {
+		pspec.All = types.NewBool(true)
+	} else {
+		pspec.PathSet = []string{"name", "childType"}
+	}
+
+	req := types.RetrieveProperties{
+		SpecSet: []types.PropertyFilterSpec{
+			{
+				ObjectSet: []types.ObjectSpec{ospec},
+				PropSet:   []types.PropertySpec{pspec},
+			},
+		},
+	}
+
+	var dst []interface{}
+
+	err := l.retrieveProperties(ctx, req, &dst)
+	if err != nil {
+		return nil, err
+	}
+
+	es := []Element{}
+	for _, v := range dst {
+		es = append(es, ToElement(v.(mo.Reference), l.Prefix))
+	}
+
+	return es, nil
+}
+
+func (l Lister) ListComputeResource(ctx context.Context) ([]Element, error) {
+	ospec := types.ObjectSpec{
+		Obj:  l.Reference,
+		Skip: types.NewBool(true),
+	}
+
+	fields := []string{
+		"host",
+		"resourcePool",
+	}
+
+	for _, f := range fields {
+		tspec := types.TraversalSpec{
+			Path: f,
+			Skip: types.NewBool(false),
+			Type: "ComputeResource",
+		}
+
+		ospec.SelectSet = append(ospec.SelectSet, &tspec)
+	}
+
+	childTypes := []string{
+		"HostSystem",
+		"ResourcePool",
+	}
+
+	var pspecs []types.PropertySpec
+	for _, t := range childTypes {
+		pspec := types.PropertySpec{
+			Type: t,
+		}
+
+		if l.All {
+			pspec.All = types.NewBool(true)
+		} else {
+			pspec.PathSet = []string{"name"}
+		}
+
+		pspecs = append(pspecs, pspec)
+	}
+
+	req := types.RetrieveProperties{
+		SpecSet: []types.PropertyFilterSpec{
+			{
+				ObjectSet: []types.ObjectSpec{ospec},
+				PropSet:   pspecs,
+			},
+		},
+	}
+
+	var dst []interface{}
+
+	err := l.retrieveProperties(ctx, req, &dst)
+	if err != nil {
+		return nil, err
+	}
+
+	es := []Element{}
+	for _, v := range dst {
+		es = append(es, ToElement(v.(mo.Reference), l.Prefix))
+	}
+
+	return es, nil
+}
+
+func (l Lister) ListResourcePool(ctx context.Context) ([]Element, error) {
+	ospec := types.ObjectSpec{
+		Obj:  l.Reference,
+		Skip: types.NewBool(true),
+	}
+
+	fields := []string{
+		"resourcePool",
+	}
+
+	for _, f := range fields {
+		tspec := types.TraversalSpec{
+			Path: f,
+			Skip: types.NewBool(false),
+			Type: "ResourcePool",
+		}
+
+		ospec.SelectSet = append(ospec.SelectSet, &tspec)
+	}
+
+	childTypes := []string{
+		"ResourcePool",
+	}
+
+	var pspecs []types.PropertySpec
+	for _, t := range childTypes {
+		pspec := types.PropertySpec{
+			Type: t,
+		}
+
+		if l.All {
+			pspec.All = types.NewBool(true)
+		} else {
+			pspec.PathSet = []string{"name"}
+		}
+
+		pspecs = append(pspecs, pspec)
+	}
+
+	req := types.RetrieveProperties{
+		SpecSet: []types.PropertyFilterSpec{
+			{
+				ObjectSet: []types.ObjectSpec{ospec},
+				PropSet:   pspecs,
+			},
+		},
+	}
+
+	var dst []interface{}
+
+	err := l.retrieveProperties(ctx, req, &dst)
+	if err != nil {
+		return nil, err
+	}
+
+	es := []Element{}
+	for _, v := range dst {
+		es = append(es, ToElement(v.(mo.Reference), l.Prefix))
+	}
+
+	return es, nil
+}
+
+func (l Lister) ListHostSystem(ctx context.Context) ([]Element, error) {
+	ospec := types.ObjectSpec{
+		Obj:  l.Reference,
+		Skip: types.NewBool(true),
+	}
+
+	fields := []string{
+		"datastore",
+		"network",
+		"vm",
+	}
+
+	for _, f := range fields {
+		tspec := types.TraversalSpec{
+			Path: f,
+			Skip: types.NewBool(false),
+			Type: "HostSystem",
+		}
+
+		ospec.SelectSet = append(ospec.SelectSet, &tspec)
+	}
+
+	childTypes := []string{
+		"Datastore",
+		"Network",
+		"VirtualMachine",
+	}
+
+	var pspecs []types.PropertySpec
+	for _, t := range childTypes {
+		pspec := types.PropertySpec{
+			Type: t,
+		}
+
+		if l.All {
+			pspec.All = types.NewBool(true)
+		} else {
+			pspec.PathSet = []string{"name"}
+		}
+
+		pspecs = append(pspecs, pspec)
+	}
+
+	req := types.RetrieveProperties{
+		SpecSet: []types.PropertyFilterSpec{
+			{
+				ObjectSet: []types.ObjectSpec{ospec},
+				PropSet:   pspecs,
+			},
+		},
+	}
+
+	var dst []interface{}
+
+	err := l.retrieveProperties(ctx, req, &dst)
+	if err != nil {
+		return nil, err
+	}
+
+	es := []Element{}
+	for _, v := range dst {
+		es = append(es, ToElement(v.(mo.Reference), l.Prefix))
+	}
+
+	return es, nil
+}
+
+func (l Lister) ListVirtualApp(ctx context.Context) ([]Element, error) {
+	ospec := types.ObjectSpec{
+		Obj:  l.Reference,
+		Skip: types.NewBool(true),
+	}
+
+	fields := []string{
+		"resourcePool",
+		"vm",
+	}
+
+	for _, f := range fields {
+		tspec := types.TraversalSpec{
+			Path: f,
+			Skip: types.NewBool(false),
+			Type: "VirtualApp",
+		}
+
+		ospec.SelectSet = append(ospec.SelectSet, &tspec)
+	}
+
+	childTypes := []string{
+		"ResourcePool",
+		"VirtualMachine",
+	}
+
+	var pspecs []types.PropertySpec
+	for _, t := range childTypes {
+		pspec := types.PropertySpec{
+			Type: t,
+		}
+
+		if l.All {
+			pspec.All = types.NewBool(true)
+		} else {
+			pspec.PathSet = []string{"name"}
+		}
+
+		pspecs = append(pspecs, pspec)
+	}
+
+	req := types.RetrieveProperties{
+		SpecSet: []types.PropertyFilterSpec{
+			{
+				ObjectSet: []types.ObjectSpec{ospec},
+				PropSet:   pspecs,
+			},
+		},
+	}
+
+	var dst []interface{}
+
+	err := l.retrieveProperties(ctx, req, &dst)
+	if err != nil {
+		return nil, err
+	}
+
+	es := []Element{}
+	for _, v := range dst {
+		es = append(es, ToElement(v.(mo.Reference), l.Prefix))
+	}
+
+	return es, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/list/path.go b/vendor/github.com/vmware/govmomi/list/path.go
new file mode 100644
index 0000000000..f3a1065201
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/list/path.go
@@ -0,0 +1,44 @@
+/*
+Copyright (c) 2014 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 list
+
+import (
+	"path"
+	"strings"
+)
+
+func ToParts(p string) []string {
+	p = path.Clean(p)
+	if p == "/" {
+		return []string{}
+	}
+
+	if len(p) > 0 {
+		// Prefix ./ if relative
+		if p[0] != '/' && p[0] != '.' {
+			p = "./" + p
+		}
+	}
+
+	ps := strings.Split(p, "/")
+	if ps[0] == "" {
+		// Start at root
+		ps = ps[1:]
+	}
+
+	return ps
+}
diff --git a/vendor/github.com/vmware/govmomi/list/path_test.go b/vendor/github.com/vmware/govmomi/list/path_test.go
new file mode 100644
index 0000000000..8cb73c3844
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/list/path_test.go
@@ -0,0 +1,93 @@
+/*
+Copyright (c) 2014 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 list
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestToParts(t *testing.T) {
+	tests := []struct {
+		In  string
+		Out []string
+	}{
+		{
+			In:  "/",
+			Out: []string{},
+		},
+		{
+			In:  "/foo",
+			Out: []string{"foo"},
+		},
+		{
+			In:  "/foo/..",
+			Out: []string{},
+		},
+		{
+			In:  "/./foo",
+			Out: []string{"foo"},
+		},
+		{
+			In:  "/../foo",
+			Out: []string{"foo"},
+		},
+		{
+			In:  "/foo/bar",
+			Out: []string{"foo", "bar"},
+		},
+		{
+			In:  "/foo/bar/..",
+			Out: []string{"foo"},
+		},
+		{
+			In:  "",
+			Out: []string{"."},
+		},
+		{
+			In:  ".",
+			Out: []string{"."},
+		},
+		{
+			In:  "foo",
+			Out: []string{".", "foo"},
+		},
+		{
+			In:  "foo/..",
+			Out: []string{"."},
+		},
+		{
+			In:  "./foo",
+			Out: []string{".", "foo"},
+		},
+		{
+			In:  "../foo", // Special case...
+			Out: []string{"..", "foo"},
+		},
+		{
+			In:  "foo/bar/..",
+			Out: []string{".", "foo"},
+		},
+	}
+
+	for _, test := range tests {
+		out := ToParts(test.In)
+		if !reflect.DeepEqual(test.Out, out) {
+			t.Errorf("Expected %s to return: %#v, actual: %#v", test.In, test.Out, out)
+		}
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/object/authorization_manager.go b/vendor/github.com/vmware/govmomi/object/authorization_manager.go
new file mode 100644
index 0000000000..b703258fe7
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/authorization_manager.go
@@ -0,0 +1,174 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type AuthorizationManager struct {
+	Common
+}
+
+func NewAuthorizationManager(c *vim25.Client) *AuthorizationManager {
+	m := AuthorizationManager{
+		Common: NewCommon(c, *c.ServiceContent.AuthorizationManager),
+	}
+
+	return &m
+}
+
+type AuthorizationRoleList []types.AuthorizationRole
+
+func (l AuthorizationRoleList) ById(id int32) *types.AuthorizationRole {
+	for _, role := range l {
+		if role.RoleId == id {
+			return &role
+		}
+	}
+
+	return nil
+}
+
+func (l AuthorizationRoleList) ByName(name string) *types.AuthorizationRole {
+	for _, role := range l {
+		if role.Name == name {
+			return &role
+		}
+	}
+
+	return nil
+}
+
+func (m AuthorizationManager) RoleList(ctx context.Context) (AuthorizationRoleList, error) {
+	var am mo.AuthorizationManager
+
+	err := m.Properties(ctx, m.Reference(), []string{"roleList"}, &am)
+	if err != nil {
+		return nil, err
+	}
+
+	return AuthorizationRoleList(am.RoleList), nil
+}
+
+func (m AuthorizationManager) RetrieveEntityPermissions(ctx context.Context, entity types.ManagedObjectReference, inherited bool) ([]types.Permission, error) {
+	req := types.RetrieveEntityPermissions{
+		This:      m.Reference(),
+		Entity:    entity,
+		Inherited: inherited,
+	}
+
+	res, err := methods.RetrieveEntityPermissions(ctx, m.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, nil
+}
+
+func (m AuthorizationManager) RemoveEntityPermission(ctx context.Context, entity types.ManagedObjectReference, user string, isGroup bool) error {
+	req := types.RemoveEntityPermission{
+		This:    m.Reference(),
+		Entity:  entity,
+		User:    user,
+		IsGroup: isGroup,
+	}
+
+	_, err := methods.RemoveEntityPermission(ctx, m.Client(), &req)
+	return err
+}
+
+func (m AuthorizationManager) SetEntityPermissions(ctx context.Context, entity types.ManagedObjectReference, permission []types.Permission) error {
+	req := types.SetEntityPermissions{
+		This:       m.Reference(),
+		Entity:     entity,
+		Permission: permission,
+	}
+
+	_, err := methods.SetEntityPermissions(ctx, m.Client(), &req)
+	return err
+}
+
+func (m AuthorizationManager) RetrieveRolePermissions(ctx context.Context, id int32) ([]types.Permission, error) {
+	req := types.RetrieveRolePermissions{
+		This:   m.Reference(),
+		RoleId: id,
+	}
+
+	res, err := methods.RetrieveRolePermissions(ctx, m.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, nil
+}
+
+func (m AuthorizationManager) RetrieveAllPermissions(ctx context.Context) ([]types.Permission, error) {
+	req := types.RetrieveAllPermissions{
+		This: m.Reference(),
+	}
+
+	res, err := methods.RetrieveAllPermissions(ctx, m.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, nil
+}
+
+func (m AuthorizationManager) AddRole(ctx context.Context, name string, ids []string) (int32, error) {
+	req := types.AddAuthorizationRole{
+		This:    m.Reference(),
+		Name:    name,
+		PrivIds: ids,
+	}
+
+	res, err := methods.AddAuthorizationRole(ctx, m.Client(), &req)
+	if err != nil {
+		return -1, err
+	}
+
+	return res.Returnval, nil
+}
+
+func (m AuthorizationManager) RemoveRole(ctx context.Context, id int32, failIfUsed bool) error {
+	req := types.RemoveAuthorizationRole{
+		This:       m.Reference(),
+		RoleId:     id,
+		FailIfUsed: failIfUsed,
+	}
+
+	_, err := methods.RemoveAuthorizationRole(ctx, m.Client(), &req)
+	return err
+}
+
+func (m AuthorizationManager) UpdateRole(ctx context.Context, id int32, name string, ids []string) error {
+	req := types.UpdateAuthorizationRole{
+		This:    m.Reference(),
+		RoleId:  id,
+		NewName: name,
+		PrivIds: ids,
+	}
+
+	_, err := methods.UpdateAuthorizationRole(ctx, m.Client(), &req)
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/object/cluster_compute_resource.go b/vendor/github.com/vmware/govmomi/object/cluster_compute_resource.go
new file mode 100644
index 0000000000..225f41b6d1
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/cluster_compute_resource.go
@@ -0,0 +1,86 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type ClusterComputeResource struct {
+	ComputeResource
+}
+
+func NewClusterComputeResource(c *vim25.Client, ref types.ManagedObjectReference) *ClusterComputeResource {
+	return &ClusterComputeResource{
+		ComputeResource: *NewComputeResource(c, ref),
+	}
+}
+
+func (c ClusterComputeResource) ReconfigureCluster(ctx context.Context, spec types.ClusterConfigSpec) (*Task, error) {
+	req := types.ReconfigureCluster_Task{
+		This:   c.Reference(),
+		Spec:   spec,
+		Modify: true,
+	}
+
+	res, err := methods.ReconfigureCluster_Task(ctx, c.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(c.c, res.Returnval), nil
+}
+
+func (c ClusterComputeResource) AddHost(ctx context.Context, spec types.HostConnectSpec, asConnected bool, license *string, resourcePool *types.ManagedObjectReference) (*Task, error) {
+	req := types.AddHost_Task{
+		This:        c.Reference(),
+		Spec:        spec,
+		AsConnected: asConnected,
+	}
+
+	if license != nil {
+		req.License = *license
+	}
+
+	if resourcePool != nil {
+		req.ResourcePool = resourcePool
+	}
+
+	res, err := methods.AddHost_Task(ctx, c.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(c.c, res.Returnval), nil
+}
+
+func (c ClusterComputeResource) Destroy(ctx context.Context) (*Task, error) {
+	req := types.Destroy_Task{
+		This: c.Reference(),
+	}
+
+	res, err := methods.Destroy_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/cluster_compute_resource_test.go b/vendor/github.com/vmware/govmomi/object/cluster_compute_resource_test.go
new file mode 100644
index 0000000000..684f4a6715
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/cluster_compute_resource_test.go
@@ -0,0 +1,20 @@
+/*
+Copyright (c) 2015 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 object
+
+// ComputeResource should implement the Reference interface.
+var _ Reference = ClusterComputeResource{}
diff --git a/vendor/github.com/vmware/govmomi/object/common.go b/vendor/github.com/vmware/govmomi/object/common.go
new file mode 100644
index 0000000000..52feeed650
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/common.go
@@ -0,0 +1,125 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"path"
+
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+var (
+	ErrNotSupported = errors.New("product/version specific feature not supported by target")
+)
+
+// Common contains the fields and functions common to all objects.
+type Common struct {
+	InventoryPath string
+
+	c *vim25.Client
+	r types.ManagedObjectReference
+}
+
+func (c Common) String() string {
+	ref := fmt.Sprintf("%v", c.Reference())
+
+	if c.InventoryPath == "" {
+		return ref
+	}
+
+	return fmt.Sprintf("%s @ %s", ref, c.InventoryPath)
+}
+
+func NewCommon(c *vim25.Client, r types.ManagedObjectReference) Common {
+	return Common{c: c, r: r}
+}
+
+func (c Common) Reference() types.ManagedObjectReference {
+	return c.r
+}
+
+func (c Common) Client() *vim25.Client {
+	return c.c
+}
+
+// Name returns the base name of the InventoryPath field
+func (c Common) Name() string {
+	if c.InventoryPath == "" {
+		return ""
+	}
+	return path.Base(c.InventoryPath)
+}
+
+func (c *Common) SetInventoryPath(p string) {
+	c.InventoryPath = p
+}
+
+// ObjectName returns the base name of the InventoryPath field if set,
+// otherwise fetches the mo.ManagedEntity.Name field via the property collector.
+func (c Common) ObjectName(ctx context.Context) (string, error) {
+	var o mo.ManagedEntity
+
+	name := c.Name()
+	if name != "" {
+		return name, nil
+	}
+
+	err := c.Properties(ctx, c.Reference(), []string{"name"}, &o)
+	if err != nil {
+		return "", err
+	}
+
+	return o.Name, nil
+}
+
+func (c Common) Properties(ctx context.Context, r types.ManagedObjectReference, ps []string, dst interface{}) error {
+	return property.DefaultCollector(c.c).RetrieveOne(ctx, r, ps, dst)
+}
+
+func (c Common) Destroy(ctx context.Context) (*Task, error) {
+	req := types.Destroy_Task{
+		This: c.Reference(),
+	}
+
+	res, err := methods.Destroy_Task(ctx, c.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(c.c, res.Returnval), nil
+}
+
+func (c Common) Rename(ctx context.Context, name string) (*Task, error) {
+	req := types.Rename_Task{
+		This:    c.Reference(),
+		NewName: name,
+	}
+
+	res, err := methods.Rename_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/common_test.go b/vendor/github.com/vmware/govmomi/object/common_test.go
new file mode 100644
index 0000000000..6b7d0749dc
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/common_test.go
@@ -0,0 +1,34 @@
+/*
+Copyright (c) 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 object
+
+import "testing"
+
+func TestCommonName(t *testing.T) {
+	c := &Common{}
+
+	name := c.Name()
+	if name != "" {
+		t.Errorf("Name=%s", name)
+	}
+
+	c.InventoryPath = "/foo/bar"
+	name = c.Name()
+	if name != "bar" {
+		t.Errorf("Name=%s", name)
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/object/compute_resource.go b/vendor/github.com/vmware/govmomi/object/compute_resource.go
new file mode 100644
index 0000000000..ac1c73019f
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/compute_resource.go
@@ -0,0 +1,124 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+	"path"
+
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type ComputeResource struct {
+	Common
+}
+
+func NewComputeResource(c *vim25.Client, ref types.ManagedObjectReference) *ComputeResource {
+	return &ComputeResource{
+		Common: NewCommon(c, ref),
+	}
+}
+
+func (c ComputeResource) Hosts(ctx context.Context) ([]*HostSystem, error) {
+	var cr mo.ComputeResource
+
+	err := c.Properties(ctx, c.Reference(), []string{"host"}, &cr)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(cr.Host) == 0 {
+		return nil, nil
+	}
+
+	var hs []mo.HostSystem
+	pc := property.DefaultCollector(c.Client())
+	err = pc.Retrieve(ctx, cr.Host, []string{"name"}, &hs)
+	if err != nil {
+		return nil, err
+	}
+
+	var hosts []*HostSystem
+
+	for _, h := range hs {
+		host := NewHostSystem(c.Client(), h.Reference())
+		host.InventoryPath = path.Join(c.InventoryPath, h.Name)
+		hosts = append(hosts, host)
+	}
+
+	return hosts, nil
+}
+
+func (c ComputeResource) Datastores(ctx context.Context) ([]*Datastore, error) {
+	var cr mo.ComputeResource
+
+	err := c.Properties(ctx, c.Reference(), []string{"datastore"}, &cr)
+	if err != nil {
+		return nil, err
+	}
+
+	var dss []*Datastore
+	for _, ref := range cr.Datastore {
+		ds := NewDatastore(c.c, ref)
+		dss = append(dss, ds)
+	}
+
+	return dss, nil
+}
+
+func (c ComputeResource) ResourcePool(ctx context.Context) (*ResourcePool, error) {
+	var cr mo.ComputeResource
+
+	err := c.Properties(ctx, c.Reference(), []string{"resourcePool"}, &cr)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewResourcePool(c.c, *cr.ResourcePool), nil
+}
+
+func (c ComputeResource) Reconfigure(ctx context.Context, spec types.BaseComputeResourceConfigSpec, modify bool) (*Task, error) {
+	req := types.ReconfigureComputeResource_Task{
+		This:   c.Reference(),
+		Spec:   spec,
+		Modify: modify,
+	}
+
+	res, err := methods.ReconfigureComputeResource_Task(ctx, c.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(c.c, res.Returnval), nil
+}
+
+func (c ComputeResource) Destroy(ctx context.Context) (*Task, error) {
+	req := types.Destroy_Task{
+		This: c.Reference(),
+	}
+
+	res, err := methods.Destroy_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/compute_resource_test.go b/vendor/github.com/vmware/govmomi/object/compute_resource_test.go
new file mode 100644
index 0000000000..0f29d58e9d
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/compute_resource_test.go
@@ -0,0 +1,20 @@
+/*
+Copyright (c) 2015 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 object
+
+// ComputeResource should implement the Reference interface.
+var _ Reference = ComputeResource{}
diff --git a/vendor/github.com/vmware/govmomi/object/custom_fields_manager.go b/vendor/github.com/vmware/govmomi/object/custom_fields_manager.go
new file mode 100644
index 0000000000..60b78df2b4
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/custom_fields_manager.go
@@ -0,0 +1,135 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+	"errors"
+	"strconv"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+var (
+	ErrKeyNameNotFound = errors.New("key name not found")
+)
+
+type CustomFieldsManager struct {
+	Common
+}
+
+// GetCustomFieldsManager wraps NewCustomFieldsManager, returning ErrNotSupported
+// when the client is not connected to a vCenter instance.
+func GetCustomFieldsManager(c *vim25.Client) (*CustomFieldsManager, error) {
+	if c.ServiceContent.CustomFieldsManager == nil {
+		return nil, ErrNotSupported
+	}
+	return NewCustomFieldsManager(c), nil
+}
+
+func NewCustomFieldsManager(c *vim25.Client) *CustomFieldsManager {
+	m := CustomFieldsManager{
+		Common: NewCommon(c, *c.ServiceContent.CustomFieldsManager),
+	}
+
+	return &m
+}
+
+func (m CustomFieldsManager) Add(ctx context.Context, name string, moType string, fieldDefPolicy *types.PrivilegePolicyDef, fieldPolicy *types.PrivilegePolicyDef) (*types.CustomFieldDef, error) {
+	req := types.AddCustomFieldDef{
+		This:           m.Reference(),
+		Name:           name,
+		MoType:         moType,
+		FieldDefPolicy: fieldDefPolicy,
+		FieldPolicy:    fieldPolicy,
+	}
+
+	res, err := methods.AddCustomFieldDef(ctx, m.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return &res.Returnval, nil
+}
+
+func (m CustomFieldsManager) Remove(ctx context.Context, key int32) error {
+	req := types.RemoveCustomFieldDef{
+		This: m.Reference(),
+		Key:  key,
+	}
+
+	_, err := methods.RemoveCustomFieldDef(ctx, m.c, &req)
+	return err
+}
+
+func (m CustomFieldsManager) Rename(ctx context.Context, key int32, name string) error {
+	req := types.RenameCustomFieldDef{
+		This: m.Reference(),
+		Key:  key,
+		Name: name,
+	}
+
+	_, err := methods.RenameCustomFieldDef(ctx, m.c, &req)
+	return err
+}
+
+func (m CustomFieldsManager) Set(ctx context.Context, entity types.ManagedObjectReference, key int32, value string) error {
+	req := types.SetField{
+		This:   m.Reference(),
+		Entity: entity,
+		Key:    key,
+		Value:  value,
+	}
+
+	_, err := methods.SetField(ctx, m.c, &req)
+	return err
+}
+
+func (m CustomFieldsManager) Field(ctx context.Context) ([]types.CustomFieldDef, error) {
+	var fm mo.CustomFieldsManager
+
+	err := m.Properties(ctx, m.Reference(), []string{"field"}, &fm)
+	if err != nil {
+		return nil, err
+	}
+
+	return fm.Field, nil
+}
+
+func (m CustomFieldsManager) FindKey(ctx context.Context, key string) (int32, error) {
+	field, err := m.Field(ctx)
+	if err != nil {
+		return -1, err
+	}
+
+	for _, def := range field {
+		if def.Name == key {
+			return def.Key, nil
+		}
+	}
+
+	k, err := strconv.Atoi(key)
+	if err == nil {
+		// assume literal int key
+		return int32(k), nil
+	}
+
+	return -1, ErrKeyNameNotFound
+}
diff --git a/vendor/github.com/vmware/govmomi/object/customization_spec_manager.go b/vendor/github.com/vmware/govmomi/object/customization_spec_manager.go
new file mode 100644
index 0000000000..cb8b965dc6
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/customization_spec_manager.go
@@ -0,0 +1,166 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type CustomizationSpecManager struct {
+	Common
+}
+
+func NewCustomizationSpecManager(c *vim25.Client) *CustomizationSpecManager {
+	cs := CustomizationSpecManager{
+		Common: NewCommon(c, *c.ServiceContent.CustomizationSpecManager),
+	}
+
+	return &cs
+}
+
+func (cs CustomizationSpecManager) DoesCustomizationSpecExist(ctx context.Context, name string) (bool, error) {
+	req := types.DoesCustomizationSpecExist{
+		This: cs.Reference(),
+		Name: name,
+	}
+
+	res, err := methods.DoesCustomizationSpecExist(ctx, cs.c, &req)
+
+	if err != nil {
+		return false, err
+	}
+
+	return res.Returnval, nil
+}
+
+func (cs CustomizationSpecManager) GetCustomizationSpec(ctx context.Context, name string) (*types.CustomizationSpecItem, error) {
+	req := types.GetCustomizationSpec{
+		This: cs.Reference(),
+		Name: name,
+	}
+
+	res, err := methods.GetCustomizationSpec(ctx, cs.c, &req)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &res.Returnval, nil
+}
+
+func (cs CustomizationSpecManager) CreateCustomizationSpec(ctx context.Context, item types.CustomizationSpecItem) error {
+	req := types.CreateCustomizationSpec{
+		This: cs.Reference(),
+		Item: item,
+	}
+
+	_, err := methods.CreateCustomizationSpec(ctx, cs.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (cs CustomizationSpecManager) OverwriteCustomizationSpec(ctx context.Context, item types.CustomizationSpecItem) error {
+	req := types.OverwriteCustomizationSpec{
+		This: cs.Reference(),
+		Item: item,
+	}
+
+	_, err := methods.OverwriteCustomizationSpec(ctx, cs.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (cs CustomizationSpecManager) DeleteCustomizationSpec(ctx context.Context, name string) error {
+	req := types.DeleteCustomizationSpec{
+		This: cs.Reference(),
+		Name: name,
+	}
+
+	_, err := methods.DeleteCustomizationSpec(ctx, cs.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (cs CustomizationSpecManager) DuplicateCustomizationSpec(ctx context.Context, name string, newName string) error {
+	req := types.DuplicateCustomizationSpec{
+		This:    cs.Reference(),
+		Name:    name,
+		NewName: newName,
+	}
+
+	_, err := methods.DuplicateCustomizationSpec(ctx, cs.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (cs CustomizationSpecManager) RenameCustomizationSpec(ctx context.Context, name string, newName string) error {
+	req := types.RenameCustomizationSpec{
+		This:    cs.Reference(),
+		Name:    name,
+		NewName: newName,
+	}
+
+	_, err := methods.RenameCustomizationSpec(ctx, cs.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (cs CustomizationSpecManager) CustomizationSpecItemToXml(ctx context.Context, item types.CustomizationSpecItem) (string, error) {
+	req := types.CustomizationSpecItemToXml{
+		This: cs.Reference(),
+		Item: item,
+	}
+
+	res, err := methods.CustomizationSpecItemToXml(ctx, cs.c, &req)
+	if err != nil {
+		return "", err
+	}
+
+	return res.Returnval, nil
+}
+
+func (cs CustomizationSpecManager) XmlToCustomizationSpecItem(ctx context.Context, xml string) (*types.CustomizationSpecItem, error) {
+	req := types.XmlToCustomizationSpecItem{
+		This:        cs.Reference(),
+		SpecItemXml: xml,
+	}
+
+	res, err := methods.XmlToCustomizationSpecItem(ctx, cs.c, &req)
+	if err != nil {
+		return nil, err
+	}
+	return &res.Returnval, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/datacenter.go b/vendor/github.com/vmware/govmomi/object/datacenter.go
new file mode 100644
index 0000000000..adddc5ffa5
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/datacenter.go
@@ -0,0 +1,90 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type DatacenterFolders struct {
+	VmFolder        *Folder
+	HostFolder      *Folder
+	DatastoreFolder *Folder
+	NetworkFolder   *Folder
+}
+
+type Datacenter struct {
+	Common
+}
+
+func NewDatacenter(c *vim25.Client, ref types.ManagedObjectReference) *Datacenter {
+	return &Datacenter{
+		Common: NewCommon(c, ref),
+	}
+}
+
+func (d *Datacenter) Folders(ctx context.Context) (*DatacenterFolders, error) {
+	var md mo.Datacenter
+
+	ps := []string{"name", "vmFolder", "hostFolder", "datastoreFolder", "networkFolder"}
+	err := d.Properties(ctx, d.Reference(), ps, &md)
+	if err != nil {
+		return nil, err
+	}
+
+	df := &DatacenterFolders{
+		VmFolder:        NewFolder(d.c, md.VmFolder),
+		HostFolder:      NewFolder(d.c, md.HostFolder),
+		DatastoreFolder: NewFolder(d.c, md.DatastoreFolder),
+		NetworkFolder:   NewFolder(d.c, md.NetworkFolder),
+	}
+
+	paths := []struct {
+		name string
+		path *string
+	}{
+		{"vm", &df.VmFolder.InventoryPath},
+		{"host", &df.HostFolder.InventoryPath},
+		{"datastore", &df.DatastoreFolder.InventoryPath},
+		{"network", &df.NetworkFolder.InventoryPath},
+	}
+
+	for _, p := range paths {
+		*p.path = fmt.Sprintf("/%s/%s", md.Name, p.name)
+	}
+
+	return df, nil
+}
+
+func (d Datacenter) Destroy(ctx context.Context) (*Task, error) {
+	req := types.Destroy_Task{
+		This: d.Reference(),
+	}
+
+	res, err := methods.Destroy_Task(ctx, d.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(d.c, res.Returnval), nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/datacenter_test.go b/vendor/github.com/vmware/govmomi/object/datacenter_test.go
new file mode 100644
index 0000000000..1eb4105767
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/datacenter_test.go
@@ -0,0 +1,20 @@
+/*
+Copyright (c) 2015 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 object
+
+// Datacenter should implement the Reference interface.
+var _ Reference = Datacenter{}
diff --git a/vendor/github.com/vmware/govmomi/object/datastore.go b/vendor/github.com/vmware/govmomi/object/datastore.go
new file mode 100644
index 0000000000..fc696cdf21
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/datastore.go
@@ -0,0 +1,438 @@
+/*
+Copyright (c) 2015-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 object
+
+import (
+	"fmt"
+	"io"
+	"math/rand"
+	"os"
+	"path"
+	"strings"
+
+	"context"
+	"net/http"
+	"net/url"
+
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/session"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+// DatastoreNoSuchDirectoryError is returned when a directory could not be found.
+type DatastoreNoSuchDirectoryError struct {
+	verb    string
+	subject string
+}
+
+func (e DatastoreNoSuchDirectoryError) Error() string {
+	return fmt.Sprintf("cannot %s '%s': No such directory", e.verb, e.subject)
+}
+
+// DatastoreNoSuchFileError is returned when a file could not be found.
+type DatastoreNoSuchFileError struct {
+	verb    string
+	subject string
+}
+
+func (e DatastoreNoSuchFileError) Error() string {
+	return fmt.Sprintf("cannot %s '%s': No such file", e.verb, e.subject)
+}
+
+type Datastore struct {
+	Common
+
+	DatacenterPath string
+}
+
+func NewDatastore(c *vim25.Client, ref types.ManagedObjectReference) *Datastore {
+	return &Datastore{
+		Common: NewCommon(c, ref),
+	}
+}
+
+func (d Datastore) Path(path string) string {
+	return (&DatastorePath{
+		Datastore: d.Name(),
+		Path:      path,
+	}).String()
+}
+
+// NewURL constructs a url.URL with the given file path for datastore access over HTTP.
+func (d Datastore) NewURL(path string) *url.URL {
+	u := d.c.URL()
+
+	return &url.URL{
+		Scheme: u.Scheme,
+		Host:   u.Host,
+		Path:   fmt.Sprintf("/folder/%s", path),
+		RawQuery: url.Values{
+			"dcPath": []string{d.DatacenterPath},
+			"dsName": []string{d.Name()},
+		}.Encode(),
+	}
+}
+
+// URL is deprecated, use NewURL instead.
+func (d Datastore) URL(ctx context.Context, dc *Datacenter, path string) (*url.URL, error) {
+	return d.NewURL(path), nil
+}
+
+func (d Datastore) Browser(ctx context.Context) (*HostDatastoreBrowser, error) {
+	var do mo.Datastore
+
+	err := d.Properties(ctx, d.Reference(), []string{"browser"}, &do)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewHostDatastoreBrowser(d.c, do.Browser), nil
+}
+
+func (d Datastore) useServiceTicket() bool {
+	// If connected to workstation, service ticketing not supported
+	// If connected to ESX, service ticketing not needed
+	if !d.c.IsVC() {
+		return false
+	}
+
+	key := "GOVMOMI_USE_SERVICE_TICKET"
+
+	val := d.c.URL().Query().Get(key)
+	if val == "" {
+		val = os.Getenv(key)
+	}
+
+	if val == "1" || val == "true" {
+		return true
+	}
+
+	return false
+}
+
+func (d Datastore) useServiceTicketHostName(name string) bool {
+	// No need if talking directly to ESX.
+	if !d.c.IsVC() {
+		return false
+	}
+
+	// If version happens to be < 5.1
+	if name == "" {
+		return false
+	}
+
+	// If the HostSystem is using DHCP on a network without dynamic DNS,
+	// HostSystem.Config.Network.DnsConfig.HostName is set to "localhost" by default.
+	// This resolves to "localhost.localdomain" by default via /etc/hosts on ESX.
+	// In that case, we will stick with the HostSystem.Name which is the IP address that
+	// was used to connect the host to VC.
+	if name == "localhost.localdomain" {
+		return false
+	}
+
+	// Still possible to have HostName that don't resolve via DNS,
+	// so we default to false.
+	key := "GOVMOMI_USE_SERVICE_TICKET_HOSTNAME"
+
+	val := d.c.URL().Query().Get(key)
+	if val == "" {
+		val = os.Getenv(key)
+	}
+
+	if val == "1" || val == "true" {
+		return true
+	}
+
+	return false
+}
+
+type datastoreServiceTicketHostKey struct{}
+
+// HostContext returns a Context where the given host will be used for datastore HTTP access
+// via the ServiceTicket method.
+func (d Datastore) HostContext(ctx context.Context, host *HostSystem) context.Context {
+	return context.WithValue(ctx, datastoreServiceTicketHostKey{}, host)
+}
+
+// ServiceTicket obtains a ticket via AcquireGenericServiceTicket and returns it an http.Cookie with the url.URL
+// that can be used along with the ticket cookie to access the given path.  An host is chosen at random unless the
+// the given Context was created with a specific host via the HostContext method.
+func (d Datastore) ServiceTicket(ctx context.Context, path string, method string) (*url.URL, *http.Cookie, error) {
+	u := d.NewURL(path)
+
+	host, ok := ctx.Value(datastoreServiceTicketHostKey{}).(*HostSystem)
+
+	if !ok {
+		if !d.useServiceTicket() {
+			return u, nil, nil
+		}
+
+		hosts, err := d.AttachedHosts(ctx)
+		if err != nil {
+			return nil, nil, err
+		}
+
+		if len(hosts) == 0 {
+			// Fallback to letting vCenter choose a host
+			return u, nil, nil
+		}
+
+		// Pick a random attached host
+		host = hosts[rand.Intn(len(hosts))]
+	}
+
+	ips, err := host.ManagementIPs(ctx)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	if len(ips) > 0 {
+		// prefer a ManagementIP
+		u.Host = ips[0].String()
+	} else {
+		// fallback to inventory name
+		u.Host, err = host.ObjectName(ctx)
+		if err != nil {
+			return nil, nil, err
+		}
+	}
+
+	// VC datacenter path will not be valid against ESX
+	q := u.Query()
+	delete(q, "dcPath")
+	u.RawQuery = q.Encode()
+
+	spec := types.SessionManagerHttpServiceRequestSpec{
+		Url: u.String(),
+		// See SessionManagerHttpServiceRequestSpecMethod enum
+		Method: fmt.Sprintf("http%s%s", method[0:1], strings.ToLower(method[1:])),
+	}
+
+	sm := session.NewManager(d.Client())
+
+	ticket, err := sm.AcquireGenericServiceTicket(ctx, &spec)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	cookie := &http.Cookie{
+		Name:  "vmware_cgi_ticket",
+		Value: ticket.Id,
+	}
+
+	if d.useServiceTicketHostName(ticket.HostName) {
+		u.Host = ticket.HostName
+	}
+
+	d.Client().SetThumbprint(u.Host, ticket.SslThumbprint)
+
+	return u, cookie, nil
+}
+
+func (d Datastore) uploadTicket(ctx context.Context, path string, param *soap.Upload) (*url.URL, *soap.Upload, error) {
+	p := soap.DefaultUpload
+	if param != nil {
+		p = *param // copy
+	}
+
+	u, ticket, err := d.ServiceTicket(ctx, path, p.Method)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	p.Ticket = ticket
+
+	return u, &p, nil
+}
+
+func (d Datastore) downloadTicket(ctx context.Context, path string, param *soap.Download) (*url.URL, *soap.Download, error) {
+	p := soap.DefaultDownload
+	if param != nil {
+		p = *param // copy
+	}
+
+	u, ticket, err := d.ServiceTicket(ctx, path, p.Method)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	p.Ticket = ticket
+
+	return u, &p, nil
+}
+
+// Upload via soap.Upload with an http service ticket
+func (d Datastore) Upload(ctx context.Context, f io.Reader, path string, param *soap.Upload) error {
+	u, p, err := d.uploadTicket(ctx, path, param)
+	if err != nil {
+		return err
+	}
+	return d.Client().Upload(f, u, p)
+}
+
+// UploadFile via soap.Upload with an http service ticket
+func (d Datastore) UploadFile(ctx context.Context, file string, path string, param *soap.Upload) error {
+	u, p, err := d.uploadTicket(ctx, path, param)
+	if err != nil {
+		return err
+	}
+	return d.Client().UploadFile(file, u, p)
+}
+
+// Download via soap.Download with an http service ticket
+func (d Datastore) Download(ctx context.Context, path string, param *soap.Download) (io.ReadCloser, int64, error) {
+	u, p, err := d.downloadTicket(ctx, path, param)
+	if err != nil {
+		return nil, 0, err
+	}
+	return d.Client().Download(u, p)
+}
+
+// DownloadFile via soap.Download with an http service ticket
+func (d Datastore) DownloadFile(ctx context.Context, path string, file string, param *soap.Download) error {
+	u, p, err := d.downloadTicket(ctx, path, param)
+	if err != nil {
+		return err
+	}
+	return d.Client().DownloadFile(file, u, p)
+}
+
+// AttachedHosts returns hosts that have this Datastore attached, accessible and writable.
+func (d Datastore) AttachedHosts(ctx context.Context) ([]*HostSystem, error) {
+	var ds mo.Datastore
+	var hosts []*HostSystem
+
+	pc := property.DefaultCollector(d.Client())
+	err := pc.RetrieveOne(ctx, d.Reference(), []string{"host"}, &ds)
+	if err != nil {
+		return nil, err
+	}
+
+	mounts := make(map[types.ManagedObjectReference]types.DatastoreHostMount)
+	var refs []types.ManagedObjectReference
+	for _, host := range ds.Host {
+		refs = append(refs, host.Key)
+		mounts[host.Key] = host
+	}
+
+	var hs []mo.HostSystem
+	err = pc.Retrieve(ctx, refs, []string{"runtime.connectionState", "runtime.powerState"}, &hs)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, host := range hs {
+		if host.Runtime.ConnectionState == types.HostSystemConnectionStateConnected &&
+			host.Runtime.PowerState == types.HostSystemPowerStatePoweredOn {
+
+			mount := mounts[host.Reference()]
+			info := mount.MountInfo
+
+			if *info.Mounted && *info.Accessible && info.AccessMode == string(types.HostMountModeReadWrite) {
+				hosts = append(hosts, NewHostSystem(d.Client(), mount.Key))
+			}
+		}
+	}
+
+	return hosts, nil
+}
+
+// AttachedClusterHosts returns hosts that have this Datastore attached, accessible and writable and are members of the given cluster.
+func (d Datastore) AttachedClusterHosts(ctx context.Context, cluster *ComputeResource) ([]*HostSystem, error) {
+	var hosts []*HostSystem
+
+	clusterHosts, err := cluster.Hosts(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	attachedHosts, err := d.AttachedHosts(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	refs := make(map[types.ManagedObjectReference]bool)
+	for _, host := range attachedHosts {
+		refs[host.Reference()] = true
+	}
+
+	for _, host := range clusterHosts {
+		if refs[host.Reference()] {
+			hosts = append(hosts, host)
+		}
+	}
+
+	return hosts, nil
+}
+
+func (d Datastore) Stat(ctx context.Context, file string) (types.BaseFileInfo, error) {
+	b, err := d.Browser(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	spec := types.HostDatastoreBrowserSearchSpec{
+		Details: &types.FileQueryFlags{
+			FileType:     true,
+			FileSize:     true,
+			Modification: true,
+			FileOwner:    types.NewBool(true),
+		},
+		MatchPattern: []string{path.Base(file)},
+	}
+
+	dsPath := d.Path(path.Dir(file))
+	task, err := b.SearchDatastore(ctx, dsPath, &spec)
+	if err != nil {
+		return nil, err
+	}
+
+	info, err := task.WaitForResult(ctx, nil)
+	if err != nil {
+		if info == nil || info.Error != nil {
+			_, ok := info.Error.Fault.(*types.FileNotFound)
+			if ok {
+				// FileNotFound means the base path doesn't exist.
+				return nil, DatastoreNoSuchDirectoryError{"stat", dsPath}
+			}
+		}
+
+		return nil, err
+	}
+
+	res := info.Result.(types.HostDatastoreBrowserSearchResults)
+	if len(res.File) == 0 {
+		// File doesn't exist
+		return nil, DatastoreNoSuchFileError{"stat", d.Path(file)}
+	}
+
+	return res.File[0], nil
+
+}
+
+// Type returns the type of file system volume.
+func (d Datastore) Type(ctx context.Context) (types.HostFileSystemVolumeFileSystemType, error) {
+	var mds mo.Datastore
+
+	if err := d.Properties(ctx, d.Reference(), []string{"summary.type"}, &mds); err != nil {
+		return types.HostFileSystemVolumeFileSystemType(""), err
+	}
+	return types.HostFileSystemVolumeFileSystemType(mds.Summary.Type), nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/datastore_file.go b/vendor/github.com/vmware/govmomi/object/datastore_file.go
new file mode 100644
index 0000000000..36c9523485
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/datastore_file.go
@@ -0,0 +1,397 @@
+/*
+Copyright (c) 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 object
+
+import (
+	"bytes"
+	"context"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"path"
+	"time"
+
+	"github.com/vmware/govmomi/vim25/soap"
+)
+
+// DatastoreFile implements io.Reader, io.Seeker and io.Closer interfaces for datastore file access.
+type DatastoreFile struct {
+	d    Datastore
+	ctx  context.Context
+	name string
+
+	buf    io.Reader
+	body   io.ReadCloser
+	length int64
+	offset struct {
+		read, seek int64
+	}
+}
+
+// Open opens the named file relative to the Datastore.
+func (d Datastore) Open(ctx context.Context, name string) (*DatastoreFile, error) {
+	return &DatastoreFile{
+		d:      d,
+		name:   name,
+		length: -1,
+		ctx:    ctx,
+	}, nil
+}
+
+// Read reads up to len(b) bytes from the DatastoreFile.
+func (f *DatastoreFile) Read(b []byte) (int, error) {
+	if f.offset.read != f.offset.seek {
+		// A Seek() call changed the offset, we need to issue a new GET
+		_ = f.Close()
+
+		f.offset.read = f.offset.seek
+	} else if f.buf != nil {
+		// f.buf + f behaves like an io.MultiReader
+		n, err := f.buf.Read(b)
+		if err == io.EOF {
+			f.buf = nil // buffer has been drained
+		}
+		if n > 0 {
+			return n, nil
+		}
+	}
+
+	body, err := f.get()
+	if err != nil {
+		return 0, err
+	}
+
+	n, err := body.Read(b)
+
+	f.offset.read += int64(n)
+	f.offset.seek += int64(n)
+
+	return n, err
+}
+
+// Close closes the DatastoreFile.
+func (f *DatastoreFile) Close() error {
+	var err error
+
+	if f.body != nil {
+		err = f.body.Close()
+		f.body = nil
+	}
+
+	f.buf = nil
+
+	return err
+}
+
+// Seek sets the offset for the next Read on the DatastoreFile.
+func (f *DatastoreFile) Seek(offset int64, whence int) (int64, error) {
+	switch whence {
+	case io.SeekStart:
+	case io.SeekCurrent:
+		offset += f.offset.seek
+	case io.SeekEnd:
+		if f.length < 0 {
+			_, err := f.Stat()
+			if err != nil {
+				return 0, err
+			}
+		}
+		offset += f.length
+	default:
+		return 0, errors.New("Seek: invalid whence")
+	}
+
+	// allow negative SeekStart for initial Range request
+	if offset < 0 {
+		return 0, errors.New("Seek: invalid offset")
+	}
+
+	f.offset.seek = offset
+
+	return offset, nil
+}
+
+type fileStat struct {
+	file   *DatastoreFile
+	header http.Header
+}
+
+func (s *fileStat) Name() string {
+	return path.Base(s.file.name)
+}
+
+func (s *fileStat) Size() int64 {
+	return s.file.length
+}
+
+func (s *fileStat) Mode() os.FileMode {
+	return 0
+}
+
+func (s *fileStat) ModTime() time.Time {
+	return time.Now() // no Last-Modified
+}
+
+func (s *fileStat) IsDir() bool {
+	return false
+}
+
+func (s *fileStat) Sys() interface{} {
+	return s.header
+}
+
+func statusError(res *http.Response) error {
+	if res.StatusCode == http.StatusNotFound {
+		return os.ErrNotExist
+	}
+	return errors.New(res.Status)
+}
+
+// Stat returns the os.FileInfo interface describing file.
+func (f *DatastoreFile) Stat() (os.FileInfo, error) {
+	// TODO: consider using Datastore.Stat() instead
+	u, p, err := f.d.downloadTicket(f.ctx, f.name, &soap.Download{Method: "HEAD"})
+	if err != nil {
+		return nil, err
+	}
+
+	res, err := f.d.Client().DownloadRequest(u, p)
+	if err != nil {
+		return nil, err
+	}
+
+	if res.StatusCode != http.StatusOK {
+		return nil, statusError(res)
+	}
+
+	f.length = res.ContentLength
+
+	return &fileStat{f, res.Header}, nil
+}
+
+func (f *DatastoreFile) get() (io.Reader, error) {
+	if f.body != nil {
+		return f.body, nil
+	}
+
+	u, p, err := f.d.downloadTicket(f.ctx, f.name, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	if f.offset.read != 0 {
+		p.Headers = map[string]string{
+			"Range": fmt.Sprintf("bytes=%d-", f.offset.read),
+		}
+	}
+
+	res, err := f.d.Client().DownloadRequest(u, p)
+	if err != nil {
+		return nil, err
+	}
+
+	switch res.StatusCode {
+	case http.StatusOK:
+		f.length = res.ContentLength
+	case http.StatusPartialContent:
+		var start, end int
+		cr := res.Header.Get("Content-Range")
+		_, err = fmt.Sscanf(cr, "bytes %d-%d/%d", &start, &end, &f.length)
+		if err != nil {
+			f.length = -1
+		}
+	case http.StatusRequestedRangeNotSatisfiable:
+		// ok: Read() will return io.EOF
+	default:
+		return nil, statusError(res)
+	}
+
+	if f.length < 0 {
+		_ = res.Body.Close()
+		return nil, errors.New("unable to determine file size")
+	}
+
+	f.body = res.Body
+
+	return f.body, nil
+}
+
+func lastIndexLines(s []byte, n *int) int64 {
+	i := len(s) - 1
+
+	for i > 0 {
+		o := bytes.LastIndexByte(s[:i], '\n')
+		if o < 0 {
+			break
+		}
+
+		i = o
+		*n--
+		if *n == 0 {
+			break
+		}
+	}
+
+	return int64(i)
+}
+
+// Tail seeks to the position of the last N lines of the file.
+func (f *DatastoreFile) Tail(n int) error {
+	// Read the file in reverse using bsize chunks
+	const bsize = int64(1024 * 16)
+
+	fsize, err := f.Seek(0, io.SeekEnd)
+	if err != nil {
+		return err
+	}
+
+	if n == 0 {
+		return nil
+	}
+
+	chunk := int64(-1)
+
+	buf := bytes.NewBuffer(make([]byte, 0, bsize))
+
+	for {
+		var eof bool
+		var pos int64
+
+		nread := bsize
+
+		offset := chunk * bsize
+		remain := fsize + offset
+
+		if remain < 0 {
+			if pos, err = f.Seek(0, io.SeekStart); err != nil {
+				return err
+			}
+
+			nread = bsize + remain
+			eof = true
+		} else {
+			if pos, err = f.Seek(offset, io.SeekEnd); err != nil {
+				return err
+			}
+		}
+
+		if _, err = io.CopyN(buf, f, nread); err != nil {
+			if err != io.EOF {
+				return err
+			}
+		}
+
+		b := buf.Bytes()
+		idx := lastIndexLines(b, &n) + 1
+
+		if n == 0 {
+			if chunk == -1 {
+				// We found all N lines in the last chunk of the file.
+				// The seek offset is also now at the current end of file.
+				// Save this buffer to avoid another GET request when Read() is called.
+				buf.Next(int(idx))
+				f.buf = buf
+				return nil
+			}
+
+			if _, err = f.Seek(pos+idx, io.SeekStart); err != nil {
+				return err
+			}
+
+			break
+		}
+
+		if eof {
+			if remain < 0 {
+				// We found < N lines in the entire file, so seek to the start.
+				_, _ = f.Seek(0, io.SeekStart)
+			}
+			break
+		}
+
+		chunk--
+		buf.Reset()
+	}
+
+	return nil
+}
+
+type followDatastoreFile struct {
+	r *DatastoreFile
+	c chan struct{}
+	i time.Duration
+}
+
+// Read reads up to len(b) bytes from the DatastoreFile being followed.
+// This method will block until data is read, an error other than io.EOF is returned or Close() is called.
+func (f *followDatastoreFile) Read(p []byte) (int, error) {
+	offset := f.r.offset.seek
+	stop := false
+
+	for {
+		n, err := f.r.Read(p)
+		if err != nil && err == io.EOF {
+			_ = f.r.Close() // GET request body has been drained.
+			if stop {
+				return n, err
+			}
+			err = nil
+		}
+
+		if n > 0 {
+			return n, err
+		}
+
+		select {
+		case <-f.c:
+			// Wake up and stop polling once the body has been drained
+			stop = true
+		case <-time.After(f.i):
+		}
+
+		info, serr := f.r.Stat()
+		if serr != nil {
+			// Return EOF rather than 404 if the file goes away
+			if serr == os.ErrNotExist {
+				_ = f.r.Close()
+				return 0, io.EOF
+			}
+			return 0, serr
+		}
+
+		if info.Size() < offset {
+			// assume file has be truncated
+			offset, err = f.r.Seek(0, io.SeekStart)
+			if err != nil {
+				return 0, err
+			}
+		}
+	}
+}
+
+// Close will stop Follow polling and close the underlying DatastoreFile.
+func (f *followDatastoreFile) Close() error {
+	close(f.c)
+	return nil
+}
+
+// Follow returns an io.ReadCloser to stream the file contents as data is appended.
+func (f *DatastoreFile) Follow(interval time.Duration) io.ReadCloser {
+	return &followDatastoreFile{f, make(chan struct{}), interval}
+}
diff --git a/vendor/github.com/vmware/govmomi/object/datastore_file_manager.go b/vendor/github.com/vmware/govmomi/object/datastore_file_manager.go
new file mode 100644
index 0000000000..7164fbbed7
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/datastore_file_manager.go
@@ -0,0 +1,145 @@
+/*
+Copyright (c) 2017 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 object
+
+import (
+	"bufio"
+	"bytes"
+	"context"
+	"fmt"
+	"io"
+	"log"
+	"path"
+	"strings"
+
+	"github.com/vmware/govmomi/vim25/soap"
+)
+
+// DatastoreFileManager combines FileManager and VirtualDiskManager to manage files on a Datastore
+type DatastoreFileManager struct {
+	Datacenter         *Datacenter
+	Datastore          *Datastore
+	FileManager        *FileManager
+	VirtualDiskManager *VirtualDiskManager
+
+	Force bool
+}
+
+// NewFileManager creates a new instance of DatastoreFileManager
+func (d Datastore) NewFileManager(dc *Datacenter, force bool) *DatastoreFileManager {
+	c := d.Client()
+
+	m := &DatastoreFileManager{
+		Datacenter:         dc,
+		Datastore:          &d,
+		FileManager:        NewFileManager(c),
+		VirtualDiskManager: NewVirtualDiskManager(c),
+		Force:              force,
+	}
+
+	return m
+}
+
+// Delete dispatches to the appropriate Delete method based on file name extension
+func (m *DatastoreFileManager) Delete(ctx context.Context, name string) error {
+	switch path.Ext(name) {
+	case ".vmdk":
+		return m.DeleteVirtualDisk(ctx, name)
+	default:
+		return m.DeleteFile(ctx, name)
+	}
+}
+
+// DeleteFile calls FileManager.DeleteDatastoreFile
+func (m *DatastoreFileManager) DeleteFile(ctx context.Context, name string) error {
+	p := m.Path(name)
+
+	task, err := m.FileManager.DeleteDatastoreFile(ctx, p.String(), m.Datacenter)
+	if err != nil {
+		return err
+	}
+
+	return task.Wait(ctx)
+}
+
+// DeleteVirtualDisk calls VirtualDiskManager.DeleteVirtualDisk
+// Regardless of the Datastore type, DeleteVirtualDisk will fail if 'ddb.deletable=false',
+// so if Force=true this method attempts to set 'ddb.deletable=true' before starting the delete task.
+func (m *DatastoreFileManager) DeleteVirtualDisk(ctx context.Context, name string) error {
+	p := m.Path(name)
+
+	var merr error
+
+	if m.Force {
+		merr = m.markDiskAsDeletable(ctx, p)
+	}
+
+	task, err := m.VirtualDiskManager.DeleteVirtualDisk(ctx, p.String(), m.Datacenter)
+	if err != nil {
+		log.Printf("markDiskAsDeletable(%s): %s", p, merr)
+		return err
+	}
+
+	return task.Wait(ctx)
+}
+
+// Path converts path name to a DatastorePath
+func (m *DatastoreFileManager) Path(name string) *DatastorePath {
+	var p DatastorePath
+
+	if !p.FromString(name) {
+		p.Path = name
+		p.Datastore = m.Datastore.Name()
+	}
+
+	return &p
+}
+
+func (m *DatastoreFileManager) markDiskAsDeletable(ctx context.Context, path *DatastorePath) error {
+	r, _, err := m.Datastore.Download(ctx, path.Path, &soap.DefaultDownload)
+	if err != nil {
+		return err
+	}
+
+	defer r.Close()
+
+	hasFlag := false
+	buf := new(bytes.Buffer)
+
+	s := bufio.NewScanner(&io.LimitedReader{R: r, N: 2048}) // should be only a few hundred bytes, limit to be sure
+
+	for s.Scan() {
+		line := s.Text()
+		if strings.HasPrefix(line, "ddb.deletable") {
+			hasFlag = true
+			continue
+		}
+
+		fmt.Fprintln(buf, line)
+	}
+
+	if err := s.Err(); err != nil {
+		return err // any error other than EOF
+	}
+
+	if !hasFlag {
+		return nil // already deletable, so leave as-is
+	}
+
+	// rewrite the .vmdk with ddb.deletable flag removed (the default is true)
+	return m.Datastore.Upload(ctx, buf, path.Path, &soap.DefaultUpload)
+}
diff --git a/vendor/github.com/vmware/govmomi/object/datastore_path.go b/vendor/github.com/vmware/govmomi/object/datastore_path.go
new file mode 100644
index 0000000000..ea152103df
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/datastore_path.go
@@ -0,0 +1,65 @@
+/*
+Copyright (c) 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 object
+
+import (
+	"fmt"
+	"strings"
+)
+
+// DatastorePath contains the components of a datastore path.
+type DatastorePath struct {
+	Datastore string
+	Path      string
+}
+
+// FromString parses a datastore path.
+// Returns true if the path could be parsed, false otherwise.
+func (p *DatastorePath) FromString(s string) bool {
+	if len(s) == 0 {
+		return false
+	}
+
+	s = strings.TrimSpace(s)
+
+	if !strings.HasPrefix(s, "[") {
+		return false
+	}
+
+	s = s[1:]
+
+	ix := strings.Index(s, "]")
+	if ix < 0 {
+		return false
+	}
+
+	p.Datastore = s[:ix]
+	p.Path = strings.TrimSpace(s[ix+1:])
+
+	return true
+}
+
+// String formats a datastore path.
+func (p *DatastorePath) String() string {
+	s := fmt.Sprintf("[%s]", p.Datastore)
+
+	if p.Path == "" {
+		return s
+	}
+
+	return strings.Join([]string{s, p.Path}, " ")
+}
diff --git a/vendor/github.com/vmware/govmomi/object/datastore_path_test.go b/vendor/github.com/vmware/govmomi/object/datastore_path_test.go
new file mode 100644
index 0000000000..ba85f74b2d
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/datastore_path_test.go
@@ -0,0 +1,76 @@
+/*
+Copyright (c) 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 object
+
+import "testing"
+
+func TestParseDatastorePath(t *testing.T) {
+	tests := []struct {
+		dsPath string
+		dsFile string
+		fail   bool
+	}{
+		{"", "", true},
+		{"x", "", true},
+		{"[", "", true},
+		{"[nope", "", true},
+		{"[te st]", "", false},
+		{"[te st] foo", "foo", false},
+		{"[te st] foo/foo.vmx", "foo/foo.vmx", false},
+		{"[te st]foo bar/foo bar.vmx", "foo bar/foo bar.vmx", false},
+		{" [te st]     bar/bar.vmx  ", "bar/bar.vmx", false},
+	}
+
+	for _, test := range tests {
+		p := new(DatastorePath)
+		ok := p.FromString(test.dsPath)
+
+		if test.fail {
+			if ok {
+				t.Errorf("expected error for: %s", test.dsPath)
+			}
+		} else {
+			if !ok {
+				t.Errorf("failed to parse: %q", test.dsPath)
+			} else {
+				if test.dsFile != p.Path {
+					t.Errorf("dsFile=%s", p.Path)
+				}
+				if p.Datastore != "te st" {
+					t.Errorf("ds=%s", p.Datastore)
+				}
+			}
+		}
+	}
+
+	s := "[datastore1] foo/bar.vmdk"
+	p := new(DatastorePath)
+	ok := p.FromString(s)
+	if !ok {
+		t.Fatal(s)
+	}
+
+	if p.String() != s {
+		t.Fatal(p.String())
+	}
+
+	p.Path = ""
+
+	if p.String() != "[datastore1]" {
+		t.Fatal(p.String())
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/object/datastore_test.go b/vendor/github.com/vmware/govmomi/object/datastore_test.go
new file mode 100644
index 0000000000..5b4f790fff
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/datastore_test.go
@@ -0,0 +1,20 @@
+/*
+Copyright (c) 2015 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 object
+
+// Datastore should implement the Reference interface.
+var _ Reference = Datastore{}
diff --git a/vendor/github.com/vmware/govmomi/object/diagnostic_log.go b/vendor/github.com/vmware/govmomi/object/diagnostic_log.go
new file mode 100644
index 0000000000..466d0ee915
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/diagnostic_log.go
@@ -0,0 +1,76 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"math"
+)
+
+// DiagnosticLog wraps DiagnosticManager.BrowseLog
+type DiagnosticLog struct {
+	m DiagnosticManager
+
+	Key  string
+	Host *HostSystem
+
+	Start int32
+}
+
+// Seek to log position starting at the last nlines of the log
+func (l *DiagnosticLog) Seek(ctx context.Context, nlines int32) error {
+	h, err := l.m.BrowseLog(ctx, l.Host, l.Key, math.MaxInt32, 0)
+	if err != nil {
+		return err
+	}
+
+	l.Start = h.LineEnd - nlines
+
+	return nil
+}
+
+// Copy log starting from l.Start to the given io.Writer
+// Returns on error or when end of log is reached.
+func (l *DiagnosticLog) Copy(ctx context.Context, w io.Writer) (int, error) {
+	const max = 500 // VC max == 500, ESX max == 1000
+	written := 0
+
+	for {
+		h, err := l.m.BrowseLog(ctx, l.Host, l.Key, l.Start, max)
+		if err != nil {
+			return 0, err
+		}
+
+		for _, line := range h.LineText {
+			n, err := fmt.Fprintln(w, line)
+			written += n
+			if err != nil {
+				return written, err
+			}
+		}
+
+		l.Start += int32(len(h.LineText))
+
+		if l.Start >= h.LineEnd {
+			break
+		}
+	}
+
+	return written, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/diagnostic_manager.go b/vendor/github.com/vmware/govmomi/object/diagnostic_manager.go
new file mode 100644
index 0000000000..5baf1ad903
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/diagnostic_manager.go
@@ -0,0 +1,104 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type DiagnosticManager struct {
+	Common
+}
+
+func NewDiagnosticManager(c *vim25.Client) *DiagnosticManager {
+	m := DiagnosticManager{
+		Common: NewCommon(c, *c.ServiceContent.DiagnosticManager),
+	}
+
+	return &m
+}
+
+func (m DiagnosticManager) Log(ctx context.Context, host *HostSystem, key string) *DiagnosticLog {
+	return &DiagnosticLog{
+		m:    m,
+		Key:  key,
+		Host: host,
+	}
+}
+
+func (m DiagnosticManager) BrowseLog(ctx context.Context, host *HostSystem, key string, start, lines int32) (*types.DiagnosticManagerLogHeader, error) {
+	req := types.BrowseDiagnosticLog{
+		This:  m.Reference(),
+		Key:   key,
+		Start: start,
+		Lines: lines,
+	}
+
+	if host != nil {
+		ref := host.Reference()
+		req.Host = &ref
+	}
+
+	res, err := methods.BrowseDiagnosticLog(ctx, m.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return &res.Returnval, nil
+}
+
+func (m DiagnosticManager) GenerateLogBundles(ctx context.Context, includeDefault bool, host []*HostSystem) (*Task, error) {
+	req := types.GenerateLogBundles_Task{
+		This:           m.Reference(),
+		IncludeDefault: includeDefault,
+	}
+
+	if host != nil {
+		for _, h := range host {
+			req.Host = append(req.Host, h.Reference())
+		}
+	}
+
+	res, err := methods.GenerateLogBundles_Task(ctx, m.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(m.c, res.Returnval), nil
+}
+
+func (m DiagnosticManager) QueryDescriptions(ctx context.Context, host *HostSystem) ([]types.DiagnosticManagerLogDescriptor, error) {
+	req := types.QueryDescriptions{
+		This: m.Reference(),
+	}
+
+	if host != nil {
+		ref := host.Reference()
+		req.Host = &ref
+	}
+
+	res, err := methods.QueryDescriptions(ctx, m.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return 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
new file mode 100644
index 0000000000..864bb783f3
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/distributed_virtual_portgroup.go
@@ -0,0 +1,73 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type DistributedVirtualPortgroup struct {
+	Common
+}
+
+func NewDistributedVirtualPortgroup(c *vim25.Client, ref types.ManagedObjectReference) *DistributedVirtualPortgroup {
+	return &DistributedVirtualPortgroup{
+		Common: NewCommon(c, ref),
+	}
+}
+
+// EthernetCardBackingInfo returns the VirtualDeviceBackingInfo for this DistributedVirtualPortgroup
+func (p DistributedVirtualPortgroup) EthernetCardBackingInfo(ctx context.Context) (types.BaseVirtualDeviceBackingInfo, error) {
+	var dvp mo.DistributedVirtualPortgroup
+	var dvs mo.VmwareDistributedVirtualSwitch // TODO: should be mo.BaseDistributedVirtualSwitch
+
+	if err := p.Properties(ctx, p.Reference(), []string{"key", "config.distributedVirtualSwitch"}, &dvp); err != nil {
+		return nil, err
+	}
+
+	if err := p.Properties(ctx, *dvp.Config.DistributedVirtualSwitch, []string{"uuid"}, &dvs); err != nil {
+		return nil, err
+	}
+
+	backing := &types.VirtualEthernetCardDistributedVirtualPortBackingInfo{
+		Port: types.DistributedVirtualSwitchPortConnection{
+			PortgroupKey: dvp.Key,
+			SwitchUuid:   dvs.Uuid,
+		},
+	}
+
+	return backing, nil
+}
+
+func (p DistributedVirtualPortgroup) Reconfigure(ctx context.Context, spec types.DVPortgroupConfigSpec) (*Task, error) {
+	req := types.ReconfigureDVPortgroup_Task{
+		This: p.Reference(),
+		Spec: spec,
+	}
+
+	res, err := methods.ReconfigureDVPortgroup_Task(ctx, p.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(p.Client(), res.Returnval), nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/distributed_virtual_portgroup_test.go b/vendor/github.com/vmware/govmomi/object/distributed_virtual_portgroup_test.go
new file mode 100644
index 0000000000..fcbbab26e9
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/distributed_virtual_portgroup_test.go
@@ -0,0 +1,23 @@
+/*
+Copyright (c) 2015 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 object
+
+// DistributedVirtualPortgroup should implement the Reference interface.
+var _ Reference = DistributedVirtualPortgroup{}
+
+// DistributedVirtualPortgroup should implement the NetworkReference interface.
+var _ NetworkReference = DistributedVirtualPortgroup{}
diff --git a/vendor/github.com/vmware/govmomi/object/distributed_virtual_switch.go b/vendor/github.com/vmware/govmomi/object/distributed_virtual_switch.go
new file mode 100644
index 0000000000..29ee52d950
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/distributed_virtual_switch.go
@@ -0,0 +1,67 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type DistributedVirtualSwitch struct {
+	Common
+}
+
+func NewDistributedVirtualSwitch(c *vim25.Client, ref types.ManagedObjectReference) *DistributedVirtualSwitch {
+	return &DistributedVirtualSwitch{
+		Common: NewCommon(c, ref),
+	}
+}
+
+func (s DistributedVirtualSwitch) EthernetCardBackingInfo(ctx context.Context) (types.BaseVirtualDeviceBackingInfo, error) {
+	return nil, ErrNotSupported // TODO: just to satisfy NetworkReference interface for the finder
+}
+
+func (s DistributedVirtualSwitch) Reconfigure(ctx context.Context, spec types.BaseDVSConfigSpec) (*Task, error) {
+	req := types.ReconfigureDvs_Task{
+		This: s.Reference(),
+		Spec: spec,
+	}
+
+	res, err := methods.ReconfigureDvs_Task(ctx, s.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(s.Client(), res.Returnval), nil
+}
+
+func (s DistributedVirtualSwitch) AddPortgroup(ctx context.Context, spec []types.DVPortgroupConfigSpec) (*Task, error) {
+	req := types.AddDVPortgroup_Task{
+		This: s.Reference(),
+		Spec: spec,
+	}
+
+	res, err := methods.AddDVPortgroup_Task(ctx, s.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(s.Client(), res.Returnval), nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/extension_manager.go b/vendor/github.com/vmware/govmomi/object/extension_manager.go
new file mode 100644
index 0000000000..94ade017c2
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/extension_manager.go
@@ -0,0 +1,113 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type ExtensionManager struct {
+	Common
+}
+
+// GetExtensionManager wraps NewExtensionManager, returning ErrNotSupported
+// when the client is not connected to a vCenter instance.
+func GetExtensionManager(c *vim25.Client) (*ExtensionManager, error) {
+	if c.ServiceContent.ExtensionManager == nil {
+		return nil, ErrNotSupported
+	}
+	return NewExtensionManager(c), nil
+}
+
+func NewExtensionManager(c *vim25.Client) *ExtensionManager {
+	o := ExtensionManager{
+		Common: NewCommon(c, *c.ServiceContent.ExtensionManager),
+	}
+
+	return &o
+}
+
+func (m ExtensionManager) List(ctx context.Context) ([]types.Extension, error) {
+	var em mo.ExtensionManager
+
+	err := m.Properties(ctx, m.Reference(), []string{"extensionList"}, &em)
+	if err != nil {
+		return nil, err
+	}
+
+	return em.ExtensionList, nil
+}
+
+func (m ExtensionManager) Find(ctx context.Context, key string) (*types.Extension, error) {
+	req := types.FindExtension{
+		This:         m.Reference(),
+		ExtensionKey: key,
+	}
+
+	res, err := methods.FindExtension(ctx, m.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, nil
+}
+
+func (m ExtensionManager) Register(ctx context.Context, extension types.Extension) error {
+	req := types.RegisterExtension{
+		This:      m.Reference(),
+		Extension: extension,
+	}
+
+	_, err := methods.RegisterExtension(ctx, m.c, &req)
+	return err
+}
+
+func (m ExtensionManager) SetCertificate(ctx context.Context, key string, certificatePem string) error {
+	req := types.SetExtensionCertificate{
+		This:           m.Reference(),
+		ExtensionKey:   key,
+		CertificatePem: certificatePem,
+	}
+
+	_, err := methods.SetExtensionCertificate(ctx, m.c, &req)
+	return err
+}
+
+func (m ExtensionManager) Unregister(ctx context.Context, key string) error {
+	req := types.UnregisterExtension{
+		This:         m.Reference(),
+		ExtensionKey: key,
+	}
+
+	_, err := methods.UnregisterExtension(ctx, m.c, &req)
+	return err
+}
+
+func (m ExtensionManager) Update(ctx context.Context, extension types.Extension) error {
+	req := types.UpdateExtension{
+		This:      m.Reference(),
+		Extension: extension,
+	}
+
+	_, err := methods.UpdateExtension(ctx, m.c, &req)
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/object/file_manager.go b/vendor/github.com/vmware/govmomi/object/file_manager.go
new file mode 100644
index 0000000000..ba947be20d
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/file_manager.go
@@ -0,0 +1,126 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type FileManager struct {
+	Common
+}
+
+func NewFileManager(c *vim25.Client) *FileManager {
+	f := FileManager{
+		Common: NewCommon(c, *c.ServiceContent.FileManager),
+	}
+
+	return &f
+}
+
+func (f FileManager) CopyDatastoreFile(ctx context.Context, sourceName string, sourceDatacenter *Datacenter, destinationName string, destinationDatacenter *Datacenter, force bool) (*Task, error) {
+	req := types.CopyDatastoreFile_Task{
+		This:            f.Reference(),
+		SourceName:      sourceName,
+		DestinationName: destinationName,
+		Force:           types.NewBool(force),
+	}
+
+	if sourceDatacenter != nil {
+		ref := sourceDatacenter.Reference()
+		req.SourceDatacenter = &ref
+	}
+
+	if destinationDatacenter != nil {
+		ref := destinationDatacenter.Reference()
+		req.DestinationDatacenter = &ref
+	}
+
+	res, err := methods.CopyDatastoreFile_Task(ctx, f.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(f.c, res.Returnval), nil
+}
+
+// DeleteDatastoreFile deletes the specified file or folder from the datastore.
+func (f FileManager) DeleteDatastoreFile(ctx context.Context, name string, dc *Datacenter) (*Task, error) {
+	req := types.DeleteDatastoreFile_Task{
+		This: f.Reference(),
+		Name: name,
+	}
+
+	if dc != nil {
+		ref := dc.Reference()
+		req.Datacenter = &ref
+	}
+
+	res, err := methods.DeleteDatastoreFile_Task(ctx, f.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(f.c, res.Returnval), nil
+}
+
+// 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,
+		CreateParentDirectories: types.NewBool(createParentDirectories),
+	}
+
+	if dc != nil {
+		ref := dc.Reference()
+		req.Datacenter = &ref
+	}
+
+	_, err := methods.MakeDirectory(ctx, f.c, &req)
+	return err
+}
+
+func (f FileManager) MoveDatastoreFile(ctx context.Context, sourceName string, sourceDatacenter *Datacenter, destinationName string, destinationDatacenter *Datacenter, force bool) (*Task, error) {
+	req := types.MoveDatastoreFile_Task{
+		This:            f.Reference(),
+		SourceName:      sourceName,
+		DestinationName: destinationName,
+		Force:           types.NewBool(force),
+	}
+
+	if sourceDatacenter != nil {
+		ref := sourceDatacenter.Reference()
+		req.SourceDatacenter = &ref
+	}
+
+	if destinationDatacenter != nil {
+		ref := destinationDatacenter.Reference()
+		req.DestinationDatacenter = &ref
+	}
+
+	res, err := methods.MoveDatastoreFile_Task(ctx, f.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(f.c, res.Returnval), nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/folder.go b/vendor/github.com/vmware/govmomi/object/folder.go
new file mode 100644
index 0000000000..7a69949f95
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/folder.go
@@ -0,0 +1,227 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type Folder struct {
+	Common
+}
+
+func NewFolder(c *vim25.Client, ref types.ManagedObjectReference) *Folder {
+	return &Folder{
+		Common: NewCommon(c, ref),
+	}
+}
+
+func NewRootFolder(c *vim25.Client) *Folder {
+	f := NewFolder(c, c.ServiceContent.RootFolder)
+	f.InventoryPath = "/"
+	return f
+}
+
+func (f Folder) Children(ctx context.Context) ([]Reference, error) {
+	var mf mo.Folder
+
+	err := f.Properties(ctx, f.Reference(), []string{"childEntity"}, &mf)
+	if err != nil {
+		return nil, err
+	}
+
+	var rs []Reference
+	for _, e := range mf.ChildEntity {
+		if r := NewReference(f.c, e); r != nil {
+			rs = append(rs, r)
+		}
+	}
+
+	return rs, nil
+}
+
+func (f Folder) CreateDatacenter(ctx context.Context, datacenter string) (*Datacenter, error) {
+	req := types.CreateDatacenter{
+		This: f.Reference(),
+		Name: datacenter,
+	}
+
+	res, err := methods.CreateDatacenter(ctx, f.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	// Response will be nil if this is an ESX host that does not belong to a vCenter
+	if res == nil {
+		return nil, nil
+	}
+
+	return NewDatacenter(f.c, res.Returnval), nil
+}
+
+func (f Folder) CreateCluster(ctx context.Context, cluster string, spec types.ClusterConfigSpecEx) (*ClusterComputeResource, error) {
+	req := types.CreateClusterEx{
+		This: f.Reference(),
+		Name: cluster,
+		Spec: spec,
+	}
+
+	res, err := methods.CreateClusterEx(ctx, f.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	// Response will be nil if this is an ESX host that does not belong to a vCenter
+	if res == nil {
+		return nil, nil
+	}
+
+	return NewClusterComputeResource(f.c, res.Returnval), nil
+}
+
+func (f Folder) CreateFolder(ctx context.Context, name string) (*Folder, error) {
+	req := types.CreateFolder{
+		This: f.Reference(),
+		Name: name,
+	}
+
+	res, err := methods.CreateFolder(ctx, f.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewFolder(f.c, res.Returnval), err
+}
+
+func (f Folder) CreateStoragePod(ctx context.Context, name string) (*StoragePod, error) {
+	req := types.CreateStoragePod{
+		This: f.Reference(),
+		Name: name,
+	}
+
+	res, err := methods.CreateStoragePod(ctx, f.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewStoragePod(f.c, res.Returnval), err
+}
+
+func (f Folder) AddStandaloneHost(ctx context.Context, spec types.HostConnectSpec, addConnected bool, license *string, compResSpec *types.BaseComputeResourceConfigSpec) (*Task, error) {
+	req := types.AddStandaloneHost_Task{
+		This:         f.Reference(),
+		Spec:         spec,
+		AddConnected: addConnected,
+	}
+
+	if license != nil {
+		req.License = *license
+	}
+
+	if compResSpec != nil {
+		req.CompResSpec = *compResSpec
+	}
+
+	res, err := methods.AddStandaloneHost_Task(ctx, f.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(f.c, res.Returnval), nil
+}
+
+func (f Folder) CreateVM(ctx context.Context, config types.VirtualMachineConfigSpec, pool *ResourcePool, host *HostSystem) (*Task, error) {
+	req := types.CreateVM_Task{
+		This:   f.Reference(),
+		Config: config,
+		Pool:   pool.Reference(),
+	}
+
+	if host != nil {
+		ref := host.Reference()
+		req.Host = &ref
+	}
+
+	res, err := methods.CreateVM_Task(ctx, f.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(f.c, res.Returnval), nil
+}
+
+func (f Folder) RegisterVM(ctx context.Context, path string, name string, asTemplate bool, pool *ResourcePool, host *HostSystem) (*Task, error) {
+	req := types.RegisterVM_Task{
+		This:       f.Reference(),
+		Path:       path,
+		AsTemplate: asTemplate,
+	}
+
+	if name != "" {
+		req.Name = name
+	}
+
+	if host != nil {
+		ref := host.Reference()
+		req.Host = &ref
+	}
+
+	if pool != nil {
+		ref := pool.Reference()
+		req.Pool = &ref
+	}
+
+	res, err := methods.RegisterVM_Task(ctx, f.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(f.c, res.Returnval), nil
+}
+
+func (f Folder) CreateDVS(ctx context.Context, spec types.DVSCreateSpec) (*Task, error) {
+	req := types.CreateDVS_Task{
+		This: f.Reference(),
+		Spec: spec,
+	}
+
+	res, err := methods.CreateDVS_Task(ctx, f.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(f.c, res.Returnval), nil
+}
+
+func (f Folder) MoveInto(ctx context.Context, list []types.ManagedObjectReference) (*Task, error) {
+	req := types.MoveIntoFolder_Task{
+		This: f.Reference(),
+		List: list,
+	}
+
+	res, err := methods.MoveIntoFolder_Task(ctx, f.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(f.c, res.Returnval), nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/folder_test.go b/vendor/github.com/vmware/govmomi/object/folder_test.go
new file mode 100644
index 0000000000..4423961f74
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/folder_test.go
@@ -0,0 +1,20 @@
+/*
+Copyright (c) 2015 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 object
+
+// Folder should implement the Reference interface.
+var _ Reference = Folder{}
diff --git a/vendor/github.com/vmware/govmomi/object/history_collector.go b/vendor/github.com/vmware/govmomi/object/history_collector.go
new file mode 100644
index 0000000000..afdcab78b6
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/history_collector.go
@@ -0,0 +1,72 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type HistoryCollector struct {
+	Common
+}
+
+func NewHistoryCollector(c *vim25.Client, ref types.ManagedObjectReference) *HistoryCollector {
+	return &HistoryCollector{
+		Common: NewCommon(c, ref),
+	}
+}
+
+func (h HistoryCollector) Destroy(ctx context.Context) error {
+	req := types.DestroyCollector{
+		This: h.Reference(),
+	}
+
+	_, err := methods.DestroyCollector(ctx, h.c, &req)
+	return err
+}
+
+func (h HistoryCollector) Reset(ctx context.Context) error {
+	req := types.ResetCollector{
+		This: h.Reference(),
+	}
+
+	_, err := methods.ResetCollector(ctx, h.c, &req)
+	return err
+}
+
+func (h HistoryCollector) Rewind(ctx context.Context) error {
+	req := types.RewindCollector{
+		This: h.Reference(),
+	}
+
+	_, err := methods.RewindCollector(ctx, h.c, &req)
+	return err
+}
+
+func (h HistoryCollector) SetPageSize(ctx context.Context, maxCount int32) error {
+	req := types.SetCollectorPageSize{
+		This:     h.Reference(),
+		MaxCount: maxCount,
+	}
+
+	_, err := methods.SetCollectorPageSize(ctx, h.c, &req)
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/object/host_account_manager.go b/vendor/github.com/vmware/govmomi/object/host_account_manager.go
new file mode 100644
index 0000000000..640aff8603
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/host_account_manager.go
@@ -0,0 +1,65 @@
+/*
+Copyright (c) 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type HostAccountManager struct {
+	Common
+}
+
+func NewHostAccountManager(c *vim25.Client, ref types.ManagedObjectReference) *HostAccountManager {
+	return &HostAccountManager{
+		Common: NewCommon(c, ref),
+	}
+}
+
+func (m HostAccountManager) Create(ctx context.Context, user *types.HostAccountSpec) error {
+	req := types.CreateUser{
+		This: m.Reference(),
+		User: user,
+	}
+
+	_, err := methods.CreateUser(ctx, m.Client(), &req)
+	return err
+}
+
+func (m HostAccountManager) Update(ctx context.Context, user *types.HostAccountSpec) error {
+	req := types.UpdateUser{
+		This: m.Reference(),
+		User: user,
+	}
+
+	_, err := methods.UpdateUser(ctx, m.Client(), &req)
+	return err
+}
+
+func (m HostAccountManager) Remove(ctx context.Context, userName string) error {
+	req := types.RemoveUser{
+		This:     m.Reference(),
+		UserName: userName,
+	}
+
+	_, err := methods.RemoveUser(ctx, m.Client(), &req)
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/object/host_certificate_info.go b/vendor/github.com/vmware/govmomi/object/host_certificate_info.go
new file mode 100644
index 0000000000..52c26a9dd6
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/host_certificate_info.go
@@ -0,0 +1,250 @@
+/*
+Copyright (c) 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 object
+
+import (
+	"crypto/sha256"
+	"crypto/tls"
+	"crypto/x509"
+	"crypto/x509/pkix"
+	"encoding/asn1"
+	"fmt"
+	"io"
+	"net/url"
+	"strings"
+	"text/tabwriter"
+
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+// HostCertificateInfo provides helpers for types.HostCertificateManagerCertificateInfo
+type HostCertificateInfo struct {
+	types.HostCertificateManagerCertificateInfo
+
+	ThumbprintSHA1   string
+	ThumbprintSHA256 string
+
+	Err         error
+	Certificate *x509.Certificate `json:"-"`
+
+	subjectName *pkix.Name
+	issuerName  *pkix.Name
+}
+
+// FromCertificate converts x509.Certificate to HostCertificateInfo
+func (info *HostCertificateInfo) FromCertificate(cert *x509.Certificate) *HostCertificateInfo {
+	info.Certificate = cert
+	info.subjectName = &cert.Subject
+	info.issuerName = &cert.Issuer
+
+	info.Issuer = info.fromName(info.issuerName)
+	info.NotBefore = &cert.NotBefore
+	info.NotAfter = &cert.NotAfter
+	info.Subject = info.fromName(info.subjectName)
+
+	info.ThumbprintSHA1 = soap.ThumbprintSHA1(cert)
+
+	// SHA-256 for info purposes only, API fields all use SHA-1
+	sum := sha256.Sum256(cert.Raw)
+	hex := make([]string, len(sum))
+	for i, b := range sum {
+		hex[i] = fmt.Sprintf("%02X", b)
+	}
+	info.ThumbprintSHA256 = strings.Join(hex, ":")
+
+	if info.Status == "" {
+		info.Status = string(types.HostCertificateManagerCertificateInfoCertificateStatusUnknown)
+	}
+
+	return info
+}
+
+// FromURL connects to the given URL.Host via tls.Dial with the given tls.Config and populates the HostCertificateInfo
+// via tls.ConnectionState.  If the certificate was verified with the given tls.Config, the Err field will be nil.
+// Otherwise, Err will be set to the x509.UnknownAuthorityError or x509.HostnameError.
+// If tls.Dial returns an error of any other type, that error is returned.
+func (info *HostCertificateInfo) FromURL(u *url.URL, config *tls.Config) error {
+	addr := u.Host
+	if !(strings.LastIndex(addr, ":") > strings.LastIndex(addr, "]")) {
+		addr += ":443"
+	}
+
+	conn, err := tls.Dial("tcp", addr, config)
+	if err != nil {
+		switch err.(type) {
+		case x509.UnknownAuthorityError:
+		case x509.HostnameError:
+		default:
+			return err
+		}
+
+		info.Err = err
+
+		conn, err = tls.Dial("tcp", addr, &tls.Config{InsecureSkipVerify: true})
+		if err != nil {
+			return err
+		}
+	} else {
+		info.Status = string(types.HostCertificateManagerCertificateInfoCertificateStatusGood)
+	}
+
+	state := conn.ConnectionState()
+	_ = conn.Close()
+	info.FromCertificate(state.PeerCertificates[0])
+
+	return nil
+}
+
+var emailAddressOID = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 9, 1}
+
+func (info *HostCertificateInfo) fromName(name *pkix.Name) string {
+	var attrs []string
+
+	oids := map[string]string{
+		emailAddressOID.String(): "emailAddress",
+	}
+
+	for _, attr := range name.Names {
+		if key, ok := oids[attr.Type.String()]; ok {
+			attrs = append(attrs, fmt.Sprintf("%s=%s", key, attr.Value))
+		}
+	}
+
+	attrs = append(attrs, fmt.Sprintf("CN=%s", name.CommonName))
+
+	add := func(key string, vals []string) {
+		for _, val := range vals {
+			attrs = append(attrs, fmt.Sprintf("%s=%s", key, val))
+		}
+	}
+
+	elts := []struct {
+		key string
+		val []string
+	}{
+		{"OU", name.OrganizationalUnit},
+		{"O", name.Organization},
+		{"L", name.Locality},
+		{"ST", name.Province},
+		{"C", name.Country},
+	}
+
+	for _, elt := range elts {
+		add(elt.key, elt.val)
+	}
+
+	return strings.Join(attrs, ",")
+}
+
+func (info *HostCertificateInfo) toName(s string) *pkix.Name {
+	var name pkix.Name
+
+	for _, pair := range strings.Split(s, ",") {
+		attr := strings.SplitN(pair, "=", 2)
+		if len(attr) != 2 {
+			continue
+		}
+
+		v := attr[1]
+
+		switch strings.ToLower(attr[0]) {
+		case "cn":
+			name.CommonName = v
+		case "ou":
+			name.OrganizationalUnit = append(name.OrganizationalUnit, v)
+		case "o":
+			name.Organization = append(name.Organization, v)
+		case "l":
+			name.Locality = append(name.Locality, v)
+		case "st":
+			name.Province = append(name.Province, v)
+		case "c":
+			name.Country = append(name.Country, v)
+		case "emailaddress":
+			name.Names = append(name.Names, pkix.AttributeTypeAndValue{Type: emailAddressOID, Value: v})
+		}
+	}
+
+	return &name
+}
+
+// SubjectName parses Subject into a pkix.Name
+func (info *HostCertificateInfo) SubjectName() *pkix.Name {
+	if info.subjectName != nil {
+		return info.subjectName
+	}
+
+	return info.toName(info.Subject)
+}
+
+// IssuerName parses Issuer into a pkix.Name
+func (info *HostCertificateInfo) IssuerName() *pkix.Name {
+	if info.issuerName != nil {
+		return info.issuerName
+	}
+
+	return info.toName(info.Issuer)
+}
+
+// Write outputs info similar to the Chrome Certificate Viewer.
+func (info *HostCertificateInfo) Write(w io.Writer) error {
+	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
+
+	s := func(val string) string {
+		if val != "" {
+			return val
+		}
+		return "<Not Part Of Certificate>"
+	}
+
+	ss := func(val []string) string {
+		return s(strings.Join(val, ","))
+	}
+
+	name := func(n *pkix.Name) {
+		fmt.Fprintf(tw, "  Common Name (CN):\t%s\n", s(n.CommonName))
+		fmt.Fprintf(tw, "  Organization (O):\t%s\n", ss(n.Organization))
+		fmt.Fprintf(tw, "  Organizational Unit (OU):\t%s\n", ss(n.OrganizationalUnit))
+	}
+
+	status := info.Status
+	if info.Err != nil {
+		status = fmt.Sprintf("ERROR %s", info.Err)
+	}
+	fmt.Fprintf(tw, "Certificate Status:\t%s\n", status)
+
+	fmt.Fprintln(tw, "Issued To:\t")
+	name(info.SubjectName())
+
+	fmt.Fprintln(tw, "Issued By:\t")
+	name(info.IssuerName())
+
+	fmt.Fprintln(tw, "Validity Period:\t")
+	fmt.Fprintf(tw, "  Issued On:\t%s\n", info.NotBefore)
+	fmt.Fprintf(tw, "  Expires On:\t%s\n", info.NotAfter)
+
+	if info.ThumbprintSHA1 != "" {
+		fmt.Fprintln(tw, "Thumbprints:\t")
+		if info.ThumbprintSHA256 != "" {
+			fmt.Fprintf(tw, "  SHA-256 Thumbprint:\t%s\n", info.ThumbprintSHA256)
+		}
+		fmt.Fprintf(tw, "  SHA-1 Thumbprint:\t%s\n", info.ThumbprintSHA1)
+	}
+
+	return tw.Flush()
+}
diff --git a/vendor/github.com/vmware/govmomi/object/host_certificate_info_test.go b/vendor/github.com/vmware/govmomi/object/host_certificate_info_test.go
new file mode 100644
index 0000000000..23a1feb442
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/host_certificate_info_test.go
@@ -0,0 +1,30 @@
+/*
+Copyright (c) 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 object
+
+import "testing"
+
+func TestHostCertificateManagerCertificateInfo(t *testing.T) {
+	subject := "emailAddress=vmca@vmware.com,CN=w2-xlr8-autoroot-esx004.eng.vmware.com,OU=VMware Engineering,O=VMware,L=Palo Alto,ST=California,C=US"
+
+	var info HostCertificateInfo
+	name := info.toName(subject)
+	s := info.fromName(name)
+	if subject != s {
+		t.Errorf("%s != %s", s, subject)
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/object/host_certificate_manager.go b/vendor/github.com/vmware/govmomi/object/host_certificate_manager.go
new file mode 100644
index 0000000000..2875a9fc1a
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/host_certificate_manager.go
@@ -0,0 +1,162 @@
+/*
+Copyright (c) 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+// HostCertificateManager provides helper methods around the HostSystem.ConfigManager.CertificateManager
+type HostCertificateManager struct {
+	Common
+	Host *HostSystem
+}
+
+// NewHostCertificateManager creates a new HostCertificateManager helper
+func NewHostCertificateManager(c *vim25.Client, ref types.ManagedObjectReference, host types.ManagedObjectReference) *HostCertificateManager {
+	return &HostCertificateManager{
+		Common: NewCommon(c, ref),
+		Host:   NewHostSystem(c, host),
+	}
+}
+
+// CertificateInfo wraps the host CertificateManager certificateInfo property with the HostCertificateInfo helper.
+// The ThumbprintSHA1 field is set to HostSystem.Summary.Config.SslThumbprint if the host system is managed by a vCenter.
+func (m HostCertificateManager) CertificateInfo(ctx context.Context) (*HostCertificateInfo, error) {
+	var hs mo.HostSystem
+	var cm mo.HostCertificateManager
+
+	pc := property.DefaultCollector(m.Client())
+
+	err := pc.RetrieveOne(ctx, m.Reference(), []string{"certificateInfo"}, &cm)
+	if err != nil {
+		return nil, err
+	}
+
+	_ = pc.RetrieveOne(ctx, m.Host.Reference(), []string{"summary.config.sslThumbprint"}, &hs)
+
+	return &HostCertificateInfo{
+		HostCertificateManagerCertificateInfo: cm.CertificateInfo,
+		ThumbprintSHA1:                        hs.Summary.Config.SslThumbprint,
+	}, nil
+}
+
+// GenerateCertificateSigningRequest requests the host system to generate a certificate-signing request (CSR) for itself.
+// The CSR is then typically provided to a Certificate Authority to sign and issue the SSL certificate for the host system.
+// Use InstallServerCertificate to import this certificate.
+func (m HostCertificateManager) GenerateCertificateSigningRequest(ctx context.Context, useIPAddressAsCommonName bool) (string, error) {
+	req := types.GenerateCertificateSigningRequest{
+		This: m.Reference(),
+		UseIpAddressAsCommonName: useIPAddressAsCommonName,
+	}
+
+	res, err := methods.GenerateCertificateSigningRequest(ctx, m.Client(), &req)
+	if err != nil {
+		return "", err
+	}
+
+	return res.Returnval, nil
+}
+
+// GenerateCertificateSigningRequestByDn requests the host system to generate a certificate-signing request (CSR) for itself.
+// Alternative version similar to GenerateCertificateSigningRequest but takes a Distinguished Name (DN) as a parameter.
+func (m HostCertificateManager) GenerateCertificateSigningRequestByDn(ctx context.Context, distinguishedName string) (string, error) {
+	req := types.GenerateCertificateSigningRequestByDn{
+		This:              m.Reference(),
+		DistinguishedName: distinguishedName,
+	}
+
+	res, err := methods.GenerateCertificateSigningRequestByDn(ctx, m.Client(), &req)
+	if err != nil {
+		return "", err
+	}
+
+	return res.Returnval, nil
+}
+
+// InstallServerCertificate imports the given SSL certificate to the host system.
+func (m HostCertificateManager) InstallServerCertificate(ctx context.Context, cert string) error {
+	req := types.InstallServerCertificate{
+		This: m.Reference(),
+		Cert: cert,
+	}
+
+	_, err := methods.InstallServerCertificate(ctx, m.Client(), &req)
+	if err != nil {
+		return err
+	}
+
+	// NotifyAffectedService is internal, not exposing as we don't have a use case other than with InstallServerCertificate
+	// Without this call, hostd needs to be restarted to use the updated certificate
+	// Note: using Refresh as it has the same struct/signature, we just need to use different xml name tags
+	body := struct {
+		Req *types.Refresh         `xml:"urn:vim25 NotifyAffectedServices,omitempty"`
+		Res *types.RefreshResponse `xml:"urn:vim25 NotifyAffectedServicesResponse,omitempty"`
+		methods.RefreshBody
+	}{
+		Req: &types.Refresh{This: m.Reference()},
+	}
+
+	return m.Client().RoundTrip(ctx, &body, &body)
+}
+
+// ListCACertificateRevocationLists returns the SSL CRLs of Certificate Authorities that are trusted by the host system.
+func (m HostCertificateManager) ListCACertificateRevocationLists(ctx context.Context) ([]string, error) {
+	req := types.ListCACertificateRevocationLists{
+		This: m.Reference(),
+	}
+
+	res, err := methods.ListCACertificateRevocationLists(ctx, m.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, nil
+}
+
+// ListCACertificates returns the SSL certificates of Certificate Authorities that are trusted by the host system.
+func (m HostCertificateManager) ListCACertificates(ctx context.Context) ([]string, error) {
+	req := types.ListCACertificates{
+		This: m.Reference(),
+	}
+
+	res, err := methods.ListCACertificates(ctx, m.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, nil
+}
+
+// ReplaceCACertificatesAndCRLs replaces the trusted CA certificates and CRL used by the host system.
+// These determine whether the server can verify the identity of an external entity.
+func (m HostCertificateManager) ReplaceCACertificatesAndCRLs(ctx context.Context, caCert []string, caCrl []string) error {
+	req := types.ReplaceCACertificatesAndCRLs{
+		This:   m.Reference(),
+		CaCert: caCert,
+		CaCrl:  caCrl,
+	}
+
+	_, err := methods.ReplaceCACertificatesAndCRLs(ctx, m.Client(), &req)
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/object/host_config_manager.go b/vendor/github.com/vmware/govmomi/object/host_config_manager.go
new file mode 100644
index 0000000000..123227ecc7
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/host_config_manager.go
@@ -0,0 +1,196 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type HostConfigManager struct {
+	Common
+}
+
+func NewHostConfigManager(c *vim25.Client, ref types.ManagedObjectReference) *HostConfigManager {
+	return &HostConfigManager{
+		Common: NewCommon(c, ref),
+	}
+}
+
+func (m HostConfigManager) DatastoreSystem(ctx context.Context) (*HostDatastoreSystem, error) {
+	var h mo.HostSystem
+
+	err := m.Properties(ctx, m.Reference(), []string{"configManager.datastoreSystem"}, &h)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewHostDatastoreSystem(m.c, *h.ConfigManager.DatastoreSystem), nil
+}
+
+func (m HostConfigManager) NetworkSystem(ctx context.Context) (*HostNetworkSystem, error) {
+	var h mo.HostSystem
+
+	err := m.Properties(ctx, m.Reference(), []string{"configManager.networkSystem"}, &h)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewHostNetworkSystem(m.c, *h.ConfigManager.NetworkSystem), nil
+}
+
+func (m HostConfigManager) FirewallSystem(ctx context.Context) (*HostFirewallSystem, error) {
+	var h mo.HostSystem
+
+	err := m.Properties(ctx, m.Reference(), []string{"configManager.firewallSystem"}, &h)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewHostFirewallSystem(m.c, *h.ConfigManager.FirewallSystem), nil
+}
+
+func (m HostConfigManager) StorageSystem(ctx context.Context) (*HostStorageSystem, error) {
+	var h mo.HostSystem
+
+	err := m.Properties(ctx, m.Reference(), []string{"configManager.storageSystem"}, &h)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewHostStorageSystem(m.c, *h.ConfigManager.StorageSystem), nil
+}
+
+func (m HostConfigManager) VirtualNicManager(ctx context.Context) (*HostVirtualNicManager, error) {
+	var h mo.HostSystem
+
+	err := m.Properties(ctx, m.Reference(), []string{"configManager.virtualNicManager"}, &h)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewHostVirtualNicManager(m.c, *h.ConfigManager.VirtualNicManager, m.Reference()), nil
+}
+
+func (m HostConfigManager) VsanSystem(ctx context.Context) (*HostVsanSystem, error) {
+	var h mo.HostSystem
+
+	err := m.Properties(ctx, m.Reference(), []string{"configManager.vsanSystem"}, &h)
+	if err != nil {
+		return nil, err
+	}
+
+	// Added in 5.5
+	if h.ConfigManager.VsanSystem == nil {
+		return nil, ErrNotSupported
+	}
+
+	return NewHostVsanSystem(m.c, *h.ConfigManager.VsanSystem), nil
+}
+
+func (m HostConfigManager) VsanInternalSystem(ctx context.Context) (*HostVsanInternalSystem, error) {
+	var h mo.HostSystem
+
+	err := m.Properties(ctx, m.Reference(), []string{"configManager.vsanInternalSystem"}, &h)
+	if err != nil {
+		return nil, err
+	}
+
+	// Added in 5.5
+	if h.ConfigManager.VsanInternalSystem == nil {
+		return nil, ErrNotSupported
+	}
+
+	return NewHostVsanInternalSystem(m.c, *h.ConfigManager.VsanInternalSystem), nil
+}
+
+func (m HostConfigManager) AccountManager(ctx context.Context) (*HostAccountManager, error) {
+	var h mo.HostSystem
+
+	err := m.Properties(ctx, m.Reference(), []string{"configManager.accountManager"}, &h)
+	if err != nil {
+		return nil, err
+	}
+
+	ref := h.ConfigManager.AccountManager // Added in 6.0
+	if ref == nil {
+		// Versions < 5.5 can use the ServiceContent ref,
+		// but we can only use it when connected directly to ESX.
+		c := m.Client()
+		if !c.IsVC() {
+			ref = c.ServiceContent.AccountManager
+		}
+
+		if ref == nil {
+			return nil, ErrNotSupported
+		}
+	}
+
+	return NewHostAccountManager(m.c, *ref), nil
+}
+
+func (m HostConfigManager) OptionManager(ctx context.Context) (*OptionManager, error) {
+	var h mo.HostSystem
+
+	err := m.Properties(ctx, m.Reference(), []string{"configManager.advancedOption"}, &h)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewOptionManager(m.c, *h.ConfigManager.AdvancedOption), nil
+}
+
+func (m HostConfigManager) ServiceSystem(ctx context.Context) (*HostServiceSystem, error) {
+	var h mo.HostSystem
+
+	err := m.Properties(ctx, m.Reference(), []string{"configManager.serviceSystem"}, &h)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewHostServiceSystem(m.c, *h.ConfigManager.ServiceSystem), nil
+}
+
+func (m HostConfigManager) CertificateManager(ctx context.Context) (*HostCertificateManager, error) {
+	var h mo.HostSystem
+
+	err := m.Properties(ctx, m.Reference(), []string{"configManager.certificateManager"}, &h)
+	if err != nil {
+		return nil, err
+	}
+
+	// Added in 6.0
+	if h.ConfigManager.CertificateManager == nil {
+		return nil, ErrNotSupported
+	}
+
+	return NewHostCertificateManager(m.c, *h.ConfigManager.CertificateManager, m.Reference()), nil
+}
+
+func (m HostConfigManager) DateTimeSystem(ctx context.Context) (*HostDateTimeSystem, error) {
+	var h mo.HostSystem
+
+	err := m.Properties(ctx, m.Reference(), []string{"configManager.dateTimeSystem"}, &h)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewHostDateTimeSystem(m.c, *h.ConfigManager.DateTimeSystem), nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/host_datastore_browser.go b/vendor/github.com/vmware/govmomi/object/host_datastore_browser.go
new file mode 100644
index 0000000000..b0c9e08a12
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/host_datastore_browser.go
@@ -0,0 +1,65 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type HostDatastoreBrowser struct {
+	Common
+}
+
+func NewHostDatastoreBrowser(c *vim25.Client, ref types.ManagedObjectReference) *HostDatastoreBrowser {
+	return &HostDatastoreBrowser{
+		Common: NewCommon(c, ref),
+	}
+}
+
+func (b HostDatastoreBrowser) SearchDatastore(ctx context.Context, datastorePath string, searchSpec *types.HostDatastoreBrowserSearchSpec) (*Task, error) {
+	req := types.SearchDatastore_Task{
+		This:          b.Reference(),
+		DatastorePath: datastorePath,
+		SearchSpec:    searchSpec,
+	}
+
+	res, err := methods.SearchDatastore_Task(ctx, b.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(b.c, res.Returnval), nil
+}
+
+func (b HostDatastoreBrowser) SearchDatastoreSubFolders(ctx context.Context, datastorePath string, searchSpec *types.HostDatastoreBrowserSearchSpec) (*Task, error) {
+	req := types.SearchDatastoreSubFolders_Task{
+		This:          b.Reference(),
+		DatastorePath: datastorePath,
+		SearchSpec:    searchSpec,
+	}
+
+	res, err := methods.SearchDatastoreSubFolders_Task(ctx, b.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(b.c, res.Returnval), nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/host_datastore_system.go b/vendor/github.com/vmware/govmomi/object/host_datastore_system.go
new file mode 100644
index 0000000000..7b738e611e
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/host_datastore_system.go
@@ -0,0 +1,119 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type HostDatastoreSystem struct {
+	Common
+}
+
+func NewHostDatastoreSystem(c *vim25.Client, ref types.ManagedObjectReference) *HostDatastoreSystem {
+	return &HostDatastoreSystem{
+		Common: NewCommon(c, ref),
+	}
+}
+
+func (s HostDatastoreSystem) CreateLocalDatastore(ctx context.Context, name string, path string) (*Datastore, error) {
+	req := types.CreateLocalDatastore{
+		This: s.Reference(),
+		Name: name,
+		Path: path,
+	}
+
+	res, err := methods.CreateLocalDatastore(ctx, s.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewDatastore(s.Client(), res.Returnval), nil
+}
+
+func (s HostDatastoreSystem) CreateNasDatastore(ctx context.Context, spec types.HostNasVolumeSpec) (*Datastore, error) {
+	req := types.CreateNasDatastore{
+		This: s.Reference(),
+		Spec: spec,
+	}
+
+	res, err := methods.CreateNasDatastore(ctx, s.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewDatastore(s.Client(), res.Returnval), nil
+}
+
+func (s HostDatastoreSystem) CreateVmfsDatastore(ctx context.Context, spec types.VmfsDatastoreCreateSpec) (*Datastore, error) {
+	req := types.CreateVmfsDatastore{
+		This: s.Reference(),
+		Spec: spec,
+	}
+
+	res, err := methods.CreateVmfsDatastore(ctx, s.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewDatastore(s.Client(), res.Returnval), nil
+}
+
+func (s HostDatastoreSystem) Remove(ctx context.Context, ds *Datastore) error {
+	req := types.RemoveDatastore{
+		This:      s.Reference(),
+		Datastore: ds.Reference(),
+	}
+
+	_, err := methods.RemoveDatastore(ctx, s.Client(), &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (s HostDatastoreSystem) QueryAvailableDisksForVmfs(ctx context.Context) ([]types.HostScsiDisk, error) {
+	req := types.QueryAvailableDisksForVmfs{
+		This: s.Reference(),
+	}
+
+	res, err := methods.QueryAvailableDisksForVmfs(ctx, s.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, nil
+}
+
+func (s HostDatastoreSystem) QueryVmfsDatastoreCreateOptions(ctx context.Context, devicePath string) ([]types.VmfsDatastoreOption, error) {
+	req := types.QueryVmfsDatastoreCreateOptions{
+		This:       s.Reference(),
+		DevicePath: devicePath,
+	}
+
+	res, err := methods.QueryVmfsDatastoreCreateOptions(ctx, s.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/host_date_time_system.go b/vendor/github.com/vmware/govmomi/object/host_date_time_system.go
new file mode 100644
index 0000000000..7c9203d7b6
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/host_date_time_system.go
@@ -0,0 +1,69 @@
+/*
+Copyright (c) 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 object
+
+import (
+	"context"
+	"time"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type HostDateTimeSystem struct {
+	Common
+}
+
+func NewHostDateTimeSystem(c *vim25.Client, ref types.ManagedObjectReference) *HostDateTimeSystem {
+	return &HostDateTimeSystem{
+		Common: NewCommon(c, ref),
+	}
+}
+
+func (s HostDateTimeSystem) UpdateConfig(ctx context.Context, config types.HostDateTimeConfig) error {
+	req := types.UpdateDateTimeConfig{
+		This:   s.Reference(),
+		Config: config,
+	}
+
+	_, err := methods.UpdateDateTimeConfig(ctx, s.c, &req)
+	return err
+}
+
+func (s HostDateTimeSystem) Update(ctx context.Context, date time.Time) error {
+	req := types.UpdateDateTime{
+		This:     s.Reference(),
+		DateTime: date,
+	}
+
+	_, err := methods.UpdateDateTime(ctx, s.c, &req)
+	return err
+}
+
+func (s HostDateTimeSystem) Query(ctx context.Context) (*time.Time, error) {
+	req := types.QueryDateTime{
+		This: s.Reference(),
+	}
+
+	res, err := methods.QueryDateTime(ctx, s.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return &res.Returnval, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/host_firewall_system.go b/vendor/github.com/vmware/govmomi/object/host_firewall_system.go
new file mode 100644
index 0000000000..0b14402531
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/host_firewall_system.go
@@ -0,0 +1,181 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"strings"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type HostFirewallSystem struct {
+	Common
+}
+
+func NewHostFirewallSystem(c *vim25.Client, ref types.ManagedObjectReference) *HostFirewallSystem {
+	return &HostFirewallSystem{
+		Common: NewCommon(c, ref),
+	}
+}
+
+func (s HostFirewallSystem) DisableRuleset(ctx context.Context, id string) error {
+	req := types.DisableRuleset{
+		This: s.Reference(),
+		Id:   id,
+	}
+
+	_, err := methods.DisableRuleset(ctx, s.c, &req)
+	return err
+}
+
+func (s HostFirewallSystem) EnableRuleset(ctx context.Context, id string) error {
+	req := types.EnableRuleset{
+		This: s.Reference(),
+		Id:   id,
+	}
+
+	_, err := methods.EnableRuleset(ctx, s.c, &req)
+	return err
+}
+
+func (s HostFirewallSystem) Refresh(ctx context.Context) error {
+	req := types.RefreshFirewall{
+		This: s.Reference(),
+	}
+
+	_, err := methods.RefreshFirewall(ctx, s.c, &req)
+	return err
+}
+
+func (s HostFirewallSystem) Info(ctx context.Context) (*types.HostFirewallInfo, error) {
+	var fs mo.HostFirewallSystem
+
+	err := s.Properties(ctx, s.Reference(), []string{"firewallInfo"}, &fs)
+	if err != nil {
+		return nil, err
+	}
+
+	return fs.FirewallInfo, nil
+}
+
+// HostFirewallRulesetList provides helpers for a slice of types.HostFirewallRuleset
+type HostFirewallRulesetList []types.HostFirewallRuleset
+
+// ByRule returns a HostFirewallRulesetList where Direction, PortType and Protocol are equal and Port is within range
+func (l HostFirewallRulesetList) ByRule(rule types.HostFirewallRule) HostFirewallRulesetList {
+	var matches HostFirewallRulesetList
+
+	for _, rs := range l {
+		for _, r := range rs.Rule {
+			if r.PortType != rule.PortType ||
+				r.Protocol != rule.Protocol ||
+				r.Direction != rule.Direction {
+				continue
+			}
+
+			if r.EndPort == 0 && rule.Port == r.Port ||
+				rule.Port >= r.Port && rule.Port <= r.EndPort {
+				matches = append(matches, rs)
+				break
+			}
+		}
+	}
+
+	return matches
+}
+
+// EnabledByRule returns a HostFirewallRulesetList with Match(rule) applied and filtered via Enabled()
+// if enabled param is true, otherwise filtered via Disabled().
+// An error is returned if the resulting list is empty.
+func (l HostFirewallRulesetList) EnabledByRule(rule types.HostFirewallRule, enabled bool) (HostFirewallRulesetList, error) {
+	var matched, skipped HostFirewallRulesetList
+	var matchedKind, skippedKind string
+
+	l = l.ByRule(rule)
+
+	if enabled {
+		matched = l.Enabled()
+		matchedKind = "enabled"
+
+		skipped = l.Disabled()
+		skippedKind = "disabled"
+	} else {
+		matched = l.Disabled()
+		matchedKind = "disabled"
+
+		skipped = l.Enabled()
+		skippedKind = "enabled"
+	}
+
+	if len(matched) == 0 {
+		msg := fmt.Sprintf("%d %s firewall rulesets match %s %s %s %d, %d %s rulesets match",
+			len(matched), matchedKind,
+			rule.Direction, rule.Protocol, rule.PortType, rule.Port,
+			len(skipped), skippedKind)
+
+		if len(skipped) != 0 {
+			msg += fmt.Sprintf(": %s", strings.Join(skipped.Keys(), ", "))
+		}
+
+		return nil, errors.New(msg)
+	}
+
+	return matched, nil
+}
+
+// Enabled returns a HostFirewallRulesetList with enabled rules
+func (l HostFirewallRulesetList) Enabled() HostFirewallRulesetList {
+	var matches HostFirewallRulesetList
+
+	for _, rs := range l {
+		if rs.Enabled {
+			matches = append(matches, rs)
+		}
+	}
+
+	return matches
+}
+
+// Disabled returns a HostFirewallRulesetList with disabled rules
+func (l HostFirewallRulesetList) Disabled() HostFirewallRulesetList {
+	var matches HostFirewallRulesetList
+
+	for _, rs := range l {
+		if !rs.Enabled {
+			matches = append(matches, rs)
+		}
+	}
+
+	return matches
+}
+
+// Keys returns the HostFirewallRuleset.Key for each ruleset in the list
+func (l HostFirewallRulesetList) Keys() []string {
+	var keys []string
+
+	for _, rs := range l {
+		keys = append(keys, rs.Key)
+	}
+
+	return keys
+}
diff --git a/vendor/github.com/vmware/govmomi/object/host_network_system.go b/vendor/github.com/vmware/govmomi/object/host_network_system.go
new file mode 100644
index 0000000000..c21e1ec35d
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/host_network_system.go
@@ -0,0 +1,358 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type HostNetworkSystem struct {
+	Common
+}
+
+func NewHostNetworkSystem(c *vim25.Client, ref types.ManagedObjectReference) *HostNetworkSystem {
+	return &HostNetworkSystem{
+		Common: NewCommon(c, ref),
+	}
+}
+
+// AddPortGroup wraps methods.AddPortGroup
+func (o HostNetworkSystem) AddPortGroup(ctx context.Context, portgrp types.HostPortGroupSpec) error {
+	req := types.AddPortGroup{
+		This:    o.Reference(),
+		Portgrp: portgrp,
+	}
+
+	_, err := methods.AddPortGroup(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// AddServiceConsoleVirtualNic wraps methods.AddServiceConsoleVirtualNic
+func (o HostNetworkSystem) AddServiceConsoleVirtualNic(ctx context.Context, portgroup string, nic types.HostVirtualNicSpec) (string, error) {
+	req := types.AddServiceConsoleVirtualNic{
+		This:      o.Reference(),
+		Portgroup: portgroup,
+		Nic:       nic,
+	}
+
+	res, err := methods.AddServiceConsoleVirtualNic(ctx, o.c, &req)
+	if err != nil {
+		return "", err
+	}
+
+	return res.Returnval, nil
+}
+
+// AddVirtualNic wraps methods.AddVirtualNic
+func (o HostNetworkSystem) AddVirtualNic(ctx context.Context, portgroup string, nic types.HostVirtualNicSpec) (string, error) {
+	req := types.AddVirtualNic{
+		This:      o.Reference(),
+		Portgroup: portgroup,
+		Nic:       nic,
+	}
+
+	res, err := methods.AddVirtualNic(ctx, o.c, &req)
+	if err != nil {
+		return "", err
+	}
+
+	return res.Returnval, nil
+}
+
+// AddVirtualSwitch wraps methods.AddVirtualSwitch
+func (o HostNetworkSystem) AddVirtualSwitch(ctx context.Context, vswitchName string, spec *types.HostVirtualSwitchSpec) error {
+	req := types.AddVirtualSwitch{
+		This:        o.Reference(),
+		VswitchName: vswitchName,
+		Spec:        spec,
+	}
+
+	_, err := methods.AddVirtualSwitch(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// QueryNetworkHint wraps methods.QueryNetworkHint
+func (o HostNetworkSystem) QueryNetworkHint(ctx context.Context, device []string) error {
+	req := types.QueryNetworkHint{
+		This:   o.Reference(),
+		Device: device,
+	}
+
+	_, err := methods.QueryNetworkHint(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// RefreshNetworkSystem wraps methods.RefreshNetworkSystem
+func (o HostNetworkSystem) RefreshNetworkSystem(ctx context.Context) error {
+	req := types.RefreshNetworkSystem{
+		This: o.Reference(),
+	}
+
+	_, err := methods.RefreshNetworkSystem(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// RemovePortGroup wraps methods.RemovePortGroup
+func (o HostNetworkSystem) RemovePortGroup(ctx context.Context, pgName string) error {
+	req := types.RemovePortGroup{
+		This:   o.Reference(),
+		PgName: pgName,
+	}
+
+	_, err := methods.RemovePortGroup(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// RemoveServiceConsoleVirtualNic wraps methods.RemoveServiceConsoleVirtualNic
+func (o HostNetworkSystem) RemoveServiceConsoleVirtualNic(ctx context.Context, device string) error {
+	req := types.RemoveServiceConsoleVirtualNic{
+		This:   o.Reference(),
+		Device: device,
+	}
+
+	_, err := methods.RemoveServiceConsoleVirtualNic(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// RemoveVirtualNic wraps methods.RemoveVirtualNic
+func (o HostNetworkSystem) RemoveVirtualNic(ctx context.Context, device string) error {
+	req := types.RemoveVirtualNic{
+		This:   o.Reference(),
+		Device: device,
+	}
+
+	_, err := methods.RemoveVirtualNic(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// RemoveVirtualSwitch wraps methods.RemoveVirtualSwitch
+func (o HostNetworkSystem) RemoveVirtualSwitch(ctx context.Context, vswitchName string) error {
+	req := types.RemoveVirtualSwitch{
+		This:        o.Reference(),
+		VswitchName: vswitchName,
+	}
+
+	_, err := methods.RemoveVirtualSwitch(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// RestartServiceConsoleVirtualNic wraps methods.RestartServiceConsoleVirtualNic
+func (o HostNetworkSystem) RestartServiceConsoleVirtualNic(ctx context.Context, device string) error {
+	req := types.RestartServiceConsoleVirtualNic{
+		This:   o.Reference(),
+		Device: device,
+	}
+
+	_, err := methods.RestartServiceConsoleVirtualNic(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// UpdateConsoleIpRouteConfig wraps methods.UpdateConsoleIpRouteConfig
+func (o HostNetworkSystem) UpdateConsoleIpRouteConfig(ctx context.Context, config types.BaseHostIpRouteConfig) error {
+	req := types.UpdateConsoleIpRouteConfig{
+		This:   o.Reference(),
+		Config: config,
+	}
+
+	_, err := methods.UpdateConsoleIpRouteConfig(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// UpdateDnsConfig wraps methods.UpdateDnsConfig
+func (o HostNetworkSystem) UpdateDnsConfig(ctx context.Context, config types.BaseHostDnsConfig) error {
+	req := types.UpdateDnsConfig{
+		This:   o.Reference(),
+		Config: config,
+	}
+
+	_, err := methods.UpdateDnsConfig(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// UpdateIpRouteConfig wraps methods.UpdateIpRouteConfig
+func (o HostNetworkSystem) UpdateIpRouteConfig(ctx context.Context, config types.BaseHostIpRouteConfig) error {
+	req := types.UpdateIpRouteConfig{
+		This:   o.Reference(),
+		Config: config,
+	}
+
+	_, err := methods.UpdateIpRouteConfig(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// UpdateIpRouteTableConfig wraps methods.UpdateIpRouteTableConfig
+func (o HostNetworkSystem) UpdateIpRouteTableConfig(ctx context.Context, config types.HostIpRouteTableConfig) error {
+	req := types.UpdateIpRouteTableConfig{
+		This:   o.Reference(),
+		Config: config,
+	}
+
+	_, err := methods.UpdateIpRouteTableConfig(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// UpdateNetworkConfig wraps methods.UpdateNetworkConfig
+func (o HostNetworkSystem) UpdateNetworkConfig(ctx context.Context, config types.HostNetworkConfig, changeMode string) (*types.HostNetworkConfigResult, error) {
+	req := types.UpdateNetworkConfig{
+		This:       o.Reference(),
+		Config:     config,
+		ChangeMode: changeMode,
+	}
+
+	res, err := methods.UpdateNetworkConfig(ctx, o.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return &res.Returnval, nil
+}
+
+// UpdatePhysicalNicLinkSpeed wraps methods.UpdatePhysicalNicLinkSpeed
+func (o HostNetworkSystem) UpdatePhysicalNicLinkSpeed(ctx context.Context, device string, linkSpeed *types.PhysicalNicLinkInfo) error {
+	req := types.UpdatePhysicalNicLinkSpeed{
+		This:      o.Reference(),
+		Device:    device,
+		LinkSpeed: linkSpeed,
+	}
+
+	_, err := methods.UpdatePhysicalNicLinkSpeed(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// UpdatePortGroup wraps methods.UpdatePortGroup
+func (o HostNetworkSystem) UpdatePortGroup(ctx context.Context, pgName string, portgrp types.HostPortGroupSpec) error {
+	req := types.UpdatePortGroup{
+		This:    o.Reference(),
+		PgName:  pgName,
+		Portgrp: portgrp,
+	}
+
+	_, err := methods.UpdatePortGroup(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// UpdateServiceConsoleVirtualNic wraps methods.UpdateServiceConsoleVirtualNic
+func (o HostNetworkSystem) UpdateServiceConsoleVirtualNic(ctx context.Context, device string, nic types.HostVirtualNicSpec) error {
+	req := types.UpdateServiceConsoleVirtualNic{
+		This:   o.Reference(),
+		Device: device,
+		Nic:    nic,
+	}
+
+	_, err := methods.UpdateServiceConsoleVirtualNic(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// UpdateVirtualNic wraps methods.UpdateVirtualNic
+func (o HostNetworkSystem) UpdateVirtualNic(ctx context.Context, device string, nic types.HostVirtualNicSpec) error {
+	req := types.UpdateVirtualNic{
+		This:   o.Reference(),
+		Device: device,
+		Nic:    nic,
+	}
+
+	_, err := methods.UpdateVirtualNic(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// UpdateVirtualSwitch wraps methods.UpdateVirtualSwitch
+func (o HostNetworkSystem) UpdateVirtualSwitch(ctx context.Context, vswitchName string, spec types.HostVirtualSwitchSpec) error {
+	req := types.UpdateVirtualSwitch{
+		This:        o.Reference(),
+		VswitchName: vswitchName,
+		Spec:        spec,
+	}
+
+	_, err := methods.UpdateVirtualSwitch(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/host_service_system.go b/vendor/github.com/vmware/govmomi/object/host_service_system.go
new file mode 100644
index 0000000000..a66b32c17c
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/host_service_system.go
@@ -0,0 +1,88 @@
+/*
+Copyright (c) 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type HostServiceSystem struct {
+	Common
+}
+
+func NewHostServiceSystem(c *vim25.Client, ref types.ManagedObjectReference) *HostServiceSystem {
+	return &HostServiceSystem{
+		Common: NewCommon(c, ref),
+	}
+}
+
+func (s HostServiceSystem) Service(ctx context.Context) ([]types.HostService, error) {
+	var ss mo.HostServiceSystem
+
+	err := s.Properties(ctx, s.Reference(), []string{"serviceInfo.service"}, &ss)
+	if err != nil {
+		return nil, err
+	}
+
+	return ss.ServiceInfo.Service, nil
+}
+
+func (s HostServiceSystem) Start(ctx context.Context, id string) error {
+	req := types.StartService{
+		This: s.Reference(),
+		Id:   id,
+	}
+
+	_, err := methods.StartService(ctx, s.Client(), &req)
+	return err
+}
+
+func (s HostServiceSystem) Stop(ctx context.Context, id string) error {
+	req := types.StopService{
+		This: s.Reference(),
+		Id:   id,
+	}
+
+	_, err := methods.StopService(ctx, s.Client(), &req)
+	return err
+}
+
+func (s HostServiceSystem) Restart(ctx context.Context, id string) error {
+	req := types.RestartService{
+		This: s.Reference(),
+		Id:   id,
+	}
+
+	_, err := methods.RestartService(ctx, s.Client(), &req)
+	return err
+}
+
+func (s HostServiceSystem) UpdatePolicy(ctx context.Context, id string, policy string) error {
+	req := types.UpdateServicePolicy{
+		This:   s.Reference(),
+		Id:     id,
+		Policy: policy,
+	}
+
+	_, err := methods.UpdateServicePolicy(ctx, s.Client(), &req)
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/object/host_storage_system.go b/vendor/github.com/vmware/govmomi/object/host_storage_system.go
new file mode 100644
index 0000000000..2a433ff2a8
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/host_storage_system.go
@@ -0,0 +1,145 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+	"errors"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type HostStorageSystem struct {
+	Common
+}
+
+func NewHostStorageSystem(c *vim25.Client, ref types.ManagedObjectReference) *HostStorageSystem {
+	return &HostStorageSystem{
+		Common: NewCommon(c, ref),
+	}
+}
+
+func (s HostStorageSystem) RetrieveDiskPartitionInfo(ctx context.Context, devicePath string) (*types.HostDiskPartitionInfo, error) {
+	req := types.RetrieveDiskPartitionInfo{
+		This:       s.Reference(),
+		DevicePath: []string{devicePath},
+	}
+
+	res, err := methods.RetrieveDiskPartitionInfo(ctx, s.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	if res.Returnval == nil || len(res.Returnval) == 0 {
+		return nil, errors.New("no partition info")
+	}
+
+	return &res.Returnval[0], nil
+}
+
+func (s HostStorageSystem) ComputeDiskPartitionInfo(ctx context.Context, devicePath string, layout types.HostDiskPartitionLayout) (*types.HostDiskPartitionInfo, error) {
+	req := types.ComputeDiskPartitionInfo{
+		This:       s.Reference(),
+		DevicePath: devicePath,
+		Layout:     layout,
+	}
+
+	res, err := methods.ComputeDiskPartitionInfo(ctx, s.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return &res.Returnval, nil
+}
+
+func (s HostStorageSystem) UpdateDiskPartitionInfo(ctx context.Context, devicePath string, spec types.HostDiskPartitionSpec) error {
+	req := types.UpdateDiskPartitions{
+		This:       s.Reference(),
+		DevicePath: devicePath,
+		Spec:       spec,
+	}
+
+	_, err := methods.UpdateDiskPartitions(ctx, s.c, &req)
+	return err
+}
+
+func (s HostStorageSystem) RescanAllHba(ctx context.Context) error {
+	req := types.RescanAllHba{
+		This: s.Reference(),
+	}
+
+	_, err := methods.RescanAllHba(ctx, s.c, &req)
+	return err
+}
+
+func (s HostStorageSystem) MarkAsSsd(ctx context.Context, uuid string) (*Task, error) {
+	req := types.MarkAsSsd_Task{
+		This:         s.Reference(),
+		ScsiDiskUuid: uuid,
+	}
+
+	res, err := methods.MarkAsSsd_Task(ctx, s.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(s.c, res.Returnval), nil
+}
+
+func (s HostStorageSystem) MarkAsNonSsd(ctx context.Context, uuid string) (*Task, error) {
+	req := types.MarkAsNonSsd_Task{
+		This:         s.Reference(),
+		ScsiDiskUuid: uuid,
+	}
+
+	res, err := methods.MarkAsNonSsd_Task(ctx, s.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(s.c, res.Returnval), nil
+}
+
+func (s HostStorageSystem) MarkAsLocal(ctx context.Context, uuid string) (*Task, error) {
+	req := types.MarkAsLocal_Task{
+		This:         s.Reference(),
+		ScsiDiskUuid: uuid,
+	}
+
+	res, err := methods.MarkAsLocal_Task(ctx, s.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(s.c, res.Returnval), nil
+}
+
+func (s HostStorageSystem) MarkAsNonLocal(ctx context.Context, uuid string) (*Task, error) {
+	req := types.MarkAsNonLocal_Task{
+		This:         s.Reference(),
+		ScsiDiskUuid: uuid,
+	}
+
+	res, err := methods.MarkAsNonLocal_Task(ctx, s.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(s.c, res.Returnval), nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/host_system.go b/vendor/github.com/vmware/govmomi/object/host_system.go
new file mode 100644
index 0000000000..a350edfdeb
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/host_system.go
@@ -0,0 +1,153 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+	"fmt"
+	"net"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type HostSystem struct {
+	Common
+}
+
+func NewHostSystem(c *vim25.Client, ref types.ManagedObjectReference) *HostSystem {
+	return &HostSystem{
+		Common: NewCommon(c, ref),
+	}
+}
+
+func (h HostSystem) ConfigManager() *HostConfigManager {
+	return NewHostConfigManager(h.c, h.Reference())
+}
+
+func (h HostSystem) ResourcePool(ctx context.Context) (*ResourcePool, error) {
+	var mh mo.HostSystem
+
+	err := h.Properties(ctx, h.Reference(), []string{"parent"}, &mh)
+	if err != nil {
+		return nil, err
+	}
+
+	var mcr *mo.ComputeResource
+	var parent interface{}
+
+	switch mh.Parent.Type {
+	case "ComputeResource":
+		mcr = new(mo.ComputeResource)
+		parent = mcr
+	case "ClusterComputeResource":
+		mcc := new(mo.ClusterComputeResource)
+		mcr = &mcc.ComputeResource
+		parent = mcc
+	default:
+		return nil, fmt.Errorf("unknown host parent type: %s", mh.Parent.Type)
+	}
+
+	err = h.Properties(ctx, *mh.Parent, []string{"resourcePool"}, parent)
+	if err != nil {
+		return nil, err
+	}
+
+	pool := NewResourcePool(h.c, *mcr.ResourcePool)
+	return pool, nil
+}
+
+func (h HostSystem) ManagementIPs(ctx context.Context) ([]net.IP, error) {
+	var mh mo.HostSystem
+
+	err := h.Properties(ctx, h.Reference(), []string{"config.virtualNicManagerInfo.netConfig"}, &mh)
+	if err != nil {
+		return nil, err
+	}
+
+	var ips []net.IP
+	for _, nc := range mh.Config.VirtualNicManagerInfo.NetConfig {
+		if nc.NicType == "management" && len(nc.CandidateVnic) > 0 {
+			ip := net.ParseIP(nc.CandidateVnic[0].Spec.Ip.IpAddress)
+			if ip != nil {
+				ips = append(ips, ip)
+			}
+		}
+	}
+
+	return ips, nil
+}
+
+func (h HostSystem) Disconnect(ctx context.Context) (*Task, error) {
+	req := types.DisconnectHost_Task{
+		This: h.Reference(),
+	}
+
+	res, err := methods.DisconnectHost_Task(ctx, h.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(h.c, res.Returnval), nil
+}
+
+func (h HostSystem) Reconnect(ctx context.Context, cnxSpec *types.HostConnectSpec, reconnectSpec *types.HostSystemReconnectSpec) (*Task, error) {
+	req := types.ReconnectHost_Task{
+		This:          h.Reference(),
+		CnxSpec:       cnxSpec,
+		ReconnectSpec: reconnectSpec,
+	}
+
+	res, err := methods.ReconnectHost_Task(ctx, h.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(h.c, res.Returnval), nil
+}
+
+func (h HostSystem) EnterMaintenanceMode(ctx context.Context, timeout int32, evacuate bool, spec *types.HostMaintenanceSpec) (*Task, error) {
+	req := types.EnterMaintenanceMode_Task{
+		This:                  h.Reference(),
+		Timeout:               timeout,
+		EvacuatePoweredOffVms: types.NewBool(evacuate),
+		MaintenanceSpec:       spec,
+	}
+
+	res, err := methods.EnterMaintenanceMode_Task(ctx, h.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(h.c, res.Returnval), nil
+}
+
+func (h HostSystem) ExitMaintenanceMode(ctx context.Context, timeout int32) (*Task, error) {
+	req := types.ExitMaintenanceMode_Task{
+		This:    h.Reference(),
+		Timeout: timeout,
+	}
+
+	res, err := methods.ExitMaintenanceMode_Task(ctx, h.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(h.c, res.Returnval), nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/host_virtual_nic_manager.go b/vendor/github.com/vmware/govmomi/object/host_virtual_nic_manager.go
new file mode 100644
index 0000000000..01e7e9cd4b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/host_virtual_nic_manager.go
@@ -0,0 +1,93 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type HostVirtualNicManager struct {
+	Common
+	Host *HostSystem
+}
+
+func NewHostVirtualNicManager(c *vim25.Client, ref types.ManagedObjectReference, host types.ManagedObjectReference) *HostVirtualNicManager {
+	return &HostVirtualNicManager{
+		Common: NewCommon(c, ref),
+		Host:   NewHostSystem(c, host),
+	}
+}
+
+func (m HostVirtualNicManager) Info(ctx context.Context) (*types.HostVirtualNicManagerInfo, error) {
+	var vnm mo.HostVirtualNicManager
+
+	err := m.Properties(ctx, m.Reference(), []string{"info"}, &vnm)
+	if err != nil {
+		return nil, err
+	}
+
+	return &vnm.Info, nil
+}
+
+func (m HostVirtualNicManager) DeselectVnic(ctx context.Context, nicType string, device string) error {
+	if nicType == string(types.HostVirtualNicManagerNicTypeVsan) {
+		// Avoid fault.NotSupported:
+		// "Error deselecting device '$device': VSAN interfaces must be deselected using vim.host.VsanSystem"
+		s, err := m.Host.ConfigManager().VsanSystem(ctx)
+		if err != nil {
+			return err
+		}
+
+		return s.updateVnic(ctx, device, false)
+	}
+
+	req := types.DeselectVnicForNicType{
+		This:    m.Reference(),
+		NicType: nicType,
+		Device:  device,
+	}
+
+	_, err := methods.DeselectVnicForNicType(ctx, m.Client(), &req)
+	return err
+}
+
+func (m HostVirtualNicManager) SelectVnic(ctx context.Context, nicType string, device string) error {
+	if nicType == string(types.HostVirtualNicManagerNicTypeVsan) {
+		// Avoid fault.NotSupported:
+		// "Error selecting device '$device': VSAN interfaces must be selected using vim.host.VsanSystem"
+		s, err := m.Host.ConfigManager().VsanSystem(ctx)
+		if err != nil {
+			return err
+		}
+
+		return s.updateVnic(ctx, device, true)
+	}
+
+	req := types.SelectVnicForNicType{
+		This:    m.Reference(),
+		NicType: nicType,
+		Device:  device,
+	}
+
+	_, err := methods.SelectVnicForNicType(ctx, m.Client(), &req)
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/object/host_vsan_internal_system.go b/vendor/github.com/vmware/govmomi/object/host_vsan_internal_system.go
new file mode 100644
index 0000000000..65e4587f6c
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/host_vsan_internal_system.go
@@ -0,0 +1,117 @@
+/*
+Copyright (c) 2017 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 object
+
+import (
+	"context"
+	"encoding/json"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type HostVsanInternalSystem struct {
+	Common
+}
+
+func NewHostVsanInternalSystem(c *vim25.Client, ref types.ManagedObjectReference) *HostVsanInternalSystem {
+	m := HostVsanInternalSystem{
+		Common: NewCommon(c, ref),
+	}
+
+	return &m
+}
+
+// QueryVsanObjectUuidsByFilter returns vSAN DOM object uuids by filter.
+func (m HostVsanInternalSystem) QueryVsanObjectUuidsByFilter(ctx context.Context, uuids []string, limit int32, version int32) ([]string, error) {
+	req := types.QueryVsanObjectUuidsByFilter{
+		This:    m.Reference(),
+		Uuids:   uuids,
+		Limit:   limit,
+		Version: version,
+	}
+
+	res, err := methods.QueryVsanObjectUuidsByFilter(ctx, m.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, nil
+}
+
+type VsanObjExtAttrs struct {
+	Type  string `json:"Object type"`
+	Class string `json:"Object class"`
+	Size  string `json:"Object size"`
+	Path  string `json:"Object path"`
+	Name  string `json:"User friendly name"`
+}
+
+func (a *VsanObjExtAttrs) DatastorePath(dir string) string {
+	l := len(dir)
+	path := a.Path
+
+	if len(path) >= l {
+		path = a.Path[l:]
+	}
+
+	if path != "" {
+		return path
+	}
+
+	return a.Name // vmnamespace
+}
+
+// GetVsanObjExtAttrs is internal and intended for troubleshooting/debugging situations in the field.
+// WARNING: This API can be slow because we do IOs (reads) to all the objects.
+func (m HostVsanInternalSystem) GetVsanObjExtAttrs(ctx context.Context, uuids []string) (map[string]VsanObjExtAttrs, error) {
+	req := types.GetVsanObjExtAttrs{
+		This:  m.Reference(),
+		Uuids: uuids,
+	}
+
+	res, err := methods.GetVsanObjExtAttrs(ctx, m.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	var attrs map[string]VsanObjExtAttrs
+
+	err = json.Unmarshal([]byte(res.Returnval), &attrs)
+
+	return attrs, err
+}
+
+// DeleteVsanObjects is internal and intended for troubleshooting/debugging only.
+// WARNING: This API can be slow because we do IOs to all the objects.
+// DOM won't allow access to objects which have lost quorum. Such objects can be deleted with the optional "force" flag.
+// These objects may however re-appear with quorum if the absent components come back (network partition gets resolved, etc.)
+func (m HostVsanInternalSystem) DeleteVsanObjects(ctx context.Context, uuids []string, force *bool) ([]types.HostVsanInternalSystemDeleteVsanObjectsResult, error) {
+	req := types.DeleteVsanObjects{
+		This:  m.Reference(),
+		Uuids: uuids,
+		Force: force,
+	}
+
+	res, err := methods.DeleteVsanObjects(ctx, m.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/host_vsan_system.go b/vendor/github.com/vmware/govmomi/object/host_vsan_system.go
new file mode 100644
index 0000000000..5ab234d5e5
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/host_vsan_system.go
@@ -0,0 +1,88 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type HostVsanSystem struct {
+	Common
+}
+
+func NewHostVsanSystem(c *vim25.Client, ref types.ManagedObjectReference) *HostVsanSystem {
+	return &HostVsanSystem{
+		Common: NewCommon(c, ref),
+	}
+}
+
+func (s HostVsanSystem) Update(ctx context.Context, config types.VsanHostConfigInfo) (*Task, error) {
+	req := types.UpdateVsan_Task{
+		This:   s.Reference(),
+		Config: config,
+	}
+
+	res, err := methods.UpdateVsan_Task(ctx, s.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(s.Client(), res.Returnval), nil
+}
+
+// updateVnic in support of the HostVirtualNicManager.{SelectVnic,DeselectVnic} methods
+func (s HostVsanSystem) updateVnic(ctx context.Context, device string, enable bool) error {
+	var vsan mo.HostVsanSystem
+
+	err := s.Properties(ctx, s.Reference(), []string{"config.networkInfo.port"}, &vsan)
+	if err != nil {
+		return err
+	}
+
+	info := vsan.Config
+
+	var port []types.VsanHostConfigInfoNetworkInfoPortConfig
+
+	for _, p := range info.NetworkInfo.Port {
+		if p.Device == device {
+			continue
+		}
+
+		port = append(port, p)
+	}
+
+	if enable {
+		port = append(port, types.VsanHostConfigInfoNetworkInfoPortConfig{
+			Device: device,
+		})
+	}
+
+	info.NetworkInfo.Port = port
+
+	task, err := s.Update(ctx, info)
+	if err != nil {
+		return err
+	}
+
+	_, err = task.WaitForResult(ctx, nil)
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/object/http_nfc_lease.go b/vendor/github.com/vmware/govmomi/object/http_nfc_lease.go
new file mode 100644
index 0000000000..3ca53558b3
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/http_nfc_lease.go
@@ -0,0 +1,143 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+	"errors"
+	"fmt"
+
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type HttpNfcLease struct {
+	Common
+}
+
+func NewHttpNfcLease(c *vim25.Client, ref types.ManagedObjectReference) *HttpNfcLease {
+	return &HttpNfcLease{
+		Common: NewCommon(c, ref),
+	}
+}
+
+// HttpNfcLeaseAbort wraps methods.HttpNfcLeaseAbort
+func (o HttpNfcLease) HttpNfcLeaseAbort(ctx context.Context, fault *types.LocalizedMethodFault) error {
+	req := types.HttpNfcLeaseAbort{
+		This:  o.Reference(),
+		Fault: fault,
+	}
+
+	_, err := methods.HttpNfcLeaseAbort(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// HttpNfcLeaseComplete wraps methods.HttpNfcLeaseComplete
+func (o HttpNfcLease) HttpNfcLeaseComplete(ctx context.Context) error {
+	req := types.HttpNfcLeaseComplete{
+		This: o.Reference(),
+	}
+
+	_, err := methods.HttpNfcLeaseComplete(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// HttpNfcLeaseGetManifest wraps methods.HttpNfcLeaseGetManifest
+func (o HttpNfcLease) HttpNfcLeaseGetManifest(ctx context.Context) error {
+	req := types.HttpNfcLeaseGetManifest{
+		This: o.Reference(),
+	}
+
+	_, err := methods.HttpNfcLeaseGetManifest(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// HttpNfcLeaseProgress wraps methods.HttpNfcLeaseProgress
+func (o HttpNfcLease) HttpNfcLeaseProgress(ctx context.Context, percent int32) error {
+	req := types.HttpNfcLeaseProgress{
+		This:    o.Reference(),
+		Percent: percent,
+	}
+
+	_, err := methods.HttpNfcLeaseProgress(ctx, o.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (o HttpNfcLease) Wait(ctx context.Context) (*types.HttpNfcLeaseInfo, error) {
+	var lease mo.HttpNfcLease
+
+	pc := property.DefaultCollector(o.c)
+	err := property.Wait(ctx, pc, o.Reference(), []string{"state", "info", "error"}, func(pc []types.PropertyChange) bool {
+		done := false
+
+		for _, c := range pc {
+			if c.Val == nil {
+				continue
+			}
+
+			switch c.Name {
+			case "error":
+				val := c.Val.(types.LocalizedMethodFault)
+				lease.Error = &val
+				done = true
+			case "info":
+				val := c.Val.(types.HttpNfcLeaseInfo)
+				lease.Info = &val
+			case "state":
+				lease.State = c.Val.(types.HttpNfcLeaseState)
+				if lease.State != types.HttpNfcLeaseStateInitializing {
+					done = true
+				}
+			}
+		}
+
+		return done
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	if lease.State == types.HttpNfcLeaseStateReady {
+		return lease.Info, nil
+	}
+
+	if lease.Error != nil {
+		return nil, errors.New(lease.Error.LocalizedMessage)
+	}
+
+	return nil, fmt.Errorf("unexpected nfc lease state: %s", lease.State)
+}
diff --git a/vendor/github.com/vmware/govmomi/object/namespace_manager.go b/vendor/github.com/vmware/govmomi/object/namespace_manager.go
new file mode 100644
index 0000000000..f463b368cd
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/namespace_manager.go
@@ -0,0 +1,76 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type DatastoreNamespaceManager struct {
+	Common
+}
+
+func NewDatastoreNamespaceManager(c *vim25.Client) *DatastoreNamespaceManager {
+	n := DatastoreNamespaceManager{
+		Common: NewCommon(c, *c.ServiceContent.DatastoreNamespaceManager),
+	}
+
+	return &n
+}
+
+// CreateDirectory creates a top-level directory on the given vsan datastore, using
+// the given user display name hint and opaque storage policy.
+func (nm DatastoreNamespaceManager) CreateDirectory(ctx context.Context, ds *Datastore, displayName string, policy string) (string, error) {
+
+	req := &types.CreateDirectory{
+		This:        nm.Reference(),
+		Datastore:   ds.Reference(),
+		DisplayName: displayName,
+		Policy:      policy,
+	}
+
+	resp, err := methods.CreateDirectory(ctx, nm.c, req)
+	if err != nil {
+		return "", err
+	}
+
+	return resp.Returnval, nil
+}
+
+// DeleteDirectory deletes the given top-level directory from a vsan datastore.
+func (nm DatastoreNamespaceManager) DeleteDirectory(ctx context.Context, dc *Datacenter, datastorePath string) error {
+
+	req := &types.DeleteDirectory{
+		This:          nm.Reference(),
+		DatastorePath: datastorePath,
+	}
+
+	if dc != nil {
+		ref := dc.Reference()
+		req.Datacenter = &ref
+	}
+
+	if _, err := methods.DeleteDirectory(ctx, nm.c, req); err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/network.go b/vendor/github.com/vmware/govmomi/object/network.go
new file mode 100644
index 0000000000..a76b17d91c
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/network.go
@@ -0,0 +1,47 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type Network struct {
+	Common
+}
+
+func NewNetwork(c *vim25.Client, ref types.ManagedObjectReference) *Network {
+	return &Network{
+		Common: NewCommon(c, ref),
+	}
+}
+
+// EthernetCardBackingInfo returns the VirtualDeviceBackingInfo for this Network
+func (n Network) EthernetCardBackingInfo(_ context.Context) (types.BaseVirtualDeviceBackingInfo, error) {
+	name := n.Name()
+
+	backing := &types.VirtualEthernetCardNetworkBackingInfo{
+		VirtualDeviceDeviceBackingInfo: types.VirtualDeviceDeviceBackingInfo{
+			DeviceName: name,
+		},
+	}
+
+	return backing, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/network_reference.go b/vendor/github.com/vmware/govmomi/object/network_reference.go
new file mode 100644
index 0000000000..7716bdb38f
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/network_reference.go
@@ -0,0 +1,31 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+// The NetworkReference interface is implemented by managed objects
+// which can be used as the backing for a VirtualEthernetCard.
+type NetworkReference interface {
+	Reference
+
+	EthernetCardBackingInfo(ctx context.Context) (types.BaseVirtualDeviceBackingInfo, error)
+}
diff --git a/vendor/github.com/vmware/govmomi/object/network_test.go b/vendor/github.com/vmware/govmomi/object/network_test.go
new file mode 100644
index 0000000000..e957615452
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/network_test.go
@@ -0,0 +1,23 @@
+/*
+Copyright (c) 2015 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 object
+
+// Network should implement the Reference interface.
+var _ Reference = Network{}
+
+// Network should implement the NetworkReference interface.
+var _ NetworkReference = Network{}
diff --git a/vendor/github.com/vmware/govmomi/object/option_manager.go b/vendor/github.com/vmware/govmomi/object/option_manager.go
new file mode 100644
index 0000000000..7f93273aac
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/option_manager.go
@@ -0,0 +1,59 @@
+/*
+Copyright (c) 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type OptionManager struct {
+	Common
+}
+
+func NewOptionManager(c *vim25.Client, ref types.ManagedObjectReference) *OptionManager {
+	return &OptionManager{
+		Common: NewCommon(c, ref),
+	}
+}
+
+func (m OptionManager) Query(ctx context.Context, name string) ([]types.BaseOptionValue, error) {
+	req := types.QueryOptions{
+		This: m.Reference(),
+		Name: name,
+	}
+
+	res, err := methods.QueryOptions(ctx, m.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, nil
+}
+
+func (m OptionManager) Update(ctx context.Context, value []types.BaseOptionValue) error {
+	req := types.UpdateOptions{
+		This:         m.Reference(),
+		ChangedValue: value,
+	}
+
+	_, err := methods.UpdateOptions(ctx, m.Client(), &req)
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/object/ovf_manager.go b/vendor/github.com/vmware/govmomi/object/ovf_manager.go
new file mode 100644
index 0000000000..7fedf689ff
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/ovf_manager.go
@@ -0,0 +1,104 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type OvfManager struct {
+	Common
+}
+
+func NewOvfManager(c *vim25.Client) *OvfManager {
+	o := OvfManager{
+		Common: NewCommon(c, *c.ServiceContent.OvfManager),
+	}
+
+	return &o
+}
+
+// CreateDescriptor wraps methods.CreateDescriptor
+func (o OvfManager) CreateDescriptor(ctx context.Context, obj Reference, cdp types.OvfCreateDescriptorParams) (*types.OvfCreateDescriptorResult, error) {
+	req := types.CreateDescriptor{
+		This: o.Reference(),
+		Obj:  obj.Reference(),
+		Cdp:  cdp,
+	}
+
+	res, err := methods.CreateDescriptor(ctx, o.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return &res.Returnval, nil
+}
+
+// CreateImportSpec wraps methods.CreateImportSpec
+func (o OvfManager) CreateImportSpec(ctx context.Context, ovfDescriptor string, resourcePool Reference, datastore Reference, cisp types.OvfCreateImportSpecParams) (*types.OvfCreateImportSpecResult, error) {
+	req := types.CreateImportSpec{
+		This:          o.Reference(),
+		OvfDescriptor: ovfDescriptor,
+		ResourcePool:  resourcePool.Reference(),
+		Datastore:     datastore.Reference(),
+		Cisp:          cisp,
+	}
+
+	res, err := methods.CreateImportSpec(ctx, o.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return &res.Returnval, nil
+}
+
+// ParseDescriptor wraps methods.ParseDescriptor
+func (o OvfManager) ParseDescriptor(ctx context.Context, ovfDescriptor string, pdp types.OvfParseDescriptorParams) (*types.OvfParseDescriptorResult, error) {
+	req := types.ParseDescriptor{
+		This:          o.Reference(),
+		OvfDescriptor: ovfDescriptor,
+		Pdp:           pdp,
+	}
+
+	res, err := methods.ParseDescriptor(ctx, o.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return &res.Returnval, nil
+}
+
+// ValidateHost wraps methods.ValidateHost
+func (o OvfManager) ValidateHost(ctx context.Context, ovfDescriptor string, host Reference, vhp types.OvfValidateHostParams) (*types.OvfValidateHostResult, error) {
+	req := types.ValidateHost{
+		This:          o.Reference(),
+		OvfDescriptor: ovfDescriptor,
+		Host:          host.Reference(),
+		Vhp:           vhp,
+	}
+
+	res, err := methods.ValidateHost(ctx, o.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return &res.Returnval, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/resource_pool.go b/vendor/github.com/vmware/govmomi/object/resource_pool.go
new file mode 100644
index 0000000000..791fd38229
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/resource_pool.go
@@ -0,0 +1,137 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type ResourcePool struct {
+	Common
+}
+
+func NewResourcePool(c *vim25.Client, ref types.ManagedObjectReference) *ResourcePool {
+	return &ResourcePool{
+		Common: NewCommon(c, ref),
+	}
+}
+
+func (p ResourcePool) ImportVApp(ctx context.Context, spec types.BaseImportSpec, folder *Folder, host *HostSystem) (*HttpNfcLease, error) {
+	req := types.ImportVApp{
+		This: p.Reference(),
+		Spec: spec,
+	}
+
+	if folder != nil {
+		ref := folder.Reference()
+		req.Folder = &ref
+	}
+
+	if host != nil {
+		ref := host.Reference()
+		req.Host = &ref
+	}
+
+	res, err := methods.ImportVApp(ctx, p.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewHttpNfcLease(p.c, res.Returnval), nil
+}
+
+func (p ResourcePool) Create(ctx context.Context, name string, spec types.ResourceConfigSpec) (*ResourcePool, error) {
+	req := types.CreateResourcePool{
+		This: p.Reference(),
+		Name: name,
+		Spec: spec,
+	}
+
+	res, err := methods.CreateResourcePool(ctx, p.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewResourcePool(p.c, res.Returnval), nil
+}
+
+func (p ResourcePool) CreateVApp(ctx context.Context, name string, resSpec types.ResourceConfigSpec, configSpec types.VAppConfigSpec, folder *Folder) (*VirtualApp, error) {
+	req := types.CreateVApp{
+		This:       p.Reference(),
+		Name:       name,
+		ResSpec:    resSpec,
+		ConfigSpec: configSpec,
+	}
+
+	if folder != nil {
+		ref := folder.Reference()
+		req.VmFolder = &ref
+	}
+
+	res, err := methods.CreateVApp(ctx, p.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewVirtualApp(p.c, res.Returnval), nil
+}
+
+func (p ResourcePool) UpdateConfig(ctx context.Context, name string, config *types.ResourceConfigSpec) error {
+	req := types.UpdateConfig{
+		This:   p.Reference(),
+		Name:   name,
+		Config: config,
+	}
+
+	if config != nil && config.Entity == nil {
+		ref := p.Reference()
+
+		// Create copy of config so changes won't leak back to the caller
+		newConfig := *config
+		newConfig.Entity = &ref
+		req.Config = &newConfig
+	}
+
+	_, err := methods.UpdateConfig(ctx, p.c, &req)
+	return err
+}
+
+func (p ResourcePool) DestroyChildren(ctx context.Context) error {
+	req := types.DestroyChildren{
+		This: p.Reference(),
+	}
+
+	_, err := methods.DestroyChildren(ctx, p.c, &req)
+	return err
+}
+
+func (p ResourcePool) Destroy(ctx context.Context) (*Task, error) {
+	req := types.Destroy_Task{
+		This: p.Reference(),
+	}
+
+	res, err := methods.Destroy_Task(ctx, p.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(p.c, res.Returnval), nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/search_index.go b/vendor/github.com/vmware/govmomi/object/search_index.go
new file mode 100644
index 0000000000..4b0a525d52
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/search_index.go
@@ -0,0 +1,163 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type SearchIndex struct {
+	Common
+}
+
+func NewSearchIndex(c *vim25.Client) *SearchIndex {
+	s := SearchIndex{
+		Common: NewCommon(c, *c.ServiceContent.SearchIndex),
+	}
+
+	return &s
+}
+
+// FindByDatastorePath finds a virtual machine by its location on a datastore.
+func (s SearchIndex) FindByDatastorePath(ctx context.Context, dc *Datacenter, path string) (Reference, error) {
+	req := types.FindByDatastorePath{
+		This:       s.Reference(),
+		Datacenter: dc.Reference(),
+		Path:       path,
+	}
+
+	res, err := methods.FindByDatastorePath(ctx, s.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	if res.Returnval == nil {
+		return nil, nil
+	}
+	return NewReference(s.c, *res.Returnval), nil
+}
+
+// FindByDnsName finds a virtual machine or host by DNS name.
+func (s SearchIndex) FindByDnsName(ctx context.Context, dc *Datacenter, dnsName string, vmSearch bool) (Reference, error) {
+	req := types.FindByDnsName{
+		This:     s.Reference(),
+		DnsName:  dnsName,
+		VmSearch: vmSearch,
+	}
+	if dc != nil {
+		ref := dc.Reference()
+		req.Datacenter = &ref
+	}
+
+	res, err := methods.FindByDnsName(ctx, s.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	if res.Returnval == nil {
+		return nil, nil
+	}
+	return NewReference(s.c, *res.Returnval), nil
+}
+
+// FindByInventoryPath finds a managed entity based on its location in the inventory.
+func (s SearchIndex) FindByInventoryPath(ctx context.Context, path string) (Reference, error) {
+	req := types.FindByInventoryPath{
+		This:          s.Reference(),
+		InventoryPath: path,
+	}
+
+	res, err := methods.FindByInventoryPath(ctx, s.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	if res.Returnval == nil {
+		return nil, nil
+	}
+	return NewReference(s.c, *res.Returnval), nil
+}
+
+// FindByIp finds a virtual machine or host by IP address.
+func (s SearchIndex) FindByIp(ctx context.Context, dc *Datacenter, ip string, vmSearch bool) (Reference, error) {
+	req := types.FindByIp{
+		This:     s.Reference(),
+		Ip:       ip,
+		VmSearch: vmSearch,
+	}
+	if dc != nil {
+		ref := dc.Reference()
+		req.Datacenter = &ref
+	}
+
+	res, err := methods.FindByIp(ctx, s.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	if res.Returnval == nil {
+		return nil, nil
+	}
+	return NewReference(s.c, *res.Returnval), nil
+}
+
+// FindByUuid finds a virtual machine or host by UUID.
+func (s SearchIndex) FindByUuid(ctx context.Context, dc *Datacenter, uuid string, vmSearch bool, instanceUuid *bool) (Reference, error) {
+	req := types.FindByUuid{
+		This:         s.Reference(),
+		Uuid:         uuid,
+		VmSearch:     vmSearch,
+		InstanceUuid: instanceUuid,
+	}
+	if dc != nil {
+		ref := dc.Reference()
+		req.Datacenter = &ref
+	}
+
+	res, err := methods.FindByUuid(ctx, s.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	if res.Returnval == nil {
+		return nil, nil
+	}
+	return NewReference(s.c, *res.Returnval), nil
+}
+
+// FindChild finds a particular child based on a managed entity name.
+func (s SearchIndex) FindChild(ctx context.Context, entity Reference, name string) (Reference, error) {
+	req := types.FindChild{
+		This:   s.Reference(),
+		Entity: entity.Reference(),
+		Name:   name,
+	}
+
+	res, err := methods.FindChild(ctx, s.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	if res.Returnval == nil {
+		return nil, nil
+	}
+	return NewReference(s.c, *res.Returnval), nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/search_index_test.go b/vendor/github.com/vmware/govmomi/object/search_index_test.go
new file mode 100644
index 0000000000..9860f9f4db
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/search_index_test.go
@@ -0,0 +1,155 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+	"fmt"
+	"reflect"
+	"testing"
+
+	"github.com/vmware/govmomi/test"
+	"github.com/vmware/govmomi/vim25/mo"
+)
+
+func TestSearch(t *testing.T) {
+	c := test.NewAuthenticatedClient(t)
+	s := NewSearchIndex(c)
+
+	ref, err := s.FindChild(context.Background(), NewRootFolder(c), "ha-datacenter")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	dc, ok := ref.(*Datacenter)
+	if !ok {
+		t.Errorf("Expected Datacenter: %#v", ref)
+	}
+
+	folders, err := dc.Folders(context.Background())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	ref, err = s.FindChild(context.Background(), folders.DatastoreFolder, "datastore1")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, ok = ref.(*Datastore)
+	if !ok {
+		t.Errorf("Expected Datastore: %#v", ref)
+	}
+
+	ref, err = s.FindByInventoryPath(context.Background(), "/ha-datacenter/network/VM Network")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, ok = ref.(*Network)
+	if !ok {
+		t.Errorf("Expected Network: %#v", ref)
+	}
+
+	crs, err := folders.HostFolder.Children(context.Background())
+	if err != nil {
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+	if len(crs) != 0 {
+		var cr mo.ComputeResource
+		ref = crs[0]
+		err = s.Properties(context.Background(), ref.Reference(), []string{"host"}, &cr)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		var host mo.HostSystem
+		ref = NewHostSystem(c, cr.Host[0])
+		err = s.Properties(context.Background(), ref.Reference(), []string{"name", "hardware", "config"}, &host)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		dnsConfig := host.Config.Network.DnsConfig.GetHostDnsConfig()
+		dnsName := fmt.Sprintf("%s.%s", dnsConfig.HostName, dnsConfig.DomainName)
+		shost, err := s.FindByDnsName(context.Background(), dc, dnsName, false)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !reflect.DeepEqual(ref, shost) {
+			t.Errorf("%#v != %#v\n", ref, shost)
+		}
+
+		shost, err = s.FindByUuid(context.Background(), dc, host.Hardware.SystemInfo.Uuid, false, nil)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !reflect.DeepEqual(ref, shost) {
+			t.Errorf("%#v != %#v\n", ref, shost)
+		}
+	}
+
+	vms, err := folders.VmFolder.Children(context.Background())
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(vms) != 0 {
+		var vm mo.VirtualMachine
+		ref = vms[0]
+		err = s.Properties(context.Background(), ref.Reference(), []string{"config", "guest"}, &vm)
+		if err != nil {
+			t.Fatal(err)
+		}
+		svm, err := s.FindByDatastorePath(context.Background(), dc, vm.Config.Files.VmPathName)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !reflect.DeepEqual(ref, svm) {
+			t.Errorf("%#v != %#v\n", ref, svm)
+		}
+
+		svm, err = s.FindByUuid(context.Background(), dc, vm.Config.Uuid, true, nil)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !reflect.DeepEqual(ref, svm) {
+			t.Errorf("%#v != %#v\n", ref, svm)
+		}
+
+		if vm.Guest.HostName != "" {
+			svm, err := s.FindByDnsName(context.Background(), dc, vm.Guest.HostName, true)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if !reflect.DeepEqual(ref, svm) {
+				t.Errorf("%#v != %#v\n", ref, svm)
+			}
+		}
+
+		if vm.Guest.IpAddress != "" {
+			svm, err := s.FindByIp(context.Background(), dc, vm.Guest.IpAddress, true)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if !reflect.DeepEqual(ref, svm) {
+				t.Errorf("%#v != %#v\n", ref, svm)
+			}
+		}
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/object/storage_pod.go b/vendor/github.com/vmware/govmomi/object/storage_pod.go
new file mode 100644
index 0000000000..188b91a002
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/storage_pod.go
@@ -0,0 +1,34 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type StoragePod struct {
+	*Folder
+}
+
+func NewStoragePod(c *vim25.Client, ref types.ManagedObjectReference) *StoragePod {
+	return &StoragePod{
+		Folder: &Folder{
+			Common: NewCommon(c, ref),
+		},
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/object/storage_resource_manager.go b/vendor/github.com/vmware/govmomi/object/storage_resource_manager.go
new file mode 100644
index 0000000000..579bcd4d7e
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/storage_resource_manager.go
@@ -0,0 +1,179 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type StorageResourceManager struct {
+	Common
+}
+
+func NewStorageResourceManager(c *vim25.Client) *StorageResourceManager {
+	sr := StorageResourceManager{
+		Common: NewCommon(c, *c.ServiceContent.StorageResourceManager),
+	}
+
+	return &sr
+}
+
+func (sr StorageResourceManager) ApplyStorageDrsRecommendation(ctx context.Context, key []string) (*Task, error) {
+	req := types.ApplyStorageDrsRecommendation_Task{
+		This: sr.Reference(),
+		Key:  key,
+	}
+
+	res, err := methods.ApplyStorageDrsRecommendation_Task(ctx, sr.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(sr.c, res.Returnval), nil
+}
+
+func (sr StorageResourceManager) ApplyStorageDrsRecommendationToPod(ctx context.Context, pod *StoragePod, key string) (*Task, error) {
+	req := types.ApplyStorageDrsRecommendationToPod_Task{
+		This: sr.Reference(),
+		Key:  key,
+	}
+
+	if pod != nil {
+		req.Pod = pod.Reference()
+	}
+
+	res, err := methods.ApplyStorageDrsRecommendationToPod_Task(ctx, sr.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(sr.c, res.Returnval), nil
+}
+
+func (sr StorageResourceManager) CancelStorageDrsRecommendation(ctx context.Context, key []string) error {
+	req := types.CancelStorageDrsRecommendation{
+		This: sr.Reference(),
+		Key:  key,
+	}
+
+	_, err := methods.CancelStorageDrsRecommendation(ctx, sr.c, &req)
+
+	return err
+}
+
+func (sr StorageResourceManager) ConfigureDatastoreIORM(ctx context.Context, datastore *Datastore, spec types.StorageIORMConfigSpec, key string) (*Task, error) {
+	req := types.ConfigureDatastoreIORM_Task{
+		This: sr.Reference(),
+		Spec: spec,
+	}
+
+	if datastore != nil {
+		req.Datastore = datastore.Reference()
+	}
+
+	res, err := methods.ConfigureDatastoreIORM_Task(ctx, sr.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(sr.c, res.Returnval), nil
+}
+
+func (sr StorageResourceManager) ConfigureStorageDrsForPod(ctx context.Context, pod *StoragePod, spec types.StorageDrsConfigSpec, modify bool) (*Task, error) {
+	req := types.ConfigureStorageDrsForPod_Task{
+		This:   sr.Reference(),
+		Spec:   spec,
+		Modify: modify,
+	}
+
+	if pod != nil {
+		req.Pod = pod.Reference()
+	}
+
+	res, err := methods.ConfigureStorageDrsForPod_Task(ctx, sr.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(sr.c, res.Returnval), nil
+}
+
+func (sr StorageResourceManager) QueryDatastorePerformanceSummary(ctx context.Context, datastore *Datastore) ([]types.StoragePerformanceSummary, error) {
+	req := types.QueryDatastorePerformanceSummary{
+		This: sr.Reference(),
+	}
+
+	if datastore != nil {
+		req.Datastore = datastore.Reference()
+	}
+
+	res, err := methods.QueryDatastorePerformanceSummary(ctx, sr.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, nil
+}
+
+func (sr StorageResourceManager) QueryIORMConfigOption(ctx context.Context, host *HostSystem) (*types.StorageIORMConfigOption, error) {
+	req := types.QueryIORMConfigOption{
+		This: sr.Reference(),
+	}
+
+	if host != nil {
+		req.Host = host.Reference()
+	}
+
+	res, err := methods.QueryIORMConfigOption(ctx, sr.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return &res.Returnval, nil
+}
+
+func (sr StorageResourceManager) RecommendDatastores(ctx context.Context, storageSpec types.StoragePlacementSpec) (*types.StoragePlacementResult, error) {
+	req := types.RecommendDatastores{
+		This:        sr.Reference(),
+		StorageSpec: storageSpec,
+	}
+
+	res, err := methods.RecommendDatastores(ctx, sr.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return &res.Returnval, nil
+}
+
+func (sr StorageResourceManager) RefreshStorageDrsRecommendation(ctx context.Context, pod *StoragePod) error {
+	req := types.RefreshStorageDrsRecommendation{
+		This: sr.Reference(),
+	}
+
+	if pod != nil {
+		req.Pod = pod.Reference()
+	}
+
+	_, err := methods.RefreshStorageDrsRecommendation(ctx, sr.c, &req)
+
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/object/task.go b/vendor/github.com/vmware/govmomi/object/task.go
new file mode 100644
index 0000000000..8572b4363b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/task.go
@@ -0,0 +1,53 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/task"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/progress"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+// Task is a convenience wrapper around task.Task that keeps a reference to
+// the client that was used to create it. This allows users to call the Wait()
+// function with only a context parameter, instead of a context parameter, a
+// soap.RoundTripper, and reference to the root property collector.
+type Task struct {
+	Common
+}
+
+func NewTask(c *vim25.Client, ref types.ManagedObjectReference) *Task {
+	t := Task{
+		Common: NewCommon(c, ref),
+	}
+
+	return &t
+}
+
+func (t *Task) Wait(ctx context.Context) error {
+	_, err := t.WaitForResult(ctx, nil)
+	return err
+}
+
+func (t *Task) WaitForResult(ctx context.Context, s progress.Sinker) (*types.TaskInfo, error) {
+	p := property.DefaultCollector(t.c)
+	return task.Wait(ctx, t.Reference(), p, s)
+}
diff --git a/vendor/github.com/vmware/govmomi/object/types.go b/vendor/github.com/vmware/govmomi/object/types.go
new file mode 100644
index 0000000000..aefb611fde
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/types.go
@@ -0,0 +1,65 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type Reference interface {
+	Reference() types.ManagedObjectReference
+}
+
+func NewReference(c *vim25.Client, e types.ManagedObjectReference) Reference {
+	switch e.Type {
+	case "Folder":
+		return NewFolder(c, e)
+	case "StoragePod":
+		return &StoragePod{
+			NewFolder(c, e),
+		}
+	case "Datacenter":
+		return NewDatacenter(c, e)
+	case "VirtualMachine":
+		return NewVirtualMachine(c, e)
+	case "VirtualApp":
+		return &VirtualApp{
+			NewResourcePool(c, e),
+		}
+	case "ComputeResource":
+		return NewComputeResource(c, e)
+	case "ClusterComputeResource":
+		return NewClusterComputeResource(c, e)
+	case "HostSystem":
+		return NewHostSystem(c, e)
+	case "Network", "OpaqueNetwork":
+		return NewNetwork(c, e)
+	case "ResourcePool":
+		return NewResourcePool(c, e)
+	case "DistributedVirtualSwitch":
+		return NewDistributedVirtualSwitch(c, e)
+	case "VmwareDistributedVirtualSwitch":
+		return &VmwareDistributedVirtualSwitch{*NewDistributedVirtualSwitch(c, e)}
+	case "DistributedVirtualPortgroup":
+		return NewDistributedVirtualPortgroup(c, e)
+	case "Datastore":
+		return NewDatastore(c, e)
+	default:
+		panic("Unknown managed entity: " + e.Type)
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/object/virtual_app.go b/vendor/github.com/vmware/govmomi/object/virtual_app.go
new file mode 100644
index 0000000000..4811178f16
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/virtual_app.go
@@ -0,0 +1,105 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type VirtualApp struct {
+	*ResourcePool
+}
+
+func NewVirtualApp(c *vim25.Client, ref types.ManagedObjectReference) *VirtualApp {
+	return &VirtualApp{
+		ResourcePool: NewResourcePool(c, ref),
+	}
+}
+
+func (p VirtualApp) CreateChildVM(ctx context.Context, config types.VirtualMachineConfigSpec, host *HostSystem) (*Task, error) {
+	req := types.CreateChildVM_Task{
+		This:   p.Reference(),
+		Config: config,
+	}
+
+	if host != nil {
+		ref := host.Reference()
+		req.Host = &ref
+	}
+
+	res, err := methods.CreateChildVM_Task(ctx, p.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(p.c, res.Returnval), nil
+}
+
+func (p VirtualApp) UpdateConfig(ctx context.Context, spec types.VAppConfigSpec) error {
+	req := types.UpdateVAppConfig{
+		This: p.Reference(),
+		Spec: spec,
+	}
+
+	_, err := methods.UpdateVAppConfig(ctx, p.c, &req)
+	return err
+}
+
+func (p VirtualApp) PowerOn(ctx context.Context) (*Task, error) {
+	req := types.PowerOnVApp_Task{
+		This: p.Reference(),
+	}
+
+	res, err := methods.PowerOnVApp_Task(ctx, p.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(p.c, res.Returnval), nil
+}
+
+func (p VirtualApp) PowerOff(ctx context.Context, force bool) (*Task, error) {
+	req := types.PowerOffVApp_Task{
+		This:  p.Reference(),
+		Force: force,
+	}
+
+	res, err := methods.PowerOffVApp_Task(ctx, p.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(p.c, res.Returnval), nil
+
+}
+
+func (p VirtualApp) Suspend(ctx context.Context) (*Task, error) {
+	req := types.SuspendVApp_Task{
+		This: p.Reference(),
+	}
+
+	res, err := methods.SuspendVApp_Task(ctx, p.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(p.c, res.Returnval), nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/virtual_device_list.go b/vendor/github.com/vmware/govmomi/object/virtual_device_list.go
new file mode 100644
index 0000000000..24821aa6b9
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/virtual_device_list.go
@@ -0,0 +1,922 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"errors"
+	"fmt"
+	"path/filepath"
+	"reflect"
+	"regexp"
+	"sort"
+	"strings"
+
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+// Type values for use in BootOrder
+const (
+	DeviceTypeCdrom    = "cdrom"
+	DeviceTypeDisk     = "disk"
+	DeviceTypeEthernet = "ethernet"
+	DeviceTypeFloppy   = "floppy"
+)
+
+// VirtualDeviceList provides helper methods for working with a list of virtual devices.
+type VirtualDeviceList []types.BaseVirtualDevice
+
+// SCSIControllerTypes are used for adding a new SCSI controller to a VM.
+func SCSIControllerTypes() VirtualDeviceList {
+	// Return a mutable list of SCSI controller types, initialized with defaults.
+	return VirtualDeviceList([]types.BaseVirtualDevice{
+		&types.VirtualLsiLogicController{},
+		&types.VirtualBusLogicController{},
+		&types.ParaVirtualSCSIController{},
+		&types.VirtualLsiLogicSASController{},
+	}).Select(func(device types.BaseVirtualDevice) bool {
+		c := device.(types.BaseVirtualSCSIController).GetVirtualSCSIController()
+		c.SharedBus = types.VirtualSCSISharingNoSharing
+		c.BusNumber = -1
+		return true
+	})
+}
+
+// EthernetCardTypes are used for adding a new ethernet card to a VM.
+func EthernetCardTypes() VirtualDeviceList {
+	return VirtualDeviceList([]types.BaseVirtualDevice{
+		&types.VirtualE1000{},
+		&types.VirtualE1000e{},
+		&types.VirtualVmxnet3{},
+	}).Select(func(device types.BaseVirtualDevice) bool {
+		c := device.(types.BaseVirtualEthernetCard).GetVirtualEthernetCard()
+		c.GetVirtualDevice().Key = -1
+		return true
+	})
+}
+
+// Select returns a new list containing all elements of the list for which the given func returns true.
+func (l VirtualDeviceList) Select(f func(device types.BaseVirtualDevice) bool) VirtualDeviceList {
+	var found VirtualDeviceList
+
+	for _, device := range l {
+		if f(device) {
+			found = append(found, device)
+		}
+	}
+
+	return found
+}
+
+// SelectByType returns a new list with devices that are equal to or extend the given type.
+func (l VirtualDeviceList) SelectByType(deviceType types.BaseVirtualDevice) VirtualDeviceList {
+	dtype := reflect.TypeOf(deviceType)
+	if dtype == nil {
+		return nil
+	}
+	dname := dtype.Elem().Name()
+
+	return l.Select(func(device types.BaseVirtualDevice) bool {
+		t := reflect.TypeOf(device)
+
+		if t == dtype {
+			return true
+		}
+
+		_, ok := t.Elem().FieldByName(dname)
+
+		return ok
+	})
+}
+
+// SelectByBackingInfo returns a new list with devices matching the given backing info.
+// If the value of backing is nil, any device with a backing of the same type will be returned.
+func (l VirtualDeviceList) SelectByBackingInfo(backing types.BaseVirtualDeviceBackingInfo) VirtualDeviceList {
+	t := reflect.TypeOf(backing)
+
+	return l.Select(func(device types.BaseVirtualDevice) bool {
+		db := device.GetVirtualDevice().Backing
+		if db == nil {
+			return false
+		}
+
+		if reflect.TypeOf(db) != t {
+			return false
+		}
+
+		if reflect.ValueOf(backing).IsNil() {
+			// selecting by backing type
+			return true
+		}
+
+		switch a := db.(type) {
+		case *types.VirtualEthernetCardNetworkBackingInfo:
+			b := backing.(*types.VirtualEthernetCardNetworkBackingInfo)
+			return a.DeviceName == b.DeviceName
+		case *types.VirtualEthernetCardDistributedVirtualPortBackingInfo:
+			b := backing.(*types.VirtualEthernetCardDistributedVirtualPortBackingInfo)
+			return a.Port.SwitchUuid == b.Port.SwitchUuid &&
+				a.Port.PortgroupKey == b.Port.PortgroupKey
+		case *types.VirtualDiskFlatVer2BackingInfo:
+			b := backing.(*types.VirtualDiskFlatVer2BackingInfo)
+			if a.Parent != nil && b.Parent != nil {
+				return a.Parent.FileName == b.Parent.FileName
+			}
+			return a.FileName == b.FileName
+		case *types.VirtualSerialPortURIBackingInfo:
+			b := backing.(*types.VirtualSerialPortURIBackingInfo)
+			return a.ServiceURI == b.ServiceURI
+		case types.BaseVirtualDeviceFileBackingInfo:
+			b := backing.(types.BaseVirtualDeviceFileBackingInfo)
+			return a.GetVirtualDeviceFileBackingInfo().FileName == b.GetVirtualDeviceFileBackingInfo().FileName
+		default:
+			return false
+		}
+	})
+}
+
+// Find returns the device matching the given name.
+func (l VirtualDeviceList) Find(name string) types.BaseVirtualDevice {
+	for _, device := range l {
+		if l.Name(device) == name {
+			return device
+		}
+	}
+	return nil
+}
+
+// FindByKey returns the device matching the given key.
+func (l VirtualDeviceList) FindByKey(key int32) types.BaseVirtualDevice {
+	for _, device := range l {
+		if device.GetVirtualDevice().Key == key {
+			return device
+		}
+	}
+	return nil
+}
+
+// FindIDEController will find the named IDE controller if given, otherwise will pick an available controller.
+// An error is returned if the named controller is not found or not an IDE controller.  Or, if name is not
+// given and no available controller can be found.
+func (l VirtualDeviceList) FindIDEController(name string) (*types.VirtualIDEController, error) {
+	if name != "" {
+		d := l.Find(name)
+		if d == nil {
+			return nil, fmt.Errorf("device '%s' not found", name)
+		}
+		if c, ok := d.(*types.VirtualIDEController); ok {
+			return c, nil
+		}
+		return nil, fmt.Errorf("%s is not an IDE controller", name)
+	}
+
+	c := l.PickController((*types.VirtualIDEController)(nil))
+	if c == nil {
+		return nil, errors.New("no available IDE controller")
+	}
+
+	return c.(*types.VirtualIDEController), nil
+}
+
+// CreateIDEController creates a new IDE controller.
+func (l VirtualDeviceList) CreateIDEController() (types.BaseVirtualDevice, error) {
+	ide := &types.VirtualIDEController{}
+	ide.Key = l.NewKey()
+	return ide, nil
+}
+
+// FindSCSIController will find the named SCSI controller if given, otherwise will pick an available controller.
+// An error is returned if the named controller is not found or not an SCSI controller.  Or, if name is not
+// given and no available controller can be found.
+func (l VirtualDeviceList) FindSCSIController(name string) (*types.VirtualSCSIController, error) {
+	if name != "" {
+		d := l.Find(name)
+		if d == nil {
+			return nil, fmt.Errorf("device '%s' not found", name)
+		}
+		if c, ok := d.(types.BaseVirtualSCSIController); ok {
+			return c.GetVirtualSCSIController(), nil
+		}
+		return nil, fmt.Errorf("%s is not an SCSI controller", name)
+	}
+
+	c := l.PickController((*types.VirtualSCSIController)(nil))
+	if c == nil {
+		return nil, errors.New("no available SCSI controller")
+	}
+
+	return c.(types.BaseVirtualSCSIController).GetVirtualSCSIController(), nil
+}
+
+// CreateSCSIController creates a new SCSI controller of type name if given, otherwise defaults to lsilogic.
+func (l VirtualDeviceList) CreateSCSIController(name string) (types.BaseVirtualDevice, error) {
+	ctypes := SCSIControllerTypes()
+
+	if name == "scsi" || name == "" {
+		name = ctypes.Type(ctypes[0])
+	}
+
+	found := ctypes.Select(func(device types.BaseVirtualDevice) bool {
+		return l.Type(device) == name
+	})
+
+	if len(found) == 0 {
+		return nil, fmt.Errorf("unknown SCSI controller type '%s'", name)
+	}
+
+	c, ok := found[0].(types.BaseVirtualSCSIController)
+	if !ok {
+		return nil, fmt.Errorf("invalid SCSI controller type '%s'", name)
+	}
+
+	scsi := c.GetVirtualSCSIController()
+	scsi.BusNumber = l.newSCSIBusNumber()
+	scsi.Key = l.NewKey()
+	scsi.ScsiCtlrUnitNumber = 7
+	return c.(types.BaseVirtualDevice), nil
+}
+
+var scsiBusNumbers = []int{0, 1, 2, 3}
+
+// newSCSIBusNumber returns the bus number to use for adding a new SCSI bus device.
+// -1 is returned if there are no bus numbers available.
+func (l VirtualDeviceList) newSCSIBusNumber() int32 {
+	var used []int
+
+	for _, d := range l.SelectByType((*types.VirtualSCSIController)(nil)) {
+		num := d.(types.BaseVirtualSCSIController).GetVirtualSCSIController().BusNumber
+		if num >= 0 {
+			used = append(used, int(num))
+		} // else caller is creating a new vm using SCSIControllerTypes
+	}
+
+	sort.Ints(used)
+
+	for i, n := range scsiBusNumbers {
+		if i == len(used) || n != used[i] {
+			return int32(n)
+		}
+	}
+
+	return -1
+}
+
+// FindNVMEController will find the named NVME controller if given, otherwise will pick an available controller.
+// An error is returned if the named controller is not found or not an NVME controller.  Or, if name is not
+// given and no available controller can be found.
+func (l VirtualDeviceList) FindNVMEController(name string) (*types.VirtualNVMEController, error) {
+	if name != "" {
+		d := l.Find(name)
+		if d == nil {
+			return nil, fmt.Errorf("device '%s' not found", name)
+		}
+		if c, ok := d.(*types.VirtualNVMEController); ok {
+			return c, nil
+		}
+		return nil, fmt.Errorf("%s is not an NVME controller", name)
+	}
+
+	c := l.PickController((*types.VirtualNVMEController)(nil))
+	if c == nil {
+		return nil, errors.New("no available NVME controller")
+	}
+
+	return c.(*types.VirtualNVMEController), nil
+}
+
+// CreateNVMEController creates a new NVMWE controller.
+func (l VirtualDeviceList) CreateNVMEController() (types.BaseVirtualDevice, error) {
+	nvme := &types.VirtualNVMEController{}
+	nvme.BusNumber = l.newNVMEBusNumber()
+	nvme.Key = l.NewKey()
+
+	return nvme, nil
+}
+
+var nvmeBusNumbers = []int{0, 1, 2, 3}
+
+// newNVMEBusNumber returns the bus number to use for adding a new NVME bus device.
+// -1 is returned if there are no bus numbers available.
+func (l VirtualDeviceList) newNVMEBusNumber() int32 {
+	var used []int
+
+	for _, d := range l.SelectByType((*types.VirtualNVMEController)(nil)) {
+		num := d.(types.BaseVirtualController).GetVirtualController().BusNumber
+		if num >= 0 {
+			used = append(used, int(num))
+		} // else caller is creating a new vm using NVMEControllerTypes
+	}
+
+	sort.Ints(used)
+
+	for i, n := range nvmeBusNumbers {
+		if i == len(used) || n != used[i] {
+			return int32(n)
+		}
+	}
+
+	return -1
+}
+
+// FindDiskController will find an existing ide or scsi disk controller.
+func (l VirtualDeviceList) FindDiskController(name string) (types.BaseVirtualController, error) {
+	switch {
+	case name == "ide":
+		return l.FindIDEController("")
+	case name == "scsi" || name == "":
+		return l.FindSCSIController("")
+	case name == "nvme":
+		return l.FindNVMEController("")
+	default:
+		if c, ok := l.Find(name).(types.BaseVirtualController); ok {
+			return c, nil
+		}
+		return nil, fmt.Errorf("%s is not a valid controller", name)
+	}
+}
+
+// PickController returns a controller of the given type(s).
+// If no controllers are found or have no available slots, then nil is returned.
+func (l VirtualDeviceList) PickController(kind types.BaseVirtualController) types.BaseVirtualController {
+	l = l.SelectByType(kind.(types.BaseVirtualDevice)).Select(func(device types.BaseVirtualDevice) bool {
+		num := len(device.(types.BaseVirtualController).GetVirtualController().Device)
+
+		switch device.(type) {
+		case types.BaseVirtualSCSIController:
+			return num < 15
+		case *types.VirtualIDEController:
+			return num < 2
+		case *types.VirtualNVMEController:
+			return num < 8
+		default:
+			return true
+		}
+	})
+
+	if len(l) == 0 {
+		return nil
+	}
+
+	return l[0].(types.BaseVirtualController)
+}
+
+// newUnitNumber returns the unit number to use for attaching a new device to the given controller.
+func (l VirtualDeviceList) newUnitNumber(c types.BaseVirtualController) int32 {
+	units := make([]bool, 30)
+
+	switch sc := c.(type) {
+	case types.BaseVirtualSCSIController:
+		//  The SCSI controller sits on its own bus
+		units[sc.GetVirtualSCSIController().ScsiCtlrUnitNumber] = true
+	}
+
+	key := c.GetVirtualController().Key
+
+	for _, device := range l {
+		d := device.GetVirtualDevice()
+
+		if d.ControllerKey == key && d.UnitNumber != nil {
+			units[int(*d.UnitNumber)] = true
+		}
+	}
+
+	for unit, used := range units {
+		if !used {
+			return int32(unit)
+		}
+	}
+
+	return -1
+}
+
+// NewKey returns the key to use for adding a new device to the device list.
+// The device list we're working with here may not be complete (e.g. when
+// we're only adding new devices), so any positive keys could conflict with device keys
+// that are already in use. To avoid this type of conflict, we can use negative keys
+// here, which will be resolved to positive keys by vSphere as the reconfiguration is done.
+func (l VirtualDeviceList) NewKey() int32 {
+	var key int32 = -200
+
+	for _, device := range l {
+		d := device.GetVirtualDevice()
+		if d.Key < key {
+			key = d.Key
+		}
+	}
+
+	return key - 1
+}
+
+// AssignController assigns a device to a controller.
+func (l VirtualDeviceList) AssignController(device types.BaseVirtualDevice, c types.BaseVirtualController) {
+	d := device.GetVirtualDevice()
+	d.ControllerKey = c.GetVirtualController().Key
+	d.UnitNumber = new(int32)
+	*d.UnitNumber = l.newUnitNumber(c)
+	if d.Key == 0 {
+		d.Key = -1
+	}
+}
+
+// CreateDisk creates a new VirtualDisk device which can be added to a VM.
+func (l VirtualDeviceList) CreateDisk(c types.BaseVirtualController, ds types.ManagedObjectReference, name string) *types.VirtualDisk {
+	// If name is not specified, one will be chosen for you.
+	// But if when given, make sure it ends in .vmdk, otherwise it will be treated as a directory.
+	if len(name) > 0 && filepath.Ext(name) != ".vmdk" {
+		name += ".vmdk"
+	}
+
+	device := &types.VirtualDisk{
+		VirtualDevice: types.VirtualDevice{
+			Backing: &types.VirtualDiskFlatVer2BackingInfo{
+				DiskMode:        string(types.VirtualDiskModePersistent),
+				ThinProvisioned: types.NewBool(true),
+				VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
+					FileName:  name,
+					Datastore: &ds,
+				},
+			},
+		},
+	}
+
+	l.AssignController(device, c)
+	return device
+}
+
+// ChildDisk creates a new VirtualDisk device, linked to the given parent disk, which can be added to a VM.
+func (l VirtualDeviceList) ChildDisk(parent *types.VirtualDisk) *types.VirtualDisk {
+	disk := *parent
+	backing := disk.Backing.(*types.VirtualDiskFlatVer2BackingInfo)
+	p := new(DatastorePath)
+	p.FromString(backing.FileName)
+	p.Path = ""
+
+	// Use specified disk as parent backing to a new disk.
+	disk.Backing = &types.VirtualDiskFlatVer2BackingInfo{
+		VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
+			FileName:  p.String(),
+			Datastore: backing.Datastore,
+		},
+		Parent:          backing,
+		DiskMode:        backing.DiskMode,
+		ThinProvisioned: backing.ThinProvisioned,
+	}
+
+	return &disk
+}
+
+func (l VirtualDeviceList) connectivity(device types.BaseVirtualDevice, v bool) error {
+	c := device.GetVirtualDevice().Connectable
+	if c == nil {
+		return fmt.Errorf("%s is not connectable", l.Name(device))
+	}
+
+	c.Connected = v
+	c.StartConnected = v
+
+	return nil
+}
+
+// Connect changes the device to connected, returns an error if the device is not connectable.
+func (l VirtualDeviceList) Connect(device types.BaseVirtualDevice) error {
+	return l.connectivity(device, true)
+}
+
+// Disconnect changes the device to disconnected, returns an error if the device is not connectable.
+func (l VirtualDeviceList) Disconnect(device types.BaseVirtualDevice) error {
+	return l.connectivity(device, false)
+}
+
+// FindCdrom finds a cdrom device with the given name, defaulting to the first cdrom device if any.
+func (l VirtualDeviceList) FindCdrom(name string) (*types.VirtualCdrom, error) {
+	if name != "" {
+		d := l.Find(name)
+		if d == nil {
+			return nil, fmt.Errorf("device '%s' not found", name)
+		}
+		if c, ok := d.(*types.VirtualCdrom); ok {
+			return c, nil
+		}
+		return nil, fmt.Errorf("%s is not a cdrom device", name)
+	}
+
+	c := l.SelectByType((*types.VirtualCdrom)(nil))
+	if len(c) == 0 {
+		return nil, errors.New("no cdrom device found")
+	}
+
+	return c[0].(*types.VirtualCdrom), nil
+}
+
+// CreateCdrom creates a new VirtualCdrom device which can be added to a VM.
+func (l VirtualDeviceList) CreateCdrom(c *types.VirtualIDEController) (*types.VirtualCdrom, error) {
+	device := &types.VirtualCdrom{}
+
+	l.AssignController(device, c)
+
+	l.setDefaultCdromBacking(device)
+
+	device.Connectable = &types.VirtualDeviceConnectInfo{
+		AllowGuestControl: true,
+		Connected:         true,
+		StartConnected:    true,
+	}
+
+	return device, nil
+}
+
+// InsertIso changes the cdrom device backing to use the given iso file.
+func (l VirtualDeviceList) InsertIso(device *types.VirtualCdrom, iso string) *types.VirtualCdrom {
+	device.Backing = &types.VirtualCdromIsoBackingInfo{
+		VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
+			FileName: iso,
+		},
+	}
+
+	return device
+}
+
+// EjectIso removes the iso file based backing and replaces with the default cdrom backing.
+func (l VirtualDeviceList) EjectIso(device *types.VirtualCdrom) *types.VirtualCdrom {
+	l.setDefaultCdromBacking(device)
+	return device
+}
+
+func (l VirtualDeviceList) setDefaultCdromBacking(device *types.VirtualCdrom) {
+	device.Backing = &types.VirtualCdromAtapiBackingInfo{
+		VirtualDeviceDeviceBackingInfo: types.VirtualDeviceDeviceBackingInfo{
+			DeviceName:    fmt.Sprintf("%s-%d-%d", DeviceTypeCdrom, device.ControllerKey, device.UnitNumber),
+			UseAutoDetect: types.NewBool(false),
+		},
+	}
+}
+
+// FindFloppy finds a floppy device with the given name, defaulting to the first floppy device if any.
+func (l VirtualDeviceList) FindFloppy(name string) (*types.VirtualFloppy, error) {
+	if name != "" {
+		d := l.Find(name)
+		if d == nil {
+			return nil, fmt.Errorf("device '%s' not found", name)
+		}
+		if c, ok := d.(*types.VirtualFloppy); ok {
+			return c, nil
+		}
+		return nil, fmt.Errorf("%s is not a floppy device", name)
+	}
+
+	c := l.SelectByType((*types.VirtualFloppy)(nil))
+	if len(c) == 0 {
+		return nil, errors.New("no floppy device found")
+	}
+
+	return c[0].(*types.VirtualFloppy), nil
+}
+
+// CreateFloppy creates a new VirtualFloppy device which can be added to a VM.
+func (l VirtualDeviceList) CreateFloppy() (*types.VirtualFloppy, error) {
+	device := &types.VirtualFloppy{}
+
+	c := l.PickController((*types.VirtualSIOController)(nil))
+	if c == nil {
+		return nil, errors.New("no available SIO controller")
+	}
+
+	l.AssignController(device, c)
+
+	l.setDefaultFloppyBacking(device)
+
+	device.Connectable = &types.VirtualDeviceConnectInfo{
+		AllowGuestControl: true,
+		Connected:         true,
+		StartConnected:    true,
+	}
+
+	return device, nil
+}
+
+// InsertImg changes the floppy device backing to use the given img file.
+func (l VirtualDeviceList) InsertImg(device *types.VirtualFloppy, img string) *types.VirtualFloppy {
+	device.Backing = &types.VirtualFloppyImageBackingInfo{
+		VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
+			FileName: img,
+		},
+	}
+
+	return device
+}
+
+// EjectImg removes the img file based backing and replaces with the default floppy backing.
+func (l VirtualDeviceList) EjectImg(device *types.VirtualFloppy) *types.VirtualFloppy {
+	l.setDefaultFloppyBacking(device)
+	return device
+}
+
+func (l VirtualDeviceList) setDefaultFloppyBacking(device *types.VirtualFloppy) {
+	device.Backing = &types.VirtualFloppyDeviceBackingInfo{
+		VirtualDeviceDeviceBackingInfo: types.VirtualDeviceDeviceBackingInfo{
+			DeviceName:    fmt.Sprintf("%s-%d", DeviceTypeFloppy, device.UnitNumber),
+			UseAutoDetect: types.NewBool(false),
+		},
+	}
+}
+
+// FindSerialPort finds a serial port device with the given name, defaulting to the first serial port device if any.
+func (l VirtualDeviceList) FindSerialPort(name string) (*types.VirtualSerialPort, error) {
+	if name != "" {
+		d := l.Find(name)
+		if d == nil {
+			return nil, fmt.Errorf("device '%s' not found", name)
+		}
+		if c, ok := d.(*types.VirtualSerialPort); ok {
+			return c, nil
+		}
+		return nil, fmt.Errorf("%s is not a serial port device", name)
+	}
+
+	c := l.SelectByType((*types.VirtualSerialPort)(nil))
+	if len(c) == 0 {
+		return nil, errors.New("no serial port device found")
+	}
+
+	return c[0].(*types.VirtualSerialPort), nil
+}
+
+// CreateSerialPort creates a new VirtualSerialPort device which can be added to a VM.
+func (l VirtualDeviceList) CreateSerialPort() (*types.VirtualSerialPort, error) {
+	device := &types.VirtualSerialPort{
+		YieldOnPoll: true,
+	}
+
+	c := l.PickController((*types.VirtualSIOController)(nil))
+	if c == nil {
+		return nil, errors.New("no available SIO controller")
+	}
+
+	l.AssignController(device, c)
+
+	l.setDefaultSerialPortBacking(device)
+
+	return device, nil
+}
+
+// ConnectSerialPort connects a serial port to a server or client uri.
+func (l VirtualDeviceList) ConnectSerialPort(device *types.VirtualSerialPort, uri string, client bool, proxyuri string) *types.VirtualSerialPort {
+	if strings.HasPrefix(uri, "[") {
+		device.Backing = &types.VirtualSerialPortFileBackingInfo{
+			VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
+				FileName: uri,
+			},
+		}
+
+		return device
+	}
+
+	direction := types.VirtualDeviceURIBackingOptionDirectionServer
+	if client {
+		direction = types.VirtualDeviceURIBackingOptionDirectionClient
+	}
+
+	device.Backing = &types.VirtualSerialPortURIBackingInfo{
+		VirtualDeviceURIBackingInfo: types.VirtualDeviceURIBackingInfo{
+			Direction:  string(direction),
+			ServiceURI: uri,
+			ProxyURI:   proxyuri,
+		},
+	}
+
+	return device
+}
+
+// DisconnectSerialPort disconnects the serial port backing.
+func (l VirtualDeviceList) DisconnectSerialPort(device *types.VirtualSerialPort) *types.VirtualSerialPort {
+	l.setDefaultSerialPortBacking(device)
+	return device
+}
+
+func (l VirtualDeviceList) setDefaultSerialPortBacking(device *types.VirtualSerialPort) {
+	device.Backing = &types.VirtualSerialPortURIBackingInfo{
+		VirtualDeviceURIBackingInfo: types.VirtualDeviceURIBackingInfo{
+			Direction:  "client",
+			ServiceURI: "localhost:0",
+		},
+	}
+}
+
+// CreateEthernetCard creates a new VirtualEthernetCard of the given name name and initialized with the given backing.
+func (l VirtualDeviceList) CreateEthernetCard(name string, backing types.BaseVirtualDeviceBackingInfo) (types.BaseVirtualDevice, error) {
+	ctypes := EthernetCardTypes()
+
+	if name == "" {
+		name = ctypes.deviceName(ctypes[0])
+	}
+
+	found := ctypes.Select(func(device types.BaseVirtualDevice) bool {
+		return l.deviceName(device) == name
+	})
+
+	if len(found) == 0 {
+		return nil, fmt.Errorf("unknown ethernet card type '%s'", name)
+	}
+
+	c, ok := found[0].(types.BaseVirtualEthernetCard)
+	if !ok {
+		return nil, fmt.Errorf("invalid ethernet card type '%s'", name)
+	}
+
+	c.GetVirtualEthernetCard().Backing = backing
+
+	return c.(types.BaseVirtualDevice), nil
+}
+
+// PrimaryMacAddress returns the MacAddress field of the primary VirtualEthernetCard
+func (l VirtualDeviceList) PrimaryMacAddress() string {
+	eth0 := l.Find("ethernet-0")
+
+	if eth0 == nil {
+		return ""
+	}
+
+	return eth0.(types.BaseVirtualEthernetCard).GetVirtualEthernetCard().MacAddress
+}
+
+// convert a BaseVirtualDevice to a BaseVirtualMachineBootOptionsBootableDevice
+var bootableDevices = map[string]func(device types.BaseVirtualDevice) types.BaseVirtualMachineBootOptionsBootableDevice{
+	DeviceTypeCdrom: func(types.BaseVirtualDevice) types.BaseVirtualMachineBootOptionsBootableDevice {
+		return &types.VirtualMachineBootOptionsBootableCdromDevice{}
+	},
+	DeviceTypeDisk: func(d types.BaseVirtualDevice) types.BaseVirtualMachineBootOptionsBootableDevice {
+		return &types.VirtualMachineBootOptionsBootableDiskDevice{
+			DeviceKey: d.GetVirtualDevice().Key,
+		}
+	},
+	DeviceTypeEthernet: func(d types.BaseVirtualDevice) types.BaseVirtualMachineBootOptionsBootableDevice {
+		return &types.VirtualMachineBootOptionsBootableEthernetDevice{
+			DeviceKey: d.GetVirtualDevice().Key,
+		}
+	},
+	DeviceTypeFloppy: func(types.BaseVirtualDevice) types.BaseVirtualMachineBootOptionsBootableDevice {
+		return &types.VirtualMachineBootOptionsBootableFloppyDevice{}
+	},
+}
+
+// BootOrder returns a list of devices which can be used to set boot order via VirtualMachine.SetBootOptions.
+// The order can any of "ethernet", "cdrom", "floppy" or "disk" or by specific device name.
+func (l VirtualDeviceList) BootOrder(order []string) []types.BaseVirtualMachineBootOptionsBootableDevice {
+	var devices []types.BaseVirtualMachineBootOptionsBootableDevice
+
+	for _, name := range order {
+		if kind, ok := bootableDevices[name]; ok {
+			for _, device := range l {
+				if l.Type(device) == name {
+					devices = append(devices, kind(device))
+				}
+
+			}
+			continue
+		}
+
+		if d := l.Find(name); d != nil {
+			if kind, ok := bootableDevices[l.Type(d)]; ok {
+				devices = append(devices, kind(d))
+			}
+		}
+	}
+
+	return devices
+}
+
+// SelectBootOrder returns an ordered list of devices matching the given bootable device order
+func (l VirtualDeviceList) SelectBootOrder(order []types.BaseVirtualMachineBootOptionsBootableDevice) VirtualDeviceList {
+	var devices VirtualDeviceList
+
+	for _, bd := range order {
+		for _, device := range l {
+			if kind, ok := bootableDevices[l.Type(device)]; ok {
+				if reflect.DeepEqual(kind(device), bd) {
+					devices = append(devices, device)
+				}
+			}
+		}
+	}
+
+	return devices
+}
+
+// TypeName returns the vmodl type name of the device
+func (l VirtualDeviceList) TypeName(device types.BaseVirtualDevice) string {
+	dtype := reflect.TypeOf(device)
+	if dtype == nil {
+		return ""
+	}
+	return dtype.Elem().Name()
+}
+
+var deviceNameRegexp = regexp.MustCompile(`(?:Virtual)?(?:Machine)?(\w+?)(?:Card|Device|Controller)?$`)
+
+func (l VirtualDeviceList) deviceName(device types.BaseVirtualDevice) string {
+	name := "device"
+	typeName := l.TypeName(device)
+
+	m := deviceNameRegexp.FindStringSubmatch(typeName)
+	if len(m) == 2 {
+		name = strings.ToLower(m[1])
+	}
+
+	return name
+}
+
+// Type returns a human-readable name for the given device
+func (l VirtualDeviceList) Type(device types.BaseVirtualDevice) string {
+	switch device.(type) {
+	case types.BaseVirtualEthernetCard:
+		return DeviceTypeEthernet
+	case *types.ParaVirtualSCSIController:
+		return "pvscsi"
+	case *types.VirtualLsiLogicSASController:
+		return "lsilogic-sas"
+	case *types.VirtualNVMEController:
+		return "nvme"
+	default:
+		return l.deviceName(device)
+	}
+}
+
+// Name returns a stable, human-readable name for the given device
+func (l VirtualDeviceList) Name(device types.BaseVirtualDevice) string {
+	var key string
+	var UnitNumber int32
+	d := device.GetVirtualDevice()
+	if d.UnitNumber != nil {
+		UnitNumber = *d.UnitNumber
+	}
+
+	dtype := l.Type(device)
+	switch dtype {
+	case DeviceTypeEthernet:
+		key = fmt.Sprintf("%d", UnitNumber-7)
+	case DeviceTypeDisk:
+		key = fmt.Sprintf("%d-%d", d.ControllerKey, UnitNumber)
+	default:
+		key = fmt.Sprintf("%d", d.Key)
+	}
+
+	return fmt.Sprintf("%s-%s", dtype, key)
+}
+
+// ConfigSpec creates a virtual machine configuration spec for
+// the specified operation, for the list of devices in the device list.
+func (l VirtualDeviceList) ConfigSpec(op types.VirtualDeviceConfigSpecOperation) ([]types.BaseVirtualDeviceConfigSpec, error) {
+	var fop types.VirtualDeviceConfigSpecFileOperation
+	switch op {
+	case types.VirtualDeviceConfigSpecOperationAdd:
+		fop = types.VirtualDeviceConfigSpecFileOperationCreate
+	case types.VirtualDeviceConfigSpecOperationEdit:
+		fop = types.VirtualDeviceConfigSpecFileOperationReplace
+	case types.VirtualDeviceConfigSpecOperationRemove:
+		fop = types.VirtualDeviceConfigSpecFileOperationDestroy
+	default:
+		panic("unknown op")
+	}
+
+	var res []types.BaseVirtualDeviceConfigSpec
+	for _, device := range l {
+		config := &types.VirtualDeviceConfigSpec{
+			Device:    device,
+			Operation: op,
+		}
+
+		if disk, ok := device.(*types.VirtualDisk); ok {
+			config.FileOperation = fop
+
+			// Special case to attach an existing disk
+			if op == types.VirtualDeviceConfigSpecOperationAdd && disk.CapacityInKB == 0 {
+				childDisk := false
+				if b, ok := disk.Backing.(*types.VirtualDiskFlatVer2BackingInfo); ok {
+					childDisk = b.Parent != nil
+				}
+
+				if !childDisk {
+					// Existing disk, clear file operation
+					config.FileOperation = ""
+				}
+			}
+		}
+
+		res = append(res, config)
+	}
+
+	return res, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/virtual_device_list_test.go b/vendor/github.com/vmware/govmomi/object/virtual_device_list_test.go
new file mode 100644
index 0000000000..23bc7da6b4
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/virtual_device_list_test.go
@@ -0,0 +1,873 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"math/rand"
+	"reflect"
+	"testing"
+
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+func intPtrValue(val int32) *int32 {
+	return &val
+}
+
+var devices = VirtualDeviceList([]types.BaseVirtualDevice{
+	&types.VirtualIDEController{
+		VirtualController: types.VirtualController{
+			VirtualDevice: types.VirtualDevice{
+				DynamicData: types.DynamicData{},
+				Key:         200,
+				DeviceInfo: &types.Description{
+					DynamicData: types.DynamicData{},
+					Label:       "IDE 0",
+					Summary:     "IDE 0",
+				},
+				Backing:       nil,
+				Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
+				SlotInfo:      nil,
+				ControllerKey: 0,
+				UnitNumber:    intPtrValue(0),
+			},
+			BusNumber: 0,
+			Device:    []int32{3001, 3000},
+		},
+	},
+	&types.VirtualIDEController{
+		VirtualController: types.VirtualController{
+			VirtualDevice: types.VirtualDevice{
+				DynamicData: types.DynamicData{},
+				Key:         201,
+				DeviceInfo: &types.Description{
+					DynamicData: types.DynamicData{},
+					Label:       "IDE 1",
+					Summary:     "IDE 1",
+				},
+				Backing:       nil,
+				Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
+				SlotInfo:      nil,
+				ControllerKey: 0,
+				UnitNumber:    intPtrValue(0),
+			},
+			BusNumber: 1,
+			Device:    []int32{3002},
+		},
+	},
+	&types.VirtualPS2Controller{
+		VirtualController: types.VirtualController{
+			VirtualDevice: types.VirtualDevice{
+				DynamicData: types.DynamicData{},
+				Key:         300,
+				DeviceInfo: &types.Description{
+					DynamicData: types.DynamicData{},
+					Label:       "PS2 controller 0",
+					Summary:     "PS2 controller 0",
+				},
+				Backing:       nil,
+				Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
+				SlotInfo:      nil,
+				ControllerKey: 0,
+				UnitNumber:    intPtrValue(0),
+			},
+			BusNumber: 0,
+			Device:    []int32{600, 700},
+		},
+	},
+	&types.VirtualPCIController{
+		VirtualController: types.VirtualController{
+			VirtualDevice: types.VirtualDevice{
+				DynamicData: types.DynamicData{},
+				Key:         100,
+				DeviceInfo: &types.Description{
+					DynamicData: types.DynamicData{},
+					Label:       "PCI controller 0",
+					Summary:     "PCI controller 0",
+				},
+				Backing:       nil,
+				Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
+				SlotInfo:      nil,
+				ControllerKey: 0,
+				UnitNumber:    intPtrValue(0),
+			},
+			BusNumber: 0,
+			Device:    []int32{500, 12000, 1000, 4000},
+		},
+	},
+	&types.VirtualSIOController{
+		VirtualController: types.VirtualController{
+			VirtualDevice: types.VirtualDevice{
+				DynamicData: types.DynamicData{},
+				Key:         400,
+				DeviceInfo: &types.Description{
+					DynamicData: types.DynamicData{},
+					Label:       "SIO controller 0",
+					Summary:     "SIO controller 0",
+				},
+				Backing:       nil,
+				Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
+				SlotInfo:      nil,
+				ControllerKey: 0,
+				UnitNumber:    intPtrValue(0),
+			},
+			BusNumber: 0,
+			Device:    []int32{9000},
+		},
+	},
+	&types.VirtualKeyboard{
+		VirtualDevice: types.VirtualDevice{
+			DynamicData: types.DynamicData{},
+			Key:         600,
+			DeviceInfo: &types.Description{
+				DynamicData: types.DynamicData{},
+				Label:       "Keyboard ",
+				Summary:     "Keyboard",
+			},
+			Backing:       nil,
+			Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
+			SlotInfo:      nil,
+			ControllerKey: 300,
+			UnitNumber:    intPtrValue(0),
+		},
+	},
+	&types.VirtualPointingDevice{
+		VirtualDevice: types.VirtualDevice{
+			DynamicData: types.DynamicData{},
+			Key:         700,
+			DeviceInfo: &types.Description{
+				DynamicData: types.DynamicData{},
+				Label:       "Pointing device",
+				Summary:     "Pointing device; Device",
+			},
+			Backing: &types.VirtualPointingDeviceDeviceBackingInfo{
+				VirtualDeviceDeviceBackingInfo: types.VirtualDeviceDeviceBackingInfo{},
+				HostPointingDevice:             "autodetect",
+			},
+			Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
+			SlotInfo:      nil,
+			ControllerKey: 300,
+			UnitNumber:    intPtrValue(1),
+		},
+	},
+	&types.VirtualMachineVideoCard{
+		VirtualDevice: types.VirtualDevice{
+			DynamicData: types.DynamicData{},
+			Key:         500,
+			DeviceInfo: &types.Description{
+				DynamicData: types.DynamicData{},
+				Label:       "Video card ",
+				Summary:     "Video card",
+			},
+			Backing:       nil,
+			Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
+			SlotInfo:      nil,
+			ControllerKey: 100,
+			UnitNumber:    intPtrValue(0),
+		},
+		VideoRamSizeInKB: 4096,
+		NumDisplays:      1,
+		UseAutoDetect:    types.NewBool(false),
+		Enable3DSupport:  types.NewBool(false),
+		Use3dRenderer:    "automatic",
+	},
+	&types.VirtualMachineVMCIDevice{
+		VirtualDevice: types.VirtualDevice{
+			DynamicData: types.DynamicData{},
+			Key:         12000,
+			DeviceInfo: &types.Description{
+				DynamicData: types.DynamicData{},
+				Label:       "VMCI device",
+				Summary:     "Device on the virtual machine PCI bus that provides support for the virtual machine communication interface",
+			},
+			Backing:     nil,
+			Connectable: (*types.VirtualDeviceConnectInfo)(nil),
+			SlotInfo: &types.VirtualDevicePciBusSlotInfo{
+				VirtualDeviceBusSlotInfo: types.VirtualDeviceBusSlotInfo{},
+				PciSlotNumber:            33,
+			},
+			ControllerKey: 100,
+			UnitNumber:    intPtrValue(17),
+		},
+		Id: 1754519335,
+		AllowUnrestrictedCommunication: types.NewBool(false),
+	},
+	&types.VirtualLsiLogicController{
+		VirtualSCSIController: types.VirtualSCSIController{
+			VirtualController: types.VirtualController{
+				VirtualDevice: types.VirtualDevice{
+					DynamicData: types.DynamicData{},
+					Key:         1000,
+					DeviceInfo: &types.Description{
+						DynamicData: types.DynamicData{},
+						Label:       "SCSI controller 0",
+						Summary:     "LSI Logic",
+					},
+					Backing:       nil,
+					Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
+					SlotInfo:      nil,
+					ControllerKey: 100,
+					UnitNumber:    intPtrValue(3),
+				},
+				BusNumber: 0,
+				Device:    nil,
+			},
+			HotAddRemove:       types.NewBool(true),
+			SharedBus:          "noSharing",
+			ScsiCtlrUnitNumber: 7,
+		},
+	},
+	&types.VirtualCdrom{
+		VirtualDevice: types.VirtualDevice{
+			DynamicData: types.DynamicData{},
+			Key:         3001,
+			DeviceInfo: &types.Description{
+				DynamicData: types.DynamicData{},
+				Label:       "CD/DVD drive 1",
+				Summary:     "ISO [datastore1] ttylinux-pc_i486-16.1.iso",
+			},
+			Backing: &types.VirtualCdromIsoBackingInfo{
+				VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
+					VirtualDeviceBackingInfo: types.VirtualDeviceBackingInfo{},
+					FileName:                 "[datastore1] foo.iso",
+					Datastore:                &types.ManagedObjectReference{Type: "Datastore", Value: "53fe43cc-75dc5110-3643-000c2918dc41"},
+					BackingObjectId:          "",
+				},
+			},
+			Connectable: &types.VirtualDeviceConnectInfo{
+				DynamicData:       types.DynamicData{},
+				StartConnected:    true,
+				AllowGuestControl: true,
+				Connected:         false,
+				Status:            "untried",
+			},
+			SlotInfo:      nil,
+			ControllerKey: 200,
+			UnitNumber:    intPtrValue(1),
+		},
+	},
+	&types.VirtualDisk{
+		VirtualDevice: types.VirtualDevice{
+			DynamicData: types.DynamicData{},
+			Key:         3000,
+			DeviceInfo: &types.Description{
+				DynamicData: types.DynamicData{},
+				Label:       "Hard disk 1",
+				Summary:     "30,720 KB",
+			},
+			Backing: &types.VirtualDiskFlatVer2BackingInfo{
+				VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
+					VirtualDeviceBackingInfo: types.VirtualDeviceBackingInfo{},
+					FileName:                 "[datastore1] bar/bar.vmdk",
+					Datastore:                &types.ManagedObjectReference{Type: "Datastore", Value: "53fe43cc-75dc5110-3643-000c2918dc41"},
+					BackingObjectId:          "3-3000-0",
+				},
+				DiskMode:        "persistent",
+				Split:           types.NewBool(false),
+				WriteThrough:    types.NewBool(false),
+				ThinProvisioned: types.NewBool(false),
+				EagerlyScrub:    types.NewBool(true),
+				Uuid:            "6000C296-d0af-1209-1975-10c98eae10e4",
+				ContentId:       "d46395062e2d1b1790985bdec573b211",
+				ChangeId:        "",
+				Parent: &types.VirtualDiskFlatVer2BackingInfo{
+					VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
+						VirtualDeviceBackingInfo: types.VirtualDeviceBackingInfo{},
+						FileName:                 "[datastore1] ttylinux.vmdk",
+						Datastore:                &types.ManagedObjectReference{Type: "Datastore", Value: "53fe43cc-75dc5110-3643-000c2918dc41"},
+						BackingObjectId:          "3-3000-1",
+					},
+					DiskMode:        "persistent",
+					Split:           types.NewBool(false),
+					WriteThrough:    types.NewBool(false),
+					ThinProvisioned: types.NewBool(false),
+					EagerlyScrub:    types.NewBool(true),
+					Uuid:            "6000C296-d0af-1209-1975-10c98eae10e4",
+					ContentId:       "1c2dad9e1662219e962a620c6d238a7c",
+					ChangeId:        "",
+					Parent:          (*types.VirtualDiskFlatVer2BackingInfo)(nil),
+					DeltaDiskFormat: "",
+					DigestEnabled:   types.NewBool(false),
+					DeltaGrainSize:  0,
+				},
+				DeltaDiskFormat: "redoLogFormat",
+				DigestEnabled:   types.NewBool(false),
+				DeltaGrainSize:  0,
+			},
+			Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
+			SlotInfo:      nil,
+			ControllerKey: 200,
+			UnitNumber:    intPtrValue(0),
+		},
+		CapacityInKB:    30720,
+		CapacityInBytes: 31457280,
+		Shares: &types.SharesInfo{
+			DynamicData: types.DynamicData{},
+			Shares:      1000,
+			Level:       "normal",
+		},
+		StorageIOAllocation: &types.StorageIOAllocationInfo{
+			DynamicData: types.DynamicData{},
+			Limit:       -1,
+			Shares: &types.SharesInfo{
+				DynamicData: types.DynamicData{},
+				Shares:      1000,
+				Level:       "normal",
+			},
+			Reservation: 0,
+		},
+		DiskObjectId:          "3-3000",
+		VFlashCacheConfigInfo: (*types.VirtualDiskVFlashCacheConfigInfo)(nil),
+	},
+	&types.VirtualDisk{
+		VirtualDevice: types.VirtualDevice{
+			DynamicData: types.DynamicData{},
+			Key:         3002,
+			DeviceInfo: &types.Description{
+				DynamicData: types.DynamicData{},
+				Label:       "Hard disk 2",
+				Summary:     "10,000,000 KB",
+			},
+			Backing: &types.VirtualDiskFlatVer2BackingInfo{
+				VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
+					VirtualDeviceBackingInfo: types.VirtualDeviceBackingInfo{},
+					FileName:                 "[datastore1] bar/disk-201-0.vmdk",
+					Datastore:                &types.ManagedObjectReference{Type: "Datastore", Value: "53fe43cc-75dc5110-3643-000c2918dc41"},
+					BackingObjectId:          "3-3002-0",
+				},
+				DiskMode:        "persistent",
+				Split:           types.NewBool(false),
+				WriteThrough:    types.NewBool(false),
+				ThinProvisioned: types.NewBool(true),
+				EagerlyScrub:    types.NewBool(false),
+				Uuid:            "6000C293-fde5-4457-5118-dd267ea992a7",
+				ContentId:       "90399989b9d520eed6793ab0fffffffe",
+				ChangeId:        "",
+				Parent:          (*types.VirtualDiskFlatVer2BackingInfo)(nil),
+				DeltaDiskFormat: "",
+				DigestEnabled:   types.NewBool(false),
+				DeltaGrainSize:  0,
+			},
+			Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
+			SlotInfo:      nil,
+			ControllerKey: 201,
+			UnitNumber:    intPtrValue(0),
+		},
+		CapacityInKB:    10000000,
+		CapacityInBytes: 10240000000,
+		Shares: &types.SharesInfo{
+			DynamicData: types.DynamicData{},
+			Shares:      1000,
+			Level:       "normal",
+		},
+		StorageIOAllocation: &types.StorageIOAllocationInfo{
+			DynamicData: types.DynamicData{},
+			Limit:       -1,
+			Shares: &types.SharesInfo{
+				DynamicData: types.DynamicData{},
+				Shares:      1000,
+				Level:       "normal",
+			},
+			Reservation: 0,
+		},
+		DiskObjectId:          "3-3002",
+		VFlashCacheConfigInfo: (*types.VirtualDiskVFlashCacheConfigInfo)(nil),
+	},
+	&types.VirtualE1000{
+		VirtualEthernetCard: types.VirtualEthernetCard{
+			VirtualDevice: types.VirtualDevice{
+				DynamicData: types.DynamicData{},
+				Key:         4000,
+				DeviceInfo: &types.Description{
+					DynamicData: types.DynamicData{},
+					Label:       "Network adapter 1",
+					Summary:     "VM Network",
+				},
+				Backing: &types.VirtualEthernetCardNetworkBackingInfo{
+					VirtualDeviceDeviceBackingInfo: types.VirtualDeviceDeviceBackingInfo{
+						VirtualDeviceBackingInfo: types.VirtualDeviceBackingInfo{},
+						DeviceName:               "VM Network",
+						UseAutoDetect:            types.NewBool(false),
+					},
+					Network:           &types.ManagedObjectReference{Type: "Network", Value: "HaNetwork-VM Network"},
+					InPassthroughMode: types.NewBool(false),
+				},
+				Connectable: &types.VirtualDeviceConnectInfo{
+					DynamicData:       types.DynamicData{},
+					StartConnected:    true,
+					AllowGuestControl: true,
+					Connected:         false,
+					Status:            "untried",
+				},
+				SlotInfo: &types.VirtualDevicePciBusSlotInfo{
+					VirtualDeviceBusSlotInfo: types.VirtualDeviceBusSlotInfo{},
+					PciSlotNumber:            32,
+				},
+				ControllerKey: 100,
+				UnitNumber:    intPtrValue(7),
+			},
+			AddressType:      "generated",
+			MacAddress:       "00:0c:29:93:d7:27",
+			WakeOnLanEnabled: types.NewBool(true),
+		},
+	},
+	&types.VirtualSerialPort{
+		VirtualDevice: types.VirtualDevice{
+			DynamicData: types.DynamicData{},
+			Key:         9000,
+			DeviceInfo: &types.Description{
+				DynamicData: types.DynamicData{},
+				Label:       "Serial port 1",
+				Summary:     "Remote localhost:0",
+			},
+			Backing: &types.VirtualSerialPortURIBackingInfo{
+				VirtualDeviceURIBackingInfo: types.VirtualDeviceURIBackingInfo{
+					VirtualDeviceBackingInfo: types.VirtualDeviceBackingInfo{},
+					ServiceURI:               "localhost:0",
+					Direction:                "client",
+					ProxyURI:                 "",
+				},
+			},
+			Connectable: &types.VirtualDeviceConnectInfo{
+				DynamicData:       types.DynamicData{},
+				StartConnected:    true,
+				AllowGuestControl: true,
+				Connected:         false,
+				Status:            "untried",
+			},
+			SlotInfo:      nil,
+			ControllerKey: 400,
+			UnitNumber:    intPtrValue(0),
+		},
+		YieldOnPoll: true,
+	},
+})
+
+func TestSelectByType(t *testing.T) {
+	tests := []struct {
+		dtype  types.BaseVirtualDevice
+		expect int
+	}{
+		{
+			(*types.VirtualCdrom)(nil),
+			1,
+		},
+		{
+			(*types.VirtualEthernetCard)(nil),
+			1,
+		},
+		{
+			(*types.VirtualDisk)(nil),
+			2,
+		},
+		{
+			(*types.VirtualController)(nil),
+			6,
+		},
+		{
+			(*types.VirtualIDEController)(nil),
+			2,
+		},
+		{
+			(*types.VirtualSCSIController)(nil),
+			1,
+		},
+		{
+			(*types.VirtualLsiLogicController)(nil),
+			1,
+		},
+		{
+			(*types.ParaVirtualSCSIController)(nil),
+			0,
+		},
+	}
+
+	for _, test := range tests {
+		d := devices.SelectByType(test.dtype)
+
+		if len(d) != test.expect {
+			t.Errorf("%#v has %d", test.dtype, len(devices))
+		}
+	}
+}
+
+func TestSelectByBackingInfo(t *testing.T) {
+	tests := []types.BaseVirtualDeviceBackingInfo{
+		&types.VirtualEthernetCardNetworkBackingInfo{
+			VirtualDeviceDeviceBackingInfo: types.VirtualDeviceDeviceBackingInfo{
+				DeviceName: "VM Network",
+			},
+		},
+		&types.VirtualDiskFlatVer2BackingInfo{
+			VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
+				FileName: "[datastore1] bar/bar.vmdk",
+			},
+		},
+		&types.VirtualDiskFlatVer2BackingInfo{
+			Parent: &types.VirtualDiskFlatVer2BackingInfo{
+				VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
+					FileName: "[datastore1] ttylinux.vmdk",
+				},
+			},
+		},
+		&types.VirtualCdromIsoBackingInfo{
+			VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
+				VirtualDeviceBackingInfo: types.VirtualDeviceBackingInfo{},
+				FileName:                 "[datastore1] foo.iso",
+			},
+		},
+		(*types.VirtualCdromIsoBackingInfo)(nil),
+		&types.VirtualSerialPortURIBackingInfo{
+			VirtualDeviceURIBackingInfo: types.VirtualDeviceURIBackingInfo{
+				VirtualDeviceBackingInfo: types.VirtualDeviceBackingInfo{},
+				ServiceURI:               "localhost:0",
+				Direction:                "client",
+				ProxyURI:                 "",
+			},
+		},
+		(*types.VirtualSerialPortURIBackingInfo)(nil),
+	}
+
+	for _, test := range tests {
+		l := devices.SelectByBackingInfo(test)
+
+		if len(l) != 1 {
+			t.Errorf("Expected 1, got %d: %#v", len(l), test)
+		}
+	}
+
+	// test selecting by backing type
+	tests = []types.BaseVirtualDeviceBackingInfo{
+		(*types.VirtualDiskFlatVer2BackingInfo)(nil),
+	}
+
+	for _, test := range tests {
+		l := devices.SelectByBackingInfo(test)
+
+		if len(l) != 2 {
+			t.Errorf("Expected 2, got %d: %#v", len(l), test)
+		}
+	}
+}
+
+func TestFind(t *testing.T) {
+	for _, device := range devices {
+		name := devices.Name(device)
+		d := devices.Find(name)
+		if name != devices.Name(d) {
+			t.Errorf("expected name: %s, got: %s", name, devices.Name(d))
+		}
+	}
+
+	d := devices.Find("enoent")
+	if d != nil {
+		t.Errorf("unexpected: %#v", d)
+	}
+}
+
+func TestFindController(t *testing.T) {
+	for _, name := range []string{"", "ide-200"} {
+		_, err := devices.FindIDEController(name)
+		if err != nil {
+			t.Error(err)
+		}
+	}
+
+	for _, name := range []string{"", "lsilogic-1000"} {
+		_, err := devices.FindSCSIController(name)
+		if err != nil {
+			t.Error(err)
+		}
+	}
+
+	fns := []func() error{
+		func() error {
+			_, err := devices.FindIDEController("lsilogic-1000")
+			return err
+		},
+		func() error {
+			_, err := devices.FindSCSIController("ide-200")
+			return err
+		},
+	}
+
+	for _, f := range fns {
+		err := f()
+		if err == nil {
+			t.Error("should fail")
+		}
+	}
+}
+
+func TestPickController(t *testing.T) {
+	list := devices
+
+	tests := []struct {
+		ctype types.BaseVirtualController
+		key   int32
+		unit  int32
+	}{
+		{
+			(*types.VirtualIDEController)(nil), 201, 1,
+		},
+		{
+			(*types.VirtualSCSIController)(nil), 1000, 0,
+		},
+		{
+			(*types.VirtualSCSIController)(nil), 1000, 1,
+		},
+	}
+
+	for _, test := range tests {
+		c := list.PickController(test.ctype).GetVirtualController()
+
+		key := c.Key
+		if key != test.key {
+			t.Errorf("expected controller key: %d, got: %d\n", test.key, key)
+		}
+
+		unit := list.newUnitNumber(c)
+		if unit != test.unit {
+			t.Errorf("expected unit number: %d, got: %d\n", test.unit, unit)
+		}
+
+		dev := &types.VirtualDevice{
+			Key:           int32(rand.Int()),
+			UnitNumber:    new(int32),
+			ControllerKey: key,
+		}
+		*dev.UnitNumber = unit
+
+		list = append(list, dev)
+		c.Device = append(c.Device, dev.Key)
+	}
+
+	if list.PickController((*types.VirtualIDEController)(nil)) != nil {
+		t.Error("should be nil")
+	}
+
+	if list.PickController((*types.VirtualSCSIController)(nil)) == nil {
+		t.Errorf("should not be nil")
+	}
+}
+
+func TestCreateSCSIController(t *testing.T) {
+	for _, l := range []VirtualDeviceList{SCSIControllerTypes(), devices} {
+		_, err := l.CreateSCSIController("enoent")
+		if err == nil {
+			t.Error("should fail")
+		}
+
+		for _, name := range []string{"", "scsi", "pvscsi", "buslogic", "lsilogic", "lsilogic-sas"} {
+			_, err = l.CreateSCSIController(name)
+			if err != nil {
+				t.Error(err)
+			}
+		}
+	}
+}
+
+func TestCreateEthernetCard(t *testing.T) {
+	_, err := EthernetCardTypes().CreateEthernetCard("enoent", nil)
+	if err == nil {
+		t.Error("should fail")
+	}
+
+	for _, name := range []string{"", "e1000", "e1000e", "vmxnet3"} {
+		_, err := EthernetCardTypes().CreateEthernetCard(name, nil)
+		if err != nil {
+			t.Error(err)
+		}
+	}
+}
+
+func TestCdrom(t *testing.T) {
+	c, err := devices.FindCdrom("")
+	if err != nil {
+		t.Error(err)
+	}
+
+	d := devices.Find(devices.Name(c))
+
+	if c.Key != d.GetVirtualDevice().Key {
+		t.Error("device key mismatch")
+	}
+
+	for _, name := range []string{"enoent", "ide-200"} {
+		c, err = devices.FindCdrom(name)
+		if err == nil {
+			t.Errorf("FindCdrom(%s) should fail", name)
+		}
+	}
+
+	c, err = devices.Select(func(device types.BaseVirtualDevice) bool {
+		if _, ok := device.(*types.VirtualCdrom); ok {
+			return false
+		}
+		return true
+	}).FindCdrom("")
+
+	if err == nil {
+		t.Error("FindCdrom('') should fail")
+	}
+}
+
+func TestSerialPort(t *testing.T) {
+	device, err := devices.CreateSerialPort()
+	if err != nil {
+		t.Error(err)
+	}
+	devices.ConnectSerialPort(device, "telnet://:33233", false, "")
+}
+
+func TestPrimaryMacAddress(t *testing.T) {
+	expect := "00:0c:29:93:d7:27"
+	mac := devices.PrimaryMacAddress()
+	if expect != mac {
+		t.Errorf("expected: %s, got: %s", expect, mac)
+	}
+}
+
+func TestBootOrder(t *testing.T) {
+	o := []string{DeviceTypeEthernet, DeviceTypeCdrom, DeviceTypeFloppy, DeviceTypeDisk}
+	list := devices
+
+	n := 4 // 1 ethernet, 1 cdrom, 2 disk
+	order := list.BootOrder(o)
+	if len(order) != n {
+		t.Errorf("expected %d boot devices, got: %d", n, len(order))
+	}
+
+	list = list.SelectBootOrder(order)
+	if len(list) != n {
+		t.Errorf("expected %d boot devices, got: %d", n, len(list))
+	}
+
+	// test lookup by name
+	var names []string
+	for _, x := range list {
+		names = append(names, list.Name(x))
+	}
+
+	order = list.BootOrder(names)
+	if len(order) != n {
+		t.Errorf("expected %d boot devices, got: %d", n, len(order))
+	}
+
+	if !reflect.DeepEqual(list, list.SelectBootOrder(order)) {
+		t.Error("boot order mismatch")
+	}
+
+	// remove disks
+	list = list.Select(func(device types.BaseVirtualDevice) bool {
+		if _, ok := device.(*types.VirtualDisk); ok {
+			return false
+		}
+		return true
+	})
+
+	n = 2 // 1 ethernet, 1 cdrom
+	order = list.BootOrder(o)
+	if len(order) != n {
+		t.Errorf("expected %d boot devices, got: %d", n, len(order))
+	}
+
+	if !reflect.DeepEqual(list, list.SelectBootOrder(order)) {
+		t.Error("boot order mismatch")
+	}
+
+	if len(list.BootOrder([]string{DeviceTypeDisk})) != 0 {
+		t.Error("expected 0 disks")
+	}
+}
+
+func TestName(t *testing.T) {
+	tests := []struct {
+		device types.BaseVirtualDevice
+		expect string
+	}{
+		{
+			&types.VirtualCdrom{},
+			"cdrom-0",
+		},
+		{
+			&types.VirtualDisk{},
+			"disk-0-0",
+		},
+		{
+			&types.VirtualFloppy{},
+			"floppy-0",
+		},
+		{
+			&types.VirtualIDEController{},
+			"ide-0",
+		},
+		{
+			&types.VirtualMachineVideoCard{},
+			"video-0",
+		},
+		{
+			&types.VirtualPointingDevice{},
+			"pointing-0",
+		},
+		{
+			&types.ParaVirtualSCSIController{},
+			"pvscsi-0",
+		},
+		{
+			&types.VirtualSerialPort{},
+			"serialport-0",
+		},
+		{
+			&types.VirtualE1000{
+				VirtualEthernetCard: types.VirtualEthernetCard{
+					VirtualDevice: types.VirtualDevice{
+						UnitNumber: intPtrValue(7),
+					},
+				},
+			},
+			"ethernet-0",
+		},
+	}
+
+	for _, test := range tests {
+		name := devices.Name(test.device)
+		if name != test.expect {
+			t.Errorf("expected: %s, got: %s", test.expect, name)
+		}
+	}
+}
+
+func TestChildDisk(t *testing.T) {
+	disks := devices.SelectByType((*types.VirtualDisk)(nil))
+
+	for _, disk := range disks {
+		child := disks.ChildDisk(disk.(*types.VirtualDisk))
+		name := child.Backing.(*types.VirtualDiskFlatVer2BackingInfo).VirtualDeviceFileBackingInfo.FileName
+
+		p := new(DatastorePath)
+		p.FromString(name)
+
+		if p.Datastore != "datastore1" {
+			t.Fatal(p.Datastore)
+		}
+
+		if p.Path != "" {
+			t.Fatal(p.Path)
+		}
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/object/virtual_disk_manager.go b/vendor/github.com/vmware/govmomi/object/virtual_disk_manager.go
new file mode 100644
index 0000000000..b26e2f71c2
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/virtual_disk_manager.go
@@ -0,0 +1,170 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type VirtualDiskManager struct {
+	Common
+}
+
+func NewVirtualDiskManager(c *vim25.Client) *VirtualDiskManager {
+	m := VirtualDiskManager{
+		Common: NewCommon(c, *c.ServiceContent.VirtualDiskManager),
+	}
+
+	return &m
+}
+
+// CopyVirtualDisk copies a virtual disk, performing conversions as specified in the spec.
+func (m VirtualDiskManager) CopyVirtualDisk(
+	ctx context.Context,
+	sourceName string, sourceDatacenter *Datacenter,
+	destName string, destDatacenter *Datacenter,
+	destSpec *types.VirtualDiskSpec, force bool) (*Task, error) {
+
+	req := types.CopyVirtualDisk_Task{
+		This:       m.Reference(),
+		SourceName: sourceName,
+		DestName:   destName,
+		DestSpec:   destSpec,
+		Force:      types.NewBool(force),
+	}
+
+	if sourceDatacenter != nil {
+		ref := sourceDatacenter.Reference()
+		req.SourceDatacenter = &ref
+	}
+
+	if destDatacenter != nil {
+		ref := destDatacenter.Reference()
+		req.DestDatacenter = &ref
+	}
+
+	res, err := methods.CopyVirtualDisk_Task(ctx, m.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(m.c, res.Returnval), nil
+}
+
+// CreateVirtualDisk creates a new virtual disk.
+func (m VirtualDiskManager) CreateVirtualDisk(
+	ctx context.Context,
+	name string, datacenter *Datacenter,
+	spec types.BaseVirtualDiskSpec) (*Task, error) {
+
+	req := types.CreateVirtualDisk_Task{
+		This: m.Reference(),
+		Name: name,
+		Spec: spec,
+	}
+
+	if datacenter != nil {
+		ref := datacenter.Reference()
+		req.Datacenter = &ref
+	}
+
+	res, err := methods.CreateVirtualDisk_Task(ctx, m.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(m.c, res.Returnval), nil
+}
+
+// MoveVirtualDisk moves a virtual disk.
+func (m VirtualDiskManager) MoveVirtualDisk(
+	ctx context.Context,
+	sourceName string, sourceDatacenter *Datacenter,
+	destName string, destDatacenter *Datacenter,
+	force bool) (*Task, error) {
+	req := types.MoveVirtualDisk_Task{
+		This:       m.Reference(),
+		SourceName: sourceName,
+		DestName:   destName,
+		Force:      types.NewBool(force),
+	}
+
+	if sourceDatacenter != nil {
+		ref := sourceDatacenter.Reference()
+		req.SourceDatacenter = &ref
+	}
+
+	if destDatacenter != nil {
+		ref := destDatacenter.Reference()
+		req.DestDatacenter = &ref
+	}
+
+	res, err := methods.MoveVirtualDisk_Task(ctx, m.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(m.c, res.Returnval), nil
+}
+
+// DeleteVirtualDisk deletes a virtual disk.
+func (m VirtualDiskManager) DeleteVirtualDisk(ctx context.Context, name string, dc *Datacenter) (*Task, error) {
+	req := types.DeleteVirtualDisk_Task{
+		This: m.Reference(),
+		Name: name,
+	}
+
+	if dc != nil {
+		ref := dc.Reference()
+		req.Datacenter = &ref
+	}
+
+	res, err := methods.DeleteVirtualDisk_Task(ctx, m.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(m.c, res.Returnval), nil
+}
+
+// Queries virtual disk uuid
+func (m VirtualDiskManager) QueryVirtualDiskUuid(ctx context.Context, name string, dc *Datacenter) (string, error) {
+	req := types.QueryVirtualDiskUuid{
+		This: m.Reference(),
+		Name: name,
+	}
+
+	if dc != nil {
+		ref := dc.Reference()
+		req.Datacenter = &ref
+	}
+
+	res, err := methods.QueryVirtualDiskUuid(ctx, m.c, &req)
+	if err != nil {
+		return "", err
+	}
+
+	if res == nil {
+		return "", nil
+	}
+
+	return res.Returnval, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/virtual_machine.go b/vendor/github.com/vmware/govmomi/object/virtual_machine.go
new file mode 100644
index 0000000000..8fd6a421b2
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/virtual_machine.go
@@ -0,0 +1,759 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"net"
+	"path"
+
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+const (
+	PropRuntimePowerState = "summary.runtime.powerState"
+)
+
+type VirtualMachine struct {
+	Common
+}
+
+func NewVirtualMachine(c *vim25.Client, ref types.ManagedObjectReference) *VirtualMachine {
+	return &VirtualMachine{
+		Common: NewCommon(c, ref),
+	}
+}
+
+func (v VirtualMachine) PowerState(ctx context.Context) (types.VirtualMachinePowerState, error) {
+	var o mo.VirtualMachine
+
+	err := v.Properties(ctx, v.Reference(), []string{PropRuntimePowerState}, &o)
+	if err != nil {
+		return "", err
+	}
+
+	return o.Summary.Runtime.PowerState, nil
+}
+
+func (v VirtualMachine) PowerOn(ctx context.Context) (*Task, error) {
+	req := types.PowerOnVM_Task{
+		This: v.Reference(),
+	}
+
+	res, err := methods.PowerOnVM_Task(ctx, v.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(v.c, res.Returnval), nil
+}
+
+func (v VirtualMachine) PowerOff(ctx context.Context) (*Task, error) {
+	req := types.PowerOffVM_Task{
+		This: v.Reference(),
+	}
+
+	res, err := methods.PowerOffVM_Task(ctx, v.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(v.c, res.Returnval), nil
+}
+
+func (v VirtualMachine) Reset(ctx context.Context) (*Task, error) {
+	req := types.ResetVM_Task{
+		This: v.Reference(),
+	}
+
+	res, err := methods.ResetVM_Task(ctx, v.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(v.c, res.Returnval), nil
+}
+
+func (v VirtualMachine) Suspend(ctx context.Context) (*Task, error) {
+	req := types.SuspendVM_Task{
+		This: v.Reference(),
+	}
+
+	res, err := methods.SuspendVM_Task(ctx, v.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(v.c, res.Returnval), nil
+}
+
+func (v VirtualMachine) ShutdownGuest(ctx context.Context) error {
+	req := types.ShutdownGuest{
+		This: v.Reference(),
+	}
+
+	_, err := methods.ShutdownGuest(ctx, v.c, &req)
+	return err
+}
+
+func (v VirtualMachine) RebootGuest(ctx context.Context) error {
+	req := types.RebootGuest{
+		This: v.Reference(),
+	}
+
+	_, err := methods.RebootGuest(ctx, v.c, &req)
+	return err
+}
+
+func (v VirtualMachine) Destroy(ctx context.Context) (*Task, error) {
+	req := types.Destroy_Task{
+		This: v.Reference(),
+	}
+
+	res, err := methods.Destroy_Task(ctx, v.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(v.c, res.Returnval), nil
+}
+
+func (v VirtualMachine) Clone(ctx context.Context, folder *Folder, name string, config types.VirtualMachineCloneSpec) (*Task, error) {
+	req := types.CloneVM_Task{
+		This:   v.Reference(),
+		Folder: folder.Reference(),
+		Name:   name,
+		Spec:   config,
+	}
+
+	res, err := methods.CloneVM_Task(ctx, v.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(v.c, res.Returnval), nil
+}
+
+func (v VirtualMachine) Customize(ctx context.Context, spec types.CustomizationSpec) (*Task, error) {
+	req := types.CustomizeVM_Task{
+		This: v.Reference(),
+		Spec: spec,
+	}
+
+	res, err := methods.CustomizeVM_Task(ctx, v.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(v.c, res.Returnval), nil
+}
+
+func (v VirtualMachine) Relocate(ctx context.Context, config types.VirtualMachineRelocateSpec, priority types.VirtualMachineMovePriority) (*Task, error) {
+	req := types.RelocateVM_Task{
+		This:     v.Reference(),
+		Spec:     config,
+		Priority: priority,
+	}
+
+	res, err := methods.RelocateVM_Task(ctx, v.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(v.c, res.Returnval), nil
+}
+
+func (v VirtualMachine) Reconfigure(ctx context.Context, config types.VirtualMachineConfigSpec) (*Task, error) {
+	req := types.ReconfigVM_Task{
+		This: v.Reference(),
+		Spec: config,
+	}
+
+	res, err := methods.ReconfigVM_Task(ctx, v.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(v.c, res.Returnval), nil
+}
+
+func (v VirtualMachine) WaitForIP(ctx context.Context) (string, error) {
+	var ip string
+
+	p := property.DefaultCollector(v.c)
+	err := property.Wait(ctx, p, v.Reference(), []string{"guest.ipAddress"}, func(pc []types.PropertyChange) bool {
+		for _, c := range pc {
+			if c.Name != "guest.ipAddress" {
+				continue
+			}
+			if c.Op != types.PropertyChangeOpAssign {
+				continue
+			}
+			if c.Val == nil {
+				continue
+			}
+
+			ip = c.Val.(string)
+			return true
+		}
+
+		return false
+	})
+
+	if err != nil {
+		return "", err
+	}
+
+	return ip, nil
+}
+
+// WaitForNetIP waits for the VM guest.net property to report an IP address for all VM NICs.
+// Only consider IPv4 addresses if the v4 param is true.
+// By default, wait for all NICs to get an IP address, unless 1 or more device is given.
+// A device can be specified by the MAC address or the device name, e.g. "ethernet-0".
+// Returns a map with MAC address as the key and IP address list as the value.
+func (v VirtualMachine) WaitForNetIP(ctx context.Context, v4 bool, device ...string) (map[string][]string, error) {
+	macs := make(map[string][]string)
+	eths := make(map[string]string)
+
+	p := property.DefaultCollector(v.c)
+
+	// Wait for all NICs to have a MacAddress, which may not be generated yet.
+	err := property.Wait(ctx, p, v.Reference(), []string{"config.hardware.device"}, func(pc []types.PropertyChange) bool {
+		for _, c := range pc {
+			if c.Op != types.PropertyChangeOpAssign {
+				continue
+			}
+
+			devices := VirtualDeviceList(c.Val.(types.ArrayOfVirtualDevice).VirtualDevice)
+			for _, d := range devices {
+				if nic, ok := d.(types.BaseVirtualEthernetCard); ok {
+					mac := nic.GetVirtualEthernetCard().MacAddress
+					if mac == "" {
+						return false
+					}
+					macs[mac] = nil
+					eths[devices.Name(d)] = mac
+				}
+			}
+		}
+
+		return true
+	})
+
+	if len(device) != 0 {
+		// Only wait for specific NIC(s)
+		macs = make(map[string][]string)
+		for _, mac := range device {
+			if eth, ok := eths[mac]; ok {
+				mac = eth // device name, e.g. "ethernet-0"
+			}
+			macs[mac] = nil
+		}
+	}
+
+	err = property.Wait(ctx, p, v.Reference(), []string{"guest.net"}, func(pc []types.PropertyChange) bool {
+		for _, c := range pc {
+			if c.Op != types.PropertyChangeOpAssign {
+				continue
+			}
+
+			nics := c.Val.(types.ArrayOfGuestNicInfo).GuestNicInfo
+			for _, nic := range nics {
+				mac := nic.MacAddress
+				if mac == "" || nic.IpConfig == nil {
+					continue
+				}
+
+				for _, ip := range nic.IpConfig.IpAddress {
+					if _, ok := macs[mac]; !ok {
+						continue // Ignore any that don't correspond to a VM device
+					}
+					if v4 && net.ParseIP(ip.IpAddress).To4() == nil {
+						continue // Ignore non IPv4 address
+					}
+					macs[mac] = append(macs[mac], ip.IpAddress)
+				}
+			}
+		}
+
+		for _, ips := range macs {
+			if len(ips) == 0 {
+				return false
+			}
+		}
+
+		return true
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	return macs, nil
+}
+
+// Device returns the VirtualMachine's config.hardware.device property.
+func (v VirtualMachine) Device(ctx context.Context) (VirtualDeviceList, error) {
+	var o mo.VirtualMachine
+
+	err := v.Properties(ctx, v.Reference(), []string{"config.hardware.device", "summary.runtime.connectionState"}, &o)
+	if err != nil {
+		return nil, err
+	}
+
+	// Quoting the SDK doc:
+	//   The virtual machine configuration is not guaranteed to be available.
+	//   For example, the configuration information would be unavailable if the server
+	//   is unable to access the virtual machine files on disk, and is often also unavailable
+	//   during the initial phases of virtual machine creation.
+	if o.Config == nil {
+		return nil, fmt.Errorf("%s Config is not available, connectionState=%s",
+			v.Reference(), o.Summary.Runtime.ConnectionState)
+	}
+
+	return VirtualDeviceList(o.Config.Hardware.Device), nil
+}
+
+func (v VirtualMachine) HostSystem(ctx context.Context) (*HostSystem, error) {
+	var o mo.VirtualMachine
+
+	err := v.Properties(ctx, v.Reference(), []string{"summary.runtime.host"}, &o)
+	if err != nil {
+		return nil, err
+	}
+
+	host := o.Summary.Runtime.Host
+	if host == nil {
+		return nil, errors.New("VM doesn't have a HostSystem")
+	}
+
+	return NewHostSystem(v.c, *host), nil
+}
+
+func (v VirtualMachine) ResourcePool(ctx context.Context) (*ResourcePool, error) {
+	var o mo.VirtualMachine
+
+	err := v.Properties(ctx, v.Reference(), []string{"resourcePool"}, &o)
+	if err != nil {
+		return nil, err
+	}
+
+	rp := o.ResourcePool
+	if rp == nil {
+		return nil, errors.New("VM doesn't have a resourcePool")
+	}
+
+	return NewResourcePool(v.c, *rp), nil
+}
+
+func (v VirtualMachine) configureDevice(ctx context.Context, op types.VirtualDeviceConfigSpecOperation, fop types.VirtualDeviceConfigSpecFileOperation, devices ...types.BaseVirtualDevice) error {
+	spec := types.VirtualMachineConfigSpec{}
+
+	for _, device := range devices {
+		config := &types.VirtualDeviceConfigSpec{
+			Device:    device,
+			Operation: op,
+		}
+
+		if disk, ok := device.(*types.VirtualDisk); ok {
+			config.FileOperation = fop
+
+			// Special case to attach an existing disk
+			if op == types.VirtualDeviceConfigSpecOperationAdd && disk.CapacityInKB == 0 {
+				childDisk := false
+				if b, ok := disk.Backing.(*types.VirtualDiskFlatVer2BackingInfo); ok {
+					childDisk = b.Parent != nil
+				}
+
+				if !childDisk {
+					config.FileOperation = "" // existing disk
+				}
+			}
+		}
+
+		spec.DeviceChange = append(spec.DeviceChange, config)
+	}
+
+	task, err := v.Reconfigure(ctx, spec)
+	if err != nil {
+		return err
+	}
+
+	return task.Wait(ctx)
+}
+
+// AddDevice adds the given devices to the VirtualMachine
+func (v VirtualMachine) AddDevice(ctx context.Context, device ...types.BaseVirtualDevice) error {
+	return v.configureDevice(ctx, types.VirtualDeviceConfigSpecOperationAdd, types.VirtualDeviceConfigSpecFileOperationCreate, device...)
+}
+
+// EditDevice edits the given (existing) devices on the VirtualMachine
+func (v VirtualMachine) EditDevice(ctx context.Context, device ...types.BaseVirtualDevice) error {
+	return v.configureDevice(ctx, types.VirtualDeviceConfigSpecOperationEdit, types.VirtualDeviceConfigSpecFileOperationReplace, device...)
+}
+
+// RemoveDevice removes the given devices on the VirtualMachine
+func (v VirtualMachine) RemoveDevice(ctx context.Context, keepFiles bool, device ...types.BaseVirtualDevice) error {
+	fop := types.VirtualDeviceConfigSpecFileOperationDestroy
+	if keepFiles {
+		fop = ""
+	}
+	return v.configureDevice(ctx, types.VirtualDeviceConfigSpecOperationRemove, fop, device...)
+}
+
+// BootOptions returns the VirtualMachine's config.bootOptions property.
+func (v VirtualMachine) BootOptions(ctx context.Context) (*types.VirtualMachineBootOptions, error) {
+	var o mo.VirtualMachine
+
+	err := v.Properties(ctx, v.Reference(), []string{"config.bootOptions"}, &o)
+	if err != nil {
+		return nil, err
+	}
+
+	return o.Config.BootOptions, nil
+}
+
+// SetBootOptions reconfigures the VirtualMachine with the given options.
+func (v VirtualMachine) SetBootOptions(ctx context.Context, options *types.VirtualMachineBootOptions) error {
+	spec := types.VirtualMachineConfigSpec{}
+
+	spec.BootOptions = options
+
+	task, err := v.Reconfigure(ctx, spec)
+	if err != nil {
+		return err
+	}
+
+	return task.Wait(ctx)
+}
+
+// Answer answers a pending question.
+func (v VirtualMachine) Answer(ctx context.Context, id, answer string) error {
+	req := types.AnswerVM{
+		This:         v.Reference(),
+		QuestionId:   id,
+		AnswerChoice: answer,
+	}
+
+	_, err := methods.AnswerVM(ctx, v.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// CreateSnapshot creates a new snapshot of a virtual machine.
+func (v VirtualMachine) CreateSnapshot(ctx context.Context, name string, description string, memory bool, quiesce bool) (*Task, error) {
+	req := types.CreateSnapshot_Task{
+		This:        v.Reference(),
+		Name:        name,
+		Description: description,
+		Memory:      memory,
+		Quiesce:     quiesce,
+	}
+
+	res, err := methods.CreateSnapshot_Task(ctx, v.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(v.c, res.Returnval), nil
+}
+
+// RemoveAllSnapshot removes all snapshots of a virtual machine
+func (v VirtualMachine) RemoveAllSnapshot(ctx context.Context, consolidate *bool) (*Task, error) {
+	req := types.RemoveAllSnapshots_Task{
+		This:        v.Reference(),
+		Consolidate: consolidate,
+	}
+
+	res, err := methods.RemoveAllSnapshots_Task(ctx, v.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(v.c, res.Returnval), nil
+}
+
+type snapshotMap map[string][]Reference
+
+func (m snapshotMap) add(parent string, tree []types.VirtualMachineSnapshotTree) {
+	for i, st := range tree {
+		sname := st.Name
+		names := []string{sname, st.Snapshot.Value}
+
+		if parent != "" {
+			sname = path.Join(parent, sname)
+			// Add full path as an option to resolve duplicate names
+			names = append(names, sname)
+		}
+
+		for _, name := range names {
+			m[name] = append(m[name], &tree[i].Snapshot)
+		}
+
+		m.add(sname, st.ChildSnapshotList)
+	}
+}
+
+// findSnapshot supports snapshot lookup by name, where name can be:
+// 1) snapshot ManagedObjectReference.Value (unique)
+// 2) snapshot name (may not be unique)
+// 3) snapshot tree path (may not be unique)
+func (v VirtualMachine) findSnapshot(ctx context.Context, name string) (Reference, error) {
+	var o mo.VirtualMachine
+
+	err := v.Properties(ctx, v.Reference(), []string{"snapshot"}, &o)
+	if err != nil {
+		return nil, err
+	}
+
+	if o.Snapshot == nil || len(o.Snapshot.RootSnapshotList) == 0 {
+		return nil, errors.New("No snapshots for this VM")
+	}
+
+	m := make(snapshotMap)
+	m.add("", o.Snapshot.RootSnapshotList)
+
+	s := m[name]
+	switch len(s) {
+	case 0:
+		return nil, fmt.Errorf("snapshot %q not found", name)
+	case 1:
+		return s[0], nil
+	default:
+		return nil, fmt.Errorf("%q resolves to %d snapshots", name, len(s))
+	}
+}
+
+// RemoveSnapshot removes a named snapshot
+func (v VirtualMachine) RemoveSnapshot(ctx context.Context, name string, removeChildren bool, consolidate *bool) (*Task, error) {
+	snapshot, err := v.findSnapshot(ctx, name)
+	if err != nil {
+		return nil, err
+	}
+
+	req := types.RemoveSnapshot_Task{
+		This:           snapshot.Reference(),
+		RemoveChildren: removeChildren,
+		Consolidate:    consolidate,
+	}
+
+	res, err := methods.RemoveSnapshot_Task(ctx, v.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(v.c, res.Returnval), nil
+}
+
+// RevertToCurrentSnapshot reverts to the current snapshot
+func (v VirtualMachine) RevertToCurrentSnapshot(ctx context.Context, suppressPowerOn bool) (*Task, error) {
+	req := types.RevertToCurrentSnapshot_Task{
+		This:            v.Reference(),
+		SuppressPowerOn: types.NewBool(suppressPowerOn),
+	}
+
+	res, err := methods.RevertToCurrentSnapshot_Task(ctx, v.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(v.c, res.Returnval), nil
+}
+
+// RevertToSnapshot reverts to a named snapshot
+func (v VirtualMachine) RevertToSnapshot(ctx context.Context, name string, suppressPowerOn bool) (*Task, error) {
+	snapshot, err := v.findSnapshot(ctx, name)
+	if err != nil {
+		return nil, err
+	}
+
+	req := types.RevertToSnapshot_Task{
+		This:            snapshot.Reference(),
+		SuppressPowerOn: types.NewBool(suppressPowerOn),
+	}
+
+	res, err := methods.RevertToSnapshot_Task(ctx, v.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(v.c, res.Returnval), nil
+}
+
+// IsToolsRunning returns true if VMware Tools is currently running in the guest OS, and false otherwise.
+func (v VirtualMachine) IsToolsRunning(ctx context.Context) (bool, error) {
+	var o mo.VirtualMachine
+
+	err := v.Properties(ctx, v.Reference(), []string{"guest.toolsRunningStatus"}, &o)
+	if err != nil {
+		return false, err
+	}
+
+	return o.Guest.ToolsRunningStatus == string(types.VirtualMachineToolsRunningStatusGuestToolsRunning), nil
+}
+
+// Wait for the VirtualMachine to change to the desired power state.
+func (v VirtualMachine) WaitForPowerState(ctx context.Context, state types.VirtualMachinePowerState) error {
+	p := property.DefaultCollector(v.c)
+	err := property.Wait(ctx, p, v.Reference(), []string{PropRuntimePowerState}, func(pc []types.PropertyChange) bool {
+		for _, c := range pc {
+			if c.Name != PropRuntimePowerState {
+				continue
+			}
+			if c.Val == nil {
+				continue
+			}
+
+			ps := c.Val.(types.VirtualMachinePowerState)
+			if ps == state {
+				return true
+			}
+		}
+		return false
+	})
+
+	return err
+}
+
+func (v VirtualMachine) MarkAsTemplate(ctx context.Context) error {
+	req := types.MarkAsTemplate{
+		This: v.Reference(),
+	}
+
+	_, err := methods.MarkAsTemplate(ctx, v.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (v VirtualMachine) MarkAsVirtualMachine(ctx context.Context, pool ResourcePool, host *HostSystem) error {
+	req := types.MarkAsVirtualMachine{
+		This: v.Reference(),
+		Pool: pool.Reference(),
+	}
+
+	if host != nil {
+		ref := host.Reference()
+		req.Host = &ref
+	}
+
+	_, err := methods.MarkAsVirtualMachine(ctx, v.c, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (v VirtualMachine) Migrate(ctx context.Context, pool *ResourcePool, host *HostSystem, priority types.VirtualMachineMovePriority, state types.VirtualMachinePowerState) (*Task, error) {
+	req := types.MigrateVM_Task{
+		This:     v.Reference(),
+		Priority: priority,
+		State:    state,
+	}
+
+	if pool != nil {
+		ref := pool.Reference()
+		req.Pool = &ref
+	}
+
+	if host != nil {
+		ref := host.Reference()
+		req.Host = &ref
+	}
+
+	res, err := methods.MigrateVM_Task(ctx, v.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(v.c, res.Returnval), nil
+}
+
+func (v VirtualMachine) Unregister(ctx context.Context) error {
+	req := types.UnregisterVM{
+		This: v.Reference(),
+	}
+
+	_, err := methods.UnregisterVM(ctx, v.Client(), &req)
+	return err
+}
+
+// QueryEnvironmentBrowser is a helper to get the environmentBrowser property.
+func (v VirtualMachine) QueryConfigTarget(ctx context.Context) (*types.ConfigTarget, error) {
+	var vm mo.VirtualMachine
+
+	err := v.Properties(ctx, v.Reference(), []string{"environmentBrowser"}, &vm)
+	if err != nil {
+		return nil, err
+	}
+
+	req := types.QueryConfigTarget{
+		This: vm.EnvironmentBrowser,
+	}
+
+	res, err := methods.QueryConfigTarget(ctx, v.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, nil
+}
+
+func (v VirtualMachine) MountToolsInstaller(ctx context.Context) error {
+	req := types.MountToolsInstaller{
+		This: v.Reference(),
+	}
+
+	_, err := methods.MountToolsInstaller(ctx, v.Client(), &req)
+	return err
+}
+
+func (v VirtualMachine) UnmountToolsInstaller(ctx context.Context) error {
+	req := types.UnmountToolsInstaller{
+		This: v.Reference(),
+	}
+
+	_, err := methods.UnmountToolsInstaller(ctx, v.Client(), &req)
+	return err
+}
+
+func (v VirtualMachine) UpgradeTools(ctx context.Context, options string) (*Task, error) {
+	req := types.UpgradeTools_Task{
+		This:             v.Reference(),
+		InstallerOptions: options,
+	}
+
+	res, err := methods.UpgradeTools_Task(ctx, v.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(v.c, res.Returnval), nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/virtual_machine_test.go b/vendor/github.com/vmware/govmomi/object/virtual_machine_test.go
new file mode 100644
index 0000000000..e3a860d170
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/virtual_machine_test.go
@@ -0,0 +1,206 @@
+/*
+Copyright (c) 2015 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 object
+
+import (
+	"testing"
+	"time"
+
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+// VirtualMachine should implement the Reference interface.
+var _ Reference = VirtualMachine{}
+
+// pretty.Printf generated
+var snapshot = &types.VirtualMachineSnapshotInfo{
+	DynamicData:     types.DynamicData{},
+	CurrentSnapshot: &types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-11"},
+	RootSnapshotList: []types.VirtualMachineSnapshotTree{
+		{
+			DynamicData:    types.DynamicData{},
+			Snapshot:       types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-1"},
+			Vm:             types.ManagedObjectReference{Type: "VirtualMachine", Value: "2"},
+			Name:           "root",
+			Description:    "",
+			Id:             1,
+			CreateTime:     time.Now(),
+			State:          "poweredOn",
+			Quiesced:       false,
+			BackupManifest: "",
+			ChildSnapshotList: []types.VirtualMachineSnapshotTree{
+				{
+					DynamicData:       types.DynamicData{},
+					Snapshot:          types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-2"},
+					Vm:                types.ManagedObjectReference{Type: "VirtualMachine", Value: "2"},
+					Name:              "child",
+					Description:       "",
+					Id:                2,
+					CreateTime:        time.Now(),
+					State:             "poweredOn",
+					Quiesced:          false,
+					BackupManifest:    "",
+					ChildSnapshotList: nil,
+					ReplaySupported:   types.NewBool(false),
+				},
+				{
+					DynamicData:    types.DynamicData{},
+					Snapshot:       types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-3"},
+					Vm:             types.ManagedObjectReference{Type: "VirtualMachine", Value: "2"},
+					Name:           "child",
+					Description:    "",
+					Id:             3,
+					CreateTime:     time.Now(),
+					State:          "poweredOn",
+					Quiesced:       false,
+					BackupManifest: "",
+					ChildSnapshotList: []types.VirtualMachineSnapshotTree{
+						{
+							DynamicData:    types.DynamicData{},
+							Snapshot:       types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-9"},
+							Vm:             types.ManagedObjectReference{Type: "VirtualMachine", Value: "2"},
+							Name:           "grandkid",
+							Description:    "",
+							Id:             9,
+							CreateTime:     time.Now(),
+							State:          "poweredOn",
+							Quiesced:       false,
+							BackupManifest: "",
+							ChildSnapshotList: []types.VirtualMachineSnapshotTree{
+								{
+									DynamicData:       types.DynamicData{},
+									Snapshot:          types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-10"},
+									Vm:                types.ManagedObjectReference{Type: "VirtualMachine", Value: "2"},
+									Name:              "great",
+									Description:       "",
+									Id:                10,
+									CreateTime:        time.Now(),
+									State:             "poweredOn",
+									Quiesced:          false,
+									BackupManifest:    "",
+									ChildSnapshotList: nil,
+									ReplaySupported:   types.NewBool(false),
+								},
+							},
+							ReplaySupported: types.NewBool(false),
+						},
+					},
+					ReplaySupported: types.NewBool(false),
+				},
+				{
+					DynamicData:    types.DynamicData{},
+					Snapshot:       types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-5"},
+					Vm:             types.ManagedObjectReference{Type: "VirtualMachine", Value: "2"},
+					Name:           "voodoo",
+					Description:    "",
+					Id:             5,
+					CreateTime:     time.Now(),
+					State:          "poweredOn",
+					Quiesced:       false,
+					BackupManifest: "",
+					ChildSnapshotList: []types.VirtualMachineSnapshotTree{
+						{
+							DynamicData:       types.DynamicData{},
+							Snapshot:          types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-11"},
+							Vm:                types.ManagedObjectReference{Type: "VirtualMachine", Value: "2"},
+							Name:              "child",
+							Description:       "",
+							Id:                11,
+							CreateTime:        time.Now(),
+							State:             "poweredOn",
+							Quiesced:          false,
+							BackupManifest:    "",
+							ChildSnapshotList: nil,
+							ReplaySupported:   types.NewBool(false),
+						},
+					},
+					ReplaySupported: types.NewBool(false),
+				},
+				{
+					DynamicData:    types.DynamicData{},
+					Snapshot:       types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-6"},
+					Vm:             types.ManagedObjectReference{Type: "VirtualMachine", Value: "2"},
+					Name:           "better",
+					Description:    "",
+					Id:             6,
+					CreateTime:     time.Now(),
+					State:          "poweredOn",
+					Quiesced:       false,
+					BackupManifest: "",
+					ChildSnapshotList: []types.VirtualMachineSnapshotTree{
+						{
+							DynamicData:    types.DynamicData{},
+							Snapshot:       types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-7"},
+							Vm:             types.ManagedObjectReference{Type: "VirtualMachine", Value: "2"},
+							Name:           "best",
+							Description:    "",
+							Id:             7,
+							CreateTime:     time.Now(),
+							State:          "poweredOn",
+							Quiesced:       false,
+							BackupManifest: "",
+							ChildSnapshotList: []types.VirtualMachineSnapshotTree{
+								{
+									DynamicData:       types.DynamicData{},
+									Snapshot:          types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-8"},
+									Vm:                types.ManagedObjectReference{Type: "VirtualMachine", Value: "2"},
+									Name:              "betterer",
+									Description:       "",
+									Id:                8,
+									CreateTime:        time.Now(),
+									State:             "poweredOn",
+									Quiesced:          false,
+									BackupManifest:    "",
+									ChildSnapshotList: nil,
+									ReplaySupported:   types.NewBool(false),
+								},
+							},
+							ReplaySupported: types.NewBool(false),
+						},
+					},
+					ReplaySupported: types.NewBool(false),
+				},
+			},
+			ReplaySupported: types.NewBool(false),
+		},
+	},
+}
+
+func TestVirtualMachineSnapshotMap(t *testing.T) {
+	m := make(snapshotMap)
+	m.add("", snapshot.RootSnapshotList)
+
+	tests := []struct {
+		name   string
+		expect int
+	}{
+		{"enoent", 0},
+		{"root", 1},
+		{"child", 3},
+		{"root/child", 2},
+		{"root/voodoo/child", 1},
+		{"2-snapshot-6", 1},
+	}
+
+	for _, test := range tests {
+		s := m[test.name]
+
+		if len(s) != test.expect {
+			t.Errorf("%s: %d != %d", test.name, len(s), test.expect)
+		}
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/object/vmware_distributed_virtual_switch.go b/vendor/github.com/vmware/govmomi/object/vmware_distributed_virtual_switch.go
new file mode 100644
index 0000000000..f6caf98708
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/object/vmware_distributed_virtual_switch.go
@@ -0,0 +1,21 @@
+/*
+Copyright (c) 2015 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 object
+
+type VmwareDistributedVirtualSwitch struct {
+	DistributedVirtualSwitch
+}
diff --git a/vendor/github.com/vmware/govmomi/ovf/cim.go b/vendor/github.com/vmware/govmomi/ovf/cim.go
new file mode 100644
index 0000000000..ce20bde19f
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/ovf/cim.go
@@ -0,0 +1,78 @@
+/*
+Copyright (c) 2015 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 ovf
+
+/*
+Source: http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.24.0/CIM_VirtualSystemSettingData.xsd
+*/
+
+type CIMVirtualSystemSettingData struct {
+	ElementName string `xml:"ElementName"`
+	InstanceID  string `xml:"InstanceID"`
+
+	AutomaticRecoveryAction              *uint8   `xml:"AutomaticRecoveryAction"`
+	AutomaticShutdownAction              *uint8   `xml:"AutomaticShutdownAction"`
+	AutomaticStartupAction               *uint8   `xml:"AutomaticStartupAction"`
+	AutomaticStartupActionDelay          *string  `xml:"AutomaticStartupActionDelay>Interval"`
+	AutomaticStartupActionSequenceNumber *uint16  `xml:"AutomaticStartupActionSequenceNumber"`
+	Caption                              *string  `xml:"Caption"`
+	ConfigurationDataRoot                *string  `xml:"ConfigurationDataRoot"`
+	ConfigurationFile                    *string  `xml:"ConfigurationFile"`
+	ConfigurationID                      *string  `xml:"ConfigurationID"`
+	CreationTime                         *string  `xml:"CreationTime"`
+	Description                          *string  `xml:"Description"`
+	LogDataRoot                          *string  `xml:"LogDataRoot"`
+	Notes                                []string `xml:"Notes"`
+	RecoveryFile                         *string  `xml:"RecoveryFile"`
+	SnapshotDataRoot                     *string  `xml:"SnapshotDataRoot"`
+	SuspendDataRoot                      *string  `xml:"SuspendDataRoot"`
+	SwapFileDataRoot                     *string  `xml:"SwapFileDataRoot"`
+	VirtualSystemIdentifier              *string  `xml:"VirtualSystemIdentifier"`
+	VirtualSystemType                    *string  `xml:"VirtualSystemType"`
+}
+
+/*
+Source: http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.24.0/CIM_ResourceAllocationSettingData.xsd
+*/
+
+type CIMResourceAllocationSettingData struct {
+	ElementName string `xml:"ElementName"`
+	InstanceID  string `xml:"InstanceID"`
+
+	ResourceType      *uint16 `xml:"ResourceType"`
+	OtherResourceType *string `xml:"OtherResourceType"`
+	ResourceSubType   *string `xml:"ResourceSubType"`
+
+	AddressOnParent       *string  `xml:"AddressOnParent"`
+	Address               *string  `xml:"Address"`
+	AllocationUnits       *string  `xml:"AllocationUnits"`
+	AutomaticAllocation   *bool    `xml:"AutomaticAllocation"`
+	AutomaticDeallocation *bool    `xml:"AutomaticDeallocation"`
+	Caption               *string  `xml:"Caption"`
+	Connection            []string `xml:"Connection"`
+	ConsumerVisibility    *uint16  `xml:"ConsumerVisibility"`
+	Description           *string  `xml:"Description"`
+	HostResource          []string `xml:"HostResource"`
+	Limit                 *uint64  `xml:"Limit"`
+	MappingBehavior       *uint    `xml:"MappingBehavior"`
+	Parent                *string  `xml:"Parent"`
+	PoolID                *string  `xml:"PoolID"`
+	Reservation           *uint64  `xml:"Reservation"`
+	VirtualQuantity       *uint    `xml:"VirtualQuantity"`
+	VirtualQuantityUnits  *string  `xml:"VirtualQuantityUnits"`
+	Weight                *uint    `xml:"Weight"`
+}
diff --git a/vendor/github.com/vmware/govmomi/ovf/doc.go b/vendor/github.com/vmware/govmomi/ovf/doc.go
new file mode 100644
index 0000000000..6284b1ac58
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/ovf/doc.go
@@ -0,0 +1,25 @@
+/*
+Copyright (c) 2015 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 ovf provides functionality to unmarshal and inspect the structure
+of an OVF file. It is not a complete implementation of the specification and
+is intended to be used to import virtual infrastructure into vSphere.
+
+For a complete specification of the OVF standard, refer to:
+https://www.dmtf.org/sites/default/files/standards/documents/DSP0243_2.1.0.pdf
+*/
+package ovf
diff --git a/vendor/github.com/vmware/govmomi/ovf/env.go b/vendor/github.com/vmware/govmomi/ovf/env.go
new file mode 100644
index 0000000000..5a5fc2f622
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/ovf/env.go
@@ -0,0 +1,98 @@
+/*
+Copyright (c) 2015 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 ovf
+
+import (
+	"bytes"
+	"encoding/xml"
+	"fmt"
+)
+
+const (
+	ovfEnvHeader = `<Environment
+		xmlns="http://schemas.dmtf.org/ovf/environment/1"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:oe="http://schemas.dmtf.org/ovf/environment/1"
+		xmlns:ve="http://www.vmware.com/schema/ovfenv"
+		oe:id=""
+		ve:esxId="%s">`
+	ovfEnvPlatformSection = `<PlatformSection>
+		<Kind>%s</Kind>
+		<Version>%s</Version>
+		<Vendor>%s</Vendor>
+		<Locale>%s</Locale>
+		</PlatformSection>`
+	ovfEnvPropertyHeader = `<PropertySection>`
+	ovfEnvPropertyEntry  = `<Property oe:key="%s" oe:value="%s"/>`
+	ovfEnvPropertyFooter = `</PropertySection>`
+	ovfEnvFooter         = `</Environment>`
+)
+
+type Env struct {
+	XMLName xml.Name `xml:"http://schemas.dmtf.org/ovf/environment/1 Environment"`
+	ID      string   `xml:"id,attr"`
+	EsxID   string   `xml:"http://www.vmware.com/schema/ovfenv esxId,attr"`
+
+	Platform *PlatformSection `xml:"PlatformSection"`
+	Property *PropertySection `xml:"PropertySection"`
+}
+
+type PlatformSection struct {
+	Kind    string `xml:"Kind"`
+	Version string `xml:"Version"`
+	Vendor  string `xml:"Vendor"`
+	Locale  string `xml:"Locale"`
+}
+
+type PropertySection struct {
+	Properties []EnvProperty `xml:"Property"`
+}
+
+type EnvProperty struct {
+	Key   string `xml:"key,attr"`
+	Value string `xml:"value,attr"`
+}
+
+// Marshal marshals Env to xml by using xml.Marshal.
+func (e Env) Marshal() (string, error) {
+	x, err := xml.Marshal(e)
+	if err != nil {
+		return "", err
+	}
+
+	return fmt.Sprintf("%s%s", xml.Header, x), nil
+}
+
+// MarshalManual manually marshals Env to xml suitable for a vApp guest.
+// It exists to overcome the lack of expressiveness in Go's XML namespaces.
+func (e Env) MarshalManual() string {
+	var buffer bytes.Buffer
+
+	buffer.WriteString(xml.Header)
+	buffer.WriteString(fmt.Sprintf(ovfEnvHeader, e.EsxID))
+	buffer.WriteString(fmt.Sprintf(ovfEnvPlatformSection, e.Platform.Kind, e.Platform.Version, e.Platform.Vendor, e.Platform.Locale))
+
+	buffer.WriteString(fmt.Sprintf(ovfEnvPropertyHeader))
+	for _, p := range e.Property.Properties {
+		buffer.WriteString(fmt.Sprintf(ovfEnvPropertyEntry, p.Key, p.Value))
+	}
+	buffer.WriteString(fmt.Sprintf(ovfEnvPropertyFooter))
+
+	buffer.WriteString(fmt.Sprintf(ovfEnvFooter))
+
+	return buffer.String()
+}
diff --git a/vendor/github.com/vmware/govmomi/ovf/env_test.go b/vendor/github.com/vmware/govmomi/ovf/env_test.go
new file mode 100644
index 0000000000..fe68c0f0c5
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/ovf/env_test.go
@@ -0,0 +1,57 @@
+/*
+Copyright (c) 2015 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 ovf
+
+import "testing"
+
+func testEnv() Env {
+	return Env{
+		EsxID: "vm moref",
+		Platform: &PlatformSection{
+			Kind:    "VMware vCenter Server",
+			Version: "5.5.0",
+			Vendor:  "VMware, Inc.",
+			Locale:  "US",
+		},
+		Property: &PropertySection{
+			Properties: []EnvProperty{
+				{"foo", "bar"},
+				{"ham", "eggs"}}},
+	}
+}
+
+func TestMarshalEnv(t *testing.T) {
+	env := testEnv()
+
+	xenv, err := env.Marshal()
+	if err != nil {
+		t.Fatal("Error marshalling environment")
+	}
+	if len(xenv) < 1 {
+		t.Fatal("Marshalled document is empty")
+	}
+	t.Log(xenv)
+}
+
+func TestMarshalManualEnv(t *testing.T) {
+	env := testEnv()
+
+	xenv := env.MarshalManual()
+	if len(xenv) < 1 {
+		t.Fatal("Marshalled document is empty")
+	}
+	t.Log(xenv)
+}
diff --git a/vendor/github.com/vmware/govmomi/ovf/envelope.go b/vendor/github.com/vmware/govmomi/ovf/envelope.go
new file mode 100644
index 0000000000..af96b15481
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/ovf/envelope.go
@@ -0,0 +1,191 @@
+/*
+Copyright (c) 2015 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 ovf
+
+type Envelope struct {
+	References []File `xml:"References>File"`
+
+	// Package level meta-data
+	Annotation         *AnnotationSection         `xml:"AnnotationSection"`
+	Product            *ProductSection            `xml:"ProductSection"`
+	Network            *NetworkSection            `xml:"NetworkSection"`
+	Disk               *DiskSection               `xml:"DiskSection"`
+	OperatingSystem    *OperatingSystemSection    `xml:"OperatingSystemSection"`
+	Eula               *EulaSection               `xml:"EulaSection"`
+	VirtualHardware    *VirtualHardwareSection    `xml:"VirtualHardwareSection"`
+	ResourceAllocation *ResourceAllocationSection `xml:"ResourceAllocationSection"`
+	DeploymentOption   *DeploymentOptionSection   `xml:"DeploymentOptionSection"`
+
+	// Content: A VirtualSystem or a VirtualSystemCollection
+	VirtualSystem *VirtualSystem `xml:"VirtualSystem"`
+}
+
+type VirtualSystem struct {
+	Content
+
+	Annotation      []AnnotationSection      `xml:"AnnotationSection"`
+	Product         []ProductSection         `xml:"ProductSection"`
+	OperatingSystem []OperatingSystemSection `xml:"OperatingSystemSection"`
+	Eula            []EulaSection            `xml:"EulaSection"`
+	VirtualHardware []VirtualHardwareSection `xml:"VirtualHardwareSection"`
+}
+
+type File struct {
+	ID          string  `xml:"id,attr"`
+	Href        string  `xml:"href,attr"`
+	Size        uint    `xml:"size,attr"`
+	Compression *string `xml:"compression,attr"`
+	ChunkSize   *int    `xml:"chunkSize,attr"`
+}
+
+type Content struct {
+	ID   string  `xml:"id,attr"`
+	Info string  `xml:"Info"`
+	Name *string `xml:"Name"`
+}
+
+type Section struct {
+	Required *bool  `xml:"required,attr"`
+	Info     string `xml:"Info"`
+}
+
+type AnnotationSection struct {
+	Section
+
+	Annotation string `xml:"Annotation"`
+}
+
+type ProductSection struct {
+	Section
+
+	Class    *string `xml:"class,attr"`
+	Instance *string `xml:"instance,attr"`
+
+	Product     string     `xml:"Product"`
+	Vendor      string     `xml:"Vendor"`
+	Version     string     `xml:"Version"`
+	FullVersion string     `xml:"FullVersion"`
+	ProductURL  string     `xml:"ProductUrl"`
+	VendorURL   string     `xml:"VendorUrl"`
+	AppURL      string     `xml:"AppUrl"`
+	Property    []Property `xml:"Property"`
+}
+
+type Property struct {
+	Key              string  `xml:"key,attr"`
+	Type             string  `xml:"type,attr"`
+	Qualifiers       *string `xml:"qualifiers,attr"`
+	UserConfigurable *bool   `xml:"userConfigurable,attr"`
+	Default          *string `xml:"value,attr"`
+	Password         *bool   `xml:"password,attr"`
+
+	Label       *string `xml:"Label"`
+	Description *string `xml:"Description"`
+
+	Values []PropertyConfigurationValue `xml:"Value"`
+}
+
+type PropertyConfigurationValue struct {
+	Value         string  `xml:"value,attr"`
+	Configuration *string `xml:"configuration,attr"`
+}
+
+type NetworkSection struct {
+	Section
+
+	Networks []Network `xml:"Network"`
+}
+
+type Network struct {
+	Name string `xml:"name,attr"`
+
+	Description string `xml:"Description"`
+}
+
+type DiskSection struct {
+	Section
+
+	Disks []VirtualDiskDesc `xml:"Disk"`
+}
+
+type VirtualDiskDesc struct {
+	DiskID                  string  `xml:"diskId,attr"`
+	FileRef                 *string `xml:"fileRef,attr"`
+	Capacity                string  `xml:"capacity,attr"`
+	CapacityAllocationUnits *string `xml:"capacityAllocationUnits,attr"`
+	Format                  *string `xml:"format,attr"`
+	PopulatedSize           *int    `xml:"populatedSize,attr"`
+	ParentRef               *string `xml:"parentRef,attr"`
+}
+
+type OperatingSystemSection struct {
+	Section
+
+	ID      uint16  `xml:"id,attr"`
+	Version *string `xml:"version,attr"`
+	OSType  *string `xml:"osType,attr"`
+
+	Description *string `xml:"Description"`
+}
+
+type EulaSection struct {
+	Section
+
+	License string `xml:"License"`
+}
+
+type VirtualHardwareSection struct {
+	Section
+
+	ID        *string `xml:"id,attr"`
+	Transport *string `xml:"transport,attr"`
+
+	System *VirtualSystemSettingData       `xml:"System"`
+	Item   []ResourceAllocationSettingData `xml:"Item"`
+}
+
+type VirtualSystemSettingData struct {
+	CIMVirtualSystemSettingData
+}
+
+type ResourceAllocationSettingData struct {
+	CIMResourceAllocationSettingData
+
+	Required      *bool   `xml:"required,attr"`
+	Configuration *string `xml:"configuration,attr"`
+	Bound         *string `xml:"bound,attr"`
+}
+
+type ResourceAllocationSection struct {
+	Section
+
+	Item []ResourceAllocationSettingData `xml:"Item"`
+}
+
+type DeploymentOptionSection struct {
+	Section
+
+	Configuration []DeploymentOptionConfiguration `xml:"Configuration"`
+}
+
+type DeploymentOptionConfiguration struct {
+	ID      string `xml:"id,attr"`
+	Default *bool  `xml:"default,attr"`
+
+	Label       string `xml:"Label"`
+	Description string `xml:"Description"`
+}
diff --git a/vendor/github.com/vmware/govmomi/ovf/ovf.go b/vendor/github.com/vmware/govmomi/ovf/ovf.go
new file mode 100644
index 0000000000..eea02d6770
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/ovf/ovf.go
@@ -0,0 +1,34 @@
+/*
+Copyright (c) 2015 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 ovf
+
+import (
+	"encoding/xml"
+	"io"
+)
+
+func Unmarshal(r io.Reader) (*Envelope, error) {
+	var e Envelope
+
+	dec := xml.NewDecoder(r)
+	err := dec.Decode(&e)
+	if err != nil {
+		return nil, err
+	}
+
+	return &e, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/ovf/ovf_test.go b/vendor/github.com/vmware/govmomi/ovf/ovf_test.go
new file mode 100644
index 0000000000..40f2f08b59
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/ovf/ovf_test.go
@@ -0,0 +1,85 @@
+/*
+Copyright (c) 2015 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 ovf
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+	"testing"
+	"text/tabwriter"
+)
+
+func testFile(t *testing.T) *os.File {
+	n := os.Getenv("OVF_TEST_FILE")
+	if n == "" {
+		t.Skip("Please specify OVF_TEST_FILE")
+	}
+
+	f, err := os.Open(n)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	return f
+}
+
+func testEnvelope(t *testing.T) *Envelope {
+	f := testFile(t)
+	defer f.Close()
+
+	e, err := Unmarshal(f)
+	if err != nil {
+		t.Fatal(f)
+	}
+
+	if e == nil {
+		t.Fatal("Empty envelope")
+	}
+
+	return e
+}
+
+func TestUnmarshal(t *testing.T) {
+	testEnvelope(t)
+}
+
+func TestDeploymentOptions(t *testing.T) {
+	e := testEnvelope(t)
+
+	if e.DeploymentOption == nil {
+		t.Fatal("Missing DeploymentOptionSection")
+	}
+
+	var b bytes.Buffer
+	tw := tabwriter.NewWriter(&b, 2, 0, 2, ' ', 0)
+	fmt.Fprintf(tw, "\n")
+	for _, c := range e.DeploymentOption.Configuration {
+		fmt.Fprintf(tw, "id=%s\t", c.ID)
+		fmt.Fprintf(tw, "label=%s\t", c.Label)
+
+		d := false
+		if c.Default != nil {
+			d = *c.Default
+		}
+
+		fmt.Fprintf(tw, "default=%t\t", d)
+		fmt.Fprintf(tw, "\n")
+	}
+	tw.Flush()
+	t.Log(b.String())
+}
diff --git a/vendor/github.com/vmware/govmomi/property/collector.go b/vendor/github.com/vmware/govmomi/property/collector.go
new file mode 100644
index 0000000000..32a0e409e2
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/property/collector.go
@@ -0,0 +1,174 @@
+/*
+Copyright (c) 2015 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 property
+
+import (
+	"context"
+	"errors"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+// Collector models the PropertyCollector managed object.
+//
+// For more information, see:
+// http://pubs.vmware.com/vsphere-55/index.jsp#com.vmware.wssdk.apiref.doc/vmodl.query.PropertyCollector.html
+//
+type Collector struct {
+	roundTripper soap.RoundTripper
+	reference    types.ManagedObjectReference
+}
+
+// DefaultCollector returns the session's default property collector.
+func DefaultCollector(c *vim25.Client) *Collector {
+	p := Collector{
+		roundTripper: c,
+		reference:    c.ServiceContent.PropertyCollector,
+	}
+
+	return &p
+}
+
+func (p Collector) Reference() types.ManagedObjectReference {
+	return p.reference
+}
+
+// Create creates a new session-specific Collector that can be used to
+// retrieve property updates independent of any other Collector.
+func (p *Collector) Create(ctx context.Context) (*Collector, error) {
+	req := types.CreatePropertyCollector{
+		This: p.Reference(),
+	}
+
+	res, err := methods.CreatePropertyCollector(ctx, p.roundTripper, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	newp := Collector{
+		roundTripper: p.roundTripper,
+		reference:    res.Returnval,
+	}
+
+	return &newp, nil
+}
+
+// Destroy destroys this Collector.
+func (p *Collector) Destroy(ctx context.Context) error {
+	req := types.DestroyPropertyCollector{
+		This: p.Reference(),
+	}
+
+	_, err := methods.DestroyPropertyCollector(ctx, p.roundTripper, &req)
+	if err != nil {
+		return err
+	}
+
+	p.reference = types.ManagedObjectReference{}
+	return nil
+}
+
+func (p *Collector) CreateFilter(ctx context.Context, req types.CreateFilter) error {
+	req.This = p.Reference()
+
+	_, err := methods.CreateFilter(ctx, p.roundTripper, &req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (p *Collector) WaitForUpdates(ctx context.Context, v string) (*types.UpdateSet, error) {
+	req := types.WaitForUpdatesEx{
+		This:    p.Reference(),
+		Version: v,
+	}
+
+	res, err := methods.WaitForUpdatesEx(ctx, p.roundTripper, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Returnval, nil
+}
+
+func (p *Collector) RetrieveProperties(ctx context.Context, req types.RetrieveProperties) (*types.RetrievePropertiesResponse, error) {
+	req.This = p.Reference()
+	return methods.RetrieveProperties(ctx, p.roundTripper, &req)
+}
+
+// Retrieve loads properties for a slice of managed objects. The dst argument
+// must be a pointer to a []interface{}, which is populated with the instances
+// of the specified managed objects, with the relevant properties filled in. If
+// the properties slice is nil, all properties are loaded.
+func (p *Collector) Retrieve(ctx context.Context, objs []types.ManagedObjectReference, ps []string, dst interface{}) error {
+	var propSpec *types.PropertySpec
+	var objectSet []types.ObjectSpec
+
+	for _, obj := range objs {
+		// Ensure that all object reference types are the same
+		if propSpec == nil {
+			propSpec = &types.PropertySpec{
+				Type: obj.Type,
+			}
+
+			if ps == nil {
+				propSpec.All = types.NewBool(true)
+			} else {
+				propSpec.PathSet = ps
+			}
+		} else {
+			if obj.Type != propSpec.Type {
+				return errors.New("object references must have the same type")
+			}
+		}
+
+		objectSpec := types.ObjectSpec{
+			Obj:  obj,
+			Skip: types.NewBool(false),
+		}
+
+		objectSet = append(objectSet, objectSpec)
+	}
+
+	req := types.RetrieveProperties{
+		SpecSet: []types.PropertyFilterSpec{
+			{
+				ObjectSet: objectSet,
+				PropSet:   []types.PropertySpec{*propSpec},
+			},
+		},
+	}
+
+	res, err := p.RetrieveProperties(ctx, req)
+	if err != nil {
+		return err
+	}
+
+	return mo.LoadRetrievePropertiesResponse(res, dst)
+}
+
+// RetrieveOne calls Retrieve with a single managed object reference.
+func (p *Collector) RetrieveOne(ctx context.Context, obj types.ManagedObjectReference, ps []string, dst interface{}) error {
+	var objs = []types.ManagedObjectReference{obj}
+	return p.Retrieve(ctx, objs, ps, dst)
+}
diff --git a/vendor/github.com/vmware/govmomi/property/wait.go b/vendor/github.com/vmware/govmomi/property/wait.go
new file mode 100644
index 0000000000..689477bfb8
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/property/wait.go
@@ -0,0 +1,153 @@
+/*
+Copyright (c) 2015 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 property
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+// Wait waits for any of the specified properties of the specified managed
+// object to change. It calls the specified function for every update it
+// receives. If this function returns false, it continues waiting for
+// subsequent updates. If this function returns true, it stops waiting and
+// returns.
+//
+// To only receive updates for the specified managed object, the function
+// creates a new property collector and calls CreateFilter. A new property
+// collector is required because filters can only be added, not removed.
+//
+// The newly created collector is destroyed before this function returns (both
+// in case of success or error).
+//
+func Wait(ctx context.Context, c *Collector, obj types.ManagedObjectReference, ps []string, f func([]types.PropertyChange) bool) error {
+	p, err := c.Create(ctx)
+	if err != nil {
+		return err
+	}
+
+	// Attempt to destroy the collector using the background context, as the
+	// specified context may have timed out or have been cancelled.
+	defer p.Destroy(context.Background())
+
+	req := types.CreateFilter{
+		Spec: types.PropertyFilterSpec{
+			ObjectSet: []types.ObjectSpec{
+				{
+					Obj: obj,
+				},
+			},
+			PropSet: []types.PropertySpec{
+				{
+					PathSet: ps,
+					Type:    obj.Type,
+				},
+			},
+		},
+	}
+
+	if len(ps) == 0 {
+		req.Spec.PropSet[0].All = types.NewBool(true)
+	}
+
+	err = p.CreateFilter(ctx, req)
+	if err != nil {
+		return err
+	}
+	return waitLoop(ctx, p, func(_ types.ManagedObjectReference, pc []types.PropertyChange) bool {
+		return f(pc)
+	})
+}
+
+// WaitForView waits for any of the specified properties of the managed
+// objects in the View to change. It calls the specified function for every update it
+// receives. If this function returns false, it continues waiting for
+// subsequent updates. If this function returns true, it stops waiting and
+// returns.
+//
+// To only receive updates for the View's specified managed objects, the function
+// creates a new property collector and calls CreateFilter. A new property
+// collector is required because filters can only be added, not removed.
+//
+// The newly created collector is destroyed before this function returns (both
+// in case of success or error).
+//
+// The code assumes that all objects in the View are the same type
+func WaitForView(ctx context.Context, c *Collector, view types.ManagedObjectReference, obj types.ManagedObjectReference, ps []string, f func(types.ManagedObjectReference, []types.PropertyChange) bool) error {
+	p, err := c.Create(ctx)
+	if err != nil {
+		return err
+	}
+
+	// Attempt to destroy the collector using the background context, as the
+	// specified context may have timed out or have been cancelled.
+	defer p.Destroy(context.Background())
+
+	req := types.CreateFilter{
+		Spec: types.PropertyFilterSpec{
+			ObjectSet: []types.ObjectSpec{
+				{
+					Obj: view,
+					SelectSet: []types.BaseSelectionSpec{
+						&types.TraversalSpec{
+							SelectionSpec: types.SelectionSpec{
+								Name: "traverseEntities",
+							},
+							Path: "view",
+							Type: view.Type}},
+				},
+			},
+			PropSet: []types.PropertySpec{
+				{
+					Type:    obj.Type,
+					PathSet: ps,
+				},
+			},
+		}}
+
+	err = p.CreateFilter(ctx, req)
+	if err != nil {
+		return err
+	}
+	return waitLoop(ctx, p, f)
+}
+
+func waitLoop(ctx context.Context, c *Collector, f func(types.ManagedObjectReference, []types.PropertyChange) bool) error {
+	for version := ""; ; {
+		res, err := c.WaitForUpdates(ctx, version)
+		if err != nil {
+			return err
+		}
+
+		// Retry if the result came back empty
+		if res == nil {
+			continue
+		}
+
+		version = res.Version
+
+		for _, fs := range res.FilterSet {
+			for _, os := range fs.ObjectSet {
+				if f(os.Obj, os.ChangeSet) {
+					return nil
+				}
+			}
+		}
+	}
+
+}
diff --git a/vendor/github.com/vmware/govmomi/scripts/.gitignore b/vendor/github.com/vmware/govmomi/scripts/.gitignore
new file mode 100644
index 0000000000..d0153ee292
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/scripts/.gitignore
@@ -0,0 +1 @@
+.wireshark-*
diff --git a/vendor/github.com/vmware/govmomi/scripts/contributors.sh b/vendor/github.com/vmware/govmomi/scripts/contributors.sh
new file mode 100755
index 0000000000..2a00aec2f5
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/scripts/contributors.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+file="$(git rev-parse --show-toplevel)/CONTRIBUTORS"
+
+cat <<EOF > "$file"
+# People who can (and typically have) contributed to this repository.
+#
+# This script is generated by $(basename "$0")
+#
+
+EOF
+
+git log --format='%aN <%aE>' | sort -uf >> "$file"
diff --git a/vendor/github.com/vmware/govmomi/scripts/debug-ls.sh b/vendor/github.com/vmware/govmomi/scripts/debug-ls.sh
new file mode 100755
index 0000000000..0cb51abf88
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/scripts/debug-ls.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# Copyright (c) 2014 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.
+
+set -e
+
+# This script shows for every request in a debug trace how long it took
+# and the name of the request body.
+
+function body-name {
+  (
+    xmllint --shell $1 <<EOS
+    setns soapenv=http://schemas.xmlsoap.org/soap/envelope/
+    xpath name(//soapenv:Body/*)
+EOS
+  )  | head -1 | sed 's/.*Object is a string : \(.*\)$/\1/'
+}
+
+if [ -n "$1" ]; then
+  cd $1
+fi
+
+for req in $(find . -name '*.req.xml'); do
+  base=$(basename $req .req.xml)
+  session=$(echo $base | awk -F'-' "{printf \"%d\", \$1}")
+  number=$(echo $base | awk -F'-' "{printf \"%d\", \$2}")
+  client_log=$(dirname $req)/${session}-client.log
+  took=$(awk "/ ${number} took / { print \$4 }" ${client_log})
+
+  printf "%s %8s: %s\n" ${base} ${took} $(body-name $req)
+done
diff --git a/vendor/github.com/vmware/govmomi/scripts/debug-xmlformat.sh b/vendor/github.com/vmware/govmomi/scripts/debug-xmlformat.sh
new file mode 100755
index 0000000000..a33a28a51a
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/scripts/debug-xmlformat.sh
@@ -0,0 +1,18 @@
+#!/bin/bash -e
+
+# pipe the most recent debug run to xmlformat
+cd ${GOVC_DEBUG_PATH-"$HOME/.govmomi/debug"}
+cd $(ls -t | head -1)
+
+header() {
+    printf "<!-- %s %s/%s\n%s\n-->\n" "$1" "$PWD" "$2" "$(tr -d '\r' < "$3")"
+}
+
+for file in *.req.xml; do
+    base=$(basename "$file" .req.xml)
+    header Request "$file" "${base}.req.headers"
+    xmlformat < "$file"
+    file="${base}.res.xml"
+    header Response "$file" "${base}.res.headers"
+    xmlformat < "$file"
+done
diff --git a/vendor/github.com/vmware/govmomi/scripts/govc-env.bash b/vendor/github.com/vmware/govmomi/scripts/govc-env.bash
new file mode 100644
index 0000000000..ed5fb2fc29
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/scripts/govc-env.bash
@@ -0,0 +1,62 @@
+# Copyright (c) 2015 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.
+
+# Provide a simple shell extension to save and load govc
+# environments to disk. No more running `export GOVC_ABC=xyz`
+# in different shells over and over again. Loading the right
+# govc environment variables is now only one short and
+# autocompleted command away!
+#
+# Usage:
+# * Source this file from your `~/.bashrc` or running shell.
+# * Execute `govc-env` to print GOVC_* variables.
+# * Execute `govc-env --save <name>` to save GOVC_* variables.
+# * Execute `govc-env <name>` to load GOVC_* variables.
+#
+
+_govc_env_dir=$HOME/.govmomi/env
+mkdir -p "${_govc_env_dir}"
+
+_govc-env-complete() {
+  local w="${COMP_WORDS[COMP_CWORD]}"
+  local c="$(find ${_govc_env_dir} -mindepth 1 -maxdepth 1 -type f  | sort | xargs -r -L1 basename | xargs echo)"
+
+  # Only allow completion if preceding argument if the function itself
+  if [ "$3" == "govc-env" ]; then
+    COMPREPLY=( $(compgen -W "${c}" -- "${w}") )
+  fi
+}
+
+govc-env() {
+  # Print current environment
+  if [ -z "$1" ]; then
+    for VAR in $(env | grep ^GOVC_ | cut -d= -f1); do
+      echo "export ${VAR}='${!VAR}'"
+    done
+
+    return
+  fi
+
+  # Save current environment
+  if [ "$1" == "--save" ]; then
+    govc-env > ${_govc_env_dir}/$2
+    return
+  fi
+
+  # Load specified environment
+  source ${_govc_env_dir}/$1
+}
+
+complete -F _govc-env-complete govc-env
+
diff --git a/vendor/github.com/vmware/govmomi/scripts/headers/go.txt b/vendor/github.com/vmware/govmomi/scripts/headers/go.txt
new file mode 100644
index 0000000000..7dfe744e99
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/scripts/headers/go.txt
@@ -0,0 +1,15 @@
+/*
+Copyright (c) ${YEARS} 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.
+*/
diff --git a/vendor/github.com/vmware/govmomi/scripts/headers/rb.txt b/vendor/github.com/vmware/govmomi/scripts/headers/rb.txt
new file mode 100644
index 0000000000..1c3bd22d41
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/scripts/headers/rb.txt
@@ -0,0 +1,13 @@
+# Copyright (c) ${YEARS} 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.
diff --git a/vendor/github.com/vmware/govmomi/scripts/license.sh b/vendor/github.com/vmware/govmomi/scripts/license.sh
new file mode 100755
index 0000000000..d47cad02c9
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/scripts/license.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+set -e
+
+header_dir=$(dirname $0)/headers
+
+tmpfile=$(mktemp)
+trap "rm -f ${tmpfile}" EXIT
+
+git ls-files | while read file; do
+  years=( $(git log --format='%ai' $file | cut -d- -f1 | sort -u) )
+  num_years=${#years[@]}
+
+  if [ "${num_years}" == 0 ]; then
+    export YEARS="$(date +%Y)"
+  else
+    yearA=${years[0]}
+    yearB=${years[$((${num_years}-1))]}
+
+    if [ ${yearA} == ${yearB} ]; then
+      export YEARS="${yearA}"
+    else
+      export YEARS="${yearA}-${yearB}"
+    fi
+  fi
+
+  case "$file" in
+    vim25/xml/*)
+      # Ignore
+      ;;
+    *.go)
+      sed -e "s/\${YEARS}/${YEARS}/" ${header_dir}/go.txt > ${tmpfile}
+      last_header_line=$(grep -n '\*/' ${file} | head -1 | cut -d: -f1)
+      tail -n +$((${last_header_line} + 1)) ${file} >> ${tmpfile}
+      mv ${tmpfile} ${file}
+      ;;
+    *.rb)
+      sed -e "s/\${YEARS}/${YEARS}/" ${header_dir}/rb.txt > ${tmpfile}
+      last_header_line=$(grep -n '^$' ${file} | head -1 | cut -d: -f1)
+      tail -n +$((${last_header_line})) ${file} >> ${tmpfile}
+      mv ${tmpfile} ${file}
+      ;;
+    *)
+      echo "Unhandled file: $file"
+      ;;
+  esac
+done
+
diff --git a/vendor/github.com/vmware/govmomi/scripts/vagrant/vcsa/.gitignore b/vendor/github.com/vmware/govmomi/scripts/vagrant/vcsa/.gitignore
new file mode 100644
index 0000000000..cd5d9c70b3
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/scripts/vagrant/vcsa/.gitignore
@@ -0,0 +1,3 @@
+*.box
+*.ova
+.vagrant
diff --git a/vendor/github.com/vmware/govmomi/scripts/vagrant/vcsa/Vagrantfile b/vendor/github.com/vmware/govmomi/scripts/vagrant/vcsa/Vagrantfile
new file mode 100644
index 0000000000..705799b741
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/scripts/vagrant/vcsa/Vagrantfile
@@ -0,0 +1,13 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Using the VCSA base box, no provisioning, inventory will be empty.
+
+Vagrant.configure("2") do |config|
+  config.vm.hostname = "vcsa"
+
+  config.vm.box = "vcsa"
+  config.vm.synced_folder ".", "/vagrant", disabled: true
+
+  config.vm.network "forwarded_port", guest: 443, host: 16443
+end
diff --git a/vendor/github.com/vmware/govmomi/scripts/vagrant/vcsa/create-box.sh b/vendor/github.com/vmware/govmomi/scripts/vagrant/vcsa/create-box.sh
new file mode 100755
index 0000000000..487253b21e
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/scripts/vagrant/vcsa/create-box.sh
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+set -e
+
+if [ "$(uname -s)" == "Darwin" ]; then
+  PATH="/Applications/VMware Fusion.app/Contents/Library:$PATH"
+  PATH="/Applications/VMware Fusion.app/Contents/Library/VMware OVF Tool:$PATH"
+fi
+
+ovf="$1"
+
+if [ -z "$ovf" ]; then
+  ovf="./VMware-vCenter-Server-Appliance-5.5.0.10300-2000350_OVA10.ova"
+fi
+
+# check for greadlink and gmktemp
+readlink=$(type -p greadlink readlink | head -1)
+mktemp=$(type -p gmktemp mktemp | head -1)
+
+dir=$($readlink -nf $(dirname $0))
+tmp=$($mktemp -d)
+trap "rm -rf $tmp" EXIT
+
+cd $tmp
+
+echo "Converting ovf..."
+ovftool \
+  --noSSLVerify \
+  --acceptAllEulas \
+  --overwrite \
+  --powerOffTarget \
+  $ovf vcsa.vmx
+
+echo "Starting vm..."
+vmrun start vcsa.vmx nogui
+
+echo "Waiting for vm ip..."
+ip=$(vmrun getGuestIPAddress vcsa.vmx -wait)
+
+echo "Configuring vm for use with vagrant..."
+vmrun -gu root -gp vmware CopyFileFromHostToGuest vcsa.vmx \
+      $dir/vagrant.sh /tmp/vagrant.sh
+
+vmrun -gu root -gp vmware runProgramInGuest vcsa.vmx \
+      /bin/sh -e /tmp/vagrant.sh
+
+vmrun -gu root -gp vmware deleteFileInGuest vcsa.vmx \
+      /tmp/vagrant.sh
+
+echo "Configuring vCenter Server Appliance..."
+
+ssh_opts="-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -T"
+
+ssh ${ssh_opts} -i ~/.vagrant.d/insecure_private_key vagrant@$ip <<EOS
+echo "Accepting EULA ..."
+sudo /usr/sbin/vpxd_servicecfg eula accept
+
+echo "Configuring Embedded DB ..."
+sudo /usr/sbin/vpxd_servicecfg db write embedded
+
+echo "Configuring SSO..."
+sudo /usr/sbin/vpxd_servicecfg sso write embedded
+
+echo "Starting VCSA ..."
+sudo /usr/sbin/vpxd_servicecfg service start
+EOS
+
+echo "Stopping vm..."
+vmrun stop vcsa.vmx
+
+rm -f vmware.log
+
+sed -i -e 's/"bridged"/"nat"/' vcsa.vmx
+
+echo '{"provider":"vmware_desktop"}' > ./metadata.json
+
+cd $dir
+
+tar -C $tmp -cvzf vcsa.box .
+
+vagrant box add --name vcsa vcsa.box
diff --git a/vendor/github.com/vmware/govmomi/scripts/vagrant/vcsa/vagrant.sh b/vendor/github.com/vmware/govmomi/scripts/vagrant/vcsa/vagrant.sh
new file mode 100755
index 0000000000..976cc17de3
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/scripts/vagrant/vcsa/vagrant.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+useradd vagrant -m -s /bin/bash
+groupmod -A vagrant wheel
+
+echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+
+mkdir ~vagrant/.ssh
+wget --no-check-certificate \
+     https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub \
+     -O ~vagrant/.ssh/authorized_keys
+chown -R vagrant ~vagrant/.ssh
+chmod -R go-rwsx ~vagrant/.ssh
+
+sed -i -e 's/^#UseDNS yes/UseDNS no/' /etc/ssh/sshd_config
+sed -i -e 's/^AllowTcpForwarding no//' /etc/ssh/sshd_config
+sed -i -e 's/^PermitTunnel no//' /etc/ssh/sshd_config
+sed -i -e 's/^MaxSessions 1//' /etc/ssh/sshd_config
+
+# disable password expiration
+for uid in root vagrant; do
+  chage -I -1 -E -1 -m 0 -M -1 $uid
+done
diff --git a/vendor/github.com/vmware/govmomi/scripts/wireshark-esx.sh b/vendor/github.com/vmware/govmomi/scripts/wireshark-esx.sh
new file mode 100755
index 0000000000..2115ba45cd
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/scripts/wireshark-esx.sh
@@ -0,0 +1,63 @@
+#!/bin/bash -e
+#
+# Capture ESXi traffic and decrypt SOAP traffic on port 443 via wireshark
+
+# Device to capture
+dev="${1-vmk0}"
+
+# Device to get the ip for wireshark ssl_keys config
+if [ "$dev" = "lo0" ] ; then
+  ip_dev="vmk0"
+else
+  ip_dev="$dev"
+fi
+
+ip=$(govc host.info -k -json | \
+        jq -r ".HostSystems[].Config.Network.Vnic[] | select(.Device == \"${ip_dev}\") | .Spec.Ip.IpAddress")
+
+scp=(scp)
+ssh=(ssh)
+
+# Check if vagrant ssh-config applies to $ip
+if [ -d ".vagrant" ] ; then
+  vssh_opts=($(vagrant ssh-config | awk NF | awk -v ORS=' ' '{print "-o " $1 "=" $2}'))
+  if grep "HostName=${ip}" >/dev/null <<<"${vssh_opts[*]}" ; then
+    ssh_opts=("${vssh_opts[@]}")
+  fi
+fi
+
+# Otherwise, use default ssh opts + sshpass if available
+if [ ${#ssh_opts[@]} -eq 0 ] ; then
+  user="$(govc env GOVC_USERNAME)"
+  ssh_opts=(-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=FATAL -o User=$user)
+
+  if [ -x "$(which sshpass)" ] ; then
+    password="$(govc env GOVC_PASSWORD)"
+    scp=(sshpass -p $password scp)
+    ssh=(sshpass -p $password ssh)
+  fi
+fi
+
+if [ "$dev" != "lo0" ] ; then
+  # If you change this filter, be sure to exclude the ssh port (not tcp port 22)
+  filter="host $ip and \(port 80 or port 443\)"
+
+  dst="$HOME/.wireshark/rui-${ip}.key"
+  if [ ! -f "$dst" ] ; then
+    # Copy key from ESX
+    "${scp[@]}" "${ssh_opts[@]}" "${ip}:/etc/vmware/ssl/rui.key" "$dst"
+  fi
+
+  if ! grep "$ip" ~/.wireshark/ssl_keys 2>/dev/null ; then
+    # Add key to wireshark ssl_keys config
+    echo "adding rui.key for $ip"
+
+    cat <<EOF >> ~/.wireshark/ssl_keys
+"$ip","443","http","$dst",""
+EOF
+  fi
+fi
+
+echo "Capturing $dev on $ip..."
+
+"${ssh[@]}" "${ssh_opts[@]}" "$ip" tcpdump-uw -i "$dev" -s0 -v -w - "$filter" | wireshark -k -i -
diff --git a/vendor/github.com/vmware/govmomi/scripts/wireshark-vcsa.sh b/vendor/github.com/vmware/govmomi/scripts/wireshark-vcsa.sh
new file mode 100755
index 0000000000..bc52de4a16
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/scripts/wireshark-vcsa.sh
@@ -0,0 +1,64 @@
+#!/bin/bash -e
+#
+# Capture SOAP traffic between web client and vpxd on 127.0.0.1:8085.
+#
+# Caveats: tested with VCSA 6.0, unlikely to work for other versions.
+#
+
+set -e
+
+cache_deb() {
+  wget $1
+  ar x *.deb data.tar.gz
+  tar zxf data.tar.gz
+  rm -f data.tar.gz
+  rm -f *.deb
+}
+
+dirname="$(dirname $0)"
+basename="$(basename $0)"
+bindir="${dirname}/.${basename}"
+
+mkdir -p "${bindir}"
+
+# Cache binaries required to run tcpdump on vcsa
+if [ ! -f "${bindir}/.done" ]; then
+  pushd ${bindir}
+  cache_deb https://launchpadlibrarian.net/200649143/libssl0.9.8_0.9.8k-7ubuntu8.27_amd64.deb
+  cache_deb https://launchpadlibrarian.net/37430984/libpcap0.8_1.0.0-6_amd64.deb
+  cache_deb https://launchpadlibrarian.net/41774869/tcpdump_4.0.0-6ubuntu3_amd64.deb
+  touch .done
+  popd
+fi
+
+scp=(scp)
+ssh=(ssh)
+
+# Extract host from GOVC_URL
+host="$(govc env -x GOVC_HOST)"
+username=root
+password="$(govc env GOVC_PASSWORD)"
+
+if [ -x "$(which sshpass)" ] ; then
+  scp=(sshpass -p "$password" scp)
+  ssh=(sshpass -p "$password" ssh)
+fi
+
+ssh_opts=(-o UserKnownHostsFile=/dev/null
+          -o StrictHostKeyChecking=no
+          -o LogLevel=FATAL
+          -o User=${username}
+          -o ControlMaster=no)
+dev="lo"
+filter="port 8085"
+tcpdump="env LD_LIBRARY_PATH=/tmp /tmp/tcpdump"
+
+echo "Capturing $dev on $host..."
+
+"${scp[@]}" "${ssh_opts[@]}" \
+            "${bindir}/lib/libcrypto.so.0.9.8" \
+            "${bindir}/usr/lib/libpcap.so.0.8" \
+            "${bindir}/usr/sbin/tcpdump" \
+            "${host}:/tmp"
+
+"${ssh[@]}" "${ssh_opts[@]}" "$host" ${tcpdump} -i "$dev" -s0 -v -w - "$filter" | wireshark -k -i - 2>/dev/null
diff --git a/vendor/github.com/vmware/govmomi/session/keep_alive.go b/vendor/github.com/vmware/govmomi/session/keep_alive.go
new file mode 100644
index 0000000000..a9d4c141c9
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/session/keep_alive.go
@@ -0,0 +1,127 @@
+/*
+Copyright (c) 2015 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 session
+
+import (
+	"context"
+	"sync"
+	"time"
+
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/soap"
+)
+
+type keepAlive struct {
+	sync.Mutex
+
+	roundTripper    soap.RoundTripper
+	idleTime        time.Duration
+	notifyRequest   chan struct{}
+	notifyStop      chan struct{}
+	notifyWaitGroup sync.WaitGroup
+
+	// keepAlive executes a request in the background with the purpose of
+	// keeping the session active. The response for this request is discarded.
+	keepAlive func(soap.RoundTripper) error
+}
+
+func defaultKeepAlive(roundTripper soap.RoundTripper) error {
+	_, _ = methods.GetCurrentTime(context.Background(), roundTripper)
+	return nil
+}
+
+// KeepAlive wraps the specified soap.RoundTripper and executes a meaningless
+// API request in the background after the RoundTripper has been idle for the
+// specified amount of idle time. The keep alive process only starts once a
+// user logs in and runs until the user logs out again.
+func KeepAlive(roundTripper soap.RoundTripper, idleTime time.Duration) soap.RoundTripper {
+	return KeepAliveHandler(roundTripper, idleTime, defaultKeepAlive)
+}
+
+// KeepAliveHandler works as KeepAlive() does, but the handler param can decide how to handle errors.
+// For example, if connectivity to ESX/VC is down long enough for a session to expire, a handler can choose to
+// Login() on a types.NotAuthenticated error.  If handler returns non-nil, the keep alive go routine will be stopped.
+func KeepAliveHandler(roundTripper soap.RoundTripper, idleTime time.Duration, handler func(soap.RoundTripper) error) soap.RoundTripper {
+	k := &keepAlive{
+		roundTripper:  roundTripper,
+		idleTime:      idleTime,
+		notifyRequest: make(chan struct{}),
+	}
+
+	k.keepAlive = handler
+
+	return k
+}
+
+func (k *keepAlive) start() {
+	k.Lock()
+	defer k.Unlock()
+
+	if k.notifyStop != nil {
+		return
+	}
+
+	// This channel must be closed to terminate idle timer.
+	k.notifyStop = make(chan struct{})
+	k.notifyWaitGroup.Add(1)
+
+	go func() {
+		defer k.notifyWaitGroup.Done()
+
+		for t := time.NewTimer(k.idleTime); ; {
+			select {
+			case <-k.notifyStop:
+				return
+			case <-k.notifyRequest:
+				t.Reset(k.idleTime)
+			case <-t.C:
+				if err := k.keepAlive(k.roundTripper); err != nil {
+					k.stop()
+				}
+				t = time.NewTimer(k.idleTime)
+			}
+		}
+	}()
+}
+
+func (k *keepAlive) stop() {
+	k.Lock()
+	defer k.Unlock()
+
+	if k.notifyStop != nil {
+		close(k.notifyStop)
+		k.notifyWaitGroup.Wait()
+		k.notifyStop = nil
+	}
+}
+
+func (k *keepAlive) RoundTrip(ctx context.Context, req, res soap.HasFault) error {
+	err := k.roundTripper.RoundTrip(ctx, req, res)
+	if err != nil {
+		return err
+	}
+
+	// Start ticker on login, stop ticker on logout.
+	switch req.(type) {
+	case *methods.LoginBody, *methods.LoginExtensionByCertificateBody:
+		k.start()
+	case *methods.LogoutBody:
+		k.stop()
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/session/keep_alive_test.go b/vendor/github.com/vmware/govmomi/session/keep_alive_test.go
new file mode 100644
index 0000000000..5cdc81114d
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/session/keep_alive_test.go
@@ -0,0 +1,280 @@
+/*
+Copyright (c) 2015 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 session
+
+import (
+	"context"
+	"fmt"
+	"net/url"
+	"os"
+	"runtime"
+	"testing"
+	"time"
+
+	"github.com/vmware/govmomi/test"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type testKeepAlive int
+
+func (t *testKeepAlive) Func(soap.RoundTripper) error {
+	*t++
+	return nil
+}
+
+func newManager(t *testing.T) (*Manager, *url.URL) {
+	u := test.URL()
+	if u == nil {
+		t.SkipNow()
+	}
+
+	soapClient := soap.NewClient(u, true)
+	vimClient, err := vim25.NewClient(context.Background(), soapClient)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	return NewManager(vimClient), u
+}
+
+func TestKeepAlive(t *testing.T) {
+	var i testKeepAlive
+	var j int
+
+	m, u := newManager(t)
+	k := KeepAlive(m.client.RoundTripper, time.Millisecond)
+	k.(*keepAlive).keepAlive = i.Func
+	m.client.RoundTripper = k
+
+	// Expect keep alive to not have triggered yet
+	if i != 0 {
+		t.Errorf("Expected i == 0, got i: %d", i)
+	}
+
+	// Logging in starts keep alive
+	err := m.Login(context.Background(), u.User)
+	if err != nil {
+		t.Error(err)
+	}
+
+	time.Sleep(2 * time.Millisecond)
+
+	// Expect keep alive to triggered at least once
+	if i == 0 {
+		t.Errorf("Expected i != 0, got i: %d", i)
+	}
+
+	j = int(i)
+	time.Sleep(2 * time.Millisecond)
+
+	// Expect keep alive to triggered at least once more
+	if int(i) <= j {
+		t.Errorf("Expected i > j, got i: %d, j: %d", i, j)
+	}
+
+	// Logging out stops keep alive
+	err = m.Logout(context.Background())
+	if err != nil {
+		t.Error(err)
+	}
+
+	j = int(i)
+	time.Sleep(2 * time.Millisecond)
+
+	// Expect keep alive to have stopped
+	if int(i) != j {
+		t.Errorf("Expected i == j, got i: %d, j: %d", i, j)
+	}
+}
+
+func testSessionOK(t *testing.T, m *Manager, ok bool) {
+	s, err := m.UserSession(context.Background())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, file, line, _ := runtime.Caller(1)
+	prefix := fmt.Sprintf("%s:%d", file, line)
+
+	if ok && s == nil {
+		t.Fatalf("%s: Expected session to be OK, but is invalid", prefix)
+	}
+
+	if !ok && s != nil {
+		t.Fatalf("%s: Expected session to be invalid, but is OK", prefix)
+	}
+}
+
+// Run with:
+//
+//   env GOVMOMI_KEEPALIVE_TEST=1 go test -timeout=60m -run TestRealKeepAlive
+//
+func TestRealKeepAlive(t *testing.T) {
+	if os.Getenv("GOVMOMI_KEEPALIVE_TEST") != "1" {
+		t.SkipNow()
+	}
+
+	m1, u1 := newManager(t)
+	m2, u2 := newManager(t)
+
+	// Enable keepalive on m2
+	k := KeepAlive(m2.client.RoundTripper, 10*time.Minute)
+	m2.client.RoundTripper = k
+
+	// Expect both sessions to be invalid
+	testSessionOK(t, m1, false)
+	testSessionOK(t, m2, false)
+
+	// Logging in starts keep alive
+	if err := m1.Login(context.Background(), u1.User); err != nil {
+		t.Error(err)
+	}
+	if err := m2.Login(context.Background(), u2.User); err != nil {
+		t.Error(err)
+	}
+
+	// Expect both sessions to be valid
+	testSessionOK(t, m1, true)
+	testSessionOK(t, m2, true)
+
+	// Wait for m1 to time out
+	delay := 31 * time.Minute
+	fmt.Printf("%s: Waiting %d minutes for session to time out...\n", time.Now(), int(delay.Minutes()))
+	time.Sleep(delay)
+
+	// Expect m1's session to be invalid, m2's session to be valid
+	testSessionOK(t, m1, false)
+	testSessionOK(t, m2, true)
+}
+
+func isNotAuthenticated(err error) bool {
+	if soap.IsSoapFault(err) {
+		switch soap.ToSoapFault(err).VimFault().(type) {
+		case types.NotAuthenticated:
+			return true
+		}
+	}
+	return false
+}
+
+func isInvalidLogin(err error) bool {
+	if soap.IsSoapFault(err) {
+		switch soap.ToSoapFault(err).VimFault().(type) {
+		case types.InvalidLogin:
+			return true
+		}
+	}
+	return false
+}
+
+func TestKeepAliveHandler(t *testing.T) {
+	u := test.URL()
+	if u == nil {
+		t.SkipNow()
+	}
+
+	m1, u1 := newManager(t)
+	m2, u2 := newManager(t)
+
+	reauth := make(chan bool)
+
+	// Keep alive handler that will re-login.
+	// Real-world case: connectivity to ESX/VC is down long enough for the session to expire
+	// Test-world case: we call TerminateSession below
+	k := KeepAliveHandler(m2.client.RoundTripper, 2*time.Second, func(roundTripper soap.RoundTripper) error {
+		_, err := methods.GetCurrentTime(context.Background(), roundTripper)
+		if err != nil {
+			if isNotAuthenticated(err) {
+				err = m2.Login(context.Background(), u2.User)
+
+				if err != nil {
+					if isInvalidLogin(err) {
+						reauth <- false
+						t.Log("failed to re-authenticate, quitting keep alive handler")
+						return err
+					}
+				} else {
+					reauth <- true
+				}
+			}
+		}
+
+		return nil
+	})
+
+	m2.client.RoundTripper = k
+
+	// Logging in starts keep alive
+	if err := m1.Login(context.Background(), u1.User); err != nil {
+		t.Error(err)
+	}
+	if err := m2.Login(context.Background(), u2.User); err != nil {
+		t.Error(err)
+	}
+
+	// Terminate session for m2.  Note that self terminate fails, so we need 2 sessions for this test.
+	s, err := m2.UserSession(context.Background())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = m1.TerminateSession(context.Background(), []string{s.Key})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = methods.GetCurrentTime(context.Background(), m2.client)
+	if err == nil {
+		t.Error("expected to fail")
+	}
+
+	// Wait for keepalive to re-authenticate
+	<-reauth
+
+	_, err = methods.GetCurrentTime(context.Background(), m2.client)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Clear credentials to test re-authentication failure
+	u2.User = nil
+
+	s, err = m2.UserSession(context.Background())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = m1.TerminateSession(context.Background(), []string{s.Key})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Wait for keepalive re-authenticate attempt
+	result := <-reauth
+
+	_, err = methods.GetCurrentTime(context.Background(), m2.client)
+	if err == nil {
+		t.Error("expected to fail")
+	}
+
+	if result {
+		t.Errorf("expected reauth to fail")
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/session/manager.go b/vendor/github.com/vmware/govmomi/session/manager.go
new file mode 100644
index 0000000000..b4591c1c4d
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/session/manager.go
@@ -0,0 +1,201 @@
+/*
+Copyright (c) 2015 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 session
+
+import (
+	"context"
+	"net/url"
+	"os"
+
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+// Locale defaults to "en_US" and can be overridden via this var or the GOVMOMI_LOCALE env var.
+// A value of "_" uses the server locale setting.
+var Locale = os.Getenv("GOVMOMI_LOCALE")
+
+func init() {
+	if Locale == "_" {
+		Locale = ""
+	} else if Locale == "" {
+		Locale = "en_US"
+	}
+}
+
+type Manager struct {
+	client      *vim25.Client
+	userSession *types.UserSession
+}
+
+func NewManager(client *vim25.Client) *Manager {
+	m := Manager{
+		client: client,
+	}
+
+	return &m
+}
+
+func (sm Manager) Reference() types.ManagedObjectReference {
+	return *sm.client.ServiceContent.SessionManager
+}
+
+func (sm *Manager) SetLocale(ctx context.Context, locale string) error {
+	req := types.SetLocale{
+		This:   sm.Reference(),
+		Locale: locale,
+	}
+
+	_, err := methods.SetLocale(ctx, sm.client, &req)
+	return err
+}
+
+func (sm *Manager) Login(ctx context.Context, u *url.Userinfo) error {
+	req := types.Login{
+		This:   sm.Reference(),
+		Locale: Locale,
+	}
+
+	if u != nil {
+		req.UserName = u.Username()
+		if pw, ok := u.Password(); ok {
+			req.Password = pw
+		}
+	}
+
+	login, err := methods.Login(ctx, sm.client, &req)
+	if err != nil {
+		return err
+	}
+
+	sm.userSession = &login.Returnval
+	return nil
+}
+
+func (sm *Manager) LoginExtensionByCertificate(ctx context.Context, key string, locale string) error {
+	req := types.LoginExtensionByCertificate{
+		This:         sm.Reference(),
+		ExtensionKey: key,
+		Locale:       locale,
+	}
+
+	login, err := methods.LoginExtensionByCertificate(ctx, sm.client, &req)
+	if err != nil {
+		return err
+	}
+
+	sm.userSession = &login.Returnval
+	return nil
+}
+
+func (sm *Manager) Logout(ctx context.Context) error {
+	req := types.Logout{
+		This: sm.Reference(),
+	}
+
+	_, err := methods.Logout(ctx, sm.client, &req)
+	if err != nil {
+		return err
+	}
+
+	sm.userSession = nil
+	return nil
+}
+
+// UserSession retrieves and returns the SessionManager's CurrentSession field.
+// Nil is returned if the session is not authenticated.
+func (sm *Manager) UserSession(ctx context.Context) (*types.UserSession, error) {
+	var mgr mo.SessionManager
+
+	pc := property.DefaultCollector(sm.client)
+	err := pc.RetrieveOne(ctx, sm.Reference(), []string{"currentSession"}, &mgr)
+	if err != nil {
+		// It's OK if we can't retrieve properties because we're not authenticated
+		if f, ok := err.(types.HasFault); ok {
+			switch f.Fault().(type) {
+			case *types.NotAuthenticated:
+				return nil, nil
+			}
+		}
+
+		return nil, err
+	}
+
+	return mgr.CurrentSession, nil
+}
+
+func (sm *Manager) TerminateSession(ctx context.Context, sessionId []string) error {
+	req := types.TerminateSession{
+		This:      sm.Reference(),
+		SessionId: sessionId,
+	}
+
+	_, err := methods.TerminateSession(ctx, sm.client, &req)
+	return err
+}
+
+// SessionIsActive checks whether the session that was created at login is
+// still valid. This function only works against vCenter.
+func (sm *Manager) SessionIsActive(ctx context.Context) (bool, error) {
+	if sm.userSession == nil {
+		return false, nil
+	}
+
+	req := types.SessionIsActive{
+		This:      sm.Reference(),
+		SessionID: sm.userSession.Key,
+		UserName:  sm.userSession.UserName,
+	}
+
+	active, err := methods.SessionIsActive(ctx, sm.client, &req)
+	if err != nil {
+		return false, err
+	}
+
+	return active.Returnval, err
+}
+
+func (sm *Manager) AcquireGenericServiceTicket(ctx context.Context, spec types.BaseSessionManagerServiceRequestSpec) (*types.SessionManagerGenericServiceTicket, error) {
+	req := types.AcquireGenericServiceTicket{
+		This: sm.Reference(),
+		Spec: spec,
+	}
+
+	res, err := methods.AcquireGenericServiceTicket(ctx, sm.client, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return &res.Returnval, nil
+}
+
+func (sm *Manager) AcquireLocalTicket(ctx context.Context, userName string) (*types.SessionManagerLocalTicket, error) {
+	req := types.AcquireLocalTicket{
+		This:     sm.Reference(),
+		UserName: userName,
+	}
+
+	res, err := methods.AcquireLocalTicket(ctx, sm.client, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return &res.Returnval, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/session/manager_test.go b/vendor/github.com/vmware/govmomi/session/manager_test.go
new file mode 100644
index 0000000000..d600d07325
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/session/manager_test.go
@@ -0,0 +1,106 @@
+/*
+Copyright (c) 2015 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 session
+
+import (
+	"context"
+	"net/url"
+	"testing"
+
+	"github.com/vmware/govmomi/test"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/soap"
+)
+
+func sessionClient(u *url.URL, t *testing.T) *Manager {
+	soapClient := soap.NewClient(u, true)
+	vimClient, err := vim25.NewClient(context.Background(), soapClient)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	return NewManager(vimClient)
+}
+
+func TestLogin(t *testing.T) {
+	u := test.URL()
+	if u == nil {
+		t.SkipNow()
+	}
+
+	session := sessionClient(u, t)
+	err := session.Login(context.Background(), u.User)
+	if err != nil {
+		t.Errorf("Expected no error, got %v", err)
+	}
+}
+
+func TestLogout(t *testing.T) {
+	u := test.URL()
+	if u == nil {
+		t.SkipNow()
+	}
+
+	session := sessionClient(u, t)
+	err := session.Login(context.Background(), u.User)
+	if err != nil {
+		t.Error("Login Error: ", err)
+	}
+
+	err = session.Logout(context.Background())
+	if err != nil {
+		t.Errorf("Expected nil, got %v", err)
+	}
+
+	err = session.Logout(context.Background())
+	if err == nil {
+		t.Errorf("Expected NotAuthenticated, got nil")
+	}
+}
+
+func TestSessionIsActive(t *testing.T) {
+	u := test.URL()
+	if u == nil {
+		t.SkipNow()
+	}
+
+	session := sessionClient(u, t)
+
+	// Skip test against ESXi -- SessionIsActive is not implemented
+	if session.client.ServiceContent.About.ApiType != "VirtualCenter" {
+		t.Skipf("Talking to %s instead of %s", session.client.ServiceContent.About.ApiType, "VirtualCenter")
+	}
+
+	err := session.Login(context.Background(), u.User)
+	if err != nil {
+		t.Error("Login Error: ", err)
+	}
+
+	active, err := session.SessionIsActive(context.Background())
+	if err != nil || !active {
+		t.Errorf("Expected %t, got %t", true, active)
+		t.Errorf("Expected nil, got %v", err)
+	}
+
+	session.Logout(context.Background())
+
+	active, err = session.SessionIsActive(context.Background())
+	if err == nil || active {
+		t.Errorf("Expected %t, got %t", false, active)
+		t.Errorf("Expected NotAuthenticated, got %v", err)
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/task/error.go b/vendor/github.com/vmware/govmomi/task/error.go
new file mode 100644
index 0000000000..5f6b8503f5
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/task/error.go
@@ -0,0 +1,32 @@
+/*
+Copyright (c) 2015 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 task
+
+import "github.com/vmware/govmomi/vim25/types"
+
+type Error struct {
+	*types.LocalizedMethodFault
+}
+
+// Error returns the task's localized fault message.
+func (e Error) Error() string {
+	return e.LocalizedMethodFault.LocalizedMessage
+}
+
+func (e Error) Fault() types.BaseMethodFault {
+	return e.LocalizedMethodFault.Fault
+}
diff --git a/vendor/github.com/vmware/govmomi/task/wait.go b/vendor/github.com/vmware/govmomi/task/wait.go
new file mode 100644
index 0000000000..19fee53846
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/task/wait.go
@@ -0,0 +1,132 @@
+/*
+Copyright (c) 2015 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 task
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25/progress"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type taskProgress struct {
+	info *types.TaskInfo
+}
+
+func (t taskProgress) Percentage() float32 {
+	return float32(t.info.Progress)
+}
+
+func (t taskProgress) Detail() string {
+	return ""
+}
+
+func (t taskProgress) Error() error {
+	if t.info.Error != nil {
+		return Error{t.info.Error}
+	}
+
+	return nil
+}
+
+type taskCallback struct {
+	ch   chan<- progress.Report
+	info *types.TaskInfo
+	err  error
+}
+
+func (t *taskCallback) fn(pc []types.PropertyChange) bool {
+	for _, c := range pc {
+		if c.Name != "info" {
+			continue
+		}
+
+		if c.Op != types.PropertyChangeOpAssign {
+			continue
+		}
+
+		if c.Val == nil {
+			continue
+		}
+
+		ti := c.Val.(types.TaskInfo)
+		t.info = &ti
+	}
+
+	// t.info could be nil if pc can't satify the rules above
+	if t.info == nil {
+		return false
+	}
+
+	pr := taskProgress{t.info}
+
+	// Store copy of error, so Wait() can return it as well.
+	t.err = pr.Error()
+
+	switch t.info.State {
+	case types.TaskInfoStateQueued, types.TaskInfoStateRunning:
+		if t.ch != nil {
+			// Don't care if this is dropped
+			select {
+			case t.ch <- pr:
+			default:
+			}
+		}
+		return false
+	case types.TaskInfoStateSuccess, types.TaskInfoStateError:
+		if t.ch != nil {
+			// Last one must always be delivered
+			t.ch <- pr
+		}
+		return true
+	default:
+		panic("unknown state: " + t.info.State)
+	}
+}
+
+// Wait waits for a task to finish with either success or failure. It does so
+// by waiting for the "info" property of task managed object to change. The
+// function returns when it finds the task in the "success" or "error" state.
+// In the former case, the return value is nil. In the latter case the return
+// value is an instance of this package's Error struct.
+//
+// Any error returned while waiting for property changes causes the function to
+// return immediately and propagate the error.
+//
+// If the progress.Sinker argument is specified, any progress updates for the
+// task are sent here. The completion percentage is passed through directly.
+// The detail for the progress update is set to an empty string. If the task
+// finishes in the error state, the error instance is passed through as well.
+// Note that this error is the same error that is returned by this function.
+//
+func Wait(ctx context.Context, ref types.ManagedObjectReference, pc *property.Collector, s progress.Sinker) (*types.TaskInfo, error) {
+	cb := &taskCallback{}
+
+	// Include progress sink if specified
+	if s != nil {
+		cb.ch = s.Sink()
+		defer close(cb.ch)
+	}
+
+	err := property.Wait(ctx, pc, ref, []string{"info"}, cb.fn)
+	if err != nil {
+		return nil, err
+	}
+
+	return cb.info, cb.err
+}
diff --git a/vendor/github.com/vmware/govmomi/task/wait_test.go b/vendor/github.com/vmware/govmomi/task/wait_test.go
new file mode 100644
index 0000000000..8ebd5b0aaa
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/task/wait_test.go
@@ -0,0 +1,41 @@
+/*
+Copyright (c) 2017 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 task
+
+import (
+	"testing"
+
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+func TestCallbackFn(t *testing.T) {
+	cb := &taskCallback{}
+
+	for _, o := range []types.PropertyChangeOp{types.PropertyChangeOpAdd, types.PropertyChangeOpRemove, types.PropertyChangeOpAssign, types.PropertyChangeOpIndirectRemove} {
+		for _, s := range []types.TaskInfoState{types.TaskInfoStateQueued, types.TaskInfoStateRunning, types.TaskInfoStateSuccess, types.TaskInfoStateError} {
+			c := types.PropertyChange{
+				Name: "info",
+				Op:   o,
+				Val: types.TaskInfo{
+					State: s,
+				},
+			}
+			t.Logf("Op: %s State: %s", o, s)
+			cb.fn([]types.PropertyChange{c})
+		}
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/test/doc.go b/vendor/github.com/vmware/govmomi/test/doc.go
new file mode 100644
index 0000000000..4bcff639af
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/test/doc.go
@@ -0,0 +1,22 @@
+/*
+Copyright (c) 2015 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 test contains functions that implement common functionality between
+tests. The code (non-test) in this package intentionally does not take any
+dependendies outside the vim25 tree.
+*/
+package test
diff --git a/vendor/github.com/vmware/govmomi/test/functional/helper.go b/vendor/github.com/vmware/govmomi/test/functional/helper.go
new file mode 100644
index 0000000000..3061926387
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/test/functional/helper.go
@@ -0,0 +1,130 @@
+/*
+Copyright (c) 2015 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 functional
+
+import (
+	"context"
+	"testing"
+
+	"github.com/vmware/govmomi/find"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/test"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type Helper struct {
+	*testing.T
+
+	c   *vim25.Client
+	f   *find.Finder
+	fns []func()
+}
+
+func NewHelper(t *testing.T) *Helper {
+	h := &Helper{
+		T: t,
+
+		c:   test.NewAuthenticatedClient(t),
+		fns: make([]func(), 0),
+	}
+
+	h.f = find.NewFinder(h.c, true)
+
+	return h
+}
+
+func (h *Helper) Defer(fn func()) {
+	h.fns = append(h.fns, fn)
+}
+
+func (h *Helper) Teardown() {
+	for _, fn := range h.fns {
+		fn()
+	}
+}
+
+func (h *Helper) RequireVirtualCenter() {
+	var expect = "VirtualCenter"
+	var actual = h.c.ServiceContent.About.ApiType
+	if actual != expect {
+		h.Skipf("Requires %s, running against %s", expect, actual)
+	}
+}
+
+func (h *Helper) Datacenter() *object.Datacenter {
+	dc, err := h.f.DefaultDatacenter(context.Background())
+	if err != nil {
+		h.Fatal(err)
+	}
+
+	h.f.SetDatacenter(dc)
+
+	return dc
+}
+
+func (h *Helper) DatacenterFolders() *object.DatacenterFolders {
+	df, err := h.Datacenter().Folders(context.Background())
+	if err != nil {
+		h.Fatal(err)
+	}
+
+	return df
+}
+
+func (h *Helper) ComputeResource() *object.ComputeResource {
+	cr, err := h.f.DefaultComputeResource(context.Background())
+	if err != nil {
+		h.Fatal(err)
+	}
+
+	return cr
+}
+
+func (h *Helper) LocalDatastores(ctx context.Context, cr *object.ComputeResource) ([]*object.Datastore, error) {
+	// List datastores for compute resource
+	dss, err := cr.Datastores(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	// Filter local datastores
+	var ldss []*object.Datastore
+	for _, ds := range dss {
+		var mds mo.Datastore
+		err = property.DefaultCollector(h.c).RetrieveOne(ctx, ds.Reference(), nil, &mds)
+		if err != nil {
+			return nil, err
+		}
+
+		switch i := mds.Info.(type) {
+		case *types.VmfsDatastoreInfo:
+			if i.Vmfs.Local != nil && *i.Vmfs.Local == true {
+				break
+			}
+		default:
+			continue
+		}
+
+		ds.InventoryPath = mds.Name
+		ldss = append(ldss, ds)
+	}
+
+	return ldss, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/test/functional/issue_242_test.go b/vendor/github.com/vmware/govmomi/test/functional/issue_242_test.go
new file mode 100644
index 0000000000..1f10959ed0
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/test/functional/issue_242_test.go
@@ -0,0 +1,104 @@
+/*
+Copyright (c) 2015 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 functional
+
+import (
+	"context"
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+func TestIssue242(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	h := NewHelper(t)
+	defer h.Teardown()
+
+	h.RequireVirtualCenter()
+
+	df, err := h.Datacenter().Folders(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	cr := h.ComputeResource()
+
+	// Get local datastores for compute resource
+	dss, err := h.LocalDatastores(ctx, cr)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(dss) == 0 {
+		t.Fatalf("No local datastores")
+	}
+
+	// Get root resource pool for compute resource
+	rp, err := cr.ResourcePool(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	spec := types.VirtualMachineConfigSpec{
+		Name:     fmt.Sprintf("govmomi-test-%s", time.Now().Format(time.RFC3339)),
+		Files:    &types.VirtualMachineFileInfo{VmPathName: fmt.Sprintf("[%s]", dss[0].Name())},
+		NumCPUs:  1,
+		MemoryMB: 32,
+	}
+
+	// Create new VM
+	task, err := df.VmFolder.CreateVM(context.Background(), spec, rp, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	info, err := task.WaitForResult(context.Background(), nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	vm := object.NewVirtualMachine(h.c, info.Result.(types.ManagedObjectReference))
+	defer func() {
+		task, err := vm.Destroy(context.Background())
+		if err != nil {
+			panic(err)
+		}
+		err = task.Wait(context.Background())
+		if err != nil {
+			panic(err)
+		}
+	}()
+
+	// Mark VM as template
+	err = vm.MarkAsTemplate(context.Background())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Get "environmentBrowser" property for VM template
+	var mvm mo.VirtualMachine
+	err = property.DefaultCollector(h.c).RetrieveOne(ctx, vm.Reference(), []string{"environmentBrowser"}, &mvm)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/test/helper.go b/vendor/github.com/vmware/govmomi/test/helper.go
new file mode 100644
index 0000000000..7e515f38ed
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/test/helper.go
@@ -0,0 +1,73 @@
+/*
+Copyright (c) 2014-2015 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 test
+
+import (
+	"context"
+	"net/url"
+	"os"
+	"testing"
+
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+// URL parses the GOVMOMI_TEST_URL environment variable if set.
+func URL() *url.URL {
+	s := os.Getenv("GOVMOMI_TEST_URL")
+	if s == "" {
+		return nil
+	}
+	u, err := soap.ParseURL(s)
+	if err != nil {
+		panic(err)
+	}
+	return u
+}
+
+// NewAuthenticatedClient creates a new vim25.Client, authenticates the user
+// specified in the test URL, and returns it.
+func NewAuthenticatedClient(t *testing.T) *vim25.Client {
+	u := URL()
+	if u == nil {
+		t.SkipNow()
+	}
+
+	soapClient := soap.NewClient(u, true)
+	vimClient, err := vim25.NewClient(context.Background(), soapClient)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	req := types.Login{
+		This: *vimClient.ServiceContent.SessionManager,
+	}
+
+	req.UserName = u.User.Username()
+	if pw, ok := u.User.Password(); ok {
+		req.Password = pw
+	}
+
+	_, err = methods.Login(context.Background(), vimClient, &req)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	return vimClient
+}
diff --git a/vendor/github.com/vmware/govmomi/units/size.go b/vendor/github.com/vmware/govmomi/units/size.go
new file mode 100644
index 0000000000..48208364a7
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/units/size.go
@@ -0,0 +1,89 @@
+/*
+Copyright (c) 2015 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 units
+
+import (
+	"errors"
+	"fmt"
+	"regexp"
+	"strconv"
+)
+
+type ByteSize int64
+
+const (
+	_  = iota
+	KB = 1 << (10 * iota)
+	MB
+	GB
+	TB
+	PB
+	EB
+)
+
+func (b ByteSize) String() string {
+	switch {
+	case b >= EB:
+		return fmt.Sprintf("%.1fEB", float32(b)/EB)
+	case b >= PB:
+		return fmt.Sprintf("%.1fPB", float32(b)/PB)
+	case b >= TB:
+		return fmt.Sprintf("%.1fTB", float32(b)/TB)
+	case b >= GB:
+		return fmt.Sprintf("%.1fGB", float32(b)/GB)
+	case b >= MB:
+		return fmt.Sprintf("%.1fMB", float32(b)/MB)
+	case b >= KB:
+		return fmt.Sprintf("%.1fKB", float32(b)/KB)
+	}
+	return fmt.Sprintf("%dB", b)
+}
+
+var bytesRegexp = regexp.MustCompile(`^(?i)(\d+)([BKMGTPE]?)(ib|b)?$`)
+
+func (b *ByteSize) Set(s string) error {
+	m := bytesRegexp.FindStringSubmatch(s)
+	if len(m) == 0 {
+		return errors.New("invalid byte value")
+	}
+
+	i, err := strconv.ParseInt(m[1], 10, 64)
+	if err != nil {
+		return err
+	}
+	*b = ByteSize(i)
+
+	switch m[2] {
+	case "B", "b", "":
+	case "K", "k":
+		*b *= ByteSize(KB)
+	case "M", "m":
+		*b *= ByteSize(MB)
+	case "G", "g":
+		*b *= ByteSize(GB)
+	case "T", "t":
+		*b *= ByteSize(TB)
+	case "P", "p":
+		*b *= ByteSize(PB)
+	case "E", "e":
+		*b *= ByteSize(EB)
+	default:
+		return errors.New("invalid byte suffix")
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/units/size_test.go b/vendor/github.com/vmware/govmomi/units/size_test.go
new file mode 100644
index 0000000000..14772887b6
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/units/size_test.go
@@ -0,0 +1,145 @@
+/*
+Copyright (c) 2015 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 units
+
+import (
+	"fmt"
+	"math"
+	"testing"
+)
+
+func TestMB(t *testing.T) {
+	b := ByteSize(1024 * 1024)
+	expected := "1.0MB"
+	if b.String() != expected {
+		t.Errorf("Expected '%v' but got '%v'", expected, b)
+	}
+}
+
+func TestTenMB(t *testing.T) {
+	b := ByteSize(10 * 1024 * 1024)
+	actual := fmt.Sprintf("%s", b)
+	expected := "10.0MB"
+	if actual != expected {
+		t.Errorf("Expected '%v' but got '%v'", expected, actual)
+	}
+}
+
+func assertEquals(t *testing.T, expected string, actual ByteSize) {
+	if expected != actual.String() {
+		t.Errorf("Expected '%v' but got '%v'", expected, actual.String())
+	}
+}
+
+func TestByteSize(t *testing.T) {
+	assertEquals(t, "1B", ByteSize(1))
+	assertEquals(t, "10B", ByteSize(10))
+	assertEquals(t, "100B", ByteSize(100))
+	assertEquals(t, "1000B", ByteSize(1000))
+	assertEquals(t, "1.0KB", ByteSize(1024))
+	assertEquals(t, "1.0MB", ByteSize(1024*1024))
+	assertEquals(t, "1.0MB", ByteSize(1048576))
+	assertEquals(t, "10.0MB", ByteSize(10*math.Pow(1024, 2)))
+	assertEquals(t, "1.0GB", ByteSize(1024*1024*1024))
+	assertEquals(t, "1.0TB", ByteSize(1024*1024*1024*1024))
+	assertEquals(t, "1.0TB", ByteSize(1048576*1048576))
+	assertEquals(t, "1.0PB", ByteSize(1024*1024*1024*1024*1024))
+	assertEquals(t, "1.0EB", ByteSize(1024*1024*1024*1024*1024*1024))
+	assertEquals(t, "1.0EB", ByteSize(1048576*1048576*1048576))
+}
+
+func TestByteSizeSet(t *testing.T) {
+	var tests = []struct {
+		In     string
+		OutStr string
+		Out    ByteSize
+	}{
+		{
+			In:     "345",
+			OutStr: "345B",
+			Out:    345.0,
+		},
+		{
+			In:     "345b",
+			OutStr: "345B",
+			Out:    345.0,
+		},
+		{
+			In:     "345K",
+			OutStr: "345.0KB",
+			Out:    345 * KB,
+		},
+		{
+			In:     "345kb",
+			OutStr: "345.0KB",
+			Out:    345 * KB,
+		},
+		{
+			In:     "345kib",
+			OutStr: "345.0KB",
+			Out:    345 * KB,
+		},
+		{
+			In:     "345KiB",
+			OutStr: "345.0KB",
+			Out:    345 * KB,
+		},
+		{
+			In:     "345M",
+			OutStr: "345.0MB",
+			Out:    345 * MB,
+		},
+		{
+			In:     "345G",
+			OutStr: "345.0GB",
+			Out:    345 * GB,
+		},
+		{
+			In:     "345T",
+			OutStr: "345.0TB",
+			Out:    345 * TB,
+		},
+		{
+			In:     "345P",
+			OutStr: "345.0PB",
+			Out:    345 * PB,
+		},
+		{
+			In:     "3E",
+			OutStr: "3.0EB",
+			Out:    3 * EB,
+		},
+	}
+
+	for _, test := range tests {
+		var v ByteSize
+		err := v.Set(test.In)
+		if err != nil {
+			t.Errorf("Error: %s [%v]", err, test.In)
+			continue
+		}
+
+		if v != test.Out {
+			t.Errorf("Out: expect '%v' actual '%v'", test.Out, v)
+			continue
+		}
+
+		if v.String() != test.OutStr {
+			t.Errorf("String: expect '%v' actual '%v'", test.OutStr, v.String())
+		}
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/view/container_view.go b/vendor/github.com/vmware/govmomi/view/container_view.go
new file mode 100644
index 0000000000..5a8100f2c3
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/view/container_view.go
@@ -0,0 +1,28 @@
+package view
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type ContainerView struct {
+	object.Common
+}
+
+func NewContainerView(c *vim25.Client, ref types.ManagedObjectReference) *ContainerView {
+	return &ContainerView{
+		Common: object.NewCommon(c, ref),
+	}
+}
+
+func (v ContainerView) Destroy(ctx context.Context) error {
+	req := types.DestroyView{
+		This: v.Reference(),
+	}
+	_, err := methods.DestroyView(ctx, v.Client(), &req)
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/view/list_view.go b/vendor/github.com/vmware/govmomi/view/list_view.go
new file mode 100644
index 0000000000..55a1c68f11
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/view/list_view.go
@@ -0,0 +1,71 @@
+/*
+Copyright (c) 2015 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 view
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type ListView struct {
+	object.Common
+}
+
+func NewListView(c *vim25.Client, ref types.ManagedObjectReference) *ListView {
+	return &ListView{
+		Common: object.NewCommon(c, ref),
+	}
+}
+
+func (v ListView) Destroy(ctx context.Context) error {
+	req := types.DestroyView{
+		This: v.Reference(),
+	}
+	_, err := methods.DestroyView(ctx, v.Client(), &req)
+	return err
+}
+
+func (v ListView) Add(ctx context.Context, refs []types.ManagedObjectReference) error {
+	req := types.ModifyListView{
+		This: v.Reference(),
+		Add:  refs,
+	}
+	_, err := methods.ModifyListView(ctx, v.Client(), &req)
+	return err
+}
+
+func (v ListView) Remove(ctx context.Context, refs []types.ManagedObjectReference) error {
+	req := types.ModifyListView{
+		This:   v.Reference(),
+		Remove: refs,
+	}
+	_, err := methods.ModifyListView(ctx, v.Client(), &req)
+	return err
+}
+
+func (v ListView) Reset(ctx context.Context, refs []types.ManagedObjectReference) error {
+	req := types.ResetListView{
+		This: v.Reference(),
+		Obj:  refs,
+	}
+	_, err := methods.ResetListView(ctx, v.Client(), &req)
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/view/manager.go b/vendor/github.com/vmware/govmomi/view/manager.go
new file mode 100644
index 0000000000..d44def0cd9
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/view/manager.go
@@ -0,0 +1,69 @@
+/*
+Copyright (c) 2015 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 view
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type Manager struct {
+	object.Common
+}
+
+func NewManager(c *vim25.Client) *Manager {
+	m := Manager{
+		object.NewCommon(c, *c.ServiceContent.ViewManager),
+	}
+
+	return &m
+}
+
+func (m Manager) CreateListView(ctx context.Context, objects []types.ManagedObjectReference) (*ListView, error) {
+	req := types.CreateListView{
+		This: m.Common.Reference(),
+		Obj:  objects,
+	}
+
+	res, err := methods.CreateListView(ctx, m.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewListView(m.Client(), res.Returnval), nil
+}
+
+func (m Manager) CreateContainerView(ctx context.Context, container types.ManagedObjectReference, managedObjectTypes []string, recursive bool) (*ContainerView, error) {
+
+	req := types.CreateContainerView{
+		This:      m.Common.Reference(),
+		Container: container,
+		Recursive: recursive,
+		Type:      managedObjectTypes,
+	}
+
+	res, err := methods.CreateContainerView(ctx, m.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewContainerView(m.Client(), res.Returnval), nil
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/client.go b/vendor/github.com/vmware/govmomi/vim25/client.go
new file mode 100644
index 0000000000..1289f33ef0
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/client.go
@@ -0,0 +1,123 @@
+/*
+Copyright (c) 2015-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 vim25
+
+import (
+	"context"
+	"encoding/json"
+
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+// 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
+// serialization without performing additional requests for initialization.
+type Client struct {
+	*soap.Client
+
+	ServiceContent types.ServiceContent
+
+	// RoundTripper is a separate field such that the client's implementation of
+	// the RoundTripper interface can be wrapped by separate implementations for
+	// extra functionality (for example, reauthentication on session timeout).
+	RoundTripper soap.RoundTripper
+}
+
+// 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,
+	}
+
+	// Set client if it happens to be a soap.Client
+	if sc, ok := rt.(*soap.Client); ok {
+		c.Client = sc
+	}
+
+	return &c, nil
+}
+
+// RoundTrip dispatches to the RoundTripper field.
+func (c *Client) RoundTrip(ctx context.Context, req, res soap.HasFault) error {
+	return c.RoundTripper.RoundTrip(ctx, req, res)
+}
+
+type marshaledClient struct {
+	SoapClient     *soap.Client
+	ServiceContent types.ServiceContent
+}
+
+func (c *Client) MarshalJSON() ([]byte, error) {
+	m := marshaledClient{
+		SoapClient:     c.Client,
+		ServiceContent: c.ServiceContent,
+	}
+
+	return json.Marshal(m)
+}
+
+func (c *Client) UnmarshalJSON(b []byte) error {
+	var m marshaledClient
+
+	err := json.Unmarshal(b, &m)
+	if err != nil {
+		return err
+	}
+
+	*c = Client{
+		Client:         m.SoapClient,
+		ServiceContent: m.ServiceContent,
+		RoundTripper:   m.SoapClient,
+	}
+
+	return nil
+}
+
+// Valid returns whether or not the client is valid and ready for use.
+// This should be called after unmarshalling the client.
+func (c *Client) Valid() bool {
+	if c == nil {
+		return false
+	}
+
+	if c.Client == nil {
+		return false
+	}
+
+	// Use arbitrary pointer field in the service content.
+	// Doesn't matter which one, as long as it is populated by default.
+	if c.ServiceContent.SessionManager == nil {
+		return false
+	}
+
+	return true
+}
+
+// IsVC returns true if we are connected to a vCenter
+func (c *Client) IsVC() bool {
+	return c.ServiceContent.About.ApiType == "VirtualCenter"
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/client_test.go b/vendor/github.com/vmware/govmomi/vim25/client_test.go
new file mode 100644
index 0000000000..46a83abc06
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/client_test.go
@@ -0,0 +1,97 @@
+/*
+Copyright (c) 2015 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 vim25
+
+import (
+	"context"
+	"encoding/json"
+	"net/url"
+	"os"
+	"testing"
+
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+// Duplicated to prevent cyclic dependency...
+func testURL(t *testing.T) *url.URL {
+	s := os.Getenv("GOVMOMI_TEST_URL")
+	if s == "" {
+		t.SkipNow()
+	}
+	u, err := soap.ParseURL(s)
+	if err != nil {
+		panic(err)
+	}
+	return u
+}
+
+func sessionLogin(t *testing.T, c *Client) {
+	req := types.Login{
+		This: *c.ServiceContent.SessionManager,
+	}
+
+	u := testURL(t).User
+	req.UserName = u.Username()
+	if pw, ok := u.Password(); ok {
+		req.Password = pw
+	}
+
+	_, err := methods.Login(context.Background(), c, &req)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func sessionCheck(t *testing.T, c *Client) {
+	var mgr mo.SessionManager
+
+	err := mo.RetrieveProperties(context.Background(), c, c.ServiceContent.PropertyCollector, *c.ServiceContent.SessionManager, &mgr)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestClientSerialization(t *testing.T) {
+	var c1, c2 *Client
+
+	soapClient := soap.NewClient(testURL(t), true)
+	c1, err := NewClient(context.Background(), soapClient)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Login
+	sessionLogin(t, c1)
+	sessionCheck(t, c1)
+
+	// Serialize/deserialize
+	b, err := json.Marshal(c1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	c2 = &Client{}
+	err = json.Unmarshal(b, c2)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Check the session is still valid
+	sessionCheck(t, c2)
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/debug/debug.go b/vendor/github.com/vmware/govmomi/vim25/debug/debug.go
new file mode 100644
index 0000000000..22d5471784
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/debug/debug.go
@@ -0,0 +1,81 @@
+/*
+Copyright (c) 2014 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 debug
+
+import (
+	"io"
+	"os"
+	"path"
+)
+
+// Provider specified the interface types must implement to be used as a
+// debugging sink. Having multiple such sink implementations allows it to be
+// changed externally (for example when running tests).
+type Provider interface {
+	NewFile(s string) io.WriteCloser
+	Flush()
+}
+
+var currentProvider Provider = nil
+
+func SetProvider(p Provider) {
+	if currentProvider != nil {
+		currentProvider.Flush()
+	}
+	currentProvider = p
+}
+
+// Enabled returns whether debugging is enabled or not.
+func Enabled() bool {
+	return currentProvider != nil
+}
+
+// NewFile dispatches to the current provider's NewFile function.
+func NewFile(s string) io.WriteCloser {
+	return currentProvider.NewFile(s)
+}
+
+// Flush dispatches to the current provider's Flush function.
+func Flush() {
+	currentProvider.Flush()
+}
+
+// FileProvider implements a debugging provider that creates a real file for
+// every call to NewFile. It maintains a list of all files that it creates,
+// such that it can close them when its Flush function is called.
+type FileProvider struct {
+	Path string
+
+	files []*os.File
+}
+
+func (fp *FileProvider) NewFile(p string) io.WriteCloser {
+	f, err := os.Create(path.Join(fp.Path, p))
+	if err != nil {
+		panic(err)
+	}
+
+	fp.files = append(fp.files, f)
+
+	return f
+}
+
+func (fp *FileProvider) Flush() {
+	for _, f := range fp.files {
+		f.Close()
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/doc.go b/vendor/github.com/vmware/govmomi/vim25/doc.go
new file mode 100644
index 0000000000..acb2c9f64d
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/doc.go
@@ -0,0 +1,29 @@
+/*
+Copyright (c) 2015 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 vim25 provides a minimal client implementation to use with other
+packages in the vim25 tree. The code in this package intentionally does not
+take any dependendies outside the vim25 tree.
+
+The client implementation in this package embeds the soap.Client structure.
+Additionally, it stores the value of the session's ServiceContent object. This
+object stores references to a variety of subsystems, such as the root property
+collector, the session manager, and the search index. The client is fully
+functional after serialization and deserialization, without the need for
+additional requests for initialization.
+*/
+package vim25
diff --git a/vendor/github.com/vmware/govmomi/vim25/methods/fault_test.go b/vendor/github.com/vmware/govmomi/vim25/methods/fault_test.go
new file mode 100644
index 0000000000..78bcaae811
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/methods/fault_test.go
@@ -0,0 +1,62 @@
+/*
+Copyright (c) 2014 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 methods
+
+import (
+	"bytes"
+	"testing"
+
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+	"github.com/vmware/govmomi/vim25/xml"
+)
+
+var invalidLoginFault = `
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+ xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<soapenv:Body>
+<soapenv:Fault><faultcode>ServerFaultCode</faultcode><faultstring>Cannot complete login due to an incorrect user name or password.</faultstring><detail><InvalidLoginFault xmlns="urn:vim25" xsi:type="InvalidLogin"></InvalidLoginFault></detail></soapenv:Fault>
+</soapenv:Body>
+</soapenv:Envelope>`
+
+type TestBody struct {
+	Fault *soap.Fault `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func TestFaultDetail(t *testing.T) {
+	body := TestBody{}
+	env := soap.Envelope{Body: &body}
+
+	dec := xml.NewDecoder(bytes.NewReader([]byte(invalidLoginFault)))
+	dec.TypeFunc = types.TypeFunc()
+
+	err := dec.Decode(&env)
+	if err != nil {
+		t.Fatalf("Decode: %s", err)
+	}
+
+	if body.Fault == nil {
+		t.Fatal("Expected fault")
+	}
+
+	if _, ok := body.Fault.Detail.Fault.(types.InvalidLogin); !ok {
+		t.Fatalf("Expected InvalidLogin, got: %#v", body.Fault.Detail.Fault)
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/methods/internal.go b/vendor/github.com/vmware/govmomi/vim25/methods/internal.go
new file mode 100644
index 0000000000..a79adf3a87
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/methods/internal.go
@@ -0,0 +1,124 @@
+/*
+Copyright (c) 2014-2015 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 methods
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type RetrieveDynamicTypeManagerBody struct {
+	Req    *types.RetrieveDynamicTypeManager         `xml:"urn:vim25 RetrieveDynamicTypeManager"`
+	Res    *types.RetrieveDynamicTypeManagerResponse `xml:"urn:vim25 RetrieveDynamicTypeManagerResponse"`
+	Fault_ *soap.Fault
+}
+
+func (b *RetrieveDynamicTypeManagerBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveDynamicTypeManager(ctx context.Context, r soap.RoundTripper, req *types.RetrieveDynamicTypeManager) (*types.RetrieveDynamicTypeManagerResponse, error) {
+	var reqBody, resBody RetrieveDynamicTypeManagerBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveManagedMethodExecuterBody struct {
+	Req    *types.RetrieveManagedMethodExecuter         `xml:"urn:vim25 RetrieveManagedMethodExecuter"`
+	Res    *types.RetrieveManagedMethodExecuterResponse `xml:"urn:vim25 RetrieveManagedMethodExecuterResponse"`
+	Fault_ *soap.Fault
+}
+
+func (b *RetrieveManagedMethodExecuterBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveManagedMethodExecuter(ctx context.Context, r soap.RoundTripper, req *types.RetrieveManagedMethodExecuter) (*types.RetrieveManagedMethodExecuterResponse, error) {
+	var reqBody, resBody RetrieveManagedMethodExecuterBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DynamicTypeMgrQueryMoInstancesBody struct {
+	Req    *types.DynamicTypeMgrQueryMoInstances         `xml:"urn:vim25 DynamicTypeMgrQueryMoInstances"`
+	Res    *types.DynamicTypeMgrQueryMoInstancesResponse `xml:"urn:vim25 DynamicTypeMgrQueryMoInstancesResponse"`
+	Fault_ *soap.Fault
+}
+
+func (b *DynamicTypeMgrQueryMoInstancesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DynamicTypeMgrQueryMoInstances(ctx context.Context, r soap.RoundTripper, req *types.DynamicTypeMgrQueryMoInstances) (*types.DynamicTypeMgrQueryMoInstancesResponse, error) {
+	var reqBody, resBody DynamicTypeMgrQueryMoInstancesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DynamicTypeMgrQueryTypeInfoBody struct {
+	Req    *types.DynamicTypeMgrQueryTypeInfo         `xml:"urn:vim25 DynamicTypeMgrQueryTypeInfo"`
+	Res    *types.DynamicTypeMgrQueryTypeInfoResponse `xml:"urn:vim25 DynamicTypeMgrQueryTypeInfoResponse"`
+	Fault_ *soap.Fault
+}
+
+func (b *DynamicTypeMgrQueryTypeInfoBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DynamicTypeMgrQueryTypeInfo(ctx context.Context, r soap.RoundTripper, req *types.DynamicTypeMgrQueryTypeInfo) (*types.DynamicTypeMgrQueryTypeInfoResponse, error) {
+	var reqBody, resBody DynamicTypeMgrQueryTypeInfoBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ExecuteSoapBody struct {
+	Req    *types.ExecuteSoap         `xml:"urn:vim25 ExecuteSoap"`
+	Res    *types.ExecuteSoapResponse `xml:"urn:vim25 ExecuteSoapResponse"`
+	Fault_ *soap.Fault
+}
+
+func (b *ExecuteSoapBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ExecuteSoap(ctx context.Context, r soap.RoundTripper, req *types.ExecuteSoap) (*types.ExecuteSoapResponse, error) {
+	var reqBody, resBody ExecuteSoapBody
+
+	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/methods.go b/vendor/github.com/vmware/govmomi/vim25/methods/methods.go
new file mode 100644
index 0000000000..79c49435a4
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/methods/methods.go
@@ -0,0 +1,16144 @@
+/*
+Copyright (c) 2014-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 methods
+
+import (
+	"context"
+
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type AbdicateDomOwnershipBody struct {
+	Req    *types.AbdicateDomOwnership         `xml:"urn:vim25 AbdicateDomOwnership,omitempty"`
+	Res    *types.AbdicateDomOwnershipResponse `xml:"urn:vim25 AbdicateDomOwnershipResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AbdicateDomOwnershipBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AbdicateDomOwnership(ctx context.Context, r soap.RoundTripper, req *types.AbdicateDomOwnership) (*types.AbdicateDomOwnershipResponse, error) {
+	var reqBody, resBody AbdicateDomOwnershipBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AcknowledgeAlarmBody struct {
+	Req    *types.AcknowledgeAlarm         `xml:"urn:vim25 AcknowledgeAlarm,omitempty"`
+	Res    *types.AcknowledgeAlarmResponse `xml:"urn:vim25 AcknowledgeAlarmResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AcknowledgeAlarmBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AcknowledgeAlarm(ctx context.Context, r soap.RoundTripper, req *types.AcknowledgeAlarm) (*types.AcknowledgeAlarmResponse, error) {
+	var reqBody, resBody AcknowledgeAlarmBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AcquireCimServicesTicketBody struct {
+	Req    *types.AcquireCimServicesTicket         `xml:"urn:vim25 AcquireCimServicesTicket,omitempty"`
+	Res    *types.AcquireCimServicesTicketResponse `xml:"urn:vim25 AcquireCimServicesTicketResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AcquireCimServicesTicketBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AcquireCimServicesTicket(ctx context.Context, r soap.RoundTripper, req *types.AcquireCimServicesTicket) (*types.AcquireCimServicesTicketResponse, error) {
+	var reqBody, resBody AcquireCimServicesTicketBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AcquireCloneTicketBody struct {
+	Req    *types.AcquireCloneTicket         `xml:"urn:vim25 AcquireCloneTicket,omitempty"`
+	Res    *types.AcquireCloneTicketResponse `xml:"urn:vim25 AcquireCloneTicketResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AcquireCloneTicketBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AcquireCloneTicket(ctx context.Context, r soap.RoundTripper, req *types.AcquireCloneTicket) (*types.AcquireCloneTicketResponse, error) {
+	var reqBody, resBody AcquireCloneTicketBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AcquireCredentialsInGuestBody struct {
+	Req    *types.AcquireCredentialsInGuest         `xml:"urn:vim25 AcquireCredentialsInGuest,omitempty"`
+	Res    *types.AcquireCredentialsInGuestResponse `xml:"urn:vim25 AcquireCredentialsInGuestResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AcquireCredentialsInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AcquireCredentialsInGuest(ctx context.Context, r soap.RoundTripper, req *types.AcquireCredentialsInGuest) (*types.AcquireCredentialsInGuestResponse, error) {
+	var reqBody, resBody AcquireCredentialsInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AcquireGenericServiceTicketBody struct {
+	Req    *types.AcquireGenericServiceTicket         `xml:"urn:vim25 AcquireGenericServiceTicket,omitempty"`
+	Res    *types.AcquireGenericServiceTicketResponse `xml:"urn:vim25 AcquireGenericServiceTicketResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AcquireGenericServiceTicketBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AcquireGenericServiceTicket(ctx context.Context, r soap.RoundTripper, req *types.AcquireGenericServiceTicket) (*types.AcquireGenericServiceTicketResponse, error) {
+	var reqBody, resBody AcquireGenericServiceTicketBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AcquireLocalTicketBody struct {
+	Req    *types.AcquireLocalTicket         `xml:"urn:vim25 AcquireLocalTicket,omitempty"`
+	Res    *types.AcquireLocalTicketResponse `xml:"urn:vim25 AcquireLocalTicketResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AcquireLocalTicketBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AcquireLocalTicket(ctx context.Context, r soap.RoundTripper, req *types.AcquireLocalTicket) (*types.AcquireLocalTicketResponse, error) {
+	var reqBody, resBody AcquireLocalTicketBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AcquireMksTicketBody struct {
+	Req    *types.AcquireMksTicket         `xml:"urn:vim25 AcquireMksTicket,omitempty"`
+	Res    *types.AcquireMksTicketResponse `xml:"urn:vim25 AcquireMksTicketResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AcquireMksTicketBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AcquireMksTicket(ctx context.Context, r soap.RoundTripper, req *types.AcquireMksTicket) (*types.AcquireMksTicketResponse, error) {
+	var reqBody, resBody AcquireMksTicketBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AcquireTicketBody struct {
+	Req    *types.AcquireTicket         `xml:"urn:vim25 AcquireTicket,omitempty"`
+	Res    *types.AcquireTicketResponse `xml:"urn:vim25 AcquireTicketResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AcquireTicketBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AcquireTicket(ctx context.Context, r soap.RoundTripper, req *types.AcquireTicket) (*types.AcquireTicketResponse, error) {
+	var reqBody, resBody AcquireTicketBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AddAuthorizationRoleBody struct {
+	Req    *types.AddAuthorizationRole         `xml:"urn:vim25 AddAuthorizationRole,omitempty"`
+	Res    *types.AddAuthorizationRoleResponse `xml:"urn:vim25 AddAuthorizationRoleResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AddAuthorizationRoleBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AddAuthorizationRole(ctx context.Context, r soap.RoundTripper, req *types.AddAuthorizationRole) (*types.AddAuthorizationRoleResponse, error) {
+	var reqBody, resBody AddAuthorizationRoleBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AddCustomFieldDefBody struct {
+	Req    *types.AddCustomFieldDef         `xml:"urn:vim25 AddCustomFieldDef,omitempty"`
+	Res    *types.AddCustomFieldDefResponse `xml:"urn:vim25 AddCustomFieldDefResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AddCustomFieldDefBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AddCustomFieldDef(ctx context.Context, r soap.RoundTripper, req *types.AddCustomFieldDef) (*types.AddCustomFieldDefResponse, error) {
+	var reqBody, resBody AddCustomFieldDefBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AddDVPortgroup_TaskBody struct {
+	Req    *types.AddDVPortgroup_Task         `xml:"urn:vim25 AddDVPortgroup_Task,omitempty"`
+	Res    *types.AddDVPortgroup_TaskResponse `xml:"urn:vim25 AddDVPortgroup_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AddDVPortgroup_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AddDVPortgroup_Task(ctx context.Context, r soap.RoundTripper, req *types.AddDVPortgroup_Task) (*types.AddDVPortgroup_TaskResponse, error) {
+	var reqBody, resBody AddDVPortgroup_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AddDisks_TaskBody struct {
+	Req    *types.AddDisks_Task         `xml:"urn:vim25 AddDisks_Task,omitempty"`
+	Res    *types.AddDisks_TaskResponse `xml:"urn:vim25 AddDisks_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AddDisks_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AddDisks_Task(ctx context.Context, r soap.RoundTripper, req *types.AddDisks_Task) (*types.AddDisks_TaskResponse, error) {
+	var reqBody, resBody AddDisks_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AddFilterBody struct {
+	Req    *types.AddFilter         `xml:"urn:vim25 AddFilter,omitempty"`
+	Res    *types.AddFilterResponse `xml:"urn:vim25 AddFilterResponse,omitempty"`
+	Fault_ *soap.Fault              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AddFilterBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AddFilter(ctx context.Context, r soap.RoundTripper, req *types.AddFilter) (*types.AddFilterResponse, error) {
+	var reqBody, resBody AddFilterBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AddFilterEntitiesBody struct {
+	Req    *types.AddFilterEntities         `xml:"urn:vim25 AddFilterEntities,omitempty"`
+	Res    *types.AddFilterEntitiesResponse `xml:"urn:vim25 AddFilterEntitiesResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AddFilterEntitiesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AddFilterEntities(ctx context.Context, r soap.RoundTripper, req *types.AddFilterEntities) (*types.AddFilterEntitiesResponse, error) {
+	var reqBody, resBody AddFilterEntitiesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AddGuestAliasBody struct {
+	Req    *types.AddGuestAlias         `xml:"urn:vim25 AddGuestAlias,omitempty"`
+	Res    *types.AddGuestAliasResponse `xml:"urn:vim25 AddGuestAliasResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AddGuestAliasBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AddGuestAlias(ctx context.Context, r soap.RoundTripper, req *types.AddGuestAlias) (*types.AddGuestAliasResponse, error) {
+	var reqBody, resBody AddGuestAliasBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AddHost_TaskBody struct {
+	Req    *types.AddHost_Task         `xml:"urn:vim25 AddHost_Task,omitempty"`
+	Res    *types.AddHost_TaskResponse `xml:"urn:vim25 AddHost_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AddHost_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AddHost_Task(ctx context.Context, r soap.RoundTripper, req *types.AddHost_Task) (*types.AddHost_TaskResponse, error) {
+	var reqBody, resBody AddHost_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AddInternetScsiSendTargetsBody struct {
+	Req    *types.AddInternetScsiSendTargets         `xml:"urn:vim25 AddInternetScsiSendTargets,omitempty"`
+	Res    *types.AddInternetScsiSendTargetsResponse `xml:"urn:vim25 AddInternetScsiSendTargetsResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AddInternetScsiSendTargetsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AddInternetScsiSendTargets(ctx context.Context, r soap.RoundTripper, req *types.AddInternetScsiSendTargets) (*types.AddInternetScsiSendTargetsResponse, error) {
+	var reqBody, resBody AddInternetScsiSendTargetsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AddInternetScsiStaticTargetsBody struct {
+	Req    *types.AddInternetScsiStaticTargets         `xml:"urn:vim25 AddInternetScsiStaticTargets,omitempty"`
+	Res    *types.AddInternetScsiStaticTargetsResponse `xml:"urn:vim25 AddInternetScsiStaticTargetsResponse,omitempty"`
+	Fault_ *soap.Fault                                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AddInternetScsiStaticTargetsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AddInternetScsiStaticTargets(ctx context.Context, r soap.RoundTripper, req *types.AddInternetScsiStaticTargets) (*types.AddInternetScsiStaticTargetsResponse, error) {
+	var reqBody, resBody AddInternetScsiStaticTargetsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AddKeyBody struct {
+	Req    *types.AddKey         `xml:"urn:vim25 AddKey,omitempty"`
+	Res    *types.AddKeyResponse `xml:"urn:vim25 AddKeyResponse,omitempty"`
+	Fault_ *soap.Fault           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AddKeyBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AddKey(ctx context.Context, r soap.RoundTripper, req *types.AddKey) (*types.AddKeyResponse, error) {
+	var reqBody, resBody AddKeyBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AddKeysBody struct {
+	Req    *types.AddKeys         `xml:"urn:vim25 AddKeys,omitempty"`
+	Res    *types.AddKeysResponse `xml:"urn:vim25 AddKeysResponse,omitempty"`
+	Fault_ *soap.Fault            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AddKeysBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AddKeys(ctx context.Context, r soap.RoundTripper, req *types.AddKeys) (*types.AddKeysResponse, error) {
+	var reqBody, resBody AddKeysBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AddLicenseBody struct {
+	Req    *types.AddLicense         `xml:"urn:vim25 AddLicense,omitempty"`
+	Res    *types.AddLicenseResponse `xml:"urn:vim25 AddLicenseResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AddLicenseBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AddLicense(ctx context.Context, r soap.RoundTripper, req *types.AddLicense) (*types.AddLicenseResponse, error) {
+	var reqBody, resBody AddLicenseBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AddMonitoredEntitiesBody struct {
+	Req    *types.AddMonitoredEntities         `xml:"urn:vim25 AddMonitoredEntities,omitempty"`
+	Res    *types.AddMonitoredEntitiesResponse `xml:"urn:vim25 AddMonitoredEntitiesResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AddMonitoredEntitiesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AddMonitoredEntities(ctx context.Context, r soap.RoundTripper, req *types.AddMonitoredEntities) (*types.AddMonitoredEntitiesResponse, error) {
+	var reqBody, resBody AddMonitoredEntitiesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AddNetworkResourcePoolBody struct {
+	Req    *types.AddNetworkResourcePool         `xml:"urn:vim25 AddNetworkResourcePool,omitempty"`
+	Res    *types.AddNetworkResourcePoolResponse `xml:"urn:vim25 AddNetworkResourcePoolResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AddNetworkResourcePoolBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AddNetworkResourcePool(ctx context.Context, r soap.RoundTripper, req *types.AddNetworkResourcePool) (*types.AddNetworkResourcePoolResponse, error) {
+	var reqBody, resBody AddNetworkResourcePoolBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AddPortGroupBody struct {
+	Req    *types.AddPortGroup         `xml:"urn:vim25 AddPortGroup,omitempty"`
+	Res    *types.AddPortGroupResponse `xml:"urn:vim25 AddPortGroupResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AddPortGroupBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AddPortGroup(ctx context.Context, r soap.RoundTripper, req *types.AddPortGroup) (*types.AddPortGroupResponse, error) {
+	var reqBody, resBody AddPortGroupBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AddServiceConsoleVirtualNicBody struct {
+	Req    *types.AddServiceConsoleVirtualNic         `xml:"urn:vim25 AddServiceConsoleVirtualNic,omitempty"`
+	Res    *types.AddServiceConsoleVirtualNicResponse `xml:"urn:vim25 AddServiceConsoleVirtualNicResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AddServiceConsoleVirtualNicBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AddServiceConsoleVirtualNic(ctx context.Context, r soap.RoundTripper, req *types.AddServiceConsoleVirtualNic) (*types.AddServiceConsoleVirtualNicResponse, error) {
+	var reqBody, resBody AddServiceConsoleVirtualNicBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AddStandaloneHost_TaskBody struct {
+	Req    *types.AddStandaloneHost_Task         `xml:"urn:vim25 AddStandaloneHost_Task,omitempty"`
+	Res    *types.AddStandaloneHost_TaskResponse `xml:"urn:vim25 AddStandaloneHost_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AddStandaloneHost_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AddStandaloneHost_Task(ctx context.Context, r soap.RoundTripper, req *types.AddStandaloneHost_Task) (*types.AddStandaloneHost_TaskResponse, error) {
+	var reqBody, resBody AddStandaloneHost_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AddVirtualNicBody struct {
+	Req    *types.AddVirtualNic         `xml:"urn:vim25 AddVirtualNic,omitempty"`
+	Res    *types.AddVirtualNicResponse `xml:"urn:vim25 AddVirtualNicResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AddVirtualNicBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AddVirtualNic(ctx context.Context, r soap.RoundTripper, req *types.AddVirtualNic) (*types.AddVirtualNicResponse, error) {
+	var reqBody, resBody AddVirtualNicBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AddVirtualSwitchBody struct {
+	Req    *types.AddVirtualSwitch         `xml:"urn:vim25 AddVirtualSwitch,omitempty"`
+	Res    *types.AddVirtualSwitchResponse `xml:"urn:vim25 AddVirtualSwitchResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AddVirtualSwitchBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AddVirtualSwitch(ctx context.Context, r soap.RoundTripper, req *types.AddVirtualSwitch) (*types.AddVirtualSwitchResponse, error) {
+	var reqBody, resBody AddVirtualSwitchBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AllocateIpv4AddressBody struct {
+	Req    *types.AllocateIpv4Address         `xml:"urn:vim25 AllocateIpv4Address,omitempty"`
+	Res    *types.AllocateIpv4AddressResponse `xml:"urn:vim25 AllocateIpv4AddressResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AllocateIpv4AddressBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AllocateIpv4Address(ctx context.Context, r soap.RoundTripper, req *types.AllocateIpv4Address) (*types.AllocateIpv4AddressResponse, error) {
+	var reqBody, resBody AllocateIpv4AddressBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AllocateIpv6AddressBody struct {
+	Req    *types.AllocateIpv6Address         `xml:"urn:vim25 AllocateIpv6Address,omitempty"`
+	Res    *types.AllocateIpv6AddressResponse `xml:"urn:vim25 AllocateIpv6AddressResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AllocateIpv6AddressBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AllocateIpv6Address(ctx context.Context, r soap.RoundTripper, req *types.AllocateIpv6Address) (*types.AllocateIpv6AddressResponse, error) {
+	var reqBody, resBody AllocateIpv6AddressBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AnswerVMBody struct {
+	Req    *types.AnswerVM         `xml:"urn:vim25 AnswerVM,omitempty"`
+	Res    *types.AnswerVMResponse `xml:"urn:vim25 AnswerVMResponse,omitempty"`
+	Fault_ *soap.Fault             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AnswerVMBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AnswerVM(ctx context.Context, r soap.RoundTripper, req *types.AnswerVM) (*types.AnswerVMResponse, error) {
+	var reqBody, resBody AnswerVMBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ApplyEntitiesConfig_TaskBody struct {
+	Req    *types.ApplyEntitiesConfig_Task         `xml:"urn:vim25 ApplyEntitiesConfig_Task,omitempty"`
+	Res    *types.ApplyEntitiesConfig_TaskResponse `xml:"urn:vim25 ApplyEntitiesConfig_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ApplyEntitiesConfig_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ApplyEntitiesConfig_Task(ctx context.Context, r soap.RoundTripper, req *types.ApplyEntitiesConfig_Task) (*types.ApplyEntitiesConfig_TaskResponse, error) {
+	var reqBody, resBody ApplyEntitiesConfig_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"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ApplyHostConfig_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ApplyHostConfig_Task(ctx context.Context, r soap.RoundTripper, req *types.ApplyHostConfig_Task) (*types.ApplyHostConfig_TaskResponse, error) {
+	var reqBody, resBody ApplyHostConfig_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ApplyRecommendationBody struct {
+	Req    *types.ApplyRecommendation         `xml:"urn:vim25 ApplyRecommendation,omitempty"`
+	Res    *types.ApplyRecommendationResponse `xml:"urn:vim25 ApplyRecommendationResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ApplyRecommendationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ApplyRecommendation(ctx context.Context, r soap.RoundTripper, req *types.ApplyRecommendation) (*types.ApplyRecommendationResponse, error) {
+	var reqBody, resBody ApplyRecommendationBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ApplyStorageDrsRecommendationToPod_TaskBody struct {
+	Req    *types.ApplyStorageDrsRecommendationToPod_Task         `xml:"urn:vim25 ApplyStorageDrsRecommendationToPod_Task,omitempty"`
+	Res    *types.ApplyStorageDrsRecommendationToPod_TaskResponse `xml:"urn:vim25 ApplyStorageDrsRecommendationToPod_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ApplyStorageDrsRecommendationToPod_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ApplyStorageDrsRecommendationToPod_Task(ctx context.Context, r soap.RoundTripper, req *types.ApplyStorageDrsRecommendationToPod_Task) (*types.ApplyStorageDrsRecommendationToPod_TaskResponse, error) {
+	var reqBody, resBody ApplyStorageDrsRecommendationToPod_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ApplyStorageDrsRecommendation_TaskBody struct {
+	Req    *types.ApplyStorageDrsRecommendation_Task         `xml:"urn:vim25 ApplyStorageDrsRecommendation_Task,omitempty"`
+	Res    *types.ApplyStorageDrsRecommendation_TaskResponse `xml:"urn:vim25 ApplyStorageDrsRecommendation_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ApplyStorageDrsRecommendation_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ApplyStorageDrsRecommendation_Task(ctx context.Context, r soap.RoundTripper, req *types.ApplyStorageDrsRecommendation_Task) (*types.ApplyStorageDrsRecommendation_TaskResponse, error) {
+	var reqBody, resBody ApplyStorageDrsRecommendation_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AreAlarmActionsEnabledBody struct {
+	Req    *types.AreAlarmActionsEnabled         `xml:"urn:vim25 AreAlarmActionsEnabled,omitempty"`
+	Res    *types.AreAlarmActionsEnabledResponse `xml:"urn:vim25 AreAlarmActionsEnabledResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AreAlarmActionsEnabledBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AreAlarmActionsEnabled(ctx context.Context, r soap.RoundTripper, req *types.AreAlarmActionsEnabled) (*types.AreAlarmActionsEnabledResponse, error) {
+	var reqBody, resBody AreAlarmActionsEnabledBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AssignUserToGroupBody struct {
+	Req    *types.AssignUserToGroup         `xml:"urn:vim25 AssignUserToGroup,omitempty"`
+	Res    *types.AssignUserToGroupResponse `xml:"urn:vim25 AssignUserToGroupResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AssignUserToGroupBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AssignUserToGroup(ctx context.Context, r soap.RoundTripper, req *types.AssignUserToGroup) (*types.AssignUserToGroupResponse, error) {
+	var reqBody, resBody AssignUserToGroupBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AssociateProfileBody struct {
+	Req    *types.AssociateProfile         `xml:"urn:vim25 AssociateProfile,omitempty"`
+	Res    *types.AssociateProfileResponse `xml:"urn:vim25 AssociateProfileResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AssociateProfileBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AssociateProfile(ctx context.Context, r soap.RoundTripper, req *types.AssociateProfile) (*types.AssociateProfileResponse, error) {
+	var reqBody, resBody AssociateProfileBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AttachDisk_TaskBody struct {
+	Req    *types.AttachDisk_Task         `xml:"urn:vim25 AttachDisk_Task,omitempty"`
+	Res    *types.AttachDisk_TaskResponse `xml:"urn:vim25 AttachDisk_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AttachDisk_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AttachDisk_Task(ctx context.Context, r soap.RoundTripper, req *types.AttachDisk_Task) (*types.AttachDisk_TaskResponse, error) {
+	var reqBody, resBody AttachDisk_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AttachScsiLunBody struct {
+	Req    *types.AttachScsiLun         `xml:"urn:vim25 AttachScsiLun,omitempty"`
+	Res    *types.AttachScsiLunResponse `xml:"urn:vim25 AttachScsiLunResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AttachScsiLunBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AttachScsiLun(ctx context.Context, r soap.RoundTripper, req *types.AttachScsiLun) (*types.AttachScsiLunResponse, error) {
+	var reqBody, resBody AttachScsiLunBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AttachScsiLunEx_TaskBody struct {
+	Req    *types.AttachScsiLunEx_Task         `xml:"urn:vim25 AttachScsiLunEx_Task,omitempty"`
+	Res    *types.AttachScsiLunEx_TaskResponse `xml:"urn:vim25 AttachScsiLunEx_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AttachScsiLunEx_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AttachScsiLunEx_Task(ctx context.Context, r soap.RoundTripper, req *types.AttachScsiLunEx_Task) (*types.AttachScsiLunEx_TaskResponse, error) {
+	var reqBody, resBody AttachScsiLunEx_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AttachTagToVStorageObjectBody struct {
+	Req    *types.AttachTagToVStorageObject         `xml:"urn:vim25 AttachTagToVStorageObject,omitempty"`
+	Res    *types.AttachTagToVStorageObjectResponse `xml:"urn:vim25 AttachTagToVStorageObjectResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AttachTagToVStorageObjectBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AttachTagToVStorageObject(ctx context.Context, r soap.RoundTripper, req *types.AttachTagToVStorageObject) (*types.AttachTagToVStorageObjectResponse, error) {
+	var reqBody, resBody AttachTagToVStorageObjectBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AttachVmfsExtentBody struct {
+	Req    *types.AttachVmfsExtent         `xml:"urn:vim25 AttachVmfsExtent,omitempty"`
+	Res    *types.AttachVmfsExtentResponse `xml:"urn:vim25 AttachVmfsExtentResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AttachVmfsExtentBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AttachVmfsExtent(ctx context.Context, r soap.RoundTripper, req *types.AttachVmfsExtent) (*types.AttachVmfsExtentResponse, error) {
+	var reqBody, resBody AttachVmfsExtentBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AutoStartPowerOffBody struct {
+	Req    *types.AutoStartPowerOff         `xml:"urn:vim25 AutoStartPowerOff,omitempty"`
+	Res    *types.AutoStartPowerOffResponse `xml:"urn:vim25 AutoStartPowerOffResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AutoStartPowerOffBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AutoStartPowerOff(ctx context.Context, r soap.RoundTripper, req *types.AutoStartPowerOff) (*types.AutoStartPowerOffResponse, error) {
+	var reqBody, resBody AutoStartPowerOffBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type AutoStartPowerOnBody struct {
+	Req    *types.AutoStartPowerOn         `xml:"urn:vim25 AutoStartPowerOn,omitempty"`
+	Res    *types.AutoStartPowerOnResponse `xml:"urn:vim25 AutoStartPowerOnResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *AutoStartPowerOnBody) Fault() *soap.Fault { return b.Fault_ }
+
+func AutoStartPowerOn(ctx context.Context, r soap.RoundTripper, req *types.AutoStartPowerOn) (*types.AutoStartPowerOnResponse, error) {
+	var reqBody, resBody AutoStartPowerOnBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type BackupFirmwareConfigurationBody struct {
+	Req    *types.BackupFirmwareConfiguration         `xml:"urn:vim25 BackupFirmwareConfiguration,omitempty"`
+	Res    *types.BackupFirmwareConfigurationResponse `xml:"urn:vim25 BackupFirmwareConfigurationResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *BackupFirmwareConfigurationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func BackupFirmwareConfiguration(ctx context.Context, r soap.RoundTripper, req *types.BackupFirmwareConfiguration) (*types.BackupFirmwareConfigurationResponse, error) {
+	var reqBody, resBody BackupFirmwareConfigurationBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type BindVnicBody struct {
+	Req    *types.BindVnic         `xml:"urn:vim25 BindVnic,omitempty"`
+	Res    *types.BindVnicResponse `xml:"urn:vim25 BindVnicResponse,omitempty"`
+	Fault_ *soap.Fault             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *BindVnicBody) Fault() *soap.Fault { return b.Fault_ }
+
+func BindVnic(ctx context.Context, r soap.RoundTripper, req *types.BindVnic) (*types.BindVnicResponse, error) {
+	var reqBody, resBody BindVnicBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type BrowseDiagnosticLogBody struct {
+	Req    *types.BrowseDiagnosticLog         `xml:"urn:vim25 BrowseDiagnosticLog,omitempty"`
+	Res    *types.BrowseDiagnosticLogResponse `xml:"urn:vim25 BrowseDiagnosticLogResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *BrowseDiagnosticLogBody) Fault() *soap.Fault { return b.Fault_ }
+
+func BrowseDiagnosticLog(ctx context.Context, r soap.RoundTripper, req *types.BrowseDiagnosticLog) (*types.BrowseDiagnosticLogResponse, error) {
+	var reqBody, resBody BrowseDiagnosticLogBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CanProvisionObjectsBody struct {
+	Req    *types.CanProvisionObjects         `xml:"urn:vim25 CanProvisionObjects,omitempty"`
+	Res    *types.CanProvisionObjectsResponse `xml:"urn:vim25 CanProvisionObjectsResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CanProvisionObjectsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CanProvisionObjects(ctx context.Context, r soap.RoundTripper, req *types.CanProvisionObjects) (*types.CanProvisionObjectsResponse, error) {
+	var reqBody, resBody CanProvisionObjectsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CancelRecommendationBody struct {
+	Req    *types.CancelRecommendation         `xml:"urn:vim25 CancelRecommendation,omitempty"`
+	Res    *types.CancelRecommendationResponse `xml:"urn:vim25 CancelRecommendationResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CancelRecommendationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CancelRecommendation(ctx context.Context, r soap.RoundTripper, req *types.CancelRecommendation) (*types.CancelRecommendationResponse, error) {
+	var reqBody, resBody CancelRecommendationBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CancelRetrievePropertiesExBody struct {
+	Req    *types.CancelRetrievePropertiesEx         `xml:"urn:vim25 CancelRetrievePropertiesEx,omitempty"`
+	Res    *types.CancelRetrievePropertiesExResponse `xml:"urn:vim25 CancelRetrievePropertiesExResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CancelRetrievePropertiesExBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CancelRetrievePropertiesEx(ctx context.Context, r soap.RoundTripper, req *types.CancelRetrievePropertiesEx) (*types.CancelRetrievePropertiesExResponse, error) {
+	var reqBody, resBody CancelRetrievePropertiesExBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CancelStorageDrsRecommendationBody struct {
+	Req    *types.CancelStorageDrsRecommendation         `xml:"urn:vim25 CancelStorageDrsRecommendation,omitempty"`
+	Res    *types.CancelStorageDrsRecommendationResponse `xml:"urn:vim25 CancelStorageDrsRecommendationResponse,omitempty"`
+	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CancelStorageDrsRecommendationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CancelStorageDrsRecommendation(ctx context.Context, r soap.RoundTripper, req *types.CancelStorageDrsRecommendation) (*types.CancelStorageDrsRecommendationResponse, error) {
+	var reqBody, resBody CancelStorageDrsRecommendationBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CancelTaskBody struct {
+	Req    *types.CancelTask         `xml:"urn:vim25 CancelTask,omitempty"`
+	Res    *types.CancelTaskResponse `xml:"urn:vim25 CancelTaskResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CancelTaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CancelTask(ctx context.Context, r soap.RoundTripper, req *types.CancelTask) (*types.CancelTaskResponse, error) {
+	var reqBody, resBody CancelTaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CancelWaitForUpdatesBody struct {
+	Req    *types.CancelWaitForUpdates         `xml:"urn:vim25 CancelWaitForUpdates,omitempty"`
+	Res    *types.CancelWaitForUpdatesResponse `xml:"urn:vim25 CancelWaitForUpdatesResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CancelWaitForUpdatesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CancelWaitForUpdates(ctx context.Context, r soap.RoundTripper, req *types.CancelWaitForUpdates) (*types.CancelWaitForUpdatesResponse, error) {
+	var reqBody, resBody CancelWaitForUpdatesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CertMgrRefreshCACertificatesAndCRLs_TaskBody struct {
+	Req    *types.CertMgrRefreshCACertificatesAndCRLs_Task         `xml:"urn:vim25 CertMgrRefreshCACertificatesAndCRLs_Task,omitempty"`
+	Res    *types.CertMgrRefreshCACertificatesAndCRLs_TaskResponse `xml:"urn:vim25 CertMgrRefreshCACertificatesAndCRLs_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CertMgrRefreshCACertificatesAndCRLs_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CertMgrRefreshCACertificatesAndCRLs_Task(ctx context.Context, r soap.RoundTripper, req *types.CertMgrRefreshCACertificatesAndCRLs_Task) (*types.CertMgrRefreshCACertificatesAndCRLs_TaskResponse, error) {
+	var reqBody, resBody CertMgrRefreshCACertificatesAndCRLs_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CertMgrRefreshCertificates_TaskBody struct {
+	Req    *types.CertMgrRefreshCertificates_Task         `xml:"urn:vim25 CertMgrRefreshCertificates_Task,omitempty"`
+	Res    *types.CertMgrRefreshCertificates_TaskResponse `xml:"urn:vim25 CertMgrRefreshCertificates_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CertMgrRefreshCertificates_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CertMgrRefreshCertificates_Task(ctx context.Context, r soap.RoundTripper, req *types.CertMgrRefreshCertificates_Task) (*types.CertMgrRefreshCertificates_TaskResponse, error) {
+	var reqBody, resBody CertMgrRefreshCertificates_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CertMgrRevokeCertificates_TaskBody struct {
+	Req    *types.CertMgrRevokeCertificates_Task         `xml:"urn:vim25 CertMgrRevokeCertificates_Task,omitempty"`
+	Res    *types.CertMgrRevokeCertificates_TaskResponse `xml:"urn:vim25 CertMgrRevokeCertificates_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CertMgrRevokeCertificates_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CertMgrRevokeCertificates_Task(ctx context.Context, r soap.RoundTripper, req *types.CertMgrRevokeCertificates_Task) (*types.CertMgrRevokeCertificates_TaskResponse, error) {
+	var reqBody, resBody CertMgrRevokeCertificates_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ChangeAccessModeBody struct {
+	Req    *types.ChangeAccessMode         `xml:"urn:vim25 ChangeAccessMode,omitempty"`
+	Res    *types.ChangeAccessModeResponse `xml:"urn:vim25 ChangeAccessModeResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ChangeAccessModeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ChangeAccessMode(ctx context.Context, r soap.RoundTripper, req *types.ChangeAccessMode) (*types.ChangeAccessModeResponse, error) {
+	var reqBody, resBody ChangeAccessModeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ChangeFileAttributesInGuestBody struct {
+	Req    *types.ChangeFileAttributesInGuest         `xml:"urn:vim25 ChangeFileAttributesInGuest,omitempty"`
+	Res    *types.ChangeFileAttributesInGuestResponse `xml:"urn:vim25 ChangeFileAttributesInGuestResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ChangeFileAttributesInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ChangeFileAttributesInGuest(ctx context.Context, r soap.RoundTripper, req *types.ChangeFileAttributesInGuest) (*types.ChangeFileAttributesInGuestResponse, error) {
+	var reqBody, resBody ChangeFileAttributesInGuestBody
+
+	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"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ChangeLockdownModeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ChangeLockdownMode(ctx context.Context, r soap.RoundTripper, req *types.ChangeLockdownMode) (*types.ChangeLockdownModeResponse, error) {
+	var reqBody, resBody ChangeLockdownModeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ChangeNFSUserPasswordBody struct {
+	Req    *types.ChangeNFSUserPassword         `xml:"urn:vim25 ChangeNFSUserPassword,omitempty"`
+	Res    *types.ChangeNFSUserPasswordResponse `xml:"urn:vim25 ChangeNFSUserPasswordResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ChangeNFSUserPasswordBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ChangeNFSUserPassword(ctx context.Context, r soap.RoundTripper, req *types.ChangeNFSUserPassword) (*types.ChangeNFSUserPasswordResponse, error) {
+	var reqBody, resBody ChangeNFSUserPasswordBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ChangeOwnerBody struct {
+	Req    *types.ChangeOwner         `xml:"urn:vim25 ChangeOwner,omitempty"`
+	Res    *types.ChangeOwnerResponse `xml:"urn:vim25 ChangeOwnerResponse,omitempty"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ChangeOwnerBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ChangeOwner(ctx context.Context, r soap.RoundTripper, req *types.ChangeOwner) (*types.ChangeOwnerResponse, error) {
+	var reqBody, resBody ChangeOwnerBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CheckAddHostEvc_TaskBody struct {
+	Req    *types.CheckAddHostEvc_Task         `xml:"urn:vim25 CheckAddHostEvc_Task,omitempty"`
+	Res    *types.CheckAddHostEvc_TaskResponse `xml:"urn:vim25 CheckAddHostEvc_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CheckAddHostEvc_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CheckAddHostEvc_Task(ctx context.Context, r soap.RoundTripper, req *types.CheckAddHostEvc_Task) (*types.CheckAddHostEvc_TaskResponse, error) {
+	var reqBody, resBody CheckAddHostEvc_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CheckAnswerFileStatus_TaskBody struct {
+	Req    *types.CheckAnswerFileStatus_Task         `xml:"urn:vim25 CheckAnswerFileStatus_Task,omitempty"`
+	Res    *types.CheckAnswerFileStatus_TaskResponse `xml:"urn:vim25 CheckAnswerFileStatus_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CheckAnswerFileStatus_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CheckAnswerFileStatus_Task(ctx context.Context, r soap.RoundTripper, req *types.CheckAnswerFileStatus_Task) (*types.CheckAnswerFileStatus_TaskResponse, error) {
+	var reqBody, resBody CheckAnswerFileStatus_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"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CheckCompatibility_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CheckCompatibility_Task(ctx context.Context, r soap.RoundTripper, req *types.CheckCompatibility_Task) (*types.CheckCompatibility_TaskResponse, error) {
+	var reqBody, resBody CheckCompatibility_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CheckCompliance_TaskBody struct {
+	Req    *types.CheckCompliance_Task         `xml:"urn:vim25 CheckCompliance_Task,omitempty"`
+	Res    *types.CheckCompliance_TaskResponse `xml:"urn:vim25 CheckCompliance_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CheckCompliance_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CheckCompliance_Task(ctx context.Context, r soap.RoundTripper, req *types.CheckCompliance_Task) (*types.CheckCompliance_TaskResponse, error) {
+	var reqBody, resBody CheckCompliance_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CheckConfigureEvcMode_TaskBody struct {
+	Req    *types.CheckConfigureEvcMode_Task         `xml:"urn:vim25 CheckConfigureEvcMode_Task,omitempty"`
+	Res    *types.CheckConfigureEvcMode_TaskResponse `xml:"urn:vim25 CheckConfigureEvcMode_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CheckConfigureEvcMode_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CheckConfigureEvcMode_Task(ctx context.Context, r soap.RoundTripper, req *types.CheckConfigureEvcMode_Task) (*types.CheckConfigureEvcMode_TaskResponse, error) {
+	var reqBody, resBody CheckConfigureEvcMode_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CheckCustomizationResourcesBody struct {
+	Req    *types.CheckCustomizationResources         `xml:"urn:vim25 CheckCustomizationResources,omitempty"`
+	Res    *types.CheckCustomizationResourcesResponse `xml:"urn:vim25 CheckCustomizationResourcesResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CheckCustomizationResourcesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CheckCustomizationResources(ctx context.Context, r soap.RoundTripper, req *types.CheckCustomizationResources) (*types.CheckCustomizationResourcesResponse, error) {
+	var reqBody, resBody CheckCustomizationResourcesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CheckCustomizationSpecBody struct {
+	Req    *types.CheckCustomizationSpec         `xml:"urn:vim25 CheckCustomizationSpec,omitempty"`
+	Res    *types.CheckCustomizationSpecResponse `xml:"urn:vim25 CheckCustomizationSpecResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CheckCustomizationSpecBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CheckCustomizationSpec(ctx context.Context, r soap.RoundTripper, req *types.CheckCustomizationSpec) (*types.CheckCustomizationSpecResponse, error) {
+	var reqBody, resBody CheckCustomizationSpecBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CheckForUpdatesBody struct {
+	Req    *types.CheckForUpdates         `xml:"urn:vim25 CheckForUpdates,omitempty"`
+	Res    *types.CheckForUpdatesResponse `xml:"urn:vim25 CheckForUpdatesResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CheckForUpdatesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CheckForUpdates(ctx context.Context, r soap.RoundTripper, req *types.CheckForUpdates) (*types.CheckForUpdatesResponse, error) {
+	var reqBody, resBody CheckForUpdatesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CheckHostPatch_TaskBody struct {
+	Req    *types.CheckHostPatch_Task         `xml:"urn:vim25 CheckHostPatch_Task,omitempty"`
+	Res    *types.CheckHostPatch_TaskResponse `xml:"urn:vim25 CheckHostPatch_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CheckHostPatch_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CheckHostPatch_Task(ctx context.Context, r soap.RoundTripper, req *types.CheckHostPatch_Task) (*types.CheckHostPatch_TaskResponse, error) {
+	var reqBody, resBody CheckHostPatch_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"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CheckLicenseFeatureBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CheckLicenseFeature(ctx context.Context, r soap.RoundTripper, req *types.CheckLicenseFeature) (*types.CheckLicenseFeatureResponse, error) {
+	var reqBody, resBody CheckLicenseFeatureBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CheckMigrate_TaskBody struct {
+	Req    *types.CheckMigrate_Task         `xml:"urn:vim25 CheckMigrate_Task,omitempty"`
+	Res    *types.CheckMigrate_TaskResponse `xml:"urn:vim25 CheckMigrate_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CheckMigrate_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CheckMigrate_Task(ctx context.Context, r soap.RoundTripper, req *types.CheckMigrate_Task) (*types.CheckMigrate_TaskResponse, error) {
+	var reqBody, resBody CheckMigrate_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"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CheckProfileCompliance_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CheckProfileCompliance_Task(ctx context.Context, r soap.RoundTripper, req *types.CheckProfileCompliance_Task) (*types.CheckProfileCompliance_TaskResponse, error) {
+	var reqBody, resBody CheckProfileCompliance_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CheckRelocate_TaskBody struct {
+	Req    *types.CheckRelocate_Task         `xml:"urn:vim25 CheckRelocate_Task,omitempty"`
+	Res    *types.CheckRelocate_TaskResponse `xml:"urn:vim25 CheckRelocate_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CheckRelocate_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CheckRelocate_Task(ctx context.Context, r soap.RoundTripper, req *types.CheckRelocate_Task) (*types.CheckRelocate_TaskResponse, error) {
+	var reqBody, resBody CheckRelocate_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"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ClearComplianceStatusBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ClearComplianceStatus(ctx context.Context, r soap.RoundTripper, req *types.ClearComplianceStatus) (*types.ClearComplianceStatusResponse, error) {
+	var reqBody, resBody ClearComplianceStatusBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ClearNFSUserBody struct {
+	Req    *types.ClearNFSUser         `xml:"urn:vim25 ClearNFSUser,omitempty"`
+	Res    *types.ClearNFSUserResponse `xml:"urn:vim25 ClearNFSUserResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ClearNFSUserBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ClearNFSUser(ctx context.Context, r soap.RoundTripper, req *types.ClearNFSUser) (*types.ClearNFSUserResponse, error) {
+	var reqBody, resBody ClearNFSUserBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ClearSystemEventLogBody struct {
+	Req    *types.ClearSystemEventLog         `xml:"urn:vim25 ClearSystemEventLog,omitempty"`
+	Res    *types.ClearSystemEventLogResponse `xml:"urn:vim25 ClearSystemEventLogResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ClearSystemEventLogBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ClearSystemEventLog(ctx context.Context, r soap.RoundTripper, req *types.ClearSystemEventLog) (*types.ClearSystemEventLogResponse, error) {
+	var reqBody, resBody ClearSystemEventLogBody
+
+	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"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CloneSessionBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CloneSession(ctx context.Context, r soap.RoundTripper, req *types.CloneSession) (*types.CloneSessionResponse, error) {
+	var reqBody, resBody CloneSessionBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CloneVApp_TaskBody struct {
+	Req    *types.CloneVApp_Task         `xml:"urn:vim25 CloneVApp_Task,omitempty"`
+	Res    *types.CloneVApp_TaskResponse `xml:"urn:vim25 CloneVApp_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CloneVApp_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CloneVApp_Task(ctx context.Context, r soap.RoundTripper, req *types.CloneVApp_Task) (*types.CloneVApp_TaskResponse, error) {
+	var reqBody, resBody CloneVApp_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CloneVM_TaskBody struct {
+	Req    *types.CloneVM_Task         `xml:"urn:vim25 CloneVM_Task,omitempty"`
+	Res    *types.CloneVM_TaskResponse `xml:"urn:vim25 CloneVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CloneVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CloneVM_Task(ctx context.Context, r soap.RoundTripper, req *types.CloneVM_Task) (*types.CloneVM_TaskResponse, error) {
+	var reqBody, resBody CloneVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CloneVStorageObject_TaskBody struct {
+	Req    *types.CloneVStorageObject_Task         `xml:"urn:vim25 CloneVStorageObject_Task,omitempty"`
+	Res    *types.CloneVStorageObject_TaskResponse `xml:"urn:vim25 CloneVStorageObject_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CloneVStorageObject_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CloneVStorageObject_Task(ctx context.Context, r soap.RoundTripper, req *types.CloneVStorageObject_Task) (*types.CloneVStorageObject_TaskResponse, error) {
+	var reqBody, resBody CloneVStorageObject_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CloseInventoryViewFolderBody struct {
+	Req    *types.CloseInventoryViewFolder         `xml:"urn:vim25 CloseInventoryViewFolder,omitempty"`
+	Res    *types.CloseInventoryViewFolderResponse `xml:"urn:vim25 CloseInventoryViewFolderResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CloseInventoryViewFolderBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CloseInventoryViewFolder(ctx context.Context, r soap.RoundTripper, req *types.CloseInventoryViewFolder) (*types.CloseInventoryViewFolderResponse, error) {
+	var reqBody, resBody CloseInventoryViewFolderBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ClusterEnterMaintenanceModeBody struct {
+	Req    *types.ClusterEnterMaintenanceMode         `xml:"urn:vim25 ClusterEnterMaintenanceMode,omitempty"`
+	Res    *types.ClusterEnterMaintenanceModeResponse `xml:"urn:vim25 ClusterEnterMaintenanceModeResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ClusterEnterMaintenanceModeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ClusterEnterMaintenanceMode(ctx context.Context, r soap.RoundTripper, req *types.ClusterEnterMaintenanceMode) (*types.ClusterEnterMaintenanceModeResponse, error) {
+	var reqBody, resBody ClusterEnterMaintenanceModeBody
+
+	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"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ComputeDiskPartitionInfoBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ComputeDiskPartitionInfo(ctx context.Context, r soap.RoundTripper, req *types.ComputeDiskPartitionInfo) (*types.ComputeDiskPartitionInfoResponse, error) {
+	var reqBody, resBody ComputeDiskPartitionInfoBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ComputeDiskPartitionInfoForResizeBody struct {
+	Req    *types.ComputeDiskPartitionInfoForResize         `xml:"urn:vim25 ComputeDiskPartitionInfoForResize,omitempty"`
+	Res    *types.ComputeDiskPartitionInfoForResizeResponse `xml:"urn:vim25 ComputeDiskPartitionInfoForResizeResponse,omitempty"`
+	Fault_ *soap.Fault                                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ComputeDiskPartitionInfoForResizeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ComputeDiskPartitionInfoForResize(ctx context.Context, r soap.RoundTripper, req *types.ComputeDiskPartitionInfoForResize) (*types.ComputeDiskPartitionInfoForResizeResponse, error) {
+	var reqBody, resBody ComputeDiskPartitionInfoForResizeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ConfigureCryptoKeyBody struct {
+	Req    *types.ConfigureCryptoKey         `xml:"urn:vim25 ConfigureCryptoKey,omitempty"`
+	Res    *types.ConfigureCryptoKeyResponse `xml:"urn:vim25 ConfigureCryptoKeyResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ConfigureCryptoKeyBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ConfigureCryptoKey(ctx context.Context, r soap.RoundTripper, req *types.ConfigureCryptoKey) (*types.ConfigureCryptoKeyResponse, error) {
+	var reqBody, resBody ConfigureCryptoKeyBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ConfigureDatastoreIORM_TaskBody struct {
+	Req    *types.ConfigureDatastoreIORM_Task         `xml:"urn:vim25 ConfigureDatastoreIORM_Task,omitempty"`
+	Res    *types.ConfigureDatastoreIORM_TaskResponse `xml:"urn:vim25 ConfigureDatastoreIORM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ConfigureDatastoreIORM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ConfigureDatastoreIORM_Task(ctx context.Context, r soap.RoundTripper, req *types.ConfigureDatastoreIORM_Task) (*types.ConfigureDatastoreIORM_TaskResponse, error) {
+	var reqBody, resBody ConfigureDatastoreIORM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ConfigureDatastorePrincipalBody struct {
+	Req    *types.ConfigureDatastorePrincipal         `xml:"urn:vim25 ConfigureDatastorePrincipal,omitempty"`
+	Res    *types.ConfigureDatastorePrincipalResponse `xml:"urn:vim25 ConfigureDatastorePrincipalResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ConfigureDatastorePrincipalBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ConfigureDatastorePrincipal(ctx context.Context, r soap.RoundTripper, req *types.ConfigureDatastorePrincipal) (*types.ConfigureDatastorePrincipalResponse, error) {
+	var reqBody, resBody ConfigureDatastorePrincipalBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ConfigureEvcMode_TaskBody struct {
+	Req    *types.ConfigureEvcMode_Task         `xml:"urn:vim25 ConfigureEvcMode_Task,omitempty"`
+	Res    *types.ConfigureEvcMode_TaskResponse `xml:"urn:vim25 ConfigureEvcMode_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ConfigureEvcMode_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ConfigureEvcMode_Task(ctx context.Context, r soap.RoundTripper, req *types.ConfigureEvcMode_Task) (*types.ConfigureEvcMode_TaskResponse, error) {
+	var reqBody, resBody ConfigureEvcMode_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ConfigureHostCache_TaskBody struct {
+	Req    *types.ConfigureHostCache_Task         `xml:"urn:vim25 ConfigureHostCache_Task,omitempty"`
+	Res    *types.ConfigureHostCache_TaskResponse `xml:"urn:vim25 ConfigureHostCache_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ConfigureHostCache_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ConfigureHostCache_Task(ctx context.Context, r soap.RoundTripper, req *types.ConfigureHostCache_Task) (*types.ConfigureHostCache_TaskResponse, error) {
+	var reqBody, resBody ConfigureHostCache_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ConfigureLicenseSourceBody struct {
+	Req    *types.ConfigureLicenseSource         `xml:"urn:vim25 ConfigureLicenseSource,omitempty"`
+	Res    *types.ConfigureLicenseSourceResponse `xml:"urn:vim25 ConfigureLicenseSourceResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ConfigureLicenseSourceBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ConfigureLicenseSource(ctx context.Context, r soap.RoundTripper, req *types.ConfigureLicenseSource) (*types.ConfigureLicenseSourceResponse, error) {
+	var reqBody, resBody ConfigureLicenseSourceBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ConfigurePowerPolicyBody struct {
+	Req    *types.ConfigurePowerPolicy         `xml:"urn:vim25 ConfigurePowerPolicy,omitempty"`
+	Res    *types.ConfigurePowerPolicyResponse `xml:"urn:vim25 ConfigurePowerPolicyResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ConfigurePowerPolicyBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ConfigurePowerPolicy(ctx context.Context, r soap.RoundTripper, req *types.ConfigurePowerPolicy) (*types.ConfigurePowerPolicyResponse, error) {
+	var reqBody, resBody ConfigurePowerPolicyBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ConfigureStorageDrsForPod_TaskBody struct {
+	Req    *types.ConfigureStorageDrsForPod_Task         `xml:"urn:vim25 ConfigureStorageDrsForPod_Task,omitempty"`
+	Res    *types.ConfigureStorageDrsForPod_TaskResponse `xml:"urn:vim25 ConfigureStorageDrsForPod_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ConfigureStorageDrsForPod_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ConfigureStorageDrsForPod_Task(ctx context.Context, r soap.RoundTripper, req *types.ConfigureStorageDrsForPod_Task) (*types.ConfigureStorageDrsForPod_TaskResponse, error) {
+	var reqBody, resBody ConfigureStorageDrsForPod_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ConfigureVFlashResourceEx_TaskBody struct {
+	Req    *types.ConfigureVFlashResourceEx_Task         `xml:"urn:vim25 ConfigureVFlashResourceEx_Task,omitempty"`
+	Res    *types.ConfigureVFlashResourceEx_TaskResponse `xml:"urn:vim25 ConfigureVFlashResourceEx_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ConfigureVFlashResourceEx_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ConfigureVFlashResourceEx_Task(ctx context.Context, r soap.RoundTripper, req *types.ConfigureVFlashResourceEx_Task) (*types.ConfigureVFlashResourceEx_TaskResponse, error) {
+	var reqBody, resBody ConfigureVFlashResourceEx_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ConsolidateVMDisks_TaskBody struct {
+	Req    *types.ConsolidateVMDisks_Task         `xml:"urn:vim25 ConsolidateVMDisks_Task,omitempty"`
+	Res    *types.ConsolidateVMDisks_TaskResponse `xml:"urn:vim25 ConsolidateVMDisks_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ConsolidateVMDisks_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ConsolidateVMDisks_Task(ctx context.Context, r soap.RoundTripper, req *types.ConsolidateVMDisks_Task) (*types.ConsolidateVMDisks_TaskResponse, error) {
+	var reqBody, resBody ConsolidateVMDisks_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ContinueRetrievePropertiesExBody struct {
+	Req    *types.ContinueRetrievePropertiesEx         `xml:"urn:vim25 ContinueRetrievePropertiesEx,omitempty"`
+	Res    *types.ContinueRetrievePropertiesExResponse `xml:"urn:vim25 ContinueRetrievePropertiesExResponse,omitempty"`
+	Fault_ *soap.Fault                                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ContinueRetrievePropertiesExBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ContinueRetrievePropertiesEx(ctx context.Context, r soap.RoundTripper, req *types.ContinueRetrievePropertiesEx) (*types.ContinueRetrievePropertiesExResponse, error) {
+	var reqBody, resBody ContinueRetrievePropertiesExBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ConvertNamespacePathToUuidPathBody struct {
+	Req    *types.ConvertNamespacePathToUuidPath         `xml:"urn:vim25 ConvertNamespacePathToUuidPath,omitempty"`
+	Res    *types.ConvertNamespacePathToUuidPathResponse `xml:"urn:vim25 ConvertNamespacePathToUuidPathResponse,omitempty"`
+	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ConvertNamespacePathToUuidPathBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ConvertNamespacePathToUuidPath(ctx context.Context, r soap.RoundTripper, req *types.ConvertNamespacePathToUuidPath) (*types.ConvertNamespacePathToUuidPathResponse, error) {
+	var reqBody, resBody ConvertNamespacePathToUuidPathBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CopyDatastoreFile_TaskBody struct {
+	Req    *types.CopyDatastoreFile_Task         `xml:"urn:vim25 CopyDatastoreFile_Task,omitempty"`
+	Res    *types.CopyDatastoreFile_TaskResponse `xml:"urn:vim25 CopyDatastoreFile_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CopyDatastoreFile_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CopyDatastoreFile_Task(ctx context.Context, r soap.RoundTripper, req *types.CopyDatastoreFile_Task) (*types.CopyDatastoreFile_TaskResponse, error) {
+	var reqBody, resBody CopyDatastoreFile_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CopyVirtualDisk_TaskBody struct {
+	Req    *types.CopyVirtualDisk_Task         `xml:"urn:vim25 CopyVirtualDisk_Task,omitempty"`
+	Res    *types.CopyVirtualDisk_TaskResponse `xml:"urn:vim25 CopyVirtualDisk_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CopyVirtualDisk_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CopyVirtualDisk_Task(ctx context.Context, r soap.RoundTripper, req *types.CopyVirtualDisk_Task) (*types.CopyVirtualDisk_TaskResponse, error) {
+	var reqBody, resBody CopyVirtualDisk_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateAlarmBody struct {
+	Req    *types.CreateAlarm         `xml:"urn:vim25 CreateAlarm,omitempty"`
+	Res    *types.CreateAlarmResponse `xml:"urn:vim25 CreateAlarmResponse,omitempty"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateAlarmBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateAlarm(ctx context.Context, r soap.RoundTripper, req *types.CreateAlarm) (*types.CreateAlarmResponse, error) {
+	var reqBody, resBody CreateAlarmBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateChildVM_TaskBody struct {
+	Req    *types.CreateChildVM_Task         `xml:"urn:vim25 CreateChildVM_Task,omitempty"`
+	Res    *types.CreateChildVM_TaskResponse `xml:"urn:vim25 CreateChildVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateChildVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateChildVM_Task(ctx context.Context, r soap.RoundTripper, req *types.CreateChildVM_Task) (*types.CreateChildVM_TaskResponse, error) {
+	var reqBody, resBody CreateChildVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateClusterBody struct {
+	Req    *types.CreateCluster         `xml:"urn:vim25 CreateCluster,omitempty"`
+	Res    *types.CreateClusterResponse `xml:"urn:vim25 CreateClusterResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateClusterBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateCluster(ctx context.Context, r soap.RoundTripper, req *types.CreateCluster) (*types.CreateClusterResponse, error) {
+	var reqBody, resBody CreateClusterBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateClusterExBody struct {
+	Req    *types.CreateClusterEx         `xml:"urn:vim25 CreateClusterEx,omitempty"`
+	Res    *types.CreateClusterExResponse `xml:"urn:vim25 CreateClusterExResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateClusterExBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateClusterEx(ctx context.Context, r soap.RoundTripper, req *types.CreateClusterEx) (*types.CreateClusterExResponse, error) {
+	var reqBody, resBody CreateClusterExBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateCollectorForEventsBody struct {
+	Req    *types.CreateCollectorForEvents         `xml:"urn:vim25 CreateCollectorForEvents,omitempty"`
+	Res    *types.CreateCollectorForEventsResponse `xml:"urn:vim25 CreateCollectorForEventsResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateCollectorForEventsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateCollectorForEvents(ctx context.Context, r soap.RoundTripper, req *types.CreateCollectorForEvents) (*types.CreateCollectorForEventsResponse, error) {
+	var reqBody, resBody CreateCollectorForEventsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateCollectorForTasksBody struct {
+	Req    *types.CreateCollectorForTasks         `xml:"urn:vim25 CreateCollectorForTasks,omitempty"`
+	Res    *types.CreateCollectorForTasksResponse `xml:"urn:vim25 CreateCollectorForTasksResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateCollectorForTasksBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateCollectorForTasks(ctx context.Context, r soap.RoundTripper, req *types.CreateCollectorForTasks) (*types.CreateCollectorForTasksResponse, error) {
+	var reqBody, resBody CreateCollectorForTasksBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateContainerViewBody struct {
+	Req    *types.CreateContainerView         `xml:"urn:vim25 CreateContainerView,omitempty"`
+	Res    *types.CreateContainerViewResponse `xml:"urn:vim25 CreateContainerViewResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateContainerViewBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateContainerView(ctx context.Context, r soap.RoundTripper, req *types.CreateContainerView) (*types.CreateContainerViewResponse, error) {
+	var reqBody, resBody CreateContainerViewBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateCustomizationSpecBody struct {
+	Req    *types.CreateCustomizationSpec         `xml:"urn:vim25 CreateCustomizationSpec,omitempty"`
+	Res    *types.CreateCustomizationSpecResponse `xml:"urn:vim25 CreateCustomizationSpecResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateCustomizationSpecBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateCustomizationSpec(ctx context.Context, r soap.RoundTripper, req *types.CreateCustomizationSpec) (*types.CreateCustomizationSpecResponse, error) {
+	var reqBody, resBody CreateCustomizationSpecBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateDVPortgroup_TaskBody struct {
+	Req    *types.CreateDVPortgroup_Task         `xml:"urn:vim25 CreateDVPortgroup_Task,omitempty"`
+	Res    *types.CreateDVPortgroup_TaskResponse `xml:"urn:vim25 CreateDVPortgroup_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateDVPortgroup_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateDVPortgroup_Task(ctx context.Context, r soap.RoundTripper, req *types.CreateDVPortgroup_Task) (*types.CreateDVPortgroup_TaskResponse, error) {
+	var reqBody, resBody CreateDVPortgroup_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateDVS_TaskBody struct {
+	Req    *types.CreateDVS_Task         `xml:"urn:vim25 CreateDVS_Task,omitempty"`
+	Res    *types.CreateDVS_TaskResponse `xml:"urn:vim25 CreateDVS_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateDVS_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateDVS_Task(ctx context.Context, r soap.RoundTripper, req *types.CreateDVS_Task) (*types.CreateDVS_TaskResponse, error) {
+	var reqBody, resBody CreateDVS_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateDatacenterBody struct {
+	Req    *types.CreateDatacenter         `xml:"urn:vim25 CreateDatacenter,omitempty"`
+	Res    *types.CreateDatacenterResponse `xml:"urn:vim25 CreateDatacenterResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateDatacenterBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateDatacenter(ctx context.Context, r soap.RoundTripper, req *types.CreateDatacenter) (*types.CreateDatacenterResponse, error) {
+	var reqBody, resBody CreateDatacenterBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateDefaultProfileBody struct {
+	Req    *types.CreateDefaultProfile         `xml:"urn:vim25 CreateDefaultProfile,omitempty"`
+	Res    *types.CreateDefaultProfileResponse `xml:"urn:vim25 CreateDefaultProfileResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateDefaultProfileBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateDefaultProfile(ctx context.Context, r soap.RoundTripper, req *types.CreateDefaultProfile) (*types.CreateDefaultProfileResponse, error) {
+	var reqBody, resBody CreateDefaultProfileBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateDescriptorBody struct {
+	Req    *types.CreateDescriptor         `xml:"urn:vim25 CreateDescriptor,omitempty"`
+	Res    *types.CreateDescriptorResponse `xml:"urn:vim25 CreateDescriptorResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateDescriptorBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateDescriptor(ctx context.Context, r soap.RoundTripper, req *types.CreateDescriptor) (*types.CreateDescriptorResponse, error) {
+	var reqBody, resBody CreateDescriptorBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateDiagnosticPartitionBody struct {
+	Req    *types.CreateDiagnosticPartition         `xml:"urn:vim25 CreateDiagnosticPartition,omitempty"`
+	Res    *types.CreateDiagnosticPartitionResponse `xml:"urn:vim25 CreateDiagnosticPartitionResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateDiagnosticPartitionBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateDiagnosticPartition(ctx context.Context, r soap.RoundTripper, req *types.CreateDiagnosticPartition) (*types.CreateDiagnosticPartitionResponse, error) {
+	var reqBody, resBody CreateDiagnosticPartitionBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateDirectoryBody struct {
+	Req    *types.CreateDirectory         `xml:"urn:vim25 CreateDirectory,omitempty"`
+	Res    *types.CreateDirectoryResponse `xml:"urn:vim25 CreateDirectoryResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateDirectoryBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateDirectory(ctx context.Context, r soap.RoundTripper, req *types.CreateDirectory) (*types.CreateDirectoryResponse, error) {
+	var reqBody, resBody CreateDirectoryBody
+
+	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"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateDisk_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateDisk_Task(ctx context.Context, r soap.RoundTripper, req *types.CreateDisk_Task) (*types.CreateDisk_TaskResponse, error) {
+	var reqBody, resBody CreateDisk_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateFilterBody struct {
+	Req    *types.CreateFilter         `xml:"urn:vim25 CreateFilter,omitempty"`
+	Res    *types.CreateFilterResponse `xml:"urn:vim25 CreateFilterResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateFilterBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateFilter(ctx context.Context, r soap.RoundTripper, req *types.CreateFilter) (*types.CreateFilterResponse, error) {
+	var reqBody, resBody CreateFilterBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateFolderBody struct {
+	Req    *types.CreateFolder         `xml:"urn:vim25 CreateFolder,omitempty"`
+	Res    *types.CreateFolderResponse `xml:"urn:vim25 CreateFolderResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateFolderBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateFolder(ctx context.Context, r soap.RoundTripper, req *types.CreateFolder) (*types.CreateFolderResponse, error) {
+	var reqBody, resBody CreateFolderBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateGroupBody struct {
+	Req    *types.CreateGroup         `xml:"urn:vim25 CreateGroup,omitempty"`
+	Res    *types.CreateGroupResponse `xml:"urn:vim25 CreateGroupResponse,omitempty"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateGroupBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateGroup(ctx context.Context, r soap.RoundTripper, req *types.CreateGroup) (*types.CreateGroupResponse, error) {
+	var reqBody, resBody CreateGroupBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateImportSpecBody struct {
+	Req    *types.CreateImportSpec         `xml:"urn:vim25 CreateImportSpec,omitempty"`
+	Res    *types.CreateImportSpecResponse `xml:"urn:vim25 CreateImportSpecResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateImportSpecBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateImportSpec(ctx context.Context, r soap.RoundTripper, req *types.CreateImportSpec) (*types.CreateImportSpecResponse, error) {
+	var reqBody, resBody CreateImportSpecBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateInventoryViewBody struct {
+	Req    *types.CreateInventoryView         `xml:"urn:vim25 CreateInventoryView,omitempty"`
+	Res    *types.CreateInventoryViewResponse `xml:"urn:vim25 CreateInventoryViewResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateInventoryViewBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateInventoryView(ctx context.Context, r soap.RoundTripper, req *types.CreateInventoryView) (*types.CreateInventoryViewResponse, error) {
+	var reqBody, resBody CreateInventoryViewBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateIpPoolBody struct {
+	Req    *types.CreateIpPool         `xml:"urn:vim25 CreateIpPool,omitempty"`
+	Res    *types.CreateIpPoolResponse `xml:"urn:vim25 CreateIpPoolResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateIpPoolBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateIpPool(ctx context.Context, r soap.RoundTripper, req *types.CreateIpPool) (*types.CreateIpPoolResponse, error) {
+	var reqBody, resBody CreateIpPoolBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateListViewBody struct {
+	Req    *types.CreateListView         `xml:"urn:vim25 CreateListView,omitempty"`
+	Res    *types.CreateListViewResponse `xml:"urn:vim25 CreateListViewResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateListViewBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateListView(ctx context.Context, r soap.RoundTripper, req *types.CreateListView) (*types.CreateListViewResponse, error) {
+	var reqBody, resBody CreateListViewBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateListViewFromViewBody struct {
+	Req    *types.CreateListViewFromView         `xml:"urn:vim25 CreateListViewFromView,omitempty"`
+	Res    *types.CreateListViewFromViewResponse `xml:"urn:vim25 CreateListViewFromViewResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateListViewFromViewBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateListViewFromView(ctx context.Context, r soap.RoundTripper, req *types.CreateListViewFromView) (*types.CreateListViewFromViewResponse, error) {
+	var reqBody, resBody CreateListViewFromViewBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateLocalDatastoreBody struct {
+	Req    *types.CreateLocalDatastore         `xml:"urn:vim25 CreateLocalDatastore,omitempty"`
+	Res    *types.CreateLocalDatastoreResponse `xml:"urn:vim25 CreateLocalDatastoreResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateLocalDatastoreBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateLocalDatastore(ctx context.Context, r soap.RoundTripper, req *types.CreateLocalDatastore) (*types.CreateLocalDatastoreResponse, error) {
+	var reqBody, resBody CreateLocalDatastoreBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateNasDatastoreBody struct {
+	Req    *types.CreateNasDatastore         `xml:"urn:vim25 CreateNasDatastore,omitempty"`
+	Res    *types.CreateNasDatastoreResponse `xml:"urn:vim25 CreateNasDatastoreResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateNasDatastoreBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateNasDatastore(ctx context.Context, r soap.RoundTripper, req *types.CreateNasDatastore) (*types.CreateNasDatastoreResponse, error) {
+	var reqBody, resBody CreateNasDatastoreBody
+
+	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"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateObjectScheduledTaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateObjectScheduledTask(ctx context.Context, r soap.RoundTripper, req *types.CreateObjectScheduledTask) (*types.CreateObjectScheduledTaskResponse, error) {
+	var reqBody, resBody CreateObjectScheduledTaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreatePerfIntervalBody struct {
+	Req    *types.CreatePerfInterval         `xml:"urn:vim25 CreatePerfInterval,omitempty"`
+	Res    *types.CreatePerfIntervalResponse `xml:"urn:vim25 CreatePerfIntervalResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreatePerfIntervalBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreatePerfInterval(ctx context.Context, r soap.RoundTripper, req *types.CreatePerfInterval) (*types.CreatePerfIntervalResponse, error) {
+	var reqBody, resBody CreatePerfIntervalBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateProfileBody struct {
+	Req    *types.CreateProfile         `xml:"urn:vim25 CreateProfile,omitempty"`
+	Res    *types.CreateProfileResponse `xml:"urn:vim25 CreateProfileResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateProfileBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateProfile(ctx context.Context, r soap.RoundTripper, req *types.CreateProfile) (*types.CreateProfileResponse, error) {
+	var reqBody, resBody CreateProfileBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreatePropertyCollectorBody struct {
+	Req    *types.CreatePropertyCollector         `xml:"urn:vim25 CreatePropertyCollector,omitempty"`
+	Res    *types.CreatePropertyCollectorResponse `xml:"urn:vim25 CreatePropertyCollectorResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreatePropertyCollectorBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreatePropertyCollector(ctx context.Context, r soap.RoundTripper, req *types.CreatePropertyCollector) (*types.CreatePropertyCollectorResponse, error) {
+	var reqBody, resBody CreatePropertyCollectorBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateRegistryKeyInGuestBody struct {
+	Req    *types.CreateRegistryKeyInGuest         `xml:"urn:vim25 CreateRegistryKeyInGuest,omitempty"`
+	Res    *types.CreateRegistryKeyInGuestResponse `xml:"urn:vim25 CreateRegistryKeyInGuestResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateRegistryKeyInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateRegistryKeyInGuest(ctx context.Context, r soap.RoundTripper, req *types.CreateRegistryKeyInGuest) (*types.CreateRegistryKeyInGuestResponse, error) {
+	var reqBody, resBody CreateRegistryKeyInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateResourcePoolBody struct {
+	Req    *types.CreateResourcePool         `xml:"urn:vim25 CreateResourcePool,omitempty"`
+	Res    *types.CreateResourcePoolResponse `xml:"urn:vim25 CreateResourcePoolResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateResourcePoolBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateResourcePool(ctx context.Context, r soap.RoundTripper, req *types.CreateResourcePool) (*types.CreateResourcePoolResponse, error) {
+	var reqBody, resBody CreateResourcePoolBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateScheduledTaskBody struct {
+	Req    *types.CreateScheduledTask         `xml:"urn:vim25 CreateScheduledTask,omitempty"`
+	Res    *types.CreateScheduledTaskResponse `xml:"urn:vim25 CreateScheduledTaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateScheduledTaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateScheduledTask(ctx context.Context, r soap.RoundTripper, req *types.CreateScheduledTask) (*types.CreateScheduledTaskResponse, error) {
+	var reqBody, resBody CreateScheduledTaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateScreenshot_TaskBody struct {
+	Req    *types.CreateScreenshot_Task         `xml:"urn:vim25 CreateScreenshot_Task,omitempty"`
+	Res    *types.CreateScreenshot_TaskResponse `xml:"urn:vim25 CreateScreenshot_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateScreenshot_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateScreenshot_Task(ctx context.Context, r soap.RoundTripper, req *types.CreateScreenshot_Task) (*types.CreateScreenshot_TaskResponse, error) {
+	var reqBody, resBody CreateScreenshot_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateSecondaryVMEx_TaskBody struct {
+	Req    *types.CreateSecondaryVMEx_Task         `xml:"urn:vim25 CreateSecondaryVMEx_Task,omitempty"`
+	Res    *types.CreateSecondaryVMEx_TaskResponse `xml:"urn:vim25 CreateSecondaryVMEx_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateSecondaryVMEx_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateSecondaryVMEx_Task(ctx context.Context, r soap.RoundTripper, req *types.CreateSecondaryVMEx_Task) (*types.CreateSecondaryVMEx_TaskResponse, error) {
+	var reqBody, resBody CreateSecondaryVMEx_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateSecondaryVM_TaskBody struct {
+	Req    *types.CreateSecondaryVM_Task         `xml:"urn:vim25 CreateSecondaryVM_Task,omitempty"`
+	Res    *types.CreateSecondaryVM_TaskResponse `xml:"urn:vim25 CreateSecondaryVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateSecondaryVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateSecondaryVM_Task(ctx context.Context, r soap.RoundTripper, req *types.CreateSecondaryVM_Task) (*types.CreateSecondaryVM_TaskResponse, error) {
+	var reqBody, resBody CreateSecondaryVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateSnapshotEx_TaskBody struct {
+	Req    *types.CreateSnapshotEx_Task         `xml:"urn:vim25 CreateSnapshotEx_Task,omitempty"`
+	Res    *types.CreateSnapshotEx_TaskResponse `xml:"urn:vim25 CreateSnapshotEx_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateSnapshotEx_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateSnapshotEx_Task(ctx context.Context, r soap.RoundTripper, req *types.CreateSnapshotEx_Task) (*types.CreateSnapshotEx_TaskResponse, error) {
+	var reqBody, resBody CreateSnapshotEx_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateSnapshot_TaskBody struct {
+	Req    *types.CreateSnapshot_Task         `xml:"urn:vim25 CreateSnapshot_Task,omitempty"`
+	Res    *types.CreateSnapshot_TaskResponse `xml:"urn:vim25 CreateSnapshot_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateSnapshot_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateSnapshot_Task(ctx context.Context, r soap.RoundTripper, req *types.CreateSnapshot_Task) (*types.CreateSnapshot_TaskResponse, error) {
+	var reqBody, resBody CreateSnapshot_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateStoragePodBody struct {
+	Req    *types.CreateStoragePod         `xml:"urn:vim25 CreateStoragePod,omitempty"`
+	Res    *types.CreateStoragePodResponse `xml:"urn:vim25 CreateStoragePodResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateStoragePodBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateStoragePod(ctx context.Context, r soap.RoundTripper, req *types.CreateStoragePod) (*types.CreateStoragePodResponse, error) {
+	var reqBody, resBody CreateStoragePodBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateTaskBody struct {
+	Req    *types.CreateTask         `xml:"urn:vim25 CreateTask,omitempty"`
+	Res    *types.CreateTaskResponse `xml:"urn:vim25 CreateTaskResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateTaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateTask(ctx context.Context, r soap.RoundTripper, req *types.CreateTask) (*types.CreateTaskResponse, error) {
+	var reqBody, resBody CreateTaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateTemporaryDirectoryInGuestBody struct {
+	Req    *types.CreateTemporaryDirectoryInGuest         `xml:"urn:vim25 CreateTemporaryDirectoryInGuest,omitempty"`
+	Res    *types.CreateTemporaryDirectoryInGuestResponse `xml:"urn:vim25 CreateTemporaryDirectoryInGuestResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateTemporaryDirectoryInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateTemporaryDirectoryInGuest(ctx context.Context, r soap.RoundTripper, req *types.CreateTemporaryDirectoryInGuest) (*types.CreateTemporaryDirectoryInGuestResponse, error) {
+	var reqBody, resBody CreateTemporaryDirectoryInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateTemporaryFileInGuestBody struct {
+	Req    *types.CreateTemporaryFileInGuest         `xml:"urn:vim25 CreateTemporaryFileInGuest,omitempty"`
+	Res    *types.CreateTemporaryFileInGuestResponse `xml:"urn:vim25 CreateTemporaryFileInGuestResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateTemporaryFileInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateTemporaryFileInGuest(ctx context.Context, r soap.RoundTripper, req *types.CreateTemporaryFileInGuest) (*types.CreateTemporaryFileInGuestResponse, error) {
+	var reqBody, resBody CreateTemporaryFileInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateUserBody struct {
+	Req    *types.CreateUser         `xml:"urn:vim25 CreateUser,omitempty"`
+	Res    *types.CreateUserResponse `xml:"urn:vim25 CreateUserResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateUserBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateUser(ctx context.Context, r soap.RoundTripper, req *types.CreateUser) (*types.CreateUserResponse, error) {
+	var reqBody, resBody CreateUserBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateVAppBody struct {
+	Req    *types.CreateVApp         `xml:"urn:vim25 CreateVApp,omitempty"`
+	Res    *types.CreateVAppResponse `xml:"urn:vim25 CreateVAppResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateVAppBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateVApp(ctx context.Context, r soap.RoundTripper, req *types.CreateVApp) (*types.CreateVAppResponse, error) {
+	var reqBody, resBody CreateVAppBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateVM_TaskBody struct {
+	Req    *types.CreateVM_Task         `xml:"urn:vim25 CreateVM_Task,omitempty"`
+	Res    *types.CreateVM_TaskResponse `xml:"urn:vim25 CreateVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateVM_Task(ctx context.Context, r soap.RoundTripper, req *types.CreateVM_Task) (*types.CreateVM_TaskResponse, error) {
+	var reqBody, resBody CreateVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateVirtualDisk_TaskBody struct {
+	Req    *types.CreateVirtualDisk_Task         `xml:"urn:vim25 CreateVirtualDisk_Task,omitempty"`
+	Res    *types.CreateVirtualDisk_TaskResponse `xml:"urn:vim25 CreateVirtualDisk_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateVirtualDisk_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateVirtualDisk_Task(ctx context.Context, r soap.RoundTripper, req *types.CreateVirtualDisk_Task) (*types.CreateVirtualDisk_TaskResponse, error) {
+	var reqBody, resBody CreateVirtualDisk_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateVmfsDatastoreBody struct {
+	Req    *types.CreateVmfsDatastore         `xml:"urn:vim25 CreateVmfsDatastore,omitempty"`
+	Res    *types.CreateVmfsDatastoreResponse `xml:"urn:vim25 CreateVmfsDatastoreResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateVmfsDatastoreBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateVmfsDatastore(ctx context.Context, r soap.RoundTripper, req *types.CreateVmfsDatastore) (*types.CreateVmfsDatastoreResponse, error) {
+	var reqBody, resBody CreateVmfsDatastoreBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateVvolDatastoreBody struct {
+	Req    *types.CreateVvolDatastore         `xml:"urn:vim25 CreateVvolDatastore,omitempty"`
+	Res    *types.CreateVvolDatastoreResponse `xml:"urn:vim25 CreateVvolDatastoreResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateVvolDatastoreBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateVvolDatastore(ctx context.Context, r soap.RoundTripper, req *types.CreateVvolDatastore) (*types.CreateVvolDatastoreResponse, error) {
+	var reqBody, resBody CreateVvolDatastoreBody
+
+	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"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CurrentTimeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CurrentTime(ctx context.Context, r soap.RoundTripper, req *types.CurrentTime) (*types.CurrentTimeResponse, error) {
+	var reqBody, resBody CurrentTimeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CustomizationSpecItemToXmlBody struct {
+	Req    *types.CustomizationSpecItemToXml         `xml:"urn:vim25 CustomizationSpecItemToXml,omitempty"`
+	Res    *types.CustomizationSpecItemToXmlResponse `xml:"urn:vim25 CustomizationSpecItemToXmlResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CustomizationSpecItemToXmlBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CustomizationSpecItemToXml(ctx context.Context, r soap.RoundTripper, req *types.CustomizationSpecItemToXml) (*types.CustomizationSpecItemToXmlResponse, error) {
+	var reqBody, resBody CustomizationSpecItemToXmlBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CustomizeVM_TaskBody struct {
+	Req    *types.CustomizeVM_Task         `xml:"urn:vim25 CustomizeVM_Task,omitempty"`
+	Res    *types.CustomizeVM_TaskResponse `xml:"urn:vim25 CustomizeVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CustomizeVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CustomizeVM_Task(ctx context.Context, r soap.RoundTripper, req *types.CustomizeVM_Task) (*types.CustomizeVM_TaskResponse, error) {
+	var reqBody, resBody CustomizeVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DVPortgroupRollback_TaskBody struct {
+	Req    *types.DVPortgroupRollback_Task         `xml:"urn:vim25 DVPortgroupRollback_Task,omitempty"`
+	Res    *types.DVPortgroupRollback_TaskResponse `xml:"urn:vim25 DVPortgroupRollback_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DVPortgroupRollback_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DVPortgroupRollback_Task(ctx context.Context, r soap.RoundTripper, req *types.DVPortgroupRollback_Task) (*types.DVPortgroupRollback_TaskResponse, error) {
+	var reqBody, resBody DVPortgroupRollback_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DVSManagerExportEntity_TaskBody struct {
+	Req    *types.DVSManagerExportEntity_Task         `xml:"urn:vim25 DVSManagerExportEntity_Task,omitempty"`
+	Res    *types.DVSManagerExportEntity_TaskResponse `xml:"urn:vim25 DVSManagerExportEntity_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DVSManagerExportEntity_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DVSManagerExportEntity_Task(ctx context.Context, r soap.RoundTripper, req *types.DVSManagerExportEntity_Task) (*types.DVSManagerExportEntity_TaskResponse, error) {
+	var reqBody, resBody DVSManagerExportEntity_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DVSManagerImportEntity_TaskBody struct {
+	Req    *types.DVSManagerImportEntity_Task         `xml:"urn:vim25 DVSManagerImportEntity_Task,omitempty"`
+	Res    *types.DVSManagerImportEntity_TaskResponse `xml:"urn:vim25 DVSManagerImportEntity_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DVSManagerImportEntity_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DVSManagerImportEntity_Task(ctx context.Context, r soap.RoundTripper, req *types.DVSManagerImportEntity_Task) (*types.DVSManagerImportEntity_TaskResponse, error) {
+	var reqBody, resBody DVSManagerImportEntity_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DVSManagerLookupDvPortGroupBody struct {
+	Req    *types.DVSManagerLookupDvPortGroup         `xml:"urn:vim25 DVSManagerLookupDvPortGroup,omitempty"`
+	Res    *types.DVSManagerLookupDvPortGroupResponse `xml:"urn:vim25 DVSManagerLookupDvPortGroupResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DVSManagerLookupDvPortGroupBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DVSManagerLookupDvPortGroup(ctx context.Context, r soap.RoundTripper, req *types.DVSManagerLookupDvPortGroup) (*types.DVSManagerLookupDvPortGroupResponse, error) {
+	var reqBody, resBody DVSManagerLookupDvPortGroupBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DVSRollback_TaskBody struct {
+	Req    *types.DVSRollback_Task         `xml:"urn:vim25 DVSRollback_Task,omitempty"`
+	Res    *types.DVSRollback_TaskResponse `xml:"urn:vim25 DVSRollback_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DVSRollback_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DVSRollback_Task(ctx context.Context, r soap.RoundTripper, req *types.DVSRollback_Task) (*types.DVSRollback_TaskResponse, error) {
+	var reqBody, resBody DVSRollback_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DatastoreEnterMaintenanceModeBody struct {
+	Req    *types.DatastoreEnterMaintenanceMode         `xml:"urn:vim25 DatastoreEnterMaintenanceMode,omitempty"`
+	Res    *types.DatastoreEnterMaintenanceModeResponse `xml:"urn:vim25 DatastoreEnterMaintenanceModeResponse,omitempty"`
+	Fault_ *soap.Fault                                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DatastoreEnterMaintenanceModeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DatastoreEnterMaintenanceMode(ctx context.Context, r soap.RoundTripper, req *types.DatastoreEnterMaintenanceMode) (*types.DatastoreEnterMaintenanceModeResponse, error) {
+	var reqBody, resBody DatastoreEnterMaintenanceModeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DatastoreExitMaintenanceMode_TaskBody struct {
+	Req    *types.DatastoreExitMaintenanceMode_Task         `xml:"urn:vim25 DatastoreExitMaintenanceMode_Task,omitempty"`
+	Res    *types.DatastoreExitMaintenanceMode_TaskResponse `xml:"urn:vim25 DatastoreExitMaintenanceMode_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DatastoreExitMaintenanceMode_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DatastoreExitMaintenanceMode_Task(ctx context.Context, r soap.RoundTripper, req *types.DatastoreExitMaintenanceMode_Task) (*types.DatastoreExitMaintenanceMode_TaskResponse, error) {
+	var reqBody, resBody DatastoreExitMaintenanceMode_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DecodeLicenseBody struct {
+	Req    *types.DecodeLicense         `xml:"urn:vim25 DecodeLicense,omitempty"`
+	Res    *types.DecodeLicenseResponse `xml:"urn:vim25 DecodeLicenseResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DecodeLicenseBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DecodeLicense(ctx context.Context, r soap.RoundTripper, req *types.DecodeLicense) (*types.DecodeLicenseResponse, error) {
+	var reqBody, resBody DecodeLicenseBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DefragmentAllDisksBody struct {
+	Req    *types.DefragmentAllDisks         `xml:"urn:vim25 DefragmentAllDisks,omitempty"`
+	Res    *types.DefragmentAllDisksResponse `xml:"urn:vim25 DefragmentAllDisksResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DefragmentAllDisksBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DefragmentAllDisks(ctx context.Context, r soap.RoundTripper, req *types.DefragmentAllDisks) (*types.DefragmentAllDisksResponse, error) {
+	var reqBody, resBody DefragmentAllDisksBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DefragmentVirtualDisk_TaskBody struct {
+	Req    *types.DefragmentVirtualDisk_Task         `xml:"urn:vim25 DefragmentVirtualDisk_Task,omitempty"`
+	Res    *types.DefragmentVirtualDisk_TaskResponse `xml:"urn:vim25 DefragmentVirtualDisk_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DefragmentVirtualDisk_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DefragmentVirtualDisk_Task(ctx context.Context, r soap.RoundTripper, req *types.DefragmentVirtualDisk_Task) (*types.DefragmentVirtualDisk_TaskResponse, error) {
+	var reqBody, resBody DefragmentVirtualDisk_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DeleteCustomizationSpecBody struct {
+	Req    *types.DeleteCustomizationSpec         `xml:"urn:vim25 DeleteCustomizationSpec,omitempty"`
+	Res    *types.DeleteCustomizationSpecResponse `xml:"urn:vim25 DeleteCustomizationSpecResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeleteCustomizationSpecBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeleteCustomizationSpec(ctx context.Context, r soap.RoundTripper, req *types.DeleteCustomizationSpec) (*types.DeleteCustomizationSpecResponse, error) {
+	var reqBody, resBody DeleteCustomizationSpecBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DeleteDatastoreFile_TaskBody struct {
+	Req    *types.DeleteDatastoreFile_Task         `xml:"urn:vim25 DeleteDatastoreFile_Task,omitempty"`
+	Res    *types.DeleteDatastoreFile_TaskResponse `xml:"urn:vim25 DeleteDatastoreFile_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeleteDatastoreFile_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeleteDatastoreFile_Task(ctx context.Context, r soap.RoundTripper, req *types.DeleteDatastoreFile_Task) (*types.DeleteDatastoreFile_TaskResponse, error) {
+	var reqBody, resBody DeleteDatastoreFile_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DeleteDirectoryBody struct {
+	Req    *types.DeleteDirectory         `xml:"urn:vim25 DeleteDirectory,omitempty"`
+	Res    *types.DeleteDirectoryResponse `xml:"urn:vim25 DeleteDirectoryResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeleteDirectoryBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeleteDirectory(ctx context.Context, r soap.RoundTripper, req *types.DeleteDirectory) (*types.DeleteDirectoryResponse, error) {
+	var reqBody, resBody DeleteDirectoryBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DeleteDirectoryInGuestBody struct {
+	Req    *types.DeleteDirectoryInGuest         `xml:"urn:vim25 DeleteDirectoryInGuest,omitempty"`
+	Res    *types.DeleteDirectoryInGuestResponse `xml:"urn:vim25 DeleteDirectoryInGuestResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeleteDirectoryInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeleteDirectoryInGuest(ctx context.Context, r soap.RoundTripper, req *types.DeleteDirectoryInGuest) (*types.DeleteDirectoryInGuestResponse, error) {
+	var reqBody, resBody DeleteDirectoryInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DeleteFileBody struct {
+	Req    *types.DeleteFile         `xml:"urn:vim25 DeleteFile,omitempty"`
+	Res    *types.DeleteFileResponse `xml:"urn:vim25 DeleteFileResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeleteFileBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeleteFile(ctx context.Context, r soap.RoundTripper, req *types.DeleteFile) (*types.DeleteFileResponse, error) {
+	var reqBody, resBody DeleteFileBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DeleteFileInGuestBody struct {
+	Req    *types.DeleteFileInGuest         `xml:"urn:vim25 DeleteFileInGuest,omitempty"`
+	Res    *types.DeleteFileInGuestResponse `xml:"urn:vim25 DeleteFileInGuestResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeleteFileInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeleteFileInGuest(ctx context.Context, r soap.RoundTripper, req *types.DeleteFileInGuest) (*types.DeleteFileInGuestResponse, error) {
+	var reqBody, resBody DeleteFileInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DeleteHostSpecificationBody struct {
+	Req    *types.DeleteHostSpecification         `xml:"urn:vim25 DeleteHostSpecification,omitempty"`
+	Res    *types.DeleteHostSpecificationResponse `xml:"urn:vim25 DeleteHostSpecificationResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeleteHostSpecificationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeleteHostSpecification(ctx context.Context, r soap.RoundTripper, req *types.DeleteHostSpecification) (*types.DeleteHostSpecificationResponse, error) {
+	var reqBody, resBody DeleteHostSpecificationBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DeleteHostSubSpecificationBody struct {
+	Req    *types.DeleteHostSubSpecification         `xml:"urn:vim25 DeleteHostSubSpecification,omitempty"`
+	Res    *types.DeleteHostSubSpecificationResponse `xml:"urn:vim25 DeleteHostSubSpecificationResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeleteHostSubSpecificationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeleteHostSubSpecification(ctx context.Context, r soap.RoundTripper, req *types.DeleteHostSubSpecification) (*types.DeleteHostSubSpecificationResponse, error) {
+	var reqBody, resBody DeleteHostSubSpecificationBody
+
+	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"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeleteRegistryKeyInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeleteRegistryKeyInGuest(ctx context.Context, r soap.RoundTripper, req *types.DeleteRegistryKeyInGuest) (*types.DeleteRegistryKeyInGuestResponse, error) {
+	var reqBody, resBody DeleteRegistryKeyInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DeleteRegistryValueInGuestBody struct {
+	Req    *types.DeleteRegistryValueInGuest         `xml:"urn:vim25 DeleteRegistryValueInGuest,omitempty"`
+	Res    *types.DeleteRegistryValueInGuestResponse `xml:"urn:vim25 DeleteRegistryValueInGuestResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeleteRegistryValueInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeleteRegistryValueInGuest(ctx context.Context, r soap.RoundTripper, req *types.DeleteRegistryValueInGuest) (*types.DeleteRegistryValueInGuestResponse, error) {
+	var reqBody, resBody DeleteRegistryValueInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DeleteScsiLunStateBody struct {
+	Req    *types.DeleteScsiLunState         `xml:"urn:vim25 DeleteScsiLunState,omitempty"`
+	Res    *types.DeleteScsiLunStateResponse `xml:"urn:vim25 DeleteScsiLunStateResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeleteScsiLunStateBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeleteScsiLunState(ctx context.Context, r soap.RoundTripper, req *types.DeleteScsiLunState) (*types.DeleteScsiLunStateResponse, error) {
+	var reqBody, resBody DeleteScsiLunStateBody
+
+	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"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeleteVStorageObject_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeleteVStorageObject_Task(ctx context.Context, r soap.RoundTripper, req *types.DeleteVStorageObject_Task) (*types.DeleteVStorageObject_TaskResponse, error) {
+	var reqBody, resBody DeleteVStorageObject_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DeleteVffsVolumeStateBody struct {
+	Req    *types.DeleteVffsVolumeState         `xml:"urn:vim25 DeleteVffsVolumeState,omitempty"`
+	Res    *types.DeleteVffsVolumeStateResponse `xml:"urn:vim25 DeleteVffsVolumeStateResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeleteVffsVolumeStateBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeleteVffsVolumeState(ctx context.Context, r soap.RoundTripper, req *types.DeleteVffsVolumeState) (*types.DeleteVffsVolumeStateResponse, error) {
+	var reqBody, resBody DeleteVffsVolumeStateBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DeleteVirtualDisk_TaskBody struct {
+	Req    *types.DeleteVirtualDisk_Task         `xml:"urn:vim25 DeleteVirtualDisk_Task,omitempty"`
+	Res    *types.DeleteVirtualDisk_TaskResponse `xml:"urn:vim25 DeleteVirtualDisk_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeleteVirtualDisk_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeleteVirtualDisk_Task(ctx context.Context, r soap.RoundTripper, req *types.DeleteVirtualDisk_Task) (*types.DeleteVirtualDisk_TaskResponse, error) {
+	var reqBody, resBody DeleteVirtualDisk_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DeleteVmfsVolumeStateBody struct {
+	Req    *types.DeleteVmfsVolumeState         `xml:"urn:vim25 DeleteVmfsVolumeState,omitempty"`
+	Res    *types.DeleteVmfsVolumeStateResponse `xml:"urn:vim25 DeleteVmfsVolumeStateResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeleteVmfsVolumeStateBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeleteVmfsVolumeState(ctx context.Context, r soap.RoundTripper, req *types.DeleteVmfsVolumeState) (*types.DeleteVmfsVolumeStateResponse, error) {
+	var reqBody, resBody DeleteVmfsVolumeStateBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DeleteVsanObjectsBody struct {
+	Req    *types.DeleteVsanObjects         `xml:"urn:vim25 DeleteVsanObjects,omitempty"`
+	Res    *types.DeleteVsanObjectsResponse `xml:"urn:vim25 DeleteVsanObjectsResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeleteVsanObjectsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeleteVsanObjects(ctx context.Context, r soap.RoundTripper, req *types.DeleteVsanObjects) (*types.DeleteVsanObjectsResponse, error) {
+	var reqBody, resBody DeleteVsanObjectsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DeselectVnicBody struct {
+	Req    *types.DeselectVnic         `xml:"urn:vim25 DeselectVnic,omitempty"`
+	Res    *types.DeselectVnicResponse `xml:"urn:vim25 DeselectVnicResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeselectVnicBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeselectVnic(ctx context.Context, r soap.RoundTripper, req *types.DeselectVnic) (*types.DeselectVnicResponse, error) {
+	var reqBody, resBody DeselectVnicBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DeselectVnicForNicTypeBody struct {
+	Req    *types.DeselectVnicForNicType         `xml:"urn:vim25 DeselectVnicForNicType,omitempty"`
+	Res    *types.DeselectVnicForNicTypeResponse `xml:"urn:vim25 DeselectVnicForNicTypeResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeselectVnicForNicTypeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeselectVnicForNicType(ctx context.Context, r soap.RoundTripper, req *types.DeselectVnicForNicType) (*types.DeselectVnicForNicTypeResponse, error) {
+	var reqBody, resBody DeselectVnicForNicTypeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DestroyChildrenBody struct {
+	Req    *types.DestroyChildren         `xml:"urn:vim25 DestroyChildren,omitempty"`
+	Res    *types.DestroyChildrenResponse `xml:"urn:vim25 DestroyChildrenResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DestroyChildrenBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DestroyChildren(ctx context.Context, r soap.RoundTripper, req *types.DestroyChildren) (*types.DestroyChildrenResponse, error) {
+	var reqBody, resBody DestroyChildrenBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DestroyCollectorBody struct {
+	Req    *types.DestroyCollector         `xml:"urn:vim25 DestroyCollector,omitempty"`
+	Res    *types.DestroyCollectorResponse `xml:"urn:vim25 DestroyCollectorResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DestroyCollectorBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DestroyCollector(ctx context.Context, r soap.RoundTripper, req *types.DestroyCollector) (*types.DestroyCollectorResponse, error) {
+	var reqBody, resBody DestroyCollectorBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DestroyDatastoreBody struct {
+	Req    *types.DestroyDatastore         `xml:"urn:vim25 DestroyDatastore,omitempty"`
+	Res    *types.DestroyDatastoreResponse `xml:"urn:vim25 DestroyDatastoreResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DestroyDatastoreBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DestroyDatastore(ctx context.Context, r soap.RoundTripper, req *types.DestroyDatastore) (*types.DestroyDatastoreResponse, error) {
+	var reqBody, resBody DestroyDatastoreBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DestroyIpPoolBody struct {
+	Req    *types.DestroyIpPool         `xml:"urn:vim25 DestroyIpPool,omitempty"`
+	Res    *types.DestroyIpPoolResponse `xml:"urn:vim25 DestroyIpPoolResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DestroyIpPoolBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DestroyIpPool(ctx context.Context, r soap.RoundTripper, req *types.DestroyIpPool) (*types.DestroyIpPoolResponse, error) {
+	var reqBody, resBody DestroyIpPoolBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DestroyNetworkBody struct {
+	Req    *types.DestroyNetwork         `xml:"urn:vim25 DestroyNetwork,omitempty"`
+	Res    *types.DestroyNetworkResponse `xml:"urn:vim25 DestroyNetworkResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DestroyNetworkBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DestroyNetwork(ctx context.Context, r soap.RoundTripper, req *types.DestroyNetwork) (*types.DestroyNetworkResponse, error) {
+	var reqBody, resBody DestroyNetworkBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DestroyProfileBody struct {
+	Req    *types.DestroyProfile         `xml:"urn:vim25 DestroyProfile,omitempty"`
+	Res    *types.DestroyProfileResponse `xml:"urn:vim25 DestroyProfileResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DestroyProfileBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DestroyProfile(ctx context.Context, r soap.RoundTripper, req *types.DestroyProfile) (*types.DestroyProfileResponse, error) {
+	var reqBody, resBody DestroyProfileBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DestroyPropertyCollectorBody struct {
+	Req    *types.DestroyPropertyCollector         `xml:"urn:vim25 DestroyPropertyCollector,omitempty"`
+	Res    *types.DestroyPropertyCollectorResponse `xml:"urn:vim25 DestroyPropertyCollectorResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DestroyPropertyCollectorBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DestroyPropertyCollector(ctx context.Context, r soap.RoundTripper, req *types.DestroyPropertyCollector) (*types.DestroyPropertyCollectorResponse, error) {
+	var reqBody, resBody DestroyPropertyCollectorBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DestroyPropertyFilterBody struct {
+	Req    *types.DestroyPropertyFilter         `xml:"urn:vim25 DestroyPropertyFilter,omitempty"`
+	Res    *types.DestroyPropertyFilterResponse `xml:"urn:vim25 DestroyPropertyFilterResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DestroyPropertyFilterBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DestroyPropertyFilter(ctx context.Context, r soap.RoundTripper, req *types.DestroyPropertyFilter) (*types.DestroyPropertyFilterResponse, error) {
+	var reqBody, resBody DestroyPropertyFilterBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DestroyVffsBody struct {
+	Req    *types.DestroyVffs         `xml:"urn:vim25 DestroyVffs,omitempty"`
+	Res    *types.DestroyVffsResponse `xml:"urn:vim25 DestroyVffsResponse,omitempty"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DestroyVffsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DestroyVffs(ctx context.Context, r soap.RoundTripper, req *types.DestroyVffs) (*types.DestroyVffsResponse, error) {
+	var reqBody, resBody DestroyVffsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DestroyViewBody struct {
+	Req    *types.DestroyView         `xml:"urn:vim25 DestroyView,omitempty"`
+	Res    *types.DestroyViewResponse `xml:"urn:vim25 DestroyViewResponse,omitempty"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DestroyViewBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DestroyView(ctx context.Context, r soap.RoundTripper, req *types.DestroyView) (*types.DestroyViewResponse, error) {
+	var reqBody, resBody DestroyViewBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type Destroy_TaskBody struct {
+	Req    *types.Destroy_Task         `xml:"urn:vim25 Destroy_Task,omitempty"`
+	Res    *types.Destroy_TaskResponse `xml:"urn:vim25 Destroy_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *Destroy_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func Destroy_Task(ctx context.Context, r soap.RoundTripper, req *types.Destroy_Task) (*types.Destroy_TaskResponse, error) {
+	var reqBody, resBody Destroy_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DetachDisk_TaskBody struct {
+	Req    *types.DetachDisk_Task         `xml:"urn:vim25 DetachDisk_Task,omitempty"`
+	Res    *types.DetachDisk_TaskResponse `xml:"urn:vim25 DetachDisk_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DetachDisk_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DetachDisk_Task(ctx context.Context, r soap.RoundTripper, req *types.DetachDisk_Task) (*types.DetachDisk_TaskResponse, error) {
+	var reqBody, resBody DetachDisk_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DetachScsiLunBody struct {
+	Req    *types.DetachScsiLun         `xml:"urn:vim25 DetachScsiLun,omitempty"`
+	Res    *types.DetachScsiLunResponse `xml:"urn:vim25 DetachScsiLunResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DetachScsiLunBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DetachScsiLun(ctx context.Context, r soap.RoundTripper, req *types.DetachScsiLun) (*types.DetachScsiLunResponse, error) {
+	var reqBody, resBody DetachScsiLunBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DetachScsiLunEx_TaskBody struct {
+	Req    *types.DetachScsiLunEx_Task         `xml:"urn:vim25 DetachScsiLunEx_Task,omitempty"`
+	Res    *types.DetachScsiLunEx_TaskResponse `xml:"urn:vim25 DetachScsiLunEx_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DetachScsiLunEx_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DetachScsiLunEx_Task(ctx context.Context, r soap.RoundTripper, req *types.DetachScsiLunEx_Task) (*types.DetachScsiLunEx_TaskResponse, error) {
+	var reqBody, resBody DetachScsiLunEx_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DetachTagFromVStorageObjectBody struct {
+	Req    *types.DetachTagFromVStorageObject         `xml:"urn:vim25 DetachTagFromVStorageObject,omitempty"`
+	Res    *types.DetachTagFromVStorageObjectResponse `xml:"urn:vim25 DetachTagFromVStorageObjectResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DetachTagFromVStorageObjectBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DetachTagFromVStorageObject(ctx context.Context, r soap.RoundTripper, req *types.DetachTagFromVStorageObject) (*types.DetachTagFromVStorageObjectResponse, error) {
+	var reqBody, resBody DetachTagFromVStorageObjectBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DisableEvcMode_TaskBody struct {
+	Req    *types.DisableEvcMode_Task         `xml:"urn:vim25 DisableEvcMode_Task,omitempty"`
+	Res    *types.DisableEvcMode_TaskResponse `xml:"urn:vim25 DisableEvcMode_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DisableEvcMode_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DisableEvcMode_Task(ctx context.Context, r soap.RoundTripper, req *types.DisableEvcMode_Task) (*types.DisableEvcMode_TaskResponse, error) {
+	var reqBody, resBody DisableEvcMode_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DisableFeatureBody struct {
+	Req    *types.DisableFeature         `xml:"urn:vim25 DisableFeature,omitempty"`
+	Res    *types.DisableFeatureResponse `xml:"urn:vim25 DisableFeatureResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DisableFeatureBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DisableFeature(ctx context.Context, r soap.RoundTripper, req *types.DisableFeature) (*types.DisableFeatureResponse, error) {
+	var reqBody, resBody DisableFeatureBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DisableHyperThreadingBody struct {
+	Req    *types.DisableHyperThreading         `xml:"urn:vim25 DisableHyperThreading,omitempty"`
+	Res    *types.DisableHyperThreadingResponse `xml:"urn:vim25 DisableHyperThreadingResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DisableHyperThreadingBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DisableHyperThreading(ctx context.Context, r soap.RoundTripper, req *types.DisableHyperThreading) (*types.DisableHyperThreadingResponse, error) {
+	var reqBody, resBody DisableHyperThreadingBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DisableMultipathPathBody struct {
+	Req    *types.DisableMultipathPath         `xml:"urn:vim25 DisableMultipathPath,omitempty"`
+	Res    *types.DisableMultipathPathResponse `xml:"urn:vim25 DisableMultipathPathResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DisableMultipathPathBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DisableMultipathPath(ctx context.Context, r soap.RoundTripper, req *types.DisableMultipathPath) (*types.DisableMultipathPathResponse, error) {
+	var reqBody, resBody DisableMultipathPathBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DisableRulesetBody struct {
+	Req    *types.DisableRuleset         `xml:"urn:vim25 DisableRuleset,omitempty"`
+	Res    *types.DisableRulesetResponse `xml:"urn:vim25 DisableRulesetResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DisableRulesetBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DisableRuleset(ctx context.Context, r soap.RoundTripper, req *types.DisableRuleset) (*types.DisableRulesetResponse, error) {
+	var reqBody, resBody DisableRulesetBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DisableSecondaryVM_TaskBody struct {
+	Req    *types.DisableSecondaryVM_Task         `xml:"urn:vim25 DisableSecondaryVM_Task,omitempty"`
+	Res    *types.DisableSecondaryVM_TaskResponse `xml:"urn:vim25 DisableSecondaryVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DisableSecondaryVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DisableSecondaryVM_Task(ctx context.Context, r soap.RoundTripper, req *types.DisableSecondaryVM_Task) (*types.DisableSecondaryVM_TaskResponse, error) {
+	var reqBody, resBody DisableSecondaryVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DisableSmartCardAuthenticationBody struct {
+	Req    *types.DisableSmartCardAuthentication         `xml:"urn:vim25 DisableSmartCardAuthentication,omitempty"`
+	Res    *types.DisableSmartCardAuthenticationResponse `xml:"urn:vim25 DisableSmartCardAuthenticationResponse,omitempty"`
+	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DisableSmartCardAuthenticationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DisableSmartCardAuthentication(ctx context.Context, r soap.RoundTripper, req *types.DisableSmartCardAuthentication) (*types.DisableSmartCardAuthenticationResponse, error) {
+	var reqBody, resBody DisableSmartCardAuthenticationBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DisconnectHost_TaskBody struct {
+	Req    *types.DisconnectHost_Task         `xml:"urn:vim25 DisconnectHost_Task,omitempty"`
+	Res    *types.DisconnectHost_TaskResponse `xml:"urn:vim25 DisconnectHost_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DisconnectHost_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DisconnectHost_Task(ctx context.Context, r soap.RoundTripper, req *types.DisconnectHost_Task) (*types.DisconnectHost_TaskResponse, error) {
+	var reqBody, resBody DisconnectHost_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DiscoverFcoeHbasBody struct {
+	Req    *types.DiscoverFcoeHbas         `xml:"urn:vim25 DiscoverFcoeHbas,omitempty"`
+	Res    *types.DiscoverFcoeHbasResponse `xml:"urn:vim25 DiscoverFcoeHbasResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DiscoverFcoeHbasBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DiscoverFcoeHbas(ctx context.Context, r soap.RoundTripper, req *types.DiscoverFcoeHbas) (*types.DiscoverFcoeHbasResponse, error) {
+	var reqBody, resBody DiscoverFcoeHbasBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DissociateProfileBody struct {
+	Req    *types.DissociateProfile         `xml:"urn:vim25 DissociateProfile,omitempty"`
+	Res    *types.DissociateProfileResponse `xml:"urn:vim25 DissociateProfileResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DissociateProfileBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DissociateProfile(ctx context.Context, r soap.RoundTripper, req *types.DissociateProfile) (*types.DissociateProfileResponse, error) {
+	var reqBody, resBody DissociateProfileBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DoesCustomizationSpecExistBody struct {
+	Req    *types.DoesCustomizationSpecExist         `xml:"urn:vim25 DoesCustomizationSpecExist,omitempty"`
+	Res    *types.DoesCustomizationSpecExistResponse `xml:"urn:vim25 DoesCustomizationSpecExistResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DoesCustomizationSpecExistBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DoesCustomizationSpecExist(ctx context.Context, r soap.RoundTripper, req *types.DoesCustomizationSpecExist) (*types.DoesCustomizationSpecExistResponse, error) {
+	var reqBody, resBody DoesCustomizationSpecExistBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DuplicateCustomizationSpecBody struct {
+	Req    *types.DuplicateCustomizationSpec         `xml:"urn:vim25 DuplicateCustomizationSpec,omitempty"`
+	Res    *types.DuplicateCustomizationSpecResponse `xml:"urn:vim25 DuplicateCustomizationSpecResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DuplicateCustomizationSpecBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DuplicateCustomizationSpec(ctx context.Context, r soap.RoundTripper, req *types.DuplicateCustomizationSpec) (*types.DuplicateCustomizationSpecResponse, error) {
+	var reqBody, resBody DuplicateCustomizationSpecBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DvsReconfigureVmVnicNetworkResourcePool_TaskBody struct {
+	Req    *types.DvsReconfigureVmVnicNetworkResourcePool_Task         `xml:"urn:vim25 DvsReconfigureVmVnicNetworkResourcePool_Task,omitempty"`
+	Res    *types.DvsReconfigureVmVnicNetworkResourcePool_TaskResponse `xml:"urn:vim25 DvsReconfigureVmVnicNetworkResourcePool_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DvsReconfigureVmVnicNetworkResourcePool_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DvsReconfigureVmVnicNetworkResourcePool_Task(ctx context.Context, r soap.RoundTripper, req *types.DvsReconfigureVmVnicNetworkResourcePool_Task) (*types.DvsReconfigureVmVnicNetworkResourcePool_TaskResponse, error) {
+	var reqBody, resBody DvsReconfigureVmVnicNetworkResourcePool_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type EagerZeroVirtualDisk_TaskBody struct {
+	Req    *types.EagerZeroVirtualDisk_Task         `xml:"urn:vim25 EagerZeroVirtualDisk_Task,omitempty"`
+	Res    *types.EagerZeroVirtualDisk_TaskResponse `xml:"urn:vim25 EagerZeroVirtualDisk_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *EagerZeroVirtualDisk_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func EagerZeroVirtualDisk_Task(ctx context.Context, r soap.RoundTripper, req *types.EagerZeroVirtualDisk_Task) (*types.EagerZeroVirtualDisk_TaskResponse, error) {
+	var reqBody, resBody EagerZeroVirtualDisk_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type EnableAlarmActionsBody struct {
+	Req    *types.EnableAlarmActions         `xml:"urn:vim25 EnableAlarmActions,omitempty"`
+	Res    *types.EnableAlarmActionsResponse `xml:"urn:vim25 EnableAlarmActionsResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *EnableAlarmActionsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func EnableAlarmActions(ctx context.Context, r soap.RoundTripper, req *types.EnableAlarmActions) (*types.EnableAlarmActionsResponse, error) {
+	var reqBody, resBody EnableAlarmActionsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type EnableCryptoBody struct {
+	Req    *types.EnableCrypto         `xml:"urn:vim25 EnableCrypto,omitempty"`
+	Res    *types.EnableCryptoResponse `xml:"urn:vim25 EnableCryptoResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *EnableCryptoBody) Fault() *soap.Fault { return b.Fault_ }
+
+func EnableCrypto(ctx context.Context, r soap.RoundTripper, req *types.EnableCrypto) (*types.EnableCryptoResponse, error) {
+	var reqBody, resBody EnableCryptoBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type EnableFeatureBody struct {
+	Req    *types.EnableFeature         `xml:"urn:vim25 EnableFeature,omitempty"`
+	Res    *types.EnableFeatureResponse `xml:"urn:vim25 EnableFeatureResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *EnableFeatureBody) Fault() *soap.Fault { return b.Fault_ }
+
+func EnableFeature(ctx context.Context, r soap.RoundTripper, req *types.EnableFeature) (*types.EnableFeatureResponse, error) {
+	var reqBody, resBody EnableFeatureBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type EnableHyperThreadingBody struct {
+	Req    *types.EnableHyperThreading         `xml:"urn:vim25 EnableHyperThreading,omitempty"`
+	Res    *types.EnableHyperThreadingResponse `xml:"urn:vim25 EnableHyperThreadingResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *EnableHyperThreadingBody) Fault() *soap.Fault { return b.Fault_ }
+
+func EnableHyperThreading(ctx context.Context, r soap.RoundTripper, req *types.EnableHyperThreading) (*types.EnableHyperThreadingResponse, error) {
+	var reqBody, resBody EnableHyperThreadingBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type EnableMultipathPathBody struct {
+	Req    *types.EnableMultipathPath         `xml:"urn:vim25 EnableMultipathPath,omitempty"`
+	Res    *types.EnableMultipathPathResponse `xml:"urn:vim25 EnableMultipathPathResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *EnableMultipathPathBody) Fault() *soap.Fault { return b.Fault_ }
+
+func EnableMultipathPath(ctx context.Context, r soap.RoundTripper, req *types.EnableMultipathPath) (*types.EnableMultipathPathResponse, error) {
+	var reqBody, resBody EnableMultipathPathBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type EnableNetworkResourceManagementBody struct {
+	Req    *types.EnableNetworkResourceManagement         `xml:"urn:vim25 EnableNetworkResourceManagement,omitempty"`
+	Res    *types.EnableNetworkResourceManagementResponse `xml:"urn:vim25 EnableNetworkResourceManagementResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *EnableNetworkResourceManagementBody) Fault() *soap.Fault { return b.Fault_ }
+
+func EnableNetworkResourceManagement(ctx context.Context, r soap.RoundTripper, req *types.EnableNetworkResourceManagement) (*types.EnableNetworkResourceManagementResponse, error) {
+	var reqBody, resBody EnableNetworkResourceManagementBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type EnableRulesetBody struct {
+	Req    *types.EnableRuleset         `xml:"urn:vim25 EnableRuleset,omitempty"`
+	Res    *types.EnableRulesetResponse `xml:"urn:vim25 EnableRulesetResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *EnableRulesetBody) Fault() *soap.Fault { return b.Fault_ }
+
+func EnableRuleset(ctx context.Context, r soap.RoundTripper, req *types.EnableRuleset) (*types.EnableRulesetResponse, error) {
+	var reqBody, resBody EnableRulesetBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type EnableSecondaryVM_TaskBody struct {
+	Req    *types.EnableSecondaryVM_Task         `xml:"urn:vim25 EnableSecondaryVM_Task,omitempty"`
+	Res    *types.EnableSecondaryVM_TaskResponse `xml:"urn:vim25 EnableSecondaryVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *EnableSecondaryVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func EnableSecondaryVM_Task(ctx context.Context, r soap.RoundTripper, req *types.EnableSecondaryVM_Task) (*types.EnableSecondaryVM_TaskResponse, error) {
+	var reqBody, resBody EnableSecondaryVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type EnableSmartCardAuthenticationBody struct {
+	Req    *types.EnableSmartCardAuthentication         `xml:"urn:vim25 EnableSmartCardAuthentication,omitempty"`
+	Res    *types.EnableSmartCardAuthenticationResponse `xml:"urn:vim25 EnableSmartCardAuthenticationResponse,omitempty"`
+	Fault_ *soap.Fault                                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *EnableSmartCardAuthenticationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func EnableSmartCardAuthentication(ctx context.Context, r soap.RoundTripper, req *types.EnableSmartCardAuthentication) (*types.EnableSmartCardAuthenticationResponse, error) {
+	var reqBody, resBody EnableSmartCardAuthenticationBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type EnterLockdownModeBody struct {
+	Req    *types.EnterLockdownMode         `xml:"urn:vim25 EnterLockdownMode,omitempty"`
+	Res    *types.EnterLockdownModeResponse `xml:"urn:vim25 EnterLockdownModeResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *EnterLockdownModeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func EnterLockdownMode(ctx context.Context, r soap.RoundTripper, req *types.EnterLockdownMode) (*types.EnterLockdownModeResponse, error) {
+	var reqBody, resBody EnterLockdownModeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type EnterMaintenanceMode_TaskBody struct {
+	Req    *types.EnterMaintenanceMode_Task         `xml:"urn:vim25 EnterMaintenanceMode_Task,omitempty"`
+	Res    *types.EnterMaintenanceMode_TaskResponse `xml:"urn:vim25 EnterMaintenanceMode_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *EnterMaintenanceMode_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func EnterMaintenanceMode_Task(ctx context.Context, r soap.RoundTripper, req *types.EnterMaintenanceMode_Task) (*types.EnterMaintenanceMode_TaskResponse, error) {
+	var reqBody, resBody EnterMaintenanceMode_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type EstimateDatabaseSizeBody struct {
+	Req    *types.EstimateDatabaseSize         `xml:"urn:vim25 EstimateDatabaseSize,omitempty"`
+	Res    *types.EstimateDatabaseSizeResponse `xml:"urn:vim25 EstimateDatabaseSizeResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *EstimateDatabaseSizeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func EstimateDatabaseSize(ctx context.Context, r soap.RoundTripper, req *types.EstimateDatabaseSize) (*types.EstimateDatabaseSizeResponse, error) {
+	var reqBody, resBody EstimateDatabaseSizeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type EstimateStorageForConsolidateSnapshots_TaskBody struct {
+	Req    *types.EstimateStorageForConsolidateSnapshots_Task         `xml:"urn:vim25 EstimateStorageForConsolidateSnapshots_Task,omitempty"`
+	Res    *types.EstimateStorageForConsolidateSnapshots_TaskResponse `xml:"urn:vim25 EstimateStorageForConsolidateSnapshots_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *EstimateStorageForConsolidateSnapshots_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func EstimateStorageForConsolidateSnapshots_Task(ctx context.Context, r soap.RoundTripper, req *types.EstimateStorageForConsolidateSnapshots_Task) (*types.EstimateStorageForConsolidateSnapshots_TaskResponse, error) {
+	var reqBody, resBody EstimateStorageForConsolidateSnapshots_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type EsxAgentHostManagerUpdateConfigBody struct {
+	Req    *types.EsxAgentHostManagerUpdateConfig         `xml:"urn:vim25 EsxAgentHostManagerUpdateConfig,omitempty"`
+	Res    *types.EsxAgentHostManagerUpdateConfigResponse `xml:"urn:vim25 EsxAgentHostManagerUpdateConfigResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *EsxAgentHostManagerUpdateConfigBody) Fault() *soap.Fault { return b.Fault_ }
+
+func EsxAgentHostManagerUpdateConfig(ctx context.Context, r soap.RoundTripper, req *types.EsxAgentHostManagerUpdateConfig) (*types.EsxAgentHostManagerUpdateConfigResponse, error) {
+	var reqBody, resBody EsxAgentHostManagerUpdateConfigBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type EvacuateVsanNode_TaskBody struct {
+	Req    *types.EvacuateVsanNode_Task         `xml:"urn:vim25 EvacuateVsanNode_Task,omitempty"`
+	Res    *types.EvacuateVsanNode_TaskResponse `xml:"urn:vim25 EvacuateVsanNode_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *EvacuateVsanNode_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func EvacuateVsanNode_Task(ctx context.Context, r soap.RoundTripper, req *types.EvacuateVsanNode_Task) (*types.EvacuateVsanNode_TaskResponse, error) {
+	var reqBody, resBody EvacuateVsanNode_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type EvcManagerBody struct {
+	Req    *types.EvcManager         `xml:"urn:vim25 EvcManager,omitempty"`
+	Res    *types.EvcManagerResponse `xml:"urn:vim25 EvcManagerResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *EvcManagerBody) Fault() *soap.Fault { return b.Fault_ }
+
+func EvcManager(ctx context.Context, r soap.RoundTripper, req *types.EvcManager) (*types.EvcManagerResponse, error) {
+	var reqBody, resBody EvcManagerBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ExecuteHostProfileBody struct {
+	Req    *types.ExecuteHostProfile         `xml:"urn:vim25 ExecuteHostProfile,omitempty"`
+	Res    *types.ExecuteHostProfileResponse `xml:"urn:vim25 ExecuteHostProfileResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ExecuteHostProfileBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ExecuteHostProfile(ctx context.Context, r soap.RoundTripper, req *types.ExecuteHostProfile) (*types.ExecuteHostProfileResponse, error) {
+	var reqBody, resBody ExecuteHostProfileBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ExecuteSimpleCommandBody struct {
+	Req    *types.ExecuteSimpleCommand         `xml:"urn:vim25 ExecuteSimpleCommand,omitempty"`
+	Res    *types.ExecuteSimpleCommandResponse `xml:"urn:vim25 ExecuteSimpleCommandResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ExecuteSimpleCommandBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ExecuteSimpleCommand(ctx context.Context, r soap.RoundTripper, req *types.ExecuteSimpleCommand) (*types.ExecuteSimpleCommandResponse, error) {
+	var reqBody, resBody ExecuteSimpleCommandBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ExitLockdownModeBody struct {
+	Req    *types.ExitLockdownMode         `xml:"urn:vim25 ExitLockdownMode,omitempty"`
+	Res    *types.ExitLockdownModeResponse `xml:"urn:vim25 ExitLockdownModeResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ExitLockdownModeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ExitLockdownMode(ctx context.Context, r soap.RoundTripper, req *types.ExitLockdownMode) (*types.ExitLockdownModeResponse, error) {
+	var reqBody, resBody ExitLockdownModeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ExitMaintenanceMode_TaskBody struct {
+	Req    *types.ExitMaintenanceMode_Task         `xml:"urn:vim25 ExitMaintenanceMode_Task,omitempty"`
+	Res    *types.ExitMaintenanceMode_TaskResponse `xml:"urn:vim25 ExitMaintenanceMode_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ExitMaintenanceMode_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ExitMaintenanceMode_Task(ctx context.Context, r soap.RoundTripper, req *types.ExitMaintenanceMode_Task) (*types.ExitMaintenanceMode_TaskResponse, error) {
+	var reqBody, resBody ExitMaintenanceMode_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ExpandVmfsDatastoreBody struct {
+	Req    *types.ExpandVmfsDatastore         `xml:"urn:vim25 ExpandVmfsDatastore,omitempty"`
+	Res    *types.ExpandVmfsDatastoreResponse `xml:"urn:vim25 ExpandVmfsDatastoreResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ExpandVmfsDatastoreBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ExpandVmfsDatastore(ctx context.Context, r soap.RoundTripper, req *types.ExpandVmfsDatastore) (*types.ExpandVmfsDatastoreResponse, error) {
+	var reqBody, resBody ExpandVmfsDatastoreBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ExpandVmfsExtentBody struct {
+	Req    *types.ExpandVmfsExtent         `xml:"urn:vim25 ExpandVmfsExtent,omitempty"`
+	Res    *types.ExpandVmfsExtentResponse `xml:"urn:vim25 ExpandVmfsExtentResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ExpandVmfsExtentBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ExpandVmfsExtent(ctx context.Context, r soap.RoundTripper, req *types.ExpandVmfsExtent) (*types.ExpandVmfsExtentResponse, error) {
+	var reqBody, resBody ExpandVmfsExtentBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ExportAnswerFile_TaskBody struct {
+	Req    *types.ExportAnswerFile_Task         `xml:"urn:vim25 ExportAnswerFile_Task,omitempty"`
+	Res    *types.ExportAnswerFile_TaskResponse `xml:"urn:vim25 ExportAnswerFile_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ExportAnswerFile_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ExportAnswerFile_Task(ctx context.Context, r soap.RoundTripper, req *types.ExportAnswerFile_Task) (*types.ExportAnswerFile_TaskResponse, error) {
+	var reqBody, resBody ExportAnswerFile_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ExportProfileBody struct {
+	Req    *types.ExportProfile         `xml:"urn:vim25 ExportProfile,omitempty"`
+	Res    *types.ExportProfileResponse `xml:"urn:vim25 ExportProfileResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ExportProfileBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ExportProfile(ctx context.Context, r soap.RoundTripper, req *types.ExportProfile) (*types.ExportProfileResponse, error) {
+	var reqBody, resBody ExportProfileBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ExportSnapshotBody struct {
+	Req    *types.ExportSnapshot         `xml:"urn:vim25 ExportSnapshot,omitempty"`
+	Res    *types.ExportSnapshotResponse `xml:"urn:vim25 ExportSnapshotResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ExportSnapshotBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ExportSnapshot(ctx context.Context, r soap.RoundTripper, req *types.ExportSnapshot) (*types.ExportSnapshotResponse, error) {
+	var reqBody, resBody ExportSnapshotBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ExportVAppBody struct {
+	Req    *types.ExportVApp         `xml:"urn:vim25 ExportVApp,omitempty"`
+	Res    *types.ExportVAppResponse `xml:"urn:vim25 ExportVAppResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ExportVAppBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ExportVApp(ctx context.Context, r soap.RoundTripper, req *types.ExportVApp) (*types.ExportVAppResponse, error) {
+	var reqBody, resBody ExportVAppBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ExportVmBody struct {
+	Req    *types.ExportVm         `xml:"urn:vim25 ExportVm,omitempty"`
+	Res    *types.ExportVmResponse `xml:"urn:vim25 ExportVmResponse,omitempty"`
+	Fault_ *soap.Fault             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ExportVmBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ExportVm(ctx context.Context, r soap.RoundTripper, req *types.ExportVm) (*types.ExportVmResponse, error) {
+	var reqBody, resBody ExportVmBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ExtendDisk_TaskBody struct {
+	Req    *types.ExtendDisk_Task         `xml:"urn:vim25 ExtendDisk_Task,omitempty"`
+	Res    *types.ExtendDisk_TaskResponse `xml:"urn:vim25 ExtendDisk_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ExtendDisk_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ExtendDisk_Task(ctx context.Context, r soap.RoundTripper, req *types.ExtendDisk_Task) (*types.ExtendDisk_TaskResponse, error) {
+	var reqBody, resBody ExtendDisk_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ExtendVffsBody struct {
+	Req    *types.ExtendVffs         `xml:"urn:vim25 ExtendVffs,omitempty"`
+	Res    *types.ExtendVffsResponse `xml:"urn:vim25 ExtendVffsResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ExtendVffsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ExtendVffs(ctx context.Context, r soap.RoundTripper, req *types.ExtendVffs) (*types.ExtendVffsResponse, error) {
+	var reqBody, resBody ExtendVffsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ExtendVirtualDisk_TaskBody struct {
+	Req    *types.ExtendVirtualDisk_Task         `xml:"urn:vim25 ExtendVirtualDisk_Task,omitempty"`
+	Res    *types.ExtendVirtualDisk_TaskResponse `xml:"urn:vim25 ExtendVirtualDisk_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ExtendVirtualDisk_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ExtendVirtualDisk_Task(ctx context.Context, r soap.RoundTripper, req *types.ExtendVirtualDisk_Task) (*types.ExtendVirtualDisk_TaskResponse, error) {
+	var reqBody, resBody ExtendVirtualDisk_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ExtendVmfsDatastoreBody struct {
+	Req    *types.ExtendVmfsDatastore         `xml:"urn:vim25 ExtendVmfsDatastore,omitempty"`
+	Res    *types.ExtendVmfsDatastoreResponse `xml:"urn:vim25 ExtendVmfsDatastoreResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ExtendVmfsDatastoreBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ExtendVmfsDatastore(ctx context.Context, r soap.RoundTripper, req *types.ExtendVmfsDatastore) (*types.ExtendVmfsDatastoreResponse, error) {
+	var reqBody, resBody ExtendVmfsDatastoreBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ExtractOvfEnvironmentBody struct {
+	Req    *types.ExtractOvfEnvironment         `xml:"urn:vim25 ExtractOvfEnvironment,omitempty"`
+	Res    *types.ExtractOvfEnvironmentResponse `xml:"urn:vim25 ExtractOvfEnvironmentResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ExtractOvfEnvironmentBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ExtractOvfEnvironment(ctx context.Context, r soap.RoundTripper, req *types.ExtractOvfEnvironment) (*types.ExtractOvfEnvironmentResponse, error) {
+	var reqBody, resBody ExtractOvfEnvironmentBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type FetchDVPortKeysBody struct {
+	Req    *types.FetchDVPortKeys         `xml:"urn:vim25 FetchDVPortKeys,omitempty"`
+	Res    *types.FetchDVPortKeysResponse `xml:"urn:vim25 FetchDVPortKeysResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *FetchDVPortKeysBody) Fault() *soap.Fault { return b.Fault_ }
+
+func FetchDVPortKeys(ctx context.Context, r soap.RoundTripper, req *types.FetchDVPortKeys) (*types.FetchDVPortKeysResponse, error) {
+	var reqBody, resBody FetchDVPortKeysBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type FetchDVPortsBody struct {
+	Req    *types.FetchDVPorts         `xml:"urn:vim25 FetchDVPorts,omitempty"`
+	Res    *types.FetchDVPortsResponse `xml:"urn:vim25 FetchDVPortsResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *FetchDVPortsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func FetchDVPorts(ctx context.Context, r soap.RoundTripper, req *types.FetchDVPorts) (*types.FetchDVPortsResponse, error) {
+	var reqBody, resBody FetchDVPortsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type FetchSystemEventLogBody struct {
+	Req    *types.FetchSystemEventLog         `xml:"urn:vim25 FetchSystemEventLog,omitempty"`
+	Res    *types.FetchSystemEventLogResponse `xml:"urn:vim25 FetchSystemEventLogResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *FetchSystemEventLogBody) Fault() *soap.Fault { return b.Fault_ }
+
+func FetchSystemEventLog(ctx context.Context, r soap.RoundTripper, req *types.FetchSystemEventLog) (*types.FetchSystemEventLogResponse, error) {
+	var reqBody, resBody FetchSystemEventLogBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type FetchUserPrivilegeOnEntitiesBody struct {
+	Req    *types.FetchUserPrivilegeOnEntities         `xml:"urn:vim25 FetchUserPrivilegeOnEntities,omitempty"`
+	Res    *types.FetchUserPrivilegeOnEntitiesResponse `xml:"urn:vim25 FetchUserPrivilegeOnEntitiesResponse,omitempty"`
+	Fault_ *soap.Fault                                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *FetchUserPrivilegeOnEntitiesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func FetchUserPrivilegeOnEntities(ctx context.Context, r soap.RoundTripper, req *types.FetchUserPrivilegeOnEntities) (*types.FetchUserPrivilegeOnEntitiesResponse, error) {
+	var reqBody, resBody FetchUserPrivilegeOnEntitiesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type FindAllByDnsNameBody struct {
+	Req    *types.FindAllByDnsName         `xml:"urn:vim25 FindAllByDnsName,omitempty"`
+	Res    *types.FindAllByDnsNameResponse `xml:"urn:vim25 FindAllByDnsNameResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *FindAllByDnsNameBody) Fault() *soap.Fault { return b.Fault_ }
+
+func FindAllByDnsName(ctx context.Context, r soap.RoundTripper, req *types.FindAllByDnsName) (*types.FindAllByDnsNameResponse, error) {
+	var reqBody, resBody FindAllByDnsNameBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type FindAllByIpBody struct {
+	Req    *types.FindAllByIp         `xml:"urn:vim25 FindAllByIp,omitempty"`
+	Res    *types.FindAllByIpResponse `xml:"urn:vim25 FindAllByIpResponse,omitempty"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *FindAllByIpBody) Fault() *soap.Fault { return b.Fault_ }
+
+func FindAllByIp(ctx context.Context, r soap.RoundTripper, req *types.FindAllByIp) (*types.FindAllByIpResponse, error) {
+	var reqBody, resBody FindAllByIpBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type FindAllByUuidBody struct {
+	Req    *types.FindAllByUuid         `xml:"urn:vim25 FindAllByUuid,omitempty"`
+	Res    *types.FindAllByUuidResponse `xml:"urn:vim25 FindAllByUuidResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *FindAllByUuidBody) Fault() *soap.Fault { return b.Fault_ }
+
+func FindAllByUuid(ctx context.Context, r soap.RoundTripper, req *types.FindAllByUuid) (*types.FindAllByUuidResponse, error) {
+	var reqBody, resBody FindAllByUuidBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type FindAssociatedProfileBody struct {
+	Req    *types.FindAssociatedProfile         `xml:"urn:vim25 FindAssociatedProfile,omitempty"`
+	Res    *types.FindAssociatedProfileResponse `xml:"urn:vim25 FindAssociatedProfileResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *FindAssociatedProfileBody) Fault() *soap.Fault { return b.Fault_ }
+
+func FindAssociatedProfile(ctx context.Context, r soap.RoundTripper, req *types.FindAssociatedProfile) (*types.FindAssociatedProfileResponse, error) {
+	var reqBody, resBody FindAssociatedProfileBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type FindByDatastorePathBody struct {
+	Req    *types.FindByDatastorePath         `xml:"urn:vim25 FindByDatastorePath,omitempty"`
+	Res    *types.FindByDatastorePathResponse `xml:"urn:vim25 FindByDatastorePathResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *FindByDatastorePathBody) Fault() *soap.Fault { return b.Fault_ }
+
+func FindByDatastorePath(ctx context.Context, r soap.RoundTripper, req *types.FindByDatastorePath) (*types.FindByDatastorePathResponse, error) {
+	var reqBody, resBody FindByDatastorePathBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type FindByDnsNameBody struct {
+	Req    *types.FindByDnsName         `xml:"urn:vim25 FindByDnsName,omitempty"`
+	Res    *types.FindByDnsNameResponse `xml:"urn:vim25 FindByDnsNameResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *FindByDnsNameBody) Fault() *soap.Fault { return b.Fault_ }
+
+func FindByDnsName(ctx context.Context, r soap.RoundTripper, req *types.FindByDnsName) (*types.FindByDnsNameResponse, error) {
+	var reqBody, resBody FindByDnsNameBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type FindByInventoryPathBody struct {
+	Req    *types.FindByInventoryPath         `xml:"urn:vim25 FindByInventoryPath,omitempty"`
+	Res    *types.FindByInventoryPathResponse `xml:"urn:vim25 FindByInventoryPathResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *FindByInventoryPathBody) Fault() *soap.Fault { return b.Fault_ }
+
+func FindByInventoryPath(ctx context.Context, r soap.RoundTripper, req *types.FindByInventoryPath) (*types.FindByInventoryPathResponse, error) {
+	var reqBody, resBody FindByInventoryPathBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type FindByIpBody struct {
+	Req    *types.FindByIp         `xml:"urn:vim25 FindByIp,omitempty"`
+	Res    *types.FindByIpResponse `xml:"urn:vim25 FindByIpResponse,omitempty"`
+	Fault_ *soap.Fault             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *FindByIpBody) Fault() *soap.Fault { return b.Fault_ }
+
+func FindByIp(ctx context.Context, r soap.RoundTripper, req *types.FindByIp) (*types.FindByIpResponse, error) {
+	var reqBody, resBody FindByIpBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type FindByUuidBody struct {
+	Req    *types.FindByUuid         `xml:"urn:vim25 FindByUuid,omitempty"`
+	Res    *types.FindByUuidResponse `xml:"urn:vim25 FindByUuidResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *FindByUuidBody) Fault() *soap.Fault { return b.Fault_ }
+
+func FindByUuid(ctx context.Context, r soap.RoundTripper, req *types.FindByUuid) (*types.FindByUuidResponse, error) {
+	var reqBody, resBody FindByUuidBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type FindChildBody struct {
+	Req    *types.FindChild         `xml:"urn:vim25 FindChild,omitempty"`
+	Res    *types.FindChildResponse `xml:"urn:vim25 FindChildResponse,omitempty"`
+	Fault_ *soap.Fault              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *FindChildBody) Fault() *soap.Fault { return b.Fault_ }
+
+func FindChild(ctx context.Context, r soap.RoundTripper, req *types.FindChild) (*types.FindChildResponse, error) {
+	var reqBody, resBody FindChildBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type FindExtensionBody struct {
+	Req    *types.FindExtension         `xml:"urn:vim25 FindExtension,omitempty"`
+	Res    *types.FindExtensionResponse `xml:"urn:vim25 FindExtensionResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *FindExtensionBody) Fault() *soap.Fault { return b.Fault_ }
+
+func FindExtension(ctx context.Context, r soap.RoundTripper, req *types.FindExtension) (*types.FindExtensionResponse, error) {
+	var reqBody, resBody FindExtensionBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type FindRulesForVmBody struct {
+	Req    *types.FindRulesForVm         `xml:"urn:vim25 FindRulesForVm,omitempty"`
+	Res    *types.FindRulesForVmResponse `xml:"urn:vim25 FindRulesForVmResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *FindRulesForVmBody) Fault() *soap.Fault { return b.Fault_ }
+
+func FindRulesForVm(ctx context.Context, r soap.RoundTripper, req *types.FindRulesForVm) (*types.FindRulesForVmResponse, error) {
+	var reqBody, resBody FindRulesForVmBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type FormatVffsBody struct {
+	Req    *types.FormatVffs         `xml:"urn:vim25 FormatVffs,omitempty"`
+	Res    *types.FormatVffsResponse `xml:"urn:vim25 FormatVffsResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *FormatVffsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func FormatVffs(ctx context.Context, r soap.RoundTripper, req *types.FormatVffs) (*types.FormatVffsResponse, error) {
+	var reqBody, resBody FormatVffsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type FormatVmfsBody struct {
+	Req    *types.FormatVmfs         `xml:"urn:vim25 FormatVmfs,omitempty"`
+	Res    *types.FormatVmfsResponse `xml:"urn:vim25 FormatVmfsResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *FormatVmfsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func FormatVmfs(ctx context.Context, r soap.RoundTripper, req *types.FormatVmfs) (*types.FormatVmfsResponse, error) {
+	var reqBody, resBody FormatVmfsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type GenerateCertificateSigningRequestBody struct {
+	Req    *types.GenerateCertificateSigningRequest         `xml:"urn:vim25 GenerateCertificateSigningRequest,omitempty"`
+	Res    *types.GenerateCertificateSigningRequestResponse `xml:"urn:vim25 GenerateCertificateSigningRequestResponse,omitempty"`
+	Fault_ *soap.Fault                                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *GenerateCertificateSigningRequestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func GenerateCertificateSigningRequest(ctx context.Context, r soap.RoundTripper, req *types.GenerateCertificateSigningRequest) (*types.GenerateCertificateSigningRequestResponse, error) {
+	var reqBody, resBody GenerateCertificateSigningRequestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type GenerateCertificateSigningRequestByDnBody struct {
+	Req    *types.GenerateCertificateSigningRequestByDn         `xml:"urn:vim25 GenerateCertificateSigningRequestByDn,omitempty"`
+	Res    *types.GenerateCertificateSigningRequestByDnResponse `xml:"urn:vim25 GenerateCertificateSigningRequestByDnResponse,omitempty"`
+	Fault_ *soap.Fault                                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *GenerateCertificateSigningRequestByDnBody) Fault() *soap.Fault { return b.Fault_ }
+
+func GenerateCertificateSigningRequestByDn(ctx context.Context, r soap.RoundTripper, req *types.GenerateCertificateSigningRequestByDn) (*types.GenerateCertificateSigningRequestByDnResponse, error) {
+	var reqBody, resBody GenerateCertificateSigningRequestByDnBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type GenerateClientCsrBody struct {
+	Req    *types.GenerateClientCsr         `xml:"urn:vim25 GenerateClientCsr,omitempty"`
+	Res    *types.GenerateClientCsrResponse `xml:"urn:vim25 GenerateClientCsrResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *GenerateClientCsrBody) Fault() *soap.Fault { return b.Fault_ }
+
+func GenerateClientCsr(ctx context.Context, r soap.RoundTripper, req *types.GenerateClientCsr) (*types.GenerateClientCsrResponse, error) {
+	var reqBody, resBody GenerateClientCsrBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type GenerateConfigTaskListBody struct {
+	Req    *types.GenerateConfigTaskList         `xml:"urn:vim25 GenerateConfigTaskList,omitempty"`
+	Res    *types.GenerateConfigTaskListResponse `xml:"urn:vim25 GenerateConfigTaskListResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *GenerateConfigTaskListBody) Fault() *soap.Fault { return b.Fault_ }
+
+func GenerateConfigTaskList(ctx context.Context, r soap.RoundTripper, req *types.GenerateConfigTaskList) (*types.GenerateConfigTaskListResponse, error) {
+	var reqBody, resBody GenerateConfigTaskListBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type GenerateHostConfigTaskSpec_TaskBody struct {
+	Req    *types.GenerateHostConfigTaskSpec_Task         `xml:"urn:vim25 GenerateHostConfigTaskSpec_Task,omitempty"`
+	Res    *types.GenerateHostConfigTaskSpec_TaskResponse `xml:"urn:vim25 GenerateHostConfigTaskSpec_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *GenerateHostConfigTaskSpec_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func GenerateHostConfigTaskSpec_Task(ctx context.Context, r soap.RoundTripper, req *types.GenerateHostConfigTaskSpec_Task) (*types.GenerateHostConfigTaskSpec_TaskResponse, error) {
+	var reqBody, resBody GenerateHostConfigTaskSpec_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type GenerateHostProfileTaskList_TaskBody struct {
+	Req    *types.GenerateHostProfileTaskList_Task         `xml:"urn:vim25 GenerateHostProfileTaskList_Task,omitempty"`
+	Res    *types.GenerateHostProfileTaskList_TaskResponse `xml:"urn:vim25 GenerateHostProfileTaskList_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *GenerateHostProfileTaskList_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func GenerateHostProfileTaskList_Task(ctx context.Context, r soap.RoundTripper, req *types.GenerateHostProfileTaskList_Task) (*types.GenerateHostProfileTaskList_TaskResponse, error) {
+	var reqBody, resBody GenerateHostProfileTaskList_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type GenerateKeyBody struct {
+	Req    *types.GenerateKey         `xml:"urn:vim25 GenerateKey,omitempty"`
+	Res    *types.GenerateKeyResponse `xml:"urn:vim25 GenerateKeyResponse,omitempty"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *GenerateKeyBody) Fault() *soap.Fault { return b.Fault_ }
+
+func GenerateKey(ctx context.Context, r soap.RoundTripper, req *types.GenerateKey) (*types.GenerateKeyResponse, error) {
+	var reqBody, resBody GenerateKeyBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type GenerateLogBundles_TaskBody struct {
+	Req    *types.GenerateLogBundles_Task         `xml:"urn:vim25 GenerateLogBundles_Task,omitempty"`
+	Res    *types.GenerateLogBundles_TaskResponse `xml:"urn:vim25 GenerateLogBundles_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *GenerateLogBundles_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func GenerateLogBundles_Task(ctx context.Context, r soap.RoundTripper, req *types.GenerateLogBundles_Task) (*types.GenerateLogBundles_TaskResponse, error) {
+	var reqBody, resBody GenerateLogBundles_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type GenerateSelfSignedClientCertBody struct {
+	Req    *types.GenerateSelfSignedClientCert         `xml:"urn:vim25 GenerateSelfSignedClientCert,omitempty"`
+	Res    *types.GenerateSelfSignedClientCertResponse `xml:"urn:vim25 GenerateSelfSignedClientCertResponse,omitempty"`
+	Fault_ *soap.Fault                                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *GenerateSelfSignedClientCertBody) Fault() *soap.Fault { return b.Fault_ }
+
+func GenerateSelfSignedClientCert(ctx context.Context, r soap.RoundTripper, req *types.GenerateSelfSignedClientCert) (*types.GenerateSelfSignedClientCertResponse, error) {
+	var reqBody, resBody GenerateSelfSignedClientCertBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type GetAlarmBody struct {
+	Req    *types.GetAlarm         `xml:"urn:vim25 GetAlarm,omitempty"`
+	Res    *types.GetAlarmResponse `xml:"urn:vim25 GetAlarmResponse,omitempty"`
+	Fault_ *soap.Fault             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *GetAlarmBody) Fault() *soap.Fault { return b.Fault_ }
+
+func GetAlarm(ctx context.Context, r soap.RoundTripper, req *types.GetAlarm) (*types.GetAlarmResponse, error) {
+	var reqBody, resBody GetAlarmBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type GetAlarmStateBody struct {
+	Req    *types.GetAlarmState         `xml:"urn:vim25 GetAlarmState,omitempty"`
+	Res    *types.GetAlarmStateResponse `xml:"urn:vim25 GetAlarmStateResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *GetAlarmStateBody) Fault() *soap.Fault { return b.Fault_ }
+
+func GetAlarmState(ctx context.Context, r soap.RoundTripper, req *types.GetAlarmState) (*types.GetAlarmStateResponse, error) {
+	var reqBody, resBody GetAlarmStateBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type GetCustomizationSpecBody struct {
+	Req    *types.GetCustomizationSpec         `xml:"urn:vim25 GetCustomizationSpec,omitempty"`
+	Res    *types.GetCustomizationSpecResponse `xml:"urn:vim25 GetCustomizationSpecResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *GetCustomizationSpecBody) Fault() *soap.Fault { return b.Fault_ }
+
+func GetCustomizationSpec(ctx context.Context, r soap.RoundTripper, req *types.GetCustomizationSpec) (*types.GetCustomizationSpecResponse, error) {
+	var reqBody, resBody GetCustomizationSpecBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type GetPublicKeyBody struct {
+	Req    *types.GetPublicKey         `xml:"urn:vim25 GetPublicKey,omitempty"`
+	Res    *types.GetPublicKeyResponse `xml:"urn:vim25 GetPublicKeyResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *GetPublicKeyBody) Fault() *soap.Fault { return b.Fault_ }
+
+func GetPublicKey(ctx context.Context, r soap.RoundTripper, req *types.GetPublicKey) (*types.GetPublicKeyResponse, error) {
+	var reqBody, resBody GetPublicKeyBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type GetResourceUsageBody struct {
+	Req    *types.GetResourceUsage         `xml:"urn:vim25 GetResourceUsage,omitempty"`
+	Res    *types.GetResourceUsageResponse `xml:"urn:vim25 GetResourceUsageResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *GetResourceUsageBody) Fault() *soap.Fault { return b.Fault_ }
+
+func GetResourceUsage(ctx context.Context, r soap.RoundTripper, req *types.GetResourceUsage) (*types.GetResourceUsageResponse, error) {
+	var reqBody, resBody GetResourceUsageBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type GetVchaClusterHealthBody struct {
+	Req    *types.GetVchaClusterHealth         `xml:"urn:vim25 GetVchaClusterHealth,omitempty"`
+	Res    *types.GetVchaClusterHealthResponse `xml:"urn:vim25 GetVchaClusterHealthResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *GetVchaClusterHealthBody) Fault() *soap.Fault { return b.Fault_ }
+
+func GetVchaClusterHealth(ctx context.Context, r soap.RoundTripper, req *types.GetVchaClusterHealth) (*types.GetVchaClusterHealthResponse, error) {
+	var reqBody, resBody GetVchaClusterHealthBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type GetVsanObjExtAttrsBody struct {
+	Req    *types.GetVsanObjExtAttrs         `xml:"urn:vim25 GetVsanObjExtAttrs,omitempty"`
+	Res    *types.GetVsanObjExtAttrsResponse `xml:"urn:vim25 GetVsanObjExtAttrsResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *GetVsanObjExtAttrsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func GetVsanObjExtAttrs(ctx context.Context, r soap.RoundTripper, req *types.GetVsanObjExtAttrs) (*types.GetVsanObjExtAttrsResponse, error) {
+	var reqBody, resBody GetVsanObjExtAttrsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HasMonitoredEntityBody struct {
+	Req    *types.HasMonitoredEntity         `xml:"urn:vim25 HasMonitoredEntity,omitempty"`
+	Res    *types.HasMonitoredEntityResponse `xml:"urn:vim25 HasMonitoredEntityResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HasMonitoredEntityBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HasMonitoredEntity(ctx context.Context, r soap.RoundTripper, req *types.HasMonitoredEntity) (*types.HasMonitoredEntityResponse, error) {
+	var reqBody, resBody HasMonitoredEntityBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HasPrivilegeOnEntitiesBody struct {
+	Req    *types.HasPrivilegeOnEntities         `xml:"urn:vim25 HasPrivilegeOnEntities,omitempty"`
+	Res    *types.HasPrivilegeOnEntitiesResponse `xml:"urn:vim25 HasPrivilegeOnEntitiesResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HasPrivilegeOnEntitiesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HasPrivilegeOnEntities(ctx context.Context, r soap.RoundTripper, req *types.HasPrivilegeOnEntities) (*types.HasPrivilegeOnEntitiesResponse, error) {
+	var reqBody, resBody HasPrivilegeOnEntitiesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HasPrivilegeOnEntityBody struct {
+	Req    *types.HasPrivilegeOnEntity         `xml:"urn:vim25 HasPrivilegeOnEntity,omitempty"`
+	Res    *types.HasPrivilegeOnEntityResponse `xml:"urn:vim25 HasPrivilegeOnEntityResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HasPrivilegeOnEntityBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HasPrivilegeOnEntity(ctx context.Context, r soap.RoundTripper, req *types.HasPrivilegeOnEntity) (*types.HasPrivilegeOnEntityResponse, error) {
+	var reqBody, resBody HasPrivilegeOnEntityBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HasProviderBody struct {
+	Req    *types.HasProvider         `xml:"urn:vim25 HasProvider,omitempty"`
+	Res    *types.HasProviderResponse `xml:"urn:vim25 HasProviderResponse,omitempty"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HasProviderBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HasProvider(ctx context.Context, r soap.RoundTripper, req *types.HasProvider) (*types.HasProviderResponse, error) {
+	var reqBody, resBody HasProviderBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HasUserPrivilegeOnEntitiesBody struct {
+	Req    *types.HasUserPrivilegeOnEntities         `xml:"urn:vim25 HasUserPrivilegeOnEntities,omitempty"`
+	Res    *types.HasUserPrivilegeOnEntitiesResponse `xml:"urn:vim25 HasUserPrivilegeOnEntitiesResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HasUserPrivilegeOnEntitiesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HasUserPrivilegeOnEntities(ctx context.Context, r soap.RoundTripper, req *types.HasUserPrivilegeOnEntities) (*types.HasUserPrivilegeOnEntitiesResponse, error) {
+	var reqBody, resBody HasUserPrivilegeOnEntitiesBody
+
+	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"`
+	Fault_ *soap.Fault                                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostCloneVStorageObject_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostCloneVStorageObject_Task(ctx context.Context, r soap.RoundTripper, req *types.HostCloneVStorageObject_Task) (*types.HostCloneVStorageObject_TaskResponse, error) {
+	var reqBody, resBody HostCloneVStorageObject_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostConfigVFlashCacheBody struct {
+	Req    *types.HostConfigVFlashCache         `xml:"urn:vim25 HostConfigVFlashCache,omitempty"`
+	Res    *types.HostConfigVFlashCacheResponse `xml:"urn:vim25 HostConfigVFlashCacheResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostConfigVFlashCacheBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostConfigVFlashCache(ctx context.Context, r soap.RoundTripper, req *types.HostConfigVFlashCache) (*types.HostConfigVFlashCacheResponse, error) {
+	var reqBody, resBody HostConfigVFlashCacheBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostConfigureVFlashResourceBody struct {
+	Req    *types.HostConfigureVFlashResource         `xml:"urn:vim25 HostConfigureVFlashResource,omitempty"`
+	Res    *types.HostConfigureVFlashResourceResponse `xml:"urn:vim25 HostConfigureVFlashResourceResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostConfigureVFlashResourceBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostConfigureVFlashResource(ctx context.Context, r soap.RoundTripper, req *types.HostConfigureVFlashResource) (*types.HostConfigureVFlashResourceResponse, error) {
+	var reqBody, resBody HostConfigureVFlashResourceBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostCreateDisk_TaskBody struct {
+	Req    *types.HostCreateDisk_Task         `xml:"urn:vim25 HostCreateDisk_Task,omitempty"`
+	Res    *types.HostCreateDisk_TaskResponse `xml:"urn:vim25 HostCreateDisk_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostCreateDisk_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostCreateDisk_Task(ctx context.Context, r soap.RoundTripper, req *types.HostCreateDisk_Task) (*types.HostCreateDisk_TaskResponse, error) {
+	var reqBody, resBody HostCreateDisk_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostDeleteVStorageObject_TaskBody struct {
+	Req    *types.HostDeleteVStorageObject_Task         `xml:"urn:vim25 HostDeleteVStorageObject_Task,omitempty"`
+	Res    *types.HostDeleteVStorageObject_TaskResponse `xml:"urn:vim25 HostDeleteVStorageObject_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostDeleteVStorageObject_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostDeleteVStorageObject_Task(ctx context.Context, r soap.RoundTripper, req *types.HostDeleteVStorageObject_Task) (*types.HostDeleteVStorageObject_TaskResponse, error) {
+	var reqBody, resBody HostDeleteVStorageObject_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostExtendDisk_TaskBody struct {
+	Req    *types.HostExtendDisk_Task         `xml:"urn:vim25 HostExtendDisk_Task,omitempty"`
+	Res    *types.HostExtendDisk_TaskResponse `xml:"urn:vim25 HostExtendDisk_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostExtendDisk_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostExtendDisk_Task(ctx context.Context, r soap.RoundTripper, req *types.HostExtendDisk_Task) (*types.HostExtendDisk_TaskResponse, error) {
+	var reqBody, resBody HostExtendDisk_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostGetVFlashModuleDefaultConfigBody struct {
+	Req    *types.HostGetVFlashModuleDefaultConfig         `xml:"urn:vim25 HostGetVFlashModuleDefaultConfig,omitempty"`
+	Res    *types.HostGetVFlashModuleDefaultConfigResponse `xml:"urn:vim25 HostGetVFlashModuleDefaultConfigResponse,omitempty"`
+	Fault_ *soap.Fault                                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostGetVFlashModuleDefaultConfigBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostGetVFlashModuleDefaultConfig(ctx context.Context, r soap.RoundTripper, req *types.HostGetVFlashModuleDefaultConfig) (*types.HostGetVFlashModuleDefaultConfigResponse, error) {
+	var reqBody, resBody HostGetVFlashModuleDefaultConfigBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostImageConfigGetAcceptanceBody struct {
+	Req    *types.HostImageConfigGetAcceptance         `xml:"urn:vim25 HostImageConfigGetAcceptance,omitempty"`
+	Res    *types.HostImageConfigGetAcceptanceResponse `xml:"urn:vim25 HostImageConfigGetAcceptanceResponse,omitempty"`
+	Fault_ *soap.Fault                                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostImageConfigGetAcceptanceBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostImageConfigGetAcceptance(ctx context.Context, r soap.RoundTripper, req *types.HostImageConfigGetAcceptance) (*types.HostImageConfigGetAcceptanceResponse, error) {
+	var reqBody, resBody HostImageConfigGetAcceptanceBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostImageConfigGetProfileBody struct {
+	Req    *types.HostImageConfigGetProfile         `xml:"urn:vim25 HostImageConfigGetProfile,omitempty"`
+	Res    *types.HostImageConfigGetProfileResponse `xml:"urn:vim25 HostImageConfigGetProfileResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostImageConfigGetProfileBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostImageConfigGetProfile(ctx context.Context, r soap.RoundTripper, req *types.HostImageConfigGetProfile) (*types.HostImageConfigGetProfileResponse, error) {
+	var reqBody, resBody HostImageConfigGetProfileBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostInflateDisk_TaskBody struct {
+	Req    *types.HostInflateDisk_Task         `xml:"urn:vim25 HostInflateDisk_Task,omitempty"`
+	Res    *types.HostInflateDisk_TaskResponse `xml:"urn:vim25 HostInflateDisk_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostInflateDisk_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostInflateDisk_Task(ctx context.Context, r soap.RoundTripper, req *types.HostInflateDisk_Task) (*types.HostInflateDisk_TaskResponse, error) {
+	var reqBody, resBody HostInflateDisk_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostListVStorageObjectBody struct {
+	Req    *types.HostListVStorageObject         `xml:"urn:vim25 HostListVStorageObject,omitempty"`
+	Res    *types.HostListVStorageObjectResponse `xml:"urn:vim25 HostListVStorageObjectResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostListVStorageObjectBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostListVStorageObject(ctx context.Context, r soap.RoundTripper, req *types.HostListVStorageObject) (*types.HostListVStorageObjectResponse, error) {
+	var reqBody, resBody HostListVStorageObjectBody
+
+	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_ }
+
+func HostReconcileDatastoreInventory_Task(ctx context.Context, r soap.RoundTripper, req *types.HostReconcileDatastoreInventory_Task) (*types.HostReconcileDatastoreInventory_TaskResponse, error) {
+	var reqBody, resBody HostReconcileDatastoreInventory_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostRegisterDiskBody struct {
+	Req    *types.HostRegisterDisk         `xml:"urn:vim25 HostRegisterDisk,omitempty"`
+	Res    *types.HostRegisterDiskResponse `xml:"urn:vim25 HostRegisterDiskResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostRegisterDiskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostRegisterDisk(ctx context.Context, r soap.RoundTripper, req *types.HostRegisterDisk) (*types.HostRegisterDiskResponse, error) {
+	var reqBody, resBody HostRegisterDiskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostRelocateVStorageObject_TaskBody struct {
+	Req    *types.HostRelocateVStorageObject_Task         `xml:"urn:vim25 HostRelocateVStorageObject_Task,omitempty"`
+	Res    *types.HostRelocateVStorageObject_TaskResponse `xml:"urn:vim25 HostRelocateVStorageObject_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostRelocateVStorageObject_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostRelocateVStorageObject_Task(ctx context.Context, r soap.RoundTripper, req *types.HostRelocateVStorageObject_Task) (*types.HostRelocateVStorageObject_TaskResponse, error) {
+	var reqBody, resBody HostRelocateVStorageObject_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostRemoveVFlashResourceBody struct {
+	Req    *types.HostRemoveVFlashResource         `xml:"urn:vim25 HostRemoveVFlashResource,omitempty"`
+	Res    *types.HostRemoveVFlashResourceResponse `xml:"urn:vim25 HostRemoveVFlashResourceResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostRemoveVFlashResourceBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostRemoveVFlashResource(ctx context.Context, r soap.RoundTripper, req *types.HostRemoveVFlashResource) (*types.HostRemoveVFlashResourceResponse, error) {
+	var reqBody, resBody HostRemoveVFlashResourceBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostRenameVStorageObjectBody struct {
+	Req    *types.HostRenameVStorageObject         `xml:"urn:vim25 HostRenameVStorageObject,omitempty"`
+	Res    *types.HostRenameVStorageObjectResponse `xml:"urn:vim25 HostRenameVStorageObjectResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostRenameVStorageObjectBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostRenameVStorageObject(ctx context.Context, r soap.RoundTripper, req *types.HostRenameVStorageObject) (*types.HostRenameVStorageObjectResponse, error) {
+	var reqBody, resBody HostRenameVStorageObjectBody
+
+	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"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostRetrieveVStorageObjectBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostRetrieveVStorageObject(ctx context.Context, r soap.RoundTripper, req *types.HostRetrieveVStorageObject) (*types.HostRetrieveVStorageObjectResponse, error) {
+	var reqBody, resBody HostRetrieveVStorageObjectBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostRetrieveVStorageObjectStateBody struct {
+	Req    *types.HostRetrieveVStorageObjectState         `xml:"urn:vim25 HostRetrieveVStorageObjectState,omitempty"`
+	Res    *types.HostRetrieveVStorageObjectStateResponse `xml:"urn:vim25 HostRetrieveVStorageObjectStateResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostRetrieveVStorageObjectStateBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostRetrieveVStorageObjectState(ctx context.Context, r soap.RoundTripper, req *types.HostRetrieveVStorageObjectState) (*types.HostRetrieveVStorageObjectStateResponse, error) {
+	var reqBody, resBody HostRetrieveVStorageObjectStateBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostScheduleReconcileDatastoreInventoryBody struct {
+	Req    *types.HostScheduleReconcileDatastoreInventory         `xml:"urn:vim25 HostScheduleReconcileDatastoreInventory,omitempty"`
+	Res    *types.HostScheduleReconcileDatastoreInventoryResponse `xml:"urn:vim25 HostScheduleReconcileDatastoreInventoryResponse,omitempty"`
+	Fault_ *soap.Fault                                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostScheduleReconcileDatastoreInventoryBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostScheduleReconcileDatastoreInventory(ctx context.Context, r soap.RoundTripper, req *types.HostScheduleReconcileDatastoreInventory) (*types.HostScheduleReconcileDatastoreInventoryResponse, error) {
+	var reqBody, resBody HostScheduleReconcileDatastoreInventoryBody
+
+	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"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostSpecGetUpdatedHostsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostSpecGetUpdatedHosts(ctx context.Context, r soap.RoundTripper, req *types.HostSpecGetUpdatedHosts) (*types.HostSpecGetUpdatedHostsResponse, error) {
+	var reqBody, resBody HostSpecGetUpdatedHostsBody
+
+	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"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HttpNfcLeaseAbortBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HttpNfcLeaseAbort(ctx context.Context, r soap.RoundTripper, req *types.HttpNfcLeaseAbort) (*types.HttpNfcLeaseAbortResponse, error) {
+	var reqBody, resBody HttpNfcLeaseAbortBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HttpNfcLeaseCompleteBody struct {
+	Req    *types.HttpNfcLeaseComplete         `xml:"urn:vim25 HttpNfcLeaseComplete,omitempty"`
+	Res    *types.HttpNfcLeaseCompleteResponse `xml:"urn:vim25 HttpNfcLeaseCompleteResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HttpNfcLeaseCompleteBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HttpNfcLeaseComplete(ctx context.Context, r soap.RoundTripper, req *types.HttpNfcLeaseComplete) (*types.HttpNfcLeaseCompleteResponse, error) {
+	var reqBody, resBody HttpNfcLeaseCompleteBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HttpNfcLeaseGetManifestBody struct {
+	Req    *types.HttpNfcLeaseGetManifest         `xml:"urn:vim25 HttpNfcLeaseGetManifest,omitempty"`
+	Res    *types.HttpNfcLeaseGetManifestResponse `xml:"urn:vim25 HttpNfcLeaseGetManifestResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HttpNfcLeaseGetManifestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HttpNfcLeaseGetManifest(ctx context.Context, r soap.RoundTripper, req *types.HttpNfcLeaseGetManifest) (*types.HttpNfcLeaseGetManifestResponse, error) {
+	var reqBody, resBody HttpNfcLeaseGetManifestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HttpNfcLeaseProgressBody struct {
+	Req    *types.HttpNfcLeaseProgress         `xml:"urn:vim25 HttpNfcLeaseProgress,omitempty"`
+	Res    *types.HttpNfcLeaseProgressResponse `xml:"urn:vim25 HttpNfcLeaseProgressResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HttpNfcLeaseProgressBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HttpNfcLeaseProgress(ctx context.Context, r soap.RoundTripper, req *types.HttpNfcLeaseProgress) (*types.HttpNfcLeaseProgressResponse, error) {
+	var reqBody, resBody HttpNfcLeaseProgressBody
+
+	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"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ImpersonateUserBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ImpersonateUser(ctx context.Context, r soap.RoundTripper, req *types.ImpersonateUser) (*types.ImpersonateUserResponse, error) {
+	var reqBody, resBody ImpersonateUserBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ImportCertificateForCAM_TaskBody struct {
+	Req    *types.ImportCertificateForCAM_Task         `xml:"urn:vim25 ImportCertificateForCAM_Task,omitempty"`
+	Res    *types.ImportCertificateForCAM_TaskResponse `xml:"urn:vim25 ImportCertificateForCAM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ImportCertificateForCAM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ImportCertificateForCAM_Task(ctx context.Context, r soap.RoundTripper, req *types.ImportCertificateForCAM_Task) (*types.ImportCertificateForCAM_TaskResponse, error) {
+	var reqBody, resBody ImportCertificateForCAM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ImportUnmanagedSnapshotBody struct {
+	Req    *types.ImportUnmanagedSnapshot         `xml:"urn:vim25 ImportUnmanagedSnapshot,omitempty"`
+	Res    *types.ImportUnmanagedSnapshotResponse `xml:"urn:vim25 ImportUnmanagedSnapshotResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ImportUnmanagedSnapshotBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ImportUnmanagedSnapshot(ctx context.Context, r soap.RoundTripper, req *types.ImportUnmanagedSnapshot) (*types.ImportUnmanagedSnapshotResponse, error) {
+	var reqBody, resBody ImportUnmanagedSnapshotBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ImportVAppBody struct {
+	Req    *types.ImportVApp         `xml:"urn:vim25 ImportVApp,omitempty"`
+	Res    *types.ImportVAppResponse `xml:"urn:vim25 ImportVAppResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ImportVAppBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ImportVApp(ctx context.Context, r soap.RoundTripper, req *types.ImportVApp) (*types.ImportVAppResponse, error) {
+	var reqBody, resBody ImportVAppBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type InflateDisk_TaskBody struct {
+	Req    *types.InflateDisk_Task         `xml:"urn:vim25 InflateDisk_Task,omitempty"`
+	Res    *types.InflateDisk_TaskResponse `xml:"urn:vim25 InflateDisk_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *InflateDisk_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func InflateDisk_Task(ctx context.Context, r soap.RoundTripper, req *types.InflateDisk_Task) (*types.InflateDisk_TaskResponse, error) {
+	var reqBody, resBody InflateDisk_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type InflateVirtualDisk_TaskBody struct {
+	Req    *types.InflateVirtualDisk_Task         `xml:"urn:vim25 InflateVirtualDisk_Task,omitempty"`
+	Res    *types.InflateVirtualDisk_TaskResponse `xml:"urn:vim25 InflateVirtualDisk_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *InflateVirtualDisk_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func InflateVirtualDisk_Task(ctx context.Context, r soap.RoundTripper, req *types.InflateVirtualDisk_Task) (*types.InflateVirtualDisk_TaskResponse, error) {
+	var reqBody, resBody InflateVirtualDisk_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type InitializeDisks_TaskBody struct {
+	Req    *types.InitializeDisks_Task         `xml:"urn:vim25 InitializeDisks_Task,omitempty"`
+	Res    *types.InitializeDisks_TaskResponse `xml:"urn:vim25 InitializeDisks_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *InitializeDisks_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func InitializeDisks_Task(ctx context.Context, r soap.RoundTripper, req *types.InitializeDisks_Task) (*types.InitializeDisks_TaskResponse, error) {
+	var reqBody, resBody InitializeDisks_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type InitiateFileTransferFromGuestBody struct {
+	Req    *types.InitiateFileTransferFromGuest         `xml:"urn:vim25 InitiateFileTransferFromGuest,omitempty"`
+	Res    *types.InitiateFileTransferFromGuestResponse `xml:"urn:vim25 InitiateFileTransferFromGuestResponse,omitempty"`
+	Fault_ *soap.Fault                                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *InitiateFileTransferFromGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func InitiateFileTransferFromGuest(ctx context.Context, r soap.RoundTripper, req *types.InitiateFileTransferFromGuest) (*types.InitiateFileTransferFromGuestResponse, error) {
+	var reqBody, resBody InitiateFileTransferFromGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type InitiateFileTransferToGuestBody struct {
+	Req    *types.InitiateFileTransferToGuest         `xml:"urn:vim25 InitiateFileTransferToGuest,omitempty"`
+	Res    *types.InitiateFileTransferToGuestResponse `xml:"urn:vim25 InitiateFileTransferToGuestResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *InitiateFileTransferToGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func InitiateFileTransferToGuest(ctx context.Context, r soap.RoundTripper, req *types.InitiateFileTransferToGuest) (*types.InitiateFileTransferToGuestResponse, error) {
+	var reqBody, resBody InitiateFileTransferToGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type InstallHostPatchV2_TaskBody struct {
+	Req    *types.InstallHostPatchV2_Task         `xml:"urn:vim25 InstallHostPatchV2_Task,omitempty"`
+	Res    *types.InstallHostPatchV2_TaskResponse `xml:"urn:vim25 InstallHostPatchV2_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *InstallHostPatchV2_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func InstallHostPatchV2_Task(ctx context.Context, r soap.RoundTripper, req *types.InstallHostPatchV2_Task) (*types.InstallHostPatchV2_TaskResponse, error) {
+	var reqBody, resBody InstallHostPatchV2_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type InstallHostPatch_TaskBody struct {
+	Req    *types.InstallHostPatch_Task         `xml:"urn:vim25 InstallHostPatch_Task,omitempty"`
+	Res    *types.InstallHostPatch_TaskResponse `xml:"urn:vim25 InstallHostPatch_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *InstallHostPatch_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func InstallHostPatch_Task(ctx context.Context, r soap.RoundTripper, req *types.InstallHostPatch_Task) (*types.InstallHostPatch_TaskResponse, error) {
+	var reqBody, resBody InstallHostPatch_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type InstallIoFilter_TaskBody struct {
+	Req    *types.InstallIoFilter_Task         `xml:"urn:vim25 InstallIoFilter_Task,omitempty"`
+	Res    *types.InstallIoFilter_TaskResponse `xml:"urn:vim25 InstallIoFilter_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *InstallIoFilter_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func InstallIoFilter_Task(ctx context.Context, r soap.RoundTripper, req *types.InstallIoFilter_Task) (*types.InstallIoFilter_TaskResponse, error) {
+	var reqBody, resBody InstallIoFilter_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type InstallServerCertificateBody struct {
+	Req    *types.InstallServerCertificate         `xml:"urn:vim25 InstallServerCertificate,omitempty"`
+	Res    *types.InstallServerCertificateResponse `xml:"urn:vim25 InstallServerCertificateResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *InstallServerCertificateBody) Fault() *soap.Fault { return b.Fault_ }
+
+func InstallServerCertificate(ctx context.Context, r soap.RoundTripper, req *types.InstallServerCertificate) (*types.InstallServerCertificateResponse, error) {
+	var reqBody, resBody InstallServerCertificateBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type InstallSmartCardTrustAnchorBody struct {
+	Req    *types.InstallSmartCardTrustAnchor         `xml:"urn:vim25 InstallSmartCardTrustAnchor,omitempty"`
+	Res    *types.InstallSmartCardTrustAnchorResponse `xml:"urn:vim25 InstallSmartCardTrustAnchorResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *InstallSmartCardTrustAnchorBody) Fault() *soap.Fault { return b.Fault_ }
+
+func InstallSmartCardTrustAnchor(ctx context.Context, r soap.RoundTripper, req *types.InstallSmartCardTrustAnchor) (*types.InstallSmartCardTrustAnchorResponse, error) {
+	var reqBody, resBody InstallSmartCardTrustAnchorBody
+
+	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"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *IsSharedGraphicsActiveBody) Fault() *soap.Fault { return b.Fault_ }
+
+func IsSharedGraphicsActive(ctx context.Context, r soap.RoundTripper, req *types.IsSharedGraphicsActive) (*types.IsSharedGraphicsActiveResponse, error) {
+	var reqBody, resBody IsSharedGraphicsActiveBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type JoinDomainWithCAM_TaskBody struct {
+	Req    *types.JoinDomainWithCAM_Task         `xml:"urn:vim25 JoinDomainWithCAM_Task,omitempty"`
+	Res    *types.JoinDomainWithCAM_TaskResponse `xml:"urn:vim25 JoinDomainWithCAM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *JoinDomainWithCAM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func JoinDomainWithCAM_Task(ctx context.Context, r soap.RoundTripper, req *types.JoinDomainWithCAM_Task) (*types.JoinDomainWithCAM_TaskResponse, error) {
+	var reqBody, resBody JoinDomainWithCAM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type JoinDomain_TaskBody struct {
+	Req    *types.JoinDomain_Task         `xml:"urn:vim25 JoinDomain_Task,omitempty"`
+	Res    *types.JoinDomain_TaskResponse `xml:"urn:vim25 JoinDomain_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *JoinDomain_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func JoinDomain_Task(ctx context.Context, r soap.RoundTripper, req *types.JoinDomain_Task) (*types.JoinDomain_TaskResponse, error) {
+	var reqBody, resBody JoinDomain_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type LeaveCurrentDomain_TaskBody struct {
+	Req    *types.LeaveCurrentDomain_Task         `xml:"urn:vim25 LeaveCurrentDomain_Task,omitempty"`
+	Res    *types.LeaveCurrentDomain_TaskResponse `xml:"urn:vim25 LeaveCurrentDomain_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *LeaveCurrentDomain_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func LeaveCurrentDomain_Task(ctx context.Context, r soap.RoundTripper, req *types.LeaveCurrentDomain_Task) (*types.LeaveCurrentDomain_TaskResponse, error) {
+	var reqBody, resBody LeaveCurrentDomain_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ListCACertificateRevocationListsBody struct {
+	Req    *types.ListCACertificateRevocationLists         `xml:"urn:vim25 ListCACertificateRevocationLists,omitempty"`
+	Res    *types.ListCACertificateRevocationListsResponse `xml:"urn:vim25 ListCACertificateRevocationListsResponse,omitempty"`
+	Fault_ *soap.Fault                                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ListCACertificateRevocationListsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ListCACertificateRevocationLists(ctx context.Context, r soap.RoundTripper, req *types.ListCACertificateRevocationLists) (*types.ListCACertificateRevocationListsResponse, error) {
+	var reqBody, resBody ListCACertificateRevocationListsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ListCACertificatesBody struct {
+	Req    *types.ListCACertificates         `xml:"urn:vim25 ListCACertificates,omitempty"`
+	Res    *types.ListCACertificatesResponse `xml:"urn:vim25 ListCACertificatesResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ListCACertificatesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ListCACertificates(ctx context.Context, r soap.RoundTripper, req *types.ListCACertificates) (*types.ListCACertificatesResponse, error) {
+	var reqBody, resBody ListCACertificatesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ListFilesInGuestBody struct {
+	Req    *types.ListFilesInGuest         `xml:"urn:vim25 ListFilesInGuest,omitempty"`
+	Res    *types.ListFilesInGuestResponse `xml:"urn:vim25 ListFilesInGuestResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ListFilesInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ListFilesInGuest(ctx context.Context, r soap.RoundTripper, req *types.ListFilesInGuest) (*types.ListFilesInGuestResponse, error) {
+	var reqBody, resBody ListFilesInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ListGuestAliasesBody struct {
+	Req    *types.ListGuestAliases         `xml:"urn:vim25 ListGuestAliases,omitempty"`
+	Res    *types.ListGuestAliasesResponse `xml:"urn:vim25 ListGuestAliasesResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ListGuestAliasesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ListGuestAliases(ctx context.Context, r soap.RoundTripper, req *types.ListGuestAliases) (*types.ListGuestAliasesResponse, error) {
+	var reqBody, resBody ListGuestAliasesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ListGuestMappedAliasesBody struct {
+	Req    *types.ListGuestMappedAliases         `xml:"urn:vim25 ListGuestMappedAliases,omitempty"`
+	Res    *types.ListGuestMappedAliasesResponse `xml:"urn:vim25 ListGuestMappedAliasesResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ListGuestMappedAliasesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ListGuestMappedAliases(ctx context.Context, r soap.RoundTripper, req *types.ListGuestMappedAliases) (*types.ListGuestMappedAliasesResponse, error) {
+	var reqBody, resBody ListGuestMappedAliasesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ListKeysBody struct {
+	Req    *types.ListKeys         `xml:"urn:vim25 ListKeys,omitempty"`
+	Res    *types.ListKeysResponse `xml:"urn:vim25 ListKeysResponse,omitempty"`
+	Fault_ *soap.Fault             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ListKeysBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ListKeys(ctx context.Context, r soap.RoundTripper, req *types.ListKeys) (*types.ListKeysResponse, error) {
+	var reqBody, resBody ListKeysBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ListKmipServersBody struct {
+	Req    *types.ListKmipServers         `xml:"urn:vim25 ListKmipServers,omitempty"`
+	Res    *types.ListKmipServersResponse `xml:"urn:vim25 ListKmipServersResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ListKmipServersBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ListKmipServers(ctx context.Context, r soap.RoundTripper, req *types.ListKmipServers) (*types.ListKmipServersResponse, error) {
+	var reqBody, resBody ListKmipServersBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ListProcessesInGuestBody struct {
+	Req    *types.ListProcessesInGuest         `xml:"urn:vim25 ListProcessesInGuest,omitempty"`
+	Res    *types.ListProcessesInGuestResponse `xml:"urn:vim25 ListProcessesInGuestResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ListProcessesInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ListProcessesInGuest(ctx context.Context, r soap.RoundTripper, req *types.ListProcessesInGuest) (*types.ListProcessesInGuestResponse, error) {
+	var reqBody, resBody ListProcessesInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ListRegistryKeysInGuestBody struct {
+	Req    *types.ListRegistryKeysInGuest         `xml:"urn:vim25 ListRegistryKeysInGuest,omitempty"`
+	Res    *types.ListRegistryKeysInGuestResponse `xml:"urn:vim25 ListRegistryKeysInGuestResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ListRegistryKeysInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ListRegistryKeysInGuest(ctx context.Context, r soap.RoundTripper, req *types.ListRegistryKeysInGuest) (*types.ListRegistryKeysInGuestResponse, error) {
+	var reqBody, resBody ListRegistryKeysInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ListRegistryValuesInGuestBody struct {
+	Req    *types.ListRegistryValuesInGuest         `xml:"urn:vim25 ListRegistryValuesInGuest,omitempty"`
+	Res    *types.ListRegistryValuesInGuestResponse `xml:"urn:vim25 ListRegistryValuesInGuestResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ListRegistryValuesInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ListRegistryValuesInGuest(ctx context.Context, r soap.RoundTripper, req *types.ListRegistryValuesInGuest) (*types.ListRegistryValuesInGuestResponse, error) {
+	var reqBody, resBody ListRegistryValuesInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ListSmartCardTrustAnchorsBody struct {
+	Req    *types.ListSmartCardTrustAnchors         `xml:"urn:vim25 ListSmartCardTrustAnchors,omitempty"`
+	Res    *types.ListSmartCardTrustAnchorsResponse `xml:"urn:vim25 ListSmartCardTrustAnchorsResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ListSmartCardTrustAnchorsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ListSmartCardTrustAnchors(ctx context.Context, r soap.RoundTripper, req *types.ListSmartCardTrustAnchors) (*types.ListSmartCardTrustAnchorsResponse, error) {
+	var reqBody, resBody ListSmartCardTrustAnchorsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ListTagsAttachedToVStorageObjectBody struct {
+	Req    *types.ListTagsAttachedToVStorageObject         `xml:"urn:vim25 ListTagsAttachedToVStorageObject,omitempty"`
+	Res    *types.ListTagsAttachedToVStorageObjectResponse `xml:"urn:vim25 ListTagsAttachedToVStorageObjectResponse,omitempty"`
+	Fault_ *soap.Fault                                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ListTagsAttachedToVStorageObjectBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ListTagsAttachedToVStorageObject(ctx context.Context, r soap.RoundTripper, req *types.ListTagsAttachedToVStorageObject) (*types.ListTagsAttachedToVStorageObjectResponse, error) {
+	var reqBody, resBody ListTagsAttachedToVStorageObjectBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ListVStorageObjectBody struct {
+	Req    *types.ListVStorageObject         `xml:"urn:vim25 ListVStorageObject,omitempty"`
+	Res    *types.ListVStorageObjectResponse `xml:"urn:vim25 ListVStorageObjectResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ListVStorageObjectBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ListVStorageObject(ctx context.Context, r soap.RoundTripper, req *types.ListVStorageObject) (*types.ListVStorageObjectResponse, error) {
+	var reqBody, resBody ListVStorageObjectBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ListVStorageObjectsAttachedToTagBody struct {
+	Req    *types.ListVStorageObjectsAttachedToTag         `xml:"urn:vim25 ListVStorageObjectsAttachedToTag,omitempty"`
+	Res    *types.ListVStorageObjectsAttachedToTagResponse `xml:"urn:vim25 ListVStorageObjectsAttachedToTagResponse,omitempty"`
+	Fault_ *soap.Fault                                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ListVStorageObjectsAttachedToTagBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ListVStorageObjectsAttachedToTag(ctx context.Context, r soap.RoundTripper, req *types.ListVStorageObjectsAttachedToTag) (*types.ListVStorageObjectsAttachedToTagResponse, error) {
+	var reqBody, resBody ListVStorageObjectsAttachedToTagBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type LogUserEventBody struct {
+	Req    *types.LogUserEvent         `xml:"urn:vim25 LogUserEvent,omitempty"`
+	Res    *types.LogUserEventResponse `xml:"urn:vim25 LogUserEventResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *LogUserEventBody) Fault() *soap.Fault { return b.Fault_ }
+
+func LogUserEvent(ctx context.Context, r soap.RoundTripper, req *types.LogUserEvent) (*types.LogUserEventResponse, error) {
+	var reqBody, resBody LogUserEventBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type LoginBody struct {
+	Req    *types.Login         `xml:"urn:vim25 Login,omitempty"`
+	Res    *types.LoginResponse `xml:"urn:vim25 LoginResponse,omitempty"`
+	Fault_ *soap.Fault          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *LoginBody) Fault() *soap.Fault { return b.Fault_ }
+
+func Login(ctx context.Context, r soap.RoundTripper, req *types.Login) (*types.LoginResponse, error) {
+	var reqBody, resBody LoginBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type LoginBySSPIBody struct {
+	Req    *types.LoginBySSPI         `xml:"urn:vim25 LoginBySSPI,omitempty"`
+	Res    *types.LoginBySSPIResponse `xml:"urn:vim25 LoginBySSPIResponse,omitempty"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *LoginBySSPIBody) Fault() *soap.Fault { return b.Fault_ }
+
+func LoginBySSPI(ctx context.Context, r soap.RoundTripper, req *types.LoginBySSPI) (*types.LoginBySSPIResponse, error) {
+	var reqBody, resBody LoginBySSPIBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type LoginByTokenBody struct {
+	Req    *types.LoginByToken         `xml:"urn:vim25 LoginByToken,omitempty"`
+	Res    *types.LoginByTokenResponse `xml:"urn:vim25 LoginByTokenResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *LoginByTokenBody) Fault() *soap.Fault { return b.Fault_ }
+
+func LoginByToken(ctx context.Context, r soap.RoundTripper, req *types.LoginByToken) (*types.LoginByTokenResponse, error) {
+	var reqBody, resBody LoginByTokenBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type LoginExtensionByCertificateBody struct {
+	Req    *types.LoginExtensionByCertificate         `xml:"urn:vim25 LoginExtensionByCertificate,omitempty"`
+	Res    *types.LoginExtensionByCertificateResponse `xml:"urn:vim25 LoginExtensionByCertificateResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *LoginExtensionByCertificateBody) Fault() *soap.Fault { return b.Fault_ }
+
+func LoginExtensionByCertificate(ctx context.Context, r soap.RoundTripper, req *types.LoginExtensionByCertificate) (*types.LoginExtensionByCertificateResponse, error) {
+	var reqBody, resBody LoginExtensionByCertificateBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type LoginExtensionBySubjectNameBody struct {
+	Req    *types.LoginExtensionBySubjectName         `xml:"urn:vim25 LoginExtensionBySubjectName,omitempty"`
+	Res    *types.LoginExtensionBySubjectNameResponse `xml:"urn:vim25 LoginExtensionBySubjectNameResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *LoginExtensionBySubjectNameBody) Fault() *soap.Fault { return b.Fault_ }
+
+func LoginExtensionBySubjectName(ctx context.Context, r soap.RoundTripper, req *types.LoginExtensionBySubjectName) (*types.LoginExtensionBySubjectNameResponse, error) {
+	var reqBody, resBody LoginExtensionBySubjectNameBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type LogoutBody struct {
+	Req    *types.Logout         `xml:"urn:vim25 Logout,omitempty"`
+	Res    *types.LogoutResponse `xml:"urn:vim25 LogoutResponse,omitempty"`
+	Fault_ *soap.Fault           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *LogoutBody) Fault() *soap.Fault { return b.Fault_ }
+
+func Logout(ctx context.Context, r soap.RoundTripper, req *types.Logout) (*types.LogoutResponse, error) {
+	var reqBody, resBody LogoutBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type LookupDvPortGroupBody struct {
+	Req    *types.LookupDvPortGroup         `xml:"urn:vim25 LookupDvPortGroup,omitempty"`
+	Res    *types.LookupDvPortGroupResponse `xml:"urn:vim25 LookupDvPortGroupResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *LookupDvPortGroupBody) Fault() *soap.Fault { return b.Fault_ }
+
+func LookupDvPortGroup(ctx context.Context, r soap.RoundTripper, req *types.LookupDvPortGroup) (*types.LookupDvPortGroupResponse, error) {
+	var reqBody, resBody LookupDvPortGroupBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type LookupVmOverheadMemoryBody struct {
+	Req    *types.LookupVmOverheadMemory         `xml:"urn:vim25 LookupVmOverheadMemory,omitempty"`
+	Res    *types.LookupVmOverheadMemoryResponse `xml:"urn:vim25 LookupVmOverheadMemoryResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *LookupVmOverheadMemoryBody) Fault() *soap.Fault { return b.Fault_ }
+
+func LookupVmOverheadMemory(ctx context.Context, r soap.RoundTripper, req *types.LookupVmOverheadMemory) (*types.LookupVmOverheadMemoryResponse, error) {
+	var reqBody, resBody LookupVmOverheadMemoryBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MakeDirectoryBody struct {
+	Req    *types.MakeDirectory         `xml:"urn:vim25 MakeDirectory,omitempty"`
+	Res    *types.MakeDirectoryResponse `xml:"urn:vim25 MakeDirectoryResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MakeDirectoryBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MakeDirectory(ctx context.Context, r soap.RoundTripper, req *types.MakeDirectory) (*types.MakeDirectoryResponse, error) {
+	var reqBody, resBody MakeDirectoryBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MakeDirectoryInGuestBody struct {
+	Req    *types.MakeDirectoryInGuest         `xml:"urn:vim25 MakeDirectoryInGuest,omitempty"`
+	Res    *types.MakeDirectoryInGuestResponse `xml:"urn:vim25 MakeDirectoryInGuestResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MakeDirectoryInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MakeDirectoryInGuest(ctx context.Context, r soap.RoundTripper, req *types.MakeDirectoryInGuest) (*types.MakeDirectoryInGuestResponse, error) {
+	var reqBody, resBody MakeDirectoryInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MakePrimaryVM_TaskBody struct {
+	Req    *types.MakePrimaryVM_Task         `xml:"urn:vim25 MakePrimaryVM_Task,omitempty"`
+	Res    *types.MakePrimaryVM_TaskResponse `xml:"urn:vim25 MakePrimaryVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MakePrimaryVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MakePrimaryVM_Task(ctx context.Context, r soap.RoundTripper, req *types.MakePrimaryVM_Task) (*types.MakePrimaryVM_TaskResponse, error) {
+	var reqBody, resBody MakePrimaryVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MarkAsLocal_TaskBody struct {
+	Req    *types.MarkAsLocal_Task         `xml:"urn:vim25 MarkAsLocal_Task,omitempty"`
+	Res    *types.MarkAsLocal_TaskResponse `xml:"urn:vim25 MarkAsLocal_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MarkAsLocal_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MarkAsLocal_Task(ctx context.Context, r soap.RoundTripper, req *types.MarkAsLocal_Task) (*types.MarkAsLocal_TaskResponse, error) {
+	var reqBody, resBody MarkAsLocal_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MarkAsNonLocal_TaskBody struct {
+	Req    *types.MarkAsNonLocal_Task         `xml:"urn:vim25 MarkAsNonLocal_Task,omitempty"`
+	Res    *types.MarkAsNonLocal_TaskResponse `xml:"urn:vim25 MarkAsNonLocal_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MarkAsNonLocal_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MarkAsNonLocal_Task(ctx context.Context, r soap.RoundTripper, req *types.MarkAsNonLocal_Task) (*types.MarkAsNonLocal_TaskResponse, error) {
+	var reqBody, resBody MarkAsNonLocal_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MarkAsNonSsd_TaskBody struct {
+	Req    *types.MarkAsNonSsd_Task         `xml:"urn:vim25 MarkAsNonSsd_Task,omitempty"`
+	Res    *types.MarkAsNonSsd_TaskResponse `xml:"urn:vim25 MarkAsNonSsd_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MarkAsNonSsd_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MarkAsNonSsd_Task(ctx context.Context, r soap.RoundTripper, req *types.MarkAsNonSsd_Task) (*types.MarkAsNonSsd_TaskResponse, error) {
+	var reqBody, resBody MarkAsNonSsd_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MarkAsSsd_TaskBody struct {
+	Req    *types.MarkAsSsd_Task         `xml:"urn:vim25 MarkAsSsd_Task,omitempty"`
+	Res    *types.MarkAsSsd_TaskResponse `xml:"urn:vim25 MarkAsSsd_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MarkAsSsd_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MarkAsSsd_Task(ctx context.Context, r soap.RoundTripper, req *types.MarkAsSsd_Task) (*types.MarkAsSsd_TaskResponse, error) {
+	var reqBody, resBody MarkAsSsd_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MarkAsTemplateBody struct {
+	Req    *types.MarkAsTemplate         `xml:"urn:vim25 MarkAsTemplate,omitempty"`
+	Res    *types.MarkAsTemplateResponse `xml:"urn:vim25 MarkAsTemplateResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MarkAsTemplateBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MarkAsTemplate(ctx context.Context, r soap.RoundTripper, req *types.MarkAsTemplate) (*types.MarkAsTemplateResponse, error) {
+	var reqBody, resBody MarkAsTemplateBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MarkAsVirtualMachineBody struct {
+	Req    *types.MarkAsVirtualMachine         `xml:"urn:vim25 MarkAsVirtualMachine,omitempty"`
+	Res    *types.MarkAsVirtualMachineResponse `xml:"urn:vim25 MarkAsVirtualMachineResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MarkAsVirtualMachineBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MarkAsVirtualMachine(ctx context.Context, r soap.RoundTripper, req *types.MarkAsVirtualMachine) (*types.MarkAsVirtualMachineResponse, error) {
+	var reqBody, resBody MarkAsVirtualMachineBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MarkDefaultBody struct {
+	Req    *types.MarkDefault         `xml:"urn:vim25 MarkDefault,omitempty"`
+	Res    *types.MarkDefaultResponse `xml:"urn:vim25 MarkDefaultResponse,omitempty"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MarkDefaultBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MarkDefault(ctx context.Context, r soap.RoundTripper, req *types.MarkDefault) (*types.MarkDefaultResponse, error) {
+	var reqBody, resBody MarkDefaultBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MarkForRemovalBody struct {
+	Req    *types.MarkForRemoval         `xml:"urn:vim25 MarkForRemoval,omitempty"`
+	Res    *types.MarkForRemovalResponse `xml:"urn:vim25 MarkForRemovalResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MarkForRemovalBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MarkForRemoval(ctx context.Context, r soap.RoundTripper, req *types.MarkForRemoval) (*types.MarkForRemovalResponse, error) {
+	var reqBody, resBody MarkForRemovalBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MergeDvs_TaskBody struct {
+	Req    *types.MergeDvs_Task         `xml:"urn:vim25 MergeDvs_Task,omitempty"`
+	Res    *types.MergeDvs_TaskResponse `xml:"urn:vim25 MergeDvs_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MergeDvs_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MergeDvs_Task(ctx context.Context, r soap.RoundTripper, req *types.MergeDvs_Task) (*types.MergeDvs_TaskResponse, error) {
+	var reqBody, resBody MergeDvs_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MergePermissionsBody struct {
+	Req    *types.MergePermissions         `xml:"urn:vim25 MergePermissions,omitempty"`
+	Res    *types.MergePermissionsResponse `xml:"urn:vim25 MergePermissionsResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MergePermissionsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MergePermissions(ctx context.Context, r soap.RoundTripper, req *types.MergePermissions) (*types.MergePermissionsResponse, error) {
+	var reqBody, resBody MergePermissionsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MigrateVM_TaskBody struct {
+	Req    *types.MigrateVM_Task         `xml:"urn:vim25 MigrateVM_Task,omitempty"`
+	Res    *types.MigrateVM_TaskResponse `xml:"urn:vim25 MigrateVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MigrateVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MigrateVM_Task(ctx context.Context, r soap.RoundTripper, req *types.MigrateVM_Task) (*types.MigrateVM_TaskResponse, error) {
+	var reqBody, resBody MigrateVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ModifyListViewBody struct {
+	Req    *types.ModifyListView         `xml:"urn:vim25 ModifyListView,omitempty"`
+	Res    *types.ModifyListViewResponse `xml:"urn:vim25 ModifyListViewResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ModifyListViewBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ModifyListView(ctx context.Context, r soap.RoundTripper, req *types.ModifyListView) (*types.ModifyListViewResponse, error) {
+	var reqBody, resBody ModifyListViewBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MountToolsInstallerBody struct {
+	Req    *types.MountToolsInstaller         `xml:"urn:vim25 MountToolsInstaller,omitempty"`
+	Res    *types.MountToolsInstallerResponse `xml:"urn:vim25 MountToolsInstallerResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MountToolsInstallerBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MountToolsInstaller(ctx context.Context, r soap.RoundTripper, req *types.MountToolsInstaller) (*types.MountToolsInstallerResponse, error) {
+	var reqBody, resBody MountToolsInstallerBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MountVffsVolumeBody struct {
+	Req    *types.MountVffsVolume         `xml:"urn:vim25 MountVffsVolume,omitempty"`
+	Res    *types.MountVffsVolumeResponse `xml:"urn:vim25 MountVffsVolumeResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MountVffsVolumeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MountVffsVolume(ctx context.Context, r soap.RoundTripper, req *types.MountVffsVolume) (*types.MountVffsVolumeResponse, error) {
+	var reqBody, resBody MountVffsVolumeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MountVmfsVolumeBody struct {
+	Req    *types.MountVmfsVolume         `xml:"urn:vim25 MountVmfsVolume,omitempty"`
+	Res    *types.MountVmfsVolumeResponse `xml:"urn:vim25 MountVmfsVolumeResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MountVmfsVolumeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MountVmfsVolume(ctx context.Context, r soap.RoundTripper, req *types.MountVmfsVolume) (*types.MountVmfsVolumeResponse, error) {
+	var reqBody, resBody MountVmfsVolumeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MountVmfsVolumeEx_TaskBody struct {
+	Req    *types.MountVmfsVolumeEx_Task         `xml:"urn:vim25 MountVmfsVolumeEx_Task,omitempty"`
+	Res    *types.MountVmfsVolumeEx_TaskResponse `xml:"urn:vim25 MountVmfsVolumeEx_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MountVmfsVolumeEx_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MountVmfsVolumeEx_Task(ctx context.Context, r soap.RoundTripper, req *types.MountVmfsVolumeEx_Task) (*types.MountVmfsVolumeEx_TaskResponse, error) {
+	var reqBody, resBody MountVmfsVolumeEx_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MoveDVPort_TaskBody struct {
+	Req    *types.MoveDVPort_Task         `xml:"urn:vim25 MoveDVPort_Task,omitempty"`
+	Res    *types.MoveDVPort_TaskResponse `xml:"urn:vim25 MoveDVPort_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MoveDVPort_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MoveDVPort_Task(ctx context.Context, r soap.RoundTripper, req *types.MoveDVPort_Task) (*types.MoveDVPort_TaskResponse, error) {
+	var reqBody, resBody MoveDVPort_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MoveDatastoreFile_TaskBody struct {
+	Req    *types.MoveDatastoreFile_Task         `xml:"urn:vim25 MoveDatastoreFile_Task,omitempty"`
+	Res    *types.MoveDatastoreFile_TaskResponse `xml:"urn:vim25 MoveDatastoreFile_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MoveDatastoreFile_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MoveDatastoreFile_Task(ctx context.Context, r soap.RoundTripper, req *types.MoveDatastoreFile_Task) (*types.MoveDatastoreFile_TaskResponse, error) {
+	var reqBody, resBody MoveDatastoreFile_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MoveDirectoryInGuestBody struct {
+	Req    *types.MoveDirectoryInGuest         `xml:"urn:vim25 MoveDirectoryInGuest,omitempty"`
+	Res    *types.MoveDirectoryInGuestResponse `xml:"urn:vim25 MoveDirectoryInGuestResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MoveDirectoryInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MoveDirectoryInGuest(ctx context.Context, r soap.RoundTripper, req *types.MoveDirectoryInGuest) (*types.MoveDirectoryInGuestResponse, error) {
+	var reqBody, resBody MoveDirectoryInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MoveFileInGuestBody struct {
+	Req    *types.MoveFileInGuest         `xml:"urn:vim25 MoveFileInGuest,omitempty"`
+	Res    *types.MoveFileInGuestResponse `xml:"urn:vim25 MoveFileInGuestResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MoveFileInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MoveFileInGuest(ctx context.Context, r soap.RoundTripper, req *types.MoveFileInGuest) (*types.MoveFileInGuestResponse, error) {
+	var reqBody, resBody MoveFileInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MoveHostInto_TaskBody struct {
+	Req    *types.MoveHostInto_Task         `xml:"urn:vim25 MoveHostInto_Task,omitempty"`
+	Res    *types.MoveHostInto_TaskResponse `xml:"urn:vim25 MoveHostInto_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MoveHostInto_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MoveHostInto_Task(ctx context.Context, r soap.RoundTripper, req *types.MoveHostInto_Task) (*types.MoveHostInto_TaskResponse, error) {
+	var reqBody, resBody MoveHostInto_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MoveIntoFolder_TaskBody struct {
+	Req    *types.MoveIntoFolder_Task         `xml:"urn:vim25 MoveIntoFolder_Task,omitempty"`
+	Res    *types.MoveIntoFolder_TaskResponse `xml:"urn:vim25 MoveIntoFolder_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MoveIntoFolder_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MoveIntoFolder_Task(ctx context.Context, r soap.RoundTripper, req *types.MoveIntoFolder_Task) (*types.MoveIntoFolder_TaskResponse, error) {
+	var reqBody, resBody MoveIntoFolder_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MoveIntoResourcePoolBody struct {
+	Req    *types.MoveIntoResourcePool         `xml:"urn:vim25 MoveIntoResourcePool,omitempty"`
+	Res    *types.MoveIntoResourcePoolResponse `xml:"urn:vim25 MoveIntoResourcePoolResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MoveIntoResourcePoolBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MoveIntoResourcePool(ctx context.Context, r soap.RoundTripper, req *types.MoveIntoResourcePool) (*types.MoveIntoResourcePoolResponse, error) {
+	var reqBody, resBody MoveIntoResourcePoolBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MoveInto_TaskBody struct {
+	Req    *types.MoveInto_Task         `xml:"urn:vim25 MoveInto_Task,omitempty"`
+	Res    *types.MoveInto_TaskResponse `xml:"urn:vim25 MoveInto_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MoveInto_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MoveInto_Task(ctx context.Context, r soap.RoundTripper, req *types.MoveInto_Task) (*types.MoveInto_TaskResponse, error) {
+	var reqBody, resBody MoveInto_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type MoveVirtualDisk_TaskBody struct {
+	Req    *types.MoveVirtualDisk_Task         `xml:"urn:vim25 MoveVirtualDisk_Task,omitempty"`
+	Res    *types.MoveVirtualDisk_TaskResponse `xml:"urn:vim25 MoveVirtualDisk_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *MoveVirtualDisk_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func MoveVirtualDisk_Task(ctx context.Context, r soap.RoundTripper, req *types.MoveVirtualDisk_Task) (*types.MoveVirtualDisk_TaskResponse, error) {
+	var reqBody, resBody MoveVirtualDisk_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type OpenInventoryViewFolderBody struct {
+	Req    *types.OpenInventoryViewFolder         `xml:"urn:vim25 OpenInventoryViewFolder,omitempty"`
+	Res    *types.OpenInventoryViewFolderResponse `xml:"urn:vim25 OpenInventoryViewFolderResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *OpenInventoryViewFolderBody) Fault() *soap.Fault { return b.Fault_ }
+
+func OpenInventoryViewFolder(ctx context.Context, r soap.RoundTripper, req *types.OpenInventoryViewFolder) (*types.OpenInventoryViewFolderResponse, error) {
+	var reqBody, resBody OpenInventoryViewFolderBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type OverwriteCustomizationSpecBody struct {
+	Req    *types.OverwriteCustomizationSpec         `xml:"urn:vim25 OverwriteCustomizationSpec,omitempty"`
+	Res    *types.OverwriteCustomizationSpecResponse `xml:"urn:vim25 OverwriteCustomizationSpecResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *OverwriteCustomizationSpecBody) Fault() *soap.Fault { return b.Fault_ }
+
+func OverwriteCustomizationSpec(ctx context.Context, r soap.RoundTripper, req *types.OverwriteCustomizationSpec) (*types.OverwriteCustomizationSpecResponse, error) {
+	var reqBody, resBody OverwriteCustomizationSpecBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ParseDescriptorBody struct {
+	Req    *types.ParseDescriptor         `xml:"urn:vim25 ParseDescriptor,omitempty"`
+	Res    *types.ParseDescriptorResponse `xml:"urn:vim25 ParseDescriptorResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ParseDescriptorBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ParseDescriptor(ctx context.Context, r soap.RoundTripper, req *types.ParseDescriptor) (*types.ParseDescriptorResponse, error) {
+	var reqBody, resBody ParseDescriptorBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type PerformDvsProductSpecOperation_TaskBody struct {
+	Req    *types.PerformDvsProductSpecOperation_Task         `xml:"urn:vim25 PerformDvsProductSpecOperation_Task,omitempty"`
+	Res    *types.PerformDvsProductSpecOperation_TaskResponse `xml:"urn:vim25 PerformDvsProductSpecOperation_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *PerformDvsProductSpecOperation_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func PerformDvsProductSpecOperation_Task(ctx context.Context, r soap.RoundTripper, req *types.PerformDvsProductSpecOperation_Task) (*types.PerformDvsProductSpecOperation_TaskResponse, error) {
+	var reqBody, resBody PerformDvsProductSpecOperation_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type PerformVsanUpgradePreflightCheckBody struct {
+	Req    *types.PerformVsanUpgradePreflightCheck         `xml:"urn:vim25 PerformVsanUpgradePreflightCheck,omitempty"`
+	Res    *types.PerformVsanUpgradePreflightCheckResponse `xml:"urn:vim25 PerformVsanUpgradePreflightCheckResponse,omitempty"`
+	Fault_ *soap.Fault                                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *PerformVsanUpgradePreflightCheckBody) Fault() *soap.Fault { return b.Fault_ }
+
+func PerformVsanUpgradePreflightCheck(ctx context.Context, r soap.RoundTripper, req *types.PerformVsanUpgradePreflightCheck) (*types.PerformVsanUpgradePreflightCheckResponse, error) {
+	var reqBody, resBody PerformVsanUpgradePreflightCheckBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type PerformVsanUpgrade_TaskBody struct {
+	Req    *types.PerformVsanUpgrade_Task         `xml:"urn:vim25 PerformVsanUpgrade_Task,omitempty"`
+	Res    *types.PerformVsanUpgrade_TaskResponse `xml:"urn:vim25 PerformVsanUpgrade_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *PerformVsanUpgrade_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func PerformVsanUpgrade_Task(ctx context.Context, r soap.RoundTripper, req *types.PerformVsanUpgrade_Task) (*types.PerformVsanUpgrade_TaskResponse, error) {
+	var reqBody, resBody PerformVsanUpgrade_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type PlaceVmBody struct {
+	Req    *types.PlaceVm         `xml:"urn:vim25 PlaceVm,omitempty"`
+	Res    *types.PlaceVmResponse `xml:"urn:vim25 PlaceVmResponse,omitempty"`
+	Fault_ *soap.Fault            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *PlaceVmBody) Fault() *soap.Fault { return b.Fault_ }
+
+func PlaceVm(ctx context.Context, r soap.RoundTripper, req *types.PlaceVm) (*types.PlaceVmResponse, error) {
+	var reqBody, resBody PlaceVmBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type PostEventBody struct {
+	Req    *types.PostEvent         `xml:"urn:vim25 PostEvent,omitempty"`
+	Res    *types.PostEventResponse `xml:"urn:vim25 PostEventResponse,omitempty"`
+	Fault_ *soap.Fault              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *PostEventBody) Fault() *soap.Fault { return b.Fault_ }
+
+func PostEvent(ctx context.Context, r soap.RoundTripper, req *types.PostEvent) (*types.PostEventResponse, error) {
+	var reqBody, resBody PostEventBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type PostHealthUpdatesBody struct {
+	Req    *types.PostHealthUpdates         `xml:"urn:vim25 PostHealthUpdates,omitempty"`
+	Res    *types.PostHealthUpdatesResponse `xml:"urn:vim25 PostHealthUpdatesResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *PostHealthUpdatesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func PostHealthUpdates(ctx context.Context, r soap.RoundTripper, req *types.PostHealthUpdates) (*types.PostHealthUpdatesResponse, error) {
+	var reqBody, resBody PostHealthUpdatesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type PowerDownHostToStandBy_TaskBody struct {
+	Req    *types.PowerDownHostToStandBy_Task         `xml:"urn:vim25 PowerDownHostToStandBy_Task,omitempty"`
+	Res    *types.PowerDownHostToStandBy_TaskResponse `xml:"urn:vim25 PowerDownHostToStandBy_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *PowerDownHostToStandBy_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func PowerDownHostToStandBy_Task(ctx context.Context, r soap.RoundTripper, req *types.PowerDownHostToStandBy_Task) (*types.PowerDownHostToStandBy_TaskResponse, error) {
+	var reqBody, resBody PowerDownHostToStandBy_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type PowerOffVApp_TaskBody struct {
+	Req    *types.PowerOffVApp_Task         `xml:"urn:vim25 PowerOffVApp_Task,omitempty"`
+	Res    *types.PowerOffVApp_TaskResponse `xml:"urn:vim25 PowerOffVApp_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *PowerOffVApp_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func PowerOffVApp_Task(ctx context.Context, r soap.RoundTripper, req *types.PowerOffVApp_Task) (*types.PowerOffVApp_TaskResponse, error) {
+	var reqBody, resBody PowerOffVApp_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type PowerOffVM_TaskBody struct {
+	Req    *types.PowerOffVM_Task         `xml:"urn:vim25 PowerOffVM_Task,omitempty"`
+	Res    *types.PowerOffVM_TaskResponse `xml:"urn:vim25 PowerOffVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *PowerOffVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func PowerOffVM_Task(ctx context.Context, r soap.RoundTripper, req *types.PowerOffVM_Task) (*types.PowerOffVM_TaskResponse, error) {
+	var reqBody, resBody PowerOffVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type PowerOnMultiVM_TaskBody struct {
+	Req    *types.PowerOnMultiVM_Task         `xml:"urn:vim25 PowerOnMultiVM_Task,omitempty"`
+	Res    *types.PowerOnMultiVM_TaskResponse `xml:"urn:vim25 PowerOnMultiVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *PowerOnMultiVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func PowerOnMultiVM_Task(ctx context.Context, r soap.RoundTripper, req *types.PowerOnMultiVM_Task) (*types.PowerOnMultiVM_TaskResponse, error) {
+	var reqBody, resBody PowerOnMultiVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type PowerOnVApp_TaskBody struct {
+	Req    *types.PowerOnVApp_Task         `xml:"urn:vim25 PowerOnVApp_Task,omitempty"`
+	Res    *types.PowerOnVApp_TaskResponse `xml:"urn:vim25 PowerOnVApp_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *PowerOnVApp_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func PowerOnVApp_Task(ctx context.Context, r soap.RoundTripper, req *types.PowerOnVApp_Task) (*types.PowerOnVApp_TaskResponse, error) {
+	var reqBody, resBody PowerOnVApp_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type PowerOnVM_TaskBody struct {
+	Req    *types.PowerOnVM_Task         `xml:"urn:vim25 PowerOnVM_Task,omitempty"`
+	Res    *types.PowerOnVM_TaskResponse `xml:"urn:vim25 PowerOnVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *PowerOnVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func PowerOnVM_Task(ctx context.Context, r soap.RoundTripper, req *types.PowerOnVM_Task) (*types.PowerOnVM_TaskResponse, error) {
+	var reqBody, resBody PowerOnVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type PowerUpHostFromStandBy_TaskBody struct {
+	Req    *types.PowerUpHostFromStandBy_Task         `xml:"urn:vim25 PowerUpHostFromStandBy_Task,omitempty"`
+	Res    *types.PowerUpHostFromStandBy_TaskResponse `xml:"urn:vim25 PowerUpHostFromStandBy_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *PowerUpHostFromStandBy_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func PowerUpHostFromStandBy_Task(ctx context.Context, r soap.RoundTripper, req *types.PowerUpHostFromStandBy_Task) (*types.PowerUpHostFromStandBy_TaskResponse, error) {
+	var reqBody, resBody PowerUpHostFromStandBy_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type PrepareCryptoBody struct {
+	Req    *types.PrepareCrypto         `xml:"urn:vim25 PrepareCrypto,omitempty"`
+	Res    *types.PrepareCryptoResponse `xml:"urn:vim25 PrepareCryptoResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *PrepareCryptoBody) Fault() *soap.Fault { return b.Fault_ }
+
+func PrepareCrypto(ctx context.Context, r soap.RoundTripper, req *types.PrepareCrypto) (*types.PrepareCryptoResponse, error) {
+	var reqBody, resBody PrepareCryptoBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type PromoteDisks_TaskBody struct {
+	Req    *types.PromoteDisks_Task         `xml:"urn:vim25 PromoteDisks_Task,omitempty"`
+	Res    *types.PromoteDisks_TaskResponse `xml:"urn:vim25 PromoteDisks_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *PromoteDisks_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func PromoteDisks_Task(ctx context.Context, r soap.RoundTripper, req *types.PromoteDisks_Task) (*types.PromoteDisks_TaskResponse, error) {
+	var reqBody, resBody PromoteDisks_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type PutUsbScanCodesBody struct {
+	Req    *types.PutUsbScanCodes         `xml:"urn:vim25 PutUsbScanCodes,omitempty"`
+	Res    *types.PutUsbScanCodesResponse `xml:"urn:vim25 PutUsbScanCodesResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *PutUsbScanCodesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func PutUsbScanCodes(ctx context.Context, r soap.RoundTripper, req *types.PutUsbScanCodes) (*types.PutUsbScanCodesResponse, error) {
+	var reqBody, resBody PutUsbScanCodesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryAnswerFileStatusBody struct {
+	Req    *types.QueryAnswerFileStatus         `xml:"urn:vim25 QueryAnswerFileStatus,omitempty"`
+	Res    *types.QueryAnswerFileStatusResponse `xml:"urn:vim25 QueryAnswerFileStatusResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryAnswerFileStatusBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryAnswerFileStatus(ctx context.Context, r soap.RoundTripper, req *types.QueryAnswerFileStatus) (*types.QueryAnswerFileStatusResponse, error) {
+	var reqBody, resBody QueryAnswerFileStatusBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryAssignedLicensesBody struct {
+	Req    *types.QueryAssignedLicenses         `xml:"urn:vim25 QueryAssignedLicenses,omitempty"`
+	Res    *types.QueryAssignedLicensesResponse `xml:"urn:vim25 QueryAssignedLicensesResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryAssignedLicensesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryAssignedLicenses(ctx context.Context, r soap.RoundTripper, req *types.QueryAssignedLicenses) (*types.QueryAssignedLicensesResponse, error) {
+	var reqBody, resBody QueryAssignedLicensesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryAvailableDisksForVmfsBody struct {
+	Req    *types.QueryAvailableDisksForVmfs         `xml:"urn:vim25 QueryAvailableDisksForVmfs,omitempty"`
+	Res    *types.QueryAvailableDisksForVmfsResponse `xml:"urn:vim25 QueryAvailableDisksForVmfsResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryAvailableDisksForVmfsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryAvailableDisksForVmfs(ctx context.Context, r soap.RoundTripper, req *types.QueryAvailableDisksForVmfs) (*types.QueryAvailableDisksForVmfsResponse, error) {
+	var reqBody, resBody QueryAvailableDisksForVmfsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryAvailableDvsSpecBody struct {
+	Req    *types.QueryAvailableDvsSpec         `xml:"urn:vim25 QueryAvailableDvsSpec,omitempty"`
+	Res    *types.QueryAvailableDvsSpecResponse `xml:"urn:vim25 QueryAvailableDvsSpecResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryAvailableDvsSpecBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryAvailableDvsSpec(ctx context.Context, r soap.RoundTripper, req *types.QueryAvailableDvsSpec) (*types.QueryAvailableDvsSpecResponse, error) {
+	var reqBody, resBody QueryAvailableDvsSpecBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryAvailablePartitionBody struct {
+	Req    *types.QueryAvailablePartition         `xml:"urn:vim25 QueryAvailablePartition,omitempty"`
+	Res    *types.QueryAvailablePartitionResponse `xml:"urn:vim25 QueryAvailablePartitionResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryAvailablePartitionBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryAvailablePartition(ctx context.Context, r soap.RoundTripper, req *types.QueryAvailablePartition) (*types.QueryAvailablePartitionResponse, error) {
+	var reqBody, resBody QueryAvailablePartitionBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryAvailablePerfMetricBody struct {
+	Req    *types.QueryAvailablePerfMetric         `xml:"urn:vim25 QueryAvailablePerfMetric,omitempty"`
+	Res    *types.QueryAvailablePerfMetricResponse `xml:"urn:vim25 QueryAvailablePerfMetricResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryAvailablePerfMetricBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryAvailablePerfMetric(ctx context.Context, r soap.RoundTripper, req *types.QueryAvailablePerfMetric) (*types.QueryAvailablePerfMetricResponse, error) {
+	var reqBody, resBody QueryAvailablePerfMetricBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryAvailableSsdsBody struct {
+	Req    *types.QueryAvailableSsds         `xml:"urn:vim25 QueryAvailableSsds,omitempty"`
+	Res    *types.QueryAvailableSsdsResponse `xml:"urn:vim25 QueryAvailableSsdsResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryAvailableSsdsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryAvailableSsds(ctx context.Context, r soap.RoundTripper, req *types.QueryAvailableSsds) (*types.QueryAvailableSsdsResponse, error) {
+	var reqBody, resBody QueryAvailableSsdsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryAvailableTimeZonesBody struct {
+	Req    *types.QueryAvailableTimeZones         `xml:"urn:vim25 QueryAvailableTimeZones,omitempty"`
+	Res    *types.QueryAvailableTimeZonesResponse `xml:"urn:vim25 QueryAvailableTimeZonesResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryAvailableTimeZonesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryAvailableTimeZones(ctx context.Context, r soap.RoundTripper, req *types.QueryAvailableTimeZones) (*types.QueryAvailableTimeZonesResponse, error) {
+	var reqBody, resBody QueryAvailableTimeZonesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryBootDevicesBody struct {
+	Req    *types.QueryBootDevices         `xml:"urn:vim25 QueryBootDevices,omitempty"`
+	Res    *types.QueryBootDevicesResponse `xml:"urn:vim25 QueryBootDevicesResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryBootDevicesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryBootDevices(ctx context.Context, r soap.RoundTripper, req *types.QueryBootDevices) (*types.QueryBootDevicesResponse, error) {
+	var reqBody, resBody QueryBootDevicesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryBoundVnicsBody struct {
+	Req    *types.QueryBoundVnics         `xml:"urn:vim25 QueryBoundVnics,omitempty"`
+	Res    *types.QueryBoundVnicsResponse `xml:"urn:vim25 QueryBoundVnicsResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryBoundVnicsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryBoundVnics(ctx context.Context, r soap.RoundTripper, req *types.QueryBoundVnics) (*types.QueryBoundVnicsResponse, error) {
+	var reqBody, resBody QueryBoundVnicsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryCandidateNicsBody struct {
+	Req    *types.QueryCandidateNics         `xml:"urn:vim25 QueryCandidateNics,omitempty"`
+	Res    *types.QueryCandidateNicsResponse `xml:"urn:vim25 QueryCandidateNicsResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryCandidateNicsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryCandidateNics(ctx context.Context, r soap.RoundTripper, req *types.QueryCandidateNics) (*types.QueryCandidateNicsResponse, error) {
+	var reqBody, resBody QueryCandidateNicsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryChangedDiskAreasBody struct {
+	Req    *types.QueryChangedDiskAreas         `xml:"urn:vim25 QueryChangedDiskAreas,omitempty"`
+	Res    *types.QueryChangedDiskAreasResponse `xml:"urn:vim25 QueryChangedDiskAreasResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryChangedDiskAreasBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryChangedDiskAreas(ctx context.Context, r soap.RoundTripper, req *types.QueryChangedDiskAreas) (*types.QueryChangedDiskAreasResponse, error) {
+	var reqBody, resBody QueryChangedDiskAreasBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryCmmdsBody struct {
+	Req    *types.QueryCmmds         `xml:"urn:vim25 QueryCmmds,omitempty"`
+	Res    *types.QueryCmmdsResponse `xml:"urn:vim25 QueryCmmdsResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryCmmdsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryCmmds(ctx context.Context, r soap.RoundTripper, req *types.QueryCmmds) (*types.QueryCmmdsResponse, error) {
+	var reqBody, resBody QueryCmmdsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryCompatibleHostForExistingDvsBody struct {
+	Req    *types.QueryCompatibleHostForExistingDvs         `xml:"urn:vim25 QueryCompatibleHostForExistingDvs,omitempty"`
+	Res    *types.QueryCompatibleHostForExistingDvsResponse `xml:"urn:vim25 QueryCompatibleHostForExistingDvsResponse,omitempty"`
+	Fault_ *soap.Fault                                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryCompatibleHostForExistingDvsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryCompatibleHostForExistingDvs(ctx context.Context, r soap.RoundTripper, req *types.QueryCompatibleHostForExistingDvs) (*types.QueryCompatibleHostForExistingDvsResponse, error) {
+	var reqBody, resBody QueryCompatibleHostForExistingDvsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryCompatibleHostForNewDvsBody struct {
+	Req    *types.QueryCompatibleHostForNewDvs         `xml:"urn:vim25 QueryCompatibleHostForNewDvs,omitempty"`
+	Res    *types.QueryCompatibleHostForNewDvsResponse `xml:"urn:vim25 QueryCompatibleHostForNewDvsResponse,omitempty"`
+	Fault_ *soap.Fault                                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryCompatibleHostForNewDvsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryCompatibleHostForNewDvs(ctx context.Context, r soap.RoundTripper, req *types.QueryCompatibleHostForNewDvs) (*types.QueryCompatibleHostForNewDvsResponse, error) {
+	var reqBody, resBody QueryCompatibleHostForNewDvsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryComplianceStatusBody struct {
+	Req    *types.QueryComplianceStatus         `xml:"urn:vim25 QueryComplianceStatus,omitempty"`
+	Res    *types.QueryComplianceStatusResponse `xml:"urn:vim25 QueryComplianceStatusResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryComplianceStatusBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryComplianceStatus(ctx context.Context, r soap.RoundTripper, req *types.QueryComplianceStatus) (*types.QueryComplianceStatusResponse, error) {
+	var reqBody, resBody QueryComplianceStatusBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryConfigOptionBody struct {
+	Req    *types.QueryConfigOption         `xml:"urn:vim25 QueryConfigOption,omitempty"`
+	Res    *types.QueryConfigOptionResponse `xml:"urn:vim25 QueryConfigOptionResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryConfigOptionBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryConfigOption(ctx context.Context, r soap.RoundTripper, req *types.QueryConfigOption) (*types.QueryConfigOptionResponse, error) {
+	var reqBody, resBody QueryConfigOptionBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryConfigOptionDescriptorBody struct {
+	Req    *types.QueryConfigOptionDescriptor         `xml:"urn:vim25 QueryConfigOptionDescriptor,omitempty"`
+	Res    *types.QueryConfigOptionDescriptorResponse `xml:"urn:vim25 QueryConfigOptionDescriptorResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryConfigOptionDescriptorBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryConfigOptionDescriptor(ctx context.Context, r soap.RoundTripper, req *types.QueryConfigOptionDescriptor) (*types.QueryConfigOptionDescriptorResponse, error) {
+	var reqBody, resBody QueryConfigOptionDescriptorBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryConfigOptionExBody struct {
+	Req    *types.QueryConfigOptionEx         `xml:"urn:vim25 QueryConfigOptionEx,omitempty"`
+	Res    *types.QueryConfigOptionExResponse `xml:"urn:vim25 QueryConfigOptionExResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryConfigOptionExBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryConfigOptionEx(ctx context.Context, r soap.RoundTripper, req *types.QueryConfigOptionEx) (*types.QueryConfigOptionExResponse, error) {
+	var reqBody, resBody QueryConfigOptionExBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryConfigTargetBody struct {
+	Req    *types.QueryConfigTarget         `xml:"urn:vim25 QueryConfigTarget,omitempty"`
+	Res    *types.QueryConfigTargetResponse `xml:"urn:vim25 QueryConfigTargetResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryConfigTargetBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryConfigTarget(ctx context.Context, r soap.RoundTripper, req *types.QueryConfigTarget) (*types.QueryConfigTargetResponse, error) {
+	var reqBody, resBody QueryConfigTargetBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryConfiguredModuleOptionStringBody struct {
+	Req    *types.QueryConfiguredModuleOptionString         `xml:"urn:vim25 QueryConfiguredModuleOptionString,omitempty"`
+	Res    *types.QueryConfiguredModuleOptionStringResponse `xml:"urn:vim25 QueryConfiguredModuleOptionStringResponse,omitempty"`
+	Fault_ *soap.Fault                                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryConfiguredModuleOptionStringBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryConfiguredModuleOptionString(ctx context.Context, r soap.RoundTripper, req *types.QueryConfiguredModuleOptionString) (*types.QueryConfiguredModuleOptionStringResponse, error) {
+	var reqBody, resBody QueryConfiguredModuleOptionStringBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryConnectionInfoBody struct {
+	Req    *types.QueryConnectionInfo         `xml:"urn:vim25 QueryConnectionInfo,omitempty"`
+	Res    *types.QueryConnectionInfoResponse `xml:"urn:vim25 QueryConnectionInfoResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryConnectionInfoBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryConnectionInfo(ctx context.Context, r soap.RoundTripper, req *types.QueryConnectionInfo) (*types.QueryConnectionInfoResponse, error) {
+	var reqBody, resBody QueryConnectionInfoBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryConnectionInfoViaSpecBody struct {
+	Req    *types.QueryConnectionInfoViaSpec         `xml:"urn:vim25 QueryConnectionInfoViaSpec,omitempty"`
+	Res    *types.QueryConnectionInfoViaSpecResponse `xml:"urn:vim25 QueryConnectionInfoViaSpecResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryConnectionInfoViaSpecBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryConnectionInfoViaSpec(ctx context.Context, r soap.RoundTripper, req *types.QueryConnectionInfoViaSpec) (*types.QueryConnectionInfoViaSpecResponse, error) {
+	var reqBody, resBody QueryConnectionInfoViaSpecBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryDatastorePerformanceSummaryBody struct {
+	Req    *types.QueryDatastorePerformanceSummary         `xml:"urn:vim25 QueryDatastorePerformanceSummary,omitempty"`
+	Res    *types.QueryDatastorePerformanceSummaryResponse `xml:"urn:vim25 QueryDatastorePerformanceSummaryResponse,omitempty"`
+	Fault_ *soap.Fault                                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryDatastorePerformanceSummaryBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryDatastorePerformanceSummary(ctx context.Context, r soap.RoundTripper, req *types.QueryDatastorePerformanceSummary) (*types.QueryDatastorePerformanceSummaryResponse, error) {
+	var reqBody, resBody QueryDatastorePerformanceSummaryBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryDateTimeBody struct {
+	Req    *types.QueryDateTime         `xml:"urn:vim25 QueryDateTime,omitempty"`
+	Res    *types.QueryDateTimeResponse `xml:"urn:vim25 QueryDateTimeResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryDateTimeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryDateTime(ctx context.Context, r soap.RoundTripper, req *types.QueryDateTime) (*types.QueryDateTimeResponse, error) {
+	var reqBody, resBody QueryDateTimeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryDescriptionsBody struct {
+	Req    *types.QueryDescriptions         `xml:"urn:vim25 QueryDescriptions,omitempty"`
+	Res    *types.QueryDescriptionsResponse `xml:"urn:vim25 QueryDescriptionsResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryDescriptionsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryDescriptions(ctx context.Context, r soap.RoundTripper, req *types.QueryDescriptions) (*types.QueryDescriptionsResponse, error) {
+	var reqBody, resBody QueryDescriptionsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryDisksForVsanBody struct {
+	Req    *types.QueryDisksForVsan         `xml:"urn:vim25 QueryDisksForVsan,omitempty"`
+	Res    *types.QueryDisksForVsanResponse `xml:"urn:vim25 QueryDisksForVsanResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryDisksForVsanBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryDisksForVsan(ctx context.Context, r soap.RoundTripper, req *types.QueryDisksForVsan) (*types.QueryDisksForVsanResponse, error) {
+	var reqBody, resBody QueryDisksForVsanBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryDisksUsingFilterBody struct {
+	Req    *types.QueryDisksUsingFilter         `xml:"urn:vim25 QueryDisksUsingFilter,omitempty"`
+	Res    *types.QueryDisksUsingFilterResponse `xml:"urn:vim25 QueryDisksUsingFilterResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryDisksUsingFilterBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryDisksUsingFilter(ctx context.Context, r soap.RoundTripper, req *types.QueryDisksUsingFilter) (*types.QueryDisksUsingFilterResponse, error) {
+	var reqBody, resBody QueryDisksUsingFilterBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryDvsByUuidBody struct {
+	Req    *types.QueryDvsByUuid         `xml:"urn:vim25 QueryDvsByUuid,omitempty"`
+	Res    *types.QueryDvsByUuidResponse `xml:"urn:vim25 QueryDvsByUuidResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryDvsByUuidBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryDvsByUuid(ctx context.Context, r soap.RoundTripper, req *types.QueryDvsByUuid) (*types.QueryDvsByUuidResponse, error) {
+	var reqBody, resBody QueryDvsByUuidBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryDvsCheckCompatibilityBody struct {
+	Req    *types.QueryDvsCheckCompatibility         `xml:"urn:vim25 QueryDvsCheckCompatibility,omitempty"`
+	Res    *types.QueryDvsCheckCompatibilityResponse `xml:"urn:vim25 QueryDvsCheckCompatibilityResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryDvsCheckCompatibilityBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryDvsCheckCompatibility(ctx context.Context, r soap.RoundTripper, req *types.QueryDvsCheckCompatibility) (*types.QueryDvsCheckCompatibilityResponse, error) {
+	var reqBody, resBody QueryDvsCheckCompatibilityBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryDvsCompatibleHostSpecBody struct {
+	Req    *types.QueryDvsCompatibleHostSpec         `xml:"urn:vim25 QueryDvsCompatibleHostSpec,omitempty"`
+	Res    *types.QueryDvsCompatibleHostSpecResponse `xml:"urn:vim25 QueryDvsCompatibleHostSpecResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryDvsCompatibleHostSpecBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryDvsCompatibleHostSpec(ctx context.Context, r soap.RoundTripper, req *types.QueryDvsCompatibleHostSpec) (*types.QueryDvsCompatibleHostSpecResponse, error) {
+	var reqBody, resBody QueryDvsCompatibleHostSpecBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryDvsConfigTargetBody struct {
+	Req    *types.QueryDvsConfigTarget         `xml:"urn:vim25 QueryDvsConfigTarget,omitempty"`
+	Res    *types.QueryDvsConfigTargetResponse `xml:"urn:vim25 QueryDvsConfigTargetResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryDvsConfigTargetBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryDvsConfigTarget(ctx context.Context, r soap.RoundTripper, req *types.QueryDvsConfigTarget) (*types.QueryDvsConfigTargetResponse, error) {
+	var reqBody, resBody QueryDvsConfigTargetBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryDvsFeatureCapabilityBody struct {
+	Req    *types.QueryDvsFeatureCapability         `xml:"urn:vim25 QueryDvsFeatureCapability,omitempty"`
+	Res    *types.QueryDvsFeatureCapabilityResponse `xml:"urn:vim25 QueryDvsFeatureCapabilityResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryDvsFeatureCapabilityBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryDvsFeatureCapability(ctx context.Context, r soap.RoundTripper, req *types.QueryDvsFeatureCapability) (*types.QueryDvsFeatureCapabilityResponse, error) {
+	var reqBody, resBody QueryDvsFeatureCapabilityBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryEventsBody struct {
+	Req    *types.QueryEvents         `xml:"urn:vim25 QueryEvents,omitempty"`
+	Res    *types.QueryEventsResponse `xml:"urn:vim25 QueryEventsResponse,omitempty"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryEventsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryEvents(ctx context.Context, r soap.RoundTripper, req *types.QueryEvents) (*types.QueryEventsResponse, error) {
+	var reqBody, resBody QueryEventsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryExpressionMetadataBody struct {
+	Req    *types.QueryExpressionMetadata         `xml:"urn:vim25 QueryExpressionMetadata,omitempty"`
+	Res    *types.QueryExpressionMetadataResponse `xml:"urn:vim25 QueryExpressionMetadataResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryExpressionMetadataBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryExpressionMetadata(ctx context.Context, r soap.RoundTripper, req *types.QueryExpressionMetadata) (*types.QueryExpressionMetadataResponse, error) {
+	var reqBody, resBody QueryExpressionMetadataBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryExtensionIpAllocationUsageBody struct {
+	Req    *types.QueryExtensionIpAllocationUsage         `xml:"urn:vim25 QueryExtensionIpAllocationUsage,omitempty"`
+	Res    *types.QueryExtensionIpAllocationUsageResponse `xml:"urn:vim25 QueryExtensionIpAllocationUsageResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryExtensionIpAllocationUsageBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryExtensionIpAllocationUsage(ctx context.Context, r soap.RoundTripper, req *types.QueryExtensionIpAllocationUsage) (*types.QueryExtensionIpAllocationUsageResponse, error) {
+	var reqBody, resBody QueryExtensionIpAllocationUsageBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryFaultToleranceCompatibilityBody struct {
+	Req    *types.QueryFaultToleranceCompatibility         `xml:"urn:vim25 QueryFaultToleranceCompatibility,omitempty"`
+	Res    *types.QueryFaultToleranceCompatibilityResponse `xml:"urn:vim25 QueryFaultToleranceCompatibilityResponse,omitempty"`
+	Fault_ *soap.Fault                                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryFaultToleranceCompatibilityBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryFaultToleranceCompatibility(ctx context.Context, r soap.RoundTripper, req *types.QueryFaultToleranceCompatibility) (*types.QueryFaultToleranceCompatibilityResponse, error) {
+	var reqBody, resBody QueryFaultToleranceCompatibilityBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryFaultToleranceCompatibilityExBody struct {
+	Req    *types.QueryFaultToleranceCompatibilityEx         `xml:"urn:vim25 QueryFaultToleranceCompatibilityEx,omitempty"`
+	Res    *types.QueryFaultToleranceCompatibilityExResponse `xml:"urn:vim25 QueryFaultToleranceCompatibilityExResponse,omitempty"`
+	Fault_ *soap.Fault                                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryFaultToleranceCompatibilityExBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryFaultToleranceCompatibilityEx(ctx context.Context, r soap.RoundTripper, req *types.QueryFaultToleranceCompatibilityEx) (*types.QueryFaultToleranceCompatibilityExResponse, error) {
+	var reqBody, resBody QueryFaultToleranceCompatibilityExBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryFilterEntitiesBody struct {
+	Req    *types.QueryFilterEntities         `xml:"urn:vim25 QueryFilterEntities,omitempty"`
+	Res    *types.QueryFilterEntitiesResponse `xml:"urn:vim25 QueryFilterEntitiesResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryFilterEntitiesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryFilterEntities(ctx context.Context, r soap.RoundTripper, req *types.QueryFilterEntities) (*types.QueryFilterEntitiesResponse, error) {
+	var reqBody, resBody QueryFilterEntitiesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryFilterInfoIdsBody struct {
+	Req    *types.QueryFilterInfoIds         `xml:"urn:vim25 QueryFilterInfoIds,omitempty"`
+	Res    *types.QueryFilterInfoIdsResponse `xml:"urn:vim25 QueryFilterInfoIdsResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryFilterInfoIdsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryFilterInfoIds(ctx context.Context, r soap.RoundTripper, req *types.QueryFilterInfoIds) (*types.QueryFilterInfoIdsResponse, error) {
+	var reqBody, resBody QueryFilterInfoIdsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryFilterListBody struct {
+	Req    *types.QueryFilterList         `xml:"urn:vim25 QueryFilterList,omitempty"`
+	Res    *types.QueryFilterListResponse `xml:"urn:vim25 QueryFilterListResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryFilterListBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryFilterList(ctx context.Context, r soap.RoundTripper, req *types.QueryFilterList) (*types.QueryFilterListResponse, error) {
+	var reqBody, resBody QueryFilterListBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryFilterNameBody struct {
+	Req    *types.QueryFilterName         `xml:"urn:vim25 QueryFilterName,omitempty"`
+	Res    *types.QueryFilterNameResponse `xml:"urn:vim25 QueryFilterNameResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryFilterNameBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryFilterName(ctx context.Context, r soap.RoundTripper, req *types.QueryFilterName) (*types.QueryFilterNameResponse, error) {
+	var reqBody, resBody QueryFilterNameBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryFirmwareConfigUploadURLBody struct {
+	Req    *types.QueryFirmwareConfigUploadURL         `xml:"urn:vim25 QueryFirmwareConfigUploadURL,omitempty"`
+	Res    *types.QueryFirmwareConfigUploadURLResponse `xml:"urn:vim25 QueryFirmwareConfigUploadURLResponse,omitempty"`
+	Fault_ *soap.Fault                                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryFirmwareConfigUploadURLBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryFirmwareConfigUploadURL(ctx context.Context, r soap.RoundTripper, req *types.QueryFirmwareConfigUploadURL) (*types.QueryFirmwareConfigUploadURLResponse, error) {
+	var reqBody, resBody QueryFirmwareConfigUploadURLBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryHealthUpdateInfosBody struct {
+	Req    *types.QueryHealthUpdateInfos         `xml:"urn:vim25 QueryHealthUpdateInfos,omitempty"`
+	Res    *types.QueryHealthUpdateInfosResponse `xml:"urn:vim25 QueryHealthUpdateInfosResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryHealthUpdateInfosBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryHealthUpdateInfos(ctx context.Context, r soap.RoundTripper, req *types.QueryHealthUpdateInfos) (*types.QueryHealthUpdateInfosResponse, error) {
+	var reqBody, resBody QueryHealthUpdateInfosBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryHealthUpdatesBody struct {
+	Req    *types.QueryHealthUpdates         `xml:"urn:vim25 QueryHealthUpdates,omitempty"`
+	Res    *types.QueryHealthUpdatesResponse `xml:"urn:vim25 QueryHealthUpdatesResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryHealthUpdatesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryHealthUpdates(ctx context.Context, r soap.RoundTripper, req *types.QueryHealthUpdates) (*types.QueryHealthUpdatesResponse, error) {
+	var reqBody, resBody QueryHealthUpdatesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryHostConnectionInfoBody struct {
+	Req    *types.QueryHostConnectionInfo         `xml:"urn:vim25 QueryHostConnectionInfo,omitempty"`
+	Res    *types.QueryHostConnectionInfoResponse `xml:"urn:vim25 QueryHostConnectionInfoResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryHostConnectionInfoBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryHostConnectionInfo(ctx context.Context, r soap.RoundTripper, req *types.QueryHostConnectionInfo) (*types.QueryHostConnectionInfoResponse, error) {
+	var reqBody, resBody QueryHostConnectionInfoBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryHostPatch_TaskBody struct {
+	Req    *types.QueryHostPatch_Task         `xml:"urn:vim25 QueryHostPatch_Task,omitempty"`
+	Res    *types.QueryHostPatch_TaskResponse `xml:"urn:vim25 QueryHostPatch_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryHostPatch_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryHostPatch_Task(ctx context.Context, r soap.RoundTripper, req *types.QueryHostPatch_Task) (*types.QueryHostPatch_TaskResponse, error) {
+	var reqBody, resBody QueryHostPatch_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryHostProfileMetadataBody struct {
+	Req    *types.QueryHostProfileMetadata         `xml:"urn:vim25 QueryHostProfileMetadata,omitempty"`
+	Res    *types.QueryHostProfileMetadataResponse `xml:"urn:vim25 QueryHostProfileMetadataResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryHostProfileMetadataBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryHostProfileMetadata(ctx context.Context, r soap.RoundTripper, req *types.QueryHostProfileMetadata) (*types.QueryHostProfileMetadataResponse, error) {
+	var reqBody, resBody QueryHostProfileMetadataBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryHostStatusBody struct {
+	Req    *types.QueryHostStatus         `xml:"urn:vim25 QueryHostStatus,omitempty"`
+	Res    *types.QueryHostStatusResponse `xml:"urn:vim25 QueryHostStatusResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryHostStatusBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryHostStatus(ctx context.Context, r soap.RoundTripper, req *types.QueryHostStatus) (*types.QueryHostStatusResponse, error) {
+	var reqBody, resBody QueryHostStatusBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryIORMConfigOptionBody struct {
+	Req    *types.QueryIORMConfigOption         `xml:"urn:vim25 QueryIORMConfigOption,omitempty"`
+	Res    *types.QueryIORMConfigOptionResponse `xml:"urn:vim25 QueryIORMConfigOptionResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryIORMConfigOptionBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryIORMConfigOption(ctx context.Context, r soap.RoundTripper, req *types.QueryIORMConfigOption) (*types.QueryIORMConfigOptionResponse, error) {
+	var reqBody, resBody QueryIORMConfigOptionBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryIPAllocationsBody struct {
+	Req    *types.QueryIPAllocations         `xml:"urn:vim25 QueryIPAllocations,omitempty"`
+	Res    *types.QueryIPAllocationsResponse `xml:"urn:vim25 QueryIPAllocationsResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryIPAllocationsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryIPAllocations(ctx context.Context, r soap.RoundTripper, req *types.QueryIPAllocations) (*types.QueryIPAllocationsResponse, error) {
+	var reqBody, resBody QueryIPAllocationsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryIoFilterInfoBody struct {
+	Req    *types.QueryIoFilterInfo         `xml:"urn:vim25 QueryIoFilterInfo,omitempty"`
+	Res    *types.QueryIoFilterInfoResponse `xml:"urn:vim25 QueryIoFilterInfoResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryIoFilterInfoBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryIoFilterInfo(ctx context.Context, r soap.RoundTripper, req *types.QueryIoFilterInfo) (*types.QueryIoFilterInfoResponse, error) {
+	var reqBody, resBody QueryIoFilterInfoBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryIoFilterIssuesBody struct {
+	Req    *types.QueryIoFilterIssues         `xml:"urn:vim25 QueryIoFilterIssues,omitempty"`
+	Res    *types.QueryIoFilterIssuesResponse `xml:"urn:vim25 QueryIoFilterIssuesResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryIoFilterIssuesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryIoFilterIssues(ctx context.Context, r soap.RoundTripper, req *types.QueryIoFilterIssues) (*types.QueryIoFilterIssuesResponse, error) {
+	var reqBody, resBody QueryIoFilterIssuesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryIpPoolsBody struct {
+	Req    *types.QueryIpPools         `xml:"urn:vim25 QueryIpPools,omitempty"`
+	Res    *types.QueryIpPoolsResponse `xml:"urn:vim25 QueryIpPoolsResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryIpPoolsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryIpPools(ctx context.Context, r soap.RoundTripper, req *types.QueryIpPools) (*types.QueryIpPoolsResponse, error) {
+	var reqBody, resBody QueryIpPoolsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryLicenseSourceAvailabilityBody struct {
+	Req    *types.QueryLicenseSourceAvailability         `xml:"urn:vim25 QueryLicenseSourceAvailability,omitempty"`
+	Res    *types.QueryLicenseSourceAvailabilityResponse `xml:"urn:vim25 QueryLicenseSourceAvailabilityResponse,omitempty"`
+	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryLicenseSourceAvailabilityBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryLicenseSourceAvailability(ctx context.Context, r soap.RoundTripper, req *types.QueryLicenseSourceAvailability) (*types.QueryLicenseSourceAvailabilityResponse, error) {
+	var reqBody, resBody QueryLicenseSourceAvailabilityBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryLicenseUsageBody struct {
+	Req    *types.QueryLicenseUsage         `xml:"urn:vim25 QueryLicenseUsage,omitempty"`
+	Res    *types.QueryLicenseUsageResponse `xml:"urn:vim25 QueryLicenseUsageResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryLicenseUsageBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryLicenseUsage(ctx context.Context, r soap.RoundTripper, req *types.QueryLicenseUsage) (*types.QueryLicenseUsageResponse, error) {
+	var reqBody, resBody QueryLicenseUsageBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryLockdownExceptionsBody struct {
+	Req    *types.QueryLockdownExceptions         `xml:"urn:vim25 QueryLockdownExceptions,omitempty"`
+	Res    *types.QueryLockdownExceptionsResponse `xml:"urn:vim25 QueryLockdownExceptionsResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryLockdownExceptionsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryLockdownExceptions(ctx context.Context, r soap.RoundTripper, req *types.QueryLockdownExceptions) (*types.QueryLockdownExceptionsResponse, error) {
+	var reqBody, resBody QueryLockdownExceptionsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryManagedByBody struct {
+	Req    *types.QueryManagedBy         `xml:"urn:vim25 QueryManagedBy,omitempty"`
+	Res    *types.QueryManagedByResponse `xml:"urn:vim25 QueryManagedByResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryManagedByBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryManagedBy(ctx context.Context, r soap.RoundTripper, req *types.QueryManagedBy) (*types.QueryManagedByResponse, error) {
+	var reqBody, resBody QueryManagedByBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryMemoryOverheadBody struct {
+	Req    *types.QueryMemoryOverhead         `xml:"urn:vim25 QueryMemoryOverhead,omitempty"`
+	Res    *types.QueryMemoryOverheadResponse `xml:"urn:vim25 QueryMemoryOverheadResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryMemoryOverheadBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryMemoryOverhead(ctx context.Context, r soap.RoundTripper, req *types.QueryMemoryOverhead) (*types.QueryMemoryOverheadResponse, error) {
+	var reqBody, resBody QueryMemoryOverheadBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryMemoryOverheadExBody struct {
+	Req    *types.QueryMemoryOverheadEx         `xml:"urn:vim25 QueryMemoryOverheadEx,omitempty"`
+	Res    *types.QueryMemoryOverheadExResponse `xml:"urn:vim25 QueryMemoryOverheadExResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryMemoryOverheadExBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryMemoryOverheadEx(ctx context.Context, r soap.RoundTripper, req *types.QueryMemoryOverheadEx) (*types.QueryMemoryOverheadExResponse, error) {
+	var reqBody, resBody QueryMemoryOverheadExBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryMigrationDependenciesBody struct {
+	Req    *types.QueryMigrationDependencies         `xml:"urn:vim25 QueryMigrationDependencies,omitempty"`
+	Res    *types.QueryMigrationDependenciesResponse `xml:"urn:vim25 QueryMigrationDependenciesResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryMigrationDependenciesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryMigrationDependencies(ctx context.Context, r soap.RoundTripper, req *types.QueryMigrationDependencies) (*types.QueryMigrationDependenciesResponse, error) {
+	var reqBody, resBody QueryMigrationDependenciesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryModulesBody struct {
+	Req    *types.QueryModules         `xml:"urn:vim25 QueryModules,omitempty"`
+	Res    *types.QueryModulesResponse `xml:"urn:vim25 QueryModulesResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryModulesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryModules(ctx context.Context, r soap.RoundTripper, req *types.QueryModules) (*types.QueryModulesResponse, error) {
+	var reqBody, resBody QueryModulesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryMonitoredEntitiesBody struct {
+	Req    *types.QueryMonitoredEntities         `xml:"urn:vim25 QueryMonitoredEntities,omitempty"`
+	Res    *types.QueryMonitoredEntitiesResponse `xml:"urn:vim25 QueryMonitoredEntitiesResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryMonitoredEntitiesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryMonitoredEntities(ctx context.Context, r soap.RoundTripper, req *types.QueryMonitoredEntities) (*types.QueryMonitoredEntitiesResponse, error) {
+	var reqBody, resBody QueryMonitoredEntitiesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryNFSUserBody struct {
+	Req    *types.QueryNFSUser         `xml:"urn:vim25 QueryNFSUser,omitempty"`
+	Res    *types.QueryNFSUserResponse `xml:"urn:vim25 QueryNFSUserResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryNFSUserBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryNFSUser(ctx context.Context, r soap.RoundTripper, req *types.QueryNFSUser) (*types.QueryNFSUserResponse, error) {
+	var reqBody, resBody QueryNFSUserBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryNetConfigBody struct {
+	Req    *types.QueryNetConfig         `xml:"urn:vim25 QueryNetConfig,omitempty"`
+	Res    *types.QueryNetConfigResponse `xml:"urn:vim25 QueryNetConfigResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryNetConfigBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryNetConfig(ctx context.Context, r soap.RoundTripper, req *types.QueryNetConfig) (*types.QueryNetConfigResponse, error) {
+	var reqBody, resBody QueryNetConfigBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryNetworkHintBody struct {
+	Req    *types.QueryNetworkHint         `xml:"urn:vim25 QueryNetworkHint,omitempty"`
+	Res    *types.QueryNetworkHintResponse `xml:"urn:vim25 QueryNetworkHintResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryNetworkHintBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryNetworkHint(ctx context.Context, r soap.RoundTripper, req *types.QueryNetworkHint) (*types.QueryNetworkHintResponse, error) {
+	var reqBody, resBody QueryNetworkHintBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryObjectsOnPhysicalVsanDiskBody struct {
+	Req    *types.QueryObjectsOnPhysicalVsanDisk         `xml:"urn:vim25 QueryObjectsOnPhysicalVsanDisk,omitempty"`
+	Res    *types.QueryObjectsOnPhysicalVsanDiskResponse `xml:"urn:vim25 QueryObjectsOnPhysicalVsanDiskResponse,omitempty"`
+	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryObjectsOnPhysicalVsanDiskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryObjectsOnPhysicalVsanDisk(ctx context.Context, r soap.RoundTripper, req *types.QueryObjectsOnPhysicalVsanDisk) (*types.QueryObjectsOnPhysicalVsanDiskResponse, error) {
+	var reqBody, resBody QueryObjectsOnPhysicalVsanDiskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryOptionsBody struct {
+	Req    *types.QueryOptions         `xml:"urn:vim25 QueryOptions,omitempty"`
+	Res    *types.QueryOptionsResponse `xml:"urn:vim25 QueryOptionsResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryOptionsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryOptions(ctx context.Context, r soap.RoundTripper, req *types.QueryOptions) (*types.QueryOptionsResponse, error) {
+	var reqBody, resBody QueryOptionsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryPartitionCreateDescBody struct {
+	Req    *types.QueryPartitionCreateDesc         `xml:"urn:vim25 QueryPartitionCreateDesc,omitempty"`
+	Res    *types.QueryPartitionCreateDescResponse `xml:"urn:vim25 QueryPartitionCreateDescResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryPartitionCreateDescBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryPartitionCreateDesc(ctx context.Context, r soap.RoundTripper, req *types.QueryPartitionCreateDesc) (*types.QueryPartitionCreateDescResponse, error) {
+	var reqBody, resBody QueryPartitionCreateDescBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryPartitionCreateOptionsBody struct {
+	Req    *types.QueryPartitionCreateOptions         `xml:"urn:vim25 QueryPartitionCreateOptions,omitempty"`
+	Res    *types.QueryPartitionCreateOptionsResponse `xml:"urn:vim25 QueryPartitionCreateOptionsResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryPartitionCreateOptionsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryPartitionCreateOptions(ctx context.Context, r soap.RoundTripper, req *types.QueryPartitionCreateOptions) (*types.QueryPartitionCreateOptionsResponse, error) {
+	var reqBody, resBody QueryPartitionCreateOptionsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryPathSelectionPolicyOptionsBody struct {
+	Req    *types.QueryPathSelectionPolicyOptions         `xml:"urn:vim25 QueryPathSelectionPolicyOptions,omitempty"`
+	Res    *types.QueryPathSelectionPolicyOptionsResponse `xml:"urn:vim25 QueryPathSelectionPolicyOptionsResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryPathSelectionPolicyOptionsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryPathSelectionPolicyOptions(ctx context.Context, r soap.RoundTripper, req *types.QueryPathSelectionPolicyOptions) (*types.QueryPathSelectionPolicyOptionsResponse, error) {
+	var reqBody, resBody QueryPathSelectionPolicyOptionsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryPerfBody struct {
+	Req    *types.QueryPerf         `xml:"urn:vim25 QueryPerf,omitempty"`
+	Res    *types.QueryPerfResponse `xml:"urn:vim25 QueryPerfResponse,omitempty"`
+	Fault_ *soap.Fault              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryPerfBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryPerf(ctx context.Context, r soap.RoundTripper, req *types.QueryPerf) (*types.QueryPerfResponse, error) {
+	var reqBody, resBody QueryPerfBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryPerfCompositeBody struct {
+	Req    *types.QueryPerfComposite         `xml:"urn:vim25 QueryPerfComposite,omitempty"`
+	Res    *types.QueryPerfCompositeResponse `xml:"urn:vim25 QueryPerfCompositeResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryPerfCompositeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryPerfComposite(ctx context.Context, r soap.RoundTripper, req *types.QueryPerfComposite) (*types.QueryPerfCompositeResponse, error) {
+	var reqBody, resBody QueryPerfCompositeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryPerfCounterBody struct {
+	Req    *types.QueryPerfCounter         `xml:"urn:vim25 QueryPerfCounter,omitempty"`
+	Res    *types.QueryPerfCounterResponse `xml:"urn:vim25 QueryPerfCounterResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryPerfCounterBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryPerfCounter(ctx context.Context, r soap.RoundTripper, req *types.QueryPerfCounter) (*types.QueryPerfCounterResponse, error) {
+	var reqBody, resBody QueryPerfCounterBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryPerfCounterByLevelBody struct {
+	Req    *types.QueryPerfCounterByLevel         `xml:"urn:vim25 QueryPerfCounterByLevel,omitempty"`
+	Res    *types.QueryPerfCounterByLevelResponse `xml:"urn:vim25 QueryPerfCounterByLevelResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryPerfCounterByLevelBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryPerfCounterByLevel(ctx context.Context, r soap.RoundTripper, req *types.QueryPerfCounterByLevel) (*types.QueryPerfCounterByLevelResponse, error) {
+	var reqBody, resBody QueryPerfCounterByLevelBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryPerfProviderSummaryBody struct {
+	Req    *types.QueryPerfProviderSummary         `xml:"urn:vim25 QueryPerfProviderSummary,omitempty"`
+	Res    *types.QueryPerfProviderSummaryResponse `xml:"urn:vim25 QueryPerfProviderSummaryResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryPerfProviderSummaryBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryPerfProviderSummary(ctx context.Context, r soap.RoundTripper, req *types.QueryPerfProviderSummary) (*types.QueryPerfProviderSummaryResponse, error) {
+	var reqBody, resBody QueryPerfProviderSummaryBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryPhysicalVsanDisksBody struct {
+	Req    *types.QueryPhysicalVsanDisks         `xml:"urn:vim25 QueryPhysicalVsanDisks,omitempty"`
+	Res    *types.QueryPhysicalVsanDisksResponse `xml:"urn:vim25 QueryPhysicalVsanDisksResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryPhysicalVsanDisksBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryPhysicalVsanDisks(ctx context.Context, r soap.RoundTripper, req *types.QueryPhysicalVsanDisks) (*types.QueryPhysicalVsanDisksResponse, error) {
+	var reqBody, resBody QueryPhysicalVsanDisksBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryPnicStatusBody struct {
+	Req    *types.QueryPnicStatus         `xml:"urn:vim25 QueryPnicStatus,omitempty"`
+	Res    *types.QueryPnicStatusResponse `xml:"urn:vim25 QueryPnicStatusResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryPnicStatusBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryPnicStatus(ctx context.Context, r soap.RoundTripper, req *types.QueryPnicStatus) (*types.QueryPnicStatusResponse, error) {
+	var reqBody, resBody QueryPnicStatusBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryPolicyMetadataBody struct {
+	Req    *types.QueryPolicyMetadata         `xml:"urn:vim25 QueryPolicyMetadata,omitempty"`
+	Res    *types.QueryPolicyMetadataResponse `xml:"urn:vim25 QueryPolicyMetadataResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryPolicyMetadataBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryPolicyMetadata(ctx context.Context, r soap.RoundTripper, req *types.QueryPolicyMetadata) (*types.QueryPolicyMetadataResponse, error) {
+	var reqBody, resBody QueryPolicyMetadataBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryProfileStructureBody struct {
+	Req    *types.QueryProfileStructure         `xml:"urn:vim25 QueryProfileStructure,omitempty"`
+	Res    *types.QueryProfileStructureResponse `xml:"urn:vim25 QueryProfileStructureResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryProfileStructureBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryProfileStructure(ctx context.Context, r soap.RoundTripper, req *types.QueryProfileStructure) (*types.QueryProfileStructureResponse, error) {
+	var reqBody, resBody QueryProfileStructureBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryProviderListBody struct {
+	Req    *types.QueryProviderList         `xml:"urn:vim25 QueryProviderList,omitempty"`
+	Res    *types.QueryProviderListResponse `xml:"urn:vim25 QueryProviderListResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryProviderListBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryProviderList(ctx context.Context, r soap.RoundTripper, req *types.QueryProviderList) (*types.QueryProviderListResponse, error) {
+	var reqBody, resBody QueryProviderListBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryProviderNameBody struct {
+	Req    *types.QueryProviderName         `xml:"urn:vim25 QueryProviderName,omitempty"`
+	Res    *types.QueryProviderNameResponse `xml:"urn:vim25 QueryProviderNameResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryProviderNameBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryProviderName(ctx context.Context, r soap.RoundTripper, req *types.QueryProviderName) (*types.QueryProviderNameResponse, error) {
+	var reqBody, resBody QueryProviderNameBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryResourceConfigOptionBody struct {
+	Req    *types.QueryResourceConfigOption         `xml:"urn:vim25 QueryResourceConfigOption,omitempty"`
+	Res    *types.QueryResourceConfigOptionResponse `xml:"urn:vim25 QueryResourceConfigOptionResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryResourceConfigOptionBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryResourceConfigOption(ctx context.Context, r soap.RoundTripper, req *types.QueryResourceConfigOption) (*types.QueryResourceConfigOptionResponse, error) {
+	var reqBody, resBody QueryResourceConfigOptionBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryServiceListBody struct {
+	Req    *types.QueryServiceList         `xml:"urn:vim25 QueryServiceList,omitempty"`
+	Res    *types.QueryServiceListResponse `xml:"urn:vim25 QueryServiceListResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryServiceListBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryServiceList(ctx context.Context, r soap.RoundTripper, req *types.QueryServiceList) (*types.QueryServiceListResponse, error) {
+	var reqBody, resBody QueryServiceListBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryStorageArrayTypePolicyOptionsBody struct {
+	Req    *types.QueryStorageArrayTypePolicyOptions         `xml:"urn:vim25 QueryStorageArrayTypePolicyOptions,omitempty"`
+	Res    *types.QueryStorageArrayTypePolicyOptionsResponse `xml:"urn:vim25 QueryStorageArrayTypePolicyOptionsResponse,omitempty"`
+	Fault_ *soap.Fault                                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryStorageArrayTypePolicyOptionsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryStorageArrayTypePolicyOptions(ctx context.Context, r soap.RoundTripper, req *types.QueryStorageArrayTypePolicyOptions) (*types.QueryStorageArrayTypePolicyOptionsResponse, error) {
+	var reqBody, resBody QueryStorageArrayTypePolicyOptionsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QuerySupportedFeaturesBody struct {
+	Req    *types.QuerySupportedFeatures         `xml:"urn:vim25 QuerySupportedFeatures,omitempty"`
+	Res    *types.QuerySupportedFeaturesResponse `xml:"urn:vim25 QuerySupportedFeaturesResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QuerySupportedFeaturesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QuerySupportedFeatures(ctx context.Context, r soap.RoundTripper, req *types.QuerySupportedFeatures) (*types.QuerySupportedFeaturesResponse, error) {
+	var reqBody, resBody QuerySupportedFeaturesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QuerySyncingVsanObjectsBody struct {
+	Req    *types.QuerySyncingVsanObjects         `xml:"urn:vim25 QuerySyncingVsanObjects,omitempty"`
+	Res    *types.QuerySyncingVsanObjectsResponse `xml:"urn:vim25 QuerySyncingVsanObjectsResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QuerySyncingVsanObjectsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QuerySyncingVsanObjects(ctx context.Context, r soap.RoundTripper, req *types.QuerySyncingVsanObjects) (*types.QuerySyncingVsanObjectsResponse, error) {
+	var reqBody, resBody QuerySyncingVsanObjectsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QuerySystemUsersBody struct {
+	Req    *types.QuerySystemUsers         `xml:"urn:vim25 QuerySystemUsers,omitempty"`
+	Res    *types.QuerySystemUsersResponse `xml:"urn:vim25 QuerySystemUsersResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QuerySystemUsersBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QuerySystemUsers(ctx context.Context, r soap.RoundTripper, req *types.QuerySystemUsers) (*types.QuerySystemUsersResponse, error) {
+	var reqBody, resBody QuerySystemUsersBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryTargetCapabilitiesBody struct {
+	Req    *types.QueryTargetCapabilities         `xml:"urn:vim25 QueryTargetCapabilities,omitempty"`
+	Res    *types.QueryTargetCapabilitiesResponse `xml:"urn:vim25 QueryTargetCapabilitiesResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryTargetCapabilitiesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryTargetCapabilities(ctx context.Context, r soap.RoundTripper, req *types.QueryTargetCapabilities) (*types.QueryTargetCapabilitiesResponse, error) {
+	var reqBody, resBody QueryTargetCapabilitiesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryTpmAttestationReportBody struct {
+	Req    *types.QueryTpmAttestationReport         `xml:"urn:vim25 QueryTpmAttestationReport,omitempty"`
+	Res    *types.QueryTpmAttestationReportResponse `xml:"urn:vim25 QueryTpmAttestationReportResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryTpmAttestationReportBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryTpmAttestationReport(ctx context.Context, r soap.RoundTripper, req *types.QueryTpmAttestationReport) (*types.QueryTpmAttestationReportResponse, error) {
+	var reqBody, resBody QueryTpmAttestationReportBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryUnmonitoredHostsBody struct {
+	Req    *types.QueryUnmonitoredHosts         `xml:"urn:vim25 QueryUnmonitoredHosts,omitempty"`
+	Res    *types.QueryUnmonitoredHostsResponse `xml:"urn:vim25 QueryUnmonitoredHostsResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryUnmonitoredHostsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryUnmonitoredHosts(ctx context.Context, r soap.RoundTripper, req *types.QueryUnmonitoredHosts) (*types.QueryUnmonitoredHostsResponse, error) {
+	var reqBody, resBody QueryUnmonitoredHostsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryUnownedFilesBody struct {
+	Req    *types.QueryUnownedFiles         `xml:"urn:vim25 QueryUnownedFiles,omitempty"`
+	Res    *types.QueryUnownedFilesResponse `xml:"urn:vim25 QueryUnownedFilesResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryUnownedFilesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryUnownedFiles(ctx context.Context, r soap.RoundTripper, req *types.QueryUnownedFiles) (*types.QueryUnownedFilesResponse, error) {
+	var reqBody, resBody QueryUnownedFilesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryUnresolvedVmfsVolumeBody struct {
+	Req    *types.QueryUnresolvedVmfsVolume         `xml:"urn:vim25 QueryUnresolvedVmfsVolume,omitempty"`
+	Res    *types.QueryUnresolvedVmfsVolumeResponse `xml:"urn:vim25 QueryUnresolvedVmfsVolumeResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryUnresolvedVmfsVolumeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryUnresolvedVmfsVolume(ctx context.Context, r soap.RoundTripper, req *types.QueryUnresolvedVmfsVolume) (*types.QueryUnresolvedVmfsVolumeResponse, error) {
+	var reqBody, resBody QueryUnresolvedVmfsVolumeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryUnresolvedVmfsVolumesBody struct {
+	Req    *types.QueryUnresolvedVmfsVolumes         `xml:"urn:vim25 QueryUnresolvedVmfsVolumes,omitempty"`
+	Res    *types.QueryUnresolvedVmfsVolumesResponse `xml:"urn:vim25 QueryUnresolvedVmfsVolumesResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryUnresolvedVmfsVolumesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryUnresolvedVmfsVolumes(ctx context.Context, r soap.RoundTripper, req *types.QueryUnresolvedVmfsVolumes) (*types.QueryUnresolvedVmfsVolumesResponse, error) {
+	var reqBody, resBody QueryUnresolvedVmfsVolumesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryUsedVlanIdInDvsBody struct {
+	Req    *types.QueryUsedVlanIdInDvs         `xml:"urn:vim25 QueryUsedVlanIdInDvs,omitempty"`
+	Res    *types.QueryUsedVlanIdInDvsResponse `xml:"urn:vim25 QueryUsedVlanIdInDvsResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryUsedVlanIdInDvsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryUsedVlanIdInDvs(ctx context.Context, r soap.RoundTripper, req *types.QueryUsedVlanIdInDvs) (*types.QueryUsedVlanIdInDvsResponse, error) {
+	var reqBody, resBody QueryUsedVlanIdInDvsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryVMotionCompatibilityBody struct {
+	Req    *types.QueryVMotionCompatibility         `xml:"urn:vim25 QueryVMotionCompatibility,omitempty"`
+	Res    *types.QueryVMotionCompatibilityResponse `xml:"urn:vim25 QueryVMotionCompatibilityResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryVMotionCompatibilityBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryVMotionCompatibility(ctx context.Context, r soap.RoundTripper, req *types.QueryVMotionCompatibility) (*types.QueryVMotionCompatibilityResponse, error) {
+	var reqBody, resBody QueryVMotionCompatibilityBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryVMotionCompatibilityEx_TaskBody struct {
+	Req    *types.QueryVMotionCompatibilityEx_Task         `xml:"urn:vim25 QueryVMotionCompatibilityEx_Task,omitempty"`
+	Res    *types.QueryVMotionCompatibilityEx_TaskResponse `xml:"urn:vim25 QueryVMotionCompatibilityEx_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryVMotionCompatibilityEx_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryVMotionCompatibilityEx_Task(ctx context.Context, r soap.RoundTripper, req *types.QueryVMotionCompatibilityEx_Task) (*types.QueryVMotionCompatibilityEx_TaskResponse, error) {
+	var reqBody, resBody QueryVMotionCompatibilityEx_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryVirtualDiskFragmentationBody struct {
+	Req    *types.QueryVirtualDiskFragmentation         `xml:"urn:vim25 QueryVirtualDiskFragmentation,omitempty"`
+	Res    *types.QueryVirtualDiskFragmentationResponse `xml:"urn:vim25 QueryVirtualDiskFragmentationResponse,omitempty"`
+	Fault_ *soap.Fault                                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryVirtualDiskFragmentationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryVirtualDiskFragmentation(ctx context.Context, r soap.RoundTripper, req *types.QueryVirtualDiskFragmentation) (*types.QueryVirtualDiskFragmentationResponse, error) {
+	var reqBody, resBody QueryVirtualDiskFragmentationBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryVirtualDiskGeometryBody struct {
+	Req    *types.QueryVirtualDiskGeometry         `xml:"urn:vim25 QueryVirtualDiskGeometry,omitempty"`
+	Res    *types.QueryVirtualDiskGeometryResponse `xml:"urn:vim25 QueryVirtualDiskGeometryResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryVirtualDiskGeometryBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryVirtualDiskGeometry(ctx context.Context, r soap.RoundTripper, req *types.QueryVirtualDiskGeometry) (*types.QueryVirtualDiskGeometryResponse, error) {
+	var reqBody, resBody QueryVirtualDiskGeometryBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryVirtualDiskUuidBody struct {
+	Req    *types.QueryVirtualDiskUuid         `xml:"urn:vim25 QueryVirtualDiskUuid,omitempty"`
+	Res    *types.QueryVirtualDiskUuidResponse `xml:"urn:vim25 QueryVirtualDiskUuidResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryVirtualDiskUuidBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryVirtualDiskUuid(ctx context.Context, r soap.RoundTripper, req *types.QueryVirtualDiskUuid) (*types.QueryVirtualDiskUuidResponse, error) {
+	var reqBody, resBody QueryVirtualDiskUuidBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryVmfsConfigOptionBody struct {
+	Req    *types.QueryVmfsConfigOption         `xml:"urn:vim25 QueryVmfsConfigOption,omitempty"`
+	Res    *types.QueryVmfsConfigOptionResponse `xml:"urn:vim25 QueryVmfsConfigOptionResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryVmfsConfigOptionBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryVmfsConfigOption(ctx context.Context, r soap.RoundTripper, req *types.QueryVmfsConfigOption) (*types.QueryVmfsConfigOptionResponse, error) {
+	var reqBody, resBody QueryVmfsConfigOptionBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryVmfsDatastoreCreateOptionsBody struct {
+	Req    *types.QueryVmfsDatastoreCreateOptions         `xml:"urn:vim25 QueryVmfsDatastoreCreateOptions,omitempty"`
+	Res    *types.QueryVmfsDatastoreCreateOptionsResponse `xml:"urn:vim25 QueryVmfsDatastoreCreateOptionsResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryVmfsDatastoreCreateOptionsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryVmfsDatastoreCreateOptions(ctx context.Context, r soap.RoundTripper, req *types.QueryVmfsDatastoreCreateOptions) (*types.QueryVmfsDatastoreCreateOptionsResponse, error) {
+	var reqBody, resBody QueryVmfsDatastoreCreateOptionsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryVmfsDatastoreExpandOptionsBody struct {
+	Req    *types.QueryVmfsDatastoreExpandOptions         `xml:"urn:vim25 QueryVmfsDatastoreExpandOptions,omitempty"`
+	Res    *types.QueryVmfsDatastoreExpandOptionsResponse `xml:"urn:vim25 QueryVmfsDatastoreExpandOptionsResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryVmfsDatastoreExpandOptionsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryVmfsDatastoreExpandOptions(ctx context.Context, r soap.RoundTripper, req *types.QueryVmfsDatastoreExpandOptions) (*types.QueryVmfsDatastoreExpandOptionsResponse, error) {
+	var reqBody, resBody QueryVmfsDatastoreExpandOptionsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryVmfsDatastoreExtendOptionsBody struct {
+	Req    *types.QueryVmfsDatastoreExtendOptions         `xml:"urn:vim25 QueryVmfsDatastoreExtendOptions,omitempty"`
+	Res    *types.QueryVmfsDatastoreExtendOptionsResponse `xml:"urn:vim25 QueryVmfsDatastoreExtendOptionsResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryVmfsDatastoreExtendOptionsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryVmfsDatastoreExtendOptions(ctx context.Context, r soap.RoundTripper, req *types.QueryVmfsDatastoreExtendOptions) (*types.QueryVmfsDatastoreExtendOptionsResponse, error) {
+	var reqBody, resBody QueryVmfsDatastoreExtendOptionsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryVnicStatusBody struct {
+	Req    *types.QueryVnicStatus         `xml:"urn:vim25 QueryVnicStatus,omitempty"`
+	Res    *types.QueryVnicStatusResponse `xml:"urn:vim25 QueryVnicStatusResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryVnicStatusBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryVnicStatus(ctx context.Context, r soap.RoundTripper, req *types.QueryVnicStatus) (*types.QueryVnicStatusResponse, error) {
+	var reqBody, resBody QueryVnicStatusBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryVsanObjectUuidsByFilterBody struct {
+	Req    *types.QueryVsanObjectUuidsByFilter         `xml:"urn:vim25 QueryVsanObjectUuidsByFilter,omitempty"`
+	Res    *types.QueryVsanObjectUuidsByFilterResponse `xml:"urn:vim25 QueryVsanObjectUuidsByFilterResponse,omitempty"`
+	Fault_ *soap.Fault                                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryVsanObjectUuidsByFilterBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryVsanObjectUuidsByFilter(ctx context.Context, r soap.RoundTripper, req *types.QueryVsanObjectUuidsByFilter) (*types.QueryVsanObjectUuidsByFilterResponse, error) {
+	var reqBody, resBody QueryVsanObjectUuidsByFilterBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryVsanObjectsBody struct {
+	Req    *types.QueryVsanObjects         `xml:"urn:vim25 QueryVsanObjects,omitempty"`
+	Res    *types.QueryVsanObjectsResponse `xml:"urn:vim25 QueryVsanObjectsResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryVsanObjectsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryVsanObjects(ctx context.Context, r soap.RoundTripper, req *types.QueryVsanObjects) (*types.QueryVsanObjectsResponse, error) {
+	var reqBody, resBody QueryVsanObjectsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryVsanStatisticsBody struct {
+	Req    *types.QueryVsanStatistics         `xml:"urn:vim25 QueryVsanStatistics,omitempty"`
+	Res    *types.QueryVsanStatisticsResponse `xml:"urn:vim25 QueryVsanStatisticsResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryVsanStatisticsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryVsanStatistics(ctx context.Context, r soap.RoundTripper, req *types.QueryVsanStatistics) (*types.QueryVsanStatisticsResponse, error) {
+	var reqBody, resBody QueryVsanStatisticsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryVsanUpgradeStatusBody struct {
+	Req    *types.QueryVsanUpgradeStatus         `xml:"urn:vim25 QueryVsanUpgradeStatus,omitempty"`
+	Res    *types.QueryVsanUpgradeStatusResponse `xml:"urn:vim25 QueryVsanUpgradeStatusResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryVsanUpgradeStatusBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryVsanUpgradeStatus(ctx context.Context, r soap.RoundTripper, req *types.QueryVsanUpgradeStatus) (*types.QueryVsanUpgradeStatusResponse, error) {
+	var reqBody, resBody QueryVsanUpgradeStatusBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReadEnvironmentVariableInGuestBody struct {
+	Req    *types.ReadEnvironmentVariableInGuest         `xml:"urn:vim25 ReadEnvironmentVariableInGuest,omitempty"`
+	Res    *types.ReadEnvironmentVariableInGuestResponse `xml:"urn:vim25 ReadEnvironmentVariableInGuestResponse,omitempty"`
+	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReadEnvironmentVariableInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReadEnvironmentVariableInGuest(ctx context.Context, r soap.RoundTripper, req *types.ReadEnvironmentVariableInGuest) (*types.ReadEnvironmentVariableInGuestResponse, error) {
+	var reqBody, resBody ReadEnvironmentVariableInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReadNextEventsBody struct {
+	Req    *types.ReadNextEvents         `xml:"urn:vim25 ReadNextEvents,omitempty"`
+	Res    *types.ReadNextEventsResponse `xml:"urn:vim25 ReadNextEventsResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReadNextEventsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReadNextEvents(ctx context.Context, r soap.RoundTripper, req *types.ReadNextEvents) (*types.ReadNextEventsResponse, error) {
+	var reqBody, resBody ReadNextEventsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReadNextTasksBody struct {
+	Req    *types.ReadNextTasks         `xml:"urn:vim25 ReadNextTasks,omitempty"`
+	Res    *types.ReadNextTasksResponse `xml:"urn:vim25 ReadNextTasksResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReadNextTasksBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReadNextTasks(ctx context.Context, r soap.RoundTripper, req *types.ReadNextTasks) (*types.ReadNextTasksResponse, error) {
+	var reqBody, resBody ReadNextTasksBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReadPreviousEventsBody struct {
+	Req    *types.ReadPreviousEvents         `xml:"urn:vim25 ReadPreviousEvents,omitempty"`
+	Res    *types.ReadPreviousEventsResponse `xml:"urn:vim25 ReadPreviousEventsResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReadPreviousEventsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReadPreviousEvents(ctx context.Context, r soap.RoundTripper, req *types.ReadPreviousEvents) (*types.ReadPreviousEventsResponse, error) {
+	var reqBody, resBody ReadPreviousEventsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReadPreviousTasksBody struct {
+	Req    *types.ReadPreviousTasks         `xml:"urn:vim25 ReadPreviousTasks,omitempty"`
+	Res    *types.ReadPreviousTasksResponse `xml:"urn:vim25 ReadPreviousTasksResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReadPreviousTasksBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReadPreviousTasks(ctx context.Context, r soap.RoundTripper, req *types.ReadPreviousTasks) (*types.ReadPreviousTasksResponse, error) {
+	var reqBody, resBody ReadPreviousTasksBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RebootGuestBody struct {
+	Req    *types.RebootGuest         `xml:"urn:vim25 RebootGuest,omitempty"`
+	Res    *types.RebootGuestResponse `xml:"urn:vim25 RebootGuestResponse,omitempty"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RebootGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RebootGuest(ctx context.Context, r soap.RoundTripper, req *types.RebootGuest) (*types.RebootGuestResponse, error) {
+	var reqBody, resBody RebootGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RebootHost_TaskBody struct {
+	Req    *types.RebootHost_Task         `xml:"urn:vim25 RebootHost_Task,omitempty"`
+	Res    *types.RebootHost_TaskResponse `xml:"urn:vim25 RebootHost_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RebootHost_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RebootHost_Task(ctx context.Context, r soap.RoundTripper, req *types.RebootHost_Task) (*types.RebootHost_TaskResponse, error) {
+	var reqBody, resBody RebootHost_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RecommendDatastoresBody struct {
+	Req    *types.RecommendDatastores         `xml:"urn:vim25 RecommendDatastores,omitempty"`
+	Res    *types.RecommendDatastoresResponse `xml:"urn:vim25 RecommendDatastoresResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RecommendDatastoresBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RecommendDatastores(ctx context.Context, r soap.RoundTripper, req *types.RecommendDatastores) (*types.RecommendDatastoresResponse, error) {
+	var reqBody, resBody RecommendDatastoresBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RecommendHostsForVmBody struct {
+	Req    *types.RecommendHostsForVm         `xml:"urn:vim25 RecommendHostsForVm,omitempty"`
+	Res    *types.RecommendHostsForVmResponse `xml:"urn:vim25 RecommendHostsForVmResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RecommendHostsForVmBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RecommendHostsForVm(ctx context.Context, r soap.RoundTripper, req *types.RecommendHostsForVm) (*types.RecommendHostsForVmResponse, error) {
+	var reqBody, resBody RecommendHostsForVmBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RecommissionVsanNode_TaskBody struct {
+	Req    *types.RecommissionVsanNode_Task         `xml:"urn:vim25 RecommissionVsanNode_Task,omitempty"`
+	Res    *types.RecommissionVsanNode_TaskResponse `xml:"urn:vim25 RecommissionVsanNode_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RecommissionVsanNode_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RecommissionVsanNode_Task(ctx context.Context, r soap.RoundTripper, req *types.RecommissionVsanNode_Task) (*types.RecommissionVsanNode_TaskResponse, error) {
+	var reqBody, resBody RecommissionVsanNode_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReconcileDatastoreInventory_TaskBody struct {
+	Req    *types.ReconcileDatastoreInventory_Task         `xml:"urn:vim25 ReconcileDatastoreInventory_Task,omitempty"`
+	Res    *types.ReconcileDatastoreInventory_TaskResponse `xml:"urn:vim25 ReconcileDatastoreInventory_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReconcileDatastoreInventory_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReconcileDatastoreInventory_Task(ctx context.Context, r soap.RoundTripper, req *types.ReconcileDatastoreInventory_Task) (*types.ReconcileDatastoreInventory_TaskResponse, error) {
+	var reqBody, resBody ReconcileDatastoreInventory_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReconfigVM_TaskBody struct {
+	Req    *types.ReconfigVM_Task         `xml:"urn:vim25 ReconfigVM_Task,omitempty"`
+	Res    *types.ReconfigVM_TaskResponse `xml:"urn:vim25 ReconfigVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReconfigVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReconfigVM_Task(ctx context.Context, r soap.RoundTripper, req *types.ReconfigVM_Task) (*types.ReconfigVM_TaskResponse, error) {
+	var reqBody, resBody ReconfigVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReconfigurationSatisfiableBody struct {
+	Req    *types.ReconfigurationSatisfiable         `xml:"urn:vim25 ReconfigurationSatisfiable,omitempty"`
+	Res    *types.ReconfigurationSatisfiableResponse `xml:"urn:vim25 ReconfigurationSatisfiableResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReconfigurationSatisfiableBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReconfigurationSatisfiable(ctx context.Context, r soap.RoundTripper, req *types.ReconfigurationSatisfiable) (*types.ReconfigurationSatisfiableResponse, error) {
+	var reqBody, resBody ReconfigurationSatisfiableBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReconfigureAlarmBody struct {
+	Req    *types.ReconfigureAlarm         `xml:"urn:vim25 ReconfigureAlarm,omitempty"`
+	Res    *types.ReconfigureAlarmResponse `xml:"urn:vim25 ReconfigureAlarmResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReconfigureAlarmBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReconfigureAlarm(ctx context.Context, r soap.RoundTripper, req *types.ReconfigureAlarm) (*types.ReconfigureAlarmResponse, error) {
+	var reqBody, resBody ReconfigureAlarmBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReconfigureAutostartBody struct {
+	Req    *types.ReconfigureAutostart         `xml:"urn:vim25 ReconfigureAutostart,omitempty"`
+	Res    *types.ReconfigureAutostartResponse `xml:"urn:vim25 ReconfigureAutostartResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReconfigureAutostartBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReconfigureAutostart(ctx context.Context, r soap.RoundTripper, req *types.ReconfigureAutostart) (*types.ReconfigureAutostartResponse, error) {
+	var reqBody, resBody ReconfigureAutostartBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReconfigureCluster_TaskBody struct {
+	Req    *types.ReconfigureCluster_Task         `xml:"urn:vim25 ReconfigureCluster_Task,omitempty"`
+	Res    *types.ReconfigureCluster_TaskResponse `xml:"urn:vim25 ReconfigureCluster_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReconfigureCluster_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReconfigureCluster_Task(ctx context.Context, r soap.RoundTripper, req *types.ReconfigureCluster_Task) (*types.ReconfigureCluster_TaskResponse, error) {
+	var reqBody, resBody ReconfigureCluster_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReconfigureComputeResource_TaskBody struct {
+	Req    *types.ReconfigureComputeResource_Task         `xml:"urn:vim25 ReconfigureComputeResource_Task,omitempty"`
+	Res    *types.ReconfigureComputeResource_TaskResponse `xml:"urn:vim25 ReconfigureComputeResource_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReconfigureComputeResource_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReconfigureComputeResource_Task(ctx context.Context, r soap.RoundTripper, req *types.ReconfigureComputeResource_Task) (*types.ReconfigureComputeResource_TaskResponse, error) {
+	var reqBody, resBody ReconfigureComputeResource_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReconfigureDVPort_TaskBody struct {
+	Req    *types.ReconfigureDVPort_Task         `xml:"urn:vim25 ReconfigureDVPort_Task,omitempty"`
+	Res    *types.ReconfigureDVPort_TaskResponse `xml:"urn:vim25 ReconfigureDVPort_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReconfigureDVPort_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReconfigureDVPort_Task(ctx context.Context, r soap.RoundTripper, req *types.ReconfigureDVPort_Task) (*types.ReconfigureDVPort_TaskResponse, error) {
+	var reqBody, resBody ReconfigureDVPort_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReconfigureDVPortgroup_TaskBody struct {
+	Req    *types.ReconfigureDVPortgroup_Task         `xml:"urn:vim25 ReconfigureDVPortgroup_Task,omitempty"`
+	Res    *types.ReconfigureDVPortgroup_TaskResponse `xml:"urn:vim25 ReconfigureDVPortgroup_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReconfigureDVPortgroup_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReconfigureDVPortgroup_Task(ctx context.Context, r soap.RoundTripper, req *types.ReconfigureDVPortgroup_Task) (*types.ReconfigureDVPortgroup_TaskResponse, error) {
+	var reqBody, resBody ReconfigureDVPortgroup_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReconfigureDatacenter_TaskBody struct {
+	Req    *types.ReconfigureDatacenter_Task         `xml:"urn:vim25 ReconfigureDatacenter_Task,omitempty"`
+	Res    *types.ReconfigureDatacenter_TaskResponse `xml:"urn:vim25 ReconfigureDatacenter_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReconfigureDatacenter_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReconfigureDatacenter_Task(ctx context.Context, r soap.RoundTripper, req *types.ReconfigureDatacenter_Task) (*types.ReconfigureDatacenter_TaskResponse, error) {
+	var reqBody, resBody ReconfigureDatacenter_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReconfigureDomObjectBody struct {
+	Req    *types.ReconfigureDomObject         `xml:"urn:vim25 ReconfigureDomObject,omitempty"`
+	Res    *types.ReconfigureDomObjectResponse `xml:"urn:vim25 ReconfigureDomObjectResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReconfigureDomObjectBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReconfigureDomObject(ctx context.Context, r soap.RoundTripper, req *types.ReconfigureDomObject) (*types.ReconfigureDomObjectResponse, error) {
+	var reqBody, resBody ReconfigureDomObjectBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReconfigureDvs_TaskBody struct {
+	Req    *types.ReconfigureDvs_Task         `xml:"urn:vim25 ReconfigureDvs_Task,omitempty"`
+	Res    *types.ReconfigureDvs_TaskResponse `xml:"urn:vim25 ReconfigureDvs_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReconfigureDvs_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReconfigureDvs_Task(ctx context.Context, r soap.RoundTripper, req *types.ReconfigureDvs_Task) (*types.ReconfigureDvs_TaskResponse, error) {
+	var reqBody, resBody ReconfigureDvs_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReconfigureHostForDAS_TaskBody struct {
+	Req    *types.ReconfigureHostForDAS_Task         `xml:"urn:vim25 ReconfigureHostForDAS_Task,omitempty"`
+	Res    *types.ReconfigureHostForDAS_TaskResponse `xml:"urn:vim25 ReconfigureHostForDAS_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReconfigureHostForDAS_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReconfigureHostForDAS_Task(ctx context.Context, r soap.RoundTripper, req *types.ReconfigureHostForDAS_Task) (*types.ReconfigureHostForDAS_TaskResponse, error) {
+	var reqBody, resBody ReconfigureHostForDAS_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReconfigureScheduledTaskBody struct {
+	Req    *types.ReconfigureScheduledTask         `xml:"urn:vim25 ReconfigureScheduledTask,omitempty"`
+	Res    *types.ReconfigureScheduledTaskResponse `xml:"urn:vim25 ReconfigureScheduledTaskResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReconfigureScheduledTaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReconfigureScheduledTask(ctx context.Context, r soap.RoundTripper, req *types.ReconfigureScheduledTask) (*types.ReconfigureScheduledTaskResponse, error) {
+	var reqBody, resBody ReconfigureScheduledTaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReconfigureServiceConsoleReservationBody struct {
+	Req    *types.ReconfigureServiceConsoleReservation         `xml:"urn:vim25 ReconfigureServiceConsoleReservation,omitempty"`
+	Res    *types.ReconfigureServiceConsoleReservationResponse `xml:"urn:vim25 ReconfigureServiceConsoleReservationResponse,omitempty"`
+	Fault_ *soap.Fault                                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReconfigureServiceConsoleReservationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReconfigureServiceConsoleReservation(ctx context.Context, r soap.RoundTripper, req *types.ReconfigureServiceConsoleReservation) (*types.ReconfigureServiceConsoleReservationResponse, error) {
+	var reqBody, resBody ReconfigureServiceConsoleReservationBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReconfigureSnmpAgentBody struct {
+	Req    *types.ReconfigureSnmpAgent         `xml:"urn:vim25 ReconfigureSnmpAgent,omitempty"`
+	Res    *types.ReconfigureSnmpAgentResponse `xml:"urn:vim25 ReconfigureSnmpAgentResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReconfigureSnmpAgentBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReconfigureSnmpAgent(ctx context.Context, r soap.RoundTripper, req *types.ReconfigureSnmpAgent) (*types.ReconfigureSnmpAgentResponse, error) {
+	var reqBody, resBody ReconfigureSnmpAgentBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReconfigureVirtualMachineReservationBody struct {
+	Req    *types.ReconfigureVirtualMachineReservation         `xml:"urn:vim25 ReconfigureVirtualMachineReservation,omitempty"`
+	Res    *types.ReconfigureVirtualMachineReservationResponse `xml:"urn:vim25 ReconfigureVirtualMachineReservationResponse,omitempty"`
+	Fault_ *soap.Fault                                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReconfigureVirtualMachineReservationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReconfigureVirtualMachineReservation(ctx context.Context, r soap.RoundTripper, req *types.ReconfigureVirtualMachineReservation) (*types.ReconfigureVirtualMachineReservationResponse, error) {
+	var reqBody, resBody ReconfigureVirtualMachineReservationBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReconnectHost_TaskBody struct {
+	Req    *types.ReconnectHost_Task         `xml:"urn:vim25 ReconnectHost_Task,omitempty"`
+	Res    *types.ReconnectHost_TaskResponse `xml:"urn:vim25 ReconnectHost_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReconnectHost_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReconnectHost_Task(ctx context.Context, r soap.RoundTripper, req *types.ReconnectHost_Task) (*types.ReconnectHost_TaskResponse, error) {
+	var reqBody, resBody ReconnectHost_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RectifyDvsHost_TaskBody struct {
+	Req    *types.RectifyDvsHost_Task         `xml:"urn:vim25 RectifyDvsHost_Task,omitempty"`
+	Res    *types.RectifyDvsHost_TaskResponse `xml:"urn:vim25 RectifyDvsHost_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RectifyDvsHost_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RectifyDvsHost_Task(ctx context.Context, r soap.RoundTripper, req *types.RectifyDvsHost_Task) (*types.RectifyDvsHost_TaskResponse, error) {
+	var reqBody, resBody RectifyDvsHost_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RectifyDvsOnHost_TaskBody struct {
+	Req    *types.RectifyDvsOnHost_Task         `xml:"urn:vim25 RectifyDvsOnHost_Task,omitempty"`
+	Res    *types.RectifyDvsOnHost_TaskResponse `xml:"urn:vim25 RectifyDvsOnHost_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RectifyDvsOnHost_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RectifyDvsOnHost_Task(ctx context.Context, r soap.RoundTripper, req *types.RectifyDvsOnHost_Task) (*types.RectifyDvsOnHost_TaskResponse, error) {
+	var reqBody, resBody RectifyDvsOnHost_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RefreshBody struct {
+	Req    *types.Refresh         `xml:"urn:vim25 Refresh,omitempty"`
+	Res    *types.RefreshResponse `xml:"urn:vim25 RefreshResponse,omitempty"`
+	Fault_ *soap.Fault            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RefreshBody) Fault() *soap.Fault { return b.Fault_ }
+
+func Refresh(ctx context.Context, r soap.RoundTripper, req *types.Refresh) (*types.RefreshResponse, error) {
+	var reqBody, resBody RefreshBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RefreshDVPortStateBody struct {
+	Req    *types.RefreshDVPortState         `xml:"urn:vim25 RefreshDVPortState,omitempty"`
+	Res    *types.RefreshDVPortStateResponse `xml:"urn:vim25 RefreshDVPortStateResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RefreshDVPortStateBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RefreshDVPortState(ctx context.Context, r soap.RoundTripper, req *types.RefreshDVPortState) (*types.RefreshDVPortStateResponse, error) {
+	var reqBody, resBody RefreshDVPortStateBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RefreshDatastoreBody struct {
+	Req    *types.RefreshDatastore         `xml:"urn:vim25 RefreshDatastore,omitempty"`
+	Res    *types.RefreshDatastoreResponse `xml:"urn:vim25 RefreshDatastoreResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RefreshDatastoreBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RefreshDatastore(ctx context.Context, r soap.RoundTripper, req *types.RefreshDatastore) (*types.RefreshDatastoreResponse, error) {
+	var reqBody, resBody RefreshDatastoreBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RefreshDatastoreStorageInfoBody struct {
+	Req    *types.RefreshDatastoreStorageInfo         `xml:"urn:vim25 RefreshDatastoreStorageInfo,omitempty"`
+	Res    *types.RefreshDatastoreStorageInfoResponse `xml:"urn:vim25 RefreshDatastoreStorageInfoResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RefreshDatastoreStorageInfoBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RefreshDatastoreStorageInfo(ctx context.Context, r soap.RoundTripper, req *types.RefreshDatastoreStorageInfo) (*types.RefreshDatastoreStorageInfoResponse, error) {
+	var reqBody, resBody RefreshDatastoreStorageInfoBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RefreshDateTimeSystemBody struct {
+	Req    *types.RefreshDateTimeSystem         `xml:"urn:vim25 RefreshDateTimeSystem,omitempty"`
+	Res    *types.RefreshDateTimeSystemResponse `xml:"urn:vim25 RefreshDateTimeSystemResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RefreshDateTimeSystemBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RefreshDateTimeSystem(ctx context.Context, r soap.RoundTripper, req *types.RefreshDateTimeSystem) (*types.RefreshDateTimeSystemResponse, error) {
+	var reqBody, resBody RefreshDateTimeSystemBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RefreshFirewallBody struct {
+	Req    *types.RefreshFirewall         `xml:"urn:vim25 RefreshFirewall,omitempty"`
+	Res    *types.RefreshFirewallResponse `xml:"urn:vim25 RefreshFirewallResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RefreshFirewallBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RefreshFirewall(ctx context.Context, r soap.RoundTripper, req *types.RefreshFirewall) (*types.RefreshFirewallResponse, error) {
+	var reqBody, resBody RefreshFirewallBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RefreshGraphicsManagerBody struct {
+	Req    *types.RefreshGraphicsManager         `xml:"urn:vim25 RefreshGraphicsManager,omitempty"`
+	Res    *types.RefreshGraphicsManagerResponse `xml:"urn:vim25 RefreshGraphicsManagerResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RefreshGraphicsManagerBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RefreshGraphicsManager(ctx context.Context, r soap.RoundTripper, req *types.RefreshGraphicsManager) (*types.RefreshGraphicsManagerResponse, error) {
+	var reqBody, resBody RefreshGraphicsManagerBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RefreshHealthStatusSystemBody struct {
+	Req    *types.RefreshHealthStatusSystem         `xml:"urn:vim25 RefreshHealthStatusSystem,omitempty"`
+	Res    *types.RefreshHealthStatusSystemResponse `xml:"urn:vim25 RefreshHealthStatusSystemResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RefreshHealthStatusSystemBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RefreshHealthStatusSystem(ctx context.Context, r soap.RoundTripper, req *types.RefreshHealthStatusSystem) (*types.RefreshHealthStatusSystemResponse, error) {
+	var reqBody, resBody RefreshHealthStatusSystemBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RefreshNetworkSystemBody struct {
+	Req    *types.RefreshNetworkSystem         `xml:"urn:vim25 RefreshNetworkSystem,omitempty"`
+	Res    *types.RefreshNetworkSystemResponse `xml:"urn:vim25 RefreshNetworkSystemResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RefreshNetworkSystemBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RefreshNetworkSystem(ctx context.Context, r soap.RoundTripper, req *types.RefreshNetworkSystem) (*types.RefreshNetworkSystemResponse, error) {
+	var reqBody, resBody RefreshNetworkSystemBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RefreshRecommendationBody struct {
+	Req    *types.RefreshRecommendation         `xml:"urn:vim25 RefreshRecommendation,omitempty"`
+	Res    *types.RefreshRecommendationResponse `xml:"urn:vim25 RefreshRecommendationResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RefreshRecommendationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RefreshRecommendation(ctx context.Context, r soap.RoundTripper, req *types.RefreshRecommendation) (*types.RefreshRecommendationResponse, error) {
+	var reqBody, resBody RefreshRecommendationBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RefreshRuntimeBody struct {
+	Req    *types.RefreshRuntime         `xml:"urn:vim25 RefreshRuntime,omitempty"`
+	Res    *types.RefreshRuntimeResponse `xml:"urn:vim25 RefreshRuntimeResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RefreshRuntimeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RefreshRuntime(ctx context.Context, r soap.RoundTripper, req *types.RefreshRuntime) (*types.RefreshRuntimeResponse, error) {
+	var reqBody, resBody RefreshRuntimeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RefreshServicesBody struct {
+	Req    *types.RefreshServices         `xml:"urn:vim25 RefreshServices,omitempty"`
+	Res    *types.RefreshServicesResponse `xml:"urn:vim25 RefreshServicesResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RefreshServicesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RefreshServices(ctx context.Context, r soap.RoundTripper, req *types.RefreshServices) (*types.RefreshServicesResponse, error) {
+	var reqBody, resBody RefreshServicesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RefreshStorageDrsRecommendationBody struct {
+	Req    *types.RefreshStorageDrsRecommendation         `xml:"urn:vim25 RefreshStorageDrsRecommendation,omitempty"`
+	Res    *types.RefreshStorageDrsRecommendationResponse `xml:"urn:vim25 RefreshStorageDrsRecommendationResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RefreshStorageDrsRecommendationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RefreshStorageDrsRecommendation(ctx context.Context, r soap.RoundTripper, req *types.RefreshStorageDrsRecommendation) (*types.RefreshStorageDrsRecommendationResponse, error) {
+	var reqBody, resBody RefreshStorageDrsRecommendationBody
+
+	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"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RefreshStorageInfoBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RefreshStorageInfo(ctx context.Context, r soap.RoundTripper, req *types.RefreshStorageInfo) (*types.RefreshStorageInfoResponse, error) {
+	var reqBody, resBody RefreshStorageInfoBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RefreshStorageSystemBody struct {
+	Req    *types.RefreshStorageSystem         `xml:"urn:vim25 RefreshStorageSystem,omitempty"`
+	Res    *types.RefreshStorageSystemResponse `xml:"urn:vim25 RefreshStorageSystemResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RefreshStorageSystemBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RefreshStorageSystem(ctx context.Context, r soap.RoundTripper, req *types.RefreshStorageSystem) (*types.RefreshStorageSystemResponse, error) {
+	var reqBody, resBody RefreshStorageSystemBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RegisterChildVM_TaskBody struct {
+	Req    *types.RegisterChildVM_Task         `xml:"urn:vim25 RegisterChildVM_Task,omitempty"`
+	Res    *types.RegisterChildVM_TaskResponse `xml:"urn:vim25 RegisterChildVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RegisterChildVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RegisterChildVM_Task(ctx context.Context, r soap.RoundTripper, req *types.RegisterChildVM_Task) (*types.RegisterChildVM_TaskResponse, error) {
+	var reqBody, resBody RegisterChildVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RegisterDiskBody struct {
+	Req    *types.RegisterDisk         `xml:"urn:vim25 RegisterDisk,omitempty"`
+	Res    *types.RegisterDiskResponse `xml:"urn:vim25 RegisterDiskResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RegisterDiskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RegisterDisk(ctx context.Context, r soap.RoundTripper, req *types.RegisterDisk) (*types.RegisterDiskResponse, error) {
+	var reqBody, resBody RegisterDiskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RegisterExtensionBody struct {
+	Req    *types.RegisterExtension         `xml:"urn:vim25 RegisterExtension,omitempty"`
+	Res    *types.RegisterExtensionResponse `xml:"urn:vim25 RegisterExtensionResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RegisterExtensionBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RegisterExtension(ctx context.Context, r soap.RoundTripper, req *types.RegisterExtension) (*types.RegisterExtensionResponse, error) {
+	var reqBody, resBody RegisterExtensionBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RegisterHealthUpdateProviderBody struct {
+	Req    *types.RegisterHealthUpdateProvider         `xml:"urn:vim25 RegisterHealthUpdateProvider,omitempty"`
+	Res    *types.RegisterHealthUpdateProviderResponse `xml:"urn:vim25 RegisterHealthUpdateProviderResponse,omitempty"`
+	Fault_ *soap.Fault                                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RegisterHealthUpdateProviderBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RegisterHealthUpdateProvider(ctx context.Context, r soap.RoundTripper, req *types.RegisterHealthUpdateProvider) (*types.RegisterHealthUpdateProviderResponse, error) {
+	var reqBody, resBody RegisterHealthUpdateProviderBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RegisterKmipServerBody struct {
+	Req    *types.RegisterKmipServer         `xml:"urn:vim25 RegisterKmipServer,omitempty"`
+	Res    *types.RegisterKmipServerResponse `xml:"urn:vim25 RegisterKmipServerResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RegisterKmipServerBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RegisterKmipServer(ctx context.Context, r soap.RoundTripper, req *types.RegisterKmipServer) (*types.RegisterKmipServerResponse, error) {
+	var reqBody, resBody RegisterKmipServerBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RegisterVM_TaskBody struct {
+	Req    *types.RegisterVM_Task         `xml:"urn:vim25 RegisterVM_Task,omitempty"`
+	Res    *types.RegisterVM_TaskResponse `xml:"urn:vim25 RegisterVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RegisterVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RegisterVM_Task(ctx context.Context, r soap.RoundTripper, req *types.RegisterVM_Task) (*types.RegisterVM_TaskResponse, error) {
+	var reqBody, resBody RegisterVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReleaseCredentialsInGuestBody struct {
+	Req    *types.ReleaseCredentialsInGuest         `xml:"urn:vim25 ReleaseCredentialsInGuest,omitempty"`
+	Res    *types.ReleaseCredentialsInGuestResponse `xml:"urn:vim25 ReleaseCredentialsInGuestResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReleaseCredentialsInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReleaseCredentialsInGuest(ctx context.Context, r soap.RoundTripper, req *types.ReleaseCredentialsInGuest) (*types.ReleaseCredentialsInGuestResponse, error) {
+	var reqBody, resBody ReleaseCredentialsInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReleaseIpAllocationBody struct {
+	Req    *types.ReleaseIpAllocation         `xml:"urn:vim25 ReleaseIpAllocation,omitempty"`
+	Res    *types.ReleaseIpAllocationResponse `xml:"urn:vim25 ReleaseIpAllocationResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReleaseIpAllocationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReleaseIpAllocation(ctx context.Context, r soap.RoundTripper, req *types.ReleaseIpAllocation) (*types.ReleaseIpAllocationResponse, error) {
+	var reqBody, resBody ReleaseIpAllocationBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReleaseManagedSnapshotBody struct {
+	Req    *types.ReleaseManagedSnapshot         `xml:"urn:vim25 ReleaseManagedSnapshot,omitempty"`
+	Res    *types.ReleaseManagedSnapshotResponse `xml:"urn:vim25 ReleaseManagedSnapshotResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReleaseManagedSnapshotBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReleaseManagedSnapshot(ctx context.Context, r soap.RoundTripper, req *types.ReleaseManagedSnapshot) (*types.ReleaseManagedSnapshotResponse, error) {
+	var reqBody, resBody ReleaseManagedSnapshotBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReloadBody struct {
+	Req    *types.Reload         `xml:"urn:vim25 Reload,omitempty"`
+	Res    *types.ReloadResponse `xml:"urn:vim25 ReloadResponse,omitempty"`
+	Fault_ *soap.Fault           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReloadBody) Fault() *soap.Fault { return b.Fault_ }
+
+func Reload(ctx context.Context, r soap.RoundTripper, req *types.Reload) (*types.ReloadResponse, error) {
+	var reqBody, resBody ReloadBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RelocateVM_TaskBody struct {
+	Req    *types.RelocateVM_Task         `xml:"urn:vim25 RelocateVM_Task,omitempty"`
+	Res    *types.RelocateVM_TaskResponse `xml:"urn:vim25 RelocateVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RelocateVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RelocateVM_Task(ctx context.Context, r soap.RoundTripper, req *types.RelocateVM_Task) (*types.RelocateVM_TaskResponse, error) {
+	var reqBody, resBody RelocateVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RelocateVStorageObject_TaskBody struct {
+	Req    *types.RelocateVStorageObject_Task         `xml:"urn:vim25 RelocateVStorageObject_Task,omitempty"`
+	Res    *types.RelocateVStorageObject_TaskResponse `xml:"urn:vim25 RelocateVStorageObject_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RelocateVStorageObject_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RelocateVStorageObject_Task(ctx context.Context, r soap.RoundTripper, req *types.RelocateVStorageObject_Task) (*types.RelocateVStorageObject_TaskResponse, error) {
+	var reqBody, resBody RelocateVStorageObject_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveAlarmBody struct {
+	Req    *types.RemoveAlarm         `xml:"urn:vim25 RemoveAlarm,omitempty"`
+	Res    *types.RemoveAlarmResponse `xml:"urn:vim25 RemoveAlarmResponse,omitempty"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveAlarmBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveAlarm(ctx context.Context, r soap.RoundTripper, req *types.RemoveAlarm) (*types.RemoveAlarmResponse, error) {
+	var reqBody, resBody RemoveAlarmBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveAllSnapshots_TaskBody struct {
+	Req    *types.RemoveAllSnapshots_Task         `xml:"urn:vim25 RemoveAllSnapshots_Task,omitempty"`
+	Res    *types.RemoveAllSnapshots_TaskResponse `xml:"urn:vim25 RemoveAllSnapshots_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveAllSnapshots_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveAllSnapshots_Task(ctx context.Context, r soap.RoundTripper, req *types.RemoveAllSnapshots_Task) (*types.RemoveAllSnapshots_TaskResponse, error) {
+	var reqBody, resBody RemoveAllSnapshots_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveAssignedLicenseBody struct {
+	Req    *types.RemoveAssignedLicense         `xml:"urn:vim25 RemoveAssignedLicense,omitempty"`
+	Res    *types.RemoveAssignedLicenseResponse `xml:"urn:vim25 RemoveAssignedLicenseResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveAssignedLicenseBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveAssignedLicense(ctx context.Context, r soap.RoundTripper, req *types.RemoveAssignedLicense) (*types.RemoveAssignedLicenseResponse, error) {
+	var reqBody, resBody RemoveAssignedLicenseBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveAuthorizationRoleBody struct {
+	Req    *types.RemoveAuthorizationRole         `xml:"urn:vim25 RemoveAuthorizationRole,omitempty"`
+	Res    *types.RemoveAuthorizationRoleResponse `xml:"urn:vim25 RemoveAuthorizationRoleResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveAuthorizationRoleBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveAuthorizationRole(ctx context.Context, r soap.RoundTripper, req *types.RemoveAuthorizationRole) (*types.RemoveAuthorizationRoleResponse, error) {
+	var reqBody, resBody RemoveAuthorizationRoleBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveCustomFieldDefBody struct {
+	Req    *types.RemoveCustomFieldDef         `xml:"urn:vim25 RemoveCustomFieldDef,omitempty"`
+	Res    *types.RemoveCustomFieldDefResponse `xml:"urn:vim25 RemoveCustomFieldDefResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveCustomFieldDefBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveCustomFieldDef(ctx context.Context, r soap.RoundTripper, req *types.RemoveCustomFieldDef) (*types.RemoveCustomFieldDefResponse, error) {
+	var reqBody, resBody RemoveCustomFieldDefBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveDatastoreBody struct {
+	Req    *types.RemoveDatastore         `xml:"urn:vim25 RemoveDatastore,omitempty"`
+	Res    *types.RemoveDatastoreResponse `xml:"urn:vim25 RemoveDatastoreResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveDatastoreBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveDatastore(ctx context.Context, r soap.RoundTripper, req *types.RemoveDatastore) (*types.RemoveDatastoreResponse, error) {
+	var reqBody, resBody RemoveDatastoreBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveDatastoreEx_TaskBody struct {
+	Req    *types.RemoveDatastoreEx_Task         `xml:"urn:vim25 RemoveDatastoreEx_Task,omitempty"`
+	Res    *types.RemoveDatastoreEx_TaskResponse `xml:"urn:vim25 RemoveDatastoreEx_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveDatastoreEx_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveDatastoreEx_Task(ctx context.Context, r soap.RoundTripper, req *types.RemoveDatastoreEx_Task) (*types.RemoveDatastoreEx_TaskResponse, error) {
+	var reqBody, resBody RemoveDatastoreEx_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveDiskMapping_TaskBody struct {
+	Req    *types.RemoveDiskMapping_Task         `xml:"urn:vim25 RemoveDiskMapping_Task,omitempty"`
+	Res    *types.RemoveDiskMapping_TaskResponse `xml:"urn:vim25 RemoveDiskMapping_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveDiskMapping_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveDiskMapping_Task(ctx context.Context, r soap.RoundTripper, req *types.RemoveDiskMapping_Task) (*types.RemoveDiskMapping_TaskResponse, error) {
+	var reqBody, resBody RemoveDiskMapping_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveDisk_TaskBody struct {
+	Req    *types.RemoveDisk_Task         `xml:"urn:vim25 RemoveDisk_Task,omitempty"`
+	Res    *types.RemoveDisk_TaskResponse `xml:"urn:vim25 RemoveDisk_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveDisk_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveDisk_Task(ctx context.Context, r soap.RoundTripper, req *types.RemoveDisk_Task) (*types.RemoveDisk_TaskResponse, error) {
+	var reqBody, resBody RemoveDisk_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveEntityPermissionBody struct {
+	Req    *types.RemoveEntityPermission         `xml:"urn:vim25 RemoveEntityPermission,omitempty"`
+	Res    *types.RemoveEntityPermissionResponse `xml:"urn:vim25 RemoveEntityPermissionResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveEntityPermissionBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveEntityPermission(ctx context.Context, r soap.RoundTripper, req *types.RemoveEntityPermission) (*types.RemoveEntityPermissionResponse, error) {
+	var reqBody, resBody RemoveEntityPermissionBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveFilterBody struct {
+	Req    *types.RemoveFilter         `xml:"urn:vim25 RemoveFilter,omitempty"`
+	Res    *types.RemoveFilterResponse `xml:"urn:vim25 RemoveFilterResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveFilterBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveFilter(ctx context.Context, r soap.RoundTripper, req *types.RemoveFilter) (*types.RemoveFilterResponse, error) {
+	var reqBody, resBody RemoveFilterBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveFilterEntitiesBody struct {
+	Req    *types.RemoveFilterEntities         `xml:"urn:vim25 RemoveFilterEntities,omitempty"`
+	Res    *types.RemoveFilterEntitiesResponse `xml:"urn:vim25 RemoveFilterEntitiesResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveFilterEntitiesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveFilterEntities(ctx context.Context, r soap.RoundTripper, req *types.RemoveFilterEntities) (*types.RemoveFilterEntitiesResponse, error) {
+	var reqBody, resBody RemoveFilterEntitiesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveGroupBody struct {
+	Req    *types.RemoveGroup         `xml:"urn:vim25 RemoveGroup,omitempty"`
+	Res    *types.RemoveGroupResponse `xml:"urn:vim25 RemoveGroupResponse,omitempty"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveGroupBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveGroup(ctx context.Context, r soap.RoundTripper, req *types.RemoveGroup) (*types.RemoveGroupResponse, error) {
+	var reqBody, resBody RemoveGroupBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveGuestAliasBody struct {
+	Req    *types.RemoveGuestAlias         `xml:"urn:vim25 RemoveGuestAlias,omitempty"`
+	Res    *types.RemoveGuestAliasResponse `xml:"urn:vim25 RemoveGuestAliasResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveGuestAliasBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveGuestAlias(ctx context.Context, r soap.RoundTripper, req *types.RemoveGuestAlias) (*types.RemoveGuestAliasResponse, error) {
+	var reqBody, resBody RemoveGuestAliasBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveGuestAliasByCertBody struct {
+	Req    *types.RemoveGuestAliasByCert         `xml:"urn:vim25 RemoveGuestAliasByCert,omitempty"`
+	Res    *types.RemoveGuestAliasByCertResponse `xml:"urn:vim25 RemoveGuestAliasByCertResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveGuestAliasByCertBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveGuestAliasByCert(ctx context.Context, r soap.RoundTripper, req *types.RemoveGuestAliasByCert) (*types.RemoveGuestAliasByCertResponse, error) {
+	var reqBody, resBody RemoveGuestAliasByCertBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveInternetScsiSendTargetsBody struct {
+	Req    *types.RemoveInternetScsiSendTargets         `xml:"urn:vim25 RemoveInternetScsiSendTargets,omitempty"`
+	Res    *types.RemoveInternetScsiSendTargetsResponse `xml:"urn:vim25 RemoveInternetScsiSendTargetsResponse,omitempty"`
+	Fault_ *soap.Fault                                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveInternetScsiSendTargetsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveInternetScsiSendTargets(ctx context.Context, r soap.RoundTripper, req *types.RemoveInternetScsiSendTargets) (*types.RemoveInternetScsiSendTargetsResponse, error) {
+	var reqBody, resBody RemoveInternetScsiSendTargetsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveInternetScsiStaticTargetsBody struct {
+	Req    *types.RemoveInternetScsiStaticTargets         `xml:"urn:vim25 RemoveInternetScsiStaticTargets,omitempty"`
+	Res    *types.RemoveInternetScsiStaticTargetsResponse `xml:"urn:vim25 RemoveInternetScsiStaticTargetsResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveInternetScsiStaticTargetsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveInternetScsiStaticTargets(ctx context.Context, r soap.RoundTripper, req *types.RemoveInternetScsiStaticTargets) (*types.RemoveInternetScsiStaticTargetsResponse, error) {
+	var reqBody, resBody RemoveInternetScsiStaticTargetsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveKeyBody struct {
+	Req    *types.RemoveKey         `xml:"urn:vim25 RemoveKey,omitempty"`
+	Res    *types.RemoveKeyResponse `xml:"urn:vim25 RemoveKeyResponse,omitempty"`
+	Fault_ *soap.Fault              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveKeyBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveKey(ctx context.Context, r soap.RoundTripper, req *types.RemoveKey) (*types.RemoveKeyResponse, error) {
+	var reqBody, resBody RemoveKeyBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveKeysBody struct {
+	Req    *types.RemoveKeys         `xml:"urn:vim25 RemoveKeys,omitempty"`
+	Res    *types.RemoveKeysResponse `xml:"urn:vim25 RemoveKeysResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveKeysBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveKeys(ctx context.Context, r soap.RoundTripper, req *types.RemoveKeys) (*types.RemoveKeysResponse, error) {
+	var reqBody, resBody RemoveKeysBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveKmipServerBody struct {
+	Req    *types.RemoveKmipServer         `xml:"urn:vim25 RemoveKmipServer,omitempty"`
+	Res    *types.RemoveKmipServerResponse `xml:"urn:vim25 RemoveKmipServerResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveKmipServerBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveKmipServer(ctx context.Context, r soap.RoundTripper, req *types.RemoveKmipServer) (*types.RemoveKmipServerResponse, error) {
+	var reqBody, resBody RemoveKmipServerBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveLicenseBody struct {
+	Req    *types.RemoveLicense         `xml:"urn:vim25 RemoveLicense,omitempty"`
+	Res    *types.RemoveLicenseResponse `xml:"urn:vim25 RemoveLicenseResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveLicenseBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveLicense(ctx context.Context, r soap.RoundTripper, req *types.RemoveLicense) (*types.RemoveLicenseResponse, error) {
+	var reqBody, resBody RemoveLicenseBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveLicenseLabelBody struct {
+	Req    *types.RemoveLicenseLabel         `xml:"urn:vim25 RemoveLicenseLabel,omitempty"`
+	Res    *types.RemoveLicenseLabelResponse `xml:"urn:vim25 RemoveLicenseLabelResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveLicenseLabelBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveLicenseLabel(ctx context.Context, r soap.RoundTripper, req *types.RemoveLicenseLabel) (*types.RemoveLicenseLabelResponse, error) {
+	var reqBody, resBody RemoveLicenseLabelBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveMonitoredEntitiesBody struct {
+	Req    *types.RemoveMonitoredEntities         `xml:"urn:vim25 RemoveMonitoredEntities,omitempty"`
+	Res    *types.RemoveMonitoredEntitiesResponse `xml:"urn:vim25 RemoveMonitoredEntitiesResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveMonitoredEntitiesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveMonitoredEntities(ctx context.Context, r soap.RoundTripper, req *types.RemoveMonitoredEntities) (*types.RemoveMonitoredEntitiesResponse, error) {
+	var reqBody, resBody RemoveMonitoredEntitiesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveNetworkResourcePoolBody struct {
+	Req    *types.RemoveNetworkResourcePool         `xml:"urn:vim25 RemoveNetworkResourcePool,omitempty"`
+	Res    *types.RemoveNetworkResourcePoolResponse `xml:"urn:vim25 RemoveNetworkResourcePoolResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveNetworkResourcePoolBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveNetworkResourcePool(ctx context.Context, r soap.RoundTripper, req *types.RemoveNetworkResourcePool) (*types.RemoveNetworkResourcePoolResponse, error) {
+	var reqBody, resBody RemoveNetworkResourcePoolBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemovePerfIntervalBody struct {
+	Req    *types.RemovePerfInterval         `xml:"urn:vim25 RemovePerfInterval,omitempty"`
+	Res    *types.RemovePerfIntervalResponse `xml:"urn:vim25 RemovePerfIntervalResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemovePerfIntervalBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemovePerfInterval(ctx context.Context, r soap.RoundTripper, req *types.RemovePerfInterval) (*types.RemovePerfIntervalResponse, error) {
+	var reqBody, resBody RemovePerfIntervalBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemovePortGroupBody struct {
+	Req    *types.RemovePortGroup         `xml:"urn:vim25 RemovePortGroup,omitempty"`
+	Res    *types.RemovePortGroupResponse `xml:"urn:vim25 RemovePortGroupResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemovePortGroupBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemovePortGroup(ctx context.Context, r soap.RoundTripper, req *types.RemovePortGroup) (*types.RemovePortGroupResponse, error) {
+	var reqBody, resBody RemovePortGroupBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveScheduledTaskBody struct {
+	Req    *types.RemoveScheduledTask         `xml:"urn:vim25 RemoveScheduledTask,omitempty"`
+	Res    *types.RemoveScheduledTaskResponse `xml:"urn:vim25 RemoveScheduledTaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveScheduledTaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveScheduledTask(ctx context.Context, r soap.RoundTripper, req *types.RemoveScheduledTask) (*types.RemoveScheduledTaskResponse, error) {
+	var reqBody, resBody RemoveScheduledTaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveServiceConsoleVirtualNicBody struct {
+	Req    *types.RemoveServiceConsoleVirtualNic         `xml:"urn:vim25 RemoveServiceConsoleVirtualNic,omitempty"`
+	Res    *types.RemoveServiceConsoleVirtualNicResponse `xml:"urn:vim25 RemoveServiceConsoleVirtualNicResponse,omitempty"`
+	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveServiceConsoleVirtualNicBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveServiceConsoleVirtualNic(ctx context.Context, r soap.RoundTripper, req *types.RemoveServiceConsoleVirtualNic) (*types.RemoveServiceConsoleVirtualNicResponse, error) {
+	var reqBody, resBody RemoveServiceConsoleVirtualNicBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveSmartCardTrustAnchorBody struct {
+	Req    *types.RemoveSmartCardTrustAnchor         `xml:"urn:vim25 RemoveSmartCardTrustAnchor,omitempty"`
+	Res    *types.RemoveSmartCardTrustAnchorResponse `xml:"urn:vim25 RemoveSmartCardTrustAnchorResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveSmartCardTrustAnchorBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveSmartCardTrustAnchor(ctx context.Context, r soap.RoundTripper, req *types.RemoveSmartCardTrustAnchor) (*types.RemoveSmartCardTrustAnchorResponse, error) {
+	var reqBody, resBody RemoveSmartCardTrustAnchorBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveSmartCardTrustAnchorByFingerprintBody struct {
+	Req    *types.RemoveSmartCardTrustAnchorByFingerprint         `xml:"urn:vim25 RemoveSmartCardTrustAnchorByFingerprint,omitempty"`
+	Res    *types.RemoveSmartCardTrustAnchorByFingerprintResponse `xml:"urn:vim25 RemoveSmartCardTrustAnchorByFingerprintResponse,omitempty"`
+	Fault_ *soap.Fault                                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveSmartCardTrustAnchorByFingerprintBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveSmartCardTrustAnchorByFingerprint(ctx context.Context, r soap.RoundTripper, req *types.RemoveSmartCardTrustAnchorByFingerprint) (*types.RemoveSmartCardTrustAnchorByFingerprintResponse, error) {
+	var reqBody, resBody RemoveSmartCardTrustAnchorByFingerprintBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveSnapshot_TaskBody struct {
+	Req    *types.RemoveSnapshot_Task         `xml:"urn:vim25 RemoveSnapshot_Task,omitempty"`
+	Res    *types.RemoveSnapshot_TaskResponse `xml:"urn:vim25 RemoveSnapshot_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveSnapshot_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveSnapshot_Task(ctx context.Context, r soap.RoundTripper, req *types.RemoveSnapshot_Task) (*types.RemoveSnapshot_TaskResponse, error) {
+	var reqBody, resBody RemoveSnapshot_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveUserBody struct {
+	Req    *types.RemoveUser         `xml:"urn:vim25 RemoveUser,omitempty"`
+	Res    *types.RemoveUserResponse `xml:"urn:vim25 RemoveUserResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveUserBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveUser(ctx context.Context, r soap.RoundTripper, req *types.RemoveUser) (*types.RemoveUserResponse, error) {
+	var reqBody, resBody RemoveUserBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveVirtualNicBody struct {
+	Req    *types.RemoveVirtualNic         `xml:"urn:vim25 RemoveVirtualNic,omitempty"`
+	Res    *types.RemoveVirtualNicResponse `xml:"urn:vim25 RemoveVirtualNicResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveVirtualNicBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveVirtualNic(ctx context.Context, r soap.RoundTripper, req *types.RemoveVirtualNic) (*types.RemoveVirtualNicResponse, error) {
+	var reqBody, resBody RemoveVirtualNicBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RemoveVirtualSwitchBody struct {
+	Req    *types.RemoveVirtualSwitch         `xml:"urn:vim25 RemoveVirtualSwitch,omitempty"`
+	Res    *types.RemoveVirtualSwitchResponse `xml:"urn:vim25 RemoveVirtualSwitchResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RemoveVirtualSwitchBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RemoveVirtualSwitch(ctx context.Context, r soap.RoundTripper, req *types.RemoveVirtualSwitch) (*types.RemoveVirtualSwitchResponse, error) {
+	var reqBody, resBody RemoveVirtualSwitchBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RenameCustomFieldDefBody struct {
+	Req    *types.RenameCustomFieldDef         `xml:"urn:vim25 RenameCustomFieldDef,omitempty"`
+	Res    *types.RenameCustomFieldDefResponse `xml:"urn:vim25 RenameCustomFieldDefResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RenameCustomFieldDefBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RenameCustomFieldDef(ctx context.Context, r soap.RoundTripper, req *types.RenameCustomFieldDef) (*types.RenameCustomFieldDefResponse, error) {
+	var reqBody, resBody RenameCustomFieldDefBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RenameCustomizationSpecBody struct {
+	Req    *types.RenameCustomizationSpec         `xml:"urn:vim25 RenameCustomizationSpec,omitempty"`
+	Res    *types.RenameCustomizationSpecResponse `xml:"urn:vim25 RenameCustomizationSpecResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RenameCustomizationSpecBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RenameCustomizationSpec(ctx context.Context, r soap.RoundTripper, req *types.RenameCustomizationSpec) (*types.RenameCustomizationSpecResponse, error) {
+	var reqBody, resBody RenameCustomizationSpecBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RenameDatastoreBody struct {
+	Req    *types.RenameDatastore         `xml:"urn:vim25 RenameDatastore,omitempty"`
+	Res    *types.RenameDatastoreResponse `xml:"urn:vim25 RenameDatastoreResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RenameDatastoreBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RenameDatastore(ctx context.Context, r soap.RoundTripper, req *types.RenameDatastore) (*types.RenameDatastoreResponse, error) {
+	var reqBody, resBody RenameDatastoreBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RenameSnapshotBody struct {
+	Req    *types.RenameSnapshot         `xml:"urn:vim25 RenameSnapshot,omitempty"`
+	Res    *types.RenameSnapshotResponse `xml:"urn:vim25 RenameSnapshotResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RenameSnapshotBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RenameSnapshot(ctx context.Context, r soap.RoundTripper, req *types.RenameSnapshot) (*types.RenameSnapshotResponse, error) {
+	var reqBody, resBody RenameSnapshotBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RenameVStorageObjectBody struct {
+	Req    *types.RenameVStorageObject         `xml:"urn:vim25 RenameVStorageObject,omitempty"`
+	Res    *types.RenameVStorageObjectResponse `xml:"urn:vim25 RenameVStorageObjectResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RenameVStorageObjectBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RenameVStorageObject(ctx context.Context, r soap.RoundTripper, req *types.RenameVStorageObject) (*types.RenameVStorageObjectResponse, error) {
+	var reqBody, resBody RenameVStorageObjectBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type Rename_TaskBody struct {
+	Req    *types.Rename_Task         `xml:"urn:vim25 Rename_Task,omitempty"`
+	Res    *types.Rename_TaskResponse `xml:"urn:vim25 Rename_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *Rename_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func Rename_Task(ctx context.Context, r soap.RoundTripper, req *types.Rename_Task) (*types.Rename_TaskResponse, error) {
+	var reqBody, resBody Rename_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReplaceCACertificatesAndCRLsBody struct {
+	Req    *types.ReplaceCACertificatesAndCRLs         `xml:"urn:vim25 ReplaceCACertificatesAndCRLs,omitempty"`
+	Res    *types.ReplaceCACertificatesAndCRLsResponse `xml:"urn:vim25 ReplaceCACertificatesAndCRLsResponse,omitempty"`
+	Fault_ *soap.Fault                                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReplaceCACertificatesAndCRLsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReplaceCACertificatesAndCRLs(ctx context.Context, r soap.RoundTripper, req *types.ReplaceCACertificatesAndCRLs) (*types.ReplaceCACertificatesAndCRLsResponse, error) {
+	var reqBody, resBody ReplaceCACertificatesAndCRLsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReplaceSmartCardTrustAnchorsBody struct {
+	Req    *types.ReplaceSmartCardTrustAnchors         `xml:"urn:vim25 ReplaceSmartCardTrustAnchors,omitempty"`
+	Res    *types.ReplaceSmartCardTrustAnchorsResponse `xml:"urn:vim25 ReplaceSmartCardTrustAnchorsResponse,omitempty"`
+	Fault_ *soap.Fault                                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReplaceSmartCardTrustAnchorsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReplaceSmartCardTrustAnchors(ctx context.Context, r soap.RoundTripper, req *types.ReplaceSmartCardTrustAnchors) (*types.ReplaceSmartCardTrustAnchorsResponse, error) {
+	var reqBody, resBody ReplaceSmartCardTrustAnchorsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RescanAllHbaBody struct {
+	Req    *types.RescanAllHba         `xml:"urn:vim25 RescanAllHba,omitempty"`
+	Res    *types.RescanAllHbaResponse `xml:"urn:vim25 RescanAllHbaResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RescanAllHbaBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RescanAllHba(ctx context.Context, r soap.RoundTripper, req *types.RescanAllHba) (*types.RescanAllHbaResponse, error) {
+	var reqBody, resBody RescanAllHbaBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RescanHbaBody struct {
+	Req    *types.RescanHba         `xml:"urn:vim25 RescanHba,omitempty"`
+	Res    *types.RescanHbaResponse `xml:"urn:vim25 RescanHbaResponse,omitempty"`
+	Fault_ *soap.Fault              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RescanHbaBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RescanHba(ctx context.Context, r soap.RoundTripper, req *types.RescanHba) (*types.RescanHbaResponse, error) {
+	var reqBody, resBody RescanHbaBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RescanVffsBody struct {
+	Req    *types.RescanVffs         `xml:"urn:vim25 RescanVffs,omitempty"`
+	Res    *types.RescanVffsResponse `xml:"urn:vim25 RescanVffsResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RescanVffsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RescanVffs(ctx context.Context, r soap.RoundTripper, req *types.RescanVffs) (*types.RescanVffsResponse, error) {
+	var reqBody, resBody RescanVffsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RescanVmfsBody struct {
+	Req    *types.RescanVmfs         `xml:"urn:vim25 RescanVmfs,omitempty"`
+	Res    *types.RescanVmfsResponse `xml:"urn:vim25 RescanVmfsResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RescanVmfsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RescanVmfs(ctx context.Context, r soap.RoundTripper, req *types.RescanVmfs) (*types.RescanVmfsResponse, error) {
+	var reqBody, resBody RescanVmfsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ResetCollectorBody struct {
+	Req    *types.ResetCollector         `xml:"urn:vim25 ResetCollector,omitempty"`
+	Res    *types.ResetCollectorResponse `xml:"urn:vim25 ResetCollectorResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ResetCollectorBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ResetCollector(ctx context.Context, r soap.RoundTripper, req *types.ResetCollector) (*types.ResetCollectorResponse, error) {
+	var reqBody, resBody ResetCollectorBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ResetCounterLevelMappingBody struct {
+	Req    *types.ResetCounterLevelMapping         `xml:"urn:vim25 ResetCounterLevelMapping,omitempty"`
+	Res    *types.ResetCounterLevelMappingResponse `xml:"urn:vim25 ResetCounterLevelMappingResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ResetCounterLevelMappingBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ResetCounterLevelMapping(ctx context.Context, r soap.RoundTripper, req *types.ResetCounterLevelMapping) (*types.ResetCounterLevelMappingResponse, error) {
+	var reqBody, resBody ResetCounterLevelMappingBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ResetEntityPermissionsBody struct {
+	Req    *types.ResetEntityPermissions         `xml:"urn:vim25 ResetEntityPermissions,omitempty"`
+	Res    *types.ResetEntityPermissionsResponse `xml:"urn:vim25 ResetEntityPermissionsResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ResetEntityPermissionsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ResetEntityPermissions(ctx context.Context, r soap.RoundTripper, req *types.ResetEntityPermissions) (*types.ResetEntityPermissionsResponse, error) {
+	var reqBody, resBody ResetEntityPermissionsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ResetFirmwareToFactoryDefaultsBody struct {
+	Req    *types.ResetFirmwareToFactoryDefaults         `xml:"urn:vim25 ResetFirmwareToFactoryDefaults,omitempty"`
+	Res    *types.ResetFirmwareToFactoryDefaultsResponse `xml:"urn:vim25 ResetFirmwareToFactoryDefaultsResponse,omitempty"`
+	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ResetFirmwareToFactoryDefaultsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ResetFirmwareToFactoryDefaults(ctx context.Context, r soap.RoundTripper, req *types.ResetFirmwareToFactoryDefaults) (*types.ResetFirmwareToFactoryDefaultsResponse, error) {
+	var reqBody, resBody ResetFirmwareToFactoryDefaultsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ResetGuestInformationBody struct {
+	Req    *types.ResetGuestInformation         `xml:"urn:vim25 ResetGuestInformation,omitempty"`
+	Res    *types.ResetGuestInformationResponse `xml:"urn:vim25 ResetGuestInformationResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ResetGuestInformationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ResetGuestInformation(ctx context.Context, r soap.RoundTripper, req *types.ResetGuestInformation) (*types.ResetGuestInformationResponse, error) {
+	var reqBody, resBody ResetGuestInformationBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ResetListViewBody struct {
+	Req    *types.ResetListView         `xml:"urn:vim25 ResetListView,omitempty"`
+	Res    *types.ResetListViewResponse `xml:"urn:vim25 ResetListViewResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ResetListViewBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ResetListView(ctx context.Context, r soap.RoundTripper, req *types.ResetListView) (*types.ResetListViewResponse, error) {
+	var reqBody, resBody ResetListViewBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ResetListViewFromViewBody struct {
+	Req    *types.ResetListViewFromView         `xml:"urn:vim25 ResetListViewFromView,omitempty"`
+	Res    *types.ResetListViewFromViewResponse `xml:"urn:vim25 ResetListViewFromViewResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ResetListViewFromViewBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ResetListViewFromView(ctx context.Context, r soap.RoundTripper, req *types.ResetListViewFromView) (*types.ResetListViewFromViewResponse, error) {
+	var reqBody, resBody ResetListViewFromViewBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ResetSystemHealthInfoBody struct {
+	Req    *types.ResetSystemHealthInfo         `xml:"urn:vim25 ResetSystemHealthInfo,omitempty"`
+	Res    *types.ResetSystemHealthInfoResponse `xml:"urn:vim25 ResetSystemHealthInfoResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ResetSystemHealthInfoBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ResetSystemHealthInfo(ctx context.Context, r soap.RoundTripper, req *types.ResetSystemHealthInfo) (*types.ResetSystemHealthInfoResponse, error) {
+	var reqBody, resBody ResetSystemHealthInfoBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ResetVM_TaskBody struct {
+	Req    *types.ResetVM_Task         `xml:"urn:vim25 ResetVM_Task,omitempty"`
+	Res    *types.ResetVM_TaskResponse `xml:"urn:vim25 ResetVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ResetVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ResetVM_Task(ctx context.Context, r soap.RoundTripper, req *types.ResetVM_Task) (*types.ResetVM_TaskResponse, error) {
+	var reqBody, resBody ResetVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ResignatureUnresolvedVmfsVolume_TaskBody struct {
+	Req    *types.ResignatureUnresolvedVmfsVolume_Task         `xml:"urn:vim25 ResignatureUnresolvedVmfsVolume_Task,omitempty"`
+	Res    *types.ResignatureUnresolvedVmfsVolume_TaskResponse `xml:"urn:vim25 ResignatureUnresolvedVmfsVolume_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ResignatureUnresolvedVmfsVolume_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ResignatureUnresolvedVmfsVolume_Task(ctx context.Context, r soap.RoundTripper, req *types.ResignatureUnresolvedVmfsVolume_Task) (*types.ResignatureUnresolvedVmfsVolume_TaskResponse, error) {
+	var reqBody, resBody ResignatureUnresolvedVmfsVolume_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ResolveInstallationErrorsOnCluster_TaskBody struct {
+	Req    *types.ResolveInstallationErrorsOnCluster_Task         `xml:"urn:vim25 ResolveInstallationErrorsOnCluster_Task,omitempty"`
+	Res    *types.ResolveInstallationErrorsOnCluster_TaskResponse `xml:"urn:vim25 ResolveInstallationErrorsOnCluster_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ResolveInstallationErrorsOnCluster_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ResolveInstallationErrorsOnCluster_Task(ctx context.Context, r soap.RoundTripper, req *types.ResolveInstallationErrorsOnCluster_Task) (*types.ResolveInstallationErrorsOnCluster_TaskResponse, error) {
+	var reqBody, resBody ResolveInstallationErrorsOnCluster_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ResolveInstallationErrorsOnHost_TaskBody struct {
+	Req    *types.ResolveInstallationErrorsOnHost_Task         `xml:"urn:vim25 ResolveInstallationErrorsOnHost_Task,omitempty"`
+	Res    *types.ResolveInstallationErrorsOnHost_TaskResponse `xml:"urn:vim25 ResolveInstallationErrorsOnHost_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ResolveInstallationErrorsOnHost_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ResolveInstallationErrorsOnHost_Task(ctx context.Context, r soap.RoundTripper, req *types.ResolveInstallationErrorsOnHost_Task) (*types.ResolveInstallationErrorsOnHost_TaskResponse, error) {
+	var reqBody, resBody ResolveInstallationErrorsOnHost_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ResolveMultipleUnresolvedVmfsVolumesBody struct {
+	Req    *types.ResolveMultipleUnresolvedVmfsVolumes         `xml:"urn:vim25 ResolveMultipleUnresolvedVmfsVolumes,omitempty"`
+	Res    *types.ResolveMultipleUnresolvedVmfsVolumesResponse `xml:"urn:vim25 ResolveMultipleUnresolvedVmfsVolumesResponse,omitempty"`
+	Fault_ *soap.Fault                                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ResolveMultipleUnresolvedVmfsVolumesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ResolveMultipleUnresolvedVmfsVolumes(ctx context.Context, r soap.RoundTripper, req *types.ResolveMultipleUnresolvedVmfsVolumes) (*types.ResolveMultipleUnresolvedVmfsVolumesResponse, error) {
+	var reqBody, resBody ResolveMultipleUnresolvedVmfsVolumesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ResolveMultipleUnresolvedVmfsVolumesEx_TaskBody struct {
+	Req    *types.ResolveMultipleUnresolvedVmfsVolumesEx_Task         `xml:"urn:vim25 ResolveMultipleUnresolvedVmfsVolumesEx_Task,omitempty"`
+	Res    *types.ResolveMultipleUnresolvedVmfsVolumesEx_TaskResponse `xml:"urn:vim25 ResolveMultipleUnresolvedVmfsVolumesEx_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ResolveMultipleUnresolvedVmfsVolumesEx_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ResolveMultipleUnresolvedVmfsVolumesEx_Task(ctx context.Context, r soap.RoundTripper, req *types.ResolveMultipleUnresolvedVmfsVolumesEx_Task) (*types.ResolveMultipleUnresolvedVmfsVolumesEx_TaskResponse, error) {
+	var reqBody, resBody ResolveMultipleUnresolvedVmfsVolumesEx_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RestartServiceBody struct {
+	Req    *types.RestartService         `xml:"urn:vim25 RestartService,omitempty"`
+	Res    *types.RestartServiceResponse `xml:"urn:vim25 RestartServiceResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RestartServiceBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RestartService(ctx context.Context, r soap.RoundTripper, req *types.RestartService) (*types.RestartServiceResponse, error) {
+	var reqBody, resBody RestartServiceBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RestartServiceConsoleVirtualNicBody struct {
+	Req    *types.RestartServiceConsoleVirtualNic         `xml:"urn:vim25 RestartServiceConsoleVirtualNic,omitempty"`
+	Res    *types.RestartServiceConsoleVirtualNicResponse `xml:"urn:vim25 RestartServiceConsoleVirtualNicResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RestartServiceConsoleVirtualNicBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RestartServiceConsoleVirtualNic(ctx context.Context, r soap.RoundTripper, req *types.RestartServiceConsoleVirtualNic) (*types.RestartServiceConsoleVirtualNicResponse, error) {
+	var reqBody, resBody RestartServiceConsoleVirtualNicBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RestoreFirmwareConfigurationBody struct {
+	Req    *types.RestoreFirmwareConfiguration         `xml:"urn:vim25 RestoreFirmwareConfiguration,omitempty"`
+	Res    *types.RestoreFirmwareConfigurationResponse `xml:"urn:vim25 RestoreFirmwareConfigurationResponse,omitempty"`
+	Fault_ *soap.Fault                                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RestoreFirmwareConfigurationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RestoreFirmwareConfiguration(ctx context.Context, r soap.RoundTripper, req *types.RestoreFirmwareConfiguration) (*types.RestoreFirmwareConfigurationResponse, error) {
+	var reqBody, resBody RestoreFirmwareConfigurationBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveAllPermissionsBody struct {
+	Req    *types.RetrieveAllPermissions         `xml:"urn:vim25 RetrieveAllPermissions,omitempty"`
+	Res    *types.RetrieveAllPermissionsResponse `xml:"urn:vim25 RetrieveAllPermissionsResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveAllPermissionsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveAllPermissions(ctx context.Context, r soap.RoundTripper, req *types.RetrieveAllPermissions) (*types.RetrieveAllPermissionsResponse, error) {
+	var reqBody, resBody RetrieveAllPermissionsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveAnswerFileBody struct {
+	Req    *types.RetrieveAnswerFile         `xml:"urn:vim25 RetrieveAnswerFile,omitempty"`
+	Res    *types.RetrieveAnswerFileResponse `xml:"urn:vim25 RetrieveAnswerFileResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveAnswerFileBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveAnswerFile(ctx context.Context, r soap.RoundTripper, req *types.RetrieveAnswerFile) (*types.RetrieveAnswerFileResponse, error) {
+	var reqBody, resBody RetrieveAnswerFileBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveAnswerFileForProfileBody struct {
+	Req    *types.RetrieveAnswerFileForProfile         `xml:"urn:vim25 RetrieveAnswerFileForProfile,omitempty"`
+	Res    *types.RetrieveAnswerFileForProfileResponse `xml:"urn:vim25 RetrieveAnswerFileForProfileResponse,omitempty"`
+	Fault_ *soap.Fault                                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveAnswerFileForProfileBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveAnswerFileForProfile(ctx context.Context, r soap.RoundTripper, req *types.RetrieveAnswerFileForProfile) (*types.RetrieveAnswerFileForProfileResponse, error) {
+	var reqBody, resBody RetrieveAnswerFileForProfileBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveArgumentDescriptionBody struct {
+	Req    *types.RetrieveArgumentDescription         `xml:"urn:vim25 RetrieveArgumentDescription,omitempty"`
+	Res    *types.RetrieveArgumentDescriptionResponse `xml:"urn:vim25 RetrieveArgumentDescriptionResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveArgumentDescriptionBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveArgumentDescription(ctx context.Context, r soap.RoundTripper, req *types.RetrieveArgumentDescription) (*types.RetrieveArgumentDescriptionResponse, error) {
+	var reqBody, resBody RetrieveArgumentDescriptionBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveClientCertBody struct {
+	Req    *types.RetrieveClientCert         `xml:"urn:vim25 RetrieveClientCert,omitempty"`
+	Res    *types.RetrieveClientCertResponse `xml:"urn:vim25 RetrieveClientCertResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveClientCertBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveClientCert(ctx context.Context, r soap.RoundTripper, req *types.RetrieveClientCert) (*types.RetrieveClientCertResponse, error) {
+	var reqBody, resBody RetrieveClientCertBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveClientCsrBody struct {
+	Req    *types.RetrieveClientCsr         `xml:"urn:vim25 RetrieveClientCsr,omitempty"`
+	Res    *types.RetrieveClientCsrResponse `xml:"urn:vim25 RetrieveClientCsrResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveClientCsrBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveClientCsr(ctx context.Context, r soap.RoundTripper, req *types.RetrieveClientCsr) (*types.RetrieveClientCsrResponse, error) {
+	var reqBody, resBody RetrieveClientCsrBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveDasAdvancedRuntimeInfoBody struct {
+	Req    *types.RetrieveDasAdvancedRuntimeInfo         `xml:"urn:vim25 RetrieveDasAdvancedRuntimeInfo,omitempty"`
+	Res    *types.RetrieveDasAdvancedRuntimeInfoResponse `xml:"urn:vim25 RetrieveDasAdvancedRuntimeInfoResponse,omitempty"`
+	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveDasAdvancedRuntimeInfoBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveDasAdvancedRuntimeInfo(ctx context.Context, r soap.RoundTripper, req *types.RetrieveDasAdvancedRuntimeInfo) (*types.RetrieveDasAdvancedRuntimeInfoResponse, error) {
+	var reqBody, resBody RetrieveDasAdvancedRuntimeInfoBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveDescriptionBody struct {
+	Req    *types.RetrieveDescription         `xml:"urn:vim25 RetrieveDescription,omitempty"`
+	Res    *types.RetrieveDescriptionResponse `xml:"urn:vim25 RetrieveDescriptionResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveDescriptionBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveDescription(ctx context.Context, r soap.RoundTripper, req *types.RetrieveDescription) (*types.RetrieveDescriptionResponse, error) {
+	var reqBody, resBody RetrieveDescriptionBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveDiskPartitionInfoBody struct {
+	Req    *types.RetrieveDiskPartitionInfo         `xml:"urn:vim25 RetrieveDiskPartitionInfo,omitempty"`
+	Res    *types.RetrieveDiskPartitionInfoResponse `xml:"urn:vim25 RetrieveDiskPartitionInfoResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveDiskPartitionInfoBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveDiskPartitionInfo(ctx context.Context, r soap.RoundTripper, req *types.RetrieveDiskPartitionInfo) (*types.RetrieveDiskPartitionInfoResponse, error) {
+	var reqBody, resBody RetrieveDiskPartitionInfoBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveEntityPermissionsBody struct {
+	Req    *types.RetrieveEntityPermissions         `xml:"urn:vim25 RetrieveEntityPermissions,omitempty"`
+	Res    *types.RetrieveEntityPermissionsResponse `xml:"urn:vim25 RetrieveEntityPermissionsResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveEntityPermissionsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveEntityPermissions(ctx context.Context, r soap.RoundTripper, req *types.RetrieveEntityPermissions) (*types.RetrieveEntityPermissionsResponse, error) {
+	var reqBody, resBody RetrieveEntityPermissionsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveEntityScheduledTaskBody struct {
+	Req    *types.RetrieveEntityScheduledTask         `xml:"urn:vim25 RetrieveEntityScheduledTask,omitempty"`
+	Res    *types.RetrieveEntityScheduledTaskResponse `xml:"urn:vim25 RetrieveEntityScheduledTaskResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveEntityScheduledTaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveEntityScheduledTask(ctx context.Context, r soap.RoundTripper, req *types.RetrieveEntityScheduledTask) (*types.RetrieveEntityScheduledTaskResponse, error) {
+	var reqBody, resBody RetrieveEntityScheduledTaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveHardwareUptimeBody struct {
+	Req    *types.RetrieveHardwareUptime         `xml:"urn:vim25 RetrieveHardwareUptime,omitempty"`
+	Res    *types.RetrieveHardwareUptimeResponse `xml:"urn:vim25 RetrieveHardwareUptimeResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveHardwareUptimeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveHardwareUptime(ctx context.Context, r soap.RoundTripper, req *types.RetrieveHardwareUptime) (*types.RetrieveHardwareUptimeResponse, error) {
+	var reqBody, resBody RetrieveHardwareUptimeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveHostAccessControlEntriesBody struct {
+	Req    *types.RetrieveHostAccessControlEntries         `xml:"urn:vim25 RetrieveHostAccessControlEntries,omitempty"`
+	Res    *types.RetrieveHostAccessControlEntriesResponse `xml:"urn:vim25 RetrieveHostAccessControlEntriesResponse,omitempty"`
+	Fault_ *soap.Fault                                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveHostAccessControlEntriesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveHostAccessControlEntries(ctx context.Context, r soap.RoundTripper, req *types.RetrieveHostAccessControlEntries) (*types.RetrieveHostAccessControlEntriesResponse, error) {
+	var reqBody, resBody RetrieveHostAccessControlEntriesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveHostCustomizationsBody struct {
+	Req    *types.RetrieveHostCustomizations         `xml:"urn:vim25 RetrieveHostCustomizations,omitempty"`
+	Res    *types.RetrieveHostCustomizationsResponse `xml:"urn:vim25 RetrieveHostCustomizationsResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveHostCustomizationsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveHostCustomizations(ctx context.Context, r soap.RoundTripper, req *types.RetrieveHostCustomizations) (*types.RetrieveHostCustomizationsResponse, error) {
+	var reqBody, resBody RetrieveHostCustomizationsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveHostCustomizationsForProfileBody struct {
+	Req    *types.RetrieveHostCustomizationsForProfile         `xml:"urn:vim25 RetrieveHostCustomizationsForProfile,omitempty"`
+	Res    *types.RetrieveHostCustomizationsForProfileResponse `xml:"urn:vim25 RetrieveHostCustomizationsForProfileResponse,omitempty"`
+	Fault_ *soap.Fault                                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveHostCustomizationsForProfileBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveHostCustomizationsForProfile(ctx context.Context, r soap.RoundTripper, req *types.RetrieveHostCustomizationsForProfile) (*types.RetrieveHostCustomizationsForProfileResponse, error) {
+	var reqBody, resBody RetrieveHostCustomizationsForProfileBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveHostSpecificationBody struct {
+	Req    *types.RetrieveHostSpecification         `xml:"urn:vim25 RetrieveHostSpecification,omitempty"`
+	Res    *types.RetrieveHostSpecificationResponse `xml:"urn:vim25 RetrieveHostSpecificationResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveHostSpecificationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveHostSpecification(ctx context.Context, r soap.RoundTripper, req *types.RetrieveHostSpecification) (*types.RetrieveHostSpecificationResponse, error) {
+	var reqBody, resBody RetrieveHostSpecificationBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveKmipServerCertBody struct {
+	Req    *types.RetrieveKmipServerCert         `xml:"urn:vim25 RetrieveKmipServerCert,omitempty"`
+	Res    *types.RetrieveKmipServerCertResponse `xml:"urn:vim25 RetrieveKmipServerCertResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveKmipServerCertBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveKmipServerCert(ctx context.Context, r soap.RoundTripper, req *types.RetrieveKmipServerCert) (*types.RetrieveKmipServerCertResponse, error) {
+	var reqBody, resBody RetrieveKmipServerCertBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveKmipServersStatus_TaskBody struct {
+	Req    *types.RetrieveKmipServersStatus_Task         `xml:"urn:vim25 RetrieveKmipServersStatus_Task,omitempty"`
+	Res    *types.RetrieveKmipServersStatus_TaskResponse `xml:"urn:vim25 RetrieveKmipServersStatus_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveKmipServersStatus_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveKmipServersStatus_Task(ctx context.Context, r soap.RoundTripper, req *types.RetrieveKmipServersStatus_Task) (*types.RetrieveKmipServersStatus_TaskResponse, error) {
+	var reqBody, resBody RetrieveKmipServersStatus_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveObjectScheduledTaskBody struct {
+	Req    *types.RetrieveObjectScheduledTask         `xml:"urn:vim25 RetrieveObjectScheduledTask,omitempty"`
+	Res    *types.RetrieveObjectScheduledTaskResponse `xml:"urn:vim25 RetrieveObjectScheduledTaskResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveObjectScheduledTaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveObjectScheduledTask(ctx context.Context, r soap.RoundTripper, req *types.RetrieveObjectScheduledTask) (*types.RetrieveObjectScheduledTaskResponse, error) {
+	var reqBody, resBody RetrieveObjectScheduledTaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveProductComponentsBody struct {
+	Req    *types.RetrieveProductComponents         `xml:"urn:vim25 RetrieveProductComponents,omitempty"`
+	Res    *types.RetrieveProductComponentsResponse `xml:"urn:vim25 RetrieveProductComponentsResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveProductComponentsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveProductComponents(ctx context.Context, r soap.RoundTripper, req *types.RetrieveProductComponents) (*types.RetrieveProductComponentsResponse, error) {
+	var reqBody, resBody RetrieveProductComponentsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrievePropertiesBody struct {
+	Req    *types.RetrieveProperties         `xml:"urn:vim25 RetrieveProperties,omitempty"`
+	Res    *types.RetrievePropertiesResponse `xml:"urn:vim25 RetrievePropertiesResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrievePropertiesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveProperties(ctx context.Context, r soap.RoundTripper, req *types.RetrieveProperties) (*types.RetrievePropertiesResponse, error) {
+	var reqBody, resBody RetrievePropertiesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrievePropertiesExBody struct {
+	Req    *types.RetrievePropertiesEx         `xml:"urn:vim25 RetrievePropertiesEx,omitempty"`
+	Res    *types.RetrievePropertiesExResponse `xml:"urn:vim25 RetrievePropertiesExResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrievePropertiesExBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrievePropertiesEx(ctx context.Context, r soap.RoundTripper, req *types.RetrievePropertiesEx) (*types.RetrievePropertiesExResponse, error) {
+	var reqBody, resBody RetrievePropertiesExBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveRolePermissionsBody struct {
+	Req    *types.RetrieveRolePermissions         `xml:"urn:vim25 RetrieveRolePermissions,omitempty"`
+	Res    *types.RetrieveRolePermissionsResponse `xml:"urn:vim25 RetrieveRolePermissionsResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveRolePermissionsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveRolePermissions(ctx context.Context, r soap.RoundTripper, req *types.RetrieveRolePermissions) (*types.RetrieveRolePermissionsResponse, error) {
+	var reqBody, resBody RetrieveRolePermissionsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveSelfSignedClientCertBody struct {
+	Req    *types.RetrieveSelfSignedClientCert         `xml:"urn:vim25 RetrieveSelfSignedClientCert,omitempty"`
+	Res    *types.RetrieveSelfSignedClientCertResponse `xml:"urn:vim25 RetrieveSelfSignedClientCertResponse,omitempty"`
+	Fault_ *soap.Fault                                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveSelfSignedClientCertBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveSelfSignedClientCert(ctx context.Context, r soap.RoundTripper, req *types.RetrieveSelfSignedClientCert) (*types.RetrieveSelfSignedClientCertResponse, error) {
+	var reqBody, resBody RetrieveSelfSignedClientCertBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RetrieveServiceContentBody struct {
+	Req    *types.RetrieveServiceContent         `xml:"urn:vim25 RetrieveServiceContent,omitempty"`
+	Res    *types.RetrieveServiceContentResponse `xml:"urn:vim25 RetrieveServiceContentResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveServiceContentBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveServiceContent(ctx context.Context, r soap.RoundTripper, req *types.RetrieveServiceContent) (*types.RetrieveServiceContentResponse, error) {
+	var reqBody, resBody RetrieveServiceContentBody
+
+	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"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveUserGroupsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveUserGroups(ctx context.Context, r soap.RoundTripper, req *types.RetrieveUserGroups) (*types.RetrieveUserGroupsResponse, error) {
+	var reqBody, resBody RetrieveUserGroupsBody
+
+	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"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveVStorageObjectBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveVStorageObject(ctx context.Context, r soap.RoundTripper, req *types.RetrieveVStorageObject) (*types.RetrieveVStorageObjectResponse, error) {
+	var reqBody, resBody RetrieveVStorageObjectBody
+
+	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"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveVStorageObjectStateBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveVStorageObjectState(ctx context.Context, r soap.RoundTripper, req *types.RetrieveVStorageObjectState) (*types.RetrieveVStorageObjectStateResponse, error) {
+	var reqBody, resBody RetrieveVStorageObjectStateBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RevertToCurrentSnapshot_TaskBody struct {
+	Req    *types.RevertToCurrentSnapshot_Task         `xml:"urn:vim25 RevertToCurrentSnapshot_Task,omitempty"`
+	Res    *types.RevertToCurrentSnapshot_TaskResponse `xml:"urn:vim25 RevertToCurrentSnapshot_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RevertToCurrentSnapshot_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RevertToCurrentSnapshot_Task(ctx context.Context, r soap.RoundTripper, req *types.RevertToCurrentSnapshot_Task) (*types.RevertToCurrentSnapshot_TaskResponse, error) {
+	var reqBody, resBody RevertToCurrentSnapshot_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RevertToSnapshot_TaskBody struct {
+	Req    *types.RevertToSnapshot_Task         `xml:"urn:vim25 RevertToSnapshot_Task,omitempty"`
+	Res    *types.RevertToSnapshot_TaskResponse `xml:"urn:vim25 RevertToSnapshot_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RevertToSnapshot_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RevertToSnapshot_Task(ctx context.Context, r soap.RoundTripper, req *types.RevertToSnapshot_Task) (*types.RevertToSnapshot_TaskResponse, error) {
+	var reqBody, resBody RevertToSnapshot_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"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RewindCollectorBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RewindCollector(ctx context.Context, r soap.RoundTripper, req *types.RewindCollector) (*types.RewindCollectorResponse, error) {
+	var reqBody, resBody RewindCollectorBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RunScheduledTaskBody struct {
+	Req    *types.RunScheduledTask         `xml:"urn:vim25 RunScheduledTask,omitempty"`
+	Res    *types.RunScheduledTaskResponse `xml:"urn:vim25 RunScheduledTaskResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RunScheduledTaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RunScheduledTask(ctx context.Context, r soap.RoundTripper, req *types.RunScheduledTask) (*types.RunScheduledTaskResponse, error) {
+	var reqBody, resBody RunScheduledTaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type RunVsanPhysicalDiskDiagnosticsBody struct {
+	Req    *types.RunVsanPhysicalDiskDiagnostics         `xml:"urn:vim25 RunVsanPhysicalDiskDiagnostics,omitempty"`
+	Res    *types.RunVsanPhysicalDiskDiagnosticsResponse `xml:"urn:vim25 RunVsanPhysicalDiskDiagnosticsResponse,omitempty"`
+	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RunVsanPhysicalDiskDiagnosticsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RunVsanPhysicalDiskDiagnostics(ctx context.Context, r soap.RoundTripper, req *types.RunVsanPhysicalDiskDiagnostics) (*types.RunVsanPhysicalDiskDiagnosticsResponse, error) {
+	var reqBody, resBody RunVsanPhysicalDiskDiagnosticsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ScanHostPatchV2_TaskBody struct {
+	Req    *types.ScanHostPatchV2_Task         `xml:"urn:vim25 ScanHostPatchV2_Task,omitempty"`
+	Res    *types.ScanHostPatchV2_TaskResponse `xml:"urn:vim25 ScanHostPatchV2_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ScanHostPatchV2_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ScanHostPatchV2_Task(ctx context.Context, r soap.RoundTripper, req *types.ScanHostPatchV2_Task) (*types.ScanHostPatchV2_TaskResponse, error) {
+	var reqBody, resBody ScanHostPatchV2_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ScanHostPatch_TaskBody struct {
+	Req    *types.ScanHostPatch_Task         `xml:"urn:vim25 ScanHostPatch_Task,omitempty"`
+	Res    *types.ScanHostPatch_TaskResponse `xml:"urn:vim25 ScanHostPatch_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ScanHostPatch_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ScanHostPatch_Task(ctx context.Context, r soap.RoundTripper, req *types.ScanHostPatch_Task) (*types.ScanHostPatch_TaskResponse, error) {
+	var reqBody, resBody ScanHostPatch_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ScheduleReconcileDatastoreInventoryBody struct {
+	Req    *types.ScheduleReconcileDatastoreInventory         `xml:"urn:vim25 ScheduleReconcileDatastoreInventory,omitempty"`
+	Res    *types.ScheduleReconcileDatastoreInventoryResponse `xml:"urn:vim25 ScheduleReconcileDatastoreInventoryResponse,omitempty"`
+	Fault_ *soap.Fault                                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ScheduleReconcileDatastoreInventoryBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ScheduleReconcileDatastoreInventory(ctx context.Context, r soap.RoundTripper, req *types.ScheduleReconcileDatastoreInventory) (*types.ScheduleReconcileDatastoreInventoryResponse, error) {
+	var reqBody, resBody ScheduleReconcileDatastoreInventoryBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SearchDatastoreSubFolders_TaskBody struct {
+	Req    *types.SearchDatastoreSubFolders_Task         `xml:"urn:vim25 SearchDatastoreSubFolders_Task,omitempty"`
+	Res    *types.SearchDatastoreSubFolders_TaskResponse `xml:"urn:vim25 SearchDatastoreSubFolders_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SearchDatastoreSubFolders_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SearchDatastoreSubFolders_Task(ctx context.Context, r soap.RoundTripper, req *types.SearchDatastoreSubFolders_Task) (*types.SearchDatastoreSubFolders_TaskResponse, error) {
+	var reqBody, resBody SearchDatastoreSubFolders_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SearchDatastore_TaskBody struct {
+	Req    *types.SearchDatastore_Task         `xml:"urn:vim25 SearchDatastore_Task,omitempty"`
+	Res    *types.SearchDatastore_TaskResponse `xml:"urn:vim25 SearchDatastore_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SearchDatastore_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SearchDatastore_Task(ctx context.Context, r soap.RoundTripper, req *types.SearchDatastore_Task) (*types.SearchDatastore_TaskResponse, error) {
+	var reqBody, resBody SearchDatastore_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SelectActivePartitionBody struct {
+	Req    *types.SelectActivePartition         `xml:"urn:vim25 SelectActivePartition,omitempty"`
+	Res    *types.SelectActivePartitionResponse `xml:"urn:vim25 SelectActivePartitionResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SelectActivePartitionBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SelectActivePartition(ctx context.Context, r soap.RoundTripper, req *types.SelectActivePartition) (*types.SelectActivePartitionResponse, error) {
+	var reqBody, resBody SelectActivePartitionBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SelectVnicBody struct {
+	Req    *types.SelectVnic         `xml:"urn:vim25 SelectVnic,omitempty"`
+	Res    *types.SelectVnicResponse `xml:"urn:vim25 SelectVnicResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SelectVnicBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SelectVnic(ctx context.Context, r soap.RoundTripper, req *types.SelectVnic) (*types.SelectVnicResponse, error) {
+	var reqBody, resBody SelectVnicBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SelectVnicForNicTypeBody struct {
+	Req    *types.SelectVnicForNicType         `xml:"urn:vim25 SelectVnicForNicType,omitempty"`
+	Res    *types.SelectVnicForNicTypeResponse `xml:"urn:vim25 SelectVnicForNicTypeResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SelectVnicForNicTypeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SelectVnicForNicType(ctx context.Context, r soap.RoundTripper, req *types.SelectVnicForNicType) (*types.SelectVnicForNicTypeResponse, error) {
+	var reqBody, resBody SelectVnicForNicTypeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SendNMIBody struct {
+	Req    *types.SendNMI         `xml:"urn:vim25 SendNMI,omitempty"`
+	Res    *types.SendNMIResponse `xml:"urn:vim25 SendNMIResponse,omitempty"`
+	Fault_ *soap.Fault            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SendNMIBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SendNMI(ctx context.Context, r soap.RoundTripper, req *types.SendNMI) (*types.SendNMIResponse, error) {
+	var reqBody, resBody SendNMIBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SendTestNotificationBody struct {
+	Req    *types.SendTestNotification         `xml:"urn:vim25 SendTestNotification,omitempty"`
+	Res    *types.SendTestNotificationResponse `xml:"urn:vim25 SendTestNotificationResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SendTestNotificationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SendTestNotification(ctx context.Context, r soap.RoundTripper, req *types.SendTestNotification) (*types.SendTestNotificationResponse, error) {
+	var reqBody, resBody SendTestNotificationBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SessionIsActiveBody struct {
+	Req    *types.SessionIsActive         `xml:"urn:vim25 SessionIsActive,omitempty"`
+	Res    *types.SessionIsActiveResponse `xml:"urn:vim25 SessionIsActiveResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SessionIsActiveBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SessionIsActive(ctx context.Context, r soap.RoundTripper, req *types.SessionIsActive) (*types.SessionIsActiveResponse, error) {
+	var reqBody, resBody SessionIsActiveBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SetCollectorPageSizeBody struct {
+	Req    *types.SetCollectorPageSize         `xml:"urn:vim25 SetCollectorPageSize,omitempty"`
+	Res    *types.SetCollectorPageSizeResponse `xml:"urn:vim25 SetCollectorPageSizeResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SetCollectorPageSizeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SetCollectorPageSize(ctx context.Context, r soap.RoundTripper, req *types.SetCollectorPageSize) (*types.SetCollectorPageSizeResponse, error) {
+	var reqBody, resBody SetCollectorPageSizeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SetDisplayTopologyBody struct {
+	Req    *types.SetDisplayTopology         `xml:"urn:vim25 SetDisplayTopology,omitempty"`
+	Res    *types.SetDisplayTopologyResponse `xml:"urn:vim25 SetDisplayTopologyResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SetDisplayTopologyBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SetDisplayTopology(ctx context.Context, r soap.RoundTripper, req *types.SetDisplayTopology) (*types.SetDisplayTopologyResponse, error) {
+	var reqBody, resBody SetDisplayTopologyBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SetEntityPermissionsBody struct {
+	Req    *types.SetEntityPermissions         `xml:"urn:vim25 SetEntityPermissions,omitempty"`
+	Res    *types.SetEntityPermissionsResponse `xml:"urn:vim25 SetEntityPermissionsResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SetEntityPermissionsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SetEntityPermissions(ctx context.Context, r soap.RoundTripper, req *types.SetEntityPermissions) (*types.SetEntityPermissionsResponse, error) {
+	var reqBody, resBody SetEntityPermissionsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SetExtensionCertificateBody struct {
+	Req    *types.SetExtensionCertificate         `xml:"urn:vim25 SetExtensionCertificate,omitempty"`
+	Res    *types.SetExtensionCertificateResponse `xml:"urn:vim25 SetExtensionCertificateResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SetExtensionCertificateBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SetExtensionCertificate(ctx context.Context, r soap.RoundTripper, req *types.SetExtensionCertificate) (*types.SetExtensionCertificateResponse, error) {
+	var reqBody, resBody SetExtensionCertificateBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SetFieldBody struct {
+	Req    *types.SetField         `xml:"urn:vim25 SetField,omitempty"`
+	Res    *types.SetFieldResponse `xml:"urn:vim25 SetFieldResponse,omitempty"`
+	Fault_ *soap.Fault             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SetFieldBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SetField(ctx context.Context, r soap.RoundTripper, req *types.SetField) (*types.SetFieldResponse, error) {
+	var reqBody, resBody SetFieldBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SetLicenseEditionBody struct {
+	Req    *types.SetLicenseEdition         `xml:"urn:vim25 SetLicenseEdition,omitempty"`
+	Res    *types.SetLicenseEditionResponse `xml:"urn:vim25 SetLicenseEditionResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SetLicenseEditionBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SetLicenseEdition(ctx context.Context, r soap.RoundTripper, req *types.SetLicenseEdition) (*types.SetLicenseEditionResponse, error) {
+	var reqBody, resBody SetLicenseEditionBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SetLocaleBody struct {
+	Req    *types.SetLocale         `xml:"urn:vim25 SetLocale,omitempty"`
+	Res    *types.SetLocaleResponse `xml:"urn:vim25 SetLocaleResponse,omitempty"`
+	Fault_ *soap.Fault              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SetLocaleBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SetLocale(ctx context.Context, r soap.RoundTripper, req *types.SetLocale) (*types.SetLocaleResponse, error) {
+	var reqBody, resBody SetLocaleBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SetMultipathLunPolicyBody struct {
+	Req    *types.SetMultipathLunPolicy         `xml:"urn:vim25 SetMultipathLunPolicy,omitempty"`
+	Res    *types.SetMultipathLunPolicyResponse `xml:"urn:vim25 SetMultipathLunPolicyResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SetMultipathLunPolicyBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SetMultipathLunPolicy(ctx context.Context, r soap.RoundTripper, req *types.SetMultipathLunPolicy) (*types.SetMultipathLunPolicyResponse, error) {
+	var reqBody, resBody SetMultipathLunPolicyBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SetNFSUserBody struct {
+	Req    *types.SetNFSUser         `xml:"urn:vim25 SetNFSUser,omitempty"`
+	Res    *types.SetNFSUserResponse `xml:"urn:vim25 SetNFSUserResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SetNFSUserBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SetNFSUser(ctx context.Context, r soap.RoundTripper, req *types.SetNFSUser) (*types.SetNFSUserResponse, error) {
+	var reqBody, resBody SetNFSUserBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SetPublicKeyBody struct {
+	Req    *types.SetPublicKey         `xml:"urn:vim25 SetPublicKey,omitempty"`
+	Res    *types.SetPublicKeyResponse `xml:"urn:vim25 SetPublicKeyResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SetPublicKeyBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SetPublicKey(ctx context.Context, r soap.RoundTripper, req *types.SetPublicKey) (*types.SetPublicKeyResponse, error) {
+	var reqBody, resBody SetPublicKeyBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SetRegistryValueInGuestBody struct {
+	Req    *types.SetRegistryValueInGuest         `xml:"urn:vim25 SetRegistryValueInGuest,omitempty"`
+	Res    *types.SetRegistryValueInGuestResponse `xml:"urn:vim25 SetRegistryValueInGuestResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SetRegistryValueInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SetRegistryValueInGuest(ctx context.Context, r soap.RoundTripper, req *types.SetRegistryValueInGuest) (*types.SetRegistryValueInGuestResponse, error) {
+	var reqBody, resBody SetRegistryValueInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SetScreenResolutionBody struct {
+	Req    *types.SetScreenResolution         `xml:"urn:vim25 SetScreenResolution,omitempty"`
+	Res    *types.SetScreenResolutionResponse `xml:"urn:vim25 SetScreenResolutionResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SetScreenResolutionBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SetScreenResolution(ctx context.Context, r soap.RoundTripper, req *types.SetScreenResolution) (*types.SetScreenResolutionResponse, error) {
+	var reqBody, resBody SetScreenResolutionBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SetTaskDescriptionBody struct {
+	Req    *types.SetTaskDescription         `xml:"urn:vim25 SetTaskDescription,omitempty"`
+	Res    *types.SetTaskDescriptionResponse `xml:"urn:vim25 SetTaskDescriptionResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SetTaskDescriptionBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SetTaskDescription(ctx context.Context, r soap.RoundTripper, req *types.SetTaskDescription) (*types.SetTaskDescriptionResponse, error) {
+	var reqBody, resBody SetTaskDescriptionBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SetTaskStateBody struct {
+	Req    *types.SetTaskState         `xml:"urn:vim25 SetTaskState,omitempty"`
+	Res    *types.SetTaskStateResponse `xml:"urn:vim25 SetTaskStateResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SetTaskStateBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SetTaskState(ctx context.Context, r soap.RoundTripper, req *types.SetTaskState) (*types.SetTaskStateResponse, error) {
+	var reqBody, resBody SetTaskStateBody
+
+	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"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SetVirtualDiskUuidBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SetVirtualDiskUuid(ctx context.Context, r soap.RoundTripper, req *types.SetVirtualDiskUuid) (*types.SetVirtualDiskUuidResponse, error) {
+	var reqBody, resBody SetVirtualDiskUuidBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ShrinkVirtualDisk_TaskBody struct {
+	Req    *types.ShrinkVirtualDisk_Task         `xml:"urn:vim25 ShrinkVirtualDisk_Task,omitempty"`
+	Res    *types.ShrinkVirtualDisk_TaskResponse `xml:"urn:vim25 ShrinkVirtualDisk_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ShrinkVirtualDisk_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ShrinkVirtualDisk_Task(ctx context.Context, r soap.RoundTripper, req *types.ShrinkVirtualDisk_Task) (*types.ShrinkVirtualDisk_TaskResponse, error) {
+	var reqBody, resBody ShrinkVirtualDisk_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ShutdownGuestBody struct {
+	Req    *types.ShutdownGuest         `xml:"urn:vim25 ShutdownGuest,omitempty"`
+	Res    *types.ShutdownGuestResponse `xml:"urn:vim25 ShutdownGuestResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ShutdownGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ShutdownGuest(ctx context.Context, r soap.RoundTripper, req *types.ShutdownGuest) (*types.ShutdownGuestResponse, error) {
+	var reqBody, resBody ShutdownGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ShutdownHost_TaskBody struct {
+	Req    *types.ShutdownHost_Task         `xml:"urn:vim25 ShutdownHost_Task,omitempty"`
+	Res    *types.ShutdownHost_TaskResponse `xml:"urn:vim25 ShutdownHost_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ShutdownHost_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ShutdownHost_Task(ctx context.Context, r soap.RoundTripper, req *types.ShutdownHost_Task) (*types.ShutdownHost_TaskResponse, error) {
+	var reqBody, resBody ShutdownHost_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type StageHostPatch_TaskBody struct {
+	Req    *types.StageHostPatch_Task         `xml:"urn:vim25 StageHostPatch_Task,omitempty"`
+	Res    *types.StageHostPatch_TaskResponse `xml:"urn:vim25 StageHostPatch_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *StageHostPatch_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func StageHostPatch_Task(ctx context.Context, r soap.RoundTripper, req *types.StageHostPatch_Task) (*types.StageHostPatch_TaskResponse, error) {
+	var reqBody, resBody StageHostPatch_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type StampAllRulesWithUuid_TaskBody struct {
+	Req    *types.StampAllRulesWithUuid_Task         `xml:"urn:vim25 StampAllRulesWithUuid_Task,omitempty"`
+	Res    *types.StampAllRulesWithUuid_TaskResponse `xml:"urn:vim25 StampAllRulesWithUuid_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *StampAllRulesWithUuid_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func StampAllRulesWithUuid_Task(ctx context.Context, r soap.RoundTripper, req *types.StampAllRulesWithUuid_Task) (*types.StampAllRulesWithUuid_TaskResponse, error) {
+	var reqBody, resBody StampAllRulesWithUuid_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type StandbyGuestBody struct {
+	Req    *types.StandbyGuest         `xml:"urn:vim25 StandbyGuest,omitempty"`
+	Res    *types.StandbyGuestResponse `xml:"urn:vim25 StandbyGuestResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *StandbyGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func StandbyGuest(ctx context.Context, r soap.RoundTripper, req *types.StandbyGuest) (*types.StandbyGuestResponse, error) {
+	var reqBody, resBody StandbyGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type StartProgramInGuestBody struct {
+	Req    *types.StartProgramInGuest         `xml:"urn:vim25 StartProgramInGuest,omitempty"`
+	Res    *types.StartProgramInGuestResponse `xml:"urn:vim25 StartProgramInGuestResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *StartProgramInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func StartProgramInGuest(ctx context.Context, r soap.RoundTripper, req *types.StartProgramInGuest) (*types.StartProgramInGuestResponse, error) {
+	var reqBody, resBody StartProgramInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type StartRecording_TaskBody struct {
+	Req    *types.StartRecording_Task         `xml:"urn:vim25 StartRecording_Task,omitempty"`
+	Res    *types.StartRecording_TaskResponse `xml:"urn:vim25 StartRecording_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *StartRecording_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func StartRecording_Task(ctx context.Context, r soap.RoundTripper, req *types.StartRecording_Task) (*types.StartRecording_TaskResponse, error) {
+	var reqBody, resBody StartRecording_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type StartReplaying_TaskBody struct {
+	Req    *types.StartReplaying_Task         `xml:"urn:vim25 StartReplaying_Task,omitempty"`
+	Res    *types.StartReplaying_TaskResponse `xml:"urn:vim25 StartReplaying_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *StartReplaying_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func StartReplaying_Task(ctx context.Context, r soap.RoundTripper, req *types.StartReplaying_Task) (*types.StartReplaying_TaskResponse, error) {
+	var reqBody, resBody StartReplaying_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type StartServiceBody struct {
+	Req    *types.StartService         `xml:"urn:vim25 StartService,omitempty"`
+	Res    *types.StartServiceResponse `xml:"urn:vim25 StartServiceResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *StartServiceBody) Fault() *soap.Fault { return b.Fault_ }
+
+func StartService(ctx context.Context, r soap.RoundTripper, req *types.StartService) (*types.StartServiceResponse, error) {
+	var reqBody, resBody StartServiceBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type StopRecording_TaskBody struct {
+	Req    *types.StopRecording_Task         `xml:"urn:vim25 StopRecording_Task,omitempty"`
+	Res    *types.StopRecording_TaskResponse `xml:"urn:vim25 StopRecording_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *StopRecording_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func StopRecording_Task(ctx context.Context, r soap.RoundTripper, req *types.StopRecording_Task) (*types.StopRecording_TaskResponse, error) {
+	var reqBody, resBody StopRecording_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type StopReplaying_TaskBody struct {
+	Req    *types.StopReplaying_Task         `xml:"urn:vim25 StopReplaying_Task,omitempty"`
+	Res    *types.StopReplaying_TaskResponse `xml:"urn:vim25 StopReplaying_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *StopReplaying_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func StopReplaying_Task(ctx context.Context, r soap.RoundTripper, req *types.StopReplaying_Task) (*types.StopReplaying_TaskResponse, error) {
+	var reqBody, resBody StopReplaying_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type StopServiceBody struct {
+	Req    *types.StopService         `xml:"urn:vim25 StopService,omitempty"`
+	Res    *types.StopServiceResponse `xml:"urn:vim25 StopServiceResponse,omitempty"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *StopServiceBody) Fault() *soap.Fault { return b.Fault_ }
+
+func StopService(ctx context.Context, r soap.RoundTripper, req *types.StopService) (*types.StopServiceResponse, error) {
+	var reqBody, resBody StopServiceBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SuspendVApp_TaskBody struct {
+	Req    *types.SuspendVApp_Task         `xml:"urn:vim25 SuspendVApp_Task,omitempty"`
+	Res    *types.SuspendVApp_TaskResponse `xml:"urn:vim25 SuspendVApp_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SuspendVApp_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SuspendVApp_Task(ctx context.Context, r soap.RoundTripper, req *types.SuspendVApp_Task) (*types.SuspendVApp_TaskResponse, error) {
+	var reqBody, resBody SuspendVApp_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SuspendVM_TaskBody struct {
+	Req    *types.SuspendVM_Task         `xml:"urn:vim25 SuspendVM_Task,omitempty"`
+	Res    *types.SuspendVM_TaskResponse `xml:"urn:vim25 SuspendVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SuspendVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SuspendVM_Task(ctx context.Context, r soap.RoundTripper, req *types.SuspendVM_Task) (*types.SuspendVM_TaskResponse, error) {
+	var reqBody, resBody SuspendVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type TerminateFaultTolerantVM_TaskBody struct {
+	Req    *types.TerminateFaultTolerantVM_Task         `xml:"urn:vim25 TerminateFaultTolerantVM_Task,omitempty"`
+	Res    *types.TerminateFaultTolerantVM_TaskResponse `xml:"urn:vim25 TerminateFaultTolerantVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *TerminateFaultTolerantVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func TerminateFaultTolerantVM_Task(ctx context.Context, r soap.RoundTripper, req *types.TerminateFaultTolerantVM_Task) (*types.TerminateFaultTolerantVM_TaskResponse, error) {
+	var reqBody, resBody TerminateFaultTolerantVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type TerminateProcessInGuestBody struct {
+	Req    *types.TerminateProcessInGuest         `xml:"urn:vim25 TerminateProcessInGuest,omitempty"`
+	Res    *types.TerminateProcessInGuestResponse `xml:"urn:vim25 TerminateProcessInGuestResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *TerminateProcessInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func TerminateProcessInGuest(ctx context.Context, r soap.RoundTripper, req *types.TerminateProcessInGuest) (*types.TerminateProcessInGuestResponse, error) {
+	var reqBody, resBody TerminateProcessInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type TerminateSessionBody struct {
+	Req    *types.TerminateSession         `xml:"urn:vim25 TerminateSession,omitempty"`
+	Res    *types.TerminateSessionResponse `xml:"urn:vim25 TerminateSessionResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *TerminateSessionBody) Fault() *soap.Fault { return b.Fault_ }
+
+func TerminateSession(ctx context.Context, r soap.RoundTripper, req *types.TerminateSession) (*types.TerminateSessionResponse, error) {
+	var reqBody, resBody TerminateSessionBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type TerminateVMBody struct {
+	Req    *types.TerminateVM         `xml:"urn:vim25 TerminateVM,omitempty"`
+	Res    *types.TerminateVMResponse `xml:"urn:vim25 TerminateVMResponse,omitempty"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *TerminateVMBody) Fault() *soap.Fault { return b.Fault_ }
+
+func TerminateVM(ctx context.Context, r soap.RoundTripper, req *types.TerminateVM) (*types.TerminateVMResponse, error) {
+	var reqBody, resBody TerminateVMBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type TurnDiskLocatorLedOff_TaskBody struct {
+	Req    *types.TurnDiskLocatorLedOff_Task         `xml:"urn:vim25 TurnDiskLocatorLedOff_Task,omitempty"`
+	Res    *types.TurnDiskLocatorLedOff_TaskResponse `xml:"urn:vim25 TurnDiskLocatorLedOff_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *TurnDiskLocatorLedOff_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func TurnDiskLocatorLedOff_Task(ctx context.Context, r soap.RoundTripper, req *types.TurnDiskLocatorLedOff_Task) (*types.TurnDiskLocatorLedOff_TaskResponse, error) {
+	var reqBody, resBody TurnDiskLocatorLedOff_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type TurnDiskLocatorLedOn_TaskBody struct {
+	Req    *types.TurnDiskLocatorLedOn_Task         `xml:"urn:vim25 TurnDiskLocatorLedOn_Task,omitempty"`
+	Res    *types.TurnDiskLocatorLedOn_TaskResponse `xml:"urn:vim25 TurnDiskLocatorLedOn_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *TurnDiskLocatorLedOn_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func TurnDiskLocatorLedOn_Task(ctx context.Context, r soap.RoundTripper, req *types.TurnDiskLocatorLedOn_Task) (*types.TurnDiskLocatorLedOn_TaskResponse, error) {
+	var reqBody, resBody TurnDiskLocatorLedOn_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type TurnOffFaultToleranceForVM_TaskBody struct {
+	Req    *types.TurnOffFaultToleranceForVM_Task         `xml:"urn:vim25 TurnOffFaultToleranceForVM_Task,omitempty"`
+	Res    *types.TurnOffFaultToleranceForVM_TaskResponse `xml:"urn:vim25 TurnOffFaultToleranceForVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *TurnOffFaultToleranceForVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func TurnOffFaultToleranceForVM_Task(ctx context.Context, r soap.RoundTripper, req *types.TurnOffFaultToleranceForVM_Task) (*types.TurnOffFaultToleranceForVM_TaskResponse, error) {
+	var reqBody, resBody TurnOffFaultToleranceForVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UnassignUserFromGroupBody struct {
+	Req    *types.UnassignUserFromGroup         `xml:"urn:vim25 UnassignUserFromGroup,omitempty"`
+	Res    *types.UnassignUserFromGroupResponse `xml:"urn:vim25 UnassignUserFromGroupResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UnassignUserFromGroupBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UnassignUserFromGroup(ctx context.Context, r soap.RoundTripper, req *types.UnassignUserFromGroup) (*types.UnassignUserFromGroupResponse, error) {
+	var reqBody, resBody UnassignUserFromGroupBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UnbindVnicBody struct {
+	Req    *types.UnbindVnic         `xml:"urn:vim25 UnbindVnic,omitempty"`
+	Res    *types.UnbindVnicResponse `xml:"urn:vim25 UnbindVnicResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UnbindVnicBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UnbindVnic(ctx context.Context, r soap.RoundTripper, req *types.UnbindVnic) (*types.UnbindVnicResponse, error) {
+	var reqBody, resBody UnbindVnicBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UninstallHostPatch_TaskBody struct {
+	Req    *types.UninstallHostPatch_Task         `xml:"urn:vim25 UninstallHostPatch_Task,omitempty"`
+	Res    *types.UninstallHostPatch_TaskResponse `xml:"urn:vim25 UninstallHostPatch_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UninstallHostPatch_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UninstallHostPatch_Task(ctx context.Context, r soap.RoundTripper, req *types.UninstallHostPatch_Task) (*types.UninstallHostPatch_TaskResponse, error) {
+	var reqBody, resBody UninstallHostPatch_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UninstallIoFilter_TaskBody struct {
+	Req    *types.UninstallIoFilter_Task         `xml:"urn:vim25 UninstallIoFilter_Task,omitempty"`
+	Res    *types.UninstallIoFilter_TaskResponse `xml:"urn:vim25 UninstallIoFilter_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UninstallIoFilter_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UninstallIoFilter_Task(ctx context.Context, r soap.RoundTripper, req *types.UninstallIoFilter_Task) (*types.UninstallIoFilter_TaskResponse, error) {
+	var reqBody, resBody UninstallIoFilter_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UninstallServiceBody struct {
+	Req    *types.UninstallService         `xml:"urn:vim25 UninstallService,omitempty"`
+	Res    *types.UninstallServiceResponse `xml:"urn:vim25 UninstallServiceResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UninstallServiceBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UninstallService(ctx context.Context, r soap.RoundTripper, req *types.UninstallService) (*types.UninstallServiceResponse, error) {
+	var reqBody, resBody UninstallServiceBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UnmapVmfsVolumeEx_TaskBody struct {
+	Req    *types.UnmapVmfsVolumeEx_Task         `xml:"urn:vim25 UnmapVmfsVolumeEx_Task,omitempty"`
+	Res    *types.UnmapVmfsVolumeEx_TaskResponse `xml:"urn:vim25 UnmapVmfsVolumeEx_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UnmapVmfsVolumeEx_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UnmapVmfsVolumeEx_Task(ctx context.Context, r soap.RoundTripper, req *types.UnmapVmfsVolumeEx_Task) (*types.UnmapVmfsVolumeEx_TaskResponse, error) {
+	var reqBody, resBody UnmapVmfsVolumeEx_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UnmountDiskMapping_TaskBody struct {
+	Req    *types.UnmountDiskMapping_Task         `xml:"urn:vim25 UnmountDiskMapping_Task,omitempty"`
+	Res    *types.UnmountDiskMapping_TaskResponse `xml:"urn:vim25 UnmountDiskMapping_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UnmountDiskMapping_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UnmountDiskMapping_Task(ctx context.Context, r soap.RoundTripper, req *types.UnmountDiskMapping_Task) (*types.UnmountDiskMapping_TaskResponse, error) {
+	var reqBody, resBody UnmountDiskMapping_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UnmountForceMountedVmfsVolumeBody struct {
+	Req    *types.UnmountForceMountedVmfsVolume         `xml:"urn:vim25 UnmountForceMountedVmfsVolume,omitempty"`
+	Res    *types.UnmountForceMountedVmfsVolumeResponse `xml:"urn:vim25 UnmountForceMountedVmfsVolumeResponse,omitempty"`
+	Fault_ *soap.Fault                                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UnmountForceMountedVmfsVolumeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UnmountForceMountedVmfsVolume(ctx context.Context, r soap.RoundTripper, req *types.UnmountForceMountedVmfsVolume) (*types.UnmountForceMountedVmfsVolumeResponse, error) {
+	var reqBody, resBody UnmountForceMountedVmfsVolumeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UnmountToolsInstallerBody struct {
+	Req    *types.UnmountToolsInstaller         `xml:"urn:vim25 UnmountToolsInstaller,omitempty"`
+	Res    *types.UnmountToolsInstallerResponse `xml:"urn:vim25 UnmountToolsInstallerResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UnmountToolsInstallerBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UnmountToolsInstaller(ctx context.Context, r soap.RoundTripper, req *types.UnmountToolsInstaller) (*types.UnmountToolsInstallerResponse, error) {
+	var reqBody, resBody UnmountToolsInstallerBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UnmountVffsVolumeBody struct {
+	Req    *types.UnmountVffsVolume         `xml:"urn:vim25 UnmountVffsVolume,omitempty"`
+	Res    *types.UnmountVffsVolumeResponse `xml:"urn:vim25 UnmountVffsVolumeResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UnmountVffsVolumeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UnmountVffsVolume(ctx context.Context, r soap.RoundTripper, req *types.UnmountVffsVolume) (*types.UnmountVffsVolumeResponse, error) {
+	var reqBody, resBody UnmountVffsVolumeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UnmountVmfsVolumeBody struct {
+	Req    *types.UnmountVmfsVolume         `xml:"urn:vim25 UnmountVmfsVolume,omitempty"`
+	Res    *types.UnmountVmfsVolumeResponse `xml:"urn:vim25 UnmountVmfsVolumeResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UnmountVmfsVolumeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UnmountVmfsVolume(ctx context.Context, r soap.RoundTripper, req *types.UnmountVmfsVolume) (*types.UnmountVmfsVolumeResponse, error) {
+	var reqBody, resBody UnmountVmfsVolumeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UnmountVmfsVolumeEx_TaskBody struct {
+	Req    *types.UnmountVmfsVolumeEx_Task         `xml:"urn:vim25 UnmountVmfsVolumeEx_Task,omitempty"`
+	Res    *types.UnmountVmfsVolumeEx_TaskResponse `xml:"urn:vim25 UnmountVmfsVolumeEx_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UnmountVmfsVolumeEx_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UnmountVmfsVolumeEx_Task(ctx context.Context, r soap.RoundTripper, req *types.UnmountVmfsVolumeEx_Task) (*types.UnmountVmfsVolumeEx_TaskResponse, error) {
+	var reqBody, resBody UnmountVmfsVolumeEx_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UnregisterAndDestroy_TaskBody struct {
+	Req    *types.UnregisterAndDestroy_Task         `xml:"urn:vim25 UnregisterAndDestroy_Task,omitempty"`
+	Res    *types.UnregisterAndDestroy_TaskResponse `xml:"urn:vim25 UnregisterAndDestroy_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UnregisterAndDestroy_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UnregisterAndDestroy_Task(ctx context.Context, r soap.RoundTripper, req *types.UnregisterAndDestroy_Task) (*types.UnregisterAndDestroy_TaskResponse, error) {
+	var reqBody, resBody UnregisterAndDestroy_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UnregisterExtensionBody struct {
+	Req    *types.UnregisterExtension         `xml:"urn:vim25 UnregisterExtension,omitempty"`
+	Res    *types.UnregisterExtensionResponse `xml:"urn:vim25 UnregisterExtensionResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UnregisterExtensionBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UnregisterExtension(ctx context.Context, r soap.RoundTripper, req *types.UnregisterExtension) (*types.UnregisterExtensionResponse, error) {
+	var reqBody, resBody UnregisterExtensionBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UnregisterHealthUpdateProviderBody struct {
+	Req    *types.UnregisterHealthUpdateProvider         `xml:"urn:vim25 UnregisterHealthUpdateProvider,omitempty"`
+	Res    *types.UnregisterHealthUpdateProviderResponse `xml:"urn:vim25 UnregisterHealthUpdateProviderResponse,omitempty"`
+	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UnregisterHealthUpdateProviderBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UnregisterHealthUpdateProvider(ctx context.Context, r soap.RoundTripper, req *types.UnregisterHealthUpdateProvider) (*types.UnregisterHealthUpdateProviderResponse, error) {
+	var reqBody, resBody UnregisterHealthUpdateProviderBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UnregisterVMBody struct {
+	Req    *types.UnregisterVM         `xml:"urn:vim25 UnregisterVM,omitempty"`
+	Res    *types.UnregisterVMResponse `xml:"urn:vim25 UnregisterVMResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UnregisterVMBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UnregisterVM(ctx context.Context, r soap.RoundTripper, req *types.UnregisterVM) (*types.UnregisterVMResponse, error) {
+	var reqBody, resBody UnregisterVMBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateAnswerFile_TaskBody struct {
+	Req    *types.UpdateAnswerFile_Task         `xml:"urn:vim25 UpdateAnswerFile_Task,omitempty"`
+	Res    *types.UpdateAnswerFile_TaskResponse `xml:"urn:vim25 UpdateAnswerFile_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateAnswerFile_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateAnswerFile_Task(ctx context.Context, r soap.RoundTripper, req *types.UpdateAnswerFile_Task) (*types.UpdateAnswerFile_TaskResponse, error) {
+	var reqBody, resBody UpdateAnswerFile_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateAssignedLicenseBody struct {
+	Req    *types.UpdateAssignedLicense         `xml:"urn:vim25 UpdateAssignedLicense,omitempty"`
+	Res    *types.UpdateAssignedLicenseResponse `xml:"urn:vim25 UpdateAssignedLicenseResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateAssignedLicenseBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateAssignedLicense(ctx context.Context, r soap.RoundTripper, req *types.UpdateAssignedLicense) (*types.UpdateAssignedLicenseResponse, error) {
+	var reqBody, resBody UpdateAssignedLicenseBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateAuthorizationRoleBody struct {
+	Req    *types.UpdateAuthorizationRole         `xml:"urn:vim25 UpdateAuthorizationRole,omitempty"`
+	Res    *types.UpdateAuthorizationRoleResponse `xml:"urn:vim25 UpdateAuthorizationRoleResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateAuthorizationRoleBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateAuthorizationRole(ctx context.Context, r soap.RoundTripper, req *types.UpdateAuthorizationRole) (*types.UpdateAuthorizationRoleResponse, error) {
+	var reqBody, resBody UpdateAuthorizationRoleBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateBootDeviceBody struct {
+	Req    *types.UpdateBootDevice         `xml:"urn:vim25 UpdateBootDevice,omitempty"`
+	Res    *types.UpdateBootDeviceResponse `xml:"urn:vim25 UpdateBootDeviceResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateBootDeviceBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateBootDevice(ctx context.Context, r soap.RoundTripper, req *types.UpdateBootDevice) (*types.UpdateBootDeviceResponse, error) {
+	var reqBody, resBody UpdateBootDeviceBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateChildResourceConfigurationBody struct {
+	Req    *types.UpdateChildResourceConfiguration         `xml:"urn:vim25 UpdateChildResourceConfiguration,omitempty"`
+	Res    *types.UpdateChildResourceConfigurationResponse `xml:"urn:vim25 UpdateChildResourceConfigurationResponse,omitempty"`
+	Fault_ *soap.Fault                                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateChildResourceConfigurationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateChildResourceConfiguration(ctx context.Context, r soap.RoundTripper, req *types.UpdateChildResourceConfiguration) (*types.UpdateChildResourceConfigurationResponse, error) {
+	var reqBody, resBody UpdateChildResourceConfigurationBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateClusterProfileBody struct {
+	Req    *types.UpdateClusterProfile         `xml:"urn:vim25 UpdateClusterProfile,omitempty"`
+	Res    *types.UpdateClusterProfileResponse `xml:"urn:vim25 UpdateClusterProfileResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateClusterProfileBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateClusterProfile(ctx context.Context, r soap.RoundTripper, req *types.UpdateClusterProfile) (*types.UpdateClusterProfileResponse, error) {
+	var reqBody, resBody UpdateClusterProfileBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateConfigBody struct {
+	Req    *types.UpdateConfig         `xml:"urn:vim25 UpdateConfig,omitempty"`
+	Res    *types.UpdateConfigResponse `xml:"urn:vim25 UpdateConfigResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateConfigBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateConfig(ctx context.Context, r soap.RoundTripper, req *types.UpdateConfig) (*types.UpdateConfigResponse, error) {
+	var reqBody, resBody UpdateConfigBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateConsoleIpRouteConfigBody struct {
+	Req    *types.UpdateConsoleIpRouteConfig         `xml:"urn:vim25 UpdateConsoleIpRouteConfig,omitempty"`
+	Res    *types.UpdateConsoleIpRouteConfigResponse `xml:"urn:vim25 UpdateConsoleIpRouteConfigResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateConsoleIpRouteConfigBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateConsoleIpRouteConfig(ctx context.Context, r soap.RoundTripper, req *types.UpdateConsoleIpRouteConfig) (*types.UpdateConsoleIpRouteConfigResponse, error) {
+	var reqBody, resBody UpdateConsoleIpRouteConfigBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateCounterLevelMappingBody struct {
+	Req    *types.UpdateCounterLevelMapping         `xml:"urn:vim25 UpdateCounterLevelMapping,omitempty"`
+	Res    *types.UpdateCounterLevelMappingResponse `xml:"urn:vim25 UpdateCounterLevelMappingResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateCounterLevelMappingBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateCounterLevelMapping(ctx context.Context, r soap.RoundTripper, req *types.UpdateCounterLevelMapping) (*types.UpdateCounterLevelMappingResponse, error) {
+	var reqBody, resBody UpdateCounterLevelMappingBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateDVSHealthCheckConfig_TaskBody struct {
+	Req    *types.UpdateDVSHealthCheckConfig_Task         `xml:"urn:vim25 UpdateDVSHealthCheckConfig_Task,omitempty"`
+	Res    *types.UpdateDVSHealthCheckConfig_TaskResponse `xml:"urn:vim25 UpdateDVSHealthCheckConfig_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateDVSHealthCheckConfig_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateDVSHealthCheckConfig_Task(ctx context.Context, r soap.RoundTripper, req *types.UpdateDVSHealthCheckConfig_Task) (*types.UpdateDVSHealthCheckConfig_TaskResponse, error) {
+	var reqBody, resBody UpdateDVSHealthCheckConfig_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateDVSLacpGroupConfig_TaskBody struct {
+	Req    *types.UpdateDVSLacpGroupConfig_Task         `xml:"urn:vim25 UpdateDVSLacpGroupConfig_Task,omitempty"`
+	Res    *types.UpdateDVSLacpGroupConfig_TaskResponse `xml:"urn:vim25 UpdateDVSLacpGroupConfig_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateDVSLacpGroupConfig_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateDVSLacpGroupConfig_Task(ctx context.Context, r soap.RoundTripper, req *types.UpdateDVSLacpGroupConfig_Task) (*types.UpdateDVSLacpGroupConfig_TaskResponse, error) {
+	var reqBody, resBody UpdateDVSLacpGroupConfig_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateDateTimeBody struct {
+	Req    *types.UpdateDateTime         `xml:"urn:vim25 UpdateDateTime,omitempty"`
+	Res    *types.UpdateDateTimeResponse `xml:"urn:vim25 UpdateDateTimeResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateDateTimeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateDateTime(ctx context.Context, r soap.RoundTripper, req *types.UpdateDateTime) (*types.UpdateDateTimeResponse, error) {
+	var reqBody, resBody UpdateDateTimeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateDateTimeConfigBody struct {
+	Req    *types.UpdateDateTimeConfig         `xml:"urn:vim25 UpdateDateTimeConfig,omitempty"`
+	Res    *types.UpdateDateTimeConfigResponse `xml:"urn:vim25 UpdateDateTimeConfigResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateDateTimeConfigBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateDateTimeConfig(ctx context.Context, r soap.RoundTripper, req *types.UpdateDateTimeConfig) (*types.UpdateDateTimeConfigResponse, error) {
+	var reqBody, resBody UpdateDateTimeConfigBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateDefaultPolicyBody struct {
+	Req    *types.UpdateDefaultPolicy         `xml:"urn:vim25 UpdateDefaultPolicy,omitempty"`
+	Res    *types.UpdateDefaultPolicyResponse `xml:"urn:vim25 UpdateDefaultPolicyResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateDefaultPolicyBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateDefaultPolicy(ctx context.Context, r soap.RoundTripper, req *types.UpdateDefaultPolicy) (*types.UpdateDefaultPolicyResponse, error) {
+	var reqBody, resBody UpdateDefaultPolicyBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateDiskPartitionsBody struct {
+	Req    *types.UpdateDiskPartitions         `xml:"urn:vim25 UpdateDiskPartitions,omitempty"`
+	Res    *types.UpdateDiskPartitionsResponse `xml:"urn:vim25 UpdateDiskPartitionsResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateDiskPartitionsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateDiskPartitions(ctx context.Context, r soap.RoundTripper, req *types.UpdateDiskPartitions) (*types.UpdateDiskPartitionsResponse, error) {
+	var reqBody, resBody UpdateDiskPartitionsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateDnsConfigBody struct {
+	Req    *types.UpdateDnsConfig         `xml:"urn:vim25 UpdateDnsConfig,omitempty"`
+	Res    *types.UpdateDnsConfigResponse `xml:"urn:vim25 UpdateDnsConfigResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateDnsConfigBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateDnsConfig(ctx context.Context, r soap.RoundTripper, req *types.UpdateDnsConfig) (*types.UpdateDnsConfigResponse, error) {
+	var reqBody, resBody UpdateDnsConfigBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateDvsCapabilityBody struct {
+	Req    *types.UpdateDvsCapability         `xml:"urn:vim25 UpdateDvsCapability,omitempty"`
+	Res    *types.UpdateDvsCapabilityResponse `xml:"urn:vim25 UpdateDvsCapabilityResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateDvsCapabilityBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateDvsCapability(ctx context.Context, r soap.RoundTripper, req *types.UpdateDvsCapability) (*types.UpdateDvsCapabilityResponse, error) {
+	var reqBody, resBody UpdateDvsCapabilityBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateExtensionBody struct {
+	Req    *types.UpdateExtension         `xml:"urn:vim25 UpdateExtension,omitempty"`
+	Res    *types.UpdateExtensionResponse `xml:"urn:vim25 UpdateExtensionResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateExtensionBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateExtension(ctx context.Context, r soap.RoundTripper, req *types.UpdateExtension) (*types.UpdateExtensionResponse, error) {
+	var reqBody, resBody UpdateExtensionBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateFlagsBody struct {
+	Req    *types.UpdateFlags         `xml:"urn:vim25 UpdateFlags,omitempty"`
+	Res    *types.UpdateFlagsResponse `xml:"urn:vim25 UpdateFlagsResponse,omitempty"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateFlagsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateFlags(ctx context.Context, r soap.RoundTripper, req *types.UpdateFlags) (*types.UpdateFlagsResponse, error) {
+	var reqBody, resBody UpdateFlagsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateGraphicsConfigBody struct {
+	Req    *types.UpdateGraphicsConfig         `xml:"urn:vim25 UpdateGraphicsConfig,omitempty"`
+	Res    *types.UpdateGraphicsConfigResponse `xml:"urn:vim25 UpdateGraphicsConfigResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateGraphicsConfigBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateGraphicsConfig(ctx context.Context, r soap.RoundTripper, req *types.UpdateGraphicsConfig) (*types.UpdateGraphicsConfigResponse, error) {
+	var reqBody, resBody UpdateGraphicsConfigBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateHostCustomizations_TaskBody struct {
+	Req    *types.UpdateHostCustomizations_Task         `xml:"urn:vim25 UpdateHostCustomizations_Task,omitempty"`
+	Res    *types.UpdateHostCustomizations_TaskResponse `xml:"urn:vim25 UpdateHostCustomizations_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateHostCustomizations_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateHostCustomizations_Task(ctx context.Context, r soap.RoundTripper, req *types.UpdateHostCustomizations_Task) (*types.UpdateHostCustomizations_TaskResponse, error) {
+	var reqBody, resBody UpdateHostCustomizations_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateHostImageAcceptanceLevelBody struct {
+	Req    *types.UpdateHostImageAcceptanceLevel         `xml:"urn:vim25 UpdateHostImageAcceptanceLevel,omitempty"`
+	Res    *types.UpdateHostImageAcceptanceLevelResponse `xml:"urn:vim25 UpdateHostImageAcceptanceLevelResponse,omitempty"`
+	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateHostImageAcceptanceLevelBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateHostImageAcceptanceLevel(ctx context.Context, r soap.RoundTripper, req *types.UpdateHostImageAcceptanceLevel) (*types.UpdateHostImageAcceptanceLevelResponse, error) {
+	var reqBody, resBody UpdateHostImageAcceptanceLevelBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateHostProfileBody struct {
+	Req    *types.UpdateHostProfile         `xml:"urn:vim25 UpdateHostProfile,omitempty"`
+	Res    *types.UpdateHostProfileResponse `xml:"urn:vim25 UpdateHostProfileResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateHostProfileBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateHostProfile(ctx context.Context, r soap.RoundTripper, req *types.UpdateHostProfile) (*types.UpdateHostProfileResponse, error) {
+	var reqBody, resBody UpdateHostProfileBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateHostSpecificationBody struct {
+	Req    *types.UpdateHostSpecification         `xml:"urn:vim25 UpdateHostSpecification,omitempty"`
+	Res    *types.UpdateHostSpecificationResponse `xml:"urn:vim25 UpdateHostSpecificationResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateHostSpecificationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateHostSpecification(ctx context.Context, r soap.RoundTripper, req *types.UpdateHostSpecification) (*types.UpdateHostSpecificationResponse, error) {
+	var reqBody, resBody UpdateHostSpecificationBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateHostSubSpecificationBody struct {
+	Req    *types.UpdateHostSubSpecification         `xml:"urn:vim25 UpdateHostSubSpecification,omitempty"`
+	Res    *types.UpdateHostSubSpecificationResponse `xml:"urn:vim25 UpdateHostSubSpecificationResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateHostSubSpecificationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateHostSubSpecification(ctx context.Context, r soap.RoundTripper, req *types.UpdateHostSubSpecification) (*types.UpdateHostSubSpecificationResponse, error) {
+	var reqBody, resBody UpdateHostSubSpecificationBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateInternetScsiAdvancedOptionsBody struct {
+	Req    *types.UpdateInternetScsiAdvancedOptions         `xml:"urn:vim25 UpdateInternetScsiAdvancedOptions,omitempty"`
+	Res    *types.UpdateInternetScsiAdvancedOptionsResponse `xml:"urn:vim25 UpdateInternetScsiAdvancedOptionsResponse,omitempty"`
+	Fault_ *soap.Fault                                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateInternetScsiAdvancedOptionsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateInternetScsiAdvancedOptions(ctx context.Context, r soap.RoundTripper, req *types.UpdateInternetScsiAdvancedOptions) (*types.UpdateInternetScsiAdvancedOptionsResponse, error) {
+	var reqBody, resBody UpdateInternetScsiAdvancedOptionsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateInternetScsiAliasBody struct {
+	Req    *types.UpdateInternetScsiAlias         `xml:"urn:vim25 UpdateInternetScsiAlias,omitempty"`
+	Res    *types.UpdateInternetScsiAliasResponse `xml:"urn:vim25 UpdateInternetScsiAliasResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateInternetScsiAliasBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateInternetScsiAlias(ctx context.Context, r soap.RoundTripper, req *types.UpdateInternetScsiAlias) (*types.UpdateInternetScsiAliasResponse, error) {
+	var reqBody, resBody UpdateInternetScsiAliasBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateInternetScsiAuthenticationPropertiesBody struct {
+	Req    *types.UpdateInternetScsiAuthenticationProperties         `xml:"urn:vim25 UpdateInternetScsiAuthenticationProperties,omitempty"`
+	Res    *types.UpdateInternetScsiAuthenticationPropertiesResponse `xml:"urn:vim25 UpdateInternetScsiAuthenticationPropertiesResponse,omitempty"`
+	Fault_ *soap.Fault                                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateInternetScsiAuthenticationPropertiesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateInternetScsiAuthenticationProperties(ctx context.Context, r soap.RoundTripper, req *types.UpdateInternetScsiAuthenticationProperties) (*types.UpdateInternetScsiAuthenticationPropertiesResponse, error) {
+	var reqBody, resBody UpdateInternetScsiAuthenticationPropertiesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateInternetScsiDigestPropertiesBody struct {
+	Req    *types.UpdateInternetScsiDigestProperties         `xml:"urn:vim25 UpdateInternetScsiDigestProperties,omitempty"`
+	Res    *types.UpdateInternetScsiDigestPropertiesResponse `xml:"urn:vim25 UpdateInternetScsiDigestPropertiesResponse,omitempty"`
+	Fault_ *soap.Fault                                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateInternetScsiDigestPropertiesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateInternetScsiDigestProperties(ctx context.Context, r soap.RoundTripper, req *types.UpdateInternetScsiDigestProperties) (*types.UpdateInternetScsiDigestPropertiesResponse, error) {
+	var reqBody, resBody UpdateInternetScsiDigestPropertiesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateInternetScsiDiscoveryPropertiesBody struct {
+	Req    *types.UpdateInternetScsiDiscoveryProperties         `xml:"urn:vim25 UpdateInternetScsiDiscoveryProperties,omitempty"`
+	Res    *types.UpdateInternetScsiDiscoveryPropertiesResponse `xml:"urn:vim25 UpdateInternetScsiDiscoveryPropertiesResponse,omitempty"`
+	Fault_ *soap.Fault                                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateInternetScsiDiscoveryPropertiesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateInternetScsiDiscoveryProperties(ctx context.Context, r soap.RoundTripper, req *types.UpdateInternetScsiDiscoveryProperties) (*types.UpdateInternetScsiDiscoveryPropertiesResponse, error) {
+	var reqBody, resBody UpdateInternetScsiDiscoveryPropertiesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateInternetScsiIPPropertiesBody struct {
+	Req    *types.UpdateInternetScsiIPProperties         `xml:"urn:vim25 UpdateInternetScsiIPProperties,omitempty"`
+	Res    *types.UpdateInternetScsiIPPropertiesResponse `xml:"urn:vim25 UpdateInternetScsiIPPropertiesResponse,omitempty"`
+	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateInternetScsiIPPropertiesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateInternetScsiIPProperties(ctx context.Context, r soap.RoundTripper, req *types.UpdateInternetScsiIPProperties) (*types.UpdateInternetScsiIPPropertiesResponse, error) {
+	var reqBody, resBody UpdateInternetScsiIPPropertiesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateInternetScsiNameBody struct {
+	Req    *types.UpdateInternetScsiName         `xml:"urn:vim25 UpdateInternetScsiName,omitempty"`
+	Res    *types.UpdateInternetScsiNameResponse `xml:"urn:vim25 UpdateInternetScsiNameResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateInternetScsiNameBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateInternetScsiName(ctx context.Context, r soap.RoundTripper, req *types.UpdateInternetScsiName) (*types.UpdateInternetScsiNameResponse, error) {
+	var reqBody, resBody UpdateInternetScsiNameBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateIpConfigBody struct {
+	Req    *types.UpdateIpConfig         `xml:"urn:vim25 UpdateIpConfig,omitempty"`
+	Res    *types.UpdateIpConfigResponse `xml:"urn:vim25 UpdateIpConfigResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateIpConfigBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateIpConfig(ctx context.Context, r soap.RoundTripper, req *types.UpdateIpConfig) (*types.UpdateIpConfigResponse, error) {
+	var reqBody, resBody UpdateIpConfigBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateIpPoolBody struct {
+	Req    *types.UpdateIpPool         `xml:"urn:vim25 UpdateIpPool,omitempty"`
+	Res    *types.UpdateIpPoolResponse `xml:"urn:vim25 UpdateIpPoolResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateIpPoolBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateIpPool(ctx context.Context, r soap.RoundTripper, req *types.UpdateIpPool) (*types.UpdateIpPoolResponse, error) {
+	var reqBody, resBody UpdateIpPoolBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateIpRouteConfigBody struct {
+	Req    *types.UpdateIpRouteConfig         `xml:"urn:vim25 UpdateIpRouteConfig,omitempty"`
+	Res    *types.UpdateIpRouteConfigResponse `xml:"urn:vim25 UpdateIpRouteConfigResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateIpRouteConfigBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateIpRouteConfig(ctx context.Context, r soap.RoundTripper, req *types.UpdateIpRouteConfig) (*types.UpdateIpRouteConfigResponse, error) {
+	var reqBody, resBody UpdateIpRouteConfigBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateIpRouteTableConfigBody struct {
+	Req    *types.UpdateIpRouteTableConfig         `xml:"urn:vim25 UpdateIpRouteTableConfig,omitempty"`
+	Res    *types.UpdateIpRouteTableConfigResponse `xml:"urn:vim25 UpdateIpRouteTableConfigResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateIpRouteTableConfigBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateIpRouteTableConfig(ctx context.Context, r soap.RoundTripper, req *types.UpdateIpRouteTableConfig) (*types.UpdateIpRouteTableConfigResponse, error) {
+	var reqBody, resBody UpdateIpRouteTableConfigBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateIpmiBody struct {
+	Req    *types.UpdateIpmi         `xml:"urn:vim25 UpdateIpmi,omitempty"`
+	Res    *types.UpdateIpmiResponse `xml:"urn:vim25 UpdateIpmiResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateIpmiBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateIpmi(ctx context.Context, r soap.RoundTripper, req *types.UpdateIpmi) (*types.UpdateIpmiResponse, error) {
+	var reqBody, resBody UpdateIpmiBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateKmipServerBody struct {
+	Req    *types.UpdateKmipServer         `xml:"urn:vim25 UpdateKmipServer,omitempty"`
+	Res    *types.UpdateKmipServerResponse `xml:"urn:vim25 UpdateKmipServerResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateKmipServerBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateKmipServer(ctx context.Context, r soap.RoundTripper, req *types.UpdateKmipServer) (*types.UpdateKmipServerResponse, error) {
+	var reqBody, resBody UpdateKmipServerBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateKmsSignedCsrClientCertBody struct {
+	Req    *types.UpdateKmsSignedCsrClientCert         `xml:"urn:vim25 UpdateKmsSignedCsrClientCert,omitempty"`
+	Res    *types.UpdateKmsSignedCsrClientCertResponse `xml:"urn:vim25 UpdateKmsSignedCsrClientCertResponse,omitempty"`
+	Fault_ *soap.Fault                                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateKmsSignedCsrClientCertBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateKmsSignedCsrClientCert(ctx context.Context, r soap.RoundTripper, req *types.UpdateKmsSignedCsrClientCert) (*types.UpdateKmsSignedCsrClientCertResponse, error) {
+	var reqBody, resBody UpdateKmsSignedCsrClientCertBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateLicenseBody struct {
+	Req    *types.UpdateLicense         `xml:"urn:vim25 UpdateLicense,omitempty"`
+	Res    *types.UpdateLicenseResponse `xml:"urn:vim25 UpdateLicenseResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateLicenseBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateLicense(ctx context.Context, r soap.RoundTripper, req *types.UpdateLicense) (*types.UpdateLicenseResponse, error) {
+	var reqBody, resBody UpdateLicenseBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateLicenseLabelBody struct {
+	Req    *types.UpdateLicenseLabel         `xml:"urn:vim25 UpdateLicenseLabel,omitempty"`
+	Res    *types.UpdateLicenseLabelResponse `xml:"urn:vim25 UpdateLicenseLabelResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateLicenseLabelBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateLicenseLabel(ctx context.Context, r soap.RoundTripper, req *types.UpdateLicenseLabel) (*types.UpdateLicenseLabelResponse, error) {
+	var reqBody, resBody UpdateLicenseLabelBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateLinkedChildrenBody struct {
+	Req    *types.UpdateLinkedChildren         `xml:"urn:vim25 UpdateLinkedChildren,omitempty"`
+	Res    *types.UpdateLinkedChildrenResponse `xml:"urn:vim25 UpdateLinkedChildrenResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateLinkedChildrenBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateLinkedChildren(ctx context.Context, r soap.RoundTripper, req *types.UpdateLinkedChildren) (*types.UpdateLinkedChildrenResponse, error) {
+	var reqBody, resBody UpdateLinkedChildrenBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateLocalSwapDatastoreBody struct {
+	Req    *types.UpdateLocalSwapDatastore         `xml:"urn:vim25 UpdateLocalSwapDatastore,omitempty"`
+	Res    *types.UpdateLocalSwapDatastoreResponse `xml:"urn:vim25 UpdateLocalSwapDatastoreResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateLocalSwapDatastoreBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateLocalSwapDatastore(ctx context.Context, r soap.RoundTripper, req *types.UpdateLocalSwapDatastore) (*types.UpdateLocalSwapDatastoreResponse, error) {
+	var reqBody, resBody UpdateLocalSwapDatastoreBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateLockdownExceptionsBody struct {
+	Req    *types.UpdateLockdownExceptions         `xml:"urn:vim25 UpdateLockdownExceptions,omitempty"`
+	Res    *types.UpdateLockdownExceptionsResponse `xml:"urn:vim25 UpdateLockdownExceptionsResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateLockdownExceptionsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateLockdownExceptions(ctx context.Context, r soap.RoundTripper, req *types.UpdateLockdownExceptions) (*types.UpdateLockdownExceptionsResponse, error) {
+	var reqBody, resBody UpdateLockdownExceptionsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateModuleOptionStringBody struct {
+	Req    *types.UpdateModuleOptionString         `xml:"urn:vim25 UpdateModuleOptionString,omitempty"`
+	Res    *types.UpdateModuleOptionStringResponse `xml:"urn:vim25 UpdateModuleOptionStringResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateModuleOptionStringBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateModuleOptionString(ctx context.Context, r soap.RoundTripper, req *types.UpdateModuleOptionString) (*types.UpdateModuleOptionStringResponse, error) {
+	var reqBody, resBody UpdateModuleOptionStringBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateNetworkConfigBody struct {
+	Req    *types.UpdateNetworkConfig         `xml:"urn:vim25 UpdateNetworkConfig,omitempty"`
+	Res    *types.UpdateNetworkConfigResponse `xml:"urn:vim25 UpdateNetworkConfigResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateNetworkConfigBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateNetworkConfig(ctx context.Context, r soap.RoundTripper, req *types.UpdateNetworkConfig) (*types.UpdateNetworkConfigResponse, error) {
+	var reqBody, resBody UpdateNetworkConfigBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateNetworkResourcePoolBody struct {
+	Req    *types.UpdateNetworkResourcePool         `xml:"urn:vim25 UpdateNetworkResourcePool,omitempty"`
+	Res    *types.UpdateNetworkResourcePoolResponse `xml:"urn:vim25 UpdateNetworkResourcePoolResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateNetworkResourcePoolBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateNetworkResourcePool(ctx context.Context, r soap.RoundTripper, req *types.UpdateNetworkResourcePool) (*types.UpdateNetworkResourcePoolResponse, error) {
+	var reqBody, resBody UpdateNetworkResourcePoolBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateOptionsBody struct {
+	Req    *types.UpdateOptions         `xml:"urn:vim25 UpdateOptions,omitempty"`
+	Res    *types.UpdateOptionsResponse `xml:"urn:vim25 UpdateOptionsResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateOptionsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateOptions(ctx context.Context, r soap.RoundTripper, req *types.UpdateOptions) (*types.UpdateOptionsResponse, error) {
+	var reqBody, resBody UpdateOptionsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdatePassthruConfigBody struct {
+	Req    *types.UpdatePassthruConfig         `xml:"urn:vim25 UpdatePassthruConfig,omitempty"`
+	Res    *types.UpdatePassthruConfigResponse `xml:"urn:vim25 UpdatePassthruConfigResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdatePassthruConfigBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdatePassthruConfig(ctx context.Context, r soap.RoundTripper, req *types.UpdatePassthruConfig) (*types.UpdatePassthruConfigResponse, error) {
+	var reqBody, resBody UpdatePassthruConfigBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdatePerfIntervalBody struct {
+	Req    *types.UpdatePerfInterval         `xml:"urn:vim25 UpdatePerfInterval,omitempty"`
+	Res    *types.UpdatePerfIntervalResponse `xml:"urn:vim25 UpdatePerfIntervalResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdatePerfIntervalBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdatePerfInterval(ctx context.Context, r soap.RoundTripper, req *types.UpdatePerfInterval) (*types.UpdatePerfIntervalResponse, error) {
+	var reqBody, resBody UpdatePerfIntervalBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdatePhysicalNicLinkSpeedBody struct {
+	Req    *types.UpdatePhysicalNicLinkSpeed         `xml:"urn:vim25 UpdatePhysicalNicLinkSpeed,omitempty"`
+	Res    *types.UpdatePhysicalNicLinkSpeedResponse `xml:"urn:vim25 UpdatePhysicalNicLinkSpeedResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdatePhysicalNicLinkSpeedBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdatePhysicalNicLinkSpeed(ctx context.Context, r soap.RoundTripper, req *types.UpdatePhysicalNicLinkSpeed) (*types.UpdatePhysicalNicLinkSpeedResponse, error) {
+	var reqBody, resBody UpdatePhysicalNicLinkSpeedBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdatePortGroupBody struct {
+	Req    *types.UpdatePortGroup         `xml:"urn:vim25 UpdatePortGroup,omitempty"`
+	Res    *types.UpdatePortGroupResponse `xml:"urn:vim25 UpdatePortGroupResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdatePortGroupBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdatePortGroup(ctx context.Context, r soap.RoundTripper, req *types.UpdatePortGroup) (*types.UpdatePortGroupResponse, error) {
+	var reqBody, resBody UpdatePortGroupBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateProgressBody struct {
+	Req    *types.UpdateProgress         `xml:"urn:vim25 UpdateProgress,omitempty"`
+	Res    *types.UpdateProgressResponse `xml:"urn:vim25 UpdateProgressResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateProgressBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateProgress(ctx context.Context, r soap.RoundTripper, req *types.UpdateProgress) (*types.UpdateProgressResponse, error) {
+	var reqBody, resBody UpdateProgressBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateReferenceHostBody struct {
+	Req    *types.UpdateReferenceHost         `xml:"urn:vim25 UpdateReferenceHost,omitempty"`
+	Res    *types.UpdateReferenceHostResponse `xml:"urn:vim25 UpdateReferenceHostResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateReferenceHostBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateReferenceHost(ctx context.Context, r soap.RoundTripper, req *types.UpdateReferenceHost) (*types.UpdateReferenceHostResponse, error) {
+	var reqBody, resBody UpdateReferenceHostBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateRulesetBody struct {
+	Req    *types.UpdateRuleset         `xml:"urn:vim25 UpdateRuleset,omitempty"`
+	Res    *types.UpdateRulesetResponse `xml:"urn:vim25 UpdateRulesetResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateRulesetBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateRuleset(ctx context.Context, r soap.RoundTripper, req *types.UpdateRuleset) (*types.UpdateRulesetResponse, error) {
+	var reqBody, resBody UpdateRulesetBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateScsiLunDisplayNameBody struct {
+	Req    *types.UpdateScsiLunDisplayName         `xml:"urn:vim25 UpdateScsiLunDisplayName,omitempty"`
+	Res    *types.UpdateScsiLunDisplayNameResponse `xml:"urn:vim25 UpdateScsiLunDisplayNameResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateScsiLunDisplayNameBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateScsiLunDisplayName(ctx context.Context, r soap.RoundTripper, req *types.UpdateScsiLunDisplayName) (*types.UpdateScsiLunDisplayNameResponse, error) {
+	var reqBody, resBody UpdateScsiLunDisplayNameBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateSelfSignedClientCertBody struct {
+	Req    *types.UpdateSelfSignedClientCert         `xml:"urn:vim25 UpdateSelfSignedClientCert,omitempty"`
+	Res    *types.UpdateSelfSignedClientCertResponse `xml:"urn:vim25 UpdateSelfSignedClientCertResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateSelfSignedClientCertBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateSelfSignedClientCert(ctx context.Context, r soap.RoundTripper, req *types.UpdateSelfSignedClientCert) (*types.UpdateSelfSignedClientCertResponse, error) {
+	var reqBody, resBody UpdateSelfSignedClientCertBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateServiceConsoleVirtualNicBody struct {
+	Req    *types.UpdateServiceConsoleVirtualNic         `xml:"urn:vim25 UpdateServiceConsoleVirtualNic,omitempty"`
+	Res    *types.UpdateServiceConsoleVirtualNicResponse `xml:"urn:vim25 UpdateServiceConsoleVirtualNicResponse,omitempty"`
+	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateServiceConsoleVirtualNicBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateServiceConsoleVirtualNic(ctx context.Context, r soap.RoundTripper, req *types.UpdateServiceConsoleVirtualNic) (*types.UpdateServiceConsoleVirtualNicResponse, error) {
+	var reqBody, resBody UpdateServiceConsoleVirtualNicBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateServiceMessageBody struct {
+	Req    *types.UpdateServiceMessage         `xml:"urn:vim25 UpdateServiceMessage,omitempty"`
+	Res    *types.UpdateServiceMessageResponse `xml:"urn:vim25 UpdateServiceMessageResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateServiceMessageBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateServiceMessage(ctx context.Context, r soap.RoundTripper, req *types.UpdateServiceMessage) (*types.UpdateServiceMessageResponse, error) {
+	var reqBody, resBody UpdateServiceMessageBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateServicePolicyBody struct {
+	Req    *types.UpdateServicePolicy         `xml:"urn:vim25 UpdateServicePolicy,omitempty"`
+	Res    *types.UpdateServicePolicyResponse `xml:"urn:vim25 UpdateServicePolicyResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateServicePolicyBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateServicePolicy(ctx context.Context, r soap.RoundTripper, req *types.UpdateServicePolicy) (*types.UpdateServicePolicyResponse, error) {
+	var reqBody, resBody UpdateServicePolicyBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateSoftwareInternetScsiEnabledBody struct {
+	Req    *types.UpdateSoftwareInternetScsiEnabled         `xml:"urn:vim25 UpdateSoftwareInternetScsiEnabled,omitempty"`
+	Res    *types.UpdateSoftwareInternetScsiEnabledResponse `xml:"urn:vim25 UpdateSoftwareInternetScsiEnabledResponse,omitempty"`
+	Fault_ *soap.Fault                                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateSoftwareInternetScsiEnabledBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateSoftwareInternetScsiEnabled(ctx context.Context, r soap.RoundTripper, req *types.UpdateSoftwareInternetScsiEnabled) (*types.UpdateSoftwareInternetScsiEnabledResponse, error) {
+	var reqBody, resBody UpdateSoftwareInternetScsiEnabledBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateSystemResourcesBody struct {
+	Req    *types.UpdateSystemResources         `xml:"urn:vim25 UpdateSystemResources,omitempty"`
+	Res    *types.UpdateSystemResourcesResponse `xml:"urn:vim25 UpdateSystemResourcesResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateSystemResourcesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateSystemResources(ctx context.Context, r soap.RoundTripper, req *types.UpdateSystemResources) (*types.UpdateSystemResourcesResponse, error) {
+	var reqBody, resBody UpdateSystemResourcesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateSystemSwapConfigurationBody struct {
+	Req    *types.UpdateSystemSwapConfiguration         `xml:"urn:vim25 UpdateSystemSwapConfiguration,omitempty"`
+	Res    *types.UpdateSystemSwapConfigurationResponse `xml:"urn:vim25 UpdateSystemSwapConfigurationResponse,omitempty"`
+	Fault_ *soap.Fault                                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateSystemSwapConfigurationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateSystemSwapConfiguration(ctx context.Context, r soap.RoundTripper, req *types.UpdateSystemSwapConfiguration) (*types.UpdateSystemSwapConfigurationResponse, error) {
+	var reqBody, resBody UpdateSystemSwapConfigurationBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateSystemUsersBody struct {
+	Req    *types.UpdateSystemUsers         `xml:"urn:vim25 UpdateSystemUsers,omitempty"`
+	Res    *types.UpdateSystemUsersResponse `xml:"urn:vim25 UpdateSystemUsersResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateSystemUsersBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateSystemUsers(ctx context.Context, r soap.RoundTripper, req *types.UpdateSystemUsers) (*types.UpdateSystemUsersResponse, error) {
+	var reqBody, resBody UpdateSystemUsersBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateUserBody struct {
+	Req    *types.UpdateUser         `xml:"urn:vim25 UpdateUser,omitempty"`
+	Res    *types.UpdateUserResponse `xml:"urn:vim25 UpdateUserResponse,omitempty"`
+	Fault_ *soap.Fault               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateUserBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateUser(ctx context.Context, r soap.RoundTripper, req *types.UpdateUser) (*types.UpdateUserResponse, error) {
+	var reqBody, resBody UpdateUserBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateVAppConfigBody struct {
+	Req    *types.UpdateVAppConfig         `xml:"urn:vim25 UpdateVAppConfig,omitempty"`
+	Res    *types.UpdateVAppConfigResponse `xml:"urn:vim25 UpdateVAppConfigResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateVAppConfigBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateVAppConfig(ctx context.Context, r soap.RoundTripper, req *types.UpdateVAppConfig) (*types.UpdateVAppConfigResponse, error) {
+	var reqBody, resBody UpdateVAppConfigBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	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"`
+}
+
+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"`
+}
+
+func (b *UpdateVirtualNicBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateVirtualNic(ctx context.Context, r soap.RoundTripper, req *types.UpdateVirtualNic) (*types.UpdateVirtualNicResponse, error) {
+	var reqBody, resBody UpdateVirtualNicBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateVirtualSwitchBody struct {
+	Req    *types.UpdateVirtualSwitch         `xml:"urn:vim25 UpdateVirtualSwitch,omitempty"`
+	Res    *types.UpdateVirtualSwitchResponse `xml:"urn:vim25 UpdateVirtualSwitchResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateVirtualSwitchBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateVirtualSwitch(ctx context.Context, r soap.RoundTripper, req *types.UpdateVirtualSwitch) (*types.UpdateVirtualSwitchResponse, error) {
+	var reqBody, resBody UpdateVirtualSwitchBody
+
+	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"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateVmfsUnmapPriorityBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateVmfsUnmapPriority(ctx context.Context, r soap.RoundTripper, req *types.UpdateVmfsUnmapPriority) (*types.UpdateVmfsUnmapPriorityResponse, error) {
+	var reqBody, resBody UpdateVmfsUnmapPriorityBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateVsan_TaskBody struct {
+	Req    *types.UpdateVsan_Task         `xml:"urn:vim25 UpdateVsan_Task,omitempty"`
+	Res    *types.UpdateVsan_TaskResponse `xml:"urn:vim25 UpdateVsan_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateVsan_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateVsan_Task(ctx context.Context, r soap.RoundTripper, req *types.UpdateVsan_Task) (*types.UpdateVsan_TaskResponse, error) {
+	var reqBody, resBody UpdateVsan_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpgradeIoFilter_TaskBody struct {
+	Req    *types.UpgradeIoFilter_Task         `xml:"urn:vim25 UpgradeIoFilter_Task,omitempty"`
+	Res    *types.UpgradeIoFilter_TaskResponse `xml:"urn:vim25 UpgradeIoFilter_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpgradeIoFilter_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpgradeIoFilter_Task(ctx context.Context, r soap.RoundTripper, req *types.UpgradeIoFilter_Task) (*types.UpgradeIoFilter_TaskResponse, error) {
+	var reqBody, resBody UpgradeIoFilter_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpgradeTools_TaskBody struct {
+	Req    *types.UpgradeTools_Task         `xml:"urn:vim25 UpgradeTools_Task,omitempty"`
+	Res    *types.UpgradeTools_TaskResponse `xml:"urn:vim25 UpgradeTools_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpgradeTools_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpgradeTools_Task(ctx context.Context, r soap.RoundTripper, req *types.UpgradeTools_Task) (*types.UpgradeTools_TaskResponse, error) {
+	var reqBody, resBody UpgradeTools_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpgradeVM_TaskBody struct {
+	Req    *types.UpgradeVM_Task         `xml:"urn:vim25 UpgradeVM_Task,omitempty"`
+	Res    *types.UpgradeVM_TaskResponse `xml:"urn:vim25 UpgradeVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpgradeVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpgradeVM_Task(ctx context.Context, r soap.RoundTripper, req *types.UpgradeVM_Task) (*types.UpgradeVM_TaskResponse, error) {
+	var reqBody, resBody UpgradeVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpgradeVmLayoutBody struct {
+	Req    *types.UpgradeVmLayout         `xml:"urn:vim25 UpgradeVmLayout,omitempty"`
+	Res    *types.UpgradeVmLayoutResponse `xml:"urn:vim25 UpgradeVmLayoutResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpgradeVmLayoutBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpgradeVmLayout(ctx context.Context, r soap.RoundTripper, req *types.UpgradeVmLayout) (*types.UpgradeVmLayoutResponse, error) {
+	var reqBody, resBody UpgradeVmLayoutBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpgradeVmfsBody struct {
+	Req    *types.UpgradeVmfs         `xml:"urn:vim25 UpgradeVmfs,omitempty"`
+	Res    *types.UpgradeVmfsResponse `xml:"urn:vim25 UpgradeVmfsResponse,omitempty"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpgradeVmfsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpgradeVmfs(ctx context.Context, r soap.RoundTripper, req *types.UpgradeVmfs) (*types.UpgradeVmfsResponse, error) {
+	var reqBody, resBody UpgradeVmfsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpgradeVsanObjectsBody struct {
+	Req    *types.UpgradeVsanObjects         `xml:"urn:vim25 UpgradeVsanObjects,omitempty"`
+	Res    *types.UpgradeVsanObjectsResponse `xml:"urn:vim25 UpgradeVsanObjectsResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpgradeVsanObjectsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpgradeVsanObjects(ctx context.Context, r soap.RoundTripper, req *types.UpgradeVsanObjects) (*types.UpgradeVsanObjectsResponse, error) {
+	var reqBody, resBody UpgradeVsanObjectsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UploadClientCertBody struct {
+	Req    *types.UploadClientCert         `xml:"urn:vim25 UploadClientCert,omitempty"`
+	Res    *types.UploadClientCertResponse `xml:"urn:vim25 UploadClientCertResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UploadClientCertBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UploadClientCert(ctx context.Context, r soap.RoundTripper, req *types.UploadClientCert) (*types.UploadClientCertResponse, error) {
+	var reqBody, resBody UploadClientCertBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UploadKmipServerCertBody struct {
+	Req    *types.UploadKmipServerCert         `xml:"urn:vim25 UploadKmipServerCert,omitempty"`
+	Res    *types.UploadKmipServerCertResponse `xml:"urn:vim25 UploadKmipServerCertResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UploadKmipServerCertBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UploadKmipServerCert(ctx context.Context, r soap.RoundTripper, req *types.UploadKmipServerCert) (*types.UploadKmipServerCertResponse, error) {
+	var reqBody, resBody UploadKmipServerCertBody
+
+	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"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ValidateCredentialsInGuestBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ValidateCredentialsInGuest(ctx context.Context, r soap.RoundTripper, req *types.ValidateCredentialsInGuest) (*types.ValidateCredentialsInGuestResponse, error) {
+	var reqBody, resBody ValidateCredentialsInGuestBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ValidateHostBody struct {
+	Req    *types.ValidateHost         `xml:"urn:vim25 ValidateHost,omitempty"`
+	Res    *types.ValidateHostResponse `xml:"urn:vim25 ValidateHostResponse,omitempty"`
+	Fault_ *soap.Fault                 `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ValidateHostBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ValidateHost(ctx context.Context, r soap.RoundTripper, req *types.ValidateHost) (*types.ValidateHostResponse, error) {
+	var reqBody, resBody ValidateHostBody
+
+	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"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ValidateMigrationBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ValidateMigration(ctx context.Context, r soap.RoundTripper, req *types.ValidateMigration) (*types.ValidateMigrationResponse, error) {
+	var reqBody, resBody ValidateMigrationBody
+
+	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"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *WaitForUpdatesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func WaitForUpdates(ctx context.Context, r soap.RoundTripper, req *types.WaitForUpdates) (*types.WaitForUpdatesResponse, error) {
+	var reqBody, resBody WaitForUpdatesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type WaitForUpdatesExBody struct {
+	Req    *types.WaitForUpdatesEx         `xml:"urn:vim25 WaitForUpdatesEx,omitempty"`
+	Res    *types.WaitForUpdatesExResponse `xml:"urn:vim25 WaitForUpdatesExResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *WaitForUpdatesExBody) Fault() *soap.Fault { return b.Fault_ }
+
+func WaitForUpdatesEx(ctx context.Context, r soap.RoundTripper, req *types.WaitForUpdatesEx) (*types.WaitForUpdatesExResponse, error) {
+	var reqBody, resBody WaitForUpdatesExBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type XmlToCustomizationSpecItemBody struct {
+	Req    *types.XmlToCustomizationSpecItem         `xml:"urn:vim25 XmlToCustomizationSpecItem,omitempty"`
+	Res    *types.XmlToCustomizationSpecItemResponse `xml:"urn:vim25 XmlToCustomizationSpecItemResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *XmlToCustomizationSpecItemBody) Fault() *soap.Fault { return b.Fault_ }
+
+func XmlToCustomizationSpecItem(ctx context.Context, r soap.RoundTripper, req *types.XmlToCustomizationSpecItem) (*types.XmlToCustomizationSpecItemResponse, error) {
+	var reqBody, resBody XmlToCustomizationSpecItemBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ZeroFillVirtualDisk_TaskBody struct {
+	Req    *types.ZeroFillVirtualDisk_Task         `xml:"urn:vim25 ZeroFillVirtualDisk_Task,omitempty"`
+	Res    *types.ZeroFillVirtualDisk_TaskResponse `xml:"urn:vim25 ZeroFillVirtualDisk_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ZeroFillVirtualDisk_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ZeroFillVirtualDisk_Task(ctx context.Context, r soap.RoundTripper, req *types.ZeroFillVirtualDisk_Task) (*types.ZeroFillVirtualDisk_TaskResponse, error) {
+	var reqBody, resBody ZeroFillVirtualDisk_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
new file mode 100644
index 0000000000..634fbfbd98
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/methods/service_content.go
@@ -0,0 +1,56 @@
+/*
+Copyright (c) 2015 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 methods
+
+import (
+	"context"
+	"time"
+
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+var ServiceInstance = types.ManagedObjectReference{
+	Type:  "ServiceInstance",
+	Value: "ServiceInstance",
+}
+
+func GetServiceContent(ctx context.Context, r soap.RoundTripper) (types.ServiceContent, error) {
+	req := types.RetrieveServiceContent{
+		This: ServiceInstance,
+	}
+
+	res, err := RetrieveServiceContent(ctx, r, &req)
+	if err != nil {
+		return types.ServiceContent{}, err
+	}
+
+	return res.Returnval, nil
+}
+
+func GetCurrentTime(ctx context.Context, r soap.RoundTripper) (*time.Time, error) {
+	req := types.CurrentTime{
+		This: ServiceInstance,
+	}
+
+	res, err := CurrentTime(ctx, r, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return &res.Returnval, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/mo/ancestors.go b/vendor/github.com/vmware/govmomi/vim25/mo/ancestors.go
new file mode 100644
index 0000000000..86a3a69f7c
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/mo/ancestors.go
@@ -0,0 +1,135 @@
+/*
+Copyright (c) 2015 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 mo
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+// Ancestors returns the entire ancestry tree of a specified managed object.
+// The return value includes the root node and the specified object itself.
+func Ancestors(ctx context.Context, rt soap.RoundTripper, pc, obj types.ManagedObjectReference) ([]ManagedEntity, error) {
+	ospec := types.ObjectSpec{
+		Obj: obj,
+		SelectSet: []types.BaseSelectionSpec{
+			&types.TraversalSpec{
+				SelectionSpec: types.SelectionSpec{Name: "traverseParent"},
+				Type:          "ManagedEntity",
+				Path:          "parent",
+				Skip:          types.NewBool(false),
+				SelectSet: []types.BaseSelectionSpec{
+					&types.SelectionSpec{Name: "traverseParent"},
+				},
+			},
+			&types.TraversalSpec{
+				SelectionSpec: types.SelectionSpec{},
+				Type:          "VirtualMachine",
+				Path:          "parentVApp",
+				Skip:          types.NewBool(false),
+				SelectSet: []types.BaseSelectionSpec{
+					&types.SelectionSpec{Name: "traverseParent"},
+				},
+			},
+		},
+		Skip: types.NewBool(false),
+	}
+
+	pspec := []types.PropertySpec{
+		{
+			Type:    "ManagedEntity",
+			PathSet: []string{"name", "parent"},
+		},
+		{
+			Type:    "VirtualMachine",
+			PathSet: []string{"parentVApp"},
+		},
+	}
+
+	req := types.RetrieveProperties{
+		This: pc,
+		SpecSet: []types.PropertyFilterSpec{
+			{
+				ObjectSet: []types.ObjectSpec{ospec},
+				PropSet:   pspec,
+			},
+		},
+	}
+
+	var ifaces []interface{}
+	err := RetrievePropertiesForRequest(ctx, rt, req, &ifaces)
+	if err != nil {
+		return nil, err
+	}
+
+	var out []ManagedEntity
+
+	// Build ancestry tree by iteratively finding a new child.
+	for len(out) < len(ifaces) {
+		var find types.ManagedObjectReference
+
+		if len(out) > 0 {
+			find = out[len(out)-1].Self
+		}
+
+		// Find entity we're looking for given the last entity in the current tree.
+		for _, iface := range ifaces {
+			me := iface.(IsManagedEntity).GetManagedEntity()
+
+			if me.Name == "" {
+				// The types below have their own 'Name' field, so ManagedEntity.Name (me.Name) is empty.
+				// We only hit this case when the 'obj' param is one of these types.
+				// In most cases, 'obj' is a Folder so Name isn't collected in this call.
+				switch x := iface.(type) {
+				case Network:
+					me.Name = x.Name
+				case DistributedVirtualSwitch:
+					me.Name = x.Name
+				case DistributedVirtualPortgroup:
+					me.Name = x.Name
+				default:
+					// ManagedEntity always has a Name, if we hit this point we missed a case above.
+					panic(fmt.Sprintf("%#v Name is empty", me.Reference()))
+				}
+			}
+
+			if me.Parent == nil {
+				// Special case for VirtualMachine within VirtualApp,
+				// unlikely to hit this other than via Finder.Element()
+				switch x := iface.(type) {
+				case VirtualMachine:
+					me.Parent = x.ParentVApp
+				}
+			}
+
+			if me.Parent == nil {
+				out = append(out, me)
+				break
+			}
+
+			if *me.Parent == find {
+				out = append(out, me)
+				break
+			}
+		}
+	}
+
+	return out, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/mo/entity.go b/vendor/github.com/vmware/govmomi/vim25/mo/entity.go
new file mode 100644
index 0000000000..193e6f71ea
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/mo/entity.go
@@ -0,0 +1,24 @@
+/*
+Copyright (c) 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 mo
+
+// Entity is the interface that is implemented by all managed objects
+// that extend ManagedEntity.
+type Entity interface {
+	Reference
+	Entity() *ManagedEntity
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/mo/extra.go b/vendor/github.com/vmware/govmomi/vim25/mo/extra.go
new file mode 100644
index 0000000000..254ef35949
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/mo/extra.go
@@ -0,0 +1,61 @@
+/*
+Copyright (c) 2014 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 mo
+
+type IsManagedEntity interface {
+	GetManagedEntity() ManagedEntity
+}
+
+func (m ComputeResource) GetManagedEntity() ManagedEntity {
+	return m.ManagedEntity
+}
+
+func (m Datacenter) GetManagedEntity() ManagedEntity {
+	return m.ManagedEntity
+}
+
+func (m Datastore) GetManagedEntity() ManagedEntity {
+	return m.ManagedEntity
+}
+
+func (m DistributedVirtualSwitch) GetManagedEntity() ManagedEntity {
+	return m.ManagedEntity
+}
+
+func (m DistributedVirtualPortgroup) GetManagedEntity() ManagedEntity {
+	return m.ManagedEntity
+}
+
+func (m Folder) GetManagedEntity() ManagedEntity {
+	return m.ManagedEntity
+}
+
+func (m HostSystem) GetManagedEntity() ManagedEntity {
+	return m.ManagedEntity
+}
+
+func (m Network) GetManagedEntity() ManagedEntity {
+	return m.ManagedEntity
+}
+
+func (m ResourcePool) GetManagedEntity() ManagedEntity {
+	return m.ManagedEntity
+}
+
+func (m VirtualMachine) GetManagedEntity() ManagedEntity {
+	return m.ManagedEntity
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/cluster_host_property.xml b/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/cluster_host_property.xml
new file mode 100644
index 0000000000..be218c0521
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/cluster_host_property.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RetrievePropertiesResponse xmlns="urn:vim25" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <returnval>
+  <obj type="ClusterComputeResource">domain-c7</obj>
+  <propSet>
+   <name>host</name>
+   <val xsi:type="ArrayOfManagedObjectReference">
+    <ManagedObjectReference type="HostSystem" xsi:type="ManagedObjectReference">host-14</ManagedObjectReference>
+    <ManagedObjectReference type="HostSystem" xsi:type="ManagedObjectReference">host-17</ManagedObjectReference>
+    <ManagedObjectReference type="HostSystem" xsi:type="ManagedObjectReference">host-19</ManagedObjectReference>
+    <ManagedObjectReference type="HostSystem" xsi:type="ManagedObjectReference">host-52</ManagedObjectReference>
+   </val>
+  </propSet>
+ </returnval>
+</RetrievePropertiesResponse>
diff --git a/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/hostsystem_list_name_property.xml b/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/hostsystem_list_name_property.xml
new file mode 100644
index 0000000000..05d369d85d
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/hostsystem_list_name_property.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RetrievePropertiesResponse xmlns="urn:vim25" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <returnval>
+  <obj type="HostSystem">host-10</obj>
+  <propSet>
+   <name>name</name>
+   <val xsi:type="xsd:string">host-01.example.com</val>
+  </propSet>
+ </returnval>
+ <returnval>
+  <obj type="HostSystem">host-30</obj>
+  <propSet>
+   <name>name</name>
+   <val xsi:type="xsd:string">host-02.example.com</val>
+  </propSet>
+ </returnval>
+</RetrievePropertiesResponse>
diff --git a/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/nested_property.xml b/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/nested_property.xml
new file mode 100644
index 0000000000..ed44167f45
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/nested_property.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RetrievePropertiesResponse xmlns="urn:vim25" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <returnval>
+    <obj type="VirtualMachine">vm-411</obj>
+    <propSet>
+      <name>config.name</name>
+      <val xsi:type="xsd:string">kubernetes-master</val>
+    </propSet>
+    <propSet>
+      <name>config.uuid</name>
+      <val xsi:type="xsd:string">422ec880-ab06-06b4-23f3-beb7a052a4c9</val>
+    </propSet>
+  </returnval>
+</RetrievePropertiesResponse>
diff --git a/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/not_authenticated_fault.xml b/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/not_authenticated_fault.xml
new file mode 100644
index 0000000000..2a7fcdbdfa
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/not_authenticated_fault.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RetrievePropertiesResponse xmlns="urn:vim25" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <returnval>
+    <obj type="SessionManager">SessionManager</obj>
+    <propSet>
+      <name>defaultLocale</name>
+      <val xsi:type="xsd:string">en</val>
+    </propSet>
+    <propSet>
+      <name>messageLocaleList</name>
+      <val xsi:type="ArrayOfString">
+        <string xsi:type="xsd:string">ja</string>
+        <string xsi:type="xsd:string">zh_CN</string>
+        <string xsi:type="xsd:string">en</string>
+        <string xsi:type="xsd:string">de</string>
+        <string xsi:type="xsd:string">zh_TW</string>
+        <string xsi:type="xsd:string">ko</string>
+        <string xsi:type="xsd:string">fr</string>
+      </val>
+    </propSet>
+    <missingSet>
+      <path>message</path>
+      <fault>
+        <fault xsi:type="NotAuthenticated">
+          <object type="Folder">group-d1</object>
+          <privilegeId>System.View</privilegeId>
+        </fault>
+        <localizedMessage/>
+      </fault>
+    </missingSet>
+    <missingSet>
+      <path>sessionList</path>
+      <fault>
+        <fault xsi:type="NotAuthenticated">
+          <object type="Folder">group-d1</object>
+          <privilegeId>Sessions.TerminateSession</privilegeId>
+        </fault>
+        <localizedMessage/>
+      </fault>
+    </missingSet>
+  </returnval>
+</RetrievePropertiesResponse>
diff --git a/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/pointer_property.xml b/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/pointer_property.xml
new file mode 100644
index 0000000000..54baaf5ffa
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/pointer_property.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RetrievePropertiesResponse xmlns="urn:vim25" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <returnval>
+    <obj type="VirtualMachine">vm-411</obj>
+    <propSet>
+      <name>config.bootOptions</name>
+      <val xsi:type="VirtualMachineBootOptions">
+        <bootDelay>0</bootDelay>
+        <enterBIOSSetup>false</enterBIOSSetup>
+        <bootRetryEnabled>false</bootRetryEnabled>
+        <bootRetryDelay>10000</bootRetryDelay>
+      </val>
+    </propSet>
+  </returnval>
+</RetrievePropertiesResponse>
diff --git a/vendor/github.com/vmware/govmomi/vim25/mo/mo.go b/vendor/github.com/vmware/govmomi/vim25/mo/mo.go
new file mode 100644
index 0000000000..0764eb49fb
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/mo/mo.go
@@ -0,0 +1,1672 @@
+/*
+Copyright (c) 2014-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 mo
+
+import (
+	"reflect"
+	"time"
+
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type Alarm struct {
+	ExtensibleManagedObject
+
+	Info types.AlarmInfo `mo:"info"`
+}
+
+func init() {
+	t["Alarm"] = reflect.TypeOf((*Alarm)(nil)).Elem()
+}
+
+type AlarmManager struct {
+	Self types.ManagedObjectReference
+
+	DefaultExpression []types.BaseAlarmExpression `mo:"defaultExpression"`
+	Description       types.AlarmDescription      `mo:"description"`
+}
+
+func (m AlarmManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["AlarmManager"] = reflect.TypeOf((*AlarmManager)(nil)).Elem()
+}
+
+type AuthorizationManager struct {
+	Self types.ManagedObjectReference
+
+	PrivilegeList []types.AuthorizationPrivilege `mo:"privilegeList"`
+	RoleList      []types.AuthorizationRole      `mo:"roleList"`
+	Description   types.AuthorizationDescription `mo:"description"`
+}
+
+func (m AuthorizationManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["AuthorizationManager"] = reflect.TypeOf((*AuthorizationManager)(nil)).Elem()
+}
+
+type CertificateManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m CertificateManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["CertificateManager"] = reflect.TypeOf((*CertificateManager)(nil)).Elem()
+}
+
+type ClusterComputeResource struct {
+	ComputeResource
+
+	Configuration     types.ClusterConfigInfo          `mo:"configuration"`
+	Recommendation    []types.ClusterRecommendation    `mo:"recommendation"`
+	DrsRecommendation []types.ClusterDrsRecommendation `mo:"drsRecommendation"`
+	MigrationHistory  []types.ClusterDrsMigration      `mo:"migrationHistory"`
+	ActionHistory     []types.ClusterActionHistory     `mo:"actionHistory"`
+	DrsFault          []types.ClusterDrsFaults         `mo:"drsFault"`
+}
+
+func init() {
+	t["ClusterComputeResource"] = reflect.TypeOf((*ClusterComputeResource)(nil)).Elem()
+}
+
+type ClusterEVCManager struct {
+	ExtensibleManagedObject
+
+	ManagedCluster types.ManagedObjectReference    `mo:"managedCluster"`
+	EvcState       types.ClusterEVCManagerEVCState `mo:"evcState"`
+}
+
+func init() {
+	t["ClusterEVCManager"] = reflect.TypeOf((*ClusterEVCManager)(nil)).Elem()
+}
+
+type ClusterProfile struct {
+	Profile
+}
+
+func init() {
+	t["ClusterProfile"] = reflect.TypeOf((*ClusterProfile)(nil)).Elem()
+}
+
+type ClusterProfileManager struct {
+	ProfileManager
+}
+
+func init() {
+	t["ClusterProfileManager"] = reflect.TypeOf((*ClusterProfileManager)(nil)).Elem()
+}
+
+type ComputeResource struct {
+	ManagedEntity
+
+	ResourcePool       *types.ManagedObjectReference       `mo:"resourcePool"`
+	Host               []types.ManagedObjectReference      `mo:"host"`
+	Datastore          []types.ManagedObjectReference      `mo:"datastore"`
+	Network            []types.ManagedObjectReference      `mo:"network"`
+	Summary            types.BaseComputeResourceSummary    `mo:"summary"`
+	EnvironmentBrowser *types.ManagedObjectReference       `mo:"environmentBrowser"`
+	ConfigurationEx    types.BaseComputeResourceConfigInfo `mo:"configurationEx"`
+}
+
+func (m *ComputeResource) Entity() *ManagedEntity {
+	return &m.ManagedEntity
+}
+
+func init() {
+	t["ComputeResource"] = reflect.TypeOf((*ComputeResource)(nil)).Elem()
+}
+
+type ContainerView struct {
+	ManagedObjectView
+
+	Container types.ManagedObjectReference `mo:"container"`
+	Type      []string                     `mo:"type"`
+	Recursive bool                         `mo:"recursive"`
+}
+
+func init() {
+	t["ContainerView"] = reflect.TypeOf((*ContainerView)(nil)).Elem()
+}
+
+type CustomFieldsManager struct {
+	Self types.ManagedObjectReference
+
+	Field []types.CustomFieldDef `mo:"field"`
+}
+
+func (m CustomFieldsManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["CustomFieldsManager"] = reflect.TypeOf((*CustomFieldsManager)(nil)).Elem()
+}
+
+type CustomizationSpecManager struct {
+	Self types.ManagedObjectReference
+
+	Info          []types.CustomizationSpecInfo `mo:"info"`
+	EncryptionKey []byte                        `mo:"encryptionKey"`
+}
+
+func (m CustomizationSpecManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["CustomizationSpecManager"] = reflect.TypeOf((*CustomizationSpecManager)(nil)).Elem()
+}
+
+type Datacenter struct {
+	ManagedEntity
+
+	VmFolder        types.ManagedObjectReference   `mo:"vmFolder"`
+	HostFolder      types.ManagedObjectReference   `mo:"hostFolder"`
+	DatastoreFolder types.ManagedObjectReference   `mo:"datastoreFolder"`
+	NetworkFolder   types.ManagedObjectReference   `mo:"networkFolder"`
+	Datastore       []types.ManagedObjectReference `mo:"datastore"`
+	Network         []types.ManagedObjectReference `mo:"network"`
+	Configuration   types.DatacenterConfigInfo     `mo:"configuration"`
+}
+
+func (m *Datacenter) Entity() *ManagedEntity {
+	return &m.ManagedEntity
+}
+
+func init() {
+	t["Datacenter"] = reflect.TypeOf((*Datacenter)(nil)).Elem()
+}
+
+type Datastore struct {
+	ManagedEntity
+
+	Info              types.BaseDatastoreInfo        `mo:"info"`
+	Summary           types.DatastoreSummary         `mo:"summary"`
+	Host              []types.DatastoreHostMount     `mo:"host"`
+	Vm                []types.ManagedObjectReference `mo:"vm"`
+	Browser           types.ManagedObjectReference   `mo:"browser"`
+	Capability        types.DatastoreCapability      `mo:"capability"`
+	IormConfiguration *types.StorageIORMInfo         `mo:"iormConfiguration"`
+}
+
+func (m *Datastore) Entity() *ManagedEntity {
+	return &m.ManagedEntity
+}
+
+func init() {
+	t["Datastore"] = reflect.TypeOf((*Datastore)(nil)).Elem()
+}
+
+type DatastoreNamespaceManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m DatastoreNamespaceManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["DatastoreNamespaceManager"] = reflect.TypeOf((*DatastoreNamespaceManager)(nil)).Elem()
+}
+
+type DiagnosticManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m DiagnosticManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["DiagnosticManager"] = reflect.TypeOf((*DiagnosticManager)(nil)).Elem()
+}
+
+type DistributedVirtualPortgroup struct {
+	Network
+
+	Key      string                      `mo:"key"`
+	Config   types.DVPortgroupConfigInfo `mo:"config"`
+	PortKeys []string                    `mo:"portKeys"`
+}
+
+func init() {
+	t["DistributedVirtualPortgroup"] = reflect.TypeOf((*DistributedVirtualPortgroup)(nil)).Elem()
+}
+
+type DistributedVirtualSwitch struct {
+	ManagedEntity
+
+	Uuid                string                         `mo:"uuid"`
+	Capability          types.DVSCapability            `mo:"capability"`
+	Summary             types.DVSSummary               `mo:"summary"`
+	Config              types.BaseDVSConfigInfo        `mo:"config"`
+	NetworkResourcePool []types.DVSNetworkResourcePool `mo:"networkResourcePool"`
+	Portgroup           []types.ManagedObjectReference `mo:"portgroup"`
+	Runtime             *types.DVSRuntimeInfo          `mo:"runtime"`
+}
+
+func (m *DistributedVirtualSwitch) Entity() *ManagedEntity {
+	return &m.ManagedEntity
+}
+
+func init() {
+	t["DistributedVirtualSwitch"] = reflect.TypeOf((*DistributedVirtualSwitch)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m DistributedVirtualSwitchManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["DistributedVirtualSwitchManager"] = reflect.TypeOf((*DistributedVirtualSwitchManager)(nil)).Elem()
+}
+
+type EnvironmentBrowser struct {
+	Self types.ManagedObjectReference
+
+	DatastoreBrowser *types.ManagedObjectReference `mo:"datastoreBrowser"`
+}
+
+func (m EnvironmentBrowser) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["EnvironmentBrowser"] = reflect.TypeOf((*EnvironmentBrowser)(nil)).Elem()
+}
+
+type EventHistoryCollector struct {
+	HistoryCollector
+
+	LatestPage []types.BaseEvent `mo:"latestPage"`
+}
+
+func init() {
+	t["EventHistoryCollector"] = reflect.TypeOf((*EventHistoryCollector)(nil)).Elem()
+}
+
+type EventManager struct {
+	Self types.ManagedObjectReference
+
+	Description  types.EventDescription `mo:"description"`
+	LatestEvent  types.BaseEvent        `mo:"latestEvent"`
+	MaxCollector int32                  `mo:"maxCollector"`
+}
+
+func (m EventManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["EventManager"] = reflect.TypeOf((*EventManager)(nil)).Elem()
+}
+
+type ExtensibleManagedObject struct {
+	Self types.ManagedObjectReference
+
+	Value          []types.BaseCustomFieldValue `mo:"value"`
+	AvailableField []types.CustomFieldDef       `mo:"availableField"`
+}
+
+func (m ExtensibleManagedObject) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["ExtensibleManagedObject"] = reflect.TypeOf((*ExtensibleManagedObject)(nil)).Elem()
+}
+
+type ExtensionManager struct {
+	Self types.ManagedObjectReference
+
+	ExtensionList []types.Extension `mo:"extensionList"`
+}
+
+func (m ExtensionManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["ExtensionManager"] = reflect.TypeOf((*ExtensionManager)(nil)).Elem()
+}
+
+type FileManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m FileManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["FileManager"] = reflect.TypeOf((*FileManager)(nil)).Elem()
+}
+
+type Folder struct {
+	ManagedEntity
+
+	ChildType   []string                       `mo:"childType"`
+	ChildEntity []types.ManagedObjectReference `mo:"childEntity"`
+}
+
+func (m *Folder) Entity() *ManagedEntity {
+	return &m.ManagedEntity
+}
+
+func init() {
+	t["Folder"] = reflect.TypeOf((*Folder)(nil)).Elem()
+}
+
+type GuestAliasManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m GuestAliasManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["GuestAliasManager"] = reflect.TypeOf((*GuestAliasManager)(nil)).Elem()
+}
+
+type GuestAuthManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m GuestAuthManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["GuestAuthManager"] = reflect.TypeOf((*GuestAuthManager)(nil)).Elem()
+}
+
+type GuestFileManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m GuestFileManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["GuestFileManager"] = reflect.TypeOf((*GuestFileManager)(nil)).Elem()
+}
+
+type GuestOperationsManager struct {
+	Self types.ManagedObjectReference
+
+	AuthManager                 *types.ManagedObjectReference `mo:"authManager"`
+	FileManager                 *types.ManagedObjectReference `mo:"fileManager"`
+	ProcessManager              *types.ManagedObjectReference `mo:"processManager"`
+	GuestWindowsRegistryManager *types.ManagedObjectReference `mo:"guestWindowsRegistryManager"`
+	AliasManager                *types.ManagedObjectReference `mo:"aliasManager"`
+}
+
+func (m GuestOperationsManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["GuestOperationsManager"] = reflect.TypeOf((*GuestOperationsManager)(nil)).Elem()
+}
+
+type GuestProcessManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m GuestProcessManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["GuestProcessManager"] = reflect.TypeOf((*GuestProcessManager)(nil)).Elem()
+}
+
+type GuestWindowsRegistryManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m GuestWindowsRegistryManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["GuestWindowsRegistryManager"] = reflect.TypeOf((*GuestWindowsRegistryManager)(nil)).Elem()
+}
+
+type HistoryCollector struct {
+	Self types.ManagedObjectReference
+
+	Filter types.AnyType `mo:"filter"`
+}
+
+func (m HistoryCollector) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HistoryCollector"] = reflect.TypeOf((*HistoryCollector)(nil)).Elem()
+}
+
+type HostAccessManager struct {
+	Self types.ManagedObjectReference
+
+	LockdownMode types.HostLockdownMode `mo:"lockdownMode"`
+}
+
+func (m HostAccessManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostAccessManager"] = reflect.TypeOf((*HostAccessManager)(nil)).Elem()
+}
+
+type HostActiveDirectoryAuthentication struct {
+	HostDirectoryStore
+}
+
+func init() {
+	t["HostActiveDirectoryAuthentication"] = reflect.TypeOf((*HostActiveDirectoryAuthentication)(nil)).Elem()
+}
+
+type HostAuthenticationManager struct {
+	Self types.ManagedObjectReference
+
+	Info           types.HostAuthenticationManagerInfo `mo:"info"`
+	SupportedStore []types.ManagedObjectReference      `mo:"supportedStore"`
+}
+
+func (m HostAuthenticationManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostAuthenticationManager"] = reflect.TypeOf((*HostAuthenticationManager)(nil)).Elem()
+}
+
+type HostAuthenticationStore struct {
+	Self types.ManagedObjectReference
+
+	Info types.BaseHostAuthenticationStoreInfo `mo:"info"`
+}
+
+func (m HostAuthenticationStore) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostAuthenticationStore"] = reflect.TypeOf((*HostAuthenticationStore)(nil)).Elem()
+}
+
+type HostAutoStartManager struct {
+	Self types.ManagedObjectReference
+
+	Config types.HostAutoStartManagerConfig `mo:"config"`
+}
+
+func (m HostAutoStartManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostAutoStartManager"] = reflect.TypeOf((*HostAutoStartManager)(nil)).Elem()
+}
+
+type HostBootDeviceSystem struct {
+	Self types.ManagedObjectReference
+}
+
+func (m HostBootDeviceSystem) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostBootDeviceSystem"] = reflect.TypeOf((*HostBootDeviceSystem)(nil)).Elem()
+}
+
+type HostCacheConfigurationManager struct {
+	Self types.ManagedObjectReference
+
+	CacheConfigurationInfo []types.HostCacheConfigurationInfo `mo:"cacheConfigurationInfo"`
+}
+
+func (m HostCacheConfigurationManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostCacheConfigurationManager"] = reflect.TypeOf((*HostCacheConfigurationManager)(nil)).Elem()
+}
+
+type HostCertificateManager struct {
+	Self types.ManagedObjectReference
+
+	CertificateInfo types.HostCertificateManagerCertificateInfo `mo:"certificateInfo"`
+}
+
+func (m HostCertificateManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostCertificateManager"] = reflect.TypeOf((*HostCertificateManager)(nil)).Elem()
+}
+
+type HostCpuSchedulerSystem struct {
+	ExtensibleManagedObject
+
+	HyperthreadInfo *types.HostHyperThreadScheduleInfo `mo:"hyperthreadInfo"`
+}
+
+func init() {
+	t["HostCpuSchedulerSystem"] = reflect.TypeOf((*HostCpuSchedulerSystem)(nil)).Elem()
+}
+
+type HostDatastoreBrowser struct {
+	Self types.ManagedObjectReference
+
+	Datastore     []types.ManagedObjectReference `mo:"datastore"`
+	SupportedType []types.BaseFileQuery          `mo:"supportedType"`
+}
+
+func (m HostDatastoreBrowser) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostDatastoreBrowser"] = reflect.TypeOf((*HostDatastoreBrowser)(nil)).Elem()
+}
+
+type HostDatastoreSystem struct {
+	Self types.ManagedObjectReference
+
+	Datastore    []types.ManagedObjectReference        `mo:"datastore"`
+	Capabilities types.HostDatastoreSystemCapabilities `mo:"capabilities"`
+}
+
+func (m HostDatastoreSystem) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostDatastoreSystem"] = reflect.TypeOf((*HostDatastoreSystem)(nil)).Elem()
+}
+
+type HostDateTimeSystem struct {
+	Self types.ManagedObjectReference
+
+	DateTimeInfo types.HostDateTimeInfo `mo:"dateTimeInfo"`
+}
+
+func (m HostDateTimeSystem) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostDateTimeSystem"] = reflect.TypeOf((*HostDateTimeSystem)(nil)).Elem()
+}
+
+type HostDiagnosticSystem struct {
+	Self types.ManagedObjectReference
+
+	ActivePartition *types.HostDiagnosticPartition `mo:"activePartition"`
+}
+
+func (m HostDiagnosticSystem) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostDiagnosticSystem"] = reflect.TypeOf((*HostDiagnosticSystem)(nil)).Elem()
+}
+
+type HostDirectoryStore struct {
+	HostAuthenticationStore
+}
+
+func init() {
+	t["HostDirectoryStore"] = reflect.TypeOf((*HostDirectoryStore)(nil)).Elem()
+}
+
+type HostEsxAgentHostManager struct {
+	Self types.ManagedObjectReference
+
+	ConfigInfo types.HostEsxAgentHostManagerConfigInfo `mo:"configInfo"`
+}
+
+func (m HostEsxAgentHostManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostEsxAgentHostManager"] = reflect.TypeOf((*HostEsxAgentHostManager)(nil)).Elem()
+}
+
+type HostFirewallSystem struct {
+	ExtensibleManagedObject
+
+	FirewallInfo *types.HostFirewallInfo `mo:"firewallInfo"`
+}
+
+func init() {
+	t["HostFirewallSystem"] = reflect.TypeOf((*HostFirewallSystem)(nil)).Elem()
+}
+
+type HostFirmwareSystem struct {
+	Self types.ManagedObjectReference
+}
+
+func (m HostFirmwareSystem) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostFirmwareSystem"] = reflect.TypeOf((*HostFirmwareSystem)(nil)).Elem()
+}
+
+type HostGraphicsManager struct {
+	ExtensibleManagedObject
+
+	GraphicsInfo           []types.HostGraphicsInfo `mo:"graphicsInfo"`
+	SharedPassthruGpuTypes []string                 `mo:"sharedPassthruGpuTypes"`
+}
+
+func init() {
+	t["HostGraphicsManager"] = reflect.TypeOf((*HostGraphicsManager)(nil)).Elem()
+}
+
+type HostHealthStatusSystem struct {
+	Self types.ManagedObjectReference
+
+	Runtime types.HealthSystemRuntime `mo:"runtime"`
+}
+
+func (m HostHealthStatusSystem) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostHealthStatusSystem"] = reflect.TypeOf((*HostHealthStatusSystem)(nil)).Elem()
+}
+
+type HostImageConfigManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m HostImageConfigManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostImageConfigManager"] = reflect.TypeOf((*HostImageConfigManager)(nil)).Elem()
+}
+
+type HostKernelModuleSystem struct {
+	Self types.ManagedObjectReference
+}
+
+func (m HostKernelModuleSystem) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostKernelModuleSystem"] = reflect.TypeOf((*HostKernelModuleSystem)(nil)).Elem()
+}
+
+type HostLocalAccountManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m HostLocalAccountManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostLocalAccountManager"] = reflect.TypeOf((*HostLocalAccountManager)(nil)).Elem()
+}
+
+type HostLocalAuthentication struct {
+	HostAuthenticationStore
+}
+
+func init() {
+	t["HostLocalAuthentication"] = reflect.TypeOf((*HostLocalAuthentication)(nil)).Elem()
+}
+
+type HostMemorySystem struct {
+	ExtensibleManagedObject
+
+	ConsoleReservationInfo        *types.ServiceConsoleReservationInfo       `mo:"consoleReservationInfo"`
+	VirtualMachineReservationInfo *types.VirtualMachineMemoryReservationInfo `mo:"virtualMachineReservationInfo"`
+}
+
+func init() {
+	t["HostMemorySystem"] = reflect.TypeOf((*HostMemorySystem)(nil)).Elem()
+}
+
+type HostNetworkSystem struct {
+	ExtensibleManagedObject
+
+	Capabilities         *types.HostNetCapabilities        `mo:"capabilities"`
+	NetworkInfo          *types.HostNetworkInfo            `mo:"networkInfo"`
+	OffloadCapabilities  *types.HostNetOffloadCapabilities `mo:"offloadCapabilities"`
+	NetworkConfig        *types.HostNetworkConfig          `mo:"networkConfig"`
+	DnsConfig            types.BaseHostDnsConfig           `mo:"dnsConfig"`
+	IpRouteConfig        types.BaseHostIpRouteConfig       `mo:"ipRouteConfig"`
+	ConsoleIpRouteConfig types.BaseHostIpRouteConfig       `mo:"consoleIpRouteConfig"`
+}
+
+func init() {
+	t["HostNetworkSystem"] = reflect.TypeOf((*HostNetworkSystem)(nil)).Elem()
+}
+
+type HostPatchManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m HostPatchManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostPatchManager"] = reflect.TypeOf((*HostPatchManager)(nil)).Elem()
+}
+
+type HostPciPassthruSystem struct {
+	ExtensibleManagedObject
+
+	PciPassthruInfo []types.BaseHostPciPassthruInfo `mo:"pciPassthruInfo"`
+}
+
+func init() {
+	t["HostPciPassthruSystem"] = reflect.TypeOf((*HostPciPassthruSystem)(nil)).Elem()
+}
+
+type HostPowerSystem struct {
+	Self types.ManagedObjectReference
+
+	Capability types.PowerSystemCapability `mo:"capability"`
+	Info       types.PowerSystemInfo       `mo:"info"`
+}
+
+func (m HostPowerSystem) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostPowerSystem"] = reflect.TypeOf((*HostPowerSystem)(nil)).Elem()
+}
+
+type HostProfile struct {
+	Profile
+
+	ReferenceHost *types.ManagedObjectReference `mo:"referenceHost"`
+}
+
+func init() {
+	t["HostProfile"] = reflect.TypeOf((*HostProfile)(nil)).Elem()
+}
+
+type HostProfileManager struct {
+	ProfileManager
+}
+
+func init() {
+	t["HostProfileManager"] = reflect.TypeOf((*HostProfileManager)(nil)).Elem()
+}
+
+type HostServiceSystem struct {
+	ExtensibleManagedObject
+
+	ServiceInfo types.HostServiceInfo `mo:"serviceInfo"`
+}
+
+func init() {
+	t["HostServiceSystem"] = reflect.TypeOf((*HostServiceSystem)(nil)).Elem()
+}
+
+type HostSnmpSystem struct {
+	Self types.ManagedObjectReference
+
+	Configuration types.HostSnmpConfigSpec        `mo:"configuration"`
+	Limits        types.HostSnmpSystemAgentLimits `mo:"limits"`
+}
+
+func (m HostSnmpSystem) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostSnmpSystem"] = reflect.TypeOf((*HostSnmpSystem)(nil)).Elem()
+}
+
+type HostStorageSystem struct {
+	ExtensibleManagedObject
+
+	StorageDeviceInfo    *types.HostStorageDeviceInfo   `mo:"storageDeviceInfo"`
+	FileSystemVolumeInfo types.HostFileSystemVolumeInfo `mo:"fileSystemVolumeInfo"`
+	SystemFile           []string                       `mo:"systemFile"`
+	MultipathStateInfo   *types.HostMultipathStateInfo  `mo:"multipathStateInfo"`
+}
+
+func init() {
+	t["HostStorageSystem"] = reflect.TypeOf((*HostStorageSystem)(nil)).Elem()
+}
+
+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"`
+}
+
+func (m *HostSystem) Entity() *ManagedEntity {
+	return &m.ManagedEntity
+}
+
+func init() {
+	t["HostSystem"] = reflect.TypeOf((*HostSystem)(nil)).Elem()
+}
+
+type HostVFlashManager struct {
+	Self types.ManagedObjectReference
+
+	VFlashConfigInfo *types.HostVFlashManagerVFlashConfigInfo `mo:"vFlashConfigInfo"`
+}
+
+func (m HostVFlashManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostVFlashManager"] = reflect.TypeOf((*HostVFlashManager)(nil)).Elem()
+}
+
+type HostVMotionSystem struct {
+	ExtensibleManagedObject
+
+	NetConfig *types.HostVMotionNetConfig `mo:"netConfig"`
+	IpConfig  *types.HostIpConfig         `mo:"ipConfig"`
+}
+
+func init() {
+	t["HostVMotionSystem"] = reflect.TypeOf((*HostVMotionSystem)(nil)).Elem()
+}
+
+type HostVirtualNicManager struct {
+	ExtensibleManagedObject
+
+	Info types.HostVirtualNicManagerInfo `mo:"info"`
+}
+
+func init() {
+	t["HostVirtualNicManager"] = reflect.TypeOf((*HostVirtualNicManager)(nil)).Elem()
+}
+
+type HostVsanInternalSystem struct {
+	Self types.ManagedObjectReference
+}
+
+func (m HostVsanInternalSystem) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostVsanInternalSystem"] = reflect.TypeOf((*HostVsanInternalSystem)(nil)).Elem()
+}
+
+type HostVsanSystem struct {
+	Self types.ManagedObjectReference
+
+	Config types.VsanHostConfigInfo `mo:"config"`
+}
+
+func (m HostVsanSystem) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostVsanSystem"] = reflect.TypeOf((*HostVsanSystem)(nil)).Elem()
+}
+
+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"`
+}
+
+func (m HttpNfcLease) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HttpNfcLease"] = reflect.TypeOf((*HttpNfcLease)(nil)).Elem()
+}
+
+type InternalDynamicTypeManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m InternalDynamicTypeManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["InternalDynamicTypeManager"] = reflect.TypeOf((*InternalDynamicTypeManager)(nil)).Elem()
+}
+
+type InventoryView struct {
+	ManagedObjectView
+}
+
+func init() {
+	t["InventoryView"] = reflect.TypeOf((*InventoryView)(nil)).Elem()
+}
+
+type IoFilterManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m IoFilterManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["IoFilterManager"] = reflect.TypeOf((*IoFilterManager)(nil)).Elem()
+}
+
+type IpPoolManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m IpPoolManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["IpPoolManager"] = reflect.TypeOf((*IpPoolManager)(nil)).Elem()
+}
+
+type IscsiManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m IscsiManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["IscsiManager"] = reflect.TypeOf((*IscsiManager)(nil)).Elem()
+}
+
+type LicenseAssignmentManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m LicenseAssignmentManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["LicenseAssignmentManager"] = reflect.TypeOf((*LicenseAssignmentManager)(nil)).Elem()
+}
+
+type LicenseManager struct {
+	Self types.ManagedObjectReference
+
+	Source                   types.BaseLicenseSource            `mo:"source"`
+	SourceAvailable          bool                               `mo:"sourceAvailable"`
+	Diagnostics              *types.LicenseDiagnostics          `mo:"diagnostics"`
+	FeatureInfo              []types.LicenseFeatureInfo         `mo:"featureInfo"`
+	LicensedEdition          string                             `mo:"licensedEdition"`
+	Licenses                 []types.LicenseManagerLicenseInfo  `mo:"licenses"`
+	LicenseAssignmentManager *types.ManagedObjectReference      `mo:"licenseAssignmentManager"`
+	Evaluation               types.LicenseManagerEvaluationInfo `mo:"evaluation"`
+}
+
+func (m LicenseManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["LicenseManager"] = reflect.TypeOf((*LicenseManager)(nil)).Elem()
+}
+
+type ListView struct {
+	ManagedObjectView
+}
+
+func init() {
+	t["ListView"] = reflect.TypeOf((*ListView)(nil)).Elem()
+}
+
+type LocalizationManager struct {
+	Self types.ManagedObjectReference
+
+	Catalog []types.LocalizationManagerMessageCatalog `mo:"catalog"`
+}
+
+func (m LocalizationManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["LocalizationManager"] = reflect.TypeOf((*LocalizationManager)(nil)).Elem()
+}
+
+type ManagedEntity struct {
+	ExtensibleManagedObject
+
+	Parent              *types.ManagedObjectReference  `mo:"parent"`
+	CustomValue         []types.BaseCustomFieldValue   `mo:"customValue"`
+	OverallStatus       types.ManagedEntityStatus      `mo:"overallStatus"`
+	ConfigStatus        types.ManagedEntityStatus      `mo:"configStatus"`
+	ConfigIssue         []types.BaseEvent              `mo:"configIssue"`
+	EffectiveRole       []int32                        `mo:"effectiveRole"`
+	Permission          []types.Permission             `mo:"permission"`
+	Name                string                         `mo:"name"`
+	DisabledMethod      []string                       `mo:"disabledMethod"`
+	RecentTask          []types.ManagedObjectReference `mo:"recentTask"`
+	DeclaredAlarmState  []types.AlarmState             `mo:"declaredAlarmState"`
+	TriggeredAlarmState []types.AlarmState             `mo:"triggeredAlarmState"`
+	AlarmActionsEnabled *bool                          `mo:"alarmActionsEnabled"`
+	Tag                 []types.Tag                    `mo:"tag"`
+}
+
+func init() {
+	t["ManagedEntity"] = reflect.TypeOf((*ManagedEntity)(nil)).Elem()
+}
+
+type ManagedObjectView struct {
+	Self types.ManagedObjectReference
+
+	View []types.ManagedObjectReference `mo:"view"`
+}
+
+func (m ManagedObjectView) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["ManagedObjectView"] = reflect.TypeOf((*ManagedObjectView)(nil)).Elem()
+}
+
+type MessageBusProxy struct {
+	Self types.ManagedObjectReference
+}
+
+func (m MessageBusProxy) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["MessageBusProxy"] = reflect.TypeOf((*MessageBusProxy)(nil)).Elem()
+}
+
+type Network struct {
+	ManagedEntity
+
+	Name    string                         `mo:"name"`
+	Summary types.BaseNetworkSummary       `mo:"summary"`
+	Host    []types.ManagedObjectReference `mo:"host"`
+	Vm      []types.ManagedObjectReference `mo:"vm"`
+}
+
+func (m *Network) Entity() *ManagedEntity {
+	return &m.ManagedEntity
+}
+
+func init() {
+	t["Network"] = reflect.TypeOf((*Network)(nil)).Elem()
+}
+
+type OpaqueNetwork struct {
+	Network
+}
+
+func init() {
+	t["OpaqueNetwork"] = reflect.TypeOf((*OpaqueNetwork)(nil)).Elem()
+}
+
+type OptionManager struct {
+	Self types.ManagedObjectReference
+
+	SupportedOption []types.OptionDef       `mo:"supportedOption"`
+	Setting         []types.BaseOptionValue `mo:"setting"`
+}
+
+func (m OptionManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["OptionManager"] = reflect.TypeOf((*OptionManager)(nil)).Elem()
+}
+
+type OverheadMemoryManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m OverheadMemoryManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["OverheadMemoryManager"] = reflect.TypeOf((*OverheadMemoryManager)(nil)).Elem()
+}
+
+type OvfManager struct {
+	Self types.ManagedObjectReference
+
+	OvfImportOption []types.OvfOptionInfo `mo:"ovfImportOption"`
+	OvfExportOption []types.OvfOptionInfo `mo:"ovfExportOption"`
+}
+
+func (m OvfManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["OvfManager"] = reflect.TypeOf((*OvfManager)(nil)).Elem()
+}
+
+type PerformanceManager struct {
+	Self types.ManagedObjectReference
+
+	Description        types.PerformanceDescription `mo:"description"`
+	HistoricalInterval []types.PerfInterval         `mo:"historicalInterval"`
+	PerfCounter        []types.PerfCounterInfo      `mo:"perfCounter"`
+}
+
+func (m PerformanceManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["PerformanceManager"] = reflect.TypeOf((*PerformanceManager)(nil)).Elem()
+}
+
+type Profile struct {
+	Self types.ManagedObjectReference
+
+	Config           types.BaseProfileConfigInfo    `mo:"config"`
+	Description      *types.ProfileDescription      `mo:"description"`
+	Name             string                         `mo:"name"`
+	CreatedTime      time.Time                      `mo:"createdTime"`
+	ModifiedTime     time.Time                      `mo:"modifiedTime"`
+	Entity           []types.ManagedObjectReference `mo:"entity"`
+	ComplianceStatus string                         `mo:"complianceStatus"`
+}
+
+func (m Profile) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["Profile"] = reflect.TypeOf((*Profile)(nil)).Elem()
+}
+
+type ProfileComplianceManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m ProfileComplianceManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["ProfileComplianceManager"] = reflect.TypeOf((*ProfileComplianceManager)(nil)).Elem()
+}
+
+type ProfileManager struct {
+	Self types.ManagedObjectReference
+
+	Profile []types.ManagedObjectReference `mo:"profile"`
+}
+
+func (m ProfileManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["ProfileManager"] = reflect.TypeOf((*ProfileManager)(nil)).Elem()
+}
+
+type PropertyCollector struct {
+	Self types.ManagedObjectReference
+
+	Filter []types.ManagedObjectReference `mo:"filter"`
+}
+
+func (m PropertyCollector) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["PropertyCollector"] = reflect.TypeOf((*PropertyCollector)(nil)).Elem()
+}
+
+type PropertyFilter struct {
+	Self types.ManagedObjectReference
+
+	Spec           types.PropertyFilterSpec `mo:"spec"`
+	PartialUpdates bool                     `mo:"partialUpdates"`
+}
+
+func (m PropertyFilter) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["PropertyFilter"] = reflect.TypeOf((*PropertyFilter)(nil)).Elem()
+}
+
+type ReflectManagedMethodExecuter struct {
+	Self types.ManagedObjectReference
+}
+
+func (m ReflectManagedMethodExecuter) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["ReflectManagedMethodExecuter"] = reflect.TypeOf((*ReflectManagedMethodExecuter)(nil)).Elem()
+}
+
+type ResourcePlanningManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m ResourcePlanningManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["ResourcePlanningManager"] = reflect.TypeOf((*ResourcePlanningManager)(nil)).Elem()
+}
+
+type ResourcePool struct {
+	ManagedEntity
+
+	Summary            types.BaseResourcePoolSummary  `mo:"summary"`
+	Runtime            types.ResourcePoolRuntimeInfo  `mo:"runtime"`
+	Owner              types.ManagedObjectReference   `mo:"owner"`
+	ResourcePool       []types.ManagedObjectReference `mo:"resourcePool"`
+	Vm                 []types.ManagedObjectReference `mo:"vm"`
+	Config             types.ResourceConfigSpec       `mo:"config"`
+	ChildConfiguration []types.ResourceConfigSpec     `mo:"childConfiguration"`
+}
+
+func (m *ResourcePool) Entity() *ManagedEntity {
+	return &m.ManagedEntity
+}
+
+func init() {
+	t["ResourcePool"] = reflect.TypeOf((*ResourcePool)(nil)).Elem()
+}
+
+type ScheduledTask struct {
+	ExtensibleManagedObject
+
+	Info types.ScheduledTaskInfo `mo:"info"`
+}
+
+func init() {
+	t["ScheduledTask"] = reflect.TypeOf((*ScheduledTask)(nil)).Elem()
+}
+
+type ScheduledTaskManager struct {
+	Self types.ManagedObjectReference
+
+	ScheduledTask []types.ManagedObjectReference `mo:"scheduledTask"`
+	Description   types.ScheduledTaskDescription `mo:"description"`
+}
+
+func (m ScheduledTaskManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["ScheduledTaskManager"] = reflect.TypeOf((*ScheduledTaskManager)(nil)).Elem()
+}
+
+type SearchIndex struct {
+	Self types.ManagedObjectReference
+}
+
+func (m SearchIndex) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["SearchIndex"] = reflect.TypeOf((*SearchIndex)(nil)).Elem()
+}
+
+type ServiceInstance struct {
+	Self types.ManagedObjectReference
+
+	ServerClock time.Time            `mo:"serverClock"`
+	Capability  types.Capability     `mo:"capability"`
+	Content     types.ServiceContent `mo:"content"`
+}
+
+func (m ServiceInstance) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["ServiceInstance"] = reflect.TypeOf((*ServiceInstance)(nil)).Elem()
+}
+
+type ServiceManager struct {
+	Self types.ManagedObjectReference
+
+	Service []types.ServiceManagerServiceInfo `mo:"service"`
+}
+
+func (m ServiceManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["ServiceManager"] = reflect.TypeOf((*ServiceManager)(nil)).Elem()
+}
+
+type SessionManager struct {
+	Self types.ManagedObjectReference
+
+	SessionList         []types.UserSession `mo:"sessionList"`
+	CurrentSession      *types.UserSession  `mo:"currentSession"`
+	Message             *string             `mo:"message"`
+	MessageLocaleList   []string            `mo:"messageLocaleList"`
+	SupportedLocaleList []string            `mo:"supportedLocaleList"`
+	DefaultLocale       string              `mo:"defaultLocale"`
+}
+
+func (m SessionManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["SessionManager"] = reflect.TypeOf((*SessionManager)(nil)).Elem()
+}
+
+type SimpleCommand struct {
+	Self types.ManagedObjectReference
+
+	EncodingType types.SimpleCommandEncoding     `mo:"encodingType"`
+	Entity       types.ServiceManagerServiceInfo `mo:"entity"`
+}
+
+func (m SimpleCommand) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["SimpleCommand"] = reflect.TypeOf((*SimpleCommand)(nil)).Elem()
+}
+
+type StoragePod struct {
+	Folder
+
+	Summary            *types.StoragePodSummary  `mo:"summary"`
+	PodStorageDrsEntry *types.PodStorageDrsEntry `mo:"podStorageDrsEntry"`
+}
+
+func init() {
+	t["StoragePod"] = reflect.TypeOf((*StoragePod)(nil)).Elem()
+}
+
+type StorageResourceManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m StorageResourceManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["StorageResourceManager"] = reflect.TypeOf((*StorageResourceManager)(nil)).Elem()
+}
+
+type Task struct {
+	ExtensibleManagedObject
+
+	Info types.TaskInfo `mo:"info"`
+}
+
+func init() {
+	t["Task"] = reflect.TypeOf((*Task)(nil)).Elem()
+}
+
+type TaskHistoryCollector struct {
+	HistoryCollector
+
+	LatestPage []types.TaskInfo `mo:"latestPage"`
+}
+
+func init() {
+	t["TaskHistoryCollector"] = reflect.TypeOf((*TaskHistoryCollector)(nil)).Elem()
+}
+
+type TaskManager struct {
+	Self types.ManagedObjectReference
+
+	RecentTask   []types.ManagedObjectReference `mo:"recentTask"`
+	Description  types.TaskDescription          `mo:"description"`
+	MaxCollector int32                          `mo:"maxCollector"`
+}
+
+func (m TaskManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["TaskManager"] = reflect.TypeOf((*TaskManager)(nil)).Elem()
+}
+
+type UserDirectory struct {
+	Self types.ManagedObjectReference
+
+	DomainList []string `mo:"domainList"`
+}
+
+func (m UserDirectory) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["UserDirectory"] = reflect.TypeOf((*UserDirectory)(nil)).Elem()
+}
+
+type View struct {
+	Self types.ManagedObjectReference
+}
+
+func (m View) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["View"] = reflect.TypeOf((*View)(nil)).Elem()
+}
+
+type ViewManager struct {
+	Self types.ManagedObjectReference
+
+	ViewList []types.ManagedObjectReference `mo:"viewList"`
+}
+
+func (m ViewManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["ViewManager"] = reflect.TypeOf((*ViewManager)(nil)).Elem()
+}
+
+type VirtualApp struct {
+	ResourcePool
+
+	ParentFolder *types.ManagedObjectReference  `mo:"parentFolder"`
+	Datastore    []types.ManagedObjectReference `mo:"datastore"`
+	Network      []types.ManagedObjectReference `mo:"network"`
+	VAppConfig   *types.VAppConfigInfo          `mo:"vAppConfig"`
+	ParentVApp   *types.ManagedObjectReference  `mo:"parentVApp"`
+	ChildLink    []types.VirtualAppLinkInfo     `mo:"childLink"`
+}
+
+func init() {
+	t["VirtualApp"] = reflect.TypeOf((*VirtualApp)(nil)).Elem()
+}
+
+type VirtualDiskManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m VirtualDiskManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["VirtualDiskManager"] = reflect.TypeOf((*VirtualDiskManager)(nil)).Elem()
+}
+
+type VirtualMachine struct {
+	ManagedEntity
+
+	Capability           types.VirtualMachineCapability    `mo:"capability"`
+	Config               *types.VirtualMachineConfigInfo   `mo:"config"`
+	Layout               *types.VirtualMachineFileLayout   `mo:"layout"`
+	LayoutEx             *types.VirtualMachineFileLayoutEx `mo:"layoutEx"`
+	Storage              *types.VirtualMachineStorageInfo  `mo:"storage"`
+	EnvironmentBrowser   types.ManagedObjectReference      `mo:"environmentBrowser"`
+	ResourcePool         *types.ManagedObjectReference     `mo:"resourcePool"`
+	ParentVApp           *types.ManagedObjectReference     `mo:"parentVApp"`
+	ResourceConfig       *types.ResourceConfigSpec         `mo:"resourceConfig"`
+	Runtime              types.VirtualMachineRuntimeInfo   `mo:"runtime"`
+	Guest                *types.GuestInfo                  `mo:"guest"`
+	Summary              types.VirtualMachineSummary       `mo:"summary"`
+	Datastore            []types.ManagedObjectReference    `mo:"datastore"`
+	Network              []types.ManagedObjectReference    `mo:"network"`
+	Snapshot             *types.VirtualMachineSnapshotInfo `mo:"snapshot"`
+	RootSnapshot         []types.ManagedObjectReference    `mo:"rootSnapshot"`
+	GuestHeartbeatStatus types.ManagedEntityStatus         `mo:"guestHeartbeatStatus"`
+}
+
+func (m *VirtualMachine) Entity() *ManagedEntity {
+	return &m.ManagedEntity
+}
+
+func init() {
+	t["VirtualMachine"] = reflect.TypeOf((*VirtualMachine)(nil)).Elem()
+}
+
+type VirtualMachineCompatibilityChecker struct {
+	Self types.ManagedObjectReference
+}
+
+func (m VirtualMachineCompatibilityChecker) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["VirtualMachineCompatibilityChecker"] = reflect.TypeOf((*VirtualMachineCompatibilityChecker)(nil)).Elem()
+}
+
+type VirtualMachineProvisioningChecker struct {
+	Self types.ManagedObjectReference
+}
+
+func (m VirtualMachineProvisioningChecker) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["VirtualMachineProvisioningChecker"] = reflect.TypeOf((*VirtualMachineProvisioningChecker)(nil)).Elem()
+}
+
+type VirtualMachineSnapshot struct {
+	ExtensibleManagedObject
+
+	Config        types.VirtualMachineConfigInfo `mo:"config"`
+	ChildSnapshot []types.ManagedObjectReference `mo:"childSnapshot"`
+	Vm            types.ManagedObjectReference   `mo:"vm"`
+}
+
+func init() {
+	t["VirtualMachineSnapshot"] = reflect.TypeOf((*VirtualMachineSnapshot)(nil)).Elem()
+}
+
+type VirtualizationManager struct {
+	Self types.ManagedObjectReference
+}
+
+func (m VirtualizationManager) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["VirtualizationManager"] = reflect.TypeOf((*VirtualizationManager)(nil)).Elem()
+}
+
+type VmwareDistributedVirtualSwitch struct {
+	DistributedVirtualSwitch
+}
+
+func init() {
+	t["VmwareDistributedVirtualSwitch"] = reflect.TypeOf((*VmwareDistributedVirtualSwitch)(nil)).Elem()
+}
+
+type VsanUpgradeSystem struct {
+	Self types.ManagedObjectReference
+}
+
+func (m VsanUpgradeSystem) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["VsanUpgradeSystem"] = reflect.TypeOf((*VsanUpgradeSystem)(nil)).Elem()
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/mo/reference.go b/vendor/github.com/vmware/govmomi/vim25/mo/reference.go
new file mode 100644
index 0000000000..465edbe807
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/mo/reference.go
@@ -0,0 +1,26 @@
+/*
+Copyright (c) 2015 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 mo
+
+import "github.com/vmware/govmomi/vim25/types"
+
+// Reference is the interface that is implemented by all the managed objects
+// defined in this package. It specifies that these managed objects have a
+// function that returns the managed object reference to themselves.
+type Reference interface {
+	Reference() types.ManagedObjectReference
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/mo/registry.go b/vendor/github.com/vmware/govmomi/vim25/mo/registry.go
new file mode 100644
index 0000000000..deacf508bb
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/mo/registry.go
@@ -0,0 +1,21 @@
+/*
+Copyright (c) 2014 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 mo
+
+import "reflect"
+
+var t = map[string]reflect.Type{}
diff --git a/vendor/github.com/vmware/govmomi/vim25/mo/retrieve.go b/vendor/github.com/vmware/govmomi/vim25/mo/retrieve.go
new file mode 100644
index 0000000000..e7ffc32cec
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/mo/retrieve.go
@@ -0,0 +1,174 @@
+/*
+Copyright (c) 2014-2015 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 mo
+
+import (
+	"context"
+	"reflect"
+
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+func ignoreMissingProperty(ref types.ManagedObjectReference, p types.MissingProperty) bool {
+	switch ref.Type {
+	case "VirtualMachine":
+		switch p.Path {
+		case "environmentBrowser":
+			// See https://github.com/vmware/govmomi/pull/242
+			return true
+		case "alarmActionsEnabled":
+			// Seen with vApp child VM
+			return true
+		}
+	}
+
+	return false
+}
+
+// ObjectContentToType loads an ObjectContent value into the value it
+// represents. If the ObjectContent value has a non-empty 'MissingSet' field,
+// it returns the first fault it finds there as error. If the 'MissingSet'
+// field is empty, it returns a pointer to a reflect.Value. It handles contain
+// nested properties, such as 'guest.ipAddress' or 'config.hardware'.
+func ObjectContentToType(o types.ObjectContent) (interface{}, error) {
+	// Expect no properties in the missing set
+	for _, p := range o.MissingSet {
+		if ignoreMissingProperty(o.Obj, p) {
+			continue
+		}
+
+		return nil, soap.WrapVimFault(p.Fault.Fault)
+	}
+
+	ti := typeInfoForType(o.Obj.Type)
+	v, err := ti.LoadFromObjectContent(o)
+	if err != nil {
+		return nil, err
+	}
+
+	return v.Elem().Interface(), nil
+}
+
+// LoadRetrievePropertiesResponse converts the response of a call to
+// RetrieveProperties to one or more managed objects.
+func LoadRetrievePropertiesResponse(res *types.RetrievePropertiesResponse, dst interface{}) error {
+	rt := reflect.TypeOf(dst)
+	if rt == nil || rt.Kind() != reflect.Ptr {
+		panic("need pointer")
+	}
+
+	rv := reflect.ValueOf(dst).Elem()
+	if !rv.CanSet() {
+		panic("cannot set dst")
+	}
+
+	isSlice := false
+	switch rt.Elem().Kind() {
+	case reflect.Struct:
+	case reflect.Slice:
+		isSlice = true
+	default:
+		panic("unexpected type")
+	}
+
+	if isSlice {
+		for _, p := range res.Returnval {
+			v, err := ObjectContentToType(p)
+			if err != nil {
+				return err
+			}
+
+			vt := reflect.TypeOf(v)
+
+			if !rv.Type().AssignableTo(vt) {
+				// For example: dst is []ManagedEntity, res is []HostSystem
+				if field, ok := vt.FieldByName(rt.Elem().Elem().Name()); ok && field.Anonymous {
+					rv.Set(reflect.Append(rv, reflect.ValueOf(v).FieldByIndex(field.Index)))
+					continue
+				}
+			}
+
+			rv.Set(reflect.Append(rv, reflect.ValueOf(v)))
+		}
+	} else {
+		switch len(res.Returnval) {
+		case 0:
+		case 1:
+			v, err := ObjectContentToType(res.Returnval[0])
+			if err != nil {
+				return err
+			}
+
+			vt := reflect.TypeOf(v)
+
+			if !rv.Type().AssignableTo(vt) {
+				// For example: dst is ComputeResource, res is ClusterComputeResource
+				if field, ok := vt.FieldByName(rt.Elem().Name()); ok && field.Anonymous {
+					rv.Set(reflect.ValueOf(v).FieldByIndex(field.Index))
+					return nil
+				}
+			}
+
+			rv.Set(reflect.ValueOf(v))
+		default:
+			// If dst is not a slice, expect to receive 0 or 1 results
+			panic("more than 1 result")
+		}
+	}
+
+	return nil
+}
+
+// RetrievePropertiesForRequest calls the RetrieveProperties method with the
+// specified request and decodes the response struct into the value pointed to
+// by dst.
+func RetrievePropertiesForRequest(ctx context.Context, r soap.RoundTripper, req types.RetrieveProperties, dst interface{}) error {
+	res, err := methods.RetrieveProperties(ctx, r, &req)
+	if err != nil {
+		return err
+	}
+
+	return LoadRetrievePropertiesResponse(res, dst)
+}
+
+// RetrieveProperties retrieves the properties of the managed object specified
+// as obj and decodes the response struct into the value pointed to by dst.
+func RetrieveProperties(ctx context.Context, r soap.RoundTripper, pc, obj types.ManagedObjectReference, dst interface{}) error {
+	req := types.RetrieveProperties{
+		This: pc,
+		SpecSet: []types.PropertyFilterSpec{
+			{
+				ObjectSet: []types.ObjectSpec{
+					{
+						Obj:  obj,
+						Skip: types.NewBool(false),
+					},
+				},
+				PropSet: []types.PropertySpec{
+					{
+						All:  types.NewBool(true),
+						Type: obj.Type,
+					},
+				},
+			},
+		},
+	}
+
+	return RetrievePropertiesForRequest(ctx, r, req, dst)
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/mo/retrieve_test.go b/vendor/github.com/vmware/govmomi/vim25/mo/retrieve_test.go
new file mode 100644
index 0000000000..5d6e011df1
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/mo/retrieve_test.go
@@ -0,0 +1,144 @@
+/*
+Copyright (c) 2014-2015 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 mo
+
+import (
+	"os"
+	"testing"
+
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+	"github.com/vmware/govmomi/vim25/xml"
+)
+
+func load(name string) *types.RetrievePropertiesResponse {
+	f, err := os.Open(name)
+	if err != nil {
+		panic(err)
+	}
+
+	defer f.Close()
+
+	var b types.RetrievePropertiesResponse
+
+	dec := xml.NewDecoder(f)
+	dec.TypeFunc = types.TypeFunc()
+	if err := dec.Decode(&b); err != nil {
+		panic(err)
+	}
+
+	return &b
+}
+
+func TestNotAuthenticatedFault(t *testing.T) {
+	var s SessionManager
+
+	err := LoadRetrievePropertiesResponse(load("fixtures/not_authenticated_fault.xml"), &s)
+	if !soap.IsVimFault(err) {
+		t.Errorf("Expected IsVimFault")
+	}
+
+	fault := soap.ToVimFault(err).(*types.NotAuthenticated)
+	if fault.PrivilegeId != "System.View" {
+		t.Errorf("Expected first fault to be returned")
+	}
+}
+
+func TestNestedProperty(t *testing.T) {
+	var vm VirtualMachine
+
+	err := LoadRetrievePropertiesResponse(load("fixtures/nested_property.xml"), &vm)
+	if err != nil {
+		t.Fatalf("Expected no error, got: %s", err)
+	}
+
+	self := types.ManagedObjectReference{
+		Type:  "VirtualMachine",
+		Value: "vm-411",
+	}
+
+	if vm.Self != self {
+		t.Fatalf("Expected vm.Self to be set")
+	}
+
+	if vm.Config == nil {
+		t.Fatalf("Expected vm.Config to be set")
+	}
+
+	if vm.Config.Name != "kubernetes-master" {
+		t.Errorf("Got: %s", vm.Config.Name)
+	}
+
+	if vm.Config.Uuid != "422ec880-ab06-06b4-23f3-beb7a052a4c9" {
+		t.Errorf("Got: %s", vm.Config.Uuid)
+	}
+}
+
+func TestPointerProperty(t *testing.T) {
+	var vm VirtualMachine
+
+	err := LoadRetrievePropertiesResponse(load("fixtures/pointer_property.xml"), &vm)
+	if err != nil {
+		t.Fatalf("Expected no error, got: %s", err)
+	}
+
+	if vm.Config == nil {
+		t.Fatalf("Expected vm.Config to be set")
+	}
+
+	if vm.Config.BootOptions == nil {
+		t.Fatalf("Expected vm.Config.BootOptions to be set")
+	}
+}
+
+func TestEmbeddedTypeProperty(t *testing.T) {
+	// Test that we avoid in this case:
+	// panic: reflect.Set: value of type mo.ClusterComputeResource is not assignable to type mo.ComputeResource
+	var cr ComputeResource
+
+	err := LoadRetrievePropertiesResponse(load("fixtures/cluster_host_property.xml"), &cr)
+	if err != nil {
+		t.Fatalf("Expected no error, got: %s", err)
+	}
+
+	if len(cr.Host) != 4 {
+		t.Fatalf("Expected cr.Host to be set")
+	}
+}
+
+func TestEmbeddedTypePropertySlice(t *testing.T) {
+	var me []ManagedEntity
+
+	err := LoadRetrievePropertiesResponse(load("fixtures/hostsystem_list_name_property.xml"), &me)
+	if err != nil {
+		t.Fatalf("Expected no error, got: %s", err)
+	}
+
+	if len(me) != 2 {
+		t.Fatalf("Expected 2 elements")
+	}
+
+	for _, m := range me {
+		if m.Name == "" {
+			t.Fatal("Expected Name field to be set")
+		}
+	}
+
+	if me[0].Name == me[1].Name {
+		t.Fatal("Name fields should not be the same")
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/mo/type_info.go b/vendor/github.com/vmware/govmomi/vim25/mo/type_info.go
new file mode 100644
index 0000000000..0c9e5b0348
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/mo/type_info.go
@@ -0,0 +1,247 @@
+/*
+Copyright (c) 2014 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 mo
+
+import (
+	"fmt"
+	"reflect"
+	"regexp"
+	"strings"
+	"sync"
+
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type typeInfo struct {
+	typ reflect.Type
+
+	// Field indices of "Self" field.
+	self []int
+
+	// Map property names to field indices.
+	props map[string][]int
+}
+
+var typeInfoLock sync.RWMutex
+var typeInfoMap = make(map[string]*typeInfo)
+
+func typeInfoForType(tname string) *typeInfo {
+	typeInfoLock.RLock()
+	ti, ok := typeInfoMap[tname]
+	typeInfoLock.RUnlock()
+
+	if ok {
+		return ti
+	}
+
+	// Create new typeInfo for type.
+	if typ, ok := t[tname]; !ok {
+		panic("unknown type: " + tname)
+	} else {
+		// Multiple routines may race to set it, but the result is the same.
+		typeInfoLock.Lock()
+		ti = newTypeInfo(typ)
+		typeInfoMap[tname] = ti
+		typeInfoLock.Unlock()
+	}
+
+	return ti
+}
+
+func newTypeInfo(typ reflect.Type) *typeInfo {
+	t := typeInfo{
+		typ:   typ,
+		props: make(map[string][]int),
+	}
+
+	t.build(typ, "", []int{})
+
+	return &t
+}
+
+var managedObjectRefType = reflect.TypeOf((*types.ManagedObjectReference)(nil)).Elem()
+
+func buildName(fn string, f reflect.StructField) string {
+	if fn != "" {
+		fn += "."
+	}
+
+	motag := f.Tag.Get("mo")
+	if motag != "" {
+		return fn + motag
+	}
+
+	xmltag := f.Tag.Get("xml")
+	if xmltag != "" {
+		tokens := strings.Split(xmltag, ",")
+		if tokens[0] != "" {
+			return fn + tokens[0]
+		}
+	}
+
+	return ""
+}
+
+func (t *typeInfo) build(typ reflect.Type, fn string, fi []int) {
+	if typ.Kind() == reflect.Ptr {
+		typ = typ.Elem()
+	}
+
+	if typ.Kind() != reflect.Struct {
+		panic("need struct")
+	}
+
+	for i := 0; i < typ.NumField(); i++ {
+		f := typ.Field(i)
+		ftyp := f.Type
+
+		// Copy field indices so they can be passed along.
+		fic := make([]int, len(fi)+1)
+		copy(fic, fi)
+		fic[len(fi)] = i
+
+		// Recurse into embedded field.
+		if f.Anonymous {
+			t.build(ftyp, fn, fic)
+			continue
+		}
+
+		// Top level type has a "Self" field.
+		if f.Name == "Self" && ftyp == managedObjectRefType {
+			t.self = fic
+			continue
+		}
+
+		fnc := buildName(fn, f)
+		if fnc == "" {
+			continue
+		}
+
+		t.props[fnc] = fic
+
+		// Dereference pointer.
+		if ftyp.Kind() == reflect.Ptr {
+			ftyp = ftyp.Elem()
+		}
+
+		// Slices are not addressable by `foo.bar.qux`.
+		if ftyp.Kind() == reflect.Slice {
+			continue
+		}
+
+		// Skip the managed reference type.
+		if ftyp == managedObjectRefType {
+			continue
+		}
+
+		// Recurse into structs.
+		if ftyp.Kind() == reflect.Struct {
+			t.build(ftyp, fnc, fic)
+		}
+	}
+}
+
+// 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
+// needed.
+func assignValue(val reflect.Value, fi []int, pv reflect.Value) {
+	// Create new value if necessary.
+	if val.Kind() == reflect.Ptr {
+		if val.IsNil() {
+			val.Set(reflect.New(val.Type().Elem()))
+		}
+
+		val = val.Elem()
+	}
+
+	rv := val.Field(fi[0])
+	fi = fi[1:]
+	if len(fi) == 0 {
+		rt := rv.Type()
+		pt := pv.Type()
+
+		// If type is a pointer, create new instance of type.
+		if rt.Kind() == reflect.Ptr {
+			rv.Set(reflect.New(rt.Elem()))
+			rv = rv.Elem()
+			rt = rv.Type()
+		}
+
+		// 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.
+			if reflect.PtrTo(pt).Implements(rt) {
+				npv := reflect.New(pt)
+				npv.Elem().Set(pv)
+				pv = npv
+				pt = pv.Type()
+			} else {
+				panic(fmt.Sprintf("type %s doesn't implement %s", pt.Name(), rt.Name()))
+			}
+		}
+
+		if pt.AssignableTo(rt) {
+			rv.Set(pv)
+		} 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()))
+		}
+
+		return
+	}
+
+	assignValue(rv, fi, pv)
+}
+
+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.
+func (t *typeInfo) LoadFromObjectContent(o types.ObjectContent) (reflect.Value, error) {
+	v := reflect.New(t.typ)
+	assignValue(v, t.self, reflect.ValueOf(o.Obj))
+
+	for _, p := range o.PropSet {
+		rv, ok := t.props[p.Name]
+		if !ok {
+			continue
+		}
+		assignValue(v, rv, anyTypeToValue(p.Val))
+	}
+
+	return v, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/mo/type_info_test.go b/vendor/github.com/vmware/govmomi/vim25/mo/type_info_test.go
new file mode 100644
index 0000000000..849d9eea46
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/mo/type_info_test.go
@@ -0,0 +1,37 @@
+/*
+Copyright (c) 2014 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 mo
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestLoadAll(*testing.T) {
+	for _, typ := range t {
+		newTypeInfo(typ)
+	}
+}
+
+// The virtual machine managed object has about 500 nested properties.
+// It's likely to be indicative of the function's performance in general.
+func BenchmarkLoadVirtualMachine(b *testing.B) {
+	vmtyp := reflect.TypeOf((*VirtualMachine)(nil)).Elem()
+	for i := 0; i < b.N; i++ {
+		newTypeInfo(vmtyp)
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/progress/aggregator.go b/vendor/github.com/vmware/govmomi/vim25/progress/aggregator.go
new file mode 100644
index 0000000000..24cb3d59a9
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/progress/aggregator.go
@@ -0,0 +1,73 @@
+/*
+Copyright (c) 2014 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 progress
+
+import "sync"
+
+type Aggregator struct {
+	downstream Sinker
+	upstream   chan (<-chan Report)
+
+	done chan struct{}
+	w    sync.WaitGroup
+}
+
+func NewAggregator(s Sinker) *Aggregator {
+	a := &Aggregator{
+		downstream: s,
+		upstream:   make(chan (<-chan Report)),
+
+		done: make(chan struct{}),
+	}
+
+	a.w.Add(1)
+	go a.loop()
+
+	return a
+}
+
+func (a *Aggregator) loop() {
+	defer a.w.Done()
+
+	dch := a.downstream.Sink()
+	defer close(dch)
+
+	for {
+		select {
+		case uch := <-a.upstream:
+			// Drain upstream channel
+			for e := range uch {
+				dch <- e
+			}
+		case <-a.done:
+			return
+		}
+	}
+}
+
+func (a *Aggregator) Sink() chan<- Report {
+	ch := make(chan Report)
+	a.upstream <- ch
+	return ch
+}
+
+// Done marks the aggregator as done. No more calls to Sink() may be made and
+// the downstream progress report channel will be closed when Done() returns.
+func (a *Aggregator) Done() {
+	close(a.done)
+	a.w.Wait()
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/progress/aggregator_test.go b/vendor/github.com/vmware/govmomi/vim25/progress/aggregator_test.go
new file mode 100644
index 0000000000..bac9594284
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/progress/aggregator_test.go
@@ -0,0 +1,81 @@
+/*
+Copyright (c) 2014 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 progress
+
+import (
+	"testing"
+	"time"
+)
+
+func TestAggregatorNoSinks(t *testing.T) {
+	ch := make(chan Report)
+	a := NewAggregator(dummySinker{ch})
+	a.Done()
+
+	_, ok := <-ch
+	if ok {
+		t.Errorf("Expected channel to be closed")
+	}
+}
+
+func TestAggregatorMultipleSinks(t *testing.T) {
+	ch := make(chan Report)
+	a := NewAggregator(dummySinker{ch})
+
+	for i := 0; i < 5; i++ {
+		go func(ch chan<- Report) {
+			ch <- dummyReport{}
+			ch <- dummyReport{}
+			close(ch)
+		}(a.Sink())
+
+		<-ch
+		<-ch
+	}
+
+	a.Done()
+
+	_, ok := <-ch
+	if ok {
+		t.Errorf("Expected channel to be closed")
+	}
+}
+
+func TestAggregatorSinkInFlightOnDone(t *testing.T) {
+	ch := make(chan Report)
+	a := NewAggregator(dummySinker{ch})
+
+	// Simulate upstream
+	go func(ch chan<- Report) {
+		time.Sleep(1 * time.Millisecond)
+		ch <- dummyReport{}
+		close(ch)
+	}(a.Sink())
+
+	// Drain downstream
+	go func(ch <-chan Report) {
+		<-ch
+	}(ch)
+
+	// This should wait for upstream to complete
+	a.Done()
+
+	_, ok := <-ch
+	if ok {
+		t.Errorf("Expected channel to be closed")
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/progress/common_test.go b/vendor/github.com/vmware/govmomi/vim25/progress/common_test.go
new file mode 100644
index 0000000000..c0da5e418a
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/progress/common_test.go
@@ -0,0 +1,43 @@
+/*
+Copyright (c) 2014 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 progress
+
+type dummySinker struct {
+	ch chan Report
+}
+
+func (d dummySinker) Sink() chan<- Report {
+	return d.ch
+}
+
+type dummyReport struct {
+	p float32
+	d string
+	e error
+}
+
+func (p dummyReport) Percentage() float32 {
+	return p.p
+}
+
+func (p dummyReport) Detail() string {
+	return p.d
+}
+
+func (p dummyReport) Error() error {
+	return p.e
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/progress/doc.go b/vendor/github.com/vmware/govmomi/vim25/progress/doc.go
new file mode 100644
index 0000000000..a0458dd5cc
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/progress/doc.go
@@ -0,0 +1,32 @@
+/*
+Copyright (c) 2014 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 progress
+
+/*
+The progress package contains functionality to deal with progress reporting.
+The functionality is built to serve progress reporting for infrastructure
+operations when talking the vSphere API, but is generic enough to be used
+elsewhere.
+
+At the core of this progress reporting API lies the Sinker interface. This
+interface is implemented by any object that can act as a sink for progress
+reports. Callers of the Sink() function receives a send-only channel for
+progress reports. They are responsible for closing the channel when done.
+This semantic makes it easy to keep track of multiple progress report channels;
+they are only created when Sink() is called and assumed closed when any
+function that receives a Sinker parameter returns.
+*/
diff --git a/vendor/github.com/vmware/govmomi/vim25/progress/prefix.go b/vendor/github.com/vmware/govmomi/vim25/progress/prefix.go
new file mode 100644
index 0000000000..4f842ad951
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/progress/prefix.go
@@ -0,0 +1,54 @@
+/*
+Copyright (c) 2014 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 progress
+
+import "fmt"
+
+type prefixedReport struct {
+	Report
+	prefix string
+}
+
+func (r prefixedReport) Detail() string {
+	if d := r.Report.Detail(); d != "" {
+		return fmt.Sprintf("%s: %s", r.prefix, d)
+	}
+
+	return r.prefix
+}
+
+func prefixLoop(upstream <-chan Report, downstream chan<- Report, prefix string) {
+	defer close(downstream)
+
+	for r := range upstream {
+		downstream <- prefixedReport{
+			Report: r,
+			prefix: prefix,
+		}
+	}
+}
+
+func Prefix(s Sinker, prefix string) Sinker {
+	fn := func() chan<- Report {
+		upstream := make(chan Report)
+		downstream := s.Sink()
+		go prefixLoop(upstream, downstream, prefix)
+		return upstream
+	}
+
+	return SinkFunc(fn)
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/progress/prefix_test.go b/vendor/github.com/vmware/govmomi/vim25/progress/prefix_test.go
new file mode 100644
index 0000000000..2438bfd799
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/progress/prefix_test.go
@@ -0,0 +1,40 @@
+/*
+Copyright (c) 2014 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 progress
+
+import "testing"
+
+func TestPrefix(t *testing.T) {
+	var r Report
+
+	ch := make(chan Report, 1)
+	s := Prefix(dummySinker{ch}, "prefix").Sink()
+
+	// No detail
+	s <- dummyReport{d: ""}
+	r = <-ch
+	if r.Detail() != "prefix" {
+		t.Errorf("Expected detail to be prefixed")
+	}
+
+	// With detail
+	s <- dummyReport{d: "something"}
+	r = <-ch
+	if r.Detail() != "prefix: something" {
+		t.Errorf("Expected detail to be prefixed")
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/progress/reader.go b/vendor/github.com/vmware/govmomi/vim25/progress/reader.go
new file mode 100644
index 0000000000..a981cb4e15
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/progress/reader.go
@@ -0,0 +1,177 @@
+/*
+Copyright (c) 2014-2015 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 progress
+
+import (
+	"container/list"
+	"fmt"
+	"io"
+	"sync/atomic"
+	"time"
+)
+
+type readerReport struct {
+	t time.Time
+
+	pos  int64
+	size int64
+	bps  *uint64
+
+	err error
+}
+
+func (r readerReport) Percentage() float32 {
+	return 100.0 * float32(r.pos) / float32(r.size)
+}
+
+func (r readerReport) Detail() string {
+	const (
+		KiB = 1024
+		MiB = 1024 * KiB
+		GiB = 1024 * MiB
+	)
+
+	// Use the reader's bps field, so this report returns an up-to-date number.
+	//
+	// For example: if there hasn't been progress for the last 5 seconds, the
+	// most recent report should return "0B/s".
+	//
+	bps := atomic.LoadUint64(r.bps)
+
+	switch {
+	case bps >= GiB:
+		return fmt.Sprintf("%.1fGiB/s", float32(bps)/float32(GiB))
+	case bps >= MiB:
+		return fmt.Sprintf("%.1fMiB/s", float32(bps)/float32(MiB))
+	case bps >= KiB:
+		return fmt.Sprintf("%.1fKiB/s", float32(bps)/float32(KiB))
+	default:
+		return fmt.Sprintf("%dB/s", bps)
+	}
+}
+
+func (p readerReport) Error() error {
+	return p.err
+}
+
+// reader wraps an io.Reader and sends a progress report over a channel for
+// every read it handles.
+type reader struct {
+	r io.Reader
+
+	pos  int64
+	size int64
+
+	bps uint64
+
+	ch chan<- Report
+}
+
+func NewReader(s Sinker, r io.Reader, size int64) *reader {
+	pr := reader{
+		r: r,
+
+		size: size,
+	}
+
+	// Reports must be sent downstream and to the bps computation loop.
+	pr.ch = Tee(s, newBpsLoop(&pr.bps)).Sink()
+
+	return &pr
+}
+
+// Read calls the Read function on the underlying io.Reader. Additionally,
+// every read causes a progress report to be sent to the progress reader's
+// underlying channel.
+func (r *reader) Read(b []byte) (int, error) {
+	n, err := r.r.Read(b)
+	if err != nil {
+		return n, err
+	}
+
+	r.pos += int64(n)
+	q := readerReport{
+		t:    time.Now(),
+		pos:  r.pos,
+		size: r.size,
+		bps:  &r.bps,
+	}
+
+	r.ch <- q
+
+	return n, err
+}
+
+// Done marks the progress reader as done, optionally including an error in the
+// progress report. After sending it, the underlying channel is closed.
+func (r *reader) Done(err error) {
+	q := readerReport{
+		t:    time.Now(),
+		pos:  r.pos,
+		size: r.size,
+		bps:  &r.bps,
+		err:  err,
+	}
+
+	r.ch <- q
+	close(r.ch)
+}
+
+// newBpsLoop returns a sink that monitors and stores throughput.
+func newBpsLoop(dst *uint64) SinkFunc {
+	fn := func() chan<- Report {
+		sink := make(chan Report)
+		go bpsLoop(sink, dst)
+		return sink
+	}
+
+	return fn
+}
+
+func bpsLoop(ch <-chan Report, dst *uint64) {
+	l := list.New()
+
+	for {
+		var tch <-chan time.Time
+
+		// Setup timer for front of list to become stale.
+		if e := l.Front(); e != nil {
+			dt := time.Second - time.Now().Sub(e.Value.(readerReport).t)
+			tch = time.After(dt)
+		}
+
+		select {
+		case q, ok := <-ch:
+			if !ok {
+				return
+			}
+
+			l.PushBack(q)
+		case <-tch:
+			l.Remove(l.Front())
+		}
+
+		// Compute new bps
+		if l.Len() == 0 {
+			atomic.StoreUint64(dst, 0)
+		} else {
+			f := l.Front().Value.(readerReport)
+			b := l.Back().Value.(readerReport)
+			atomic.StoreUint64(dst, uint64(b.pos-f.pos))
+		}
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/progress/reader_test.go b/vendor/github.com/vmware/govmomi/vim25/progress/reader_test.go
new file mode 100644
index 0000000000..2d60582234
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/progress/reader_test.go
@@ -0,0 +1,90 @@
+/*
+Copyright (c) 2014 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 progress
+
+import (
+	"io"
+	"strings"
+	"testing"
+)
+
+func TestReader(t *testing.T) {
+	s := "helloworld"
+	ch := make(chan Report, 1)
+	pr := NewReader(&dummySinker{ch}, strings.NewReader(s), int64(len(s)))
+
+	var buf [10]byte
+	var q Report
+	var n int
+	var err error
+
+	// Read first byte
+	n, err = pr.Read(buf[0:1])
+	if n != 1 {
+		t.Errorf("Expected n=1, but got: %d", n)
+	}
+
+	if err != nil {
+		t.Errorf("Error: %s", err)
+	}
+
+	q = <-ch
+	if q.Error() != nil {
+		t.Errorf("Error: %s", err)
+	}
+
+	if f := q.Percentage(); f != 10.0 {
+		t.Errorf("Expected percentage after 1 byte to be 10%%, but got: %.0f%%", f)
+	}
+
+	// Read remaining bytes
+	n, err = pr.Read(buf[:])
+	if n != 9 {
+		t.Errorf("Expected n=1, but got: %d", n)
+	}
+	if err != nil {
+		t.Errorf("Error: %s", err)
+	}
+
+	q = <-ch
+	if q.Error() != nil {
+		t.Errorf("Error: %s", err)
+	}
+
+	if f := q.Percentage(); f != 100.0 {
+		t.Errorf("Expected percentage after 10 bytes to be 100%%, but got: %.0f%%", f)
+	}
+
+	// Read EOF
+	_, err = pr.Read(buf[:])
+	if err != io.EOF {
+		t.Errorf("Expected io.EOF, but got: %s", err)
+	}
+
+	// Mark progress reader as done
+	pr.Done(io.EOF)
+	q = <-ch
+	if err != io.EOF {
+		t.Errorf("Expected io.EOF, but got: %s", err)
+	}
+
+	// Progress channel should be closed after progress reader is marked done
+	_, ok := <-ch
+	if ok {
+		t.Errorf("Expected channel to be closed")
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/progress/report.go b/vendor/github.com/vmware/govmomi/vim25/progress/report.go
new file mode 100644
index 0000000000..bf80263ff5
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/progress/report.go
@@ -0,0 +1,26 @@
+/*
+Copyright (c) 2014 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 progress
+
+// Report defines the interface for types that can deliver progress reports.
+// Examples include uploads/downloads in the http client and the task info
+// field in the task managed object.
+type Report interface {
+	Percentage() float32
+	Detail() string
+	Error() error
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/progress/scale.go b/vendor/github.com/vmware/govmomi/vim25/progress/scale.go
new file mode 100644
index 0000000000..9880839206
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/progress/scale.go
@@ -0,0 +1,76 @@
+/*
+Copyright (c) 2014 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 progress
+
+type scaledReport struct {
+	Report
+	n int
+	i int
+}
+
+func (r scaledReport) Percentage() float32 {
+	b := 100 * float32(r.i) / float32(r.n)
+	return b + (r.Report.Percentage() / float32(r.n))
+}
+
+type scaleOne struct {
+	s Sinker
+	n int
+	i int
+}
+
+func (s scaleOne) Sink() chan<- Report {
+	upstream := make(chan Report)
+	downstream := s.s.Sink()
+	go s.loop(upstream, downstream)
+	return upstream
+}
+
+func (s scaleOne) loop(upstream <-chan Report, downstream chan<- Report) {
+	defer close(downstream)
+
+	for r := range upstream {
+		downstream <- scaledReport{
+			Report: r,
+			n:      s.n,
+			i:      s.i,
+		}
+	}
+}
+
+type scaleMany struct {
+	s Sinker
+	n int
+	i int
+}
+
+func Scale(s Sinker, n int) Sinker {
+	return &scaleMany{
+		s: s,
+		n: n,
+	}
+}
+
+func (s *scaleMany) Sink() chan<- Report {
+	if s.i == s.n {
+		s.n++
+	}
+
+	ch := scaleOne{s: s.s, n: s.n, i: s.i}.Sink()
+	s.i++
+	return ch
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/progress/scale_test.go b/vendor/github.com/vmware/govmomi/vim25/progress/scale_test.go
new file mode 100644
index 0000000000..8b722e9a95
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/progress/scale_test.go
@@ -0,0 +1,45 @@
+/*
+Copyright (c) 2014 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 progress
+
+import "testing"
+
+func TestScaleMany(t *testing.T) {
+	ch := make(chan Report)
+	a := NewAggregator(dummySinker{ch})
+	defer a.Done()
+
+	s := Scale(a, 5)
+
+	go func() {
+		for i := 0; i < 5; i++ {
+			go func(ch chan<- Report) {
+				ch <- dummyReport{p: 0.0}
+				ch <- dummyReport{p: 50.0}
+				close(ch)
+			}(s.Sink())
+		}
+	}()
+
+	// Expect percentages to be scaled across sinks
+	for p := float32(0.0); p < 100.0; p += 10.0 {
+		r := <-ch
+		if r.Percentage() != p {
+			t.Errorf("Expected percentage to be: %.0f%%", p)
+		}
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/progress/sinker.go b/vendor/github.com/vmware/govmomi/vim25/progress/sinker.go
new file mode 100644
index 0000000000..0bd35a47f7
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/progress/sinker.go
@@ -0,0 +1,33 @@
+/*
+Copyright (c) 2014 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 progress
+
+// Sinker defines what is expected of a type that can act as a sink for
+// progress reports. The semantics are as follows. If you call Sink(), you are
+// responsible for closing the returned channel. Closing this channel means
+// that the related task is done, or resulted in error.
+type Sinker interface {
+	Sink() chan<- Report
+}
+
+// SinkFunc defines a function that returns a progress report channel.
+type SinkFunc func() chan<- Report
+
+// Sink makes the SinkFunc implement the Sinker interface.
+func (fn SinkFunc) Sink() chan<- Report {
+	return fn()
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/progress/tee.go b/vendor/github.com/vmware/govmomi/vim25/progress/tee.go
new file mode 100644
index 0000000000..ab4607842b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/progress/tee.go
@@ -0,0 +1,41 @@
+/*
+Copyright (c) 2014 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 progress
+
+// Tee works like Unix tee; it forwards all progress reports it receives to the
+// specified sinks
+func Tee(s1, s2 Sinker) Sinker {
+	fn := func() chan<- Report {
+		d1 := s1.Sink()
+		d2 := s2.Sink()
+		u := make(chan Report)
+		go tee(u, d1, d2)
+		return u
+	}
+
+	return SinkFunc(fn)
+}
+
+func tee(u <-chan Report, d1, d2 chan<- Report) {
+	defer close(d1)
+	defer close(d2)
+
+	for r := range u {
+		d1 <- r
+		d2 <- r
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/progress/tee_test.go b/vendor/github.com/vmware/govmomi/vim25/progress/tee_test.go
new file mode 100644
index 0000000000..350f6f1cb9
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/progress/tee_test.go
@@ -0,0 +1,46 @@
+/*
+Copyright (c) 2014 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 progress
+
+import "testing"
+
+func TestTee(t *testing.T) {
+	var ok bool
+
+	ch1 := make(chan Report)
+	ch2 := make(chan Report)
+
+	s := Tee(&dummySinker{ch: ch1}, &dummySinker{ch: ch2})
+
+	in := s.Sink()
+	in <- dummyReport{}
+	close(in)
+
+	// Receive dummy on both sinks
+	<-ch1
+	<-ch2
+
+	_, ok = <-ch1
+	if ok {
+		t.Errorf("Expected channel to be closed")
+	}
+
+	_, ok = <-ch2
+	if ok {
+		t.Errorf("Expected channel to be closed")
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/retry.go b/vendor/github.com/vmware/govmomi/vim25/retry.go
new file mode 100644
index 0000000000..b8807eef31
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/retry.go
@@ -0,0 +1,105 @@
+/*
+Copyright (c) 2015 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 vim25
+
+import (
+	"context"
+	"net"
+	"net/url"
+	"time"
+
+	"github.com/vmware/govmomi/vim25/soap"
+)
+
+type RetryFunc func(err error) (retry bool, delay time.Duration)
+
+// TemporaryNetworkError returns a RetryFunc that retries up to a maximum of n
+// times, only if the error returned by the RoundTrip function is a temporary
+// network error (for example: a connect timeout).
+func TemporaryNetworkError(n int) RetryFunc {
+	return func(err error) (retry bool, delay time.Duration) {
+		var nerr net.Error
+		var ok bool
+
+		// Never retry if this is not a network error.
+		switch rerr := err.(type) {
+		case *url.Error:
+			if nerr, ok = rerr.Err.(net.Error); !ok {
+				return false, 0
+			}
+		case net.Error:
+			nerr = rerr
+		default:
+			return false, 0
+		}
+
+		if !nerr.Temporary() {
+			return false, 0
+		}
+
+		// Don't retry if we're out of tries.
+		if n--; n <= 0 {
+			return false, 0
+		}
+
+		return true, 0
+	}
+}
+
+type retry struct {
+	roundTripper soap.RoundTripper
+
+	// fn is a custom function that is called when an error occurs.
+	// It returns whether or not to retry, and if so, how long to
+	// delay before retrying.
+	fn RetryFunc
+}
+
+// Retry wraps the specified soap.RoundTripper and invokes the
+// specified RetryFunc. The RetryFunc returns whether or not to
+// retry the call, and if so, how long to wait before retrying. If
+// the result of this function is to not retry, the original error
+// is returned from the RoundTrip function.
+func Retry(roundTripper soap.RoundTripper, fn RetryFunc) soap.RoundTripper {
+	r := &retry{
+		roundTripper: roundTripper,
+		fn:           fn,
+	}
+
+	return r
+}
+
+func (r *retry) RoundTrip(ctx context.Context, req, res soap.HasFault) error {
+	var err error
+
+	for {
+		err = r.roundTripper.RoundTrip(ctx, req, res)
+		if err == nil {
+			break
+		}
+
+		// Invoke retry function to see if another attempt should be made.
+		if retry, delay := r.fn(err); retry {
+			time.Sleep(delay)
+			continue
+		}
+
+		break
+	}
+
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/retry_test.go b/vendor/github.com/vmware/govmomi/vim25/retry_test.go
new file mode 100644
index 0000000000..e6e1c498db
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/retry_test.go
@@ -0,0 +1,86 @@
+/*
+Copyright (c) 2015 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 vim25
+
+import (
+	"context"
+	"testing"
+
+	"github.com/vmware/govmomi/vim25/soap"
+)
+
+type tempError struct{}
+
+func (tempError) Error() string   { return "tempError" }
+func (tempError) Timeout() bool   { return true }
+func (tempError) Temporary() bool { return true }
+
+type nonTempError struct{}
+
+func (nonTempError) Error() string   { return "nonTempError" }
+func (nonTempError) Timeout() bool   { return false }
+func (nonTempError) Temporary() bool { return false }
+
+type fakeRoundTripper struct {
+	errs []error
+}
+
+func (f *fakeRoundTripper) RoundTrip(ctx context.Context, req, res soap.HasFault) error {
+	err := f.errs[0]
+	f.errs = f.errs[1:]
+	return err
+}
+
+func TestRetry(t *testing.T) {
+	var tcs = []struct {
+		errs     []error
+		expected error
+	}{
+		{
+			errs:     []error{nil},
+			expected: nil,
+		},
+		{
+			errs:     []error{tempError{}, nil},
+			expected: nil,
+		},
+		{
+			errs:     []error{tempError{}, tempError{}},
+			expected: tempError{},
+		},
+		{
+			errs:     []error{nonTempError{}},
+			expected: nonTempError{},
+		},
+		{
+			errs:     []error{tempError{}, nonTempError{}},
+			expected: nonTempError{},
+		},
+	}
+
+	for _, tc := range tcs {
+		var rt soap.RoundTripper
+
+		rt = &fakeRoundTripper{errs: tc.errs}
+		rt = Retry(rt, TemporaryNetworkError(2))
+
+		err := rt.RoundTrip(nil, nil, nil)
+		if err != tc.expected {
+			t.Errorf("Expected: %s, got: %s", tc.expected, err)
+		}
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/soap/client.go b/vendor/github.com/vmware/govmomi/vim25/soap/client.go
new file mode 100644
index 0000000000..e89ffc8107
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/soap/client.go
@@ -0,0 +1,671 @@
+/*
+Copyright (c) 2014-2015 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 soap
+
+import (
+	"bufio"
+	"bytes"
+	"context"
+	"crypto/sha1"
+	"crypto/tls"
+	"crypto/x509"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net"
+	"net/http"
+	"net/http/cookiejar"
+	"net/url"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/vmware/govmomi/vim25/progress"
+	"github.com/vmware/govmomi/vim25/types"
+	"github.com/vmware/govmomi/vim25/xml"
+)
+
+type HasFault interface {
+	Fault() *Fault
+}
+
+type RoundTripper interface {
+	RoundTrip(ctx context.Context, req, res HasFault) error
+}
+
+const (
+	DefaultVimNamespace  = "urn:vim25"
+	DefaultVimVersion    = "6.5"
+	DefaultMinVimVersion = "5.5"
+)
+
+type Client struct {
+	http.Client
+
+	u *url.URL
+	k bool // Named after curl's -k flag
+	d *debugContainer
+	t *http.Transport
+	p *url.URL
+
+	hostsMu sync.Mutex
+	hosts   map[string]string
+
+	Namespace string // Vim namespace
+	Version   string // Vim version
+	UserAgent string
+}
+
+var schemeMatch = regexp.MustCompile(`^\w+://`)
+
+// 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
+	var u *url.URL
+
+	if s != "" {
+		// Default the scheme to https
+		if !schemeMatch.MatchString(s) {
+			s = "https://" + s
+		}
+
+		u, err = url.Parse(s)
+		if err != nil {
+			return nil, err
+		}
+
+		// Default the path to /sdk
+		if u.Path == "" {
+			u.Path = "/sdk"
+		}
+
+		if u.User == nil {
+			u.User = url.UserPassword("", "")
+		}
+	}
+
+	return u, nil
+}
+
+func NewClient(u *url.URL, insecure bool) *Client {
+	c := Client{
+		u: u,
+		k: insecure,
+		d: newDebug(),
+	}
+
+	// Initialize http.RoundTripper on client, so we can customize it below
+	if t, ok := http.DefaultTransport.(*http.Transport); ok {
+		c.t = &http.Transport{
+			Proxy:                 t.Proxy,
+			DialContext:           t.DialContext,
+			MaxIdleConns:          t.MaxIdleConns,
+			IdleConnTimeout:       t.IdleConnTimeout,
+			TLSHandshakeTimeout:   t.TLSHandshakeTimeout,
+			ExpectContinueTimeout: t.ExpectContinueTimeout,
+		}
+	} else {
+		c.t = new(http.Transport)
+	}
+
+	c.hosts = make(map[string]string)
+	c.t.TLSClientConfig = &tls.Config{InsecureSkipVerify: c.k}
+	// Don't bother setting DialTLS if InsecureSkipVerify=true
+	if !c.k {
+		c.t.DialTLS = c.dialTLS
+	}
+
+	c.Client.Transport = c.t
+	c.Client.Jar, _ = cookiejar.New(nil)
+
+	// Remove user information from a copy of the URL
+	c.u = c.URL()
+	c.u.User = nil
+
+	c.Namespace = DefaultVimNamespace
+	c.Version = DefaultVimVersion
+
+	return &c
+}
+
+// SetRootCAs defines the set of root certificate authorities
+// that clients use when verifying server certificates.
+// By default TLS uses the host's root CA set.
+//
+// See: http.Client.Transport.TLSClientConfig.RootCAs
+func (c *Client) SetRootCAs(file string) error {
+	pool := x509.NewCertPool()
+
+	for _, name := range filepath.SplitList(file) {
+		pem, err := ioutil.ReadFile(name)
+		if err != nil {
+			return err
+		}
+
+		pool.AppendCertsFromPEM(pem)
+	}
+
+	c.t.TLSClientConfig.RootCAs = pool
+
+	return nil
+}
+
+// Add default https port if missing
+func hostAddr(addr string) string {
+	_, port := splitHostPort(addr)
+	if port == "" {
+		return addr + ":443"
+	}
+	return addr
+}
+
+// SetThumbprint sets the known certificate thumbprint for the given host.
+// A custom DialTLS function is used to support thumbprint based verification.
+// We first try tls.Dial with the default tls.Config, only falling back to thumbprint verification
+// if it fails with an x509.UnknownAuthorityError or x509.HostnameError
+//
+// See: http.Client.Transport.DialTLS
+func (c *Client) SetThumbprint(host string, thumbprint string) {
+	host = hostAddr(host)
+
+	c.hostsMu.Lock()
+	if thumbprint == "" {
+		delete(c.hosts, host)
+	} else {
+		c.hosts[host] = thumbprint
+	}
+	c.hostsMu.Unlock()
+}
+
+// Thumbprint returns the certificate thumbprint for the given host if known to this client.
+func (c *Client) Thumbprint(host string) string {
+	host = hostAddr(host)
+	c.hostsMu.Lock()
+	defer c.hostsMu.Unlock()
+	return c.hosts[host]
+}
+
+// LoadThumbprints from file with the give name.
+// If name is empty or name does not exist this function will return nil.
+func (c *Client) LoadThumbprints(file string) error {
+	if file == "" {
+		return nil
+	}
+
+	for _, name := range filepath.SplitList(file) {
+		err := c.loadThumbprints(name)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (c *Client) loadThumbprints(name string) error {
+	f, err := os.Open(name)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return nil
+		}
+		return err
+	}
+
+	scanner := bufio.NewScanner(f)
+
+	for scanner.Scan() {
+		e := strings.SplitN(scanner.Text(), " ", 2)
+		if len(e) != 2 {
+			continue
+		}
+
+		c.SetThumbprint(e[0], e[1])
+	}
+
+	_ = f.Close()
+
+	return scanner.Err()
+}
+
+// ThumbprintSHA1 returns the thumbprint of the given cert in the same format used by the SDK and Client.SetThumbprint.
+//
+// See: SSLVerifyFault.Thumbprint, SessionManagerGenericServiceTicket.Thumbprint, HostConnectSpec.SslThumbprint
+func ThumbprintSHA1(cert *x509.Certificate) string {
+	sum := sha1.Sum(cert.Raw)
+	hex := make([]string, len(sum))
+	for i, b := range sum {
+		hex[i] = fmt.Sprintf("%02X", b)
+	}
+	return strings.Join(hex, ":")
+}
+
+func (c *Client) dialTLS(network string, addr string) (net.Conn, error) {
+	// Would be nice if there was a tls.Config.Verify func,
+	// see tls.clientHandshakeState.doFullHandshake
+
+	conn, err := tls.Dial(network, addr, c.t.TLSClientConfig)
+
+	if err == nil {
+		return conn, nil
+	}
+
+	switch err.(type) {
+	case x509.UnknownAuthorityError:
+	case x509.HostnameError:
+	default:
+		return nil, err
+	}
+
+	thumbprint := c.Thumbprint(addr)
+	if thumbprint == "" {
+		return nil, err
+	}
+
+	config := &tls.Config{InsecureSkipVerify: true}
+	conn, err = tls.Dial(network, addr, config)
+	if err != nil {
+		return nil, err
+	}
+
+	cert := conn.ConnectionState().PeerCertificates[0]
+	peer := ThumbprintSHA1(cert)
+	if thumbprint != peer {
+		_ = conn.Close()
+
+		return nil, fmt.Errorf("Host %q thumbprint does not match %q", addr, thumbprint)
+	}
+
+	return conn, nil
+}
+
+// splitHostPort is similar to net.SplitHostPort,
+// but rather than return error if there isn't a ':port',
+// return an empty string for the port.
+func splitHostPort(host string) (string, string) {
+	ix := strings.LastIndex(host, ":")
+
+	if ix <= strings.LastIndex(host, "]") {
+		return host, ""
+	}
+
+	name := host[:ix]
+	port := host[ix+1:]
+
+	return name, port
+}
+
+const sdkTunnel = "sdkTunnel:8089"
+
+func (c *Client) SetCertificate(cert tls.Certificate) {
+	t := c.Client.Transport.(*http.Transport)
+
+	// Extension certificate
+	t.TLSClientConfig.Certificates = []tls.Certificate{cert}
+
+	// Proxy to vCenter host on port 80
+	host, _ := splitHostPort(c.u.Host)
+
+	// Should be no reason to change the default port other than testing
+	key := "GOVMOMI_TUNNEL_PROXY_PORT"
+
+	port := c.URL().Query().Get(key)
+	if port == "" {
+		port = os.Getenv(key)
+	}
+
+	if port != "" {
+		host += ":" + port
+	}
+
+	c.p = &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
+}
+
+func (c *Client) URL() *url.URL {
+	urlCopy := *c.u
+	return &urlCopy
+}
+
+type marshaledClient struct {
+	Cookies  []*http.Cookie
+	URL      *url.URL
+	Insecure bool
+}
+
+func (c *Client) MarshalJSON() ([]byte, error) {
+	m := marshaledClient{
+		Cookies:  c.Jar.Cookies(c.u),
+		URL:      c.u,
+		Insecure: c.k,
+	}
+
+	return json.Marshal(m)
+}
+
+func (c *Client) UnmarshalJSON(b []byte) error {
+	var m marshaledClient
+
+	err := json.Unmarshal(b, &m)
+	if err != nil {
+		return err
+	}
+
+	*c = *NewClient(m.URL, m.Insecure)
+	c.Jar.SetCookies(m.URL, m.Cookies)
+
+	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)
+	}
+
+	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}
+
+	// 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.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)
+	}
+
+	if d.enabled() {
+		d.debugRequest(req)
+	}
+
+	tstart := time.Now()
+	res, err := c.do(ctx, req)
+	tstop := time.Now()
+
+	if d.enabled() {
+		d.logf("%6dms (%T)", tstop.Sub(tstart)/time.Millisecond, resBody)
+	}
+
+	if err != nil {
+		return err
+	}
+
+	if d.enabled() {
+		d.debugResponse(res)
+	}
+
+	// Close response regardless of what happens next
+	defer res.Body.Close()
+
+	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() {
+	c.t.CloseIdleConnections()
+}
+
+// ParseURL wraps url.Parse to rewrite the URL.Host field
+// In the case of VM guest uploads or NFC lease URLs, a Host
+// field with a value of "*" is rewritten to the Client's URL.Host.
+func (c *Client) ParseURL(urlStr string) (*url.URL, error) {
+	u, err := url.Parse(urlStr)
+	if err != nil {
+		return nil, err
+	}
+
+	host, _ := splitHostPort(u.Host)
+	if host == "*" {
+		// Also use Client's port, to support port forwarding
+		u.Host = c.URL().Host
+	}
+
+	return u, nil
+}
+
+type Upload struct {
+	Type          string
+	Method        string
+	ContentLength int64
+	Headers       map[string]string
+	Ticket        *http.Cookie
+	Progress      progress.Sinker
+}
+
+var DefaultUpload = Upload{
+	Type:   "application/octet-stream",
+	Method: "PUT",
+}
+
+// Upload PUTs the local file to the given URL
+func (c *Client) Upload(f io.Reader, u *url.URL, param *Upload) error {
+	var err error
+
+	if param.Progress != nil {
+		pr := progress.NewReader(param.Progress, f, param.ContentLength)
+		f = pr
+
+		// Mark progress reader as done when returning from this function.
+		defer func() {
+			pr.Done(err)
+		}()
+	}
+
+	req, err := http.NewRequest(param.Method, u.String(), f)
+	if err != nil {
+		return err
+	}
+
+	req.ContentLength = param.ContentLength
+	req.Header.Set("Content-Type", param.Type)
+
+	for k, v := range param.Headers {
+		req.Header.Add(k, v)
+	}
+
+	if param.Ticket != nil {
+		req.AddCookie(param.Ticket)
+	}
+
+	res, err := c.Client.Do(req)
+	if err != nil {
+		return err
+	}
+
+	switch res.StatusCode {
+	case http.StatusOK:
+	case http.StatusCreated:
+	default:
+		err = errors.New(res.Status)
+	}
+
+	return err
+}
+
+// UploadFile PUTs the local file to the given URL
+func (c *Client) UploadFile(file string, u *url.URL, param *Upload) error {
+	if param == nil {
+		p := DefaultUpload // Copy since we set ContentLength
+		param = &p
+	}
+
+	s, err := os.Stat(file)
+	if err != nil {
+		return err
+	}
+
+	f, err := os.Open(file)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	param.ContentLength = s.Size()
+
+	return c.Upload(f, u, param)
+}
+
+type Download struct {
+	Method   string
+	Headers  map[string]string
+	Ticket   *http.Cookie
+	Progress progress.Sinker
+}
+
+var DefaultDownload = Download{
+	Method: "GET",
+}
+
+// DownloadRequest wraps http.Client.Do, returning the http.Response without checking its StatusCode
+func (c *Client) DownloadRequest(u *url.URL, param *Download) (*http.Response, error) {
+	req, err := http.NewRequest(param.Method, u.String(), nil)
+	if err != nil {
+		return nil, err
+	}
+
+	for k, v := range param.Headers {
+		req.Header.Add(k, v)
+	}
+
+	if param.Ticket != nil {
+		req.AddCookie(param.Ticket)
+	}
+
+	return c.Client.Do(req)
+}
+
+// Download GETs the remote file from the given URL
+func (c *Client) Download(u *url.URL, param *Download) (io.ReadCloser, int64, error) {
+	res, err := c.DownloadRequest(u, param)
+	if err != nil {
+		return nil, 0, err
+	}
+
+	switch res.StatusCode {
+	case http.StatusOK:
+	default:
+		err = errors.New(res.Status)
+	}
+
+	if err != nil {
+		return nil, 0, err
+	}
+
+	return res.Body, res.ContentLength, nil
+}
+
+// DownloadFile GETs the given URL to a local file
+func (c *Client) DownloadFile(file string, u *url.URL, param *Download) error {
+	var err error
+	if param == nil {
+		param = &DefaultDownload
+	}
+
+	rc, contentLength, err := c.Download(u, param)
+	if err != nil {
+		return err
+	}
+	defer rc.Close()
+
+	var r io.Reader = rc
+
+	fh, err := os.Create(file)
+	if err != nil {
+		return err
+	}
+	defer fh.Close()
+
+	if param.Progress != nil {
+		pr := progress.NewReader(param.Progress, r, contentLength)
+		r = pr
+
+		// Mark progress reader as done when returning from this function.
+		defer func() {
+			pr.Done(err)
+		}()
+	}
+
+	_, err = io.Copy(fh, r)
+	if err != nil {
+		return err
+	}
+
+	// Assign error before returning so that it gets picked up by the deferred
+	// function marking the progress reader as done.
+	err = fh.Close()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/soap/client_test.go b/vendor/github.com/vmware/govmomi/vim25/soap/client_test.go
new file mode 100644
index 0000000000..0cf4729dd8
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/soap/client_test.go
@@ -0,0 +1,43 @@
+/*
+Copyright (c) 2015 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 soap
+
+import "testing"
+
+func TestSplitHostPort(t *testing.T) {
+	tests := []struct {
+		url  string
+		host string
+		port string
+	}{
+		{"127.0.0.1", "127.0.0.1", ""},
+		{"*:1234", "*", "1234"},
+		{"127.0.0.1:80", "127.0.0.1", "80"},
+		{"[::1]:6767", "[::1]", "6767"},
+		{"[::1]", "[::1]", ""},
+	}
+
+	for _, test := range tests {
+		host, port := splitHostPort(test.url)
+		if host != test.host {
+			t.Errorf("(%s) %s != %s", test.url, host, test.host)
+		}
+		if port != test.port {
+			t.Errorf("(%s) %s != %s", test.url, port, test.port)
+		}
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/soap/debug.go b/vendor/github.com/vmware/govmomi/vim25/soap/debug.go
new file mode 100644
index 0000000000..63518abca3
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/soap/debug.go
@@ -0,0 +1,149 @@
+/*
+Copyright (c) 2015 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 soap
+
+import (
+	"fmt"
+	"io"
+	"net/http"
+	"net/http/httputil"
+	"sync/atomic"
+	"time"
+
+	"github.com/vmware/govmomi/vim25/debug"
+)
+
+// teeReader wraps io.TeeReader and patches through the Close() function.
+type teeReader struct {
+	io.Reader
+	io.Closer
+}
+
+func newTeeReader(rc io.ReadCloser, w io.Writer) io.ReadCloser {
+	return teeReader{
+		Reader: io.TeeReader(rc, w),
+		Closer: rc,
+	}
+}
+
+// debugRoundTrip contains state and logic needed to debug a single round trip.
+type debugRoundTrip struct {
+	cn  uint64         // Client number
+	rn  uint64         // Request number
+	log io.WriteCloser // Request log
+	cs  []io.Closer    // Files that need closing when done
+}
+
+func (d *debugRoundTrip) logf(format string, a ...interface{}) {
+	now := time.Now().Format("2006-01-02T15-04-05.000000000")
+	fmt.Fprintf(d.log, "%s - %04d: ", now, d.rn)
+	fmt.Fprintf(d.log, format, a...)
+	fmt.Fprintf(d.log, "\n")
+}
+
+func (d *debugRoundTrip) enabled() bool {
+	return d != nil
+}
+
+func (d *debugRoundTrip) done() {
+	for _, c := range d.cs {
+		c.Close()
+	}
+}
+
+func (d *debugRoundTrip) newFile(suffix string) io.WriteCloser {
+	return debug.NewFile(fmt.Sprintf("%d-%04d.%s", d.cn, d.rn, suffix))
+}
+
+func (d *debugRoundTrip) debugRequest(req *http.Request) {
+	if d == nil {
+		return
+	}
+
+	var wc io.WriteCloser
+
+	// Capture headers
+	wc = d.newFile("req.headers")
+	b, _ := httputil.DumpRequest(req, false)
+	wc.Write(b)
+	wc.Close()
+
+	// Capture body
+	wc = d.newFile("req.xml")
+	req.Body = newTeeReader(req.Body, wc)
+
+	// Delay closing until marked done
+	d.cs = append(d.cs, wc)
+}
+
+func (d *debugRoundTrip) debugResponse(res *http.Response) {
+	if d == nil {
+		return
+	}
+
+	var wc io.WriteCloser
+
+	// Capture headers
+	wc = d.newFile("res.headers")
+	b, _ := httputil.DumpResponse(res, false)
+	wc.Write(b)
+	wc.Close()
+
+	// Capture body
+	wc = d.newFile("res.xml")
+	res.Body = newTeeReader(res.Body, wc)
+
+	// Delay closing until marked done
+	d.cs = append(d.cs, wc)
+}
+
+var cn uint64 // Client counter
+
+// debugContainer wraps the debugging state for a single client.
+type debugContainer struct {
+	cn  uint64         // Client number
+	rn  uint64         // Request counter
+	log io.WriteCloser // Request log
+}
+
+func newDebug() *debugContainer {
+	d := debugContainer{
+		cn: atomic.AddUint64(&cn, 1),
+		rn: 0,
+	}
+
+	if !debug.Enabled() {
+		return nil
+	}
+
+	d.log = debug.NewFile(fmt.Sprintf("%d-client.log", d.cn))
+	return &d
+}
+
+func (d *debugContainer) newRoundTrip() *debugRoundTrip {
+	if d == nil {
+		return nil
+	}
+
+	drt := debugRoundTrip{
+		cn:  d.cn,
+		rn:  atomic.AddUint64(&d.rn, 1),
+		log: d.log,
+	}
+
+	return &drt
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/soap/error.go b/vendor/github.com/vmware/govmomi/vim25/soap/error.go
new file mode 100644
index 0000000000..0408e7bf0d
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/soap/error.go
@@ -0,0 +1,109 @@
+/*
+Copyright (c) 2014 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 soap
+
+import (
+	"fmt"
+	"reflect"
+
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type regularError struct {
+	err error
+}
+
+func (r regularError) Error() string {
+	return r.err.Error()
+}
+
+type soapFaultError struct {
+	fault *Fault
+}
+
+func (s soapFaultError) Error() string {
+	return fmt.Sprintf("%s: %s", s.fault.Code, s.fault.String)
+}
+
+type vimFaultError struct {
+	fault types.BaseMethodFault
+}
+
+func (v vimFaultError) Error() string {
+	typ := reflect.TypeOf(v.fault)
+	for typ.Kind() == reflect.Ptr {
+		typ = typ.Elem()
+	}
+
+	return typ.Name()
+}
+
+func (v vimFaultError) Fault() types.BaseMethodFault {
+	return v.fault
+}
+
+func Wrap(err error) error {
+	switch err.(type) {
+	case regularError:
+		return err
+	case soapFaultError:
+		return err
+	case vimFaultError:
+		return err
+	}
+
+	return WrapRegularError(err)
+}
+
+func WrapRegularError(err error) error {
+	return regularError{err}
+}
+
+func IsRegularError(err error) bool {
+	_, ok := err.(regularError)
+	return ok
+}
+
+func ToRegularError(err error) error {
+	return err.(regularError).err
+}
+
+func WrapSoapFault(f *Fault) error {
+	return soapFaultError{f}
+}
+
+func IsSoapFault(err error) bool {
+	_, ok := err.(soapFaultError)
+	return ok
+}
+
+func ToSoapFault(err error) *Fault {
+	return err.(soapFaultError).fault
+}
+
+func WrapVimFault(v types.BaseMethodFault) error {
+	return vimFaultError{v}
+}
+
+func IsVimFault(err error) bool {
+	_, ok := err.(vimFaultError)
+	return ok
+}
+
+func ToVimFault(err error) types.BaseMethodFault {
+	return err.(vimFaultError).fault
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/soap/soap.go b/vendor/github.com/vmware/govmomi/vim25/soap/soap.go
new file mode 100644
index 0000000000..ea35e77ad7
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/soap/soap.go
@@ -0,0 +1,45 @@
+/*
+Copyright (c) 2014 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 soap
+
+import (
+	"github.com/vmware/govmomi/vim25/types"
+	"github.com/vmware/govmomi/vim25/xml"
+)
+
+type Envelope struct {
+	XMLName xml.Name `xml:"http://schemas.xmlsoap.org/soap/envelope/ Envelope"`
+	Header  *Header  `xml:",omitempty"`
+	Body    interface{}
+}
+
+type Header struct {
+	XMLName xml.Name `xml:"http://schemas.xmlsoap.org/soap/envelope/ Header"`
+}
+
+type Fault struct {
+	XMLName xml.Name `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault"`
+	Code    string   `xml:"faultcode"`
+	String  string   `xml:"faultstring"`
+	Detail  struct {
+		Fault types.AnyType `xml:",any,typeattr"`
+	} `xml:"detail"`
+}
+
+func (f *Fault) VimFault() types.AnyType {
+	return f.Detail.Fault
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/soap/soap_test.go b/vendor/github.com/vmware/govmomi/vim25/soap/soap_test.go
new file mode 100644
index 0000000000..d90a17d19f
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/soap/soap_test.go
@@ -0,0 +1,55 @@
+/*
+Copyright (c) 2014 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 soap
+
+import (
+	"testing"
+
+	"github.com/vmware/govmomi/vim25/xml"
+)
+
+func TestEmptyEnvelope(t *testing.T) {
+	env := Envelope{}
+
+	b, err := xml.Marshal(env)
+	if err != nil {
+		t.Errorf("error: %s", err)
+		return
+	}
+
+	expected := `<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"></Envelope>`
+	actual := string(b)
+	if expected != actual {
+		t.Fatalf("expected: %s, actual: %s", expected, actual)
+	}
+}
+
+func TestEmptyHeader(t *testing.T) {
+	h := Header{}
+
+	b, err := xml.Marshal(h)
+	if err != nil {
+		t.Errorf("error: %s", err)
+		return
+	}
+
+	expected := `<Header xmlns="http://schemas.xmlsoap.org/soap/envelope/"></Header>`
+	actual := string(b)
+	if expected != actual {
+		t.Fatalf("expected: %s, actual: %s", expected, actual)
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/types/base.go b/vendor/github.com/vmware/govmomi/vim25/types/base.go
new file mode 100644
index 0000000000..3bb12b7412
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/types/base.go
@@ -0,0 +1,19 @@
+/*
+Copyright (c) 2014 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 types
+
+type AnyType interface{}
diff --git a/vendor/github.com/vmware/govmomi/vim25/types/base_test.go b/vendor/github.com/vmware/govmomi/vim25/types/base_test.go
new file mode 100644
index 0000000000..ab8b1de734
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/types/base_test.go
@@ -0,0 +1,65 @@
+/*
+Copyright (c) 2014 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 types
+
+import (
+	"bytes"
+	"reflect"
+	"testing"
+
+	"github.com/vmware/govmomi/vim25/xml"
+)
+
+func TestAnyType(t *testing.T) {
+	x := func(s string) []byte {
+		s = `<root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">` + s
+		s += `</root>`
+		return []byte(s)
+	}
+
+	tests := []struct {
+		Input []byte
+		Value interface{}
+	}{
+		{
+			Input: x(`<name xsi:type="xsd:string">test</name>`),
+			Value: "test",
+		},
+		{
+			Input: x(`<name xsi:type="ArrayOfString"><string>AA</string><string>BB</string></name>`),
+			Value: ArrayOfString{String: []string{"AA", "BB"}},
+		},
+	}
+
+	for _, test := range tests {
+		var r struct {
+			A interface{} `xml:"name,typeattr"`
+		}
+
+		dec := xml.NewDecoder(bytes.NewReader(test.Input))
+		dec.TypeFunc = TypeFunc()
+
+		err := dec.Decode(&r)
+		if err != nil {
+			t.Fatalf("Decode: %s", err)
+		}
+
+		if !reflect.DeepEqual(r.A, test.Value) {
+			t.Errorf("Expected: %#v, actual: %#v", r.A, test.Value)
+		}
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/types/enum.go b/vendor/github.com/vmware/govmomi/vim25/types/enum.go
new file mode 100644
index 0000000000..1db935ef7a
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/types/enum.go
@@ -0,0 +1,4466 @@
+/*
+Copyright (c) 2014-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 types
+
+import "reflect"
+
+type ActionParameter string
+
+const (
+	ActionParameterTargetName        = ActionParameter("targetName")
+	ActionParameterAlarmName         = ActionParameter("alarmName")
+	ActionParameterOldStatus         = ActionParameter("oldStatus")
+	ActionParameterNewStatus         = ActionParameter("newStatus")
+	ActionParameterTriggeringSummary = ActionParameter("triggeringSummary")
+	ActionParameterDeclaringSummary  = ActionParameter("declaringSummary")
+	ActionParameterEventDescription  = ActionParameter("eventDescription")
+	ActionParameterTarget            = ActionParameter("target")
+	ActionParameterAlarm             = ActionParameter("alarm")
+)
+
+func init() {
+	t["ActionParameter"] = reflect.TypeOf((*ActionParameter)(nil)).Elem()
+}
+
+type ActionType string
+
+const (
+	ActionTypeMigrationV1         = ActionType("MigrationV1")
+	ActionTypeVmPowerV1           = ActionType("VmPowerV1")
+	ActionTypeHostPowerV1         = ActionType("HostPowerV1")
+	ActionTypeHostMaintenanceV1   = ActionType("HostMaintenanceV1")
+	ActionTypeStorageMigrationV1  = ActionType("StorageMigrationV1")
+	ActionTypeStoragePlacementV1  = ActionType("StoragePlacementV1")
+	ActionTypePlacementV1         = ActionType("PlacementV1")
+	ActionTypeHostInfraUpdateHaV1 = ActionType("HostInfraUpdateHaV1")
+)
+
+func init() {
+	t["ActionType"] = reflect.TypeOf((*ActionType)(nil)).Elem()
+}
+
+type AffinityType string
+
+const (
+	AffinityTypeMemory = AffinityType("memory")
+	AffinityTypeCpu    = AffinityType("cpu")
+)
+
+func init() {
+	t["AffinityType"] = reflect.TypeOf((*AffinityType)(nil)).Elem()
+}
+
+type AgentInstallFailedReason string
+
+const (
+	AgentInstallFailedReasonNotEnoughSpaceOnDevice      = AgentInstallFailedReason("NotEnoughSpaceOnDevice")
+	AgentInstallFailedReasonPrepareToUpgradeFailed      = AgentInstallFailedReason("PrepareToUpgradeFailed")
+	AgentInstallFailedReasonAgentNotRunning             = AgentInstallFailedReason("AgentNotRunning")
+	AgentInstallFailedReasonAgentNotReachable           = AgentInstallFailedReason("AgentNotReachable")
+	AgentInstallFailedReasonInstallTimedout             = AgentInstallFailedReason("InstallTimedout")
+	AgentInstallFailedReasonSignatureVerificationFailed = AgentInstallFailedReason("SignatureVerificationFailed")
+	AgentInstallFailedReasonAgentUploadFailed           = AgentInstallFailedReason("AgentUploadFailed")
+	AgentInstallFailedReasonAgentUploadTimedout         = AgentInstallFailedReason("AgentUploadTimedout")
+	AgentInstallFailedReasonUnknownInstallerError       = AgentInstallFailedReason("UnknownInstallerError")
+)
+
+func init() {
+	t["AgentInstallFailedReason"] = reflect.TypeOf((*AgentInstallFailedReason)(nil)).Elem()
+}
+
+type ArrayUpdateOperation string
+
+const (
+	ArrayUpdateOperationAdd    = ArrayUpdateOperation("add")
+	ArrayUpdateOperationRemove = ArrayUpdateOperation("remove")
+	ArrayUpdateOperationEdit   = ArrayUpdateOperation("edit")
+)
+
+func init() {
+	t["ArrayUpdateOperation"] = reflect.TypeOf((*ArrayUpdateOperation)(nil)).Elem()
+}
+
+type AutoStartAction string
+
+const (
+	AutoStartActionNone          = AutoStartAction("none")
+	AutoStartActionSystemDefault = AutoStartAction("systemDefault")
+	AutoStartActionPowerOn       = AutoStartAction("powerOn")
+	AutoStartActionPowerOff      = AutoStartAction("powerOff")
+	AutoStartActionGuestShutdown = AutoStartAction("guestShutdown")
+	AutoStartActionSuspend       = AutoStartAction("suspend")
+)
+
+func init() {
+	t["AutoStartAction"] = reflect.TypeOf((*AutoStartAction)(nil)).Elem()
+}
+
+type AutoStartWaitHeartbeatSetting string
+
+const (
+	AutoStartWaitHeartbeatSettingYes           = AutoStartWaitHeartbeatSetting("yes")
+	AutoStartWaitHeartbeatSettingNo            = AutoStartWaitHeartbeatSetting("no")
+	AutoStartWaitHeartbeatSettingSystemDefault = AutoStartWaitHeartbeatSetting("systemDefault")
+)
+
+func init() {
+	t["AutoStartWaitHeartbeatSetting"] = reflect.TypeOf((*AutoStartWaitHeartbeatSetting)(nil)).Elem()
+}
+
+type BaseConfigInfoDiskFileBackingInfoProvisioningType string
+
+const (
+	BaseConfigInfoDiskFileBackingInfoProvisioningTypeThin             = BaseConfigInfoDiskFileBackingInfoProvisioningType("thin")
+	BaseConfigInfoDiskFileBackingInfoProvisioningTypeEagerZeroedThick = BaseConfigInfoDiskFileBackingInfoProvisioningType("eagerZeroedThick")
+	BaseConfigInfoDiskFileBackingInfoProvisioningTypeLazyZeroedThick  = BaseConfigInfoDiskFileBackingInfoProvisioningType("lazyZeroedThick")
+)
+
+func init() {
+	t["BaseConfigInfoDiskFileBackingInfoProvisioningType"] = reflect.TypeOf((*BaseConfigInfoDiskFileBackingInfoProvisioningType)(nil)).Elem()
+}
+
+type BatchResultResult string
+
+const (
+	BatchResultResultSuccess = BatchResultResult("success")
+	BatchResultResultFail    = BatchResultResult("fail")
+)
+
+func init() {
+	t["BatchResultResult"] = reflect.TypeOf((*BatchResultResult)(nil)).Elem()
+}
+
+type CannotEnableVmcpForClusterReason string
+
+const (
+	CannotEnableVmcpForClusterReasonAPDTimeoutDisabled      = CannotEnableVmcpForClusterReason("APDTimeoutDisabled")
+	CannotEnableVmcpForClusterReasonIncompatibleHostVersion = CannotEnableVmcpForClusterReason("IncompatibleHostVersion")
+)
+
+func init() {
+	t["CannotEnableVmcpForClusterReason"] = reflect.TypeOf((*CannotEnableVmcpForClusterReason)(nil)).Elem()
+}
+
+type CannotMoveFaultToleranceVmMoveType string
+
+const (
+	CannotMoveFaultToleranceVmMoveTypeResourcePool = CannotMoveFaultToleranceVmMoveType("resourcePool")
+	CannotMoveFaultToleranceVmMoveTypeCluster      = CannotMoveFaultToleranceVmMoveType("cluster")
+)
+
+func init() {
+	t["CannotMoveFaultToleranceVmMoveType"] = reflect.TypeOf((*CannotMoveFaultToleranceVmMoveType)(nil)).Elem()
+}
+
+type CannotPowerOffVmInClusterOperation string
+
+const (
+	CannotPowerOffVmInClusterOperationSuspend       = CannotPowerOffVmInClusterOperation("suspend")
+	CannotPowerOffVmInClusterOperationPowerOff      = CannotPowerOffVmInClusterOperation("powerOff")
+	CannotPowerOffVmInClusterOperationGuestShutdown = CannotPowerOffVmInClusterOperation("guestShutdown")
+	CannotPowerOffVmInClusterOperationGuestSuspend  = CannotPowerOffVmInClusterOperation("guestSuspend")
+)
+
+func init() {
+	t["CannotPowerOffVmInClusterOperation"] = reflect.TypeOf((*CannotPowerOffVmInClusterOperation)(nil)).Elem()
+}
+
+type CannotUseNetworkReason string
+
+const (
+	CannotUseNetworkReasonNetworkReservationNotSupported  = CannotUseNetworkReason("NetworkReservationNotSupported")
+	CannotUseNetworkReasonMismatchedNetworkPolicies       = CannotUseNetworkReason("MismatchedNetworkPolicies")
+	CannotUseNetworkReasonMismatchedDvsVersionOrVendor    = CannotUseNetworkReason("MismatchedDvsVersionOrVendor")
+	CannotUseNetworkReasonVMotionToUnsupportedNetworkType = CannotUseNetworkReason("VMotionToUnsupportedNetworkType")
+)
+
+func init() {
+	t["CannotUseNetworkReason"] = reflect.TypeOf((*CannotUseNetworkReason)(nil)).Elem()
+}
+
+type CheckTestType string
+
+const (
+	CheckTestTypeSourceTests       = CheckTestType("sourceTests")
+	CheckTestTypeHostTests         = CheckTestType("hostTests")
+	CheckTestTypeResourcePoolTests = CheckTestType("resourcePoolTests")
+	CheckTestTypeDatastoreTests    = CheckTestType("datastoreTests")
+	CheckTestTypeNetworkTests      = CheckTestType("networkTests")
+)
+
+func init() {
+	t["CheckTestType"] = reflect.TypeOf((*CheckTestType)(nil)).Elem()
+}
+
+type ClusterDasAamNodeStateDasState string
+
+const (
+	ClusterDasAamNodeStateDasStateUninitialized = ClusterDasAamNodeStateDasState("uninitialized")
+	ClusterDasAamNodeStateDasStateInitialized   = ClusterDasAamNodeStateDasState("initialized")
+	ClusterDasAamNodeStateDasStateConfiguring   = ClusterDasAamNodeStateDasState("configuring")
+	ClusterDasAamNodeStateDasStateUnconfiguring = ClusterDasAamNodeStateDasState("unconfiguring")
+	ClusterDasAamNodeStateDasStateRunning       = ClusterDasAamNodeStateDasState("running")
+	ClusterDasAamNodeStateDasStateError         = ClusterDasAamNodeStateDasState("error")
+	ClusterDasAamNodeStateDasStateAgentShutdown = ClusterDasAamNodeStateDasState("agentShutdown")
+	ClusterDasAamNodeStateDasStateNodeFailed    = ClusterDasAamNodeStateDasState("nodeFailed")
+)
+
+func init() {
+	t["ClusterDasAamNodeStateDasState"] = reflect.TypeOf((*ClusterDasAamNodeStateDasState)(nil)).Elem()
+}
+
+type ClusterDasConfigInfoHBDatastoreCandidate string
+
+const (
+	ClusterDasConfigInfoHBDatastoreCandidateUserSelectedDs                  = ClusterDasConfigInfoHBDatastoreCandidate("userSelectedDs")
+	ClusterDasConfigInfoHBDatastoreCandidateAllFeasibleDs                   = ClusterDasConfigInfoHBDatastoreCandidate("allFeasibleDs")
+	ClusterDasConfigInfoHBDatastoreCandidateAllFeasibleDsWithUserPreference = ClusterDasConfigInfoHBDatastoreCandidate("allFeasibleDsWithUserPreference")
+)
+
+func init() {
+	t["ClusterDasConfigInfoHBDatastoreCandidate"] = reflect.TypeOf((*ClusterDasConfigInfoHBDatastoreCandidate)(nil)).Elem()
+}
+
+type ClusterDasConfigInfoServiceState string
+
+const (
+	ClusterDasConfigInfoServiceStateDisabled = ClusterDasConfigInfoServiceState("disabled")
+	ClusterDasConfigInfoServiceStateEnabled  = ClusterDasConfigInfoServiceState("enabled")
+)
+
+func init() {
+	t["ClusterDasConfigInfoServiceState"] = reflect.TypeOf((*ClusterDasConfigInfoServiceState)(nil)).Elem()
+}
+
+type ClusterDasConfigInfoVmMonitoringState string
+
+const (
+	ClusterDasConfigInfoVmMonitoringStateVmMonitoringDisabled = ClusterDasConfigInfoVmMonitoringState("vmMonitoringDisabled")
+	ClusterDasConfigInfoVmMonitoringStateVmMonitoringOnly     = ClusterDasConfigInfoVmMonitoringState("vmMonitoringOnly")
+	ClusterDasConfigInfoVmMonitoringStateVmAndAppMonitoring   = ClusterDasConfigInfoVmMonitoringState("vmAndAppMonitoring")
+)
+
+func init() {
+	t["ClusterDasConfigInfoVmMonitoringState"] = reflect.TypeOf((*ClusterDasConfigInfoVmMonitoringState)(nil)).Elem()
+}
+
+type ClusterDasFdmAvailabilityState string
+
+const (
+	ClusterDasFdmAvailabilityStateUninitialized                = ClusterDasFdmAvailabilityState("uninitialized")
+	ClusterDasFdmAvailabilityStateElection                     = ClusterDasFdmAvailabilityState("election")
+	ClusterDasFdmAvailabilityStateMaster                       = ClusterDasFdmAvailabilityState("master")
+	ClusterDasFdmAvailabilityStateConnectedToMaster            = ClusterDasFdmAvailabilityState("connectedToMaster")
+	ClusterDasFdmAvailabilityStateNetworkPartitionedFromMaster = ClusterDasFdmAvailabilityState("networkPartitionedFromMaster")
+	ClusterDasFdmAvailabilityStateNetworkIsolated              = ClusterDasFdmAvailabilityState("networkIsolated")
+	ClusterDasFdmAvailabilityStateHostDown                     = ClusterDasFdmAvailabilityState("hostDown")
+	ClusterDasFdmAvailabilityStateInitializationError          = ClusterDasFdmAvailabilityState("initializationError")
+	ClusterDasFdmAvailabilityStateUninitializationError        = ClusterDasFdmAvailabilityState("uninitializationError")
+	ClusterDasFdmAvailabilityStateFdmUnreachable               = ClusterDasFdmAvailabilityState("fdmUnreachable")
+)
+
+func init() {
+	t["ClusterDasFdmAvailabilityState"] = reflect.TypeOf((*ClusterDasFdmAvailabilityState)(nil)).Elem()
+}
+
+type ClusterDasVmSettingsIsolationResponse string
+
+const (
+	ClusterDasVmSettingsIsolationResponseNone                     = ClusterDasVmSettingsIsolationResponse("none")
+	ClusterDasVmSettingsIsolationResponsePowerOff                 = ClusterDasVmSettingsIsolationResponse("powerOff")
+	ClusterDasVmSettingsIsolationResponseShutdown                 = ClusterDasVmSettingsIsolationResponse("shutdown")
+	ClusterDasVmSettingsIsolationResponseClusterIsolationResponse = ClusterDasVmSettingsIsolationResponse("clusterIsolationResponse")
+)
+
+func init() {
+	t["ClusterDasVmSettingsIsolationResponse"] = reflect.TypeOf((*ClusterDasVmSettingsIsolationResponse)(nil)).Elem()
+}
+
+type ClusterDasVmSettingsRestartPriority string
+
+const (
+	ClusterDasVmSettingsRestartPriorityDisabled               = ClusterDasVmSettingsRestartPriority("disabled")
+	ClusterDasVmSettingsRestartPriorityLowest                 = ClusterDasVmSettingsRestartPriority("lowest")
+	ClusterDasVmSettingsRestartPriorityLow                    = ClusterDasVmSettingsRestartPriority("low")
+	ClusterDasVmSettingsRestartPriorityMedium                 = ClusterDasVmSettingsRestartPriority("medium")
+	ClusterDasVmSettingsRestartPriorityHigh                   = ClusterDasVmSettingsRestartPriority("high")
+	ClusterDasVmSettingsRestartPriorityHighest                = ClusterDasVmSettingsRestartPriority("highest")
+	ClusterDasVmSettingsRestartPriorityClusterRestartPriority = ClusterDasVmSettingsRestartPriority("clusterRestartPriority")
+)
+
+func init() {
+	t["ClusterDasVmSettingsRestartPriority"] = reflect.TypeOf((*ClusterDasVmSettingsRestartPriority)(nil)).Elem()
+}
+
+type ClusterHostInfraUpdateHaModeActionOperationType string
+
+const (
+	ClusterHostInfraUpdateHaModeActionOperationTypeEnterQuarantine  = ClusterHostInfraUpdateHaModeActionOperationType("enterQuarantine")
+	ClusterHostInfraUpdateHaModeActionOperationTypeExitQuarantine   = ClusterHostInfraUpdateHaModeActionOperationType("exitQuarantine")
+	ClusterHostInfraUpdateHaModeActionOperationTypeEnterMaintenance = ClusterHostInfraUpdateHaModeActionOperationType("enterMaintenance")
+)
+
+func init() {
+	t["ClusterHostInfraUpdateHaModeActionOperationType"] = reflect.TypeOf((*ClusterHostInfraUpdateHaModeActionOperationType)(nil)).Elem()
+}
+
+type ClusterInfraUpdateHaConfigInfoBehaviorType string
+
+const (
+	ClusterInfraUpdateHaConfigInfoBehaviorTypeManual    = ClusterInfraUpdateHaConfigInfoBehaviorType("Manual")
+	ClusterInfraUpdateHaConfigInfoBehaviorTypeAutomated = ClusterInfraUpdateHaConfigInfoBehaviorType("Automated")
+)
+
+func init() {
+	t["ClusterInfraUpdateHaConfigInfoBehaviorType"] = reflect.TypeOf((*ClusterInfraUpdateHaConfigInfoBehaviorType)(nil)).Elem()
+}
+
+type ClusterInfraUpdateHaConfigInfoRemediationType string
+
+const (
+	ClusterInfraUpdateHaConfigInfoRemediationTypeQuarantineMode  = ClusterInfraUpdateHaConfigInfoRemediationType("QuarantineMode")
+	ClusterInfraUpdateHaConfigInfoRemediationTypeMaintenanceMode = ClusterInfraUpdateHaConfigInfoRemediationType("MaintenanceMode")
+)
+
+func init() {
+	t["ClusterInfraUpdateHaConfigInfoRemediationType"] = reflect.TypeOf((*ClusterInfraUpdateHaConfigInfoRemediationType)(nil)).Elem()
+}
+
+type ClusterPowerOnVmOption string
+
+const (
+	ClusterPowerOnVmOptionOverrideAutomationLevel = ClusterPowerOnVmOption("OverrideAutomationLevel")
+	ClusterPowerOnVmOptionReserveResources        = ClusterPowerOnVmOption("ReserveResources")
+)
+
+func init() {
+	t["ClusterPowerOnVmOption"] = reflect.TypeOf((*ClusterPowerOnVmOption)(nil)).Elem()
+}
+
+type ClusterProfileServiceType string
+
+const (
+	ClusterProfileServiceTypeDRS = ClusterProfileServiceType("DRS")
+	ClusterProfileServiceTypeHA  = ClusterProfileServiceType("HA")
+	ClusterProfileServiceTypeDPM = ClusterProfileServiceType("DPM")
+	ClusterProfileServiceTypeFT  = ClusterProfileServiceType("FT")
+)
+
+func init() {
+	t["ClusterProfileServiceType"] = reflect.TypeOf((*ClusterProfileServiceType)(nil)).Elem()
+}
+
+type ClusterVmComponentProtectionSettingsStorageVmReaction string
+
+const (
+	ClusterVmComponentProtectionSettingsStorageVmReactionDisabled            = ClusterVmComponentProtectionSettingsStorageVmReaction("disabled")
+	ClusterVmComponentProtectionSettingsStorageVmReactionWarning             = ClusterVmComponentProtectionSettingsStorageVmReaction("warning")
+	ClusterVmComponentProtectionSettingsStorageVmReactionRestartConservative = ClusterVmComponentProtectionSettingsStorageVmReaction("restartConservative")
+	ClusterVmComponentProtectionSettingsStorageVmReactionRestartAggressive   = ClusterVmComponentProtectionSettingsStorageVmReaction("restartAggressive")
+	ClusterVmComponentProtectionSettingsStorageVmReactionClusterDefault      = ClusterVmComponentProtectionSettingsStorageVmReaction("clusterDefault")
+)
+
+func init() {
+	t["ClusterVmComponentProtectionSettingsStorageVmReaction"] = reflect.TypeOf((*ClusterVmComponentProtectionSettingsStorageVmReaction)(nil)).Elem()
+}
+
+type ClusterVmComponentProtectionSettingsVmReactionOnAPDCleared string
+
+const (
+	ClusterVmComponentProtectionSettingsVmReactionOnAPDClearedNone              = ClusterVmComponentProtectionSettingsVmReactionOnAPDCleared("none")
+	ClusterVmComponentProtectionSettingsVmReactionOnAPDClearedReset             = ClusterVmComponentProtectionSettingsVmReactionOnAPDCleared("reset")
+	ClusterVmComponentProtectionSettingsVmReactionOnAPDClearedUseClusterDefault = ClusterVmComponentProtectionSettingsVmReactionOnAPDCleared("useClusterDefault")
+)
+
+func init() {
+	t["ClusterVmComponentProtectionSettingsVmReactionOnAPDCleared"] = reflect.TypeOf((*ClusterVmComponentProtectionSettingsVmReactionOnAPDCleared)(nil)).Elem()
+}
+
+type ClusterVmReadinessReadyCondition string
+
+const (
+	ClusterVmReadinessReadyConditionNone               = ClusterVmReadinessReadyCondition("none")
+	ClusterVmReadinessReadyConditionPoweredOn          = ClusterVmReadinessReadyCondition("poweredOn")
+	ClusterVmReadinessReadyConditionGuestHbStatusGreen = ClusterVmReadinessReadyCondition("guestHbStatusGreen")
+	ClusterVmReadinessReadyConditionAppHbStatusGreen   = ClusterVmReadinessReadyCondition("appHbStatusGreen")
+	ClusterVmReadinessReadyConditionUseClusterDefault  = ClusterVmReadinessReadyCondition("useClusterDefault")
+)
+
+func init() {
+	t["ClusterVmReadinessReadyCondition"] = reflect.TypeOf((*ClusterVmReadinessReadyCondition)(nil)).Elem()
+}
+
+type ComplianceResultStatus string
+
+const (
+	ComplianceResultStatusCompliant    = ComplianceResultStatus("compliant")
+	ComplianceResultStatusNonCompliant = ComplianceResultStatus("nonCompliant")
+	ComplianceResultStatusUnknown      = ComplianceResultStatus("unknown")
+)
+
+func init() {
+	t["ComplianceResultStatus"] = reflect.TypeOf((*ComplianceResultStatus)(nil)).Elem()
+}
+
+type ComputeResourceHostSPBMLicenseInfoHostSPBMLicenseState string
+
+const (
+	ComputeResourceHostSPBMLicenseInfoHostSPBMLicenseStateLicensed   = ComputeResourceHostSPBMLicenseInfoHostSPBMLicenseState("licensed")
+	ComputeResourceHostSPBMLicenseInfoHostSPBMLicenseStateUnlicensed = ComputeResourceHostSPBMLicenseInfoHostSPBMLicenseState("unlicensed")
+	ComputeResourceHostSPBMLicenseInfoHostSPBMLicenseStateUnknown    = ComputeResourceHostSPBMLicenseInfoHostSPBMLicenseState("unknown")
+)
+
+func init() {
+	t["ComputeResourceHostSPBMLicenseInfoHostSPBMLicenseState"] = reflect.TypeOf((*ComputeResourceHostSPBMLicenseInfoHostSPBMLicenseState)(nil)).Elem()
+}
+
+type ConfigSpecOperation string
+
+const (
+	ConfigSpecOperationAdd    = ConfigSpecOperation("add")
+	ConfigSpecOperationEdit   = ConfigSpecOperation("edit")
+	ConfigSpecOperationRemove = ConfigSpecOperation("remove")
+)
+
+func init() {
+	t["ConfigSpecOperation"] = reflect.TypeOf((*ConfigSpecOperation)(nil)).Elem()
+}
+
+type CustomizationLicenseDataMode string
+
+const (
+	CustomizationLicenseDataModePerServer = CustomizationLicenseDataMode("perServer")
+	CustomizationLicenseDataModePerSeat   = CustomizationLicenseDataMode("perSeat")
+)
+
+func init() {
+	t["CustomizationLicenseDataMode"] = reflect.TypeOf((*CustomizationLicenseDataMode)(nil)).Elem()
+}
+
+type CustomizationNetBIOSMode string
+
+const (
+	CustomizationNetBIOSModeEnableNetBIOSViaDhcp = CustomizationNetBIOSMode("enableNetBIOSViaDhcp")
+	CustomizationNetBIOSModeEnableNetBIOS        = CustomizationNetBIOSMode("enableNetBIOS")
+	CustomizationNetBIOSModeDisableNetBIOS       = CustomizationNetBIOSMode("disableNetBIOS")
+)
+
+func init() {
+	t["CustomizationNetBIOSMode"] = reflect.TypeOf((*CustomizationNetBIOSMode)(nil)).Elem()
+}
+
+type CustomizationSysprepRebootOption string
+
+const (
+	CustomizationSysprepRebootOptionReboot   = CustomizationSysprepRebootOption("reboot")
+	CustomizationSysprepRebootOptionNoreboot = CustomizationSysprepRebootOption("noreboot")
+	CustomizationSysprepRebootOptionShutdown = CustomizationSysprepRebootOption("shutdown")
+)
+
+func init() {
+	t["CustomizationSysprepRebootOption"] = reflect.TypeOf((*CustomizationSysprepRebootOption)(nil)).Elem()
+}
+
+type DVPortStatusVmDirectPathGen2InactiveReasonNetwork string
+
+const (
+	DVPortStatusVmDirectPathGen2InactiveReasonNetworkPortNptIncompatibleDvs             = DVPortStatusVmDirectPathGen2InactiveReasonNetwork("portNptIncompatibleDvs")
+	DVPortStatusVmDirectPathGen2InactiveReasonNetworkPortNptNoCompatibleNics            = DVPortStatusVmDirectPathGen2InactiveReasonNetwork("portNptNoCompatibleNics")
+	DVPortStatusVmDirectPathGen2InactiveReasonNetworkPortNptNoVirtualFunctionsAvailable = DVPortStatusVmDirectPathGen2InactiveReasonNetwork("portNptNoVirtualFunctionsAvailable")
+	DVPortStatusVmDirectPathGen2InactiveReasonNetworkPortNptDisabledForPort             = DVPortStatusVmDirectPathGen2InactiveReasonNetwork("portNptDisabledForPort")
+)
+
+func init() {
+	t["DVPortStatusVmDirectPathGen2InactiveReasonNetwork"] = reflect.TypeOf((*DVPortStatusVmDirectPathGen2InactiveReasonNetwork)(nil)).Elem()
+}
+
+type DVPortStatusVmDirectPathGen2InactiveReasonOther string
+
+const (
+	DVPortStatusVmDirectPathGen2InactiveReasonOtherPortNptIncompatibleHost      = DVPortStatusVmDirectPathGen2InactiveReasonOther("portNptIncompatibleHost")
+	DVPortStatusVmDirectPathGen2InactiveReasonOtherPortNptIncompatibleConnectee = DVPortStatusVmDirectPathGen2InactiveReasonOther("portNptIncompatibleConnectee")
+)
+
+func init() {
+	t["DVPortStatusVmDirectPathGen2InactiveReasonOther"] = reflect.TypeOf((*DVPortStatusVmDirectPathGen2InactiveReasonOther)(nil)).Elem()
+}
+
+type DasConfigFaultDasConfigFaultReason string
+
+const (
+	DasConfigFaultDasConfigFaultReasonHostNetworkMisconfiguration = DasConfigFaultDasConfigFaultReason("HostNetworkMisconfiguration")
+	DasConfigFaultDasConfigFaultReasonHostMisconfiguration        = DasConfigFaultDasConfigFaultReason("HostMisconfiguration")
+	DasConfigFaultDasConfigFaultReasonInsufficientPrivileges      = DasConfigFaultDasConfigFaultReason("InsufficientPrivileges")
+	DasConfigFaultDasConfigFaultReasonNoPrimaryAgentAvailable     = DasConfigFaultDasConfigFaultReason("NoPrimaryAgentAvailable")
+	DasConfigFaultDasConfigFaultReasonOther                       = DasConfigFaultDasConfigFaultReason("Other")
+	DasConfigFaultDasConfigFaultReasonNoDatastoresConfigured      = DasConfigFaultDasConfigFaultReason("NoDatastoresConfigured")
+	DasConfigFaultDasConfigFaultReasonCreateConfigVvolFailed      = DasConfigFaultDasConfigFaultReason("CreateConfigVvolFailed")
+	DasConfigFaultDasConfigFaultReasonVSanNotSupportedOnHost      = DasConfigFaultDasConfigFaultReason("VSanNotSupportedOnHost")
+	DasConfigFaultDasConfigFaultReasonDasNetworkMisconfiguration  = DasConfigFaultDasConfigFaultReason("DasNetworkMisconfiguration")
+)
+
+func init() {
+	t["DasConfigFaultDasConfigFaultReason"] = reflect.TypeOf((*DasConfigFaultDasConfigFaultReason)(nil)).Elem()
+}
+
+type DasVmPriority string
+
+const (
+	DasVmPriorityDisabled = DasVmPriority("disabled")
+	DasVmPriorityLow      = DasVmPriority("low")
+	DasVmPriorityMedium   = DasVmPriority("medium")
+	DasVmPriorityHigh     = DasVmPriority("high")
+)
+
+func init() {
+	t["DasVmPriority"] = reflect.TypeOf((*DasVmPriority)(nil)).Elem()
+}
+
+type DatastoreAccessible string
+
+const (
+	DatastoreAccessibleTrue  = DatastoreAccessible("True")
+	DatastoreAccessibleFalse = DatastoreAccessible("False")
+)
+
+func init() {
+	t["DatastoreAccessible"] = reflect.TypeOf((*DatastoreAccessible)(nil)).Elem()
+}
+
+type DatastoreSummaryMaintenanceModeState string
+
+const (
+	DatastoreSummaryMaintenanceModeStateNormal              = DatastoreSummaryMaintenanceModeState("normal")
+	DatastoreSummaryMaintenanceModeStateEnteringMaintenance = DatastoreSummaryMaintenanceModeState("enteringMaintenance")
+	DatastoreSummaryMaintenanceModeStateInMaintenance       = DatastoreSummaryMaintenanceModeState("inMaintenance")
+)
+
+func init() {
+	t["DatastoreSummaryMaintenanceModeState"] = reflect.TypeOf((*DatastoreSummaryMaintenanceModeState)(nil)).Elem()
+}
+
+type DayOfWeek string
+
+const (
+	DayOfWeekSunday    = DayOfWeek("sunday")
+	DayOfWeekMonday    = DayOfWeek("monday")
+	DayOfWeekTuesday   = DayOfWeek("tuesday")
+	DayOfWeekWednesday = DayOfWeek("wednesday")
+	DayOfWeekThursday  = DayOfWeek("thursday")
+	DayOfWeekFriday    = DayOfWeek("friday")
+	DayOfWeekSaturday  = DayOfWeek("saturday")
+)
+
+func init() {
+	t["DayOfWeek"] = reflect.TypeOf((*DayOfWeek)(nil)).Elem()
+}
+
+type DeviceNotSupportedReason string
+
+const (
+	DeviceNotSupportedReasonHost  = DeviceNotSupportedReason("host")
+	DeviceNotSupportedReasonGuest = DeviceNotSupportedReason("guest")
+)
+
+func init() {
+	t["DeviceNotSupportedReason"] = reflect.TypeOf((*DeviceNotSupportedReason)(nil)).Elem()
+}
+
+type DiagnosticManagerLogCreator string
+
+const (
+	DiagnosticManagerLogCreatorVpxd      = DiagnosticManagerLogCreator("vpxd")
+	DiagnosticManagerLogCreatorVpxa      = DiagnosticManagerLogCreator("vpxa")
+	DiagnosticManagerLogCreatorHostd     = DiagnosticManagerLogCreator("hostd")
+	DiagnosticManagerLogCreatorServerd   = DiagnosticManagerLogCreator("serverd")
+	DiagnosticManagerLogCreatorInstall   = DiagnosticManagerLogCreator("install")
+	DiagnosticManagerLogCreatorVpxClient = DiagnosticManagerLogCreator("vpxClient")
+	DiagnosticManagerLogCreatorRecordLog = DiagnosticManagerLogCreator("recordLog")
+)
+
+func init() {
+	t["DiagnosticManagerLogCreator"] = reflect.TypeOf((*DiagnosticManagerLogCreator)(nil)).Elem()
+}
+
+type DiagnosticManagerLogFormat string
+
+const (
+	DiagnosticManagerLogFormatPlain = DiagnosticManagerLogFormat("plain")
+)
+
+func init() {
+	t["DiagnosticManagerLogFormat"] = reflect.TypeOf((*DiagnosticManagerLogFormat)(nil)).Elem()
+}
+
+type DiagnosticPartitionStorageType string
+
+const (
+	DiagnosticPartitionStorageTypeDirectAttached  = DiagnosticPartitionStorageType("directAttached")
+	DiagnosticPartitionStorageTypeNetworkAttached = DiagnosticPartitionStorageType("networkAttached")
+)
+
+func init() {
+	t["DiagnosticPartitionStorageType"] = reflect.TypeOf((*DiagnosticPartitionStorageType)(nil)).Elem()
+}
+
+type DiagnosticPartitionType string
+
+const (
+	DiagnosticPartitionTypeSingleHost = DiagnosticPartitionType("singleHost")
+	DiagnosticPartitionTypeMultiHost  = DiagnosticPartitionType("multiHost")
+)
+
+func init() {
+	t["DiagnosticPartitionType"] = reflect.TypeOf((*DiagnosticPartitionType)(nil)).Elem()
+}
+
+type DisallowedChangeByServiceDisallowedChange string
+
+const (
+	DisallowedChangeByServiceDisallowedChangeHotExtendDisk = DisallowedChangeByServiceDisallowedChange("hotExtendDisk")
+)
+
+func init() {
+	t["DisallowedChangeByServiceDisallowedChange"] = reflect.TypeOf((*DisallowedChangeByServiceDisallowedChange)(nil)).Elem()
+}
+
+type DistributedVirtualPortgroupMetaTagName string
+
+const (
+	DistributedVirtualPortgroupMetaTagNameDvsName       = DistributedVirtualPortgroupMetaTagName("dvsName")
+	DistributedVirtualPortgroupMetaTagNamePortgroupName = DistributedVirtualPortgroupMetaTagName("portgroupName")
+	DistributedVirtualPortgroupMetaTagNamePortIndex     = DistributedVirtualPortgroupMetaTagName("portIndex")
+)
+
+func init() {
+	t["DistributedVirtualPortgroupMetaTagName"] = reflect.TypeOf((*DistributedVirtualPortgroupMetaTagName)(nil)).Elem()
+}
+
+type DistributedVirtualPortgroupPortgroupType string
+
+const (
+	DistributedVirtualPortgroupPortgroupTypeEarlyBinding = DistributedVirtualPortgroupPortgroupType("earlyBinding")
+	DistributedVirtualPortgroupPortgroupTypeLateBinding  = DistributedVirtualPortgroupPortgroupType("lateBinding")
+	DistributedVirtualPortgroupPortgroupTypeEphemeral    = DistributedVirtualPortgroupPortgroupType("ephemeral")
+)
+
+func init() {
+	t["DistributedVirtualPortgroupPortgroupType"] = reflect.TypeOf((*DistributedVirtualPortgroupPortgroupType)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchHostInfrastructureTrafficClass string
+
+const (
+	DistributedVirtualSwitchHostInfrastructureTrafficClassManagement     = DistributedVirtualSwitchHostInfrastructureTrafficClass("management")
+	DistributedVirtualSwitchHostInfrastructureTrafficClassFaultTolerance = DistributedVirtualSwitchHostInfrastructureTrafficClass("faultTolerance")
+	DistributedVirtualSwitchHostInfrastructureTrafficClassVmotion        = DistributedVirtualSwitchHostInfrastructureTrafficClass("vmotion")
+	DistributedVirtualSwitchHostInfrastructureTrafficClassVirtualMachine = DistributedVirtualSwitchHostInfrastructureTrafficClass("virtualMachine")
+	DistributedVirtualSwitchHostInfrastructureTrafficClassISCSI          = DistributedVirtualSwitchHostInfrastructureTrafficClass("iSCSI")
+	DistributedVirtualSwitchHostInfrastructureTrafficClassNfs            = DistributedVirtualSwitchHostInfrastructureTrafficClass("nfs")
+	DistributedVirtualSwitchHostInfrastructureTrafficClassHbr            = DistributedVirtualSwitchHostInfrastructureTrafficClass("hbr")
+	DistributedVirtualSwitchHostInfrastructureTrafficClassVsan           = DistributedVirtualSwitchHostInfrastructureTrafficClass("vsan")
+	DistributedVirtualSwitchHostInfrastructureTrafficClassVdp            = DistributedVirtualSwitchHostInfrastructureTrafficClass("vdp")
+)
+
+func init() {
+	t["DistributedVirtualSwitchHostInfrastructureTrafficClass"] = reflect.TypeOf((*DistributedVirtualSwitchHostInfrastructureTrafficClass)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchHostMemberHostComponentState string
+
+const (
+	DistributedVirtualSwitchHostMemberHostComponentStateUp           = DistributedVirtualSwitchHostMemberHostComponentState("up")
+	DistributedVirtualSwitchHostMemberHostComponentStatePending      = DistributedVirtualSwitchHostMemberHostComponentState("pending")
+	DistributedVirtualSwitchHostMemberHostComponentStateOutOfSync    = DistributedVirtualSwitchHostMemberHostComponentState("outOfSync")
+	DistributedVirtualSwitchHostMemberHostComponentStateWarning      = DistributedVirtualSwitchHostMemberHostComponentState("warning")
+	DistributedVirtualSwitchHostMemberHostComponentStateDisconnected = DistributedVirtualSwitchHostMemberHostComponentState("disconnected")
+	DistributedVirtualSwitchHostMemberHostComponentStateDown         = DistributedVirtualSwitchHostMemberHostComponentState("down")
+)
+
+func init() {
+	t["DistributedVirtualSwitchHostMemberHostComponentState"] = reflect.TypeOf((*DistributedVirtualSwitchHostMemberHostComponentState)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchNetworkResourceControlVersion string
+
+const (
+	DistributedVirtualSwitchNetworkResourceControlVersionVersion2 = DistributedVirtualSwitchNetworkResourceControlVersion("version2")
+	DistributedVirtualSwitchNetworkResourceControlVersionVersion3 = DistributedVirtualSwitchNetworkResourceControlVersion("version3")
+)
+
+func init() {
+	t["DistributedVirtualSwitchNetworkResourceControlVersion"] = reflect.TypeOf((*DistributedVirtualSwitchNetworkResourceControlVersion)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchNicTeamingPolicyMode string
+
+const (
+	DistributedVirtualSwitchNicTeamingPolicyModeLoadbalance_ip        = DistributedVirtualSwitchNicTeamingPolicyMode("loadbalance_ip")
+	DistributedVirtualSwitchNicTeamingPolicyModeLoadbalance_srcmac    = DistributedVirtualSwitchNicTeamingPolicyMode("loadbalance_srcmac")
+	DistributedVirtualSwitchNicTeamingPolicyModeLoadbalance_srcid     = DistributedVirtualSwitchNicTeamingPolicyMode("loadbalance_srcid")
+	DistributedVirtualSwitchNicTeamingPolicyModeFailover_explicit     = DistributedVirtualSwitchNicTeamingPolicyMode("failover_explicit")
+	DistributedVirtualSwitchNicTeamingPolicyModeLoadbalance_loadbased = DistributedVirtualSwitchNicTeamingPolicyMode("loadbalance_loadbased")
+)
+
+func init() {
+	t["DistributedVirtualSwitchNicTeamingPolicyMode"] = reflect.TypeOf((*DistributedVirtualSwitchNicTeamingPolicyMode)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchPortConnecteeConnecteeType string
+
+const (
+	DistributedVirtualSwitchPortConnecteeConnecteeTypePnic            = DistributedVirtualSwitchPortConnecteeConnecteeType("pnic")
+	DistributedVirtualSwitchPortConnecteeConnecteeTypeVmVnic          = DistributedVirtualSwitchPortConnecteeConnecteeType("vmVnic")
+	DistributedVirtualSwitchPortConnecteeConnecteeTypeHostConsoleVnic = DistributedVirtualSwitchPortConnecteeConnecteeType("hostConsoleVnic")
+	DistributedVirtualSwitchPortConnecteeConnecteeTypeHostVmkVnic     = DistributedVirtualSwitchPortConnecteeConnecteeType("hostVmkVnic")
+)
+
+func init() {
+	t["DistributedVirtualSwitchPortConnecteeConnecteeType"] = reflect.TypeOf((*DistributedVirtualSwitchPortConnecteeConnecteeType)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchProductSpecOperationType string
+
+const (
+	DistributedVirtualSwitchProductSpecOperationTypePreInstall             = DistributedVirtualSwitchProductSpecOperationType("preInstall")
+	DistributedVirtualSwitchProductSpecOperationTypeUpgrade                = DistributedVirtualSwitchProductSpecOperationType("upgrade")
+	DistributedVirtualSwitchProductSpecOperationTypeNotifyAvailableUpgrade = DistributedVirtualSwitchProductSpecOperationType("notifyAvailableUpgrade")
+	DistributedVirtualSwitchProductSpecOperationTypeProceedWithUpgrade     = DistributedVirtualSwitchProductSpecOperationType("proceedWithUpgrade")
+	DistributedVirtualSwitchProductSpecOperationTypeUpdateBundleInfo       = DistributedVirtualSwitchProductSpecOperationType("updateBundleInfo")
+)
+
+func init() {
+	t["DistributedVirtualSwitchProductSpecOperationType"] = reflect.TypeOf((*DistributedVirtualSwitchProductSpecOperationType)(nil)).Elem()
+}
+
+type DpmBehavior string
+
+const (
+	DpmBehaviorManual    = DpmBehavior("manual")
+	DpmBehaviorAutomated = DpmBehavior("automated")
+)
+
+func init() {
+	t["DpmBehavior"] = reflect.TypeOf((*DpmBehavior)(nil)).Elem()
+}
+
+type DrsBehavior string
+
+const (
+	DrsBehaviorManual             = DrsBehavior("manual")
+	DrsBehaviorPartiallyAutomated = DrsBehavior("partiallyAutomated")
+	DrsBehaviorFullyAutomated     = DrsBehavior("fullyAutomated")
+)
+
+func init() {
+	t["DrsBehavior"] = reflect.TypeOf((*DrsBehavior)(nil)).Elem()
+}
+
+type DrsInjectorWorkloadCorrelationState string
+
+const (
+	DrsInjectorWorkloadCorrelationStateCorrelated   = DrsInjectorWorkloadCorrelationState("Correlated")
+	DrsInjectorWorkloadCorrelationStateUncorrelated = DrsInjectorWorkloadCorrelationState("Uncorrelated")
+)
+
+func init() {
+	t["DrsInjectorWorkloadCorrelationState"] = reflect.TypeOf((*DrsInjectorWorkloadCorrelationState)(nil)).Elem()
+}
+
+type DrsRecommendationReasonCode string
+
+const (
+	DrsRecommendationReasonCodeFairnessCpuAvg = DrsRecommendationReasonCode("fairnessCpuAvg")
+	DrsRecommendationReasonCodeFairnessMemAvg = DrsRecommendationReasonCode("fairnessMemAvg")
+	DrsRecommendationReasonCodeJointAffin     = DrsRecommendationReasonCode("jointAffin")
+	DrsRecommendationReasonCodeAntiAffin      = DrsRecommendationReasonCode("antiAffin")
+	DrsRecommendationReasonCodeHostMaint      = DrsRecommendationReasonCode("hostMaint")
+)
+
+func init() {
+	t["DrsRecommendationReasonCode"] = reflect.TypeOf((*DrsRecommendationReasonCode)(nil)).Elem()
+}
+
+type DvsEventPortBlockState string
+
+const (
+	DvsEventPortBlockStateUnset     = DvsEventPortBlockState("unset")
+	DvsEventPortBlockStateBlocked   = DvsEventPortBlockState("blocked")
+	DvsEventPortBlockStateUnblocked = DvsEventPortBlockState("unblocked")
+	DvsEventPortBlockStateUnknown   = DvsEventPortBlockState("unknown")
+)
+
+func init() {
+	t["DvsEventPortBlockState"] = reflect.TypeOf((*DvsEventPortBlockState)(nil)).Elem()
+}
+
+type DvsFilterOnFailure string
+
+const (
+	DvsFilterOnFailureFailOpen   = DvsFilterOnFailure("failOpen")
+	DvsFilterOnFailureFailClosed = DvsFilterOnFailure("failClosed")
+)
+
+func init() {
+	t["DvsFilterOnFailure"] = reflect.TypeOf((*DvsFilterOnFailure)(nil)).Elem()
+}
+
+type DvsNetworkRuleDirectionType string
+
+const (
+	DvsNetworkRuleDirectionTypeIncomingPackets = DvsNetworkRuleDirectionType("incomingPackets")
+	DvsNetworkRuleDirectionTypeOutgoingPackets = DvsNetworkRuleDirectionType("outgoingPackets")
+	DvsNetworkRuleDirectionTypeBoth            = DvsNetworkRuleDirectionType("both")
+)
+
+func init() {
+	t["DvsNetworkRuleDirectionType"] = reflect.TypeOf((*DvsNetworkRuleDirectionType)(nil)).Elem()
+}
+
+type EntityImportType string
+
+const (
+	EntityImportTypeCreateEntityWithNewIdentifier      = EntityImportType("createEntityWithNewIdentifier")
+	EntityImportTypeCreateEntityWithOriginalIdentifier = EntityImportType("createEntityWithOriginalIdentifier")
+	EntityImportTypeApplyToEntitySpecified             = EntityImportType("applyToEntitySpecified")
+)
+
+func init() {
+	t["EntityImportType"] = reflect.TypeOf((*EntityImportType)(nil)).Elem()
+}
+
+type EntityType string
+
+const (
+	EntityTypeDistributedVirtualSwitch    = EntityType("distributedVirtualSwitch")
+	EntityTypeDistributedVirtualPortgroup = EntityType("distributedVirtualPortgroup")
+)
+
+func init() {
+	t["EntityType"] = reflect.TypeOf((*EntityType)(nil)).Elem()
+}
+
+type EventAlarmExpressionComparisonOperator string
+
+const (
+	EventAlarmExpressionComparisonOperatorEquals           = EventAlarmExpressionComparisonOperator("equals")
+	EventAlarmExpressionComparisonOperatorNotEqualTo       = EventAlarmExpressionComparisonOperator("notEqualTo")
+	EventAlarmExpressionComparisonOperatorStartsWith       = EventAlarmExpressionComparisonOperator("startsWith")
+	EventAlarmExpressionComparisonOperatorDoesNotStartWith = EventAlarmExpressionComparisonOperator("doesNotStartWith")
+	EventAlarmExpressionComparisonOperatorEndsWith         = EventAlarmExpressionComparisonOperator("endsWith")
+	EventAlarmExpressionComparisonOperatorDoesNotEndWith   = EventAlarmExpressionComparisonOperator("doesNotEndWith")
+)
+
+func init() {
+	t["EventAlarmExpressionComparisonOperator"] = reflect.TypeOf((*EventAlarmExpressionComparisonOperator)(nil)).Elem()
+}
+
+type EventCategory string
+
+const (
+	EventCategoryInfo    = EventCategory("info")
+	EventCategoryWarning = EventCategory("warning")
+	EventCategoryError   = EventCategory("error")
+	EventCategoryUser    = EventCategory("user")
+)
+
+func init() {
+	t["EventCategory"] = reflect.TypeOf((*EventCategory)(nil)).Elem()
+}
+
+type EventEventSeverity string
+
+const (
+	EventEventSeverityError   = EventEventSeverity("error")
+	EventEventSeverityWarning = EventEventSeverity("warning")
+	EventEventSeverityInfo    = EventEventSeverity("info")
+	EventEventSeverityUser    = EventEventSeverity("user")
+)
+
+func init() {
+	t["EventEventSeverity"] = reflect.TypeOf((*EventEventSeverity)(nil)).Elem()
+}
+
+type EventFilterSpecRecursionOption string
+
+const (
+	EventFilterSpecRecursionOptionSelf     = EventFilterSpecRecursionOption("self")
+	EventFilterSpecRecursionOptionChildren = EventFilterSpecRecursionOption("children")
+	EventFilterSpecRecursionOptionAll      = EventFilterSpecRecursionOption("all")
+)
+
+func init() {
+	t["EventFilterSpecRecursionOption"] = reflect.TypeOf((*EventFilterSpecRecursionOption)(nil)).Elem()
+}
+
+type FibreChannelPortType string
+
+const (
+	FibreChannelPortTypeFabric       = FibreChannelPortType("fabric")
+	FibreChannelPortTypeLoop         = FibreChannelPortType("loop")
+	FibreChannelPortTypePointToPoint = FibreChannelPortType("pointToPoint")
+	FibreChannelPortTypeUnknown      = FibreChannelPortType("unknown")
+)
+
+func init() {
+	t["FibreChannelPortType"] = reflect.TypeOf((*FibreChannelPortType)(nil)).Elem()
+}
+
+type FileSystemMountInfoVStorageSupportStatus string
+
+const (
+	FileSystemMountInfoVStorageSupportStatusVStorageSupported   = FileSystemMountInfoVStorageSupportStatus("vStorageSupported")
+	FileSystemMountInfoVStorageSupportStatusVStorageUnsupported = FileSystemMountInfoVStorageSupportStatus("vStorageUnsupported")
+	FileSystemMountInfoVStorageSupportStatusVStorageUnknown     = FileSystemMountInfoVStorageSupportStatus("vStorageUnknown")
+)
+
+func init() {
+	t["FileSystemMountInfoVStorageSupportStatus"] = reflect.TypeOf((*FileSystemMountInfoVStorageSupportStatus)(nil)).Elem()
+}
+
+type FtIssuesOnHostHostSelectionType string
+
+const (
+	FtIssuesOnHostHostSelectionTypeUser = FtIssuesOnHostHostSelectionType("user")
+	FtIssuesOnHostHostSelectionTypeVc   = FtIssuesOnHostHostSelectionType("vc")
+	FtIssuesOnHostHostSelectionTypeDrs  = FtIssuesOnHostHostSelectionType("drs")
+)
+
+func init() {
+	t["FtIssuesOnHostHostSelectionType"] = reflect.TypeOf((*FtIssuesOnHostHostSelectionType)(nil)).Elem()
+}
+
+type GuestFileType string
+
+const (
+	GuestFileTypeFile      = GuestFileType("file")
+	GuestFileTypeDirectory = GuestFileType("directory")
+	GuestFileTypeSymlink   = GuestFileType("symlink")
+)
+
+func init() {
+	t["GuestFileType"] = reflect.TypeOf((*GuestFileType)(nil)).Elem()
+}
+
+type GuestInfoAppStateType string
+
+const (
+	GuestInfoAppStateTypeNone              = GuestInfoAppStateType("none")
+	GuestInfoAppStateTypeAppStateOk        = GuestInfoAppStateType("appStateOk")
+	GuestInfoAppStateTypeAppStateNeedReset = GuestInfoAppStateType("appStateNeedReset")
+)
+
+func init() {
+	t["GuestInfoAppStateType"] = reflect.TypeOf((*GuestInfoAppStateType)(nil)).Elem()
+}
+
+type GuestOsDescriptorFirmwareType string
+
+const (
+	GuestOsDescriptorFirmwareTypeBios = GuestOsDescriptorFirmwareType("bios")
+	GuestOsDescriptorFirmwareTypeEfi  = GuestOsDescriptorFirmwareType("efi")
+)
+
+func init() {
+	t["GuestOsDescriptorFirmwareType"] = reflect.TypeOf((*GuestOsDescriptorFirmwareType)(nil)).Elem()
+}
+
+type GuestOsDescriptorSupportLevel string
+
+const (
+	GuestOsDescriptorSupportLevelExperimental = GuestOsDescriptorSupportLevel("experimental")
+	GuestOsDescriptorSupportLevelLegacy       = GuestOsDescriptorSupportLevel("legacy")
+	GuestOsDescriptorSupportLevelTerminated   = GuestOsDescriptorSupportLevel("terminated")
+	GuestOsDescriptorSupportLevelSupported    = GuestOsDescriptorSupportLevel("supported")
+	GuestOsDescriptorSupportLevelUnsupported  = GuestOsDescriptorSupportLevel("unsupported")
+	GuestOsDescriptorSupportLevelDeprecated   = GuestOsDescriptorSupportLevel("deprecated")
+	GuestOsDescriptorSupportLevelTechPreview  = GuestOsDescriptorSupportLevel("techPreview")
+)
+
+func init() {
+	t["GuestOsDescriptorSupportLevel"] = reflect.TypeOf((*GuestOsDescriptorSupportLevel)(nil)).Elem()
+}
+
+type GuestRegKeyWowSpec string
+
+const (
+	GuestRegKeyWowSpecWOWNative = GuestRegKeyWowSpec("WOWNative")
+	GuestRegKeyWowSpecWOW32     = GuestRegKeyWowSpec("WOW32")
+	GuestRegKeyWowSpecWOW64     = GuestRegKeyWowSpec("WOW64")
+)
+
+func init() {
+	t["GuestRegKeyWowSpec"] = reflect.TypeOf((*GuestRegKeyWowSpec)(nil)).Elem()
+}
+
+type HealthUpdateInfoComponentType string
+
+const (
+	HealthUpdateInfoComponentTypeMemory  = HealthUpdateInfoComponentType("Memory")
+	HealthUpdateInfoComponentTypePower   = HealthUpdateInfoComponentType("Power")
+	HealthUpdateInfoComponentTypeFan     = HealthUpdateInfoComponentType("Fan")
+	HealthUpdateInfoComponentTypeNetwork = HealthUpdateInfoComponentType("Network")
+	HealthUpdateInfoComponentTypeStorage = HealthUpdateInfoComponentType("Storage")
+)
+
+func init() {
+	t["HealthUpdateInfoComponentType"] = reflect.TypeOf((*HealthUpdateInfoComponentType)(nil)).Elem()
+}
+
+type HostAccessMode string
+
+const (
+	HostAccessModeAccessNone     = HostAccessMode("accessNone")
+	HostAccessModeAccessAdmin    = HostAccessMode("accessAdmin")
+	HostAccessModeAccessNoAccess = HostAccessMode("accessNoAccess")
+	HostAccessModeAccessReadOnly = HostAccessMode("accessReadOnly")
+	HostAccessModeAccessOther    = HostAccessMode("accessOther")
+)
+
+func init() {
+	t["HostAccessMode"] = reflect.TypeOf((*HostAccessMode)(nil)).Elem()
+}
+
+type HostActiveDirectoryAuthenticationCertificateDigest string
+
+const (
+	HostActiveDirectoryAuthenticationCertificateDigestSHA1 = HostActiveDirectoryAuthenticationCertificateDigest("SHA1")
+)
+
+func init() {
+	t["HostActiveDirectoryAuthenticationCertificateDigest"] = reflect.TypeOf((*HostActiveDirectoryAuthenticationCertificateDigest)(nil)).Elem()
+}
+
+type HostActiveDirectoryInfoDomainMembershipStatus string
+
+const (
+	HostActiveDirectoryInfoDomainMembershipStatusUnknown           = HostActiveDirectoryInfoDomainMembershipStatus("unknown")
+	HostActiveDirectoryInfoDomainMembershipStatusOk                = HostActiveDirectoryInfoDomainMembershipStatus("ok")
+	HostActiveDirectoryInfoDomainMembershipStatusNoServers         = HostActiveDirectoryInfoDomainMembershipStatus("noServers")
+	HostActiveDirectoryInfoDomainMembershipStatusClientTrustBroken = HostActiveDirectoryInfoDomainMembershipStatus("clientTrustBroken")
+	HostActiveDirectoryInfoDomainMembershipStatusServerTrustBroken = HostActiveDirectoryInfoDomainMembershipStatus("serverTrustBroken")
+	HostActiveDirectoryInfoDomainMembershipStatusInconsistentTrust = HostActiveDirectoryInfoDomainMembershipStatus("inconsistentTrust")
+	HostActiveDirectoryInfoDomainMembershipStatusOtherProblem      = HostActiveDirectoryInfoDomainMembershipStatus("otherProblem")
+)
+
+func init() {
+	t["HostActiveDirectoryInfoDomainMembershipStatus"] = reflect.TypeOf((*HostActiveDirectoryInfoDomainMembershipStatus)(nil)).Elem()
+}
+
+type HostCapabilityFtUnsupportedReason string
+
+const (
+	HostCapabilityFtUnsupportedReasonVMotionNotLicensed  = HostCapabilityFtUnsupportedReason("vMotionNotLicensed")
+	HostCapabilityFtUnsupportedReasonMissingVMotionNic   = HostCapabilityFtUnsupportedReason("missingVMotionNic")
+	HostCapabilityFtUnsupportedReasonMissingFTLoggingNic = HostCapabilityFtUnsupportedReason("missingFTLoggingNic")
+	HostCapabilityFtUnsupportedReasonFtNotLicensed       = HostCapabilityFtUnsupportedReason("ftNotLicensed")
+	HostCapabilityFtUnsupportedReasonHaAgentIssue        = HostCapabilityFtUnsupportedReason("haAgentIssue")
+	HostCapabilityFtUnsupportedReasonUnsupportedProduct  = HostCapabilityFtUnsupportedReason("unsupportedProduct")
+	HostCapabilityFtUnsupportedReasonCpuHvUnsupported    = HostCapabilityFtUnsupportedReason("cpuHvUnsupported")
+	HostCapabilityFtUnsupportedReasonCpuHwmmuUnsupported = HostCapabilityFtUnsupportedReason("cpuHwmmuUnsupported")
+	HostCapabilityFtUnsupportedReasonCpuHvDisabled       = HostCapabilityFtUnsupportedReason("cpuHvDisabled")
+)
+
+func init() {
+	t["HostCapabilityFtUnsupportedReason"] = reflect.TypeOf((*HostCapabilityFtUnsupportedReason)(nil)).Elem()
+}
+
+type HostCapabilityVmDirectPathGen2UnsupportedReason string
+
+const (
+	HostCapabilityVmDirectPathGen2UnsupportedReasonHostNptIncompatibleProduct  = HostCapabilityVmDirectPathGen2UnsupportedReason("hostNptIncompatibleProduct")
+	HostCapabilityVmDirectPathGen2UnsupportedReasonHostNptIncompatibleHardware = HostCapabilityVmDirectPathGen2UnsupportedReason("hostNptIncompatibleHardware")
+	HostCapabilityVmDirectPathGen2UnsupportedReasonHostNptDisabled             = HostCapabilityVmDirectPathGen2UnsupportedReason("hostNptDisabled")
+)
+
+func init() {
+	t["HostCapabilityVmDirectPathGen2UnsupportedReason"] = reflect.TypeOf((*HostCapabilityVmDirectPathGen2UnsupportedReason)(nil)).Elem()
+}
+
+type HostCertificateManagerCertificateInfoCertificateStatus string
+
+const (
+	HostCertificateManagerCertificateInfoCertificateStatusUnknown            = HostCertificateManagerCertificateInfoCertificateStatus("unknown")
+	HostCertificateManagerCertificateInfoCertificateStatusExpired            = HostCertificateManagerCertificateInfoCertificateStatus("expired")
+	HostCertificateManagerCertificateInfoCertificateStatusExpiring           = HostCertificateManagerCertificateInfoCertificateStatus("expiring")
+	HostCertificateManagerCertificateInfoCertificateStatusExpiringShortly    = HostCertificateManagerCertificateInfoCertificateStatus("expiringShortly")
+	HostCertificateManagerCertificateInfoCertificateStatusExpirationImminent = HostCertificateManagerCertificateInfoCertificateStatus("expirationImminent")
+	HostCertificateManagerCertificateInfoCertificateStatusGood               = HostCertificateManagerCertificateInfoCertificateStatus("good")
+)
+
+func init() {
+	t["HostCertificateManagerCertificateInfoCertificateStatus"] = reflect.TypeOf((*HostCertificateManagerCertificateInfoCertificateStatus)(nil)).Elem()
+}
+
+type HostConfigChangeMode string
+
+const (
+	HostConfigChangeModeModify  = HostConfigChangeMode("modify")
+	HostConfigChangeModeReplace = HostConfigChangeMode("replace")
+)
+
+func init() {
+	t["HostConfigChangeMode"] = reflect.TypeOf((*HostConfigChangeMode)(nil)).Elem()
+}
+
+type HostConfigChangeOperation string
+
+const (
+	HostConfigChangeOperationAdd    = HostConfigChangeOperation("add")
+	HostConfigChangeOperationRemove = HostConfigChangeOperation("remove")
+	HostConfigChangeOperationEdit   = HostConfigChangeOperation("edit")
+	HostConfigChangeOperationIgnore = HostConfigChangeOperation("ignore")
+)
+
+func init() {
+	t["HostConfigChangeOperation"] = reflect.TypeOf((*HostConfigChangeOperation)(nil)).Elem()
+}
+
+type HostCpuPackageVendor string
+
+const (
+	HostCpuPackageVendorUnknown = HostCpuPackageVendor("unknown")
+	HostCpuPackageVendorIntel   = HostCpuPackageVendor("intel")
+	HostCpuPackageVendorAmd     = HostCpuPackageVendor("amd")
+)
+
+func init() {
+	t["HostCpuPackageVendor"] = reflect.TypeOf((*HostCpuPackageVendor)(nil)).Elem()
+}
+
+type HostCpuPowerManagementInfoPolicyType string
+
+const (
+	HostCpuPowerManagementInfoPolicyTypeOff           = HostCpuPowerManagementInfoPolicyType("off")
+	HostCpuPowerManagementInfoPolicyTypeStaticPolicy  = HostCpuPowerManagementInfoPolicyType("staticPolicy")
+	HostCpuPowerManagementInfoPolicyTypeDynamicPolicy = HostCpuPowerManagementInfoPolicyType("dynamicPolicy")
+)
+
+func init() {
+	t["HostCpuPowerManagementInfoPolicyType"] = reflect.TypeOf((*HostCpuPowerManagementInfoPolicyType)(nil)).Elem()
+}
+
+type HostCryptoState string
+
+const (
+	HostCryptoStateIncapable = HostCryptoState("incapable")
+	HostCryptoStatePrepared  = HostCryptoState("prepared")
+	HostCryptoStateSafe      = HostCryptoState("safe")
+)
+
+func init() {
+	t["HostCryptoState"] = reflect.TypeOf((*HostCryptoState)(nil)).Elem()
+}
+
+type HostDasErrorEventHostDasErrorReason string
+
+const (
+	HostDasErrorEventHostDasErrorReasonConfigFailed               = HostDasErrorEventHostDasErrorReason("configFailed")
+	HostDasErrorEventHostDasErrorReasonTimeout                    = HostDasErrorEventHostDasErrorReason("timeout")
+	HostDasErrorEventHostDasErrorReasonCommunicationInitFailed    = HostDasErrorEventHostDasErrorReason("communicationInitFailed")
+	HostDasErrorEventHostDasErrorReasonHealthCheckScriptFailed    = HostDasErrorEventHostDasErrorReason("healthCheckScriptFailed")
+	HostDasErrorEventHostDasErrorReasonAgentFailed                = HostDasErrorEventHostDasErrorReason("agentFailed")
+	HostDasErrorEventHostDasErrorReasonAgentShutdown              = HostDasErrorEventHostDasErrorReason("agentShutdown")
+	HostDasErrorEventHostDasErrorReasonIsolationAddressUnpingable = HostDasErrorEventHostDasErrorReason("isolationAddressUnpingable")
+	HostDasErrorEventHostDasErrorReasonOther                      = HostDasErrorEventHostDasErrorReason("other")
+)
+
+func init() {
+	t["HostDasErrorEventHostDasErrorReason"] = reflect.TypeOf((*HostDasErrorEventHostDasErrorReason)(nil)).Elem()
+}
+
+type HostDigestInfoDigestMethodType string
+
+const (
+	HostDigestInfoDigestMethodTypeSHA1 = HostDigestInfoDigestMethodType("SHA1")
+	HostDigestInfoDigestMethodTypeMD5  = HostDigestInfoDigestMethodType("MD5")
+)
+
+func init() {
+	t["HostDigestInfoDigestMethodType"] = reflect.TypeOf((*HostDigestInfoDigestMethodType)(nil)).Elem()
+}
+
+type HostDisconnectedEventReasonCode string
+
+const (
+	HostDisconnectedEventReasonCodeSslThumbprintVerifyFailed = HostDisconnectedEventReasonCode("sslThumbprintVerifyFailed")
+	HostDisconnectedEventReasonCodeLicenseExpired            = HostDisconnectedEventReasonCode("licenseExpired")
+	HostDisconnectedEventReasonCodeAgentUpgrade              = HostDisconnectedEventReasonCode("agentUpgrade")
+	HostDisconnectedEventReasonCodeUserRequest               = HostDisconnectedEventReasonCode("userRequest")
+	HostDisconnectedEventReasonCodeInsufficientLicenses      = HostDisconnectedEventReasonCode("insufficientLicenses")
+	HostDisconnectedEventReasonCodeAgentOutOfDate            = HostDisconnectedEventReasonCode("agentOutOfDate")
+	HostDisconnectedEventReasonCodePasswordDecryptFailure    = HostDisconnectedEventReasonCode("passwordDecryptFailure")
+	HostDisconnectedEventReasonCodeUnknown                   = HostDisconnectedEventReasonCode("unknown")
+	HostDisconnectedEventReasonCodeVcVRAMCapacityExceeded    = HostDisconnectedEventReasonCode("vcVRAMCapacityExceeded")
+)
+
+func init() {
+	t["HostDisconnectedEventReasonCode"] = reflect.TypeOf((*HostDisconnectedEventReasonCode)(nil)).Elem()
+}
+
+type HostDiskPartitionInfoPartitionFormat string
+
+const (
+	HostDiskPartitionInfoPartitionFormatGpt     = HostDiskPartitionInfoPartitionFormat("gpt")
+	HostDiskPartitionInfoPartitionFormatMbr     = HostDiskPartitionInfoPartitionFormat("mbr")
+	HostDiskPartitionInfoPartitionFormatUnknown = HostDiskPartitionInfoPartitionFormat("unknown")
+)
+
+func init() {
+	t["HostDiskPartitionInfoPartitionFormat"] = reflect.TypeOf((*HostDiskPartitionInfoPartitionFormat)(nil)).Elem()
+}
+
+type HostDiskPartitionInfoType string
+
+const (
+	HostDiskPartitionInfoTypeNone          = HostDiskPartitionInfoType("none")
+	HostDiskPartitionInfoTypeVmfs          = HostDiskPartitionInfoType("vmfs")
+	HostDiskPartitionInfoTypeLinuxNative   = HostDiskPartitionInfoType("linuxNative")
+	HostDiskPartitionInfoTypeLinuxSwap     = HostDiskPartitionInfoType("linuxSwap")
+	HostDiskPartitionInfoTypeExtended      = HostDiskPartitionInfoType("extended")
+	HostDiskPartitionInfoTypeNtfs          = HostDiskPartitionInfoType("ntfs")
+	HostDiskPartitionInfoTypeVmkDiagnostic = HostDiskPartitionInfoType("vmkDiagnostic")
+	HostDiskPartitionInfoTypeVffs          = HostDiskPartitionInfoType("vffs")
+)
+
+func init() {
+	t["HostDiskPartitionInfoType"] = reflect.TypeOf((*HostDiskPartitionInfoType)(nil)).Elem()
+}
+
+type HostFeatureVersionKey string
+
+const (
+	HostFeatureVersionKeyFaultTolerance = HostFeatureVersionKey("faultTolerance")
+)
+
+func init() {
+	t["HostFeatureVersionKey"] = reflect.TypeOf((*HostFeatureVersionKey)(nil)).Elem()
+}
+
+type HostFileSystemVolumeFileSystemType string
+
+const (
+	HostFileSystemVolumeFileSystemTypeVMFS  = HostFileSystemVolumeFileSystemType("VMFS")
+	HostFileSystemVolumeFileSystemTypeNFS   = HostFileSystemVolumeFileSystemType("NFS")
+	HostFileSystemVolumeFileSystemTypeNFS41 = HostFileSystemVolumeFileSystemType("NFS41")
+	HostFileSystemVolumeFileSystemTypeCIFS  = HostFileSystemVolumeFileSystemType("CIFS")
+	HostFileSystemVolumeFileSystemTypeVsan  = HostFileSystemVolumeFileSystemType("vsan")
+	HostFileSystemVolumeFileSystemTypeVFFS  = HostFileSystemVolumeFileSystemType("VFFS")
+	HostFileSystemVolumeFileSystemTypeVVOL  = HostFileSystemVolumeFileSystemType("VVOL")
+	HostFileSystemVolumeFileSystemTypeOTHER = HostFileSystemVolumeFileSystemType("OTHER")
+)
+
+func init() {
+	t["HostFileSystemVolumeFileSystemType"] = reflect.TypeOf((*HostFileSystemVolumeFileSystemType)(nil)).Elem()
+}
+
+type HostFirewallRuleDirection string
+
+const (
+	HostFirewallRuleDirectionInbound  = HostFirewallRuleDirection("inbound")
+	HostFirewallRuleDirectionOutbound = HostFirewallRuleDirection("outbound")
+)
+
+func init() {
+	t["HostFirewallRuleDirection"] = reflect.TypeOf((*HostFirewallRuleDirection)(nil)).Elem()
+}
+
+type HostFirewallRulePortType string
+
+const (
+	HostFirewallRulePortTypeSrc = HostFirewallRulePortType("src")
+	HostFirewallRulePortTypeDst = HostFirewallRulePortType("dst")
+)
+
+func init() {
+	t["HostFirewallRulePortType"] = reflect.TypeOf((*HostFirewallRulePortType)(nil)).Elem()
+}
+
+type HostFirewallRuleProtocol string
+
+const (
+	HostFirewallRuleProtocolTcp = HostFirewallRuleProtocol("tcp")
+	HostFirewallRuleProtocolUdp = HostFirewallRuleProtocol("udp")
+)
+
+func init() {
+	t["HostFirewallRuleProtocol"] = reflect.TypeOf((*HostFirewallRuleProtocol)(nil)).Elem()
+}
+
+type HostGraphicsConfigGraphicsType string
+
+const (
+	HostGraphicsConfigGraphicsTypeShared       = HostGraphicsConfigGraphicsType("shared")
+	HostGraphicsConfigGraphicsTypeSharedDirect = HostGraphicsConfigGraphicsType("sharedDirect")
+)
+
+func init() {
+	t["HostGraphicsConfigGraphicsType"] = reflect.TypeOf((*HostGraphicsConfigGraphicsType)(nil)).Elem()
+}
+
+type HostGraphicsConfigSharedPassthruAssignmentPolicy string
+
+const (
+	HostGraphicsConfigSharedPassthruAssignmentPolicyPerformance   = HostGraphicsConfigSharedPassthruAssignmentPolicy("performance")
+	HostGraphicsConfigSharedPassthruAssignmentPolicyConsolidation = HostGraphicsConfigSharedPassthruAssignmentPolicy("consolidation")
+)
+
+func init() {
+	t["HostGraphicsConfigSharedPassthruAssignmentPolicy"] = reflect.TypeOf((*HostGraphicsConfigSharedPassthruAssignmentPolicy)(nil)).Elem()
+}
+
+type HostGraphicsInfoGraphicsType string
+
+const (
+	HostGraphicsInfoGraphicsTypeBasic        = HostGraphicsInfoGraphicsType("basic")
+	HostGraphicsInfoGraphicsTypeShared       = HostGraphicsInfoGraphicsType("shared")
+	HostGraphicsInfoGraphicsTypeDirect       = HostGraphicsInfoGraphicsType("direct")
+	HostGraphicsInfoGraphicsTypeSharedDirect = HostGraphicsInfoGraphicsType("sharedDirect")
+)
+
+func init() {
+	t["HostGraphicsInfoGraphicsType"] = reflect.TypeOf((*HostGraphicsInfoGraphicsType)(nil)).Elem()
+}
+
+type HostHardwareElementStatus string
+
+const (
+	HostHardwareElementStatusUnknown = HostHardwareElementStatus("Unknown")
+	HostHardwareElementStatusGreen   = HostHardwareElementStatus("Green")
+	HostHardwareElementStatusYellow  = HostHardwareElementStatus("Yellow")
+	HostHardwareElementStatusRed     = HostHardwareElementStatus("Red")
+)
+
+func init() {
+	t["HostHardwareElementStatus"] = reflect.TypeOf((*HostHardwareElementStatus)(nil)).Elem()
+}
+
+type HostHasComponentFailureHostComponentType string
+
+const (
+	HostHasComponentFailureHostComponentTypeDatastore = HostHasComponentFailureHostComponentType("Datastore")
+)
+
+func init() {
+	t["HostHasComponentFailureHostComponentType"] = reflect.TypeOf((*HostHasComponentFailureHostComponentType)(nil)).Elem()
+}
+
+type HostImageAcceptanceLevel string
+
+const (
+	HostImageAcceptanceLevelVmware_certified = HostImageAcceptanceLevel("vmware_certified")
+	HostImageAcceptanceLevelVmware_accepted  = HostImageAcceptanceLevel("vmware_accepted")
+	HostImageAcceptanceLevelPartner          = HostImageAcceptanceLevel("partner")
+	HostImageAcceptanceLevelCommunity        = HostImageAcceptanceLevel("community")
+)
+
+func init() {
+	t["HostImageAcceptanceLevel"] = reflect.TypeOf((*HostImageAcceptanceLevel)(nil)).Elem()
+}
+
+type HostIncompatibleForFaultToleranceReason string
+
+const (
+	HostIncompatibleForFaultToleranceReasonProduct   = HostIncompatibleForFaultToleranceReason("product")
+	HostIncompatibleForFaultToleranceReasonProcessor = HostIncompatibleForFaultToleranceReason("processor")
+)
+
+func init() {
+	t["HostIncompatibleForFaultToleranceReason"] = reflect.TypeOf((*HostIncompatibleForFaultToleranceReason)(nil)).Elem()
+}
+
+type HostIncompatibleForRecordReplayReason string
+
+const (
+	HostIncompatibleForRecordReplayReasonProduct   = HostIncompatibleForRecordReplayReason("product")
+	HostIncompatibleForRecordReplayReasonProcessor = HostIncompatibleForRecordReplayReason("processor")
+)
+
+func init() {
+	t["HostIncompatibleForRecordReplayReason"] = reflect.TypeOf((*HostIncompatibleForRecordReplayReason)(nil)).Elem()
+}
+
+type HostInternetScsiHbaChapAuthenticationType string
+
+const (
+	HostInternetScsiHbaChapAuthenticationTypeChapProhibited  = HostInternetScsiHbaChapAuthenticationType("chapProhibited")
+	HostInternetScsiHbaChapAuthenticationTypeChapDiscouraged = HostInternetScsiHbaChapAuthenticationType("chapDiscouraged")
+	HostInternetScsiHbaChapAuthenticationTypeChapPreferred   = HostInternetScsiHbaChapAuthenticationType("chapPreferred")
+	HostInternetScsiHbaChapAuthenticationTypeChapRequired    = HostInternetScsiHbaChapAuthenticationType("chapRequired")
+)
+
+func init() {
+	t["HostInternetScsiHbaChapAuthenticationType"] = reflect.TypeOf((*HostInternetScsiHbaChapAuthenticationType)(nil)).Elem()
+}
+
+type HostInternetScsiHbaDigestType string
+
+const (
+	HostInternetScsiHbaDigestTypeDigestProhibited  = HostInternetScsiHbaDigestType("digestProhibited")
+	HostInternetScsiHbaDigestTypeDigestDiscouraged = HostInternetScsiHbaDigestType("digestDiscouraged")
+	HostInternetScsiHbaDigestTypeDigestPreferred   = HostInternetScsiHbaDigestType("digestPreferred")
+	HostInternetScsiHbaDigestTypeDigestRequired    = HostInternetScsiHbaDigestType("digestRequired")
+)
+
+func init() {
+	t["HostInternetScsiHbaDigestType"] = reflect.TypeOf((*HostInternetScsiHbaDigestType)(nil)).Elem()
+}
+
+type HostInternetScsiHbaIscsiIpv6AddressAddressConfigurationType string
+
+const (
+	HostInternetScsiHbaIscsiIpv6AddressAddressConfigurationTypeDHCP           = HostInternetScsiHbaIscsiIpv6AddressAddressConfigurationType("DHCP")
+	HostInternetScsiHbaIscsiIpv6AddressAddressConfigurationTypeAutoConfigured = HostInternetScsiHbaIscsiIpv6AddressAddressConfigurationType("AutoConfigured")
+	HostInternetScsiHbaIscsiIpv6AddressAddressConfigurationTypeStatic         = HostInternetScsiHbaIscsiIpv6AddressAddressConfigurationType("Static")
+	HostInternetScsiHbaIscsiIpv6AddressAddressConfigurationTypeOther          = HostInternetScsiHbaIscsiIpv6AddressAddressConfigurationType("Other")
+)
+
+func init() {
+	t["HostInternetScsiHbaIscsiIpv6AddressAddressConfigurationType"] = reflect.TypeOf((*HostInternetScsiHbaIscsiIpv6AddressAddressConfigurationType)(nil)).Elem()
+}
+
+type HostInternetScsiHbaIscsiIpv6AddressIPv6AddressOperation string
+
+const (
+	HostInternetScsiHbaIscsiIpv6AddressIPv6AddressOperationAdd    = HostInternetScsiHbaIscsiIpv6AddressIPv6AddressOperation("add")
+	HostInternetScsiHbaIscsiIpv6AddressIPv6AddressOperationRemove = HostInternetScsiHbaIscsiIpv6AddressIPv6AddressOperation("remove")
+)
+
+func init() {
+	t["HostInternetScsiHbaIscsiIpv6AddressIPv6AddressOperation"] = reflect.TypeOf((*HostInternetScsiHbaIscsiIpv6AddressIPv6AddressOperation)(nil)).Elem()
+}
+
+type HostInternetScsiHbaNetworkBindingSupportType string
+
+const (
+	HostInternetScsiHbaNetworkBindingSupportTypeNotsupported = HostInternetScsiHbaNetworkBindingSupportType("notsupported")
+	HostInternetScsiHbaNetworkBindingSupportTypeOptional     = HostInternetScsiHbaNetworkBindingSupportType("optional")
+	HostInternetScsiHbaNetworkBindingSupportTypeRequired     = HostInternetScsiHbaNetworkBindingSupportType("required")
+)
+
+func init() {
+	t["HostInternetScsiHbaNetworkBindingSupportType"] = reflect.TypeOf((*HostInternetScsiHbaNetworkBindingSupportType)(nil)).Elem()
+}
+
+type HostInternetScsiHbaStaticTargetTargetDiscoveryMethod string
+
+const (
+	HostInternetScsiHbaStaticTargetTargetDiscoveryMethodStaticMethod     = HostInternetScsiHbaStaticTargetTargetDiscoveryMethod("staticMethod")
+	HostInternetScsiHbaStaticTargetTargetDiscoveryMethodSendTargetMethod = HostInternetScsiHbaStaticTargetTargetDiscoveryMethod("sendTargetMethod")
+	HostInternetScsiHbaStaticTargetTargetDiscoveryMethodSlpMethod        = HostInternetScsiHbaStaticTargetTargetDiscoveryMethod("slpMethod")
+	HostInternetScsiHbaStaticTargetTargetDiscoveryMethodIsnsMethod       = HostInternetScsiHbaStaticTargetTargetDiscoveryMethod("isnsMethod")
+	HostInternetScsiHbaStaticTargetTargetDiscoveryMethodUnknownMethod    = HostInternetScsiHbaStaticTargetTargetDiscoveryMethod("unknownMethod")
+)
+
+func init() {
+	t["HostInternetScsiHbaStaticTargetTargetDiscoveryMethod"] = reflect.TypeOf((*HostInternetScsiHbaStaticTargetTargetDiscoveryMethod)(nil)).Elem()
+}
+
+type HostIpConfigIpV6AddressConfigType string
+
+const (
+	HostIpConfigIpV6AddressConfigTypeOther     = HostIpConfigIpV6AddressConfigType("other")
+	HostIpConfigIpV6AddressConfigTypeManual    = HostIpConfigIpV6AddressConfigType("manual")
+	HostIpConfigIpV6AddressConfigTypeDhcp      = HostIpConfigIpV6AddressConfigType("dhcp")
+	HostIpConfigIpV6AddressConfigTypeLinklayer = HostIpConfigIpV6AddressConfigType("linklayer")
+	HostIpConfigIpV6AddressConfigTypeRandom    = HostIpConfigIpV6AddressConfigType("random")
+)
+
+func init() {
+	t["HostIpConfigIpV6AddressConfigType"] = reflect.TypeOf((*HostIpConfigIpV6AddressConfigType)(nil)).Elem()
+}
+
+type HostIpConfigIpV6AddressStatus string
+
+const (
+	HostIpConfigIpV6AddressStatusPreferred    = HostIpConfigIpV6AddressStatus("preferred")
+	HostIpConfigIpV6AddressStatusDeprecated   = HostIpConfigIpV6AddressStatus("deprecated")
+	HostIpConfigIpV6AddressStatusInvalid      = HostIpConfigIpV6AddressStatus("invalid")
+	HostIpConfigIpV6AddressStatusInaccessible = HostIpConfigIpV6AddressStatus("inaccessible")
+	HostIpConfigIpV6AddressStatusUnknown      = HostIpConfigIpV6AddressStatus("unknown")
+	HostIpConfigIpV6AddressStatusTentative    = HostIpConfigIpV6AddressStatus("tentative")
+	HostIpConfigIpV6AddressStatusDuplicate    = HostIpConfigIpV6AddressStatus("duplicate")
+)
+
+func init() {
+	t["HostIpConfigIpV6AddressStatus"] = reflect.TypeOf((*HostIpConfigIpV6AddressStatus)(nil)).Elem()
+}
+
+type HostLicensableResourceKey string
+
+const (
+	HostLicensableResourceKeyNumCpuPackages = HostLicensableResourceKey("numCpuPackages")
+	HostLicensableResourceKeyNumCpuCores    = HostLicensableResourceKey("numCpuCores")
+	HostLicensableResourceKeyMemorySize     = HostLicensableResourceKey("memorySize")
+	HostLicensableResourceKeyMemoryForVms   = HostLicensableResourceKey("memoryForVms")
+	HostLicensableResourceKeyNumVmsStarted  = HostLicensableResourceKey("numVmsStarted")
+	HostLicensableResourceKeyNumVmsStarting = HostLicensableResourceKey("numVmsStarting")
+)
+
+func init() {
+	t["HostLicensableResourceKey"] = reflect.TypeOf((*HostLicensableResourceKey)(nil)).Elem()
+}
+
+type HostLockdownMode string
+
+const (
+	HostLockdownModeLockdownDisabled = HostLockdownMode("lockdownDisabled")
+	HostLockdownModeLockdownNormal   = HostLockdownMode("lockdownNormal")
+	HostLockdownModeLockdownStrict   = HostLockdownMode("lockdownStrict")
+)
+
+func init() {
+	t["HostLockdownMode"] = reflect.TypeOf((*HostLockdownMode)(nil)).Elem()
+}
+
+type HostLowLevelProvisioningManagerFileType string
+
+const (
+	HostLowLevelProvisioningManagerFileTypeFile        = HostLowLevelProvisioningManagerFileType("File")
+	HostLowLevelProvisioningManagerFileTypeVirtualDisk = HostLowLevelProvisioningManagerFileType("VirtualDisk")
+	HostLowLevelProvisioningManagerFileTypeDirectory   = HostLowLevelProvisioningManagerFileType("Directory")
+)
+
+func init() {
+	t["HostLowLevelProvisioningManagerFileType"] = reflect.TypeOf((*HostLowLevelProvisioningManagerFileType)(nil)).Elem()
+}
+
+type HostLowLevelProvisioningManagerReloadTarget string
+
+const (
+	HostLowLevelProvisioningManagerReloadTargetCurrentConfig  = HostLowLevelProvisioningManagerReloadTarget("currentConfig")
+	HostLowLevelProvisioningManagerReloadTargetSnapshotConfig = HostLowLevelProvisioningManagerReloadTarget("snapshotConfig")
+)
+
+func init() {
+	t["HostLowLevelProvisioningManagerReloadTarget"] = reflect.TypeOf((*HostLowLevelProvisioningManagerReloadTarget)(nil)).Elem()
+}
+
+type HostMountInfoInaccessibleReason string
+
+const (
+	HostMountInfoInaccessibleReasonAllPathsDown_Start   = HostMountInfoInaccessibleReason("AllPathsDown_Start")
+	HostMountInfoInaccessibleReasonAllPathsDown_Timeout = HostMountInfoInaccessibleReason("AllPathsDown_Timeout")
+	HostMountInfoInaccessibleReasonPermanentDeviceLoss  = HostMountInfoInaccessibleReason("PermanentDeviceLoss")
+)
+
+func init() {
+	t["HostMountInfoInaccessibleReason"] = reflect.TypeOf((*HostMountInfoInaccessibleReason)(nil)).Elem()
+}
+
+type HostMountMode string
+
+const (
+	HostMountModeReadWrite = HostMountMode("readWrite")
+	HostMountModeReadOnly  = HostMountMode("readOnly")
+)
+
+func init() {
+	t["HostMountMode"] = reflect.TypeOf((*HostMountMode)(nil)).Elem()
+}
+
+type HostNasVolumeSecurityType string
+
+const (
+	HostNasVolumeSecurityTypeAUTH_SYS  = HostNasVolumeSecurityType("AUTH_SYS")
+	HostNasVolumeSecurityTypeSEC_KRB5  = HostNasVolumeSecurityType("SEC_KRB5")
+	HostNasVolumeSecurityTypeSEC_KRB5I = HostNasVolumeSecurityType("SEC_KRB5I")
+)
+
+func init() {
+	t["HostNasVolumeSecurityType"] = reflect.TypeOf((*HostNasVolumeSecurityType)(nil)).Elem()
+}
+
+type HostNetStackInstanceCongestionControlAlgorithmType string
+
+const (
+	HostNetStackInstanceCongestionControlAlgorithmTypeNewreno = HostNetStackInstanceCongestionControlAlgorithmType("newreno")
+	HostNetStackInstanceCongestionControlAlgorithmTypeCubic   = HostNetStackInstanceCongestionControlAlgorithmType("cubic")
+)
+
+func init() {
+	t["HostNetStackInstanceCongestionControlAlgorithmType"] = reflect.TypeOf((*HostNetStackInstanceCongestionControlAlgorithmType)(nil)).Elem()
+}
+
+type HostNetStackInstanceSystemStackKey string
+
+const (
+	HostNetStackInstanceSystemStackKeyDefaultTcpipStack   = HostNetStackInstanceSystemStackKey("defaultTcpipStack")
+	HostNetStackInstanceSystemStackKeyVmotion             = HostNetStackInstanceSystemStackKey("vmotion")
+	HostNetStackInstanceSystemStackKeyVSphereProvisioning = HostNetStackInstanceSystemStackKey("vSphereProvisioning")
+)
+
+func init() {
+	t["HostNetStackInstanceSystemStackKey"] = reflect.TypeOf((*HostNetStackInstanceSystemStackKey)(nil)).Elem()
+}
+
+type HostNumericSensorHealthState string
+
+const (
+	HostNumericSensorHealthStateUnknown = HostNumericSensorHealthState("unknown")
+	HostNumericSensorHealthStateGreen   = HostNumericSensorHealthState("green")
+	HostNumericSensorHealthStateYellow  = HostNumericSensorHealthState("yellow")
+	HostNumericSensorHealthStateRed     = HostNumericSensorHealthState("red")
+)
+
+func init() {
+	t["HostNumericSensorHealthState"] = reflect.TypeOf((*HostNumericSensorHealthState)(nil)).Elem()
+}
+
+type HostNumericSensorType string
+
+const (
+	HostNumericSensorTypeFan         = HostNumericSensorType("fan")
+	HostNumericSensorTypePower       = HostNumericSensorType("power")
+	HostNumericSensorTypeTemperature = HostNumericSensorType("temperature")
+	HostNumericSensorTypeVoltage     = HostNumericSensorType("voltage")
+	HostNumericSensorTypeOther       = HostNumericSensorType("other")
+	HostNumericSensorTypeProcessor   = HostNumericSensorType("processor")
+	HostNumericSensorTypeMemory      = HostNumericSensorType("memory")
+	HostNumericSensorTypeStorage     = HostNumericSensorType("storage")
+	HostNumericSensorTypeSystemBoard = HostNumericSensorType("systemBoard")
+	HostNumericSensorTypeBattery     = HostNumericSensorType("battery")
+	HostNumericSensorTypeBios        = HostNumericSensorType("bios")
+	HostNumericSensorTypeCable       = HostNumericSensorType("cable")
+	HostNumericSensorTypeWatchdog    = HostNumericSensorType("watchdog")
+)
+
+func init() {
+	t["HostNumericSensorType"] = reflect.TypeOf((*HostNumericSensorType)(nil)).Elem()
+}
+
+type HostOpaqueSwitchOpaqueSwitchState string
+
+const (
+	HostOpaqueSwitchOpaqueSwitchStateUp      = HostOpaqueSwitchOpaqueSwitchState("up")
+	HostOpaqueSwitchOpaqueSwitchStateWarning = HostOpaqueSwitchOpaqueSwitchState("warning")
+	HostOpaqueSwitchOpaqueSwitchStateDown    = HostOpaqueSwitchOpaqueSwitchState("down")
+)
+
+func init() {
+	t["HostOpaqueSwitchOpaqueSwitchState"] = reflect.TypeOf((*HostOpaqueSwitchOpaqueSwitchState)(nil)).Elem()
+}
+
+type HostPatchManagerInstallState string
+
+const (
+	HostPatchManagerInstallStateHostRestarted = HostPatchManagerInstallState("hostRestarted")
+	HostPatchManagerInstallStateImageActive   = HostPatchManagerInstallState("imageActive")
+)
+
+func init() {
+	t["HostPatchManagerInstallState"] = reflect.TypeOf((*HostPatchManagerInstallState)(nil)).Elem()
+}
+
+type HostPatchManagerIntegrityStatus string
+
+const (
+	HostPatchManagerIntegrityStatusValidated           = HostPatchManagerIntegrityStatus("validated")
+	HostPatchManagerIntegrityStatusKeyNotFound         = HostPatchManagerIntegrityStatus("keyNotFound")
+	HostPatchManagerIntegrityStatusKeyRevoked          = HostPatchManagerIntegrityStatus("keyRevoked")
+	HostPatchManagerIntegrityStatusKeyExpired          = HostPatchManagerIntegrityStatus("keyExpired")
+	HostPatchManagerIntegrityStatusDigestMismatch      = HostPatchManagerIntegrityStatus("digestMismatch")
+	HostPatchManagerIntegrityStatusNotEnoughSignatures = HostPatchManagerIntegrityStatus("notEnoughSignatures")
+	HostPatchManagerIntegrityStatusValidationError     = HostPatchManagerIntegrityStatus("validationError")
+)
+
+func init() {
+	t["HostPatchManagerIntegrityStatus"] = reflect.TypeOf((*HostPatchManagerIntegrityStatus)(nil)).Elem()
+}
+
+type HostPatchManagerReason string
+
+const (
+	HostPatchManagerReasonObsoleted         = HostPatchManagerReason("obsoleted")
+	HostPatchManagerReasonMissingPatch      = HostPatchManagerReason("missingPatch")
+	HostPatchManagerReasonMissingLib        = HostPatchManagerReason("missingLib")
+	HostPatchManagerReasonHasDependentPatch = HostPatchManagerReason("hasDependentPatch")
+	HostPatchManagerReasonConflictPatch     = HostPatchManagerReason("conflictPatch")
+	HostPatchManagerReasonConflictLib       = HostPatchManagerReason("conflictLib")
+)
+
+func init() {
+	t["HostPatchManagerReason"] = reflect.TypeOf((*HostPatchManagerReason)(nil)).Elem()
+}
+
+type HostPowerOperationType string
+
+const (
+	HostPowerOperationTypePowerOn  = HostPowerOperationType("powerOn")
+	HostPowerOperationTypePowerOff = HostPowerOperationType("powerOff")
+)
+
+func init() {
+	t["HostPowerOperationType"] = reflect.TypeOf((*HostPowerOperationType)(nil)).Elem()
+}
+
+type HostProfileManagerAnswerFileStatus string
+
+const (
+	HostProfileManagerAnswerFileStatusValid   = HostProfileManagerAnswerFileStatus("valid")
+	HostProfileManagerAnswerFileStatusInvalid = HostProfileManagerAnswerFileStatus("invalid")
+	HostProfileManagerAnswerFileStatusUnknown = HostProfileManagerAnswerFileStatus("unknown")
+)
+
+func init() {
+	t["HostProfileManagerAnswerFileStatus"] = reflect.TypeOf((*HostProfileManagerAnswerFileStatus)(nil)).Elem()
+}
+
+type HostProfileManagerTaskListRequirement string
+
+const (
+	HostProfileManagerTaskListRequirementMaintenanceModeRequired = HostProfileManagerTaskListRequirement("maintenanceModeRequired")
+	HostProfileManagerTaskListRequirementRebootRequired          = HostProfileManagerTaskListRequirement("rebootRequired")
+)
+
+func init() {
+	t["HostProfileManagerTaskListRequirement"] = reflect.TypeOf((*HostProfileManagerTaskListRequirement)(nil)).Elem()
+}
+
+type HostProtocolEndpointPEType string
+
+const (
+	HostProtocolEndpointPETypeBlock = HostProtocolEndpointPEType("block")
+	HostProtocolEndpointPETypeNas   = HostProtocolEndpointPEType("nas")
+)
+
+func init() {
+	t["HostProtocolEndpointPEType"] = reflect.TypeOf((*HostProtocolEndpointPEType)(nil)).Elem()
+}
+
+type HostProtocolEndpointProtocolEndpointType string
+
+const (
+	HostProtocolEndpointProtocolEndpointTypeScsi  = HostProtocolEndpointProtocolEndpointType("scsi")
+	HostProtocolEndpointProtocolEndpointTypeNfs   = HostProtocolEndpointProtocolEndpointType("nfs")
+	HostProtocolEndpointProtocolEndpointTypeNfs4x = HostProtocolEndpointProtocolEndpointType("nfs4x")
+)
+
+func init() {
+	t["HostProtocolEndpointProtocolEndpointType"] = reflect.TypeOf((*HostProtocolEndpointProtocolEndpointType)(nil)).Elem()
+}
+
+type HostReplayUnsupportedReason string
+
+const (
+	HostReplayUnsupportedReasonIncompatibleProduct = HostReplayUnsupportedReason("incompatibleProduct")
+	HostReplayUnsupportedReasonIncompatibleCpu     = HostReplayUnsupportedReason("incompatibleCpu")
+	HostReplayUnsupportedReasonHvDisabled          = HostReplayUnsupportedReason("hvDisabled")
+	HostReplayUnsupportedReasonCpuidLimitSet       = HostReplayUnsupportedReason("cpuidLimitSet")
+	HostReplayUnsupportedReasonOldBIOS             = HostReplayUnsupportedReason("oldBIOS")
+	HostReplayUnsupportedReasonUnknown             = HostReplayUnsupportedReason("unknown")
+)
+
+func init() {
+	t["HostReplayUnsupportedReason"] = reflect.TypeOf((*HostReplayUnsupportedReason)(nil)).Elem()
+}
+
+type HostRuntimeInfoNetStackInstanceRuntimeInfoState string
+
+const (
+	HostRuntimeInfoNetStackInstanceRuntimeInfoStateInactive     = HostRuntimeInfoNetStackInstanceRuntimeInfoState("inactive")
+	HostRuntimeInfoNetStackInstanceRuntimeInfoStateActive       = HostRuntimeInfoNetStackInstanceRuntimeInfoState("active")
+	HostRuntimeInfoNetStackInstanceRuntimeInfoStateDeactivating = HostRuntimeInfoNetStackInstanceRuntimeInfoState("deactivating")
+	HostRuntimeInfoNetStackInstanceRuntimeInfoStateActivating   = HostRuntimeInfoNetStackInstanceRuntimeInfoState("activating")
+)
+
+func init() {
+	t["HostRuntimeInfoNetStackInstanceRuntimeInfoState"] = reflect.TypeOf((*HostRuntimeInfoNetStackInstanceRuntimeInfoState)(nil)).Elem()
+}
+
+type HostServicePolicy string
+
+const (
+	HostServicePolicyOn        = HostServicePolicy("on")
+	HostServicePolicyAutomatic = HostServicePolicy("automatic")
+	HostServicePolicyOff       = HostServicePolicy("off")
+)
+
+func init() {
+	t["HostServicePolicy"] = reflect.TypeOf((*HostServicePolicy)(nil)).Elem()
+}
+
+type HostSnmpAgentCapability string
+
+const (
+	HostSnmpAgentCapabilityCOMPLETE      = HostSnmpAgentCapability("COMPLETE")
+	HostSnmpAgentCapabilityDIAGNOSTICS   = HostSnmpAgentCapability("DIAGNOSTICS")
+	HostSnmpAgentCapabilityCONFIGURATION = HostSnmpAgentCapability("CONFIGURATION")
+)
+
+func init() {
+	t["HostSnmpAgentCapability"] = reflect.TypeOf((*HostSnmpAgentCapability)(nil)).Elem()
+}
+
+type HostStandbyMode string
+
+const (
+	HostStandbyModeEntering = HostStandbyMode("entering")
+	HostStandbyModeExiting  = HostStandbyMode("exiting")
+	HostStandbyModeIn       = HostStandbyMode("in")
+	HostStandbyModeNone     = HostStandbyMode("none")
+)
+
+func init() {
+	t["HostStandbyMode"] = reflect.TypeOf((*HostStandbyMode)(nil)).Elem()
+}
+
+type HostSystemConnectionState string
+
+const (
+	HostSystemConnectionStateConnected     = HostSystemConnectionState("connected")
+	HostSystemConnectionStateNotResponding = HostSystemConnectionState("notResponding")
+	HostSystemConnectionStateDisconnected  = HostSystemConnectionState("disconnected")
+)
+
+func init() {
+	t["HostSystemConnectionState"] = reflect.TypeOf((*HostSystemConnectionState)(nil)).Elem()
+}
+
+type HostSystemIdentificationInfoIdentifier string
+
+const (
+	HostSystemIdentificationInfoIdentifierAssetTag          = HostSystemIdentificationInfoIdentifier("AssetTag")
+	HostSystemIdentificationInfoIdentifierServiceTag        = HostSystemIdentificationInfoIdentifier("ServiceTag")
+	HostSystemIdentificationInfoIdentifierOemSpecificString = HostSystemIdentificationInfoIdentifier("OemSpecificString")
+)
+
+func init() {
+	t["HostSystemIdentificationInfoIdentifier"] = reflect.TypeOf((*HostSystemIdentificationInfoIdentifier)(nil)).Elem()
+}
+
+type HostSystemPowerState string
+
+const (
+	HostSystemPowerStatePoweredOn  = HostSystemPowerState("poweredOn")
+	HostSystemPowerStatePoweredOff = HostSystemPowerState("poweredOff")
+	HostSystemPowerStateStandBy    = HostSystemPowerState("standBy")
+	HostSystemPowerStateUnknown    = HostSystemPowerState("unknown")
+)
+
+func init() {
+	t["HostSystemPowerState"] = reflect.TypeOf((*HostSystemPowerState)(nil)).Elem()
+}
+
+type HostUnresolvedVmfsExtentUnresolvedReason string
+
+const (
+	HostUnresolvedVmfsExtentUnresolvedReasonDiskIdMismatch = HostUnresolvedVmfsExtentUnresolvedReason("diskIdMismatch")
+	HostUnresolvedVmfsExtentUnresolvedReasonUuidConflict   = HostUnresolvedVmfsExtentUnresolvedReason("uuidConflict")
+)
+
+func init() {
+	t["HostUnresolvedVmfsExtentUnresolvedReason"] = reflect.TypeOf((*HostUnresolvedVmfsExtentUnresolvedReason)(nil)).Elem()
+}
+
+type HostUnresolvedVmfsResolutionSpecVmfsUuidResolution string
+
+const (
+	HostUnresolvedVmfsResolutionSpecVmfsUuidResolutionResignature = HostUnresolvedVmfsResolutionSpecVmfsUuidResolution("resignature")
+	HostUnresolvedVmfsResolutionSpecVmfsUuidResolutionForceMount  = HostUnresolvedVmfsResolutionSpecVmfsUuidResolution("forceMount")
+)
+
+func init() {
+	t["HostUnresolvedVmfsResolutionSpecVmfsUuidResolution"] = reflect.TypeOf((*HostUnresolvedVmfsResolutionSpecVmfsUuidResolution)(nil)).Elem()
+}
+
+type HostVirtualNicManagerNicType string
+
+const (
+	HostVirtualNicManagerNicTypeVmotion               = HostVirtualNicManagerNicType("vmotion")
+	HostVirtualNicManagerNicTypeFaultToleranceLogging = HostVirtualNicManagerNicType("faultToleranceLogging")
+	HostVirtualNicManagerNicTypeVSphereReplication    = HostVirtualNicManagerNicType("vSphereReplication")
+	HostVirtualNicManagerNicTypeVSphereReplicationNFC = HostVirtualNicManagerNicType("vSphereReplicationNFC")
+	HostVirtualNicManagerNicTypeManagement            = HostVirtualNicManagerNicType("management")
+	HostVirtualNicManagerNicTypeVsan                  = HostVirtualNicManagerNicType("vsan")
+	HostVirtualNicManagerNicTypeVSphereProvisioning   = HostVirtualNicManagerNicType("vSphereProvisioning")
+	HostVirtualNicManagerNicTypeVsanWitness           = HostVirtualNicManagerNicType("vsanWitness")
+)
+
+func init() {
+	t["HostVirtualNicManagerNicType"] = reflect.TypeOf((*HostVirtualNicManagerNicType)(nil)).Elem()
+}
+
+type HostVmciAccessManagerMode string
+
+const (
+	HostVmciAccessManagerModeGrant   = HostVmciAccessManagerMode("grant")
+	HostVmciAccessManagerModeReplace = HostVmciAccessManagerMode("replace")
+	HostVmciAccessManagerModeRevoke  = HostVmciAccessManagerMode("revoke")
+)
+
+func init() {
+	t["HostVmciAccessManagerMode"] = reflect.TypeOf((*HostVmciAccessManagerMode)(nil)).Elem()
+}
+
+type HostVmfsVolumeUnmapPriority string
+
+const (
+	HostVmfsVolumeUnmapPriorityNone = HostVmfsVolumeUnmapPriority("none")
+	HostVmfsVolumeUnmapPriorityLow  = HostVmfsVolumeUnmapPriority("low")
+)
+
+func init() {
+	t["HostVmfsVolumeUnmapPriority"] = reflect.TypeOf((*HostVmfsVolumeUnmapPriority)(nil)).Elem()
+}
+
+type HttpNfcLeaseState string
+
+const (
+	HttpNfcLeaseStateInitializing = HttpNfcLeaseState("initializing")
+	HttpNfcLeaseStateReady        = HttpNfcLeaseState("ready")
+	HttpNfcLeaseStateDone         = HttpNfcLeaseState("done")
+	HttpNfcLeaseStateError        = HttpNfcLeaseState("error")
+)
+
+func init() {
+	t["HttpNfcLeaseState"] = reflect.TypeOf((*HttpNfcLeaseState)(nil)).Elem()
+}
+
+type IncompatibleHostForVmReplicationIncompatibleReason string
+
+const (
+	IncompatibleHostForVmReplicationIncompatibleReasonRpo            = IncompatibleHostForVmReplicationIncompatibleReason("rpo")
+	IncompatibleHostForVmReplicationIncompatibleReasonNetCompression = IncompatibleHostForVmReplicationIncompatibleReason("netCompression")
+)
+
+func init() {
+	t["IncompatibleHostForVmReplicationIncompatibleReason"] = reflect.TypeOf((*IncompatibleHostForVmReplicationIncompatibleReason)(nil)).Elem()
+}
+
+type InternetScsiSnsDiscoveryMethod string
+
+const (
+	InternetScsiSnsDiscoveryMethodIsnsStatic = InternetScsiSnsDiscoveryMethod("isnsStatic")
+	InternetScsiSnsDiscoveryMethodIsnsDhcp   = InternetScsiSnsDiscoveryMethod("isnsDhcp")
+	InternetScsiSnsDiscoveryMethodIsnsSlp    = InternetScsiSnsDiscoveryMethod("isnsSlp")
+)
+
+func init() {
+	t["InternetScsiSnsDiscoveryMethod"] = reflect.TypeOf((*InternetScsiSnsDiscoveryMethod)(nil)).Elem()
+}
+
+type InvalidDasConfigArgumentEntryForInvalidArgument string
+
+const (
+	InvalidDasConfigArgumentEntryForInvalidArgumentAdmissionControl = InvalidDasConfigArgumentEntryForInvalidArgument("admissionControl")
+	InvalidDasConfigArgumentEntryForInvalidArgumentUserHeartbeatDs  = InvalidDasConfigArgumentEntryForInvalidArgument("userHeartbeatDs")
+	InvalidDasConfigArgumentEntryForInvalidArgumentVmConfig         = InvalidDasConfigArgumentEntryForInvalidArgument("vmConfig")
+)
+
+func init() {
+	t["InvalidDasConfigArgumentEntryForInvalidArgument"] = reflect.TypeOf((*InvalidDasConfigArgumentEntryForInvalidArgument)(nil)).Elem()
+}
+
+type InvalidProfileReferenceHostReason string
+
+const (
+	InvalidProfileReferenceHostReasonIncompatibleVersion  = InvalidProfileReferenceHostReason("incompatibleVersion")
+	InvalidProfileReferenceHostReasonMissingReferenceHost = InvalidProfileReferenceHostReason("missingReferenceHost")
+)
+
+func init() {
+	t["InvalidProfileReferenceHostReason"] = reflect.TypeOf((*InvalidProfileReferenceHostReason)(nil)).Elem()
+}
+
+type IoFilterOperation string
+
+const (
+	IoFilterOperationInstall   = IoFilterOperation("install")
+	IoFilterOperationUninstall = IoFilterOperation("uninstall")
+	IoFilterOperationUpgrade   = IoFilterOperation("upgrade")
+)
+
+func init() {
+	t["IoFilterOperation"] = reflect.TypeOf((*IoFilterOperation)(nil)).Elem()
+}
+
+type IoFilterType string
+
+const (
+	IoFilterTypeCache              = IoFilterType("cache")
+	IoFilterTypeReplication        = IoFilterType("replication")
+	IoFilterTypeEncryption         = IoFilterType("encryption")
+	IoFilterTypeCompression        = IoFilterType("compression")
+	IoFilterTypeInspection         = IoFilterType("inspection")
+	IoFilterTypeDatastoreIoControl = IoFilterType("datastoreIoControl")
+	IoFilterTypeDataProvider       = IoFilterType("dataProvider")
+)
+
+func init() {
+	t["IoFilterType"] = reflect.TypeOf((*IoFilterType)(nil)).Elem()
+}
+
+type IscsiPortInfoPathStatus string
+
+const (
+	IscsiPortInfoPathStatusNotUsed    = IscsiPortInfoPathStatus("notUsed")
+	IscsiPortInfoPathStatusActive     = IscsiPortInfoPathStatus("active")
+	IscsiPortInfoPathStatusStandBy    = IscsiPortInfoPathStatus("standBy")
+	IscsiPortInfoPathStatusLastActive = IscsiPortInfoPathStatus("lastActive")
+)
+
+func init() {
+	t["IscsiPortInfoPathStatus"] = reflect.TypeOf((*IscsiPortInfoPathStatus)(nil)).Elem()
+}
+
+type LatencySensitivitySensitivityLevel string
+
+const (
+	LatencySensitivitySensitivityLevelLow    = LatencySensitivitySensitivityLevel("low")
+	LatencySensitivitySensitivityLevelNormal = LatencySensitivitySensitivityLevel("normal")
+	LatencySensitivitySensitivityLevelMedium = LatencySensitivitySensitivityLevel("medium")
+	LatencySensitivitySensitivityLevelHigh   = LatencySensitivitySensitivityLevel("high")
+	LatencySensitivitySensitivityLevelCustom = LatencySensitivitySensitivityLevel("custom")
+)
+
+func init() {
+	t["LatencySensitivitySensitivityLevel"] = reflect.TypeOf((*LatencySensitivitySensitivityLevel)(nil)).Elem()
+}
+
+type LicenseAssignmentFailedReason string
+
+const (
+	LicenseAssignmentFailedReasonKeyEntityMismatch                                    = LicenseAssignmentFailedReason("keyEntityMismatch")
+	LicenseAssignmentFailedReasonDowngradeDisallowed                                  = LicenseAssignmentFailedReason("downgradeDisallowed")
+	LicenseAssignmentFailedReasonInventoryNotManageableByVirtualCenter                = LicenseAssignmentFailedReason("inventoryNotManageableByVirtualCenter")
+	LicenseAssignmentFailedReasonHostsUnmanageableByVirtualCenterWithoutLicenseServer = LicenseAssignmentFailedReason("hostsUnmanageableByVirtualCenterWithoutLicenseServer")
+)
+
+func init() {
+	t["LicenseAssignmentFailedReason"] = reflect.TypeOf((*LicenseAssignmentFailedReason)(nil)).Elem()
+}
+
+type LicenseFeatureInfoSourceRestriction string
+
+const (
+	LicenseFeatureInfoSourceRestrictionUnrestricted = LicenseFeatureInfoSourceRestriction("unrestricted")
+	LicenseFeatureInfoSourceRestrictionServed       = LicenseFeatureInfoSourceRestriction("served")
+	LicenseFeatureInfoSourceRestrictionFile         = LicenseFeatureInfoSourceRestriction("file")
+)
+
+func init() {
+	t["LicenseFeatureInfoSourceRestriction"] = reflect.TypeOf((*LicenseFeatureInfoSourceRestriction)(nil)).Elem()
+}
+
+type LicenseFeatureInfoState string
+
+const (
+	LicenseFeatureInfoStateEnabled  = LicenseFeatureInfoState("enabled")
+	LicenseFeatureInfoStateDisabled = LicenseFeatureInfoState("disabled")
+	LicenseFeatureInfoStateOptional = LicenseFeatureInfoState("optional")
+)
+
+func init() {
+	t["LicenseFeatureInfoState"] = reflect.TypeOf((*LicenseFeatureInfoState)(nil)).Elem()
+}
+
+type LicenseFeatureInfoUnit string
+
+const (
+	LicenseFeatureInfoUnitHost       = LicenseFeatureInfoUnit("host")
+	LicenseFeatureInfoUnitCpuCore    = LicenseFeatureInfoUnit("cpuCore")
+	LicenseFeatureInfoUnitCpuPackage = LicenseFeatureInfoUnit("cpuPackage")
+	LicenseFeatureInfoUnitServer     = LicenseFeatureInfoUnit("server")
+	LicenseFeatureInfoUnitVm         = LicenseFeatureInfoUnit("vm")
+)
+
+func init() {
+	t["LicenseFeatureInfoUnit"] = reflect.TypeOf((*LicenseFeatureInfoUnit)(nil)).Elem()
+}
+
+type LicenseManagerLicenseKey string
+
+const (
+	LicenseManagerLicenseKeyEsxFull    = LicenseManagerLicenseKey("esxFull")
+	LicenseManagerLicenseKeyEsxVmtn    = LicenseManagerLicenseKey("esxVmtn")
+	LicenseManagerLicenseKeyEsxExpress = LicenseManagerLicenseKey("esxExpress")
+	LicenseManagerLicenseKeySan        = LicenseManagerLicenseKey("san")
+	LicenseManagerLicenseKeyIscsi      = LicenseManagerLicenseKey("iscsi")
+	LicenseManagerLicenseKeyNas        = LicenseManagerLicenseKey("nas")
+	LicenseManagerLicenseKeyVsmp       = LicenseManagerLicenseKey("vsmp")
+	LicenseManagerLicenseKeyBackup     = LicenseManagerLicenseKey("backup")
+	LicenseManagerLicenseKeyVc         = LicenseManagerLicenseKey("vc")
+	LicenseManagerLicenseKeyVcExpress  = LicenseManagerLicenseKey("vcExpress")
+	LicenseManagerLicenseKeyEsxHost    = LicenseManagerLicenseKey("esxHost")
+	LicenseManagerLicenseKeyGsxHost    = LicenseManagerLicenseKey("gsxHost")
+	LicenseManagerLicenseKeyServerHost = LicenseManagerLicenseKey("serverHost")
+	LicenseManagerLicenseKeyDrsPower   = LicenseManagerLicenseKey("drsPower")
+	LicenseManagerLicenseKeyVmotion    = LicenseManagerLicenseKey("vmotion")
+	LicenseManagerLicenseKeyDrs        = LicenseManagerLicenseKey("drs")
+	LicenseManagerLicenseKeyDas        = LicenseManagerLicenseKey("das")
+)
+
+func init() {
+	t["LicenseManagerLicenseKey"] = reflect.TypeOf((*LicenseManagerLicenseKey)(nil)).Elem()
+}
+
+type LicenseManagerState string
+
+const (
+	LicenseManagerStateInitializing = LicenseManagerState("initializing")
+	LicenseManagerStateNormal       = LicenseManagerState("normal")
+	LicenseManagerStateMarginal     = LicenseManagerState("marginal")
+	LicenseManagerStateFault        = LicenseManagerState("fault")
+)
+
+func init() {
+	t["LicenseManagerState"] = reflect.TypeOf((*LicenseManagerState)(nil)).Elem()
+}
+
+type LicenseReservationInfoState string
+
+const (
+	LicenseReservationInfoStateNotUsed       = LicenseReservationInfoState("notUsed")
+	LicenseReservationInfoStateNoLicense     = LicenseReservationInfoState("noLicense")
+	LicenseReservationInfoStateUnlicensedUse = LicenseReservationInfoState("unlicensedUse")
+	LicenseReservationInfoStateLicensed      = LicenseReservationInfoState("licensed")
+)
+
+func init() {
+	t["LicenseReservationInfoState"] = reflect.TypeOf((*LicenseReservationInfoState)(nil)).Elem()
+}
+
+type LinkDiscoveryProtocolConfigOperationType string
+
+const (
+	LinkDiscoveryProtocolConfigOperationTypeNone      = LinkDiscoveryProtocolConfigOperationType("none")
+	LinkDiscoveryProtocolConfigOperationTypeListen    = LinkDiscoveryProtocolConfigOperationType("listen")
+	LinkDiscoveryProtocolConfigOperationTypeAdvertise = LinkDiscoveryProtocolConfigOperationType("advertise")
+	LinkDiscoveryProtocolConfigOperationTypeBoth      = LinkDiscoveryProtocolConfigOperationType("both")
+)
+
+func init() {
+	t["LinkDiscoveryProtocolConfigOperationType"] = reflect.TypeOf((*LinkDiscoveryProtocolConfigOperationType)(nil)).Elem()
+}
+
+type LinkDiscoveryProtocolConfigProtocolType string
+
+const (
+	LinkDiscoveryProtocolConfigProtocolTypeCdp  = LinkDiscoveryProtocolConfigProtocolType("cdp")
+	LinkDiscoveryProtocolConfigProtocolTypeLldp = LinkDiscoveryProtocolConfigProtocolType("lldp")
+)
+
+func init() {
+	t["LinkDiscoveryProtocolConfigProtocolType"] = reflect.TypeOf((*LinkDiscoveryProtocolConfigProtocolType)(nil)).Elem()
+}
+
+type ManagedEntityStatus string
+
+const (
+	ManagedEntityStatusGray   = ManagedEntityStatus("gray")
+	ManagedEntityStatusGreen  = ManagedEntityStatus("green")
+	ManagedEntityStatusYellow = ManagedEntityStatus("yellow")
+	ManagedEntityStatusRed    = ManagedEntityStatus("red")
+)
+
+func init() {
+	t["ManagedEntityStatus"] = reflect.TypeOf((*ManagedEntityStatus)(nil)).Elem()
+}
+
+type MetricAlarmOperator string
+
+const (
+	MetricAlarmOperatorIsAbove = MetricAlarmOperator("isAbove")
+	MetricAlarmOperatorIsBelow = MetricAlarmOperator("isBelow")
+)
+
+func init() {
+	t["MetricAlarmOperator"] = reflect.TypeOf((*MetricAlarmOperator)(nil)).Elem()
+}
+
+type MultipathState string
+
+const (
+	MultipathStateStandby  = MultipathState("standby")
+	MultipathStateActive   = MultipathState("active")
+	MultipathStateDisabled = MultipathState("disabled")
+	MultipathStateDead     = MultipathState("dead")
+	MultipathStateUnknown  = MultipathState("unknown")
+)
+
+func init() {
+	t["MultipathState"] = reflect.TypeOf((*MultipathState)(nil)).Elem()
+}
+
+type NetBIOSConfigInfoMode string
+
+const (
+	NetBIOSConfigInfoModeUnknown        = NetBIOSConfigInfoMode("unknown")
+	NetBIOSConfigInfoModeEnabled        = NetBIOSConfigInfoMode("enabled")
+	NetBIOSConfigInfoModeDisabled       = NetBIOSConfigInfoMode("disabled")
+	NetBIOSConfigInfoModeEnabledViaDHCP = NetBIOSConfigInfoMode("enabledViaDHCP")
+)
+
+func init() {
+	t["NetBIOSConfigInfoMode"] = reflect.TypeOf((*NetBIOSConfigInfoMode)(nil)).Elem()
+}
+
+type NetIpConfigInfoIpAddressOrigin string
+
+const (
+	NetIpConfigInfoIpAddressOriginOther     = NetIpConfigInfoIpAddressOrigin("other")
+	NetIpConfigInfoIpAddressOriginManual    = NetIpConfigInfoIpAddressOrigin("manual")
+	NetIpConfigInfoIpAddressOriginDhcp      = NetIpConfigInfoIpAddressOrigin("dhcp")
+	NetIpConfigInfoIpAddressOriginLinklayer = NetIpConfigInfoIpAddressOrigin("linklayer")
+	NetIpConfigInfoIpAddressOriginRandom    = NetIpConfigInfoIpAddressOrigin("random")
+)
+
+func init() {
+	t["NetIpConfigInfoIpAddressOrigin"] = reflect.TypeOf((*NetIpConfigInfoIpAddressOrigin)(nil)).Elem()
+}
+
+type NetIpConfigInfoIpAddressStatus string
+
+const (
+	NetIpConfigInfoIpAddressStatusPreferred    = NetIpConfigInfoIpAddressStatus("preferred")
+	NetIpConfigInfoIpAddressStatusDeprecated   = NetIpConfigInfoIpAddressStatus("deprecated")
+	NetIpConfigInfoIpAddressStatusInvalid      = NetIpConfigInfoIpAddressStatus("invalid")
+	NetIpConfigInfoIpAddressStatusInaccessible = NetIpConfigInfoIpAddressStatus("inaccessible")
+	NetIpConfigInfoIpAddressStatusUnknown      = NetIpConfigInfoIpAddressStatus("unknown")
+	NetIpConfigInfoIpAddressStatusTentative    = NetIpConfigInfoIpAddressStatus("tentative")
+	NetIpConfigInfoIpAddressStatusDuplicate    = NetIpConfigInfoIpAddressStatus("duplicate")
+)
+
+func init() {
+	t["NetIpConfigInfoIpAddressStatus"] = reflect.TypeOf((*NetIpConfigInfoIpAddressStatus)(nil)).Elem()
+}
+
+type NetIpStackInfoEntryType string
+
+const (
+	NetIpStackInfoEntryTypeOther   = NetIpStackInfoEntryType("other")
+	NetIpStackInfoEntryTypeInvalid = NetIpStackInfoEntryType("invalid")
+	NetIpStackInfoEntryTypeDynamic = NetIpStackInfoEntryType("dynamic")
+	NetIpStackInfoEntryTypeManual  = NetIpStackInfoEntryType("manual")
+)
+
+func init() {
+	t["NetIpStackInfoEntryType"] = reflect.TypeOf((*NetIpStackInfoEntryType)(nil)).Elem()
+}
+
+type NetIpStackInfoPreference string
+
+const (
+	NetIpStackInfoPreferenceReserved = NetIpStackInfoPreference("reserved")
+	NetIpStackInfoPreferenceLow      = NetIpStackInfoPreference("low")
+	NetIpStackInfoPreferenceMedium   = NetIpStackInfoPreference("medium")
+	NetIpStackInfoPreferenceHigh     = NetIpStackInfoPreference("high")
+)
+
+func init() {
+	t["NetIpStackInfoPreference"] = reflect.TypeOf((*NetIpStackInfoPreference)(nil)).Elem()
+}
+
+type NotSupportedDeviceForFTDeviceType string
+
+const (
+	NotSupportedDeviceForFTDeviceTypeVirtualVmxnet3            = NotSupportedDeviceForFTDeviceType("virtualVmxnet3")
+	NotSupportedDeviceForFTDeviceTypeParaVirtualSCSIController = NotSupportedDeviceForFTDeviceType("paraVirtualSCSIController")
+)
+
+func init() {
+	t["NotSupportedDeviceForFTDeviceType"] = reflect.TypeOf((*NotSupportedDeviceForFTDeviceType)(nil)).Elem()
+}
+
+type NumVirtualCpusIncompatibleReason string
+
+const (
+	NumVirtualCpusIncompatibleReasonRecordReplay   = NumVirtualCpusIncompatibleReason("recordReplay")
+	NumVirtualCpusIncompatibleReasonFaultTolerance = NumVirtualCpusIncompatibleReason("faultTolerance")
+)
+
+func init() {
+	t["NumVirtualCpusIncompatibleReason"] = reflect.TypeOf((*NumVirtualCpusIncompatibleReason)(nil)).Elem()
+}
+
+type ObjectUpdateKind string
+
+const (
+	ObjectUpdateKindModify = ObjectUpdateKind("modify")
+	ObjectUpdateKindEnter  = ObjectUpdateKind("enter")
+	ObjectUpdateKindLeave  = ObjectUpdateKind("leave")
+)
+
+func init() {
+	t["ObjectUpdateKind"] = reflect.TypeOf((*ObjectUpdateKind)(nil)).Elem()
+}
+
+type OvfConsumerOstNodeType string
+
+const (
+	OvfConsumerOstNodeTypeEnvelope                = OvfConsumerOstNodeType("envelope")
+	OvfConsumerOstNodeTypeVirtualSystem           = OvfConsumerOstNodeType("virtualSystem")
+	OvfConsumerOstNodeTypeVirtualSystemCollection = OvfConsumerOstNodeType("virtualSystemCollection")
+)
+
+func init() {
+	t["OvfConsumerOstNodeType"] = reflect.TypeOf((*OvfConsumerOstNodeType)(nil)).Elem()
+}
+
+type OvfCreateImportSpecParamsDiskProvisioningType string
+
+const (
+	OvfCreateImportSpecParamsDiskProvisioningTypeMonolithicSparse     = OvfCreateImportSpecParamsDiskProvisioningType("monolithicSparse")
+	OvfCreateImportSpecParamsDiskProvisioningTypeMonolithicFlat       = OvfCreateImportSpecParamsDiskProvisioningType("monolithicFlat")
+	OvfCreateImportSpecParamsDiskProvisioningTypeTwoGbMaxExtentSparse = OvfCreateImportSpecParamsDiskProvisioningType("twoGbMaxExtentSparse")
+	OvfCreateImportSpecParamsDiskProvisioningTypeTwoGbMaxExtentFlat   = OvfCreateImportSpecParamsDiskProvisioningType("twoGbMaxExtentFlat")
+	OvfCreateImportSpecParamsDiskProvisioningTypeThin                 = OvfCreateImportSpecParamsDiskProvisioningType("thin")
+	OvfCreateImportSpecParamsDiskProvisioningTypeThick                = OvfCreateImportSpecParamsDiskProvisioningType("thick")
+	OvfCreateImportSpecParamsDiskProvisioningTypeSeSparse             = OvfCreateImportSpecParamsDiskProvisioningType("seSparse")
+	OvfCreateImportSpecParamsDiskProvisioningTypeEagerZeroedThick     = OvfCreateImportSpecParamsDiskProvisioningType("eagerZeroedThick")
+	OvfCreateImportSpecParamsDiskProvisioningTypeSparse               = OvfCreateImportSpecParamsDiskProvisioningType("sparse")
+	OvfCreateImportSpecParamsDiskProvisioningTypeFlat                 = OvfCreateImportSpecParamsDiskProvisioningType("flat")
+)
+
+func init() {
+	t["OvfCreateImportSpecParamsDiskProvisioningType"] = reflect.TypeOf((*OvfCreateImportSpecParamsDiskProvisioningType)(nil)).Elem()
+}
+
+type PerfFormat string
+
+const (
+	PerfFormatNormal = PerfFormat("normal")
+	PerfFormatCsv    = PerfFormat("csv")
+)
+
+func init() {
+	t["PerfFormat"] = reflect.TypeOf((*PerfFormat)(nil)).Elem()
+}
+
+type PerfStatsType string
+
+const (
+	PerfStatsTypeAbsolute = PerfStatsType("absolute")
+	PerfStatsTypeDelta    = PerfStatsType("delta")
+	PerfStatsTypeRate     = PerfStatsType("rate")
+)
+
+func init() {
+	t["PerfStatsType"] = reflect.TypeOf((*PerfStatsType)(nil)).Elem()
+}
+
+type PerfSummaryType string
+
+const (
+	PerfSummaryTypeAverage   = PerfSummaryType("average")
+	PerfSummaryTypeMaximum   = PerfSummaryType("maximum")
+	PerfSummaryTypeMinimum   = PerfSummaryType("minimum")
+	PerfSummaryTypeLatest    = PerfSummaryType("latest")
+	PerfSummaryTypeSummation = PerfSummaryType("summation")
+	PerfSummaryTypeNone      = PerfSummaryType("none")
+)
+
+func init() {
+	t["PerfSummaryType"] = reflect.TypeOf((*PerfSummaryType)(nil)).Elem()
+}
+
+type PerformanceManagerUnit string
+
+const (
+	PerformanceManagerUnitPercent            = PerformanceManagerUnit("percent")
+	PerformanceManagerUnitKiloBytes          = PerformanceManagerUnit("kiloBytes")
+	PerformanceManagerUnitMegaBytes          = PerformanceManagerUnit("megaBytes")
+	PerformanceManagerUnitMegaHertz          = PerformanceManagerUnit("megaHertz")
+	PerformanceManagerUnitNumber             = PerformanceManagerUnit("number")
+	PerformanceManagerUnitMicrosecond        = PerformanceManagerUnit("microsecond")
+	PerformanceManagerUnitMillisecond        = PerformanceManagerUnit("millisecond")
+	PerformanceManagerUnitSecond             = PerformanceManagerUnit("second")
+	PerformanceManagerUnitKiloBytesPerSecond = PerformanceManagerUnit("kiloBytesPerSecond")
+	PerformanceManagerUnitMegaBytesPerSecond = PerformanceManagerUnit("megaBytesPerSecond")
+	PerformanceManagerUnitWatt               = PerformanceManagerUnit("watt")
+	PerformanceManagerUnitJoule              = PerformanceManagerUnit("joule")
+	PerformanceManagerUnitTeraBytes          = PerformanceManagerUnit("teraBytes")
+)
+
+func init() {
+	t["PerformanceManagerUnit"] = reflect.TypeOf((*PerformanceManagerUnit)(nil)).Elem()
+}
+
+type PhysicalNicResourcePoolSchedulerDisallowedReason string
+
+const (
+	PhysicalNicResourcePoolSchedulerDisallowedReasonUserOptOut          = PhysicalNicResourcePoolSchedulerDisallowedReason("userOptOut")
+	PhysicalNicResourcePoolSchedulerDisallowedReasonHardwareUnsupported = PhysicalNicResourcePoolSchedulerDisallowedReason("hardwareUnsupported")
+)
+
+func init() {
+	t["PhysicalNicResourcePoolSchedulerDisallowedReason"] = reflect.TypeOf((*PhysicalNicResourcePoolSchedulerDisallowedReason)(nil)).Elem()
+}
+
+type PhysicalNicVmDirectPathGen2SupportedMode string
+
+const (
+	PhysicalNicVmDirectPathGen2SupportedModeUpt = PhysicalNicVmDirectPathGen2SupportedMode("upt")
+)
+
+func init() {
+	t["PhysicalNicVmDirectPathGen2SupportedMode"] = reflect.TypeOf((*PhysicalNicVmDirectPathGen2SupportedMode)(nil)).Elem()
+}
+
+type PlacementAffinityRuleRuleScope string
+
+const (
+	PlacementAffinityRuleRuleScopeCluster    = PlacementAffinityRuleRuleScope("cluster")
+	PlacementAffinityRuleRuleScopeHost       = PlacementAffinityRuleRuleScope("host")
+	PlacementAffinityRuleRuleScopeStoragePod = PlacementAffinityRuleRuleScope("storagePod")
+	PlacementAffinityRuleRuleScopeDatastore  = PlacementAffinityRuleRuleScope("datastore")
+)
+
+func init() {
+	t["PlacementAffinityRuleRuleScope"] = reflect.TypeOf((*PlacementAffinityRuleRuleScope)(nil)).Elem()
+}
+
+type PlacementAffinityRuleRuleType string
+
+const (
+	PlacementAffinityRuleRuleTypeAffinity         = PlacementAffinityRuleRuleType("affinity")
+	PlacementAffinityRuleRuleTypeAntiAffinity     = PlacementAffinityRuleRuleType("antiAffinity")
+	PlacementAffinityRuleRuleTypeSoftAffinity     = PlacementAffinityRuleRuleType("softAffinity")
+	PlacementAffinityRuleRuleTypeSoftAntiAffinity = PlacementAffinityRuleRuleType("softAntiAffinity")
+)
+
+func init() {
+	t["PlacementAffinityRuleRuleType"] = reflect.TypeOf((*PlacementAffinityRuleRuleType)(nil)).Elem()
+}
+
+type PlacementSpecPlacementType string
+
+const (
+	PlacementSpecPlacementTypeCreate      = PlacementSpecPlacementType("create")
+	PlacementSpecPlacementTypeReconfigure = PlacementSpecPlacementType("reconfigure")
+	PlacementSpecPlacementTypeRelocate    = PlacementSpecPlacementType("relocate")
+	PlacementSpecPlacementTypeClone       = PlacementSpecPlacementType("clone")
+)
+
+func init() {
+	t["PlacementSpecPlacementType"] = reflect.TypeOf((*PlacementSpecPlacementType)(nil)).Elem()
+}
+
+type PortGroupConnecteeType string
+
+const (
+	PortGroupConnecteeTypeVirtualMachine   = PortGroupConnecteeType("virtualMachine")
+	PortGroupConnecteeTypeSystemManagement = PortGroupConnecteeType("systemManagement")
+	PortGroupConnecteeTypeHost             = PortGroupConnecteeType("host")
+	PortGroupConnecteeTypeUnknown          = PortGroupConnecteeType("unknown")
+)
+
+func init() {
+	t["PortGroupConnecteeType"] = reflect.TypeOf((*PortGroupConnecteeType)(nil)).Elem()
+}
+
+type ProfileExecuteResultStatus string
+
+const (
+	ProfileExecuteResultStatusSuccess   = ProfileExecuteResultStatus("success")
+	ProfileExecuteResultStatusNeedInput = ProfileExecuteResultStatus("needInput")
+	ProfileExecuteResultStatusError     = ProfileExecuteResultStatus("error")
+)
+
+func init() {
+	t["ProfileExecuteResultStatus"] = reflect.TypeOf((*ProfileExecuteResultStatus)(nil)).Elem()
+}
+
+type ProfileNumericComparator string
+
+const (
+	ProfileNumericComparatorLessThan         = ProfileNumericComparator("lessThan")
+	ProfileNumericComparatorLessThanEqual    = ProfileNumericComparator("lessThanEqual")
+	ProfileNumericComparatorEqual            = ProfileNumericComparator("equal")
+	ProfileNumericComparatorNotEqual         = ProfileNumericComparator("notEqual")
+	ProfileNumericComparatorGreaterThanEqual = ProfileNumericComparator("greaterThanEqual")
+	ProfileNumericComparatorGreaterThan      = ProfileNumericComparator("greaterThan")
+)
+
+func init() {
+	t["ProfileNumericComparator"] = reflect.TypeOf((*ProfileNumericComparator)(nil)).Elem()
+}
+
+type PropertyChangeOp string
+
+const (
+	PropertyChangeOpAdd            = PropertyChangeOp("add")
+	PropertyChangeOpRemove         = PropertyChangeOp("remove")
+	PropertyChangeOpAssign         = PropertyChangeOp("assign")
+	PropertyChangeOpIndirectRemove = PropertyChangeOp("indirectRemove")
+)
+
+func init() {
+	t["PropertyChangeOp"] = reflect.TypeOf((*PropertyChangeOp)(nil)).Elem()
+}
+
+type QuarantineModeFaultFaultType string
+
+const (
+	QuarantineModeFaultFaultTypeNoCompatibleNonQuarantinedHost = QuarantineModeFaultFaultType("NoCompatibleNonQuarantinedHost")
+	QuarantineModeFaultFaultTypeCorrectionDisallowed           = QuarantineModeFaultFaultType("CorrectionDisallowed")
+	QuarantineModeFaultFaultTypeCorrectionImpact               = QuarantineModeFaultFaultType("CorrectionImpact")
+)
+
+func init() {
+	t["QuarantineModeFaultFaultType"] = reflect.TypeOf((*QuarantineModeFaultFaultType)(nil)).Elem()
+}
+
+type QuiesceMode string
+
+const (
+	QuiesceModeApplication = QuiesceMode("application")
+	QuiesceModeFilesystem  = QuiesceMode("filesystem")
+	QuiesceModeNone        = QuiesceMode("none")
+)
+
+func init() {
+	t["QuiesceMode"] = reflect.TypeOf((*QuiesceMode)(nil)).Elem()
+}
+
+type RecommendationReasonCode string
+
+const (
+	RecommendationReasonCodeFairnessCpuAvg                  = RecommendationReasonCode("fairnessCpuAvg")
+	RecommendationReasonCodeFairnessMemAvg                  = RecommendationReasonCode("fairnessMemAvg")
+	RecommendationReasonCodeJointAffin                      = RecommendationReasonCode("jointAffin")
+	RecommendationReasonCodeAntiAffin                       = RecommendationReasonCode("antiAffin")
+	RecommendationReasonCodeHostMaint                       = RecommendationReasonCode("hostMaint")
+	RecommendationReasonCodeEnterStandby                    = RecommendationReasonCode("enterStandby")
+	RecommendationReasonCodeReservationCpu                  = RecommendationReasonCode("reservationCpu")
+	RecommendationReasonCodeReservationMem                  = RecommendationReasonCode("reservationMem")
+	RecommendationReasonCodePowerOnVm                       = RecommendationReasonCode("powerOnVm")
+	RecommendationReasonCodePowerSaving                     = RecommendationReasonCode("powerSaving")
+	RecommendationReasonCodeIncreaseCapacity                = RecommendationReasonCode("increaseCapacity")
+	RecommendationReasonCodeCheckResource                   = RecommendationReasonCode("checkResource")
+	RecommendationReasonCodeUnreservedCapacity              = RecommendationReasonCode("unreservedCapacity")
+	RecommendationReasonCodeVmHostHardAffinity              = RecommendationReasonCode("vmHostHardAffinity")
+	RecommendationReasonCodeVmHostSoftAffinity              = RecommendationReasonCode("vmHostSoftAffinity")
+	RecommendationReasonCodeBalanceDatastoreSpaceUsage      = RecommendationReasonCode("balanceDatastoreSpaceUsage")
+	RecommendationReasonCodeBalanceDatastoreIOLoad          = RecommendationReasonCode("balanceDatastoreIOLoad")
+	RecommendationReasonCodeBalanceDatastoreIOPSReservation = RecommendationReasonCode("balanceDatastoreIOPSReservation")
+	RecommendationReasonCodeDatastoreMaint                  = RecommendationReasonCode("datastoreMaint")
+	RecommendationReasonCodeVirtualDiskJointAffin           = RecommendationReasonCode("virtualDiskJointAffin")
+	RecommendationReasonCodeVirtualDiskAntiAffin            = RecommendationReasonCode("virtualDiskAntiAffin")
+	RecommendationReasonCodeDatastoreSpaceOutage            = RecommendationReasonCode("datastoreSpaceOutage")
+	RecommendationReasonCodeStoragePlacement                = RecommendationReasonCode("storagePlacement")
+	RecommendationReasonCodeIolbDisabledInternal            = RecommendationReasonCode("iolbDisabledInternal")
+	RecommendationReasonCodeXvmotionPlacement               = RecommendationReasonCode("xvmotionPlacement")
+	RecommendationReasonCodeNetworkBandwidthReservation     = RecommendationReasonCode("networkBandwidthReservation")
+	RecommendationReasonCodeHostInDegradation               = RecommendationReasonCode("hostInDegradation")
+	RecommendationReasonCodeHostExitDegradation             = RecommendationReasonCode("hostExitDegradation")
+	RecommendationReasonCodeMaxVmsConstraint                = RecommendationReasonCode("maxVmsConstraint")
+	RecommendationReasonCodeFtConstraints                   = RecommendationReasonCode("ftConstraints")
+)
+
+func init() {
+	t["RecommendationReasonCode"] = reflect.TypeOf((*RecommendationReasonCode)(nil)).Elem()
+}
+
+type RecommendationType string
+
+const (
+	RecommendationTypeV1 = RecommendationType("V1")
+)
+
+func init() {
+	t["RecommendationType"] = reflect.TypeOf((*RecommendationType)(nil)).Elem()
+}
+
+type ReplicationDiskConfigFaultReasonForFault string
+
+const (
+	ReplicationDiskConfigFaultReasonForFaultDiskNotFound                           = ReplicationDiskConfigFaultReasonForFault("diskNotFound")
+	ReplicationDiskConfigFaultReasonForFaultDiskTypeNotSupported                   = ReplicationDiskConfigFaultReasonForFault("diskTypeNotSupported")
+	ReplicationDiskConfigFaultReasonForFaultInvalidDiskKey                         = ReplicationDiskConfigFaultReasonForFault("invalidDiskKey")
+	ReplicationDiskConfigFaultReasonForFaultInvalidDiskReplicationId               = ReplicationDiskConfigFaultReasonForFault("invalidDiskReplicationId")
+	ReplicationDiskConfigFaultReasonForFaultDuplicateDiskReplicationId             = ReplicationDiskConfigFaultReasonForFault("duplicateDiskReplicationId")
+	ReplicationDiskConfigFaultReasonForFaultInvalidPersistentFilePath              = ReplicationDiskConfigFaultReasonForFault("invalidPersistentFilePath")
+	ReplicationDiskConfigFaultReasonForFaultReconfigureDiskReplicationIdNotAllowed = ReplicationDiskConfigFaultReasonForFault("reconfigureDiskReplicationIdNotAllowed")
+)
+
+func init() {
+	t["ReplicationDiskConfigFaultReasonForFault"] = reflect.TypeOf((*ReplicationDiskConfigFaultReasonForFault)(nil)).Elem()
+}
+
+type ReplicationVmConfigFaultReasonForFault string
+
+const (
+	ReplicationVmConfigFaultReasonForFaultIncompatibleHwVersion                    = ReplicationVmConfigFaultReasonForFault("incompatibleHwVersion")
+	ReplicationVmConfigFaultReasonForFaultInvalidVmReplicationId                   = ReplicationVmConfigFaultReasonForFault("invalidVmReplicationId")
+	ReplicationVmConfigFaultReasonForFaultInvalidGenerationNumber                  = ReplicationVmConfigFaultReasonForFault("invalidGenerationNumber")
+	ReplicationVmConfigFaultReasonForFaultOutOfBoundsRpoValue                      = ReplicationVmConfigFaultReasonForFault("outOfBoundsRpoValue")
+	ReplicationVmConfigFaultReasonForFaultInvalidDestinationIpAddress              = ReplicationVmConfigFaultReasonForFault("invalidDestinationIpAddress")
+	ReplicationVmConfigFaultReasonForFaultInvalidDestinationPort                   = ReplicationVmConfigFaultReasonForFault("invalidDestinationPort")
+	ReplicationVmConfigFaultReasonForFaultInvalidExtraVmOptions                    = ReplicationVmConfigFaultReasonForFault("invalidExtraVmOptions")
+	ReplicationVmConfigFaultReasonForFaultStaleGenerationNumber                    = ReplicationVmConfigFaultReasonForFault("staleGenerationNumber")
+	ReplicationVmConfigFaultReasonForFaultReconfigureVmReplicationIdNotAllowed     = ReplicationVmConfigFaultReasonForFault("reconfigureVmReplicationIdNotAllowed")
+	ReplicationVmConfigFaultReasonForFaultCannotRetrieveVmReplicationConfiguration = ReplicationVmConfigFaultReasonForFault("cannotRetrieveVmReplicationConfiguration")
+	ReplicationVmConfigFaultReasonForFaultReplicationAlreadyEnabled                = ReplicationVmConfigFaultReasonForFault("replicationAlreadyEnabled")
+	ReplicationVmConfigFaultReasonForFaultInvalidPriorConfiguration                = ReplicationVmConfigFaultReasonForFault("invalidPriorConfiguration")
+	ReplicationVmConfigFaultReasonForFaultReplicationNotEnabled                    = ReplicationVmConfigFaultReasonForFault("replicationNotEnabled")
+	ReplicationVmConfigFaultReasonForFaultReplicationConfigurationFailed           = ReplicationVmConfigFaultReasonForFault("replicationConfigurationFailed")
+	ReplicationVmConfigFaultReasonForFaultEncryptedVm                              = ReplicationVmConfigFaultReasonForFault("encryptedVm")
+)
+
+func init() {
+	t["ReplicationVmConfigFaultReasonForFault"] = reflect.TypeOf((*ReplicationVmConfigFaultReasonForFault)(nil)).Elem()
+}
+
+type ReplicationVmFaultReasonForFault string
+
+const (
+	ReplicationVmFaultReasonForFaultNotConfigured      = ReplicationVmFaultReasonForFault("notConfigured")
+	ReplicationVmFaultReasonForFaultPoweredOff         = ReplicationVmFaultReasonForFault("poweredOff")
+	ReplicationVmFaultReasonForFaultSuspended          = ReplicationVmFaultReasonForFault("suspended")
+	ReplicationVmFaultReasonForFaultPoweredOn          = ReplicationVmFaultReasonForFault("poweredOn")
+	ReplicationVmFaultReasonForFaultOfflineReplicating = ReplicationVmFaultReasonForFault("offlineReplicating")
+	ReplicationVmFaultReasonForFaultInvalidState       = ReplicationVmFaultReasonForFault("invalidState")
+	ReplicationVmFaultReasonForFaultInvalidInstanceId  = ReplicationVmFaultReasonForFault("invalidInstanceId")
+	ReplicationVmFaultReasonForFaultCloseDiskError     = ReplicationVmFaultReasonForFault("closeDiskError")
+)
+
+func init() {
+	t["ReplicationVmFaultReasonForFault"] = reflect.TypeOf((*ReplicationVmFaultReasonForFault)(nil)).Elem()
+}
+
+type ReplicationVmInProgressFaultActivity string
+
+const (
+	ReplicationVmInProgressFaultActivityFullSync = ReplicationVmInProgressFaultActivity("fullSync")
+	ReplicationVmInProgressFaultActivityDelta    = ReplicationVmInProgressFaultActivity("delta")
+)
+
+func init() {
+	t["ReplicationVmInProgressFaultActivity"] = reflect.TypeOf((*ReplicationVmInProgressFaultActivity)(nil)).Elem()
+}
+
+type ReplicationVmState string
+
+const (
+	ReplicationVmStateNone    = ReplicationVmState("none")
+	ReplicationVmStatePaused  = ReplicationVmState("paused")
+	ReplicationVmStateSyncing = ReplicationVmState("syncing")
+	ReplicationVmStateIdle    = ReplicationVmState("idle")
+	ReplicationVmStateActive  = ReplicationVmState("active")
+	ReplicationVmStateError   = ReplicationVmState("error")
+)
+
+func init() {
+	t["ReplicationVmState"] = reflect.TypeOf((*ReplicationVmState)(nil)).Elem()
+}
+
+type ScheduledHardwareUpgradeInfoHardwareUpgradePolicy string
+
+const (
+	ScheduledHardwareUpgradeInfoHardwareUpgradePolicyNever          = ScheduledHardwareUpgradeInfoHardwareUpgradePolicy("never")
+	ScheduledHardwareUpgradeInfoHardwareUpgradePolicyOnSoftPowerOff = ScheduledHardwareUpgradeInfoHardwareUpgradePolicy("onSoftPowerOff")
+	ScheduledHardwareUpgradeInfoHardwareUpgradePolicyAlways         = ScheduledHardwareUpgradeInfoHardwareUpgradePolicy("always")
+)
+
+func init() {
+	t["ScheduledHardwareUpgradeInfoHardwareUpgradePolicy"] = reflect.TypeOf((*ScheduledHardwareUpgradeInfoHardwareUpgradePolicy)(nil)).Elem()
+}
+
+type ScheduledHardwareUpgradeInfoHardwareUpgradeStatus string
+
+const (
+	ScheduledHardwareUpgradeInfoHardwareUpgradeStatusNone    = ScheduledHardwareUpgradeInfoHardwareUpgradeStatus("none")
+	ScheduledHardwareUpgradeInfoHardwareUpgradeStatusPending = ScheduledHardwareUpgradeInfoHardwareUpgradeStatus("pending")
+	ScheduledHardwareUpgradeInfoHardwareUpgradeStatusSuccess = ScheduledHardwareUpgradeInfoHardwareUpgradeStatus("success")
+	ScheduledHardwareUpgradeInfoHardwareUpgradeStatusFailed  = ScheduledHardwareUpgradeInfoHardwareUpgradeStatus("failed")
+)
+
+func init() {
+	t["ScheduledHardwareUpgradeInfoHardwareUpgradeStatus"] = reflect.TypeOf((*ScheduledHardwareUpgradeInfoHardwareUpgradeStatus)(nil)).Elem()
+}
+
+type ScsiDiskType string
+
+const (
+	ScsiDiskTypeNative512   = ScsiDiskType("native512")
+	ScsiDiskTypeEmulated512 = ScsiDiskType("emulated512")
+	ScsiDiskTypeNative4k    = ScsiDiskType("native4k")
+	ScsiDiskTypeUnknown     = ScsiDiskType("unknown")
+)
+
+func init() {
+	t["ScsiDiskType"] = reflect.TypeOf((*ScsiDiskType)(nil)).Elem()
+}
+
+type ScsiLunDescriptorQuality string
+
+const (
+	ScsiLunDescriptorQualityHighQuality    = ScsiLunDescriptorQuality("highQuality")
+	ScsiLunDescriptorQualityMediumQuality  = ScsiLunDescriptorQuality("mediumQuality")
+	ScsiLunDescriptorQualityLowQuality     = ScsiLunDescriptorQuality("lowQuality")
+	ScsiLunDescriptorQualityUnknownQuality = ScsiLunDescriptorQuality("unknownQuality")
+)
+
+func init() {
+	t["ScsiLunDescriptorQuality"] = reflect.TypeOf((*ScsiLunDescriptorQuality)(nil)).Elem()
+}
+
+type ScsiLunState string
+
+const (
+	ScsiLunStateUnknownState      = ScsiLunState("unknownState")
+	ScsiLunStateOk                = ScsiLunState("ok")
+	ScsiLunStateError             = ScsiLunState("error")
+	ScsiLunStateOff               = ScsiLunState("off")
+	ScsiLunStateQuiesced          = ScsiLunState("quiesced")
+	ScsiLunStateDegraded          = ScsiLunState("degraded")
+	ScsiLunStateLostCommunication = ScsiLunState("lostCommunication")
+	ScsiLunStateTimeout           = ScsiLunState("timeout")
+)
+
+func init() {
+	t["ScsiLunState"] = reflect.TypeOf((*ScsiLunState)(nil)).Elem()
+}
+
+type ScsiLunType string
+
+const (
+	ScsiLunTypeDisk                   = ScsiLunType("disk")
+	ScsiLunTypeTape                   = ScsiLunType("tape")
+	ScsiLunTypePrinter                = ScsiLunType("printer")
+	ScsiLunTypeProcessor              = ScsiLunType("processor")
+	ScsiLunTypeWorm                   = ScsiLunType("worm")
+	ScsiLunTypeCdrom                  = ScsiLunType("cdrom")
+	ScsiLunTypeScanner                = ScsiLunType("scanner")
+	ScsiLunTypeOpticalDevice          = ScsiLunType("opticalDevice")
+	ScsiLunTypeMediaChanger           = ScsiLunType("mediaChanger")
+	ScsiLunTypeCommunications         = ScsiLunType("communications")
+	ScsiLunTypeStorageArrayController = ScsiLunType("storageArrayController")
+	ScsiLunTypeEnclosure              = ScsiLunType("enclosure")
+	ScsiLunTypeUnknown                = ScsiLunType("unknown")
+)
+
+func init() {
+	t["ScsiLunType"] = reflect.TypeOf((*ScsiLunType)(nil)).Elem()
+}
+
+type ScsiLunVStorageSupportStatus string
+
+const (
+	ScsiLunVStorageSupportStatusVStorageSupported   = ScsiLunVStorageSupportStatus("vStorageSupported")
+	ScsiLunVStorageSupportStatusVStorageUnsupported = ScsiLunVStorageSupportStatus("vStorageUnsupported")
+	ScsiLunVStorageSupportStatusVStorageUnknown     = ScsiLunVStorageSupportStatus("vStorageUnknown")
+)
+
+func init() {
+	t["ScsiLunVStorageSupportStatus"] = reflect.TypeOf((*ScsiLunVStorageSupportStatus)(nil)).Elem()
+}
+
+type SessionManagerHttpServiceRequestSpecMethod string
+
+const (
+	SessionManagerHttpServiceRequestSpecMethodHttpOptions = SessionManagerHttpServiceRequestSpecMethod("httpOptions")
+	SessionManagerHttpServiceRequestSpecMethodHttpGet     = SessionManagerHttpServiceRequestSpecMethod("httpGet")
+	SessionManagerHttpServiceRequestSpecMethodHttpHead    = SessionManagerHttpServiceRequestSpecMethod("httpHead")
+	SessionManagerHttpServiceRequestSpecMethodHttpPost    = SessionManagerHttpServiceRequestSpecMethod("httpPost")
+	SessionManagerHttpServiceRequestSpecMethodHttpPut     = SessionManagerHttpServiceRequestSpecMethod("httpPut")
+	SessionManagerHttpServiceRequestSpecMethodHttpDelete  = SessionManagerHttpServiceRequestSpecMethod("httpDelete")
+	SessionManagerHttpServiceRequestSpecMethodHttpTrace   = SessionManagerHttpServiceRequestSpecMethod("httpTrace")
+	SessionManagerHttpServiceRequestSpecMethodHttpConnect = SessionManagerHttpServiceRequestSpecMethod("httpConnect")
+)
+
+func init() {
+	t["SessionManagerHttpServiceRequestSpecMethod"] = reflect.TypeOf((*SessionManagerHttpServiceRequestSpecMethod)(nil)).Elem()
+}
+
+type SharesLevel string
+
+const (
+	SharesLevelLow    = SharesLevel("low")
+	SharesLevelNormal = SharesLevel("normal")
+	SharesLevelHigh   = SharesLevel("high")
+	SharesLevelCustom = SharesLevel("custom")
+)
+
+func init() {
+	t["SharesLevel"] = reflect.TypeOf((*SharesLevel)(nil)).Elem()
+}
+
+type SimpleCommandEncoding string
+
+const (
+	SimpleCommandEncodingCSV    = SimpleCommandEncoding("CSV")
+	SimpleCommandEncodingHEX    = SimpleCommandEncoding("HEX")
+	SimpleCommandEncodingSTRING = SimpleCommandEncoding("STRING")
+)
+
+func init() {
+	t["SimpleCommandEncoding"] = reflect.TypeOf((*SimpleCommandEncoding)(nil)).Elem()
+}
+
+type SlpDiscoveryMethod string
+
+const (
+	SlpDiscoveryMethodSlpDhcp          = SlpDiscoveryMethod("slpDhcp")
+	SlpDiscoveryMethodSlpAutoUnicast   = SlpDiscoveryMethod("slpAutoUnicast")
+	SlpDiscoveryMethodSlpAutoMulticast = SlpDiscoveryMethod("slpAutoMulticast")
+	SlpDiscoveryMethodSlpManual        = SlpDiscoveryMethod("slpManual")
+)
+
+func init() {
+	t["SlpDiscoveryMethod"] = reflect.TypeOf((*SlpDiscoveryMethod)(nil)).Elem()
+}
+
+type SoftwarePackageConstraint string
+
+const (
+	SoftwarePackageConstraintEquals           = SoftwarePackageConstraint("equals")
+	SoftwarePackageConstraintLessThan         = SoftwarePackageConstraint("lessThan")
+	SoftwarePackageConstraintLessThanEqual    = SoftwarePackageConstraint("lessThanEqual")
+	SoftwarePackageConstraintGreaterThanEqual = SoftwarePackageConstraint("greaterThanEqual")
+	SoftwarePackageConstraintGreaterThan      = SoftwarePackageConstraint("greaterThan")
+)
+
+func init() {
+	t["SoftwarePackageConstraint"] = reflect.TypeOf((*SoftwarePackageConstraint)(nil)).Elem()
+}
+
+type SoftwarePackageVibType string
+
+const (
+	SoftwarePackageVibTypeBootbank = SoftwarePackageVibType("bootbank")
+	SoftwarePackageVibTypeTools    = SoftwarePackageVibType("tools")
+	SoftwarePackageVibTypeMeta     = SoftwarePackageVibType("meta")
+)
+
+func init() {
+	t["SoftwarePackageVibType"] = reflect.TypeOf((*SoftwarePackageVibType)(nil)).Elem()
+}
+
+type StateAlarmOperator string
+
+const (
+	StateAlarmOperatorIsEqual   = StateAlarmOperator("isEqual")
+	StateAlarmOperatorIsUnequal = StateAlarmOperator("isUnequal")
+)
+
+func init() {
+	t["StateAlarmOperator"] = reflect.TypeOf((*StateAlarmOperator)(nil)).Elem()
+}
+
+type StorageDrsPodConfigInfoBehavior string
+
+const (
+	StorageDrsPodConfigInfoBehaviorManual    = StorageDrsPodConfigInfoBehavior("manual")
+	StorageDrsPodConfigInfoBehaviorAutomated = StorageDrsPodConfigInfoBehavior("automated")
+)
+
+func init() {
+	t["StorageDrsPodConfigInfoBehavior"] = reflect.TypeOf((*StorageDrsPodConfigInfoBehavior)(nil)).Elem()
+}
+
+type StorageDrsSpaceLoadBalanceConfigSpaceThresholdMode string
+
+const (
+	StorageDrsSpaceLoadBalanceConfigSpaceThresholdModeUtilization = StorageDrsSpaceLoadBalanceConfigSpaceThresholdMode("utilization")
+	StorageDrsSpaceLoadBalanceConfigSpaceThresholdModeFreeSpace   = StorageDrsSpaceLoadBalanceConfigSpaceThresholdMode("freeSpace")
+)
+
+func init() {
+	t["StorageDrsSpaceLoadBalanceConfigSpaceThresholdMode"] = reflect.TypeOf((*StorageDrsSpaceLoadBalanceConfigSpaceThresholdMode)(nil)).Elem()
+}
+
+type StorageIORMThresholdMode string
+
+const (
+	StorageIORMThresholdModeAutomatic = StorageIORMThresholdMode("automatic")
+	StorageIORMThresholdModeManual    = StorageIORMThresholdMode("manual")
+)
+
+func init() {
+	t["StorageIORMThresholdMode"] = reflect.TypeOf((*StorageIORMThresholdMode)(nil)).Elem()
+}
+
+type StoragePlacementSpecPlacementType string
+
+const (
+	StoragePlacementSpecPlacementTypeCreate      = StoragePlacementSpecPlacementType("create")
+	StoragePlacementSpecPlacementTypeReconfigure = StoragePlacementSpecPlacementType("reconfigure")
+	StoragePlacementSpecPlacementTypeRelocate    = StoragePlacementSpecPlacementType("relocate")
+	StoragePlacementSpecPlacementTypeClone       = StoragePlacementSpecPlacementType("clone")
+)
+
+func init() {
+	t["StoragePlacementSpecPlacementType"] = reflect.TypeOf((*StoragePlacementSpecPlacementType)(nil)).Elem()
+}
+
+type TaskFilterSpecRecursionOption string
+
+const (
+	TaskFilterSpecRecursionOptionSelf     = TaskFilterSpecRecursionOption("self")
+	TaskFilterSpecRecursionOptionChildren = TaskFilterSpecRecursionOption("children")
+	TaskFilterSpecRecursionOptionAll      = TaskFilterSpecRecursionOption("all")
+)
+
+func init() {
+	t["TaskFilterSpecRecursionOption"] = reflect.TypeOf((*TaskFilterSpecRecursionOption)(nil)).Elem()
+}
+
+type TaskFilterSpecTimeOption string
+
+const (
+	TaskFilterSpecTimeOptionQueuedTime    = TaskFilterSpecTimeOption("queuedTime")
+	TaskFilterSpecTimeOptionStartedTime   = TaskFilterSpecTimeOption("startedTime")
+	TaskFilterSpecTimeOptionCompletedTime = TaskFilterSpecTimeOption("completedTime")
+)
+
+func init() {
+	t["TaskFilterSpecTimeOption"] = reflect.TypeOf((*TaskFilterSpecTimeOption)(nil)).Elem()
+}
+
+type TaskInfoState string
+
+const (
+	TaskInfoStateQueued  = TaskInfoState("queued")
+	TaskInfoStateRunning = TaskInfoState("running")
+	TaskInfoStateSuccess = TaskInfoState("success")
+	TaskInfoStateError   = TaskInfoState("error")
+)
+
+func init() {
+	t["TaskInfoState"] = reflect.TypeOf((*TaskInfoState)(nil)).Elem()
+}
+
+type ThirdPartyLicenseAssignmentFailedReason string
+
+const (
+	ThirdPartyLicenseAssignmentFailedReasonLicenseAssignmentFailed = ThirdPartyLicenseAssignmentFailedReason("licenseAssignmentFailed")
+	ThirdPartyLicenseAssignmentFailedReasonModuleNotInstalled      = ThirdPartyLicenseAssignmentFailedReason("moduleNotInstalled")
+)
+
+func init() {
+	t["ThirdPartyLicenseAssignmentFailedReason"] = reflect.TypeOf((*ThirdPartyLicenseAssignmentFailedReason)(nil)).Elem()
+}
+
+type UpgradePolicy string
+
+const (
+	UpgradePolicyManual              = UpgradePolicy("manual")
+	UpgradePolicyUpgradeAtPowerCycle = UpgradePolicy("upgradeAtPowerCycle")
+)
+
+func init() {
+	t["UpgradePolicy"] = reflect.TypeOf((*UpgradePolicy)(nil)).Elem()
+}
+
+type VAppAutoStartAction string
+
+const (
+	VAppAutoStartActionNone          = VAppAutoStartAction("none")
+	VAppAutoStartActionPowerOn       = VAppAutoStartAction("powerOn")
+	VAppAutoStartActionPowerOff      = VAppAutoStartAction("powerOff")
+	VAppAutoStartActionGuestShutdown = VAppAutoStartAction("guestShutdown")
+	VAppAutoStartActionSuspend       = VAppAutoStartAction("suspend")
+)
+
+func init() {
+	t["VAppAutoStartAction"] = reflect.TypeOf((*VAppAutoStartAction)(nil)).Elem()
+}
+
+type VAppCloneSpecProvisioningType string
+
+const (
+	VAppCloneSpecProvisioningTypeSameAsSource = VAppCloneSpecProvisioningType("sameAsSource")
+	VAppCloneSpecProvisioningTypeThin         = VAppCloneSpecProvisioningType("thin")
+	VAppCloneSpecProvisioningTypeThick        = VAppCloneSpecProvisioningType("thick")
+)
+
+func init() {
+	t["VAppCloneSpecProvisioningType"] = reflect.TypeOf((*VAppCloneSpecProvisioningType)(nil)).Elem()
+}
+
+type VAppIPAssignmentInfoAllocationSchemes string
+
+const (
+	VAppIPAssignmentInfoAllocationSchemesDhcp   = VAppIPAssignmentInfoAllocationSchemes("dhcp")
+	VAppIPAssignmentInfoAllocationSchemesOvfenv = VAppIPAssignmentInfoAllocationSchemes("ovfenv")
+)
+
+func init() {
+	t["VAppIPAssignmentInfoAllocationSchemes"] = reflect.TypeOf((*VAppIPAssignmentInfoAllocationSchemes)(nil)).Elem()
+}
+
+type VAppIPAssignmentInfoIpAllocationPolicy string
+
+const (
+	VAppIPAssignmentInfoIpAllocationPolicyDhcpPolicy           = VAppIPAssignmentInfoIpAllocationPolicy("dhcpPolicy")
+	VAppIPAssignmentInfoIpAllocationPolicyTransientPolicy      = VAppIPAssignmentInfoIpAllocationPolicy("transientPolicy")
+	VAppIPAssignmentInfoIpAllocationPolicyFixedPolicy          = VAppIPAssignmentInfoIpAllocationPolicy("fixedPolicy")
+	VAppIPAssignmentInfoIpAllocationPolicyFixedAllocatedPolicy = VAppIPAssignmentInfoIpAllocationPolicy("fixedAllocatedPolicy")
+)
+
+func init() {
+	t["VAppIPAssignmentInfoIpAllocationPolicy"] = reflect.TypeOf((*VAppIPAssignmentInfoIpAllocationPolicy)(nil)).Elem()
+}
+
+type VAppIPAssignmentInfoProtocols string
+
+const (
+	VAppIPAssignmentInfoProtocolsIPv4 = VAppIPAssignmentInfoProtocols("IPv4")
+	VAppIPAssignmentInfoProtocolsIPv6 = VAppIPAssignmentInfoProtocols("IPv6")
+)
+
+func init() {
+	t["VAppIPAssignmentInfoProtocols"] = reflect.TypeOf((*VAppIPAssignmentInfoProtocols)(nil)).Elem()
+}
+
+type VFlashModuleNotSupportedReason string
+
+const (
+	VFlashModuleNotSupportedReasonCacheModeNotSupported            = VFlashModuleNotSupportedReason("CacheModeNotSupported")
+	VFlashModuleNotSupportedReasonCacheConsistencyTypeNotSupported = VFlashModuleNotSupportedReason("CacheConsistencyTypeNotSupported")
+	VFlashModuleNotSupportedReasonCacheBlockSizeNotSupported       = VFlashModuleNotSupportedReason("CacheBlockSizeNotSupported")
+	VFlashModuleNotSupportedReasonCacheReservationNotSupported     = VFlashModuleNotSupportedReason("CacheReservationNotSupported")
+	VFlashModuleNotSupportedReasonDiskSizeNotSupported             = VFlashModuleNotSupportedReason("DiskSizeNotSupported")
+)
+
+func init() {
+	t["VFlashModuleNotSupportedReason"] = reflect.TypeOf((*VFlashModuleNotSupportedReason)(nil)).Elem()
+}
+
+type VMotionCompatibilityType string
+
+const (
+	VMotionCompatibilityTypeCpu      = VMotionCompatibilityType("cpu")
+	VMotionCompatibilityTypeSoftware = VMotionCompatibilityType("software")
+)
+
+func init() {
+	t["VMotionCompatibilityType"] = reflect.TypeOf((*VMotionCompatibilityType)(nil)).Elem()
+}
+
+type VMwareDVSTeamingMatchStatus string
+
+const (
+	VMwareDVSTeamingMatchStatusIphashMatch       = VMwareDVSTeamingMatchStatus("iphashMatch")
+	VMwareDVSTeamingMatchStatusNonIphashMatch    = VMwareDVSTeamingMatchStatus("nonIphashMatch")
+	VMwareDVSTeamingMatchStatusIphashMismatch    = VMwareDVSTeamingMatchStatus("iphashMismatch")
+	VMwareDVSTeamingMatchStatusNonIphashMismatch = VMwareDVSTeamingMatchStatus("nonIphashMismatch")
+)
+
+func init() {
+	t["VMwareDVSTeamingMatchStatus"] = reflect.TypeOf((*VMwareDVSTeamingMatchStatus)(nil)).Elem()
+}
+
+type VMwareDVSVspanSessionEncapType string
+
+const (
+	VMwareDVSVspanSessionEncapTypeGre     = VMwareDVSVspanSessionEncapType("gre")
+	VMwareDVSVspanSessionEncapTypeErspan2 = VMwareDVSVspanSessionEncapType("erspan2")
+	VMwareDVSVspanSessionEncapTypeErspan3 = VMwareDVSVspanSessionEncapType("erspan3")
+)
+
+func init() {
+	t["VMwareDVSVspanSessionEncapType"] = reflect.TypeOf((*VMwareDVSVspanSessionEncapType)(nil)).Elem()
+}
+
+type VMwareDVSVspanSessionType string
+
+const (
+	VMwareDVSVspanSessionTypeMixedDestMirror                = VMwareDVSVspanSessionType("mixedDestMirror")
+	VMwareDVSVspanSessionTypeDvPortMirror                   = VMwareDVSVspanSessionType("dvPortMirror")
+	VMwareDVSVspanSessionTypeRemoteMirrorSource             = VMwareDVSVspanSessionType("remoteMirrorSource")
+	VMwareDVSVspanSessionTypeRemoteMirrorDest               = VMwareDVSVspanSessionType("remoteMirrorDest")
+	VMwareDVSVspanSessionTypeEncapsulatedRemoteMirrorSource = VMwareDVSVspanSessionType("encapsulatedRemoteMirrorSource")
+)
+
+func init() {
+	t["VMwareDVSVspanSessionType"] = reflect.TypeOf((*VMwareDVSVspanSessionType)(nil)).Elem()
+}
+
+type VMwareDvsLacpApiVersion string
+
+const (
+	VMwareDvsLacpApiVersionSingleLag   = VMwareDvsLacpApiVersion("singleLag")
+	VMwareDvsLacpApiVersionMultipleLag = VMwareDvsLacpApiVersion("multipleLag")
+)
+
+func init() {
+	t["VMwareDvsLacpApiVersion"] = reflect.TypeOf((*VMwareDvsLacpApiVersion)(nil)).Elem()
+}
+
+type VMwareDvsLacpLoadBalanceAlgorithm string
+
+const (
+	VMwareDvsLacpLoadBalanceAlgorithmSrcMac                  = VMwareDvsLacpLoadBalanceAlgorithm("srcMac")
+	VMwareDvsLacpLoadBalanceAlgorithmDestMac                 = VMwareDvsLacpLoadBalanceAlgorithm("destMac")
+	VMwareDvsLacpLoadBalanceAlgorithmSrcDestMac              = VMwareDvsLacpLoadBalanceAlgorithm("srcDestMac")
+	VMwareDvsLacpLoadBalanceAlgorithmDestIpVlan              = VMwareDvsLacpLoadBalanceAlgorithm("destIpVlan")
+	VMwareDvsLacpLoadBalanceAlgorithmSrcIpVlan               = VMwareDvsLacpLoadBalanceAlgorithm("srcIpVlan")
+	VMwareDvsLacpLoadBalanceAlgorithmSrcDestIpVlan           = VMwareDvsLacpLoadBalanceAlgorithm("srcDestIpVlan")
+	VMwareDvsLacpLoadBalanceAlgorithmDestTcpUdpPort          = VMwareDvsLacpLoadBalanceAlgorithm("destTcpUdpPort")
+	VMwareDvsLacpLoadBalanceAlgorithmSrcTcpUdpPort           = VMwareDvsLacpLoadBalanceAlgorithm("srcTcpUdpPort")
+	VMwareDvsLacpLoadBalanceAlgorithmSrcDestTcpUdpPort       = VMwareDvsLacpLoadBalanceAlgorithm("srcDestTcpUdpPort")
+	VMwareDvsLacpLoadBalanceAlgorithmDestIpTcpUdpPort        = VMwareDvsLacpLoadBalanceAlgorithm("destIpTcpUdpPort")
+	VMwareDvsLacpLoadBalanceAlgorithmSrcIpTcpUdpPort         = VMwareDvsLacpLoadBalanceAlgorithm("srcIpTcpUdpPort")
+	VMwareDvsLacpLoadBalanceAlgorithmSrcDestIpTcpUdpPort     = VMwareDvsLacpLoadBalanceAlgorithm("srcDestIpTcpUdpPort")
+	VMwareDvsLacpLoadBalanceAlgorithmDestIpTcpUdpPortVlan    = VMwareDvsLacpLoadBalanceAlgorithm("destIpTcpUdpPortVlan")
+	VMwareDvsLacpLoadBalanceAlgorithmSrcIpTcpUdpPortVlan     = VMwareDvsLacpLoadBalanceAlgorithm("srcIpTcpUdpPortVlan")
+	VMwareDvsLacpLoadBalanceAlgorithmSrcDestIpTcpUdpPortVlan = VMwareDvsLacpLoadBalanceAlgorithm("srcDestIpTcpUdpPortVlan")
+	VMwareDvsLacpLoadBalanceAlgorithmDestIp                  = VMwareDvsLacpLoadBalanceAlgorithm("destIp")
+	VMwareDvsLacpLoadBalanceAlgorithmSrcIp                   = VMwareDvsLacpLoadBalanceAlgorithm("srcIp")
+	VMwareDvsLacpLoadBalanceAlgorithmSrcDestIp               = VMwareDvsLacpLoadBalanceAlgorithm("srcDestIp")
+	VMwareDvsLacpLoadBalanceAlgorithmVlan                    = VMwareDvsLacpLoadBalanceAlgorithm("vlan")
+	VMwareDvsLacpLoadBalanceAlgorithmSrcPortId               = VMwareDvsLacpLoadBalanceAlgorithm("srcPortId")
+)
+
+func init() {
+	t["VMwareDvsLacpLoadBalanceAlgorithm"] = reflect.TypeOf((*VMwareDvsLacpLoadBalanceAlgorithm)(nil)).Elem()
+}
+
+type VMwareDvsMulticastFilteringMode string
+
+const (
+	VMwareDvsMulticastFilteringModeLegacyFiltering = VMwareDvsMulticastFilteringMode("legacyFiltering")
+	VMwareDvsMulticastFilteringModeSnooping        = VMwareDvsMulticastFilteringMode("snooping")
+)
+
+func init() {
+	t["VMwareDvsMulticastFilteringMode"] = reflect.TypeOf((*VMwareDvsMulticastFilteringMode)(nil)).Elem()
+}
+
+type VMwareUplinkLacpMode string
+
+const (
+	VMwareUplinkLacpModeActive  = VMwareUplinkLacpMode("active")
+	VMwareUplinkLacpModePassive = VMwareUplinkLacpMode("passive")
+)
+
+func init() {
+	t["VMwareUplinkLacpMode"] = reflect.TypeOf((*VMwareUplinkLacpMode)(nil)).Elem()
+}
+
+type VStorageObjectConsumptionType string
+
+const (
+	VStorageObjectConsumptionTypeDisk = VStorageObjectConsumptionType("disk")
+)
+
+func init() {
+	t["VStorageObjectConsumptionType"] = reflect.TypeOf((*VStorageObjectConsumptionType)(nil)).Elem()
+}
+
+type ValidateMigrationTestType string
+
+const (
+	ValidateMigrationTestTypeSourceTests            = ValidateMigrationTestType("sourceTests")
+	ValidateMigrationTestTypeCompatibilityTests     = ValidateMigrationTestType("compatibilityTests")
+	ValidateMigrationTestTypeDiskAccessibilityTests = ValidateMigrationTestType("diskAccessibilityTests")
+	ValidateMigrationTestTypeResourceTests          = ValidateMigrationTestType("resourceTests")
+)
+
+func init() {
+	t["ValidateMigrationTestType"] = reflect.TypeOf((*ValidateMigrationTestType)(nil)).Elem()
+}
+
+type VchaClusterMode string
+
+const (
+	VchaClusterModeEnabled     = VchaClusterMode("enabled")
+	VchaClusterModeDisabled    = VchaClusterMode("disabled")
+	VchaClusterModeMaintenance = VchaClusterMode("maintenance")
+)
+
+func init() {
+	t["VchaClusterMode"] = reflect.TypeOf((*VchaClusterMode)(nil)).Elem()
+}
+
+type VchaClusterState string
+
+const (
+	VchaClusterStateHealthy  = VchaClusterState("healthy")
+	VchaClusterStateDegraded = VchaClusterState("degraded")
+	VchaClusterStateIsolated = VchaClusterState("isolated")
+)
+
+func init() {
+	t["VchaClusterState"] = reflect.TypeOf((*VchaClusterState)(nil)).Elem()
+}
+
+type VchaNodeRole string
+
+const (
+	VchaNodeRoleActive  = VchaNodeRole("active")
+	VchaNodeRolePassive = VchaNodeRole("passive")
+	VchaNodeRoleWitness = VchaNodeRole("witness")
+)
+
+func init() {
+	t["VchaNodeRole"] = reflect.TypeOf((*VchaNodeRole)(nil)).Elem()
+}
+
+type VchaNodeState string
+
+const (
+	VchaNodeStateUp   = VchaNodeState("up")
+	VchaNodeStateDown = VchaNodeState("down")
+)
+
+func init() {
+	t["VchaNodeState"] = reflect.TypeOf((*VchaNodeState)(nil)).Elem()
+}
+
+type VchaState string
+
+const (
+	VchaStateConfigured    = VchaState("configured")
+	VchaStateNotConfigured = VchaState("notConfigured")
+	VchaStateInvalid       = VchaState("invalid")
+	VchaStatePrepared      = VchaState("prepared")
+)
+
+func init() {
+	t["VchaState"] = reflect.TypeOf((*VchaState)(nil)).Elem()
+}
+
+type VirtualAppVAppState string
+
+const (
+	VirtualAppVAppStateStarted  = VirtualAppVAppState("started")
+	VirtualAppVAppStateStopped  = VirtualAppVAppState("stopped")
+	VirtualAppVAppStateStarting = VirtualAppVAppState("starting")
+	VirtualAppVAppStateStopping = VirtualAppVAppState("stopping")
+)
+
+func init() {
+	t["VirtualAppVAppState"] = reflect.TypeOf((*VirtualAppVAppState)(nil)).Elem()
+}
+
+type VirtualDeviceConfigSpecFileOperation string
+
+const (
+	VirtualDeviceConfigSpecFileOperationCreate  = VirtualDeviceConfigSpecFileOperation("create")
+	VirtualDeviceConfigSpecFileOperationDestroy = VirtualDeviceConfigSpecFileOperation("destroy")
+	VirtualDeviceConfigSpecFileOperationReplace = VirtualDeviceConfigSpecFileOperation("replace")
+)
+
+func init() {
+	t["VirtualDeviceConfigSpecFileOperation"] = reflect.TypeOf((*VirtualDeviceConfigSpecFileOperation)(nil)).Elem()
+}
+
+type VirtualDeviceConfigSpecOperation string
+
+const (
+	VirtualDeviceConfigSpecOperationAdd    = VirtualDeviceConfigSpecOperation("add")
+	VirtualDeviceConfigSpecOperationRemove = VirtualDeviceConfigSpecOperation("remove")
+	VirtualDeviceConfigSpecOperationEdit   = VirtualDeviceConfigSpecOperation("edit")
+)
+
+func init() {
+	t["VirtualDeviceConfigSpecOperation"] = reflect.TypeOf((*VirtualDeviceConfigSpecOperation)(nil)).Elem()
+}
+
+type VirtualDeviceConnectInfoStatus string
+
+const (
+	VirtualDeviceConnectInfoStatusOk                 = VirtualDeviceConnectInfoStatus("ok")
+	VirtualDeviceConnectInfoStatusRecoverableError   = VirtualDeviceConnectInfoStatus("recoverableError")
+	VirtualDeviceConnectInfoStatusUnrecoverableError = VirtualDeviceConnectInfoStatus("unrecoverableError")
+	VirtualDeviceConnectInfoStatusUntried            = VirtualDeviceConnectInfoStatus("untried")
+)
+
+func init() {
+	t["VirtualDeviceConnectInfoStatus"] = reflect.TypeOf((*VirtualDeviceConnectInfoStatus)(nil)).Elem()
+}
+
+type VirtualDeviceFileExtension string
+
+const (
+	VirtualDeviceFileExtensionIso  = VirtualDeviceFileExtension("iso")
+	VirtualDeviceFileExtensionFlp  = VirtualDeviceFileExtension("flp")
+	VirtualDeviceFileExtensionVmdk = VirtualDeviceFileExtension("vmdk")
+	VirtualDeviceFileExtensionDsk  = VirtualDeviceFileExtension("dsk")
+	VirtualDeviceFileExtensionRdm  = VirtualDeviceFileExtension("rdm")
+)
+
+func init() {
+	t["VirtualDeviceFileExtension"] = reflect.TypeOf((*VirtualDeviceFileExtension)(nil)).Elem()
+}
+
+type VirtualDeviceURIBackingOptionDirection string
+
+const (
+	VirtualDeviceURIBackingOptionDirectionServer = VirtualDeviceURIBackingOptionDirection("server")
+	VirtualDeviceURIBackingOptionDirectionClient = VirtualDeviceURIBackingOptionDirection("client")
+)
+
+func init() {
+	t["VirtualDeviceURIBackingOptionDirection"] = reflect.TypeOf((*VirtualDeviceURIBackingOptionDirection)(nil)).Elem()
+}
+
+type VirtualDiskAdapterType string
+
+const (
+	VirtualDiskAdapterTypeIde      = VirtualDiskAdapterType("ide")
+	VirtualDiskAdapterTypeBusLogic = VirtualDiskAdapterType("busLogic")
+	VirtualDiskAdapterTypeLsiLogic = VirtualDiskAdapterType("lsiLogic")
+)
+
+func init() {
+	t["VirtualDiskAdapterType"] = reflect.TypeOf((*VirtualDiskAdapterType)(nil)).Elem()
+}
+
+type VirtualDiskCompatibilityMode string
+
+const (
+	VirtualDiskCompatibilityModeVirtualMode  = VirtualDiskCompatibilityMode("virtualMode")
+	VirtualDiskCompatibilityModePhysicalMode = VirtualDiskCompatibilityMode("physicalMode")
+)
+
+func init() {
+	t["VirtualDiskCompatibilityMode"] = reflect.TypeOf((*VirtualDiskCompatibilityMode)(nil)).Elem()
+}
+
+type VirtualDiskDeltaDiskFormat string
+
+const (
+	VirtualDiskDeltaDiskFormatRedoLogFormat  = VirtualDiskDeltaDiskFormat("redoLogFormat")
+	VirtualDiskDeltaDiskFormatNativeFormat   = VirtualDiskDeltaDiskFormat("nativeFormat")
+	VirtualDiskDeltaDiskFormatSeSparseFormat = VirtualDiskDeltaDiskFormat("seSparseFormat")
+)
+
+func init() {
+	t["VirtualDiskDeltaDiskFormat"] = reflect.TypeOf((*VirtualDiskDeltaDiskFormat)(nil)).Elem()
+}
+
+type VirtualDiskDeltaDiskFormatVariant string
+
+const (
+	VirtualDiskDeltaDiskFormatVariantVmfsSparseVariant = VirtualDiskDeltaDiskFormatVariant("vmfsSparseVariant")
+	VirtualDiskDeltaDiskFormatVariantVsanSparseVariant = VirtualDiskDeltaDiskFormatVariant("vsanSparseVariant")
+)
+
+func init() {
+	t["VirtualDiskDeltaDiskFormatVariant"] = reflect.TypeOf((*VirtualDiskDeltaDiskFormatVariant)(nil)).Elem()
+}
+
+type VirtualDiskMode string
+
+const (
+	VirtualDiskModePersistent                = VirtualDiskMode("persistent")
+	VirtualDiskModeNonpersistent             = VirtualDiskMode("nonpersistent")
+	VirtualDiskModeUndoable                  = VirtualDiskMode("undoable")
+	VirtualDiskModeIndependent_persistent    = VirtualDiskMode("independent_persistent")
+	VirtualDiskModeIndependent_nonpersistent = VirtualDiskMode("independent_nonpersistent")
+	VirtualDiskModeAppend                    = VirtualDiskMode("append")
+)
+
+func init() {
+	t["VirtualDiskMode"] = reflect.TypeOf((*VirtualDiskMode)(nil)).Elem()
+}
+
+type VirtualDiskSharing string
+
+const (
+	VirtualDiskSharingSharingNone        = VirtualDiskSharing("sharingNone")
+	VirtualDiskSharingSharingMultiWriter = VirtualDiskSharing("sharingMultiWriter")
+)
+
+func init() {
+	t["VirtualDiskSharing"] = reflect.TypeOf((*VirtualDiskSharing)(nil)).Elem()
+}
+
+type VirtualDiskType string
+
+const (
+	VirtualDiskTypePreallocated     = VirtualDiskType("preallocated")
+	VirtualDiskTypeThin             = VirtualDiskType("thin")
+	VirtualDiskTypeSeSparse         = VirtualDiskType("seSparse")
+	VirtualDiskTypeRdm              = VirtualDiskType("rdm")
+	VirtualDiskTypeRdmp             = VirtualDiskType("rdmp")
+	VirtualDiskTypeRaw              = VirtualDiskType("raw")
+	VirtualDiskTypeDelta            = VirtualDiskType("delta")
+	VirtualDiskTypeSparse2Gb        = VirtualDiskType("sparse2Gb")
+	VirtualDiskTypeThick2Gb         = VirtualDiskType("thick2Gb")
+	VirtualDiskTypeEagerZeroedThick = VirtualDiskType("eagerZeroedThick")
+	VirtualDiskTypeSparseMonolithic = VirtualDiskType("sparseMonolithic")
+	VirtualDiskTypeFlatMonolithic   = VirtualDiskType("flatMonolithic")
+	VirtualDiskTypeThick            = VirtualDiskType("thick")
+)
+
+func init() {
+	t["VirtualDiskType"] = reflect.TypeOf((*VirtualDiskType)(nil)).Elem()
+}
+
+type VirtualDiskVFlashCacheConfigInfoCacheConsistencyType string
+
+const (
+	VirtualDiskVFlashCacheConfigInfoCacheConsistencyTypeStrong = VirtualDiskVFlashCacheConfigInfoCacheConsistencyType("strong")
+	VirtualDiskVFlashCacheConfigInfoCacheConsistencyTypeWeak   = VirtualDiskVFlashCacheConfigInfoCacheConsistencyType("weak")
+)
+
+func init() {
+	t["VirtualDiskVFlashCacheConfigInfoCacheConsistencyType"] = reflect.TypeOf((*VirtualDiskVFlashCacheConfigInfoCacheConsistencyType)(nil)).Elem()
+}
+
+type VirtualDiskVFlashCacheConfigInfoCacheMode string
+
+const (
+	VirtualDiskVFlashCacheConfigInfoCacheModeWrite_thru = VirtualDiskVFlashCacheConfigInfoCacheMode("write_thru")
+	VirtualDiskVFlashCacheConfigInfoCacheModeWrite_back = VirtualDiskVFlashCacheConfigInfoCacheMode("write_back")
+)
+
+func init() {
+	t["VirtualDiskVFlashCacheConfigInfoCacheMode"] = reflect.TypeOf((*VirtualDiskVFlashCacheConfigInfoCacheMode)(nil)).Elem()
+}
+
+type VirtualEthernetCardLegacyNetworkDeviceName string
+
+const (
+	VirtualEthernetCardLegacyNetworkDeviceNameBridged  = VirtualEthernetCardLegacyNetworkDeviceName("bridged")
+	VirtualEthernetCardLegacyNetworkDeviceNameNat      = VirtualEthernetCardLegacyNetworkDeviceName("nat")
+	VirtualEthernetCardLegacyNetworkDeviceNameHostonly = VirtualEthernetCardLegacyNetworkDeviceName("hostonly")
+)
+
+func init() {
+	t["VirtualEthernetCardLegacyNetworkDeviceName"] = reflect.TypeOf((*VirtualEthernetCardLegacyNetworkDeviceName)(nil)).Elem()
+}
+
+type VirtualEthernetCardMacType string
+
+const (
+	VirtualEthernetCardMacTypeManual    = VirtualEthernetCardMacType("manual")
+	VirtualEthernetCardMacTypeGenerated = VirtualEthernetCardMacType("generated")
+	VirtualEthernetCardMacTypeAssigned  = VirtualEthernetCardMacType("assigned")
+)
+
+func init() {
+	t["VirtualEthernetCardMacType"] = reflect.TypeOf((*VirtualEthernetCardMacType)(nil)).Elem()
+}
+
+type VirtualMachineAppHeartbeatStatusType string
+
+const (
+	VirtualMachineAppHeartbeatStatusTypeAppStatusGray  = VirtualMachineAppHeartbeatStatusType("appStatusGray")
+	VirtualMachineAppHeartbeatStatusTypeAppStatusGreen = VirtualMachineAppHeartbeatStatusType("appStatusGreen")
+	VirtualMachineAppHeartbeatStatusTypeAppStatusRed   = VirtualMachineAppHeartbeatStatusType("appStatusRed")
+)
+
+func init() {
+	t["VirtualMachineAppHeartbeatStatusType"] = reflect.TypeOf((*VirtualMachineAppHeartbeatStatusType)(nil)).Elem()
+}
+
+type VirtualMachineBootOptionsNetworkBootProtocolType string
+
+const (
+	VirtualMachineBootOptionsNetworkBootProtocolTypeIpv4 = VirtualMachineBootOptionsNetworkBootProtocolType("ipv4")
+	VirtualMachineBootOptionsNetworkBootProtocolTypeIpv6 = VirtualMachineBootOptionsNetworkBootProtocolType("ipv6")
+)
+
+func init() {
+	t["VirtualMachineBootOptionsNetworkBootProtocolType"] = reflect.TypeOf((*VirtualMachineBootOptionsNetworkBootProtocolType)(nil)).Elem()
+}
+
+type VirtualMachineConfigInfoNpivWwnType string
+
+const (
+	VirtualMachineConfigInfoNpivWwnTypeVc       = VirtualMachineConfigInfoNpivWwnType("vc")
+	VirtualMachineConfigInfoNpivWwnTypeHost     = VirtualMachineConfigInfoNpivWwnType("host")
+	VirtualMachineConfigInfoNpivWwnTypeExternal = VirtualMachineConfigInfoNpivWwnType("external")
+)
+
+func init() {
+	t["VirtualMachineConfigInfoNpivWwnType"] = reflect.TypeOf((*VirtualMachineConfigInfoNpivWwnType)(nil)).Elem()
+}
+
+type VirtualMachineConfigInfoSwapPlacementType string
+
+const (
+	VirtualMachineConfigInfoSwapPlacementTypeInherit     = VirtualMachineConfigInfoSwapPlacementType("inherit")
+	VirtualMachineConfigInfoSwapPlacementTypeVmDirectory = VirtualMachineConfigInfoSwapPlacementType("vmDirectory")
+	VirtualMachineConfigInfoSwapPlacementTypeHostLocal   = VirtualMachineConfigInfoSwapPlacementType("hostLocal")
+)
+
+func init() {
+	t["VirtualMachineConfigInfoSwapPlacementType"] = reflect.TypeOf((*VirtualMachineConfigInfoSwapPlacementType)(nil)).Elem()
+}
+
+type VirtualMachineConfigSpecEncryptedVMotionModes string
+
+const (
+	VirtualMachineConfigSpecEncryptedVMotionModesDisabled      = VirtualMachineConfigSpecEncryptedVMotionModes("disabled")
+	VirtualMachineConfigSpecEncryptedVMotionModesOpportunistic = VirtualMachineConfigSpecEncryptedVMotionModes("opportunistic")
+	VirtualMachineConfigSpecEncryptedVMotionModesRequired      = VirtualMachineConfigSpecEncryptedVMotionModes("required")
+)
+
+func init() {
+	t["VirtualMachineConfigSpecEncryptedVMotionModes"] = reflect.TypeOf((*VirtualMachineConfigSpecEncryptedVMotionModes)(nil)).Elem()
+}
+
+type VirtualMachineConfigSpecNpivWwnOp string
+
+const (
+	VirtualMachineConfigSpecNpivWwnOpGenerate = VirtualMachineConfigSpecNpivWwnOp("generate")
+	VirtualMachineConfigSpecNpivWwnOpSet      = VirtualMachineConfigSpecNpivWwnOp("set")
+	VirtualMachineConfigSpecNpivWwnOpRemove   = VirtualMachineConfigSpecNpivWwnOp("remove")
+	VirtualMachineConfigSpecNpivWwnOpExtend   = VirtualMachineConfigSpecNpivWwnOp("extend")
+)
+
+func init() {
+	t["VirtualMachineConfigSpecNpivWwnOp"] = reflect.TypeOf((*VirtualMachineConfigSpecNpivWwnOp)(nil)).Elem()
+}
+
+type VirtualMachineConnectionState string
+
+const (
+	VirtualMachineConnectionStateConnected    = VirtualMachineConnectionState("connected")
+	VirtualMachineConnectionStateDisconnected = VirtualMachineConnectionState("disconnected")
+	VirtualMachineConnectionStateOrphaned     = VirtualMachineConnectionState("orphaned")
+	VirtualMachineConnectionStateInaccessible = VirtualMachineConnectionState("inaccessible")
+	VirtualMachineConnectionStateInvalid      = VirtualMachineConnectionState("invalid")
+)
+
+func init() {
+	t["VirtualMachineConnectionState"] = reflect.TypeOf((*VirtualMachineConnectionState)(nil)).Elem()
+}
+
+type VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonOther string
+
+const (
+	VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonOtherVmNptIncompatibleHost    = VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonOther("vmNptIncompatibleHost")
+	VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonOtherVmNptIncompatibleNetwork = VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonOther("vmNptIncompatibleNetwork")
+)
+
+func init() {
+	t["VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonOther"] = reflect.TypeOf((*VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonOther)(nil)).Elem()
+}
+
+type VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVm string
+
+const (
+	VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVmVmNptIncompatibleGuest                      = VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVm("vmNptIncompatibleGuest")
+	VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVmVmNptIncompatibleGuestDriver                = VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVm("vmNptIncompatibleGuestDriver")
+	VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVmVmNptIncompatibleAdapterType                = VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVm("vmNptIncompatibleAdapterType")
+	VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVmVmNptDisabledOrDisconnectedAdapter          = VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVm("vmNptDisabledOrDisconnectedAdapter")
+	VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVmVmNptIncompatibleAdapterFeatures            = VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVm("vmNptIncompatibleAdapterFeatures")
+	VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVmVmNptIncompatibleBackingType                = VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVm("vmNptIncompatibleBackingType")
+	VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVmVmNptInsufficientMemoryReservation          = VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVm("vmNptInsufficientMemoryReservation")
+	VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVmVmNptFaultToleranceOrRecordReplayConfigured = VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVm("vmNptFaultToleranceOrRecordReplayConfigured")
+	VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVmVmNptConflictingIOChainConfigured           = VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVm("vmNptConflictingIOChainConfigured")
+	VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVmVmNptMonitorBlocks                          = VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVm("vmNptMonitorBlocks")
+	VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVmVmNptConflictingOperationInProgress         = VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVm("vmNptConflictingOperationInProgress")
+	VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVmVmNptRuntimeError                           = VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVm("vmNptRuntimeError")
+	VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVmVmNptOutOfIntrVector                        = VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVm("vmNptOutOfIntrVector")
+	VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVmVmNptVMCIActive                             = VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVm("vmNptVMCIActive")
+)
+
+func init() {
+	t["VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVm"] = reflect.TypeOf((*VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonVm)(nil)).Elem()
+}
+
+type VirtualMachineFaultToleranceState string
+
+const (
+	VirtualMachineFaultToleranceStateNotConfigured = VirtualMachineFaultToleranceState("notConfigured")
+	VirtualMachineFaultToleranceStateDisabled      = VirtualMachineFaultToleranceState("disabled")
+	VirtualMachineFaultToleranceStateEnabled       = VirtualMachineFaultToleranceState("enabled")
+	VirtualMachineFaultToleranceStateNeedSecondary = VirtualMachineFaultToleranceState("needSecondary")
+	VirtualMachineFaultToleranceStateStarting      = VirtualMachineFaultToleranceState("starting")
+	VirtualMachineFaultToleranceStateRunning       = VirtualMachineFaultToleranceState("running")
+)
+
+func init() {
+	t["VirtualMachineFaultToleranceState"] = reflect.TypeOf((*VirtualMachineFaultToleranceState)(nil)).Elem()
+}
+
+type VirtualMachineFaultToleranceType string
+
+const (
+	VirtualMachineFaultToleranceTypeUnset         = VirtualMachineFaultToleranceType("unset")
+	VirtualMachineFaultToleranceTypeRecordReplay  = VirtualMachineFaultToleranceType("recordReplay")
+	VirtualMachineFaultToleranceTypeCheckpointing = VirtualMachineFaultToleranceType("checkpointing")
+)
+
+func init() {
+	t["VirtualMachineFaultToleranceType"] = reflect.TypeOf((*VirtualMachineFaultToleranceType)(nil)).Elem()
+}
+
+type VirtualMachineFileLayoutExFileType string
+
+const (
+	VirtualMachineFileLayoutExFileTypeConfig               = VirtualMachineFileLayoutExFileType("config")
+	VirtualMachineFileLayoutExFileTypeExtendedConfig       = VirtualMachineFileLayoutExFileType("extendedConfig")
+	VirtualMachineFileLayoutExFileTypeDiskDescriptor       = VirtualMachineFileLayoutExFileType("diskDescriptor")
+	VirtualMachineFileLayoutExFileTypeDiskExtent           = VirtualMachineFileLayoutExFileType("diskExtent")
+	VirtualMachineFileLayoutExFileTypeDigestDescriptor     = VirtualMachineFileLayoutExFileType("digestDescriptor")
+	VirtualMachineFileLayoutExFileTypeDigestExtent         = VirtualMachineFileLayoutExFileType("digestExtent")
+	VirtualMachineFileLayoutExFileTypeDiskReplicationState = VirtualMachineFileLayoutExFileType("diskReplicationState")
+	VirtualMachineFileLayoutExFileTypeLog                  = VirtualMachineFileLayoutExFileType("log")
+	VirtualMachineFileLayoutExFileTypeStat                 = VirtualMachineFileLayoutExFileType("stat")
+	VirtualMachineFileLayoutExFileTypeNamespaceData        = VirtualMachineFileLayoutExFileType("namespaceData")
+	VirtualMachineFileLayoutExFileTypeNvram                = VirtualMachineFileLayoutExFileType("nvram")
+	VirtualMachineFileLayoutExFileTypeSnapshotData         = VirtualMachineFileLayoutExFileType("snapshotData")
+	VirtualMachineFileLayoutExFileTypeSnapshotMemory       = VirtualMachineFileLayoutExFileType("snapshotMemory")
+	VirtualMachineFileLayoutExFileTypeSnapshotList         = VirtualMachineFileLayoutExFileType("snapshotList")
+	VirtualMachineFileLayoutExFileTypeSnapshotManifestList = VirtualMachineFileLayoutExFileType("snapshotManifestList")
+	VirtualMachineFileLayoutExFileTypeSuspend              = VirtualMachineFileLayoutExFileType("suspend")
+	VirtualMachineFileLayoutExFileTypeSuspendMemory        = VirtualMachineFileLayoutExFileType("suspendMemory")
+	VirtualMachineFileLayoutExFileTypeSwap                 = VirtualMachineFileLayoutExFileType("swap")
+	VirtualMachineFileLayoutExFileTypeUwswap               = VirtualMachineFileLayoutExFileType("uwswap")
+	VirtualMachineFileLayoutExFileTypeCore                 = VirtualMachineFileLayoutExFileType("core")
+	VirtualMachineFileLayoutExFileTypeScreenshot           = VirtualMachineFileLayoutExFileType("screenshot")
+	VirtualMachineFileLayoutExFileTypeFtMetadata           = VirtualMachineFileLayoutExFileType("ftMetadata")
+	VirtualMachineFileLayoutExFileTypeGuestCustomization   = VirtualMachineFileLayoutExFileType("guestCustomization")
+)
+
+func init() {
+	t["VirtualMachineFileLayoutExFileType"] = reflect.TypeOf((*VirtualMachineFileLayoutExFileType)(nil)).Elem()
+}
+
+type VirtualMachineFlagInfoMonitorType string
+
+const (
+	VirtualMachineFlagInfoMonitorTypeRelease = VirtualMachineFlagInfoMonitorType("release")
+	VirtualMachineFlagInfoMonitorTypeDebug   = VirtualMachineFlagInfoMonitorType("debug")
+	VirtualMachineFlagInfoMonitorTypeStats   = VirtualMachineFlagInfoMonitorType("stats")
+)
+
+func init() {
+	t["VirtualMachineFlagInfoMonitorType"] = reflect.TypeOf((*VirtualMachineFlagInfoMonitorType)(nil)).Elem()
+}
+
+type VirtualMachineFlagInfoVirtualExecUsage string
+
+const (
+	VirtualMachineFlagInfoVirtualExecUsageHvAuto = VirtualMachineFlagInfoVirtualExecUsage("hvAuto")
+	VirtualMachineFlagInfoVirtualExecUsageHvOn   = VirtualMachineFlagInfoVirtualExecUsage("hvOn")
+	VirtualMachineFlagInfoVirtualExecUsageHvOff  = VirtualMachineFlagInfoVirtualExecUsage("hvOff")
+)
+
+func init() {
+	t["VirtualMachineFlagInfoVirtualExecUsage"] = reflect.TypeOf((*VirtualMachineFlagInfoVirtualExecUsage)(nil)).Elem()
+}
+
+type VirtualMachineFlagInfoVirtualMmuUsage string
+
+const (
+	VirtualMachineFlagInfoVirtualMmuUsageAutomatic = VirtualMachineFlagInfoVirtualMmuUsage("automatic")
+	VirtualMachineFlagInfoVirtualMmuUsageOn        = VirtualMachineFlagInfoVirtualMmuUsage("on")
+	VirtualMachineFlagInfoVirtualMmuUsageOff       = VirtualMachineFlagInfoVirtualMmuUsage("off")
+)
+
+func init() {
+	t["VirtualMachineFlagInfoVirtualMmuUsage"] = reflect.TypeOf((*VirtualMachineFlagInfoVirtualMmuUsage)(nil)).Elem()
+}
+
+type VirtualMachineForkConfigInfoChildType string
+
+const (
+	VirtualMachineForkConfigInfoChildTypeNone          = VirtualMachineForkConfigInfoChildType("none")
+	VirtualMachineForkConfigInfoChildTypePersistent    = VirtualMachineForkConfigInfoChildType("persistent")
+	VirtualMachineForkConfigInfoChildTypeNonpersistent = VirtualMachineForkConfigInfoChildType("nonpersistent")
+)
+
+func init() {
+	t["VirtualMachineForkConfigInfoChildType"] = reflect.TypeOf((*VirtualMachineForkConfigInfoChildType)(nil)).Elem()
+}
+
+type VirtualMachineGuestOsFamily string
+
+const (
+	VirtualMachineGuestOsFamilyWindowsGuest      = VirtualMachineGuestOsFamily("windowsGuest")
+	VirtualMachineGuestOsFamilyLinuxGuest        = VirtualMachineGuestOsFamily("linuxGuest")
+	VirtualMachineGuestOsFamilyNetwareGuest      = VirtualMachineGuestOsFamily("netwareGuest")
+	VirtualMachineGuestOsFamilySolarisGuest      = VirtualMachineGuestOsFamily("solarisGuest")
+	VirtualMachineGuestOsFamilyDarwinGuestFamily = VirtualMachineGuestOsFamily("darwinGuestFamily")
+	VirtualMachineGuestOsFamilyOtherGuestFamily  = VirtualMachineGuestOsFamily("otherGuestFamily")
+)
+
+func init() {
+	t["VirtualMachineGuestOsFamily"] = reflect.TypeOf((*VirtualMachineGuestOsFamily)(nil)).Elem()
+}
+
+type VirtualMachineGuestOsIdentifier string
+
+const (
+	VirtualMachineGuestOsIdentifierDosGuest                = VirtualMachineGuestOsIdentifier("dosGuest")
+	VirtualMachineGuestOsIdentifierWin31Guest              = VirtualMachineGuestOsIdentifier("win31Guest")
+	VirtualMachineGuestOsIdentifierWin95Guest              = VirtualMachineGuestOsIdentifier("win95Guest")
+	VirtualMachineGuestOsIdentifierWin98Guest              = VirtualMachineGuestOsIdentifier("win98Guest")
+	VirtualMachineGuestOsIdentifierWinMeGuest              = VirtualMachineGuestOsIdentifier("winMeGuest")
+	VirtualMachineGuestOsIdentifierWinNTGuest              = VirtualMachineGuestOsIdentifier("winNTGuest")
+	VirtualMachineGuestOsIdentifierWin2000ProGuest         = VirtualMachineGuestOsIdentifier("win2000ProGuest")
+	VirtualMachineGuestOsIdentifierWin2000ServGuest        = VirtualMachineGuestOsIdentifier("win2000ServGuest")
+	VirtualMachineGuestOsIdentifierWin2000AdvServGuest     = VirtualMachineGuestOsIdentifier("win2000AdvServGuest")
+	VirtualMachineGuestOsIdentifierWinXPHomeGuest          = VirtualMachineGuestOsIdentifier("winXPHomeGuest")
+	VirtualMachineGuestOsIdentifierWinXPProGuest           = VirtualMachineGuestOsIdentifier("winXPProGuest")
+	VirtualMachineGuestOsIdentifierWinXPPro64Guest         = VirtualMachineGuestOsIdentifier("winXPPro64Guest")
+	VirtualMachineGuestOsIdentifierWinNetWebGuest          = VirtualMachineGuestOsIdentifier("winNetWebGuest")
+	VirtualMachineGuestOsIdentifierWinNetStandardGuest     = VirtualMachineGuestOsIdentifier("winNetStandardGuest")
+	VirtualMachineGuestOsIdentifierWinNetEnterpriseGuest   = VirtualMachineGuestOsIdentifier("winNetEnterpriseGuest")
+	VirtualMachineGuestOsIdentifierWinNetDatacenterGuest   = VirtualMachineGuestOsIdentifier("winNetDatacenterGuest")
+	VirtualMachineGuestOsIdentifierWinNetBusinessGuest     = VirtualMachineGuestOsIdentifier("winNetBusinessGuest")
+	VirtualMachineGuestOsIdentifierWinNetStandard64Guest   = VirtualMachineGuestOsIdentifier("winNetStandard64Guest")
+	VirtualMachineGuestOsIdentifierWinNetEnterprise64Guest = VirtualMachineGuestOsIdentifier("winNetEnterprise64Guest")
+	VirtualMachineGuestOsIdentifierWinLonghornGuest        = VirtualMachineGuestOsIdentifier("winLonghornGuest")
+	VirtualMachineGuestOsIdentifierWinLonghorn64Guest      = VirtualMachineGuestOsIdentifier("winLonghorn64Guest")
+	VirtualMachineGuestOsIdentifierWinNetDatacenter64Guest = VirtualMachineGuestOsIdentifier("winNetDatacenter64Guest")
+	VirtualMachineGuestOsIdentifierWinVistaGuest           = VirtualMachineGuestOsIdentifier("winVistaGuest")
+	VirtualMachineGuestOsIdentifierWinVista64Guest         = VirtualMachineGuestOsIdentifier("winVista64Guest")
+	VirtualMachineGuestOsIdentifierWindows7Guest           = VirtualMachineGuestOsIdentifier("windows7Guest")
+	VirtualMachineGuestOsIdentifierWindows7_64Guest        = VirtualMachineGuestOsIdentifier("windows7_64Guest")
+	VirtualMachineGuestOsIdentifierWindows7Server64Guest   = VirtualMachineGuestOsIdentifier("windows7Server64Guest")
+	VirtualMachineGuestOsIdentifierWindows8Guest           = VirtualMachineGuestOsIdentifier("windows8Guest")
+	VirtualMachineGuestOsIdentifierWindows8_64Guest        = VirtualMachineGuestOsIdentifier("windows8_64Guest")
+	VirtualMachineGuestOsIdentifierWindows8Server64Guest   = VirtualMachineGuestOsIdentifier("windows8Server64Guest")
+	VirtualMachineGuestOsIdentifierWindows9Guest           = VirtualMachineGuestOsIdentifier("windows9Guest")
+	VirtualMachineGuestOsIdentifierWindows9_64Guest        = VirtualMachineGuestOsIdentifier("windows9_64Guest")
+	VirtualMachineGuestOsIdentifierWindows9Server64Guest   = VirtualMachineGuestOsIdentifier("windows9Server64Guest")
+	VirtualMachineGuestOsIdentifierWindowsHyperVGuest      = VirtualMachineGuestOsIdentifier("windowsHyperVGuest")
+	VirtualMachineGuestOsIdentifierFreebsdGuest            = VirtualMachineGuestOsIdentifier("freebsdGuest")
+	VirtualMachineGuestOsIdentifierFreebsd64Guest          = VirtualMachineGuestOsIdentifier("freebsd64Guest")
+	VirtualMachineGuestOsIdentifierRedhatGuest             = VirtualMachineGuestOsIdentifier("redhatGuest")
+	VirtualMachineGuestOsIdentifierRhel2Guest              = VirtualMachineGuestOsIdentifier("rhel2Guest")
+	VirtualMachineGuestOsIdentifierRhel3Guest              = VirtualMachineGuestOsIdentifier("rhel3Guest")
+	VirtualMachineGuestOsIdentifierRhel3_64Guest           = VirtualMachineGuestOsIdentifier("rhel3_64Guest")
+	VirtualMachineGuestOsIdentifierRhel4Guest              = VirtualMachineGuestOsIdentifier("rhel4Guest")
+	VirtualMachineGuestOsIdentifierRhel4_64Guest           = VirtualMachineGuestOsIdentifier("rhel4_64Guest")
+	VirtualMachineGuestOsIdentifierRhel5Guest              = VirtualMachineGuestOsIdentifier("rhel5Guest")
+	VirtualMachineGuestOsIdentifierRhel5_64Guest           = VirtualMachineGuestOsIdentifier("rhel5_64Guest")
+	VirtualMachineGuestOsIdentifierRhel6Guest              = VirtualMachineGuestOsIdentifier("rhel6Guest")
+	VirtualMachineGuestOsIdentifierRhel6_64Guest           = VirtualMachineGuestOsIdentifier("rhel6_64Guest")
+	VirtualMachineGuestOsIdentifierRhel7Guest              = VirtualMachineGuestOsIdentifier("rhel7Guest")
+	VirtualMachineGuestOsIdentifierRhel7_64Guest           = VirtualMachineGuestOsIdentifier("rhel7_64Guest")
+	VirtualMachineGuestOsIdentifierCentosGuest             = VirtualMachineGuestOsIdentifier("centosGuest")
+	VirtualMachineGuestOsIdentifierCentos64Guest           = VirtualMachineGuestOsIdentifier("centos64Guest")
+	VirtualMachineGuestOsIdentifierCentos6Guest            = VirtualMachineGuestOsIdentifier("centos6Guest")
+	VirtualMachineGuestOsIdentifierCentos6_64Guest         = VirtualMachineGuestOsIdentifier("centos6_64Guest")
+	VirtualMachineGuestOsIdentifierCentos7Guest            = VirtualMachineGuestOsIdentifier("centos7Guest")
+	VirtualMachineGuestOsIdentifierCentos7_64Guest         = VirtualMachineGuestOsIdentifier("centos7_64Guest")
+	VirtualMachineGuestOsIdentifierOracleLinuxGuest        = VirtualMachineGuestOsIdentifier("oracleLinuxGuest")
+	VirtualMachineGuestOsIdentifierOracleLinux64Guest      = VirtualMachineGuestOsIdentifier("oracleLinux64Guest")
+	VirtualMachineGuestOsIdentifierOracleLinux6Guest       = VirtualMachineGuestOsIdentifier("oracleLinux6Guest")
+	VirtualMachineGuestOsIdentifierOracleLinux6_64Guest    = VirtualMachineGuestOsIdentifier("oracleLinux6_64Guest")
+	VirtualMachineGuestOsIdentifierOracleLinux7Guest       = VirtualMachineGuestOsIdentifier("oracleLinux7Guest")
+	VirtualMachineGuestOsIdentifierOracleLinux7_64Guest    = VirtualMachineGuestOsIdentifier("oracleLinux7_64Guest")
+	VirtualMachineGuestOsIdentifierSuseGuest               = VirtualMachineGuestOsIdentifier("suseGuest")
+	VirtualMachineGuestOsIdentifierSuse64Guest             = VirtualMachineGuestOsIdentifier("suse64Guest")
+	VirtualMachineGuestOsIdentifierSlesGuest               = VirtualMachineGuestOsIdentifier("slesGuest")
+	VirtualMachineGuestOsIdentifierSles64Guest             = VirtualMachineGuestOsIdentifier("sles64Guest")
+	VirtualMachineGuestOsIdentifierSles10Guest             = VirtualMachineGuestOsIdentifier("sles10Guest")
+	VirtualMachineGuestOsIdentifierSles10_64Guest          = VirtualMachineGuestOsIdentifier("sles10_64Guest")
+	VirtualMachineGuestOsIdentifierSles11Guest             = VirtualMachineGuestOsIdentifier("sles11Guest")
+	VirtualMachineGuestOsIdentifierSles11_64Guest          = VirtualMachineGuestOsIdentifier("sles11_64Guest")
+	VirtualMachineGuestOsIdentifierSles12Guest             = VirtualMachineGuestOsIdentifier("sles12Guest")
+	VirtualMachineGuestOsIdentifierSles12_64Guest          = VirtualMachineGuestOsIdentifier("sles12_64Guest")
+	VirtualMachineGuestOsIdentifierNld9Guest               = VirtualMachineGuestOsIdentifier("nld9Guest")
+	VirtualMachineGuestOsIdentifierOesGuest                = VirtualMachineGuestOsIdentifier("oesGuest")
+	VirtualMachineGuestOsIdentifierSjdsGuest               = VirtualMachineGuestOsIdentifier("sjdsGuest")
+	VirtualMachineGuestOsIdentifierMandrakeGuest           = VirtualMachineGuestOsIdentifier("mandrakeGuest")
+	VirtualMachineGuestOsIdentifierMandrivaGuest           = VirtualMachineGuestOsIdentifier("mandrivaGuest")
+	VirtualMachineGuestOsIdentifierMandriva64Guest         = VirtualMachineGuestOsIdentifier("mandriva64Guest")
+	VirtualMachineGuestOsIdentifierTurboLinuxGuest         = VirtualMachineGuestOsIdentifier("turboLinuxGuest")
+	VirtualMachineGuestOsIdentifierTurboLinux64Guest       = VirtualMachineGuestOsIdentifier("turboLinux64Guest")
+	VirtualMachineGuestOsIdentifierUbuntuGuest             = VirtualMachineGuestOsIdentifier("ubuntuGuest")
+	VirtualMachineGuestOsIdentifierUbuntu64Guest           = VirtualMachineGuestOsIdentifier("ubuntu64Guest")
+	VirtualMachineGuestOsIdentifierDebian4Guest            = VirtualMachineGuestOsIdentifier("debian4Guest")
+	VirtualMachineGuestOsIdentifierDebian4_64Guest         = VirtualMachineGuestOsIdentifier("debian4_64Guest")
+	VirtualMachineGuestOsIdentifierDebian5Guest            = VirtualMachineGuestOsIdentifier("debian5Guest")
+	VirtualMachineGuestOsIdentifierDebian5_64Guest         = VirtualMachineGuestOsIdentifier("debian5_64Guest")
+	VirtualMachineGuestOsIdentifierDebian6Guest            = VirtualMachineGuestOsIdentifier("debian6Guest")
+	VirtualMachineGuestOsIdentifierDebian6_64Guest         = VirtualMachineGuestOsIdentifier("debian6_64Guest")
+	VirtualMachineGuestOsIdentifierDebian7Guest            = VirtualMachineGuestOsIdentifier("debian7Guest")
+	VirtualMachineGuestOsIdentifierDebian7_64Guest         = VirtualMachineGuestOsIdentifier("debian7_64Guest")
+	VirtualMachineGuestOsIdentifierDebian8Guest            = VirtualMachineGuestOsIdentifier("debian8Guest")
+	VirtualMachineGuestOsIdentifierDebian8_64Guest         = VirtualMachineGuestOsIdentifier("debian8_64Guest")
+	VirtualMachineGuestOsIdentifierDebian9Guest            = VirtualMachineGuestOsIdentifier("debian9Guest")
+	VirtualMachineGuestOsIdentifierDebian9_64Guest         = VirtualMachineGuestOsIdentifier("debian9_64Guest")
+	VirtualMachineGuestOsIdentifierDebian10Guest           = VirtualMachineGuestOsIdentifier("debian10Guest")
+	VirtualMachineGuestOsIdentifierDebian10_64Guest        = VirtualMachineGuestOsIdentifier("debian10_64Guest")
+	VirtualMachineGuestOsIdentifierAsianux3Guest           = VirtualMachineGuestOsIdentifier("asianux3Guest")
+	VirtualMachineGuestOsIdentifierAsianux3_64Guest        = VirtualMachineGuestOsIdentifier("asianux3_64Guest")
+	VirtualMachineGuestOsIdentifierAsianux4Guest           = VirtualMachineGuestOsIdentifier("asianux4Guest")
+	VirtualMachineGuestOsIdentifierAsianux4_64Guest        = VirtualMachineGuestOsIdentifier("asianux4_64Guest")
+	VirtualMachineGuestOsIdentifierAsianux5_64Guest        = VirtualMachineGuestOsIdentifier("asianux5_64Guest")
+	VirtualMachineGuestOsIdentifierAsianux7_64Guest        = VirtualMachineGuestOsIdentifier("asianux7_64Guest")
+	VirtualMachineGuestOsIdentifierOpensuseGuest           = VirtualMachineGuestOsIdentifier("opensuseGuest")
+	VirtualMachineGuestOsIdentifierOpensuse64Guest         = VirtualMachineGuestOsIdentifier("opensuse64Guest")
+	VirtualMachineGuestOsIdentifierFedoraGuest             = VirtualMachineGuestOsIdentifier("fedoraGuest")
+	VirtualMachineGuestOsIdentifierFedora64Guest           = VirtualMachineGuestOsIdentifier("fedora64Guest")
+	VirtualMachineGuestOsIdentifierCoreos64Guest           = VirtualMachineGuestOsIdentifier("coreos64Guest")
+	VirtualMachineGuestOsIdentifierVmwarePhoton64Guest     = VirtualMachineGuestOsIdentifier("vmwarePhoton64Guest")
+	VirtualMachineGuestOsIdentifierOther24xLinuxGuest      = VirtualMachineGuestOsIdentifier("other24xLinuxGuest")
+	VirtualMachineGuestOsIdentifierOther26xLinuxGuest      = VirtualMachineGuestOsIdentifier("other26xLinuxGuest")
+	VirtualMachineGuestOsIdentifierOtherLinuxGuest         = VirtualMachineGuestOsIdentifier("otherLinuxGuest")
+	VirtualMachineGuestOsIdentifierOther3xLinuxGuest       = VirtualMachineGuestOsIdentifier("other3xLinuxGuest")
+	VirtualMachineGuestOsIdentifierGenericLinuxGuest       = VirtualMachineGuestOsIdentifier("genericLinuxGuest")
+	VirtualMachineGuestOsIdentifierOther24xLinux64Guest    = VirtualMachineGuestOsIdentifier("other24xLinux64Guest")
+	VirtualMachineGuestOsIdentifierOther26xLinux64Guest    = VirtualMachineGuestOsIdentifier("other26xLinux64Guest")
+	VirtualMachineGuestOsIdentifierOther3xLinux64Guest     = VirtualMachineGuestOsIdentifier("other3xLinux64Guest")
+	VirtualMachineGuestOsIdentifierOtherLinux64Guest       = VirtualMachineGuestOsIdentifier("otherLinux64Guest")
+	VirtualMachineGuestOsIdentifierSolaris6Guest           = VirtualMachineGuestOsIdentifier("solaris6Guest")
+	VirtualMachineGuestOsIdentifierSolaris7Guest           = VirtualMachineGuestOsIdentifier("solaris7Guest")
+	VirtualMachineGuestOsIdentifierSolaris8Guest           = VirtualMachineGuestOsIdentifier("solaris8Guest")
+	VirtualMachineGuestOsIdentifierSolaris9Guest           = VirtualMachineGuestOsIdentifier("solaris9Guest")
+	VirtualMachineGuestOsIdentifierSolaris10Guest          = VirtualMachineGuestOsIdentifier("solaris10Guest")
+	VirtualMachineGuestOsIdentifierSolaris10_64Guest       = VirtualMachineGuestOsIdentifier("solaris10_64Guest")
+	VirtualMachineGuestOsIdentifierSolaris11_64Guest       = VirtualMachineGuestOsIdentifier("solaris11_64Guest")
+	VirtualMachineGuestOsIdentifierOs2Guest                = VirtualMachineGuestOsIdentifier("os2Guest")
+	VirtualMachineGuestOsIdentifierEComStationGuest        = VirtualMachineGuestOsIdentifier("eComStationGuest")
+	VirtualMachineGuestOsIdentifierEComStation2Guest       = VirtualMachineGuestOsIdentifier("eComStation2Guest")
+	VirtualMachineGuestOsIdentifierNetware4Guest           = VirtualMachineGuestOsIdentifier("netware4Guest")
+	VirtualMachineGuestOsIdentifierNetware5Guest           = VirtualMachineGuestOsIdentifier("netware5Guest")
+	VirtualMachineGuestOsIdentifierNetware6Guest           = VirtualMachineGuestOsIdentifier("netware6Guest")
+	VirtualMachineGuestOsIdentifierOpenServer5Guest        = VirtualMachineGuestOsIdentifier("openServer5Guest")
+	VirtualMachineGuestOsIdentifierOpenServer6Guest        = VirtualMachineGuestOsIdentifier("openServer6Guest")
+	VirtualMachineGuestOsIdentifierUnixWare7Guest          = VirtualMachineGuestOsIdentifier("unixWare7Guest")
+	VirtualMachineGuestOsIdentifierDarwinGuest             = VirtualMachineGuestOsIdentifier("darwinGuest")
+	VirtualMachineGuestOsIdentifierDarwin64Guest           = VirtualMachineGuestOsIdentifier("darwin64Guest")
+	VirtualMachineGuestOsIdentifierDarwin10Guest           = VirtualMachineGuestOsIdentifier("darwin10Guest")
+	VirtualMachineGuestOsIdentifierDarwin10_64Guest        = VirtualMachineGuestOsIdentifier("darwin10_64Guest")
+	VirtualMachineGuestOsIdentifierDarwin11Guest           = VirtualMachineGuestOsIdentifier("darwin11Guest")
+	VirtualMachineGuestOsIdentifierDarwin11_64Guest        = VirtualMachineGuestOsIdentifier("darwin11_64Guest")
+	VirtualMachineGuestOsIdentifierDarwin12_64Guest        = VirtualMachineGuestOsIdentifier("darwin12_64Guest")
+	VirtualMachineGuestOsIdentifierDarwin13_64Guest        = VirtualMachineGuestOsIdentifier("darwin13_64Guest")
+	VirtualMachineGuestOsIdentifierDarwin14_64Guest        = VirtualMachineGuestOsIdentifier("darwin14_64Guest")
+	VirtualMachineGuestOsIdentifierDarwin15_64Guest        = VirtualMachineGuestOsIdentifier("darwin15_64Guest")
+	VirtualMachineGuestOsIdentifierDarwin16_64Guest        = VirtualMachineGuestOsIdentifier("darwin16_64Guest")
+	VirtualMachineGuestOsIdentifierVmkernelGuest           = VirtualMachineGuestOsIdentifier("vmkernelGuest")
+	VirtualMachineGuestOsIdentifierVmkernel5Guest          = VirtualMachineGuestOsIdentifier("vmkernel5Guest")
+	VirtualMachineGuestOsIdentifierVmkernel6Guest          = VirtualMachineGuestOsIdentifier("vmkernel6Guest")
+	VirtualMachineGuestOsIdentifierVmkernel65Guest         = VirtualMachineGuestOsIdentifier("vmkernel65Guest")
+	VirtualMachineGuestOsIdentifierOtherGuest              = VirtualMachineGuestOsIdentifier("otherGuest")
+	VirtualMachineGuestOsIdentifierOtherGuest64            = VirtualMachineGuestOsIdentifier("otherGuest64")
+)
+
+func init() {
+	t["VirtualMachineGuestOsIdentifier"] = reflect.TypeOf((*VirtualMachineGuestOsIdentifier)(nil)).Elem()
+}
+
+type VirtualMachineGuestState string
+
+const (
+	VirtualMachineGuestStateRunning      = VirtualMachineGuestState("running")
+	VirtualMachineGuestStateShuttingDown = VirtualMachineGuestState("shuttingDown")
+	VirtualMachineGuestStateResetting    = VirtualMachineGuestState("resetting")
+	VirtualMachineGuestStateStandby      = VirtualMachineGuestState("standby")
+	VirtualMachineGuestStateNotRunning   = VirtualMachineGuestState("notRunning")
+	VirtualMachineGuestStateUnknown      = VirtualMachineGuestState("unknown")
+)
+
+func init() {
+	t["VirtualMachineGuestState"] = reflect.TypeOf((*VirtualMachineGuestState)(nil)).Elem()
+}
+
+type VirtualMachineHtSharing string
+
+const (
+	VirtualMachineHtSharingAny      = VirtualMachineHtSharing("any")
+	VirtualMachineHtSharingNone     = VirtualMachineHtSharing("none")
+	VirtualMachineHtSharingInternal = VirtualMachineHtSharing("internal")
+)
+
+func init() {
+	t["VirtualMachineHtSharing"] = reflect.TypeOf((*VirtualMachineHtSharing)(nil)).Elem()
+}
+
+type VirtualMachineMemoryAllocationPolicy string
+
+const (
+	VirtualMachineMemoryAllocationPolicySwapNone = VirtualMachineMemoryAllocationPolicy("swapNone")
+	VirtualMachineMemoryAllocationPolicySwapSome = VirtualMachineMemoryAllocationPolicy("swapSome")
+	VirtualMachineMemoryAllocationPolicySwapMost = VirtualMachineMemoryAllocationPolicy("swapMost")
+)
+
+func init() {
+	t["VirtualMachineMemoryAllocationPolicy"] = reflect.TypeOf((*VirtualMachineMemoryAllocationPolicy)(nil)).Elem()
+}
+
+type VirtualMachineMetadataManagerVmMetadataOp string
+
+const (
+	VirtualMachineMetadataManagerVmMetadataOpUpdate = VirtualMachineMetadataManagerVmMetadataOp("Update")
+	VirtualMachineMetadataManagerVmMetadataOpRemove = VirtualMachineMetadataManagerVmMetadataOp("Remove")
+)
+
+func init() {
+	t["VirtualMachineMetadataManagerVmMetadataOp"] = reflect.TypeOf((*VirtualMachineMetadataManagerVmMetadataOp)(nil)).Elem()
+}
+
+type VirtualMachineMetadataManagerVmMetadataOwnerOwner string
+
+const (
+	VirtualMachineMetadataManagerVmMetadataOwnerOwnerComVmwareVsphereHA = VirtualMachineMetadataManagerVmMetadataOwnerOwner("ComVmwareVsphereHA")
+)
+
+func init() {
+	t["VirtualMachineMetadataManagerVmMetadataOwnerOwner"] = reflect.TypeOf((*VirtualMachineMetadataManagerVmMetadataOwnerOwner)(nil)).Elem()
+}
+
+type VirtualMachineMovePriority string
+
+const (
+	VirtualMachineMovePriorityLowPriority     = VirtualMachineMovePriority("lowPriority")
+	VirtualMachineMovePriorityHighPriority    = VirtualMachineMovePriority("highPriority")
+	VirtualMachineMovePriorityDefaultPriority = VirtualMachineMovePriority("defaultPriority")
+)
+
+func init() {
+	t["VirtualMachineMovePriority"] = reflect.TypeOf((*VirtualMachineMovePriority)(nil)).Elem()
+}
+
+type VirtualMachineNeedSecondaryReason string
+
+const (
+	VirtualMachineNeedSecondaryReasonInitializing           = VirtualMachineNeedSecondaryReason("initializing")
+	VirtualMachineNeedSecondaryReasonDivergence             = VirtualMachineNeedSecondaryReason("divergence")
+	VirtualMachineNeedSecondaryReasonLostConnection         = VirtualMachineNeedSecondaryReason("lostConnection")
+	VirtualMachineNeedSecondaryReasonPartialHardwareFailure = VirtualMachineNeedSecondaryReason("partialHardwareFailure")
+	VirtualMachineNeedSecondaryReasonUserAction             = VirtualMachineNeedSecondaryReason("userAction")
+	VirtualMachineNeedSecondaryReasonCheckpointError        = VirtualMachineNeedSecondaryReason("checkpointError")
+	VirtualMachineNeedSecondaryReasonOther                  = VirtualMachineNeedSecondaryReason("other")
+)
+
+func init() {
+	t["VirtualMachineNeedSecondaryReason"] = reflect.TypeOf((*VirtualMachineNeedSecondaryReason)(nil)).Elem()
+}
+
+type VirtualMachinePowerOffBehavior string
+
+const (
+	VirtualMachinePowerOffBehaviorPowerOff = VirtualMachinePowerOffBehavior("powerOff")
+	VirtualMachinePowerOffBehaviorRevert   = VirtualMachinePowerOffBehavior("revert")
+	VirtualMachinePowerOffBehaviorPrompt   = VirtualMachinePowerOffBehavior("prompt")
+	VirtualMachinePowerOffBehaviorTake     = VirtualMachinePowerOffBehavior("take")
+)
+
+func init() {
+	t["VirtualMachinePowerOffBehavior"] = reflect.TypeOf((*VirtualMachinePowerOffBehavior)(nil)).Elem()
+}
+
+type VirtualMachinePowerOpType string
+
+const (
+	VirtualMachinePowerOpTypeSoft   = VirtualMachinePowerOpType("soft")
+	VirtualMachinePowerOpTypeHard   = VirtualMachinePowerOpType("hard")
+	VirtualMachinePowerOpTypePreset = VirtualMachinePowerOpType("preset")
+)
+
+func init() {
+	t["VirtualMachinePowerOpType"] = reflect.TypeOf((*VirtualMachinePowerOpType)(nil)).Elem()
+}
+
+type VirtualMachinePowerState string
+
+const (
+	VirtualMachinePowerStatePoweredOff = VirtualMachinePowerState("poweredOff")
+	VirtualMachinePowerStatePoweredOn  = VirtualMachinePowerState("poweredOn")
+	VirtualMachinePowerStateSuspended  = VirtualMachinePowerState("suspended")
+)
+
+func init() {
+	t["VirtualMachinePowerState"] = reflect.TypeOf((*VirtualMachinePowerState)(nil)).Elem()
+}
+
+type VirtualMachineRecordReplayState string
+
+const (
+	VirtualMachineRecordReplayStateRecording = VirtualMachineRecordReplayState("recording")
+	VirtualMachineRecordReplayStateReplaying = VirtualMachineRecordReplayState("replaying")
+	VirtualMachineRecordReplayStateInactive  = VirtualMachineRecordReplayState("inactive")
+)
+
+func init() {
+	t["VirtualMachineRecordReplayState"] = reflect.TypeOf((*VirtualMachineRecordReplayState)(nil)).Elem()
+}
+
+type VirtualMachineRelocateDiskMoveOptions string
+
+const (
+	VirtualMachineRelocateDiskMoveOptionsMoveAllDiskBackingsAndAllowSharing    = VirtualMachineRelocateDiskMoveOptions("moveAllDiskBackingsAndAllowSharing")
+	VirtualMachineRelocateDiskMoveOptionsMoveAllDiskBackingsAndDisallowSharing = VirtualMachineRelocateDiskMoveOptions("moveAllDiskBackingsAndDisallowSharing")
+	VirtualMachineRelocateDiskMoveOptionsMoveChildMostDiskBacking              = VirtualMachineRelocateDiskMoveOptions("moveChildMostDiskBacking")
+	VirtualMachineRelocateDiskMoveOptionsCreateNewChildDiskBacking             = VirtualMachineRelocateDiskMoveOptions("createNewChildDiskBacking")
+	VirtualMachineRelocateDiskMoveOptionsMoveAllDiskBackingsAndConsolidate     = VirtualMachineRelocateDiskMoveOptions("moveAllDiskBackingsAndConsolidate")
+)
+
+func init() {
+	t["VirtualMachineRelocateDiskMoveOptions"] = reflect.TypeOf((*VirtualMachineRelocateDiskMoveOptions)(nil)).Elem()
+}
+
+type VirtualMachineRelocateTransformation string
+
+const (
+	VirtualMachineRelocateTransformationFlat   = VirtualMachineRelocateTransformation("flat")
+	VirtualMachineRelocateTransformationSparse = VirtualMachineRelocateTransformation("sparse")
+)
+
+func init() {
+	t["VirtualMachineRelocateTransformation"] = reflect.TypeOf((*VirtualMachineRelocateTransformation)(nil)).Elem()
+}
+
+type VirtualMachineScsiPassthroughType string
+
+const (
+	VirtualMachineScsiPassthroughTypeDisk      = VirtualMachineScsiPassthroughType("disk")
+	VirtualMachineScsiPassthroughTypeTape      = VirtualMachineScsiPassthroughType("tape")
+	VirtualMachineScsiPassthroughTypePrinter   = VirtualMachineScsiPassthroughType("printer")
+	VirtualMachineScsiPassthroughTypeProcessor = VirtualMachineScsiPassthroughType("processor")
+	VirtualMachineScsiPassthroughTypeWorm      = VirtualMachineScsiPassthroughType("worm")
+	VirtualMachineScsiPassthroughTypeCdrom     = VirtualMachineScsiPassthroughType("cdrom")
+	VirtualMachineScsiPassthroughTypeScanner   = VirtualMachineScsiPassthroughType("scanner")
+	VirtualMachineScsiPassthroughTypeOptical   = VirtualMachineScsiPassthroughType("optical")
+	VirtualMachineScsiPassthroughTypeMedia     = VirtualMachineScsiPassthroughType("media")
+	VirtualMachineScsiPassthroughTypeCom       = VirtualMachineScsiPassthroughType("com")
+	VirtualMachineScsiPassthroughTypeRaid      = VirtualMachineScsiPassthroughType("raid")
+	VirtualMachineScsiPassthroughTypeUnknown   = VirtualMachineScsiPassthroughType("unknown")
+)
+
+func init() {
+	t["VirtualMachineScsiPassthroughType"] = reflect.TypeOf((*VirtualMachineScsiPassthroughType)(nil)).Elem()
+}
+
+type VirtualMachineStandbyActionType string
+
+const (
+	VirtualMachineStandbyActionTypeCheckpoint     = VirtualMachineStandbyActionType("checkpoint")
+	VirtualMachineStandbyActionTypePowerOnSuspend = VirtualMachineStandbyActionType("powerOnSuspend")
+)
+
+func init() {
+	t["VirtualMachineStandbyActionType"] = reflect.TypeOf((*VirtualMachineStandbyActionType)(nil)).Elem()
+}
+
+type VirtualMachineTargetInfoConfigurationTag string
+
+const (
+	VirtualMachineTargetInfoConfigurationTagCompliant   = VirtualMachineTargetInfoConfigurationTag("compliant")
+	VirtualMachineTargetInfoConfigurationTagClusterWide = VirtualMachineTargetInfoConfigurationTag("clusterWide")
+)
+
+func init() {
+	t["VirtualMachineTargetInfoConfigurationTag"] = reflect.TypeOf((*VirtualMachineTargetInfoConfigurationTag)(nil)).Elem()
+}
+
+type VirtualMachineTicketType string
+
+const (
+	VirtualMachineTicketTypeMks          = VirtualMachineTicketType("mks")
+	VirtualMachineTicketTypeDevice       = VirtualMachineTicketType("device")
+	VirtualMachineTicketTypeGuestControl = VirtualMachineTicketType("guestControl")
+	VirtualMachineTicketTypeWebmks       = VirtualMachineTicketType("webmks")
+)
+
+func init() {
+	t["VirtualMachineTicketType"] = reflect.TypeOf((*VirtualMachineTicketType)(nil)).Elem()
+}
+
+type VirtualMachineToolsInstallType string
+
+const (
+	VirtualMachineToolsInstallTypeGuestToolsTypeUnknown     = VirtualMachineToolsInstallType("guestToolsTypeUnknown")
+	VirtualMachineToolsInstallTypeGuestToolsTypeMSI         = VirtualMachineToolsInstallType("guestToolsTypeMSI")
+	VirtualMachineToolsInstallTypeGuestToolsTypeTar         = VirtualMachineToolsInstallType("guestToolsTypeTar")
+	VirtualMachineToolsInstallTypeGuestToolsTypeOSP         = VirtualMachineToolsInstallType("guestToolsTypeOSP")
+	VirtualMachineToolsInstallTypeGuestToolsTypeOpenVMTools = VirtualMachineToolsInstallType("guestToolsTypeOpenVMTools")
+)
+
+func init() {
+	t["VirtualMachineToolsInstallType"] = reflect.TypeOf((*VirtualMachineToolsInstallType)(nil)).Elem()
+}
+
+type VirtualMachineToolsRunningStatus string
+
+const (
+	VirtualMachineToolsRunningStatusGuestToolsNotRunning       = VirtualMachineToolsRunningStatus("guestToolsNotRunning")
+	VirtualMachineToolsRunningStatusGuestToolsRunning          = VirtualMachineToolsRunningStatus("guestToolsRunning")
+	VirtualMachineToolsRunningStatusGuestToolsExecutingScripts = VirtualMachineToolsRunningStatus("guestToolsExecutingScripts")
+)
+
+func init() {
+	t["VirtualMachineToolsRunningStatus"] = reflect.TypeOf((*VirtualMachineToolsRunningStatus)(nil)).Elem()
+}
+
+type VirtualMachineToolsStatus string
+
+const (
+	VirtualMachineToolsStatusToolsNotInstalled = VirtualMachineToolsStatus("toolsNotInstalled")
+	VirtualMachineToolsStatusToolsNotRunning   = VirtualMachineToolsStatus("toolsNotRunning")
+	VirtualMachineToolsStatusToolsOld          = VirtualMachineToolsStatus("toolsOld")
+	VirtualMachineToolsStatusToolsOk           = VirtualMachineToolsStatus("toolsOk")
+)
+
+func init() {
+	t["VirtualMachineToolsStatus"] = reflect.TypeOf((*VirtualMachineToolsStatus)(nil)).Elem()
+}
+
+type VirtualMachineToolsVersionStatus string
+
+const (
+	VirtualMachineToolsVersionStatusGuestToolsNotInstalled = VirtualMachineToolsVersionStatus("guestToolsNotInstalled")
+	VirtualMachineToolsVersionStatusGuestToolsNeedUpgrade  = VirtualMachineToolsVersionStatus("guestToolsNeedUpgrade")
+	VirtualMachineToolsVersionStatusGuestToolsCurrent      = VirtualMachineToolsVersionStatus("guestToolsCurrent")
+	VirtualMachineToolsVersionStatusGuestToolsUnmanaged    = VirtualMachineToolsVersionStatus("guestToolsUnmanaged")
+	VirtualMachineToolsVersionStatusGuestToolsTooOld       = VirtualMachineToolsVersionStatus("guestToolsTooOld")
+	VirtualMachineToolsVersionStatusGuestToolsSupportedOld = VirtualMachineToolsVersionStatus("guestToolsSupportedOld")
+	VirtualMachineToolsVersionStatusGuestToolsSupportedNew = VirtualMachineToolsVersionStatus("guestToolsSupportedNew")
+	VirtualMachineToolsVersionStatusGuestToolsTooNew       = VirtualMachineToolsVersionStatus("guestToolsTooNew")
+	VirtualMachineToolsVersionStatusGuestToolsBlacklisted  = VirtualMachineToolsVersionStatus("guestToolsBlacklisted")
+)
+
+func init() {
+	t["VirtualMachineToolsVersionStatus"] = reflect.TypeOf((*VirtualMachineToolsVersionStatus)(nil)).Elem()
+}
+
+type VirtualMachineUsbInfoFamily string
+
+const (
+	VirtualMachineUsbInfoFamilyAudio           = VirtualMachineUsbInfoFamily("audio")
+	VirtualMachineUsbInfoFamilyHid             = VirtualMachineUsbInfoFamily("hid")
+	VirtualMachineUsbInfoFamilyHid_bootable    = VirtualMachineUsbInfoFamily("hid_bootable")
+	VirtualMachineUsbInfoFamilyPhysical        = VirtualMachineUsbInfoFamily("physical")
+	VirtualMachineUsbInfoFamilyCommunication   = VirtualMachineUsbInfoFamily("communication")
+	VirtualMachineUsbInfoFamilyImaging         = VirtualMachineUsbInfoFamily("imaging")
+	VirtualMachineUsbInfoFamilyPrinter         = VirtualMachineUsbInfoFamily("printer")
+	VirtualMachineUsbInfoFamilyStorage         = VirtualMachineUsbInfoFamily("storage")
+	VirtualMachineUsbInfoFamilyHub             = VirtualMachineUsbInfoFamily("hub")
+	VirtualMachineUsbInfoFamilySmart_card      = VirtualMachineUsbInfoFamily("smart_card")
+	VirtualMachineUsbInfoFamilySecurity        = VirtualMachineUsbInfoFamily("security")
+	VirtualMachineUsbInfoFamilyVideo           = VirtualMachineUsbInfoFamily("video")
+	VirtualMachineUsbInfoFamilyWireless        = VirtualMachineUsbInfoFamily("wireless")
+	VirtualMachineUsbInfoFamilyBluetooth       = VirtualMachineUsbInfoFamily("bluetooth")
+	VirtualMachineUsbInfoFamilyWusb            = VirtualMachineUsbInfoFamily("wusb")
+	VirtualMachineUsbInfoFamilyPda             = VirtualMachineUsbInfoFamily("pda")
+	VirtualMachineUsbInfoFamilyVendor_specific = VirtualMachineUsbInfoFamily("vendor_specific")
+	VirtualMachineUsbInfoFamilyOther           = VirtualMachineUsbInfoFamily("other")
+	VirtualMachineUsbInfoFamilyUnknownFamily   = VirtualMachineUsbInfoFamily("unknownFamily")
+)
+
+func init() {
+	t["VirtualMachineUsbInfoFamily"] = reflect.TypeOf((*VirtualMachineUsbInfoFamily)(nil)).Elem()
+}
+
+type VirtualMachineUsbInfoSpeed string
+
+const (
+	VirtualMachineUsbInfoSpeedLow          = VirtualMachineUsbInfoSpeed("low")
+	VirtualMachineUsbInfoSpeedFull         = VirtualMachineUsbInfoSpeed("full")
+	VirtualMachineUsbInfoSpeedHigh         = VirtualMachineUsbInfoSpeed("high")
+	VirtualMachineUsbInfoSpeedSuperSpeed   = VirtualMachineUsbInfoSpeed("superSpeed")
+	VirtualMachineUsbInfoSpeedUnknownSpeed = VirtualMachineUsbInfoSpeed("unknownSpeed")
+)
+
+func init() {
+	t["VirtualMachineUsbInfoSpeed"] = reflect.TypeOf((*VirtualMachineUsbInfoSpeed)(nil)).Elem()
+}
+
+type VirtualMachineVMCIDeviceAction string
+
+const (
+	VirtualMachineVMCIDeviceActionAllow = VirtualMachineVMCIDeviceAction("allow")
+	VirtualMachineVMCIDeviceActionDeny  = VirtualMachineVMCIDeviceAction("deny")
+)
+
+func init() {
+	t["VirtualMachineVMCIDeviceAction"] = reflect.TypeOf((*VirtualMachineVMCIDeviceAction)(nil)).Elem()
+}
+
+type VirtualMachineVMCIDeviceDirection string
+
+const (
+	VirtualMachineVMCIDeviceDirectionGuest        = VirtualMachineVMCIDeviceDirection("guest")
+	VirtualMachineVMCIDeviceDirectionHost         = VirtualMachineVMCIDeviceDirection("host")
+	VirtualMachineVMCIDeviceDirectionAnyDirection = VirtualMachineVMCIDeviceDirection("anyDirection")
+)
+
+func init() {
+	t["VirtualMachineVMCIDeviceDirection"] = reflect.TypeOf((*VirtualMachineVMCIDeviceDirection)(nil)).Elem()
+}
+
+type VirtualMachineVMCIDeviceProtocol string
+
+const (
+	VirtualMachineVMCIDeviceProtocolHypervisor  = VirtualMachineVMCIDeviceProtocol("hypervisor")
+	VirtualMachineVMCIDeviceProtocolDoorbell    = VirtualMachineVMCIDeviceProtocol("doorbell")
+	VirtualMachineVMCIDeviceProtocolQueuepair   = VirtualMachineVMCIDeviceProtocol("queuepair")
+	VirtualMachineVMCIDeviceProtocolDatagram    = VirtualMachineVMCIDeviceProtocol("datagram")
+	VirtualMachineVMCIDeviceProtocolStream      = VirtualMachineVMCIDeviceProtocol("stream")
+	VirtualMachineVMCIDeviceProtocolAnyProtocol = VirtualMachineVMCIDeviceProtocol("anyProtocol")
+)
+
+func init() {
+	t["VirtualMachineVMCIDeviceProtocol"] = reflect.TypeOf((*VirtualMachineVMCIDeviceProtocol)(nil)).Elem()
+}
+
+type VirtualMachineVideoCardUse3dRenderer string
+
+const (
+	VirtualMachineVideoCardUse3dRendererAutomatic = VirtualMachineVideoCardUse3dRenderer("automatic")
+	VirtualMachineVideoCardUse3dRendererSoftware  = VirtualMachineVideoCardUse3dRenderer("software")
+	VirtualMachineVideoCardUse3dRendererHardware  = VirtualMachineVideoCardUse3dRenderer("hardware")
+)
+
+func init() {
+	t["VirtualMachineVideoCardUse3dRenderer"] = reflect.TypeOf((*VirtualMachineVideoCardUse3dRenderer)(nil)).Elem()
+}
+
+type VirtualMachineWindowsQuiesceSpecVssBackupContext string
+
+const (
+	VirtualMachineWindowsQuiesceSpecVssBackupContextCtx_auto              = VirtualMachineWindowsQuiesceSpecVssBackupContext("ctx_auto")
+	VirtualMachineWindowsQuiesceSpecVssBackupContextCtx_backup            = VirtualMachineWindowsQuiesceSpecVssBackupContext("ctx_backup")
+	VirtualMachineWindowsQuiesceSpecVssBackupContextCtx_file_share_backup = VirtualMachineWindowsQuiesceSpecVssBackupContext("ctx_file_share_backup")
+)
+
+func init() {
+	t["VirtualMachineWindowsQuiesceSpecVssBackupContext"] = reflect.TypeOf((*VirtualMachineWindowsQuiesceSpecVssBackupContext)(nil)).Elem()
+}
+
+type VirtualPointingDeviceHostChoice string
+
+const (
+	VirtualPointingDeviceHostChoiceAutodetect           = VirtualPointingDeviceHostChoice("autodetect")
+	VirtualPointingDeviceHostChoiceIntellimouseExplorer = VirtualPointingDeviceHostChoice("intellimouseExplorer")
+	VirtualPointingDeviceHostChoiceIntellimousePs2      = VirtualPointingDeviceHostChoice("intellimousePs2")
+	VirtualPointingDeviceHostChoiceLogitechMouseman     = VirtualPointingDeviceHostChoice("logitechMouseman")
+	VirtualPointingDeviceHostChoiceMicrosoft_serial     = VirtualPointingDeviceHostChoice("microsoft_serial")
+	VirtualPointingDeviceHostChoiceMouseSystems         = VirtualPointingDeviceHostChoice("mouseSystems")
+	VirtualPointingDeviceHostChoiceMousemanSerial       = VirtualPointingDeviceHostChoice("mousemanSerial")
+	VirtualPointingDeviceHostChoicePs2                  = VirtualPointingDeviceHostChoice("ps2")
+)
+
+func init() {
+	t["VirtualPointingDeviceHostChoice"] = reflect.TypeOf((*VirtualPointingDeviceHostChoice)(nil)).Elem()
+}
+
+type VirtualSCSISharing string
+
+const (
+	VirtualSCSISharingNoSharing       = VirtualSCSISharing("noSharing")
+	VirtualSCSISharingVirtualSharing  = VirtualSCSISharing("virtualSharing")
+	VirtualSCSISharingPhysicalSharing = VirtualSCSISharing("physicalSharing")
+)
+
+func init() {
+	t["VirtualSCSISharing"] = reflect.TypeOf((*VirtualSCSISharing)(nil)).Elem()
+}
+
+type VirtualSerialPortEndPoint string
+
+const (
+	VirtualSerialPortEndPointClient = VirtualSerialPortEndPoint("client")
+	VirtualSerialPortEndPointServer = VirtualSerialPortEndPoint("server")
+)
+
+func init() {
+	t["VirtualSerialPortEndPoint"] = reflect.TypeOf((*VirtualSerialPortEndPoint)(nil)).Elem()
+}
+
+type VmDasBeingResetEventReasonCode string
+
+const (
+	VmDasBeingResetEventReasonCodeVmtoolsHeartbeatFailure  = VmDasBeingResetEventReasonCode("vmtoolsHeartbeatFailure")
+	VmDasBeingResetEventReasonCodeAppHeartbeatFailure      = VmDasBeingResetEventReasonCode("appHeartbeatFailure")
+	VmDasBeingResetEventReasonCodeAppImmediateResetRequest = VmDasBeingResetEventReasonCode("appImmediateResetRequest")
+	VmDasBeingResetEventReasonCodeVmcpResetApdCleared      = VmDasBeingResetEventReasonCode("vmcpResetApdCleared")
+)
+
+func init() {
+	t["VmDasBeingResetEventReasonCode"] = reflect.TypeOf((*VmDasBeingResetEventReasonCode)(nil)).Elem()
+}
+
+type VmFailedStartingSecondaryEventFailureReason string
+
+const (
+	VmFailedStartingSecondaryEventFailureReasonIncompatibleHost = VmFailedStartingSecondaryEventFailureReason("incompatibleHost")
+	VmFailedStartingSecondaryEventFailureReasonLoginFailed      = VmFailedStartingSecondaryEventFailureReason("loginFailed")
+	VmFailedStartingSecondaryEventFailureReasonRegisterVmFailed = VmFailedStartingSecondaryEventFailureReason("registerVmFailed")
+	VmFailedStartingSecondaryEventFailureReasonMigrateFailed    = VmFailedStartingSecondaryEventFailureReason("migrateFailed")
+)
+
+func init() {
+	t["VmFailedStartingSecondaryEventFailureReason"] = reflect.TypeOf((*VmFailedStartingSecondaryEventFailureReason)(nil)).Elem()
+}
+
+type VmFaultToleranceConfigIssueReasonForIssue string
+
+const (
+	VmFaultToleranceConfigIssueReasonForIssueHaNotEnabled                   = VmFaultToleranceConfigIssueReasonForIssue("haNotEnabled")
+	VmFaultToleranceConfigIssueReasonForIssueMoreThanOneSecondary           = VmFaultToleranceConfigIssueReasonForIssue("moreThanOneSecondary")
+	VmFaultToleranceConfigIssueReasonForIssueRecordReplayNotSupported       = VmFaultToleranceConfigIssueReasonForIssue("recordReplayNotSupported")
+	VmFaultToleranceConfigIssueReasonForIssueReplayNotSupported             = VmFaultToleranceConfigIssueReasonForIssue("replayNotSupported")
+	VmFaultToleranceConfigIssueReasonForIssueTemplateVm                     = VmFaultToleranceConfigIssueReasonForIssue("templateVm")
+	VmFaultToleranceConfigIssueReasonForIssueMultipleVCPU                   = VmFaultToleranceConfigIssueReasonForIssue("multipleVCPU")
+	VmFaultToleranceConfigIssueReasonForIssueHostInactive                   = VmFaultToleranceConfigIssueReasonForIssue("hostInactive")
+	VmFaultToleranceConfigIssueReasonForIssueFtUnsupportedHardware          = VmFaultToleranceConfigIssueReasonForIssue("ftUnsupportedHardware")
+	VmFaultToleranceConfigIssueReasonForIssueFtUnsupportedProduct           = VmFaultToleranceConfigIssueReasonForIssue("ftUnsupportedProduct")
+	VmFaultToleranceConfigIssueReasonForIssueMissingVMotionNic              = VmFaultToleranceConfigIssueReasonForIssue("missingVMotionNic")
+	VmFaultToleranceConfigIssueReasonForIssueMissingFTLoggingNic            = VmFaultToleranceConfigIssueReasonForIssue("missingFTLoggingNic")
+	VmFaultToleranceConfigIssueReasonForIssueThinDisk                       = VmFaultToleranceConfigIssueReasonForIssue("thinDisk")
+	VmFaultToleranceConfigIssueReasonForIssueVerifySSLCertificateFlagNotSet = VmFaultToleranceConfigIssueReasonForIssue("verifySSLCertificateFlagNotSet")
+	VmFaultToleranceConfigIssueReasonForIssueHasSnapshots                   = VmFaultToleranceConfigIssueReasonForIssue("hasSnapshots")
+	VmFaultToleranceConfigIssueReasonForIssueNoConfig                       = VmFaultToleranceConfigIssueReasonForIssue("noConfig")
+	VmFaultToleranceConfigIssueReasonForIssueFtSecondaryVm                  = VmFaultToleranceConfigIssueReasonForIssue("ftSecondaryVm")
+	VmFaultToleranceConfigIssueReasonForIssueHasLocalDisk                   = VmFaultToleranceConfigIssueReasonForIssue("hasLocalDisk")
+	VmFaultToleranceConfigIssueReasonForIssueEsxAgentVm                     = VmFaultToleranceConfigIssueReasonForIssue("esxAgentVm")
+	VmFaultToleranceConfigIssueReasonForIssueVideo3dEnabled                 = VmFaultToleranceConfigIssueReasonForIssue("video3dEnabled")
+	VmFaultToleranceConfigIssueReasonForIssueHasUnsupportedDisk             = VmFaultToleranceConfigIssueReasonForIssue("hasUnsupportedDisk")
+	VmFaultToleranceConfigIssueReasonForIssueInsufficientBandwidth          = VmFaultToleranceConfigIssueReasonForIssue("insufficientBandwidth")
+	VmFaultToleranceConfigIssueReasonForIssueHasNestedHVConfiguration       = VmFaultToleranceConfigIssueReasonForIssue("hasNestedHVConfiguration")
+	VmFaultToleranceConfigIssueReasonForIssueHasVFlashConfiguration         = VmFaultToleranceConfigIssueReasonForIssue("hasVFlashConfiguration")
+	VmFaultToleranceConfigIssueReasonForIssueUnsupportedProduct             = VmFaultToleranceConfigIssueReasonForIssue("unsupportedProduct")
+	VmFaultToleranceConfigIssueReasonForIssueCpuHvUnsupported               = VmFaultToleranceConfigIssueReasonForIssue("cpuHvUnsupported")
+	VmFaultToleranceConfigIssueReasonForIssueCpuHwmmuUnsupported            = VmFaultToleranceConfigIssueReasonForIssue("cpuHwmmuUnsupported")
+	VmFaultToleranceConfigIssueReasonForIssueCpuHvDisabled                  = VmFaultToleranceConfigIssueReasonForIssue("cpuHvDisabled")
+	VmFaultToleranceConfigIssueReasonForIssueHasEFIFirmware                 = VmFaultToleranceConfigIssueReasonForIssue("hasEFIFirmware")
+)
+
+func init() {
+	t["VmFaultToleranceConfigIssueReasonForIssue"] = reflect.TypeOf((*VmFaultToleranceConfigIssueReasonForIssue)(nil)).Elem()
+}
+
+type VmFaultToleranceInvalidFileBackingDeviceType string
+
+const (
+	VmFaultToleranceInvalidFileBackingDeviceTypeVirtualFloppy       = VmFaultToleranceInvalidFileBackingDeviceType("virtualFloppy")
+	VmFaultToleranceInvalidFileBackingDeviceTypeVirtualCdrom        = VmFaultToleranceInvalidFileBackingDeviceType("virtualCdrom")
+	VmFaultToleranceInvalidFileBackingDeviceTypeVirtualSerialPort   = VmFaultToleranceInvalidFileBackingDeviceType("virtualSerialPort")
+	VmFaultToleranceInvalidFileBackingDeviceTypeVirtualParallelPort = VmFaultToleranceInvalidFileBackingDeviceType("virtualParallelPort")
+	VmFaultToleranceInvalidFileBackingDeviceTypeVirtualDisk         = VmFaultToleranceInvalidFileBackingDeviceType("virtualDisk")
+)
+
+func init() {
+	t["VmFaultToleranceInvalidFileBackingDeviceType"] = reflect.TypeOf((*VmFaultToleranceInvalidFileBackingDeviceType)(nil)).Elem()
+}
+
+type VmShutdownOnIsolationEventOperation string
+
+const (
+	VmShutdownOnIsolationEventOperationShutdown   = VmShutdownOnIsolationEventOperation("shutdown")
+	VmShutdownOnIsolationEventOperationPoweredOff = VmShutdownOnIsolationEventOperation("poweredOff")
+)
+
+func init() {
+	t["VmShutdownOnIsolationEventOperation"] = reflect.TypeOf((*VmShutdownOnIsolationEventOperation)(nil)).Elem()
+}
+
+type VmwareDistributedVirtualSwitchPvlanPortType string
+
+const (
+	VmwareDistributedVirtualSwitchPvlanPortTypePromiscuous = VmwareDistributedVirtualSwitchPvlanPortType("promiscuous")
+	VmwareDistributedVirtualSwitchPvlanPortTypeIsolated    = VmwareDistributedVirtualSwitchPvlanPortType("isolated")
+	VmwareDistributedVirtualSwitchPvlanPortTypeCommunity   = VmwareDistributedVirtualSwitchPvlanPortType("community")
+)
+
+func init() {
+	t["VmwareDistributedVirtualSwitchPvlanPortType"] = reflect.TypeOf((*VmwareDistributedVirtualSwitchPvlanPortType)(nil)).Elem()
+}
+
+type VsanDiskIssueType string
+
+const (
+	VsanDiskIssueTypeNonExist      = VsanDiskIssueType("nonExist")
+	VsanDiskIssueTypeStampMismatch = VsanDiskIssueType("stampMismatch")
+	VsanDiskIssueTypeUnknown       = VsanDiskIssueType("unknown")
+)
+
+func init() {
+	t["VsanDiskIssueType"] = reflect.TypeOf((*VsanDiskIssueType)(nil)).Elem()
+}
+
+type VsanHostDecommissionModeObjectAction string
+
+const (
+	VsanHostDecommissionModeObjectActionNoAction                  = VsanHostDecommissionModeObjectAction("noAction")
+	VsanHostDecommissionModeObjectActionEnsureObjectAccessibility = VsanHostDecommissionModeObjectAction("ensureObjectAccessibility")
+	VsanHostDecommissionModeObjectActionEvacuateAllData           = VsanHostDecommissionModeObjectAction("evacuateAllData")
+)
+
+func init() {
+	t["VsanHostDecommissionModeObjectAction"] = reflect.TypeOf((*VsanHostDecommissionModeObjectAction)(nil)).Elem()
+}
+
+type VsanHostDiskResultState string
+
+const (
+	VsanHostDiskResultStateInUse      = VsanHostDiskResultState("inUse")
+	VsanHostDiskResultStateEligible   = VsanHostDiskResultState("eligible")
+	VsanHostDiskResultStateIneligible = VsanHostDiskResultState("ineligible")
+)
+
+func init() {
+	t["VsanHostDiskResultState"] = reflect.TypeOf((*VsanHostDiskResultState)(nil)).Elem()
+}
+
+type VsanHostHealthState string
+
+const (
+	VsanHostHealthStateUnknown   = VsanHostHealthState("unknown")
+	VsanHostHealthStateHealthy   = VsanHostHealthState("healthy")
+	VsanHostHealthStateUnhealthy = VsanHostHealthState("unhealthy")
+)
+
+func init() {
+	t["VsanHostHealthState"] = reflect.TypeOf((*VsanHostHealthState)(nil)).Elem()
+}
+
+type VsanHostNodeState string
+
+const (
+	VsanHostNodeStateError                   = VsanHostNodeState("error")
+	VsanHostNodeStateDisabled                = VsanHostNodeState("disabled")
+	VsanHostNodeStateAgent                   = VsanHostNodeState("agent")
+	VsanHostNodeStateMaster                  = VsanHostNodeState("master")
+	VsanHostNodeStateBackup                  = VsanHostNodeState("backup")
+	VsanHostNodeStateStarting                = VsanHostNodeState("starting")
+	VsanHostNodeStateStopping                = VsanHostNodeState("stopping")
+	VsanHostNodeStateEnteringMaintenanceMode = VsanHostNodeState("enteringMaintenanceMode")
+	VsanHostNodeStateExitingMaintenanceMode  = VsanHostNodeState("exitingMaintenanceMode")
+	VsanHostNodeStateDecommissioning         = VsanHostNodeState("decommissioning")
+)
+
+func init() {
+	t["VsanHostNodeState"] = reflect.TypeOf((*VsanHostNodeState)(nil)).Elem()
+}
+
+type VsanUpgradeSystemUpgradeHistoryDiskGroupOpType string
+
+const (
+	VsanUpgradeSystemUpgradeHistoryDiskGroupOpTypeAdd    = VsanUpgradeSystemUpgradeHistoryDiskGroupOpType("add")
+	VsanUpgradeSystemUpgradeHistoryDiskGroupOpTypeRemove = VsanUpgradeSystemUpgradeHistoryDiskGroupOpType("remove")
+)
+
+func init() {
+	t["VsanUpgradeSystemUpgradeHistoryDiskGroupOpType"] = reflect.TypeOf((*VsanUpgradeSystemUpgradeHistoryDiskGroupOpType)(nil)).Elem()
+}
+
+type WeekOfMonth string
+
+const (
+	WeekOfMonthFirst  = WeekOfMonth("first")
+	WeekOfMonthSecond = WeekOfMonth("second")
+	WeekOfMonthThird  = WeekOfMonth("third")
+	WeekOfMonthFourth = WeekOfMonth("fourth")
+	WeekOfMonthLast   = WeekOfMonth("last")
+)
+
+func init() {
+	t["WeekOfMonth"] = reflect.TypeOf((*WeekOfMonth)(nil)).Elem()
+}
+
+type WillLoseHAProtectionResolution string
+
+const (
+	WillLoseHAProtectionResolutionSvmotion = WillLoseHAProtectionResolution("svmotion")
+	WillLoseHAProtectionResolutionRelocate = WillLoseHAProtectionResolution("relocate")
+)
+
+func init() {
+	t["WillLoseHAProtectionResolution"] = reflect.TypeOf((*WillLoseHAProtectionResolution)(nil)).Elem()
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/types/fault.go b/vendor/github.com/vmware/govmomi/vim25/types/fault.go
new file mode 100644
index 0000000000..c2503fa5cb
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/types/fault.go
@@ -0,0 +1,32 @@
+/*
+Copyright (c) 2015 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 types
+
+type HasFault interface {
+	Fault() BaseMethodFault
+}
+
+func IsFileNotFound(err error) bool {
+	if f, ok := err.(HasFault); ok {
+		switch f.Fault().(type) {
+		case *FileNotFound:
+			return true
+		}
+	}
+
+	return false
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/types/helpers.go b/vendor/github.com/vmware/govmomi/vim25/types/helpers.go
new file mode 100644
index 0000000000..7b72358b25
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/types/helpers.go
@@ -0,0 +1,48 @@
+/*
+Copyright (c) 2015 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 types
+
+import "strings"
+
+func NewBool(v bool) *bool {
+	return &v
+}
+
+func NewReference(r ManagedObjectReference) *ManagedObjectReference {
+	return &r
+}
+
+func (r ManagedObjectReference) Reference() ManagedObjectReference {
+	return r
+}
+
+func (r ManagedObjectReference) String() string {
+	return strings.Join([]string{r.Type, r.Value}, ":")
+}
+
+func (r *ManagedObjectReference) FromString(o string) bool {
+	s := strings.SplitN(o, ":", 2)
+
+	if len(s) < 2 {
+		return false
+	}
+
+	r.Type = s[0]
+	r.Value = s[1]
+
+	return true
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/types/if.go b/vendor/github.com/vmware/govmomi/vim25/types/if.go
new file mode 100644
index 0000000000..5ae275c6da
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/types/if.go
@@ -0,0 +1,3459 @@
+/*
+Copyright (c) 2014-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 types
+
+import "reflect"
+
+func (b *Action) GetAction() *Action { return b }
+
+type BaseAction interface {
+	GetAction() *Action
+}
+
+func init() {
+	t["BaseAction"] = reflect.TypeOf((*Action)(nil)).Elem()
+}
+
+func (b *ActiveDirectoryFault) GetActiveDirectoryFault() *ActiveDirectoryFault { return b }
+
+type BaseActiveDirectoryFault interface {
+	GetActiveDirectoryFault() *ActiveDirectoryFault
+}
+
+func init() {
+	t["BaseActiveDirectoryFault"] = reflect.TypeOf((*ActiveDirectoryFault)(nil)).Elem()
+}
+
+func (b *AlarmAction) GetAlarmAction() *AlarmAction { return b }
+
+type BaseAlarmAction interface {
+	GetAlarmAction() *AlarmAction
+}
+
+func init() {
+	t["BaseAlarmAction"] = reflect.TypeOf((*AlarmAction)(nil)).Elem()
+}
+
+func (b *AlarmEvent) GetAlarmEvent() *AlarmEvent { return b }
+
+type BaseAlarmEvent interface {
+	GetAlarmEvent() *AlarmEvent
+}
+
+func init() {
+	t["BaseAlarmEvent"] = reflect.TypeOf((*AlarmEvent)(nil)).Elem()
+}
+
+func (b *AlarmExpression) GetAlarmExpression() *AlarmExpression { return b }
+
+type BaseAlarmExpression interface {
+	GetAlarmExpression() *AlarmExpression
+}
+
+func init() {
+	t["BaseAlarmExpression"] = reflect.TypeOf((*AlarmExpression)(nil)).Elem()
+}
+
+func (b *AlarmSpec) GetAlarmSpec() *AlarmSpec { return b }
+
+type BaseAlarmSpec interface {
+	GetAlarmSpec() *AlarmSpec
+}
+
+func init() {
+	t["BaseAlarmSpec"] = reflect.TypeOf((*AlarmSpec)(nil)).Elem()
+}
+
+func (b *AnswerFileCreateSpec) GetAnswerFileCreateSpec() *AnswerFileCreateSpec { return b }
+
+type BaseAnswerFileCreateSpec interface {
+	GetAnswerFileCreateSpec() *AnswerFileCreateSpec
+}
+
+func init() {
+	t["BaseAnswerFileCreateSpec"] = reflect.TypeOf((*AnswerFileCreateSpec)(nil)).Elem()
+}
+
+func (b *ApplyProfile) GetApplyProfile() *ApplyProfile { return b }
+
+type BaseApplyProfile interface {
+	GetApplyProfile() *ApplyProfile
+}
+
+func init() {
+	t["BaseApplyProfile"] = reflect.TypeOf((*ApplyProfile)(nil)).Elem()
+}
+
+func (b *ArrayUpdateSpec) GetArrayUpdateSpec() *ArrayUpdateSpec { return b }
+
+type BaseArrayUpdateSpec interface {
+	GetArrayUpdateSpec() *ArrayUpdateSpec
+}
+
+func init() {
+	t["BaseArrayUpdateSpec"] = reflect.TypeOf((*ArrayUpdateSpec)(nil)).Elem()
+}
+
+func (b *AuthorizationEvent) GetAuthorizationEvent() *AuthorizationEvent { return b }
+
+type BaseAuthorizationEvent interface {
+	GetAuthorizationEvent() *AuthorizationEvent
+}
+
+func init() {
+	t["BaseAuthorizationEvent"] = reflect.TypeOf((*AuthorizationEvent)(nil)).Elem()
+}
+
+func (b *BaseConfigInfo) GetBaseConfigInfo() *BaseConfigInfo { return b }
+
+type BaseBaseConfigInfo interface {
+	GetBaseConfigInfo() *BaseConfigInfo
+}
+
+func init() {
+	t["BaseBaseConfigInfo"] = reflect.TypeOf((*BaseConfigInfo)(nil)).Elem()
+}
+
+func (b *BaseConfigInfoBackingInfo) GetBaseConfigInfoBackingInfo() *BaseConfigInfoBackingInfo {
+	return b
+}
+
+type BaseBaseConfigInfoBackingInfo interface {
+	GetBaseConfigInfoBackingInfo() *BaseConfigInfoBackingInfo
+}
+
+func init() {
+	t["BaseBaseConfigInfoBackingInfo"] = reflect.TypeOf((*BaseConfigInfoBackingInfo)(nil)).Elem()
+}
+
+func (b *BaseConfigInfoFileBackingInfo) GetBaseConfigInfoFileBackingInfo() *BaseConfigInfoFileBackingInfo {
+	return b
+}
+
+type BaseBaseConfigInfoFileBackingInfo interface {
+	GetBaseConfigInfoFileBackingInfo() *BaseConfigInfoFileBackingInfo
+}
+
+func init() {
+	t["BaseBaseConfigInfoFileBackingInfo"] = reflect.TypeOf((*BaseConfigInfoFileBackingInfo)(nil)).Elem()
+}
+
+func (b *CannotAccessNetwork) GetCannotAccessNetwork() *CannotAccessNetwork { return b }
+
+type BaseCannotAccessNetwork interface {
+	GetCannotAccessNetwork() *CannotAccessNetwork
+}
+
+func init() {
+	t["BaseCannotAccessNetwork"] = reflect.TypeOf((*CannotAccessNetwork)(nil)).Elem()
+}
+
+func (b *CannotAccessVmComponent) GetCannotAccessVmComponent() *CannotAccessVmComponent { return b }
+
+type BaseCannotAccessVmComponent interface {
+	GetCannotAccessVmComponent() *CannotAccessVmComponent
+}
+
+func init() {
+	t["BaseCannotAccessVmComponent"] = reflect.TypeOf((*CannotAccessVmComponent)(nil)).Elem()
+}
+
+func (b *CannotAccessVmDevice) GetCannotAccessVmDevice() *CannotAccessVmDevice { return b }
+
+type BaseCannotAccessVmDevice interface {
+	GetCannotAccessVmDevice() *CannotAccessVmDevice
+}
+
+func init() {
+	t["BaseCannotAccessVmDevice"] = reflect.TypeOf((*CannotAccessVmDevice)(nil)).Elem()
+}
+
+func (b *CannotAccessVmDisk) GetCannotAccessVmDisk() *CannotAccessVmDisk { return b }
+
+type BaseCannotAccessVmDisk interface {
+	GetCannotAccessVmDisk() *CannotAccessVmDisk
+}
+
+func init() {
+	t["BaseCannotAccessVmDisk"] = reflect.TypeOf((*CannotAccessVmDisk)(nil)).Elem()
+}
+
+func (b *CannotMoveVsanEnabledHost) GetCannotMoveVsanEnabledHost() *CannotMoveVsanEnabledHost {
+	return b
+}
+
+type BaseCannotMoveVsanEnabledHost interface {
+	GetCannotMoveVsanEnabledHost() *CannotMoveVsanEnabledHost
+}
+
+func init() {
+	t["BaseCannotMoveVsanEnabledHost"] = reflect.TypeOf((*CannotMoveVsanEnabledHost)(nil)).Elem()
+}
+
+func (b *ClusterAction) GetClusterAction() *ClusterAction { return b }
+
+type BaseClusterAction interface {
+	GetClusterAction() *ClusterAction
+}
+
+func init() {
+	t["BaseClusterAction"] = reflect.TypeOf((*ClusterAction)(nil)).Elem()
+}
+
+func (b *ClusterDasAdmissionControlInfo) GetClusterDasAdmissionControlInfo() *ClusterDasAdmissionControlInfo {
+	return b
+}
+
+type BaseClusterDasAdmissionControlInfo interface {
+	GetClusterDasAdmissionControlInfo() *ClusterDasAdmissionControlInfo
+}
+
+func init() {
+	t["BaseClusterDasAdmissionControlInfo"] = reflect.TypeOf((*ClusterDasAdmissionControlInfo)(nil)).Elem()
+}
+
+func (b *ClusterDasAdmissionControlPolicy) GetClusterDasAdmissionControlPolicy() *ClusterDasAdmissionControlPolicy {
+	return b
+}
+
+type BaseClusterDasAdmissionControlPolicy interface {
+	GetClusterDasAdmissionControlPolicy() *ClusterDasAdmissionControlPolicy
+}
+
+func init() {
+	t["BaseClusterDasAdmissionControlPolicy"] = reflect.TypeOf((*ClusterDasAdmissionControlPolicy)(nil)).Elem()
+}
+
+func (b *ClusterDasAdvancedRuntimeInfo) GetClusterDasAdvancedRuntimeInfo() *ClusterDasAdvancedRuntimeInfo {
+	return b
+}
+
+type BaseClusterDasAdvancedRuntimeInfo interface {
+	GetClusterDasAdvancedRuntimeInfo() *ClusterDasAdvancedRuntimeInfo
+}
+
+func init() {
+	t["BaseClusterDasAdvancedRuntimeInfo"] = reflect.TypeOf((*ClusterDasAdvancedRuntimeInfo)(nil)).Elem()
+}
+
+func (b *ClusterDasData) GetClusterDasData() *ClusterDasData { return b }
+
+type BaseClusterDasData interface {
+	GetClusterDasData() *ClusterDasData
+}
+
+func init() {
+	t["BaseClusterDasData"] = reflect.TypeOf((*ClusterDasData)(nil)).Elem()
+}
+
+func (b *ClusterDasHostInfo) GetClusterDasHostInfo() *ClusterDasHostInfo { return b }
+
+type BaseClusterDasHostInfo interface {
+	GetClusterDasHostInfo() *ClusterDasHostInfo
+}
+
+func init() {
+	t["BaseClusterDasHostInfo"] = reflect.TypeOf((*ClusterDasHostInfo)(nil)).Elem()
+}
+
+func (b *ClusterDrsFaultsFaultsByVm) GetClusterDrsFaultsFaultsByVm() *ClusterDrsFaultsFaultsByVm {
+	return b
+}
+
+type BaseClusterDrsFaultsFaultsByVm interface {
+	GetClusterDrsFaultsFaultsByVm() *ClusterDrsFaultsFaultsByVm
+}
+
+func init() {
+	t["BaseClusterDrsFaultsFaultsByVm"] = reflect.TypeOf((*ClusterDrsFaultsFaultsByVm)(nil)).Elem()
+}
+
+func (b *ClusterEvent) GetClusterEvent() *ClusterEvent { return b }
+
+type BaseClusterEvent interface {
+	GetClusterEvent() *ClusterEvent
+}
+
+func init() {
+	t["BaseClusterEvent"] = reflect.TypeOf((*ClusterEvent)(nil)).Elem()
+}
+
+func (b *ClusterGroupInfo) GetClusterGroupInfo() *ClusterGroupInfo { return b }
+
+type BaseClusterGroupInfo interface {
+	GetClusterGroupInfo() *ClusterGroupInfo
+}
+
+func init() {
+	t["BaseClusterGroupInfo"] = reflect.TypeOf((*ClusterGroupInfo)(nil)).Elem()
+}
+
+func (b *ClusterOvercommittedEvent) GetClusterOvercommittedEvent() *ClusterOvercommittedEvent {
+	return b
+}
+
+type BaseClusterOvercommittedEvent interface {
+	GetClusterOvercommittedEvent() *ClusterOvercommittedEvent
+}
+
+func init() {
+	t["BaseClusterOvercommittedEvent"] = reflect.TypeOf((*ClusterOvercommittedEvent)(nil)).Elem()
+}
+
+func (b *ClusterProfileConfigSpec) GetClusterProfileConfigSpec() *ClusterProfileConfigSpec { return b }
+
+type BaseClusterProfileConfigSpec interface {
+	GetClusterProfileConfigSpec() *ClusterProfileConfigSpec
+}
+
+func init() {
+	t["BaseClusterProfileConfigSpec"] = reflect.TypeOf((*ClusterProfileConfigSpec)(nil)).Elem()
+}
+
+func (b *ClusterProfileCreateSpec) GetClusterProfileCreateSpec() *ClusterProfileCreateSpec { return b }
+
+type BaseClusterProfileCreateSpec interface {
+	GetClusterProfileCreateSpec() *ClusterProfileCreateSpec
+}
+
+func init() {
+	t["BaseClusterProfileCreateSpec"] = reflect.TypeOf((*ClusterProfileCreateSpec)(nil)).Elem()
+}
+
+func (b *ClusterRuleInfo) GetClusterRuleInfo() *ClusterRuleInfo { return b }
+
+type BaseClusterRuleInfo interface {
+	GetClusterRuleInfo() *ClusterRuleInfo
+}
+
+func init() {
+	t["BaseClusterRuleInfo"] = reflect.TypeOf((*ClusterRuleInfo)(nil)).Elem()
+}
+
+func (b *ClusterSlotPolicy) GetClusterSlotPolicy() *ClusterSlotPolicy { return b }
+
+type BaseClusterSlotPolicy interface {
+	GetClusterSlotPolicy() *ClusterSlotPolicy
+}
+
+func init() {
+	t["BaseClusterSlotPolicy"] = reflect.TypeOf((*ClusterSlotPolicy)(nil)).Elem()
+}
+
+func (b *ClusterStatusChangedEvent) GetClusterStatusChangedEvent() *ClusterStatusChangedEvent {
+	return b
+}
+
+type BaseClusterStatusChangedEvent interface {
+	GetClusterStatusChangedEvent() *ClusterStatusChangedEvent
+}
+
+func init() {
+	t["BaseClusterStatusChangedEvent"] = reflect.TypeOf((*ClusterStatusChangedEvent)(nil)).Elem()
+}
+
+func (b *ComputeResourceConfigInfo) GetComputeResourceConfigInfo() *ComputeResourceConfigInfo {
+	return b
+}
+
+type BaseComputeResourceConfigInfo interface {
+	GetComputeResourceConfigInfo() *ComputeResourceConfigInfo
+}
+
+func init() {
+	t["BaseComputeResourceConfigInfo"] = reflect.TypeOf((*ComputeResourceConfigInfo)(nil)).Elem()
+}
+
+func (b *ComputeResourceConfigSpec) GetComputeResourceConfigSpec() *ComputeResourceConfigSpec {
+	return b
+}
+
+type BaseComputeResourceConfigSpec interface {
+	GetComputeResourceConfigSpec() *ComputeResourceConfigSpec
+}
+
+func init() {
+	t["BaseComputeResourceConfigSpec"] = reflect.TypeOf((*ComputeResourceConfigSpec)(nil)).Elem()
+}
+
+func (b *ComputeResourceSummary) GetComputeResourceSummary() *ComputeResourceSummary { return b }
+
+type BaseComputeResourceSummary interface {
+	GetComputeResourceSummary() *ComputeResourceSummary
+}
+
+func init() {
+	t["BaseComputeResourceSummary"] = reflect.TypeOf((*ComputeResourceSummary)(nil)).Elem()
+}
+
+func (b *CpuIncompatible) GetCpuIncompatible() *CpuIncompatible { return b }
+
+type BaseCpuIncompatible interface {
+	GetCpuIncompatible() *CpuIncompatible
+}
+
+func init() {
+	t["BaseCpuIncompatible"] = reflect.TypeOf((*CpuIncompatible)(nil)).Elem()
+}
+
+func (b *CryptoSpec) GetCryptoSpec() *CryptoSpec { return b }
+
+type BaseCryptoSpec interface {
+	GetCryptoSpec() *CryptoSpec
+}
+
+func init() {
+	t["BaseCryptoSpec"] = reflect.TypeOf((*CryptoSpec)(nil)).Elem()
+}
+
+func (b *CryptoSpecNoOp) GetCryptoSpecNoOp() *CryptoSpecNoOp { return b }
+
+type BaseCryptoSpecNoOp interface {
+	GetCryptoSpecNoOp() *CryptoSpecNoOp
+}
+
+func init() {
+	t["BaseCryptoSpecNoOp"] = reflect.TypeOf((*CryptoSpecNoOp)(nil)).Elem()
+}
+
+func (b *CustomFieldDefEvent) GetCustomFieldDefEvent() *CustomFieldDefEvent { return b }
+
+type BaseCustomFieldDefEvent interface {
+	GetCustomFieldDefEvent() *CustomFieldDefEvent
+}
+
+func init() {
+	t["BaseCustomFieldDefEvent"] = reflect.TypeOf((*CustomFieldDefEvent)(nil)).Elem()
+}
+
+func (b *CustomFieldEvent) GetCustomFieldEvent() *CustomFieldEvent { return b }
+
+type BaseCustomFieldEvent interface {
+	GetCustomFieldEvent() *CustomFieldEvent
+}
+
+func init() {
+	t["BaseCustomFieldEvent"] = reflect.TypeOf((*CustomFieldEvent)(nil)).Elem()
+}
+
+func (b *CustomFieldValue) GetCustomFieldValue() *CustomFieldValue { return b }
+
+type BaseCustomFieldValue interface {
+	GetCustomFieldValue() *CustomFieldValue
+}
+
+func init() {
+	t["BaseCustomFieldValue"] = reflect.TypeOf((*CustomFieldValue)(nil)).Elem()
+}
+
+func (b *CustomizationEvent) GetCustomizationEvent() *CustomizationEvent { return b }
+
+type BaseCustomizationEvent interface {
+	GetCustomizationEvent() *CustomizationEvent
+}
+
+func init() {
+	t["BaseCustomizationEvent"] = reflect.TypeOf((*CustomizationEvent)(nil)).Elem()
+}
+
+func (b *CustomizationFailed) GetCustomizationFailed() *CustomizationFailed { return b }
+
+type BaseCustomizationFailed interface {
+	GetCustomizationFailed() *CustomizationFailed
+}
+
+func init() {
+	t["BaseCustomizationFailed"] = reflect.TypeOf((*CustomizationFailed)(nil)).Elem()
+}
+
+func (b *CustomizationFault) GetCustomizationFault() *CustomizationFault { return b }
+
+type BaseCustomizationFault interface {
+	GetCustomizationFault() *CustomizationFault
+}
+
+func init() {
+	t["BaseCustomizationFault"] = reflect.TypeOf((*CustomizationFault)(nil)).Elem()
+}
+
+func (b *CustomizationIdentitySettings) GetCustomizationIdentitySettings() *CustomizationIdentitySettings {
+	return b
+}
+
+type BaseCustomizationIdentitySettings interface {
+	GetCustomizationIdentitySettings() *CustomizationIdentitySettings
+}
+
+func init() {
+	t["BaseCustomizationIdentitySettings"] = reflect.TypeOf((*CustomizationIdentitySettings)(nil)).Elem()
+}
+
+func (b *CustomizationIpGenerator) GetCustomizationIpGenerator() *CustomizationIpGenerator { return b }
+
+type BaseCustomizationIpGenerator interface {
+	GetCustomizationIpGenerator() *CustomizationIpGenerator
+}
+
+func init() {
+	t["BaseCustomizationIpGenerator"] = reflect.TypeOf((*CustomizationIpGenerator)(nil)).Elem()
+}
+
+func (b *CustomizationIpV6Generator) GetCustomizationIpV6Generator() *CustomizationIpV6Generator {
+	return b
+}
+
+type BaseCustomizationIpV6Generator interface {
+	GetCustomizationIpV6Generator() *CustomizationIpV6Generator
+}
+
+func init() {
+	t["BaseCustomizationIpV6Generator"] = reflect.TypeOf((*CustomizationIpV6Generator)(nil)).Elem()
+}
+
+func (b *CustomizationName) GetCustomizationName() *CustomizationName { return b }
+
+type BaseCustomizationName interface {
+	GetCustomizationName() *CustomizationName
+}
+
+func init() {
+	t["BaseCustomizationName"] = reflect.TypeOf((*CustomizationName)(nil)).Elem()
+}
+
+func (b *CustomizationOptions) GetCustomizationOptions() *CustomizationOptions { return b }
+
+type BaseCustomizationOptions interface {
+	GetCustomizationOptions() *CustomizationOptions
+}
+
+func init() {
+	t["BaseCustomizationOptions"] = reflect.TypeOf((*CustomizationOptions)(nil)).Elem()
+}
+
+func (b *DVPortSetting) GetDVPortSetting() *DVPortSetting { return b }
+
+type BaseDVPortSetting interface {
+	GetDVPortSetting() *DVPortSetting
+}
+
+func init() {
+	t["BaseDVPortSetting"] = reflect.TypeOf((*DVPortSetting)(nil)).Elem()
+}
+
+func (b *DVPortgroupEvent) GetDVPortgroupEvent() *DVPortgroupEvent { return b }
+
+type BaseDVPortgroupEvent interface {
+	GetDVPortgroupEvent() *DVPortgroupEvent
+}
+
+func init() {
+	t["BaseDVPortgroupEvent"] = reflect.TypeOf((*DVPortgroupEvent)(nil)).Elem()
+}
+
+func (b *DVPortgroupPolicy) GetDVPortgroupPolicy() *DVPortgroupPolicy { return b }
+
+type BaseDVPortgroupPolicy interface {
+	GetDVPortgroupPolicy() *DVPortgroupPolicy
+}
+
+func init() {
+	t["BaseDVPortgroupPolicy"] = reflect.TypeOf((*DVPortgroupPolicy)(nil)).Elem()
+}
+
+func (b *DVSConfigInfo) GetDVSConfigInfo() *DVSConfigInfo { return b }
+
+type BaseDVSConfigInfo interface {
+	GetDVSConfigInfo() *DVSConfigInfo
+}
+
+func init() {
+	t["BaseDVSConfigInfo"] = reflect.TypeOf((*DVSConfigInfo)(nil)).Elem()
+}
+
+func (b *DVSConfigSpec) GetDVSConfigSpec() *DVSConfigSpec { return b }
+
+type BaseDVSConfigSpec interface {
+	GetDVSConfigSpec() *DVSConfigSpec
+}
+
+func init() {
+	t["BaseDVSConfigSpec"] = reflect.TypeOf((*DVSConfigSpec)(nil)).Elem()
+}
+
+func (b *DVSFeatureCapability) GetDVSFeatureCapability() *DVSFeatureCapability { return b }
+
+type BaseDVSFeatureCapability interface {
+	GetDVSFeatureCapability() *DVSFeatureCapability
+}
+
+func init() {
+	t["BaseDVSFeatureCapability"] = reflect.TypeOf((*DVSFeatureCapability)(nil)).Elem()
+}
+
+func (b *DVSHealthCheckCapability) GetDVSHealthCheckCapability() *DVSHealthCheckCapability { return b }
+
+type BaseDVSHealthCheckCapability interface {
+	GetDVSHealthCheckCapability() *DVSHealthCheckCapability
+}
+
+func init() {
+	t["BaseDVSHealthCheckCapability"] = reflect.TypeOf((*DVSHealthCheckCapability)(nil)).Elem()
+}
+
+func (b *DVSHealthCheckConfig) GetDVSHealthCheckConfig() *DVSHealthCheckConfig { return b }
+
+type BaseDVSHealthCheckConfig interface {
+	GetDVSHealthCheckConfig() *DVSHealthCheckConfig
+}
+
+func init() {
+	t["BaseDVSHealthCheckConfig"] = reflect.TypeOf((*DVSHealthCheckConfig)(nil)).Elem()
+}
+
+func (b *DVSUplinkPortPolicy) GetDVSUplinkPortPolicy() *DVSUplinkPortPolicy { return b }
+
+type BaseDVSUplinkPortPolicy interface {
+	GetDVSUplinkPortPolicy() *DVSUplinkPortPolicy
+}
+
+func init() {
+	t["BaseDVSUplinkPortPolicy"] = reflect.TypeOf((*DVSUplinkPortPolicy)(nil)).Elem()
+}
+
+func (b *DailyTaskScheduler) GetDailyTaskScheduler() *DailyTaskScheduler { return b }
+
+type BaseDailyTaskScheduler interface {
+	GetDailyTaskScheduler() *DailyTaskScheduler
+}
+
+func init() {
+	t["BaseDailyTaskScheduler"] = reflect.TypeOf((*DailyTaskScheduler)(nil)).Elem()
+}
+
+func (b *DatacenterEvent) GetDatacenterEvent() *DatacenterEvent { return b }
+
+type BaseDatacenterEvent interface {
+	GetDatacenterEvent() *DatacenterEvent
+}
+
+func init() {
+	t["BaseDatacenterEvent"] = reflect.TypeOf((*DatacenterEvent)(nil)).Elem()
+}
+
+func (b *DatastoreEvent) GetDatastoreEvent() *DatastoreEvent { return b }
+
+type BaseDatastoreEvent interface {
+	GetDatastoreEvent() *DatastoreEvent
+}
+
+func init() {
+	t["BaseDatastoreEvent"] = reflect.TypeOf((*DatastoreEvent)(nil)).Elem()
+}
+
+func (b *DatastoreFileEvent) GetDatastoreFileEvent() *DatastoreFileEvent { return b }
+
+type BaseDatastoreFileEvent interface {
+	GetDatastoreFileEvent() *DatastoreFileEvent
+}
+
+func init() {
+	t["BaseDatastoreFileEvent"] = reflect.TypeOf((*DatastoreFileEvent)(nil)).Elem()
+}
+
+func (b *DatastoreInfo) GetDatastoreInfo() *DatastoreInfo { return b }
+
+type BaseDatastoreInfo interface {
+	GetDatastoreInfo() *DatastoreInfo
+}
+
+func init() {
+	t["BaseDatastoreInfo"] = reflect.TypeOf((*DatastoreInfo)(nil)).Elem()
+}
+
+func (b *DatastoreNotWritableOnHost) GetDatastoreNotWritableOnHost() *DatastoreNotWritableOnHost {
+	return b
+}
+
+type BaseDatastoreNotWritableOnHost interface {
+	GetDatastoreNotWritableOnHost() *DatastoreNotWritableOnHost
+}
+
+func init() {
+	t["BaseDatastoreNotWritableOnHost"] = reflect.TypeOf((*DatastoreNotWritableOnHost)(nil)).Elem()
+}
+
+func (b *Description) GetDescription() *Description { return b }
+
+type BaseDescription interface {
+	GetDescription() *Description
+}
+
+func init() {
+	t["BaseDescription"] = reflect.TypeOf((*Description)(nil)).Elem()
+}
+
+func (b *DeviceBackingNotSupported) GetDeviceBackingNotSupported() *DeviceBackingNotSupported {
+	return b
+}
+
+type BaseDeviceBackingNotSupported interface {
+	GetDeviceBackingNotSupported() *DeviceBackingNotSupported
+}
+
+func init() {
+	t["BaseDeviceBackingNotSupported"] = reflect.TypeOf((*DeviceBackingNotSupported)(nil)).Elem()
+}
+
+func (b *DeviceNotSupported) GetDeviceNotSupported() *DeviceNotSupported { return b }
+
+type BaseDeviceNotSupported interface {
+	GetDeviceNotSupported() *DeviceNotSupported
+}
+
+func init() {
+	t["BaseDeviceNotSupported"] = reflect.TypeOf((*DeviceNotSupported)(nil)).Elem()
+}
+
+func (b *DiskNotSupported) GetDiskNotSupported() *DiskNotSupported { return b }
+
+type BaseDiskNotSupported interface {
+	GetDiskNotSupported() *DiskNotSupported
+}
+
+func init() {
+	t["BaseDiskNotSupported"] = reflect.TypeOf((*DiskNotSupported)(nil)).Elem()
+}
+
+func (b *DistributedVirtualSwitchHostMemberBacking) GetDistributedVirtualSwitchHostMemberBacking() *DistributedVirtualSwitchHostMemberBacking {
+	return b
+}
+
+type BaseDistributedVirtualSwitchHostMemberBacking interface {
+	GetDistributedVirtualSwitchHostMemberBacking() *DistributedVirtualSwitchHostMemberBacking
+}
+
+func init() {
+	t["BaseDistributedVirtualSwitchHostMemberBacking"] = reflect.TypeOf((*DistributedVirtualSwitchHostMemberBacking)(nil)).Elem()
+}
+
+func (b *DistributedVirtualSwitchManagerHostDvsFilterSpec) GetDistributedVirtualSwitchManagerHostDvsFilterSpec() *DistributedVirtualSwitchManagerHostDvsFilterSpec {
+	return b
+}
+
+type BaseDistributedVirtualSwitchManagerHostDvsFilterSpec interface {
+	GetDistributedVirtualSwitchManagerHostDvsFilterSpec() *DistributedVirtualSwitchManagerHostDvsFilterSpec
+}
+
+func init() {
+	t["BaseDistributedVirtualSwitchManagerHostDvsFilterSpec"] = reflect.TypeOf((*DistributedVirtualSwitchManagerHostDvsFilterSpec)(nil)).Elem()
+}
+
+func (b *DvsEvent) GetDvsEvent() *DvsEvent { return b }
+
+type BaseDvsEvent interface {
+	GetDvsEvent() *DvsEvent
+}
+
+func init() {
+	t["BaseDvsEvent"] = reflect.TypeOf((*DvsEvent)(nil)).Elem()
+}
+
+func (b *DvsFault) GetDvsFault() *DvsFault { return b }
+
+type BaseDvsFault interface {
+	GetDvsFault() *DvsFault
+}
+
+func init() {
+	t["BaseDvsFault"] = reflect.TypeOf((*DvsFault)(nil)).Elem()
+}
+
+func (b *DvsFilterConfig) GetDvsFilterConfig() *DvsFilterConfig { return b }
+
+type BaseDvsFilterConfig interface {
+	GetDvsFilterConfig() *DvsFilterConfig
+}
+
+func init() {
+	t["BaseDvsFilterConfig"] = reflect.TypeOf((*DvsFilterConfig)(nil)).Elem()
+}
+
+func (b *DvsHealthStatusChangeEvent) GetDvsHealthStatusChangeEvent() *DvsHealthStatusChangeEvent {
+	return b
+}
+
+type BaseDvsHealthStatusChangeEvent interface {
+	GetDvsHealthStatusChangeEvent() *DvsHealthStatusChangeEvent
+}
+
+func init() {
+	t["BaseDvsHealthStatusChangeEvent"] = reflect.TypeOf((*DvsHealthStatusChangeEvent)(nil)).Elem()
+}
+
+func (b *DvsIpPort) GetDvsIpPort() *DvsIpPort { return b }
+
+type BaseDvsIpPort interface {
+	GetDvsIpPort() *DvsIpPort
+}
+
+func init() {
+	t["BaseDvsIpPort"] = reflect.TypeOf((*DvsIpPort)(nil)).Elem()
+}
+
+func (b *DvsNetworkRuleAction) GetDvsNetworkRuleAction() *DvsNetworkRuleAction { return b }
+
+type BaseDvsNetworkRuleAction interface {
+	GetDvsNetworkRuleAction() *DvsNetworkRuleAction
+}
+
+func init() {
+	t["BaseDvsNetworkRuleAction"] = reflect.TypeOf((*DvsNetworkRuleAction)(nil)).Elem()
+}
+
+func (b *DvsNetworkRuleQualifier) GetDvsNetworkRuleQualifier() *DvsNetworkRuleQualifier { return b }
+
+type BaseDvsNetworkRuleQualifier interface {
+	GetDvsNetworkRuleQualifier() *DvsNetworkRuleQualifier
+}
+
+func init() {
+	t["BaseDvsNetworkRuleQualifier"] = reflect.TypeOf((*DvsNetworkRuleQualifier)(nil)).Elem()
+}
+
+func (b *DvsTrafficFilterConfig) GetDvsTrafficFilterConfig() *DvsTrafficFilterConfig { return b }
+
+type BaseDvsTrafficFilterConfig interface {
+	GetDvsTrafficFilterConfig() *DvsTrafficFilterConfig
+}
+
+func init() {
+	t["BaseDvsTrafficFilterConfig"] = reflect.TypeOf((*DvsTrafficFilterConfig)(nil)).Elem()
+}
+
+func (b *DvsVNicProfile) GetDvsVNicProfile() *DvsVNicProfile { return b }
+
+type BaseDvsVNicProfile interface {
+	GetDvsVNicProfile() *DvsVNicProfile
+}
+
+func init() {
+	t["BaseDvsVNicProfile"] = reflect.TypeOf((*DvsVNicProfile)(nil)).Elem()
+}
+
+func (b *DynamicData) GetDynamicData() *DynamicData { return b }
+
+type BaseDynamicData interface {
+	GetDynamicData() *DynamicData
+}
+
+func init() {
+	t["BaseDynamicData"] = reflect.TypeOf((*DynamicData)(nil)).Elem()
+}
+
+func (b *EVCAdmissionFailed) GetEVCAdmissionFailed() *EVCAdmissionFailed { return b }
+
+type BaseEVCAdmissionFailed interface {
+	GetEVCAdmissionFailed() *EVCAdmissionFailed
+}
+
+func init() {
+	t["BaseEVCAdmissionFailed"] = reflect.TypeOf((*EVCAdmissionFailed)(nil)).Elem()
+}
+
+func (b *EVCConfigFault) GetEVCConfigFault() *EVCConfigFault { return b }
+
+type BaseEVCConfigFault interface {
+	GetEVCConfigFault() *EVCConfigFault
+}
+
+func init() {
+	t["BaseEVCConfigFault"] = reflect.TypeOf((*EVCConfigFault)(nil)).Elem()
+}
+
+func (b *ElementDescription) GetElementDescription() *ElementDescription { return b }
+
+type BaseElementDescription interface {
+	GetElementDescription() *ElementDescription
+}
+
+func init() {
+	t["BaseElementDescription"] = reflect.TypeOf((*ElementDescription)(nil)).Elem()
+}
+
+func (b *EnteredStandbyModeEvent) GetEnteredStandbyModeEvent() *EnteredStandbyModeEvent { return b }
+
+type BaseEnteredStandbyModeEvent interface {
+	GetEnteredStandbyModeEvent() *EnteredStandbyModeEvent
+}
+
+func init() {
+	t["BaseEnteredStandbyModeEvent"] = reflect.TypeOf((*EnteredStandbyModeEvent)(nil)).Elem()
+}
+
+func (b *EnteringStandbyModeEvent) GetEnteringStandbyModeEvent() *EnteringStandbyModeEvent { return b }
+
+type BaseEnteringStandbyModeEvent interface {
+	GetEnteringStandbyModeEvent() *EnteringStandbyModeEvent
+}
+
+func init() {
+	t["BaseEnteringStandbyModeEvent"] = reflect.TypeOf((*EnteringStandbyModeEvent)(nil)).Elem()
+}
+
+func (b *EntityEventArgument) GetEntityEventArgument() *EntityEventArgument { return b }
+
+type BaseEntityEventArgument interface {
+	GetEntityEventArgument() *EntityEventArgument
+}
+
+func init() {
+	t["BaseEntityEventArgument"] = reflect.TypeOf((*EntityEventArgument)(nil)).Elem()
+}
+
+func (b *Event) GetEvent() *Event { return b }
+
+type BaseEvent interface {
+	GetEvent() *Event
+}
+
+func init() {
+	t["BaseEvent"] = reflect.TypeOf((*Event)(nil)).Elem()
+}
+
+func (b *EventArgument) GetEventArgument() *EventArgument { return b }
+
+type BaseEventArgument interface {
+	GetEventArgument() *EventArgument
+}
+
+func init() {
+	t["BaseEventArgument"] = reflect.TypeOf((*EventArgument)(nil)).Elem()
+}
+
+func (b *ExitStandbyModeFailedEvent) GetExitStandbyModeFailedEvent() *ExitStandbyModeFailedEvent {
+	return b
+}
+
+type BaseExitStandbyModeFailedEvent interface {
+	GetExitStandbyModeFailedEvent() *ExitStandbyModeFailedEvent
+}
+
+func init() {
+	t["BaseExitStandbyModeFailedEvent"] = reflect.TypeOf((*ExitStandbyModeFailedEvent)(nil)).Elem()
+}
+
+func (b *ExitedStandbyModeEvent) GetExitedStandbyModeEvent() *ExitedStandbyModeEvent { return b }
+
+type BaseExitedStandbyModeEvent interface {
+	GetExitedStandbyModeEvent() *ExitedStandbyModeEvent
+}
+
+func init() {
+	t["BaseExitedStandbyModeEvent"] = reflect.TypeOf((*ExitedStandbyModeEvent)(nil)).Elem()
+}
+
+func (b *ExitingStandbyModeEvent) GetExitingStandbyModeEvent() *ExitingStandbyModeEvent { return b }
+
+type BaseExitingStandbyModeEvent interface {
+	GetExitingStandbyModeEvent() *ExitingStandbyModeEvent
+}
+
+func init() {
+	t["BaseExitingStandbyModeEvent"] = reflect.TypeOf((*ExitingStandbyModeEvent)(nil)).Elem()
+}
+
+func (b *ExpiredFeatureLicense) GetExpiredFeatureLicense() *ExpiredFeatureLicense { return b }
+
+type BaseExpiredFeatureLicense interface {
+	GetExpiredFeatureLicense() *ExpiredFeatureLicense
+}
+
+func init() {
+	t["BaseExpiredFeatureLicense"] = reflect.TypeOf((*ExpiredFeatureLicense)(nil)).Elem()
+}
+
+func (b *FaultToleranceConfigInfo) GetFaultToleranceConfigInfo() *FaultToleranceConfigInfo { return b }
+
+type BaseFaultToleranceConfigInfo interface {
+	GetFaultToleranceConfigInfo() *FaultToleranceConfigInfo
+}
+
+func init() {
+	t["BaseFaultToleranceConfigInfo"] = reflect.TypeOf((*FaultToleranceConfigInfo)(nil)).Elem()
+}
+
+func (b *FcoeFault) GetFcoeFault() *FcoeFault { return b }
+
+type BaseFcoeFault interface {
+	GetFcoeFault() *FcoeFault
+}
+
+func init() {
+	t["BaseFcoeFault"] = reflect.TypeOf((*FcoeFault)(nil)).Elem()
+}
+
+func (b *FileBackedVirtualDiskSpec) GetFileBackedVirtualDiskSpec() *FileBackedVirtualDiskSpec {
+	return b
+}
+
+type BaseFileBackedVirtualDiskSpec interface {
+	GetFileBackedVirtualDiskSpec() *FileBackedVirtualDiskSpec
+}
+
+func init() {
+	t["BaseFileBackedVirtualDiskSpec"] = reflect.TypeOf((*FileBackedVirtualDiskSpec)(nil)).Elem()
+}
+
+func (b *FileFault) GetFileFault() *FileFault { return b }
+
+type BaseFileFault interface {
+	GetFileFault() *FileFault
+}
+
+func init() {
+	t["BaseFileFault"] = reflect.TypeOf((*FileFault)(nil)).Elem()
+}
+
+func (b *FileInfo) GetFileInfo() *FileInfo { return b }
+
+type BaseFileInfo interface {
+	GetFileInfo() *FileInfo
+}
+
+func init() {
+	t["BaseFileInfo"] = reflect.TypeOf((*FileInfo)(nil)).Elem()
+}
+
+func (b *FileQuery) GetFileQuery() *FileQuery { return b }
+
+type BaseFileQuery interface {
+	GetFileQuery() *FileQuery
+}
+
+func init() {
+	t["BaseFileQuery"] = reflect.TypeOf((*FileQuery)(nil)).Elem()
+}
+
+func (b *GatewayConnectFault) GetGatewayConnectFault() *GatewayConnectFault { return b }
+
+type BaseGatewayConnectFault interface {
+	GetGatewayConnectFault() *GatewayConnectFault
+}
+
+func init() {
+	t["BaseGatewayConnectFault"] = reflect.TypeOf((*GatewayConnectFault)(nil)).Elem()
+}
+
+func (b *GatewayToHostConnectFault) GetGatewayToHostConnectFault() *GatewayToHostConnectFault {
+	return b
+}
+
+type BaseGatewayToHostConnectFault interface {
+	GetGatewayToHostConnectFault() *GatewayToHostConnectFault
+}
+
+func init() {
+	t["BaseGatewayToHostConnectFault"] = reflect.TypeOf((*GatewayToHostConnectFault)(nil)).Elem()
+}
+
+func (b *GeneralEvent) GetGeneralEvent() *GeneralEvent { return b }
+
+type BaseGeneralEvent interface {
+	GetGeneralEvent() *GeneralEvent
+}
+
+func init() {
+	t["BaseGeneralEvent"] = reflect.TypeOf((*GeneralEvent)(nil)).Elem()
+}
+
+func (b *GuestAuthSubject) GetGuestAuthSubject() *GuestAuthSubject { return b }
+
+type BaseGuestAuthSubject interface {
+	GetGuestAuthSubject() *GuestAuthSubject
+}
+
+func init() {
+	t["BaseGuestAuthSubject"] = reflect.TypeOf((*GuestAuthSubject)(nil)).Elem()
+}
+
+func (b *GuestAuthentication) GetGuestAuthentication() *GuestAuthentication { return b }
+
+type BaseGuestAuthentication interface {
+	GetGuestAuthentication() *GuestAuthentication
+}
+
+func init() {
+	t["BaseGuestAuthentication"] = reflect.TypeOf((*GuestAuthentication)(nil)).Elem()
+}
+
+func (b *GuestFileAttributes) GetGuestFileAttributes() *GuestFileAttributes { return b }
+
+type BaseGuestFileAttributes interface {
+	GetGuestFileAttributes() *GuestFileAttributes
+}
+
+func init() {
+	t["BaseGuestFileAttributes"] = reflect.TypeOf((*GuestFileAttributes)(nil)).Elem()
+}
+
+func (b *GuestOperationsFault) GetGuestOperationsFault() *GuestOperationsFault { return b }
+
+type BaseGuestOperationsFault interface {
+	GetGuestOperationsFault() *GuestOperationsFault
+}
+
+func init() {
+	t["BaseGuestOperationsFault"] = reflect.TypeOf((*GuestOperationsFault)(nil)).Elem()
+}
+
+func (b *GuestProgramSpec) GetGuestProgramSpec() *GuestProgramSpec { return b }
+
+type BaseGuestProgramSpec interface {
+	GetGuestProgramSpec() *GuestProgramSpec
+}
+
+func init() {
+	t["BaseGuestProgramSpec"] = reflect.TypeOf((*GuestProgramSpec)(nil)).Elem()
+}
+
+func (b *GuestRegValueDataSpec) GetGuestRegValueDataSpec() *GuestRegValueDataSpec { return b }
+
+type BaseGuestRegValueDataSpec interface {
+	GetGuestRegValueDataSpec() *GuestRegValueDataSpec
+}
+
+func init() {
+	t["BaseGuestRegValueDataSpec"] = reflect.TypeOf((*GuestRegValueDataSpec)(nil)).Elem()
+}
+
+func (b *GuestRegistryFault) GetGuestRegistryFault() *GuestRegistryFault { return b }
+
+type BaseGuestRegistryFault interface {
+	GetGuestRegistryFault() *GuestRegistryFault
+}
+
+func init() {
+	t["BaseGuestRegistryFault"] = reflect.TypeOf((*GuestRegistryFault)(nil)).Elem()
+}
+
+func (b *GuestRegistryKeyFault) GetGuestRegistryKeyFault() *GuestRegistryKeyFault { return b }
+
+type BaseGuestRegistryKeyFault interface {
+	GetGuestRegistryKeyFault() *GuestRegistryKeyFault
+}
+
+func init() {
+	t["BaseGuestRegistryKeyFault"] = reflect.TypeOf((*GuestRegistryKeyFault)(nil)).Elem()
+}
+
+func (b *GuestRegistryValueFault) GetGuestRegistryValueFault() *GuestRegistryValueFault { return b }
+
+type BaseGuestRegistryValueFault interface {
+	GetGuestRegistryValueFault() *GuestRegistryValueFault
+}
+
+func init() {
+	t["BaseGuestRegistryValueFault"] = reflect.TypeOf((*GuestRegistryValueFault)(nil)).Elem()
+}
+
+func (b *HostAccountSpec) GetHostAccountSpec() *HostAccountSpec { return b }
+
+type BaseHostAccountSpec interface {
+	GetHostAccountSpec() *HostAccountSpec
+}
+
+func init() {
+	t["BaseHostAccountSpec"] = reflect.TypeOf((*HostAccountSpec)(nil)).Elem()
+}
+
+func (b *HostAuthenticationStoreInfo) GetHostAuthenticationStoreInfo() *HostAuthenticationStoreInfo {
+	return b
+}
+
+type BaseHostAuthenticationStoreInfo interface {
+	GetHostAuthenticationStoreInfo() *HostAuthenticationStoreInfo
+}
+
+func init() {
+	t["BaseHostAuthenticationStoreInfo"] = reflect.TypeOf((*HostAuthenticationStoreInfo)(nil)).Elem()
+}
+
+func (b *HostCommunication) GetHostCommunication() *HostCommunication { return b }
+
+type BaseHostCommunication interface {
+	GetHostCommunication() *HostCommunication
+}
+
+func init() {
+	t["BaseHostCommunication"] = reflect.TypeOf((*HostCommunication)(nil)).Elem()
+}
+
+func (b *HostConfigFault) GetHostConfigFault() *HostConfigFault { return b }
+
+type BaseHostConfigFault interface {
+	GetHostConfigFault() *HostConfigFault
+}
+
+func init() {
+	t["BaseHostConfigFault"] = reflect.TypeOf((*HostConfigFault)(nil)).Elem()
+}
+
+func (b *HostConnectFault) GetHostConnectFault() *HostConnectFault { return b }
+
+type BaseHostConnectFault interface {
+	GetHostConnectFault() *HostConnectFault
+}
+
+func init() {
+	t["BaseHostConnectFault"] = reflect.TypeOf((*HostConnectFault)(nil)).Elem()
+}
+
+func (b *HostConnectInfoNetworkInfo) GetHostConnectInfoNetworkInfo() *HostConnectInfoNetworkInfo {
+	return b
+}
+
+type BaseHostConnectInfoNetworkInfo interface {
+	GetHostConnectInfoNetworkInfo() *HostConnectInfoNetworkInfo
+}
+
+func init() {
+	t["BaseHostConnectInfoNetworkInfo"] = reflect.TypeOf((*HostConnectInfoNetworkInfo)(nil)).Elem()
+}
+
+func (b *HostDasEvent) GetHostDasEvent() *HostDasEvent { return b }
+
+type BaseHostDasEvent interface {
+	GetHostDasEvent() *HostDasEvent
+}
+
+func init() {
+	t["BaseHostDasEvent"] = reflect.TypeOf((*HostDasEvent)(nil)).Elem()
+}
+
+func (b *HostDatastoreConnectInfo) GetHostDatastoreConnectInfo() *HostDatastoreConnectInfo { return b }
+
+type BaseHostDatastoreConnectInfo interface {
+	GetHostDatastoreConnectInfo() *HostDatastoreConnectInfo
+}
+
+func init() {
+	t["BaseHostDatastoreConnectInfo"] = reflect.TypeOf((*HostDatastoreConnectInfo)(nil)).Elem()
+}
+
+func (b *HostDevice) GetHostDevice() *HostDevice { return b }
+
+type BaseHostDevice interface {
+	GetHostDevice() *HostDevice
+}
+
+func init() {
+	t["BaseHostDevice"] = reflect.TypeOf((*HostDevice)(nil)).Elem()
+}
+
+func (b *HostDigestInfo) GetHostDigestInfo() *HostDigestInfo { return b }
+
+type BaseHostDigestInfo interface {
+	GetHostDigestInfo() *HostDigestInfo
+}
+
+func init() {
+	t["BaseHostDigestInfo"] = reflect.TypeOf((*HostDigestInfo)(nil)).Elem()
+}
+
+func (b *HostDirectoryStoreInfo) GetHostDirectoryStoreInfo() *HostDirectoryStoreInfo { return b }
+
+type BaseHostDirectoryStoreInfo interface {
+	GetHostDirectoryStoreInfo() *HostDirectoryStoreInfo
+}
+
+func init() {
+	t["BaseHostDirectoryStoreInfo"] = reflect.TypeOf((*HostDirectoryStoreInfo)(nil)).Elem()
+}
+
+func (b *HostDnsConfig) GetHostDnsConfig() *HostDnsConfig { return b }
+
+type BaseHostDnsConfig interface {
+	GetHostDnsConfig() *HostDnsConfig
+}
+
+func init() {
+	t["BaseHostDnsConfig"] = reflect.TypeOf((*HostDnsConfig)(nil)).Elem()
+}
+
+func (b *HostEvent) GetHostEvent() *HostEvent { return b }
+
+type BaseHostEvent interface {
+	GetHostEvent() *HostEvent
+}
+
+func init() {
+	t["BaseHostEvent"] = reflect.TypeOf((*HostEvent)(nil)).Elem()
+}
+
+func (b *HostFibreChannelHba) GetHostFibreChannelHba() *HostFibreChannelHba { return b }
+
+type BaseHostFibreChannelHba interface {
+	GetHostFibreChannelHba() *HostFibreChannelHba
+}
+
+func init() {
+	t["BaseHostFibreChannelHba"] = reflect.TypeOf((*HostFibreChannelHba)(nil)).Elem()
+}
+
+func (b *HostFibreChannelTargetTransport) GetHostFibreChannelTargetTransport() *HostFibreChannelTargetTransport {
+	return b
+}
+
+type BaseHostFibreChannelTargetTransport interface {
+	GetHostFibreChannelTargetTransport() *HostFibreChannelTargetTransport
+}
+
+func init() {
+	t["BaseHostFibreChannelTargetTransport"] = reflect.TypeOf((*HostFibreChannelTargetTransport)(nil)).Elem()
+}
+
+func (b *HostFileSystemVolume) GetHostFileSystemVolume() *HostFileSystemVolume { return b }
+
+type BaseHostFileSystemVolume interface {
+	GetHostFileSystemVolume() *HostFileSystemVolume
+}
+
+func init() {
+	t["BaseHostFileSystemVolume"] = reflect.TypeOf((*HostFileSystemVolume)(nil)).Elem()
+}
+
+func (b *HostHardwareElementInfo) GetHostHardwareElementInfo() *HostHardwareElementInfo { return b }
+
+type BaseHostHardwareElementInfo interface {
+	GetHostHardwareElementInfo() *HostHardwareElementInfo
+}
+
+func init() {
+	t["BaseHostHardwareElementInfo"] = reflect.TypeOf((*HostHardwareElementInfo)(nil)).Elem()
+}
+
+func (b *HostHostBusAdapter) GetHostHostBusAdapter() *HostHostBusAdapter { return b }
+
+type BaseHostHostBusAdapter interface {
+	GetHostHostBusAdapter() *HostHostBusAdapter
+}
+
+func init() {
+	t["BaseHostHostBusAdapter"] = reflect.TypeOf((*HostHostBusAdapter)(nil)).Elem()
+}
+
+func (b *HostIpRouteConfig) GetHostIpRouteConfig() *HostIpRouteConfig { return b }
+
+type BaseHostIpRouteConfig interface {
+	GetHostIpRouteConfig() *HostIpRouteConfig
+}
+
+func init() {
+	t["BaseHostIpRouteConfig"] = reflect.TypeOf((*HostIpRouteConfig)(nil)).Elem()
+}
+
+func (b *HostMemberHealthCheckResult) GetHostMemberHealthCheckResult() *HostMemberHealthCheckResult {
+	return b
+}
+
+type BaseHostMemberHealthCheckResult interface {
+	GetHostMemberHealthCheckResult() *HostMemberHealthCheckResult
+}
+
+func init() {
+	t["BaseHostMemberHealthCheckResult"] = reflect.TypeOf((*HostMemberHealthCheckResult)(nil)).Elem()
+}
+
+func (b *HostMemberUplinkHealthCheckResult) GetHostMemberUplinkHealthCheckResult() *HostMemberUplinkHealthCheckResult {
+	return b
+}
+
+type BaseHostMemberUplinkHealthCheckResult interface {
+	GetHostMemberUplinkHealthCheckResult() *HostMemberUplinkHealthCheckResult
+}
+
+func init() {
+	t["BaseHostMemberUplinkHealthCheckResult"] = reflect.TypeOf((*HostMemberUplinkHealthCheckResult)(nil)).Elem()
+}
+
+func (b *HostMultipathInfoLogicalUnitPolicy) GetHostMultipathInfoLogicalUnitPolicy() *HostMultipathInfoLogicalUnitPolicy {
+	return b
+}
+
+type BaseHostMultipathInfoLogicalUnitPolicy interface {
+	GetHostMultipathInfoLogicalUnitPolicy() *HostMultipathInfoLogicalUnitPolicy
+}
+
+func init() {
+	t["BaseHostMultipathInfoLogicalUnitPolicy"] = reflect.TypeOf((*HostMultipathInfoLogicalUnitPolicy)(nil)).Elem()
+}
+
+func (b *HostPciPassthruConfig) GetHostPciPassthruConfig() *HostPciPassthruConfig { return b }
+
+type BaseHostPciPassthruConfig interface {
+	GetHostPciPassthruConfig() *HostPciPassthruConfig
+}
+
+func init() {
+	t["BaseHostPciPassthruConfig"] = reflect.TypeOf((*HostPciPassthruConfig)(nil)).Elem()
+}
+
+func (b *HostPciPassthruInfo) GetHostPciPassthruInfo() *HostPciPassthruInfo { return b }
+
+type BaseHostPciPassthruInfo interface {
+	GetHostPciPassthruInfo() *HostPciPassthruInfo
+}
+
+func init() {
+	t["BaseHostPciPassthruInfo"] = reflect.TypeOf((*HostPciPassthruInfo)(nil)).Elem()
+}
+
+func (b *HostPowerOpFailed) GetHostPowerOpFailed() *HostPowerOpFailed { return b }
+
+type BaseHostPowerOpFailed interface {
+	GetHostPowerOpFailed() *HostPowerOpFailed
+}
+
+func init() {
+	t["BaseHostPowerOpFailed"] = reflect.TypeOf((*HostPowerOpFailed)(nil)).Elem()
+}
+
+func (b *HostProfileConfigSpec) GetHostProfileConfigSpec() *HostProfileConfigSpec { return b }
+
+type BaseHostProfileConfigSpec interface {
+	GetHostProfileConfigSpec() *HostProfileConfigSpec
+}
+
+func init() {
+	t["BaseHostProfileConfigSpec"] = reflect.TypeOf((*HostProfileConfigSpec)(nil)).Elem()
+}
+
+func (b *HostProfilesEntityCustomizations) GetHostProfilesEntityCustomizations() *HostProfilesEntityCustomizations {
+	return b
+}
+
+type BaseHostProfilesEntityCustomizations interface {
+	GetHostProfilesEntityCustomizations() *HostProfilesEntityCustomizations
+}
+
+func init() {
+	t["BaseHostProfilesEntityCustomizations"] = reflect.TypeOf((*HostProfilesEntityCustomizations)(nil)).Elem()
+}
+
+func (b *HostSriovDevicePoolInfo) GetHostSriovDevicePoolInfo() *HostSriovDevicePoolInfo { return b }
+
+type BaseHostSriovDevicePoolInfo interface {
+	GetHostSriovDevicePoolInfo() *HostSriovDevicePoolInfo
+}
+
+func init() {
+	t["BaseHostSriovDevicePoolInfo"] = reflect.TypeOf((*HostSriovDevicePoolInfo)(nil)).Elem()
+}
+
+func (b *HostSystemSwapConfigurationSystemSwapOption) GetHostSystemSwapConfigurationSystemSwapOption() *HostSystemSwapConfigurationSystemSwapOption {
+	return b
+}
+
+type BaseHostSystemSwapConfigurationSystemSwapOption interface {
+	GetHostSystemSwapConfigurationSystemSwapOption() *HostSystemSwapConfigurationSystemSwapOption
+}
+
+func init() {
+	t["BaseHostSystemSwapConfigurationSystemSwapOption"] = reflect.TypeOf((*HostSystemSwapConfigurationSystemSwapOption)(nil)).Elem()
+}
+
+func (b *HostTargetTransport) GetHostTargetTransport() *HostTargetTransport { return b }
+
+type BaseHostTargetTransport interface {
+	GetHostTargetTransport() *HostTargetTransport
+}
+
+func init() {
+	t["BaseHostTargetTransport"] = reflect.TypeOf((*HostTargetTransport)(nil)).Elem()
+}
+
+func (b *HostTpmEventDetails) GetHostTpmEventDetails() *HostTpmEventDetails { return b }
+
+type BaseHostTpmEventDetails interface {
+	GetHostTpmEventDetails() *HostTpmEventDetails
+}
+
+func init() {
+	t["BaseHostTpmEventDetails"] = reflect.TypeOf((*HostTpmEventDetails)(nil)).Elem()
+}
+
+func (b *HostVirtualSwitchBridge) GetHostVirtualSwitchBridge() *HostVirtualSwitchBridge { return b }
+
+type BaseHostVirtualSwitchBridge interface {
+	GetHostVirtualSwitchBridge() *HostVirtualSwitchBridge
+}
+
+func init() {
+	t["BaseHostVirtualSwitchBridge"] = reflect.TypeOf((*HostVirtualSwitchBridge)(nil)).Elem()
+}
+
+func (b *HourlyTaskScheduler) GetHourlyTaskScheduler() *HourlyTaskScheduler { return b }
+
+type BaseHourlyTaskScheduler interface {
+	GetHourlyTaskScheduler() *HourlyTaskScheduler
+}
+
+func init() {
+	t["BaseHourlyTaskScheduler"] = reflect.TypeOf((*HourlyTaskScheduler)(nil)).Elem()
+}
+
+func (b *ImportSpec) GetImportSpec() *ImportSpec { return b }
+
+type BaseImportSpec interface {
+	GetImportSpec() *ImportSpec
+}
+
+func init() {
+	t["BaseImportSpec"] = reflect.TypeOf((*ImportSpec)(nil)).Elem()
+}
+
+func (b *InaccessibleDatastore) GetInaccessibleDatastore() *InaccessibleDatastore { return b }
+
+type BaseInaccessibleDatastore interface {
+	GetInaccessibleDatastore() *InaccessibleDatastore
+}
+
+func init() {
+	t["BaseInaccessibleDatastore"] = reflect.TypeOf((*InaccessibleDatastore)(nil)).Elem()
+}
+
+func (b *InheritablePolicy) GetInheritablePolicy() *InheritablePolicy { return b }
+
+type BaseInheritablePolicy interface {
+	GetInheritablePolicy() *InheritablePolicy
+}
+
+func init() {
+	t["BaseInheritablePolicy"] = reflect.TypeOf((*InheritablePolicy)(nil)).Elem()
+}
+
+func (b *InsufficientHostCapacityFault) GetInsufficientHostCapacityFault() *InsufficientHostCapacityFault {
+	return b
+}
+
+type BaseInsufficientHostCapacityFault interface {
+	GetInsufficientHostCapacityFault() *InsufficientHostCapacityFault
+}
+
+func init() {
+	t["BaseInsufficientHostCapacityFault"] = reflect.TypeOf((*InsufficientHostCapacityFault)(nil)).Elem()
+}
+
+func (b *InsufficientResourcesFault) GetInsufficientResourcesFault() *InsufficientResourcesFault {
+	return b
+}
+
+type BaseInsufficientResourcesFault interface {
+	GetInsufficientResourcesFault() *InsufficientResourcesFault
+}
+
+func init() {
+	t["BaseInsufficientResourcesFault"] = reflect.TypeOf((*InsufficientResourcesFault)(nil)).Elem()
+}
+
+func (b *InsufficientStandbyResource) GetInsufficientStandbyResource() *InsufficientStandbyResource {
+	return b
+}
+
+type BaseInsufficientStandbyResource interface {
+	GetInsufficientStandbyResource() *InsufficientStandbyResource
+}
+
+func init() {
+	t["BaseInsufficientStandbyResource"] = reflect.TypeOf((*InsufficientStandbyResource)(nil)).Elem()
+}
+
+func (b *InvalidArgument) GetInvalidArgument() *InvalidArgument { return b }
+
+type BaseInvalidArgument interface {
+	GetInvalidArgument() *InvalidArgument
+}
+
+func init() {
+	t["BaseInvalidArgument"] = reflect.TypeOf((*InvalidArgument)(nil)).Elem()
+}
+
+func (b *InvalidCAMServer) GetInvalidCAMServer() *InvalidCAMServer { return b }
+
+type BaseInvalidCAMServer interface {
+	GetInvalidCAMServer() *InvalidCAMServer
+}
+
+func init() {
+	t["BaseInvalidCAMServer"] = reflect.TypeOf((*InvalidCAMServer)(nil)).Elem()
+}
+
+func (b *InvalidDatastore) GetInvalidDatastore() *InvalidDatastore { return b }
+
+type BaseInvalidDatastore interface {
+	GetInvalidDatastore() *InvalidDatastore
+}
+
+func init() {
+	t["BaseInvalidDatastore"] = reflect.TypeOf((*InvalidDatastore)(nil)).Elem()
+}
+
+func (b *InvalidDeviceSpec) GetInvalidDeviceSpec() *InvalidDeviceSpec { return b }
+
+type BaseInvalidDeviceSpec interface {
+	GetInvalidDeviceSpec() *InvalidDeviceSpec
+}
+
+func init() {
+	t["BaseInvalidDeviceSpec"] = reflect.TypeOf((*InvalidDeviceSpec)(nil)).Elem()
+}
+
+func (b *InvalidFolder) GetInvalidFolder() *InvalidFolder { return b }
+
+type BaseInvalidFolder interface {
+	GetInvalidFolder() *InvalidFolder
+}
+
+func init() {
+	t["BaseInvalidFolder"] = reflect.TypeOf((*InvalidFolder)(nil)).Elem()
+}
+
+func (b *InvalidFormat) GetInvalidFormat() *InvalidFormat { return b }
+
+type BaseInvalidFormat interface {
+	GetInvalidFormat() *InvalidFormat
+}
+
+func init() {
+	t["BaseInvalidFormat"] = reflect.TypeOf((*InvalidFormat)(nil)).Elem()
+}
+
+func (b *InvalidHostState) GetInvalidHostState() *InvalidHostState { return b }
+
+type BaseInvalidHostState interface {
+	GetInvalidHostState() *InvalidHostState
+}
+
+func init() {
+	t["BaseInvalidHostState"] = reflect.TypeOf((*InvalidHostState)(nil)).Elem()
+}
+
+func (b *InvalidLogin) GetInvalidLogin() *InvalidLogin { return b }
+
+type BaseInvalidLogin interface {
+	GetInvalidLogin() *InvalidLogin
+}
+
+func init() {
+	t["BaseInvalidLogin"] = reflect.TypeOf((*InvalidLogin)(nil)).Elem()
+}
+
+func (b *InvalidPropertyValue) GetInvalidPropertyValue() *InvalidPropertyValue { return b }
+
+type BaseInvalidPropertyValue interface {
+	GetInvalidPropertyValue() *InvalidPropertyValue
+}
+
+func init() {
+	t["BaseInvalidPropertyValue"] = reflect.TypeOf((*InvalidPropertyValue)(nil)).Elem()
+}
+
+func (b *InvalidRequest) GetInvalidRequest() *InvalidRequest { return b }
+
+type BaseInvalidRequest interface {
+	GetInvalidRequest() *InvalidRequest
+}
+
+func init() {
+	t["BaseInvalidRequest"] = reflect.TypeOf((*InvalidRequest)(nil)).Elem()
+}
+
+func (b *InvalidState) GetInvalidState() *InvalidState { return b }
+
+type BaseInvalidState interface {
+	GetInvalidState() *InvalidState
+}
+
+func init() {
+	t["BaseInvalidState"] = reflect.TypeOf((*InvalidState)(nil)).Elem()
+}
+
+func (b *InvalidVmConfig) GetInvalidVmConfig() *InvalidVmConfig { return b }
+
+type BaseInvalidVmConfig interface {
+	GetInvalidVmConfig() *InvalidVmConfig
+}
+
+func init() {
+	t["BaseInvalidVmConfig"] = reflect.TypeOf((*InvalidVmConfig)(nil)).Elem()
+}
+
+func (b *IoFilterInfo) GetIoFilterInfo() *IoFilterInfo { return b }
+
+type BaseIoFilterInfo interface {
+	GetIoFilterInfo() *IoFilterInfo
+}
+
+func init() {
+	t["BaseIoFilterInfo"] = reflect.TypeOf((*IoFilterInfo)(nil)).Elem()
+}
+
+func (b *IpAddress) GetIpAddress() *IpAddress { return b }
+
+type BaseIpAddress interface {
+	GetIpAddress() *IpAddress
+}
+
+func init() {
+	t["BaseIpAddress"] = reflect.TypeOf((*IpAddress)(nil)).Elem()
+}
+
+func (b *IscsiFault) GetIscsiFault() *IscsiFault { return b }
+
+type BaseIscsiFault interface {
+	GetIscsiFault() *IscsiFault
+}
+
+func init() {
+	t["BaseIscsiFault"] = reflect.TypeOf((*IscsiFault)(nil)).Elem()
+}
+
+func (b *LicenseEvent) GetLicenseEvent() *LicenseEvent { return b }
+
+type BaseLicenseEvent interface {
+	GetLicenseEvent() *LicenseEvent
+}
+
+func init() {
+	t["BaseLicenseEvent"] = reflect.TypeOf((*LicenseEvent)(nil)).Elem()
+}
+
+func (b *LicenseSource) GetLicenseSource() *LicenseSource { return b }
+
+type BaseLicenseSource interface {
+	GetLicenseSource() *LicenseSource
+}
+
+func init() {
+	t["BaseLicenseSource"] = reflect.TypeOf((*LicenseSource)(nil)).Elem()
+}
+
+func (b *MacAddress) GetMacAddress() *MacAddress { return b }
+
+type BaseMacAddress interface {
+	GetMacAddress() *MacAddress
+}
+
+func init() {
+	t["BaseMacAddress"] = reflect.TypeOf((*MacAddress)(nil)).Elem()
+}
+
+func (b *MethodFault) GetMethodFault() *MethodFault { return b }
+
+type BaseMethodFault interface {
+	GetMethodFault() *MethodFault
+}
+
+func init() {
+	t["BaseMethodFault"] = reflect.TypeOf((*MethodFault)(nil)).Elem()
+}
+
+func (b *MigrationEvent) GetMigrationEvent() *MigrationEvent { return b }
+
+type BaseMigrationEvent interface {
+	GetMigrationEvent() *MigrationEvent
+}
+
+func init() {
+	t["BaseMigrationEvent"] = reflect.TypeOf((*MigrationEvent)(nil)).Elem()
+}
+
+func (b *MigrationFault) GetMigrationFault() *MigrationFault { return b }
+
+type BaseMigrationFault interface {
+	GetMigrationFault() *MigrationFault
+}
+
+func init() {
+	t["BaseMigrationFault"] = reflect.TypeOf((*MigrationFault)(nil)).Elem()
+}
+
+func (b *MigrationFeatureNotSupported) GetMigrationFeatureNotSupported() *MigrationFeatureNotSupported {
+	return b
+}
+
+type BaseMigrationFeatureNotSupported interface {
+	GetMigrationFeatureNotSupported() *MigrationFeatureNotSupported
+}
+
+func init() {
+	t["BaseMigrationFeatureNotSupported"] = reflect.TypeOf((*MigrationFeatureNotSupported)(nil)).Elem()
+}
+
+func (b *MonthlyTaskScheduler) GetMonthlyTaskScheduler() *MonthlyTaskScheduler { return b }
+
+type BaseMonthlyTaskScheduler interface {
+	GetMonthlyTaskScheduler() *MonthlyTaskScheduler
+}
+
+func init() {
+	t["BaseMonthlyTaskScheduler"] = reflect.TypeOf((*MonthlyTaskScheduler)(nil)).Elem()
+}
+
+func (b *NasConfigFault) GetNasConfigFault() *NasConfigFault { return b }
+
+type BaseNasConfigFault interface {
+	GetNasConfigFault() *NasConfigFault
+}
+
+func init() {
+	t["BaseNasConfigFault"] = reflect.TypeOf((*NasConfigFault)(nil)).Elem()
+}
+
+func (b *NegatableExpression) GetNegatableExpression() *NegatableExpression { return b }
+
+type BaseNegatableExpression interface {
+	GetNegatableExpression() *NegatableExpression
+}
+
+func init() {
+	t["BaseNegatableExpression"] = reflect.TypeOf((*NegatableExpression)(nil)).Elem()
+}
+
+func (b *NetBIOSConfigInfo) GetNetBIOSConfigInfo() *NetBIOSConfigInfo { return b }
+
+type BaseNetBIOSConfigInfo interface {
+	GetNetBIOSConfigInfo() *NetBIOSConfigInfo
+}
+
+func init() {
+	t["BaseNetBIOSConfigInfo"] = reflect.TypeOf((*NetBIOSConfigInfo)(nil)).Elem()
+}
+
+func (b *NetworkSummary) GetNetworkSummary() *NetworkSummary { return b }
+
+type BaseNetworkSummary interface {
+	GetNetworkSummary() *NetworkSummary
+}
+
+func init() {
+	t["BaseNetworkSummary"] = reflect.TypeOf((*NetworkSummary)(nil)).Elem()
+}
+
+func (b *NoCompatibleHost) GetNoCompatibleHost() *NoCompatibleHost { return b }
+
+type BaseNoCompatibleHost interface {
+	GetNoCompatibleHost() *NoCompatibleHost
+}
+
+func init() {
+	t["BaseNoCompatibleHost"] = reflect.TypeOf((*NoCompatibleHost)(nil)).Elem()
+}
+
+func (b *NoPermission) GetNoPermission() *NoPermission { return b }
+
+type BaseNoPermission interface {
+	GetNoPermission() *NoPermission
+}
+
+func init() {
+	t["BaseNoPermission"] = reflect.TypeOf((*NoPermission)(nil)).Elem()
+}
+
+func (b *NodeDeploymentSpec) GetNodeDeploymentSpec() *NodeDeploymentSpec { return b }
+
+type BaseNodeDeploymentSpec interface {
+	GetNodeDeploymentSpec() *NodeDeploymentSpec
+}
+
+func init() {
+	t["BaseNodeDeploymentSpec"] = reflect.TypeOf((*NodeDeploymentSpec)(nil)).Elem()
+}
+
+func (b *NodeNetworkSpec) GetNodeNetworkSpec() *NodeNetworkSpec { return b }
+
+type BaseNodeNetworkSpec interface {
+	GetNodeNetworkSpec() *NodeNetworkSpec
+}
+
+func init() {
+	t["BaseNodeNetworkSpec"] = reflect.TypeOf((*NodeNetworkSpec)(nil)).Elem()
+}
+
+func (b *NotEnoughCpus) GetNotEnoughCpus() *NotEnoughCpus { return b }
+
+type BaseNotEnoughCpus interface {
+	GetNotEnoughCpus() *NotEnoughCpus
+}
+
+func init() {
+	t["BaseNotEnoughCpus"] = reflect.TypeOf((*NotEnoughCpus)(nil)).Elem()
+}
+
+func (b *NotEnoughLicenses) GetNotEnoughLicenses() *NotEnoughLicenses { return b }
+
+type BaseNotEnoughLicenses interface {
+	GetNotEnoughLicenses() *NotEnoughLicenses
+}
+
+func init() {
+	t["BaseNotEnoughLicenses"] = reflect.TypeOf((*NotEnoughLicenses)(nil)).Elem()
+}
+
+func (b *NotSupported) GetNotSupported() *NotSupported { return b }
+
+type BaseNotSupported interface {
+	GetNotSupported() *NotSupported
+}
+
+func init() {
+	t["BaseNotSupported"] = reflect.TypeOf((*NotSupported)(nil)).Elem()
+}
+
+func (b *NotSupportedHost) GetNotSupportedHost() *NotSupportedHost { return b }
+
+type BaseNotSupportedHost interface {
+	GetNotSupportedHost() *NotSupportedHost
+}
+
+func init() {
+	t["BaseNotSupportedHost"] = reflect.TypeOf((*NotSupportedHost)(nil)).Elem()
+}
+
+func (b *NotSupportedHostInCluster) GetNotSupportedHostInCluster() *NotSupportedHostInCluster {
+	return b
+}
+
+type BaseNotSupportedHostInCluster interface {
+	GetNotSupportedHostInCluster() *NotSupportedHostInCluster
+}
+
+func init() {
+	t["BaseNotSupportedHostInCluster"] = reflect.TypeOf((*NotSupportedHostInCluster)(nil)).Elem()
+}
+
+func (b *OptionType) GetOptionType() *OptionType { return b }
+
+type BaseOptionType interface {
+	GetOptionType() *OptionType
+}
+
+func init() {
+	t["BaseOptionType"] = reflect.TypeOf((*OptionType)(nil)).Elem()
+}
+
+func (b *OptionValue) GetOptionValue() *OptionValue { return b }
+
+type BaseOptionValue interface {
+	GetOptionValue() *OptionValue
+}
+
+func init() {
+	t["BaseOptionValue"] = reflect.TypeOf((*OptionValue)(nil)).Elem()
+}
+
+func (b *OvfAttribute) GetOvfAttribute() *OvfAttribute { return b }
+
+type BaseOvfAttribute interface {
+	GetOvfAttribute() *OvfAttribute
+}
+
+func init() {
+	t["BaseOvfAttribute"] = reflect.TypeOf((*OvfAttribute)(nil)).Elem()
+}
+
+func (b *OvfConnectedDevice) GetOvfConnectedDevice() *OvfConnectedDevice { return b }
+
+type BaseOvfConnectedDevice interface {
+	GetOvfConnectedDevice() *OvfConnectedDevice
+}
+
+func init() {
+	t["BaseOvfConnectedDevice"] = reflect.TypeOf((*OvfConnectedDevice)(nil)).Elem()
+}
+
+func (b *OvfConstraint) GetOvfConstraint() *OvfConstraint { return b }
+
+type BaseOvfConstraint interface {
+	GetOvfConstraint() *OvfConstraint
+}
+
+func init() {
+	t["BaseOvfConstraint"] = reflect.TypeOf((*OvfConstraint)(nil)).Elem()
+}
+
+func (b *OvfConsumerCallbackFault) GetOvfConsumerCallbackFault() *OvfConsumerCallbackFault { return b }
+
+type BaseOvfConsumerCallbackFault interface {
+	GetOvfConsumerCallbackFault() *OvfConsumerCallbackFault
+}
+
+func init() {
+	t["BaseOvfConsumerCallbackFault"] = reflect.TypeOf((*OvfConsumerCallbackFault)(nil)).Elem()
+}
+
+func (b *OvfElement) GetOvfElement() *OvfElement { return b }
+
+type BaseOvfElement interface {
+	GetOvfElement() *OvfElement
+}
+
+func init() {
+	t["BaseOvfElement"] = reflect.TypeOf((*OvfElement)(nil)).Elem()
+}
+
+func (b *OvfExport) GetOvfExport() *OvfExport { return b }
+
+type BaseOvfExport interface {
+	GetOvfExport() *OvfExport
+}
+
+func init() {
+	t["BaseOvfExport"] = reflect.TypeOf((*OvfExport)(nil)).Elem()
+}
+
+func (b *OvfFault) GetOvfFault() *OvfFault { return b }
+
+type BaseOvfFault interface {
+	GetOvfFault() *OvfFault
+}
+
+func init() {
+	t["BaseOvfFault"] = reflect.TypeOf((*OvfFault)(nil)).Elem()
+}
+
+func (b *OvfHardwareExport) GetOvfHardwareExport() *OvfHardwareExport { return b }
+
+type BaseOvfHardwareExport interface {
+	GetOvfHardwareExport() *OvfHardwareExport
+}
+
+func init() {
+	t["BaseOvfHardwareExport"] = reflect.TypeOf((*OvfHardwareExport)(nil)).Elem()
+}
+
+func (b *OvfImport) GetOvfImport() *OvfImport { return b }
+
+type BaseOvfImport interface {
+	GetOvfImport() *OvfImport
+}
+
+func init() {
+	t["BaseOvfImport"] = reflect.TypeOf((*OvfImport)(nil)).Elem()
+}
+
+func (b *OvfInvalidPackage) GetOvfInvalidPackage() *OvfInvalidPackage { return b }
+
+type BaseOvfInvalidPackage interface {
+	GetOvfInvalidPackage() *OvfInvalidPackage
+}
+
+func init() {
+	t["BaseOvfInvalidPackage"] = reflect.TypeOf((*OvfInvalidPackage)(nil)).Elem()
+}
+
+func (b *OvfInvalidValue) GetOvfInvalidValue() *OvfInvalidValue { return b }
+
+type BaseOvfInvalidValue interface {
+	GetOvfInvalidValue() *OvfInvalidValue
+}
+
+func init() {
+	t["BaseOvfInvalidValue"] = reflect.TypeOf((*OvfInvalidValue)(nil)).Elem()
+}
+
+func (b *OvfManagerCommonParams) GetOvfManagerCommonParams() *OvfManagerCommonParams { return b }
+
+type BaseOvfManagerCommonParams interface {
+	GetOvfManagerCommonParams() *OvfManagerCommonParams
+}
+
+func init() {
+	t["BaseOvfManagerCommonParams"] = reflect.TypeOf((*OvfManagerCommonParams)(nil)).Elem()
+}
+
+func (b *OvfMissingElement) GetOvfMissingElement() *OvfMissingElement { return b }
+
+type BaseOvfMissingElement interface {
+	GetOvfMissingElement() *OvfMissingElement
+}
+
+func init() {
+	t["BaseOvfMissingElement"] = reflect.TypeOf((*OvfMissingElement)(nil)).Elem()
+}
+
+func (b *OvfProperty) GetOvfProperty() *OvfProperty { return b }
+
+type BaseOvfProperty interface {
+	GetOvfProperty() *OvfProperty
+}
+
+func init() {
+	t["BaseOvfProperty"] = reflect.TypeOf((*OvfProperty)(nil)).Elem()
+}
+
+func (b *OvfSystemFault) GetOvfSystemFault() *OvfSystemFault { return b }
+
+type BaseOvfSystemFault interface {
+	GetOvfSystemFault() *OvfSystemFault
+}
+
+func init() {
+	t["BaseOvfSystemFault"] = reflect.TypeOf((*OvfSystemFault)(nil)).Elem()
+}
+
+func (b *OvfUnsupportedAttribute) GetOvfUnsupportedAttribute() *OvfUnsupportedAttribute { return b }
+
+type BaseOvfUnsupportedAttribute interface {
+	GetOvfUnsupportedAttribute() *OvfUnsupportedAttribute
+}
+
+func init() {
+	t["BaseOvfUnsupportedAttribute"] = reflect.TypeOf((*OvfUnsupportedAttribute)(nil)).Elem()
+}
+
+func (b *OvfUnsupportedElement) GetOvfUnsupportedElement() *OvfUnsupportedElement { return b }
+
+type BaseOvfUnsupportedElement interface {
+	GetOvfUnsupportedElement() *OvfUnsupportedElement
+}
+
+func init() {
+	t["BaseOvfUnsupportedElement"] = reflect.TypeOf((*OvfUnsupportedElement)(nil)).Elem()
+}
+
+func (b *OvfUnsupportedPackage) GetOvfUnsupportedPackage() *OvfUnsupportedPackage { return b }
+
+type BaseOvfUnsupportedPackage interface {
+	GetOvfUnsupportedPackage() *OvfUnsupportedPackage
+}
+
+func init() {
+	t["BaseOvfUnsupportedPackage"] = reflect.TypeOf((*OvfUnsupportedPackage)(nil)).Elem()
+}
+
+func (b *PatchMetadataInvalid) GetPatchMetadataInvalid() *PatchMetadataInvalid { return b }
+
+type BasePatchMetadataInvalid interface {
+	GetPatchMetadataInvalid() *PatchMetadataInvalid
+}
+
+func init() {
+	t["BasePatchMetadataInvalid"] = reflect.TypeOf((*PatchMetadataInvalid)(nil)).Elem()
+}
+
+func (b *PatchNotApplicable) GetPatchNotApplicable() *PatchNotApplicable { return b }
+
+type BasePatchNotApplicable interface {
+	GetPatchNotApplicable() *PatchNotApplicable
+}
+
+func init() {
+	t["BasePatchNotApplicable"] = reflect.TypeOf((*PatchNotApplicable)(nil)).Elem()
+}
+
+func (b *PerfEntityMetricBase) GetPerfEntityMetricBase() *PerfEntityMetricBase { return b }
+
+type BasePerfEntityMetricBase interface {
+	GetPerfEntityMetricBase() *PerfEntityMetricBase
+}
+
+func init() {
+	t["BasePerfEntityMetricBase"] = reflect.TypeOf((*PerfEntityMetricBase)(nil)).Elem()
+}
+
+func (b *PerfMetricSeries) GetPerfMetricSeries() *PerfMetricSeries { return b }
+
+type BasePerfMetricSeries interface {
+	GetPerfMetricSeries() *PerfMetricSeries
+}
+
+func init() {
+	t["BasePerfMetricSeries"] = reflect.TypeOf((*PerfMetricSeries)(nil)).Elem()
+}
+
+func (b *PermissionEvent) GetPermissionEvent() *PermissionEvent { return b }
+
+type BasePermissionEvent interface {
+	GetPermissionEvent() *PermissionEvent
+}
+
+func init() {
+	t["BasePermissionEvent"] = reflect.TypeOf((*PermissionEvent)(nil)).Elem()
+}
+
+func (b *PhysicalNicHint) GetPhysicalNicHint() *PhysicalNicHint { return b }
+
+type BasePhysicalNicHint interface {
+	GetPhysicalNicHint() *PhysicalNicHint
+}
+
+func init() {
+	t["BasePhysicalNicHint"] = reflect.TypeOf((*PhysicalNicHint)(nil)).Elem()
+}
+
+func (b *PlatformConfigFault) GetPlatformConfigFault() *PlatformConfigFault { return b }
+
+type BasePlatformConfigFault interface {
+	GetPlatformConfigFault() *PlatformConfigFault
+}
+
+func init() {
+	t["BasePlatformConfigFault"] = reflect.TypeOf((*PlatformConfigFault)(nil)).Elem()
+}
+
+func (b *PolicyOption) GetPolicyOption() *PolicyOption { return b }
+
+type BasePolicyOption interface {
+	GetPolicyOption() *PolicyOption
+}
+
+func init() {
+	t["BasePolicyOption"] = reflect.TypeOf((*PolicyOption)(nil)).Elem()
+}
+
+func (b *PortGroupProfile) GetPortGroupProfile() *PortGroupProfile { return b }
+
+type BasePortGroupProfile interface {
+	GetPortGroupProfile() *PortGroupProfile
+}
+
+func init() {
+	t["BasePortGroupProfile"] = reflect.TypeOf((*PortGroupProfile)(nil)).Elem()
+}
+
+func (b *ProfileConfigInfo) GetProfileConfigInfo() *ProfileConfigInfo { return b }
+
+type BaseProfileConfigInfo interface {
+	GetProfileConfigInfo() *ProfileConfigInfo
+}
+
+func init() {
+	t["BaseProfileConfigInfo"] = reflect.TypeOf((*ProfileConfigInfo)(nil)).Elem()
+}
+
+func (b *ProfileCreateSpec) GetProfileCreateSpec() *ProfileCreateSpec { return b }
+
+type BaseProfileCreateSpec interface {
+	GetProfileCreateSpec() *ProfileCreateSpec
+}
+
+func init() {
+	t["BaseProfileCreateSpec"] = reflect.TypeOf((*ProfileCreateSpec)(nil)).Elem()
+}
+
+func (b *ProfileEvent) GetProfileEvent() *ProfileEvent { return b }
+
+type BaseProfileEvent interface {
+	GetProfileEvent() *ProfileEvent
+}
+
+func init() {
+	t["BaseProfileEvent"] = reflect.TypeOf((*ProfileEvent)(nil)).Elem()
+}
+
+func (b *ProfileExecuteResult) GetProfileExecuteResult() *ProfileExecuteResult { return b }
+
+type BaseProfileExecuteResult interface {
+	GetProfileExecuteResult() *ProfileExecuteResult
+}
+
+func init() {
+	t["BaseProfileExecuteResult"] = reflect.TypeOf((*ProfileExecuteResult)(nil)).Elem()
+}
+
+func (b *ProfileExpression) GetProfileExpression() *ProfileExpression { return b }
+
+type BaseProfileExpression interface {
+	GetProfileExpression() *ProfileExpression
+}
+
+func init() {
+	t["BaseProfileExpression"] = reflect.TypeOf((*ProfileExpression)(nil)).Elem()
+}
+
+func (b *ProfilePolicyOptionMetadata) GetProfilePolicyOptionMetadata() *ProfilePolicyOptionMetadata {
+	return b
+}
+
+type BaseProfilePolicyOptionMetadata interface {
+	GetProfilePolicyOptionMetadata() *ProfilePolicyOptionMetadata
+}
+
+func init() {
+	t["BaseProfilePolicyOptionMetadata"] = reflect.TypeOf((*ProfilePolicyOptionMetadata)(nil)).Elem()
+}
+
+func (b *ProfileSerializedCreateSpec) GetProfileSerializedCreateSpec() *ProfileSerializedCreateSpec {
+	return b
+}
+
+type BaseProfileSerializedCreateSpec interface {
+	GetProfileSerializedCreateSpec() *ProfileSerializedCreateSpec
+}
+
+func init() {
+	t["BaseProfileSerializedCreateSpec"] = reflect.TypeOf((*ProfileSerializedCreateSpec)(nil)).Elem()
+}
+
+func (b *RDMNotSupported) GetRDMNotSupported() *RDMNotSupported { return b }
+
+type BaseRDMNotSupported interface {
+	GetRDMNotSupported() *RDMNotSupported
+}
+
+func init() {
+	t["BaseRDMNotSupported"] = reflect.TypeOf((*RDMNotSupported)(nil)).Elem()
+}
+
+func (b *RecurrentTaskScheduler) GetRecurrentTaskScheduler() *RecurrentTaskScheduler { return b }
+
+type BaseRecurrentTaskScheduler interface {
+	GetRecurrentTaskScheduler() *RecurrentTaskScheduler
+}
+
+func init() {
+	t["BaseRecurrentTaskScheduler"] = reflect.TypeOf((*RecurrentTaskScheduler)(nil)).Elem()
+}
+
+func (b *ReplicationConfigFault) GetReplicationConfigFault() *ReplicationConfigFault { return b }
+
+type BaseReplicationConfigFault interface {
+	GetReplicationConfigFault() *ReplicationConfigFault
+}
+
+func init() {
+	t["BaseReplicationConfigFault"] = reflect.TypeOf((*ReplicationConfigFault)(nil)).Elem()
+}
+
+func (b *ReplicationFault) GetReplicationFault() *ReplicationFault { return b }
+
+type BaseReplicationFault interface {
+	GetReplicationFault() *ReplicationFault
+}
+
+func init() {
+	t["BaseReplicationFault"] = reflect.TypeOf((*ReplicationFault)(nil)).Elem()
+}
+
+func (b *ReplicationVmFault) GetReplicationVmFault() *ReplicationVmFault { return b }
+
+type BaseReplicationVmFault interface {
+	GetReplicationVmFault() *ReplicationVmFault
+}
+
+func init() {
+	t["BaseReplicationVmFault"] = reflect.TypeOf((*ReplicationVmFault)(nil)).Elem()
+}
+
+func (b *ResourceAllocationInfo) GetResourceAllocationInfo() *ResourceAllocationInfo { return b }
+
+type BaseResourceAllocationInfo interface {
+	GetResourceAllocationInfo() *ResourceAllocationInfo
+}
+
+func init() {
+	t["BaseResourceAllocationInfo"] = reflect.TypeOf((*ResourceAllocationInfo)(nil)).Elem()
+}
+
+func (b *ResourceInUse) GetResourceInUse() *ResourceInUse { return b }
+
+type BaseResourceInUse interface {
+	GetResourceInUse() *ResourceInUse
+}
+
+func init() {
+	t["BaseResourceInUse"] = reflect.TypeOf((*ResourceInUse)(nil)).Elem()
+}
+
+func (b *ResourcePoolEvent) GetResourcePoolEvent() *ResourcePoolEvent { return b }
+
+type BaseResourcePoolEvent interface {
+	GetResourcePoolEvent() *ResourcePoolEvent
+}
+
+func init() {
+	t["BaseResourcePoolEvent"] = reflect.TypeOf((*ResourcePoolEvent)(nil)).Elem()
+}
+
+func (b *ResourcePoolSummary) GetResourcePoolSummary() *ResourcePoolSummary { return b }
+
+type BaseResourcePoolSummary interface {
+	GetResourcePoolSummary() *ResourcePoolSummary
+}
+
+func init() {
+	t["BaseResourcePoolSummary"] = reflect.TypeOf((*ResourcePoolSummary)(nil)).Elem()
+}
+
+func (b *RoleEvent) GetRoleEvent() *RoleEvent { return b }
+
+type BaseRoleEvent interface {
+	GetRoleEvent() *RoleEvent
+}
+
+func init() {
+	t["BaseRoleEvent"] = reflect.TypeOf((*RoleEvent)(nil)).Elem()
+}
+
+func (b *RuntimeFault) GetRuntimeFault() *RuntimeFault { return b }
+
+type BaseRuntimeFault interface {
+	GetRuntimeFault() *RuntimeFault
+}
+
+func init() {
+	t["BaseRuntimeFault"] = reflect.TypeOf((*RuntimeFault)(nil)).Elem()
+}
+
+func (b *ScheduledTaskEvent) GetScheduledTaskEvent() *ScheduledTaskEvent { return b }
+
+type BaseScheduledTaskEvent interface {
+	GetScheduledTaskEvent() *ScheduledTaskEvent
+}
+
+func init() {
+	t["BaseScheduledTaskEvent"] = reflect.TypeOf((*ScheduledTaskEvent)(nil)).Elem()
+}
+
+func (b *ScheduledTaskSpec) GetScheduledTaskSpec() *ScheduledTaskSpec { return b }
+
+type BaseScheduledTaskSpec interface {
+	GetScheduledTaskSpec() *ScheduledTaskSpec
+}
+
+func init() {
+	t["BaseScheduledTaskSpec"] = reflect.TypeOf((*ScheduledTaskSpec)(nil)).Elem()
+}
+
+func (b *ScsiLun) GetScsiLun() *ScsiLun { return b }
+
+type BaseScsiLun interface {
+	GetScsiLun() *ScsiLun
+}
+
+func init() {
+	t["BaseScsiLun"] = reflect.TypeOf((*ScsiLun)(nil)).Elem()
+}
+
+func (b *SecurityError) GetSecurityError() *SecurityError { return b }
+
+type BaseSecurityError interface {
+	GetSecurityError() *SecurityError
+}
+
+func init() {
+	t["BaseSecurityError"] = reflect.TypeOf((*SecurityError)(nil)).Elem()
+}
+
+func (b *SelectionSet) GetSelectionSet() *SelectionSet { return b }
+
+type BaseSelectionSet interface {
+	GetSelectionSet() *SelectionSet
+}
+
+func init() {
+	t["BaseSelectionSet"] = reflect.TypeOf((*SelectionSet)(nil)).Elem()
+}
+
+func (b *SelectionSpec) GetSelectionSpec() *SelectionSpec { return b }
+
+type BaseSelectionSpec interface {
+	GetSelectionSpec() *SelectionSpec
+}
+
+func init() {
+	t["BaseSelectionSpec"] = reflect.TypeOf((*SelectionSpec)(nil)).Elem()
+}
+
+func (b *ServiceLocatorCredential) GetServiceLocatorCredential() *ServiceLocatorCredential { return b }
+
+type BaseServiceLocatorCredential interface {
+	GetServiceLocatorCredential() *ServiceLocatorCredential
+}
+
+func init() {
+	t["BaseServiceLocatorCredential"] = reflect.TypeOf((*ServiceLocatorCredential)(nil)).Elem()
+}
+
+func (b *SessionEvent) GetSessionEvent() *SessionEvent { return b }
+
+type BaseSessionEvent interface {
+	GetSessionEvent() *SessionEvent
+}
+
+func init() {
+	t["BaseSessionEvent"] = reflect.TypeOf((*SessionEvent)(nil)).Elem()
+}
+
+func (b *SessionManagerServiceRequestSpec) GetSessionManagerServiceRequestSpec() *SessionManagerServiceRequestSpec {
+	return b
+}
+
+type BaseSessionManagerServiceRequestSpec interface {
+	GetSessionManagerServiceRequestSpec() *SessionManagerServiceRequestSpec
+}
+
+func init() {
+	t["BaseSessionManagerServiceRequestSpec"] = reflect.TypeOf((*SessionManagerServiceRequestSpec)(nil)).Elem()
+}
+
+func (b *SnapshotCopyNotSupported) GetSnapshotCopyNotSupported() *SnapshotCopyNotSupported { return b }
+
+type BaseSnapshotCopyNotSupported interface {
+	GetSnapshotCopyNotSupported() *SnapshotCopyNotSupported
+}
+
+func init() {
+	t["BaseSnapshotCopyNotSupported"] = reflect.TypeOf((*SnapshotCopyNotSupported)(nil)).Elem()
+}
+
+func (b *SnapshotFault) GetSnapshotFault() *SnapshotFault { return b }
+
+type BaseSnapshotFault interface {
+	GetSnapshotFault() *SnapshotFault
+}
+
+func init() {
+	t["BaseSnapshotFault"] = reflect.TypeOf((*SnapshotFault)(nil)).Elem()
+}
+
+func (b *TaskEvent) GetTaskEvent() *TaskEvent { return b }
+
+type BaseTaskEvent interface {
+	GetTaskEvent() *TaskEvent
+}
+
+func init() {
+	t["BaseTaskEvent"] = reflect.TypeOf((*TaskEvent)(nil)).Elem()
+}
+
+func (b *TaskInProgress) GetTaskInProgress() *TaskInProgress { return b }
+
+type BaseTaskInProgress interface {
+	GetTaskInProgress() *TaskInProgress
+}
+
+func init() {
+	t["BaseTaskInProgress"] = reflect.TypeOf((*TaskInProgress)(nil)).Elem()
+}
+
+func (b *TaskReason) GetTaskReason() *TaskReason { return b }
+
+type BaseTaskReason interface {
+	GetTaskReason() *TaskReason
+}
+
+func init() {
+	t["BaseTaskReason"] = reflect.TypeOf((*TaskReason)(nil)).Elem()
+}
+
+func (b *TaskScheduler) GetTaskScheduler() *TaskScheduler { return b }
+
+type BaseTaskScheduler interface {
+	GetTaskScheduler() *TaskScheduler
+}
+
+func init() {
+	t["BaseTaskScheduler"] = reflect.TypeOf((*TaskScheduler)(nil)).Elem()
+}
+
+func (b *TemplateUpgradeEvent) GetTemplateUpgradeEvent() *TemplateUpgradeEvent { return b }
+
+type BaseTemplateUpgradeEvent interface {
+	GetTemplateUpgradeEvent() *TemplateUpgradeEvent
+}
+
+func init() {
+	t["BaseTemplateUpgradeEvent"] = reflect.TypeOf((*TemplateUpgradeEvent)(nil)).Elem()
+}
+
+func (b *Timedout) GetTimedout() *Timedout { return b }
+
+type BaseTimedout interface {
+	GetTimedout() *Timedout
+}
+
+func init() {
+	t["BaseTimedout"] = reflect.TypeOf((*Timedout)(nil)).Elem()
+}
+
+func (b *TypeDescription) GetTypeDescription() *TypeDescription { return b }
+
+type BaseTypeDescription interface {
+	GetTypeDescription() *TypeDescription
+}
+
+func init() {
+	t["BaseTypeDescription"] = reflect.TypeOf((*TypeDescription)(nil)).Elem()
+}
+
+func (b *UnsupportedDatastore) GetUnsupportedDatastore() *UnsupportedDatastore { return b }
+
+type BaseUnsupportedDatastore interface {
+	GetUnsupportedDatastore() *UnsupportedDatastore
+}
+
+func init() {
+	t["BaseUnsupportedDatastore"] = reflect.TypeOf((*UnsupportedDatastore)(nil)).Elem()
+}
+
+func (b *UpgradeEvent) GetUpgradeEvent() *UpgradeEvent { return b }
+
+type BaseUpgradeEvent interface {
+	GetUpgradeEvent() *UpgradeEvent
+}
+
+func init() {
+	t["BaseUpgradeEvent"] = reflect.TypeOf((*UpgradeEvent)(nil)).Elem()
+}
+
+func (b *UserSearchResult) GetUserSearchResult() *UserSearchResult { return b }
+
+type BaseUserSearchResult interface {
+	GetUserSearchResult() *UserSearchResult
+}
+
+func init() {
+	t["BaseUserSearchResult"] = reflect.TypeOf((*UserSearchResult)(nil)).Elem()
+}
+
+func (b *VAppConfigFault) GetVAppConfigFault() *VAppConfigFault { return b }
+
+type BaseVAppConfigFault interface {
+	GetVAppConfigFault() *VAppConfigFault
+}
+
+func init() {
+	t["BaseVAppConfigFault"] = reflect.TypeOf((*VAppConfigFault)(nil)).Elem()
+}
+
+func (b *VAppPropertyFault) GetVAppPropertyFault() *VAppPropertyFault { return b }
+
+type BaseVAppPropertyFault interface {
+	GetVAppPropertyFault() *VAppPropertyFault
+}
+
+func init() {
+	t["BaseVAppPropertyFault"] = reflect.TypeOf((*VAppPropertyFault)(nil)).Elem()
+}
+
+func (b *VMotionInterfaceIssue) GetVMotionInterfaceIssue() *VMotionInterfaceIssue { return b }
+
+type BaseVMotionInterfaceIssue interface {
+	GetVMotionInterfaceIssue() *VMotionInterfaceIssue
+}
+
+func init() {
+	t["BaseVMotionInterfaceIssue"] = reflect.TypeOf((*VMotionInterfaceIssue)(nil)).Elem()
+}
+
+func (b *VMwareDVSHealthCheckConfig) GetVMwareDVSHealthCheckConfig() *VMwareDVSHealthCheckConfig {
+	return b
+}
+
+type BaseVMwareDVSHealthCheckConfig interface {
+	GetVMwareDVSHealthCheckConfig() *VMwareDVSHealthCheckConfig
+}
+
+func init() {
+	t["BaseVMwareDVSHealthCheckConfig"] = reflect.TypeOf((*VMwareDVSHealthCheckConfig)(nil)).Elem()
+}
+
+func (b *VimFault) GetVimFault() *VimFault { return b }
+
+type BaseVimFault interface {
+	GetVimFault() *VimFault
+}
+
+func init() {
+	t["BaseVimFault"] = reflect.TypeOf((*VimFault)(nil)).Elem()
+}
+
+func (b *VirtualController) GetVirtualController() *VirtualController { return b }
+
+type BaseVirtualController interface {
+	GetVirtualController() *VirtualController
+}
+
+func init() {
+	t["BaseVirtualController"] = reflect.TypeOf((*VirtualController)(nil)).Elem()
+}
+
+func (b *VirtualControllerOption) GetVirtualControllerOption() *VirtualControllerOption { return b }
+
+type BaseVirtualControllerOption interface {
+	GetVirtualControllerOption() *VirtualControllerOption
+}
+
+func init() {
+	t["BaseVirtualControllerOption"] = reflect.TypeOf((*VirtualControllerOption)(nil)).Elem()
+}
+
+func (b *VirtualDevice) GetVirtualDevice() *VirtualDevice { return b }
+
+type BaseVirtualDevice interface {
+	GetVirtualDevice() *VirtualDevice
+}
+
+func init() {
+	t["BaseVirtualDevice"] = reflect.TypeOf((*VirtualDevice)(nil)).Elem()
+}
+
+func (b *VirtualDeviceBackingInfo) GetVirtualDeviceBackingInfo() *VirtualDeviceBackingInfo { return b }
+
+type BaseVirtualDeviceBackingInfo interface {
+	GetVirtualDeviceBackingInfo() *VirtualDeviceBackingInfo
+}
+
+func init() {
+	t["BaseVirtualDeviceBackingInfo"] = reflect.TypeOf((*VirtualDeviceBackingInfo)(nil)).Elem()
+}
+
+func (b *VirtualDeviceBackingOption) GetVirtualDeviceBackingOption() *VirtualDeviceBackingOption {
+	return b
+}
+
+type BaseVirtualDeviceBackingOption interface {
+	GetVirtualDeviceBackingOption() *VirtualDeviceBackingOption
+}
+
+func init() {
+	t["BaseVirtualDeviceBackingOption"] = reflect.TypeOf((*VirtualDeviceBackingOption)(nil)).Elem()
+}
+
+func (b *VirtualDeviceBusSlotInfo) GetVirtualDeviceBusSlotInfo() *VirtualDeviceBusSlotInfo { return b }
+
+type BaseVirtualDeviceBusSlotInfo interface {
+	GetVirtualDeviceBusSlotInfo() *VirtualDeviceBusSlotInfo
+}
+
+func init() {
+	t["BaseVirtualDeviceBusSlotInfo"] = reflect.TypeOf((*VirtualDeviceBusSlotInfo)(nil)).Elem()
+}
+
+func (b *VirtualDeviceConfigSpec) GetVirtualDeviceConfigSpec() *VirtualDeviceConfigSpec { return b }
+
+type BaseVirtualDeviceConfigSpec interface {
+	GetVirtualDeviceConfigSpec() *VirtualDeviceConfigSpec
+}
+
+func init() {
+	t["BaseVirtualDeviceConfigSpec"] = reflect.TypeOf((*VirtualDeviceConfigSpec)(nil)).Elem()
+}
+
+func (b *VirtualDeviceDeviceBackingInfo) GetVirtualDeviceDeviceBackingInfo() *VirtualDeviceDeviceBackingInfo {
+	return b
+}
+
+type BaseVirtualDeviceDeviceBackingInfo interface {
+	GetVirtualDeviceDeviceBackingInfo() *VirtualDeviceDeviceBackingInfo
+}
+
+func init() {
+	t["BaseVirtualDeviceDeviceBackingInfo"] = reflect.TypeOf((*VirtualDeviceDeviceBackingInfo)(nil)).Elem()
+}
+
+func (b *VirtualDeviceDeviceBackingOption) GetVirtualDeviceDeviceBackingOption() *VirtualDeviceDeviceBackingOption {
+	return b
+}
+
+type BaseVirtualDeviceDeviceBackingOption interface {
+	GetVirtualDeviceDeviceBackingOption() *VirtualDeviceDeviceBackingOption
+}
+
+func init() {
+	t["BaseVirtualDeviceDeviceBackingOption"] = reflect.TypeOf((*VirtualDeviceDeviceBackingOption)(nil)).Elem()
+}
+
+func (b *VirtualDeviceFileBackingInfo) GetVirtualDeviceFileBackingInfo() *VirtualDeviceFileBackingInfo {
+	return b
+}
+
+type BaseVirtualDeviceFileBackingInfo interface {
+	GetVirtualDeviceFileBackingInfo() *VirtualDeviceFileBackingInfo
+}
+
+func init() {
+	t["BaseVirtualDeviceFileBackingInfo"] = reflect.TypeOf((*VirtualDeviceFileBackingInfo)(nil)).Elem()
+}
+
+func (b *VirtualDeviceFileBackingOption) GetVirtualDeviceFileBackingOption() *VirtualDeviceFileBackingOption {
+	return b
+}
+
+type BaseVirtualDeviceFileBackingOption interface {
+	GetVirtualDeviceFileBackingOption() *VirtualDeviceFileBackingOption
+}
+
+func init() {
+	t["BaseVirtualDeviceFileBackingOption"] = reflect.TypeOf((*VirtualDeviceFileBackingOption)(nil)).Elem()
+}
+
+func (b *VirtualDeviceOption) GetVirtualDeviceOption() *VirtualDeviceOption { return b }
+
+type BaseVirtualDeviceOption interface {
+	GetVirtualDeviceOption() *VirtualDeviceOption
+}
+
+func init() {
+	t["BaseVirtualDeviceOption"] = reflect.TypeOf((*VirtualDeviceOption)(nil)).Elem()
+}
+
+func (b *VirtualDevicePciBusSlotInfo) GetVirtualDevicePciBusSlotInfo() *VirtualDevicePciBusSlotInfo {
+	return b
+}
+
+type BaseVirtualDevicePciBusSlotInfo interface {
+	GetVirtualDevicePciBusSlotInfo() *VirtualDevicePciBusSlotInfo
+}
+
+func init() {
+	t["BaseVirtualDevicePciBusSlotInfo"] = reflect.TypeOf((*VirtualDevicePciBusSlotInfo)(nil)).Elem()
+}
+
+func (b *VirtualDevicePipeBackingInfo) GetVirtualDevicePipeBackingInfo() *VirtualDevicePipeBackingInfo {
+	return b
+}
+
+type BaseVirtualDevicePipeBackingInfo interface {
+	GetVirtualDevicePipeBackingInfo() *VirtualDevicePipeBackingInfo
+}
+
+func init() {
+	t["BaseVirtualDevicePipeBackingInfo"] = reflect.TypeOf((*VirtualDevicePipeBackingInfo)(nil)).Elem()
+}
+
+func (b *VirtualDevicePipeBackingOption) GetVirtualDevicePipeBackingOption() *VirtualDevicePipeBackingOption {
+	return b
+}
+
+type BaseVirtualDevicePipeBackingOption interface {
+	GetVirtualDevicePipeBackingOption() *VirtualDevicePipeBackingOption
+}
+
+func init() {
+	t["BaseVirtualDevicePipeBackingOption"] = reflect.TypeOf((*VirtualDevicePipeBackingOption)(nil)).Elem()
+}
+
+func (b *VirtualDeviceRemoteDeviceBackingInfo) GetVirtualDeviceRemoteDeviceBackingInfo() *VirtualDeviceRemoteDeviceBackingInfo {
+	return b
+}
+
+type BaseVirtualDeviceRemoteDeviceBackingInfo interface {
+	GetVirtualDeviceRemoteDeviceBackingInfo() *VirtualDeviceRemoteDeviceBackingInfo
+}
+
+func init() {
+	t["BaseVirtualDeviceRemoteDeviceBackingInfo"] = reflect.TypeOf((*VirtualDeviceRemoteDeviceBackingInfo)(nil)).Elem()
+}
+
+func (b *VirtualDeviceRemoteDeviceBackingOption) GetVirtualDeviceRemoteDeviceBackingOption() *VirtualDeviceRemoteDeviceBackingOption {
+	return b
+}
+
+type BaseVirtualDeviceRemoteDeviceBackingOption interface {
+	GetVirtualDeviceRemoteDeviceBackingOption() *VirtualDeviceRemoteDeviceBackingOption
+}
+
+func init() {
+	t["BaseVirtualDeviceRemoteDeviceBackingOption"] = reflect.TypeOf((*VirtualDeviceRemoteDeviceBackingOption)(nil)).Elem()
+}
+
+func (b *VirtualDeviceURIBackingInfo) GetVirtualDeviceURIBackingInfo() *VirtualDeviceURIBackingInfo {
+	return b
+}
+
+type BaseVirtualDeviceURIBackingInfo interface {
+	GetVirtualDeviceURIBackingInfo() *VirtualDeviceURIBackingInfo
+}
+
+func init() {
+	t["BaseVirtualDeviceURIBackingInfo"] = reflect.TypeOf((*VirtualDeviceURIBackingInfo)(nil)).Elem()
+}
+
+func (b *VirtualDeviceURIBackingOption) GetVirtualDeviceURIBackingOption() *VirtualDeviceURIBackingOption {
+	return b
+}
+
+type BaseVirtualDeviceURIBackingOption interface {
+	GetVirtualDeviceURIBackingOption() *VirtualDeviceURIBackingOption
+}
+
+func init() {
+	t["BaseVirtualDeviceURIBackingOption"] = reflect.TypeOf((*VirtualDeviceURIBackingOption)(nil)).Elem()
+}
+
+func (b *VirtualDiskRawDiskVer2BackingInfo) GetVirtualDiskRawDiskVer2BackingInfo() *VirtualDiskRawDiskVer2BackingInfo {
+	return b
+}
+
+type BaseVirtualDiskRawDiskVer2BackingInfo interface {
+	GetVirtualDiskRawDiskVer2BackingInfo() *VirtualDiskRawDiskVer2BackingInfo
+}
+
+func init() {
+	t["BaseVirtualDiskRawDiskVer2BackingInfo"] = reflect.TypeOf((*VirtualDiskRawDiskVer2BackingInfo)(nil)).Elem()
+}
+
+func (b *VirtualDiskRawDiskVer2BackingOption) GetVirtualDiskRawDiskVer2BackingOption() *VirtualDiskRawDiskVer2BackingOption {
+	return b
+}
+
+type BaseVirtualDiskRawDiskVer2BackingOption interface {
+	GetVirtualDiskRawDiskVer2BackingOption() *VirtualDiskRawDiskVer2BackingOption
+}
+
+func init() {
+	t["BaseVirtualDiskRawDiskVer2BackingOption"] = reflect.TypeOf((*VirtualDiskRawDiskVer2BackingOption)(nil)).Elem()
+}
+
+func (b *VirtualDiskSpec) GetVirtualDiskSpec() *VirtualDiskSpec { return b }
+
+type BaseVirtualDiskSpec interface {
+	GetVirtualDiskSpec() *VirtualDiskSpec
+}
+
+func init() {
+	t["BaseVirtualDiskSpec"] = reflect.TypeOf((*VirtualDiskSpec)(nil)).Elem()
+}
+
+func (b *VirtualEthernetCard) GetVirtualEthernetCard() *VirtualEthernetCard { return b }
+
+type BaseVirtualEthernetCard interface {
+	GetVirtualEthernetCard() *VirtualEthernetCard
+}
+
+func init() {
+	t["BaseVirtualEthernetCard"] = reflect.TypeOf((*VirtualEthernetCard)(nil)).Elem()
+}
+
+func (b *VirtualEthernetCardOption) GetVirtualEthernetCardOption() *VirtualEthernetCardOption {
+	return b
+}
+
+type BaseVirtualEthernetCardOption interface {
+	GetVirtualEthernetCardOption() *VirtualEthernetCardOption
+}
+
+func init() {
+	t["BaseVirtualEthernetCardOption"] = reflect.TypeOf((*VirtualEthernetCardOption)(nil)).Elem()
+}
+
+func (b *VirtualHardwareCompatibilityIssue) GetVirtualHardwareCompatibilityIssue() *VirtualHardwareCompatibilityIssue {
+	return b
+}
+
+type BaseVirtualHardwareCompatibilityIssue interface {
+	GetVirtualHardwareCompatibilityIssue() *VirtualHardwareCompatibilityIssue
+}
+
+func init() {
+	t["BaseVirtualHardwareCompatibilityIssue"] = reflect.TypeOf((*VirtualHardwareCompatibilityIssue)(nil)).Elem()
+}
+
+func (b *VirtualMachineBootOptionsBootableDevice) GetVirtualMachineBootOptionsBootableDevice() *VirtualMachineBootOptionsBootableDevice {
+	return b
+}
+
+type BaseVirtualMachineBootOptionsBootableDevice interface {
+	GetVirtualMachineBootOptionsBootableDevice() *VirtualMachineBootOptionsBootableDevice
+}
+
+func init() {
+	t["BaseVirtualMachineBootOptionsBootableDevice"] = reflect.TypeOf((*VirtualMachineBootOptionsBootableDevice)(nil)).Elem()
+}
+
+func (b *VirtualMachineDeviceRuntimeInfoDeviceRuntimeState) GetVirtualMachineDeviceRuntimeInfoDeviceRuntimeState() *VirtualMachineDeviceRuntimeInfoDeviceRuntimeState {
+	return b
+}
+
+type BaseVirtualMachineDeviceRuntimeInfoDeviceRuntimeState interface {
+	GetVirtualMachineDeviceRuntimeInfoDeviceRuntimeState() *VirtualMachineDeviceRuntimeInfoDeviceRuntimeState
+}
+
+func init() {
+	t["BaseVirtualMachineDeviceRuntimeInfoDeviceRuntimeState"] = reflect.TypeOf((*VirtualMachineDeviceRuntimeInfoDeviceRuntimeState)(nil)).Elem()
+}
+
+func (b *VirtualMachineDiskDeviceInfo) GetVirtualMachineDiskDeviceInfo() *VirtualMachineDiskDeviceInfo {
+	return b
+}
+
+type BaseVirtualMachineDiskDeviceInfo interface {
+	GetVirtualMachineDiskDeviceInfo() *VirtualMachineDiskDeviceInfo
+}
+
+func init() {
+	t["BaseVirtualMachineDiskDeviceInfo"] = reflect.TypeOf((*VirtualMachineDiskDeviceInfo)(nil)).Elem()
+}
+
+func (b *VirtualMachineGuestQuiesceSpec) GetVirtualMachineGuestQuiesceSpec() *VirtualMachineGuestQuiesceSpec {
+	return b
+}
+
+type BaseVirtualMachineGuestQuiesceSpec interface {
+	GetVirtualMachineGuestQuiesceSpec() *VirtualMachineGuestQuiesceSpec
+}
+
+func init() {
+	t["BaseVirtualMachineGuestQuiesceSpec"] = reflect.TypeOf((*VirtualMachineGuestQuiesceSpec)(nil)).Elem()
+}
+
+func (b *VirtualMachinePciPassthroughInfo) GetVirtualMachinePciPassthroughInfo() *VirtualMachinePciPassthroughInfo {
+	return b
+}
+
+type BaseVirtualMachinePciPassthroughInfo interface {
+	GetVirtualMachinePciPassthroughInfo() *VirtualMachinePciPassthroughInfo
+}
+
+func init() {
+	t["BaseVirtualMachinePciPassthroughInfo"] = reflect.TypeOf((*VirtualMachinePciPassthroughInfo)(nil)).Elem()
+}
+
+func (b *VirtualMachineProfileSpec) GetVirtualMachineProfileSpec() *VirtualMachineProfileSpec {
+	return b
+}
+
+type BaseVirtualMachineProfileSpec interface {
+	GetVirtualMachineProfileSpec() *VirtualMachineProfileSpec
+}
+
+func init() {
+	t["BaseVirtualMachineProfileSpec"] = reflect.TypeOf((*VirtualMachineProfileSpec)(nil)).Elem()
+}
+
+func (b *VirtualMachineSriovDevicePoolInfo) GetVirtualMachineSriovDevicePoolInfo() *VirtualMachineSriovDevicePoolInfo {
+	return b
+}
+
+type BaseVirtualMachineSriovDevicePoolInfo interface {
+	GetVirtualMachineSriovDevicePoolInfo() *VirtualMachineSriovDevicePoolInfo
+}
+
+func init() {
+	t["BaseVirtualMachineSriovDevicePoolInfo"] = reflect.TypeOf((*VirtualMachineSriovDevicePoolInfo)(nil)).Elem()
+}
+
+func (b *VirtualMachineTargetInfo) GetVirtualMachineTargetInfo() *VirtualMachineTargetInfo { return b }
+
+type BaseVirtualMachineTargetInfo interface {
+	GetVirtualMachineTargetInfo() *VirtualMachineTargetInfo
+}
+
+func init() {
+	t["BaseVirtualMachineTargetInfo"] = reflect.TypeOf((*VirtualMachineTargetInfo)(nil)).Elem()
+}
+
+func (b *VirtualPCIPassthroughPluginBackingInfo) GetVirtualPCIPassthroughPluginBackingInfo() *VirtualPCIPassthroughPluginBackingInfo {
+	return b
+}
+
+type BaseVirtualPCIPassthroughPluginBackingInfo interface {
+	GetVirtualPCIPassthroughPluginBackingInfo() *VirtualPCIPassthroughPluginBackingInfo
+}
+
+func init() {
+	t["BaseVirtualPCIPassthroughPluginBackingInfo"] = reflect.TypeOf((*VirtualPCIPassthroughPluginBackingInfo)(nil)).Elem()
+}
+
+func (b *VirtualPCIPassthroughPluginBackingOption) GetVirtualPCIPassthroughPluginBackingOption() *VirtualPCIPassthroughPluginBackingOption {
+	return b
+}
+
+type BaseVirtualPCIPassthroughPluginBackingOption interface {
+	GetVirtualPCIPassthroughPluginBackingOption() *VirtualPCIPassthroughPluginBackingOption
+}
+
+func init() {
+	t["BaseVirtualPCIPassthroughPluginBackingOption"] = reflect.TypeOf((*VirtualPCIPassthroughPluginBackingOption)(nil)).Elem()
+}
+
+func (b *VirtualSATAController) GetVirtualSATAController() *VirtualSATAController { return b }
+
+type BaseVirtualSATAController interface {
+	GetVirtualSATAController() *VirtualSATAController
+}
+
+func init() {
+	t["BaseVirtualSATAController"] = reflect.TypeOf((*VirtualSATAController)(nil)).Elem()
+}
+
+func (b *VirtualSATAControllerOption) GetVirtualSATAControllerOption() *VirtualSATAControllerOption {
+	return b
+}
+
+type BaseVirtualSATAControllerOption interface {
+	GetVirtualSATAControllerOption() *VirtualSATAControllerOption
+}
+
+func init() {
+	t["BaseVirtualSATAControllerOption"] = reflect.TypeOf((*VirtualSATAControllerOption)(nil)).Elem()
+}
+
+func (b *VirtualSCSIController) GetVirtualSCSIController() *VirtualSCSIController { return b }
+
+type BaseVirtualSCSIController interface {
+	GetVirtualSCSIController() *VirtualSCSIController
+}
+
+func init() {
+	t["BaseVirtualSCSIController"] = reflect.TypeOf((*VirtualSCSIController)(nil)).Elem()
+}
+
+func (b *VirtualSCSIControllerOption) GetVirtualSCSIControllerOption() *VirtualSCSIControllerOption {
+	return b
+}
+
+type BaseVirtualSCSIControllerOption interface {
+	GetVirtualSCSIControllerOption() *VirtualSCSIControllerOption
+}
+
+func init() {
+	t["BaseVirtualSCSIControllerOption"] = reflect.TypeOf((*VirtualSCSIControllerOption)(nil)).Elem()
+}
+
+func (b *VirtualSoundCard) GetVirtualSoundCard() *VirtualSoundCard { return b }
+
+type BaseVirtualSoundCard interface {
+	GetVirtualSoundCard() *VirtualSoundCard
+}
+
+func init() {
+	t["BaseVirtualSoundCard"] = reflect.TypeOf((*VirtualSoundCard)(nil)).Elem()
+}
+
+func (b *VirtualSoundCardOption) GetVirtualSoundCardOption() *VirtualSoundCardOption { return b }
+
+type BaseVirtualSoundCardOption interface {
+	GetVirtualSoundCardOption() *VirtualSoundCardOption
+}
+
+func init() {
+	t["BaseVirtualSoundCardOption"] = reflect.TypeOf((*VirtualSoundCardOption)(nil)).Elem()
+}
+
+func (b *VirtualVmxnet) GetVirtualVmxnet() *VirtualVmxnet { return b }
+
+type BaseVirtualVmxnet interface {
+	GetVirtualVmxnet() *VirtualVmxnet
+}
+
+func init() {
+	t["BaseVirtualVmxnet"] = reflect.TypeOf((*VirtualVmxnet)(nil)).Elem()
+}
+
+func (b *VirtualVmxnet3) GetVirtualVmxnet3() *VirtualVmxnet3 { return b }
+
+type BaseVirtualVmxnet3 interface {
+	GetVirtualVmxnet3() *VirtualVmxnet3
+}
+
+func init() {
+	t["BaseVirtualVmxnet3"] = reflect.TypeOf((*VirtualVmxnet3)(nil)).Elem()
+}
+
+func (b *VirtualVmxnet3Option) GetVirtualVmxnet3Option() *VirtualVmxnet3Option { return b }
+
+type BaseVirtualVmxnet3Option interface {
+	GetVirtualVmxnet3Option() *VirtualVmxnet3Option
+}
+
+func init() {
+	t["BaseVirtualVmxnet3Option"] = reflect.TypeOf((*VirtualVmxnet3Option)(nil)).Elem()
+}
+
+func (b *VirtualVmxnetOption) GetVirtualVmxnetOption() *VirtualVmxnetOption { return b }
+
+type BaseVirtualVmxnetOption interface {
+	GetVirtualVmxnetOption() *VirtualVmxnetOption
+}
+
+func init() {
+	t["BaseVirtualVmxnetOption"] = reflect.TypeOf((*VirtualVmxnetOption)(nil)).Elem()
+}
+
+func (b *VmCloneEvent) GetVmCloneEvent() *VmCloneEvent { return b }
+
+type BaseVmCloneEvent interface {
+	GetVmCloneEvent() *VmCloneEvent
+}
+
+func init() {
+	t["BaseVmCloneEvent"] = reflect.TypeOf((*VmCloneEvent)(nil)).Elem()
+}
+
+func (b *VmConfigFault) GetVmConfigFault() *VmConfigFault { return b }
+
+type BaseVmConfigFault interface {
+	GetVmConfigFault() *VmConfigFault
+}
+
+func init() {
+	t["BaseVmConfigFault"] = reflect.TypeOf((*VmConfigFault)(nil)).Elem()
+}
+
+func (b *VmConfigFileInfo) GetVmConfigFileInfo() *VmConfigFileInfo { return b }
+
+type BaseVmConfigFileInfo interface {
+	GetVmConfigFileInfo() *VmConfigFileInfo
+}
+
+func init() {
+	t["BaseVmConfigFileInfo"] = reflect.TypeOf((*VmConfigFileInfo)(nil)).Elem()
+}
+
+func (b *VmConfigFileQuery) GetVmConfigFileQuery() *VmConfigFileQuery { return b }
+
+type BaseVmConfigFileQuery interface {
+	GetVmConfigFileQuery() *VmConfigFileQuery
+}
+
+func init() {
+	t["BaseVmConfigFileQuery"] = reflect.TypeOf((*VmConfigFileQuery)(nil)).Elem()
+}
+
+func (b *VmConfigInfo) GetVmConfigInfo() *VmConfigInfo { return b }
+
+type BaseVmConfigInfo interface {
+	GetVmConfigInfo() *VmConfigInfo
+}
+
+func init() {
+	t["BaseVmConfigInfo"] = reflect.TypeOf((*VmConfigInfo)(nil)).Elem()
+}
+
+func (b *VmConfigSpec) GetVmConfigSpec() *VmConfigSpec { return b }
+
+type BaseVmConfigSpec interface {
+	GetVmConfigSpec() *VmConfigSpec
+}
+
+func init() {
+	t["BaseVmConfigSpec"] = reflect.TypeOf((*VmConfigSpec)(nil)).Elem()
+}
+
+func (b *VmDasBeingResetEvent) GetVmDasBeingResetEvent() *VmDasBeingResetEvent { return b }
+
+type BaseVmDasBeingResetEvent interface {
+	GetVmDasBeingResetEvent() *VmDasBeingResetEvent
+}
+
+func init() {
+	t["BaseVmDasBeingResetEvent"] = reflect.TypeOf((*VmDasBeingResetEvent)(nil)).Elem()
+}
+
+func (b *VmEvent) GetVmEvent() *VmEvent { return b }
+
+type BaseVmEvent interface {
+	GetVmEvent() *VmEvent
+}
+
+func init() {
+	t["BaseVmEvent"] = reflect.TypeOf((*VmEvent)(nil)).Elem()
+}
+
+func (b *VmFaultToleranceIssue) GetVmFaultToleranceIssue() *VmFaultToleranceIssue { return b }
+
+type BaseVmFaultToleranceIssue interface {
+	GetVmFaultToleranceIssue() *VmFaultToleranceIssue
+}
+
+func init() {
+	t["BaseVmFaultToleranceIssue"] = reflect.TypeOf((*VmFaultToleranceIssue)(nil)).Elem()
+}
+
+func (b *VmMigratedEvent) GetVmMigratedEvent() *VmMigratedEvent { return b }
+
+type BaseVmMigratedEvent interface {
+	GetVmMigratedEvent() *VmMigratedEvent
+}
+
+func init() {
+	t["BaseVmMigratedEvent"] = reflect.TypeOf((*VmMigratedEvent)(nil)).Elem()
+}
+
+func (b *VmPoweredOffEvent) GetVmPoweredOffEvent() *VmPoweredOffEvent { return b }
+
+type BaseVmPoweredOffEvent interface {
+	GetVmPoweredOffEvent() *VmPoweredOffEvent
+}
+
+func init() {
+	t["BaseVmPoweredOffEvent"] = reflect.TypeOf((*VmPoweredOffEvent)(nil)).Elem()
+}
+
+func (b *VmPoweredOnEvent) GetVmPoweredOnEvent() *VmPoweredOnEvent { return b }
+
+type BaseVmPoweredOnEvent interface {
+	GetVmPoweredOnEvent() *VmPoweredOnEvent
+}
+
+func init() {
+	t["BaseVmPoweredOnEvent"] = reflect.TypeOf((*VmPoweredOnEvent)(nil)).Elem()
+}
+
+func (b *VmRelocateSpecEvent) GetVmRelocateSpecEvent() *VmRelocateSpecEvent { return b }
+
+type BaseVmRelocateSpecEvent interface {
+	GetVmRelocateSpecEvent() *VmRelocateSpecEvent
+}
+
+func init() {
+	t["BaseVmRelocateSpecEvent"] = reflect.TypeOf((*VmRelocateSpecEvent)(nil)).Elem()
+}
+
+func (b *VmStartingEvent) GetVmStartingEvent() *VmStartingEvent { return b }
+
+type BaseVmStartingEvent interface {
+	GetVmStartingEvent() *VmStartingEvent
+}
+
+func init() {
+	t["BaseVmStartingEvent"] = reflect.TypeOf((*VmStartingEvent)(nil)).Elem()
+}
+
+func (b *VmToolsUpgradeFault) GetVmToolsUpgradeFault() *VmToolsUpgradeFault { return b }
+
+type BaseVmToolsUpgradeFault interface {
+	GetVmToolsUpgradeFault() *VmToolsUpgradeFault
+}
+
+func init() {
+	t["BaseVmToolsUpgradeFault"] = reflect.TypeOf((*VmToolsUpgradeFault)(nil)).Elem()
+}
+
+func (b *VmfsDatastoreBaseOption) GetVmfsDatastoreBaseOption() *VmfsDatastoreBaseOption { return b }
+
+type BaseVmfsDatastoreBaseOption interface {
+	GetVmfsDatastoreBaseOption() *VmfsDatastoreBaseOption
+}
+
+func init() {
+	t["BaseVmfsDatastoreBaseOption"] = reflect.TypeOf((*VmfsDatastoreBaseOption)(nil)).Elem()
+}
+
+func (b *VmfsDatastoreSingleExtentOption) GetVmfsDatastoreSingleExtentOption() *VmfsDatastoreSingleExtentOption {
+	return b
+}
+
+type BaseVmfsDatastoreSingleExtentOption interface {
+	GetVmfsDatastoreSingleExtentOption() *VmfsDatastoreSingleExtentOption
+}
+
+func init() {
+	t["BaseVmfsDatastoreSingleExtentOption"] = reflect.TypeOf((*VmfsDatastoreSingleExtentOption)(nil)).Elem()
+}
+
+func (b *VmfsDatastoreSpec) GetVmfsDatastoreSpec() *VmfsDatastoreSpec { return b }
+
+type BaseVmfsDatastoreSpec interface {
+	GetVmfsDatastoreSpec() *VmfsDatastoreSpec
+}
+
+func init() {
+	t["BaseVmfsDatastoreSpec"] = reflect.TypeOf((*VmfsDatastoreSpec)(nil)).Elem()
+}
+
+func (b *VmfsMountFault) GetVmfsMountFault() *VmfsMountFault { return b }
+
+type BaseVmfsMountFault interface {
+	GetVmfsMountFault() *VmfsMountFault
+}
+
+func init() {
+	t["BaseVmfsMountFault"] = reflect.TypeOf((*VmfsMountFault)(nil)).Elem()
+}
+
+func (b *VmwareDistributedVirtualSwitchVlanSpec) GetVmwareDistributedVirtualSwitchVlanSpec() *VmwareDistributedVirtualSwitchVlanSpec {
+	return b
+}
+
+type BaseVmwareDistributedVirtualSwitchVlanSpec interface {
+	GetVmwareDistributedVirtualSwitchVlanSpec() *VmwareDistributedVirtualSwitchVlanSpec
+}
+
+func init() {
+	t["BaseVmwareDistributedVirtualSwitchVlanSpec"] = reflect.TypeOf((*VmwareDistributedVirtualSwitchVlanSpec)(nil)).Elem()
+}
+
+func (b *VsanDiskFault) GetVsanDiskFault() *VsanDiskFault { return b }
+
+type BaseVsanDiskFault interface {
+	GetVsanDiskFault() *VsanDiskFault
+}
+
+func init() {
+	t["BaseVsanDiskFault"] = reflect.TypeOf((*VsanDiskFault)(nil)).Elem()
+}
+
+func (b *VsanFault) GetVsanFault() *VsanFault { return b }
+
+type BaseVsanFault interface {
+	GetVsanFault() *VsanFault
+}
+
+func init() {
+	t["BaseVsanFault"] = reflect.TypeOf((*VsanFault)(nil)).Elem()
+}
+
+func (b *VsanUpgradeSystemPreflightCheckIssue) GetVsanUpgradeSystemPreflightCheckIssue() *VsanUpgradeSystemPreflightCheckIssue {
+	return b
+}
+
+type BaseVsanUpgradeSystemPreflightCheckIssue interface {
+	GetVsanUpgradeSystemPreflightCheckIssue() *VsanUpgradeSystemPreflightCheckIssue
+}
+
+func init() {
+	t["BaseVsanUpgradeSystemPreflightCheckIssue"] = reflect.TypeOf((*VsanUpgradeSystemPreflightCheckIssue)(nil)).Elem()
+}
+
+func (b *VsanUpgradeSystemUpgradeHistoryItem) GetVsanUpgradeSystemUpgradeHistoryItem() *VsanUpgradeSystemUpgradeHistoryItem {
+	return b
+}
+
+type BaseVsanUpgradeSystemUpgradeHistoryItem interface {
+	GetVsanUpgradeSystemUpgradeHistoryItem() *VsanUpgradeSystemUpgradeHistoryItem
+}
+
+func init() {
+	t["BaseVsanUpgradeSystemUpgradeHistoryItem"] = reflect.TypeOf((*VsanUpgradeSystemUpgradeHistoryItem)(nil)).Elem()
+}
+
+func (b *VslmCreateSpecBackingSpec) GetVslmCreateSpecBackingSpec() *VslmCreateSpecBackingSpec {
+	return b
+}
+
+type BaseVslmCreateSpecBackingSpec interface {
+	GetVslmCreateSpecBackingSpec() *VslmCreateSpecBackingSpec
+}
+
+func init() {
+	t["BaseVslmCreateSpecBackingSpec"] = reflect.TypeOf((*VslmCreateSpecBackingSpec)(nil)).Elem()
+}
+
+func (b *VslmMigrateSpec) GetVslmMigrateSpec() *VslmMigrateSpec { return b }
+
+type BaseVslmMigrateSpec interface {
+	GetVslmMigrateSpec() *VslmMigrateSpec
+}
+
+func init() {
+	t["BaseVslmMigrateSpec"] = reflect.TypeOf((*VslmMigrateSpec)(nil)).Elem()
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/types/internal.go b/vendor/github.com/vmware/govmomi/vim25/types/internal.go
new file mode 100644
index 0000000000..0c2693499b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/types/internal.go
@@ -0,0 +1,266 @@
+/*
+Copyright (c) 2014 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 types
+
+import "reflect"
+
+type DynamicTypeMgrQueryMoInstances struct {
+	This       ManagedObjectReference       `xml:"_this"`
+	FilterSpec BaseDynamicTypeMgrFilterSpec `xml:"filterSpec,omitempty,typeattr"`
+}
+
+type DynamicTypeMgrQueryMoInstancesResponse struct {
+	Returnval []DynamicTypeMgrMoInstance `xml:"urn:vim25 returnval"`
+}
+
+type DynamicTypeEnumTypeInfo struct {
+	DynamicData
+
+	Name       string                     `xml:"name"`
+	WsdlName   string                     `xml:"wsdlName"`
+	Version    string                     `xml:"version"`
+	Value      []string                   `xml:"value,omitempty"`
+	Annotation []DynamicTypeMgrAnnotation `xml:"annotation,omitempty"`
+}
+
+func init() {
+	t["DynamicTypeEnumTypeInfo"] = reflect.TypeOf((*DynamicTypeEnumTypeInfo)(nil)).Elem()
+}
+
+type DynamicTypeMgrAllTypeInfo struct {
+	DynamicData
+
+	ManagedTypeInfo []DynamicTypeMgrManagedTypeInfo `xml:"managedTypeInfo,omitempty"`
+	EnumTypeInfo    []DynamicTypeEnumTypeInfo       `xml:"enumTypeInfo,omitempty"`
+	DataTypeInfo    []DynamicTypeMgrDataTypeInfo    `xml:"dataTypeInfo,omitempty"`
+}
+
+func init() {
+	t["DynamicTypeMgrAllTypeInfo"] = reflect.TypeOf((*DynamicTypeMgrAllTypeInfo)(nil)).Elem()
+}
+
+type DynamicTypeMgrAnnotation struct {
+	DynamicData
+
+	Name      string   `xml:"name"`
+	Parameter []string `xml:"parameter,omitempty"`
+}
+
+func init() {
+	t["DynamicTypeMgrAnnotation"] = reflect.TypeOf((*DynamicTypeMgrAnnotation)(nil)).Elem()
+}
+
+type DynamicTypeMgrDataTypeInfo struct {
+	DynamicData
+
+	Name       string                           `xml:"name"`
+	WsdlName   string                           `xml:"wsdlName"`
+	Version    string                           `xml:"version"`
+	Base       []string                         `xml:"base,omitempty"`
+	Property   []DynamicTypeMgrPropertyTypeInfo `xml:"property,omitempty"`
+	Annotation []DynamicTypeMgrAnnotation       `xml:"annotation,omitempty"`
+}
+
+func init() {
+	t["DynamicTypeMgrDataTypeInfo"] = reflect.TypeOf((*DynamicTypeMgrDataTypeInfo)(nil)).Elem()
+}
+
+func (b *DynamicTypeMgrFilterSpec) GetDynamicTypeMgrFilterSpec() *DynamicTypeMgrFilterSpec { return b }
+
+type BaseDynamicTypeMgrFilterSpec interface {
+	GetDynamicTypeMgrFilterSpec() *DynamicTypeMgrFilterSpec
+}
+
+type DynamicTypeMgrFilterSpec struct {
+	DynamicData
+}
+
+func init() {
+	t["DynamicTypeMgrFilterSpec"] = reflect.TypeOf((*DynamicTypeMgrFilterSpec)(nil)).Elem()
+}
+
+type DynamicTypeMgrManagedTypeInfo struct {
+	DynamicData
+
+	Name       string                           `xml:"name"`
+	WsdlName   string                           `xml:"wsdlName"`
+	Version    string                           `xml:"version"`
+	Base       []string                         `xml:"base,omitempty"`
+	Property   []DynamicTypeMgrPropertyTypeInfo `xml:"property,omitempty"`
+	Method     []DynamicTypeMgrMethodTypeInfo   `xml:"method,omitempty"`
+	Annotation []DynamicTypeMgrAnnotation       `xml:"annotation,omitempty"`
+}
+
+func init() {
+	t["DynamicTypeMgrManagedTypeInfo"] = reflect.TypeOf((*DynamicTypeMgrManagedTypeInfo)(nil)).Elem()
+}
+
+type DynamicTypeMgrMethodTypeInfo struct {
+	DynamicData
+
+	Name           string                        `xml:"name"`
+	WsdlName       string                        `xml:"wsdlName"`
+	Version        string                        `xml:"version"`
+	ParamTypeInfo  []DynamicTypeMgrParamTypeInfo `xml:"paramTypeInfo,omitempty"`
+	ReturnTypeInfo *DynamicTypeMgrParamTypeInfo  `xml:"returnTypeInfo,omitempty"`
+	Fault          []string                      `xml:"fault,omitempty"`
+	PrivId         string                        `xml:"privId,omitempty"`
+	Annotation     []DynamicTypeMgrAnnotation    `xml:"annotation,omitempty"`
+}
+
+func init() {
+	t["DynamicTypeMgrMethodTypeInfo"] = reflect.TypeOf((*DynamicTypeMgrMethodTypeInfo)(nil)).Elem()
+}
+
+type DynamicTypeMgrMoFilterSpec struct {
+	DynamicTypeMgrFilterSpec
+
+	Id         string `xml:"id,omitempty"`
+	TypeSubstr string `xml:"typeSubstr,omitempty"`
+}
+
+func init() {
+	t["DynamicTypeMgrMoFilterSpec"] = reflect.TypeOf((*DynamicTypeMgrMoFilterSpec)(nil)).Elem()
+}
+
+type DynamicTypeMgrMoInstance struct {
+	DynamicData
+
+	Id     string `xml:"id"`
+	MoType string `xml:"moType"`
+}
+
+func init() {
+	t["DynamicTypeMgrMoInstance"] = reflect.TypeOf((*DynamicTypeMgrMoInstance)(nil)).Elem()
+}
+
+type DynamicTypeMgrParamTypeInfo struct {
+	DynamicData
+
+	Name       string                     `xml:"name"`
+	Version    string                     `xml:"version"`
+	Type       string                     `xml:"type"`
+	PrivId     string                     `xml:"privId,omitempty"`
+	Annotation []DynamicTypeMgrAnnotation `xml:"annotation,omitempty"`
+}
+
+func init() {
+	t["DynamicTypeMgrParamTypeInfo"] = reflect.TypeOf((*DynamicTypeMgrParamTypeInfo)(nil)).Elem()
+}
+
+type DynamicTypeMgrPropertyTypeInfo struct {
+	DynamicData
+
+	Name        string                     `xml:"name"`
+	Version     string                     `xml:"version"`
+	Type        string                     `xml:"type"`
+	PrivId      string                     `xml:"privId,omitempty"`
+	MsgIdFormat string                     `xml:"msgIdFormat,omitempty"`
+	Annotation  []DynamicTypeMgrAnnotation `xml:"annotation,omitempty"`
+}
+
+type DynamicTypeMgrQueryTypeInfo struct {
+	This       ManagedObjectReference       `xml:"_this"`
+	FilterSpec BaseDynamicTypeMgrFilterSpec `xml:"filterSpec,omitempty,typeattr"`
+}
+
+type DynamicTypeMgrQueryTypeInfoResponse struct {
+	Returnval DynamicTypeMgrAllTypeInfo `xml:"urn:vim25 returnval"`
+}
+
+func init() {
+	t["DynamicTypeMgrPropertyTypeInfo"] = reflect.TypeOf((*DynamicTypeMgrPropertyTypeInfo)(nil)).Elem()
+}
+
+type DynamicTypeMgrTypeFilterSpec struct {
+	DynamicTypeMgrFilterSpec
+
+	TypeSubstr string `xml:"typeSubstr,omitempty"`
+}
+
+func init() {
+	t["DynamicTypeMgrTypeFilterSpec"] = reflect.TypeOf((*DynamicTypeMgrTypeFilterSpec)(nil)).Elem()
+}
+
+type ReflectManagedMethodExecuterSoapArgument struct {
+	DynamicData
+
+	Name string `xml:"name"`
+	Val  string `xml:"val"`
+}
+
+func init() {
+	t["ReflectManagedMethodExecuterSoapArgument"] = reflect.TypeOf((*ReflectManagedMethodExecuterSoapArgument)(nil)).Elem()
+}
+
+type ReflectManagedMethodExecuterSoapFault struct {
+	DynamicData
+
+	FaultMsg    string `xml:"faultMsg"`
+	FaultDetail string `xml:"faultDetail,omitempty"`
+}
+
+func init() {
+	t["ReflectManagedMethodExecuterSoapFault"] = reflect.TypeOf((*ReflectManagedMethodExecuterSoapFault)(nil)).Elem()
+}
+
+type ReflectManagedMethodExecuterSoapResult struct {
+	DynamicData
+
+	Response string                                 `xml:"response,omitempty"`
+	Fault    *ReflectManagedMethodExecuterSoapFault `xml:"fault,omitempty"`
+}
+
+type RetrieveDynamicTypeManager struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+type RetrieveDynamicTypeManagerResponse struct {
+	Returnval *InternalDynamicTypeManager `xml:"urn:vim25 returnval"`
+}
+
+type RetrieveManagedMethodExecuter struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RetrieveManagedMethodExecuter"] = reflect.TypeOf((*RetrieveManagedMethodExecuter)(nil)).Elem()
+}
+
+type RetrieveManagedMethodExecuterResponse struct {
+	Returnval *ReflectManagedMethodExecuter `xml:"urn:vim25 returnval"`
+}
+
+type InternalDynamicTypeManager struct {
+	ManagedObjectReference
+}
+
+type ReflectManagedMethodExecuter struct {
+	ManagedObjectReference
+}
+
+type ExecuteSoap struct {
+	This     ManagedObjectReference                     `xml:"_this"`
+	Moid     string                                     `xml:"moid"`
+	Version  string                                     `xml:"version"`
+	Method   string                                     `xml:"method"`
+	Argument []ReflectManagedMethodExecuterSoapArgument `xml:"argument,omitempty"`
+}
+
+type ExecuteSoapResponse struct {
+	Returnval *ReflectManagedMethodExecuterSoapResult `xml:"urn:vim25 returnval"`
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/types/registry.go b/vendor/github.com/vmware/govmomi/vim25/types/registry.go
new file mode 100644
index 0000000000..8f238088db
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/types/registry.go
@@ -0,0 +1,30 @@
+/*
+Copyright (c) 2014 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 types
+
+import "reflect"
+
+var t = map[string]reflect.Type{}
+
+type Func func(string) (reflect.Type, bool)
+
+func TypeFunc() Func {
+	return func(name string) (reflect.Type, bool) {
+		typ, ok := t[name]
+		return typ, ok
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/types/registry_test.go b/vendor/github.com/vmware/govmomi/vim25/types/registry_test.go
new file mode 100644
index 0000000000..1ea675c5c4
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/types/registry_test.go
@@ -0,0 +1,43 @@
+/*
+Copyright (c) 2014 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 types
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestTypeFunc(t *testing.T) {
+	var ok bool
+
+	fn := TypeFunc()
+
+	_, ok = fn("unknown")
+	if ok {
+		t.Errorf("Expected ok==false")
+	}
+
+	actual, ok := fn("UserProfile")
+	if !ok {
+		t.Errorf("Expected ok==true")
+	}
+
+	expected := reflect.TypeOf(UserProfile{})
+	if !reflect.DeepEqual(expected, actual) {
+		t.Errorf("Expected: %#v, actual: %#v", expected, actual)
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/types/types.go b/vendor/github.com/vmware/govmomi/vim25/types/types.go
new file mode 100644
index 0000000000..ffb4606c63
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/types/types.go
@@ -0,0 +1,53334 @@
+/*
+Copyright (c) 2014-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 types
+
+import (
+	"net/url"
+	"reflect"
+	"time"
+)
+
+type AbdicateDomOwnership AbdicateDomOwnershipRequestType
+
+func init() {
+	t["AbdicateDomOwnership"] = reflect.TypeOf((*AbdicateDomOwnership)(nil)).Elem()
+}
+
+type AbdicateDomOwnershipRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Uuids []string               `xml:"uuids"`
+}
+
+func init() {
+	t["AbdicateDomOwnershipRequestType"] = reflect.TypeOf((*AbdicateDomOwnershipRequestType)(nil)).Elem()
+}
+
+type AbdicateDomOwnershipResponse struct {
+	Returnval []string `xml:"returnval,omitempty"`
+}
+
+type AboutInfo struct {
+	DynamicData
+
+	Name                  string `xml:"name"`
+	FullName              string `xml:"fullName"`
+	Vendor                string `xml:"vendor"`
+	Version               string `xml:"version"`
+	Build                 string `xml:"build"`
+	LocaleVersion         string `xml:"localeVersion,omitempty"`
+	LocaleBuild           string `xml:"localeBuild,omitempty"`
+	OsType                string `xml:"osType"`
+	ProductLineId         string `xml:"productLineId"`
+	ApiType               string `xml:"apiType"`
+	ApiVersion            string `xml:"apiVersion"`
+	InstanceUuid          string `xml:"instanceUuid,omitempty"`
+	LicenseProductName    string `xml:"licenseProductName,omitempty"`
+	LicenseProductVersion string `xml:"licenseProductVersion,omitempty"`
+}
+
+func init() {
+	t["AboutInfo"] = reflect.TypeOf((*AboutInfo)(nil)).Elem()
+}
+
+type AccountCreatedEvent struct {
+	HostEvent
+
+	Spec  BaseHostAccountSpec `xml:"spec,typeattr"`
+	Group bool                `xml:"group"`
+}
+
+func init() {
+	t["AccountCreatedEvent"] = reflect.TypeOf((*AccountCreatedEvent)(nil)).Elem()
+}
+
+type AccountRemovedEvent struct {
+	HostEvent
+
+	Account string `xml:"account"`
+	Group   bool   `xml:"group"`
+}
+
+func init() {
+	t["AccountRemovedEvent"] = reflect.TypeOf((*AccountRemovedEvent)(nil)).Elem()
+}
+
+type AccountUpdatedEvent struct {
+	HostEvent
+
+	Spec            BaseHostAccountSpec `xml:"spec,typeattr"`
+	Group           bool                `xml:"group"`
+	PrevDescription string              `xml:"prevDescription,omitempty"`
+}
+
+func init() {
+	t["AccountUpdatedEvent"] = reflect.TypeOf((*AccountUpdatedEvent)(nil)).Elem()
+}
+
+type AcknowledgeAlarm AcknowledgeAlarmRequestType
+
+func init() {
+	t["AcknowledgeAlarm"] = reflect.TypeOf((*AcknowledgeAlarm)(nil)).Elem()
+}
+
+type AcknowledgeAlarmRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Alarm  ManagedObjectReference `xml:"alarm"`
+	Entity ManagedObjectReference `xml:"entity"`
+}
+
+func init() {
+	t["AcknowledgeAlarmRequestType"] = reflect.TypeOf((*AcknowledgeAlarmRequestType)(nil)).Elem()
+}
+
+type AcknowledgeAlarmResponse struct {
+}
+
+type AcquireCimServicesTicket AcquireCimServicesTicketRequestType
+
+func init() {
+	t["AcquireCimServicesTicket"] = reflect.TypeOf((*AcquireCimServicesTicket)(nil)).Elem()
+}
+
+type AcquireCimServicesTicketRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["AcquireCimServicesTicketRequestType"] = reflect.TypeOf((*AcquireCimServicesTicketRequestType)(nil)).Elem()
+}
+
+type AcquireCimServicesTicketResponse struct {
+	Returnval HostServiceTicket `xml:"returnval"`
+}
+
+type AcquireCloneTicket AcquireCloneTicketRequestType
+
+func init() {
+	t["AcquireCloneTicket"] = reflect.TypeOf((*AcquireCloneTicket)(nil)).Elem()
+}
+
+type AcquireCloneTicketRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["AcquireCloneTicketRequestType"] = reflect.TypeOf((*AcquireCloneTicketRequestType)(nil)).Elem()
+}
+
+type AcquireCloneTicketResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type AcquireCredentialsInGuest AcquireCredentialsInGuestRequestType
+
+func init() {
+	t["AcquireCredentialsInGuest"] = reflect.TypeOf((*AcquireCredentialsInGuest)(nil)).Elem()
+}
+
+type AcquireCredentialsInGuestRequestType struct {
+	This          ManagedObjectReference  `xml:"_this"`
+	Vm            ManagedObjectReference  `xml:"vm"`
+	RequestedAuth BaseGuestAuthentication `xml:"requestedAuth,typeattr"`
+	SessionID     int64                   `xml:"sessionID,omitempty"`
+}
+
+func init() {
+	t["AcquireCredentialsInGuestRequestType"] = reflect.TypeOf((*AcquireCredentialsInGuestRequestType)(nil)).Elem()
+}
+
+type AcquireCredentialsInGuestResponse struct {
+	Returnval BaseGuestAuthentication `xml:"returnval,typeattr"`
+}
+
+type AcquireGenericServiceTicket AcquireGenericServiceTicketRequestType
+
+func init() {
+	t["AcquireGenericServiceTicket"] = reflect.TypeOf((*AcquireGenericServiceTicket)(nil)).Elem()
+}
+
+type AcquireGenericServiceTicketRequestType struct {
+	This ManagedObjectReference               `xml:"_this"`
+	Spec BaseSessionManagerServiceRequestSpec `xml:"spec,typeattr"`
+}
+
+func init() {
+	t["AcquireGenericServiceTicketRequestType"] = reflect.TypeOf((*AcquireGenericServiceTicketRequestType)(nil)).Elem()
+}
+
+type AcquireGenericServiceTicketResponse struct {
+	Returnval SessionManagerGenericServiceTicket `xml:"returnval"`
+}
+
+type AcquireLocalTicket AcquireLocalTicketRequestType
+
+func init() {
+	t["AcquireLocalTicket"] = reflect.TypeOf((*AcquireLocalTicket)(nil)).Elem()
+}
+
+type AcquireLocalTicketRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	UserName string                 `xml:"userName"`
+}
+
+func init() {
+	t["AcquireLocalTicketRequestType"] = reflect.TypeOf((*AcquireLocalTicketRequestType)(nil)).Elem()
+}
+
+type AcquireLocalTicketResponse struct {
+	Returnval SessionManagerLocalTicket `xml:"returnval"`
+}
+
+type AcquireMksTicket AcquireMksTicketRequestType
+
+func init() {
+	t["AcquireMksTicket"] = reflect.TypeOf((*AcquireMksTicket)(nil)).Elem()
+}
+
+type AcquireMksTicketRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["AcquireMksTicketRequestType"] = reflect.TypeOf((*AcquireMksTicketRequestType)(nil)).Elem()
+}
+
+type AcquireMksTicketResponse struct {
+	Returnval VirtualMachineMksTicket `xml:"returnval"`
+}
+
+type AcquireTicket AcquireTicketRequestType
+
+func init() {
+	t["AcquireTicket"] = reflect.TypeOf((*AcquireTicket)(nil)).Elem()
+}
+
+type AcquireTicketRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	TicketType string                 `xml:"ticketType"`
+}
+
+func init() {
+	t["AcquireTicketRequestType"] = reflect.TypeOf((*AcquireTicketRequestType)(nil)).Elem()
+}
+
+type AcquireTicketResponse struct {
+	Returnval VirtualMachineTicket `xml:"returnval"`
+}
+
+type Action struct {
+	DynamicData
+}
+
+func init() {
+	t["Action"] = reflect.TypeOf((*Action)(nil)).Elem()
+}
+
+type ActiveDirectoryFault struct {
+	VimFault
+
+	ErrorCode int32 `xml:"errorCode,omitempty"`
+}
+
+func init() {
+	t["ActiveDirectoryFault"] = reflect.TypeOf((*ActiveDirectoryFault)(nil)).Elem()
+}
+
+type ActiveDirectoryFaultFault BaseActiveDirectoryFault
+
+func init() {
+	t["ActiveDirectoryFaultFault"] = reflect.TypeOf((*ActiveDirectoryFaultFault)(nil)).Elem()
+}
+
+type ActiveDirectoryProfile struct {
+	ApplyProfile
+}
+
+func init() {
+	t["ActiveDirectoryProfile"] = reflect.TypeOf((*ActiveDirectoryProfile)(nil)).Elem()
+}
+
+type ActiveVMsBlockingEVC struct {
+	EVCConfigFault
+
+	EvcMode  string                   `xml:"evcMode,omitempty"`
+	Host     []ManagedObjectReference `xml:"host,omitempty"`
+	HostName []string                 `xml:"hostName,omitempty"`
+}
+
+func init() {
+	t["ActiveVMsBlockingEVC"] = reflect.TypeOf((*ActiveVMsBlockingEVC)(nil)).Elem()
+}
+
+type ActiveVMsBlockingEVCFault ActiveVMsBlockingEVC
+
+func init() {
+	t["ActiveVMsBlockingEVCFault"] = reflect.TypeOf((*ActiveVMsBlockingEVCFault)(nil)).Elem()
+}
+
+type AddAuthorizationRole AddAuthorizationRoleRequestType
+
+func init() {
+	t["AddAuthorizationRole"] = reflect.TypeOf((*AddAuthorizationRole)(nil)).Elem()
+}
+
+type AddAuthorizationRoleRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Name    string                 `xml:"name"`
+	PrivIds []string               `xml:"privIds,omitempty"`
+}
+
+func init() {
+	t["AddAuthorizationRoleRequestType"] = reflect.TypeOf((*AddAuthorizationRoleRequestType)(nil)).Elem()
+}
+
+type AddAuthorizationRoleResponse struct {
+	Returnval int32 `xml:"returnval"`
+}
+
+type AddCustomFieldDef AddCustomFieldDefRequestType
+
+func init() {
+	t["AddCustomFieldDef"] = reflect.TypeOf((*AddCustomFieldDef)(nil)).Elem()
+}
+
+type AddCustomFieldDefRequestType struct {
+	This           ManagedObjectReference `xml:"_this"`
+	Name           string                 `xml:"name"`
+	MoType         string                 `xml:"moType,omitempty"`
+	FieldDefPolicy *PrivilegePolicyDef    `xml:"fieldDefPolicy,omitempty"`
+	FieldPolicy    *PrivilegePolicyDef    `xml:"fieldPolicy,omitempty"`
+}
+
+func init() {
+	t["AddCustomFieldDefRequestType"] = reflect.TypeOf((*AddCustomFieldDefRequestType)(nil)).Elem()
+}
+
+type AddCustomFieldDefResponse struct {
+	Returnval CustomFieldDef `xml:"returnval"`
+}
+
+type AddDVPortgroupRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Spec []DVPortgroupConfigSpec `xml:"spec"`
+}
+
+func init() {
+	t["AddDVPortgroupRequestType"] = reflect.TypeOf((*AddDVPortgroupRequestType)(nil)).Elem()
+}
+
+type AddDVPortgroup_Task AddDVPortgroupRequestType
+
+func init() {
+	t["AddDVPortgroup_Task"] = reflect.TypeOf((*AddDVPortgroup_Task)(nil)).Elem()
+}
+
+type AddDVPortgroup_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type AddDisksRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Disk []HostScsiDisk         `xml:"disk"`
+}
+
+func init() {
+	t["AddDisksRequestType"] = reflect.TypeOf((*AddDisksRequestType)(nil)).Elem()
+}
+
+type AddDisks_Task AddDisksRequestType
+
+func init() {
+	t["AddDisks_Task"] = reflect.TypeOf((*AddDisks_Task)(nil)).Elem()
+}
+
+type AddDisks_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type AddFilter AddFilterRequestType
+
+func init() {
+	t["AddFilter"] = reflect.TypeOf((*AddFilter)(nil)).Elem()
+}
+
+type AddFilterEntities AddFilterEntitiesRequestType
+
+func init() {
+	t["AddFilterEntities"] = reflect.TypeOf((*AddFilterEntities)(nil)).Elem()
+}
+
+type AddFilterEntitiesRequestType struct {
+	This     ManagedObjectReference   `xml:"_this"`
+	FilterId string                   `xml:"filterId"`
+	Entities []ManagedObjectReference `xml:"entities,omitempty"`
+}
+
+func init() {
+	t["AddFilterEntitiesRequestType"] = reflect.TypeOf((*AddFilterEntitiesRequestType)(nil)).Elem()
+}
+
+type AddFilterEntitiesResponse struct {
+}
+
+type AddFilterRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	ProviderId string                 `xml:"providerId"`
+	FilterName string                 `xml:"filterName"`
+	InfoIds    []string               `xml:"infoIds,omitempty"`
+}
+
+func init() {
+	t["AddFilterRequestType"] = reflect.TypeOf((*AddFilterRequestType)(nil)).Elem()
+}
+
+type AddFilterResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type AddGuestAlias AddGuestAliasRequestType
+
+func init() {
+	t["AddGuestAlias"] = reflect.TypeOf((*AddGuestAlias)(nil)).Elem()
+}
+
+type AddGuestAliasRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Vm         ManagedObjectReference  `xml:"vm"`
+	Auth       BaseGuestAuthentication `xml:"auth,typeattr"`
+	Username   string                  `xml:"username"`
+	MapCert    bool                    `xml:"mapCert"`
+	Base64Cert string                  `xml:"base64Cert"`
+	AliasInfo  GuestAuthAliasInfo      `xml:"aliasInfo"`
+}
+
+func init() {
+	t["AddGuestAliasRequestType"] = reflect.TypeOf((*AddGuestAliasRequestType)(nil)).Elem()
+}
+
+type AddGuestAliasResponse struct {
+}
+
+type AddHostRequestType struct {
+	This         ManagedObjectReference  `xml:"_this"`
+	Spec         HostConnectSpec         `xml:"spec"`
+	AsConnected  bool                    `xml:"asConnected"`
+	ResourcePool *ManagedObjectReference `xml:"resourcePool,omitempty"`
+	License      string                  `xml:"license,omitempty"`
+}
+
+func init() {
+	t["AddHostRequestType"] = reflect.TypeOf((*AddHostRequestType)(nil)).Elem()
+}
+
+type AddHost_Task AddHostRequestType
+
+func init() {
+	t["AddHost_Task"] = reflect.TypeOf((*AddHost_Task)(nil)).Elem()
+}
+
+type AddHost_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type AddInternetScsiSendTargets AddInternetScsiSendTargetsRequestType
+
+func init() {
+	t["AddInternetScsiSendTargets"] = reflect.TypeOf((*AddInternetScsiSendTargets)(nil)).Elem()
+}
+
+type AddInternetScsiSendTargetsRequestType struct {
+	This           ManagedObjectReference          `xml:"_this"`
+	IScsiHbaDevice string                          `xml:"iScsiHbaDevice"`
+	Targets        []HostInternetScsiHbaSendTarget `xml:"targets"`
+}
+
+func init() {
+	t["AddInternetScsiSendTargetsRequestType"] = reflect.TypeOf((*AddInternetScsiSendTargetsRequestType)(nil)).Elem()
+}
+
+type AddInternetScsiSendTargetsResponse struct {
+}
+
+type AddInternetScsiStaticTargets AddInternetScsiStaticTargetsRequestType
+
+func init() {
+	t["AddInternetScsiStaticTargets"] = reflect.TypeOf((*AddInternetScsiStaticTargets)(nil)).Elem()
+}
+
+type AddInternetScsiStaticTargetsRequestType struct {
+	This           ManagedObjectReference            `xml:"_this"`
+	IScsiHbaDevice string                            `xml:"iScsiHbaDevice"`
+	Targets        []HostInternetScsiHbaStaticTarget `xml:"targets"`
+}
+
+func init() {
+	t["AddInternetScsiStaticTargetsRequestType"] = reflect.TypeOf((*AddInternetScsiStaticTargetsRequestType)(nil)).Elem()
+}
+
+type AddInternetScsiStaticTargetsResponse struct {
+}
+
+type AddKey AddKeyRequestType
+
+func init() {
+	t["AddKey"] = reflect.TypeOf((*AddKey)(nil)).Elem()
+}
+
+type AddKeyRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Key  CryptoKeyPlain         `xml:"key"`
+}
+
+func init() {
+	t["AddKeyRequestType"] = reflect.TypeOf((*AddKeyRequestType)(nil)).Elem()
+}
+
+type AddKeyResponse struct {
+}
+
+type AddKeys AddKeysRequestType
+
+func init() {
+	t["AddKeys"] = reflect.TypeOf((*AddKeys)(nil)).Elem()
+}
+
+type AddKeysRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Keys []CryptoKeyPlain       `xml:"keys,omitempty"`
+}
+
+func init() {
+	t["AddKeysRequestType"] = reflect.TypeOf((*AddKeysRequestType)(nil)).Elem()
+}
+
+type AddKeysResponse struct {
+	Returnval []CryptoKeyResult `xml:"returnval,omitempty"`
+}
+
+type AddLicense AddLicenseRequestType
+
+func init() {
+	t["AddLicense"] = reflect.TypeOf((*AddLicense)(nil)).Elem()
+}
+
+type AddLicenseRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	LicenseKey string                 `xml:"licenseKey"`
+	Labels     []KeyValue             `xml:"labels,omitempty"`
+}
+
+func init() {
+	t["AddLicenseRequestType"] = reflect.TypeOf((*AddLicenseRequestType)(nil)).Elem()
+}
+
+type AddLicenseResponse struct {
+	Returnval LicenseManagerLicenseInfo `xml:"returnval"`
+}
+
+type AddMonitoredEntities AddMonitoredEntitiesRequestType
+
+func init() {
+	t["AddMonitoredEntities"] = reflect.TypeOf((*AddMonitoredEntities)(nil)).Elem()
+}
+
+type AddMonitoredEntitiesRequestType struct {
+	This       ManagedObjectReference   `xml:"_this"`
+	ProviderId string                   `xml:"providerId"`
+	Entities   []ManagedObjectReference `xml:"entities,omitempty"`
+}
+
+func init() {
+	t["AddMonitoredEntitiesRequestType"] = reflect.TypeOf((*AddMonitoredEntitiesRequestType)(nil)).Elem()
+}
+
+type AddMonitoredEntitiesResponse struct {
+}
+
+type AddNetworkResourcePool AddNetworkResourcePoolRequestType
+
+func init() {
+	t["AddNetworkResourcePool"] = reflect.TypeOf((*AddNetworkResourcePool)(nil)).Elem()
+}
+
+type AddNetworkResourcePoolRequestType struct {
+	This       ManagedObjectReference             `xml:"_this"`
+	ConfigSpec []DVSNetworkResourcePoolConfigSpec `xml:"configSpec"`
+}
+
+func init() {
+	t["AddNetworkResourcePoolRequestType"] = reflect.TypeOf((*AddNetworkResourcePoolRequestType)(nil)).Elem()
+}
+
+type AddNetworkResourcePoolResponse struct {
+}
+
+type AddPortGroup AddPortGroupRequestType
+
+func init() {
+	t["AddPortGroup"] = reflect.TypeOf((*AddPortGroup)(nil)).Elem()
+}
+
+type AddPortGroupRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Portgrp HostPortGroupSpec      `xml:"portgrp"`
+}
+
+func init() {
+	t["AddPortGroupRequestType"] = reflect.TypeOf((*AddPortGroupRequestType)(nil)).Elem()
+}
+
+type AddPortGroupResponse struct {
+}
+
+type AddServiceConsoleVirtualNic AddServiceConsoleVirtualNicRequestType
+
+func init() {
+	t["AddServiceConsoleVirtualNic"] = reflect.TypeOf((*AddServiceConsoleVirtualNic)(nil)).Elem()
+}
+
+type AddServiceConsoleVirtualNicRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Portgroup string                 `xml:"portgroup"`
+	Nic       HostVirtualNicSpec     `xml:"nic"`
+}
+
+func init() {
+	t["AddServiceConsoleVirtualNicRequestType"] = reflect.TypeOf((*AddServiceConsoleVirtualNicRequestType)(nil)).Elem()
+}
+
+type AddServiceConsoleVirtualNicResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type AddStandaloneHostRequestType struct {
+	This         ManagedObjectReference        `xml:"_this"`
+	Spec         HostConnectSpec               `xml:"spec"`
+	CompResSpec  BaseComputeResourceConfigSpec `xml:"compResSpec,omitempty,typeattr"`
+	AddConnected bool                          `xml:"addConnected"`
+	License      string                        `xml:"license,omitempty"`
+}
+
+func init() {
+	t["AddStandaloneHostRequestType"] = reflect.TypeOf((*AddStandaloneHostRequestType)(nil)).Elem()
+}
+
+type AddStandaloneHost_Task AddStandaloneHostRequestType
+
+func init() {
+	t["AddStandaloneHost_Task"] = reflect.TypeOf((*AddStandaloneHost_Task)(nil)).Elem()
+}
+
+type AddStandaloneHost_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type AddVirtualNic AddVirtualNicRequestType
+
+func init() {
+	t["AddVirtualNic"] = reflect.TypeOf((*AddVirtualNic)(nil)).Elem()
+}
+
+type AddVirtualNicRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Portgroup string                 `xml:"portgroup"`
+	Nic       HostVirtualNicSpec     `xml:"nic"`
+}
+
+func init() {
+	t["AddVirtualNicRequestType"] = reflect.TypeOf((*AddVirtualNicRequestType)(nil)).Elem()
+}
+
+type AddVirtualNicResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type AddVirtualSwitch AddVirtualSwitchRequestType
+
+func init() {
+	t["AddVirtualSwitch"] = reflect.TypeOf((*AddVirtualSwitch)(nil)).Elem()
+}
+
+type AddVirtualSwitchRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	VswitchName string                 `xml:"vswitchName"`
+	Spec        *HostVirtualSwitchSpec `xml:"spec,omitempty"`
+}
+
+func init() {
+	t["AddVirtualSwitchRequestType"] = reflect.TypeOf((*AddVirtualSwitchRequestType)(nil)).Elem()
+}
+
+type AddVirtualSwitchResponse struct {
+}
+
+type AdminDisabled struct {
+	HostConfigFault
+}
+
+func init() {
+	t["AdminDisabled"] = reflect.TypeOf((*AdminDisabled)(nil)).Elem()
+}
+
+type AdminDisabledFault AdminDisabled
+
+func init() {
+	t["AdminDisabledFault"] = reflect.TypeOf((*AdminDisabledFault)(nil)).Elem()
+}
+
+type AdminNotDisabled struct {
+	HostConfigFault
+}
+
+func init() {
+	t["AdminNotDisabled"] = reflect.TypeOf((*AdminNotDisabled)(nil)).Elem()
+}
+
+type AdminNotDisabledFault AdminNotDisabled
+
+func init() {
+	t["AdminNotDisabledFault"] = reflect.TypeOf((*AdminNotDisabledFault)(nil)).Elem()
+}
+
+type AdminPasswordNotChangedEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["AdminPasswordNotChangedEvent"] = reflect.TypeOf((*AdminPasswordNotChangedEvent)(nil)).Elem()
+}
+
+type AffinityConfigured struct {
+	MigrationFault
+
+	ConfiguredAffinity []string `xml:"configuredAffinity"`
+}
+
+func init() {
+	t["AffinityConfigured"] = reflect.TypeOf((*AffinityConfigured)(nil)).Elem()
+}
+
+type AffinityConfiguredFault AffinityConfigured
+
+func init() {
+	t["AffinityConfiguredFault"] = reflect.TypeOf((*AffinityConfiguredFault)(nil)).Elem()
+}
+
+type AfterStartupTaskScheduler struct {
+	TaskScheduler
+
+	Minute int32 `xml:"minute"`
+}
+
+func init() {
+	t["AfterStartupTaskScheduler"] = reflect.TypeOf((*AfterStartupTaskScheduler)(nil)).Elem()
+}
+
+type AgentInstallFailed struct {
+	HostConnectFault
+
+	Reason          string `xml:"reason,omitempty"`
+	StatusCode      int32  `xml:"statusCode,omitempty"`
+	InstallerOutput string `xml:"installerOutput,omitempty"`
+}
+
+func init() {
+	t["AgentInstallFailed"] = reflect.TypeOf((*AgentInstallFailed)(nil)).Elem()
+}
+
+type AgentInstallFailedFault AgentInstallFailed
+
+func init() {
+	t["AgentInstallFailedFault"] = reflect.TypeOf((*AgentInstallFailedFault)(nil)).Elem()
+}
+
+type AlarmAcknowledgedEvent struct {
+	AlarmEvent
+
+	Source ManagedEntityEventArgument `xml:"source"`
+	Entity ManagedEntityEventArgument `xml:"entity"`
+}
+
+func init() {
+	t["AlarmAcknowledgedEvent"] = reflect.TypeOf((*AlarmAcknowledgedEvent)(nil)).Elem()
+}
+
+type AlarmAction struct {
+	DynamicData
+}
+
+func init() {
+	t["AlarmAction"] = reflect.TypeOf((*AlarmAction)(nil)).Elem()
+}
+
+type AlarmActionTriggeredEvent struct {
+	AlarmEvent
+
+	Source ManagedEntityEventArgument `xml:"source"`
+	Entity ManagedEntityEventArgument `xml:"entity"`
+}
+
+func init() {
+	t["AlarmActionTriggeredEvent"] = reflect.TypeOf((*AlarmActionTriggeredEvent)(nil)).Elem()
+}
+
+type AlarmClearedEvent struct {
+	AlarmEvent
+
+	Source ManagedEntityEventArgument `xml:"source"`
+	Entity ManagedEntityEventArgument `xml:"entity"`
+	From   string                     `xml:"from"`
+}
+
+func init() {
+	t["AlarmClearedEvent"] = reflect.TypeOf((*AlarmClearedEvent)(nil)).Elem()
+}
+
+type AlarmCreatedEvent struct {
+	AlarmEvent
+
+	Entity ManagedEntityEventArgument `xml:"entity"`
+}
+
+func init() {
+	t["AlarmCreatedEvent"] = reflect.TypeOf((*AlarmCreatedEvent)(nil)).Elem()
+}
+
+type AlarmDescription struct {
+	DynamicData
+
+	Expr                               []BaseTypeDescription    `xml:"expr,typeattr"`
+	StateOperator                      []BaseElementDescription `xml:"stateOperator,typeattr"`
+	MetricOperator                     []BaseElementDescription `xml:"metricOperator,typeattr"`
+	HostSystemConnectionState          []BaseElementDescription `xml:"hostSystemConnectionState,typeattr"`
+	VirtualMachinePowerState           []BaseElementDescription `xml:"virtualMachinePowerState,typeattr"`
+	DatastoreConnectionState           []BaseElementDescription `xml:"datastoreConnectionState,omitempty,typeattr"`
+	HostSystemPowerState               []BaseElementDescription `xml:"hostSystemPowerState,omitempty,typeattr"`
+	VirtualMachineGuestHeartbeatStatus []BaseElementDescription `xml:"virtualMachineGuestHeartbeatStatus,omitempty,typeattr"`
+	EntityStatus                       []BaseElementDescription `xml:"entityStatus,typeattr"`
+	Action                             []BaseTypeDescription    `xml:"action,typeattr"`
+}
+
+func init() {
+	t["AlarmDescription"] = reflect.TypeOf((*AlarmDescription)(nil)).Elem()
+}
+
+type AlarmEmailCompletedEvent struct {
+	AlarmEvent
+
+	Entity ManagedEntityEventArgument `xml:"entity"`
+	To     string                     `xml:"to"`
+}
+
+func init() {
+	t["AlarmEmailCompletedEvent"] = reflect.TypeOf((*AlarmEmailCompletedEvent)(nil)).Elem()
+}
+
+type AlarmEmailFailedEvent struct {
+	AlarmEvent
+
+	Entity ManagedEntityEventArgument `xml:"entity"`
+	To     string                     `xml:"to"`
+	Reason LocalizedMethodFault       `xml:"reason"`
+}
+
+func init() {
+	t["AlarmEmailFailedEvent"] = reflect.TypeOf((*AlarmEmailFailedEvent)(nil)).Elem()
+}
+
+type AlarmEvent struct {
+	Event
+
+	Alarm AlarmEventArgument `xml:"alarm"`
+}
+
+func init() {
+	t["AlarmEvent"] = reflect.TypeOf((*AlarmEvent)(nil)).Elem()
+}
+
+type AlarmEventArgument struct {
+	EntityEventArgument
+
+	Alarm ManagedObjectReference `xml:"alarm"`
+}
+
+func init() {
+	t["AlarmEventArgument"] = reflect.TypeOf((*AlarmEventArgument)(nil)).Elem()
+}
+
+type AlarmExpression struct {
+	DynamicData
+}
+
+func init() {
+	t["AlarmExpression"] = reflect.TypeOf((*AlarmExpression)(nil)).Elem()
+}
+
+type AlarmInfo struct {
+	AlarmSpec
+
+	Key              string                 `xml:"key"`
+	Alarm            ManagedObjectReference `xml:"alarm"`
+	Entity           ManagedObjectReference `xml:"entity"`
+	LastModifiedTime time.Time              `xml:"lastModifiedTime"`
+	LastModifiedUser string                 `xml:"lastModifiedUser"`
+	CreationEventId  int32                  `xml:"creationEventId"`
+}
+
+func init() {
+	t["AlarmInfo"] = reflect.TypeOf((*AlarmInfo)(nil)).Elem()
+}
+
+type AlarmReconfiguredEvent struct {
+	AlarmEvent
+
+	Entity        ManagedEntityEventArgument `xml:"entity"`
+	ConfigChanges *ChangesInfoEventArgument  `xml:"configChanges,omitempty"`
+}
+
+func init() {
+	t["AlarmReconfiguredEvent"] = reflect.TypeOf((*AlarmReconfiguredEvent)(nil)).Elem()
+}
+
+type AlarmRemovedEvent struct {
+	AlarmEvent
+
+	Entity ManagedEntityEventArgument `xml:"entity"`
+}
+
+func init() {
+	t["AlarmRemovedEvent"] = reflect.TypeOf((*AlarmRemovedEvent)(nil)).Elem()
+}
+
+type AlarmScriptCompleteEvent struct {
+	AlarmEvent
+
+	Entity ManagedEntityEventArgument `xml:"entity"`
+	Script string                     `xml:"script"`
+}
+
+func init() {
+	t["AlarmScriptCompleteEvent"] = reflect.TypeOf((*AlarmScriptCompleteEvent)(nil)).Elem()
+}
+
+type AlarmScriptFailedEvent struct {
+	AlarmEvent
+
+	Entity ManagedEntityEventArgument `xml:"entity"`
+	Script string                     `xml:"script"`
+	Reason LocalizedMethodFault       `xml:"reason"`
+}
+
+func init() {
+	t["AlarmScriptFailedEvent"] = reflect.TypeOf((*AlarmScriptFailedEvent)(nil)).Elem()
+}
+
+type AlarmSetting struct {
+	DynamicData
+
+	ToleranceRange     int32 `xml:"toleranceRange"`
+	ReportingFrequency int32 `xml:"reportingFrequency"`
+}
+
+func init() {
+	t["AlarmSetting"] = reflect.TypeOf((*AlarmSetting)(nil)).Elem()
+}
+
+type AlarmSnmpCompletedEvent struct {
+	AlarmEvent
+
+	Entity ManagedEntityEventArgument `xml:"entity"`
+}
+
+func init() {
+	t["AlarmSnmpCompletedEvent"] = reflect.TypeOf((*AlarmSnmpCompletedEvent)(nil)).Elem()
+}
+
+type AlarmSnmpFailedEvent struct {
+	AlarmEvent
+
+	Entity ManagedEntityEventArgument `xml:"entity"`
+	Reason LocalizedMethodFault       `xml:"reason"`
+}
+
+func init() {
+	t["AlarmSnmpFailedEvent"] = reflect.TypeOf((*AlarmSnmpFailedEvent)(nil)).Elem()
+}
+
+type AlarmSpec struct {
+	DynamicData
+
+	Name            string              `xml:"name"`
+	SystemName      string              `xml:"systemName,omitempty"`
+	Description     string              `xml:"description"`
+	Enabled         bool                `xml:"enabled"`
+	Expression      BaseAlarmExpression `xml:"expression,typeattr"`
+	Action          BaseAlarmAction     `xml:"action,omitempty,typeattr"`
+	ActionFrequency int32               `xml:"actionFrequency,omitempty"`
+	Setting         *AlarmSetting       `xml:"setting,omitempty"`
+}
+
+func init() {
+	t["AlarmSpec"] = reflect.TypeOf((*AlarmSpec)(nil)).Elem()
+}
+
+type AlarmState struct {
+	DynamicData
+
+	Key                string                 `xml:"key"`
+	Entity             ManagedObjectReference `xml:"entity"`
+	Alarm              ManagedObjectReference `xml:"alarm"`
+	OverallStatus      ManagedEntityStatus    `xml:"overallStatus"`
+	Time               time.Time              `xml:"time"`
+	Acknowledged       *bool                  `xml:"acknowledged"`
+	AcknowledgedByUser string                 `xml:"acknowledgedByUser,omitempty"`
+	AcknowledgedTime   *time.Time             `xml:"acknowledgedTime"`
+	EventKey           int32                  `xml:"eventKey,omitempty"`
+}
+
+func init() {
+	t["AlarmState"] = reflect.TypeOf((*AlarmState)(nil)).Elem()
+}
+
+type AlarmStatusChangedEvent struct {
+	AlarmEvent
+
+	Source ManagedEntityEventArgument `xml:"source"`
+	Entity ManagedEntityEventArgument `xml:"entity"`
+	From   string                     `xml:"from"`
+	To     string                     `xml:"to"`
+}
+
+func init() {
+	t["AlarmStatusChangedEvent"] = reflect.TypeOf((*AlarmStatusChangedEvent)(nil)).Elem()
+}
+
+type AlarmTriggeringAction struct {
+	AlarmAction
+
+	Action          BaseAction                            `xml:"action,typeattr"`
+	TransitionSpecs []AlarmTriggeringActionTransitionSpec `xml:"transitionSpecs,omitempty"`
+	Green2yellow    bool                                  `xml:"green2yellow"`
+	Yellow2red      bool                                  `xml:"yellow2red"`
+	Red2yellow      bool                                  `xml:"red2yellow"`
+	Yellow2green    bool                                  `xml:"yellow2green"`
+}
+
+func init() {
+	t["AlarmTriggeringAction"] = reflect.TypeOf((*AlarmTriggeringAction)(nil)).Elem()
+}
+
+type AlarmTriggeringActionTransitionSpec struct {
+	DynamicData
+
+	StartState ManagedEntityStatus `xml:"startState"`
+	FinalState ManagedEntityStatus `xml:"finalState"`
+	Repeats    bool                `xml:"repeats"`
+}
+
+func init() {
+	t["AlarmTriggeringActionTransitionSpec"] = reflect.TypeOf((*AlarmTriggeringActionTransitionSpec)(nil)).Elem()
+}
+
+type AllVirtualMachinesLicensedEvent struct {
+	LicenseEvent
+}
+
+func init() {
+	t["AllVirtualMachinesLicensedEvent"] = reflect.TypeOf((*AllVirtualMachinesLicensedEvent)(nil)).Elem()
+}
+
+type AllocateIpv4Address AllocateIpv4AddressRequestType
+
+func init() {
+	t["AllocateIpv4Address"] = reflect.TypeOf((*AllocateIpv4Address)(nil)).Elem()
+}
+
+type AllocateIpv4AddressRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	Dc           ManagedObjectReference `xml:"dc"`
+	PoolId       int32                  `xml:"poolId"`
+	AllocationId string                 `xml:"allocationId"`
+}
+
+func init() {
+	t["AllocateIpv4AddressRequestType"] = reflect.TypeOf((*AllocateIpv4AddressRequestType)(nil)).Elem()
+}
+
+type AllocateIpv4AddressResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type AllocateIpv6Address AllocateIpv6AddressRequestType
+
+func init() {
+	t["AllocateIpv6Address"] = reflect.TypeOf((*AllocateIpv6Address)(nil)).Elem()
+}
+
+type AllocateIpv6AddressRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	Dc           ManagedObjectReference `xml:"dc"`
+	PoolId       int32                  `xml:"poolId"`
+	AllocationId string                 `xml:"allocationId"`
+}
+
+func init() {
+	t["AllocateIpv6AddressRequestType"] = reflect.TypeOf((*AllocateIpv6AddressRequestType)(nil)).Elem()
+}
+
+type AllocateIpv6AddressResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type AlreadyAuthenticatedSessionEvent struct {
+	SessionEvent
+}
+
+func init() {
+	t["AlreadyAuthenticatedSessionEvent"] = reflect.TypeOf((*AlreadyAuthenticatedSessionEvent)(nil)).Elem()
+}
+
+type AlreadyBeingManaged struct {
+	HostConnectFault
+
+	IpAddress string `xml:"ipAddress"`
+}
+
+func init() {
+	t["AlreadyBeingManaged"] = reflect.TypeOf((*AlreadyBeingManaged)(nil)).Elem()
+}
+
+type AlreadyBeingManagedFault AlreadyBeingManaged
+
+func init() {
+	t["AlreadyBeingManagedFault"] = reflect.TypeOf((*AlreadyBeingManagedFault)(nil)).Elem()
+}
+
+type AlreadyConnected struct {
+	HostConnectFault
+
+	Name string `xml:"name"`
+}
+
+func init() {
+	t["AlreadyConnected"] = reflect.TypeOf((*AlreadyConnected)(nil)).Elem()
+}
+
+type AlreadyConnectedFault AlreadyConnected
+
+func init() {
+	t["AlreadyConnectedFault"] = reflect.TypeOf((*AlreadyConnectedFault)(nil)).Elem()
+}
+
+type AlreadyExists struct {
+	VimFault
+
+	Name string `xml:"name,omitempty"`
+}
+
+func init() {
+	t["AlreadyExists"] = reflect.TypeOf((*AlreadyExists)(nil)).Elem()
+}
+
+type AlreadyExistsFault AlreadyExists
+
+func init() {
+	t["AlreadyExistsFault"] = reflect.TypeOf((*AlreadyExistsFault)(nil)).Elem()
+}
+
+type AlreadyUpgraded struct {
+	VimFault
+}
+
+func init() {
+	t["AlreadyUpgraded"] = reflect.TypeOf((*AlreadyUpgraded)(nil)).Elem()
+}
+
+type AlreadyUpgradedFault AlreadyUpgraded
+
+func init() {
+	t["AlreadyUpgradedFault"] = reflect.TypeOf((*AlreadyUpgradedFault)(nil)).Elem()
+}
+
+type AndAlarmExpression struct {
+	AlarmExpression
+
+	Expression []BaseAlarmExpression `xml:"expression,typeattr"`
+}
+
+func init() {
+	t["AndAlarmExpression"] = reflect.TypeOf((*AndAlarmExpression)(nil)).Elem()
+}
+
+type AnswerFile struct {
+	DynamicData
+
+	UserInput    []ProfileDeferredPolicyOptionParameter `xml:"userInput,omitempty"`
+	CreatedTime  time.Time                              `xml:"createdTime"`
+	ModifiedTime time.Time                              `xml:"modifiedTime"`
+}
+
+func init() {
+	t["AnswerFile"] = reflect.TypeOf((*AnswerFile)(nil)).Elem()
+}
+
+type AnswerFileCreateSpec struct {
+	DynamicData
+
+	Validating *bool `xml:"validating"`
+}
+
+func init() {
+	t["AnswerFileCreateSpec"] = reflect.TypeOf((*AnswerFileCreateSpec)(nil)).Elem()
+}
+
+type AnswerFileOptionsCreateSpec struct {
+	AnswerFileCreateSpec
+
+	UserInput []ProfileDeferredPolicyOptionParameter `xml:"userInput,omitempty"`
+}
+
+func init() {
+	t["AnswerFileOptionsCreateSpec"] = reflect.TypeOf((*AnswerFileOptionsCreateSpec)(nil)).Elem()
+}
+
+type AnswerFileSerializedCreateSpec struct {
+	AnswerFileCreateSpec
+
+	AnswerFileConfigString string `xml:"answerFileConfigString"`
+}
+
+func init() {
+	t["AnswerFileSerializedCreateSpec"] = reflect.TypeOf((*AnswerFileSerializedCreateSpec)(nil)).Elem()
+}
+
+type AnswerFileStatusError struct {
+	DynamicData
+
+	UserInputPath ProfilePropertyPath `xml:"userInputPath"`
+	ErrMsg        LocalizableMessage  `xml:"errMsg"`
+}
+
+func init() {
+	t["AnswerFileStatusError"] = reflect.TypeOf((*AnswerFileStatusError)(nil)).Elem()
+}
+
+type AnswerFileStatusResult struct {
+	DynamicData
+
+	CheckedTime time.Time               `xml:"checkedTime"`
+	Host        ManagedObjectReference  `xml:"host"`
+	Status      string                  `xml:"status"`
+	Error       []AnswerFileStatusError `xml:"error,omitempty"`
+}
+
+func init() {
+	t["AnswerFileStatusResult"] = reflect.TypeOf((*AnswerFileStatusResult)(nil)).Elem()
+}
+
+type AnswerFileUpdateFailed struct {
+	VimFault
+
+	Failure []AnswerFileUpdateFailure `xml:"failure"`
+}
+
+func init() {
+	t["AnswerFileUpdateFailed"] = reflect.TypeOf((*AnswerFileUpdateFailed)(nil)).Elem()
+}
+
+type AnswerFileUpdateFailedFault AnswerFileUpdateFailed
+
+func init() {
+	t["AnswerFileUpdateFailedFault"] = reflect.TypeOf((*AnswerFileUpdateFailedFault)(nil)).Elem()
+}
+
+type AnswerFileUpdateFailure struct {
+	DynamicData
+
+	UserInputPath ProfilePropertyPath `xml:"userInputPath"`
+	ErrMsg        LocalizableMessage  `xml:"errMsg"`
+}
+
+func init() {
+	t["AnswerFileUpdateFailure"] = reflect.TypeOf((*AnswerFileUpdateFailure)(nil)).Elem()
+}
+
+type AnswerVM AnswerVMRequestType
+
+func init() {
+	t["AnswerVM"] = reflect.TypeOf((*AnswerVM)(nil)).Elem()
+}
+
+type AnswerVMRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	QuestionId   string                 `xml:"questionId"`
+	AnswerChoice string                 `xml:"answerChoice"`
+}
+
+func init() {
+	t["AnswerVMRequestType"] = reflect.TypeOf((*AnswerVMRequestType)(nil)).Elem()
+}
+
+type AnswerVMResponse struct {
+}
+
+type ApplicationQuiesceFault struct {
+	SnapshotFault
+}
+
+func init() {
+	t["ApplicationQuiesceFault"] = reflect.TypeOf((*ApplicationQuiesceFault)(nil)).Elem()
+}
+
+type ApplicationQuiesceFaultFault ApplicationQuiesceFault
+
+func init() {
+	t["ApplicationQuiesceFaultFault"] = reflect.TypeOf((*ApplicationQuiesceFaultFault)(nil)).Elem()
+}
+
+type ApplyEntitiesConfigRequestType struct {
+	This             ManagedObjectReference              `xml:"_this"`
+	ApplyConfigSpecs []ApplyHostProfileConfigurationSpec `xml:"applyConfigSpecs,omitempty"`
+}
+
+func init() {
+	t["ApplyEntitiesConfigRequestType"] = reflect.TypeOf((*ApplyEntitiesConfigRequestType)(nil)).Elem()
+}
+
+type ApplyEntitiesConfig_Task ApplyEntitiesConfigRequestType
+
+func init() {
+	t["ApplyEntitiesConfig_Task"] = reflect.TypeOf((*ApplyEntitiesConfig_Task)(nil)).Elem()
+}
+
+type ApplyEntitiesConfig_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ApplyHostConfigRequestType struct {
+	This       ManagedObjectReference                 `xml:"_this"`
+	Host       ManagedObjectReference                 `xml:"host"`
+	ConfigSpec HostConfigSpec                         `xml:"configSpec"`
+	UserInput  []ProfileDeferredPolicyOptionParameter `xml:"userInput,omitempty"`
+}
+
+func init() {
+	t["ApplyHostConfigRequestType"] = reflect.TypeOf((*ApplyHostConfigRequestType)(nil)).Elem()
+}
+
+type ApplyHostConfig_Task ApplyHostConfigRequestType
+
+func init() {
+	t["ApplyHostConfig_Task"] = reflect.TypeOf((*ApplyHostConfig_Task)(nil)).Elem()
+}
+
+type ApplyHostConfig_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ApplyHostProfileConfigurationSpec struct {
+	ProfileExecuteResult
+
+	Host                ManagedObjectReference `xml:"host"`
+	TaskListRequirement []string               `xml:"taskListRequirement,omitempty"`
+	TaskDescription     []LocalizableMessage   `xml:"taskDescription,omitempty"`
+	RebootStateless     *bool                  `xml:"rebootStateless"`
+	RebootHost          *bool                  `xml:"rebootHost"`
+	FaultData           *LocalizedMethodFault  `xml:"faultData,omitempty"`
+}
+
+func init() {
+	t["ApplyHostProfileConfigurationSpec"] = reflect.TypeOf((*ApplyHostProfileConfigurationSpec)(nil)).Elem()
+}
+
+type ApplyProfile struct {
+	DynamicData
+
+	Enabled          bool                          `xml:"enabled"`
+	Policy           []ProfilePolicy               `xml:"policy,omitempty"`
+	ProfileTypeName  string                        `xml:"profileTypeName,omitempty"`
+	ProfileVersion   string                        `xml:"profileVersion,omitempty"`
+	Property         []ProfileApplyProfileProperty `xml:"property,omitempty"`
+	Favorite         *bool                         `xml:"favorite"`
+	ToBeMerged       *bool                         `xml:"toBeMerged"`
+	ToReplaceWith    *bool                         `xml:"toReplaceWith"`
+	ToBeDeleted      *bool                         `xml:"toBeDeleted"`
+	CopyEnableStatus *bool                         `xml:"copyEnableStatus"`
+}
+
+func init() {
+	t["ApplyProfile"] = reflect.TypeOf((*ApplyProfile)(nil)).Elem()
+}
+
+type ApplyRecommendation ApplyRecommendationRequestType
+
+func init() {
+	t["ApplyRecommendation"] = reflect.TypeOf((*ApplyRecommendation)(nil)).Elem()
+}
+
+type ApplyRecommendationRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Key  string                 `xml:"key"`
+}
+
+func init() {
+	t["ApplyRecommendationRequestType"] = reflect.TypeOf((*ApplyRecommendationRequestType)(nil)).Elem()
+}
+
+type ApplyRecommendationResponse struct {
+}
+
+type ApplyStorageDrsRecommendationRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Key  []string               `xml:"key"`
+}
+
+func init() {
+	t["ApplyStorageDrsRecommendationRequestType"] = reflect.TypeOf((*ApplyStorageDrsRecommendationRequestType)(nil)).Elem()
+}
+
+type ApplyStorageDrsRecommendationToPodRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Pod  ManagedObjectReference `xml:"pod"`
+	Key  string                 `xml:"key"`
+}
+
+func init() {
+	t["ApplyStorageDrsRecommendationToPodRequestType"] = reflect.TypeOf((*ApplyStorageDrsRecommendationToPodRequestType)(nil)).Elem()
+}
+
+type ApplyStorageDrsRecommendationToPod_Task ApplyStorageDrsRecommendationToPodRequestType
+
+func init() {
+	t["ApplyStorageDrsRecommendationToPod_Task"] = reflect.TypeOf((*ApplyStorageDrsRecommendationToPod_Task)(nil)).Elem()
+}
+
+type ApplyStorageDrsRecommendationToPod_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ApplyStorageDrsRecommendation_Task ApplyStorageDrsRecommendationRequestType
+
+func init() {
+	t["ApplyStorageDrsRecommendation_Task"] = reflect.TypeOf((*ApplyStorageDrsRecommendation_Task)(nil)).Elem()
+}
+
+type ApplyStorageDrsRecommendation_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ApplyStorageRecommendationResult struct {
+	DynamicData
+
+	Vm *ManagedObjectReference `xml:"vm,omitempty"`
+}
+
+func init() {
+	t["ApplyStorageRecommendationResult"] = reflect.TypeOf((*ApplyStorageRecommendationResult)(nil)).Elem()
+}
+
+type AreAlarmActionsEnabled AreAlarmActionsEnabledRequestType
+
+func init() {
+	t["AreAlarmActionsEnabled"] = reflect.TypeOf((*AreAlarmActionsEnabled)(nil)).Elem()
+}
+
+type AreAlarmActionsEnabledRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Entity ManagedObjectReference `xml:"entity"`
+}
+
+func init() {
+	t["AreAlarmActionsEnabledRequestType"] = reflect.TypeOf((*AreAlarmActionsEnabledRequestType)(nil)).Elem()
+}
+
+type AreAlarmActionsEnabledResponse struct {
+	Returnval bool `xml:"returnval"`
+}
+
+type ArrayOfAlarmAction struct {
+	AlarmAction []BaseAlarmAction `xml:"AlarmAction,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfAlarmAction"] = reflect.TypeOf((*ArrayOfAlarmAction)(nil)).Elem()
+}
+
+type ArrayOfAlarmExpression struct {
+	AlarmExpression []BaseAlarmExpression `xml:"AlarmExpression,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfAlarmExpression"] = reflect.TypeOf((*ArrayOfAlarmExpression)(nil)).Elem()
+}
+
+type ArrayOfAlarmState struct {
+	AlarmState []AlarmState `xml:"AlarmState,omitempty"`
+}
+
+func init() {
+	t["ArrayOfAlarmState"] = reflect.TypeOf((*ArrayOfAlarmState)(nil)).Elem()
+}
+
+type ArrayOfAlarmTriggeringActionTransitionSpec struct {
+	AlarmTriggeringActionTransitionSpec []AlarmTriggeringActionTransitionSpec `xml:"AlarmTriggeringActionTransitionSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfAlarmTriggeringActionTransitionSpec"] = reflect.TypeOf((*ArrayOfAlarmTriggeringActionTransitionSpec)(nil)).Elem()
+}
+
+type ArrayOfAnswerFileStatusError struct {
+	AnswerFileStatusError []AnswerFileStatusError `xml:"AnswerFileStatusError,omitempty"`
+}
+
+func init() {
+	t["ArrayOfAnswerFileStatusError"] = reflect.TypeOf((*ArrayOfAnswerFileStatusError)(nil)).Elem()
+}
+
+type ArrayOfAnswerFileStatusResult struct {
+	AnswerFileStatusResult []AnswerFileStatusResult `xml:"AnswerFileStatusResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfAnswerFileStatusResult"] = reflect.TypeOf((*ArrayOfAnswerFileStatusResult)(nil)).Elem()
+}
+
+type ArrayOfAnswerFileUpdateFailure struct {
+	AnswerFileUpdateFailure []AnswerFileUpdateFailure `xml:"AnswerFileUpdateFailure,omitempty"`
+}
+
+func init() {
+	t["ArrayOfAnswerFileUpdateFailure"] = reflect.TypeOf((*ArrayOfAnswerFileUpdateFailure)(nil)).Elem()
+}
+
+type ArrayOfAnyType struct {
+	AnyType []AnyType `xml:"anyType,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfAnyType"] = reflect.TypeOf((*ArrayOfAnyType)(nil)).Elem()
+}
+
+type ArrayOfAnyURI struct {
+	AnyURI []url.URL `xml:"anyURI,omitempty"`
+}
+
+func init() {
+	t["ArrayOfAnyURI"] = reflect.TypeOf((*ArrayOfAnyURI)(nil)).Elem()
+}
+
+type ArrayOfApplyHostProfileConfigurationSpec struct {
+	ApplyHostProfileConfigurationSpec []ApplyHostProfileConfigurationSpec `xml:"ApplyHostProfileConfigurationSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfApplyHostProfileConfigurationSpec"] = reflect.TypeOf((*ArrayOfApplyHostProfileConfigurationSpec)(nil)).Elem()
+}
+
+type ArrayOfApplyProfile struct {
+	ApplyProfile []BaseApplyProfile `xml:"ApplyProfile,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfApplyProfile"] = reflect.TypeOf((*ArrayOfApplyProfile)(nil)).Elem()
+}
+
+type ArrayOfAuthorizationPrivilege struct {
+	AuthorizationPrivilege []AuthorizationPrivilege `xml:"AuthorizationPrivilege,omitempty"`
+}
+
+func init() {
+	t["ArrayOfAuthorizationPrivilege"] = reflect.TypeOf((*ArrayOfAuthorizationPrivilege)(nil)).Elem()
+}
+
+type ArrayOfAuthorizationRole struct {
+	AuthorizationRole []AuthorizationRole `xml:"AuthorizationRole,omitempty"`
+}
+
+func init() {
+	t["ArrayOfAuthorizationRole"] = reflect.TypeOf((*ArrayOfAuthorizationRole)(nil)).Elem()
+}
+
+type ArrayOfAutoStartPowerInfo struct {
+	AutoStartPowerInfo []AutoStartPowerInfo `xml:"AutoStartPowerInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfAutoStartPowerInfo"] = reflect.TypeOf((*ArrayOfAutoStartPowerInfo)(nil)).Elem()
+}
+
+type ArrayOfBoolean struct {
+	Boolean []bool `xml:"boolean,omitempty"`
+}
+
+func init() {
+	t["ArrayOfBoolean"] = reflect.TypeOf((*ArrayOfBoolean)(nil)).Elem()
+}
+
+type ArrayOfByte struct {
+	Byte []byte `xml:"byte,omitempty"`
+}
+
+func init() {
+	t["ArrayOfByte"] = reflect.TypeOf((*ArrayOfByte)(nil)).Elem()
+}
+
+type ArrayOfChangesInfoEventArgument struct {
+	ChangesInfoEventArgument []ChangesInfoEventArgument `xml:"ChangesInfoEventArgument,omitempty"`
+}
+
+func init() {
+	t["ArrayOfChangesInfoEventArgument"] = reflect.TypeOf((*ArrayOfChangesInfoEventArgument)(nil)).Elem()
+}
+
+type ArrayOfCheckResult struct {
+	CheckResult []CheckResult `xml:"CheckResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfCheckResult"] = reflect.TypeOf((*ArrayOfCheckResult)(nil)).Elem()
+}
+
+type ArrayOfClusterAction struct {
+	ClusterAction []BaseClusterAction `xml:"ClusterAction,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfClusterAction"] = reflect.TypeOf((*ArrayOfClusterAction)(nil)).Elem()
+}
+
+type ArrayOfClusterActionHistory struct {
+	ClusterActionHistory []ClusterActionHistory `xml:"ClusterActionHistory,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterActionHistory"] = reflect.TypeOf((*ArrayOfClusterActionHistory)(nil)).Elem()
+}
+
+type ArrayOfClusterAttemptedVmInfo struct {
+	ClusterAttemptedVmInfo []ClusterAttemptedVmInfo `xml:"ClusterAttemptedVmInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterAttemptedVmInfo"] = reflect.TypeOf((*ArrayOfClusterAttemptedVmInfo)(nil)).Elem()
+}
+
+type ArrayOfClusterDasAamNodeState struct {
+	ClusterDasAamNodeState []ClusterDasAamNodeState `xml:"ClusterDasAamNodeState,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterDasAamNodeState"] = reflect.TypeOf((*ArrayOfClusterDasAamNodeState)(nil)).Elem()
+}
+
+type ArrayOfClusterDasFailoverLevelAdvancedRuntimeInfoHostSlots struct {
+	ClusterDasFailoverLevelAdvancedRuntimeInfoHostSlots []ClusterDasFailoverLevelAdvancedRuntimeInfoHostSlots `xml:"ClusterDasFailoverLevelAdvancedRuntimeInfoHostSlots,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterDasFailoverLevelAdvancedRuntimeInfoHostSlots"] = reflect.TypeOf((*ArrayOfClusterDasFailoverLevelAdvancedRuntimeInfoHostSlots)(nil)).Elem()
+}
+
+type ArrayOfClusterDasFailoverLevelAdvancedRuntimeInfoVmSlots struct {
+	ClusterDasFailoverLevelAdvancedRuntimeInfoVmSlots []ClusterDasFailoverLevelAdvancedRuntimeInfoVmSlots `xml:"ClusterDasFailoverLevelAdvancedRuntimeInfoVmSlots,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterDasFailoverLevelAdvancedRuntimeInfoVmSlots"] = reflect.TypeOf((*ArrayOfClusterDasFailoverLevelAdvancedRuntimeInfoVmSlots)(nil)).Elem()
+}
+
+type ArrayOfClusterDasVmConfigInfo struct {
+	ClusterDasVmConfigInfo []ClusterDasVmConfigInfo `xml:"ClusterDasVmConfigInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterDasVmConfigInfo"] = reflect.TypeOf((*ArrayOfClusterDasVmConfigInfo)(nil)).Elem()
+}
+
+type ArrayOfClusterDasVmConfigSpec struct {
+	ClusterDasVmConfigSpec []ClusterDasVmConfigSpec `xml:"ClusterDasVmConfigSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterDasVmConfigSpec"] = reflect.TypeOf((*ArrayOfClusterDasVmConfigSpec)(nil)).Elem()
+}
+
+type ArrayOfClusterDpmHostConfigInfo struct {
+	ClusterDpmHostConfigInfo []ClusterDpmHostConfigInfo `xml:"ClusterDpmHostConfigInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterDpmHostConfigInfo"] = reflect.TypeOf((*ArrayOfClusterDpmHostConfigInfo)(nil)).Elem()
+}
+
+type ArrayOfClusterDpmHostConfigSpec struct {
+	ClusterDpmHostConfigSpec []ClusterDpmHostConfigSpec `xml:"ClusterDpmHostConfigSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterDpmHostConfigSpec"] = reflect.TypeOf((*ArrayOfClusterDpmHostConfigSpec)(nil)).Elem()
+}
+
+type ArrayOfClusterDrsFaults struct {
+	ClusterDrsFaults []ClusterDrsFaults `xml:"ClusterDrsFaults,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterDrsFaults"] = reflect.TypeOf((*ArrayOfClusterDrsFaults)(nil)).Elem()
+}
+
+type ArrayOfClusterDrsFaultsFaultsByVm struct {
+	ClusterDrsFaultsFaultsByVm []BaseClusterDrsFaultsFaultsByVm `xml:"ClusterDrsFaultsFaultsByVm,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfClusterDrsFaultsFaultsByVm"] = reflect.TypeOf((*ArrayOfClusterDrsFaultsFaultsByVm)(nil)).Elem()
+}
+
+type ArrayOfClusterDrsMigration struct {
+	ClusterDrsMigration []ClusterDrsMigration `xml:"ClusterDrsMigration,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterDrsMigration"] = reflect.TypeOf((*ArrayOfClusterDrsMigration)(nil)).Elem()
+}
+
+type ArrayOfClusterDrsRecommendation struct {
+	ClusterDrsRecommendation []ClusterDrsRecommendation `xml:"ClusterDrsRecommendation,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterDrsRecommendation"] = reflect.TypeOf((*ArrayOfClusterDrsRecommendation)(nil)).Elem()
+}
+
+type ArrayOfClusterDrsVmConfigInfo struct {
+	ClusterDrsVmConfigInfo []ClusterDrsVmConfigInfo `xml:"ClusterDrsVmConfigInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterDrsVmConfigInfo"] = reflect.TypeOf((*ArrayOfClusterDrsVmConfigInfo)(nil)).Elem()
+}
+
+type ArrayOfClusterDrsVmConfigSpec struct {
+	ClusterDrsVmConfigSpec []ClusterDrsVmConfigSpec `xml:"ClusterDrsVmConfigSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterDrsVmConfigSpec"] = reflect.TypeOf((*ArrayOfClusterDrsVmConfigSpec)(nil)).Elem()
+}
+
+type ArrayOfClusterEVCManagerCheckResult struct {
+	ClusterEVCManagerCheckResult []ClusterEVCManagerCheckResult `xml:"ClusterEVCManagerCheckResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterEVCManagerCheckResult"] = reflect.TypeOf((*ArrayOfClusterEVCManagerCheckResult)(nil)).Elem()
+}
+
+type ArrayOfClusterFailoverHostAdmissionControlInfoHostStatus struct {
+	ClusterFailoverHostAdmissionControlInfoHostStatus []ClusterFailoverHostAdmissionControlInfoHostStatus `xml:"ClusterFailoverHostAdmissionControlInfoHostStatus,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterFailoverHostAdmissionControlInfoHostStatus"] = reflect.TypeOf((*ArrayOfClusterFailoverHostAdmissionControlInfoHostStatus)(nil)).Elem()
+}
+
+type ArrayOfClusterGroupInfo struct {
+	ClusterGroupInfo []BaseClusterGroupInfo `xml:"ClusterGroupInfo,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfClusterGroupInfo"] = reflect.TypeOf((*ArrayOfClusterGroupInfo)(nil)).Elem()
+}
+
+type ArrayOfClusterGroupSpec struct {
+	ClusterGroupSpec []ClusterGroupSpec `xml:"ClusterGroupSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterGroupSpec"] = reflect.TypeOf((*ArrayOfClusterGroupSpec)(nil)).Elem()
+}
+
+type ArrayOfClusterHostRecommendation struct {
+	ClusterHostRecommendation []ClusterHostRecommendation `xml:"ClusterHostRecommendation,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterHostRecommendation"] = reflect.TypeOf((*ArrayOfClusterHostRecommendation)(nil)).Elem()
+}
+
+type ArrayOfClusterIoFilterInfo struct {
+	ClusterIoFilterInfo []ClusterIoFilterInfo `xml:"ClusterIoFilterInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterIoFilterInfo"] = reflect.TypeOf((*ArrayOfClusterIoFilterInfo)(nil)).Elem()
+}
+
+type ArrayOfClusterNotAttemptedVmInfo struct {
+	ClusterNotAttemptedVmInfo []ClusterNotAttemptedVmInfo `xml:"ClusterNotAttemptedVmInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterNotAttemptedVmInfo"] = reflect.TypeOf((*ArrayOfClusterNotAttemptedVmInfo)(nil)).Elem()
+}
+
+type ArrayOfClusterRecommendation struct {
+	ClusterRecommendation []ClusterRecommendation `xml:"ClusterRecommendation,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterRecommendation"] = reflect.TypeOf((*ArrayOfClusterRecommendation)(nil)).Elem()
+}
+
+type ArrayOfClusterRuleInfo struct {
+	ClusterRuleInfo []BaseClusterRuleInfo `xml:"ClusterRuleInfo,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfClusterRuleInfo"] = reflect.TypeOf((*ArrayOfClusterRuleInfo)(nil)).Elem()
+}
+
+type ArrayOfClusterRuleSpec struct {
+	ClusterRuleSpec []ClusterRuleSpec `xml:"ClusterRuleSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterRuleSpec"] = reflect.TypeOf((*ArrayOfClusterRuleSpec)(nil)).Elem()
+}
+
+type ArrayOfClusterVmOrchestrationInfo struct {
+	ClusterVmOrchestrationInfo []ClusterVmOrchestrationInfo `xml:"ClusterVmOrchestrationInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterVmOrchestrationInfo"] = reflect.TypeOf((*ArrayOfClusterVmOrchestrationInfo)(nil)).Elem()
+}
+
+type ArrayOfClusterVmOrchestrationSpec struct {
+	ClusterVmOrchestrationSpec []ClusterVmOrchestrationSpec `xml:"ClusterVmOrchestrationSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfClusterVmOrchestrationSpec"] = reflect.TypeOf((*ArrayOfClusterVmOrchestrationSpec)(nil)).Elem()
+}
+
+type ArrayOfComplianceFailure struct {
+	ComplianceFailure []ComplianceFailure `xml:"ComplianceFailure,omitempty"`
+}
+
+func init() {
+	t["ArrayOfComplianceFailure"] = reflect.TypeOf((*ArrayOfComplianceFailure)(nil)).Elem()
+}
+
+type ArrayOfComplianceFailureComplianceFailureValues struct {
+	ComplianceFailureComplianceFailureValues []ComplianceFailureComplianceFailureValues `xml:"ComplianceFailureComplianceFailureValues,omitempty"`
+}
+
+func init() {
+	t["ArrayOfComplianceFailureComplianceFailureValues"] = reflect.TypeOf((*ArrayOfComplianceFailureComplianceFailureValues)(nil)).Elem()
+}
+
+type ArrayOfComplianceLocator struct {
+	ComplianceLocator []ComplianceLocator `xml:"ComplianceLocator,omitempty"`
+}
+
+func init() {
+	t["ArrayOfComplianceLocator"] = reflect.TypeOf((*ArrayOfComplianceLocator)(nil)).Elem()
+}
+
+type ArrayOfComplianceResult struct {
+	ComplianceResult []ComplianceResult `xml:"ComplianceResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfComplianceResult"] = reflect.TypeOf((*ArrayOfComplianceResult)(nil)).Elem()
+}
+
+type ArrayOfComputeResourceHostSPBMLicenseInfo struct {
+	ComputeResourceHostSPBMLicenseInfo []ComputeResourceHostSPBMLicenseInfo `xml:"ComputeResourceHostSPBMLicenseInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfComputeResourceHostSPBMLicenseInfo"] = reflect.TypeOf((*ArrayOfComputeResourceHostSPBMLicenseInfo)(nil)).Elem()
+}
+
+type ArrayOfConflictingConfigurationConfig struct {
+	ConflictingConfigurationConfig []ConflictingConfigurationConfig `xml:"ConflictingConfigurationConfig,omitempty"`
+}
+
+func init() {
+	t["ArrayOfConflictingConfigurationConfig"] = reflect.TypeOf((*ArrayOfConflictingConfigurationConfig)(nil)).Elem()
+}
+
+type ArrayOfCryptoKeyId struct {
+	CryptoKeyId []CryptoKeyId `xml:"CryptoKeyId,omitempty"`
+}
+
+func init() {
+	t["ArrayOfCryptoKeyId"] = reflect.TypeOf((*ArrayOfCryptoKeyId)(nil)).Elem()
+}
+
+type ArrayOfCryptoKeyPlain struct {
+	CryptoKeyPlain []CryptoKeyPlain `xml:"CryptoKeyPlain,omitempty"`
+}
+
+func init() {
+	t["ArrayOfCryptoKeyPlain"] = reflect.TypeOf((*ArrayOfCryptoKeyPlain)(nil)).Elem()
+}
+
+type ArrayOfCryptoKeyResult struct {
+	CryptoKeyResult []CryptoKeyResult `xml:"CryptoKeyResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfCryptoKeyResult"] = reflect.TypeOf((*ArrayOfCryptoKeyResult)(nil)).Elem()
+}
+
+type ArrayOfCryptoManagerKmipClusterStatus struct {
+	CryptoManagerKmipClusterStatus []CryptoManagerKmipClusterStatus `xml:"CryptoManagerKmipClusterStatus,omitempty"`
+}
+
+func init() {
+	t["ArrayOfCryptoManagerKmipClusterStatus"] = reflect.TypeOf((*ArrayOfCryptoManagerKmipClusterStatus)(nil)).Elem()
+}
+
+type ArrayOfCryptoManagerKmipServerStatus struct {
+	CryptoManagerKmipServerStatus []CryptoManagerKmipServerStatus `xml:"CryptoManagerKmipServerStatus,omitempty"`
+}
+
+func init() {
+	t["ArrayOfCryptoManagerKmipServerStatus"] = reflect.TypeOf((*ArrayOfCryptoManagerKmipServerStatus)(nil)).Elem()
+}
+
+type ArrayOfCustomFieldDef struct {
+	CustomFieldDef []CustomFieldDef `xml:"CustomFieldDef,omitempty"`
+}
+
+func init() {
+	t["ArrayOfCustomFieldDef"] = reflect.TypeOf((*ArrayOfCustomFieldDef)(nil)).Elem()
+}
+
+type ArrayOfCustomFieldValue struct {
+	CustomFieldValue []BaseCustomFieldValue `xml:"CustomFieldValue,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfCustomFieldValue"] = reflect.TypeOf((*ArrayOfCustomFieldValue)(nil)).Elem()
+}
+
+type ArrayOfCustomizationAdapterMapping struct {
+	CustomizationAdapterMapping []CustomizationAdapterMapping `xml:"CustomizationAdapterMapping,omitempty"`
+}
+
+func init() {
+	t["ArrayOfCustomizationAdapterMapping"] = reflect.TypeOf((*ArrayOfCustomizationAdapterMapping)(nil)).Elem()
+}
+
+type ArrayOfCustomizationIpV6Generator struct {
+	CustomizationIpV6Generator []BaseCustomizationIpV6Generator `xml:"CustomizationIpV6Generator,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfCustomizationIpV6Generator"] = reflect.TypeOf((*ArrayOfCustomizationIpV6Generator)(nil)).Elem()
+}
+
+type ArrayOfCustomizationSpecInfo struct {
+	CustomizationSpecInfo []CustomizationSpecInfo `xml:"CustomizationSpecInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfCustomizationSpecInfo"] = reflect.TypeOf((*ArrayOfCustomizationSpecInfo)(nil)).Elem()
+}
+
+type ArrayOfDVPortConfigSpec struct {
+	DVPortConfigSpec []DVPortConfigSpec `xml:"DVPortConfigSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDVPortConfigSpec"] = reflect.TypeOf((*ArrayOfDVPortConfigSpec)(nil)).Elem()
+}
+
+type ArrayOfDVPortgroupConfigSpec struct {
+	DVPortgroupConfigSpec []DVPortgroupConfigSpec `xml:"DVPortgroupConfigSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDVPortgroupConfigSpec"] = reflect.TypeOf((*ArrayOfDVPortgroupConfigSpec)(nil)).Elem()
+}
+
+type ArrayOfDVSHealthCheckConfig struct {
+	DVSHealthCheckConfig []BaseDVSHealthCheckConfig `xml:"DVSHealthCheckConfig,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfDVSHealthCheckConfig"] = reflect.TypeOf((*ArrayOfDVSHealthCheckConfig)(nil)).Elem()
+}
+
+type ArrayOfDVSNetworkResourcePool struct {
+	DVSNetworkResourcePool []DVSNetworkResourcePool `xml:"DVSNetworkResourcePool,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDVSNetworkResourcePool"] = reflect.TypeOf((*ArrayOfDVSNetworkResourcePool)(nil)).Elem()
+}
+
+type ArrayOfDVSNetworkResourcePoolConfigSpec struct {
+	DVSNetworkResourcePoolConfigSpec []DVSNetworkResourcePoolConfigSpec `xml:"DVSNetworkResourcePoolConfigSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDVSNetworkResourcePoolConfigSpec"] = reflect.TypeOf((*ArrayOfDVSNetworkResourcePoolConfigSpec)(nil)).Elem()
+}
+
+type ArrayOfDVSVmVnicNetworkResourcePool struct {
+	DVSVmVnicNetworkResourcePool []DVSVmVnicNetworkResourcePool `xml:"DVSVmVnicNetworkResourcePool,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDVSVmVnicNetworkResourcePool"] = reflect.TypeOf((*ArrayOfDVSVmVnicNetworkResourcePool)(nil)).Elem()
+}
+
+type ArrayOfDasHeartbeatDatastoreInfo struct {
+	DasHeartbeatDatastoreInfo []DasHeartbeatDatastoreInfo `xml:"DasHeartbeatDatastoreInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDasHeartbeatDatastoreInfo"] = reflect.TypeOf((*ArrayOfDasHeartbeatDatastoreInfo)(nil)).Elem()
+}
+
+type ArrayOfDatacenterMismatchArgument struct {
+	DatacenterMismatchArgument []DatacenterMismatchArgument `xml:"DatacenterMismatchArgument,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDatacenterMismatchArgument"] = reflect.TypeOf((*ArrayOfDatacenterMismatchArgument)(nil)).Elem()
+}
+
+type ArrayOfDatastoreHostMount struct {
+	DatastoreHostMount []DatastoreHostMount `xml:"DatastoreHostMount,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDatastoreHostMount"] = reflect.TypeOf((*ArrayOfDatastoreHostMount)(nil)).Elem()
+}
+
+type ArrayOfDatastoreMountPathDatastorePair struct {
+	DatastoreMountPathDatastorePair []DatastoreMountPathDatastorePair `xml:"DatastoreMountPathDatastorePair,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDatastoreMountPathDatastorePair"] = reflect.TypeOf((*ArrayOfDatastoreMountPathDatastorePair)(nil)).Elem()
+}
+
+type ArrayOfDatastoreVVolContainerFailoverPair struct {
+	DatastoreVVolContainerFailoverPair []DatastoreVVolContainerFailoverPair `xml:"DatastoreVVolContainerFailoverPair,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDatastoreVVolContainerFailoverPair"] = reflect.TypeOf((*ArrayOfDatastoreVVolContainerFailoverPair)(nil)).Elem()
+}
+
+type ArrayOfDiagnosticManagerBundleInfo struct {
+	DiagnosticManagerBundleInfo []DiagnosticManagerBundleInfo `xml:"DiagnosticManagerBundleInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDiagnosticManagerBundleInfo"] = reflect.TypeOf((*ArrayOfDiagnosticManagerBundleInfo)(nil)).Elem()
+}
+
+type ArrayOfDiagnosticManagerLogDescriptor struct {
+	DiagnosticManagerLogDescriptor []DiagnosticManagerLogDescriptor `xml:"DiagnosticManagerLogDescriptor,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDiagnosticManagerLogDescriptor"] = reflect.TypeOf((*ArrayOfDiagnosticManagerLogDescriptor)(nil)).Elem()
+}
+
+type ArrayOfDiskChangeExtent struct {
+	DiskChangeExtent []DiskChangeExtent `xml:"DiskChangeExtent,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDiskChangeExtent"] = reflect.TypeOf((*ArrayOfDiskChangeExtent)(nil)).Elem()
+}
+
+type ArrayOfDistributedVirtualPort struct {
+	DistributedVirtualPort []DistributedVirtualPort `xml:"DistributedVirtualPort,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDistributedVirtualPort"] = reflect.TypeOf((*ArrayOfDistributedVirtualPort)(nil)).Elem()
+}
+
+type ArrayOfDistributedVirtualPortgroupInfo struct {
+	DistributedVirtualPortgroupInfo []DistributedVirtualPortgroupInfo `xml:"DistributedVirtualPortgroupInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDistributedVirtualPortgroupInfo"] = reflect.TypeOf((*ArrayOfDistributedVirtualPortgroupInfo)(nil)).Elem()
+}
+
+type ArrayOfDistributedVirtualSwitchHostMember struct {
+	DistributedVirtualSwitchHostMember []DistributedVirtualSwitchHostMember `xml:"DistributedVirtualSwitchHostMember,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDistributedVirtualSwitchHostMember"] = reflect.TypeOf((*ArrayOfDistributedVirtualSwitchHostMember)(nil)).Elem()
+}
+
+type ArrayOfDistributedVirtualSwitchHostMemberConfigSpec struct {
+	DistributedVirtualSwitchHostMemberConfigSpec []DistributedVirtualSwitchHostMemberConfigSpec `xml:"DistributedVirtualSwitchHostMemberConfigSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDistributedVirtualSwitchHostMemberConfigSpec"] = reflect.TypeOf((*ArrayOfDistributedVirtualSwitchHostMemberConfigSpec)(nil)).Elem()
+}
+
+type ArrayOfDistributedVirtualSwitchHostMemberPnicSpec struct {
+	DistributedVirtualSwitchHostMemberPnicSpec []DistributedVirtualSwitchHostMemberPnicSpec `xml:"DistributedVirtualSwitchHostMemberPnicSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDistributedVirtualSwitchHostMemberPnicSpec"] = reflect.TypeOf((*ArrayOfDistributedVirtualSwitchHostMemberPnicSpec)(nil)).Elem()
+}
+
+type ArrayOfDistributedVirtualSwitchHostProductSpec struct {
+	DistributedVirtualSwitchHostProductSpec []DistributedVirtualSwitchHostProductSpec `xml:"DistributedVirtualSwitchHostProductSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDistributedVirtualSwitchHostProductSpec"] = reflect.TypeOf((*ArrayOfDistributedVirtualSwitchHostProductSpec)(nil)).Elem()
+}
+
+type ArrayOfDistributedVirtualSwitchInfo struct {
+	DistributedVirtualSwitchInfo []DistributedVirtualSwitchInfo `xml:"DistributedVirtualSwitchInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDistributedVirtualSwitchInfo"] = reflect.TypeOf((*ArrayOfDistributedVirtualSwitchInfo)(nil)).Elem()
+}
+
+type ArrayOfDistributedVirtualSwitchKeyedOpaqueBlob struct {
+	DistributedVirtualSwitchKeyedOpaqueBlob []DistributedVirtualSwitchKeyedOpaqueBlob `xml:"DistributedVirtualSwitchKeyedOpaqueBlob,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDistributedVirtualSwitchKeyedOpaqueBlob"] = reflect.TypeOf((*ArrayOfDistributedVirtualSwitchKeyedOpaqueBlob)(nil)).Elem()
+}
+
+type ArrayOfDistributedVirtualSwitchManagerCompatibilityResult struct {
+	DistributedVirtualSwitchManagerCompatibilityResult []DistributedVirtualSwitchManagerCompatibilityResult `xml:"DistributedVirtualSwitchManagerCompatibilityResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDistributedVirtualSwitchManagerCompatibilityResult"] = reflect.TypeOf((*ArrayOfDistributedVirtualSwitchManagerCompatibilityResult)(nil)).Elem()
+}
+
+type ArrayOfDistributedVirtualSwitchManagerHostDvsFilterSpec struct {
+	DistributedVirtualSwitchManagerHostDvsFilterSpec []BaseDistributedVirtualSwitchManagerHostDvsFilterSpec `xml:"DistributedVirtualSwitchManagerHostDvsFilterSpec,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfDistributedVirtualSwitchManagerHostDvsFilterSpec"] = reflect.TypeOf((*ArrayOfDistributedVirtualSwitchManagerHostDvsFilterSpec)(nil)).Elem()
+}
+
+type ArrayOfDistributedVirtualSwitchProductSpec struct {
+	DistributedVirtualSwitchProductSpec []DistributedVirtualSwitchProductSpec `xml:"DistributedVirtualSwitchProductSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDistributedVirtualSwitchProductSpec"] = reflect.TypeOf((*ArrayOfDistributedVirtualSwitchProductSpec)(nil)).Elem()
+}
+
+type ArrayOfDouble struct {
+	Double []float64 `xml:"double,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDouble"] = reflect.TypeOf((*ArrayOfDouble)(nil)).Elem()
+}
+
+type ArrayOfDvsApplyOperationFaultFaultOnObject struct {
+	DvsApplyOperationFaultFaultOnObject []DvsApplyOperationFaultFaultOnObject `xml:"DvsApplyOperationFaultFaultOnObject,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDvsApplyOperationFaultFaultOnObject"] = reflect.TypeOf((*ArrayOfDvsApplyOperationFaultFaultOnObject)(nil)).Elem()
+}
+
+type ArrayOfDvsFilterConfig struct {
+	DvsFilterConfig []BaseDvsFilterConfig `xml:"DvsFilterConfig,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfDvsFilterConfig"] = reflect.TypeOf((*ArrayOfDvsFilterConfig)(nil)).Elem()
+}
+
+type ArrayOfDvsHostInfrastructureTrafficResource struct {
+	DvsHostInfrastructureTrafficResource []DvsHostInfrastructureTrafficResource `xml:"DvsHostInfrastructureTrafficResource,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDvsHostInfrastructureTrafficResource"] = reflect.TypeOf((*ArrayOfDvsHostInfrastructureTrafficResource)(nil)).Elem()
+}
+
+type ArrayOfDvsHostVNicProfile struct {
+	DvsHostVNicProfile []DvsHostVNicProfile `xml:"DvsHostVNicProfile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDvsHostVNicProfile"] = reflect.TypeOf((*ArrayOfDvsHostVNicProfile)(nil)).Elem()
+}
+
+type ArrayOfDvsNetworkRuleQualifier struct {
+	DvsNetworkRuleQualifier []BaseDvsNetworkRuleQualifier `xml:"DvsNetworkRuleQualifier,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfDvsNetworkRuleQualifier"] = reflect.TypeOf((*ArrayOfDvsNetworkRuleQualifier)(nil)).Elem()
+}
+
+type ArrayOfDvsOperationBulkFaultFaultOnHost struct {
+	DvsOperationBulkFaultFaultOnHost []DvsOperationBulkFaultFaultOnHost `xml:"DvsOperationBulkFaultFaultOnHost,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDvsOperationBulkFaultFaultOnHost"] = reflect.TypeOf((*ArrayOfDvsOperationBulkFaultFaultOnHost)(nil)).Elem()
+}
+
+type ArrayOfDvsOutOfSyncHostArgument struct {
+	DvsOutOfSyncHostArgument []DvsOutOfSyncHostArgument `xml:"DvsOutOfSyncHostArgument,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDvsOutOfSyncHostArgument"] = reflect.TypeOf((*ArrayOfDvsOutOfSyncHostArgument)(nil)).Elem()
+}
+
+type ArrayOfDvsProfile struct {
+	DvsProfile []DvsProfile `xml:"DvsProfile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDvsProfile"] = reflect.TypeOf((*ArrayOfDvsProfile)(nil)).Elem()
+}
+
+type ArrayOfDvsServiceConsoleVNicProfile struct {
+	DvsServiceConsoleVNicProfile []DvsServiceConsoleVNicProfile `xml:"DvsServiceConsoleVNicProfile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDvsServiceConsoleVNicProfile"] = reflect.TypeOf((*ArrayOfDvsServiceConsoleVNicProfile)(nil)).Elem()
+}
+
+type ArrayOfDvsTrafficRule struct {
+	DvsTrafficRule []DvsTrafficRule `xml:"DvsTrafficRule,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDvsTrafficRule"] = reflect.TypeOf((*ArrayOfDvsTrafficRule)(nil)).Elem()
+}
+
+type ArrayOfDvsVmVnicNetworkResourcePoolRuntimeInfo struct {
+	DvsVmVnicNetworkResourcePoolRuntimeInfo []DvsVmVnicNetworkResourcePoolRuntimeInfo `xml:"DvsVmVnicNetworkResourcePoolRuntimeInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDvsVmVnicNetworkResourcePoolRuntimeInfo"] = reflect.TypeOf((*ArrayOfDvsVmVnicNetworkResourcePoolRuntimeInfo)(nil)).Elem()
+}
+
+type ArrayOfDvsVmVnicResourcePoolConfigSpec struct {
+	DvsVmVnicResourcePoolConfigSpec []DvsVmVnicResourcePoolConfigSpec `xml:"DvsVmVnicResourcePoolConfigSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDvsVmVnicResourcePoolConfigSpec"] = reflect.TypeOf((*ArrayOfDvsVmVnicResourcePoolConfigSpec)(nil)).Elem()
+}
+
+type ArrayOfDvsVnicAllocatedResource struct {
+	DvsVnicAllocatedResource []DvsVnicAllocatedResource `xml:"DvsVnicAllocatedResource,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDvsVnicAllocatedResource"] = reflect.TypeOf((*ArrayOfDvsVnicAllocatedResource)(nil)).Elem()
+}
+
+type ArrayOfDynamicProperty struct {
+	DynamicProperty []DynamicProperty `xml:"DynamicProperty,omitempty"`
+}
+
+func init() {
+	t["ArrayOfDynamicProperty"] = reflect.TypeOf((*ArrayOfDynamicProperty)(nil)).Elem()
+}
+
+type ArrayOfEVCMode struct {
+	EVCMode []EVCMode `xml:"EVCMode,omitempty"`
+}
+
+func init() {
+	t["ArrayOfEVCMode"] = reflect.TypeOf((*ArrayOfEVCMode)(nil)).Elem()
+}
+
+type ArrayOfElementDescription struct {
+	ElementDescription []BaseElementDescription `xml:"ElementDescription,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfElementDescription"] = reflect.TypeOf((*ArrayOfElementDescription)(nil)).Elem()
+}
+
+type ArrayOfEntityBackupConfig struct {
+	EntityBackupConfig []EntityBackupConfig `xml:"EntityBackupConfig,omitempty"`
+}
+
+func init() {
+	t["ArrayOfEntityBackupConfig"] = reflect.TypeOf((*ArrayOfEntityBackupConfig)(nil)).Elem()
+}
+
+type ArrayOfEntityPrivilege struct {
+	EntityPrivilege []EntityPrivilege `xml:"EntityPrivilege,omitempty"`
+}
+
+func init() {
+	t["ArrayOfEntityPrivilege"] = reflect.TypeOf((*ArrayOfEntityPrivilege)(nil)).Elem()
+}
+
+type ArrayOfEnumDescription struct {
+	EnumDescription []EnumDescription `xml:"EnumDescription,omitempty"`
+}
+
+func init() {
+	t["ArrayOfEnumDescription"] = reflect.TypeOf((*ArrayOfEnumDescription)(nil)).Elem()
+}
+
+type ArrayOfEvent struct {
+	Event []BaseEvent `xml:"Event,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfEvent"] = reflect.TypeOf((*ArrayOfEvent)(nil)).Elem()
+}
+
+type ArrayOfEventAlarmExpressionComparison struct {
+	EventAlarmExpressionComparison []EventAlarmExpressionComparison `xml:"EventAlarmExpressionComparison,omitempty"`
+}
+
+func init() {
+	t["ArrayOfEventAlarmExpressionComparison"] = reflect.TypeOf((*ArrayOfEventAlarmExpressionComparison)(nil)).Elem()
+}
+
+type ArrayOfEventArgDesc struct {
+	EventArgDesc []EventArgDesc `xml:"EventArgDesc,omitempty"`
+}
+
+func init() {
+	t["ArrayOfEventArgDesc"] = reflect.TypeOf((*ArrayOfEventArgDesc)(nil)).Elem()
+}
+
+type ArrayOfEventDescriptionEventDetail struct {
+	EventDescriptionEventDetail []EventDescriptionEventDetail `xml:"EventDescriptionEventDetail,omitempty"`
+}
+
+func init() {
+	t["ArrayOfEventDescriptionEventDetail"] = reflect.TypeOf((*ArrayOfEventDescriptionEventDetail)(nil)).Elem()
+}
+
+type ArrayOfExtManagedEntityInfo struct {
+	ExtManagedEntityInfo []ExtManagedEntityInfo `xml:"ExtManagedEntityInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfExtManagedEntityInfo"] = reflect.TypeOf((*ArrayOfExtManagedEntityInfo)(nil)).Elem()
+}
+
+type ArrayOfExtSolutionManagerInfoTabInfo struct {
+	ExtSolutionManagerInfoTabInfo []ExtSolutionManagerInfoTabInfo `xml:"ExtSolutionManagerInfoTabInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfExtSolutionManagerInfoTabInfo"] = reflect.TypeOf((*ArrayOfExtSolutionManagerInfoTabInfo)(nil)).Elem()
+}
+
+type ArrayOfExtendedEventPair struct {
+	ExtendedEventPair []ExtendedEventPair `xml:"ExtendedEventPair,omitempty"`
+}
+
+func init() {
+	t["ArrayOfExtendedEventPair"] = reflect.TypeOf((*ArrayOfExtendedEventPair)(nil)).Elem()
+}
+
+type ArrayOfExtension struct {
+	Extension []Extension `xml:"Extension,omitempty"`
+}
+
+func init() {
+	t["ArrayOfExtension"] = reflect.TypeOf((*ArrayOfExtension)(nil)).Elem()
+}
+
+type ArrayOfExtensionClientInfo struct {
+	ExtensionClientInfo []ExtensionClientInfo `xml:"ExtensionClientInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfExtensionClientInfo"] = reflect.TypeOf((*ArrayOfExtensionClientInfo)(nil)).Elem()
+}
+
+type ArrayOfExtensionEventTypeInfo struct {
+	ExtensionEventTypeInfo []ExtensionEventTypeInfo `xml:"ExtensionEventTypeInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfExtensionEventTypeInfo"] = reflect.TypeOf((*ArrayOfExtensionEventTypeInfo)(nil)).Elem()
+}
+
+type ArrayOfExtensionFaultTypeInfo struct {
+	ExtensionFaultTypeInfo []ExtensionFaultTypeInfo `xml:"ExtensionFaultTypeInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfExtensionFaultTypeInfo"] = reflect.TypeOf((*ArrayOfExtensionFaultTypeInfo)(nil)).Elem()
+}
+
+type ArrayOfExtensionManagerIpAllocationUsage struct {
+	ExtensionManagerIpAllocationUsage []ExtensionManagerIpAllocationUsage `xml:"ExtensionManagerIpAllocationUsage,omitempty"`
+}
+
+func init() {
+	t["ArrayOfExtensionManagerIpAllocationUsage"] = reflect.TypeOf((*ArrayOfExtensionManagerIpAllocationUsage)(nil)).Elem()
+}
+
+type ArrayOfExtensionPrivilegeInfo struct {
+	ExtensionPrivilegeInfo []ExtensionPrivilegeInfo `xml:"ExtensionPrivilegeInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfExtensionPrivilegeInfo"] = reflect.TypeOf((*ArrayOfExtensionPrivilegeInfo)(nil)).Elem()
+}
+
+type ArrayOfExtensionResourceInfo struct {
+	ExtensionResourceInfo []ExtensionResourceInfo `xml:"ExtensionResourceInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfExtensionResourceInfo"] = reflect.TypeOf((*ArrayOfExtensionResourceInfo)(nil)).Elem()
+}
+
+type ArrayOfExtensionServerInfo struct {
+	ExtensionServerInfo []ExtensionServerInfo `xml:"ExtensionServerInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfExtensionServerInfo"] = reflect.TypeOf((*ArrayOfExtensionServerInfo)(nil)).Elem()
+}
+
+type ArrayOfExtensionTaskTypeInfo struct {
+	ExtensionTaskTypeInfo []ExtensionTaskTypeInfo `xml:"ExtensionTaskTypeInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfExtensionTaskTypeInfo"] = reflect.TypeOf((*ArrayOfExtensionTaskTypeInfo)(nil)).Elem()
+}
+
+type ArrayOfFaultToleranceDiskSpec struct {
+	FaultToleranceDiskSpec []FaultToleranceDiskSpec `xml:"FaultToleranceDiskSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfFaultToleranceDiskSpec"] = reflect.TypeOf((*ArrayOfFaultToleranceDiskSpec)(nil)).Elem()
+}
+
+type ArrayOfFcoeConfigVlanRange struct {
+	FcoeConfigVlanRange []FcoeConfigVlanRange `xml:"FcoeConfigVlanRange,omitempty"`
+}
+
+func init() {
+	t["ArrayOfFcoeConfigVlanRange"] = reflect.TypeOf((*ArrayOfFcoeConfigVlanRange)(nil)).Elem()
+}
+
+type ArrayOfFileInfo struct {
+	FileInfo []BaseFileInfo `xml:"FileInfo,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfFileInfo"] = reflect.TypeOf((*ArrayOfFileInfo)(nil)).Elem()
+}
+
+type ArrayOfFileQuery struct {
+	FileQuery []BaseFileQuery `xml:"FileQuery,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfFileQuery"] = reflect.TypeOf((*ArrayOfFileQuery)(nil)).Elem()
+}
+
+type ArrayOfFirewallProfileRulesetProfile struct {
+	FirewallProfileRulesetProfile []FirewallProfileRulesetProfile `xml:"FirewallProfileRulesetProfile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfFirewallProfileRulesetProfile"] = reflect.TypeOf((*ArrayOfFirewallProfileRulesetProfile)(nil)).Elem()
+}
+
+type ArrayOfGuestAliases struct {
+	GuestAliases []GuestAliases `xml:"GuestAliases,omitempty"`
+}
+
+func init() {
+	t["ArrayOfGuestAliases"] = reflect.TypeOf((*ArrayOfGuestAliases)(nil)).Elem()
+}
+
+type ArrayOfGuestAuthAliasInfo struct {
+	GuestAuthAliasInfo []GuestAuthAliasInfo `xml:"GuestAuthAliasInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfGuestAuthAliasInfo"] = reflect.TypeOf((*ArrayOfGuestAuthAliasInfo)(nil)).Elem()
+}
+
+type ArrayOfGuestAuthSubject struct {
+	GuestAuthSubject []BaseGuestAuthSubject `xml:"GuestAuthSubject,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfGuestAuthSubject"] = reflect.TypeOf((*ArrayOfGuestAuthSubject)(nil)).Elem()
+}
+
+type ArrayOfGuestDiskInfo struct {
+	GuestDiskInfo []GuestDiskInfo `xml:"GuestDiskInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfGuestDiskInfo"] = reflect.TypeOf((*ArrayOfGuestDiskInfo)(nil)).Elem()
+}
+
+type ArrayOfGuestFileInfo struct {
+	GuestFileInfo []GuestFileInfo `xml:"GuestFileInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfGuestFileInfo"] = reflect.TypeOf((*ArrayOfGuestFileInfo)(nil)).Elem()
+}
+
+type ArrayOfGuestInfoNamespaceGenerationInfo struct {
+	GuestInfoNamespaceGenerationInfo []GuestInfoNamespaceGenerationInfo `xml:"GuestInfoNamespaceGenerationInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfGuestInfoNamespaceGenerationInfo"] = reflect.TypeOf((*ArrayOfGuestInfoNamespaceGenerationInfo)(nil)).Elem()
+}
+
+type ArrayOfGuestMappedAliases struct {
+	GuestMappedAliases []GuestMappedAliases `xml:"GuestMappedAliases,omitempty"`
+}
+
+func init() {
+	t["ArrayOfGuestMappedAliases"] = reflect.TypeOf((*ArrayOfGuestMappedAliases)(nil)).Elem()
+}
+
+type ArrayOfGuestNicInfo struct {
+	GuestNicInfo []GuestNicInfo `xml:"GuestNicInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfGuestNicInfo"] = reflect.TypeOf((*ArrayOfGuestNicInfo)(nil)).Elem()
+}
+
+type ArrayOfGuestOsDescriptor struct {
+	GuestOsDescriptor []GuestOsDescriptor `xml:"GuestOsDescriptor,omitempty"`
+}
+
+func init() {
+	t["ArrayOfGuestOsDescriptor"] = reflect.TypeOf((*ArrayOfGuestOsDescriptor)(nil)).Elem()
+}
+
+type ArrayOfGuestProcessInfo struct {
+	GuestProcessInfo []GuestProcessInfo `xml:"GuestProcessInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfGuestProcessInfo"] = reflect.TypeOf((*ArrayOfGuestProcessInfo)(nil)).Elem()
+}
+
+type ArrayOfGuestRegKeyRecordSpec struct {
+	GuestRegKeyRecordSpec []GuestRegKeyRecordSpec `xml:"GuestRegKeyRecordSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfGuestRegKeyRecordSpec"] = reflect.TypeOf((*ArrayOfGuestRegKeyRecordSpec)(nil)).Elem()
+}
+
+type ArrayOfGuestRegValueSpec struct {
+	GuestRegValueSpec []GuestRegValueSpec `xml:"GuestRegValueSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfGuestRegValueSpec"] = reflect.TypeOf((*ArrayOfGuestRegValueSpec)(nil)).Elem()
+}
+
+type ArrayOfGuestStackInfo struct {
+	GuestStackInfo []GuestStackInfo `xml:"GuestStackInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfGuestStackInfo"] = reflect.TypeOf((*ArrayOfGuestStackInfo)(nil)).Elem()
+}
+
+type ArrayOfHbrManagerVmReplicationCapability struct {
+	HbrManagerVmReplicationCapability []HbrManagerVmReplicationCapability `xml:"HbrManagerVmReplicationCapability,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHbrManagerVmReplicationCapability"] = reflect.TypeOf((*ArrayOfHbrManagerVmReplicationCapability)(nil)).Elem()
+}
+
+type ArrayOfHealthUpdate struct {
+	HealthUpdate []HealthUpdate `xml:"HealthUpdate,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHealthUpdate"] = reflect.TypeOf((*ArrayOfHealthUpdate)(nil)).Elem()
+}
+
+type ArrayOfHealthUpdateInfo struct {
+	HealthUpdateInfo []HealthUpdateInfo `xml:"HealthUpdateInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHealthUpdateInfo"] = reflect.TypeOf((*ArrayOfHealthUpdateInfo)(nil)).Elem()
+}
+
+type ArrayOfHostAccessControlEntry struct {
+	HostAccessControlEntry []HostAccessControlEntry `xml:"HostAccessControlEntry,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostAccessControlEntry"] = reflect.TypeOf((*ArrayOfHostAccessControlEntry)(nil)).Elem()
+}
+
+type ArrayOfHostAccountSpec struct {
+	HostAccountSpec []BaseHostAccountSpec `xml:"HostAccountSpec,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfHostAccountSpec"] = reflect.TypeOf((*ArrayOfHostAccountSpec)(nil)).Elem()
+}
+
+type ArrayOfHostActiveDirectory struct {
+	HostActiveDirectory []HostActiveDirectory `xml:"HostActiveDirectory,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostActiveDirectory"] = reflect.TypeOf((*ArrayOfHostActiveDirectory)(nil)).Elem()
+}
+
+type ArrayOfHostAuthenticationStoreInfo struct {
+	HostAuthenticationStoreInfo []BaseHostAuthenticationStoreInfo `xml:"HostAuthenticationStoreInfo,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfHostAuthenticationStoreInfo"] = reflect.TypeOf((*ArrayOfHostAuthenticationStoreInfo)(nil)).Elem()
+}
+
+type ArrayOfHostBootDevice struct {
+	HostBootDevice []HostBootDevice `xml:"HostBootDevice,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostBootDevice"] = reflect.TypeOf((*ArrayOfHostBootDevice)(nil)).Elem()
+}
+
+type ArrayOfHostCacheConfigurationInfo struct {
+	HostCacheConfigurationInfo []HostCacheConfigurationInfo `xml:"HostCacheConfigurationInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostCacheConfigurationInfo"] = reflect.TypeOf((*ArrayOfHostCacheConfigurationInfo)(nil)).Elem()
+}
+
+type ArrayOfHostConnectInfoNetworkInfo struct {
+	HostConnectInfoNetworkInfo []BaseHostConnectInfoNetworkInfo `xml:"HostConnectInfoNetworkInfo,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfHostConnectInfoNetworkInfo"] = reflect.TypeOf((*ArrayOfHostConnectInfoNetworkInfo)(nil)).Elem()
+}
+
+type ArrayOfHostCpuIdInfo struct {
+	HostCpuIdInfo []HostCpuIdInfo `xml:"HostCpuIdInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostCpuIdInfo"] = reflect.TypeOf((*ArrayOfHostCpuIdInfo)(nil)).Elem()
+}
+
+type ArrayOfHostCpuPackage struct {
+	HostCpuPackage []HostCpuPackage `xml:"HostCpuPackage,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostCpuPackage"] = reflect.TypeOf((*ArrayOfHostCpuPackage)(nil)).Elem()
+}
+
+type ArrayOfHostDatastoreBrowserSearchResults struct {
+	HostDatastoreBrowserSearchResults []HostDatastoreBrowserSearchResults `xml:"HostDatastoreBrowserSearchResults,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostDatastoreBrowserSearchResults"] = reflect.TypeOf((*ArrayOfHostDatastoreBrowserSearchResults)(nil)).Elem()
+}
+
+type ArrayOfHostDatastoreConnectInfo struct {
+	HostDatastoreConnectInfo []BaseHostDatastoreConnectInfo `xml:"HostDatastoreConnectInfo,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfHostDatastoreConnectInfo"] = reflect.TypeOf((*ArrayOfHostDatastoreConnectInfo)(nil)).Elem()
+}
+
+type ArrayOfHostDatastoreSystemDatastoreResult struct {
+	HostDatastoreSystemDatastoreResult []HostDatastoreSystemDatastoreResult `xml:"HostDatastoreSystemDatastoreResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostDatastoreSystemDatastoreResult"] = reflect.TypeOf((*ArrayOfHostDatastoreSystemDatastoreResult)(nil)).Elem()
+}
+
+type ArrayOfHostDateTimeSystemTimeZone struct {
+	HostDateTimeSystemTimeZone []HostDateTimeSystemTimeZone `xml:"HostDateTimeSystemTimeZone,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostDateTimeSystemTimeZone"] = reflect.TypeOf((*ArrayOfHostDateTimeSystemTimeZone)(nil)).Elem()
+}
+
+type ArrayOfHostDhcpService struct {
+	HostDhcpService []HostDhcpService `xml:"HostDhcpService,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostDhcpService"] = reflect.TypeOf((*ArrayOfHostDhcpService)(nil)).Elem()
+}
+
+type ArrayOfHostDhcpServiceConfig struct {
+	HostDhcpServiceConfig []HostDhcpServiceConfig `xml:"HostDhcpServiceConfig,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostDhcpServiceConfig"] = reflect.TypeOf((*ArrayOfHostDhcpServiceConfig)(nil)).Elem()
+}
+
+type ArrayOfHostDiagnosticPartition struct {
+	HostDiagnosticPartition []HostDiagnosticPartition `xml:"HostDiagnosticPartition,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostDiagnosticPartition"] = reflect.TypeOf((*ArrayOfHostDiagnosticPartition)(nil)).Elem()
+}
+
+type ArrayOfHostDiagnosticPartitionCreateOption struct {
+	HostDiagnosticPartitionCreateOption []HostDiagnosticPartitionCreateOption `xml:"HostDiagnosticPartitionCreateOption,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostDiagnosticPartitionCreateOption"] = reflect.TypeOf((*ArrayOfHostDiagnosticPartitionCreateOption)(nil)).Elem()
+}
+
+type ArrayOfHostDiskConfigurationResult struct {
+	HostDiskConfigurationResult []HostDiskConfigurationResult `xml:"HostDiskConfigurationResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostDiskConfigurationResult"] = reflect.TypeOf((*ArrayOfHostDiskConfigurationResult)(nil)).Elem()
+}
+
+type ArrayOfHostDiskMappingPartitionOption struct {
+	HostDiskMappingPartitionOption []HostDiskMappingPartitionOption `xml:"HostDiskMappingPartitionOption,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostDiskMappingPartitionOption"] = reflect.TypeOf((*ArrayOfHostDiskMappingPartitionOption)(nil)).Elem()
+}
+
+type ArrayOfHostDiskPartitionAttributes struct {
+	HostDiskPartitionAttributes []HostDiskPartitionAttributes `xml:"HostDiskPartitionAttributes,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostDiskPartitionAttributes"] = reflect.TypeOf((*ArrayOfHostDiskPartitionAttributes)(nil)).Elem()
+}
+
+type ArrayOfHostDiskPartitionBlockRange struct {
+	HostDiskPartitionBlockRange []HostDiskPartitionBlockRange `xml:"HostDiskPartitionBlockRange,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostDiskPartitionBlockRange"] = reflect.TypeOf((*ArrayOfHostDiskPartitionBlockRange)(nil)).Elem()
+}
+
+type ArrayOfHostDiskPartitionInfo struct {
+	HostDiskPartitionInfo []HostDiskPartitionInfo `xml:"HostDiskPartitionInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostDiskPartitionInfo"] = reflect.TypeOf((*ArrayOfHostDiskPartitionInfo)(nil)).Elem()
+}
+
+type ArrayOfHostEventArgument struct {
+	HostEventArgument []HostEventArgument `xml:"HostEventArgument,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostEventArgument"] = reflect.TypeOf((*ArrayOfHostEventArgument)(nil)).Elem()
+}
+
+type ArrayOfHostFeatureCapability struct {
+	HostFeatureCapability []HostFeatureCapability `xml:"HostFeatureCapability,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostFeatureCapability"] = reflect.TypeOf((*ArrayOfHostFeatureCapability)(nil)).Elem()
+}
+
+type ArrayOfHostFeatureMask struct {
+	HostFeatureMask []HostFeatureMask `xml:"HostFeatureMask,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostFeatureMask"] = reflect.TypeOf((*ArrayOfHostFeatureMask)(nil)).Elem()
+}
+
+type ArrayOfHostFeatureVersionInfo struct {
+	HostFeatureVersionInfo []HostFeatureVersionInfo `xml:"HostFeatureVersionInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostFeatureVersionInfo"] = reflect.TypeOf((*ArrayOfHostFeatureVersionInfo)(nil)).Elem()
+}
+
+type ArrayOfHostFileSystemMountInfo struct {
+	HostFileSystemMountInfo []HostFileSystemMountInfo `xml:"HostFileSystemMountInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostFileSystemMountInfo"] = reflect.TypeOf((*ArrayOfHostFileSystemMountInfo)(nil)).Elem()
+}
+
+type ArrayOfHostFirewallConfigRuleSetConfig struct {
+	HostFirewallConfigRuleSetConfig []HostFirewallConfigRuleSetConfig `xml:"HostFirewallConfigRuleSetConfig,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostFirewallConfigRuleSetConfig"] = reflect.TypeOf((*ArrayOfHostFirewallConfigRuleSetConfig)(nil)).Elem()
+}
+
+type ArrayOfHostFirewallRule struct {
+	HostFirewallRule []HostFirewallRule `xml:"HostFirewallRule,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostFirewallRule"] = reflect.TypeOf((*ArrayOfHostFirewallRule)(nil)).Elem()
+}
+
+type ArrayOfHostFirewallRuleset struct {
+	HostFirewallRuleset []HostFirewallRuleset `xml:"HostFirewallRuleset,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostFirewallRuleset"] = reflect.TypeOf((*ArrayOfHostFirewallRuleset)(nil)).Elem()
+}
+
+type ArrayOfHostFirewallRulesetIpNetwork struct {
+	HostFirewallRulesetIpNetwork []HostFirewallRulesetIpNetwork `xml:"HostFirewallRulesetIpNetwork,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostFirewallRulesetIpNetwork"] = reflect.TypeOf((*ArrayOfHostFirewallRulesetIpNetwork)(nil)).Elem()
+}
+
+type ArrayOfHostGraphicsConfigDeviceType struct {
+	HostGraphicsConfigDeviceType []HostGraphicsConfigDeviceType `xml:"HostGraphicsConfigDeviceType,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostGraphicsConfigDeviceType"] = reflect.TypeOf((*ArrayOfHostGraphicsConfigDeviceType)(nil)).Elem()
+}
+
+type ArrayOfHostGraphicsInfo struct {
+	HostGraphicsInfo []HostGraphicsInfo `xml:"HostGraphicsInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostGraphicsInfo"] = reflect.TypeOf((*ArrayOfHostGraphicsInfo)(nil)).Elem()
+}
+
+type ArrayOfHostHardwareElementInfo struct {
+	HostHardwareElementInfo []BaseHostHardwareElementInfo `xml:"HostHardwareElementInfo,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfHostHardwareElementInfo"] = reflect.TypeOf((*ArrayOfHostHardwareElementInfo)(nil)).Elem()
+}
+
+type ArrayOfHostHostBusAdapter struct {
+	HostHostBusAdapter []BaseHostHostBusAdapter `xml:"HostHostBusAdapter,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfHostHostBusAdapter"] = reflect.TypeOf((*ArrayOfHostHostBusAdapter)(nil)).Elem()
+}
+
+type ArrayOfHostInternetScsiHbaIscsiIpv6Address struct {
+	HostInternetScsiHbaIscsiIpv6Address []HostInternetScsiHbaIscsiIpv6Address `xml:"HostInternetScsiHbaIscsiIpv6Address,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostInternetScsiHbaIscsiIpv6Address"] = reflect.TypeOf((*ArrayOfHostInternetScsiHbaIscsiIpv6Address)(nil)).Elem()
+}
+
+type ArrayOfHostInternetScsiHbaParamValue struct {
+	HostInternetScsiHbaParamValue []HostInternetScsiHbaParamValue `xml:"HostInternetScsiHbaParamValue,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostInternetScsiHbaParamValue"] = reflect.TypeOf((*ArrayOfHostInternetScsiHbaParamValue)(nil)).Elem()
+}
+
+type ArrayOfHostInternetScsiHbaSendTarget struct {
+	HostInternetScsiHbaSendTarget []HostInternetScsiHbaSendTarget `xml:"HostInternetScsiHbaSendTarget,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostInternetScsiHbaSendTarget"] = reflect.TypeOf((*ArrayOfHostInternetScsiHbaSendTarget)(nil)).Elem()
+}
+
+type ArrayOfHostInternetScsiHbaStaticTarget struct {
+	HostInternetScsiHbaStaticTarget []HostInternetScsiHbaStaticTarget `xml:"HostInternetScsiHbaStaticTarget,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostInternetScsiHbaStaticTarget"] = reflect.TypeOf((*ArrayOfHostInternetScsiHbaStaticTarget)(nil)).Elem()
+}
+
+type ArrayOfHostIoFilterInfo struct {
+	HostIoFilterInfo []HostIoFilterInfo `xml:"HostIoFilterInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostIoFilterInfo"] = reflect.TypeOf((*ArrayOfHostIoFilterInfo)(nil)).Elem()
+}
+
+type ArrayOfHostIpConfigIpV6Address struct {
+	HostIpConfigIpV6Address []HostIpConfigIpV6Address `xml:"HostIpConfigIpV6Address,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostIpConfigIpV6Address"] = reflect.TypeOf((*ArrayOfHostIpConfigIpV6Address)(nil)).Elem()
+}
+
+type ArrayOfHostIpRouteEntry struct {
+	HostIpRouteEntry []HostIpRouteEntry `xml:"HostIpRouteEntry,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostIpRouteEntry"] = reflect.TypeOf((*ArrayOfHostIpRouteEntry)(nil)).Elem()
+}
+
+type ArrayOfHostIpRouteOp struct {
+	HostIpRouteOp []HostIpRouteOp `xml:"HostIpRouteOp,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostIpRouteOp"] = reflect.TypeOf((*ArrayOfHostIpRouteOp)(nil)).Elem()
+}
+
+type ArrayOfHostLowLevelProvisioningManagerDiskLayoutSpec struct {
+	HostLowLevelProvisioningManagerDiskLayoutSpec []HostLowLevelProvisioningManagerDiskLayoutSpec `xml:"HostLowLevelProvisioningManagerDiskLayoutSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostLowLevelProvisioningManagerDiskLayoutSpec"] = reflect.TypeOf((*ArrayOfHostLowLevelProvisioningManagerDiskLayoutSpec)(nil)).Elem()
+}
+
+type ArrayOfHostLowLevelProvisioningManagerFileDeleteResult struct {
+	HostLowLevelProvisioningManagerFileDeleteResult []HostLowLevelProvisioningManagerFileDeleteResult `xml:"HostLowLevelProvisioningManagerFileDeleteResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostLowLevelProvisioningManagerFileDeleteResult"] = reflect.TypeOf((*ArrayOfHostLowLevelProvisioningManagerFileDeleteResult)(nil)).Elem()
+}
+
+type ArrayOfHostLowLevelProvisioningManagerFileDeleteSpec struct {
+	HostLowLevelProvisioningManagerFileDeleteSpec []HostLowLevelProvisioningManagerFileDeleteSpec `xml:"HostLowLevelProvisioningManagerFileDeleteSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostLowLevelProvisioningManagerFileDeleteSpec"] = reflect.TypeOf((*ArrayOfHostLowLevelProvisioningManagerFileDeleteSpec)(nil)).Elem()
+}
+
+type ArrayOfHostLowLevelProvisioningManagerFileReserveResult struct {
+	HostLowLevelProvisioningManagerFileReserveResult []HostLowLevelProvisioningManagerFileReserveResult `xml:"HostLowLevelProvisioningManagerFileReserveResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostLowLevelProvisioningManagerFileReserveResult"] = reflect.TypeOf((*ArrayOfHostLowLevelProvisioningManagerFileReserveResult)(nil)).Elem()
+}
+
+type ArrayOfHostLowLevelProvisioningManagerFileReserveSpec struct {
+	HostLowLevelProvisioningManagerFileReserveSpec []HostLowLevelProvisioningManagerFileReserveSpec `xml:"HostLowLevelProvisioningManagerFileReserveSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostLowLevelProvisioningManagerFileReserveSpec"] = reflect.TypeOf((*ArrayOfHostLowLevelProvisioningManagerFileReserveSpec)(nil)).Elem()
+}
+
+type ArrayOfHostLowLevelProvisioningManagerSnapshotLayoutSpec struct {
+	HostLowLevelProvisioningManagerSnapshotLayoutSpec []HostLowLevelProvisioningManagerSnapshotLayoutSpec `xml:"HostLowLevelProvisioningManagerSnapshotLayoutSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostLowLevelProvisioningManagerSnapshotLayoutSpec"] = reflect.TypeOf((*ArrayOfHostLowLevelProvisioningManagerSnapshotLayoutSpec)(nil)).Elem()
+}
+
+type ArrayOfHostMemberHealthCheckResult struct {
+	HostMemberHealthCheckResult []BaseHostMemberHealthCheckResult `xml:"HostMemberHealthCheckResult,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfHostMemberHealthCheckResult"] = reflect.TypeOf((*ArrayOfHostMemberHealthCheckResult)(nil)).Elem()
+}
+
+type ArrayOfHostMemberRuntimeInfo struct {
+	HostMemberRuntimeInfo []HostMemberRuntimeInfo `xml:"HostMemberRuntimeInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostMemberRuntimeInfo"] = reflect.TypeOf((*ArrayOfHostMemberRuntimeInfo)(nil)).Elem()
+}
+
+type ArrayOfHostMultipathInfoLogicalUnit struct {
+	HostMultipathInfoLogicalUnit []HostMultipathInfoLogicalUnit `xml:"HostMultipathInfoLogicalUnit,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostMultipathInfoLogicalUnit"] = reflect.TypeOf((*ArrayOfHostMultipathInfoLogicalUnit)(nil)).Elem()
+}
+
+type ArrayOfHostMultipathInfoPath struct {
+	HostMultipathInfoPath []HostMultipathInfoPath `xml:"HostMultipathInfoPath,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostMultipathInfoPath"] = reflect.TypeOf((*ArrayOfHostMultipathInfoPath)(nil)).Elem()
+}
+
+type ArrayOfHostMultipathStateInfoPath struct {
+	HostMultipathStateInfoPath []HostMultipathStateInfoPath `xml:"HostMultipathStateInfoPath,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostMultipathStateInfoPath"] = reflect.TypeOf((*ArrayOfHostMultipathStateInfoPath)(nil)).Elem()
+}
+
+type ArrayOfHostNasVolumeConfig struct {
+	HostNasVolumeConfig []HostNasVolumeConfig `xml:"HostNasVolumeConfig,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostNasVolumeConfig"] = reflect.TypeOf((*ArrayOfHostNasVolumeConfig)(nil)).Elem()
+}
+
+type ArrayOfHostNatService struct {
+	HostNatService []HostNatService `xml:"HostNatService,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostNatService"] = reflect.TypeOf((*ArrayOfHostNatService)(nil)).Elem()
+}
+
+type ArrayOfHostNatServiceConfig struct {
+	HostNatServiceConfig []HostNatServiceConfig `xml:"HostNatServiceConfig,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostNatServiceConfig"] = reflect.TypeOf((*ArrayOfHostNatServiceConfig)(nil)).Elem()
+}
+
+type ArrayOfHostNatServicePortForwardSpec struct {
+	HostNatServicePortForwardSpec []HostNatServicePortForwardSpec `xml:"HostNatServicePortForwardSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostNatServicePortForwardSpec"] = reflect.TypeOf((*ArrayOfHostNatServicePortForwardSpec)(nil)).Elem()
+}
+
+type ArrayOfHostNetStackInstance struct {
+	HostNetStackInstance []HostNetStackInstance `xml:"HostNetStackInstance,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostNetStackInstance"] = reflect.TypeOf((*ArrayOfHostNetStackInstance)(nil)).Elem()
+}
+
+type ArrayOfHostNetworkConfigNetStackSpec struct {
+	HostNetworkConfigNetStackSpec []HostNetworkConfigNetStackSpec `xml:"HostNetworkConfigNetStackSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostNetworkConfigNetStackSpec"] = reflect.TypeOf((*ArrayOfHostNetworkConfigNetStackSpec)(nil)).Elem()
+}
+
+type ArrayOfHostNumaNode struct {
+	HostNumaNode []HostNumaNode `xml:"HostNumaNode,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostNumaNode"] = reflect.TypeOf((*ArrayOfHostNumaNode)(nil)).Elem()
+}
+
+type ArrayOfHostNumericSensorInfo struct {
+	HostNumericSensorInfo []HostNumericSensorInfo `xml:"HostNumericSensorInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostNumericSensorInfo"] = reflect.TypeOf((*ArrayOfHostNumericSensorInfo)(nil)).Elem()
+}
+
+type ArrayOfHostOpaqueNetworkInfo struct {
+	HostOpaqueNetworkInfo []HostOpaqueNetworkInfo `xml:"HostOpaqueNetworkInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostOpaqueNetworkInfo"] = reflect.TypeOf((*ArrayOfHostOpaqueNetworkInfo)(nil)).Elem()
+}
+
+type ArrayOfHostOpaqueSwitch struct {
+	HostOpaqueSwitch []HostOpaqueSwitch `xml:"HostOpaqueSwitch,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostOpaqueSwitch"] = reflect.TypeOf((*ArrayOfHostOpaqueSwitch)(nil)).Elem()
+}
+
+type ArrayOfHostOpaqueSwitchPhysicalNicZone struct {
+	HostOpaqueSwitchPhysicalNicZone []HostOpaqueSwitchPhysicalNicZone `xml:"HostOpaqueSwitchPhysicalNicZone,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostOpaqueSwitchPhysicalNicZone"] = reflect.TypeOf((*ArrayOfHostOpaqueSwitchPhysicalNicZone)(nil)).Elem()
+}
+
+type ArrayOfHostPatchManagerStatus struct {
+	HostPatchManagerStatus []HostPatchManagerStatus `xml:"HostPatchManagerStatus,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostPatchManagerStatus"] = reflect.TypeOf((*ArrayOfHostPatchManagerStatus)(nil)).Elem()
+}
+
+type ArrayOfHostPatchManagerStatusPrerequisitePatch struct {
+	HostPatchManagerStatusPrerequisitePatch []HostPatchManagerStatusPrerequisitePatch `xml:"HostPatchManagerStatusPrerequisitePatch,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostPatchManagerStatusPrerequisitePatch"] = reflect.TypeOf((*ArrayOfHostPatchManagerStatusPrerequisitePatch)(nil)).Elem()
+}
+
+type ArrayOfHostPathSelectionPolicyOption struct {
+	HostPathSelectionPolicyOption []HostPathSelectionPolicyOption `xml:"HostPathSelectionPolicyOption,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostPathSelectionPolicyOption"] = reflect.TypeOf((*ArrayOfHostPathSelectionPolicyOption)(nil)).Elem()
+}
+
+type ArrayOfHostPciDevice struct {
+	HostPciDevice []HostPciDevice `xml:"HostPciDevice,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostPciDevice"] = reflect.TypeOf((*ArrayOfHostPciDevice)(nil)).Elem()
+}
+
+type ArrayOfHostPciPassthruConfig struct {
+	HostPciPassthruConfig []BaseHostPciPassthruConfig `xml:"HostPciPassthruConfig,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfHostPciPassthruConfig"] = reflect.TypeOf((*ArrayOfHostPciPassthruConfig)(nil)).Elem()
+}
+
+type ArrayOfHostPciPassthruInfo struct {
+	HostPciPassthruInfo []BaseHostPciPassthruInfo `xml:"HostPciPassthruInfo,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfHostPciPassthruInfo"] = reflect.TypeOf((*ArrayOfHostPciPassthruInfo)(nil)).Elem()
+}
+
+type ArrayOfHostPlacedVirtualNicIdentifier struct {
+	HostPlacedVirtualNicIdentifier []HostPlacedVirtualNicIdentifier `xml:"HostPlacedVirtualNicIdentifier,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostPlacedVirtualNicIdentifier"] = reflect.TypeOf((*ArrayOfHostPlacedVirtualNicIdentifier)(nil)).Elem()
+}
+
+type ArrayOfHostPlugStoreTopologyAdapter struct {
+	HostPlugStoreTopologyAdapter []HostPlugStoreTopologyAdapter `xml:"HostPlugStoreTopologyAdapter,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostPlugStoreTopologyAdapter"] = reflect.TypeOf((*ArrayOfHostPlugStoreTopologyAdapter)(nil)).Elem()
+}
+
+type ArrayOfHostPlugStoreTopologyDevice struct {
+	HostPlugStoreTopologyDevice []HostPlugStoreTopologyDevice `xml:"HostPlugStoreTopologyDevice,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostPlugStoreTopologyDevice"] = reflect.TypeOf((*ArrayOfHostPlugStoreTopologyDevice)(nil)).Elem()
+}
+
+type ArrayOfHostPlugStoreTopologyPath struct {
+	HostPlugStoreTopologyPath []HostPlugStoreTopologyPath `xml:"HostPlugStoreTopologyPath,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostPlugStoreTopologyPath"] = reflect.TypeOf((*ArrayOfHostPlugStoreTopologyPath)(nil)).Elem()
+}
+
+type ArrayOfHostPlugStoreTopologyPlugin struct {
+	HostPlugStoreTopologyPlugin []HostPlugStoreTopologyPlugin `xml:"HostPlugStoreTopologyPlugin,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostPlugStoreTopologyPlugin"] = reflect.TypeOf((*ArrayOfHostPlugStoreTopologyPlugin)(nil)).Elem()
+}
+
+type ArrayOfHostPlugStoreTopologyTarget struct {
+	HostPlugStoreTopologyTarget []HostPlugStoreTopologyTarget `xml:"HostPlugStoreTopologyTarget,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostPlugStoreTopologyTarget"] = reflect.TypeOf((*ArrayOfHostPlugStoreTopologyTarget)(nil)).Elem()
+}
+
+type ArrayOfHostPnicNetworkResourceInfo struct {
+	HostPnicNetworkResourceInfo []HostPnicNetworkResourceInfo `xml:"HostPnicNetworkResourceInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostPnicNetworkResourceInfo"] = reflect.TypeOf((*ArrayOfHostPnicNetworkResourceInfo)(nil)).Elem()
+}
+
+type ArrayOfHostPortGroup struct {
+	HostPortGroup []HostPortGroup `xml:"HostPortGroup,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostPortGroup"] = reflect.TypeOf((*ArrayOfHostPortGroup)(nil)).Elem()
+}
+
+type ArrayOfHostPortGroupConfig struct {
+	HostPortGroupConfig []HostPortGroupConfig `xml:"HostPortGroupConfig,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostPortGroupConfig"] = reflect.TypeOf((*ArrayOfHostPortGroupConfig)(nil)).Elem()
+}
+
+type ArrayOfHostPortGroupPort struct {
+	HostPortGroupPort []HostPortGroupPort `xml:"HostPortGroupPort,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostPortGroupPort"] = reflect.TypeOf((*ArrayOfHostPortGroupPort)(nil)).Elem()
+}
+
+type ArrayOfHostPortGroupProfile struct {
+	HostPortGroupProfile []HostPortGroupProfile `xml:"HostPortGroupProfile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostPortGroupProfile"] = reflect.TypeOf((*ArrayOfHostPortGroupProfile)(nil)).Elem()
+}
+
+type ArrayOfHostPowerPolicy struct {
+	HostPowerPolicy []HostPowerPolicy `xml:"HostPowerPolicy,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostPowerPolicy"] = reflect.TypeOf((*ArrayOfHostPowerPolicy)(nil)).Elem()
+}
+
+type ArrayOfHostProfileManagerCompositionValidationResultResultElement struct {
+	HostProfileManagerCompositionValidationResultResultElement []HostProfileManagerCompositionValidationResultResultElement `xml:"HostProfileManagerCompositionValidationResultResultElement,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostProfileManagerCompositionValidationResultResultElement"] = reflect.TypeOf((*ArrayOfHostProfileManagerCompositionValidationResultResultElement)(nil)).Elem()
+}
+
+type ArrayOfHostProfileManagerHostToConfigSpecMap struct {
+	HostProfileManagerHostToConfigSpecMap []HostProfileManagerHostToConfigSpecMap `xml:"HostProfileManagerHostToConfigSpecMap,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostProfileManagerHostToConfigSpecMap"] = reflect.TypeOf((*ArrayOfHostProfileManagerHostToConfigSpecMap)(nil)).Elem()
+}
+
+type ArrayOfHostProfilesEntityCustomizations struct {
+	HostProfilesEntityCustomizations []BaseHostProfilesEntityCustomizations `xml:"HostProfilesEntityCustomizations,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfHostProfilesEntityCustomizations"] = reflect.TypeOf((*ArrayOfHostProfilesEntityCustomizations)(nil)).Elem()
+}
+
+type ArrayOfHostProtocolEndpoint struct {
+	HostProtocolEndpoint []HostProtocolEndpoint `xml:"HostProtocolEndpoint,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostProtocolEndpoint"] = reflect.TypeOf((*ArrayOfHostProtocolEndpoint)(nil)).Elem()
+}
+
+type ArrayOfHostProxySwitch struct {
+	HostProxySwitch []HostProxySwitch `xml:"HostProxySwitch,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostProxySwitch"] = reflect.TypeOf((*ArrayOfHostProxySwitch)(nil)).Elem()
+}
+
+type ArrayOfHostProxySwitchConfig struct {
+	HostProxySwitchConfig []HostProxySwitchConfig `xml:"HostProxySwitchConfig,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostProxySwitchConfig"] = reflect.TypeOf((*ArrayOfHostProxySwitchConfig)(nil)).Elem()
+}
+
+type ArrayOfHostProxySwitchHostLagConfig struct {
+	HostProxySwitchHostLagConfig []HostProxySwitchHostLagConfig `xml:"HostProxySwitchHostLagConfig,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostProxySwitchHostLagConfig"] = reflect.TypeOf((*ArrayOfHostProxySwitchHostLagConfig)(nil)).Elem()
+}
+
+type ArrayOfHostRuntimeInfoNetStackInstanceRuntimeInfo struct {
+	HostRuntimeInfoNetStackInstanceRuntimeInfo []HostRuntimeInfoNetStackInstanceRuntimeInfo `xml:"HostRuntimeInfoNetStackInstanceRuntimeInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostRuntimeInfoNetStackInstanceRuntimeInfo"] = reflect.TypeOf((*ArrayOfHostRuntimeInfoNetStackInstanceRuntimeInfo)(nil)).Elem()
+}
+
+type ArrayOfHostScsiDisk struct {
+	HostScsiDisk []HostScsiDisk `xml:"HostScsiDisk,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostScsiDisk"] = reflect.TypeOf((*ArrayOfHostScsiDisk)(nil)).Elem()
+}
+
+type ArrayOfHostScsiDiskPartition struct {
+	HostScsiDiskPartition []HostScsiDiskPartition `xml:"HostScsiDiskPartition,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostScsiDiskPartition"] = reflect.TypeOf((*ArrayOfHostScsiDiskPartition)(nil)).Elem()
+}
+
+type ArrayOfHostScsiTopologyInterface struct {
+	HostScsiTopologyInterface []HostScsiTopologyInterface `xml:"HostScsiTopologyInterface,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostScsiTopologyInterface"] = reflect.TypeOf((*ArrayOfHostScsiTopologyInterface)(nil)).Elem()
+}
+
+type ArrayOfHostScsiTopologyLun struct {
+	HostScsiTopologyLun []HostScsiTopologyLun `xml:"HostScsiTopologyLun,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostScsiTopologyLun"] = reflect.TypeOf((*ArrayOfHostScsiTopologyLun)(nil)).Elem()
+}
+
+type ArrayOfHostScsiTopologyTarget struct {
+	HostScsiTopologyTarget []HostScsiTopologyTarget `xml:"HostScsiTopologyTarget,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostScsiTopologyTarget"] = reflect.TypeOf((*ArrayOfHostScsiTopologyTarget)(nil)).Elem()
+}
+
+type ArrayOfHostService struct {
+	HostService []HostService `xml:"HostService,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostService"] = reflect.TypeOf((*ArrayOfHostService)(nil)).Elem()
+}
+
+type ArrayOfHostServiceConfig struct {
+	HostServiceConfig []HostServiceConfig `xml:"HostServiceConfig,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostServiceConfig"] = reflect.TypeOf((*ArrayOfHostServiceConfig)(nil)).Elem()
+}
+
+type ArrayOfHostSnmpDestination struct {
+	HostSnmpDestination []HostSnmpDestination `xml:"HostSnmpDestination,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostSnmpDestination"] = reflect.TypeOf((*ArrayOfHostSnmpDestination)(nil)).Elem()
+}
+
+type ArrayOfHostSriovDevicePoolInfo struct {
+	HostSriovDevicePoolInfo []BaseHostSriovDevicePoolInfo `xml:"HostSriovDevicePoolInfo,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfHostSriovDevicePoolInfo"] = reflect.TypeOf((*ArrayOfHostSriovDevicePoolInfo)(nil)).Elem()
+}
+
+type ArrayOfHostSslThumbprintInfo struct {
+	HostSslThumbprintInfo []HostSslThumbprintInfo `xml:"HostSslThumbprintInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostSslThumbprintInfo"] = reflect.TypeOf((*ArrayOfHostSslThumbprintInfo)(nil)).Elem()
+}
+
+type ArrayOfHostStorageArrayTypePolicyOption struct {
+	HostStorageArrayTypePolicyOption []HostStorageArrayTypePolicyOption `xml:"HostStorageArrayTypePolicyOption,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostStorageArrayTypePolicyOption"] = reflect.TypeOf((*ArrayOfHostStorageArrayTypePolicyOption)(nil)).Elem()
+}
+
+type ArrayOfHostStorageElementInfo struct {
+	HostStorageElementInfo []HostStorageElementInfo `xml:"HostStorageElementInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostStorageElementInfo"] = reflect.TypeOf((*ArrayOfHostStorageElementInfo)(nil)).Elem()
+}
+
+type ArrayOfHostStorageOperationalInfo struct {
+	HostStorageOperationalInfo []HostStorageOperationalInfo `xml:"HostStorageOperationalInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostStorageOperationalInfo"] = reflect.TypeOf((*ArrayOfHostStorageOperationalInfo)(nil)).Elem()
+}
+
+type ArrayOfHostStorageSystemDiskLocatorLedResult struct {
+	HostStorageSystemDiskLocatorLedResult []HostStorageSystemDiskLocatorLedResult `xml:"HostStorageSystemDiskLocatorLedResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostStorageSystemDiskLocatorLedResult"] = reflect.TypeOf((*ArrayOfHostStorageSystemDiskLocatorLedResult)(nil)).Elem()
+}
+
+type ArrayOfHostStorageSystemScsiLunResult struct {
+	HostStorageSystemScsiLunResult []HostStorageSystemScsiLunResult `xml:"HostStorageSystemScsiLunResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostStorageSystemScsiLunResult"] = reflect.TypeOf((*ArrayOfHostStorageSystemScsiLunResult)(nil)).Elem()
+}
+
+type ArrayOfHostStorageSystemVmfsVolumeResult struct {
+	HostStorageSystemVmfsVolumeResult []HostStorageSystemVmfsVolumeResult `xml:"HostStorageSystemVmfsVolumeResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostStorageSystemVmfsVolumeResult"] = reflect.TypeOf((*ArrayOfHostStorageSystemVmfsVolumeResult)(nil)).Elem()
+}
+
+type ArrayOfHostSubSpecification struct {
+	HostSubSpecification []HostSubSpecification `xml:"HostSubSpecification,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostSubSpecification"] = reflect.TypeOf((*ArrayOfHostSubSpecification)(nil)).Elem()
+}
+
+type ArrayOfHostSystemIdentificationInfo struct {
+	HostSystemIdentificationInfo []HostSystemIdentificationInfo `xml:"HostSystemIdentificationInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostSystemIdentificationInfo"] = reflect.TypeOf((*ArrayOfHostSystemIdentificationInfo)(nil)).Elem()
+}
+
+type ArrayOfHostSystemResourceInfo struct {
+	HostSystemResourceInfo []HostSystemResourceInfo `xml:"HostSystemResourceInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostSystemResourceInfo"] = reflect.TypeOf((*ArrayOfHostSystemResourceInfo)(nil)).Elem()
+}
+
+type ArrayOfHostSystemSwapConfigurationSystemSwapOption struct {
+	HostSystemSwapConfigurationSystemSwapOption []BaseHostSystemSwapConfigurationSystemSwapOption `xml:"HostSystemSwapConfigurationSystemSwapOption,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfHostSystemSwapConfigurationSystemSwapOption"] = reflect.TypeOf((*ArrayOfHostSystemSwapConfigurationSystemSwapOption)(nil)).Elem()
+}
+
+type ArrayOfHostTpmDigestInfo struct {
+	HostTpmDigestInfo []HostTpmDigestInfo `xml:"HostTpmDigestInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostTpmDigestInfo"] = reflect.TypeOf((*ArrayOfHostTpmDigestInfo)(nil)).Elem()
+}
+
+type ArrayOfHostTpmEventLogEntry struct {
+	HostTpmEventLogEntry []HostTpmEventLogEntry `xml:"HostTpmEventLogEntry,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostTpmEventLogEntry"] = reflect.TypeOf((*ArrayOfHostTpmEventLogEntry)(nil)).Elem()
+}
+
+type ArrayOfHostUnresolvedVmfsExtent struct {
+	HostUnresolvedVmfsExtent []HostUnresolvedVmfsExtent `xml:"HostUnresolvedVmfsExtent,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostUnresolvedVmfsExtent"] = reflect.TypeOf((*ArrayOfHostUnresolvedVmfsExtent)(nil)).Elem()
+}
+
+type ArrayOfHostUnresolvedVmfsResolutionResult struct {
+	HostUnresolvedVmfsResolutionResult []HostUnresolvedVmfsResolutionResult `xml:"HostUnresolvedVmfsResolutionResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostUnresolvedVmfsResolutionResult"] = reflect.TypeOf((*ArrayOfHostUnresolvedVmfsResolutionResult)(nil)).Elem()
+}
+
+type ArrayOfHostUnresolvedVmfsResolutionSpec struct {
+	HostUnresolvedVmfsResolutionSpec []HostUnresolvedVmfsResolutionSpec `xml:"HostUnresolvedVmfsResolutionSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostUnresolvedVmfsResolutionSpec"] = reflect.TypeOf((*ArrayOfHostUnresolvedVmfsResolutionSpec)(nil)).Elem()
+}
+
+type ArrayOfHostUnresolvedVmfsVolume struct {
+	HostUnresolvedVmfsVolume []HostUnresolvedVmfsVolume `xml:"HostUnresolvedVmfsVolume,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostUnresolvedVmfsVolume"] = reflect.TypeOf((*ArrayOfHostUnresolvedVmfsVolume)(nil)).Elem()
+}
+
+type ArrayOfHostVFlashManagerVFlashCacheConfigInfoVFlashModuleConfigOption struct {
+	HostVFlashManagerVFlashCacheConfigInfoVFlashModuleConfigOption []HostVFlashManagerVFlashCacheConfigInfoVFlashModuleConfigOption `xml:"HostVFlashManagerVFlashCacheConfigInfoVFlashModuleConfigOption,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostVFlashManagerVFlashCacheConfigInfoVFlashModuleConfigOption"] = reflect.TypeOf((*ArrayOfHostVFlashManagerVFlashCacheConfigInfoVFlashModuleConfigOption)(nil)).Elem()
+}
+
+type ArrayOfHostVMotionCompatibility struct {
+	HostVMotionCompatibility []HostVMotionCompatibility `xml:"HostVMotionCompatibility,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostVMotionCompatibility"] = reflect.TypeOf((*ArrayOfHostVMotionCompatibility)(nil)).Elem()
+}
+
+type ArrayOfHostVirtualNic struct {
+	HostVirtualNic []HostVirtualNic `xml:"HostVirtualNic,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostVirtualNic"] = reflect.TypeOf((*ArrayOfHostVirtualNic)(nil)).Elem()
+}
+
+type ArrayOfHostVirtualNicConfig struct {
+	HostVirtualNicConfig []HostVirtualNicConfig `xml:"HostVirtualNicConfig,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostVirtualNicConfig"] = reflect.TypeOf((*ArrayOfHostVirtualNicConfig)(nil)).Elem()
+}
+
+type ArrayOfHostVirtualNicManagerNicTypeSelection struct {
+	HostVirtualNicManagerNicTypeSelection []HostVirtualNicManagerNicTypeSelection `xml:"HostVirtualNicManagerNicTypeSelection,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostVirtualNicManagerNicTypeSelection"] = reflect.TypeOf((*ArrayOfHostVirtualNicManagerNicTypeSelection)(nil)).Elem()
+}
+
+type ArrayOfHostVirtualSwitch struct {
+	HostVirtualSwitch []HostVirtualSwitch `xml:"HostVirtualSwitch,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostVirtualSwitch"] = reflect.TypeOf((*ArrayOfHostVirtualSwitch)(nil)).Elem()
+}
+
+type ArrayOfHostVirtualSwitchConfig struct {
+	HostVirtualSwitchConfig []HostVirtualSwitchConfig `xml:"HostVirtualSwitchConfig,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostVirtualSwitchConfig"] = reflect.TypeOf((*ArrayOfHostVirtualSwitchConfig)(nil)).Elem()
+}
+
+type ArrayOfHostVmciAccessManagerAccessSpec struct {
+	HostVmciAccessManagerAccessSpec []HostVmciAccessManagerAccessSpec `xml:"HostVmciAccessManagerAccessSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostVmciAccessManagerAccessSpec"] = reflect.TypeOf((*ArrayOfHostVmciAccessManagerAccessSpec)(nil)).Elem()
+}
+
+type ArrayOfHostVmfsRescanResult struct {
+	HostVmfsRescanResult []HostVmfsRescanResult `xml:"HostVmfsRescanResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostVmfsRescanResult"] = reflect.TypeOf((*ArrayOfHostVmfsRescanResult)(nil)).Elem()
+}
+
+type ArrayOfHostVsanInternalSystemCmmdsQuery struct {
+	HostVsanInternalSystemCmmdsQuery []HostVsanInternalSystemCmmdsQuery `xml:"HostVsanInternalSystemCmmdsQuery,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostVsanInternalSystemCmmdsQuery"] = reflect.TypeOf((*ArrayOfHostVsanInternalSystemCmmdsQuery)(nil)).Elem()
+}
+
+type ArrayOfHostVsanInternalSystemDeleteVsanObjectsResult struct {
+	HostVsanInternalSystemDeleteVsanObjectsResult []HostVsanInternalSystemDeleteVsanObjectsResult `xml:"HostVsanInternalSystemDeleteVsanObjectsResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostVsanInternalSystemDeleteVsanObjectsResult"] = reflect.TypeOf((*ArrayOfHostVsanInternalSystemDeleteVsanObjectsResult)(nil)).Elem()
+}
+
+type ArrayOfHostVsanInternalSystemVsanObjectOperationResult struct {
+	HostVsanInternalSystemVsanObjectOperationResult []HostVsanInternalSystemVsanObjectOperationResult `xml:"HostVsanInternalSystemVsanObjectOperationResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostVsanInternalSystemVsanObjectOperationResult"] = reflect.TypeOf((*ArrayOfHostVsanInternalSystemVsanObjectOperationResult)(nil)).Elem()
+}
+
+type ArrayOfHostVsanInternalSystemVsanPhysicalDiskDiagnosticsResult struct {
+	HostVsanInternalSystemVsanPhysicalDiskDiagnosticsResult []HostVsanInternalSystemVsanPhysicalDiskDiagnosticsResult `xml:"HostVsanInternalSystemVsanPhysicalDiskDiagnosticsResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostVsanInternalSystemVsanPhysicalDiskDiagnosticsResult"] = reflect.TypeOf((*ArrayOfHostVsanInternalSystemVsanPhysicalDiskDiagnosticsResult)(nil)).Elem()
+}
+
+type ArrayOfHttpNfcLeaseDatastoreLeaseInfo struct {
+	HttpNfcLeaseDatastoreLeaseInfo []HttpNfcLeaseDatastoreLeaseInfo `xml:"HttpNfcLeaseDatastoreLeaseInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHttpNfcLeaseDatastoreLeaseInfo"] = reflect.TypeOf((*ArrayOfHttpNfcLeaseDatastoreLeaseInfo)(nil)).Elem()
+}
+
+type ArrayOfHttpNfcLeaseDeviceUrl struct {
+	HttpNfcLeaseDeviceUrl []HttpNfcLeaseDeviceUrl `xml:"HttpNfcLeaseDeviceUrl,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHttpNfcLeaseDeviceUrl"] = reflect.TypeOf((*ArrayOfHttpNfcLeaseDeviceUrl)(nil)).Elem()
+}
+
+type ArrayOfHttpNfcLeaseHostInfo struct {
+	HttpNfcLeaseHostInfo []HttpNfcLeaseHostInfo `xml:"HttpNfcLeaseHostInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHttpNfcLeaseHostInfo"] = reflect.TypeOf((*ArrayOfHttpNfcLeaseHostInfo)(nil)).Elem()
+}
+
+type ArrayOfHttpNfcLeaseManifestEntry struct {
+	HttpNfcLeaseManifestEntry []HttpNfcLeaseManifestEntry `xml:"HttpNfcLeaseManifestEntry,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHttpNfcLeaseManifestEntry"] = reflect.TypeOf((*ArrayOfHttpNfcLeaseManifestEntry)(nil)).Elem()
+}
+
+type ArrayOfID struct {
+	ID []ID `xml:"ID,omitempty"`
+}
+
+func init() {
+	t["ArrayOfID"] = reflect.TypeOf((*ArrayOfID)(nil)).Elem()
+}
+
+type ArrayOfImportOperationBulkFaultFaultOnImport struct {
+	ImportOperationBulkFaultFaultOnImport []ImportOperationBulkFaultFaultOnImport `xml:"ImportOperationBulkFaultFaultOnImport,omitempty"`
+}
+
+func init() {
+	t["ArrayOfImportOperationBulkFaultFaultOnImport"] = reflect.TypeOf((*ArrayOfImportOperationBulkFaultFaultOnImport)(nil)).Elem()
+}
+
+type ArrayOfImportSpec struct {
+	ImportSpec []BaseImportSpec `xml:"ImportSpec,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfImportSpec"] = reflect.TypeOf((*ArrayOfImportSpec)(nil)).Elem()
+}
+
+type ArrayOfInt struct {
+	Int []int32 `xml:"int,omitempty"`
+}
+
+func init() {
+	t["ArrayOfInt"] = reflect.TypeOf((*ArrayOfInt)(nil)).Elem()
+}
+
+type ArrayOfIoFilterHostIssue struct {
+	IoFilterHostIssue []IoFilterHostIssue `xml:"IoFilterHostIssue,omitempty"`
+}
+
+func init() {
+	t["ArrayOfIoFilterHostIssue"] = reflect.TypeOf((*ArrayOfIoFilterHostIssue)(nil)).Elem()
+}
+
+type ArrayOfIpPool struct {
+	IpPool []IpPool `xml:"IpPool,omitempty"`
+}
+
+func init() {
+	t["ArrayOfIpPool"] = reflect.TypeOf((*ArrayOfIpPool)(nil)).Elem()
+}
+
+type ArrayOfIpPoolAssociation struct {
+	IpPoolAssociation []IpPoolAssociation `xml:"IpPoolAssociation,omitempty"`
+}
+
+func init() {
+	t["ArrayOfIpPoolAssociation"] = reflect.TypeOf((*ArrayOfIpPoolAssociation)(nil)).Elem()
+}
+
+type ArrayOfIpPoolManagerIpAllocation struct {
+	IpPoolManagerIpAllocation []IpPoolManagerIpAllocation `xml:"IpPoolManagerIpAllocation,omitempty"`
+}
+
+func init() {
+	t["ArrayOfIpPoolManagerIpAllocation"] = reflect.TypeOf((*ArrayOfIpPoolManagerIpAllocation)(nil)).Elem()
+}
+
+type ArrayOfIscsiDependencyEntity struct {
+	IscsiDependencyEntity []IscsiDependencyEntity `xml:"IscsiDependencyEntity,omitempty"`
+}
+
+func init() {
+	t["ArrayOfIscsiDependencyEntity"] = reflect.TypeOf((*ArrayOfIscsiDependencyEntity)(nil)).Elem()
+}
+
+type ArrayOfIscsiPortInfo struct {
+	IscsiPortInfo []IscsiPortInfo `xml:"IscsiPortInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfIscsiPortInfo"] = reflect.TypeOf((*ArrayOfIscsiPortInfo)(nil)).Elem()
+}
+
+type ArrayOfKernelModuleInfo struct {
+	KernelModuleInfo []KernelModuleInfo `xml:"KernelModuleInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfKernelModuleInfo"] = reflect.TypeOf((*ArrayOfKernelModuleInfo)(nil)).Elem()
+}
+
+type ArrayOfKeyAnyValue struct {
+	KeyAnyValue []KeyAnyValue `xml:"KeyAnyValue,omitempty"`
+}
+
+func init() {
+	t["ArrayOfKeyAnyValue"] = reflect.TypeOf((*ArrayOfKeyAnyValue)(nil)).Elem()
+}
+
+type ArrayOfKeyValue struct {
+	KeyValue []KeyValue `xml:"KeyValue,omitempty"`
+}
+
+func init() {
+	t["ArrayOfKeyValue"] = reflect.TypeOf((*ArrayOfKeyValue)(nil)).Elem()
+}
+
+type ArrayOfKmipClusterInfo struct {
+	KmipClusterInfo []KmipClusterInfo `xml:"KmipClusterInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfKmipClusterInfo"] = reflect.TypeOf((*ArrayOfKmipClusterInfo)(nil)).Elem()
+}
+
+type ArrayOfKmipServerInfo struct {
+	KmipServerInfo []KmipServerInfo `xml:"KmipServerInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfKmipServerInfo"] = reflect.TypeOf((*ArrayOfKmipServerInfo)(nil)).Elem()
+}
+
+type ArrayOfLicenseAssignmentManagerLicenseAssignment struct {
+	LicenseAssignmentManagerLicenseAssignment []LicenseAssignmentManagerLicenseAssignment `xml:"LicenseAssignmentManagerLicenseAssignment,omitempty"`
+}
+
+func init() {
+	t["ArrayOfLicenseAssignmentManagerLicenseAssignment"] = reflect.TypeOf((*ArrayOfLicenseAssignmentManagerLicenseAssignment)(nil)).Elem()
+}
+
+type ArrayOfLicenseAvailabilityInfo struct {
+	LicenseAvailabilityInfo []LicenseAvailabilityInfo `xml:"LicenseAvailabilityInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfLicenseAvailabilityInfo"] = reflect.TypeOf((*ArrayOfLicenseAvailabilityInfo)(nil)).Elem()
+}
+
+type ArrayOfLicenseFeatureInfo struct {
+	LicenseFeatureInfo []LicenseFeatureInfo `xml:"LicenseFeatureInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfLicenseFeatureInfo"] = reflect.TypeOf((*ArrayOfLicenseFeatureInfo)(nil)).Elem()
+}
+
+type ArrayOfLicenseManagerLicenseInfo struct {
+	LicenseManagerLicenseInfo []LicenseManagerLicenseInfo `xml:"LicenseManagerLicenseInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfLicenseManagerLicenseInfo"] = reflect.TypeOf((*ArrayOfLicenseManagerLicenseInfo)(nil)).Elem()
+}
+
+type ArrayOfLicenseReservationInfo struct {
+	LicenseReservationInfo []LicenseReservationInfo `xml:"LicenseReservationInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfLicenseReservationInfo"] = reflect.TypeOf((*ArrayOfLicenseReservationInfo)(nil)).Elem()
+}
+
+type ArrayOfLocalizableMessage struct {
+	LocalizableMessage []LocalizableMessage `xml:"LocalizableMessage,omitempty"`
+}
+
+func init() {
+	t["ArrayOfLocalizableMessage"] = reflect.TypeOf((*ArrayOfLocalizableMessage)(nil)).Elem()
+}
+
+type ArrayOfLocalizationManagerMessageCatalog struct {
+	LocalizationManagerMessageCatalog []LocalizationManagerMessageCatalog `xml:"LocalizationManagerMessageCatalog,omitempty"`
+}
+
+func init() {
+	t["ArrayOfLocalizationManagerMessageCatalog"] = reflect.TypeOf((*ArrayOfLocalizationManagerMessageCatalog)(nil)).Elem()
+}
+
+type ArrayOfLong struct {
+	Long []int64 `xml:"long,omitempty"`
+}
+
+func init() {
+	t["ArrayOfLong"] = reflect.TypeOf((*ArrayOfLong)(nil)).Elem()
+}
+
+type ArrayOfManagedObjectReference struct {
+	ManagedObjectReference []ManagedObjectReference `xml:"ManagedObjectReference,omitempty"`
+}
+
+func init() {
+	t["ArrayOfManagedObjectReference"] = reflect.TypeOf((*ArrayOfManagedObjectReference)(nil)).Elem()
+}
+
+type ArrayOfMethodActionArgument struct {
+	MethodActionArgument []MethodActionArgument `xml:"MethodActionArgument,omitempty"`
+}
+
+func init() {
+	t["ArrayOfMethodActionArgument"] = reflect.TypeOf((*ArrayOfMethodActionArgument)(nil)).Elem()
+}
+
+type ArrayOfMethodFault struct {
+	MethodFault []BaseMethodFault `xml:"MethodFault,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfMethodFault"] = reflect.TypeOf((*ArrayOfMethodFault)(nil)).Elem()
+}
+
+type ArrayOfMissingObject struct {
+	MissingObject []MissingObject `xml:"MissingObject,omitempty"`
+}
+
+func init() {
+	t["ArrayOfMissingObject"] = reflect.TypeOf((*ArrayOfMissingObject)(nil)).Elem()
+}
+
+type ArrayOfMissingProperty struct {
+	MissingProperty []MissingProperty `xml:"MissingProperty,omitempty"`
+}
+
+func init() {
+	t["ArrayOfMissingProperty"] = reflect.TypeOf((*ArrayOfMissingProperty)(nil)).Elem()
+}
+
+type ArrayOfMultipleCertificatesVerifyFaultThumbprintData struct {
+	MultipleCertificatesVerifyFaultThumbprintData []MultipleCertificatesVerifyFaultThumbprintData `xml:"MultipleCertificatesVerifyFaultThumbprintData,omitempty"`
+}
+
+func init() {
+	t["ArrayOfMultipleCertificatesVerifyFaultThumbprintData"] = reflect.TypeOf((*ArrayOfMultipleCertificatesVerifyFaultThumbprintData)(nil)).Elem()
+}
+
+type ArrayOfNasStorageProfile struct {
+	NasStorageProfile []NasStorageProfile `xml:"NasStorageProfile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfNasStorageProfile"] = reflect.TypeOf((*ArrayOfNasStorageProfile)(nil)).Elem()
+}
+
+type ArrayOfNetIpConfigInfoIpAddress struct {
+	NetIpConfigInfoIpAddress []NetIpConfigInfoIpAddress `xml:"NetIpConfigInfoIpAddress,omitempty"`
+}
+
+func init() {
+	t["ArrayOfNetIpConfigInfoIpAddress"] = reflect.TypeOf((*ArrayOfNetIpConfigInfoIpAddress)(nil)).Elem()
+}
+
+type ArrayOfNetIpConfigSpecIpAddressSpec struct {
+	NetIpConfigSpecIpAddressSpec []NetIpConfigSpecIpAddressSpec `xml:"NetIpConfigSpecIpAddressSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfNetIpConfigSpecIpAddressSpec"] = reflect.TypeOf((*ArrayOfNetIpConfigSpecIpAddressSpec)(nil)).Elem()
+}
+
+type ArrayOfNetIpRouteConfigInfoIpRoute struct {
+	NetIpRouteConfigInfoIpRoute []NetIpRouteConfigInfoIpRoute `xml:"NetIpRouteConfigInfoIpRoute,omitempty"`
+}
+
+func init() {
+	t["ArrayOfNetIpRouteConfigInfoIpRoute"] = reflect.TypeOf((*ArrayOfNetIpRouteConfigInfoIpRoute)(nil)).Elem()
+}
+
+type ArrayOfNetIpRouteConfigSpecIpRouteSpec struct {
+	NetIpRouteConfigSpecIpRouteSpec []NetIpRouteConfigSpecIpRouteSpec `xml:"NetIpRouteConfigSpecIpRouteSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfNetIpRouteConfigSpecIpRouteSpec"] = reflect.TypeOf((*ArrayOfNetIpRouteConfigSpecIpRouteSpec)(nil)).Elem()
+}
+
+type ArrayOfNetIpStackInfoDefaultRouter struct {
+	NetIpStackInfoDefaultRouter []NetIpStackInfoDefaultRouter `xml:"NetIpStackInfoDefaultRouter,omitempty"`
+}
+
+func init() {
+	t["ArrayOfNetIpStackInfoDefaultRouter"] = reflect.TypeOf((*ArrayOfNetIpStackInfoDefaultRouter)(nil)).Elem()
+}
+
+type ArrayOfNetIpStackInfoNetToMedia struct {
+	NetIpStackInfoNetToMedia []NetIpStackInfoNetToMedia `xml:"NetIpStackInfoNetToMedia,omitempty"`
+}
+
+func init() {
+	t["ArrayOfNetIpStackInfoNetToMedia"] = reflect.TypeOf((*ArrayOfNetIpStackInfoNetToMedia)(nil)).Elem()
+}
+
+type ArrayOfNetStackInstanceProfile struct {
+	NetStackInstanceProfile []NetStackInstanceProfile `xml:"NetStackInstanceProfile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfNetStackInstanceProfile"] = reflect.TypeOf((*ArrayOfNetStackInstanceProfile)(nil)).Elem()
+}
+
+type ArrayOfNumericRange struct {
+	NumericRange []NumericRange `xml:"NumericRange,omitempty"`
+}
+
+func init() {
+	t["ArrayOfNumericRange"] = reflect.TypeOf((*ArrayOfNumericRange)(nil)).Elem()
+}
+
+type ArrayOfObjectContent struct {
+	ObjectContent []ObjectContent `xml:"ObjectContent,omitempty"`
+}
+
+func init() {
+	t["ArrayOfObjectContent"] = reflect.TypeOf((*ArrayOfObjectContent)(nil)).Elem()
+}
+
+type ArrayOfObjectSpec struct {
+	ObjectSpec []ObjectSpec `xml:"ObjectSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfObjectSpec"] = reflect.TypeOf((*ArrayOfObjectSpec)(nil)).Elem()
+}
+
+type ArrayOfObjectUpdate struct {
+	ObjectUpdate []ObjectUpdate `xml:"ObjectUpdate,omitempty"`
+}
+
+func init() {
+	t["ArrayOfObjectUpdate"] = reflect.TypeOf((*ArrayOfObjectUpdate)(nil)).Elem()
+}
+
+type ArrayOfOpaqueNetworkTargetInfo struct {
+	OpaqueNetworkTargetInfo []OpaqueNetworkTargetInfo `xml:"OpaqueNetworkTargetInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfOpaqueNetworkTargetInfo"] = reflect.TypeOf((*ArrayOfOpaqueNetworkTargetInfo)(nil)).Elem()
+}
+
+type ArrayOfOptionDef struct {
+	OptionDef []OptionDef `xml:"OptionDef,omitempty"`
+}
+
+func init() {
+	t["ArrayOfOptionDef"] = reflect.TypeOf((*ArrayOfOptionDef)(nil)).Elem()
+}
+
+type ArrayOfOptionProfile struct {
+	OptionProfile []OptionProfile `xml:"OptionProfile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfOptionProfile"] = reflect.TypeOf((*ArrayOfOptionProfile)(nil)).Elem()
+}
+
+type ArrayOfOptionValue struct {
+	OptionValue []BaseOptionValue `xml:"OptionValue,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfOptionValue"] = reflect.TypeOf((*ArrayOfOptionValue)(nil)).Elem()
+}
+
+type ArrayOfOvfConsumerOstNode struct {
+	OvfConsumerOstNode []OvfConsumerOstNode `xml:"OvfConsumerOstNode,omitempty"`
+}
+
+func init() {
+	t["ArrayOfOvfConsumerOstNode"] = reflect.TypeOf((*ArrayOfOvfConsumerOstNode)(nil)).Elem()
+}
+
+type ArrayOfOvfConsumerOvfSection struct {
+	OvfConsumerOvfSection []OvfConsumerOvfSection `xml:"OvfConsumerOvfSection,omitempty"`
+}
+
+func init() {
+	t["ArrayOfOvfConsumerOvfSection"] = reflect.TypeOf((*ArrayOfOvfConsumerOvfSection)(nil)).Elem()
+}
+
+type ArrayOfOvfDeploymentOption struct {
+	OvfDeploymentOption []OvfDeploymentOption `xml:"OvfDeploymentOption,omitempty"`
+}
+
+func init() {
+	t["ArrayOfOvfDeploymentOption"] = reflect.TypeOf((*ArrayOfOvfDeploymentOption)(nil)).Elem()
+}
+
+type ArrayOfOvfFile struct {
+	OvfFile []OvfFile `xml:"OvfFile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfOvfFile"] = reflect.TypeOf((*ArrayOfOvfFile)(nil)).Elem()
+}
+
+type ArrayOfOvfFileItem struct {
+	OvfFileItem []OvfFileItem `xml:"OvfFileItem,omitempty"`
+}
+
+func init() {
+	t["ArrayOfOvfFileItem"] = reflect.TypeOf((*ArrayOfOvfFileItem)(nil)).Elem()
+}
+
+type ArrayOfOvfNetworkInfo struct {
+	OvfNetworkInfo []OvfNetworkInfo `xml:"OvfNetworkInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfOvfNetworkInfo"] = reflect.TypeOf((*ArrayOfOvfNetworkInfo)(nil)).Elem()
+}
+
+type ArrayOfOvfNetworkMapping struct {
+	OvfNetworkMapping []OvfNetworkMapping `xml:"OvfNetworkMapping,omitempty"`
+}
+
+func init() {
+	t["ArrayOfOvfNetworkMapping"] = reflect.TypeOf((*ArrayOfOvfNetworkMapping)(nil)).Elem()
+}
+
+type ArrayOfOvfOptionInfo struct {
+	OvfOptionInfo []OvfOptionInfo `xml:"OvfOptionInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfOvfOptionInfo"] = reflect.TypeOf((*ArrayOfOvfOptionInfo)(nil)).Elem()
+}
+
+type ArrayOfOvfResourceMap struct {
+	OvfResourceMap []OvfResourceMap `xml:"OvfResourceMap,omitempty"`
+}
+
+func init() {
+	t["ArrayOfOvfResourceMap"] = reflect.TypeOf((*ArrayOfOvfResourceMap)(nil)).Elem()
+}
+
+type ArrayOfPerfCounterInfo struct {
+	PerfCounterInfo []PerfCounterInfo `xml:"PerfCounterInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPerfCounterInfo"] = reflect.TypeOf((*ArrayOfPerfCounterInfo)(nil)).Elem()
+}
+
+type ArrayOfPerfEntityMetricBase struct {
+	PerfEntityMetricBase []BasePerfEntityMetricBase `xml:"PerfEntityMetricBase,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfPerfEntityMetricBase"] = reflect.TypeOf((*ArrayOfPerfEntityMetricBase)(nil)).Elem()
+}
+
+type ArrayOfPerfInterval struct {
+	PerfInterval []PerfInterval `xml:"PerfInterval,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPerfInterval"] = reflect.TypeOf((*ArrayOfPerfInterval)(nil)).Elem()
+}
+
+type ArrayOfPerfMetricId struct {
+	PerfMetricId []PerfMetricId `xml:"PerfMetricId,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPerfMetricId"] = reflect.TypeOf((*ArrayOfPerfMetricId)(nil)).Elem()
+}
+
+type ArrayOfPerfMetricSeries struct {
+	PerfMetricSeries []BasePerfMetricSeries `xml:"PerfMetricSeries,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfPerfMetricSeries"] = reflect.TypeOf((*ArrayOfPerfMetricSeries)(nil)).Elem()
+}
+
+type ArrayOfPerfMetricSeriesCSV struct {
+	PerfMetricSeriesCSV []PerfMetricSeriesCSV `xml:"PerfMetricSeriesCSV,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPerfMetricSeriesCSV"] = reflect.TypeOf((*ArrayOfPerfMetricSeriesCSV)(nil)).Elem()
+}
+
+type ArrayOfPerfQuerySpec struct {
+	PerfQuerySpec []PerfQuerySpec `xml:"PerfQuerySpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPerfQuerySpec"] = reflect.TypeOf((*ArrayOfPerfQuerySpec)(nil)).Elem()
+}
+
+type ArrayOfPerfSampleInfo struct {
+	PerfSampleInfo []PerfSampleInfo `xml:"PerfSampleInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPerfSampleInfo"] = reflect.TypeOf((*ArrayOfPerfSampleInfo)(nil)).Elem()
+}
+
+type ArrayOfPerformanceManagerCounterLevelMapping struct {
+	PerformanceManagerCounterLevelMapping []PerformanceManagerCounterLevelMapping `xml:"PerformanceManagerCounterLevelMapping,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPerformanceManagerCounterLevelMapping"] = reflect.TypeOf((*ArrayOfPerformanceManagerCounterLevelMapping)(nil)).Elem()
+}
+
+type ArrayOfPermission struct {
+	Permission []Permission `xml:"Permission,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPermission"] = reflect.TypeOf((*ArrayOfPermission)(nil)).Elem()
+}
+
+type ArrayOfPermissionProfile struct {
+	PermissionProfile []PermissionProfile `xml:"PermissionProfile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPermissionProfile"] = reflect.TypeOf((*ArrayOfPermissionProfile)(nil)).Elem()
+}
+
+type ArrayOfPhysicalNic struct {
+	PhysicalNic []PhysicalNic `xml:"PhysicalNic,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPhysicalNic"] = reflect.TypeOf((*ArrayOfPhysicalNic)(nil)).Elem()
+}
+
+type ArrayOfPhysicalNicConfig struct {
+	PhysicalNicConfig []PhysicalNicConfig `xml:"PhysicalNicConfig,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPhysicalNicConfig"] = reflect.TypeOf((*ArrayOfPhysicalNicConfig)(nil)).Elem()
+}
+
+type ArrayOfPhysicalNicHintInfo struct {
+	PhysicalNicHintInfo []PhysicalNicHintInfo `xml:"PhysicalNicHintInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPhysicalNicHintInfo"] = reflect.TypeOf((*ArrayOfPhysicalNicHintInfo)(nil)).Elem()
+}
+
+type ArrayOfPhysicalNicIpHint struct {
+	PhysicalNicIpHint []PhysicalNicIpHint `xml:"PhysicalNicIpHint,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPhysicalNicIpHint"] = reflect.TypeOf((*ArrayOfPhysicalNicIpHint)(nil)).Elem()
+}
+
+type ArrayOfPhysicalNicLinkInfo struct {
+	PhysicalNicLinkInfo []PhysicalNicLinkInfo `xml:"PhysicalNicLinkInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPhysicalNicLinkInfo"] = reflect.TypeOf((*ArrayOfPhysicalNicLinkInfo)(nil)).Elem()
+}
+
+type ArrayOfPhysicalNicNameHint struct {
+	PhysicalNicNameHint []PhysicalNicNameHint `xml:"PhysicalNicNameHint,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPhysicalNicNameHint"] = reflect.TypeOf((*ArrayOfPhysicalNicNameHint)(nil)).Elem()
+}
+
+type ArrayOfPhysicalNicProfile struct {
+	PhysicalNicProfile []PhysicalNicProfile `xml:"PhysicalNicProfile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPhysicalNicProfile"] = reflect.TypeOf((*ArrayOfPhysicalNicProfile)(nil)).Elem()
+}
+
+type ArrayOfPlacementAffinityRule struct {
+	PlacementAffinityRule []PlacementAffinityRule `xml:"PlacementAffinityRule,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPlacementAffinityRule"] = reflect.TypeOf((*ArrayOfPlacementAffinityRule)(nil)).Elem()
+}
+
+type ArrayOfPlacementSpec struct {
+	PlacementSpec []PlacementSpec `xml:"PlacementSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPlacementSpec"] = reflect.TypeOf((*ArrayOfPlacementSpec)(nil)).Elem()
+}
+
+type ArrayOfPnicUplinkProfile struct {
+	PnicUplinkProfile []PnicUplinkProfile `xml:"PnicUplinkProfile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPnicUplinkProfile"] = reflect.TypeOf((*ArrayOfPnicUplinkProfile)(nil)).Elem()
+}
+
+type ArrayOfPodDiskLocator struct {
+	PodDiskLocator []PodDiskLocator `xml:"PodDiskLocator,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPodDiskLocator"] = reflect.TypeOf((*ArrayOfPodDiskLocator)(nil)).Elem()
+}
+
+type ArrayOfPolicyOption struct {
+	PolicyOption []BasePolicyOption `xml:"PolicyOption,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfPolicyOption"] = reflect.TypeOf((*ArrayOfPolicyOption)(nil)).Elem()
+}
+
+type ArrayOfPrivilegeAvailability struct {
+	PrivilegeAvailability []PrivilegeAvailability `xml:"PrivilegeAvailability,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPrivilegeAvailability"] = reflect.TypeOf((*ArrayOfPrivilegeAvailability)(nil)).Elem()
+}
+
+type ArrayOfProductComponentInfo struct {
+	ProductComponentInfo []ProductComponentInfo `xml:"ProductComponentInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfProductComponentInfo"] = reflect.TypeOf((*ArrayOfProductComponentInfo)(nil)).Elem()
+}
+
+type ArrayOfProfileApplyProfileProperty struct {
+	ProfileApplyProfileProperty []ProfileApplyProfileProperty `xml:"ProfileApplyProfileProperty,omitempty"`
+}
+
+func init() {
+	t["ArrayOfProfileApplyProfileProperty"] = reflect.TypeOf((*ArrayOfProfileApplyProfileProperty)(nil)).Elem()
+}
+
+type ArrayOfProfileDeferredPolicyOptionParameter struct {
+	ProfileDeferredPolicyOptionParameter []ProfileDeferredPolicyOptionParameter `xml:"ProfileDeferredPolicyOptionParameter,omitempty"`
+}
+
+func init() {
+	t["ArrayOfProfileDeferredPolicyOptionParameter"] = reflect.TypeOf((*ArrayOfProfileDeferredPolicyOptionParameter)(nil)).Elem()
+}
+
+type ArrayOfProfileDescriptionSection struct {
+	ProfileDescriptionSection []ProfileDescriptionSection `xml:"ProfileDescriptionSection,omitempty"`
+}
+
+func init() {
+	t["ArrayOfProfileDescriptionSection"] = reflect.TypeOf((*ArrayOfProfileDescriptionSection)(nil)).Elem()
+}
+
+type ArrayOfProfileExecuteError struct {
+	ProfileExecuteError []ProfileExecuteError `xml:"ProfileExecuteError,omitempty"`
+}
+
+func init() {
+	t["ArrayOfProfileExecuteError"] = reflect.TypeOf((*ArrayOfProfileExecuteError)(nil)).Elem()
+}
+
+type ArrayOfProfileExpression struct {
+	ProfileExpression []BaseProfileExpression `xml:"ProfileExpression,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfProfileExpression"] = reflect.TypeOf((*ArrayOfProfileExpression)(nil)).Elem()
+}
+
+type ArrayOfProfileExpressionMetadata struct {
+	ProfileExpressionMetadata []ProfileExpressionMetadata `xml:"ProfileExpressionMetadata,omitempty"`
+}
+
+func init() {
+	t["ArrayOfProfileExpressionMetadata"] = reflect.TypeOf((*ArrayOfProfileExpressionMetadata)(nil)).Elem()
+}
+
+type ArrayOfProfileMetadata struct {
+	ProfileMetadata []ProfileMetadata `xml:"ProfileMetadata,omitempty"`
+}
+
+func init() {
+	t["ArrayOfProfileMetadata"] = reflect.TypeOf((*ArrayOfProfileMetadata)(nil)).Elem()
+}
+
+type ArrayOfProfileMetadataProfileSortSpec struct {
+	ProfileMetadataProfileSortSpec []ProfileMetadataProfileSortSpec `xml:"ProfileMetadataProfileSortSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfProfileMetadataProfileSortSpec"] = reflect.TypeOf((*ArrayOfProfileMetadataProfileSortSpec)(nil)).Elem()
+}
+
+type ArrayOfProfileParameterMetadata struct {
+	ProfileParameterMetadata []ProfileParameterMetadata `xml:"ProfileParameterMetadata,omitempty"`
+}
+
+func init() {
+	t["ArrayOfProfileParameterMetadata"] = reflect.TypeOf((*ArrayOfProfileParameterMetadata)(nil)).Elem()
+}
+
+type ArrayOfProfilePolicy struct {
+	ProfilePolicy []ProfilePolicy `xml:"ProfilePolicy,omitempty"`
+}
+
+func init() {
+	t["ArrayOfProfilePolicy"] = reflect.TypeOf((*ArrayOfProfilePolicy)(nil)).Elem()
+}
+
+type ArrayOfProfilePolicyMetadata struct {
+	ProfilePolicyMetadata []ProfilePolicyMetadata `xml:"ProfilePolicyMetadata,omitempty"`
+}
+
+func init() {
+	t["ArrayOfProfilePolicyMetadata"] = reflect.TypeOf((*ArrayOfProfilePolicyMetadata)(nil)).Elem()
+}
+
+type ArrayOfProfilePolicyOptionMetadata struct {
+	ProfilePolicyOptionMetadata []BaseProfilePolicyOptionMetadata `xml:"ProfilePolicyOptionMetadata,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfProfilePolicyOptionMetadata"] = reflect.TypeOf((*ArrayOfProfilePolicyOptionMetadata)(nil)).Elem()
+}
+
+type ArrayOfProfileProfileStructureProperty struct {
+	ProfileProfileStructureProperty []ProfileProfileStructureProperty `xml:"ProfileProfileStructureProperty,omitempty"`
+}
+
+func init() {
+	t["ArrayOfProfileProfileStructureProperty"] = reflect.TypeOf((*ArrayOfProfileProfileStructureProperty)(nil)).Elem()
+}
+
+type ArrayOfProfilePropertyPath struct {
+	ProfilePropertyPath []ProfilePropertyPath `xml:"ProfilePropertyPath,omitempty"`
+}
+
+func init() {
+	t["ArrayOfProfilePropertyPath"] = reflect.TypeOf((*ArrayOfProfilePropertyPath)(nil)).Elem()
+}
+
+type ArrayOfProfileUpdateFailedUpdateFailure struct {
+	ProfileUpdateFailedUpdateFailure []ProfileUpdateFailedUpdateFailure `xml:"ProfileUpdateFailedUpdateFailure,omitempty"`
+}
+
+func init() {
+	t["ArrayOfProfileUpdateFailedUpdateFailure"] = reflect.TypeOf((*ArrayOfProfileUpdateFailedUpdateFailure)(nil)).Elem()
+}
+
+type ArrayOfPropertyChange struct {
+	PropertyChange []PropertyChange `xml:"PropertyChange,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPropertyChange"] = reflect.TypeOf((*ArrayOfPropertyChange)(nil)).Elem()
+}
+
+type ArrayOfPropertyFilterSpec struct {
+	PropertyFilterSpec []PropertyFilterSpec `xml:"PropertyFilterSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPropertyFilterSpec"] = reflect.TypeOf((*ArrayOfPropertyFilterSpec)(nil)).Elem()
+}
+
+type ArrayOfPropertyFilterUpdate struct {
+	PropertyFilterUpdate []PropertyFilterUpdate `xml:"PropertyFilterUpdate,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPropertyFilterUpdate"] = reflect.TypeOf((*ArrayOfPropertyFilterUpdate)(nil)).Elem()
+}
+
+type ArrayOfPropertySpec struct {
+	PropertySpec []PropertySpec `xml:"PropertySpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfPropertySpec"] = reflect.TypeOf((*ArrayOfPropertySpec)(nil)).Elem()
+}
+
+type ArrayOfRelation struct {
+	Relation []Relation `xml:"Relation,omitempty"`
+}
+
+func init() {
+	t["ArrayOfRelation"] = reflect.TypeOf((*ArrayOfRelation)(nil)).Elem()
+}
+
+type ArrayOfReplicationInfoDiskSettings struct {
+	ReplicationInfoDiskSettings []ReplicationInfoDiskSettings `xml:"ReplicationInfoDiskSettings,omitempty"`
+}
+
+func init() {
+	t["ArrayOfReplicationInfoDiskSettings"] = reflect.TypeOf((*ArrayOfReplicationInfoDiskSettings)(nil)).Elem()
+}
+
+type ArrayOfResourceConfigSpec struct {
+	ResourceConfigSpec []ResourceConfigSpec `xml:"ResourceConfigSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfResourceConfigSpec"] = reflect.TypeOf((*ArrayOfResourceConfigSpec)(nil)).Elem()
+}
+
+type ArrayOfScheduledTaskDetail struct {
+	ScheduledTaskDetail []ScheduledTaskDetail `xml:"ScheduledTaskDetail,omitempty"`
+}
+
+func init() {
+	t["ArrayOfScheduledTaskDetail"] = reflect.TypeOf((*ArrayOfScheduledTaskDetail)(nil)).Elem()
+}
+
+type ArrayOfScsiLun struct {
+	ScsiLun []BaseScsiLun `xml:"ScsiLun,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfScsiLun"] = reflect.TypeOf((*ArrayOfScsiLun)(nil)).Elem()
+}
+
+type ArrayOfScsiLunDescriptor struct {
+	ScsiLunDescriptor []ScsiLunDescriptor `xml:"ScsiLunDescriptor,omitempty"`
+}
+
+func init() {
+	t["ArrayOfScsiLunDescriptor"] = reflect.TypeOf((*ArrayOfScsiLunDescriptor)(nil)).Elem()
+}
+
+type ArrayOfScsiLunDurableName struct {
+	ScsiLunDurableName []ScsiLunDurableName `xml:"ScsiLunDurableName,omitempty"`
+}
+
+func init() {
+	t["ArrayOfScsiLunDurableName"] = reflect.TypeOf((*ArrayOfScsiLunDurableName)(nil)).Elem()
+}
+
+type ArrayOfSelectionSet struct {
+	SelectionSet []BaseSelectionSet `xml:"SelectionSet,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfSelectionSet"] = reflect.TypeOf((*ArrayOfSelectionSet)(nil)).Elem()
+}
+
+type ArrayOfSelectionSpec struct {
+	SelectionSpec []BaseSelectionSpec `xml:"SelectionSpec,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfSelectionSpec"] = reflect.TypeOf((*ArrayOfSelectionSpec)(nil)).Elem()
+}
+
+type ArrayOfServiceConsolePortGroupProfile struct {
+	ServiceConsolePortGroupProfile []ServiceConsolePortGroupProfile `xml:"ServiceConsolePortGroupProfile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfServiceConsolePortGroupProfile"] = reflect.TypeOf((*ArrayOfServiceConsolePortGroupProfile)(nil)).Elem()
+}
+
+type ArrayOfServiceLocator struct {
+	ServiceLocator []ServiceLocator `xml:"ServiceLocator,omitempty"`
+}
+
+func init() {
+	t["ArrayOfServiceLocator"] = reflect.TypeOf((*ArrayOfServiceLocator)(nil)).Elem()
+}
+
+type ArrayOfServiceManagerServiceInfo struct {
+	ServiceManagerServiceInfo []ServiceManagerServiceInfo `xml:"ServiceManagerServiceInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfServiceManagerServiceInfo"] = reflect.TypeOf((*ArrayOfServiceManagerServiceInfo)(nil)).Elem()
+}
+
+type ArrayOfServiceProfile struct {
+	ServiceProfile []ServiceProfile `xml:"ServiceProfile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfServiceProfile"] = reflect.TypeOf((*ArrayOfServiceProfile)(nil)).Elem()
+}
+
+type ArrayOfShort struct {
+	Short []int16 `xml:"short,omitempty"`
+}
+
+func init() {
+	t["ArrayOfShort"] = reflect.TypeOf((*ArrayOfShort)(nil)).Elem()
+}
+
+type ArrayOfSoftwarePackage struct {
+	SoftwarePackage []SoftwarePackage `xml:"SoftwarePackage,omitempty"`
+}
+
+func init() {
+	t["ArrayOfSoftwarePackage"] = reflect.TypeOf((*ArrayOfSoftwarePackage)(nil)).Elem()
+}
+
+type ArrayOfStaticRouteProfile struct {
+	StaticRouteProfile []StaticRouteProfile `xml:"StaticRouteProfile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfStaticRouteProfile"] = reflect.TypeOf((*ArrayOfStaticRouteProfile)(nil)).Elem()
+}
+
+type ArrayOfStorageDrsOptionSpec struct {
+	StorageDrsOptionSpec []StorageDrsOptionSpec `xml:"StorageDrsOptionSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfStorageDrsOptionSpec"] = reflect.TypeOf((*ArrayOfStorageDrsOptionSpec)(nil)).Elem()
+}
+
+type ArrayOfStorageDrsPlacementRankVmSpec struct {
+	StorageDrsPlacementRankVmSpec []StorageDrsPlacementRankVmSpec `xml:"StorageDrsPlacementRankVmSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfStorageDrsPlacementRankVmSpec"] = reflect.TypeOf((*ArrayOfStorageDrsPlacementRankVmSpec)(nil)).Elem()
+}
+
+type ArrayOfStorageDrsVmConfigInfo struct {
+	StorageDrsVmConfigInfo []StorageDrsVmConfigInfo `xml:"StorageDrsVmConfigInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfStorageDrsVmConfigInfo"] = reflect.TypeOf((*ArrayOfStorageDrsVmConfigInfo)(nil)).Elem()
+}
+
+type ArrayOfStorageDrsVmConfigSpec struct {
+	StorageDrsVmConfigSpec []StorageDrsVmConfigSpec `xml:"StorageDrsVmConfigSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfStorageDrsVmConfigSpec"] = reflect.TypeOf((*ArrayOfStorageDrsVmConfigSpec)(nil)).Elem()
+}
+
+type ArrayOfStoragePerformanceSummary struct {
+	StoragePerformanceSummary []StoragePerformanceSummary `xml:"StoragePerformanceSummary,omitempty"`
+}
+
+func init() {
+	t["ArrayOfStoragePerformanceSummary"] = reflect.TypeOf((*ArrayOfStoragePerformanceSummary)(nil)).Elem()
+}
+
+type ArrayOfStorageRequirement struct {
+	StorageRequirement []StorageRequirement `xml:"StorageRequirement,omitempty"`
+}
+
+func init() {
+	t["ArrayOfStorageRequirement"] = reflect.TypeOf((*ArrayOfStorageRequirement)(nil)).Elem()
+}
+
+type ArrayOfString struct {
+	String []string `xml:"string,omitempty"`
+}
+
+func init() {
+	t["ArrayOfString"] = reflect.TypeOf((*ArrayOfString)(nil)).Elem()
+}
+
+type ArrayOfStructuredCustomizations struct {
+	StructuredCustomizations []StructuredCustomizations `xml:"StructuredCustomizations,omitempty"`
+}
+
+func init() {
+	t["ArrayOfStructuredCustomizations"] = reflect.TypeOf((*ArrayOfStructuredCustomizations)(nil)).Elem()
+}
+
+type ArrayOfSystemEventInfo struct {
+	SystemEventInfo []SystemEventInfo `xml:"SystemEventInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfSystemEventInfo"] = reflect.TypeOf((*ArrayOfSystemEventInfo)(nil)).Elem()
+}
+
+type ArrayOfTag struct {
+	Tag []Tag `xml:"Tag,omitempty"`
+}
+
+func init() {
+	t["ArrayOfTag"] = reflect.TypeOf((*ArrayOfTag)(nil)).Elem()
+}
+
+type ArrayOfTaskInfo struct {
+	TaskInfo []TaskInfo `xml:"TaskInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfTaskInfo"] = reflect.TypeOf((*ArrayOfTaskInfo)(nil)).Elem()
+}
+
+type ArrayOfTaskInfoState struct {
+	TaskInfoState []TaskInfoState `xml:"TaskInfoState,omitempty"`
+}
+
+func init() {
+	t["ArrayOfTaskInfoState"] = reflect.TypeOf((*ArrayOfTaskInfoState)(nil)).Elem()
+}
+
+type ArrayOfTypeDescription struct {
+	TypeDescription []BaseTypeDescription `xml:"TypeDescription,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfTypeDescription"] = reflect.TypeOf((*ArrayOfTypeDescription)(nil)).Elem()
+}
+
+type ArrayOfUpdateVirtualMachineFilesResultFailedVmFileInfo struct {
+	UpdateVirtualMachineFilesResultFailedVmFileInfo []UpdateVirtualMachineFilesResultFailedVmFileInfo `xml:"UpdateVirtualMachineFilesResultFailedVmFileInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfUpdateVirtualMachineFilesResultFailedVmFileInfo"] = reflect.TypeOf((*ArrayOfUpdateVirtualMachineFilesResultFailedVmFileInfo)(nil)).Elem()
+}
+
+type ArrayOfUsbScanCodeSpecKeyEvent struct {
+	UsbScanCodeSpecKeyEvent []UsbScanCodeSpecKeyEvent `xml:"UsbScanCodeSpecKeyEvent,omitempty"`
+}
+
+func init() {
+	t["ArrayOfUsbScanCodeSpecKeyEvent"] = reflect.TypeOf((*ArrayOfUsbScanCodeSpecKeyEvent)(nil)).Elem()
+}
+
+type ArrayOfUserGroupProfile struct {
+	UserGroupProfile []UserGroupProfile `xml:"UserGroupProfile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfUserGroupProfile"] = reflect.TypeOf((*ArrayOfUserGroupProfile)(nil)).Elem()
+}
+
+type ArrayOfUserPrivilegeResult struct {
+	UserPrivilegeResult []UserPrivilegeResult `xml:"UserPrivilegeResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfUserPrivilegeResult"] = reflect.TypeOf((*ArrayOfUserPrivilegeResult)(nil)).Elem()
+}
+
+type ArrayOfUserProfile struct {
+	UserProfile []UserProfile `xml:"UserProfile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfUserProfile"] = reflect.TypeOf((*ArrayOfUserProfile)(nil)).Elem()
+}
+
+type ArrayOfUserSearchResult struct {
+	UserSearchResult []BaseUserSearchResult `xml:"UserSearchResult,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfUserSearchResult"] = reflect.TypeOf((*ArrayOfUserSearchResult)(nil)).Elem()
+}
+
+type ArrayOfUserSession struct {
+	UserSession []UserSession `xml:"UserSession,omitempty"`
+}
+
+func init() {
+	t["ArrayOfUserSession"] = reflect.TypeOf((*ArrayOfUserSession)(nil)).Elem()
+}
+
+type ArrayOfVASAStorageArray struct {
+	VASAStorageArray []VASAStorageArray `xml:"VASAStorageArray,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVASAStorageArray"] = reflect.TypeOf((*ArrayOfVASAStorageArray)(nil)).Elem()
+}
+
+type ArrayOfVAppCloneSpecNetworkMappingPair struct {
+	VAppCloneSpecNetworkMappingPair []VAppCloneSpecNetworkMappingPair `xml:"VAppCloneSpecNetworkMappingPair,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVAppCloneSpecNetworkMappingPair"] = reflect.TypeOf((*ArrayOfVAppCloneSpecNetworkMappingPair)(nil)).Elem()
+}
+
+type ArrayOfVAppCloneSpecResourceMap struct {
+	VAppCloneSpecResourceMap []VAppCloneSpecResourceMap `xml:"VAppCloneSpecResourceMap,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVAppCloneSpecResourceMap"] = reflect.TypeOf((*ArrayOfVAppCloneSpecResourceMap)(nil)).Elem()
+}
+
+type ArrayOfVAppEntityConfigInfo struct {
+	VAppEntityConfigInfo []VAppEntityConfigInfo `xml:"VAppEntityConfigInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVAppEntityConfigInfo"] = reflect.TypeOf((*ArrayOfVAppEntityConfigInfo)(nil)).Elem()
+}
+
+type ArrayOfVAppOvfSectionInfo struct {
+	VAppOvfSectionInfo []VAppOvfSectionInfo `xml:"VAppOvfSectionInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVAppOvfSectionInfo"] = reflect.TypeOf((*ArrayOfVAppOvfSectionInfo)(nil)).Elem()
+}
+
+type ArrayOfVAppOvfSectionSpec struct {
+	VAppOvfSectionSpec []VAppOvfSectionSpec `xml:"VAppOvfSectionSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVAppOvfSectionSpec"] = reflect.TypeOf((*ArrayOfVAppOvfSectionSpec)(nil)).Elem()
+}
+
+type ArrayOfVAppProductInfo struct {
+	VAppProductInfo []VAppProductInfo `xml:"VAppProductInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVAppProductInfo"] = reflect.TypeOf((*ArrayOfVAppProductInfo)(nil)).Elem()
+}
+
+type ArrayOfVAppProductSpec struct {
+	VAppProductSpec []VAppProductSpec `xml:"VAppProductSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVAppProductSpec"] = reflect.TypeOf((*ArrayOfVAppProductSpec)(nil)).Elem()
+}
+
+type ArrayOfVAppPropertyInfo struct {
+	VAppPropertyInfo []VAppPropertyInfo `xml:"VAppPropertyInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVAppPropertyInfo"] = reflect.TypeOf((*ArrayOfVAppPropertyInfo)(nil)).Elem()
+}
+
+type ArrayOfVAppPropertySpec struct {
+	VAppPropertySpec []VAppPropertySpec `xml:"VAppPropertySpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVAppPropertySpec"] = reflect.TypeOf((*ArrayOfVAppPropertySpec)(nil)).Elem()
+}
+
+type ArrayOfVMwareDVSPvlanConfigSpec struct {
+	VMwareDVSPvlanConfigSpec []VMwareDVSPvlanConfigSpec `xml:"VMwareDVSPvlanConfigSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVMwareDVSPvlanConfigSpec"] = reflect.TypeOf((*ArrayOfVMwareDVSPvlanConfigSpec)(nil)).Elem()
+}
+
+type ArrayOfVMwareDVSPvlanMapEntry struct {
+	VMwareDVSPvlanMapEntry []VMwareDVSPvlanMapEntry `xml:"VMwareDVSPvlanMapEntry,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVMwareDVSPvlanMapEntry"] = reflect.TypeOf((*ArrayOfVMwareDVSPvlanMapEntry)(nil)).Elem()
+}
+
+type ArrayOfVMwareDVSVspanConfigSpec struct {
+	VMwareDVSVspanConfigSpec []VMwareDVSVspanConfigSpec `xml:"VMwareDVSVspanConfigSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVMwareDVSVspanConfigSpec"] = reflect.TypeOf((*ArrayOfVMwareDVSVspanConfigSpec)(nil)).Elem()
+}
+
+type ArrayOfVMwareDvsLacpGroupConfig struct {
+	VMwareDvsLacpGroupConfig []VMwareDvsLacpGroupConfig `xml:"VMwareDvsLacpGroupConfig,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVMwareDvsLacpGroupConfig"] = reflect.TypeOf((*ArrayOfVMwareDvsLacpGroupConfig)(nil)).Elem()
+}
+
+type ArrayOfVMwareDvsLacpGroupSpec struct {
+	VMwareDvsLacpGroupSpec []VMwareDvsLacpGroupSpec `xml:"VMwareDvsLacpGroupSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVMwareDvsLacpGroupSpec"] = reflect.TypeOf((*ArrayOfVMwareDvsLacpGroupSpec)(nil)).Elem()
+}
+
+type ArrayOfVMwareVspanSession struct {
+	VMwareVspanSession []VMwareVspanSession `xml:"VMwareVspanSession,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVMwareVspanSession"] = reflect.TypeOf((*ArrayOfVMwareVspanSession)(nil)).Elem()
+}
+
+type ArrayOfVVolHostPE struct {
+	VVolHostPE []VVolHostPE `xml:"VVolHostPE,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVVolHostPE"] = reflect.TypeOf((*ArrayOfVVolHostPE)(nil)).Elem()
+}
+
+type ArrayOfVVolVmConfigFileUpdateResultFailedVmConfigFileInfo struct {
+	VVolVmConfigFileUpdateResultFailedVmConfigFileInfo []VVolVmConfigFileUpdateResultFailedVmConfigFileInfo `xml:"VVolVmConfigFileUpdateResultFailedVmConfigFileInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVVolVmConfigFileUpdateResultFailedVmConfigFileInfo"] = reflect.TypeOf((*ArrayOfVVolVmConfigFileUpdateResultFailedVmConfigFileInfo)(nil)).Elem()
+}
+
+type ArrayOfVchaNodeRuntimeInfo struct {
+	VchaNodeRuntimeInfo []VchaNodeRuntimeInfo `xml:"VchaNodeRuntimeInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVchaNodeRuntimeInfo"] = reflect.TypeOf((*ArrayOfVchaNodeRuntimeInfo)(nil)).Elem()
+}
+
+type ArrayOfVimVasaProviderInfo struct {
+	VimVasaProviderInfo []VimVasaProviderInfo `xml:"VimVasaProviderInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVimVasaProviderInfo"] = reflect.TypeOf((*ArrayOfVimVasaProviderInfo)(nil)).Elem()
+}
+
+type ArrayOfVimVasaProviderStatePerArray struct {
+	VimVasaProviderStatePerArray []VimVasaProviderStatePerArray `xml:"VimVasaProviderStatePerArray,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVimVasaProviderStatePerArray"] = reflect.TypeOf((*ArrayOfVimVasaProviderStatePerArray)(nil)).Elem()
+}
+
+type ArrayOfVirtualAppLinkInfo struct {
+	VirtualAppLinkInfo []VirtualAppLinkInfo `xml:"VirtualAppLinkInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualAppLinkInfo"] = reflect.TypeOf((*ArrayOfVirtualAppLinkInfo)(nil)).Elem()
+}
+
+type ArrayOfVirtualDevice struct {
+	VirtualDevice []BaseVirtualDevice `xml:"VirtualDevice,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfVirtualDevice"] = reflect.TypeOf((*ArrayOfVirtualDevice)(nil)).Elem()
+}
+
+type ArrayOfVirtualDeviceBackingOption struct {
+	VirtualDeviceBackingOption []BaseVirtualDeviceBackingOption `xml:"VirtualDeviceBackingOption,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfVirtualDeviceBackingOption"] = reflect.TypeOf((*ArrayOfVirtualDeviceBackingOption)(nil)).Elem()
+}
+
+type ArrayOfVirtualDeviceConfigSpec struct {
+	VirtualDeviceConfigSpec []BaseVirtualDeviceConfigSpec `xml:"VirtualDeviceConfigSpec,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfVirtualDeviceConfigSpec"] = reflect.TypeOf((*ArrayOfVirtualDeviceConfigSpec)(nil)).Elem()
+}
+
+type ArrayOfVirtualDeviceOption struct {
+	VirtualDeviceOption []BaseVirtualDeviceOption `xml:"VirtualDeviceOption,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfVirtualDeviceOption"] = reflect.TypeOf((*ArrayOfVirtualDeviceOption)(nil)).Elem()
+}
+
+type ArrayOfVirtualDisk struct {
+	VirtualDisk []VirtualDisk `xml:"VirtualDisk,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualDisk"] = reflect.TypeOf((*ArrayOfVirtualDisk)(nil)).Elem()
+}
+
+type ArrayOfVirtualDiskDeltaDiskFormatsSupported struct {
+	VirtualDiskDeltaDiskFormatsSupported []VirtualDiskDeltaDiskFormatsSupported `xml:"VirtualDiskDeltaDiskFormatsSupported,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualDiskDeltaDiskFormatsSupported"] = reflect.TypeOf((*ArrayOfVirtualDiskDeltaDiskFormatsSupported)(nil)).Elem()
+}
+
+type ArrayOfVirtualDiskId struct {
+	VirtualDiskId []VirtualDiskId `xml:"VirtualDiskId,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualDiskId"] = reflect.TypeOf((*ArrayOfVirtualDiskId)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineBootOptionsBootableDevice struct {
+	VirtualMachineBootOptionsBootableDevice []BaseVirtualMachineBootOptionsBootableDevice `xml:"VirtualMachineBootOptionsBootableDevice,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineBootOptionsBootableDevice"] = reflect.TypeOf((*ArrayOfVirtualMachineBootOptionsBootableDevice)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineCdromInfo struct {
+	VirtualMachineCdromInfo []VirtualMachineCdromInfo `xml:"VirtualMachineCdromInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineCdromInfo"] = reflect.TypeOf((*ArrayOfVirtualMachineCdromInfo)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineConfigInfoDatastoreUrlPair struct {
+	VirtualMachineConfigInfoDatastoreUrlPair []VirtualMachineConfigInfoDatastoreUrlPair `xml:"VirtualMachineConfigInfoDatastoreUrlPair,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineConfigInfoDatastoreUrlPair"] = reflect.TypeOf((*ArrayOfVirtualMachineConfigInfoDatastoreUrlPair)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineConfigOptionDescriptor struct {
+	VirtualMachineConfigOptionDescriptor []VirtualMachineConfigOptionDescriptor `xml:"VirtualMachineConfigOptionDescriptor,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineConfigOptionDescriptor"] = reflect.TypeOf((*ArrayOfVirtualMachineConfigOptionDescriptor)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineCpuIdInfoSpec struct {
+	VirtualMachineCpuIdInfoSpec []VirtualMachineCpuIdInfoSpec `xml:"VirtualMachineCpuIdInfoSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineCpuIdInfoSpec"] = reflect.TypeOf((*ArrayOfVirtualMachineCpuIdInfoSpec)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineDatastoreInfo struct {
+	VirtualMachineDatastoreInfo []VirtualMachineDatastoreInfo `xml:"VirtualMachineDatastoreInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineDatastoreInfo"] = reflect.TypeOf((*ArrayOfVirtualMachineDatastoreInfo)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineDatastoreVolumeOption struct {
+	VirtualMachineDatastoreVolumeOption []VirtualMachineDatastoreVolumeOption `xml:"VirtualMachineDatastoreVolumeOption,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineDatastoreVolumeOption"] = reflect.TypeOf((*ArrayOfVirtualMachineDatastoreVolumeOption)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineDeviceRuntimeInfo struct {
+	VirtualMachineDeviceRuntimeInfo []VirtualMachineDeviceRuntimeInfo `xml:"VirtualMachineDeviceRuntimeInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineDeviceRuntimeInfo"] = reflect.TypeOf((*ArrayOfVirtualMachineDeviceRuntimeInfo)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineDisplayTopology struct {
+	VirtualMachineDisplayTopology []VirtualMachineDisplayTopology `xml:"VirtualMachineDisplayTopology,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineDisplayTopology"] = reflect.TypeOf((*ArrayOfVirtualMachineDisplayTopology)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineFeatureRequirement struct {
+	VirtualMachineFeatureRequirement []VirtualMachineFeatureRequirement `xml:"VirtualMachineFeatureRequirement,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineFeatureRequirement"] = reflect.TypeOf((*ArrayOfVirtualMachineFeatureRequirement)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineFileLayoutDiskLayout struct {
+	VirtualMachineFileLayoutDiskLayout []VirtualMachineFileLayoutDiskLayout `xml:"VirtualMachineFileLayoutDiskLayout,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineFileLayoutDiskLayout"] = reflect.TypeOf((*ArrayOfVirtualMachineFileLayoutDiskLayout)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineFileLayoutExDiskLayout struct {
+	VirtualMachineFileLayoutExDiskLayout []VirtualMachineFileLayoutExDiskLayout `xml:"VirtualMachineFileLayoutExDiskLayout,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineFileLayoutExDiskLayout"] = reflect.TypeOf((*ArrayOfVirtualMachineFileLayoutExDiskLayout)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineFileLayoutExDiskUnit struct {
+	VirtualMachineFileLayoutExDiskUnit []VirtualMachineFileLayoutExDiskUnit `xml:"VirtualMachineFileLayoutExDiskUnit,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineFileLayoutExDiskUnit"] = reflect.TypeOf((*ArrayOfVirtualMachineFileLayoutExDiskUnit)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineFileLayoutExFileInfo struct {
+	VirtualMachineFileLayoutExFileInfo []VirtualMachineFileLayoutExFileInfo `xml:"VirtualMachineFileLayoutExFileInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineFileLayoutExFileInfo"] = reflect.TypeOf((*ArrayOfVirtualMachineFileLayoutExFileInfo)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineFileLayoutExSnapshotLayout struct {
+	VirtualMachineFileLayoutExSnapshotLayout []VirtualMachineFileLayoutExSnapshotLayout `xml:"VirtualMachineFileLayoutExSnapshotLayout,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineFileLayoutExSnapshotLayout"] = reflect.TypeOf((*ArrayOfVirtualMachineFileLayoutExSnapshotLayout)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineFileLayoutSnapshotLayout struct {
+	VirtualMachineFileLayoutSnapshotLayout []VirtualMachineFileLayoutSnapshotLayout `xml:"VirtualMachineFileLayoutSnapshotLayout,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineFileLayoutSnapshotLayout"] = reflect.TypeOf((*ArrayOfVirtualMachineFileLayoutSnapshotLayout)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineFloppyInfo struct {
+	VirtualMachineFloppyInfo []VirtualMachineFloppyInfo `xml:"VirtualMachineFloppyInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineFloppyInfo"] = reflect.TypeOf((*ArrayOfVirtualMachineFloppyInfo)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineIdeDiskDeviceInfo struct {
+	VirtualMachineIdeDiskDeviceInfo []VirtualMachineIdeDiskDeviceInfo `xml:"VirtualMachineIdeDiskDeviceInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineIdeDiskDeviceInfo"] = reflect.TypeOf((*ArrayOfVirtualMachineIdeDiskDeviceInfo)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineIdeDiskDevicePartitionInfo struct {
+	VirtualMachineIdeDiskDevicePartitionInfo []VirtualMachineIdeDiskDevicePartitionInfo `xml:"VirtualMachineIdeDiskDevicePartitionInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineIdeDiskDevicePartitionInfo"] = reflect.TypeOf((*ArrayOfVirtualMachineIdeDiskDevicePartitionInfo)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineLegacyNetworkSwitchInfo struct {
+	VirtualMachineLegacyNetworkSwitchInfo []VirtualMachineLegacyNetworkSwitchInfo `xml:"VirtualMachineLegacyNetworkSwitchInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineLegacyNetworkSwitchInfo"] = reflect.TypeOf((*ArrayOfVirtualMachineLegacyNetworkSwitchInfo)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineMessage struct {
+	VirtualMachineMessage []VirtualMachineMessage `xml:"VirtualMachineMessage,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineMessage"] = reflect.TypeOf((*ArrayOfVirtualMachineMessage)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineMetadataManagerVmMetadataInput struct {
+	VirtualMachineMetadataManagerVmMetadataInput []VirtualMachineMetadataManagerVmMetadataInput `xml:"VirtualMachineMetadataManagerVmMetadataInput,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineMetadataManagerVmMetadataInput"] = reflect.TypeOf((*ArrayOfVirtualMachineMetadataManagerVmMetadataInput)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineMetadataManagerVmMetadataResult struct {
+	VirtualMachineMetadataManagerVmMetadataResult []VirtualMachineMetadataManagerVmMetadataResult `xml:"VirtualMachineMetadataManagerVmMetadataResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineMetadataManagerVmMetadataResult"] = reflect.TypeOf((*ArrayOfVirtualMachineMetadataManagerVmMetadataResult)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineNetworkInfo struct {
+	VirtualMachineNetworkInfo []VirtualMachineNetworkInfo `xml:"VirtualMachineNetworkInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineNetworkInfo"] = reflect.TypeOf((*ArrayOfVirtualMachineNetworkInfo)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineParallelInfo struct {
+	VirtualMachineParallelInfo []VirtualMachineParallelInfo `xml:"VirtualMachineParallelInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineParallelInfo"] = reflect.TypeOf((*ArrayOfVirtualMachineParallelInfo)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachinePciPassthroughInfo struct {
+	VirtualMachinePciPassthroughInfo []BaseVirtualMachinePciPassthroughInfo `xml:"VirtualMachinePciPassthroughInfo,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachinePciPassthroughInfo"] = reflect.TypeOf((*ArrayOfVirtualMachinePciPassthroughInfo)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachinePciSharedGpuPassthroughInfo struct {
+	VirtualMachinePciSharedGpuPassthroughInfo []VirtualMachinePciSharedGpuPassthroughInfo `xml:"VirtualMachinePciSharedGpuPassthroughInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachinePciSharedGpuPassthroughInfo"] = reflect.TypeOf((*ArrayOfVirtualMachinePciSharedGpuPassthroughInfo)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineProfileSpec struct {
+	VirtualMachineProfileSpec []BaseVirtualMachineProfileSpec `xml:"VirtualMachineProfileSpec,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineProfileSpec"] = reflect.TypeOf((*ArrayOfVirtualMachineProfileSpec)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineRelocateSpecDiskLocator struct {
+	VirtualMachineRelocateSpecDiskLocator []VirtualMachineRelocateSpecDiskLocator `xml:"VirtualMachineRelocateSpecDiskLocator,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineRelocateSpecDiskLocator"] = reflect.TypeOf((*ArrayOfVirtualMachineRelocateSpecDiskLocator)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineScsiDiskDeviceInfo struct {
+	VirtualMachineScsiDiskDeviceInfo []VirtualMachineScsiDiskDeviceInfo `xml:"VirtualMachineScsiDiskDeviceInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineScsiDiskDeviceInfo"] = reflect.TypeOf((*ArrayOfVirtualMachineScsiDiskDeviceInfo)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineScsiPassthroughInfo struct {
+	VirtualMachineScsiPassthroughInfo []VirtualMachineScsiPassthroughInfo `xml:"VirtualMachineScsiPassthroughInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineScsiPassthroughInfo"] = reflect.TypeOf((*ArrayOfVirtualMachineScsiPassthroughInfo)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineSerialInfo struct {
+	VirtualMachineSerialInfo []VirtualMachineSerialInfo `xml:"VirtualMachineSerialInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineSerialInfo"] = reflect.TypeOf((*ArrayOfVirtualMachineSerialInfo)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineSnapshotTree struct {
+	VirtualMachineSnapshotTree []VirtualMachineSnapshotTree `xml:"VirtualMachineSnapshotTree,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineSnapshotTree"] = reflect.TypeOf((*ArrayOfVirtualMachineSnapshotTree)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineSoundInfo struct {
+	VirtualMachineSoundInfo []VirtualMachineSoundInfo `xml:"VirtualMachineSoundInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineSoundInfo"] = reflect.TypeOf((*ArrayOfVirtualMachineSoundInfo)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineSriovInfo struct {
+	VirtualMachineSriovInfo []VirtualMachineSriovInfo `xml:"VirtualMachineSriovInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineSriovInfo"] = reflect.TypeOf((*ArrayOfVirtualMachineSriovInfo)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineSummary struct {
+	VirtualMachineSummary []VirtualMachineSummary `xml:"VirtualMachineSummary,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineSummary"] = reflect.TypeOf((*ArrayOfVirtualMachineSummary)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineUsageOnDatastore struct {
+	VirtualMachineUsageOnDatastore []VirtualMachineUsageOnDatastore `xml:"VirtualMachineUsageOnDatastore,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineUsageOnDatastore"] = reflect.TypeOf((*ArrayOfVirtualMachineUsageOnDatastore)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineUsbInfo struct {
+	VirtualMachineUsbInfo []VirtualMachineUsbInfo `xml:"VirtualMachineUsbInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineUsbInfo"] = reflect.TypeOf((*ArrayOfVirtualMachineUsbInfo)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineVFlashModuleInfo struct {
+	VirtualMachineVFlashModuleInfo []VirtualMachineVFlashModuleInfo `xml:"VirtualMachineVFlashModuleInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineVFlashModuleInfo"] = reflect.TypeOf((*ArrayOfVirtualMachineVFlashModuleInfo)(nil)).Elem()
+}
+
+type ArrayOfVirtualMachineVMCIDeviceFilterSpec struct {
+	VirtualMachineVMCIDeviceFilterSpec []VirtualMachineVMCIDeviceFilterSpec `xml:"VirtualMachineVMCIDeviceFilterSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineVMCIDeviceFilterSpec"] = reflect.TypeOf((*ArrayOfVirtualMachineVMCIDeviceFilterSpec)(nil)).Elem()
+}
+
+type ArrayOfVirtualNicManagerNetConfig struct {
+	VirtualNicManagerNetConfig []VirtualNicManagerNetConfig `xml:"VirtualNicManagerNetConfig,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualNicManagerNetConfig"] = reflect.TypeOf((*ArrayOfVirtualNicManagerNetConfig)(nil)).Elem()
+}
+
+type ArrayOfVirtualSCSISharing struct {
+	VirtualSCSISharing []VirtualSCSISharing `xml:"VirtualSCSISharing,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualSCSISharing"] = reflect.TypeOf((*ArrayOfVirtualSCSISharing)(nil)).Elem()
+}
+
+type ArrayOfVirtualSwitchProfile struct {
+	VirtualSwitchProfile []VirtualSwitchProfile `xml:"VirtualSwitchProfile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualSwitchProfile"] = reflect.TypeOf((*ArrayOfVirtualSwitchProfile)(nil)).Elem()
+}
+
+type ArrayOfVmEventArgument struct {
+	VmEventArgument []VmEventArgument `xml:"VmEventArgument,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVmEventArgument"] = reflect.TypeOf((*ArrayOfVmEventArgument)(nil)).Elem()
+}
+
+type ArrayOfVmPodConfigForPlacement struct {
+	VmPodConfigForPlacement []VmPodConfigForPlacement `xml:"VmPodConfigForPlacement,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVmPodConfigForPlacement"] = reflect.TypeOf((*ArrayOfVmPodConfigForPlacement)(nil)).Elem()
+}
+
+type ArrayOfVmPortGroupProfile struct {
+	VmPortGroupProfile []VmPortGroupProfile `xml:"VmPortGroupProfile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVmPortGroupProfile"] = reflect.TypeOf((*ArrayOfVmPortGroupProfile)(nil)).Elem()
+}
+
+type ArrayOfVmfsConfigOption struct {
+	VmfsConfigOption []VmfsConfigOption `xml:"VmfsConfigOption,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVmfsConfigOption"] = reflect.TypeOf((*ArrayOfVmfsConfigOption)(nil)).Elem()
+}
+
+type ArrayOfVmfsDatastoreOption struct {
+	VmfsDatastoreOption []VmfsDatastoreOption `xml:"VmfsDatastoreOption,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVmfsDatastoreOption"] = reflect.TypeOf((*ArrayOfVmfsDatastoreOption)(nil)).Elem()
+}
+
+type ArrayOfVnicPortArgument struct {
+	VnicPortArgument []VnicPortArgument `xml:"VnicPortArgument,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVnicPortArgument"] = reflect.TypeOf((*ArrayOfVnicPortArgument)(nil)).Elem()
+}
+
+type ArrayOfVsanHostConfigInfo struct {
+	VsanHostConfigInfo []VsanHostConfigInfo `xml:"VsanHostConfigInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVsanHostConfigInfo"] = reflect.TypeOf((*ArrayOfVsanHostConfigInfo)(nil)).Elem()
+}
+
+type ArrayOfVsanHostConfigInfoNetworkInfoPortConfig struct {
+	VsanHostConfigInfoNetworkInfoPortConfig []VsanHostConfigInfoNetworkInfoPortConfig `xml:"VsanHostConfigInfoNetworkInfoPortConfig,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVsanHostConfigInfoNetworkInfoPortConfig"] = reflect.TypeOf((*ArrayOfVsanHostConfigInfoNetworkInfoPortConfig)(nil)).Elem()
+}
+
+type ArrayOfVsanHostDiskMapInfo struct {
+	VsanHostDiskMapInfo []VsanHostDiskMapInfo `xml:"VsanHostDiskMapInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVsanHostDiskMapInfo"] = reflect.TypeOf((*ArrayOfVsanHostDiskMapInfo)(nil)).Elem()
+}
+
+type ArrayOfVsanHostDiskMapResult struct {
+	VsanHostDiskMapResult []VsanHostDiskMapResult `xml:"VsanHostDiskMapResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVsanHostDiskMapResult"] = reflect.TypeOf((*ArrayOfVsanHostDiskMapResult)(nil)).Elem()
+}
+
+type ArrayOfVsanHostDiskMapping struct {
+	VsanHostDiskMapping []VsanHostDiskMapping `xml:"VsanHostDiskMapping,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVsanHostDiskMapping"] = reflect.TypeOf((*ArrayOfVsanHostDiskMapping)(nil)).Elem()
+}
+
+type ArrayOfVsanHostDiskResult struct {
+	VsanHostDiskResult []VsanHostDiskResult `xml:"VsanHostDiskResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVsanHostDiskResult"] = reflect.TypeOf((*ArrayOfVsanHostDiskResult)(nil)).Elem()
+}
+
+type ArrayOfVsanHostMembershipInfo struct {
+	VsanHostMembershipInfo []VsanHostMembershipInfo `xml:"VsanHostMembershipInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVsanHostMembershipInfo"] = reflect.TypeOf((*ArrayOfVsanHostMembershipInfo)(nil)).Elem()
+}
+
+type ArrayOfVsanHostRuntimeInfoDiskIssue struct {
+	VsanHostRuntimeInfoDiskIssue []VsanHostRuntimeInfoDiskIssue `xml:"VsanHostRuntimeInfoDiskIssue,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVsanHostRuntimeInfoDiskIssue"] = reflect.TypeOf((*ArrayOfVsanHostRuntimeInfoDiskIssue)(nil)).Elem()
+}
+
+type ArrayOfVsanNewPolicyBatch struct {
+	VsanNewPolicyBatch []VsanNewPolicyBatch `xml:"VsanNewPolicyBatch,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVsanNewPolicyBatch"] = reflect.TypeOf((*ArrayOfVsanNewPolicyBatch)(nil)).Elem()
+}
+
+type ArrayOfVsanPolicyChangeBatch struct {
+	VsanPolicyChangeBatch []VsanPolicyChangeBatch `xml:"VsanPolicyChangeBatch,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVsanPolicyChangeBatch"] = reflect.TypeOf((*ArrayOfVsanPolicyChangeBatch)(nil)).Elem()
+}
+
+type ArrayOfVsanPolicySatisfiability struct {
+	VsanPolicySatisfiability []VsanPolicySatisfiability `xml:"VsanPolicySatisfiability,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVsanPolicySatisfiability"] = reflect.TypeOf((*ArrayOfVsanPolicySatisfiability)(nil)).Elem()
+}
+
+type ArrayOfVsanUpgradeSystemNetworkPartitionInfo struct {
+	VsanUpgradeSystemNetworkPartitionInfo []VsanUpgradeSystemNetworkPartitionInfo `xml:"VsanUpgradeSystemNetworkPartitionInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVsanUpgradeSystemNetworkPartitionInfo"] = reflect.TypeOf((*ArrayOfVsanUpgradeSystemNetworkPartitionInfo)(nil)).Elem()
+}
+
+type ArrayOfVsanUpgradeSystemPreflightCheckIssue struct {
+	VsanUpgradeSystemPreflightCheckIssue []BaseVsanUpgradeSystemPreflightCheckIssue `xml:"VsanUpgradeSystemPreflightCheckIssue,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfVsanUpgradeSystemPreflightCheckIssue"] = reflect.TypeOf((*ArrayOfVsanUpgradeSystemPreflightCheckIssue)(nil)).Elem()
+}
+
+type ArrayOfVsanUpgradeSystemUpgradeHistoryItem struct {
+	VsanUpgradeSystemUpgradeHistoryItem []BaseVsanUpgradeSystemUpgradeHistoryItem `xml:"VsanUpgradeSystemUpgradeHistoryItem,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayOfVsanUpgradeSystemUpgradeHistoryItem"] = reflect.TypeOf((*ArrayOfVsanUpgradeSystemUpgradeHistoryItem)(nil)).Elem()
+}
+
+type ArrayOfVslmTagEntry struct {
+	VslmTagEntry []VslmTagEntry `xml:"VslmTagEntry,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVslmTagEntry"] = reflect.TypeOf((*ArrayOfVslmTagEntry)(nil)).Elem()
+}
+
+type ArrayUpdateSpec struct {
+	DynamicData
+
+	Operation ArrayUpdateOperation `xml:"operation"`
+	RemoveKey AnyType              `xml:"removeKey,omitempty,typeattr"`
+}
+
+func init() {
+	t["ArrayUpdateSpec"] = reflect.TypeOf((*ArrayUpdateSpec)(nil)).Elem()
+}
+
+type AssignUserToGroup AssignUserToGroupRequestType
+
+func init() {
+	t["AssignUserToGroup"] = reflect.TypeOf((*AssignUserToGroup)(nil)).Elem()
+}
+
+type AssignUserToGroupRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	User  string                 `xml:"user"`
+	Group string                 `xml:"group"`
+}
+
+func init() {
+	t["AssignUserToGroupRequestType"] = reflect.TypeOf((*AssignUserToGroupRequestType)(nil)).Elem()
+}
+
+type AssignUserToGroupResponse struct {
+}
+
+type AssociateProfile AssociateProfileRequestType
+
+func init() {
+	t["AssociateProfile"] = reflect.TypeOf((*AssociateProfile)(nil)).Elem()
+}
+
+type AssociateProfileRequestType struct {
+	This   ManagedObjectReference   `xml:"_this"`
+	Entity []ManagedObjectReference `xml:"entity"`
+}
+
+func init() {
+	t["AssociateProfileRequestType"] = reflect.TypeOf((*AssociateProfileRequestType)(nil)).Elem()
+}
+
+type AssociateProfileResponse struct {
+}
+
+type AttachDiskRequestType struct {
+	This          ManagedObjectReference `xml:"_this"`
+	DiskId        ID                     `xml:"diskId"`
+	Datastore     ManagedObjectReference `xml:"datastore"`
+	ControllerKey int32                  `xml:"controllerKey,omitempty"`
+	UnitNumber    *int32                 `xml:"unitNumber"`
+}
+
+func init() {
+	t["AttachDiskRequestType"] = reflect.TypeOf((*AttachDiskRequestType)(nil)).Elem()
+}
+
+type AttachDisk_Task AttachDiskRequestType
+
+func init() {
+	t["AttachDisk_Task"] = reflect.TypeOf((*AttachDisk_Task)(nil)).Elem()
+}
+
+type AttachDisk_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type AttachScsiLun AttachScsiLunRequestType
+
+func init() {
+	t["AttachScsiLun"] = reflect.TypeOf((*AttachScsiLun)(nil)).Elem()
+}
+
+type AttachScsiLunExRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	LunUuid []string               `xml:"lunUuid"`
+}
+
+func init() {
+	t["AttachScsiLunExRequestType"] = reflect.TypeOf((*AttachScsiLunExRequestType)(nil)).Elem()
+}
+
+type AttachScsiLunEx_Task AttachScsiLunExRequestType
+
+func init() {
+	t["AttachScsiLunEx_Task"] = reflect.TypeOf((*AttachScsiLunEx_Task)(nil)).Elem()
+}
+
+type AttachScsiLunEx_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type AttachScsiLunRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	LunUuid string                 `xml:"lunUuid"`
+}
+
+func init() {
+	t["AttachScsiLunRequestType"] = reflect.TypeOf((*AttachScsiLunRequestType)(nil)).Elem()
+}
+
+type AttachScsiLunResponse struct {
+}
+
+type AttachTagToVStorageObject AttachTagToVStorageObjectRequestType
+
+func init() {
+	t["AttachTagToVStorageObject"] = reflect.TypeOf((*AttachTagToVStorageObject)(nil)).Elem()
+}
+
+type AttachTagToVStorageObjectRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	Id       ID                     `xml:"id"`
+	Category string                 `xml:"category"`
+	Tag      string                 `xml:"tag"`
+}
+
+func init() {
+	t["AttachTagToVStorageObjectRequestType"] = reflect.TypeOf((*AttachTagToVStorageObjectRequestType)(nil)).Elem()
+}
+
+type AttachTagToVStorageObjectResponse struct {
+}
+
+type AttachVmfsExtent AttachVmfsExtentRequestType
+
+func init() {
+	t["AttachVmfsExtent"] = reflect.TypeOf((*AttachVmfsExtent)(nil)).Elem()
+}
+
+type AttachVmfsExtentRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	VmfsPath string                 `xml:"vmfsPath"`
+	Extent   HostScsiDiskPartition  `xml:"extent"`
+}
+
+func init() {
+	t["AttachVmfsExtentRequestType"] = reflect.TypeOf((*AttachVmfsExtentRequestType)(nil)).Elem()
+}
+
+type AttachVmfsExtentResponse struct {
+}
+
+type AuthMinimumAdminPermission struct {
+	VimFault
+}
+
+func init() {
+	t["AuthMinimumAdminPermission"] = reflect.TypeOf((*AuthMinimumAdminPermission)(nil)).Elem()
+}
+
+type AuthMinimumAdminPermissionFault AuthMinimumAdminPermission
+
+func init() {
+	t["AuthMinimumAdminPermissionFault"] = reflect.TypeOf((*AuthMinimumAdminPermissionFault)(nil)).Elem()
+}
+
+type AuthenticationProfile struct {
+	ApplyProfile
+
+	ActiveDirectory *ActiveDirectoryProfile `xml:"activeDirectory,omitempty"`
+}
+
+func init() {
+	t["AuthenticationProfile"] = reflect.TypeOf((*AuthenticationProfile)(nil)).Elem()
+}
+
+type AuthorizationDescription struct {
+	DynamicData
+
+	Privilege      []BaseElementDescription `xml:"privilege,typeattr"`
+	PrivilegeGroup []BaseElementDescription `xml:"privilegeGroup,typeattr"`
+}
+
+func init() {
+	t["AuthorizationDescription"] = reflect.TypeOf((*AuthorizationDescription)(nil)).Elem()
+}
+
+type AuthorizationEvent struct {
+	Event
+}
+
+func init() {
+	t["AuthorizationEvent"] = reflect.TypeOf((*AuthorizationEvent)(nil)).Elem()
+}
+
+type AuthorizationPrivilege struct {
+	DynamicData
+
+	PrivId        string `xml:"privId"`
+	OnParent      bool   `xml:"onParent"`
+	Name          string `xml:"name"`
+	PrivGroupName string `xml:"privGroupName"`
+}
+
+func init() {
+	t["AuthorizationPrivilege"] = reflect.TypeOf((*AuthorizationPrivilege)(nil)).Elem()
+}
+
+type AuthorizationRole struct {
+	DynamicData
+
+	RoleId    int32           `xml:"roleId"`
+	System    bool            `xml:"system"`
+	Name      string          `xml:"name"`
+	Info      BaseDescription `xml:"info,typeattr"`
+	Privilege []string        `xml:"privilege,omitempty"`
+}
+
+func init() {
+	t["AuthorizationRole"] = reflect.TypeOf((*AuthorizationRole)(nil)).Elem()
+}
+
+type AutoStartDefaults struct {
+	DynamicData
+
+	Enabled          *bool  `xml:"enabled"`
+	StartDelay       int32  `xml:"startDelay,omitempty"`
+	StopDelay        int32  `xml:"stopDelay,omitempty"`
+	WaitForHeartbeat *bool  `xml:"waitForHeartbeat"`
+	StopAction       string `xml:"stopAction,omitempty"`
+}
+
+func init() {
+	t["AutoStartDefaults"] = reflect.TypeOf((*AutoStartDefaults)(nil)).Elem()
+}
+
+type AutoStartPowerInfo struct {
+	DynamicData
+
+	Key              ManagedObjectReference        `xml:"key"`
+	StartOrder       int32                         `xml:"startOrder"`
+	StartDelay       int32                         `xml:"startDelay"`
+	WaitForHeartbeat AutoStartWaitHeartbeatSetting `xml:"waitForHeartbeat"`
+	StartAction      string                        `xml:"startAction"`
+	StopDelay        int32                         `xml:"stopDelay"`
+	StopAction       string                        `xml:"stopAction"`
+}
+
+func init() {
+	t["AutoStartPowerInfo"] = reflect.TypeOf((*AutoStartPowerInfo)(nil)).Elem()
+}
+
+type AutoStartPowerOff AutoStartPowerOffRequestType
+
+func init() {
+	t["AutoStartPowerOff"] = reflect.TypeOf((*AutoStartPowerOff)(nil)).Elem()
+}
+
+type AutoStartPowerOffRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["AutoStartPowerOffRequestType"] = reflect.TypeOf((*AutoStartPowerOffRequestType)(nil)).Elem()
+}
+
+type AutoStartPowerOffResponse struct {
+}
+
+type AutoStartPowerOn AutoStartPowerOnRequestType
+
+func init() {
+	t["AutoStartPowerOn"] = reflect.TypeOf((*AutoStartPowerOn)(nil)).Elem()
+}
+
+type AutoStartPowerOnRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["AutoStartPowerOnRequestType"] = reflect.TypeOf((*AutoStartPowerOnRequestType)(nil)).Elem()
+}
+
+type AutoStartPowerOnResponse struct {
+}
+
+type BackupBlobReadFailure struct {
+	DvsFault
+
+	EntityName string               `xml:"entityName"`
+	EntityType string               `xml:"entityType"`
+	Fault      LocalizedMethodFault `xml:"fault"`
+}
+
+func init() {
+	t["BackupBlobReadFailure"] = reflect.TypeOf((*BackupBlobReadFailure)(nil)).Elem()
+}
+
+type BackupBlobReadFailureFault BackupBlobReadFailure
+
+func init() {
+	t["BackupBlobReadFailureFault"] = reflect.TypeOf((*BackupBlobReadFailureFault)(nil)).Elem()
+}
+
+type BackupBlobWriteFailure struct {
+	DvsFault
+
+	EntityName string               `xml:"entityName"`
+	EntityType string               `xml:"entityType"`
+	Fault      LocalizedMethodFault `xml:"fault"`
+}
+
+func init() {
+	t["BackupBlobWriteFailure"] = reflect.TypeOf((*BackupBlobWriteFailure)(nil)).Elem()
+}
+
+type BackupBlobWriteFailureFault BackupBlobWriteFailure
+
+func init() {
+	t["BackupBlobWriteFailureFault"] = reflect.TypeOf((*BackupBlobWriteFailureFault)(nil)).Elem()
+}
+
+type BackupFirmwareConfiguration BackupFirmwareConfigurationRequestType
+
+func init() {
+	t["BackupFirmwareConfiguration"] = reflect.TypeOf((*BackupFirmwareConfiguration)(nil)).Elem()
+}
+
+type BackupFirmwareConfigurationRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["BackupFirmwareConfigurationRequestType"] = reflect.TypeOf((*BackupFirmwareConfigurationRequestType)(nil)).Elem()
+}
+
+type BackupFirmwareConfigurationResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type BadUsernameSessionEvent struct {
+	SessionEvent
+
+	IpAddress string `xml:"ipAddress"`
+}
+
+func init() {
+	t["BadUsernameSessionEvent"] = reflect.TypeOf((*BadUsernameSessionEvent)(nil)).Elem()
+}
+
+type BaseConfigInfo struct {
+	DynamicData
+
+	Id         ID                            `xml:"id"`
+	Name       string                        `xml:"name"`
+	CreateTime time.Time                     `xml:"createTime"`
+	Backing    BaseBaseConfigInfoBackingInfo `xml:"backing,typeattr"`
+}
+
+func init() {
+	t["BaseConfigInfo"] = reflect.TypeOf((*BaseConfigInfo)(nil)).Elem()
+}
+
+type BaseConfigInfoBackingInfo struct {
+	DynamicData
+
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["BaseConfigInfoBackingInfo"] = reflect.TypeOf((*BaseConfigInfoBackingInfo)(nil)).Elem()
+}
+
+type BaseConfigInfoDiskFileBackingInfo struct {
+	BaseConfigInfoFileBackingInfo
+
+	ProvisioningType string `xml:"provisioningType"`
+}
+
+func init() {
+	t["BaseConfigInfoDiskFileBackingInfo"] = reflect.TypeOf((*BaseConfigInfoDiskFileBackingInfo)(nil)).Elem()
+}
+
+type BaseConfigInfoFileBackingInfo struct {
+	BaseConfigInfoBackingInfo
+
+	FilePath        string                            `xml:"filePath"`
+	BackingObjectId string                            `xml:"backingObjectId,omitempty"`
+	Parent          BaseBaseConfigInfoFileBackingInfo `xml:"parent,omitempty,typeattr"`
+	DeltaSizeInMB   int64                             `xml:"deltaSizeInMB,omitempty"`
+}
+
+func init() {
+	t["BaseConfigInfoFileBackingInfo"] = reflect.TypeOf((*BaseConfigInfoFileBackingInfo)(nil)).Elem()
+}
+
+type BaseConfigInfoRawDiskMappingBackingInfo struct {
+	BaseConfigInfoFileBackingInfo
+
+	LunUuid           string `xml:"lunUuid"`
+	CompatibilityMode string `xml:"compatibilityMode"`
+}
+
+func init() {
+	t["BaseConfigInfoRawDiskMappingBackingInfo"] = reflect.TypeOf((*BaseConfigInfoRawDiskMappingBackingInfo)(nil)).Elem()
+}
+
+type BatchResult struct {
+	DynamicData
+
+	Result  string                  `xml:"result"`
+	HostKey string                  `xml:"hostKey"`
+	Ds      *ManagedObjectReference `xml:"ds,omitempty"`
+	Fault   *LocalizedMethodFault   `xml:"fault,omitempty"`
+}
+
+func init() {
+	t["BatchResult"] = reflect.TypeOf((*BatchResult)(nil)).Elem()
+}
+
+type BindVnic BindVnicRequestType
+
+func init() {
+	t["BindVnic"] = reflect.TypeOf((*BindVnic)(nil)).Elem()
+}
+
+type BindVnicRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	IScsiHbaName string                 `xml:"iScsiHbaName"`
+	VnicDevice   string                 `xml:"vnicDevice"`
+}
+
+func init() {
+	t["BindVnicRequestType"] = reflect.TypeOf((*BindVnicRequestType)(nil)).Elem()
+}
+
+type BindVnicResponse struct {
+}
+
+type BlockedByFirewall struct {
+	HostConfigFault
+}
+
+func init() {
+	t["BlockedByFirewall"] = reflect.TypeOf((*BlockedByFirewall)(nil)).Elem()
+}
+
+type BlockedByFirewallFault BlockedByFirewall
+
+func init() {
+	t["BlockedByFirewallFault"] = reflect.TypeOf((*BlockedByFirewallFault)(nil)).Elem()
+}
+
+type BoolOption struct {
+	OptionType
+
+	Supported    bool `xml:"supported"`
+	DefaultValue bool `xml:"defaultValue"`
+}
+
+func init() {
+	t["BoolOption"] = reflect.TypeOf((*BoolOption)(nil)).Elem()
+}
+
+type BoolPolicy struct {
+	InheritablePolicy
+
+	Value *bool `xml:"value"`
+}
+
+func init() {
+	t["BoolPolicy"] = reflect.TypeOf((*BoolPolicy)(nil)).Elem()
+}
+
+type BrowseDiagnosticLog BrowseDiagnosticLogRequestType
+
+func init() {
+	t["BrowseDiagnosticLog"] = reflect.TypeOf((*BrowseDiagnosticLog)(nil)).Elem()
+}
+
+type BrowseDiagnosticLogRequestType struct {
+	This  ManagedObjectReference  `xml:"_this"`
+	Host  *ManagedObjectReference `xml:"host,omitempty"`
+	Key   string                  `xml:"key"`
+	Start int32                   `xml:"start,omitempty"`
+	Lines int32                   `xml:"lines,omitempty"`
+}
+
+func init() {
+	t["BrowseDiagnosticLogRequestType"] = reflect.TypeOf((*BrowseDiagnosticLogRequestType)(nil)).Elem()
+}
+
+type BrowseDiagnosticLogResponse struct {
+	Returnval DiagnosticManagerLogHeader `xml:"returnval"`
+}
+
+type CAMServerRefusedConnection struct {
+	InvalidCAMServer
+}
+
+func init() {
+	t["CAMServerRefusedConnection"] = reflect.TypeOf((*CAMServerRefusedConnection)(nil)).Elem()
+}
+
+type CAMServerRefusedConnectionFault CAMServerRefusedConnection
+
+func init() {
+	t["CAMServerRefusedConnectionFault"] = reflect.TypeOf((*CAMServerRefusedConnectionFault)(nil)).Elem()
+}
+
+type CanProvisionObjects CanProvisionObjectsRequestType
+
+func init() {
+	t["CanProvisionObjects"] = reflect.TypeOf((*CanProvisionObjects)(nil)).Elem()
+}
+
+type CanProvisionObjectsRequestType struct {
+	This                 ManagedObjectReference `xml:"_this"`
+	Npbs                 []VsanNewPolicyBatch   `xml:"npbs"`
+	IgnoreSatisfiability *bool                  `xml:"ignoreSatisfiability"`
+}
+
+func init() {
+	t["CanProvisionObjectsRequestType"] = reflect.TypeOf((*CanProvisionObjectsRequestType)(nil)).Elem()
+}
+
+type CanProvisionObjectsResponse struct {
+	Returnval []VsanPolicySatisfiability `xml:"returnval"`
+}
+
+type CancelRecommendation CancelRecommendationRequestType
+
+func init() {
+	t["CancelRecommendation"] = reflect.TypeOf((*CancelRecommendation)(nil)).Elem()
+}
+
+type CancelRecommendationRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Key  string                 `xml:"key"`
+}
+
+func init() {
+	t["CancelRecommendationRequestType"] = reflect.TypeOf((*CancelRecommendationRequestType)(nil)).Elem()
+}
+
+type CancelRecommendationResponse struct {
+}
+
+type CancelRetrievePropertiesEx CancelRetrievePropertiesExRequestType
+
+func init() {
+	t["CancelRetrievePropertiesEx"] = reflect.TypeOf((*CancelRetrievePropertiesEx)(nil)).Elem()
+}
+
+type CancelRetrievePropertiesExRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Token string                 `xml:"token"`
+}
+
+func init() {
+	t["CancelRetrievePropertiesExRequestType"] = reflect.TypeOf((*CancelRetrievePropertiesExRequestType)(nil)).Elem()
+}
+
+type CancelRetrievePropertiesExResponse struct {
+}
+
+type CancelStorageDrsRecommendation CancelStorageDrsRecommendationRequestType
+
+func init() {
+	t["CancelStorageDrsRecommendation"] = reflect.TypeOf((*CancelStorageDrsRecommendation)(nil)).Elem()
+}
+
+type CancelStorageDrsRecommendationRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Key  []string               `xml:"key"`
+}
+
+func init() {
+	t["CancelStorageDrsRecommendationRequestType"] = reflect.TypeOf((*CancelStorageDrsRecommendationRequestType)(nil)).Elem()
+}
+
+type CancelStorageDrsRecommendationResponse struct {
+}
+
+type CancelTask CancelTaskRequestType
+
+func init() {
+	t["CancelTask"] = reflect.TypeOf((*CancelTask)(nil)).Elem()
+}
+
+type CancelTaskRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["CancelTaskRequestType"] = reflect.TypeOf((*CancelTaskRequestType)(nil)).Elem()
+}
+
+type CancelTaskResponse struct {
+}
+
+type CancelWaitForUpdates CancelWaitForUpdatesRequestType
+
+func init() {
+	t["CancelWaitForUpdates"] = reflect.TypeOf((*CancelWaitForUpdates)(nil)).Elem()
+}
+
+type CancelWaitForUpdatesRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["CancelWaitForUpdatesRequestType"] = reflect.TypeOf((*CancelWaitForUpdatesRequestType)(nil)).Elem()
+}
+
+type CancelWaitForUpdatesResponse struct {
+}
+
+type CanceledHostOperationEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["CanceledHostOperationEvent"] = reflect.TypeOf((*CanceledHostOperationEvent)(nil)).Elem()
+}
+
+type CannotAccessFile struct {
+	FileFault
+}
+
+func init() {
+	t["CannotAccessFile"] = reflect.TypeOf((*CannotAccessFile)(nil)).Elem()
+}
+
+type CannotAccessFileFault CannotAccessFile
+
+func init() {
+	t["CannotAccessFileFault"] = reflect.TypeOf((*CannotAccessFileFault)(nil)).Elem()
+}
+
+type CannotAccessLocalSource struct {
+	VimFault
+}
+
+func init() {
+	t["CannotAccessLocalSource"] = reflect.TypeOf((*CannotAccessLocalSource)(nil)).Elem()
+}
+
+type CannotAccessLocalSourceFault CannotAccessLocalSource
+
+func init() {
+	t["CannotAccessLocalSourceFault"] = reflect.TypeOf((*CannotAccessLocalSourceFault)(nil)).Elem()
+}
+
+type CannotAccessNetwork struct {
+	CannotAccessVmDevice
+
+	Network *ManagedObjectReference `xml:"network,omitempty"`
+}
+
+func init() {
+	t["CannotAccessNetwork"] = reflect.TypeOf((*CannotAccessNetwork)(nil)).Elem()
+}
+
+type CannotAccessNetworkFault BaseCannotAccessNetwork
+
+func init() {
+	t["CannotAccessNetworkFault"] = reflect.TypeOf((*CannotAccessNetworkFault)(nil)).Elem()
+}
+
+type CannotAccessVmComponent struct {
+	VmConfigFault
+}
+
+func init() {
+	t["CannotAccessVmComponent"] = reflect.TypeOf((*CannotAccessVmComponent)(nil)).Elem()
+}
+
+type CannotAccessVmComponentFault BaseCannotAccessVmComponent
+
+func init() {
+	t["CannotAccessVmComponentFault"] = reflect.TypeOf((*CannotAccessVmComponentFault)(nil)).Elem()
+}
+
+type CannotAccessVmConfig struct {
+	CannotAccessVmComponent
+
+	Reason LocalizedMethodFault `xml:"reason"`
+}
+
+func init() {
+	t["CannotAccessVmConfig"] = reflect.TypeOf((*CannotAccessVmConfig)(nil)).Elem()
+}
+
+type CannotAccessVmConfigFault CannotAccessVmConfig
+
+func init() {
+	t["CannotAccessVmConfigFault"] = reflect.TypeOf((*CannotAccessVmConfigFault)(nil)).Elem()
+}
+
+type CannotAccessVmDevice struct {
+	CannotAccessVmComponent
+
+	Device    string `xml:"device"`
+	Backing   string `xml:"backing"`
+	Connected bool   `xml:"connected"`
+}
+
+func init() {
+	t["CannotAccessVmDevice"] = reflect.TypeOf((*CannotAccessVmDevice)(nil)).Elem()
+}
+
+type CannotAccessVmDeviceFault BaseCannotAccessVmDevice
+
+func init() {
+	t["CannotAccessVmDeviceFault"] = reflect.TypeOf((*CannotAccessVmDeviceFault)(nil)).Elem()
+}
+
+type CannotAccessVmDisk struct {
+	CannotAccessVmDevice
+
+	Fault LocalizedMethodFault `xml:"fault"`
+}
+
+func init() {
+	t["CannotAccessVmDisk"] = reflect.TypeOf((*CannotAccessVmDisk)(nil)).Elem()
+}
+
+type CannotAccessVmDiskFault BaseCannotAccessVmDisk
+
+func init() {
+	t["CannotAccessVmDiskFault"] = reflect.TypeOf((*CannotAccessVmDiskFault)(nil)).Elem()
+}
+
+type CannotAddHostWithFTVmAsStandalone struct {
+	HostConnectFault
+}
+
+func init() {
+	t["CannotAddHostWithFTVmAsStandalone"] = reflect.TypeOf((*CannotAddHostWithFTVmAsStandalone)(nil)).Elem()
+}
+
+type CannotAddHostWithFTVmAsStandaloneFault CannotAddHostWithFTVmAsStandalone
+
+func init() {
+	t["CannotAddHostWithFTVmAsStandaloneFault"] = reflect.TypeOf((*CannotAddHostWithFTVmAsStandaloneFault)(nil)).Elem()
+}
+
+type CannotAddHostWithFTVmToDifferentCluster struct {
+	HostConnectFault
+}
+
+func init() {
+	t["CannotAddHostWithFTVmToDifferentCluster"] = reflect.TypeOf((*CannotAddHostWithFTVmToDifferentCluster)(nil)).Elem()
+}
+
+type CannotAddHostWithFTVmToDifferentClusterFault CannotAddHostWithFTVmToDifferentCluster
+
+func init() {
+	t["CannotAddHostWithFTVmToDifferentClusterFault"] = reflect.TypeOf((*CannotAddHostWithFTVmToDifferentClusterFault)(nil)).Elem()
+}
+
+type CannotAddHostWithFTVmToNonHACluster struct {
+	HostConnectFault
+}
+
+func init() {
+	t["CannotAddHostWithFTVmToNonHACluster"] = reflect.TypeOf((*CannotAddHostWithFTVmToNonHACluster)(nil)).Elem()
+}
+
+type CannotAddHostWithFTVmToNonHAClusterFault CannotAddHostWithFTVmToNonHACluster
+
+func init() {
+	t["CannotAddHostWithFTVmToNonHAClusterFault"] = reflect.TypeOf((*CannotAddHostWithFTVmToNonHAClusterFault)(nil)).Elem()
+}
+
+type CannotChangeDrsBehaviorForFtSecondary struct {
+	VmFaultToleranceIssue
+
+	Vm     ManagedObjectReference `xml:"vm"`
+	VmName string                 `xml:"vmName"`
+}
+
+func init() {
+	t["CannotChangeDrsBehaviorForFtSecondary"] = reflect.TypeOf((*CannotChangeDrsBehaviorForFtSecondary)(nil)).Elem()
+}
+
+type CannotChangeDrsBehaviorForFtSecondaryFault CannotChangeDrsBehaviorForFtSecondary
+
+func init() {
+	t["CannotChangeDrsBehaviorForFtSecondaryFault"] = reflect.TypeOf((*CannotChangeDrsBehaviorForFtSecondaryFault)(nil)).Elem()
+}
+
+type CannotChangeHaSettingsForFtSecondary struct {
+	VmFaultToleranceIssue
+
+	Vm     ManagedObjectReference `xml:"vm"`
+	VmName string                 `xml:"vmName"`
+}
+
+func init() {
+	t["CannotChangeHaSettingsForFtSecondary"] = reflect.TypeOf((*CannotChangeHaSettingsForFtSecondary)(nil)).Elem()
+}
+
+type CannotChangeHaSettingsForFtSecondaryFault CannotChangeHaSettingsForFtSecondary
+
+func init() {
+	t["CannotChangeHaSettingsForFtSecondaryFault"] = reflect.TypeOf((*CannotChangeHaSettingsForFtSecondaryFault)(nil)).Elem()
+}
+
+type CannotChangeVsanClusterUuid struct {
+	VsanFault
+}
+
+func init() {
+	t["CannotChangeVsanClusterUuid"] = reflect.TypeOf((*CannotChangeVsanClusterUuid)(nil)).Elem()
+}
+
+type CannotChangeVsanClusterUuidFault CannotChangeVsanClusterUuid
+
+func init() {
+	t["CannotChangeVsanClusterUuidFault"] = reflect.TypeOf((*CannotChangeVsanClusterUuidFault)(nil)).Elem()
+}
+
+type CannotChangeVsanNodeUuid struct {
+	VsanFault
+}
+
+func init() {
+	t["CannotChangeVsanNodeUuid"] = reflect.TypeOf((*CannotChangeVsanNodeUuid)(nil)).Elem()
+}
+
+type CannotChangeVsanNodeUuidFault CannotChangeVsanNodeUuid
+
+func init() {
+	t["CannotChangeVsanNodeUuidFault"] = reflect.TypeOf((*CannotChangeVsanNodeUuidFault)(nil)).Elem()
+}
+
+type CannotComputeFTCompatibleHosts struct {
+	VmFaultToleranceIssue
+
+	Vm     ManagedObjectReference `xml:"vm"`
+	VmName string                 `xml:"vmName"`
+}
+
+func init() {
+	t["CannotComputeFTCompatibleHosts"] = reflect.TypeOf((*CannotComputeFTCompatibleHosts)(nil)).Elem()
+}
+
+type CannotComputeFTCompatibleHostsFault CannotComputeFTCompatibleHosts
+
+func init() {
+	t["CannotComputeFTCompatibleHostsFault"] = reflect.TypeOf((*CannotComputeFTCompatibleHostsFault)(nil)).Elem()
+}
+
+type CannotCreateFile struct {
+	FileFault
+}
+
+func init() {
+	t["CannotCreateFile"] = reflect.TypeOf((*CannotCreateFile)(nil)).Elem()
+}
+
+type CannotCreateFileFault CannotCreateFile
+
+func init() {
+	t["CannotCreateFileFault"] = reflect.TypeOf((*CannotCreateFileFault)(nil)).Elem()
+}
+
+type CannotDecryptPasswords struct {
+	CustomizationFault
+}
+
+func init() {
+	t["CannotDecryptPasswords"] = reflect.TypeOf((*CannotDecryptPasswords)(nil)).Elem()
+}
+
+type CannotDecryptPasswordsFault CannotDecryptPasswords
+
+func init() {
+	t["CannotDecryptPasswordsFault"] = reflect.TypeOf((*CannotDecryptPasswordsFault)(nil)).Elem()
+}
+
+type CannotDeleteFile struct {
+	FileFault
+}
+
+func init() {
+	t["CannotDeleteFile"] = reflect.TypeOf((*CannotDeleteFile)(nil)).Elem()
+}
+
+type CannotDeleteFileFault CannotDeleteFile
+
+func init() {
+	t["CannotDeleteFileFault"] = reflect.TypeOf((*CannotDeleteFileFault)(nil)).Elem()
+}
+
+type CannotDisableDrsOnClustersWithVApps struct {
+	RuntimeFault
+}
+
+func init() {
+	t["CannotDisableDrsOnClustersWithVApps"] = reflect.TypeOf((*CannotDisableDrsOnClustersWithVApps)(nil)).Elem()
+}
+
+type CannotDisableDrsOnClustersWithVAppsFault CannotDisableDrsOnClustersWithVApps
+
+func init() {
+	t["CannotDisableDrsOnClustersWithVAppsFault"] = reflect.TypeOf((*CannotDisableDrsOnClustersWithVAppsFault)(nil)).Elem()
+}
+
+type CannotDisableSnapshot struct {
+	VmConfigFault
+}
+
+func init() {
+	t["CannotDisableSnapshot"] = reflect.TypeOf((*CannotDisableSnapshot)(nil)).Elem()
+}
+
+type CannotDisableSnapshotFault CannotDisableSnapshot
+
+func init() {
+	t["CannotDisableSnapshotFault"] = reflect.TypeOf((*CannotDisableSnapshotFault)(nil)).Elem()
+}
+
+type CannotDisconnectHostWithFaultToleranceVm struct {
+	VimFault
+
+	HostName string `xml:"hostName"`
+}
+
+func init() {
+	t["CannotDisconnectHostWithFaultToleranceVm"] = reflect.TypeOf((*CannotDisconnectHostWithFaultToleranceVm)(nil)).Elem()
+}
+
+type CannotDisconnectHostWithFaultToleranceVmFault CannotDisconnectHostWithFaultToleranceVm
+
+func init() {
+	t["CannotDisconnectHostWithFaultToleranceVmFault"] = reflect.TypeOf((*CannotDisconnectHostWithFaultToleranceVmFault)(nil)).Elem()
+}
+
+type CannotEnableVmcpForCluster struct {
+	VimFault
+
+	Host     *ManagedObjectReference `xml:"host,omitempty"`
+	HostName string                  `xml:"hostName,omitempty"`
+	Reason   string                  `xml:"reason,omitempty"`
+}
+
+func init() {
+	t["CannotEnableVmcpForCluster"] = reflect.TypeOf((*CannotEnableVmcpForCluster)(nil)).Elem()
+}
+
+type CannotEnableVmcpForClusterFault CannotEnableVmcpForCluster
+
+func init() {
+	t["CannotEnableVmcpForClusterFault"] = reflect.TypeOf((*CannotEnableVmcpForClusterFault)(nil)).Elem()
+}
+
+type CannotModifyConfigCpuRequirements struct {
+	MigrationFault
+}
+
+func init() {
+	t["CannotModifyConfigCpuRequirements"] = reflect.TypeOf((*CannotModifyConfigCpuRequirements)(nil)).Elem()
+}
+
+type CannotModifyConfigCpuRequirementsFault CannotModifyConfigCpuRequirements
+
+func init() {
+	t["CannotModifyConfigCpuRequirementsFault"] = reflect.TypeOf((*CannotModifyConfigCpuRequirementsFault)(nil)).Elem()
+}
+
+type CannotMoveFaultToleranceVm struct {
+	VimFault
+
+	MoveType string `xml:"moveType"`
+	VmName   string `xml:"vmName"`
+}
+
+func init() {
+	t["CannotMoveFaultToleranceVm"] = reflect.TypeOf((*CannotMoveFaultToleranceVm)(nil)).Elem()
+}
+
+type CannotMoveFaultToleranceVmFault CannotMoveFaultToleranceVm
+
+func init() {
+	t["CannotMoveFaultToleranceVmFault"] = reflect.TypeOf((*CannotMoveFaultToleranceVmFault)(nil)).Elem()
+}
+
+type CannotMoveHostWithFaultToleranceVm struct {
+	VimFault
+}
+
+func init() {
+	t["CannotMoveHostWithFaultToleranceVm"] = reflect.TypeOf((*CannotMoveHostWithFaultToleranceVm)(nil)).Elem()
+}
+
+type CannotMoveHostWithFaultToleranceVmFault CannotMoveHostWithFaultToleranceVm
+
+func init() {
+	t["CannotMoveHostWithFaultToleranceVmFault"] = reflect.TypeOf((*CannotMoveHostWithFaultToleranceVmFault)(nil)).Elem()
+}
+
+type CannotMoveVmWithDeltaDisk struct {
+	MigrationFault
+
+	Device string `xml:"device"`
+}
+
+func init() {
+	t["CannotMoveVmWithDeltaDisk"] = reflect.TypeOf((*CannotMoveVmWithDeltaDisk)(nil)).Elem()
+}
+
+type CannotMoveVmWithDeltaDiskFault CannotMoveVmWithDeltaDisk
+
+func init() {
+	t["CannotMoveVmWithDeltaDiskFault"] = reflect.TypeOf((*CannotMoveVmWithDeltaDiskFault)(nil)).Elem()
+}
+
+type CannotMoveVmWithNativeDeltaDisk struct {
+	MigrationFault
+}
+
+func init() {
+	t["CannotMoveVmWithNativeDeltaDisk"] = reflect.TypeOf((*CannotMoveVmWithNativeDeltaDisk)(nil)).Elem()
+}
+
+type CannotMoveVmWithNativeDeltaDiskFault CannotMoveVmWithNativeDeltaDisk
+
+func init() {
+	t["CannotMoveVmWithNativeDeltaDiskFault"] = reflect.TypeOf((*CannotMoveVmWithNativeDeltaDiskFault)(nil)).Elem()
+}
+
+type CannotMoveVsanEnabledHost struct {
+	VsanFault
+}
+
+func init() {
+	t["CannotMoveVsanEnabledHost"] = reflect.TypeOf((*CannotMoveVsanEnabledHost)(nil)).Elem()
+}
+
+type CannotMoveVsanEnabledHostFault BaseCannotMoveVsanEnabledHost
+
+func init() {
+	t["CannotMoveVsanEnabledHostFault"] = reflect.TypeOf((*CannotMoveVsanEnabledHostFault)(nil)).Elem()
+}
+
+type CannotPlaceWithoutPrerequisiteMoves struct {
+	VimFault
+}
+
+func init() {
+	t["CannotPlaceWithoutPrerequisiteMoves"] = reflect.TypeOf((*CannotPlaceWithoutPrerequisiteMoves)(nil)).Elem()
+}
+
+type CannotPlaceWithoutPrerequisiteMovesFault CannotPlaceWithoutPrerequisiteMoves
+
+func init() {
+	t["CannotPlaceWithoutPrerequisiteMovesFault"] = reflect.TypeOf((*CannotPlaceWithoutPrerequisiteMovesFault)(nil)).Elem()
+}
+
+type CannotPowerOffVmInCluster struct {
+	InvalidState
+
+	Operation string                 `xml:"operation"`
+	Vm        ManagedObjectReference `xml:"vm"`
+	VmName    string                 `xml:"vmName"`
+}
+
+func init() {
+	t["CannotPowerOffVmInCluster"] = reflect.TypeOf((*CannotPowerOffVmInCluster)(nil)).Elem()
+}
+
+type CannotPowerOffVmInClusterFault CannotPowerOffVmInCluster
+
+func init() {
+	t["CannotPowerOffVmInClusterFault"] = reflect.TypeOf((*CannotPowerOffVmInClusterFault)(nil)).Elem()
+}
+
+type CannotReconfigureVsanWhenHaEnabled struct {
+	VsanFault
+}
+
+func init() {
+	t["CannotReconfigureVsanWhenHaEnabled"] = reflect.TypeOf((*CannotReconfigureVsanWhenHaEnabled)(nil)).Elem()
+}
+
+type CannotReconfigureVsanWhenHaEnabledFault CannotReconfigureVsanWhenHaEnabled
+
+func init() {
+	t["CannotReconfigureVsanWhenHaEnabledFault"] = reflect.TypeOf((*CannotReconfigureVsanWhenHaEnabledFault)(nil)).Elem()
+}
+
+type CannotUseNetwork struct {
+	VmConfigFault
+
+	Device    string                  `xml:"device"`
+	Backing   string                  `xml:"backing"`
+	Connected bool                    `xml:"connected"`
+	Reason    string                  `xml:"reason"`
+	Network   *ManagedObjectReference `xml:"network,omitempty"`
+}
+
+func init() {
+	t["CannotUseNetwork"] = reflect.TypeOf((*CannotUseNetwork)(nil)).Elem()
+}
+
+type CannotUseNetworkFault CannotUseNetwork
+
+func init() {
+	t["CannotUseNetworkFault"] = reflect.TypeOf((*CannotUseNetworkFault)(nil)).Elem()
+}
+
+type Capability struct {
+	DynamicData
+
+	ProvisioningSupported            bool      `xml:"provisioningSupported"`
+	MultiHostSupported               bool      `xml:"multiHostSupported"`
+	UserShellAccessSupported         bool      `xml:"userShellAccessSupported"`
+	SupportedEVCMode                 []EVCMode `xml:"supportedEVCMode,omitempty"`
+	NetworkBackupAndRestoreSupported *bool     `xml:"networkBackupAndRestoreSupported"`
+}
+
+func init() {
+	t["Capability"] = reflect.TypeOf((*Capability)(nil)).Elem()
+}
+
+type CertMgrRefreshCACertificatesAndCRLsRequestType struct {
+	This ManagedObjectReference   `xml:"_this"`
+	Host []ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["CertMgrRefreshCACertificatesAndCRLsRequestType"] = reflect.TypeOf((*CertMgrRefreshCACertificatesAndCRLsRequestType)(nil)).Elem()
+}
+
+type CertMgrRefreshCACertificatesAndCRLs_Task CertMgrRefreshCACertificatesAndCRLsRequestType
+
+func init() {
+	t["CertMgrRefreshCACertificatesAndCRLs_Task"] = reflect.TypeOf((*CertMgrRefreshCACertificatesAndCRLs_Task)(nil)).Elem()
+}
+
+type CertMgrRefreshCACertificatesAndCRLs_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CertMgrRefreshCertificatesRequestType struct {
+	This ManagedObjectReference   `xml:"_this"`
+	Host []ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["CertMgrRefreshCertificatesRequestType"] = reflect.TypeOf((*CertMgrRefreshCertificatesRequestType)(nil)).Elem()
+}
+
+type CertMgrRefreshCertificates_Task CertMgrRefreshCertificatesRequestType
+
+func init() {
+	t["CertMgrRefreshCertificates_Task"] = reflect.TypeOf((*CertMgrRefreshCertificates_Task)(nil)).Elem()
+}
+
+type CertMgrRefreshCertificates_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CertMgrRevokeCertificatesRequestType struct {
+	This ManagedObjectReference   `xml:"_this"`
+	Host []ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["CertMgrRevokeCertificatesRequestType"] = reflect.TypeOf((*CertMgrRevokeCertificatesRequestType)(nil)).Elem()
+}
+
+type CertMgrRevokeCertificates_Task CertMgrRevokeCertificatesRequestType
+
+func init() {
+	t["CertMgrRevokeCertificates_Task"] = reflect.TypeOf((*CertMgrRevokeCertificates_Task)(nil)).Elem()
+}
+
+type CertMgrRevokeCertificates_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ChangeAccessMode ChangeAccessModeRequestType
+
+func init() {
+	t["ChangeAccessMode"] = reflect.TypeOf((*ChangeAccessMode)(nil)).Elem()
+}
+
+type ChangeAccessModeRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	Principal  string                 `xml:"principal"`
+	IsGroup    bool                   `xml:"isGroup"`
+	AccessMode HostAccessMode         `xml:"accessMode"`
+}
+
+func init() {
+	t["ChangeAccessModeRequestType"] = reflect.TypeOf((*ChangeAccessModeRequestType)(nil)).Elem()
+}
+
+type ChangeAccessModeResponse struct {
+}
+
+type ChangeFileAttributesInGuest ChangeFileAttributesInGuestRequestType
+
+func init() {
+	t["ChangeFileAttributesInGuest"] = reflect.TypeOf((*ChangeFileAttributesInGuest)(nil)).Elem()
+}
+
+type ChangeFileAttributesInGuestRequestType struct {
+	This           ManagedObjectReference  `xml:"_this"`
+	Vm             ManagedObjectReference  `xml:"vm"`
+	Auth           BaseGuestAuthentication `xml:"auth,typeattr"`
+	GuestFilePath  string                  `xml:"guestFilePath"`
+	FileAttributes BaseGuestFileAttributes `xml:"fileAttributes,typeattr"`
+}
+
+func init() {
+	t["ChangeFileAttributesInGuestRequestType"] = reflect.TypeOf((*ChangeFileAttributesInGuestRequestType)(nil)).Elem()
+}
+
+type ChangeFileAttributesInGuestResponse struct {
+}
+
+type ChangeLockdownMode ChangeLockdownModeRequestType
+
+func init() {
+	t["ChangeLockdownMode"] = reflect.TypeOf((*ChangeLockdownMode)(nil)).Elem()
+}
+
+type ChangeLockdownModeRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Mode HostLockdownMode       `xml:"mode"`
+}
+
+func init() {
+	t["ChangeLockdownModeRequestType"] = reflect.TypeOf((*ChangeLockdownModeRequestType)(nil)).Elem()
+}
+
+type ChangeLockdownModeResponse struct {
+}
+
+type ChangeNFSUserPassword ChangeNFSUserPasswordRequestType
+
+func init() {
+	t["ChangeNFSUserPassword"] = reflect.TypeOf((*ChangeNFSUserPassword)(nil)).Elem()
+}
+
+type ChangeNFSUserPasswordRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	Password string                 `xml:"password"`
+}
+
+func init() {
+	t["ChangeNFSUserPasswordRequestType"] = reflect.TypeOf((*ChangeNFSUserPasswordRequestType)(nil)).Elem()
+}
+
+type ChangeNFSUserPasswordResponse struct {
+}
+
+type ChangeOwner ChangeOwnerRequestType
+
+func init() {
+	t["ChangeOwner"] = reflect.TypeOf((*ChangeOwner)(nil)).Elem()
+}
+
+type ChangeOwnerRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Name       string                  `xml:"name"`
+	Datacenter *ManagedObjectReference `xml:"datacenter,omitempty"`
+	Owner      string                  `xml:"owner"`
+}
+
+func init() {
+	t["ChangeOwnerRequestType"] = reflect.TypeOf((*ChangeOwnerRequestType)(nil)).Elem()
+}
+
+type ChangeOwnerResponse struct {
+}
+
+type ChangesInfoEventArgument struct {
+	DynamicData
+
+	Modified string `xml:"modified,omitempty"`
+	Added    string `xml:"added,omitempty"`
+	Deleted  string `xml:"deleted,omitempty"`
+}
+
+func init() {
+	t["ChangesInfoEventArgument"] = reflect.TypeOf((*ChangesInfoEventArgument)(nil)).Elem()
+}
+
+type CheckAddHostEvcRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	CnxSpec HostConnectSpec        `xml:"cnxSpec"`
+}
+
+func init() {
+	t["CheckAddHostEvcRequestType"] = reflect.TypeOf((*CheckAddHostEvcRequestType)(nil)).Elem()
+}
+
+type CheckAddHostEvc_Task CheckAddHostEvcRequestType
+
+func init() {
+	t["CheckAddHostEvc_Task"] = reflect.TypeOf((*CheckAddHostEvc_Task)(nil)).Elem()
+}
+
+type CheckAddHostEvc_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CheckAnswerFileStatusRequestType struct {
+	This ManagedObjectReference   `xml:"_this"`
+	Host []ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["CheckAnswerFileStatusRequestType"] = reflect.TypeOf((*CheckAnswerFileStatusRequestType)(nil)).Elem()
+}
+
+type CheckAnswerFileStatus_Task CheckAnswerFileStatusRequestType
+
+func init() {
+	t["CheckAnswerFileStatus_Task"] = reflect.TypeOf((*CheckAnswerFileStatus_Task)(nil)).Elem()
+}
+
+type CheckAnswerFileStatus_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CheckCompatibilityRequestType 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["CheckCompatibilityRequestType"] = reflect.TypeOf((*CheckCompatibilityRequestType)(nil)).Elem()
+}
+
+type CheckCompatibility_Task CheckCompatibilityRequestType
+
+func init() {
+	t["CheckCompatibility_Task"] = reflect.TypeOf((*CheckCompatibility_Task)(nil)).Elem()
+}
+
+type CheckCompatibility_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CheckComplianceRequestType struct {
+	This    ManagedObjectReference   `xml:"_this"`
+	Profile []ManagedObjectReference `xml:"profile,omitempty"`
+	Entity  []ManagedObjectReference `xml:"entity,omitempty"`
+}
+
+func init() {
+	t["CheckComplianceRequestType"] = reflect.TypeOf((*CheckComplianceRequestType)(nil)).Elem()
+}
+
+type CheckCompliance_Task CheckComplianceRequestType
+
+func init() {
+	t["CheckCompliance_Task"] = reflect.TypeOf((*CheckCompliance_Task)(nil)).Elem()
+}
+
+type CheckCompliance_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CheckConfigureEvcModeRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	EvcModeKey string                 `xml:"evcModeKey"`
+}
+
+func init() {
+	t["CheckConfigureEvcModeRequestType"] = reflect.TypeOf((*CheckConfigureEvcModeRequestType)(nil)).Elem()
+}
+
+type CheckConfigureEvcMode_Task CheckConfigureEvcModeRequestType
+
+func init() {
+	t["CheckConfigureEvcMode_Task"] = reflect.TypeOf((*CheckConfigureEvcMode_Task)(nil)).Elem()
+}
+
+type CheckConfigureEvcMode_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CheckCustomizationResources CheckCustomizationResourcesRequestType
+
+func init() {
+	t["CheckCustomizationResources"] = reflect.TypeOf((*CheckCustomizationResources)(nil)).Elem()
+}
+
+type CheckCustomizationResourcesRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	GuestOs string                 `xml:"guestOs"`
+}
+
+func init() {
+	t["CheckCustomizationResourcesRequestType"] = reflect.TypeOf((*CheckCustomizationResourcesRequestType)(nil)).Elem()
+}
+
+type CheckCustomizationResourcesResponse struct {
+}
+
+type CheckCustomizationSpec CheckCustomizationSpecRequestType
+
+func init() {
+	t["CheckCustomizationSpec"] = reflect.TypeOf((*CheckCustomizationSpec)(nil)).Elem()
+}
+
+type CheckCustomizationSpecRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Spec CustomizationSpec      `xml:"spec"`
+}
+
+func init() {
+	t["CheckCustomizationSpecRequestType"] = reflect.TypeOf((*CheckCustomizationSpecRequestType)(nil)).Elem()
+}
+
+type CheckCustomizationSpecResponse struct {
+}
+
+type CheckForUpdates CheckForUpdatesRequestType
+
+func init() {
+	t["CheckForUpdates"] = reflect.TypeOf((*CheckForUpdates)(nil)).Elem()
+}
+
+type CheckForUpdatesRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Version string                 `xml:"version,omitempty"`
+}
+
+func init() {
+	t["CheckForUpdatesRequestType"] = reflect.TypeOf((*CheckForUpdatesRequestType)(nil)).Elem()
+}
+
+type CheckForUpdatesResponse struct {
+	Returnval *UpdateSet `xml:"returnval,omitempty"`
+}
+
+type CheckHostPatchRequestType struct {
+	This       ManagedObjectReference                     `xml:"_this"`
+	MetaUrls   []string                                   `xml:"metaUrls,omitempty"`
+	BundleUrls []string                                   `xml:"bundleUrls,omitempty"`
+	Spec       *HostPatchManagerPatchManagerOperationSpec `xml:"spec,omitempty"`
+}
+
+func init() {
+	t["CheckHostPatchRequestType"] = reflect.TypeOf((*CheckHostPatchRequestType)(nil)).Elem()
+}
+
+type CheckHostPatch_Task CheckHostPatchRequestType
+
+func init() {
+	t["CheckHostPatch_Task"] = reflect.TypeOf((*CheckHostPatch_Task)(nil)).Elem()
+}
+
+type CheckHostPatch_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CheckLicenseFeature CheckLicenseFeatureRequestType
+
+func init() {
+	t["CheckLicenseFeature"] = reflect.TypeOf((*CheckLicenseFeature)(nil)).Elem()
+}
+
+type CheckLicenseFeatureRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Host       *ManagedObjectReference `xml:"host,omitempty"`
+	FeatureKey string                  `xml:"featureKey"`
+}
+
+func init() {
+	t["CheckLicenseFeatureRequestType"] = reflect.TypeOf((*CheckLicenseFeatureRequestType)(nil)).Elem()
+}
+
+type CheckLicenseFeatureResponse struct {
+	Returnval bool `xml:"returnval"`
+}
+
+type CheckMigrateRequestType struct {
+	This     ManagedObjectReference   `xml:"_this"`
+	Vm       ManagedObjectReference   `xml:"vm"`
+	Host     *ManagedObjectReference  `xml:"host,omitempty"`
+	Pool     *ManagedObjectReference  `xml:"pool,omitempty"`
+	State    VirtualMachinePowerState `xml:"state,omitempty"`
+	TestType []string                 `xml:"testType,omitempty"`
+}
+
+func init() {
+	t["CheckMigrateRequestType"] = reflect.TypeOf((*CheckMigrateRequestType)(nil)).Elem()
+}
+
+type CheckMigrate_Task CheckMigrateRequestType
+
+func init() {
+	t["CheckMigrate_Task"] = reflect.TypeOf((*CheckMigrate_Task)(nil)).Elem()
+}
+
+type CheckMigrate_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CheckProfileComplianceRequestType struct {
+	This   ManagedObjectReference   `xml:"_this"`
+	Entity []ManagedObjectReference `xml:"entity,omitempty"`
+}
+
+func init() {
+	t["CheckProfileComplianceRequestType"] = reflect.TypeOf((*CheckProfileComplianceRequestType)(nil)).Elem()
+}
+
+type CheckProfileCompliance_Task CheckProfileComplianceRequestType
+
+func init() {
+	t["CheckProfileCompliance_Task"] = reflect.TypeOf((*CheckProfileCompliance_Task)(nil)).Elem()
+}
+
+type CheckProfileCompliance_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CheckRelocateRequestType struct {
+	This     ManagedObjectReference     `xml:"_this"`
+	Vm       ManagedObjectReference     `xml:"vm"`
+	Spec     VirtualMachineRelocateSpec `xml:"spec"`
+	TestType []string                   `xml:"testType,omitempty"`
+}
+
+func init() {
+	t["CheckRelocateRequestType"] = reflect.TypeOf((*CheckRelocateRequestType)(nil)).Elem()
+}
+
+type CheckRelocate_Task CheckRelocateRequestType
+
+func init() {
+	t["CheckRelocate_Task"] = reflect.TypeOf((*CheckRelocate_Task)(nil)).Elem()
+}
+
+type CheckRelocate_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CheckResult struct {
+	DynamicData
+
+	Vm      *ManagedObjectReference `xml:"vm,omitempty"`
+	Host    *ManagedObjectReference `xml:"host,omitempty"`
+	Warning []LocalizedMethodFault  `xml:"warning,omitempty"`
+	Error   []LocalizedMethodFault  `xml:"error,omitempty"`
+}
+
+func init() {
+	t["CheckResult"] = reflect.TypeOf((*CheckResult)(nil)).Elem()
+}
+
+type ChoiceOption struct {
+	OptionType
+
+	ChoiceInfo   []BaseElementDescription `xml:"choiceInfo,typeattr"`
+	DefaultIndex int32                    `xml:"defaultIndex,omitempty"`
+}
+
+func init() {
+	t["ChoiceOption"] = reflect.TypeOf((*ChoiceOption)(nil)).Elem()
+}
+
+type ClearComplianceStatus ClearComplianceStatusRequestType
+
+func init() {
+	t["ClearComplianceStatus"] = reflect.TypeOf((*ClearComplianceStatus)(nil)).Elem()
+}
+
+type ClearComplianceStatusRequestType struct {
+	This    ManagedObjectReference   `xml:"_this"`
+	Profile []ManagedObjectReference `xml:"profile,omitempty"`
+	Entity  []ManagedObjectReference `xml:"entity,omitempty"`
+}
+
+func init() {
+	t["ClearComplianceStatusRequestType"] = reflect.TypeOf((*ClearComplianceStatusRequestType)(nil)).Elem()
+}
+
+type ClearComplianceStatusResponse struct {
+}
+
+type ClearNFSUser ClearNFSUserRequestType
+
+func init() {
+	t["ClearNFSUser"] = reflect.TypeOf((*ClearNFSUser)(nil)).Elem()
+}
+
+type ClearNFSUserRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["ClearNFSUserRequestType"] = reflect.TypeOf((*ClearNFSUserRequestType)(nil)).Elem()
+}
+
+type ClearNFSUserResponse struct {
+}
+
+type ClearSystemEventLog ClearSystemEventLogRequestType
+
+func init() {
+	t["ClearSystemEventLog"] = reflect.TypeOf((*ClearSystemEventLog)(nil)).Elem()
+}
+
+type ClearSystemEventLogRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["ClearSystemEventLogRequestType"] = reflect.TypeOf((*ClearSystemEventLogRequestType)(nil)).Elem()
+}
+
+type ClearSystemEventLogResponse struct {
+}
+
+type ClockSkew struct {
+	HostConfigFault
+}
+
+func init() {
+	t["ClockSkew"] = reflect.TypeOf((*ClockSkew)(nil)).Elem()
+}
+
+type ClockSkewFault ClockSkew
+
+func init() {
+	t["ClockSkewFault"] = reflect.TypeOf((*ClockSkewFault)(nil)).Elem()
+}
+
+type CloneFromSnapshotNotSupported struct {
+	MigrationFault
+}
+
+func init() {
+	t["CloneFromSnapshotNotSupported"] = reflect.TypeOf((*CloneFromSnapshotNotSupported)(nil)).Elem()
+}
+
+type CloneFromSnapshotNotSupportedFault CloneFromSnapshotNotSupported
+
+func init() {
+	t["CloneFromSnapshotNotSupportedFault"] = reflect.TypeOf((*CloneFromSnapshotNotSupportedFault)(nil)).Elem()
+}
+
+type CloneSession CloneSessionRequestType
+
+func init() {
+	t["CloneSession"] = reflect.TypeOf((*CloneSession)(nil)).Elem()
+}
+
+type CloneSessionRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	CloneTicket string                 `xml:"cloneTicket"`
+}
+
+func init() {
+	t["CloneSessionRequestType"] = reflect.TypeOf((*CloneSessionRequestType)(nil)).Elem()
+}
+
+type CloneSessionResponse struct {
+	Returnval UserSession `xml:"returnval"`
+}
+
+type CloneVAppRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Name   string                 `xml:"name"`
+	Target ManagedObjectReference `xml:"target"`
+	Spec   VAppCloneSpec          `xml:"spec"`
+}
+
+func init() {
+	t["CloneVAppRequestType"] = reflect.TypeOf((*CloneVAppRequestType)(nil)).Elem()
+}
+
+type CloneVApp_Task CloneVAppRequestType
+
+func init() {
+	t["CloneVApp_Task"] = reflect.TypeOf((*CloneVApp_Task)(nil)).Elem()
+}
+
+type CloneVApp_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CloneVMRequestType struct {
+	This   ManagedObjectReference  `xml:"_this"`
+	Folder ManagedObjectReference  `xml:"folder"`
+	Name   string                  `xml:"name"`
+	Spec   VirtualMachineCloneSpec `xml:"spec"`
+}
+
+func init() {
+	t["CloneVMRequestType"] = reflect.TypeOf((*CloneVMRequestType)(nil)).Elem()
+}
+
+type CloneVM_Task CloneVMRequestType
+
+func init() {
+	t["CloneVM_Task"] = reflect.TypeOf((*CloneVM_Task)(nil)).Elem()
+}
+
+type CloneVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CloneVStorageObjectRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Id        ID                     `xml:"id"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+	Spec      VslmCloneSpec          `xml:"spec"`
+}
+
+func init() {
+	t["CloneVStorageObjectRequestType"] = reflect.TypeOf((*CloneVStorageObjectRequestType)(nil)).Elem()
+}
+
+type CloneVStorageObject_Task CloneVStorageObjectRequestType
+
+func init() {
+	t["CloneVStorageObject_Task"] = reflect.TypeOf((*CloneVStorageObject_Task)(nil)).Elem()
+}
+
+type CloneVStorageObject_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CloseInventoryViewFolder CloseInventoryViewFolderRequestType
+
+func init() {
+	t["CloseInventoryViewFolder"] = reflect.TypeOf((*CloseInventoryViewFolder)(nil)).Elem()
+}
+
+type CloseInventoryViewFolderRequestType struct {
+	This   ManagedObjectReference   `xml:"_this"`
+	Entity []ManagedObjectReference `xml:"entity"`
+}
+
+func init() {
+	t["CloseInventoryViewFolderRequestType"] = reflect.TypeOf((*CloseInventoryViewFolderRequestType)(nil)).Elem()
+}
+
+type CloseInventoryViewFolderResponse struct {
+	Returnval []ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type ClusterAction struct {
+	DynamicData
+
+	Type   string                  `xml:"type"`
+	Target *ManagedObjectReference `xml:"target,omitempty"`
+}
+
+func init() {
+	t["ClusterAction"] = reflect.TypeOf((*ClusterAction)(nil)).Elem()
+}
+
+type ClusterActionHistory struct {
+	DynamicData
+
+	Action BaseClusterAction `xml:"action,typeattr"`
+	Time   time.Time         `xml:"time"`
+}
+
+func init() {
+	t["ClusterActionHistory"] = reflect.TypeOf((*ClusterActionHistory)(nil)).Elem()
+}
+
+type ClusterAffinityRuleSpec struct {
+	ClusterRuleInfo
+
+	Vm []ManagedObjectReference `xml:"vm"`
+}
+
+func init() {
+	t["ClusterAffinityRuleSpec"] = reflect.TypeOf((*ClusterAffinityRuleSpec)(nil)).Elem()
+}
+
+type ClusterAntiAffinityRuleSpec struct {
+	ClusterRuleInfo
+
+	Vm []ManagedObjectReference `xml:"vm"`
+}
+
+func init() {
+	t["ClusterAntiAffinityRuleSpec"] = reflect.TypeOf((*ClusterAntiAffinityRuleSpec)(nil)).Elem()
+}
+
+type ClusterAttemptedVmInfo struct {
+	DynamicData
+
+	Vm   ManagedObjectReference  `xml:"vm"`
+	Task *ManagedObjectReference `xml:"task,omitempty"`
+}
+
+func init() {
+	t["ClusterAttemptedVmInfo"] = reflect.TypeOf((*ClusterAttemptedVmInfo)(nil)).Elem()
+}
+
+type ClusterComplianceCheckedEvent struct {
+	ClusterEvent
+
+	Profile ProfileEventArgument `xml:"profile"`
+}
+
+func init() {
+	t["ClusterComplianceCheckedEvent"] = reflect.TypeOf((*ClusterComplianceCheckedEvent)(nil)).Elem()
+}
+
+type ClusterComputeResourceSummary struct {
+	ComputeResourceSummary
+
+	CurrentFailoverLevel int32                              `xml:"currentFailoverLevel"`
+	AdmissionControlInfo BaseClusterDasAdmissionControlInfo `xml:"admissionControlInfo,omitempty,typeattr"`
+	NumVmotions          int32                              `xml:"numVmotions"`
+	TargetBalance        int32                              `xml:"targetBalance,omitempty"`
+	CurrentBalance       int32                              `xml:"currentBalance,omitempty"`
+	UsageSummary         *ClusterUsageSummary               `xml:"usageSummary,omitempty"`
+	CurrentEVCModeKey    string                             `xml:"currentEVCModeKey,omitempty"`
+	DasData              BaseClusterDasData                 `xml:"dasData,omitempty,typeattr"`
+}
+
+func init() {
+	t["ClusterComputeResourceSummary"] = reflect.TypeOf((*ClusterComputeResourceSummary)(nil)).Elem()
+}
+
+type ClusterConfigInfo struct {
+	DynamicData
+
+	DasConfig   ClusterDasConfigInfo     `xml:"dasConfig"`
+	DasVmConfig []ClusterDasVmConfigInfo `xml:"dasVmConfig,omitempty"`
+	DrsConfig   ClusterDrsConfigInfo     `xml:"drsConfig"`
+	DrsVmConfig []ClusterDrsVmConfigInfo `xml:"drsVmConfig,omitempty"`
+	Rule        []BaseClusterRuleInfo    `xml:"rule,omitempty,typeattr"`
+}
+
+func init() {
+	t["ClusterConfigInfo"] = reflect.TypeOf((*ClusterConfigInfo)(nil)).Elem()
+}
+
+type ClusterConfigInfoEx struct {
+	ComputeResourceConfigInfo
+
+	DasConfig           ClusterDasConfigInfo            `xml:"dasConfig"`
+	DasVmConfig         []ClusterDasVmConfigInfo        `xml:"dasVmConfig,omitempty"`
+	DrsConfig           ClusterDrsConfigInfo            `xml:"drsConfig"`
+	DrsVmConfig         []ClusterDrsVmConfigInfo        `xml:"drsVmConfig,omitempty"`
+	Rule                []BaseClusterRuleInfo           `xml:"rule,omitempty,typeattr"`
+	Orchestration       *ClusterOrchestrationInfo       `xml:"orchestration,omitempty"`
+	VmOrchestration     []ClusterVmOrchestrationInfo    `xml:"vmOrchestration,omitempty"`
+	DpmConfigInfo       *ClusterDpmConfigInfo           `xml:"dpmConfigInfo,omitempty"`
+	DpmHostConfig       []ClusterDpmHostConfigInfo      `xml:"dpmHostConfig,omitempty"`
+	VsanConfigInfo      *VsanClusterConfigInfo          `xml:"vsanConfigInfo,omitempty"`
+	VsanHostConfig      []VsanHostConfigInfo            `xml:"vsanHostConfig,omitempty"`
+	Group               []BaseClusterGroupInfo          `xml:"group,omitempty,typeattr"`
+	InfraUpdateHaConfig *ClusterInfraUpdateHaConfigInfo `xml:"infraUpdateHaConfig,omitempty"`
+	ProactiveDrsConfig  *ClusterProactiveDrsConfigInfo  `xml:"proactiveDrsConfig,omitempty"`
+}
+
+func init() {
+	t["ClusterConfigInfoEx"] = reflect.TypeOf((*ClusterConfigInfoEx)(nil)).Elem()
+}
+
+type ClusterConfigSpec struct {
+	DynamicData
+
+	DasConfig       *ClusterDasConfigInfo    `xml:"dasConfig,omitempty"`
+	DasVmConfigSpec []ClusterDasVmConfigSpec `xml:"dasVmConfigSpec,omitempty"`
+	DrsConfig       *ClusterDrsConfigInfo    `xml:"drsConfig,omitempty"`
+	DrsVmConfigSpec []ClusterDrsVmConfigSpec `xml:"drsVmConfigSpec,omitempty"`
+	RulesSpec       []ClusterRuleSpec        `xml:"rulesSpec,omitempty"`
+}
+
+func init() {
+	t["ClusterConfigSpec"] = reflect.TypeOf((*ClusterConfigSpec)(nil)).Elem()
+}
+
+type ClusterConfigSpecEx struct {
+	ComputeResourceConfigSpec
+
+	DasConfig           *ClusterDasConfigInfo           `xml:"dasConfig,omitempty"`
+	DasVmConfigSpec     []ClusterDasVmConfigSpec        `xml:"dasVmConfigSpec,omitempty"`
+	DrsConfig           *ClusterDrsConfigInfo           `xml:"drsConfig,omitempty"`
+	DrsVmConfigSpec     []ClusterDrsVmConfigSpec        `xml:"drsVmConfigSpec,omitempty"`
+	RulesSpec           []ClusterRuleSpec               `xml:"rulesSpec,omitempty"`
+	Orchestration       *ClusterOrchestrationInfo       `xml:"orchestration,omitempty"`
+	VmOrchestrationSpec []ClusterVmOrchestrationSpec    `xml:"vmOrchestrationSpec,omitempty"`
+	DpmConfig           *ClusterDpmConfigInfo           `xml:"dpmConfig,omitempty"`
+	DpmHostConfigSpec   []ClusterDpmHostConfigSpec      `xml:"dpmHostConfigSpec,omitempty"`
+	VsanConfig          *VsanClusterConfigInfo          `xml:"vsanConfig,omitempty"`
+	VsanHostConfigSpec  []VsanHostConfigInfo            `xml:"vsanHostConfigSpec,omitempty"`
+	GroupSpec           []ClusterGroupSpec              `xml:"groupSpec,omitempty"`
+	InfraUpdateHaConfig *ClusterInfraUpdateHaConfigInfo `xml:"infraUpdateHaConfig,omitempty"`
+	ProactiveDrsConfig  *ClusterProactiveDrsConfigInfo  `xml:"proactiveDrsConfig,omitempty"`
+}
+
+func init() {
+	t["ClusterConfigSpecEx"] = reflect.TypeOf((*ClusterConfigSpecEx)(nil)).Elem()
+}
+
+type ClusterCreatedEvent struct {
+	ClusterEvent
+
+	Parent FolderEventArgument `xml:"parent"`
+}
+
+func init() {
+	t["ClusterCreatedEvent"] = reflect.TypeOf((*ClusterCreatedEvent)(nil)).Elem()
+}
+
+type ClusterDasAamHostInfo struct {
+	ClusterDasHostInfo
+
+	HostDasState []ClusterDasAamNodeState `xml:"hostDasState,omitempty"`
+	PrimaryHosts []string                 `xml:"primaryHosts,omitempty"`
+}
+
+func init() {
+	t["ClusterDasAamHostInfo"] = reflect.TypeOf((*ClusterDasAamHostInfo)(nil)).Elem()
+}
+
+type ClusterDasAamNodeState struct {
+	DynamicData
+
+	Host         ManagedObjectReference `xml:"host"`
+	Name         string                 `xml:"name"`
+	ConfigState  string                 `xml:"configState"`
+	RuntimeState string                 `xml:"runtimeState"`
+}
+
+func init() {
+	t["ClusterDasAamNodeState"] = reflect.TypeOf((*ClusterDasAamNodeState)(nil)).Elem()
+}
+
+type ClusterDasAdmissionControlInfo struct {
+	DynamicData
+}
+
+func init() {
+	t["ClusterDasAdmissionControlInfo"] = reflect.TypeOf((*ClusterDasAdmissionControlInfo)(nil)).Elem()
+}
+
+type ClusterDasAdmissionControlPolicy struct {
+	DynamicData
+
+	ResourceReductionToToleratePercent int32 `xml:"resourceReductionToToleratePercent,omitempty"`
+}
+
+func init() {
+	t["ClusterDasAdmissionControlPolicy"] = reflect.TypeOf((*ClusterDasAdmissionControlPolicy)(nil)).Elem()
+}
+
+type ClusterDasAdvancedRuntimeInfo struct {
+	DynamicData
+
+	DasHostInfo            BaseClusterDasHostInfo                           `xml:"dasHostInfo,omitempty,typeattr"`
+	VmcpSupported          *ClusterDasAdvancedRuntimeInfoVmcpCapabilityInfo `xml:"vmcpSupported,omitempty"`
+	HeartbeatDatastoreInfo []DasHeartbeatDatastoreInfo                      `xml:"heartbeatDatastoreInfo,omitempty"`
+}
+
+func init() {
+	t["ClusterDasAdvancedRuntimeInfo"] = reflect.TypeOf((*ClusterDasAdvancedRuntimeInfo)(nil)).Elem()
+}
+
+type ClusterDasAdvancedRuntimeInfoVmcpCapabilityInfo struct {
+	DynamicData
+
+	StorageAPDSupported bool `xml:"storageAPDSupported"`
+	StoragePDLSupported bool `xml:"storagePDLSupported"`
+}
+
+func init() {
+	t["ClusterDasAdvancedRuntimeInfoVmcpCapabilityInfo"] = reflect.TypeOf((*ClusterDasAdvancedRuntimeInfoVmcpCapabilityInfo)(nil)).Elem()
+}
+
+type ClusterDasConfigInfo struct {
+	DynamicData
+
+	Enabled                    *bool                                `xml:"enabled"`
+	VmMonitoring               string                               `xml:"vmMonitoring,omitempty"`
+	HostMonitoring             string                               `xml:"hostMonitoring,omitempty"`
+	VmComponentProtecting      string                               `xml:"vmComponentProtecting,omitempty"`
+	FailoverLevel              int32                                `xml:"failoverLevel,omitempty"`
+	AdmissionControlPolicy     BaseClusterDasAdmissionControlPolicy `xml:"admissionControlPolicy,omitempty,typeattr"`
+	AdmissionControlEnabled    *bool                                `xml:"admissionControlEnabled"`
+	DefaultVmSettings          *ClusterDasVmSettings                `xml:"defaultVmSettings,omitempty"`
+	Option                     []BaseOptionValue                    `xml:"option,omitempty,typeattr"`
+	HeartbeatDatastore         []ManagedObjectReference             `xml:"heartbeatDatastore,omitempty"`
+	HBDatastoreCandidatePolicy string                               `xml:"hBDatastoreCandidatePolicy,omitempty"`
+}
+
+func init() {
+	t["ClusterDasConfigInfo"] = reflect.TypeOf((*ClusterDasConfigInfo)(nil)).Elem()
+}
+
+type ClusterDasData struct {
+	DynamicData
+}
+
+func init() {
+	t["ClusterDasData"] = reflect.TypeOf((*ClusterDasData)(nil)).Elem()
+}
+
+type ClusterDasDataSummary struct {
+	ClusterDasData
+
+	HostListVersion      int64 `xml:"hostListVersion"`
+	ClusterConfigVersion int64 `xml:"clusterConfigVersion"`
+	CompatListVersion    int64 `xml:"compatListVersion"`
+}
+
+func init() {
+	t["ClusterDasDataSummary"] = reflect.TypeOf((*ClusterDasDataSummary)(nil)).Elem()
+}
+
+type ClusterDasFailoverLevelAdvancedRuntimeInfo struct {
+	ClusterDasAdvancedRuntimeInfo
+
+	SlotInfo                  ClusterDasFailoverLevelAdvancedRuntimeInfoSlotInfo    `xml:"slotInfo"`
+	TotalSlots                int32                                                 `xml:"totalSlots"`
+	UsedSlots                 int32                                                 `xml:"usedSlots"`
+	UnreservedSlots           int32                                                 `xml:"unreservedSlots"`
+	TotalVms                  int32                                                 `xml:"totalVms"`
+	TotalHosts                int32                                                 `xml:"totalHosts"`
+	TotalGoodHosts            int32                                                 `xml:"totalGoodHosts"`
+	HostSlots                 []ClusterDasFailoverLevelAdvancedRuntimeInfoHostSlots `xml:"hostSlots,omitempty"`
+	VmsRequiringMultipleSlots []ClusterDasFailoverLevelAdvancedRuntimeInfoVmSlots   `xml:"vmsRequiringMultipleSlots,omitempty"`
+}
+
+func init() {
+	t["ClusterDasFailoverLevelAdvancedRuntimeInfo"] = reflect.TypeOf((*ClusterDasFailoverLevelAdvancedRuntimeInfo)(nil)).Elem()
+}
+
+type ClusterDasFailoverLevelAdvancedRuntimeInfoHostSlots struct {
+	DynamicData
+
+	Host  ManagedObjectReference `xml:"host"`
+	Slots int32                  `xml:"slots"`
+}
+
+func init() {
+	t["ClusterDasFailoverLevelAdvancedRuntimeInfoHostSlots"] = reflect.TypeOf((*ClusterDasFailoverLevelAdvancedRuntimeInfoHostSlots)(nil)).Elem()
+}
+
+type ClusterDasFailoverLevelAdvancedRuntimeInfoSlotInfo struct {
+	DynamicData
+
+	NumVcpus int32 `xml:"numVcpus"`
+	CpuMHz   int32 `xml:"cpuMHz"`
+	MemoryMB int32 `xml:"memoryMB"`
+}
+
+func init() {
+	t["ClusterDasFailoverLevelAdvancedRuntimeInfoSlotInfo"] = reflect.TypeOf((*ClusterDasFailoverLevelAdvancedRuntimeInfoSlotInfo)(nil)).Elem()
+}
+
+type ClusterDasFailoverLevelAdvancedRuntimeInfoVmSlots struct {
+	DynamicData
+
+	Vm    ManagedObjectReference `xml:"vm"`
+	Slots int32                  `xml:"slots"`
+}
+
+func init() {
+	t["ClusterDasFailoverLevelAdvancedRuntimeInfoVmSlots"] = reflect.TypeOf((*ClusterDasFailoverLevelAdvancedRuntimeInfoVmSlots)(nil)).Elem()
+}
+
+type ClusterDasFdmHostState struct {
+	DynamicData
+
+	State         string                  `xml:"state"`
+	StateReporter *ManagedObjectReference `xml:"stateReporter,omitempty"`
+}
+
+func init() {
+	t["ClusterDasFdmHostState"] = reflect.TypeOf((*ClusterDasFdmHostState)(nil)).Elem()
+}
+
+type ClusterDasHostInfo struct {
+	DynamicData
+}
+
+func init() {
+	t["ClusterDasHostInfo"] = reflect.TypeOf((*ClusterDasHostInfo)(nil)).Elem()
+}
+
+type ClusterDasHostRecommendation struct {
+	DynamicData
+
+	Host      ManagedObjectReference `xml:"host"`
+	DrsRating int32                  `xml:"drsRating,omitempty"`
+}
+
+func init() {
+	t["ClusterDasHostRecommendation"] = reflect.TypeOf((*ClusterDasHostRecommendation)(nil)).Elem()
+}
+
+type ClusterDasVmConfigInfo struct {
+	DynamicData
+
+	Key                 ManagedObjectReference `xml:"key"`
+	RestartPriority     DasVmPriority          `xml:"restartPriority,omitempty"`
+	PowerOffOnIsolation *bool                  `xml:"powerOffOnIsolation"`
+	DasSettings         *ClusterDasVmSettings  `xml:"dasSettings,omitempty"`
+}
+
+func init() {
+	t["ClusterDasVmConfigInfo"] = reflect.TypeOf((*ClusterDasVmConfigInfo)(nil)).Elem()
+}
+
+type ClusterDasVmConfigSpec struct {
+	ArrayUpdateSpec
+
+	Info *ClusterDasVmConfigInfo `xml:"info,omitempty"`
+}
+
+func init() {
+	t["ClusterDasVmConfigSpec"] = reflect.TypeOf((*ClusterDasVmConfigSpec)(nil)).Elem()
+}
+
+type ClusterDasVmSettings struct {
+	DynamicData
+
+	RestartPriority               string                                `xml:"restartPriority,omitempty"`
+	RestartPriorityTimeout        int32                                 `xml:"restartPriorityTimeout,omitempty"`
+	IsolationResponse             string                                `xml:"isolationResponse,omitempty"`
+	VmToolsMonitoringSettings     *ClusterVmToolsMonitoringSettings     `xml:"vmToolsMonitoringSettings,omitempty"`
+	VmComponentProtectionSettings *ClusterVmComponentProtectionSettings `xml:"vmComponentProtectionSettings,omitempty"`
+}
+
+func init() {
+	t["ClusterDasVmSettings"] = reflect.TypeOf((*ClusterDasVmSettings)(nil)).Elem()
+}
+
+type ClusterDependencyRuleInfo struct {
+	ClusterRuleInfo
+
+	VmGroup          string `xml:"vmGroup"`
+	DependsOnVmGroup string `xml:"dependsOnVmGroup"`
+}
+
+func init() {
+	t["ClusterDependencyRuleInfo"] = reflect.TypeOf((*ClusterDependencyRuleInfo)(nil)).Elem()
+}
+
+type ClusterDestroyedEvent struct {
+	ClusterEvent
+}
+
+func init() {
+	t["ClusterDestroyedEvent"] = reflect.TypeOf((*ClusterDestroyedEvent)(nil)).Elem()
+}
+
+type ClusterDpmConfigInfo struct {
+	DynamicData
+
+	Enabled             *bool             `xml:"enabled"`
+	DefaultDpmBehavior  DpmBehavior       `xml:"defaultDpmBehavior,omitempty"`
+	HostPowerActionRate int32             `xml:"hostPowerActionRate,omitempty"`
+	Option              []BaseOptionValue `xml:"option,omitempty,typeattr"`
+}
+
+func init() {
+	t["ClusterDpmConfigInfo"] = reflect.TypeOf((*ClusterDpmConfigInfo)(nil)).Elem()
+}
+
+type ClusterDpmHostConfigInfo struct {
+	DynamicData
+
+	Key      ManagedObjectReference `xml:"key"`
+	Enabled  *bool                  `xml:"enabled"`
+	Behavior DpmBehavior            `xml:"behavior,omitempty"`
+}
+
+func init() {
+	t["ClusterDpmHostConfigInfo"] = reflect.TypeOf((*ClusterDpmHostConfigInfo)(nil)).Elem()
+}
+
+type ClusterDpmHostConfigSpec struct {
+	ArrayUpdateSpec
+
+	Info *ClusterDpmHostConfigInfo `xml:"info,omitempty"`
+}
+
+func init() {
+	t["ClusterDpmHostConfigSpec"] = reflect.TypeOf((*ClusterDpmHostConfigSpec)(nil)).Elem()
+}
+
+type ClusterDrsConfigInfo struct {
+	DynamicData
+
+	Enabled                   *bool             `xml:"enabled"`
+	EnableVmBehaviorOverrides *bool             `xml:"enableVmBehaviorOverrides"`
+	DefaultVmBehavior         DrsBehavior       `xml:"defaultVmBehavior,omitempty"`
+	VmotionRate               int32             `xml:"vmotionRate,omitempty"`
+	Option                    []BaseOptionValue `xml:"option,omitempty,typeattr"`
+}
+
+func init() {
+	t["ClusterDrsConfigInfo"] = reflect.TypeOf((*ClusterDrsConfigInfo)(nil)).Elem()
+}
+
+type ClusterDrsFaults struct {
+	DynamicData
+
+	Reason     string                           `xml:"reason"`
+	FaultsByVm []BaseClusterDrsFaultsFaultsByVm `xml:"faultsByVm,typeattr"`
+}
+
+func init() {
+	t["ClusterDrsFaults"] = reflect.TypeOf((*ClusterDrsFaults)(nil)).Elem()
+}
+
+type ClusterDrsFaultsFaultsByVirtualDisk struct {
+	ClusterDrsFaultsFaultsByVm
+
+	Disk *VirtualDiskId `xml:"disk,omitempty"`
+}
+
+func init() {
+	t["ClusterDrsFaultsFaultsByVirtualDisk"] = reflect.TypeOf((*ClusterDrsFaultsFaultsByVirtualDisk)(nil)).Elem()
+}
+
+type ClusterDrsFaultsFaultsByVm struct {
+	DynamicData
+
+	Vm    *ManagedObjectReference `xml:"vm,omitempty"`
+	Fault []LocalizedMethodFault  `xml:"fault"`
+}
+
+func init() {
+	t["ClusterDrsFaultsFaultsByVm"] = reflect.TypeOf((*ClusterDrsFaultsFaultsByVm)(nil)).Elem()
+}
+
+type ClusterDrsMigration struct {
+	DynamicData
+
+	Key                   string                 `xml:"key"`
+	Time                  time.Time              `xml:"time"`
+	Vm                    ManagedObjectReference `xml:"vm"`
+	CpuLoad               int32                  `xml:"cpuLoad,omitempty"`
+	MemoryLoad            int64                  `xml:"memoryLoad,omitempty"`
+	Source                ManagedObjectReference `xml:"source"`
+	SourceCpuLoad         int32                  `xml:"sourceCpuLoad,omitempty"`
+	SourceMemoryLoad      int64                  `xml:"sourceMemoryLoad,omitempty"`
+	Destination           ManagedObjectReference `xml:"destination"`
+	DestinationCpuLoad    int32                  `xml:"destinationCpuLoad,omitempty"`
+	DestinationMemoryLoad int64                  `xml:"destinationMemoryLoad,omitempty"`
+}
+
+func init() {
+	t["ClusterDrsMigration"] = reflect.TypeOf((*ClusterDrsMigration)(nil)).Elem()
+}
+
+type ClusterDrsRecommendation struct {
+	DynamicData
+
+	Key           string                `xml:"key"`
+	Rating        int32                 `xml:"rating"`
+	Reason        string                `xml:"reason"`
+	ReasonText    string                `xml:"reasonText"`
+	MigrationList []ClusterDrsMigration `xml:"migrationList"`
+}
+
+func init() {
+	t["ClusterDrsRecommendation"] = reflect.TypeOf((*ClusterDrsRecommendation)(nil)).Elem()
+}
+
+type ClusterDrsVmConfigInfo struct {
+	DynamicData
+
+	Key      ManagedObjectReference `xml:"key"`
+	Enabled  *bool                  `xml:"enabled"`
+	Behavior DrsBehavior            `xml:"behavior,omitempty"`
+}
+
+func init() {
+	t["ClusterDrsVmConfigInfo"] = reflect.TypeOf((*ClusterDrsVmConfigInfo)(nil)).Elem()
+}
+
+type ClusterDrsVmConfigSpec struct {
+	ArrayUpdateSpec
+
+	Info *ClusterDrsVmConfigInfo `xml:"info,omitempty"`
+}
+
+func init() {
+	t["ClusterDrsVmConfigSpec"] = reflect.TypeOf((*ClusterDrsVmConfigSpec)(nil)).Elem()
+}
+
+type ClusterEVCManagerCheckResult struct {
+	DynamicData
+
+	EvcModeKey string                   `xml:"evcModeKey"`
+	Error      LocalizedMethodFault     `xml:"error"`
+	Host       []ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["ClusterEVCManagerCheckResult"] = reflect.TypeOf((*ClusterEVCManagerCheckResult)(nil)).Elem()
+}
+
+type ClusterEVCManagerEVCState struct {
+	DynamicData
+
+	SupportedEVCMode      []EVCMode                          `xml:"supportedEVCMode"`
+	CurrentEVCModeKey     string                             `xml:"currentEVCModeKey,omitempty"`
+	GuaranteedCPUFeatures []HostCpuIdInfo                    `xml:"guaranteedCPUFeatures,omitempty"`
+	FeatureCapability     []HostFeatureCapability            `xml:"featureCapability,omitempty"`
+	FeatureMask           []HostFeatureMask                  `xml:"featureMask,omitempty"`
+	FeatureRequirement    []VirtualMachineFeatureRequirement `xml:"featureRequirement,omitempty"`
+}
+
+func init() {
+	t["ClusterEVCManagerEVCState"] = reflect.TypeOf((*ClusterEVCManagerEVCState)(nil)).Elem()
+}
+
+type ClusterEnterMaintenanceMode ClusterEnterMaintenanceModeRequestType
+
+func init() {
+	t["ClusterEnterMaintenanceMode"] = reflect.TypeOf((*ClusterEnterMaintenanceMode)(nil)).Elem()
+}
+
+type ClusterEnterMaintenanceModeRequestType struct {
+	This   ManagedObjectReference   `xml:"_this"`
+	Host   []ManagedObjectReference `xml:"host"`
+	Option []BaseOptionValue        `xml:"option,omitempty,typeattr"`
+}
+
+func init() {
+	t["ClusterEnterMaintenanceModeRequestType"] = reflect.TypeOf((*ClusterEnterMaintenanceModeRequestType)(nil)).Elem()
+}
+
+type ClusterEnterMaintenanceModeResponse struct {
+	Returnval ClusterEnterMaintenanceResult `xml:"returnval"`
+}
+
+type ClusterEnterMaintenanceResult struct {
+	DynamicData
+
+	Recommendations []ClusterRecommendation `xml:"recommendations,omitempty"`
+	Fault           *ClusterDrsFaults       `xml:"fault,omitempty"`
+}
+
+func init() {
+	t["ClusterEnterMaintenanceResult"] = reflect.TypeOf((*ClusterEnterMaintenanceResult)(nil)).Elem()
+}
+
+type ClusterEvent struct {
+	Event
+}
+
+func init() {
+	t["ClusterEvent"] = reflect.TypeOf((*ClusterEvent)(nil)).Elem()
+}
+
+type ClusterFailoverHostAdmissionControlInfo struct {
+	ClusterDasAdmissionControlInfo
+
+	HostStatus []ClusterFailoverHostAdmissionControlInfoHostStatus `xml:"hostStatus,omitempty"`
+}
+
+func init() {
+	t["ClusterFailoverHostAdmissionControlInfo"] = reflect.TypeOf((*ClusterFailoverHostAdmissionControlInfo)(nil)).Elem()
+}
+
+type ClusterFailoverHostAdmissionControlInfoHostStatus struct {
+	DynamicData
+
+	Host   ManagedObjectReference `xml:"host"`
+	Status ManagedEntityStatus    `xml:"status"`
+}
+
+func init() {
+	t["ClusterFailoverHostAdmissionControlInfoHostStatus"] = reflect.TypeOf((*ClusterFailoverHostAdmissionControlInfoHostStatus)(nil)).Elem()
+}
+
+type ClusterFailoverHostAdmissionControlPolicy struct {
+	ClusterDasAdmissionControlPolicy
+
+	FailoverHosts []ManagedObjectReference `xml:"failoverHosts,omitempty"`
+	FailoverLevel int32                    `xml:"failoverLevel,omitempty"`
+}
+
+func init() {
+	t["ClusterFailoverHostAdmissionControlPolicy"] = reflect.TypeOf((*ClusterFailoverHostAdmissionControlPolicy)(nil)).Elem()
+}
+
+type ClusterFailoverLevelAdmissionControlInfo struct {
+	ClusterDasAdmissionControlInfo
+
+	CurrentFailoverLevel int32 `xml:"currentFailoverLevel"`
+}
+
+func init() {
+	t["ClusterFailoverLevelAdmissionControlInfo"] = reflect.TypeOf((*ClusterFailoverLevelAdmissionControlInfo)(nil)).Elem()
+}
+
+type ClusterFailoverLevelAdmissionControlPolicy struct {
+	ClusterDasAdmissionControlPolicy
+
+	FailoverLevel int32                 `xml:"failoverLevel"`
+	SlotPolicy    BaseClusterSlotPolicy `xml:"slotPolicy,omitempty,typeattr"`
+}
+
+func init() {
+	t["ClusterFailoverLevelAdmissionControlPolicy"] = reflect.TypeOf((*ClusterFailoverLevelAdmissionControlPolicy)(nil)).Elem()
+}
+
+type ClusterFailoverResourcesAdmissionControlInfo struct {
+	ClusterDasAdmissionControlInfo
+
+	CurrentCpuFailoverResourcesPercent    int32 `xml:"currentCpuFailoverResourcesPercent"`
+	CurrentMemoryFailoverResourcesPercent int32 `xml:"currentMemoryFailoverResourcesPercent"`
+}
+
+func init() {
+	t["ClusterFailoverResourcesAdmissionControlInfo"] = reflect.TypeOf((*ClusterFailoverResourcesAdmissionControlInfo)(nil)).Elem()
+}
+
+type ClusterFailoverResourcesAdmissionControlPolicy struct {
+	ClusterDasAdmissionControlPolicy
+
+	CpuFailoverResourcesPercent    int32 `xml:"cpuFailoverResourcesPercent"`
+	MemoryFailoverResourcesPercent int32 `xml:"memoryFailoverResourcesPercent"`
+	FailoverLevel                  int32 `xml:"failoverLevel,omitempty"`
+	AutoComputePercentages         *bool `xml:"autoComputePercentages"`
+}
+
+func init() {
+	t["ClusterFailoverResourcesAdmissionControlPolicy"] = reflect.TypeOf((*ClusterFailoverResourcesAdmissionControlPolicy)(nil)).Elem()
+}
+
+type ClusterFixedSizeSlotPolicy struct {
+	ClusterSlotPolicy
+
+	Cpu    int32 `xml:"cpu"`
+	Memory int32 `xml:"memory"`
+}
+
+func init() {
+	t["ClusterFixedSizeSlotPolicy"] = reflect.TypeOf((*ClusterFixedSizeSlotPolicy)(nil)).Elem()
+}
+
+type ClusterGroupInfo struct {
+	DynamicData
+
+	Name        string `xml:"name"`
+	UserCreated *bool  `xml:"userCreated"`
+	UniqueID    string `xml:"uniqueID,omitempty"`
+}
+
+func init() {
+	t["ClusterGroupInfo"] = reflect.TypeOf((*ClusterGroupInfo)(nil)).Elem()
+}
+
+type ClusterGroupSpec struct {
+	ArrayUpdateSpec
+
+	Info BaseClusterGroupInfo `xml:"info,omitempty,typeattr"`
+}
+
+func init() {
+	t["ClusterGroupSpec"] = reflect.TypeOf((*ClusterGroupSpec)(nil)).Elem()
+}
+
+type ClusterHostGroup struct {
+	ClusterGroupInfo
+
+	Host []ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["ClusterHostGroup"] = reflect.TypeOf((*ClusterHostGroup)(nil)).Elem()
+}
+
+type ClusterHostInfraUpdateHaModeAction struct {
+	ClusterAction
+
+	OperationType string `xml:"operationType"`
+}
+
+func init() {
+	t["ClusterHostInfraUpdateHaModeAction"] = reflect.TypeOf((*ClusterHostInfraUpdateHaModeAction)(nil)).Elem()
+}
+
+type ClusterHostPowerAction struct {
+	ClusterAction
+
+	OperationType        HostPowerOperationType `xml:"operationType"`
+	PowerConsumptionWatt int32                  `xml:"powerConsumptionWatt,omitempty"`
+	CpuCapacityMHz       int32                  `xml:"cpuCapacityMHz,omitempty"`
+	MemCapacityMB        int32                  `xml:"memCapacityMB,omitempty"`
+}
+
+func init() {
+	t["ClusterHostPowerAction"] = reflect.TypeOf((*ClusterHostPowerAction)(nil)).Elem()
+}
+
+type ClusterHostRecommendation struct {
+	DynamicData
+
+	Host   ManagedObjectReference `xml:"host"`
+	Rating int32                  `xml:"rating"`
+}
+
+func init() {
+	t["ClusterHostRecommendation"] = reflect.TypeOf((*ClusterHostRecommendation)(nil)).Elem()
+}
+
+type ClusterInfraUpdateHaConfigInfo struct {
+	DynamicData
+
+	Enabled             *bool    `xml:"enabled"`
+	Behavior            string   `xml:"behavior,omitempty"`
+	ModerateRemediation string   `xml:"moderateRemediation,omitempty"`
+	SevereRemediation   string   `xml:"severeRemediation,omitempty"`
+	Providers           []string `xml:"providers,omitempty"`
+}
+
+func init() {
+	t["ClusterInfraUpdateHaConfigInfo"] = reflect.TypeOf((*ClusterInfraUpdateHaConfigInfo)(nil)).Elem()
+}
+
+type ClusterInitialPlacementAction struct {
+	ClusterAction
+
+	TargetHost ManagedObjectReference  `xml:"targetHost"`
+	Pool       *ManagedObjectReference `xml:"pool,omitempty"`
+}
+
+func init() {
+	t["ClusterInitialPlacementAction"] = reflect.TypeOf((*ClusterInitialPlacementAction)(nil)).Elem()
+}
+
+type ClusterIoFilterInfo struct {
+	IoFilterInfo
+
+	OpType string `xml:"opType"`
+	VibUrl string `xml:"vibUrl,omitempty"`
+}
+
+func init() {
+	t["ClusterIoFilterInfo"] = reflect.TypeOf((*ClusterIoFilterInfo)(nil)).Elem()
+}
+
+type ClusterMigrationAction struct {
+	ClusterAction
+
+	DrsMigration *ClusterDrsMigration `xml:"drsMigration,omitempty"`
+}
+
+func init() {
+	t["ClusterMigrationAction"] = reflect.TypeOf((*ClusterMigrationAction)(nil)).Elem()
+}
+
+type ClusterNetworkConfigSpec struct {
+	DynamicData
+
+	NetworkPortGroup ManagedObjectReference  `xml:"networkPortGroup"`
+	IpSettings       CustomizationIPSettings `xml:"ipSettings"`
+}
+
+func init() {
+	t["ClusterNetworkConfigSpec"] = reflect.TypeOf((*ClusterNetworkConfigSpec)(nil)).Elem()
+}
+
+type ClusterNotAttemptedVmInfo struct {
+	DynamicData
+
+	Vm    ManagedObjectReference `xml:"vm"`
+	Fault LocalizedMethodFault   `xml:"fault"`
+}
+
+func init() {
+	t["ClusterNotAttemptedVmInfo"] = reflect.TypeOf((*ClusterNotAttemptedVmInfo)(nil)).Elem()
+}
+
+type ClusterOrchestrationInfo struct {
+	DynamicData
+
+	DefaultVmReadiness *ClusterVmReadiness `xml:"defaultVmReadiness,omitempty"`
+}
+
+func init() {
+	t["ClusterOrchestrationInfo"] = reflect.TypeOf((*ClusterOrchestrationInfo)(nil)).Elem()
+}
+
+type ClusterOvercommittedEvent struct {
+	ClusterEvent
+}
+
+func init() {
+	t["ClusterOvercommittedEvent"] = reflect.TypeOf((*ClusterOvercommittedEvent)(nil)).Elem()
+}
+
+type ClusterPowerOnVmResult struct {
+	DynamicData
+
+	Attempted       []ClusterAttemptedVmInfo    `xml:"attempted,omitempty"`
+	NotAttempted    []ClusterNotAttemptedVmInfo `xml:"notAttempted,omitempty"`
+	Recommendations []ClusterRecommendation     `xml:"recommendations,omitempty"`
+}
+
+func init() {
+	t["ClusterPowerOnVmResult"] = reflect.TypeOf((*ClusterPowerOnVmResult)(nil)).Elem()
+}
+
+type ClusterProactiveDrsConfigInfo struct {
+	DynamicData
+
+	Enabled *bool `xml:"enabled"`
+}
+
+func init() {
+	t["ClusterProactiveDrsConfigInfo"] = reflect.TypeOf((*ClusterProactiveDrsConfigInfo)(nil)).Elem()
+}
+
+type ClusterProfileCompleteConfigSpec struct {
+	ClusterProfileConfigSpec
+
+	ComplyProfile *ComplianceProfile `xml:"complyProfile,omitempty"`
+}
+
+func init() {
+	t["ClusterProfileCompleteConfigSpec"] = reflect.TypeOf((*ClusterProfileCompleteConfigSpec)(nil)).Elem()
+}
+
+type ClusterProfileConfigInfo struct {
+	ProfileConfigInfo
+
+	ComplyProfile *ComplianceProfile `xml:"complyProfile,omitempty"`
+}
+
+func init() {
+	t["ClusterProfileConfigInfo"] = reflect.TypeOf((*ClusterProfileConfigInfo)(nil)).Elem()
+}
+
+type ClusterProfileConfigServiceCreateSpec struct {
+	ClusterProfileConfigSpec
+
+	ServiceType []string `xml:"serviceType,omitempty"`
+}
+
+func init() {
+	t["ClusterProfileConfigServiceCreateSpec"] = reflect.TypeOf((*ClusterProfileConfigServiceCreateSpec)(nil)).Elem()
+}
+
+type ClusterProfileConfigSpec struct {
+	ClusterProfileCreateSpec
+}
+
+func init() {
+	t["ClusterProfileConfigSpec"] = reflect.TypeOf((*ClusterProfileConfigSpec)(nil)).Elem()
+}
+
+type ClusterProfileCreateSpec struct {
+	ProfileCreateSpec
+}
+
+func init() {
+	t["ClusterProfileCreateSpec"] = reflect.TypeOf((*ClusterProfileCreateSpec)(nil)).Elem()
+}
+
+type ClusterRecommendation struct {
+	DynamicData
+
+	Key            string                  `xml:"key"`
+	Type           string                  `xml:"type"`
+	Time           time.Time               `xml:"time"`
+	Rating         int32                   `xml:"rating"`
+	Reason         string                  `xml:"reason"`
+	ReasonText     string                  `xml:"reasonText"`
+	WarningText    string                  `xml:"warningText,omitempty"`
+	WarningDetails *LocalizableMessage     `xml:"warningDetails,omitempty"`
+	Prerequisite   []string                `xml:"prerequisite,omitempty"`
+	Action         []BaseClusterAction     `xml:"action,omitempty,typeattr"`
+	Target         *ManagedObjectReference `xml:"target,omitempty"`
+}
+
+func init() {
+	t["ClusterRecommendation"] = reflect.TypeOf((*ClusterRecommendation)(nil)).Elem()
+}
+
+type ClusterReconfiguredEvent struct {
+	ClusterEvent
+
+	ConfigChanges *ChangesInfoEventArgument `xml:"configChanges,omitempty"`
+}
+
+func init() {
+	t["ClusterReconfiguredEvent"] = reflect.TypeOf((*ClusterReconfiguredEvent)(nil)).Elem()
+}
+
+type ClusterResourceUsageSummary struct {
+	DynamicData
+
+	CpuUsedMHz        int32 `xml:"cpuUsedMHz"`
+	CpuCapacityMHz    int32 `xml:"cpuCapacityMHz"`
+	MemUsedMB         int32 `xml:"memUsedMB"`
+	MemCapacityMB     int32 `xml:"memCapacityMB"`
+	StorageUsedMB     int64 `xml:"storageUsedMB"`
+	StorageCapacityMB int64 `xml:"storageCapacityMB"`
+}
+
+func init() {
+	t["ClusterResourceUsageSummary"] = reflect.TypeOf((*ClusterResourceUsageSummary)(nil)).Elem()
+}
+
+type ClusterRuleInfo struct {
+	DynamicData
+
+	Key          int32               `xml:"key,omitempty"`
+	Status       ManagedEntityStatus `xml:"status,omitempty"`
+	Enabled      *bool               `xml:"enabled"`
+	Name         string              `xml:"name,omitempty"`
+	Mandatory    *bool               `xml:"mandatory"`
+	UserCreated  *bool               `xml:"userCreated"`
+	InCompliance *bool               `xml:"inCompliance"`
+	RuleUuid     string              `xml:"ruleUuid,omitempty"`
+}
+
+func init() {
+	t["ClusterRuleInfo"] = reflect.TypeOf((*ClusterRuleInfo)(nil)).Elem()
+}
+
+type ClusterRuleSpec struct {
+	ArrayUpdateSpec
+
+	Info BaseClusterRuleInfo `xml:"info,omitempty,typeattr"`
+}
+
+func init() {
+	t["ClusterRuleSpec"] = reflect.TypeOf((*ClusterRuleSpec)(nil)).Elem()
+}
+
+type ClusterSlotPolicy struct {
+	DynamicData
+}
+
+func init() {
+	t["ClusterSlotPolicy"] = reflect.TypeOf((*ClusterSlotPolicy)(nil)).Elem()
+}
+
+type ClusterStatusChangedEvent struct {
+	ClusterEvent
+
+	OldStatus string `xml:"oldStatus"`
+	NewStatus string `xml:"newStatus"`
+}
+
+func init() {
+	t["ClusterStatusChangedEvent"] = reflect.TypeOf((*ClusterStatusChangedEvent)(nil)).Elem()
+}
+
+type ClusterUsageSummary struct {
+	DynamicData
+
+	TotalCpuCapacityMhz         int32 `xml:"totalCpuCapacityMhz"`
+	TotalMemCapacityMB          int32 `xml:"totalMemCapacityMB"`
+	CpuReservationMhz           int32 `xml:"cpuReservationMhz"`
+	MemReservationMB            int32 `xml:"memReservationMB"`
+	PoweredOffCpuReservationMhz int32 `xml:"poweredOffCpuReservationMhz,omitempty"`
+	PoweredOffMemReservationMB  int32 `xml:"poweredOffMemReservationMB,omitempty"`
+	CpuDemandMhz                int32 `xml:"cpuDemandMhz"`
+	MemDemandMB                 int32 `xml:"memDemandMB"`
+	StatsGenNumber              int64 `xml:"statsGenNumber"`
+	CpuEntitledMhz              int32 `xml:"cpuEntitledMhz"`
+	MemEntitledMB               int32 `xml:"memEntitledMB"`
+	PoweredOffVmCount           int32 `xml:"poweredOffVmCount"`
+	TotalVmCount                int32 `xml:"totalVmCount"`
+}
+
+func init() {
+	t["ClusterUsageSummary"] = reflect.TypeOf((*ClusterUsageSummary)(nil)).Elem()
+}
+
+type ClusterVmComponentProtectionSettings struct {
+	DynamicData
+
+	VmStorageProtectionForAPD string `xml:"vmStorageProtectionForAPD,omitempty"`
+	EnableAPDTimeoutForHosts  *bool  `xml:"enableAPDTimeoutForHosts"`
+	VmTerminateDelayForAPDSec int32  `xml:"vmTerminateDelayForAPDSec,omitempty"`
+	VmReactionOnAPDCleared    string `xml:"vmReactionOnAPDCleared,omitempty"`
+	VmStorageProtectionForPDL string `xml:"vmStorageProtectionForPDL,omitempty"`
+}
+
+func init() {
+	t["ClusterVmComponentProtectionSettings"] = reflect.TypeOf((*ClusterVmComponentProtectionSettings)(nil)).Elem()
+}
+
+type ClusterVmGroup struct {
+	ClusterGroupInfo
+
+	Vm []ManagedObjectReference `xml:"vm,omitempty"`
+}
+
+func init() {
+	t["ClusterVmGroup"] = reflect.TypeOf((*ClusterVmGroup)(nil)).Elem()
+}
+
+type ClusterVmHostRuleInfo struct {
+	ClusterRuleInfo
+
+	VmGroupName             string `xml:"vmGroupName,omitempty"`
+	AffineHostGroupName     string `xml:"affineHostGroupName,omitempty"`
+	AntiAffineHostGroupName string `xml:"antiAffineHostGroupName,omitempty"`
+}
+
+func init() {
+	t["ClusterVmHostRuleInfo"] = reflect.TypeOf((*ClusterVmHostRuleInfo)(nil)).Elem()
+}
+
+type ClusterVmOrchestrationInfo struct {
+	DynamicData
+
+	Vm          ManagedObjectReference `xml:"vm"`
+	VmReadiness ClusterVmReadiness     `xml:"vmReadiness"`
+}
+
+func init() {
+	t["ClusterVmOrchestrationInfo"] = reflect.TypeOf((*ClusterVmOrchestrationInfo)(nil)).Elem()
+}
+
+type ClusterVmOrchestrationSpec struct {
+	ArrayUpdateSpec
+
+	Info *ClusterVmOrchestrationInfo `xml:"info,omitempty"`
+}
+
+func init() {
+	t["ClusterVmOrchestrationSpec"] = reflect.TypeOf((*ClusterVmOrchestrationSpec)(nil)).Elem()
+}
+
+type ClusterVmReadiness struct {
+	DynamicData
+
+	ReadyCondition string `xml:"readyCondition,omitempty"`
+	PostReadyDelay int32  `xml:"postReadyDelay,omitempty"`
+}
+
+func init() {
+	t["ClusterVmReadiness"] = reflect.TypeOf((*ClusterVmReadiness)(nil)).Elem()
+}
+
+type ClusterVmToolsMonitoringSettings struct {
+	DynamicData
+
+	Enabled          *bool  `xml:"enabled"`
+	VmMonitoring     string `xml:"vmMonitoring,omitempty"`
+	ClusterSettings  *bool  `xml:"clusterSettings"`
+	FailureInterval  int32  `xml:"failureInterval,omitempty"`
+	MinUpTime        int32  `xml:"minUpTime,omitempty"`
+	MaxFailures      int32  `xml:"maxFailures,omitempty"`
+	MaxFailureWindow int32  `xml:"maxFailureWindow,omitempty"`
+}
+
+func init() {
+	t["ClusterVmToolsMonitoringSettings"] = reflect.TypeOf((*ClusterVmToolsMonitoringSettings)(nil)).Elem()
+}
+
+type CollectorAddressUnset struct {
+	DvsFault
+}
+
+func init() {
+	t["CollectorAddressUnset"] = reflect.TypeOf((*CollectorAddressUnset)(nil)).Elem()
+}
+
+type CollectorAddressUnsetFault CollectorAddressUnset
+
+func init() {
+	t["CollectorAddressUnsetFault"] = reflect.TypeOf((*CollectorAddressUnsetFault)(nil)).Elem()
+}
+
+type ComplianceFailure struct {
+	DynamicData
+
+	FailureType    string                                     `xml:"failureType"`
+	Message        LocalizableMessage                         `xml:"message"`
+	ExpressionName string                                     `xml:"expressionName,omitempty"`
+	FailureValues  []ComplianceFailureComplianceFailureValues `xml:"failureValues,omitempty"`
+}
+
+func init() {
+	t["ComplianceFailure"] = reflect.TypeOf((*ComplianceFailure)(nil)).Elem()
+}
+
+type ComplianceFailureComplianceFailureValues struct {
+	DynamicData
+
+	ComparisonIdentifier string  `xml:"comparisonIdentifier"`
+	ProfileInstance      string  `xml:"profileInstance,omitempty"`
+	HostValue            AnyType `xml:"hostValue,omitempty,typeattr"`
+	ProfileValue         AnyType `xml:"profileValue,omitempty,typeattr"`
+}
+
+func init() {
+	t["ComplianceFailureComplianceFailureValues"] = reflect.TypeOf((*ComplianceFailureComplianceFailureValues)(nil)).Elem()
+}
+
+type ComplianceLocator struct {
+	DynamicData
+
+	ExpressionName string              `xml:"expressionName"`
+	ApplyPath      ProfilePropertyPath `xml:"applyPath"`
+}
+
+func init() {
+	t["ComplianceLocator"] = reflect.TypeOf((*ComplianceLocator)(nil)).Elem()
+}
+
+type ComplianceProfile struct {
+	DynamicData
+
+	Expression     []BaseProfileExpression `xml:"expression,typeattr"`
+	RootExpression string                  `xml:"rootExpression"`
+}
+
+func init() {
+	t["ComplianceProfile"] = reflect.TypeOf((*ComplianceProfile)(nil)).Elem()
+}
+
+type ComplianceResult struct {
+	DynamicData
+
+	Profile          *ManagedObjectReference `xml:"profile,omitempty"`
+	ComplianceStatus string                  `xml:"complianceStatus"`
+	Entity           *ManagedObjectReference `xml:"entity,omitempty"`
+	CheckTime        *time.Time              `xml:"checkTime"`
+	Failure          []ComplianceFailure     `xml:"failure,omitempty"`
+}
+
+func init() {
+	t["ComplianceResult"] = reflect.TypeOf((*ComplianceResult)(nil)).Elem()
+}
+
+type CompositePolicyOption struct {
+	PolicyOption
+
+	Option []BasePolicyOption `xml:"option,omitempty,typeattr"`
+}
+
+func init() {
+	t["CompositePolicyOption"] = reflect.TypeOf((*CompositePolicyOption)(nil)).Elem()
+}
+
+type ComputeDiskPartitionInfo ComputeDiskPartitionInfoRequestType
+
+func init() {
+	t["ComputeDiskPartitionInfo"] = reflect.TypeOf((*ComputeDiskPartitionInfo)(nil)).Elem()
+}
+
+type ComputeDiskPartitionInfoForResize ComputeDiskPartitionInfoForResizeRequestType
+
+func init() {
+	t["ComputeDiskPartitionInfoForResize"] = reflect.TypeOf((*ComputeDiskPartitionInfoForResize)(nil)).Elem()
+}
+
+type ComputeDiskPartitionInfoForResizeRequestType struct {
+	This            ManagedObjectReference      `xml:"_this"`
+	Partition       HostScsiDiskPartition       `xml:"partition"`
+	BlockRange      HostDiskPartitionBlockRange `xml:"blockRange"`
+	PartitionFormat string                      `xml:"partitionFormat,omitempty"`
+}
+
+func init() {
+	t["ComputeDiskPartitionInfoForResizeRequestType"] = reflect.TypeOf((*ComputeDiskPartitionInfoForResizeRequestType)(nil)).Elem()
+}
+
+type ComputeDiskPartitionInfoForResizeResponse struct {
+	Returnval HostDiskPartitionInfo `xml:"returnval"`
+}
+
+type ComputeDiskPartitionInfoRequestType struct {
+	This            ManagedObjectReference  `xml:"_this"`
+	DevicePath      string                  `xml:"devicePath"`
+	Layout          HostDiskPartitionLayout `xml:"layout"`
+	PartitionFormat string                  `xml:"partitionFormat,omitempty"`
+}
+
+func init() {
+	t["ComputeDiskPartitionInfoRequestType"] = reflect.TypeOf((*ComputeDiskPartitionInfoRequestType)(nil)).Elem()
+}
+
+type ComputeDiskPartitionInfoResponse struct {
+	Returnval HostDiskPartitionInfo `xml:"returnval"`
+}
+
+type ComputeResourceConfigInfo struct {
+	DynamicData
+
+	VmSwapPlacement           string `xml:"vmSwapPlacement"`
+	SpbmEnabled               *bool  `xml:"spbmEnabled"`
+	DefaultHardwareVersionKey string `xml:"defaultHardwareVersionKey,omitempty"`
+}
+
+func init() {
+	t["ComputeResourceConfigInfo"] = reflect.TypeOf((*ComputeResourceConfigInfo)(nil)).Elem()
+}
+
+type ComputeResourceConfigSpec struct {
+	DynamicData
+
+	VmSwapPlacement           string `xml:"vmSwapPlacement,omitempty"`
+	SpbmEnabled               *bool  `xml:"spbmEnabled"`
+	DefaultHardwareVersionKey string `xml:"defaultHardwareVersionKey,omitempty"`
+}
+
+func init() {
+	t["ComputeResourceConfigSpec"] = reflect.TypeOf((*ComputeResourceConfigSpec)(nil)).Elem()
+}
+
+type ComputeResourceEventArgument struct {
+	EntityEventArgument
+
+	ComputeResource ManagedObjectReference `xml:"computeResource"`
+}
+
+func init() {
+	t["ComputeResourceEventArgument"] = reflect.TypeOf((*ComputeResourceEventArgument)(nil)).Elem()
+}
+
+type ComputeResourceHostSPBMLicenseInfo struct {
+	DynamicData
+
+	Host         ManagedObjectReference                                 `xml:"host"`
+	LicenseState ComputeResourceHostSPBMLicenseInfoHostSPBMLicenseState `xml:"licenseState"`
+}
+
+func init() {
+	t["ComputeResourceHostSPBMLicenseInfo"] = reflect.TypeOf((*ComputeResourceHostSPBMLicenseInfo)(nil)).Elem()
+}
+
+type ComputeResourceSummary struct {
+	DynamicData
+
+	TotalCpu          int32               `xml:"totalCpu"`
+	TotalMemory       int64               `xml:"totalMemory"`
+	NumCpuCores       int16               `xml:"numCpuCores"`
+	NumCpuThreads     int16               `xml:"numCpuThreads"`
+	EffectiveCpu      int32               `xml:"effectiveCpu"`
+	EffectiveMemory   int64               `xml:"effectiveMemory"`
+	NumHosts          int32               `xml:"numHosts"`
+	NumEffectiveHosts int32               `xml:"numEffectiveHosts"`
+	OverallStatus     ManagedEntityStatus `xml:"overallStatus"`
+}
+
+func init() {
+	t["ComputeResourceSummary"] = reflect.TypeOf((*ComputeResourceSummary)(nil)).Elem()
+}
+
+type ConcurrentAccess struct {
+	VimFault
+}
+
+func init() {
+	t["ConcurrentAccess"] = reflect.TypeOf((*ConcurrentAccess)(nil)).Elem()
+}
+
+type ConcurrentAccessFault ConcurrentAccess
+
+func init() {
+	t["ConcurrentAccessFault"] = reflect.TypeOf((*ConcurrentAccessFault)(nil)).Elem()
+}
+
+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"`
+}
+
+func init() {
+	t["ConfigTarget"] = reflect.TypeOf((*ConfigTarget)(nil)).Elem()
+}
+
+type ConfigureCryptoKey ConfigureCryptoKeyRequestType
+
+func init() {
+	t["ConfigureCryptoKey"] = reflect.TypeOf((*ConfigureCryptoKey)(nil)).Elem()
+}
+
+type ConfigureCryptoKeyRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	KeyId *CryptoKeyId           `xml:"keyId,omitempty"`
+}
+
+func init() {
+	t["ConfigureCryptoKeyRequestType"] = reflect.TypeOf((*ConfigureCryptoKeyRequestType)(nil)).Elem()
+}
+
+type ConfigureCryptoKeyResponse struct {
+}
+
+type ConfigureDatastoreIORMRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+	Spec      StorageIORMConfigSpec  `xml:"spec"`
+}
+
+func init() {
+	t["ConfigureDatastoreIORMRequestType"] = reflect.TypeOf((*ConfigureDatastoreIORMRequestType)(nil)).Elem()
+}
+
+type ConfigureDatastoreIORM_Task ConfigureDatastoreIORMRequestType
+
+func init() {
+	t["ConfigureDatastoreIORM_Task"] = reflect.TypeOf((*ConfigureDatastoreIORM_Task)(nil)).Elem()
+}
+
+type ConfigureDatastoreIORM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ConfigureDatastorePrincipal ConfigureDatastorePrincipalRequestType
+
+func init() {
+	t["ConfigureDatastorePrincipal"] = reflect.TypeOf((*ConfigureDatastorePrincipal)(nil)).Elem()
+}
+
+type ConfigureDatastorePrincipalRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	UserName string                 `xml:"userName"`
+	Password string                 `xml:"password,omitempty"`
+}
+
+func init() {
+	t["ConfigureDatastorePrincipalRequestType"] = reflect.TypeOf((*ConfigureDatastorePrincipalRequestType)(nil)).Elem()
+}
+
+type ConfigureDatastorePrincipalResponse struct {
+}
+
+type ConfigureEvcModeRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	EvcModeKey string                 `xml:"evcModeKey"`
+}
+
+func init() {
+	t["ConfigureEvcModeRequestType"] = reflect.TypeOf((*ConfigureEvcModeRequestType)(nil)).Elem()
+}
+
+type ConfigureEvcMode_Task ConfigureEvcModeRequestType
+
+func init() {
+	t["ConfigureEvcMode_Task"] = reflect.TypeOf((*ConfigureEvcMode_Task)(nil)).Elem()
+}
+
+type ConfigureEvcMode_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ConfigureHostCacheRequestType struct {
+	This ManagedObjectReference     `xml:"_this"`
+	Spec HostCacheConfigurationSpec `xml:"spec"`
+}
+
+func init() {
+	t["ConfigureHostCacheRequestType"] = reflect.TypeOf((*ConfigureHostCacheRequestType)(nil)).Elem()
+}
+
+type ConfigureHostCache_Task ConfigureHostCacheRequestType
+
+func init() {
+	t["ConfigureHostCache_Task"] = reflect.TypeOf((*ConfigureHostCache_Task)(nil)).Elem()
+}
+
+type ConfigureHostCache_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ConfigureLicenseSource ConfigureLicenseSourceRequestType
+
+func init() {
+	t["ConfigureLicenseSource"] = reflect.TypeOf((*ConfigureLicenseSource)(nil)).Elem()
+}
+
+type ConfigureLicenseSourceRequestType struct {
+	This          ManagedObjectReference  `xml:"_this"`
+	Host          *ManagedObjectReference `xml:"host,omitempty"`
+	LicenseSource BaseLicenseSource       `xml:"licenseSource,typeattr"`
+}
+
+func init() {
+	t["ConfigureLicenseSourceRequestType"] = reflect.TypeOf((*ConfigureLicenseSourceRequestType)(nil)).Elem()
+}
+
+type ConfigureLicenseSourceResponse struct {
+}
+
+type ConfigurePowerPolicy ConfigurePowerPolicyRequestType
+
+func init() {
+	t["ConfigurePowerPolicy"] = reflect.TypeOf((*ConfigurePowerPolicy)(nil)).Elem()
+}
+
+type ConfigurePowerPolicyRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Key  int32                  `xml:"key"`
+}
+
+func init() {
+	t["ConfigurePowerPolicyRequestType"] = reflect.TypeOf((*ConfigurePowerPolicyRequestType)(nil)).Elem()
+}
+
+type ConfigurePowerPolicyResponse struct {
+}
+
+type ConfigureStorageDrsForPodRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Pod    ManagedObjectReference `xml:"pod"`
+	Spec   StorageDrsConfigSpec   `xml:"spec"`
+	Modify bool                   `xml:"modify"`
+}
+
+func init() {
+	t["ConfigureStorageDrsForPodRequestType"] = reflect.TypeOf((*ConfigureStorageDrsForPodRequestType)(nil)).Elem()
+}
+
+type ConfigureStorageDrsForPod_Task ConfigureStorageDrsForPodRequestType
+
+func init() {
+	t["ConfigureStorageDrsForPod_Task"] = reflect.TypeOf((*ConfigureStorageDrsForPod_Task)(nil)).Elem()
+}
+
+type ConfigureStorageDrsForPod_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ConfigureVFlashResourceExRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	DevicePath []string               `xml:"devicePath,omitempty"`
+}
+
+func init() {
+	t["ConfigureVFlashResourceExRequestType"] = reflect.TypeOf((*ConfigureVFlashResourceExRequestType)(nil)).Elem()
+}
+
+type ConfigureVFlashResourceEx_Task ConfigureVFlashResourceExRequestType
+
+func init() {
+	t["ConfigureVFlashResourceEx_Task"] = reflect.TypeOf((*ConfigureVFlashResourceEx_Task)(nil)).Elem()
+}
+
+type ConfigureVFlashResourceEx_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ConflictingConfiguration struct {
+	DvsFault
+
+	ConfigInConflict []ConflictingConfigurationConfig `xml:"configInConflict"`
+}
+
+func init() {
+	t["ConflictingConfiguration"] = reflect.TypeOf((*ConflictingConfiguration)(nil)).Elem()
+}
+
+type ConflictingConfigurationConfig struct {
+	DynamicData
+
+	Entity       *ManagedObjectReference `xml:"entity,omitempty"`
+	PropertyPath string                  `xml:"propertyPath"`
+}
+
+func init() {
+	t["ConflictingConfigurationConfig"] = reflect.TypeOf((*ConflictingConfigurationConfig)(nil)).Elem()
+}
+
+type ConflictingConfigurationFault ConflictingConfiguration
+
+func init() {
+	t["ConflictingConfigurationFault"] = reflect.TypeOf((*ConflictingConfigurationFault)(nil)).Elem()
+}
+
+type ConflictingDatastoreFound struct {
+	RuntimeFault
+
+	Name string `xml:"name"`
+	Url  string `xml:"url"`
+}
+
+func init() {
+	t["ConflictingDatastoreFound"] = reflect.TypeOf((*ConflictingDatastoreFound)(nil)).Elem()
+}
+
+type ConflictingDatastoreFoundFault ConflictingDatastoreFound
+
+func init() {
+	t["ConflictingDatastoreFoundFault"] = reflect.TypeOf((*ConflictingDatastoreFoundFault)(nil)).Elem()
+}
+
+type ConnectedIso struct {
+	OvfExport
+
+	Cdrom    VirtualCdrom `xml:"cdrom"`
+	Filename string       `xml:"filename"`
+}
+
+func init() {
+	t["ConnectedIso"] = reflect.TypeOf((*ConnectedIso)(nil)).Elem()
+}
+
+type ConnectedIsoFault ConnectedIso
+
+func init() {
+	t["ConnectedIsoFault"] = reflect.TypeOf((*ConnectedIsoFault)(nil)).Elem()
+}
+
+type ConsolidateVMDisksRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["ConsolidateVMDisksRequestType"] = reflect.TypeOf((*ConsolidateVMDisksRequestType)(nil)).Elem()
+}
+
+type ConsolidateVMDisks_Task ConsolidateVMDisksRequestType
+
+func init() {
+	t["ConsolidateVMDisks_Task"] = reflect.TypeOf((*ConsolidateVMDisks_Task)(nil)).Elem()
+}
+
+type ConsolidateVMDisks_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ContinueRetrievePropertiesEx ContinueRetrievePropertiesExRequestType
+
+func init() {
+	t["ContinueRetrievePropertiesEx"] = reflect.TypeOf((*ContinueRetrievePropertiesEx)(nil)).Elem()
+}
+
+type ContinueRetrievePropertiesExRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Token string                 `xml:"token"`
+}
+
+func init() {
+	t["ContinueRetrievePropertiesExRequestType"] = reflect.TypeOf((*ContinueRetrievePropertiesExRequestType)(nil)).Elem()
+}
+
+type ContinueRetrievePropertiesExResponse struct {
+	Returnval RetrieveResult `xml:"returnval"`
+}
+
+type ConvertNamespacePathToUuidPath ConvertNamespacePathToUuidPathRequestType
+
+func init() {
+	t["ConvertNamespacePathToUuidPath"] = reflect.TypeOf((*ConvertNamespacePathToUuidPath)(nil)).Elem()
+}
+
+type ConvertNamespacePathToUuidPathRequestType struct {
+	This         ManagedObjectReference  `xml:"_this"`
+	Datacenter   *ManagedObjectReference `xml:"datacenter,omitempty"`
+	NamespaceUrl string                  `xml:"namespaceUrl"`
+}
+
+func init() {
+	t["ConvertNamespacePathToUuidPathRequestType"] = reflect.TypeOf((*ConvertNamespacePathToUuidPathRequestType)(nil)).Elem()
+}
+
+type ConvertNamespacePathToUuidPathResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type CopyDatastoreFileRequestType struct {
+	This                  ManagedObjectReference  `xml:"_this"`
+	SourceName            string                  `xml:"sourceName"`
+	SourceDatacenter      *ManagedObjectReference `xml:"sourceDatacenter,omitempty"`
+	DestinationName       string                  `xml:"destinationName"`
+	DestinationDatacenter *ManagedObjectReference `xml:"destinationDatacenter,omitempty"`
+	Force                 *bool                   `xml:"force"`
+}
+
+func init() {
+	t["CopyDatastoreFileRequestType"] = reflect.TypeOf((*CopyDatastoreFileRequestType)(nil)).Elem()
+}
+
+type CopyDatastoreFile_Task CopyDatastoreFileRequestType
+
+func init() {
+	t["CopyDatastoreFile_Task"] = reflect.TypeOf((*CopyDatastoreFile_Task)(nil)).Elem()
+}
+
+type CopyDatastoreFile_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CopyVirtualDiskRequestType struct {
+	This             ManagedObjectReference  `xml:"_this"`
+	SourceName       string                  `xml:"sourceName"`
+	SourceDatacenter *ManagedObjectReference `xml:"sourceDatacenter,omitempty"`
+	DestName         string                  `xml:"destName"`
+	DestDatacenter   *ManagedObjectReference `xml:"destDatacenter,omitempty"`
+	DestSpec         BaseVirtualDiskSpec     `xml:"destSpec,omitempty,typeattr"`
+	Force            *bool                   `xml:"force"`
+}
+
+func init() {
+	t["CopyVirtualDiskRequestType"] = reflect.TypeOf((*CopyVirtualDiskRequestType)(nil)).Elem()
+}
+
+type CopyVirtualDisk_Task CopyVirtualDiskRequestType
+
+func init() {
+	t["CopyVirtualDisk_Task"] = reflect.TypeOf((*CopyVirtualDisk_Task)(nil)).Elem()
+}
+
+type CopyVirtualDisk_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CpuCompatibilityUnknown struct {
+	CpuIncompatible
+}
+
+func init() {
+	t["CpuCompatibilityUnknown"] = reflect.TypeOf((*CpuCompatibilityUnknown)(nil)).Elem()
+}
+
+type CpuCompatibilityUnknownFault CpuCompatibilityUnknown
+
+func init() {
+	t["CpuCompatibilityUnknownFault"] = reflect.TypeOf((*CpuCompatibilityUnknownFault)(nil)).Elem()
+}
+
+type CpuHotPlugNotSupported struct {
+	VmConfigFault
+}
+
+func init() {
+	t["CpuHotPlugNotSupported"] = reflect.TypeOf((*CpuHotPlugNotSupported)(nil)).Elem()
+}
+
+type CpuHotPlugNotSupportedFault CpuHotPlugNotSupported
+
+func init() {
+	t["CpuHotPlugNotSupportedFault"] = reflect.TypeOf((*CpuHotPlugNotSupportedFault)(nil)).Elem()
+}
+
+type CpuIncompatible struct {
+	VirtualHardwareCompatibilityIssue
+
+	Level        int32                   `xml:"level"`
+	RegisterName string                  `xml:"registerName"`
+	RegisterBits string                  `xml:"registerBits,omitempty"`
+	DesiredBits  string                  `xml:"desiredBits,omitempty"`
+	Host         *ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["CpuIncompatible"] = reflect.TypeOf((*CpuIncompatible)(nil)).Elem()
+}
+
+type CpuIncompatible1ECX struct {
+	CpuIncompatible
+
+	Sse3      bool  `xml:"sse3"`
+	Pclmulqdq *bool `xml:"pclmulqdq"`
+	Ssse3     bool  `xml:"ssse3"`
+	Sse41     bool  `xml:"sse41"`
+	Sse42     bool  `xml:"sse42"`
+	Aes       *bool `xml:"aes"`
+	Other     bool  `xml:"other"`
+	OtherOnly bool  `xml:"otherOnly"`
+}
+
+func init() {
+	t["CpuIncompatible1ECX"] = reflect.TypeOf((*CpuIncompatible1ECX)(nil)).Elem()
+}
+
+type CpuIncompatible1ECXFault CpuIncompatible1ECX
+
+func init() {
+	t["CpuIncompatible1ECXFault"] = reflect.TypeOf((*CpuIncompatible1ECXFault)(nil)).Elem()
+}
+
+type CpuIncompatible81EDX struct {
+	CpuIncompatible
+
+	Nx        bool `xml:"nx"`
+	Ffxsr     bool `xml:"ffxsr"`
+	Rdtscp    bool `xml:"rdtscp"`
+	Lm        bool `xml:"lm"`
+	Other     bool `xml:"other"`
+	OtherOnly bool `xml:"otherOnly"`
+}
+
+func init() {
+	t["CpuIncompatible81EDX"] = reflect.TypeOf((*CpuIncompatible81EDX)(nil)).Elem()
+}
+
+type CpuIncompatible81EDXFault CpuIncompatible81EDX
+
+func init() {
+	t["CpuIncompatible81EDXFault"] = reflect.TypeOf((*CpuIncompatible81EDXFault)(nil)).Elem()
+}
+
+type CpuIncompatibleFault BaseCpuIncompatible
+
+func init() {
+	t["CpuIncompatibleFault"] = reflect.TypeOf((*CpuIncompatibleFault)(nil)).Elem()
+}
+
+type CreateAlarm CreateAlarmRequestType
+
+func init() {
+	t["CreateAlarm"] = reflect.TypeOf((*CreateAlarm)(nil)).Elem()
+}
+
+type CreateAlarmRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Entity ManagedObjectReference `xml:"entity"`
+	Spec   BaseAlarmSpec          `xml:"spec,typeattr"`
+}
+
+func init() {
+	t["CreateAlarmRequestType"] = reflect.TypeOf((*CreateAlarmRequestType)(nil)).Elem()
+}
+
+type CreateAlarmResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateChildVMRequestType struct {
+	This   ManagedObjectReference   `xml:"_this"`
+	Config VirtualMachineConfigSpec `xml:"config"`
+	Host   *ManagedObjectReference  `xml:"host,omitempty"`
+}
+
+func init() {
+	t["CreateChildVMRequestType"] = reflect.TypeOf((*CreateChildVMRequestType)(nil)).Elem()
+}
+
+type CreateChildVM_Task CreateChildVMRequestType
+
+func init() {
+	t["CreateChildVM_Task"] = reflect.TypeOf((*CreateChildVM_Task)(nil)).Elem()
+}
+
+type CreateChildVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateCluster CreateClusterRequestType
+
+func init() {
+	t["CreateCluster"] = reflect.TypeOf((*CreateCluster)(nil)).Elem()
+}
+
+type CreateClusterEx CreateClusterExRequestType
+
+func init() {
+	t["CreateClusterEx"] = reflect.TypeOf((*CreateClusterEx)(nil)).Elem()
+}
+
+type CreateClusterExRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Name string                 `xml:"name"`
+	Spec ClusterConfigSpecEx    `xml:"spec"`
+}
+
+func init() {
+	t["CreateClusterExRequestType"] = reflect.TypeOf((*CreateClusterExRequestType)(nil)).Elem()
+}
+
+type CreateClusterExResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateClusterRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Name string                 `xml:"name"`
+	Spec ClusterConfigSpec      `xml:"spec"`
+}
+
+func init() {
+	t["CreateClusterRequestType"] = reflect.TypeOf((*CreateClusterRequestType)(nil)).Elem()
+}
+
+type CreateClusterResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateCollectorForEvents CreateCollectorForEventsRequestType
+
+func init() {
+	t["CreateCollectorForEvents"] = reflect.TypeOf((*CreateCollectorForEvents)(nil)).Elem()
+}
+
+type CreateCollectorForEventsRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Filter EventFilterSpec        `xml:"filter"`
+}
+
+func init() {
+	t["CreateCollectorForEventsRequestType"] = reflect.TypeOf((*CreateCollectorForEventsRequestType)(nil)).Elem()
+}
+
+type CreateCollectorForEventsResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateCollectorForTasks CreateCollectorForTasksRequestType
+
+func init() {
+	t["CreateCollectorForTasks"] = reflect.TypeOf((*CreateCollectorForTasks)(nil)).Elem()
+}
+
+type CreateCollectorForTasksRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Filter TaskFilterSpec         `xml:"filter"`
+}
+
+func init() {
+	t["CreateCollectorForTasksRequestType"] = reflect.TypeOf((*CreateCollectorForTasksRequestType)(nil)).Elem()
+}
+
+type CreateCollectorForTasksResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateContainerView CreateContainerViewRequestType
+
+func init() {
+	t["CreateContainerView"] = reflect.TypeOf((*CreateContainerView)(nil)).Elem()
+}
+
+type CreateContainerViewRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Container ManagedObjectReference `xml:"container"`
+	Type      []string               `xml:"type,omitempty"`
+	Recursive bool                   `xml:"recursive"`
+}
+
+func init() {
+	t["CreateContainerViewRequestType"] = reflect.TypeOf((*CreateContainerViewRequestType)(nil)).Elem()
+}
+
+type CreateContainerViewResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateCustomizationSpec CreateCustomizationSpecRequestType
+
+func init() {
+	t["CreateCustomizationSpec"] = reflect.TypeOf((*CreateCustomizationSpec)(nil)).Elem()
+}
+
+type CreateCustomizationSpecRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Item CustomizationSpecItem  `xml:"item"`
+}
+
+func init() {
+	t["CreateCustomizationSpecRequestType"] = reflect.TypeOf((*CreateCustomizationSpecRequestType)(nil)).Elem()
+}
+
+type CreateCustomizationSpecResponse struct {
+}
+
+type CreateDVPortgroupRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Spec DVPortgroupConfigSpec  `xml:"spec"`
+}
+
+func init() {
+	t["CreateDVPortgroupRequestType"] = reflect.TypeOf((*CreateDVPortgroupRequestType)(nil)).Elem()
+}
+
+type CreateDVPortgroup_Task CreateDVPortgroupRequestType
+
+func init() {
+	t["CreateDVPortgroup_Task"] = reflect.TypeOf((*CreateDVPortgroup_Task)(nil)).Elem()
+}
+
+type CreateDVPortgroup_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateDVSRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Spec DVSCreateSpec          `xml:"spec"`
+}
+
+func init() {
+	t["CreateDVSRequestType"] = reflect.TypeOf((*CreateDVSRequestType)(nil)).Elem()
+}
+
+type CreateDVS_Task CreateDVSRequestType
+
+func init() {
+	t["CreateDVS_Task"] = reflect.TypeOf((*CreateDVS_Task)(nil)).Elem()
+}
+
+type CreateDVS_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateDatacenter CreateDatacenterRequestType
+
+func init() {
+	t["CreateDatacenter"] = reflect.TypeOf((*CreateDatacenter)(nil)).Elem()
+}
+
+type CreateDatacenterRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Name string                 `xml:"name"`
+}
+
+func init() {
+	t["CreateDatacenterRequestType"] = reflect.TypeOf((*CreateDatacenterRequestType)(nil)).Elem()
+}
+
+type CreateDatacenterResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateDefaultProfile CreateDefaultProfileRequestType
+
+func init() {
+	t["CreateDefaultProfile"] = reflect.TypeOf((*CreateDefaultProfile)(nil)).Elem()
+}
+
+type CreateDefaultProfileRequestType struct {
+	This            ManagedObjectReference  `xml:"_this"`
+	ProfileType     string                  `xml:"profileType"`
+	ProfileTypeName string                  `xml:"profileTypeName,omitempty"`
+	Profile         *ManagedObjectReference `xml:"profile,omitempty"`
+}
+
+func init() {
+	t["CreateDefaultProfileRequestType"] = reflect.TypeOf((*CreateDefaultProfileRequestType)(nil)).Elem()
+}
+
+type CreateDefaultProfileResponse struct {
+	Returnval BaseApplyProfile `xml:"returnval,typeattr"`
+}
+
+type CreateDescriptor CreateDescriptorRequestType
+
+func init() {
+	t["CreateDescriptor"] = reflect.TypeOf((*CreateDescriptor)(nil)).Elem()
+}
+
+type CreateDescriptorRequestType struct {
+	This ManagedObjectReference    `xml:"_this"`
+	Obj  ManagedObjectReference    `xml:"obj"`
+	Cdp  OvfCreateDescriptorParams `xml:"cdp"`
+}
+
+func init() {
+	t["CreateDescriptorRequestType"] = reflect.TypeOf((*CreateDescriptorRequestType)(nil)).Elem()
+}
+
+type CreateDescriptorResponse struct {
+	Returnval OvfCreateDescriptorResult `xml:"returnval"`
+}
+
+type CreateDiagnosticPartition CreateDiagnosticPartitionRequestType
+
+func init() {
+	t["CreateDiagnosticPartition"] = reflect.TypeOf((*CreateDiagnosticPartition)(nil)).Elem()
+}
+
+type CreateDiagnosticPartitionRequestType struct {
+	This ManagedObjectReference            `xml:"_this"`
+	Spec HostDiagnosticPartitionCreateSpec `xml:"spec"`
+}
+
+func init() {
+	t["CreateDiagnosticPartitionRequestType"] = reflect.TypeOf((*CreateDiagnosticPartitionRequestType)(nil)).Elem()
+}
+
+type CreateDiagnosticPartitionResponse struct {
+}
+
+type CreateDirectory CreateDirectoryRequestType
+
+func init() {
+	t["CreateDirectory"] = reflect.TypeOf((*CreateDirectory)(nil)).Elem()
+}
+
+type CreateDirectoryRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	Datastore   ManagedObjectReference `xml:"datastore"`
+	DisplayName string                 `xml:"displayName,omitempty"`
+	Policy      string                 `xml:"policy,omitempty"`
+}
+
+func init() {
+	t["CreateDirectoryRequestType"] = reflect.TypeOf((*CreateDirectoryRequestType)(nil)).Elem()
+}
+
+type CreateDirectoryResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type CreateDiskRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Spec VslmCreateSpec         `xml:"spec"`
+}
+
+func init() {
+	t["CreateDiskRequestType"] = reflect.TypeOf((*CreateDiskRequestType)(nil)).Elem()
+}
+
+type CreateDisk_Task CreateDiskRequestType
+
+func init() {
+	t["CreateDisk_Task"] = reflect.TypeOf((*CreateDisk_Task)(nil)).Elem()
+}
+
+type CreateDisk_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateFilter CreateFilterRequestType
+
+func init() {
+	t["CreateFilter"] = reflect.TypeOf((*CreateFilter)(nil)).Elem()
+}
+
+type CreateFilterRequestType struct {
+	This           ManagedObjectReference `xml:"_this"`
+	Spec           PropertyFilterSpec     `xml:"spec"`
+	PartialUpdates bool                   `xml:"partialUpdates"`
+}
+
+func init() {
+	t["CreateFilterRequestType"] = reflect.TypeOf((*CreateFilterRequestType)(nil)).Elem()
+}
+
+type CreateFilterResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateFolder CreateFolderRequestType
+
+func init() {
+	t["CreateFolder"] = reflect.TypeOf((*CreateFolder)(nil)).Elem()
+}
+
+type CreateFolderRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Name string                 `xml:"name"`
+}
+
+func init() {
+	t["CreateFolderRequestType"] = reflect.TypeOf((*CreateFolderRequestType)(nil)).Elem()
+}
+
+type CreateFolderResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateGroup CreateGroupRequestType
+
+func init() {
+	t["CreateGroup"] = reflect.TypeOf((*CreateGroup)(nil)).Elem()
+}
+
+type CreateGroupRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Group BaseHostAccountSpec    `xml:"group,typeattr"`
+}
+
+func init() {
+	t["CreateGroupRequestType"] = reflect.TypeOf((*CreateGroupRequestType)(nil)).Elem()
+}
+
+type CreateGroupResponse struct {
+}
+
+type CreateImportSpec CreateImportSpecRequestType
+
+func init() {
+	t["CreateImportSpec"] = reflect.TypeOf((*CreateImportSpec)(nil)).Elem()
+}
+
+type CreateImportSpecRequestType struct {
+	This          ManagedObjectReference    `xml:"_this"`
+	OvfDescriptor string                    `xml:"ovfDescriptor"`
+	ResourcePool  ManagedObjectReference    `xml:"resourcePool"`
+	Datastore     ManagedObjectReference    `xml:"datastore"`
+	Cisp          OvfCreateImportSpecParams `xml:"cisp"`
+}
+
+func init() {
+	t["CreateImportSpecRequestType"] = reflect.TypeOf((*CreateImportSpecRequestType)(nil)).Elem()
+}
+
+type CreateImportSpecResponse struct {
+	Returnval OvfCreateImportSpecResult `xml:"returnval"`
+}
+
+type CreateInventoryView CreateInventoryViewRequestType
+
+func init() {
+	t["CreateInventoryView"] = reflect.TypeOf((*CreateInventoryView)(nil)).Elem()
+}
+
+type CreateInventoryViewRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["CreateInventoryViewRequestType"] = reflect.TypeOf((*CreateInventoryViewRequestType)(nil)).Elem()
+}
+
+type CreateInventoryViewResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateIpPool CreateIpPoolRequestType
+
+func init() {
+	t["CreateIpPool"] = reflect.TypeOf((*CreateIpPool)(nil)).Elem()
+}
+
+type CreateIpPoolRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Dc   ManagedObjectReference `xml:"dc"`
+	Pool IpPool                 `xml:"pool"`
+}
+
+func init() {
+	t["CreateIpPoolRequestType"] = reflect.TypeOf((*CreateIpPoolRequestType)(nil)).Elem()
+}
+
+type CreateIpPoolResponse struct {
+	Returnval int32 `xml:"returnval"`
+}
+
+type CreateListView CreateListViewRequestType
+
+func init() {
+	t["CreateListView"] = reflect.TypeOf((*CreateListView)(nil)).Elem()
+}
+
+type CreateListViewFromView CreateListViewFromViewRequestType
+
+func init() {
+	t["CreateListViewFromView"] = reflect.TypeOf((*CreateListViewFromView)(nil)).Elem()
+}
+
+type CreateListViewFromViewRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	View ManagedObjectReference `xml:"view"`
+}
+
+func init() {
+	t["CreateListViewFromViewRequestType"] = reflect.TypeOf((*CreateListViewFromViewRequestType)(nil)).Elem()
+}
+
+type CreateListViewFromViewResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateListViewRequestType struct {
+	This ManagedObjectReference   `xml:"_this"`
+	Obj  []ManagedObjectReference `xml:"obj,omitempty"`
+}
+
+func init() {
+	t["CreateListViewRequestType"] = reflect.TypeOf((*CreateListViewRequestType)(nil)).Elem()
+}
+
+type CreateListViewResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateLocalDatastore CreateLocalDatastoreRequestType
+
+func init() {
+	t["CreateLocalDatastore"] = reflect.TypeOf((*CreateLocalDatastore)(nil)).Elem()
+}
+
+type CreateLocalDatastoreRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Name string                 `xml:"name"`
+	Path string                 `xml:"path"`
+}
+
+func init() {
+	t["CreateLocalDatastoreRequestType"] = reflect.TypeOf((*CreateLocalDatastoreRequestType)(nil)).Elem()
+}
+
+type CreateLocalDatastoreResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateNasDatastore CreateNasDatastoreRequestType
+
+func init() {
+	t["CreateNasDatastore"] = reflect.TypeOf((*CreateNasDatastore)(nil)).Elem()
+}
+
+type CreateNasDatastoreRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Spec HostNasVolumeSpec      `xml:"spec"`
+}
+
+func init() {
+	t["CreateNasDatastoreRequestType"] = reflect.TypeOf((*CreateNasDatastoreRequestType)(nil)).Elem()
+}
+
+type CreateNasDatastoreResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateObjectScheduledTask CreateObjectScheduledTaskRequestType
+
+func init() {
+	t["CreateObjectScheduledTask"] = reflect.TypeOf((*CreateObjectScheduledTask)(nil)).Elem()
+}
+
+type CreateObjectScheduledTaskRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Obj  ManagedObjectReference `xml:"obj"`
+	Spec BaseScheduledTaskSpec  `xml:"spec,typeattr"`
+}
+
+func init() {
+	t["CreateObjectScheduledTaskRequestType"] = reflect.TypeOf((*CreateObjectScheduledTaskRequestType)(nil)).Elem()
+}
+
+type CreateObjectScheduledTaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreatePerfInterval CreatePerfIntervalRequestType
+
+func init() {
+	t["CreatePerfInterval"] = reflect.TypeOf((*CreatePerfInterval)(nil)).Elem()
+}
+
+type CreatePerfIntervalRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	IntervalId PerfInterval           `xml:"intervalId"`
+}
+
+func init() {
+	t["CreatePerfIntervalRequestType"] = reflect.TypeOf((*CreatePerfIntervalRequestType)(nil)).Elem()
+}
+
+type CreatePerfIntervalResponse struct {
+}
+
+type CreateProfile CreateProfileRequestType
+
+func init() {
+	t["CreateProfile"] = reflect.TypeOf((*CreateProfile)(nil)).Elem()
+}
+
+type CreateProfileRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	CreateSpec BaseProfileCreateSpec  `xml:"createSpec,typeattr"`
+}
+
+func init() {
+	t["CreateProfileRequestType"] = reflect.TypeOf((*CreateProfileRequestType)(nil)).Elem()
+}
+
+type CreateProfileResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreatePropertyCollector CreatePropertyCollectorRequestType
+
+func init() {
+	t["CreatePropertyCollector"] = reflect.TypeOf((*CreatePropertyCollector)(nil)).Elem()
+}
+
+type CreatePropertyCollectorRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["CreatePropertyCollectorRequestType"] = reflect.TypeOf((*CreatePropertyCollectorRequestType)(nil)).Elem()
+}
+
+type CreatePropertyCollectorResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateRegistryKeyInGuest CreateRegistryKeyInGuestRequestType
+
+func init() {
+	t["CreateRegistryKeyInGuest"] = reflect.TypeOf((*CreateRegistryKeyInGuest)(nil)).Elem()
+}
+
+type CreateRegistryKeyInGuestRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Vm         ManagedObjectReference  `xml:"vm"`
+	Auth       BaseGuestAuthentication `xml:"auth,typeattr"`
+	KeyName    GuestRegKeyNameSpec     `xml:"keyName"`
+	IsVolatile bool                    `xml:"isVolatile"`
+	ClassType  string                  `xml:"classType,omitempty"`
+}
+
+func init() {
+	t["CreateRegistryKeyInGuestRequestType"] = reflect.TypeOf((*CreateRegistryKeyInGuestRequestType)(nil)).Elem()
+}
+
+type CreateRegistryKeyInGuestResponse struct {
+}
+
+type CreateResourcePool CreateResourcePoolRequestType
+
+func init() {
+	t["CreateResourcePool"] = reflect.TypeOf((*CreateResourcePool)(nil)).Elem()
+}
+
+type CreateResourcePoolRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Name string                 `xml:"name"`
+	Spec ResourceConfigSpec     `xml:"spec"`
+}
+
+func init() {
+	t["CreateResourcePoolRequestType"] = reflect.TypeOf((*CreateResourcePoolRequestType)(nil)).Elem()
+}
+
+type CreateResourcePoolResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateScheduledTask CreateScheduledTaskRequestType
+
+func init() {
+	t["CreateScheduledTask"] = reflect.TypeOf((*CreateScheduledTask)(nil)).Elem()
+}
+
+type CreateScheduledTaskRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Entity ManagedObjectReference `xml:"entity"`
+	Spec   BaseScheduledTaskSpec  `xml:"spec,typeattr"`
+}
+
+func init() {
+	t["CreateScheduledTaskRequestType"] = reflect.TypeOf((*CreateScheduledTaskRequestType)(nil)).Elem()
+}
+
+type CreateScheduledTaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateScreenshotRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["CreateScreenshotRequestType"] = reflect.TypeOf((*CreateScreenshotRequestType)(nil)).Elem()
+}
+
+type CreateScreenshot_Task CreateScreenshotRequestType
+
+func init() {
+	t["CreateScreenshot_Task"] = reflect.TypeOf((*CreateScreenshot_Task)(nil)).Elem()
+}
+
+type CreateScreenshot_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateSecondaryVMExRequestType struct {
+	This ManagedObjectReference    `xml:"_this"`
+	Host *ManagedObjectReference   `xml:"host,omitempty"`
+	Spec *FaultToleranceConfigSpec `xml:"spec,omitempty"`
+}
+
+func init() {
+	t["CreateSecondaryVMExRequestType"] = reflect.TypeOf((*CreateSecondaryVMExRequestType)(nil)).Elem()
+}
+
+type CreateSecondaryVMEx_Task CreateSecondaryVMExRequestType
+
+func init() {
+	t["CreateSecondaryVMEx_Task"] = reflect.TypeOf((*CreateSecondaryVMEx_Task)(nil)).Elem()
+}
+
+type CreateSecondaryVMEx_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateSecondaryVMRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Host *ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["CreateSecondaryVMRequestType"] = reflect.TypeOf((*CreateSecondaryVMRequestType)(nil)).Elem()
+}
+
+type CreateSecondaryVM_Task CreateSecondaryVMRequestType
+
+func init() {
+	t["CreateSecondaryVM_Task"] = reflect.TypeOf((*CreateSecondaryVM_Task)(nil)).Elem()
+}
+
+type CreateSecondaryVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateSnapshotExRequestType struct {
+	This        ManagedObjectReference             `xml:"_this"`
+	Name        string                             `xml:"name"`
+	Description string                             `xml:"description,omitempty"`
+	Memory      bool                               `xml:"memory"`
+	QuiesceSpec BaseVirtualMachineGuestQuiesceSpec `xml:"quiesceSpec,omitempty,typeattr"`
+}
+
+func init() {
+	t["CreateSnapshotExRequestType"] = reflect.TypeOf((*CreateSnapshotExRequestType)(nil)).Elem()
+}
+
+type CreateSnapshotEx_Task CreateSnapshotExRequestType
+
+func init() {
+	t["CreateSnapshotEx_Task"] = reflect.TypeOf((*CreateSnapshotEx_Task)(nil)).Elem()
+}
+
+type CreateSnapshotEx_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateSnapshotRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	Name        string                 `xml:"name"`
+	Description string                 `xml:"description,omitempty"`
+	Memory      bool                   `xml:"memory"`
+	Quiesce     bool                   `xml:"quiesce"`
+}
+
+func init() {
+	t["CreateSnapshotRequestType"] = reflect.TypeOf((*CreateSnapshotRequestType)(nil)).Elem()
+}
+
+type CreateSnapshot_Task CreateSnapshotRequestType
+
+func init() {
+	t["CreateSnapshot_Task"] = reflect.TypeOf((*CreateSnapshot_Task)(nil)).Elem()
+}
+
+type CreateSnapshot_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateStoragePod CreateStoragePodRequestType
+
+func init() {
+	t["CreateStoragePod"] = reflect.TypeOf((*CreateStoragePod)(nil)).Elem()
+}
+
+type CreateStoragePodRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Name string                 `xml:"name"`
+}
+
+func init() {
+	t["CreateStoragePodRequestType"] = reflect.TypeOf((*CreateStoragePodRequestType)(nil)).Elem()
+}
+
+type CreateStoragePodResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateTask CreateTaskRequestType
+
+func init() {
+	t["CreateTask"] = reflect.TypeOf((*CreateTask)(nil)).Elem()
+}
+
+type CreateTaskAction struct {
+	Action
+
+	TaskTypeId string `xml:"taskTypeId"`
+	Cancelable bool   `xml:"cancelable"`
+}
+
+func init() {
+	t["CreateTaskAction"] = reflect.TypeOf((*CreateTaskAction)(nil)).Elem()
+}
+
+type CreateTaskRequestType struct {
+	This          ManagedObjectReference `xml:"_this"`
+	Obj           ManagedObjectReference `xml:"obj"`
+	TaskTypeId    string                 `xml:"taskTypeId"`
+	InitiatedBy   string                 `xml:"initiatedBy,omitempty"`
+	Cancelable    bool                   `xml:"cancelable"`
+	ParentTaskKey string                 `xml:"parentTaskKey,omitempty"`
+	ActivationId  string                 `xml:"activationId,omitempty"`
+}
+
+func init() {
+	t["CreateTaskRequestType"] = reflect.TypeOf((*CreateTaskRequestType)(nil)).Elem()
+}
+
+type CreateTaskResponse struct {
+	Returnval TaskInfo `xml:"returnval"`
+}
+
+type CreateTemporaryDirectoryInGuest CreateTemporaryDirectoryInGuestRequestType
+
+func init() {
+	t["CreateTemporaryDirectoryInGuest"] = reflect.TypeOf((*CreateTemporaryDirectoryInGuest)(nil)).Elem()
+}
+
+type CreateTemporaryDirectoryInGuestRequestType struct {
+	This          ManagedObjectReference  `xml:"_this"`
+	Vm            ManagedObjectReference  `xml:"vm"`
+	Auth          BaseGuestAuthentication `xml:"auth,typeattr"`
+	Prefix        string                  `xml:"prefix"`
+	Suffix        string                  `xml:"suffix"`
+	DirectoryPath string                  `xml:"directoryPath,omitempty"`
+}
+
+func init() {
+	t["CreateTemporaryDirectoryInGuestRequestType"] = reflect.TypeOf((*CreateTemporaryDirectoryInGuestRequestType)(nil)).Elem()
+}
+
+type CreateTemporaryDirectoryInGuestResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type CreateTemporaryFileInGuest CreateTemporaryFileInGuestRequestType
+
+func init() {
+	t["CreateTemporaryFileInGuest"] = reflect.TypeOf((*CreateTemporaryFileInGuest)(nil)).Elem()
+}
+
+type CreateTemporaryFileInGuestRequestType struct {
+	This          ManagedObjectReference  `xml:"_this"`
+	Vm            ManagedObjectReference  `xml:"vm"`
+	Auth          BaseGuestAuthentication `xml:"auth,typeattr"`
+	Prefix        string                  `xml:"prefix"`
+	Suffix        string                  `xml:"suffix"`
+	DirectoryPath string                  `xml:"directoryPath,omitempty"`
+}
+
+func init() {
+	t["CreateTemporaryFileInGuestRequestType"] = reflect.TypeOf((*CreateTemporaryFileInGuestRequestType)(nil)).Elem()
+}
+
+type CreateTemporaryFileInGuestResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type CreateUser CreateUserRequestType
+
+func init() {
+	t["CreateUser"] = reflect.TypeOf((*CreateUser)(nil)).Elem()
+}
+
+type CreateUserRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	User BaseHostAccountSpec    `xml:"user,typeattr"`
+}
+
+func init() {
+	t["CreateUserRequestType"] = reflect.TypeOf((*CreateUserRequestType)(nil)).Elem()
+}
+
+type CreateUserResponse struct {
+}
+
+type CreateVApp CreateVAppRequestType
+
+func init() {
+	t["CreateVApp"] = reflect.TypeOf((*CreateVApp)(nil)).Elem()
+}
+
+type CreateVAppRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Name       string                  `xml:"name"`
+	ResSpec    ResourceConfigSpec      `xml:"resSpec"`
+	ConfigSpec VAppConfigSpec          `xml:"configSpec"`
+	VmFolder   *ManagedObjectReference `xml:"vmFolder,omitempty"`
+}
+
+func init() {
+	t["CreateVAppRequestType"] = reflect.TypeOf((*CreateVAppRequestType)(nil)).Elem()
+}
+
+type CreateVAppResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateVMRequestType struct {
+	This   ManagedObjectReference   `xml:"_this"`
+	Config VirtualMachineConfigSpec `xml:"config"`
+	Pool   ManagedObjectReference   `xml:"pool"`
+	Host   *ManagedObjectReference  `xml:"host,omitempty"`
+}
+
+func init() {
+	t["CreateVMRequestType"] = reflect.TypeOf((*CreateVMRequestType)(nil)).Elem()
+}
+
+type CreateVM_Task CreateVMRequestType
+
+func init() {
+	t["CreateVM_Task"] = reflect.TypeOf((*CreateVM_Task)(nil)).Elem()
+}
+
+type CreateVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateVirtualDiskRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Name       string                  `xml:"name"`
+	Datacenter *ManagedObjectReference `xml:"datacenter,omitempty"`
+	Spec       BaseVirtualDiskSpec     `xml:"spec,typeattr"`
+}
+
+func init() {
+	t["CreateVirtualDiskRequestType"] = reflect.TypeOf((*CreateVirtualDiskRequestType)(nil)).Elem()
+}
+
+type CreateVirtualDisk_Task CreateVirtualDiskRequestType
+
+func init() {
+	t["CreateVirtualDisk_Task"] = reflect.TypeOf((*CreateVirtualDisk_Task)(nil)).Elem()
+}
+
+type CreateVirtualDisk_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateVmfsDatastore CreateVmfsDatastoreRequestType
+
+func init() {
+	t["CreateVmfsDatastore"] = reflect.TypeOf((*CreateVmfsDatastore)(nil)).Elem()
+}
+
+type CreateVmfsDatastoreRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Spec VmfsDatastoreCreateSpec `xml:"spec"`
+}
+
+func init() {
+	t["CreateVmfsDatastoreRequestType"] = reflect.TypeOf((*CreateVmfsDatastoreRequestType)(nil)).Elem()
+}
+
+type CreateVmfsDatastoreResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateVvolDatastore CreateVvolDatastoreRequestType
+
+func init() {
+	t["CreateVvolDatastore"] = reflect.TypeOf((*CreateVvolDatastore)(nil)).Elem()
+}
+
+type CreateVvolDatastoreRequestType struct {
+	This ManagedObjectReference               `xml:"_this"`
+	Spec HostDatastoreSystemVvolDatastoreSpec `xml:"spec"`
+}
+
+func init() {
+	t["CreateVvolDatastoreRequestType"] = reflect.TypeOf((*CreateVvolDatastoreRequestType)(nil)).Elem()
+}
+
+type CreateVvolDatastoreResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CryptoKeyId struct {
+	DynamicData
+
+	KeyId      string         `xml:"keyId"`
+	ProviderId *KeyProviderId `xml:"providerId,omitempty"`
+}
+
+func init() {
+	t["CryptoKeyId"] = reflect.TypeOf((*CryptoKeyId)(nil)).Elem()
+}
+
+type CryptoKeyPlain struct {
+	DynamicData
+
+	KeyId     CryptoKeyId `xml:"keyId"`
+	Algorithm string      `xml:"algorithm"`
+	KeyData   string      `xml:"keyData"`
+}
+
+func init() {
+	t["CryptoKeyPlain"] = reflect.TypeOf((*CryptoKeyPlain)(nil)).Elem()
+}
+
+type CryptoKeyResult struct {
+	DynamicData
+
+	KeyId   CryptoKeyId `xml:"keyId"`
+	Success bool        `xml:"success"`
+	Reason  string      `xml:"reason,omitempty"`
+}
+
+func init() {
+	t["CryptoKeyResult"] = reflect.TypeOf((*CryptoKeyResult)(nil)).Elem()
+}
+
+type CryptoManagerKmipCertificateInfo struct {
+	DynamicData
+
+	Subject             string    `xml:"subject"`
+	Issuer              string    `xml:"issuer"`
+	SerialNumber        string    `xml:"serialNumber"`
+	NotBefore           time.Time `xml:"notBefore"`
+	NotAfter            time.Time `xml:"notAfter"`
+	Fingerprint         string    `xml:"fingerprint"`
+	CheckTime           time.Time `xml:"checkTime"`
+	SecondsSinceValid   int32     `xml:"secondsSinceValid,omitempty"`
+	SecondsBeforeExpire int32     `xml:"secondsBeforeExpire,omitempty"`
+}
+
+func init() {
+	t["CryptoManagerKmipCertificateInfo"] = reflect.TypeOf((*CryptoManagerKmipCertificateInfo)(nil)).Elem()
+}
+
+type CryptoManagerKmipClusterStatus struct {
+	DynamicData
+
+	ClusterId      KeyProviderId                     `xml:"clusterId"`
+	Servers        []CryptoManagerKmipServerStatus   `xml:"servers"`
+	ClientCertInfo *CryptoManagerKmipCertificateInfo `xml:"clientCertInfo,omitempty"`
+}
+
+func init() {
+	t["CryptoManagerKmipClusterStatus"] = reflect.TypeOf((*CryptoManagerKmipClusterStatus)(nil)).Elem()
+}
+
+type CryptoManagerKmipServerCertInfo struct {
+	DynamicData
+
+	Certificate       string                            `xml:"certificate"`
+	CertInfo          *CryptoManagerKmipCertificateInfo `xml:"certInfo,omitempty"`
+	ClientTrustServer *bool                             `xml:"clientTrustServer"`
+}
+
+func init() {
+	t["CryptoManagerKmipServerCertInfo"] = reflect.TypeOf((*CryptoManagerKmipServerCertInfo)(nil)).Elem()
+}
+
+type CryptoManagerKmipServerStatus struct {
+	DynamicData
+
+	Name              string                            `xml:"name"`
+	Status            ManagedEntityStatus               `xml:"status"`
+	ConnectionStatus  string                            `xml:"connectionStatus"`
+	CertInfo          *CryptoManagerKmipCertificateInfo `xml:"certInfo,omitempty"`
+	ClientTrustServer *bool                             `xml:"clientTrustServer"`
+	ServerTrustClient *bool                             `xml:"serverTrustClient"`
+}
+
+func init() {
+	t["CryptoManagerKmipServerStatus"] = reflect.TypeOf((*CryptoManagerKmipServerStatus)(nil)).Elem()
+}
+
+type CryptoSpec struct {
+	DynamicData
+}
+
+func init() {
+	t["CryptoSpec"] = reflect.TypeOf((*CryptoSpec)(nil)).Elem()
+}
+
+type CryptoSpecDecrypt struct {
+	CryptoSpec
+}
+
+func init() {
+	t["CryptoSpecDecrypt"] = reflect.TypeOf((*CryptoSpecDecrypt)(nil)).Elem()
+}
+
+type CryptoSpecDeepRecrypt struct {
+	CryptoSpec
+
+	NewKeyId CryptoKeyId `xml:"newKeyId"`
+}
+
+func init() {
+	t["CryptoSpecDeepRecrypt"] = reflect.TypeOf((*CryptoSpecDeepRecrypt)(nil)).Elem()
+}
+
+type CryptoSpecEncrypt struct {
+	CryptoSpec
+
+	CryptoKeyId CryptoKeyId `xml:"cryptoKeyId"`
+}
+
+func init() {
+	t["CryptoSpecEncrypt"] = reflect.TypeOf((*CryptoSpecEncrypt)(nil)).Elem()
+}
+
+type CryptoSpecNoOp struct {
+	CryptoSpec
+}
+
+func init() {
+	t["CryptoSpecNoOp"] = reflect.TypeOf((*CryptoSpecNoOp)(nil)).Elem()
+}
+
+type CryptoSpecRegister struct {
+	CryptoSpecNoOp
+
+	CryptoKeyId CryptoKeyId `xml:"cryptoKeyId"`
+}
+
+func init() {
+	t["CryptoSpecRegister"] = reflect.TypeOf((*CryptoSpecRegister)(nil)).Elem()
+}
+
+type CryptoSpecShallowRecrypt struct {
+	CryptoSpec
+
+	NewKeyId CryptoKeyId `xml:"newKeyId"`
+}
+
+func init() {
+	t["CryptoSpecShallowRecrypt"] = reflect.TypeOf((*CryptoSpecShallowRecrypt)(nil)).Elem()
+}
+
+type CurrentTime CurrentTimeRequestType
+
+func init() {
+	t["CurrentTime"] = reflect.TypeOf((*CurrentTime)(nil)).Elem()
+}
+
+type CurrentTimeRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["CurrentTimeRequestType"] = reflect.TypeOf((*CurrentTimeRequestType)(nil)).Elem()
+}
+
+type CurrentTimeResponse struct {
+	Returnval time.Time `xml:"returnval"`
+}
+
+type CustomFieldDef struct {
+	DynamicData
+
+	Key                     int32               `xml:"key"`
+	Name                    string              `xml:"name"`
+	Type                    string              `xml:"type"`
+	ManagedObjectType       string              `xml:"managedObjectType,omitempty"`
+	FieldDefPrivileges      *PrivilegePolicyDef `xml:"fieldDefPrivileges,omitempty"`
+	FieldInstancePrivileges *PrivilegePolicyDef `xml:"fieldInstancePrivileges,omitempty"`
+}
+
+func init() {
+	t["CustomFieldDef"] = reflect.TypeOf((*CustomFieldDef)(nil)).Elem()
+}
+
+type CustomFieldDefAddedEvent struct {
+	CustomFieldDefEvent
+}
+
+func init() {
+	t["CustomFieldDefAddedEvent"] = reflect.TypeOf((*CustomFieldDefAddedEvent)(nil)).Elem()
+}
+
+type CustomFieldDefEvent struct {
+	CustomFieldEvent
+
+	FieldKey int32  `xml:"fieldKey"`
+	Name     string `xml:"name"`
+}
+
+func init() {
+	t["CustomFieldDefEvent"] = reflect.TypeOf((*CustomFieldDefEvent)(nil)).Elem()
+}
+
+type CustomFieldDefRemovedEvent struct {
+	CustomFieldDefEvent
+}
+
+func init() {
+	t["CustomFieldDefRemovedEvent"] = reflect.TypeOf((*CustomFieldDefRemovedEvent)(nil)).Elem()
+}
+
+type CustomFieldDefRenamedEvent struct {
+	CustomFieldDefEvent
+
+	NewName string `xml:"newName"`
+}
+
+func init() {
+	t["CustomFieldDefRenamedEvent"] = reflect.TypeOf((*CustomFieldDefRenamedEvent)(nil)).Elem()
+}
+
+type CustomFieldEvent struct {
+	Event
+}
+
+func init() {
+	t["CustomFieldEvent"] = reflect.TypeOf((*CustomFieldEvent)(nil)).Elem()
+}
+
+type CustomFieldStringValue struct {
+	CustomFieldValue
+
+	Value string `xml:"value"`
+}
+
+func init() {
+	t["CustomFieldStringValue"] = reflect.TypeOf((*CustomFieldStringValue)(nil)).Elem()
+}
+
+type CustomFieldValue struct {
+	DynamicData
+
+	Key int32 `xml:"key"`
+}
+
+func init() {
+	t["CustomFieldValue"] = reflect.TypeOf((*CustomFieldValue)(nil)).Elem()
+}
+
+type CustomFieldValueChangedEvent struct {
+	CustomFieldEvent
+
+	Entity    ManagedEntityEventArgument `xml:"entity"`
+	FieldKey  int32                      `xml:"fieldKey"`
+	Name      string                     `xml:"name"`
+	Value     string                     `xml:"value"`
+	PrevState string                     `xml:"prevState,omitempty"`
+}
+
+func init() {
+	t["CustomFieldValueChangedEvent"] = reflect.TypeOf((*CustomFieldValueChangedEvent)(nil)).Elem()
+}
+
+type CustomizationAdapterMapping struct {
+	DynamicData
+
+	MacAddress string                  `xml:"macAddress,omitempty"`
+	Adapter    CustomizationIPSettings `xml:"adapter"`
+}
+
+func init() {
+	t["CustomizationAdapterMapping"] = reflect.TypeOf((*CustomizationAdapterMapping)(nil)).Elem()
+}
+
+type CustomizationAutoIpV6Generator struct {
+	CustomizationIpV6Generator
+}
+
+func init() {
+	t["CustomizationAutoIpV6Generator"] = reflect.TypeOf((*CustomizationAutoIpV6Generator)(nil)).Elem()
+}
+
+type CustomizationCustomIpGenerator struct {
+	CustomizationIpGenerator
+
+	Argument string `xml:"argument,omitempty"`
+}
+
+func init() {
+	t["CustomizationCustomIpGenerator"] = reflect.TypeOf((*CustomizationCustomIpGenerator)(nil)).Elem()
+}
+
+type CustomizationCustomIpV6Generator struct {
+	CustomizationIpV6Generator
+
+	Argument string `xml:"argument,omitempty"`
+}
+
+func init() {
+	t["CustomizationCustomIpV6Generator"] = reflect.TypeOf((*CustomizationCustomIpV6Generator)(nil)).Elem()
+}
+
+type CustomizationCustomName struct {
+	CustomizationName
+
+	Argument string `xml:"argument,omitempty"`
+}
+
+func init() {
+	t["CustomizationCustomName"] = reflect.TypeOf((*CustomizationCustomName)(nil)).Elem()
+}
+
+type CustomizationDhcpIpGenerator struct {
+	CustomizationIpGenerator
+}
+
+func init() {
+	t["CustomizationDhcpIpGenerator"] = reflect.TypeOf((*CustomizationDhcpIpGenerator)(nil)).Elem()
+}
+
+type CustomizationDhcpIpV6Generator struct {
+	CustomizationIpV6Generator
+}
+
+func init() {
+	t["CustomizationDhcpIpV6Generator"] = reflect.TypeOf((*CustomizationDhcpIpV6Generator)(nil)).Elem()
+}
+
+type CustomizationEvent struct {
+	VmEvent
+
+	LogLocation string `xml:"logLocation,omitempty"`
+}
+
+func init() {
+	t["CustomizationEvent"] = reflect.TypeOf((*CustomizationEvent)(nil)).Elem()
+}
+
+type CustomizationFailed struct {
+	CustomizationEvent
+}
+
+func init() {
+	t["CustomizationFailed"] = reflect.TypeOf((*CustomizationFailed)(nil)).Elem()
+}
+
+type CustomizationFault struct {
+	VimFault
+}
+
+func init() {
+	t["CustomizationFault"] = reflect.TypeOf((*CustomizationFault)(nil)).Elem()
+}
+
+type CustomizationFaultFault BaseCustomizationFault
+
+func init() {
+	t["CustomizationFaultFault"] = reflect.TypeOf((*CustomizationFaultFault)(nil)).Elem()
+}
+
+type CustomizationFixedIp struct {
+	CustomizationIpGenerator
+
+	IpAddress string `xml:"ipAddress"`
+}
+
+func init() {
+	t["CustomizationFixedIp"] = reflect.TypeOf((*CustomizationFixedIp)(nil)).Elem()
+}
+
+type CustomizationFixedIpV6 struct {
+	CustomizationIpV6Generator
+
+	IpAddress  string `xml:"ipAddress"`
+	SubnetMask int32  `xml:"subnetMask"`
+}
+
+func init() {
+	t["CustomizationFixedIpV6"] = reflect.TypeOf((*CustomizationFixedIpV6)(nil)).Elem()
+}
+
+type CustomizationFixedName struct {
+	CustomizationName
+
+	Name string `xml:"name"`
+}
+
+func init() {
+	t["CustomizationFixedName"] = reflect.TypeOf((*CustomizationFixedName)(nil)).Elem()
+}
+
+type CustomizationGlobalIPSettings struct {
+	DynamicData
+
+	DnsSuffixList []string `xml:"dnsSuffixList,omitempty"`
+	DnsServerList []string `xml:"dnsServerList,omitempty"`
+}
+
+func init() {
+	t["CustomizationGlobalIPSettings"] = reflect.TypeOf((*CustomizationGlobalIPSettings)(nil)).Elem()
+}
+
+type CustomizationGuiRunOnce struct {
+	DynamicData
+
+	CommandList []string `xml:"commandList"`
+}
+
+func init() {
+	t["CustomizationGuiRunOnce"] = reflect.TypeOf((*CustomizationGuiRunOnce)(nil)).Elem()
+}
+
+type CustomizationGuiUnattended struct {
+	DynamicData
+
+	Password       *CustomizationPassword `xml:"password,omitempty"`
+	TimeZone       int32                  `xml:"timeZone"`
+	AutoLogon      bool                   `xml:"autoLogon"`
+	AutoLogonCount int32                  `xml:"autoLogonCount"`
+}
+
+func init() {
+	t["CustomizationGuiUnattended"] = reflect.TypeOf((*CustomizationGuiUnattended)(nil)).Elem()
+}
+
+type CustomizationIPSettings struct {
+	DynamicData
+
+	Ip            BaseCustomizationIpGenerator            `xml:"ip,typeattr"`
+	SubnetMask    string                                  `xml:"subnetMask,omitempty"`
+	Gateway       []string                                `xml:"gateway,omitempty"`
+	IpV6Spec      *CustomizationIPSettingsIpV6AddressSpec `xml:"ipV6Spec,omitempty"`
+	DnsServerList []string                                `xml:"dnsServerList,omitempty"`
+	DnsDomain     string                                  `xml:"dnsDomain,omitempty"`
+	PrimaryWINS   string                                  `xml:"primaryWINS,omitempty"`
+	SecondaryWINS string                                  `xml:"secondaryWINS,omitempty"`
+	NetBIOS       CustomizationNetBIOSMode                `xml:"netBIOS,omitempty"`
+}
+
+func init() {
+	t["CustomizationIPSettings"] = reflect.TypeOf((*CustomizationIPSettings)(nil)).Elem()
+}
+
+type CustomizationIPSettingsIpV6AddressSpec struct {
+	DynamicData
+
+	Ip      []BaseCustomizationIpV6Generator `xml:"ip,typeattr"`
+	Gateway []string                         `xml:"gateway,omitempty"`
+}
+
+func init() {
+	t["CustomizationIPSettingsIpV6AddressSpec"] = reflect.TypeOf((*CustomizationIPSettingsIpV6AddressSpec)(nil)).Elem()
+}
+
+type CustomizationIdentification struct {
+	DynamicData
+
+	JoinWorkgroup       string                 `xml:"joinWorkgroup,omitempty"`
+	JoinDomain          string                 `xml:"joinDomain,omitempty"`
+	DomainAdmin         string                 `xml:"domainAdmin,omitempty"`
+	DomainAdminPassword *CustomizationPassword `xml:"domainAdminPassword,omitempty"`
+}
+
+func init() {
+	t["CustomizationIdentification"] = reflect.TypeOf((*CustomizationIdentification)(nil)).Elem()
+}
+
+type CustomizationIdentitySettings struct {
+	DynamicData
+}
+
+func init() {
+	t["CustomizationIdentitySettings"] = reflect.TypeOf((*CustomizationIdentitySettings)(nil)).Elem()
+}
+
+type CustomizationIpGenerator struct {
+	DynamicData
+}
+
+func init() {
+	t["CustomizationIpGenerator"] = reflect.TypeOf((*CustomizationIpGenerator)(nil)).Elem()
+}
+
+type CustomizationIpV6Generator struct {
+	DynamicData
+}
+
+func init() {
+	t["CustomizationIpV6Generator"] = reflect.TypeOf((*CustomizationIpV6Generator)(nil)).Elem()
+}
+
+type CustomizationLicenseFilePrintData struct {
+	DynamicData
+
+	AutoMode  CustomizationLicenseDataMode `xml:"autoMode"`
+	AutoUsers int32                        `xml:"autoUsers,omitempty"`
+}
+
+func init() {
+	t["CustomizationLicenseFilePrintData"] = reflect.TypeOf((*CustomizationLicenseFilePrintData)(nil)).Elem()
+}
+
+type CustomizationLinuxIdentityFailed struct {
+	CustomizationFailed
+}
+
+func init() {
+	t["CustomizationLinuxIdentityFailed"] = reflect.TypeOf((*CustomizationLinuxIdentityFailed)(nil)).Elem()
+}
+
+type CustomizationLinuxOptions struct {
+	CustomizationOptions
+}
+
+func init() {
+	t["CustomizationLinuxOptions"] = reflect.TypeOf((*CustomizationLinuxOptions)(nil)).Elem()
+}
+
+type CustomizationLinuxPrep struct {
+	CustomizationIdentitySettings
+
+	HostName   BaseCustomizationName `xml:"hostName,typeattr"`
+	Domain     string                `xml:"domain"`
+	TimeZone   string                `xml:"timeZone,omitempty"`
+	HwClockUTC *bool                 `xml:"hwClockUTC"`
+}
+
+func init() {
+	t["CustomizationLinuxPrep"] = reflect.TypeOf((*CustomizationLinuxPrep)(nil)).Elem()
+}
+
+type CustomizationName struct {
+	DynamicData
+}
+
+func init() {
+	t["CustomizationName"] = reflect.TypeOf((*CustomizationName)(nil)).Elem()
+}
+
+type CustomizationNetworkSetupFailed struct {
+	CustomizationFailed
+}
+
+func init() {
+	t["CustomizationNetworkSetupFailed"] = reflect.TypeOf((*CustomizationNetworkSetupFailed)(nil)).Elem()
+}
+
+type CustomizationOptions struct {
+	DynamicData
+}
+
+func init() {
+	t["CustomizationOptions"] = reflect.TypeOf((*CustomizationOptions)(nil)).Elem()
+}
+
+type CustomizationPassword struct {
+	DynamicData
+
+	Value     string `xml:"value"`
+	PlainText bool   `xml:"plainText"`
+}
+
+func init() {
+	t["CustomizationPassword"] = reflect.TypeOf((*CustomizationPassword)(nil)).Elem()
+}
+
+type CustomizationPending struct {
+	CustomizationFault
+}
+
+func init() {
+	t["CustomizationPending"] = reflect.TypeOf((*CustomizationPending)(nil)).Elem()
+}
+
+type CustomizationPendingFault CustomizationPending
+
+func init() {
+	t["CustomizationPendingFault"] = reflect.TypeOf((*CustomizationPendingFault)(nil)).Elem()
+}
+
+type CustomizationPrefixName struct {
+	CustomizationName
+
+	Base string `xml:"base"`
+}
+
+func init() {
+	t["CustomizationPrefixName"] = reflect.TypeOf((*CustomizationPrefixName)(nil)).Elem()
+}
+
+type CustomizationSpec struct {
+	DynamicData
+
+	Options          BaseCustomizationOptions          `xml:"options,omitempty,typeattr"`
+	Identity         BaseCustomizationIdentitySettings `xml:"identity,typeattr"`
+	GlobalIPSettings CustomizationGlobalIPSettings     `xml:"globalIPSettings"`
+	NicSettingMap    []CustomizationAdapterMapping     `xml:"nicSettingMap,omitempty"`
+	EncryptionKey    []byte                            `xml:"encryptionKey,omitempty"`
+}
+
+func init() {
+	t["CustomizationSpec"] = reflect.TypeOf((*CustomizationSpec)(nil)).Elem()
+}
+
+type CustomizationSpecInfo struct {
+	DynamicData
+
+	Name           string     `xml:"name"`
+	Description    string     `xml:"description"`
+	Type           string     `xml:"type"`
+	ChangeVersion  string     `xml:"changeVersion,omitempty"`
+	LastUpdateTime *time.Time `xml:"lastUpdateTime"`
+}
+
+func init() {
+	t["CustomizationSpecInfo"] = reflect.TypeOf((*CustomizationSpecInfo)(nil)).Elem()
+}
+
+type CustomizationSpecItem struct {
+	DynamicData
+
+	Info CustomizationSpecInfo `xml:"info"`
+	Spec CustomizationSpec     `xml:"spec"`
+}
+
+func init() {
+	t["CustomizationSpecItem"] = reflect.TypeOf((*CustomizationSpecItem)(nil)).Elem()
+}
+
+type CustomizationSpecItemToXml CustomizationSpecItemToXmlRequestType
+
+func init() {
+	t["CustomizationSpecItemToXml"] = reflect.TypeOf((*CustomizationSpecItemToXml)(nil)).Elem()
+}
+
+type CustomizationSpecItemToXmlRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Item CustomizationSpecItem  `xml:"item"`
+}
+
+func init() {
+	t["CustomizationSpecItemToXmlRequestType"] = reflect.TypeOf((*CustomizationSpecItemToXmlRequestType)(nil)).Elem()
+}
+
+type CustomizationSpecItemToXmlResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type CustomizationStartedEvent struct {
+	CustomizationEvent
+}
+
+func init() {
+	t["CustomizationStartedEvent"] = reflect.TypeOf((*CustomizationStartedEvent)(nil)).Elem()
+}
+
+type CustomizationStatelessIpV6Generator struct {
+	CustomizationIpV6Generator
+}
+
+func init() {
+	t["CustomizationStatelessIpV6Generator"] = reflect.TypeOf((*CustomizationStatelessIpV6Generator)(nil)).Elem()
+}
+
+type CustomizationSucceeded struct {
+	CustomizationEvent
+}
+
+func init() {
+	t["CustomizationSucceeded"] = reflect.TypeOf((*CustomizationSucceeded)(nil)).Elem()
+}
+
+type CustomizationSysprep struct {
+	CustomizationIdentitySettings
+
+	GuiUnattended        CustomizationGuiUnattended         `xml:"guiUnattended"`
+	UserData             CustomizationUserData              `xml:"userData"`
+	GuiRunOnce           *CustomizationGuiRunOnce           `xml:"guiRunOnce,omitempty"`
+	Identification       CustomizationIdentification        `xml:"identification"`
+	LicenseFilePrintData *CustomizationLicenseFilePrintData `xml:"licenseFilePrintData,omitempty"`
+}
+
+func init() {
+	t["CustomizationSysprep"] = reflect.TypeOf((*CustomizationSysprep)(nil)).Elem()
+}
+
+type CustomizationSysprepFailed struct {
+	CustomizationFailed
+
+	SysprepVersion string `xml:"sysprepVersion"`
+	SystemVersion  string `xml:"systemVersion"`
+}
+
+func init() {
+	t["CustomizationSysprepFailed"] = reflect.TypeOf((*CustomizationSysprepFailed)(nil)).Elem()
+}
+
+type CustomizationSysprepText struct {
+	CustomizationIdentitySettings
+
+	Value string `xml:"value"`
+}
+
+func init() {
+	t["CustomizationSysprepText"] = reflect.TypeOf((*CustomizationSysprepText)(nil)).Elem()
+}
+
+type CustomizationUnknownFailure struct {
+	CustomizationFailed
+}
+
+func init() {
+	t["CustomizationUnknownFailure"] = reflect.TypeOf((*CustomizationUnknownFailure)(nil)).Elem()
+}
+
+type CustomizationUnknownIpGenerator struct {
+	CustomizationIpGenerator
+}
+
+func init() {
+	t["CustomizationUnknownIpGenerator"] = reflect.TypeOf((*CustomizationUnknownIpGenerator)(nil)).Elem()
+}
+
+type CustomizationUnknownIpV6Generator struct {
+	CustomizationIpV6Generator
+}
+
+func init() {
+	t["CustomizationUnknownIpV6Generator"] = reflect.TypeOf((*CustomizationUnknownIpV6Generator)(nil)).Elem()
+}
+
+type CustomizationUnknownName struct {
+	CustomizationName
+}
+
+func init() {
+	t["CustomizationUnknownName"] = reflect.TypeOf((*CustomizationUnknownName)(nil)).Elem()
+}
+
+type CustomizationUserData struct {
+	DynamicData
+
+	FullName     string                `xml:"fullName"`
+	OrgName      string                `xml:"orgName"`
+	ComputerName BaseCustomizationName `xml:"computerName,typeattr"`
+	ProductId    string                `xml:"productId"`
+}
+
+func init() {
+	t["CustomizationUserData"] = reflect.TypeOf((*CustomizationUserData)(nil)).Elem()
+}
+
+type CustomizationVirtualMachineName struct {
+	CustomizationName
+}
+
+func init() {
+	t["CustomizationVirtualMachineName"] = reflect.TypeOf((*CustomizationVirtualMachineName)(nil)).Elem()
+}
+
+type CustomizationWinOptions struct {
+	CustomizationOptions
+
+	ChangeSID      bool                             `xml:"changeSID"`
+	DeleteAccounts bool                             `xml:"deleteAccounts"`
+	Reboot         CustomizationSysprepRebootOption `xml:"reboot,omitempty"`
+}
+
+func init() {
+	t["CustomizationWinOptions"] = reflect.TypeOf((*CustomizationWinOptions)(nil)).Elem()
+}
+
+type CustomizeVMRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Spec CustomizationSpec      `xml:"spec"`
+}
+
+func init() {
+	t["CustomizeVMRequestType"] = reflect.TypeOf((*CustomizeVMRequestType)(nil)).Elem()
+}
+
+type CustomizeVM_Task CustomizeVMRequestType
+
+func init() {
+	t["CustomizeVM_Task"] = reflect.TypeOf((*CustomizeVM_Task)(nil)).Elem()
+}
+
+type CustomizeVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type DVPortConfigInfo struct {
+	DynamicData
+
+	Name          string                   `xml:"name,omitempty"`
+	Scope         []ManagedObjectReference `xml:"scope,omitempty"`
+	Description   string                   `xml:"description,omitempty"`
+	Setting       BaseDVPortSetting        `xml:"setting,omitempty,typeattr"`
+	ConfigVersion string                   `xml:"configVersion"`
+}
+
+func init() {
+	t["DVPortConfigInfo"] = reflect.TypeOf((*DVPortConfigInfo)(nil)).Elem()
+}
+
+type DVPortConfigSpec struct {
+	DynamicData
+
+	Operation     string                   `xml:"operation"`
+	Key           string                   `xml:"key,omitempty"`
+	Name          string                   `xml:"name,omitempty"`
+	Scope         []ManagedObjectReference `xml:"scope,omitempty"`
+	Description   string                   `xml:"description,omitempty"`
+	Setting       BaseDVPortSetting        `xml:"setting,omitempty,typeattr"`
+	ConfigVersion string                   `xml:"configVersion,omitempty"`
+}
+
+func init() {
+	t["DVPortConfigSpec"] = reflect.TypeOf((*DVPortConfigSpec)(nil)).Elem()
+}
+
+type DVPortNotSupported struct {
+	DeviceBackingNotSupported
+}
+
+func init() {
+	t["DVPortNotSupported"] = reflect.TypeOf((*DVPortNotSupported)(nil)).Elem()
+}
+
+type DVPortNotSupportedFault DVPortNotSupported
+
+func init() {
+	t["DVPortNotSupportedFault"] = reflect.TypeOf((*DVPortNotSupportedFault)(nil)).Elem()
+}
+
+type DVPortSetting struct {
+	DynamicData
+
+	Blocked                 *BoolPolicy              `xml:"blocked,omitempty"`
+	VmDirectPathGen2Allowed *BoolPolicy              `xml:"vmDirectPathGen2Allowed,omitempty"`
+	InShapingPolicy         *DVSTrafficShapingPolicy `xml:"inShapingPolicy,omitempty"`
+	OutShapingPolicy        *DVSTrafficShapingPolicy `xml:"outShapingPolicy,omitempty"`
+	VendorSpecificConfig    *DVSVendorSpecificConfig `xml:"vendorSpecificConfig,omitempty"`
+	NetworkResourcePoolKey  *StringPolicy            `xml:"networkResourcePoolKey,omitempty"`
+	FilterPolicy            *DvsFilterPolicy         `xml:"filterPolicy,omitempty"`
+}
+
+func init() {
+	t["DVPortSetting"] = reflect.TypeOf((*DVPortSetting)(nil)).Elem()
+}
+
+type DVPortState struct {
+	DynamicData
+
+	RuntimeInfo         *DVPortStatus                             `xml:"runtimeInfo,omitempty"`
+	Stats               DistributedVirtualSwitchPortStatistics    `xml:"stats"`
+	VendorSpecificState []DistributedVirtualSwitchKeyedOpaqueBlob `xml:"vendorSpecificState,omitempty"`
+}
+
+func init() {
+	t["DVPortState"] = reflect.TypeOf((*DVPortState)(nil)).Elem()
+}
+
+type DVPortStatus struct {
+	DynamicData
+
+	LinkUp                                 bool           `xml:"linkUp"`
+	Blocked                                bool           `xml:"blocked"`
+	VlanIds                                []NumericRange `xml:"vlanIds,omitempty"`
+	TrunkingMode                           *bool          `xml:"trunkingMode"`
+	Mtu                                    int32          `xml:"mtu,omitempty"`
+	LinkPeer                               string         `xml:"linkPeer,omitempty"`
+	MacAddress                             string         `xml:"macAddress,omitempty"`
+	StatusDetail                           string         `xml:"statusDetail,omitempty"`
+	VmDirectPathGen2Active                 *bool          `xml:"vmDirectPathGen2Active"`
+	VmDirectPathGen2InactiveReasonNetwork  []string       `xml:"vmDirectPathGen2InactiveReasonNetwork,omitempty"`
+	VmDirectPathGen2InactiveReasonOther    []string       `xml:"vmDirectPathGen2InactiveReasonOther,omitempty"`
+	VmDirectPathGen2InactiveReasonExtended string         `xml:"vmDirectPathGen2InactiveReasonExtended,omitempty"`
+}
+
+func init() {
+	t["DVPortStatus"] = reflect.TypeOf((*DVPortStatus)(nil)).Elem()
+}
+
+type DVPortgroupConfigInfo struct {
+	DynamicData
+
+	Key                          string                                    `xml:"key"`
+	Name                         string                                    `xml:"name"`
+	NumPorts                     int32                                     `xml:"numPorts"`
+	DistributedVirtualSwitch     *ManagedObjectReference                   `xml:"distributedVirtualSwitch,omitempty"`
+	DefaultPortConfig            BaseDVPortSetting                         `xml:"defaultPortConfig,omitempty,typeattr"`
+	Description                  string                                    `xml:"description,omitempty"`
+	Type                         string                                    `xml:"type"`
+	Policy                       BaseDVPortgroupPolicy                     `xml:"policy,typeattr"`
+	PortNameFormat               string                                    `xml:"portNameFormat,omitempty"`
+	Scope                        []ManagedObjectReference                  `xml:"scope,omitempty"`
+	VendorSpecificConfig         []DistributedVirtualSwitchKeyedOpaqueBlob `xml:"vendorSpecificConfig,omitempty"`
+	ConfigVersion                string                                    `xml:"configVersion,omitempty"`
+	AutoExpand                   *bool                                     `xml:"autoExpand"`
+	VmVnicNetworkResourcePoolKey string                                    `xml:"vmVnicNetworkResourcePoolKey,omitempty"`
+	Uplink                       *bool                                     `xml:"uplink"`
+}
+
+func init() {
+	t["DVPortgroupConfigInfo"] = reflect.TypeOf((*DVPortgroupConfigInfo)(nil)).Elem()
+}
+
+type DVPortgroupConfigSpec struct {
+	DynamicData
+
+	ConfigVersion                string                                    `xml:"configVersion,omitempty"`
+	Name                         string                                    `xml:"name,omitempty"`
+	NumPorts                     int32                                     `xml:"numPorts,omitempty"`
+	PortNameFormat               string                                    `xml:"portNameFormat,omitempty"`
+	DefaultPortConfig            BaseDVPortSetting                         `xml:"defaultPortConfig,omitempty,typeattr"`
+	Description                  string                                    `xml:"description,omitempty"`
+	Type                         string                                    `xml:"type,omitempty"`
+	Scope                        []ManagedObjectReference                  `xml:"scope,omitempty"`
+	Policy                       BaseDVPortgroupPolicy                     `xml:"policy,omitempty,typeattr"`
+	VendorSpecificConfig         []DistributedVirtualSwitchKeyedOpaqueBlob `xml:"vendorSpecificConfig,omitempty"`
+	AutoExpand                   *bool                                     `xml:"autoExpand"`
+	VmVnicNetworkResourcePoolKey string                                    `xml:"vmVnicNetworkResourcePoolKey,omitempty"`
+}
+
+func init() {
+	t["DVPortgroupConfigSpec"] = reflect.TypeOf((*DVPortgroupConfigSpec)(nil)).Elem()
+}
+
+type DVPortgroupCreatedEvent struct {
+	DVPortgroupEvent
+}
+
+func init() {
+	t["DVPortgroupCreatedEvent"] = reflect.TypeOf((*DVPortgroupCreatedEvent)(nil)).Elem()
+}
+
+type DVPortgroupDestroyedEvent struct {
+	DVPortgroupEvent
+}
+
+func init() {
+	t["DVPortgroupDestroyedEvent"] = reflect.TypeOf((*DVPortgroupDestroyedEvent)(nil)).Elem()
+}
+
+type DVPortgroupEvent struct {
+	Event
+}
+
+func init() {
+	t["DVPortgroupEvent"] = reflect.TypeOf((*DVPortgroupEvent)(nil)).Elem()
+}
+
+type DVPortgroupPolicy struct {
+	DynamicData
+
+	BlockOverrideAllowed               bool  `xml:"blockOverrideAllowed"`
+	ShapingOverrideAllowed             bool  `xml:"shapingOverrideAllowed"`
+	VendorConfigOverrideAllowed        bool  `xml:"vendorConfigOverrideAllowed"`
+	LivePortMovingAllowed              bool  `xml:"livePortMovingAllowed"`
+	PortConfigResetAtDisconnect        bool  `xml:"portConfigResetAtDisconnect"`
+	NetworkResourcePoolOverrideAllowed *bool `xml:"networkResourcePoolOverrideAllowed"`
+	TrafficFilterOverrideAllowed       *bool `xml:"trafficFilterOverrideAllowed"`
+}
+
+func init() {
+	t["DVPortgroupPolicy"] = reflect.TypeOf((*DVPortgroupPolicy)(nil)).Elem()
+}
+
+type DVPortgroupReconfiguredEvent struct {
+	DVPortgroupEvent
+
+	ConfigSpec    DVPortgroupConfigSpec     `xml:"configSpec"`
+	ConfigChanges *ChangesInfoEventArgument `xml:"configChanges,omitempty"`
+}
+
+func init() {
+	t["DVPortgroupReconfiguredEvent"] = reflect.TypeOf((*DVPortgroupReconfiguredEvent)(nil)).Elem()
+}
+
+type DVPortgroupRenamedEvent struct {
+	DVPortgroupEvent
+
+	OldName string `xml:"oldName"`
+	NewName string `xml:"newName"`
+}
+
+func init() {
+	t["DVPortgroupRenamedEvent"] = reflect.TypeOf((*DVPortgroupRenamedEvent)(nil)).Elem()
+}
+
+type DVPortgroupRollbackRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	EntityBackup *EntityBackupConfig    `xml:"entityBackup,omitempty"`
+}
+
+func init() {
+	t["DVPortgroupRollbackRequestType"] = reflect.TypeOf((*DVPortgroupRollbackRequestType)(nil)).Elem()
+}
+
+type DVPortgroupRollback_Task DVPortgroupRollbackRequestType
+
+func init() {
+	t["DVPortgroupRollback_Task"] = reflect.TypeOf((*DVPortgroupRollback_Task)(nil)).Elem()
+}
+
+type DVPortgroupRollback_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type DVPortgroupSelection struct {
+	SelectionSet
+
+	DvsUuid      string   `xml:"dvsUuid"`
+	PortgroupKey []string `xml:"portgroupKey"`
+}
+
+func init() {
+	t["DVPortgroupSelection"] = reflect.TypeOf((*DVPortgroupSelection)(nil)).Elem()
+}
+
+type DVSBackupRestoreCapability struct {
+	DynamicData
+
+	BackupRestoreSupported bool `xml:"backupRestoreSupported"`
+}
+
+func init() {
+	t["DVSBackupRestoreCapability"] = reflect.TypeOf((*DVSBackupRestoreCapability)(nil)).Elem()
+}
+
+type DVSCapability struct {
+	DynamicData
+
+	DvsOperationSupported              *bool                                     `xml:"dvsOperationSupported"`
+	DvPortGroupOperationSupported      *bool                                     `xml:"dvPortGroupOperationSupported"`
+	DvPortOperationSupported           *bool                                     `xml:"dvPortOperationSupported"`
+	CompatibleHostComponentProductInfo []DistributedVirtualSwitchHostProductSpec `xml:"compatibleHostComponentProductInfo,omitempty"`
+	FeaturesSupported                  BaseDVSFeatureCapability                  `xml:"featuresSupported,omitempty,typeattr"`
+}
+
+func init() {
+	t["DVSCapability"] = reflect.TypeOf((*DVSCapability)(nil)).Elem()
+}
+
+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"`
+}
+
+func init() {
+	t["DVSConfigInfo"] = reflect.TypeOf((*DVSConfigInfo)(nil)).Elem()
+}
+
+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"`
+}
+
+func init() {
+	t["DVSConfigSpec"] = reflect.TypeOf((*DVSConfigSpec)(nil)).Elem()
+}
+
+type DVSContactInfo struct {
+	DynamicData
+
+	Name    string `xml:"name,omitempty"`
+	Contact string `xml:"contact,omitempty"`
+}
+
+func init() {
+	t["DVSContactInfo"] = reflect.TypeOf((*DVSContactInfo)(nil)).Elem()
+}
+
+type DVSCreateSpec struct {
+	DynamicData
+
+	ConfigSpec  BaseDVSConfigSpec                    `xml:"configSpec,typeattr"`
+	ProductInfo *DistributedVirtualSwitchProductSpec `xml:"productInfo,omitempty"`
+	Capability  *DVSCapability                       `xml:"capability,omitempty"`
+}
+
+func init() {
+	t["DVSCreateSpec"] = reflect.TypeOf((*DVSCreateSpec)(nil)).Elem()
+}
+
+type DVSFailureCriteria struct {
+	InheritablePolicy
+
+	CheckSpeed        *StringPolicy `xml:"checkSpeed,omitempty"`
+	Speed             *IntPolicy    `xml:"speed,omitempty"`
+	CheckDuplex       *BoolPolicy   `xml:"checkDuplex,omitempty"`
+	FullDuplex        *BoolPolicy   `xml:"fullDuplex,omitempty"`
+	CheckErrorPercent *BoolPolicy   `xml:"checkErrorPercent,omitempty"`
+	Percentage        *IntPolicy    `xml:"percentage,omitempty"`
+	CheckBeacon       *BoolPolicy   `xml:"checkBeacon,omitempty"`
+}
+
+func init() {
+	t["DVSFailureCriteria"] = reflect.TypeOf((*DVSFailureCriteria)(nil)).Elem()
+}
+
+type DVSFeatureCapability struct {
+	DynamicData
+
+	NetworkResourceManagementSupported  bool                                    `xml:"networkResourceManagementSupported"`
+	VmDirectPathGen2Supported           bool                                    `xml:"vmDirectPathGen2Supported"`
+	NicTeamingPolicy                    []string                                `xml:"nicTeamingPolicy,omitempty"`
+	NetworkResourcePoolHighShareValue   int32                                   `xml:"networkResourcePoolHighShareValue,omitempty"`
+	NetworkResourceManagementCapability *DVSNetworkResourceManagementCapability `xml:"networkResourceManagementCapability,omitempty"`
+	HealthCheckCapability               BaseDVSHealthCheckCapability            `xml:"healthCheckCapability,omitempty,typeattr"`
+	RollbackCapability                  *DVSRollbackCapability                  `xml:"rollbackCapability,omitempty"`
+	BackupRestoreCapability             *DVSBackupRestoreCapability             `xml:"backupRestoreCapability,omitempty"`
+	NetworkFilterSupported              *bool                                   `xml:"networkFilterSupported"`
+}
+
+func init() {
+	t["DVSFeatureCapability"] = reflect.TypeOf((*DVSFeatureCapability)(nil)).Elem()
+}
+
+type DVSHealthCheckCapability struct {
+	DynamicData
+}
+
+func init() {
+	t["DVSHealthCheckCapability"] = reflect.TypeOf((*DVSHealthCheckCapability)(nil)).Elem()
+}
+
+type DVSHealthCheckConfig struct {
+	DynamicData
+
+	Enable   *bool `xml:"enable"`
+	Interval int32 `xml:"interval,omitempty"`
+}
+
+func init() {
+	t["DVSHealthCheckConfig"] = reflect.TypeOf((*DVSHealthCheckConfig)(nil)).Elem()
+}
+
+type DVSHostLocalPortInfo struct {
+	DynamicData
+
+	SwitchUuid string            `xml:"switchUuid"`
+	PortKey    string            `xml:"portKey"`
+	Setting    BaseDVPortSetting `xml:"setting,typeattr"`
+	Vnic       string            `xml:"vnic"`
+}
+
+func init() {
+	t["DVSHostLocalPortInfo"] = reflect.TypeOf((*DVSHostLocalPortInfo)(nil)).Elem()
+}
+
+type DVSManagerDvsConfigTarget struct {
+	DynamicData
+
+	DistributedVirtualPortgroup []DistributedVirtualPortgroupInfo `xml:"distributedVirtualPortgroup,omitempty"`
+	DistributedVirtualSwitch    []DistributedVirtualSwitchInfo    `xml:"distributedVirtualSwitch,omitempty"`
+}
+
+func init() {
+	t["DVSManagerDvsConfigTarget"] = reflect.TypeOf((*DVSManagerDvsConfigTarget)(nil)).Elem()
+}
+
+type DVSManagerExportEntityRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	SelectionSet []BaseSelectionSet     `xml:"selectionSet,typeattr"`
+}
+
+func init() {
+	t["DVSManagerExportEntityRequestType"] = reflect.TypeOf((*DVSManagerExportEntityRequestType)(nil)).Elem()
+}
+
+type DVSManagerExportEntity_Task DVSManagerExportEntityRequestType
+
+func init() {
+	t["DVSManagerExportEntity_Task"] = reflect.TypeOf((*DVSManagerExportEntity_Task)(nil)).Elem()
+}
+
+type DVSManagerExportEntity_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type DVSManagerImportEntityRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	EntityBackup []EntityBackupConfig   `xml:"entityBackup"`
+	ImportType   string                 `xml:"importType"`
+}
+
+func init() {
+	t["DVSManagerImportEntityRequestType"] = reflect.TypeOf((*DVSManagerImportEntityRequestType)(nil)).Elem()
+}
+
+type DVSManagerImportEntity_Task DVSManagerImportEntityRequestType
+
+func init() {
+	t["DVSManagerImportEntity_Task"] = reflect.TypeOf((*DVSManagerImportEntity_Task)(nil)).Elem()
+}
+
+type DVSManagerImportEntity_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type DVSManagerLookupDvPortGroup DVSManagerLookupDvPortGroupRequestType
+
+func init() {
+	t["DVSManagerLookupDvPortGroup"] = reflect.TypeOf((*DVSManagerLookupDvPortGroup)(nil)).Elem()
+}
+
+type DVSManagerLookupDvPortGroupRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	SwitchUuid   string                 `xml:"switchUuid"`
+	PortgroupKey string                 `xml:"portgroupKey"`
+}
+
+func init() {
+	t["DVSManagerLookupDvPortGroupRequestType"] = reflect.TypeOf((*DVSManagerLookupDvPortGroupRequestType)(nil)).Elem()
+}
+
+type DVSManagerLookupDvPortGroupResponse struct {
+	Returnval *ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type DVSNameArrayUplinkPortPolicy struct {
+	DVSUplinkPortPolicy
+
+	UplinkPortName []string `xml:"uplinkPortName"`
+}
+
+func init() {
+	t["DVSNameArrayUplinkPortPolicy"] = reflect.TypeOf((*DVSNameArrayUplinkPortPolicy)(nil)).Elem()
+}
+
+type DVSNetworkResourceManagementCapability struct {
+	DynamicData
+
+	NetworkResourceManagementSupported       bool  `xml:"networkResourceManagementSupported"`
+	NetworkResourcePoolHighShareValue        int32 `xml:"networkResourcePoolHighShareValue"`
+	QosSupported                             bool  `xml:"qosSupported"`
+	UserDefinedNetworkResourcePoolsSupported bool  `xml:"userDefinedNetworkResourcePoolsSupported"`
+	NetworkResourceControlVersion3Supported  *bool `xml:"networkResourceControlVersion3Supported"`
+}
+
+func init() {
+	t["DVSNetworkResourceManagementCapability"] = reflect.TypeOf((*DVSNetworkResourceManagementCapability)(nil)).Elem()
+}
+
+type DVSNetworkResourcePool struct {
+	DynamicData
+
+	Key            string                               `xml:"key"`
+	Name           string                               `xml:"name,omitempty"`
+	Description    string                               `xml:"description,omitempty"`
+	ConfigVersion  string                               `xml:"configVersion"`
+	AllocationInfo DVSNetworkResourcePoolAllocationInfo `xml:"allocationInfo"`
+}
+
+func init() {
+	t["DVSNetworkResourcePool"] = reflect.TypeOf((*DVSNetworkResourcePool)(nil)).Elem()
+}
+
+type DVSNetworkResourcePoolAllocationInfo struct {
+	DynamicData
+
+	Limit       int64       `xml:"limit,omitempty"`
+	Shares      *SharesInfo `xml:"shares,omitempty"`
+	PriorityTag int32       `xml:"priorityTag,omitempty"`
+}
+
+func init() {
+	t["DVSNetworkResourcePoolAllocationInfo"] = reflect.TypeOf((*DVSNetworkResourcePoolAllocationInfo)(nil)).Elem()
+}
+
+type DVSNetworkResourcePoolConfigSpec struct {
+	DynamicData
+
+	Key            string                                `xml:"key"`
+	ConfigVersion  string                                `xml:"configVersion,omitempty"`
+	AllocationInfo *DVSNetworkResourcePoolAllocationInfo `xml:"allocationInfo,omitempty"`
+	Name           string                                `xml:"name,omitempty"`
+	Description    string                                `xml:"description,omitempty"`
+}
+
+func init() {
+	t["DVSNetworkResourcePoolConfigSpec"] = reflect.TypeOf((*DVSNetworkResourcePoolConfigSpec)(nil)).Elem()
+}
+
+type DVSPolicy struct {
+	DynamicData
+
+	AutoPreInstallAllowed *bool `xml:"autoPreInstallAllowed"`
+	AutoUpgradeAllowed    *bool `xml:"autoUpgradeAllowed"`
+	PartialUpgradeAllowed *bool `xml:"partialUpgradeAllowed"`
+}
+
+func init() {
+	t["DVSPolicy"] = reflect.TypeOf((*DVSPolicy)(nil)).Elem()
+}
+
+type DVSRollbackCapability struct {
+	DynamicData
+
+	RollbackSupported bool `xml:"rollbackSupported"`
+}
+
+func init() {
+	t["DVSRollbackCapability"] = reflect.TypeOf((*DVSRollbackCapability)(nil)).Elem()
+}
+
+type DVSRollbackRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	EntityBackup *EntityBackupConfig    `xml:"entityBackup,omitempty"`
+}
+
+func init() {
+	t["DVSRollbackRequestType"] = reflect.TypeOf((*DVSRollbackRequestType)(nil)).Elem()
+}
+
+type DVSRollback_Task DVSRollbackRequestType
+
+func init() {
+	t["DVSRollback_Task"] = reflect.TypeOf((*DVSRollback_Task)(nil)).Elem()
+}
+
+type DVSRollback_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type DVSRuntimeInfo struct {
+	DynamicData
+
+	HostMemberRuntime   []HostMemberRuntimeInfo `xml:"hostMemberRuntime,omitempty"`
+	ResourceRuntimeInfo *DvsResourceRuntimeInfo `xml:"resourceRuntimeInfo,omitempty"`
+}
+
+func init() {
+	t["DVSRuntimeInfo"] = reflect.TypeOf((*DVSRuntimeInfo)(nil)).Elem()
+}
+
+type DVSSecurityPolicy struct {
+	InheritablePolicy
+
+	AllowPromiscuous *BoolPolicy `xml:"allowPromiscuous,omitempty"`
+	MacChanges       *BoolPolicy `xml:"macChanges,omitempty"`
+	ForgedTransmits  *BoolPolicy `xml:"forgedTransmits,omitempty"`
+}
+
+func init() {
+	t["DVSSecurityPolicy"] = reflect.TypeOf((*DVSSecurityPolicy)(nil)).Elem()
+}
+
+type DVSSelection struct {
+	SelectionSet
+
+	DvsUuid string `xml:"dvsUuid"`
+}
+
+func init() {
+	t["DVSSelection"] = reflect.TypeOf((*DVSSelection)(nil)).Elem()
+}
+
+type DVSSummary struct {
+	DynamicData
+
+	Name          string                               `xml:"name"`
+	Uuid          string                               `xml:"uuid"`
+	NumPorts      int32                                `xml:"numPorts"`
+	ProductInfo   *DistributedVirtualSwitchProductSpec `xml:"productInfo,omitempty"`
+	HostMember    []ManagedObjectReference             `xml:"hostMember,omitempty"`
+	Vm            []ManagedObjectReference             `xml:"vm,omitempty"`
+	Host          []ManagedObjectReference             `xml:"host,omitempty"`
+	PortgroupName []string                             `xml:"portgroupName,omitempty"`
+	Description   string                               `xml:"description,omitempty"`
+	Contact       *DVSContactInfo                      `xml:"contact,omitempty"`
+	NumHosts      int32                                `xml:"numHosts,omitempty"`
+}
+
+func init() {
+	t["DVSSummary"] = reflect.TypeOf((*DVSSummary)(nil)).Elem()
+}
+
+type DVSTrafficShapingPolicy struct {
+	InheritablePolicy
+
+	Enabled          *BoolPolicy `xml:"enabled,omitempty"`
+	AverageBandwidth *LongPolicy `xml:"averageBandwidth,omitempty"`
+	PeakBandwidth    *LongPolicy `xml:"peakBandwidth,omitempty"`
+	BurstSize        *LongPolicy `xml:"burstSize,omitempty"`
+}
+
+func init() {
+	t["DVSTrafficShapingPolicy"] = reflect.TypeOf((*DVSTrafficShapingPolicy)(nil)).Elem()
+}
+
+type DVSUplinkPortPolicy struct {
+	DynamicData
+}
+
+func init() {
+	t["DVSUplinkPortPolicy"] = reflect.TypeOf((*DVSUplinkPortPolicy)(nil)).Elem()
+}
+
+type DVSVendorSpecificConfig struct {
+	InheritablePolicy
+
+	KeyValue []DistributedVirtualSwitchKeyedOpaqueBlob `xml:"keyValue,omitempty"`
+}
+
+func init() {
+	t["DVSVendorSpecificConfig"] = reflect.TypeOf((*DVSVendorSpecificConfig)(nil)).Elem()
+}
+
+type DVSVmVnicNetworkResourcePool struct {
+	DynamicData
+
+	Key            string                       `xml:"key"`
+	Name           string                       `xml:"name,omitempty"`
+	Description    string                       `xml:"description,omitempty"`
+	ConfigVersion  string                       `xml:"configVersion"`
+	AllocationInfo *DvsVmVnicResourceAllocation `xml:"allocationInfo,omitempty"`
+}
+
+func init() {
+	t["DVSVmVnicNetworkResourcePool"] = reflect.TypeOf((*DVSVmVnicNetworkResourcePool)(nil)).Elem()
+}
+
+type DailyTaskScheduler struct {
+	HourlyTaskScheduler
+
+	Hour int32 `xml:"hour"`
+}
+
+func init() {
+	t["DailyTaskScheduler"] = reflect.TypeOf((*DailyTaskScheduler)(nil)).Elem()
+}
+
+type DasAdmissionControlDisabledEvent struct {
+	ClusterEvent
+}
+
+func init() {
+	t["DasAdmissionControlDisabledEvent"] = reflect.TypeOf((*DasAdmissionControlDisabledEvent)(nil)).Elem()
+}
+
+type DasAdmissionControlEnabledEvent struct {
+	ClusterEvent
+}
+
+func init() {
+	t["DasAdmissionControlEnabledEvent"] = reflect.TypeOf((*DasAdmissionControlEnabledEvent)(nil)).Elem()
+}
+
+type DasAgentFoundEvent struct {
+	ClusterEvent
+}
+
+func init() {
+	t["DasAgentFoundEvent"] = reflect.TypeOf((*DasAgentFoundEvent)(nil)).Elem()
+}
+
+type DasAgentUnavailableEvent struct {
+	ClusterEvent
+}
+
+func init() {
+	t["DasAgentUnavailableEvent"] = reflect.TypeOf((*DasAgentUnavailableEvent)(nil)).Elem()
+}
+
+type DasClusterIsolatedEvent struct {
+	ClusterEvent
+}
+
+func init() {
+	t["DasClusterIsolatedEvent"] = reflect.TypeOf((*DasClusterIsolatedEvent)(nil)).Elem()
+}
+
+type DasConfigFault struct {
+	VimFault
+
+	Reason string      `xml:"reason,omitempty"`
+	Output string      `xml:"output,omitempty"`
+	Event  []BaseEvent `xml:"event,omitempty,typeattr"`
+}
+
+func init() {
+	t["DasConfigFault"] = reflect.TypeOf((*DasConfigFault)(nil)).Elem()
+}
+
+type DasConfigFaultFault DasConfigFault
+
+func init() {
+	t["DasConfigFaultFault"] = reflect.TypeOf((*DasConfigFaultFault)(nil)).Elem()
+}
+
+type DasDisabledEvent struct {
+	ClusterEvent
+}
+
+func init() {
+	t["DasDisabledEvent"] = reflect.TypeOf((*DasDisabledEvent)(nil)).Elem()
+}
+
+type DasEnabledEvent struct {
+	ClusterEvent
+}
+
+func init() {
+	t["DasEnabledEvent"] = reflect.TypeOf((*DasEnabledEvent)(nil)).Elem()
+}
+
+type DasHeartbeatDatastoreInfo struct {
+	DynamicData
+
+	Datastore ManagedObjectReference   `xml:"datastore"`
+	Hosts     []ManagedObjectReference `xml:"hosts"`
+}
+
+func init() {
+	t["DasHeartbeatDatastoreInfo"] = reflect.TypeOf((*DasHeartbeatDatastoreInfo)(nil)).Elem()
+}
+
+type DasHostFailedEvent struct {
+	ClusterEvent
+
+	FailedHost HostEventArgument `xml:"failedHost"`
+}
+
+func init() {
+	t["DasHostFailedEvent"] = reflect.TypeOf((*DasHostFailedEvent)(nil)).Elem()
+}
+
+type DasHostIsolatedEvent struct {
+	ClusterEvent
+
+	IsolatedHost HostEventArgument `xml:"isolatedHost"`
+}
+
+func init() {
+	t["DasHostIsolatedEvent"] = reflect.TypeOf((*DasHostIsolatedEvent)(nil)).Elem()
+}
+
+type DatabaseError struct {
+	RuntimeFault
+}
+
+func init() {
+	t["DatabaseError"] = reflect.TypeOf((*DatabaseError)(nil)).Elem()
+}
+
+type DatabaseErrorFault DatabaseError
+
+func init() {
+	t["DatabaseErrorFault"] = reflect.TypeOf((*DatabaseErrorFault)(nil)).Elem()
+}
+
+type DatabaseSizeEstimate struct {
+	DynamicData
+
+	Size int64 `xml:"size"`
+}
+
+func init() {
+	t["DatabaseSizeEstimate"] = reflect.TypeOf((*DatabaseSizeEstimate)(nil)).Elem()
+}
+
+type DatabaseSizeParam struct {
+	DynamicData
+
+	InventoryDesc InventoryDescription              `xml:"inventoryDesc"`
+	PerfStatsDesc *PerformanceStatisticsDescription `xml:"perfStatsDesc,omitempty"`
+}
+
+func init() {
+	t["DatabaseSizeParam"] = reflect.TypeOf((*DatabaseSizeParam)(nil)).Elem()
+}
+
+type DatacenterConfigInfo struct {
+	DynamicData
+
+	DefaultHardwareVersionKey string `xml:"defaultHardwareVersionKey,omitempty"`
+}
+
+func init() {
+	t["DatacenterConfigInfo"] = reflect.TypeOf((*DatacenterConfigInfo)(nil)).Elem()
+}
+
+type DatacenterConfigSpec struct {
+	DynamicData
+
+	DefaultHardwareVersionKey string `xml:"defaultHardwareVersionKey,omitempty"`
+}
+
+func init() {
+	t["DatacenterConfigSpec"] = reflect.TypeOf((*DatacenterConfigSpec)(nil)).Elem()
+}
+
+type DatacenterCreatedEvent struct {
+	DatacenterEvent
+
+	Parent FolderEventArgument `xml:"parent"`
+}
+
+func init() {
+	t["DatacenterCreatedEvent"] = reflect.TypeOf((*DatacenterCreatedEvent)(nil)).Elem()
+}
+
+type DatacenterEvent struct {
+	Event
+}
+
+func init() {
+	t["DatacenterEvent"] = reflect.TypeOf((*DatacenterEvent)(nil)).Elem()
+}
+
+type DatacenterEventArgument struct {
+	EntityEventArgument
+
+	Datacenter ManagedObjectReference `xml:"datacenter"`
+}
+
+func init() {
+	t["DatacenterEventArgument"] = reflect.TypeOf((*DatacenterEventArgument)(nil)).Elem()
+}
+
+type DatacenterMismatch struct {
+	MigrationFault
+
+	InvalidArgument    []DatacenterMismatchArgument `xml:"invalidArgument"`
+	ExpectedDatacenter ManagedObjectReference       `xml:"expectedDatacenter"`
+}
+
+func init() {
+	t["DatacenterMismatch"] = reflect.TypeOf((*DatacenterMismatch)(nil)).Elem()
+}
+
+type DatacenterMismatchArgument struct {
+	DynamicData
+
+	Entity          ManagedObjectReference  `xml:"entity"`
+	InputDatacenter *ManagedObjectReference `xml:"inputDatacenter,omitempty"`
+}
+
+func init() {
+	t["DatacenterMismatchArgument"] = reflect.TypeOf((*DatacenterMismatchArgument)(nil)).Elem()
+}
+
+type DatacenterMismatchFault DatacenterMismatch
+
+func init() {
+	t["DatacenterMismatchFault"] = reflect.TypeOf((*DatacenterMismatchFault)(nil)).Elem()
+}
+
+type DatacenterRenamedEvent struct {
+	DatacenterEvent
+
+	OldName string `xml:"oldName"`
+	NewName string `xml:"newName"`
+}
+
+func init() {
+	t["DatacenterRenamedEvent"] = reflect.TypeOf((*DatacenterRenamedEvent)(nil)).Elem()
+}
+
+type DatastoreCapability struct {
+	DynamicData
+
+	DirectoryHierarchySupported      bool  `xml:"directoryHierarchySupported"`
+	RawDiskMappingsSupported         bool  `xml:"rawDiskMappingsSupported"`
+	PerFileThinProvisioningSupported bool  `xml:"perFileThinProvisioningSupported"`
+	StorageIORMSupported             *bool `xml:"storageIORMSupported"`
+	NativeSnapshotSupported          *bool `xml:"nativeSnapshotSupported"`
+	TopLevelDirectoryCreateSupported *bool `xml:"topLevelDirectoryCreateSupported"`
+	SeSparseSupported                *bool `xml:"seSparseSupported"`
+	VmfsSparseSupported              *bool `xml:"vmfsSparseSupported"`
+	VsanSparseSupported              *bool `xml:"vsanSparseSupported"`
+	UpitSupported                    *bool `xml:"upitSupported"`
+}
+
+func init() {
+	t["DatastoreCapability"] = reflect.TypeOf((*DatastoreCapability)(nil)).Elem()
+}
+
+type DatastoreCapacityIncreasedEvent struct {
+	DatastoreEvent
+
+	OldCapacity int64 `xml:"oldCapacity"`
+	NewCapacity int64 `xml:"newCapacity"`
+}
+
+func init() {
+	t["DatastoreCapacityIncreasedEvent"] = reflect.TypeOf((*DatastoreCapacityIncreasedEvent)(nil)).Elem()
+}
+
+type DatastoreDestroyedEvent struct {
+	DatastoreEvent
+}
+
+func init() {
+	t["DatastoreDestroyedEvent"] = reflect.TypeOf((*DatastoreDestroyedEvent)(nil)).Elem()
+}
+
+type DatastoreDiscoveredEvent struct {
+	HostEvent
+
+	Datastore DatastoreEventArgument `xml:"datastore"`
+}
+
+func init() {
+	t["DatastoreDiscoveredEvent"] = reflect.TypeOf((*DatastoreDiscoveredEvent)(nil)).Elem()
+}
+
+type DatastoreDuplicatedEvent struct {
+	DatastoreEvent
+}
+
+func init() {
+	t["DatastoreDuplicatedEvent"] = reflect.TypeOf((*DatastoreDuplicatedEvent)(nil)).Elem()
+}
+
+type DatastoreEnterMaintenanceMode DatastoreEnterMaintenanceModeRequestType
+
+func init() {
+	t["DatastoreEnterMaintenanceMode"] = reflect.TypeOf((*DatastoreEnterMaintenanceMode)(nil)).Elem()
+}
+
+type DatastoreEnterMaintenanceModeRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["DatastoreEnterMaintenanceModeRequestType"] = reflect.TypeOf((*DatastoreEnterMaintenanceModeRequestType)(nil)).Elem()
+}
+
+type DatastoreEnterMaintenanceModeResponse struct {
+	Returnval StoragePlacementResult `xml:"returnval"`
+}
+
+type DatastoreEvent struct {
+	Event
+
+	Datastore *DatastoreEventArgument `xml:"datastore,omitempty"`
+}
+
+func init() {
+	t["DatastoreEvent"] = reflect.TypeOf((*DatastoreEvent)(nil)).Elem()
+}
+
+type DatastoreEventArgument struct {
+	EntityEventArgument
+
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["DatastoreEventArgument"] = reflect.TypeOf((*DatastoreEventArgument)(nil)).Elem()
+}
+
+type DatastoreExitMaintenanceModeRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["DatastoreExitMaintenanceModeRequestType"] = reflect.TypeOf((*DatastoreExitMaintenanceModeRequestType)(nil)).Elem()
+}
+
+type DatastoreExitMaintenanceMode_Task DatastoreExitMaintenanceModeRequestType
+
+func init() {
+	t["DatastoreExitMaintenanceMode_Task"] = reflect.TypeOf((*DatastoreExitMaintenanceMode_Task)(nil)).Elem()
+}
+
+type DatastoreExitMaintenanceMode_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type DatastoreFileCopiedEvent struct {
+	DatastoreFileEvent
+
+	SourceDatastore DatastoreEventArgument `xml:"sourceDatastore"`
+	SourceFile      string                 `xml:"sourceFile"`
+}
+
+func init() {
+	t["DatastoreFileCopiedEvent"] = reflect.TypeOf((*DatastoreFileCopiedEvent)(nil)).Elem()
+}
+
+type DatastoreFileDeletedEvent struct {
+	DatastoreFileEvent
+}
+
+func init() {
+	t["DatastoreFileDeletedEvent"] = reflect.TypeOf((*DatastoreFileDeletedEvent)(nil)).Elem()
+}
+
+type DatastoreFileEvent struct {
+	DatastoreEvent
+
+	TargetFile        string `xml:"targetFile"`
+	SourceOfOperation string `xml:"sourceOfOperation,omitempty"`
+	Succeeded         *bool  `xml:"succeeded"`
+}
+
+func init() {
+	t["DatastoreFileEvent"] = reflect.TypeOf((*DatastoreFileEvent)(nil)).Elem()
+}
+
+type DatastoreFileMovedEvent struct {
+	DatastoreFileEvent
+
+	SourceDatastore DatastoreEventArgument `xml:"sourceDatastore"`
+	SourceFile      string                 `xml:"sourceFile"`
+}
+
+func init() {
+	t["DatastoreFileMovedEvent"] = reflect.TypeOf((*DatastoreFileMovedEvent)(nil)).Elem()
+}
+
+type DatastoreHostMount struct {
+	DynamicData
+
+	Key       ManagedObjectReference `xml:"key"`
+	MountInfo HostMountInfo          `xml:"mountInfo"`
+}
+
+func init() {
+	t["DatastoreHostMount"] = reflect.TypeOf((*DatastoreHostMount)(nil)).Elem()
+}
+
+type DatastoreIORMReconfiguredEvent struct {
+	DatastoreEvent
+}
+
+func init() {
+	t["DatastoreIORMReconfiguredEvent"] = reflect.TypeOf((*DatastoreIORMReconfiguredEvent)(nil)).Elem()
+}
+
+type DatastoreInfo struct {
+	DynamicData
+
+	Name                   string     `xml:"name"`
+	Url                    string     `xml:"url"`
+	FreeSpace              int64      `xml:"freeSpace"`
+	MaxFileSize            int64      `xml:"maxFileSize"`
+	MaxVirtualDiskCapacity int64      `xml:"maxVirtualDiskCapacity,omitempty"`
+	MaxMemoryFileSize      int64      `xml:"maxMemoryFileSize,omitempty"`
+	Timestamp              *time.Time `xml:"timestamp"`
+	ContainerId            string     `xml:"containerId,omitempty"`
+}
+
+func init() {
+	t["DatastoreInfo"] = reflect.TypeOf((*DatastoreInfo)(nil)).Elem()
+}
+
+type DatastoreMountPathDatastorePair struct {
+	DynamicData
+
+	OldMountPath string                 `xml:"oldMountPath"`
+	Datastore    ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["DatastoreMountPathDatastorePair"] = reflect.TypeOf((*DatastoreMountPathDatastorePair)(nil)).Elem()
+}
+
+type DatastoreNotWritableOnHost struct {
+	InvalidDatastore
+
+	Host ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["DatastoreNotWritableOnHost"] = reflect.TypeOf((*DatastoreNotWritableOnHost)(nil)).Elem()
+}
+
+type DatastoreNotWritableOnHostFault BaseDatastoreNotWritableOnHost
+
+func init() {
+	t["DatastoreNotWritableOnHostFault"] = reflect.TypeOf((*DatastoreNotWritableOnHostFault)(nil)).Elem()
+}
+
+type DatastoreOption struct {
+	DynamicData
+
+	UnsupportedVolumes []VirtualMachineDatastoreVolumeOption `xml:"unsupportedVolumes,omitempty"`
+}
+
+func init() {
+	t["DatastoreOption"] = reflect.TypeOf((*DatastoreOption)(nil)).Elem()
+}
+
+type DatastorePrincipalConfigured struct {
+	HostEvent
+
+	DatastorePrincipal string `xml:"datastorePrincipal"`
+}
+
+func init() {
+	t["DatastorePrincipalConfigured"] = reflect.TypeOf((*DatastorePrincipalConfigured)(nil)).Elem()
+}
+
+type DatastoreRemovedOnHostEvent struct {
+	HostEvent
+
+	Datastore DatastoreEventArgument `xml:"datastore"`
+}
+
+func init() {
+	t["DatastoreRemovedOnHostEvent"] = reflect.TypeOf((*DatastoreRemovedOnHostEvent)(nil)).Elem()
+}
+
+type DatastoreRenamedEvent struct {
+	DatastoreEvent
+
+	OldName string `xml:"oldName"`
+	NewName string `xml:"newName"`
+}
+
+func init() {
+	t["DatastoreRenamedEvent"] = reflect.TypeOf((*DatastoreRenamedEvent)(nil)).Elem()
+}
+
+type DatastoreRenamedOnHostEvent struct {
+	HostEvent
+
+	OldName string `xml:"oldName"`
+	NewName string `xml:"newName"`
+}
+
+func init() {
+	t["DatastoreRenamedOnHostEvent"] = reflect.TypeOf((*DatastoreRenamedOnHostEvent)(nil)).Elem()
+}
+
+type DatastoreSummary struct {
+	DynamicData
+
+	Datastore          *ManagedObjectReference `xml:"datastore,omitempty"`
+	Name               string                  `xml:"name"`
+	Url                string                  `xml:"url"`
+	Capacity           int64                   `xml:"capacity"`
+	FreeSpace          int64                   `xml:"freeSpace"`
+	Uncommitted        int64                   `xml:"uncommitted,omitempty"`
+	Accessible         bool                    `xml:"accessible"`
+	MultipleHostAccess *bool                   `xml:"multipleHostAccess"`
+	Type               string                  `xml:"type"`
+	MaintenanceMode    string                  `xml:"maintenanceMode,omitempty"`
+}
+
+func init() {
+	t["DatastoreSummary"] = reflect.TypeOf((*DatastoreSummary)(nil)).Elem()
+}
+
+type DatastoreVVolContainerFailoverPair struct {
+	DynamicData
+
+	SrcContainer string     `xml:"srcContainer,omitempty"`
+	TgtContainer string     `xml:"tgtContainer"`
+	VvolMapping  []KeyValue `xml:"vvolMapping,omitempty"`
+}
+
+func init() {
+	t["DatastoreVVolContainerFailoverPair"] = reflect.TypeOf((*DatastoreVVolContainerFailoverPair)(nil)).Elem()
+}
+
+type DateTimeProfile struct {
+	ApplyProfile
+}
+
+func init() {
+	t["DateTimeProfile"] = reflect.TypeOf((*DateTimeProfile)(nil)).Elem()
+}
+
+type DecodeLicense DecodeLicenseRequestType
+
+func init() {
+	t["DecodeLicense"] = reflect.TypeOf((*DecodeLicense)(nil)).Elem()
+}
+
+type DecodeLicenseRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	LicenseKey string                 `xml:"licenseKey"`
+}
+
+func init() {
+	t["DecodeLicenseRequestType"] = reflect.TypeOf((*DecodeLicenseRequestType)(nil)).Elem()
+}
+
+type DecodeLicenseResponse struct {
+	Returnval LicenseManagerLicenseInfo `xml:"returnval"`
+}
+
+type DefragmentAllDisks DefragmentAllDisksRequestType
+
+func init() {
+	t["DefragmentAllDisks"] = reflect.TypeOf((*DefragmentAllDisks)(nil)).Elem()
+}
+
+type DefragmentAllDisksRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["DefragmentAllDisksRequestType"] = reflect.TypeOf((*DefragmentAllDisksRequestType)(nil)).Elem()
+}
+
+type DefragmentAllDisksResponse struct {
+}
+
+type DefragmentVirtualDiskRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Name       string                  `xml:"name"`
+	Datacenter *ManagedObjectReference `xml:"datacenter,omitempty"`
+}
+
+func init() {
+	t["DefragmentVirtualDiskRequestType"] = reflect.TypeOf((*DefragmentVirtualDiskRequestType)(nil)).Elem()
+}
+
+type DefragmentVirtualDisk_Task DefragmentVirtualDiskRequestType
+
+func init() {
+	t["DefragmentVirtualDisk_Task"] = reflect.TypeOf((*DefragmentVirtualDisk_Task)(nil)).Elem()
+}
+
+type DefragmentVirtualDisk_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type DeleteCustomizationSpec DeleteCustomizationSpecRequestType
+
+func init() {
+	t["DeleteCustomizationSpec"] = reflect.TypeOf((*DeleteCustomizationSpec)(nil)).Elem()
+}
+
+type DeleteCustomizationSpecRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Name string                 `xml:"name"`
+}
+
+func init() {
+	t["DeleteCustomizationSpecRequestType"] = reflect.TypeOf((*DeleteCustomizationSpecRequestType)(nil)).Elem()
+}
+
+type DeleteCustomizationSpecResponse struct {
+}
+
+type DeleteDatastoreFileRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Name       string                  `xml:"name"`
+	Datacenter *ManagedObjectReference `xml:"datacenter,omitempty"`
+}
+
+func init() {
+	t["DeleteDatastoreFileRequestType"] = reflect.TypeOf((*DeleteDatastoreFileRequestType)(nil)).Elem()
+}
+
+type DeleteDatastoreFile_Task DeleteDatastoreFileRequestType
+
+func init() {
+	t["DeleteDatastoreFile_Task"] = reflect.TypeOf((*DeleteDatastoreFile_Task)(nil)).Elem()
+}
+
+type DeleteDatastoreFile_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type DeleteDirectory DeleteDirectoryRequestType
+
+func init() {
+	t["DeleteDirectory"] = reflect.TypeOf((*DeleteDirectory)(nil)).Elem()
+}
+
+type DeleteDirectoryInGuest DeleteDirectoryInGuestRequestType
+
+func init() {
+	t["DeleteDirectoryInGuest"] = reflect.TypeOf((*DeleteDirectoryInGuest)(nil)).Elem()
+}
+
+type DeleteDirectoryInGuestRequestType struct {
+	This          ManagedObjectReference  `xml:"_this"`
+	Vm            ManagedObjectReference  `xml:"vm"`
+	Auth          BaseGuestAuthentication `xml:"auth,typeattr"`
+	DirectoryPath string                  `xml:"directoryPath"`
+	Recursive     bool                    `xml:"recursive"`
+}
+
+func init() {
+	t["DeleteDirectoryInGuestRequestType"] = reflect.TypeOf((*DeleteDirectoryInGuestRequestType)(nil)).Elem()
+}
+
+type DeleteDirectoryInGuestResponse struct {
+}
+
+type DeleteDirectoryRequestType struct {
+	This          ManagedObjectReference  `xml:"_this"`
+	Datacenter    *ManagedObjectReference `xml:"datacenter,omitempty"`
+	DatastorePath string                  `xml:"datastorePath"`
+}
+
+func init() {
+	t["DeleteDirectoryRequestType"] = reflect.TypeOf((*DeleteDirectoryRequestType)(nil)).Elem()
+}
+
+type DeleteDirectoryResponse struct {
+}
+
+type DeleteFile DeleteFileRequestType
+
+func init() {
+	t["DeleteFile"] = reflect.TypeOf((*DeleteFile)(nil)).Elem()
+}
+
+type DeleteFileInGuest DeleteFileInGuestRequestType
+
+func init() {
+	t["DeleteFileInGuest"] = reflect.TypeOf((*DeleteFileInGuest)(nil)).Elem()
+}
+
+type DeleteFileInGuestRequestType struct {
+	This     ManagedObjectReference  `xml:"_this"`
+	Vm       ManagedObjectReference  `xml:"vm"`
+	Auth     BaseGuestAuthentication `xml:"auth,typeattr"`
+	FilePath string                  `xml:"filePath"`
+}
+
+func init() {
+	t["DeleteFileInGuestRequestType"] = reflect.TypeOf((*DeleteFileInGuestRequestType)(nil)).Elem()
+}
+
+type DeleteFileInGuestResponse struct {
+}
+
+type DeleteFileRequestType struct {
+	This          ManagedObjectReference `xml:"_this"`
+	DatastorePath string                 `xml:"datastorePath"`
+}
+
+func init() {
+	t["DeleteFileRequestType"] = reflect.TypeOf((*DeleteFileRequestType)(nil)).Elem()
+}
+
+type DeleteFileResponse struct {
+}
+
+type DeleteHostSpecification DeleteHostSpecificationRequestType
+
+func init() {
+	t["DeleteHostSpecification"] = reflect.TypeOf((*DeleteHostSpecification)(nil)).Elem()
+}
+
+type DeleteHostSpecificationRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Host ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["DeleteHostSpecificationRequestType"] = reflect.TypeOf((*DeleteHostSpecificationRequestType)(nil)).Elem()
+}
+
+type DeleteHostSpecificationResponse struct {
+}
+
+type DeleteHostSubSpecification DeleteHostSubSpecificationRequestType
+
+func init() {
+	t["DeleteHostSubSpecification"] = reflect.TypeOf((*DeleteHostSubSpecification)(nil)).Elem()
+}
+
+type DeleteHostSubSpecificationRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	Host        ManagedObjectReference `xml:"host"`
+	SubSpecName string                 `xml:"subSpecName"`
+}
+
+func init() {
+	t["DeleteHostSubSpecificationRequestType"] = reflect.TypeOf((*DeleteHostSubSpecificationRequestType)(nil)).Elem()
+}
+
+type DeleteHostSubSpecificationResponse struct {
+}
+
+type DeleteRegistryKeyInGuest DeleteRegistryKeyInGuestRequestType
+
+func init() {
+	t["DeleteRegistryKeyInGuest"] = reflect.TypeOf((*DeleteRegistryKeyInGuest)(nil)).Elem()
+}
+
+type DeleteRegistryKeyInGuestRequestType struct {
+	This      ManagedObjectReference  `xml:"_this"`
+	Vm        ManagedObjectReference  `xml:"vm"`
+	Auth      BaseGuestAuthentication `xml:"auth,typeattr"`
+	KeyName   GuestRegKeyNameSpec     `xml:"keyName"`
+	Recursive bool                    `xml:"recursive"`
+}
+
+func init() {
+	t["DeleteRegistryKeyInGuestRequestType"] = reflect.TypeOf((*DeleteRegistryKeyInGuestRequestType)(nil)).Elem()
+}
+
+type DeleteRegistryKeyInGuestResponse struct {
+}
+
+type DeleteRegistryValueInGuest DeleteRegistryValueInGuestRequestType
+
+func init() {
+	t["DeleteRegistryValueInGuest"] = reflect.TypeOf((*DeleteRegistryValueInGuest)(nil)).Elem()
+}
+
+type DeleteRegistryValueInGuestRequestType struct {
+	This      ManagedObjectReference  `xml:"_this"`
+	Vm        ManagedObjectReference  `xml:"vm"`
+	Auth      BaseGuestAuthentication `xml:"auth,typeattr"`
+	ValueName GuestRegValueNameSpec   `xml:"valueName"`
+}
+
+func init() {
+	t["DeleteRegistryValueInGuestRequestType"] = reflect.TypeOf((*DeleteRegistryValueInGuestRequestType)(nil)).Elem()
+}
+
+type DeleteRegistryValueInGuestResponse struct {
+}
+
+type DeleteScsiLunState DeleteScsiLunStateRequestType
+
+func init() {
+	t["DeleteScsiLunState"] = reflect.TypeOf((*DeleteScsiLunState)(nil)).Elem()
+}
+
+type DeleteScsiLunStateRequestType struct {
+	This             ManagedObjectReference `xml:"_this"`
+	LunCanonicalName string                 `xml:"lunCanonicalName"`
+}
+
+func init() {
+	t["DeleteScsiLunStateRequestType"] = reflect.TypeOf((*DeleteScsiLunStateRequestType)(nil)).Elem()
+}
+
+type DeleteScsiLunStateResponse struct {
+}
+
+type DeleteVStorageObjectRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Id        ID                     `xml:"id"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["DeleteVStorageObjectRequestType"] = reflect.TypeOf((*DeleteVStorageObjectRequestType)(nil)).Elem()
+}
+
+type DeleteVStorageObject_Task DeleteVStorageObjectRequestType
+
+func init() {
+	t["DeleteVStorageObject_Task"] = reflect.TypeOf((*DeleteVStorageObject_Task)(nil)).Elem()
+}
+
+type DeleteVStorageObject_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type DeleteVffsVolumeState DeleteVffsVolumeStateRequestType
+
+func init() {
+	t["DeleteVffsVolumeState"] = reflect.TypeOf((*DeleteVffsVolumeState)(nil)).Elem()
+}
+
+type DeleteVffsVolumeStateRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	VffsUuid string                 `xml:"vffsUuid"`
+}
+
+func init() {
+	t["DeleteVffsVolumeStateRequestType"] = reflect.TypeOf((*DeleteVffsVolumeStateRequestType)(nil)).Elem()
+}
+
+type DeleteVffsVolumeStateResponse struct {
+}
+
+type DeleteVirtualDiskRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Name       string                  `xml:"name"`
+	Datacenter *ManagedObjectReference `xml:"datacenter,omitempty"`
+}
+
+func init() {
+	t["DeleteVirtualDiskRequestType"] = reflect.TypeOf((*DeleteVirtualDiskRequestType)(nil)).Elem()
+}
+
+type DeleteVirtualDisk_Task DeleteVirtualDiskRequestType
+
+func init() {
+	t["DeleteVirtualDisk_Task"] = reflect.TypeOf((*DeleteVirtualDisk_Task)(nil)).Elem()
+}
+
+type DeleteVirtualDisk_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type DeleteVmfsVolumeState DeleteVmfsVolumeStateRequestType
+
+func init() {
+	t["DeleteVmfsVolumeState"] = reflect.TypeOf((*DeleteVmfsVolumeState)(nil)).Elem()
+}
+
+type DeleteVmfsVolumeStateRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	VmfsUuid string                 `xml:"vmfsUuid"`
+}
+
+func init() {
+	t["DeleteVmfsVolumeStateRequestType"] = reflect.TypeOf((*DeleteVmfsVolumeStateRequestType)(nil)).Elem()
+}
+
+type DeleteVmfsVolumeStateResponse struct {
+}
+
+type DeleteVsanObjects DeleteVsanObjectsRequestType
+
+func init() {
+	t["DeleteVsanObjects"] = reflect.TypeOf((*DeleteVsanObjects)(nil)).Elem()
+}
+
+type DeleteVsanObjectsRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Uuids []string               `xml:"uuids"`
+	Force *bool                  `xml:"force"`
+}
+
+func init() {
+	t["DeleteVsanObjectsRequestType"] = reflect.TypeOf((*DeleteVsanObjectsRequestType)(nil)).Elem()
+}
+
+type DeleteVsanObjectsResponse struct {
+	Returnval []HostVsanInternalSystemDeleteVsanObjectsResult `xml:"returnval"`
+}
+
+type DeltaDiskFormatNotSupported struct {
+	VmConfigFault
+
+	Datastore       []ManagedObjectReference `xml:"datastore,omitempty"`
+	DeltaDiskFormat string                   `xml:"deltaDiskFormat"`
+}
+
+func init() {
+	t["DeltaDiskFormatNotSupported"] = reflect.TypeOf((*DeltaDiskFormatNotSupported)(nil)).Elem()
+}
+
+type DeltaDiskFormatNotSupportedFault DeltaDiskFormatNotSupported
+
+func init() {
+	t["DeltaDiskFormatNotSupportedFault"] = reflect.TypeOf((*DeltaDiskFormatNotSupportedFault)(nil)).Elem()
+}
+
+type Description struct {
+	DynamicData
+
+	Label   string `xml:"label"`
+	Summary string `xml:"summary"`
+}
+
+func init() {
+	t["Description"] = reflect.TypeOf((*Description)(nil)).Elem()
+}
+
+type DeselectVnic DeselectVnicRequestType
+
+func init() {
+	t["DeselectVnic"] = reflect.TypeOf((*DeselectVnic)(nil)).Elem()
+}
+
+type DeselectVnicForNicType DeselectVnicForNicTypeRequestType
+
+func init() {
+	t["DeselectVnicForNicType"] = reflect.TypeOf((*DeselectVnicForNicType)(nil)).Elem()
+}
+
+type DeselectVnicForNicTypeRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	NicType string                 `xml:"nicType"`
+	Device  string                 `xml:"device"`
+}
+
+func init() {
+	t["DeselectVnicForNicTypeRequestType"] = reflect.TypeOf((*DeselectVnicForNicTypeRequestType)(nil)).Elem()
+}
+
+type DeselectVnicForNicTypeResponse struct {
+}
+
+type DeselectVnicRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["DeselectVnicRequestType"] = reflect.TypeOf((*DeselectVnicRequestType)(nil)).Elem()
+}
+
+type DeselectVnicResponse struct {
+}
+
+type DestinationSwitchFull struct {
+	CannotAccessNetwork
+}
+
+func init() {
+	t["DestinationSwitchFull"] = reflect.TypeOf((*DestinationSwitchFull)(nil)).Elem()
+}
+
+type DestinationSwitchFullFault DestinationSwitchFull
+
+func init() {
+	t["DestinationSwitchFullFault"] = reflect.TypeOf((*DestinationSwitchFullFault)(nil)).Elem()
+}
+
+type DestinationVsanDisabled struct {
+	CannotMoveVsanEnabledHost
+
+	DestinationCluster string `xml:"destinationCluster"`
+}
+
+func init() {
+	t["DestinationVsanDisabled"] = reflect.TypeOf((*DestinationVsanDisabled)(nil)).Elem()
+}
+
+type DestinationVsanDisabledFault DestinationVsanDisabled
+
+func init() {
+	t["DestinationVsanDisabledFault"] = reflect.TypeOf((*DestinationVsanDisabledFault)(nil)).Elem()
+}
+
+type DestroyChildren DestroyChildrenRequestType
+
+func init() {
+	t["DestroyChildren"] = reflect.TypeOf((*DestroyChildren)(nil)).Elem()
+}
+
+type DestroyChildrenRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["DestroyChildrenRequestType"] = reflect.TypeOf((*DestroyChildrenRequestType)(nil)).Elem()
+}
+
+type DestroyChildrenResponse struct {
+}
+
+type DestroyCollector DestroyCollectorRequestType
+
+func init() {
+	t["DestroyCollector"] = reflect.TypeOf((*DestroyCollector)(nil)).Elem()
+}
+
+type DestroyCollectorRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["DestroyCollectorRequestType"] = reflect.TypeOf((*DestroyCollectorRequestType)(nil)).Elem()
+}
+
+type DestroyCollectorResponse struct {
+}
+
+type DestroyDatastore DestroyDatastoreRequestType
+
+func init() {
+	t["DestroyDatastore"] = reflect.TypeOf((*DestroyDatastore)(nil)).Elem()
+}
+
+type DestroyDatastoreRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["DestroyDatastoreRequestType"] = reflect.TypeOf((*DestroyDatastoreRequestType)(nil)).Elem()
+}
+
+type DestroyDatastoreResponse struct {
+}
+
+type DestroyIpPool DestroyIpPoolRequestType
+
+func init() {
+	t["DestroyIpPool"] = reflect.TypeOf((*DestroyIpPool)(nil)).Elem()
+}
+
+type DestroyIpPoolRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Dc    ManagedObjectReference `xml:"dc"`
+	Id    int32                  `xml:"id"`
+	Force bool                   `xml:"force"`
+}
+
+func init() {
+	t["DestroyIpPoolRequestType"] = reflect.TypeOf((*DestroyIpPoolRequestType)(nil)).Elem()
+}
+
+type DestroyIpPoolResponse struct {
+}
+
+type DestroyNetwork DestroyNetworkRequestType
+
+func init() {
+	t["DestroyNetwork"] = reflect.TypeOf((*DestroyNetwork)(nil)).Elem()
+}
+
+type DestroyNetworkRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["DestroyNetworkRequestType"] = reflect.TypeOf((*DestroyNetworkRequestType)(nil)).Elem()
+}
+
+type DestroyNetworkResponse struct {
+}
+
+type DestroyProfile DestroyProfileRequestType
+
+func init() {
+	t["DestroyProfile"] = reflect.TypeOf((*DestroyProfile)(nil)).Elem()
+}
+
+type DestroyProfileRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["DestroyProfileRequestType"] = reflect.TypeOf((*DestroyProfileRequestType)(nil)).Elem()
+}
+
+type DestroyProfileResponse struct {
+}
+
+type DestroyPropertyCollector DestroyPropertyCollectorRequestType
+
+func init() {
+	t["DestroyPropertyCollector"] = reflect.TypeOf((*DestroyPropertyCollector)(nil)).Elem()
+}
+
+type DestroyPropertyCollectorRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["DestroyPropertyCollectorRequestType"] = reflect.TypeOf((*DestroyPropertyCollectorRequestType)(nil)).Elem()
+}
+
+type DestroyPropertyCollectorResponse struct {
+}
+
+type DestroyPropertyFilter DestroyPropertyFilterRequestType
+
+func init() {
+	t["DestroyPropertyFilter"] = reflect.TypeOf((*DestroyPropertyFilter)(nil)).Elem()
+}
+
+type DestroyPropertyFilterRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["DestroyPropertyFilterRequestType"] = reflect.TypeOf((*DestroyPropertyFilterRequestType)(nil)).Elem()
+}
+
+type DestroyPropertyFilterResponse struct {
+}
+
+type DestroyRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["DestroyRequestType"] = reflect.TypeOf((*DestroyRequestType)(nil)).Elem()
+}
+
+type DestroyVffs DestroyVffsRequestType
+
+func init() {
+	t["DestroyVffs"] = reflect.TypeOf((*DestroyVffs)(nil)).Elem()
+}
+
+type DestroyVffsRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	VffsPath string                 `xml:"vffsPath"`
+}
+
+func init() {
+	t["DestroyVffsRequestType"] = reflect.TypeOf((*DestroyVffsRequestType)(nil)).Elem()
+}
+
+type DestroyVffsResponse struct {
+}
+
+type DestroyView DestroyViewRequestType
+
+func init() {
+	t["DestroyView"] = reflect.TypeOf((*DestroyView)(nil)).Elem()
+}
+
+type DestroyViewRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["DestroyViewRequestType"] = reflect.TypeOf((*DestroyViewRequestType)(nil)).Elem()
+}
+
+type DestroyViewResponse struct {
+}
+
+type Destroy_Task DestroyRequestType
+
+func init() {
+	t["Destroy_Task"] = reflect.TypeOf((*Destroy_Task)(nil)).Elem()
+}
+
+type Destroy_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type DetachDiskRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	DiskId ID                     `xml:"diskId"`
+}
+
+func init() {
+	t["DetachDiskRequestType"] = reflect.TypeOf((*DetachDiskRequestType)(nil)).Elem()
+}
+
+type DetachDisk_Task DetachDiskRequestType
+
+func init() {
+	t["DetachDisk_Task"] = reflect.TypeOf((*DetachDisk_Task)(nil)).Elem()
+}
+
+type DetachDisk_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type DetachScsiLun DetachScsiLunRequestType
+
+func init() {
+	t["DetachScsiLun"] = reflect.TypeOf((*DetachScsiLun)(nil)).Elem()
+}
+
+type DetachScsiLunExRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	LunUuid []string               `xml:"lunUuid"`
+}
+
+func init() {
+	t["DetachScsiLunExRequestType"] = reflect.TypeOf((*DetachScsiLunExRequestType)(nil)).Elem()
+}
+
+type DetachScsiLunEx_Task DetachScsiLunExRequestType
+
+func init() {
+	t["DetachScsiLunEx_Task"] = reflect.TypeOf((*DetachScsiLunEx_Task)(nil)).Elem()
+}
+
+type DetachScsiLunEx_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type DetachScsiLunRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	LunUuid string                 `xml:"lunUuid"`
+}
+
+func init() {
+	t["DetachScsiLunRequestType"] = reflect.TypeOf((*DetachScsiLunRequestType)(nil)).Elem()
+}
+
+type DetachScsiLunResponse struct {
+}
+
+type DetachTagFromVStorageObject DetachTagFromVStorageObjectRequestType
+
+func init() {
+	t["DetachTagFromVStorageObject"] = reflect.TypeOf((*DetachTagFromVStorageObject)(nil)).Elem()
+}
+
+type DetachTagFromVStorageObjectRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	Id       ID                     `xml:"id"`
+	Category string                 `xml:"category"`
+	Tag      string                 `xml:"tag"`
+}
+
+func init() {
+	t["DetachTagFromVStorageObjectRequestType"] = reflect.TypeOf((*DetachTagFromVStorageObjectRequestType)(nil)).Elem()
+}
+
+type DetachTagFromVStorageObjectResponse struct {
+}
+
+type DeviceBackedVirtualDiskSpec struct {
+	VirtualDiskSpec
+
+	Device string `xml:"device"`
+}
+
+func init() {
+	t["DeviceBackedVirtualDiskSpec"] = reflect.TypeOf((*DeviceBackedVirtualDiskSpec)(nil)).Elem()
+}
+
+type DeviceBackingNotSupported struct {
+	DeviceNotSupported
+
+	Backing string `xml:"backing"`
+}
+
+func init() {
+	t["DeviceBackingNotSupported"] = reflect.TypeOf((*DeviceBackingNotSupported)(nil)).Elem()
+}
+
+type DeviceBackingNotSupportedFault BaseDeviceBackingNotSupported
+
+func init() {
+	t["DeviceBackingNotSupportedFault"] = reflect.TypeOf((*DeviceBackingNotSupportedFault)(nil)).Elem()
+}
+
+type DeviceControllerNotSupported struct {
+	DeviceNotSupported
+
+	Controller string `xml:"controller"`
+}
+
+func init() {
+	t["DeviceControllerNotSupported"] = reflect.TypeOf((*DeviceControllerNotSupported)(nil)).Elem()
+}
+
+type DeviceControllerNotSupportedFault DeviceControllerNotSupported
+
+func init() {
+	t["DeviceControllerNotSupportedFault"] = reflect.TypeOf((*DeviceControllerNotSupportedFault)(nil)).Elem()
+}
+
+type DeviceGroupId struct {
+	DynamicData
+
+	Id string `xml:"id"`
+}
+
+func init() {
+	t["DeviceGroupId"] = reflect.TypeOf((*DeviceGroupId)(nil)).Elem()
+}
+
+type DeviceHotPlugNotSupported struct {
+	InvalidDeviceSpec
+}
+
+func init() {
+	t["DeviceHotPlugNotSupported"] = reflect.TypeOf((*DeviceHotPlugNotSupported)(nil)).Elem()
+}
+
+type DeviceHotPlugNotSupportedFault DeviceHotPlugNotSupported
+
+func init() {
+	t["DeviceHotPlugNotSupportedFault"] = reflect.TypeOf((*DeviceHotPlugNotSupportedFault)(nil)).Elem()
+}
+
+type DeviceNotFound struct {
+	InvalidDeviceSpec
+}
+
+func init() {
+	t["DeviceNotFound"] = reflect.TypeOf((*DeviceNotFound)(nil)).Elem()
+}
+
+type DeviceNotFoundFault DeviceNotFound
+
+func init() {
+	t["DeviceNotFoundFault"] = reflect.TypeOf((*DeviceNotFoundFault)(nil)).Elem()
+}
+
+type DeviceNotSupported struct {
+	VirtualHardwareCompatibilityIssue
+
+	Device string `xml:"device"`
+	Reason string `xml:"reason,omitempty"`
+}
+
+func init() {
+	t["DeviceNotSupported"] = reflect.TypeOf((*DeviceNotSupported)(nil)).Elem()
+}
+
+type DeviceNotSupportedFault BaseDeviceNotSupported
+
+func init() {
+	t["DeviceNotSupportedFault"] = reflect.TypeOf((*DeviceNotSupportedFault)(nil)).Elem()
+}
+
+type DeviceUnsupportedForVmPlatform struct {
+	InvalidDeviceSpec
+}
+
+func init() {
+	t["DeviceUnsupportedForVmPlatform"] = reflect.TypeOf((*DeviceUnsupportedForVmPlatform)(nil)).Elem()
+}
+
+type DeviceUnsupportedForVmPlatformFault DeviceUnsupportedForVmPlatform
+
+func init() {
+	t["DeviceUnsupportedForVmPlatformFault"] = reflect.TypeOf((*DeviceUnsupportedForVmPlatformFault)(nil)).Elem()
+}
+
+type DeviceUnsupportedForVmVersion struct {
+	InvalidDeviceSpec
+
+	CurrentVersion  string `xml:"currentVersion"`
+	ExpectedVersion string `xml:"expectedVersion"`
+}
+
+func init() {
+	t["DeviceUnsupportedForVmVersion"] = reflect.TypeOf((*DeviceUnsupportedForVmVersion)(nil)).Elem()
+}
+
+type DeviceUnsupportedForVmVersionFault DeviceUnsupportedForVmVersion
+
+func init() {
+	t["DeviceUnsupportedForVmVersionFault"] = reflect.TypeOf((*DeviceUnsupportedForVmVersionFault)(nil)).Elem()
+}
+
+type DiagnosticManagerBundleInfo struct {
+	DynamicData
+
+	System *ManagedObjectReference `xml:"system,omitempty"`
+	Url    string                  `xml:"url"`
+}
+
+func init() {
+	t["DiagnosticManagerBundleInfo"] = reflect.TypeOf((*DiagnosticManagerBundleInfo)(nil)).Elem()
+}
+
+type DiagnosticManagerLogDescriptor struct {
+	DynamicData
+
+	Key      string          `xml:"key"`
+	FileName string          `xml:"fileName"`
+	Creator  string          `xml:"creator"`
+	Format   string          `xml:"format"`
+	MimeType string          `xml:"mimeType"`
+	Info     BaseDescription `xml:"info,typeattr"`
+}
+
+func init() {
+	t["DiagnosticManagerLogDescriptor"] = reflect.TypeOf((*DiagnosticManagerLogDescriptor)(nil)).Elem()
+}
+
+type DiagnosticManagerLogHeader struct {
+	DynamicData
+
+	LineStart int32    `xml:"lineStart"`
+	LineEnd   int32    `xml:"lineEnd"`
+	LineText  []string `xml:"lineText,omitempty"`
+}
+
+func init() {
+	t["DiagnosticManagerLogHeader"] = reflect.TypeOf((*DiagnosticManagerLogHeader)(nil)).Elem()
+}
+
+type DigestNotSupported struct {
+	DeviceNotSupported
+}
+
+func init() {
+	t["DigestNotSupported"] = reflect.TypeOf((*DigestNotSupported)(nil)).Elem()
+}
+
+type DigestNotSupportedFault DigestNotSupported
+
+func init() {
+	t["DigestNotSupportedFault"] = reflect.TypeOf((*DigestNotSupportedFault)(nil)).Elem()
+}
+
+type DirectoryNotEmpty struct {
+	FileFault
+}
+
+func init() {
+	t["DirectoryNotEmpty"] = reflect.TypeOf((*DirectoryNotEmpty)(nil)).Elem()
+}
+
+type DirectoryNotEmptyFault DirectoryNotEmpty
+
+func init() {
+	t["DirectoryNotEmptyFault"] = reflect.TypeOf((*DirectoryNotEmptyFault)(nil)).Elem()
+}
+
+type DisableAdminNotSupported struct {
+	HostConfigFault
+}
+
+func init() {
+	t["DisableAdminNotSupported"] = reflect.TypeOf((*DisableAdminNotSupported)(nil)).Elem()
+}
+
+type DisableAdminNotSupportedFault DisableAdminNotSupported
+
+func init() {
+	t["DisableAdminNotSupportedFault"] = reflect.TypeOf((*DisableAdminNotSupportedFault)(nil)).Elem()
+}
+
+type DisableEvcModeRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["DisableEvcModeRequestType"] = reflect.TypeOf((*DisableEvcModeRequestType)(nil)).Elem()
+}
+
+type DisableEvcMode_Task DisableEvcModeRequestType
+
+func init() {
+	t["DisableEvcMode_Task"] = reflect.TypeOf((*DisableEvcMode_Task)(nil)).Elem()
+}
+
+type DisableEvcMode_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type DisableFeature DisableFeatureRequestType
+
+func init() {
+	t["DisableFeature"] = reflect.TypeOf((*DisableFeature)(nil)).Elem()
+}
+
+type DisableFeatureRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Host       *ManagedObjectReference `xml:"host,omitempty"`
+	FeatureKey string                  `xml:"featureKey"`
+}
+
+func init() {
+	t["DisableFeatureRequestType"] = reflect.TypeOf((*DisableFeatureRequestType)(nil)).Elem()
+}
+
+type DisableFeatureResponse struct {
+	Returnval bool `xml:"returnval"`
+}
+
+type DisableHyperThreading DisableHyperThreadingRequestType
+
+func init() {
+	t["DisableHyperThreading"] = reflect.TypeOf((*DisableHyperThreading)(nil)).Elem()
+}
+
+type DisableHyperThreadingRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["DisableHyperThreadingRequestType"] = reflect.TypeOf((*DisableHyperThreadingRequestType)(nil)).Elem()
+}
+
+type DisableHyperThreadingResponse struct {
+}
+
+type DisableMultipathPath DisableMultipathPathRequestType
+
+func init() {
+	t["DisableMultipathPath"] = reflect.TypeOf((*DisableMultipathPath)(nil)).Elem()
+}
+
+type DisableMultipathPathRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	PathName string                 `xml:"pathName"`
+}
+
+func init() {
+	t["DisableMultipathPathRequestType"] = reflect.TypeOf((*DisableMultipathPathRequestType)(nil)).Elem()
+}
+
+type DisableMultipathPathResponse struct {
+}
+
+type DisableRuleset DisableRulesetRequestType
+
+func init() {
+	t["DisableRuleset"] = reflect.TypeOf((*DisableRuleset)(nil)).Elem()
+}
+
+type DisableRulesetRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Id   string                 `xml:"id"`
+}
+
+func init() {
+	t["DisableRulesetRequestType"] = reflect.TypeOf((*DisableRulesetRequestType)(nil)).Elem()
+}
+
+type DisableRulesetResponse struct {
+}
+
+type DisableSecondaryVMRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Vm   ManagedObjectReference `xml:"vm"`
+}
+
+func init() {
+	t["DisableSecondaryVMRequestType"] = reflect.TypeOf((*DisableSecondaryVMRequestType)(nil)).Elem()
+}
+
+type DisableSecondaryVM_Task DisableSecondaryVMRequestType
+
+func init() {
+	t["DisableSecondaryVM_Task"] = reflect.TypeOf((*DisableSecondaryVM_Task)(nil)).Elem()
+}
+
+type DisableSecondaryVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type DisableSmartCardAuthentication DisableSmartCardAuthenticationRequestType
+
+func init() {
+	t["DisableSmartCardAuthentication"] = reflect.TypeOf((*DisableSmartCardAuthentication)(nil)).Elem()
+}
+
+type DisableSmartCardAuthenticationRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["DisableSmartCardAuthenticationRequestType"] = reflect.TypeOf((*DisableSmartCardAuthenticationRequestType)(nil)).Elem()
+}
+
+type DisableSmartCardAuthenticationResponse struct {
+}
+
+type DisallowedChangeByService struct {
+	RuntimeFault
+
+	ServiceName      string `xml:"serviceName"`
+	DisallowedChange string `xml:"disallowedChange,omitempty"`
+}
+
+func init() {
+	t["DisallowedChangeByService"] = reflect.TypeOf((*DisallowedChangeByService)(nil)).Elem()
+}
+
+type DisallowedChangeByServiceFault DisallowedChangeByService
+
+func init() {
+	t["DisallowedChangeByServiceFault"] = reflect.TypeOf((*DisallowedChangeByServiceFault)(nil)).Elem()
+}
+
+type DisallowedDiskModeChange struct {
+	InvalidDeviceSpec
+}
+
+func init() {
+	t["DisallowedDiskModeChange"] = reflect.TypeOf((*DisallowedDiskModeChange)(nil)).Elem()
+}
+
+type DisallowedDiskModeChangeFault DisallowedDiskModeChange
+
+func init() {
+	t["DisallowedDiskModeChangeFault"] = reflect.TypeOf((*DisallowedDiskModeChangeFault)(nil)).Elem()
+}
+
+type DisallowedMigrationDeviceAttached struct {
+	MigrationFault
+
+	Fault LocalizedMethodFault `xml:"fault"`
+}
+
+func init() {
+	t["DisallowedMigrationDeviceAttached"] = reflect.TypeOf((*DisallowedMigrationDeviceAttached)(nil)).Elem()
+}
+
+type DisallowedMigrationDeviceAttachedFault DisallowedMigrationDeviceAttached
+
+func init() {
+	t["DisallowedMigrationDeviceAttachedFault"] = reflect.TypeOf((*DisallowedMigrationDeviceAttachedFault)(nil)).Elem()
+}
+
+type DisallowedOperationOnFailoverHost struct {
+	RuntimeFault
+
+	Host     ManagedObjectReference `xml:"host"`
+	Hostname string                 `xml:"hostname"`
+}
+
+func init() {
+	t["DisallowedOperationOnFailoverHost"] = reflect.TypeOf((*DisallowedOperationOnFailoverHost)(nil)).Elem()
+}
+
+type DisallowedOperationOnFailoverHostFault DisallowedOperationOnFailoverHost
+
+func init() {
+	t["DisallowedOperationOnFailoverHostFault"] = reflect.TypeOf((*DisallowedOperationOnFailoverHostFault)(nil)).Elem()
+}
+
+type DisconnectHostRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["DisconnectHostRequestType"] = reflect.TypeOf((*DisconnectHostRequestType)(nil)).Elem()
+}
+
+type DisconnectHost_Task DisconnectHostRequestType
+
+func init() {
+	t["DisconnectHost_Task"] = reflect.TypeOf((*DisconnectHost_Task)(nil)).Elem()
+}
+
+type DisconnectHost_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type DisconnectedHostsBlockingEVC struct {
+	EVCConfigFault
+}
+
+func init() {
+	t["DisconnectedHostsBlockingEVC"] = reflect.TypeOf((*DisconnectedHostsBlockingEVC)(nil)).Elem()
+}
+
+type DisconnectedHostsBlockingEVCFault DisconnectedHostsBlockingEVC
+
+func init() {
+	t["DisconnectedHostsBlockingEVCFault"] = reflect.TypeOf((*DisconnectedHostsBlockingEVCFault)(nil)).Elem()
+}
+
+type DiscoverFcoeHbas DiscoverFcoeHbasRequestType
+
+func init() {
+	t["DiscoverFcoeHbas"] = reflect.TypeOf((*DiscoverFcoeHbas)(nil)).Elem()
+}
+
+type DiscoverFcoeHbasRequestType struct {
+	This     ManagedObjectReference      `xml:"_this"`
+	FcoeSpec FcoeConfigFcoeSpecification `xml:"fcoeSpec"`
+}
+
+func init() {
+	t["DiscoverFcoeHbasRequestType"] = reflect.TypeOf((*DiscoverFcoeHbasRequestType)(nil)).Elem()
+}
+
+type DiscoverFcoeHbasResponse struct {
+}
+
+type DiskChangeExtent struct {
+	DynamicData
+
+	Start  int64 `xml:"start"`
+	Length int64 `xml:"length"`
+}
+
+func init() {
+	t["DiskChangeExtent"] = reflect.TypeOf((*DiskChangeExtent)(nil)).Elem()
+}
+
+type DiskChangeInfo struct {
+	DynamicData
+
+	StartOffset int64              `xml:"startOffset"`
+	Length      int64              `xml:"length"`
+	ChangedArea []DiskChangeExtent `xml:"changedArea,omitempty"`
+}
+
+func init() {
+	t["DiskChangeInfo"] = reflect.TypeOf((*DiskChangeInfo)(nil)).Elem()
+}
+
+type DiskHasPartitions struct {
+	VsanDiskFault
+}
+
+func init() {
+	t["DiskHasPartitions"] = reflect.TypeOf((*DiskHasPartitions)(nil)).Elem()
+}
+
+type DiskHasPartitionsFault DiskHasPartitions
+
+func init() {
+	t["DiskHasPartitionsFault"] = reflect.TypeOf((*DiskHasPartitionsFault)(nil)).Elem()
+}
+
+type DiskIsLastRemainingNonSSD struct {
+	VsanDiskFault
+}
+
+func init() {
+	t["DiskIsLastRemainingNonSSD"] = reflect.TypeOf((*DiskIsLastRemainingNonSSD)(nil)).Elem()
+}
+
+type DiskIsLastRemainingNonSSDFault DiskIsLastRemainingNonSSD
+
+func init() {
+	t["DiskIsLastRemainingNonSSDFault"] = reflect.TypeOf((*DiskIsLastRemainingNonSSDFault)(nil)).Elem()
+}
+
+type DiskIsNonLocal struct {
+	VsanDiskFault
+}
+
+func init() {
+	t["DiskIsNonLocal"] = reflect.TypeOf((*DiskIsNonLocal)(nil)).Elem()
+}
+
+type DiskIsNonLocalFault DiskIsNonLocal
+
+func init() {
+	t["DiskIsNonLocalFault"] = reflect.TypeOf((*DiskIsNonLocalFault)(nil)).Elem()
+}
+
+type DiskIsUSB struct {
+	VsanDiskFault
+}
+
+func init() {
+	t["DiskIsUSB"] = reflect.TypeOf((*DiskIsUSB)(nil)).Elem()
+}
+
+type DiskIsUSBFault DiskIsUSB
+
+func init() {
+	t["DiskIsUSBFault"] = reflect.TypeOf((*DiskIsUSBFault)(nil)).Elem()
+}
+
+type DiskMoveTypeNotSupported struct {
+	MigrationFault
+}
+
+func init() {
+	t["DiskMoveTypeNotSupported"] = reflect.TypeOf((*DiskMoveTypeNotSupported)(nil)).Elem()
+}
+
+type DiskMoveTypeNotSupportedFault DiskMoveTypeNotSupported
+
+func init() {
+	t["DiskMoveTypeNotSupportedFault"] = reflect.TypeOf((*DiskMoveTypeNotSupportedFault)(nil)).Elem()
+}
+
+type DiskNotSupported struct {
+	VirtualHardwareCompatibilityIssue
+
+	Disk int32 `xml:"disk"`
+}
+
+func init() {
+	t["DiskNotSupported"] = reflect.TypeOf((*DiskNotSupported)(nil)).Elem()
+}
+
+type DiskNotSupportedFault BaseDiskNotSupported
+
+func init() {
+	t["DiskNotSupportedFault"] = reflect.TypeOf((*DiskNotSupportedFault)(nil)).Elem()
+}
+
+type DiskTooSmall struct {
+	VsanDiskFault
+}
+
+func init() {
+	t["DiskTooSmall"] = reflect.TypeOf((*DiskTooSmall)(nil)).Elem()
+}
+
+type DiskTooSmallFault DiskTooSmall
+
+func init() {
+	t["DiskTooSmallFault"] = reflect.TypeOf((*DiskTooSmallFault)(nil)).Elem()
+}
+
+type DissociateProfile DissociateProfileRequestType
+
+func init() {
+	t["DissociateProfile"] = reflect.TypeOf((*DissociateProfile)(nil)).Elem()
+}
+
+type DissociateProfileRequestType struct {
+	This   ManagedObjectReference   `xml:"_this"`
+	Entity []ManagedObjectReference `xml:"entity,omitempty"`
+}
+
+func init() {
+	t["DissociateProfileRequestType"] = reflect.TypeOf((*DissociateProfileRequestType)(nil)).Elem()
+}
+
+type DissociateProfileResponse struct {
+}
+
+type DistributedVirtualPort struct {
+	DynamicData
+
+	Key              string                                 `xml:"key"`
+	Config           DVPortConfigInfo                       `xml:"config"`
+	DvsUuid          string                                 `xml:"dvsUuid"`
+	PortgroupKey     string                                 `xml:"portgroupKey,omitempty"`
+	ProxyHost        *ManagedObjectReference                `xml:"proxyHost,omitempty"`
+	Connectee        *DistributedVirtualSwitchPortConnectee `xml:"connectee,omitempty"`
+	Conflict         bool                                   `xml:"conflict"`
+	ConflictPortKey  string                                 `xml:"conflictPortKey,omitempty"`
+	State            *DVPortState                           `xml:"state,omitempty"`
+	ConnectionCookie int32                                  `xml:"connectionCookie,omitempty"`
+	LastStatusChange time.Time                              `xml:"lastStatusChange"`
+	HostLocalPort    *bool                                  `xml:"hostLocalPort"`
+}
+
+func init() {
+	t["DistributedVirtualPort"] = reflect.TypeOf((*DistributedVirtualPort)(nil)).Elem()
+}
+
+type DistributedVirtualPortgroupInfo struct {
+	DynamicData
+
+	SwitchName                  string                 `xml:"switchName"`
+	SwitchUuid                  string                 `xml:"switchUuid"`
+	PortgroupName               string                 `xml:"portgroupName"`
+	PortgroupKey                string                 `xml:"portgroupKey"`
+	PortgroupType               string                 `xml:"portgroupType"`
+	UplinkPortgroup             bool                   `xml:"uplinkPortgroup"`
+	Portgroup                   ManagedObjectReference `xml:"portgroup"`
+	NetworkReservationSupported *bool                  `xml:"networkReservationSupported"`
+}
+
+func init() {
+	t["DistributedVirtualPortgroupInfo"] = reflect.TypeOf((*DistributedVirtualPortgroupInfo)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchHostMember struct {
+	DynamicData
+
+	RuntimeState  *DistributedVirtualSwitchHostMemberRuntimeState `xml:"runtimeState,omitempty"`
+	Config        DistributedVirtualSwitchHostMemberConfigInfo    `xml:"config"`
+	ProductInfo   *DistributedVirtualSwitchProductSpec            `xml:"productInfo,omitempty"`
+	UplinkPortKey []string                                        `xml:"uplinkPortKey,omitempty"`
+	Status        string                                          `xml:"status"`
+	StatusDetail  string                                          `xml:"statusDetail,omitempty"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchHostMember"] = reflect.TypeOf((*DistributedVirtualSwitchHostMember)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchHostMemberBacking struct {
+	DynamicData
+}
+
+func init() {
+	t["DistributedVirtualSwitchHostMemberBacking"] = reflect.TypeOf((*DistributedVirtualSwitchHostMemberBacking)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchHostMemberConfigInfo struct {
+	DynamicData
+
+	Host                 *ManagedObjectReference                       `xml:"host,omitempty"`
+	MaxProxySwitchPorts  int32                                         `xml:"maxProxySwitchPorts"`
+	VendorSpecificConfig []DistributedVirtualSwitchKeyedOpaqueBlob     `xml:"vendorSpecificConfig,omitempty"`
+	Backing              BaseDistributedVirtualSwitchHostMemberBacking `xml:"backing,typeattr"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchHostMemberConfigInfo"] = reflect.TypeOf((*DistributedVirtualSwitchHostMemberConfigInfo)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchHostMemberConfigSpec struct {
+	DynamicData
+
+	Operation            string                                        `xml:"operation"`
+	Host                 ManagedObjectReference                        `xml:"host"`
+	Backing              BaseDistributedVirtualSwitchHostMemberBacking `xml:"backing,omitempty,typeattr"`
+	MaxProxySwitchPorts  int32                                         `xml:"maxProxySwitchPorts,omitempty"`
+	VendorSpecificConfig []DistributedVirtualSwitchKeyedOpaqueBlob     `xml:"vendorSpecificConfig,omitempty"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchHostMemberConfigSpec"] = reflect.TypeOf((*DistributedVirtualSwitchHostMemberConfigSpec)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchHostMemberPnicBacking struct {
+	DistributedVirtualSwitchHostMemberBacking
+
+	PnicSpec []DistributedVirtualSwitchHostMemberPnicSpec `xml:"pnicSpec,omitempty"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchHostMemberPnicBacking"] = reflect.TypeOf((*DistributedVirtualSwitchHostMemberPnicBacking)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchHostMemberPnicSpec struct {
+	DynamicData
+
+	PnicDevice         string `xml:"pnicDevice"`
+	UplinkPortKey      string `xml:"uplinkPortKey,omitempty"`
+	UplinkPortgroupKey string `xml:"uplinkPortgroupKey,omitempty"`
+	ConnectionCookie   int32  `xml:"connectionCookie,omitempty"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchHostMemberPnicSpec"] = reflect.TypeOf((*DistributedVirtualSwitchHostMemberPnicSpec)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchHostMemberRuntimeState struct {
+	DynamicData
+
+	CurrentMaxProxySwitchPorts int32 `xml:"currentMaxProxySwitchPorts"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchHostMemberRuntimeState"] = reflect.TypeOf((*DistributedVirtualSwitchHostMemberRuntimeState)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchHostProductSpec struct {
+	DynamicData
+
+	ProductLineId string `xml:"productLineId,omitempty"`
+	Version       string `xml:"version,omitempty"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchHostProductSpec"] = reflect.TypeOf((*DistributedVirtualSwitchHostProductSpec)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchInfo struct {
+	DynamicData
+
+	SwitchName                  string                 `xml:"switchName"`
+	SwitchUuid                  string                 `xml:"switchUuid"`
+	DistributedVirtualSwitch    ManagedObjectReference `xml:"distributedVirtualSwitch"`
+	NetworkReservationSupported *bool                  `xml:"networkReservationSupported"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchInfo"] = reflect.TypeOf((*DistributedVirtualSwitchInfo)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchKeyedOpaqueBlob struct {
+	DynamicData
+
+	Key        string `xml:"key"`
+	OpaqueData string `xml:"opaqueData"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchKeyedOpaqueBlob"] = reflect.TypeOf((*DistributedVirtualSwitchKeyedOpaqueBlob)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchManagerCompatibilityResult struct {
+	DynamicData
+
+	Host  ManagedObjectReference `xml:"host"`
+	Error []LocalizedMethodFault `xml:"error,omitempty"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchManagerCompatibilityResult"] = reflect.TypeOf((*DistributedVirtualSwitchManagerCompatibilityResult)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchManagerDvsProductSpec struct {
+	DynamicData
+
+	NewSwitchProductSpec     *DistributedVirtualSwitchProductSpec `xml:"newSwitchProductSpec,omitempty"`
+	DistributedVirtualSwitch *ManagedObjectReference              `xml:"distributedVirtualSwitch,omitempty"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchManagerDvsProductSpec"] = reflect.TypeOf((*DistributedVirtualSwitchManagerDvsProductSpec)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchManagerHostArrayFilter struct {
+	DistributedVirtualSwitchManagerHostDvsFilterSpec
+
+	Host []ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchManagerHostArrayFilter"] = reflect.TypeOf((*DistributedVirtualSwitchManagerHostArrayFilter)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchManagerHostContainer struct {
+	DynamicData
+
+	Container ManagedObjectReference `xml:"container"`
+	Recursive bool                   `xml:"recursive"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchManagerHostContainer"] = reflect.TypeOf((*DistributedVirtualSwitchManagerHostContainer)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchManagerHostContainerFilter struct {
+	DistributedVirtualSwitchManagerHostDvsFilterSpec
+
+	HostContainer DistributedVirtualSwitchManagerHostContainer `xml:"hostContainer"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchManagerHostContainerFilter"] = reflect.TypeOf((*DistributedVirtualSwitchManagerHostContainerFilter)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchManagerHostDvsFilterSpec struct {
+	DynamicData
+
+	Inclusive bool `xml:"inclusive"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchManagerHostDvsFilterSpec"] = reflect.TypeOf((*DistributedVirtualSwitchManagerHostDvsFilterSpec)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchManagerHostDvsMembershipFilter struct {
+	DistributedVirtualSwitchManagerHostDvsFilterSpec
+
+	DistributedVirtualSwitch ManagedObjectReference `xml:"distributedVirtualSwitch"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchManagerHostDvsMembershipFilter"] = reflect.TypeOf((*DistributedVirtualSwitchManagerHostDvsMembershipFilter)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchManagerImportResult struct {
+	DynamicData
+
+	DistributedVirtualSwitch    []ManagedObjectReference                `xml:"distributedVirtualSwitch,omitempty"`
+	DistributedVirtualPortgroup []ManagedObjectReference                `xml:"distributedVirtualPortgroup,omitempty"`
+	ImportFault                 []ImportOperationBulkFaultFaultOnImport `xml:"importFault,omitempty"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchManagerImportResult"] = reflect.TypeOf((*DistributedVirtualSwitchManagerImportResult)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchPortConnectee struct {
+	DynamicData
+
+	ConnectedEntity *ManagedObjectReference `xml:"connectedEntity,omitempty"`
+	NicKey          string                  `xml:"nicKey,omitempty"`
+	Type            string                  `xml:"type,omitempty"`
+	AddressHint     string                  `xml:"addressHint,omitempty"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchPortConnectee"] = reflect.TypeOf((*DistributedVirtualSwitchPortConnectee)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchPortConnection struct {
+	DynamicData
+
+	SwitchUuid       string `xml:"switchUuid"`
+	PortgroupKey     string `xml:"portgroupKey,omitempty"`
+	PortKey          string `xml:"portKey,omitempty"`
+	ConnectionCookie int32  `xml:"connectionCookie,omitempty"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchPortConnection"] = reflect.TypeOf((*DistributedVirtualSwitchPortConnection)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchPortCriteria struct {
+	DynamicData
+
+	Connected    *bool                    `xml:"connected"`
+	Active       *bool                    `xml:"active"`
+	UplinkPort   *bool                    `xml:"uplinkPort"`
+	Scope        *ManagedObjectReference  `xml:"scope,omitempty"`
+	PortgroupKey []string                 `xml:"portgroupKey,omitempty"`
+	Inside       *bool                    `xml:"inside"`
+	PortKey      []string                 `xml:"portKey,omitempty"`
+	Host         []ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchPortCriteria"] = reflect.TypeOf((*DistributedVirtualSwitchPortCriteria)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchPortStatistics struct {
+	DynamicData
+
+	PacketsInMulticast  int64 `xml:"packetsInMulticast"`
+	PacketsOutMulticast int64 `xml:"packetsOutMulticast"`
+	BytesInMulticast    int64 `xml:"bytesInMulticast"`
+	BytesOutMulticast   int64 `xml:"bytesOutMulticast"`
+	PacketsInUnicast    int64 `xml:"packetsInUnicast"`
+	PacketsOutUnicast   int64 `xml:"packetsOutUnicast"`
+	BytesInUnicast      int64 `xml:"bytesInUnicast"`
+	BytesOutUnicast     int64 `xml:"bytesOutUnicast"`
+	PacketsInBroadcast  int64 `xml:"packetsInBroadcast"`
+	PacketsOutBroadcast int64 `xml:"packetsOutBroadcast"`
+	BytesInBroadcast    int64 `xml:"bytesInBroadcast"`
+	BytesOutBroadcast   int64 `xml:"bytesOutBroadcast"`
+	PacketsInDropped    int64 `xml:"packetsInDropped"`
+	PacketsOutDropped   int64 `xml:"packetsOutDropped"`
+	PacketsInException  int64 `xml:"packetsInException"`
+	PacketsOutException int64 `xml:"packetsOutException"`
+	BytesInFromPnic     int64 `xml:"bytesInFromPnic,omitempty"`
+	BytesOutToPnic      int64 `xml:"bytesOutToPnic,omitempty"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchPortStatistics"] = reflect.TypeOf((*DistributedVirtualSwitchPortStatistics)(nil)).Elem()
+}
+
+type DistributedVirtualSwitchProductSpec struct {
+	DynamicData
+
+	Name            string `xml:"name,omitempty"`
+	Vendor          string `xml:"vendor,omitempty"`
+	Version         string `xml:"version,omitempty"`
+	Build           string `xml:"build,omitempty"`
+	ForwardingClass string `xml:"forwardingClass,omitempty"`
+	BundleId        string `xml:"bundleId,omitempty"`
+	BundleUrl       string `xml:"bundleUrl,omitempty"`
+}
+
+func init() {
+	t["DistributedVirtualSwitchProductSpec"] = reflect.TypeOf((*DistributedVirtualSwitchProductSpec)(nil)).Elem()
+}
+
+type DoesCustomizationSpecExist DoesCustomizationSpecExistRequestType
+
+func init() {
+	t["DoesCustomizationSpecExist"] = reflect.TypeOf((*DoesCustomizationSpecExist)(nil)).Elem()
+}
+
+type DoesCustomizationSpecExistRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Name string                 `xml:"name"`
+}
+
+func init() {
+	t["DoesCustomizationSpecExistRequestType"] = reflect.TypeOf((*DoesCustomizationSpecExistRequestType)(nil)).Elem()
+}
+
+type DoesCustomizationSpecExistResponse struct {
+	Returnval bool `xml:"returnval"`
+}
+
+type DomainNotFound struct {
+	ActiveDirectoryFault
+
+	DomainName string `xml:"domainName"`
+}
+
+func init() {
+	t["DomainNotFound"] = reflect.TypeOf((*DomainNotFound)(nil)).Elem()
+}
+
+type DomainNotFoundFault DomainNotFound
+
+func init() {
+	t["DomainNotFoundFault"] = reflect.TypeOf((*DomainNotFoundFault)(nil)).Elem()
+}
+
+type DrsDisabledEvent struct {
+	ClusterEvent
+}
+
+func init() {
+	t["DrsDisabledEvent"] = reflect.TypeOf((*DrsDisabledEvent)(nil)).Elem()
+}
+
+type DrsDisabledOnVm struct {
+	VimFault
+}
+
+func init() {
+	t["DrsDisabledOnVm"] = reflect.TypeOf((*DrsDisabledOnVm)(nil)).Elem()
+}
+
+type DrsDisabledOnVmFault DrsDisabledOnVm
+
+func init() {
+	t["DrsDisabledOnVmFault"] = reflect.TypeOf((*DrsDisabledOnVmFault)(nil)).Elem()
+}
+
+type DrsEnabledEvent struct {
+	ClusterEvent
+
+	Behavior string `xml:"behavior"`
+}
+
+func init() {
+	t["DrsEnabledEvent"] = reflect.TypeOf((*DrsEnabledEvent)(nil)).Elem()
+}
+
+type DrsEnteredStandbyModeEvent struct {
+	EnteredStandbyModeEvent
+}
+
+func init() {
+	t["DrsEnteredStandbyModeEvent"] = reflect.TypeOf((*DrsEnteredStandbyModeEvent)(nil)).Elem()
+}
+
+type DrsEnteringStandbyModeEvent struct {
+	EnteringStandbyModeEvent
+}
+
+func init() {
+	t["DrsEnteringStandbyModeEvent"] = reflect.TypeOf((*DrsEnteringStandbyModeEvent)(nil)).Elem()
+}
+
+type DrsExitStandbyModeFailedEvent struct {
+	ExitStandbyModeFailedEvent
+}
+
+func init() {
+	t["DrsExitStandbyModeFailedEvent"] = reflect.TypeOf((*DrsExitStandbyModeFailedEvent)(nil)).Elem()
+}
+
+type DrsExitedStandbyModeEvent struct {
+	ExitedStandbyModeEvent
+}
+
+func init() {
+	t["DrsExitedStandbyModeEvent"] = reflect.TypeOf((*DrsExitedStandbyModeEvent)(nil)).Elem()
+}
+
+type DrsExitingStandbyModeEvent struct {
+	ExitingStandbyModeEvent
+}
+
+func init() {
+	t["DrsExitingStandbyModeEvent"] = reflect.TypeOf((*DrsExitingStandbyModeEvent)(nil)).Elem()
+}
+
+type DrsInvocationFailedEvent struct {
+	ClusterEvent
+}
+
+func init() {
+	t["DrsInvocationFailedEvent"] = reflect.TypeOf((*DrsInvocationFailedEvent)(nil)).Elem()
+}
+
+type DrsRecoveredFromFailureEvent struct {
+	ClusterEvent
+}
+
+func init() {
+	t["DrsRecoveredFromFailureEvent"] = reflect.TypeOf((*DrsRecoveredFromFailureEvent)(nil)).Elem()
+}
+
+type DrsResourceConfigureFailedEvent struct {
+	HostEvent
+
+	Reason LocalizedMethodFault `xml:"reason"`
+}
+
+func init() {
+	t["DrsResourceConfigureFailedEvent"] = reflect.TypeOf((*DrsResourceConfigureFailedEvent)(nil)).Elem()
+}
+
+type DrsResourceConfigureSyncedEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["DrsResourceConfigureSyncedEvent"] = reflect.TypeOf((*DrsResourceConfigureSyncedEvent)(nil)).Elem()
+}
+
+type DrsRuleComplianceEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["DrsRuleComplianceEvent"] = reflect.TypeOf((*DrsRuleComplianceEvent)(nil)).Elem()
+}
+
+type DrsRuleViolationEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["DrsRuleViolationEvent"] = reflect.TypeOf((*DrsRuleViolationEvent)(nil)).Elem()
+}
+
+type DrsSoftRuleViolationEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["DrsSoftRuleViolationEvent"] = reflect.TypeOf((*DrsSoftRuleViolationEvent)(nil)).Elem()
+}
+
+type DrsVmMigratedEvent struct {
+	VmMigratedEvent
+}
+
+func init() {
+	t["DrsVmMigratedEvent"] = reflect.TypeOf((*DrsVmMigratedEvent)(nil)).Elem()
+}
+
+type DrsVmPoweredOnEvent struct {
+	VmPoweredOnEvent
+}
+
+func init() {
+	t["DrsVmPoweredOnEvent"] = reflect.TypeOf((*DrsVmPoweredOnEvent)(nil)).Elem()
+}
+
+type DrsVmotionIncompatibleFault struct {
+	VirtualHardwareCompatibilityIssue
+
+	Host ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["DrsVmotionIncompatibleFault"] = reflect.TypeOf((*DrsVmotionIncompatibleFault)(nil)).Elem()
+}
+
+type DrsVmotionIncompatibleFaultFault DrsVmotionIncompatibleFault
+
+func init() {
+	t["DrsVmotionIncompatibleFaultFault"] = reflect.TypeOf((*DrsVmotionIncompatibleFaultFault)(nil)).Elem()
+}
+
+type DuplicateCustomizationSpec DuplicateCustomizationSpecRequestType
+
+func init() {
+	t["DuplicateCustomizationSpec"] = reflect.TypeOf((*DuplicateCustomizationSpec)(nil)).Elem()
+}
+
+type DuplicateCustomizationSpecRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Name    string                 `xml:"name"`
+	NewName string                 `xml:"newName"`
+}
+
+func init() {
+	t["DuplicateCustomizationSpecRequestType"] = reflect.TypeOf((*DuplicateCustomizationSpecRequestType)(nil)).Elem()
+}
+
+type DuplicateCustomizationSpecResponse struct {
+}
+
+type DuplicateDisks struct {
+	VsanDiskFault
+}
+
+func init() {
+	t["DuplicateDisks"] = reflect.TypeOf((*DuplicateDisks)(nil)).Elem()
+}
+
+type DuplicateDisksFault DuplicateDisks
+
+func init() {
+	t["DuplicateDisksFault"] = reflect.TypeOf((*DuplicateDisksFault)(nil)).Elem()
+}
+
+type DuplicateIpDetectedEvent struct {
+	HostEvent
+
+	DuplicateIP string `xml:"duplicateIP"`
+	MacAddress  string `xml:"macAddress"`
+}
+
+func init() {
+	t["DuplicateIpDetectedEvent"] = reflect.TypeOf((*DuplicateIpDetectedEvent)(nil)).Elem()
+}
+
+type DuplicateName struct {
+	VimFault
+
+	Name   string                 `xml:"name"`
+	Object ManagedObjectReference `xml:"object"`
+}
+
+func init() {
+	t["DuplicateName"] = reflect.TypeOf((*DuplicateName)(nil)).Elem()
+}
+
+type DuplicateNameFault DuplicateName
+
+func init() {
+	t["DuplicateNameFault"] = reflect.TypeOf((*DuplicateNameFault)(nil)).Elem()
+}
+
+type DuplicateVsanNetworkInterface struct {
+	VsanFault
+
+	Device string `xml:"device"`
+}
+
+func init() {
+	t["DuplicateVsanNetworkInterface"] = reflect.TypeOf((*DuplicateVsanNetworkInterface)(nil)).Elem()
+}
+
+type DuplicateVsanNetworkInterfaceFault DuplicateVsanNetworkInterface
+
+func init() {
+	t["DuplicateVsanNetworkInterfaceFault"] = reflect.TypeOf((*DuplicateVsanNetworkInterfaceFault)(nil)).Elem()
+}
+
+type DvpgImportEvent struct {
+	DVPortgroupEvent
+
+	ImportType string `xml:"importType"`
+}
+
+func init() {
+	t["DvpgImportEvent"] = reflect.TypeOf((*DvpgImportEvent)(nil)).Elem()
+}
+
+type DvpgRestoreEvent struct {
+	DVPortgroupEvent
+}
+
+func init() {
+	t["DvpgRestoreEvent"] = reflect.TypeOf((*DvpgRestoreEvent)(nil)).Elem()
+}
+
+type DvsAcceptNetworkRuleAction struct {
+	DvsNetworkRuleAction
+}
+
+func init() {
+	t["DvsAcceptNetworkRuleAction"] = reflect.TypeOf((*DvsAcceptNetworkRuleAction)(nil)).Elem()
+}
+
+type DvsApplyOperationFault struct {
+	DvsFault
+
+	ObjectFault []DvsApplyOperationFaultFaultOnObject `xml:"objectFault"`
+}
+
+func init() {
+	t["DvsApplyOperationFault"] = reflect.TypeOf((*DvsApplyOperationFault)(nil)).Elem()
+}
+
+type DvsApplyOperationFaultFault DvsApplyOperationFault
+
+func init() {
+	t["DvsApplyOperationFaultFault"] = reflect.TypeOf((*DvsApplyOperationFaultFault)(nil)).Elem()
+}
+
+type DvsApplyOperationFaultFaultOnObject struct {
+	DynamicData
+
+	ObjectId string               `xml:"objectId"`
+	Type     string               `xml:"type"`
+	Fault    LocalizedMethodFault `xml:"fault"`
+}
+
+func init() {
+	t["DvsApplyOperationFaultFaultOnObject"] = reflect.TypeOf((*DvsApplyOperationFaultFaultOnObject)(nil)).Elem()
+}
+
+type DvsCopyNetworkRuleAction struct {
+	DvsNetworkRuleAction
+}
+
+func init() {
+	t["DvsCopyNetworkRuleAction"] = reflect.TypeOf((*DvsCopyNetworkRuleAction)(nil)).Elem()
+}
+
+type DvsCreatedEvent struct {
+	DvsEvent
+
+	Parent FolderEventArgument `xml:"parent"`
+}
+
+func init() {
+	t["DvsCreatedEvent"] = reflect.TypeOf((*DvsCreatedEvent)(nil)).Elem()
+}
+
+type DvsDestroyedEvent struct {
+	DvsEvent
+}
+
+func init() {
+	t["DvsDestroyedEvent"] = reflect.TypeOf((*DvsDestroyedEvent)(nil)).Elem()
+}
+
+type DvsDropNetworkRuleAction struct {
+	DvsNetworkRuleAction
+}
+
+func init() {
+	t["DvsDropNetworkRuleAction"] = reflect.TypeOf((*DvsDropNetworkRuleAction)(nil)).Elem()
+}
+
+type DvsEvent struct {
+	Event
+}
+
+func init() {
+	t["DvsEvent"] = reflect.TypeOf((*DvsEvent)(nil)).Elem()
+}
+
+type DvsEventArgument struct {
+	EntityEventArgument
+
+	Dvs ManagedObjectReference `xml:"dvs"`
+}
+
+func init() {
+	t["DvsEventArgument"] = reflect.TypeOf((*DvsEventArgument)(nil)).Elem()
+}
+
+type DvsFault struct {
+	VimFault
+}
+
+func init() {
+	t["DvsFault"] = reflect.TypeOf((*DvsFault)(nil)).Elem()
+}
+
+type DvsFaultFault BaseDvsFault
+
+func init() {
+	t["DvsFaultFault"] = reflect.TypeOf((*DvsFaultFault)(nil)).Elem()
+}
+
+type DvsFilterConfig struct {
+	InheritablePolicy
+
+	Key        string              `xml:"key,omitempty"`
+	AgentName  string              `xml:"agentName,omitempty"`
+	SlotNumber string              `xml:"slotNumber,omitempty"`
+	Parameters *DvsFilterParameter `xml:"parameters,omitempty"`
+	OnFailure  string              `xml:"onFailure,omitempty"`
+}
+
+func init() {
+	t["DvsFilterConfig"] = reflect.TypeOf((*DvsFilterConfig)(nil)).Elem()
+}
+
+type DvsFilterConfigSpec struct {
+	DvsFilterConfig
+
+	Operation string `xml:"operation"`
+}
+
+func init() {
+	t["DvsFilterConfigSpec"] = reflect.TypeOf((*DvsFilterConfigSpec)(nil)).Elem()
+}
+
+type DvsFilterParameter struct {
+	DynamicData
+
+	Parameters []string `xml:"parameters,omitempty"`
+}
+
+func init() {
+	t["DvsFilterParameter"] = reflect.TypeOf((*DvsFilterParameter)(nil)).Elem()
+}
+
+type DvsFilterPolicy struct {
+	InheritablePolicy
+
+	FilterConfig []BaseDvsFilterConfig `xml:"filterConfig,omitempty,typeattr"`
+}
+
+func init() {
+	t["DvsFilterPolicy"] = reflect.TypeOf((*DvsFilterPolicy)(nil)).Elem()
+}
+
+type DvsGreEncapNetworkRuleAction struct {
+	DvsNetworkRuleAction
+
+	EncapsulationIp SingleIp `xml:"encapsulationIp"`
+}
+
+func init() {
+	t["DvsGreEncapNetworkRuleAction"] = reflect.TypeOf((*DvsGreEncapNetworkRuleAction)(nil)).Elem()
+}
+
+type DvsHealthStatusChangeEvent struct {
+	HostEvent
+
+	SwitchUuid   string                          `xml:"switchUuid"`
+	HealthResult BaseHostMemberHealthCheckResult `xml:"healthResult,omitempty,typeattr"`
+}
+
+func init() {
+	t["DvsHealthStatusChangeEvent"] = reflect.TypeOf((*DvsHealthStatusChangeEvent)(nil)).Elem()
+}
+
+type DvsHostBackInSyncEvent struct {
+	DvsEvent
+
+	HostBackInSync HostEventArgument `xml:"hostBackInSync"`
+}
+
+func init() {
+	t["DvsHostBackInSyncEvent"] = reflect.TypeOf((*DvsHostBackInSyncEvent)(nil)).Elem()
+}
+
+type DvsHostInfrastructureTrafficResource struct {
+	DynamicData
+
+	Key            string                                         `xml:"key"`
+	Description    string                                         `xml:"description,omitempty"`
+	AllocationInfo DvsHostInfrastructureTrafficResourceAllocation `xml:"allocationInfo"`
+}
+
+func init() {
+	t["DvsHostInfrastructureTrafficResource"] = reflect.TypeOf((*DvsHostInfrastructureTrafficResource)(nil)).Elem()
+}
+
+type DvsHostInfrastructureTrafficResourceAllocation struct {
+	DynamicData
+
+	Limit       int64       `xml:"limit,omitempty"`
+	Shares      *SharesInfo `xml:"shares,omitempty"`
+	Reservation int64       `xml:"reservation,omitempty"`
+}
+
+func init() {
+	t["DvsHostInfrastructureTrafficResourceAllocation"] = reflect.TypeOf((*DvsHostInfrastructureTrafficResourceAllocation)(nil)).Elem()
+}
+
+type DvsHostJoinedEvent struct {
+	DvsEvent
+
+	HostJoined HostEventArgument `xml:"hostJoined"`
+}
+
+func init() {
+	t["DvsHostJoinedEvent"] = reflect.TypeOf((*DvsHostJoinedEvent)(nil)).Elem()
+}
+
+type DvsHostLeftEvent struct {
+	DvsEvent
+
+	HostLeft HostEventArgument `xml:"hostLeft"`
+}
+
+func init() {
+	t["DvsHostLeftEvent"] = reflect.TypeOf((*DvsHostLeftEvent)(nil)).Elem()
+}
+
+type DvsHostStatusUpdated struct {
+	DvsEvent
+
+	HostMember      HostEventArgument `xml:"hostMember"`
+	OldStatus       string            `xml:"oldStatus,omitempty"`
+	NewStatus       string            `xml:"newStatus,omitempty"`
+	OldStatusDetail string            `xml:"oldStatusDetail,omitempty"`
+	NewStatusDetail string            `xml:"newStatusDetail,omitempty"`
+}
+
+func init() {
+	t["DvsHostStatusUpdated"] = reflect.TypeOf((*DvsHostStatusUpdated)(nil)).Elem()
+}
+
+type DvsHostVNicProfile struct {
+	DvsVNicProfile
+}
+
+func init() {
+	t["DvsHostVNicProfile"] = reflect.TypeOf((*DvsHostVNicProfile)(nil)).Elem()
+}
+
+type DvsHostWentOutOfSyncEvent struct {
+	DvsEvent
+
+	HostOutOfSync DvsOutOfSyncHostArgument `xml:"hostOutOfSync"`
+}
+
+func init() {
+	t["DvsHostWentOutOfSyncEvent"] = reflect.TypeOf((*DvsHostWentOutOfSyncEvent)(nil)).Elem()
+}
+
+type DvsImportEvent struct {
+	DvsEvent
+
+	ImportType string `xml:"importType"`
+}
+
+func init() {
+	t["DvsImportEvent"] = reflect.TypeOf((*DvsImportEvent)(nil)).Elem()
+}
+
+type DvsIpNetworkRuleQualifier struct {
+	DvsNetworkRuleQualifier
+
+	SourceAddress      BaseIpAddress  `xml:"sourceAddress,omitempty,typeattr"`
+	DestinationAddress BaseIpAddress  `xml:"destinationAddress,omitempty,typeattr"`
+	Protocol           *IntExpression `xml:"protocol,omitempty"`
+	SourceIpPort       BaseDvsIpPort  `xml:"sourceIpPort,omitempty,typeattr"`
+	DestinationIpPort  BaseDvsIpPort  `xml:"destinationIpPort,omitempty,typeattr"`
+	TcpFlags           *IntExpression `xml:"tcpFlags,omitempty"`
+}
+
+func init() {
+	t["DvsIpNetworkRuleQualifier"] = reflect.TypeOf((*DvsIpNetworkRuleQualifier)(nil)).Elem()
+}
+
+type DvsIpPort struct {
+	NegatableExpression
+}
+
+func init() {
+	t["DvsIpPort"] = reflect.TypeOf((*DvsIpPort)(nil)).Elem()
+}
+
+type DvsIpPortRange struct {
+	DvsIpPort
+
+	StartPortNumber int32 `xml:"startPortNumber"`
+	EndPortNumber   int32 `xml:"endPortNumber"`
+}
+
+func init() {
+	t["DvsIpPortRange"] = reflect.TypeOf((*DvsIpPortRange)(nil)).Elem()
+}
+
+type DvsLogNetworkRuleAction struct {
+	DvsNetworkRuleAction
+}
+
+func init() {
+	t["DvsLogNetworkRuleAction"] = reflect.TypeOf((*DvsLogNetworkRuleAction)(nil)).Elem()
+}
+
+type DvsMacNetworkRuleQualifier struct {
+	DvsNetworkRuleQualifier
+
+	SourceAddress      BaseMacAddress `xml:"sourceAddress,omitempty,typeattr"`
+	DestinationAddress BaseMacAddress `xml:"destinationAddress,omitempty,typeattr"`
+	Protocol           *IntExpression `xml:"protocol,omitempty"`
+	VlanId             *IntExpression `xml:"vlanId,omitempty"`
+}
+
+func init() {
+	t["DvsMacNetworkRuleQualifier"] = reflect.TypeOf((*DvsMacNetworkRuleQualifier)(nil)).Elem()
+}
+
+type DvsMacRewriteNetworkRuleAction struct {
+	DvsNetworkRuleAction
+
+	RewriteMac string `xml:"rewriteMac"`
+}
+
+func init() {
+	t["DvsMacRewriteNetworkRuleAction"] = reflect.TypeOf((*DvsMacRewriteNetworkRuleAction)(nil)).Elem()
+}
+
+type DvsMergedEvent struct {
+	DvsEvent
+
+	SourceDvs      DvsEventArgument `xml:"sourceDvs"`
+	DestinationDvs DvsEventArgument `xml:"destinationDvs"`
+}
+
+func init() {
+	t["DvsMergedEvent"] = reflect.TypeOf((*DvsMergedEvent)(nil)).Elem()
+}
+
+type DvsNetworkRuleAction struct {
+	DynamicData
+}
+
+func init() {
+	t["DvsNetworkRuleAction"] = reflect.TypeOf((*DvsNetworkRuleAction)(nil)).Elem()
+}
+
+type DvsNetworkRuleQualifier struct {
+	DynamicData
+
+	Key string `xml:"key,omitempty"`
+}
+
+func init() {
+	t["DvsNetworkRuleQualifier"] = reflect.TypeOf((*DvsNetworkRuleQualifier)(nil)).Elem()
+}
+
+type DvsNotAuthorized struct {
+	DvsFault
+
+	SessionExtensionKey string `xml:"sessionExtensionKey,omitempty"`
+	DvsExtensionKey     string `xml:"dvsExtensionKey,omitempty"`
+}
+
+func init() {
+	t["DvsNotAuthorized"] = reflect.TypeOf((*DvsNotAuthorized)(nil)).Elem()
+}
+
+type DvsNotAuthorizedFault DvsNotAuthorized
+
+func init() {
+	t["DvsNotAuthorizedFault"] = reflect.TypeOf((*DvsNotAuthorizedFault)(nil)).Elem()
+}
+
+type DvsOperationBulkFault struct {
+	DvsFault
+
+	HostFault []DvsOperationBulkFaultFaultOnHost `xml:"hostFault"`
+}
+
+func init() {
+	t["DvsOperationBulkFault"] = reflect.TypeOf((*DvsOperationBulkFault)(nil)).Elem()
+}
+
+type DvsOperationBulkFaultFault DvsOperationBulkFault
+
+func init() {
+	t["DvsOperationBulkFaultFault"] = reflect.TypeOf((*DvsOperationBulkFaultFault)(nil)).Elem()
+}
+
+type DvsOperationBulkFaultFaultOnHost struct {
+	DynamicData
+
+	Host  ManagedObjectReference `xml:"host"`
+	Fault LocalizedMethodFault   `xml:"fault"`
+}
+
+func init() {
+	t["DvsOperationBulkFaultFaultOnHost"] = reflect.TypeOf((*DvsOperationBulkFaultFaultOnHost)(nil)).Elem()
+}
+
+type DvsOutOfSyncHostArgument struct {
+	DynamicData
+
+	OutOfSyncHost   HostEventArgument `xml:"outOfSyncHost"`
+	ConfigParamters []string          `xml:"configParamters"`
+}
+
+func init() {
+	t["DvsOutOfSyncHostArgument"] = reflect.TypeOf((*DvsOutOfSyncHostArgument)(nil)).Elem()
+}
+
+type DvsPortBlockedEvent struct {
+	DvsEvent
+
+	PortKey        string        `xml:"portKey"`
+	StatusDetail   string        `xml:"statusDetail,omitempty"`
+	RuntimeInfo    *DVPortStatus `xml:"runtimeInfo,omitempty"`
+	PrevBlockState string        `xml:"prevBlockState,omitempty"`
+}
+
+func init() {
+	t["DvsPortBlockedEvent"] = reflect.TypeOf((*DvsPortBlockedEvent)(nil)).Elem()
+}
+
+type DvsPortConnectedEvent struct {
+	DvsEvent
+
+	PortKey   string                                 `xml:"portKey"`
+	Connectee *DistributedVirtualSwitchPortConnectee `xml:"connectee,omitempty"`
+}
+
+func init() {
+	t["DvsPortConnectedEvent"] = reflect.TypeOf((*DvsPortConnectedEvent)(nil)).Elem()
+}
+
+type DvsPortCreatedEvent struct {
+	DvsEvent
+
+	PortKey []string `xml:"portKey"`
+}
+
+func init() {
+	t["DvsPortCreatedEvent"] = reflect.TypeOf((*DvsPortCreatedEvent)(nil)).Elem()
+}
+
+type DvsPortDeletedEvent struct {
+	DvsEvent
+
+	PortKey []string `xml:"portKey"`
+}
+
+func init() {
+	t["DvsPortDeletedEvent"] = reflect.TypeOf((*DvsPortDeletedEvent)(nil)).Elem()
+}
+
+type DvsPortDisconnectedEvent struct {
+	DvsEvent
+
+	PortKey   string                                 `xml:"portKey"`
+	Connectee *DistributedVirtualSwitchPortConnectee `xml:"connectee,omitempty"`
+}
+
+func init() {
+	t["DvsPortDisconnectedEvent"] = reflect.TypeOf((*DvsPortDisconnectedEvent)(nil)).Elem()
+}
+
+type DvsPortEnteredPassthruEvent struct {
+	DvsEvent
+
+	PortKey     string        `xml:"portKey"`
+	RuntimeInfo *DVPortStatus `xml:"runtimeInfo,omitempty"`
+}
+
+func init() {
+	t["DvsPortEnteredPassthruEvent"] = reflect.TypeOf((*DvsPortEnteredPassthruEvent)(nil)).Elem()
+}
+
+type DvsPortExitedPassthruEvent struct {
+	DvsEvent
+
+	PortKey     string        `xml:"portKey"`
+	RuntimeInfo *DVPortStatus `xml:"runtimeInfo,omitempty"`
+}
+
+func init() {
+	t["DvsPortExitedPassthruEvent"] = reflect.TypeOf((*DvsPortExitedPassthruEvent)(nil)).Elem()
+}
+
+type DvsPortJoinPortgroupEvent struct {
+	DvsEvent
+
+	PortKey       string `xml:"portKey"`
+	PortgroupKey  string `xml:"portgroupKey"`
+	PortgroupName string `xml:"portgroupName"`
+}
+
+func init() {
+	t["DvsPortJoinPortgroupEvent"] = reflect.TypeOf((*DvsPortJoinPortgroupEvent)(nil)).Elem()
+}
+
+type DvsPortLeavePortgroupEvent struct {
+	DvsEvent
+
+	PortKey       string `xml:"portKey"`
+	PortgroupKey  string `xml:"portgroupKey"`
+	PortgroupName string `xml:"portgroupName"`
+}
+
+func init() {
+	t["DvsPortLeavePortgroupEvent"] = reflect.TypeOf((*DvsPortLeavePortgroupEvent)(nil)).Elem()
+}
+
+type DvsPortLinkDownEvent struct {
+	DvsEvent
+
+	PortKey     string        `xml:"portKey"`
+	RuntimeInfo *DVPortStatus `xml:"runtimeInfo,omitempty"`
+}
+
+func init() {
+	t["DvsPortLinkDownEvent"] = reflect.TypeOf((*DvsPortLinkDownEvent)(nil)).Elem()
+}
+
+type DvsPortLinkUpEvent struct {
+	DvsEvent
+
+	PortKey     string        `xml:"portKey"`
+	RuntimeInfo *DVPortStatus `xml:"runtimeInfo,omitempty"`
+}
+
+func init() {
+	t["DvsPortLinkUpEvent"] = reflect.TypeOf((*DvsPortLinkUpEvent)(nil)).Elem()
+}
+
+type DvsPortReconfiguredEvent struct {
+	DvsEvent
+
+	PortKey       []string                   `xml:"portKey"`
+	ConfigChanges []ChangesInfoEventArgument `xml:"configChanges,omitempty"`
+}
+
+func init() {
+	t["DvsPortReconfiguredEvent"] = reflect.TypeOf((*DvsPortReconfiguredEvent)(nil)).Elem()
+}
+
+type DvsPortRuntimeChangeEvent struct {
+	DvsEvent
+
+	PortKey     string       `xml:"portKey"`
+	RuntimeInfo DVPortStatus `xml:"runtimeInfo"`
+}
+
+func init() {
+	t["DvsPortRuntimeChangeEvent"] = reflect.TypeOf((*DvsPortRuntimeChangeEvent)(nil)).Elem()
+}
+
+type DvsPortUnblockedEvent struct {
+	DvsEvent
+
+	PortKey        string        `xml:"portKey"`
+	RuntimeInfo    *DVPortStatus `xml:"runtimeInfo,omitempty"`
+	PrevBlockState string        `xml:"prevBlockState,omitempty"`
+}
+
+func init() {
+	t["DvsPortUnblockedEvent"] = reflect.TypeOf((*DvsPortUnblockedEvent)(nil)).Elem()
+}
+
+type DvsPortVendorSpecificStateChangeEvent struct {
+	DvsEvent
+
+	PortKey string `xml:"portKey"`
+}
+
+func init() {
+	t["DvsPortVendorSpecificStateChangeEvent"] = reflect.TypeOf((*DvsPortVendorSpecificStateChangeEvent)(nil)).Elem()
+}
+
+type DvsProfile struct {
+	ApplyProfile
+
+	Key    string              `xml:"key"`
+	Name   string              `xml:"name"`
+	Uplink []PnicUplinkProfile `xml:"uplink,omitempty"`
+}
+
+func init() {
+	t["DvsProfile"] = reflect.TypeOf((*DvsProfile)(nil)).Elem()
+}
+
+type DvsPuntNetworkRuleAction struct {
+	DvsNetworkRuleAction
+}
+
+func init() {
+	t["DvsPuntNetworkRuleAction"] = reflect.TypeOf((*DvsPuntNetworkRuleAction)(nil)).Elem()
+}
+
+type DvsRateLimitNetworkRuleAction struct {
+	DvsNetworkRuleAction
+
+	PacketsPerSecond int32 `xml:"packetsPerSecond"`
+}
+
+func init() {
+	t["DvsRateLimitNetworkRuleAction"] = reflect.TypeOf((*DvsRateLimitNetworkRuleAction)(nil)).Elem()
+}
+
+type DvsReconfigureVmVnicNetworkResourcePoolRequestType struct {
+	This       ManagedObjectReference            `xml:"_this"`
+	ConfigSpec []DvsVmVnicResourcePoolConfigSpec `xml:"configSpec"`
+}
+
+func init() {
+	t["DvsReconfigureVmVnicNetworkResourcePoolRequestType"] = reflect.TypeOf((*DvsReconfigureVmVnicNetworkResourcePoolRequestType)(nil)).Elem()
+}
+
+type DvsReconfigureVmVnicNetworkResourcePool_Task DvsReconfigureVmVnicNetworkResourcePoolRequestType
+
+func init() {
+	t["DvsReconfigureVmVnicNetworkResourcePool_Task"] = reflect.TypeOf((*DvsReconfigureVmVnicNetworkResourcePool_Task)(nil)).Elem()
+}
+
+type DvsReconfigureVmVnicNetworkResourcePool_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type DvsReconfiguredEvent struct {
+	DvsEvent
+
+	ConfigSpec    BaseDVSConfigSpec         `xml:"configSpec,typeattr"`
+	ConfigChanges *ChangesInfoEventArgument `xml:"configChanges,omitempty"`
+}
+
+func init() {
+	t["DvsReconfiguredEvent"] = reflect.TypeOf((*DvsReconfiguredEvent)(nil)).Elem()
+}
+
+type DvsRenamedEvent struct {
+	DvsEvent
+
+	OldName string `xml:"oldName"`
+	NewName string `xml:"newName"`
+}
+
+func init() {
+	t["DvsRenamedEvent"] = reflect.TypeOf((*DvsRenamedEvent)(nil)).Elem()
+}
+
+type DvsResourceRuntimeInfo struct {
+	DynamicData
+
+	Capacity                         int32                                     `xml:"capacity,omitempty"`
+	Usage                            int32                                     `xml:"usage,omitempty"`
+	Available                        int32                                     `xml:"available,omitempty"`
+	AllocatedResource                []DvsVnicAllocatedResource                `xml:"allocatedResource,omitempty"`
+	VmVnicNetworkResourcePoolRuntime []DvsVmVnicNetworkResourcePoolRuntimeInfo `xml:"vmVnicNetworkResourcePoolRuntime,omitempty"`
+}
+
+func init() {
+	t["DvsResourceRuntimeInfo"] = reflect.TypeOf((*DvsResourceRuntimeInfo)(nil)).Elem()
+}
+
+type DvsRestoreEvent struct {
+	DvsEvent
+}
+
+func init() {
+	t["DvsRestoreEvent"] = reflect.TypeOf((*DvsRestoreEvent)(nil)).Elem()
+}
+
+type DvsScopeViolated struct {
+	DvsFault
+
+	Scope  []ManagedObjectReference `xml:"scope"`
+	Entity ManagedObjectReference   `xml:"entity"`
+}
+
+func init() {
+	t["DvsScopeViolated"] = reflect.TypeOf((*DvsScopeViolated)(nil)).Elem()
+}
+
+type DvsScopeViolatedFault DvsScopeViolated
+
+func init() {
+	t["DvsScopeViolatedFault"] = reflect.TypeOf((*DvsScopeViolatedFault)(nil)).Elem()
+}
+
+type DvsServiceConsoleVNicProfile struct {
+	DvsVNicProfile
+}
+
+func init() {
+	t["DvsServiceConsoleVNicProfile"] = reflect.TypeOf((*DvsServiceConsoleVNicProfile)(nil)).Elem()
+}
+
+type DvsSingleIpPort struct {
+	DvsIpPort
+
+	PortNumber int32 `xml:"portNumber"`
+}
+
+func init() {
+	t["DvsSingleIpPort"] = reflect.TypeOf((*DvsSingleIpPort)(nil)).Elem()
+}
+
+type DvsSystemTrafficNetworkRuleQualifier struct {
+	DvsNetworkRuleQualifier
+
+	TypeOfSystemTraffic *StringExpression `xml:"typeOfSystemTraffic,omitempty"`
+}
+
+func init() {
+	t["DvsSystemTrafficNetworkRuleQualifier"] = reflect.TypeOf((*DvsSystemTrafficNetworkRuleQualifier)(nil)).Elem()
+}
+
+type DvsTrafficFilterConfig struct {
+	DvsFilterConfig
+
+	TrafficRuleset *DvsTrafficRuleset `xml:"trafficRuleset,omitempty"`
+}
+
+func init() {
+	t["DvsTrafficFilterConfig"] = reflect.TypeOf((*DvsTrafficFilterConfig)(nil)).Elem()
+}
+
+type DvsTrafficFilterConfigSpec struct {
+	DvsTrafficFilterConfig
+
+	Operation string `xml:"operation"`
+}
+
+func init() {
+	t["DvsTrafficFilterConfigSpec"] = reflect.TypeOf((*DvsTrafficFilterConfigSpec)(nil)).Elem()
+}
+
+type DvsTrafficRule struct {
+	DynamicData
+
+	Key         string                        `xml:"key,omitempty"`
+	Description string                        `xml:"description,omitempty"`
+	Sequence    int32                         `xml:"sequence,omitempty"`
+	Qualifier   []BaseDvsNetworkRuleQualifier `xml:"qualifier,omitempty,typeattr"`
+	Action      BaseDvsNetworkRuleAction      `xml:"action,omitempty,typeattr"`
+	Direction   string                        `xml:"direction,omitempty"`
+}
+
+func init() {
+	t["DvsTrafficRule"] = reflect.TypeOf((*DvsTrafficRule)(nil)).Elem()
+}
+
+type DvsTrafficRuleset struct {
+	DynamicData
+
+	Key        string           `xml:"key,omitempty"`
+	Enabled    *bool            `xml:"enabled"`
+	Precedence int32            `xml:"precedence,omitempty"`
+	Rules      []DvsTrafficRule `xml:"rules,omitempty"`
+}
+
+func init() {
+	t["DvsTrafficRuleset"] = reflect.TypeOf((*DvsTrafficRuleset)(nil)).Elem()
+}
+
+type DvsUpdateTagNetworkRuleAction struct {
+	DvsNetworkRuleAction
+
+	QosTag  int32 `xml:"qosTag,omitempty"`
+	DscpTag int32 `xml:"dscpTag,omitempty"`
+}
+
+func init() {
+	t["DvsUpdateTagNetworkRuleAction"] = reflect.TypeOf((*DvsUpdateTagNetworkRuleAction)(nil)).Elem()
+}
+
+type DvsUpgradeAvailableEvent struct {
+	DvsEvent
+
+	ProductInfo DistributedVirtualSwitchProductSpec `xml:"productInfo"`
+}
+
+func init() {
+	t["DvsUpgradeAvailableEvent"] = reflect.TypeOf((*DvsUpgradeAvailableEvent)(nil)).Elem()
+}
+
+type DvsUpgradeInProgressEvent struct {
+	DvsEvent
+
+	ProductInfo DistributedVirtualSwitchProductSpec `xml:"productInfo"`
+}
+
+func init() {
+	t["DvsUpgradeInProgressEvent"] = reflect.TypeOf((*DvsUpgradeInProgressEvent)(nil)).Elem()
+}
+
+type DvsUpgradeRejectedEvent struct {
+	DvsEvent
+
+	ProductInfo DistributedVirtualSwitchProductSpec `xml:"productInfo"`
+}
+
+func init() {
+	t["DvsUpgradeRejectedEvent"] = reflect.TypeOf((*DvsUpgradeRejectedEvent)(nil)).Elem()
+}
+
+type DvsUpgradedEvent struct {
+	DvsEvent
+
+	ProductInfo DistributedVirtualSwitchProductSpec `xml:"productInfo"`
+}
+
+func init() {
+	t["DvsUpgradedEvent"] = reflect.TypeOf((*DvsUpgradedEvent)(nil)).Elem()
+}
+
+type DvsVNicProfile struct {
+	ApplyProfile
+
+	Key      string           `xml:"key"`
+	IpConfig IpAddressProfile `xml:"ipConfig"`
+}
+
+func init() {
+	t["DvsVNicProfile"] = reflect.TypeOf((*DvsVNicProfile)(nil)).Elem()
+}
+
+type DvsVmVnicNetworkResourcePoolRuntimeInfo struct {
+	DynamicData
+
+	Key               string                     `xml:"key"`
+	Name              string                     `xml:"name,omitempty"`
+	Capacity          int32                      `xml:"capacity,omitempty"`
+	Usage             int32                      `xml:"usage,omitempty"`
+	Available         int32                      `xml:"available,omitempty"`
+	Status            string                     `xml:"status"`
+	AllocatedResource []DvsVnicAllocatedResource `xml:"allocatedResource,omitempty"`
+}
+
+func init() {
+	t["DvsVmVnicNetworkResourcePoolRuntimeInfo"] = reflect.TypeOf((*DvsVmVnicNetworkResourcePoolRuntimeInfo)(nil)).Elem()
+}
+
+type DvsVmVnicResourceAllocation struct {
+	DynamicData
+
+	ReservationQuota int64 `xml:"reservationQuota,omitempty"`
+}
+
+func init() {
+	t["DvsVmVnicResourceAllocation"] = reflect.TypeOf((*DvsVmVnicResourceAllocation)(nil)).Elem()
+}
+
+type DvsVmVnicResourcePoolConfigSpec struct {
+	DynamicData
+
+	Operation      string                       `xml:"operation"`
+	Key            string                       `xml:"key,omitempty"`
+	ConfigVersion  string                       `xml:"configVersion,omitempty"`
+	AllocationInfo *DvsVmVnicResourceAllocation `xml:"allocationInfo,omitempty"`
+	Name           string                       `xml:"name,omitempty"`
+	Description    string                       `xml:"description,omitempty"`
+}
+
+func init() {
+	t["DvsVmVnicResourcePoolConfigSpec"] = reflect.TypeOf((*DvsVmVnicResourcePoolConfigSpec)(nil)).Elem()
+}
+
+type DvsVnicAllocatedResource struct {
+	DynamicData
+
+	Vm          ManagedObjectReference `xml:"vm"`
+	VnicKey     string                 `xml:"vnicKey"`
+	Reservation int64                  `xml:"reservation,omitempty"`
+}
+
+func init() {
+	t["DvsVnicAllocatedResource"] = reflect.TypeOf((*DvsVnicAllocatedResource)(nil)).Elem()
+}
+
+type DynamicArray struct {
+	Val []AnyType `xml:"val,typeattr"`
+}
+
+func init() {
+	t["DynamicArray"] = reflect.TypeOf((*DynamicArray)(nil)).Elem()
+}
+
+type DynamicData struct {
+}
+
+func init() {
+	t["DynamicData"] = reflect.TypeOf((*DynamicData)(nil)).Elem()
+}
+
+type DynamicProperty struct {
+	Name string  `xml:"name"`
+	Val  AnyType `xml:"val,typeattr"`
+}
+
+func init() {
+	t["DynamicProperty"] = reflect.TypeOf((*DynamicProperty)(nil)).Elem()
+}
+
+type EVCAdmissionFailed struct {
+	NotSupportedHostInCluster
+
+	Faults []LocalizedMethodFault `xml:"faults,omitempty"`
+}
+
+func init() {
+	t["EVCAdmissionFailed"] = reflect.TypeOf((*EVCAdmissionFailed)(nil)).Elem()
+}
+
+type EVCAdmissionFailedCPUFeaturesForMode struct {
+	EVCAdmissionFailed
+
+	CurrentEVCModeKey string `xml:"currentEVCModeKey"`
+}
+
+func init() {
+	t["EVCAdmissionFailedCPUFeaturesForMode"] = reflect.TypeOf((*EVCAdmissionFailedCPUFeaturesForMode)(nil)).Elem()
+}
+
+type EVCAdmissionFailedCPUFeaturesForModeFault EVCAdmissionFailedCPUFeaturesForMode
+
+func init() {
+	t["EVCAdmissionFailedCPUFeaturesForModeFault"] = reflect.TypeOf((*EVCAdmissionFailedCPUFeaturesForModeFault)(nil)).Elem()
+}
+
+type EVCAdmissionFailedCPUModel struct {
+	EVCAdmissionFailed
+}
+
+func init() {
+	t["EVCAdmissionFailedCPUModel"] = reflect.TypeOf((*EVCAdmissionFailedCPUModel)(nil)).Elem()
+}
+
+type EVCAdmissionFailedCPUModelFault EVCAdmissionFailedCPUModel
+
+func init() {
+	t["EVCAdmissionFailedCPUModelFault"] = reflect.TypeOf((*EVCAdmissionFailedCPUModelFault)(nil)).Elem()
+}
+
+type EVCAdmissionFailedCPUModelForMode struct {
+	EVCAdmissionFailed
+
+	CurrentEVCModeKey string `xml:"currentEVCModeKey"`
+}
+
+func init() {
+	t["EVCAdmissionFailedCPUModelForMode"] = reflect.TypeOf((*EVCAdmissionFailedCPUModelForMode)(nil)).Elem()
+}
+
+type EVCAdmissionFailedCPUModelForModeFault EVCAdmissionFailedCPUModelForMode
+
+func init() {
+	t["EVCAdmissionFailedCPUModelForModeFault"] = reflect.TypeOf((*EVCAdmissionFailedCPUModelForModeFault)(nil)).Elem()
+}
+
+type EVCAdmissionFailedCPUVendor struct {
+	EVCAdmissionFailed
+
+	ClusterCPUVendor string `xml:"clusterCPUVendor"`
+	HostCPUVendor    string `xml:"hostCPUVendor"`
+}
+
+func init() {
+	t["EVCAdmissionFailedCPUVendor"] = reflect.TypeOf((*EVCAdmissionFailedCPUVendor)(nil)).Elem()
+}
+
+type EVCAdmissionFailedCPUVendorFault EVCAdmissionFailedCPUVendor
+
+func init() {
+	t["EVCAdmissionFailedCPUVendorFault"] = reflect.TypeOf((*EVCAdmissionFailedCPUVendorFault)(nil)).Elem()
+}
+
+type EVCAdmissionFailedCPUVendorUnknown struct {
+	EVCAdmissionFailed
+}
+
+func init() {
+	t["EVCAdmissionFailedCPUVendorUnknown"] = reflect.TypeOf((*EVCAdmissionFailedCPUVendorUnknown)(nil)).Elem()
+}
+
+type EVCAdmissionFailedCPUVendorUnknownFault EVCAdmissionFailedCPUVendorUnknown
+
+func init() {
+	t["EVCAdmissionFailedCPUVendorUnknownFault"] = reflect.TypeOf((*EVCAdmissionFailedCPUVendorUnknownFault)(nil)).Elem()
+}
+
+type EVCAdmissionFailedFault BaseEVCAdmissionFailed
+
+func init() {
+	t["EVCAdmissionFailedFault"] = reflect.TypeOf((*EVCAdmissionFailedFault)(nil)).Elem()
+}
+
+type EVCAdmissionFailedHostDisconnected struct {
+	EVCAdmissionFailed
+}
+
+func init() {
+	t["EVCAdmissionFailedHostDisconnected"] = reflect.TypeOf((*EVCAdmissionFailedHostDisconnected)(nil)).Elem()
+}
+
+type EVCAdmissionFailedHostDisconnectedFault EVCAdmissionFailedHostDisconnected
+
+func init() {
+	t["EVCAdmissionFailedHostDisconnectedFault"] = reflect.TypeOf((*EVCAdmissionFailedHostDisconnectedFault)(nil)).Elem()
+}
+
+type EVCAdmissionFailedHostSoftware struct {
+	EVCAdmissionFailed
+}
+
+func init() {
+	t["EVCAdmissionFailedHostSoftware"] = reflect.TypeOf((*EVCAdmissionFailedHostSoftware)(nil)).Elem()
+}
+
+type EVCAdmissionFailedHostSoftwareFault EVCAdmissionFailedHostSoftware
+
+func init() {
+	t["EVCAdmissionFailedHostSoftwareFault"] = reflect.TypeOf((*EVCAdmissionFailedHostSoftwareFault)(nil)).Elem()
+}
+
+type EVCAdmissionFailedHostSoftwareForMode struct {
+	EVCAdmissionFailed
+}
+
+func init() {
+	t["EVCAdmissionFailedHostSoftwareForMode"] = reflect.TypeOf((*EVCAdmissionFailedHostSoftwareForMode)(nil)).Elem()
+}
+
+type EVCAdmissionFailedHostSoftwareForModeFault EVCAdmissionFailedHostSoftwareForMode
+
+func init() {
+	t["EVCAdmissionFailedHostSoftwareForModeFault"] = reflect.TypeOf((*EVCAdmissionFailedHostSoftwareForModeFault)(nil)).Elem()
+}
+
+type EVCAdmissionFailedVmActive struct {
+	EVCAdmissionFailed
+}
+
+func init() {
+	t["EVCAdmissionFailedVmActive"] = reflect.TypeOf((*EVCAdmissionFailedVmActive)(nil)).Elem()
+}
+
+type EVCAdmissionFailedVmActiveFault EVCAdmissionFailedVmActive
+
+func init() {
+	t["EVCAdmissionFailedVmActiveFault"] = reflect.TypeOf((*EVCAdmissionFailedVmActiveFault)(nil)).Elem()
+}
+
+type EVCConfigFault struct {
+	VimFault
+
+	Faults []LocalizedMethodFault `xml:"faults,omitempty"`
+}
+
+func init() {
+	t["EVCConfigFault"] = reflect.TypeOf((*EVCConfigFault)(nil)).Elem()
+}
+
+type EVCConfigFaultFault BaseEVCConfigFault
+
+func init() {
+	t["EVCConfigFaultFault"] = reflect.TypeOf((*EVCConfigFaultFault)(nil)).Elem()
+}
+
+type EVCMode struct {
+	ElementDescription
+
+	GuaranteedCPUFeatures []HostCpuIdInfo                    `xml:"guaranteedCPUFeatures,omitempty"`
+	FeatureCapability     []HostFeatureCapability            `xml:"featureCapability,omitempty"`
+	FeatureMask           []HostFeatureMask                  `xml:"featureMask,omitempty"`
+	FeatureRequirement    []VirtualMachineFeatureRequirement `xml:"featureRequirement,omitempty"`
+	Vendor                string                             `xml:"vendor"`
+	Track                 []string                           `xml:"track,omitempty"`
+	VendorTier            int32                              `xml:"vendorTier"`
+}
+
+func init() {
+	t["EVCMode"] = reflect.TypeOf((*EVCMode)(nil)).Elem()
+}
+
+type EVCModeIllegalByVendor struct {
+	EVCConfigFault
+
+	ClusterCPUVendor string `xml:"clusterCPUVendor"`
+	ModeCPUVendor    string `xml:"modeCPUVendor"`
+}
+
+func init() {
+	t["EVCModeIllegalByVendor"] = reflect.TypeOf((*EVCModeIllegalByVendor)(nil)).Elem()
+}
+
+type EVCModeIllegalByVendorFault EVCModeIllegalByVendor
+
+func init() {
+	t["EVCModeIllegalByVendorFault"] = reflect.TypeOf((*EVCModeIllegalByVendorFault)(nil)).Elem()
+}
+
+type EVCModeUnsupportedByHosts struct {
+	EVCConfigFault
+
+	EvcMode  string                   `xml:"evcMode,omitempty"`
+	Host     []ManagedObjectReference `xml:"host,omitempty"`
+	HostName []string                 `xml:"hostName,omitempty"`
+}
+
+func init() {
+	t["EVCModeUnsupportedByHosts"] = reflect.TypeOf((*EVCModeUnsupportedByHosts)(nil)).Elem()
+}
+
+type EVCModeUnsupportedByHostsFault EVCModeUnsupportedByHosts
+
+func init() {
+	t["EVCModeUnsupportedByHostsFault"] = reflect.TypeOf((*EVCModeUnsupportedByHostsFault)(nil)).Elem()
+}
+
+type EVCUnsupportedByHostHardware struct {
+	EVCConfigFault
+
+	Host     []ManagedObjectReference `xml:"host"`
+	HostName []string                 `xml:"hostName"`
+}
+
+func init() {
+	t["EVCUnsupportedByHostHardware"] = reflect.TypeOf((*EVCUnsupportedByHostHardware)(nil)).Elem()
+}
+
+type EVCUnsupportedByHostHardwareFault EVCUnsupportedByHostHardware
+
+func init() {
+	t["EVCUnsupportedByHostHardwareFault"] = reflect.TypeOf((*EVCUnsupportedByHostHardwareFault)(nil)).Elem()
+}
+
+type EVCUnsupportedByHostSoftware struct {
+	EVCConfigFault
+
+	Host     []ManagedObjectReference `xml:"host"`
+	HostName []string                 `xml:"hostName"`
+}
+
+func init() {
+	t["EVCUnsupportedByHostSoftware"] = reflect.TypeOf((*EVCUnsupportedByHostSoftware)(nil)).Elem()
+}
+
+type EVCUnsupportedByHostSoftwareFault EVCUnsupportedByHostSoftware
+
+func init() {
+	t["EVCUnsupportedByHostSoftwareFault"] = reflect.TypeOf((*EVCUnsupportedByHostSoftwareFault)(nil)).Elem()
+}
+
+type EagerZeroVirtualDiskRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Name       string                  `xml:"name"`
+	Datacenter *ManagedObjectReference `xml:"datacenter,omitempty"`
+}
+
+func init() {
+	t["EagerZeroVirtualDiskRequestType"] = reflect.TypeOf((*EagerZeroVirtualDiskRequestType)(nil)).Elem()
+}
+
+type EagerZeroVirtualDisk_Task EagerZeroVirtualDiskRequestType
+
+func init() {
+	t["EagerZeroVirtualDisk_Task"] = reflect.TypeOf((*EagerZeroVirtualDisk_Task)(nil)).Elem()
+}
+
+type EagerZeroVirtualDisk_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type EightHostLimitViolated struct {
+	VmConfigFault
+}
+
+func init() {
+	t["EightHostLimitViolated"] = reflect.TypeOf((*EightHostLimitViolated)(nil)).Elem()
+}
+
+type EightHostLimitViolatedFault EightHostLimitViolated
+
+func init() {
+	t["EightHostLimitViolatedFault"] = reflect.TypeOf((*EightHostLimitViolatedFault)(nil)).Elem()
+}
+
+type ElementDescription struct {
+	Description
+
+	Key string `xml:"key"`
+}
+
+func init() {
+	t["ElementDescription"] = reflect.TypeOf((*ElementDescription)(nil)).Elem()
+}
+
+type EnableAlarmActions EnableAlarmActionsRequestType
+
+func init() {
+	t["EnableAlarmActions"] = reflect.TypeOf((*EnableAlarmActions)(nil)).Elem()
+}
+
+type EnableAlarmActionsRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Entity  ManagedObjectReference `xml:"entity"`
+	Enabled bool                   `xml:"enabled"`
+}
+
+func init() {
+	t["EnableAlarmActionsRequestType"] = reflect.TypeOf((*EnableAlarmActionsRequestType)(nil)).Elem()
+}
+
+type EnableAlarmActionsResponse struct {
+}
+
+type EnableCrypto EnableCryptoRequestType
+
+func init() {
+	t["EnableCrypto"] = reflect.TypeOf((*EnableCrypto)(nil)).Elem()
+}
+
+type EnableCryptoRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	KeyPlain CryptoKeyPlain         `xml:"keyPlain"`
+}
+
+func init() {
+	t["EnableCryptoRequestType"] = reflect.TypeOf((*EnableCryptoRequestType)(nil)).Elem()
+}
+
+type EnableCryptoResponse struct {
+}
+
+type EnableFeature EnableFeatureRequestType
+
+func init() {
+	t["EnableFeature"] = reflect.TypeOf((*EnableFeature)(nil)).Elem()
+}
+
+type EnableFeatureRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Host       *ManagedObjectReference `xml:"host,omitempty"`
+	FeatureKey string                  `xml:"featureKey"`
+}
+
+func init() {
+	t["EnableFeatureRequestType"] = reflect.TypeOf((*EnableFeatureRequestType)(nil)).Elem()
+}
+
+type EnableFeatureResponse struct {
+	Returnval bool `xml:"returnval"`
+}
+
+type EnableHyperThreading EnableHyperThreadingRequestType
+
+func init() {
+	t["EnableHyperThreading"] = reflect.TypeOf((*EnableHyperThreading)(nil)).Elem()
+}
+
+type EnableHyperThreadingRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["EnableHyperThreadingRequestType"] = reflect.TypeOf((*EnableHyperThreadingRequestType)(nil)).Elem()
+}
+
+type EnableHyperThreadingResponse struct {
+}
+
+type EnableMultipathPath EnableMultipathPathRequestType
+
+func init() {
+	t["EnableMultipathPath"] = reflect.TypeOf((*EnableMultipathPath)(nil)).Elem()
+}
+
+type EnableMultipathPathRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	PathName string                 `xml:"pathName"`
+}
+
+func init() {
+	t["EnableMultipathPathRequestType"] = reflect.TypeOf((*EnableMultipathPathRequestType)(nil)).Elem()
+}
+
+type EnableMultipathPathResponse struct {
+}
+
+type EnableNetworkResourceManagement EnableNetworkResourceManagementRequestType
+
+func init() {
+	t["EnableNetworkResourceManagement"] = reflect.TypeOf((*EnableNetworkResourceManagement)(nil)).Elem()
+}
+
+type EnableNetworkResourceManagementRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Enable bool                   `xml:"enable"`
+}
+
+func init() {
+	t["EnableNetworkResourceManagementRequestType"] = reflect.TypeOf((*EnableNetworkResourceManagementRequestType)(nil)).Elem()
+}
+
+type EnableNetworkResourceManagementResponse struct {
+}
+
+type EnableRuleset EnableRulesetRequestType
+
+func init() {
+	t["EnableRuleset"] = reflect.TypeOf((*EnableRuleset)(nil)).Elem()
+}
+
+type EnableRulesetRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Id   string                 `xml:"id"`
+}
+
+func init() {
+	t["EnableRulesetRequestType"] = reflect.TypeOf((*EnableRulesetRequestType)(nil)).Elem()
+}
+
+type EnableRulesetResponse struct {
+}
+
+type EnableSecondaryVMRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Vm   ManagedObjectReference  `xml:"vm"`
+	Host *ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["EnableSecondaryVMRequestType"] = reflect.TypeOf((*EnableSecondaryVMRequestType)(nil)).Elem()
+}
+
+type EnableSecondaryVM_Task EnableSecondaryVMRequestType
+
+func init() {
+	t["EnableSecondaryVM_Task"] = reflect.TypeOf((*EnableSecondaryVM_Task)(nil)).Elem()
+}
+
+type EnableSecondaryVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type EnableSmartCardAuthentication EnableSmartCardAuthenticationRequestType
+
+func init() {
+	t["EnableSmartCardAuthentication"] = reflect.TypeOf((*EnableSmartCardAuthentication)(nil)).Elem()
+}
+
+type EnableSmartCardAuthenticationRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["EnableSmartCardAuthenticationRequestType"] = reflect.TypeOf((*EnableSmartCardAuthenticationRequestType)(nil)).Elem()
+}
+
+type EnableSmartCardAuthenticationResponse struct {
+}
+
+type EnterLockdownMode EnterLockdownModeRequestType
+
+func init() {
+	t["EnterLockdownMode"] = reflect.TypeOf((*EnterLockdownMode)(nil)).Elem()
+}
+
+type EnterLockdownModeRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["EnterLockdownModeRequestType"] = reflect.TypeOf((*EnterLockdownModeRequestType)(nil)).Elem()
+}
+
+type EnterLockdownModeResponse struct {
+}
+
+type EnterMaintenanceModeRequestType struct {
+	This                  ManagedObjectReference `xml:"_this"`
+	Timeout               int32                  `xml:"timeout"`
+	EvacuatePoweredOffVms *bool                  `xml:"evacuatePoweredOffVms"`
+	MaintenanceSpec       *HostMaintenanceSpec   `xml:"maintenanceSpec,omitempty"`
+}
+
+func init() {
+	t["EnterMaintenanceModeRequestType"] = reflect.TypeOf((*EnterMaintenanceModeRequestType)(nil)).Elem()
+}
+
+type EnterMaintenanceMode_Task EnterMaintenanceModeRequestType
+
+func init() {
+	t["EnterMaintenanceMode_Task"] = reflect.TypeOf((*EnterMaintenanceMode_Task)(nil)).Elem()
+}
+
+type EnterMaintenanceMode_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type EnteredMaintenanceModeEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["EnteredMaintenanceModeEvent"] = reflect.TypeOf((*EnteredMaintenanceModeEvent)(nil)).Elem()
+}
+
+type EnteredStandbyModeEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["EnteredStandbyModeEvent"] = reflect.TypeOf((*EnteredStandbyModeEvent)(nil)).Elem()
+}
+
+type EnteringMaintenanceModeEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["EnteringMaintenanceModeEvent"] = reflect.TypeOf((*EnteringMaintenanceModeEvent)(nil)).Elem()
+}
+
+type EnteringStandbyModeEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["EnteringStandbyModeEvent"] = reflect.TypeOf((*EnteringStandbyModeEvent)(nil)).Elem()
+}
+
+type EntityBackup struct {
+	DynamicData
+}
+
+func init() {
+	t["EntityBackup"] = reflect.TypeOf((*EntityBackup)(nil)).Elem()
+}
+
+type EntityBackupConfig struct {
+	DynamicData
+
+	EntityType    string                  `xml:"entityType"`
+	ConfigBlob    []byte                  `xml:"configBlob"`
+	Key           string                  `xml:"key,omitempty"`
+	Name          string                  `xml:"name,omitempty"`
+	Container     *ManagedObjectReference `xml:"container,omitempty"`
+	ConfigVersion string                  `xml:"configVersion,omitempty"`
+}
+
+func init() {
+	t["EntityBackupConfig"] = reflect.TypeOf((*EntityBackupConfig)(nil)).Elem()
+}
+
+type EntityEventArgument struct {
+	EventArgument
+
+	Name string `xml:"name"`
+}
+
+func init() {
+	t["EntityEventArgument"] = reflect.TypeOf((*EntityEventArgument)(nil)).Elem()
+}
+
+type EntityPrivilege struct {
+	DynamicData
+
+	Entity           ManagedObjectReference  `xml:"entity"`
+	PrivAvailability []PrivilegeAvailability `xml:"privAvailability"`
+}
+
+func init() {
+	t["EntityPrivilege"] = reflect.TypeOf((*EntityPrivilege)(nil)).Elem()
+}
+
+type EnumDescription struct {
+	DynamicData
+
+	Key  string                   `xml:"key"`
+	Tags []BaseElementDescription `xml:"tags,typeattr"`
+}
+
+func init() {
+	t["EnumDescription"] = reflect.TypeOf((*EnumDescription)(nil)).Elem()
+}
+
+type EnvironmentBrowserConfigOptionQuerySpec struct {
+	DynamicData
+
+	Key     string                  `xml:"key,omitempty"`
+	Host    *ManagedObjectReference `xml:"host,omitempty"`
+	GuestId []string                `xml:"guestId,omitempty"`
+}
+
+func init() {
+	t["EnvironmentBrowserConfigOptionQuerySpec"] = reflect.TypeOf((*EnvironmentBrowserConfigOptionQuerySpec)(nil)).Elem()
+}
+
+type ErrorUpgradeEvent struct {
+	UpgradeEvent
+}
+
+func init() {
+	t["ErrorUpgradeEvent"] = reflect.TypeOf((*ErrorUpgradeEvent)(nil)).Elem()
+}
+
+type EstimateDatabaseSize EstimateDatabaseSizeRequestType
+
+func init() {
+	t["EstimateDatabaseSize"] = reflect.TypeOf((*EstimateDatabaseSize)(nil)).Elem()
+}
+
+type EstimateDatabaseSizeRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	DbSizeParam DatabaseSizeParam      `xml:"dbSizeParam"`
+}
+
+func init() {
+	t["EstimateDatabaseSizeRequestType"] = reflect.TypeOf((*EstimateDatabaseSizeRequestType)(nil)).Elem()
+}
+
+type EstimateDatabaseSizeResponse struct {
+	Returnval DatabaseSizeEstimate `xml:"returnval"`
+}
+
+type EstimateStorageForConsolidateSnapshotsRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["EstimateStorageForConsolidateSnapshotsRequestType"] = reflect.TypeOf((*EstimateStorageForConsolidateSnapshotsRequestType)(nil)).Elem()
+}
+
+type EstimateStorageForConsolidateSnapshots_Task EstimateStorageForConsolidateSnapshotsRequestType
+
+func init() {
+	t["EstimateStorageForConsolidateSnapshots_Task"] = reflect.TypeOf((*EstimateStorageForConsolidateSnapshots_Task)(nil)).Elem()
+}
+
+type EstimateStorageForConsolidateSnapshots_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type EsxAgentHostManagerUpdateConfig EsxAgentHostManagerUpdateConfigRequestType
+
+func init() {
+	t["EsxAgentHostManagerUpdateConfig"] = reflect.TypeOf((*EsxAgentHostManagerUpdateConfig)(nil)).Elem()
+}
+
+type EsxAgentHostManagerUpdateConfigRequestType struct {
+	This       ManagedObjectReference            `xml:"_this"`
+	ConfigInfo HostEsxAgentHostManagerConfigInfo `xml:"configInfo"`
+}
+
+func init() {
+	t["EsxAgentHostManagerUpdateConfigRequestType"] = reflect.TypeOf((*EsxAgentHostManagerUpdateConfigRequestType)(nil)).Elem()
+}
+
+type EsxAgentHostManagerUpdateConfigResponse struct {
+}
+
+type EvacuateVsanNodeRequestType struct {
+	This            ManagedObjectReference `xml:"_this"`
+	MaintenanceSpec HostMaintenanceSpec    `xml:"maintenanceSpec"`
+	Timeout         int32                  `xml:"timeout"`
+}
+
+func init() {
+	t["EvacuateVsanNodeRequestType"] = reflect.TypeOf((*EvacuateVsanNodeRequestType)(nil)).Elem()
+}
+
+type EvacuateVsanNode_Task EvacuateVsanNodeRequestType
+
+func init() {
+	t["EvacuateVsanNode_Task"] = reflect.TypeOf((*EvacuateVsanNode_Task)(nil)).Elem()
+}
+
+type EvacuateVsanNode_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type EvaluationLicenseSource struct {
+	LicenseSource
+
+	RemainingHours int64 `xml:"remainingHours,omitempty"`
+}
+
+func init() {
+	t["EvaluationLicenseSource"] = reflect.TypeOf((*EvaluationLicenseSource)(nil)).Elem()
+}
+
+type EvcManager EvcManagerRequestType
+
+func init() {
+	t["EvcManager"] = reflect.TypeOf((*EvcManager)(nil)).Elem()
+}
+
+type EvcManagerRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["EvcManagerRequestType"] = reflect.TypeOf((*EvcManagerRequestType)(nil)).Elem()
+}
+
+type EvcManagerResponse struct {
+	Returnval *ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type Event struct {
+	DynamicData
+
+	Key                  int32                         `xml:"key"`
+	ChainId              int32                         `xml:"chainId"`
+	CreatedTime          time.Time                     `xml:"createdTime"`
+	UserName             string                        `xml:"userName"`
+	Datacenter           *DatacenterEventArgument      `xml:"datacenter,omitempty"`
+	ComputeResource      *ComputeResourceEventArgument `xml:"computeResource,omitempty"`
+	Host                 *HostEventArgument            `xml:"host,omitempty"`
+	Vm                   *VmEventArgument              `xml:"vm,omitempty"`
+	Ds                   *DatastoreEventArgument       `xml:"ds,omitempty"`
+	Net                  *NetworkEventArgument         `xml:"net,omitempty"`
+	Dvs                  *DvsEventArgument             `xml:"dvs,omitempty"`
+	FullFormattedMessage string                        `xml:"fullFormattedMessage,omitempty"`
+	ChangeTag            string                        `xml:"changeTag,omitempty"`
+}
+
+func init() {
+	t["Event"] = reflect.TypeOf((*Event)(nil)).Elem()
+}
+
+type EventAlarmExpression struct {
+	AlarmExpression
+
+	Comparisons []EventAlarmExpressionComparison `xml:"comparisons,omitempty"`
+	EventType   string                           `xml:"eventType"`
+	EventTypeId string                           `xml:"eventTypeId,omitempty"`
+	ObjectType  string                           `xml:"objectType,omitempty"`
+	Status      ManagedEntityStatus              `xml:"status,omitempty"`
+}
+
+func init() {
+	t["EventAlarmExpression"] = reflect.TypeOf((*EventAlarmExpression)(nil)).Elem()
+}
+
+type EventAlarmExpressionComparison struct {
+	DynamicData
+
+	AttributeName string `xml:"attributeName"`
+	Operator      string `xml:"operator"`
+	Value         string `xml:"value"`
+}
+
+func init() {
+	t["EventAlarmExpressionComparison"] = reflect.TypeOf((*EventAlarmExpressionComparison)(nil)).Elem()
+}
+
+type EventArgDesc struct {
+	DynamicData
+
+	Name        string                 `xml:"name"`
+	Type        string                 `xml:"type"`
+	Description BaseElementDescription `xml:"description,omitempty,typeattr"`
+}
+
+func init() {
+	t["EventArgDesc"] = reflect.TypeOf((*EventArgDesc)(nil)).Elem()
+}
+
+type EventArgument struct {
+	DynamicData
+}
+
+func init() {
+	t["EventArgument"] = reflect.TypeOf((*EventArgument)(nil)).Elem()
+}
+
+type EventDescription struct {
+	DynamicData
+
+	Category        []BaseElementDescription      `xml:"category,typeattr"`
+	EventInfo       []EventDescriptionEventDetail `xml:"eventInfo"`
+	EnumeratedTypes []EnumDescription             `xml:"enumeratedTypes,omitempty"`
+}
+
+func init() {
+	t["EventDescription"] = reflect.TypeOf((*EventDescription)(nil)).Elem()
+}
+
+type EventDescriptionEventDetail struct {
+	DynamicData
+
+	Key                     string `xml:"key"`
+	Description             string `xml:"description,omitempty"`
+	Category                string `xml:"category"`
+	FormatOnDatacenter      string `xml:"formatOnDatacenter"`
+	FormatOnComputeResource string `xml:"formatOnComputeResource"`
+	FormatOnHost            string `xml:"formatOnHost"`
+	FormatOnVm              string `xml:"formatOnVm"`
+	FullFormat              string `xml:"fullFormat"`
+	LongDescription         string `xml:"longDescription,omitempty"`
+}
+
+func init() {
+	t["EventDescriptionEventDetail"] = reflect.TypeOf((*EventDescriptionEventDetail)(nil)).Elem()
+}
+
+type EventEx struct {
+	Event
+
+	EventTypeId string                `xml:"eventTypeId"`
+	Severity    string                `xml:"severity,omitempty"`
+	Message     string                `xml:"message,omitempty"`
+	Arguments   []KeyAnyValue         `xml:"arguments,omitempty"`
+	ObjectId    string                `xml:"objectId,omitempty"`
+	ObjectType  string                `xml:"objectType,omitempty"`
+	ObjectName  string                `xml:"objectName,omitempty"`
+	Fault       *LocalizedMethodFault `xml:"fault,omitempty"`
+}
+
+func init() {
+	t["EventEx"] = reflect.TypeOf((*EventEx)(nil)).Elem()
+}
+
+type EventFilterSpec struct {
+	DynamicData
+
+	Entity             *EventFilterSpecByEntity   `xml:"entity,omitempty"`
+	Time               *EventFilterSpecByTime     `xml:"time,omitempty"`
+	UserName           *EventFilterSpecByUsername `xml:"userName,omitempty"`
+	EventChainId       int32                      `xml:"eventChainId,omitempty"`
+	Alarm              *ManagedObjectReference    `xml:"alarm,omitempty"`
+	ScheduledTask      *ManagedObjectReference    `xml:"scheduledTask,omitempty"`
+	DisableFullMessage *bool                      `xml:"disableFullMessage"`
+	Category           []string                   `xml:"category,omitempty"`
+	Type               []string                   `xml:"type,omitempty"`
+	Tag                []string                   `xml:"tag,omitempty"`
+	EventTypeId        []string                   `xml:"eventTypeId,omitempty"`
+	MaxCount           int32                      `xml:"maxCount,omitempty"`
+}
+
+func init() {
+	t["EventFilterSpec"] = reflect.TypeOf((*EventFilterSpec)(nil)).Elem()
+}
+
+type EventFilterSpecByEntity struct {
+	DynamicData
+
+	Entity    ManagedObjectReference         `xml:"entity"`
+	Recursion EventFilterSpecRecursionOption `xml:"recursion"`
+}
+
+func init() {
+	t["EventFilterSpecByEntity"] = reflect.TypeOf((*EventFilterSpecByEntity)(nil)).Elem()
+}
+
+type EventFilterSpecByTime struct {
+	DynamicData
+
+	BeginTime *time.Time `xml:"beginTime"`
+	EndTime   *time.Time `xml:"endTime"`
+}
+
+func init() {
+	t["EventFilterSpecByTime"] = reflect.TypeOf((*EventFilterSpecByTime)(nil)).Elem()
+}
+
+type EventFilterSpecByUsername struct {
+	DynamicData
+
+	SystemUser bool     `xml:"systemUser"`
+	UserList   []string `xml:"userList,omitempty"`
+}
+
+func init() {
+	t["EventFilterSpecByUsername"] = reflect.TypeOf((*EventFilterSpecByUsername)(nil)).Elem()
+}
+
+type ExecuteHostProfile ExecuteHostProfileRequestType
+
+func init() {
+	t["ExecuteHostProfile"] = reflect.TypeOf((*ExecuteHostProfile)(nil)).Elem()
+}
+
+type ExecuteHostProfileRequestType struct {
+	This          ManagedObjectReference                 `xml:"_this"`
+	Host          ManagedObjectReference                 `xml:"host"`
+	DeferredParam []ProfileDeferredPolicyOptionParameter `xml:"deferredParam,omitempty"`
+}
+
+func init() {
+	t["ExecuteHostProfileRequestType"] = reflect.TypeOf((*ExecuteHostProfileRequestType)(nil)).Elem()
+}
+
+type ExecuteHostProfileResponse struct {
+	Returnval BaseProfileExecuteResult `xml:"returnval,typeattr"`
+}
+
+type ExecuteSimpleCommand ExecuteSimpleCommandRequestType
+
+func init() {
+	t["ExecuteSimpleCommand"] = reflect.TypeOf((*ExecuteSimpleCommand)(nil)).Elem()
+}
+
+type ExecuteSimpleCommandRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Arguments []string               `xml:"arguments,omitempty"`
+}
+
+func init() {
+	t["ExecuteSimpleCommandRequestType"] = reflect.TypeOf((*ExecuteSimpleCommandRequestType)(nil)).Elem()
+}
+
+type ExecuteSimpleCommandResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type ExitLockdownMode ExitLockdownModeRequestType
+
+func init() {
+	t["ExitLockdownMode"] = reflect.TypeOf((*ExitLockdownMode)(nil)).Elem()
+}
+
+type ExitLockdownModeRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["ExitLockdownModeRequestType"] = reflect.TypeOf((*ExitLockdownModeRequestType)(nil)).Elem()
+}
+
+type ExitLockdownModeResponse struct {
+}
+
+type ExitMaintenanceModeEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["ExitMaintenanceModeEvent"] = reflect.TypeOf((*ExitMaintenanceModeEvent)(nil)).Elem()
+}
+
+type ExitMaintenanceModeRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Timeout int32                  `xml:"timeout"`
+}
+
+func init() {
+	t["ExitMaintenanceModeRequestType"] = reflect.TypeOf((*ExitMaintenanceModeRequestType)(nil)).Elem()
+}
+
+type ExitMaintenanceMode_Task ExitMaintenanceModeRequestType
+
+func init() {
+	t["ExitMaintenanceMode_Task"] = reflect.TypeOf((*ExitMaintenanceMode_Task)(nil)).Elem()
+}
+
+type ExitMaintenanceMode_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ExitStandbyModeFailedEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["ExitStandbyModeFailedEvent"] = reflect.TypeOf((*ExitStandbyModeFailedEvent)(nil)).Elem()
+}
+
+type ExitedStandbyModeEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["ExitedStandbyModeEvent"] = reflect.TypeOf((*ExitedStandbyModeEvent)(nil)).Elem()
+}
+
+type ExitingStandbyModeEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["ExitingStandbyModeEvent"] = reflect.TypeOf((*ExitingStandbyModeEvent)(nil)).Elem()
+}
+
+type ExpandVmfsDatastore ExpandVmfsDatastoreRequestType
+
+func init() {
+	t["ExpandVmfsDatastore"] = reflect.TypeOf((*ExpandVmfsDatastore)(nil)).Elem()
+}
+
+type ExpandVmfsDatastoreRequestType struct {
+	This      ManagedObjectReference  `xml:"_this"`
+	Datastore ManagedObjectReference  `xml:"datastore"`
+	Spec      VmfsDatastoreExpandSpec `xml:"spec"`
+}
+
+func init() {
+	t["ExpandVmfsDatastoreRequestType"] = reflect.TypeOf((*ExpandVmfsDatastoreRequestType)(nil)).Elem()
+}
+
+type ExpandVmfsDatastoreResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ExpandVmfsExtent ExpandVmfsExtentRequestType
+
+func init() {
+	t["ExpandVmfsExtent"] = reflect.TypeOf((*ExpandVmfsExtent)(nil)).Elem()
+}
+
+type ExpandVmfsExtentRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	VmfsPath string                 `xml:"vmfsPath"`
+	Extent   HostScsiDiskPartition  `xml:"extent"`
+}
+
+func init() {
+	t["ExpandVmfsExtentRequestType"] = reflect.TypeOf((*ExpandVmfsExtentRequestType)(nil)).Elem()
+}
+
+type ExpandVmfsExtentResponse struct {
+}
+
+type ExpiredAddonLicense struct {
+	ExpiredFeatureLicense
+}
+
+func init() {
+	t["ExpiredAddonLicense"] = reflect.TypeOf((*ExpiredAddonLicense)(nil)).Elem()
+}
+
+type ExpiredAddonLicenseFault ExpiredAddonLicense
+
+func init() {
+	t["ExpiredAddonLicenseFault"] = reflect.TypeOf((*ExpiredAddonLicenseFault)(nil)).Elem()
+}
+
+type ExpiredEditionLicense struct {
+	ExpiredFeatureLicense
+}
+
+func init() {
+	t["ExpiredEditionLicense"] = reflect.TypeOf((*ExpiredEditionLicense)(nil)).Elem()
+}
+
+type ExpiredEditionLicenseFault ExpiredEditionLicense
+
+func init() {
+	t["ExpiredEditionLicenseFault"] = reflect.TypeOf((*ExpiredEditionLicenseFault)(nil)).Elem()
+}
+
+type ExpiredFeatureLicense struct {
+	NotEnoughLicenses
+
+	Feature        string    `xml:"feature"`
+	Count          int32     `xml:"count"`
+	ExpirationDate time.Time `xml:"expirationDate"`
+}
+
+func init() {
+	t["ExpiredFeatureLicense"] = reflect.TypeOf((*ExpiredFeatureLicense)(nil)).Elem()
+}
+
+type ExpiredFeatureLicenseFault BaseExpiredFeatureLicense
+
+func init() {
+	t["ExpiredFeatureLicenseFault"] = reflect.TypeOf((*ExpiredFeatureLicenseFault)(nil)).Elem()
+}
+
+type ExportAnswerFileRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Host ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["ExportAnswerFileRequestType"] = reflect.TypeOf((*ExportAnswerFileRequestType)(nil)).Elem()
+}
+
+type ExportAnswerFile_Task ExportAnswerFileRequestType
+
+func init() {
+	t["ExportAnswerFile_Task"] = reflect.TypeOf((*ExportAnswerFile_Task)(nil)).Elem()
+}
+
+type ExportAnswerFile_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ExportProfile ExportProfileRequestType
+
+func init() {
+	t["ExportProfile"] = reflect.TypeOf((*ExportProfile)(nil)).Elem()
+}
+
+type ExportProfileRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["ExportProfileRequestType"] = reflect.TypeOf((*ExportProfileRequestType)(nil)).Elem()
+}
+
+type ExportProfileResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type ExportSnapshot ExportSnapshotRequestType
+
+func init() {
+	t["ExportSnapshot"] = reflect.TypeOf((*ExportSnapshot)(nil)).Elem()
+}
+
+type ExportSnapshotRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["ExportSnapshotRequestType"] = reflect.TypeOf((*ExportSnapshotRequestType)(nil)).Elem()
+}
+
+type ExportSnapshotResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ExportVApp ExportVAppRequestType
+
+func init() {
+	t["ExportVApp"] = reflect.TypeOf((*ExportVApp)(nil)).Elem()
+}
+
+type ExportVAppRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["ExportVAppRequestType"] = reflect.TypeOf((*ExportVAppRequestType)(nil)).Elem()
+}
+
+type ExportVAppResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ExportVm ExportVmRequestType
+
+func init() {
+	t["ExportVm"] = reflect.TypeOf((*ExportVm)(nil)).Elem()
+}
+
+type ExportVmRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["ExportVmRequestType"] = reflect.TypeOf((*ExportVmRequestType)(nil)).Elem()
+}
+
+type ExportVmResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ExtExtendedProductInfo struct {
+	DynamicData
+
+	CompanyUrl    string                  `xml:"companyUrl,omitempty"`
+	ProductUrl    string                  `xml:"productUrl,omitempty"`
+	ManagementUrl string                  `xml:"managementUrl,omitempty"`
+	Self          *ManagedObjectReference `xml:"self,omitempty"`
+}
+
+func init() {
+	t["ExtExtendedProductInfo"] = reflect.TypeOf((*ExtExtendedProductInfo)(nil)).Elem()
+}
+
+type ExtManagedEntityInfo struct {
+	DynamicData
+
+	Type         string `xml:"type"`
+	SmallIconUrl string `xml:"smallIconUrl,omitempty"`
+	IconUrl      string `xml:"iconUrl,omitempty"`
+	Description  string `xml:"description,omitempty"`
+}
+
+func init() {
+	t["ExtManagedEntityInfo"] = reflect.TypeOf((*ExtManagedEntityInfo)(nil)).Elem()
+}
+
+type ExtSolutionManagerInfo struct {
+	DynamicData
+
+	Tab          []ExtSolutionManagerInfoTabInfo `xml:"tab,omitempty"`
+	SmallIconUrl string                          `xml:"smallIconUrl,omitempty"`
+}
+
+func init() {
+	t["ExtSolutionManagerInfo"] = reflect.TypeOf((*ExtSolutionManagerInfo)(nil)).Elem()
+}
+
+type ExtSolutionManagerInfoTabInfo struct {
+	DynamicData
+
+	Label string `xml:"label"`
+	Url   string `xml:"url"`
+}
+
+func init() {
+	t["ExtSolutionManagerInfoTabInfo"] = reflect.TypeOf((*ExtSolutionManagerInfoTabInfo)(nil)).Elem()
+}
+
+type ExtendDiskRequestType struct {
+	This            ManagedObjectReference `xml:"_this"`
+	Id              ID                     `xml:"id"`
+	Datastore       ManagedObjectReference `xml:"datastore"`
+	NewCapacityInMB int64                  `xml:"newCapacityInMB"`
+}
+
+func init() {
+	t["ExtendDiskRequestType"] = reflect.TypeOf((*ExtendDiskRequestType)(nil)).Elem()
+}
+
+type ExtendDisk_Task ExtendDiskRequestType
+
+func init() {
+	t["ExtendDisk_Task"] = reflect.TypeOf((*ExtendDisk_Task)(nil)).Elem()
+}
+
+type ExtendDisk_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ExtendVffs ExtendVffsRequestType
+
+func init() {
+	t["ExtendVffs"] = reflect.TypeOf((*ExtendVffs)(nil)).Elem()
+}
+
+type ExtendVffsRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	VffsPath   string                 `xml:"vffsPath"`
+	DevicePath string                 `xml:"devicePath"`
+	Spec       *HostDiskPartitionSpec `xml:"spec,omitempty"`
+}
+
+func init() {
+	t["ExtendVffsRequestType"] = reflect.TypeOf((*ExtendVffsRequestType)(nil)).Elem()
+}
+
+type ExtendVffsResponse struct {
+}
+
+type ExtendVirtualDiskRequestType struct {
+	This          ManagedObjectReference  `xml:"_this"`
+	Name          string                  `xml:"name"`
+	Datacenter    *ManagedObjectReference `xml:"datacenter,omitempty"`
+	NewCapacityKb int64                   `xml:"newCapacityKb"`
+	EagerZero     *bool                   `xml:"eagerZero"`
+}
+
+func init() {
+	t["ExtendVirtualDiskRequestType"] = reflect.TypeOf((*ExtendVirtualDiskRequestType)(nil)).Elem()
+}
+
+type ExtendVirtualDisk_Task ExtendVirtualDiskRequestType
+
+func init() {
+	t["ExtendVirtualDisk_Task"] = reflect.TypeOf((*ExtendVirtualDisk_Task)(nil)).Elem()
+}
+
+type ExtendVirtualDisk_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ExtendVmfsDatastore ExtendVmfsDatastoreRequestType
+
+func init() {
+	t["ExtendVmfsDatastore"] = reflect.TypeOf((*ExtendVmfsDatastore)(nil)).Elem()
+}
+
+type ExtendVmfsDatastoreRequestType struct {
+	This      ManagedObjectReference  `xml:"_this"`
+	Datastore ManagedObjectReference  `xml:"datastore"`
+	Spec      VmfsDatastoreExtendSpec `xml:"spec"`
+}
+
+func init() {
+	t["ExtendVmfsDatastoreRequestType"] = reflect.TypeOf((*ExtendVmfsDatastoreRequestType)(nil)).Elem()
+}
+
+type ExtendVmfsDatastoreResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ExtendedDescription struct {
+	Description
+
+	MessageCatalogKeyPrefix string        `xml:"messageCatalogKeyPrefix"`
+	MessageArg              []KeyAnyValue `xml:"messageArg,omitempty"`
+}
+
+func init() {
+	t["ExtendedDescription"] = reflect.TypeOf((*ExtendedDescription)(nil)).Elem()
+}
+
+type ExtendedElementDescription struct {
+	ElementDescription
+
+	MessageCatalogKeyPrefix string        `xml:"messageCatalogKeyPrefix"`
+	MessageArg              []KeyAnyValue `xml:"messageArg,omitempty"`
+}
+
+func init() {
+	t["ExtendedElementDescription"] = reflect.TypeOf((*ExtendedElementDescription)(nil)).Elem()
+}
+
+type ExtendedEvent struct {
+	GeneralEvent
+
+	EventTypeId   string                 `xml:"eventTypeId"`
+	ManagedObject ManagedObjectReference `xml:"managedObject"`
+	Data          []ExtendedEventPair    `xml:"data,omitempty"`
+}
+
+func init() {
+	t["ExtendedEvent"] = reflect.TypeOf((*ExtendedEvent)(nil)).Elem()
+}
+
+type ExtendedEventPair struct {
+	DynamicData
+
+	Key   string `xml:"key"`
+	Value string `xml:"value"`
+}
+
+func init() {
+	t["ExtendedEventPair"] = reflect.TypeOf((*ExtendedEventPair)(nil)).Elem()
+}
+
+type ExtendedFault struct {
+	VimFault
+
+	FaultTypeId string     `xml:"faultTypeId"`
+	Data        []KeyValue `xml:"data,omitempty"`
+}
+
+func init() {
+	t["ExtendedFault"] = reflect.TypeOf((*ExtendedFault)(nil)).Elem()
+}
+
+type ExtendedFaultFault ExtendedFault
+
+func init() {
+	t["ExtendedFaultFault"] = reflect.TypeOf((*ExtendedFaultFault)(nil)).Elem()
+}
+
+type Extension struct {
+	DynamicData
+
+	Description            BaseDescription           `xml:"description,typeattr"`
+	Key                    string                    `xml:"key"`
+	Company                string                    `xml:"company,omitempty"`
+	Type                   string                    `xml:"type,omitempty"`
+	Version                string                    `xml:"version"`
+	SubjectName            string                    `xml:"subjectName,omitempty"`
+	Server                 []ExtensionServerInfo     `xml:"server,omitempty"`
+	Client                 []ExtensionClientInfo     `xml:"client,omitempty"`
+	TaskList               []ExtensionTaskTypeInfo   `xml:"taskList,omitempty"`
+	EventList              []ExtensionEventTypeInfo  `xml:"eventList,omitempty"`
+	FaultList              []ExtensionFaultTypeInfo  `xml:"faultList,omitempty"`
+	PrivilegeList          []ExtensionPrivilegeInfo  `xml:"privilegeList,omitempty"`
+	ResourceList           []ExtensionResourceInfo   `xml:"resourceList,omitempty"`
+	LastHeartbeatTime      time.Time                 `xml:"lastHeartbeatTime"`
+	HealthInfo             *ExtensionHealthInfo      `xml:"healthInfo,omitempty"`
+	OvfConsumerInfo        *ExtensionOvfConsumerInfo `xml:"ovfConsumerInfo,omitempty"`
+	ExtendedProductInfo    *ExtExtendedProductInfo   `xml:"extendedProductInfo,omitempty"`
+	ManagedEntityInfo      []ExtManagedEntityInfo    `xml:"managedEntityInfo,omitempty"`
+	ShownInSolutionManager *bool                     `xml:"shownInSolutionManager"`
+	SolutionManagerInfo    *ExtSolutionManagerInfo   `xml:"solutionManagerInfo,omitempty"`
+}
+
+func init() {
+	t["Extension"] = reflect.TypeOf((*Extension)(nil)).Elem()
+}
+
+type ExtensionClientInfo struct {
+	DynamicData
+
+	Version     string          `xml:"version"`
+	Description BaseDescription `xml:"description,typeattr"`
+	Company     string          `xml:"company"`
+	Type        string          `xml:"type"`
+	Url         string          `xml:"url"`
+}
+
+func init() {
+	t["ExtensionClientInfo"] = reflect.TypeOf((*ExtensionClientInfo)(nil)).Elem()
+}
+
+type ExtensionEventTypeInfo struct {
+	DynamicData
+
+	EventID         string `xml:"eventID"`
+	EventTypeSchema string `xml:"eventTypeSchema,omitempty"`
+}
+
+func init() {
+	t["ExtensionEventTypeInfo"] = reflect.TypeOf((*ExtensionEventTypeInfo)(nil)).Elem()
+}
+
+type ExtensionFaultTypeInfo struct {
+	DynamicData
+
+	FaultID string `xml:"faultID"`
+}
+
+func init() {
+	t["ExtensionFaultTypeInfo"] = reflect.TypeOf((*ExtensionFaultTypeInfo)(nil)).Elem()
+}
+
+type ExtensionHealthInfo struct {
+	DynamicData
+
+	Url string `xml:"url"`
+}
+
+func init() {
+	t["ExtensionHealthInfo"] = reflect.TypeOf((*ExtensionHealthInfo)(nil)).Elem()
+}
+
+type ExtensionManagerIpAllocationUsage struct {
+	DynamicData
+
+	ExtensionKey string `xml:"extensionKey"`
+	NumAddresses int32  `xml:"numAddresses"`
+}
+
+func init() {
+	t["ExtensionManagerIpAllocationUsage"] = reflect.TypeOf((*ExtensionManagerIpAllocationUsage)(nil)).Elem()
+}
+
+type ExtensionOvfConsumerInfo struct {
+	DynamicData
+
+	CallbackUrl string   `xml:"callbackUrl"`
+	SectionType []string `xml:"sectionType"`
+}
+
+func init() {
+	t["ExtensionOvfConsumerInfo"] = reflect.TypeOf((*ExtensionOvfConsumerInfo)(nil)).Elem()
+}
+
+type ExtensionPrivilegeInfo struct {
+	DynamicData
+
+	PrivID        string `xml:"privID"`
+	PrivGroupName string `xml:"privGroupName"`
+}
+
+func init() {
+	t["ExtensionPrivilegeInfo"] = reflect.TypeOf((*ExtensionPrivilegeInfo)(nil)).Elem()
+}
+
+type ExtensionResourceInfo struct {
+	DynamicData
+
+	Locale string     `xml:"locale"`
+	Module string     `xml:"module"`
+	Data   []KeyValue `xml:"data"`
+}
+
+func init() {
+	t["ExtensionResourceInfo"] = reflect.TypeOf((*ExtensionResourceInfo)(nil)).Elem()
+}
+
+type ExtensionServerInfo struct {
+	DynamicData
+
+	Url              string          `xml:"url"`
+	Description      BaseDescription `xml:"description,typeattr"`
+	Company          string          `xml:"company"`
+	Type             string          `xml:"type"`
+	AdminEmail       []string        `xml:"adminEmail"`
+	ServerThumbprint string          `xml:"serverThumbprint,omitempty"`
+}
+
+func init() {
+	t["ExtensionServerInfo"] = reflect.TypeOf((*ExtensionServerInfo)(nil)).Elem()
+}
+
+type ExtensionTaskTypeInfo struct {
+	DynamicData
+
+	TaskID string `xml:"taskID"`
+}
+
+func init() {
+	t["ExtensionTaskTypeInfo"] = reflect.TypeOf((*ExtensionTaskTypeInfo)(nil)).Elem()
+}
+
+type ExtractOvfEnvironment ExtractOvfEnvironmentRequestType
+
+func init() {
+	t["ExtractOvfEnvironment"] = reflect.TypeOf((*ExtractOvfEnvironment)(nil)).Elem()
+}
+
+type ExtractOvfEnvironmentRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["ExtractOvfEnvironmentRequestType"] = reflect.TypeOf((*ExtractOvfEnvironmentRequestType)(nil)).Elem()
+}
+
+type ExtractOvfEnvironmentResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type FailToEnableSPBM struct {
+	NotEnoughLicenses
+
+	Cs                ManagedObjectReference               `xml:"cs"`
+	CsName            string                               `xml:"csName"`
+	HostLicenseStates []ComputeResourceHostSPBMLicenseInfo `xml:"hostLicenseStates"`
+}
+
+func init() {
+	t["FailToEnableSPBM"] = reflect.TypeOf((*FailToEnableSPBM)(nil)).Elem()
+}
+
+type FailToEnableSPBMFault FailToEnableSPBM
+
+func init() {
+	t["FailToEnableSPBMFault"] = reflect.TypeOf((*FailToEnableSPBMFault)(nil)).Elem()
+}
+
+type FailToLockFaultToleranceVMs struct {
+	RuntimeFault
+
+	VmName          string                 `xml:"vmName"`
+	Vm              ManagedObjectReference `xml:"vm"`
+	AlreadyLockedVm ManagedObjectReference `xml:"alreadyLockedVm"`
+}
+
+func init() {
+	t["FailToLockFaultToleranceVMs"] = reflect.TypeOf((*FailToLockFaultToleranceVMs)(nil)).Elem()
+}
+
+type FailToLockFaultToleranceVMsFault FailToLockFaultToleranceVMs
+
+func init() {
+	t["FailToLockFaultToleranceVMsFault"] = reflect.TypeOf((*FailToLockFaultToleranceVMsFault)(nil)).Elem()
+}
+
+type FailoverLevelRestored struct {
+	ClusterEvent
+}
+
+func init() {
+	t["FailoverLevelRestored"] = reflect.TypeOf((*FailoverLevelRestored)(nil)).Elem()
+}
+
+type FailoverNodeInfo struct {
+	DynamicData
+
+	ClusterIpSettings CustomizationIPSettings  `xml:"clusterIpSettings"`
+	FailoverIp        *CustomizationIPSettings `xml:"failoverIp,omitempty"`
+	BiosUuid          string                   `xml:"biosUuid,omitempty"`
+}
+
+func init() {
+	t["FailoverNodeInfo"] = reflect.TypeOf((*FailoverNodeInfo)(nil)).Elem()
+}
+
+type FaultDomainId struct {
+	DynamicData
+
+	Id string `xml:"id"`
+}
+
+func init() {
+	t["FaultDomainId"] = reflect.TypeOf((*FaultDomainId)(nil)).Elem()
+}
+
+type FaultToleranceAntiAffinityViolated struct {
+	MigrationFault
+
+	HostName string                 `xml:"hostName"`
+	Host     ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["FaultToleranceAntiAffinityViolated"] = reflect.TypeOf((*FaultToleranceAntiAffinityViolated)(nil)).Elem()
+}
+
+type FaultToleranceAntiAffinityViolatedFault FaultToleranceAntiAffinityViolated
+
+func init() {
+	t["FaultToleranceAntiAffinityViolatedFault"] = reflect.TypeOf((*FaultToleranceAntiAffinityViolatedFault)(nil)).Elem()
+}
+
+type FaultToleranceCannotEditMem struct {
+	VmConfigFault
+
+	VmName string                 `xml:"vmName"`
+	Vm     ManagedObjectReference `xml:"vm"`
+}
+
+func init() {
+	t["FaultToleranceCannotEditMem"] = reflect.TypeOf((*FaultToleranceCannotEditMem)(nil)).Elem()
+}
+
+type FaultToleranceCannotEditMemFault FaultToleranceCannotEditMem
+
+func init() {
+	t["FaultToleranceCannotEditMemFault"] = reflect.TypeOf((*FaultToleranceCannotEditMemFault)(nil)).Elem()
+}
+
+type FaultToleranceConfigInfo struct {
+	DynamicData
+
+	Role          int32    `xml:"role"`
+	InstanceUuids []string `xml:"instanceUuids"`
+	ConfigPaths   []string `xml:"configPaths"`
+	Orphaned      *bool    `xml:"orphaned"`
+}
+
+func init() {
+	t["FaultToleranceConfigInfo"] = reflect.TypeOf((*FaultToleranceConfigInfo)(nil)).Elem()
+}
+
+type FaultToleranceConfigSpec struct {
+	DynamicData
+
+	MetaDataPath    *FaultToleranceMetaSpec     `xml:"metaDataPath,omitempty"`
+	SecondaryVmSpec *FaultToleranceVMConfigSpec `xml:"secondaryVmSpec,omitempty"`
+}
+
+func init() {
+	t["FaultToleranceConfigSpec"] = reflect.TypeOf((*FaultToleranceConfigSpec)(nil)).Elem()
+}
+
+type FaultToleranceCpuIncompatible struct {
+	CpuIncompatible
+
+	Model    bool `xml:"model"`
+	Family   bool `xml:"family"`
+	Stepping bool `xml:"stepping"`
+}
+
+func init() {
+	t["FaultToleranceCpuIncompatible"] = reflect.TypeOf((*FaultToleranceCpuIncompatible)(nil)).Elem()
+}
+
+type FaultToleranceCpuIncompatibleFault FaultToleranceCpuIncompatible
+
+func init() {
+	t["FaultToleranceCpuIncompatibleFault"] = reflect.TypeOf((*FaultToleranceCpuIncompatibleFault)(nil)).Elem()
+}
+
+type FaultToleranceDiskSpec struct {
+	DynamicData
+
+	Disk      BaseVirtualDevice      `xml:"disk,typeattr"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["FaultToleranceDiskSpec"] = reflect.TypeOf((*FaultToleranceDiskSpec)(nil)).Elem()
+}
+
+type FaultToleranceMetaSpec struct {
+	DynamicData
+
+	MetaDataDatastore ManagedObjectReference `xml:"metaDataDatastore"`
+}
+
+func init() {
+	t["FaultToleranceMetaSpec"] = reflect.TypeOf((*FaultToleranceMetaSpec)(nil)).Elem()
+}
+
+type FaultToleranceNeedsThickDisk struct {
+	MigrationFault
+
+	VmName string `xml:"vmName"`
+}
+
+func init() {
+	t["FaultToleranceNeedsThickDisk"] = reflect.TypeOf((*FaultToleranceNeedsThickDisk)(nil)).Elem()
+}
+
+type FaultToleranceNeedsThickDiskFault FaultToleranceNeedsThickDisk
+
+func init() {
+	t["FaultToleranceNeedsThickDiskFault"] = reflect.TypeOf((*FaultToleranceNeedsThickDiskFault)(nil)).Elem()
+}
+
+type FaultToleranceNotLicensed struct {
+	VmFaultToleranceIssue
+
+	HostName string `xml:"hostName,omitempty"`
+}
+
+func init() {
+	t["FaultToleranceNotLicensed"] = reflect.TypeOf((*FaultToleranceNotLicensed)(nil)).Elem()
+}
+
+type FaultToleranceNotLicensedFault FaultToleranceNotLicensed
+
+func init() {
+	t["FaultToleranceNotLicensedFault"] = reflect.TypeOf((*FaultToleranceNotLicensedFault)(nil)).Elem()
+}
+
+type FaultToleranceNotSameBuild struct {
+	MigrationFault
+
+	Build string `xml:"build"`
+}
+
+func init() {
+	t["FaultToleranceNotSameBuild"] = reflect.TypeOf((*FaultToleranceNotSameBuild)(nil)).Elem()
+}
+
+type FaultToleranceNotSameBuildFault FaultToleranceNotSameBuild
+
+func init() {
+	t["FaultToleranceNotSameBuildFault"] = reflect.TypeOf((*FaultToleranceNotSameBuildFault)(nil)).Elem()
+}
+
+type FaultTolerancePrimaryConfigInfo struct {
+	FaultToleranceConfigInfo
+
+	Secondaries []ManagedObjectReference `xml:"secondaries"`
+}
+
+func init() {
+	t["FaultTolerancePrimaryConfigInfo"] = reflect.TypeOf((*FaultTolerancePrimaryConfigInfo)(nil)).Elem()
+}
+
+type FaultTolerancePrimaryPowerOnNotAttempted struct {
+	VmFaultToleranceIssue
+
+	SecondaryVm ManagedObjectReference `xml:"secondaryVm"`
+	PrimaryVm   ManagedObjectReference `xml:"primaryVm"`
+}
+
+func init() {
+	t["FaultTolerancePrimaryPowerOnNotAttempted"] = reflect.TypeOf((*FaultTolerancePrimaryPowerOnNotAttempted)(nil)).Elem()
+}
+
+type FaultTolerancePrimaryPowerOnNotAttemptedFault FaultTolerancePrimaryPowerOnNotAttempted
+
+func init() {
+	t["FaultTolerancePrimaryPowerOnNotAttemptedFault"] = reflect.TypeOf((*FaultTolerancePrimaryPowerOnNotAttemptedFault)(nil)).Elem()
+}
+
+type FaultToleranceSecondaryConfigInfo struct {
+	FaultToleranceConfigInfo
+
+	PrimaryVM ManagedObjectReference `xml:"primaryVM"`
+}
+
+func init() {
+	t["FaultToleranceSecondaryConfigInfo"] = reflect.TypeOf((*FaultToleranceSecondaryConfigInfo)(nil)).Elem()
+}
+
+type FaultToleranceSecondaryOpResult struct {
+	DynamicData
+
+	Vm               ManagedObjectReference  `xml:"vm"`
+	PowerOnAttempted bool                    `xml:"powerOnAttempted"`
+	PowerOnResult    *ClusterPowerOnVmResult `xml:"powerOnResult,omitempty"`
+}
+
+func init() {
+	t["FaultToleranceSecondaryOpResult"] = reflect.TypeOf((*FaultToleranceSecondaryOpResult)(nil)).Elem()
+}
+
+type FaultToleranceVMConfigSpec struct {
+	DynamicData
+
+	VmConfig *ManagedObjectReference  `xml:"vmConfig,omitempty"`
+	Disks    []FaultToleranceDiskSpec `xml:"disks,omitempty"`
+}
+
+func init() {
+	t["FaultToleranceVMConfigSpec"] = reflect.TypeOf((*FaultToleranceVMConfigSpec)(nil)).Elem()
+}
+
+type FaultToleranceVmNotDasProtected struct {
+	VimFault
+
+	Vm     ManagedObjectReference `xml:"vm"`
+	VmName string                 `xml:"vmName"`
+}
+
+func init() {
+	t["FaultToleranceVmNotDasProtected"] = reflect.TypeOf((*FaultToleranceVmNotDasProtected)(nil)).Elem()
+}
+
+type FaultToleranceVmNotDasProtectedFault FaultToleranceVmNotDasProtected
+
+func init() {
+	t["FaultToleranceVmNotDasProtectedFault"] = reflect.TypeOf((*FaultToleranceVmNotDasProtectedFault)(nil)).Elem()
+}
+
+type FcoeConfig struct {
+	DynamicData
+
+	PriorityClass int32                      `xml:"priorityClass"`
+	SourceMac     string                     `xml:"sourceMac"`
+	VlanRange     []FcoeConfigVlanRange      `xml:"vlanRange"`
+	Capabilities  FcoeConfigFcoeCapabilities `xml:"capabilities"`
+	FcoeActive    bool                       `xml:"fcoeActive"`
+}
+
+func init() {
+	t["FcoeConfig"] = reflect.TypeOf((*FcoeConfig)(nil)).Elem()
+}
+
+type FcoeConfigFcoeCapabilities struct {
+	DynamicData
+
+	PriorityClass    bool `xml:"priorityClass"`
+	SourceMacAddress bool `xml:"sourceMacAddress"`
+	VlanRange        bool `xml:"vlanRange"`
+}
+
+func init() {
+	t["FcoeConfigFcoeCapabilities"] = reflect.TypeOf((*FcoeConfigFcoeCapabilities)(nil)).Elem()
+}
+
+type FcoeConfigFcoeSpecification struct {
+	DynamicData
+
+	UnderlyingPnic string                `xml:"underlyingPnic"`
+	PriorityClass  int32                 `xml:"priorityClass,omitempty"`
+	SourceMac      string                `xml:"sourceMac,omitempty"`
+	VlanRange      []FcoeConfigVlanRange `xml:"vlanRange,omitempty"`
+}
+
+func init() {
+	t["FcoeConfigFcoeSpecification"] = reflect.TypeOf((*FcoeConfigFcoeSpecification)(nil)).Elem()
+}
+
+type FcoeConfigVlanRange struct {
+	DynamicData
+
+	VlanLow  int32 `xml:"vlanLow"`
+	VlanHigh int32 `xml:"vlanHigh"`
+}
+
+func init() {
+	t["FcoeConfigVlanRange"] = reflect.TypeOf((*FcoeConfigVlanRange)(nil)).Elem()
+}
+
+type FcoeFault struct {
+	VimFault
+}
+
+func init() {
+	t["FcoeFault"] = reflect.TypeOf((*FcoeFault)(nil)).Elem()
+}
+
+type FcoeFaultFault BaseFcoeFault
+
+func init() {
+	t["FcoeFaultFault"] = reflect.TypeOf((*FcoeFaultFault)(nil)).Elem()
+}
+
+type FcoeFaultPnicHasNoPortSet struct {
+	FcoeFault
+
+	NicDevice string `xml:"nicDevice"`
+}
+
+func init() {
+	t["FcoeFaultPnicHasNoPortSet"] = reflect.TypeOf((*FcoeFaultPnicHasNoPortSet)(nil)).Elem()
+}
+
+type FcoeFaultPnicHasNoPortSetFault FcoeFaultPnicHasNoPortSet
+
+func init() {
+	t["FcoeFaultPnicHasNoPortSetFault"] = reflect.TypeOf((*FcoeFaultPnicHasNoPortSetFault)(nil)).Elem()
+}
+
+type FeatureRequirementsNotMet struct {
+	VirtualHardwareCompatibilityIssue
+
+	FeatureRequirement []VirtualMachineFeatureRequirement `xml:"featureRequirement,omitempty"`
+	Vm                 *ManagedObjectReference            `xml:"vm,omitempty"`
+	Host               *ManagedObjectReference            `xml:"host,omitempty"`
+}
+
+func init() {
+	t["FeatureRequirementsNotMet"] = reflect.TypeOf((*FeatureRequirementsNotMet)(nil)).Elem()
+}
+
+type FeatureRequirementsNotMetFault FeatureRequirementsNotMet
+
+func init() {
+	t["FeatureRequirementsNotMetFault"] = reflect.TypeOf((*FeatureRequirementsNotMetFault)(nil)).Elem()
+}
+
+type FetchDVPortKeys FetchDVPortKeysRequestType
+
+func init() {
+	t["FetchDVPortKeys"] = reflect.TypeOf((*FetchDVPortKeys)(nil)).Elem()
+}
+
+type FetchDVPortKeysRequestType struct {
+	This     ManagedObjectReference                `xml:"_this"`
+	Criteria *DistributedVirtualSwitchPortCriteria `xml:"criteria,omitempty"`
+}
+
+func init() {
+	t["FetchDVPortKeysRequestType"] = reflect.TypeOf((*FetchDVPortKeysRequestType)(nil)).Elem()
+}
+
+type FetchDVPortKeysResponse struct {
+	Returnval []string `xml:"returnval,omitempty"`
+}
+
+type FetchDVPorts FetchDVPortsRequestType
+
+func init() {
+	t["FetchDVPorts"] = reflect.TypeOf((*FetchDVPorts)(nil)).Elem()
+}
+
+type FetchDVPortsRequestType struct {
+	This     ManagedObjectReference                `xml:"_this"`
+	Criteria *DistributedVirtualSwitchPortCriteria `xml:"criteria,omitempty"`
+}
+
+func init() {
+	t["FetchDVPortsRequestType"] = reflect.TypeOf((*FetchDVPortsRequestType)(nil)).Elem()
+}
+
+type FetchDVPortsResponse struct {
+	Returnval []DistributedVirtualPort `xml:"returnval,omitempty"`
+}
+
+type FetchSystemEventLog FetchSystemEventLogRequestType
+
+func init() {
+	t["FetchSystemEventLog"] = reflect.TypeOf((*FetchSystemEventLog)(nil)).Elem()
+}
+
+type FetchSystemEventLogRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["FetchSystemEventLogRequestType"] = reflect.TypeOf((*FetchSystemEventLogRequestType)(nil)).Elem()
+}
+
+type FetchSystemEventLogResponse struct {
+	Returnval []SystemEventInfo `xml:"returnval,omitempty"`
+}
+
+type FetchUserPrivilegeOnEntities FetchUserPrivilegeOnEntitiesRequestType
+
+func init() {
+	t["FetchUserPrivilegeOnEntities"] = reflect.TypeOf((*FetchUserPrivilegeOnEntities)(nil)).Elem()
+}
+
+type FetchUserPrivilegeOnEntitiesRequestType struct {
+	This     ManagedObjectReference   `xml:"_this"`
+	Entities []ManagedObjectReference `xml:"entities"`
+	UserName string                   `xml:"userName"`
+}
+
+func init() {
+	t["FetchUserPrivilegeOnEntitiesRequestType"] = reflect.TypeOf((*FetchUserPrivilegeOnEntitiesRequestType)(nil)).Elem()
+}
+
+type FetchUserPrivilegeOnEntitiesResponse struct {
+	Returnval []UserPrivilegeResult `xml:"returnval,omitempty"`
+}
+
+type FileAlreadyExists struct {
+	FileFault
+}
+
+func init() {
+	t["FileAlreadyExists"] = reflect.TypeOf((*FileAlreadyExists)(nil)).Elem()
+}
+
+type FileAlreadyExistsFault FileAlreadyExists
+
+func init() {
+	t["FileAlreadyExistsFault"] = reflect.TypeOf((*FileAlreadyExistsFault)(nil)).Elem()
+}
+
+type FileBackedPortNotSupported struct {
+	DeviceNotSupported
+}
+
+func init() {
+	t["FileBackedPortNotSupported"] = reflect.TypeOf((*FileBackedPortNotSupported)(nil)).Elem()
+}
+
+type FileBackedPortNotSupportedFault FileBackedPortNotSupported
+
+func init() {
+	t["FileBackedPortNotSupportedFault"] = reflect.TypeOf((*FileBackedPortNotSupportedFault)(nil)).Elem()
+}
+
+type FileBackedVirtualDiskSpec struct {
+	VirtualDiskSpec
+
+	CapacityKb int64                           `xml:"capacityKb"`
+	Profile    []BaseVirtualMachineProfileSpec `xml:"profile,omitempty,typeattr"`
+	Crypto     BaseCryptoSpec                  `xml:"crypto,omitempty,typeattr"`
+}
+
+func init() {
+	t["FileBackedVirtualDiskSpec"] = reflect.TypeOf((*FileBackedVirtualDiskSpec)(nil)).Elem()
+}
+
+type FileFault struct {
+	VimFault
+
+	File string `xml:"file"`
+}
+
+func init() {
+	t["FileFault"] = reflect.TypeOf((*FileFault)(nil)).Elem()
+}
+
+type FileFaultFault BaseFileFault
+
+func init() {
+	t["FileFaultFault"] = reflect.TypeOf((*FileFaultFault)(nil)).Elem()
+}
+
+type FileInfo struct {
+	DynamicData
+
+	Path         string     `xml:"path"`
+	FriendlyName string     `xml:"friendlyName,omitempty"`
+	FileSize     int64      `xml:"fileSize,omitempty"`
+	Modification *time.Time `xml:"modification"`
+	Owner        string     `xml:"owner,omitempty"`
+}
+
+func init() {
+	t["FileInfo"] = reflect.TypeOf((*FileInfo)(nil)).Elem()
+}
+
+type FileLocked struct {
+	FileFault
+}
+
+func init() {
+	t["FileLocked"] = reflect.TypeOf((*FileLocked)(nil)).Elem()
+}
+
+type FileLockedFault FileLocked
+
+func init() {
+	t["FileLockedFault"] = reflect.TypeOf((*FileLockedFault)(nil)).Elem()
+}
+
+type FileNameTooLong struct {
+	FileFault
+}
+
+func init() {
+	t["FileNameTooLong"] = reflect.TypeOf((*FileNameTooLong)(nil)).Elem()
+}
+
+type FileNameTooLongFault FileNameTooLong
+
+func init() {
+	t["FileNameTooLongFault"] = reflect.TypeOf((*FileNameTooLongFault)(nil)).Elem()
+}
+
+type FileNotFound struct {
+	FileFault
+}
+
+func init() {
+	t["FileNotFound"] = reflect.TypeOf((*FileNotFound)(nil)).Elem()
+}
+
+type FileNotFoundFault FileNotFound
+
+func init() {
+	t["FileNotFoundFault"] = reflect.TypeOf((*FileNotFoundFault)(nil)).Elem()
+}
+
+type FileNotWritable struct {
+	FileFault
+}
+
+func init() {
+	t["FileNotWritable"] = reflect.TypeOf((*FileNotWritable)(nil)).Elem()
+}
+
+type FileNotWritableFault FileNotWritable
+
+func init() {
+	t["FileNotWritableFault"] = reflect.TypeOf((*FileNotWritableFault)(nil)).Elem()
+}
+
+type FileQuery struct {
+	DynamicData
+}
+
+func init() {
+	t["FileQuery"] = reflect.TypeOf((*FileQuery)(nil)).Elem()
+}
+
+type FileQueryFlags struct {
+	DynamicData
+
+	FileType     bool  `xml:"fileType"`
+	FileSize     bool  `xml:"fileSize"`
+	Modification bool  `xml:"modification"`
+	FileOwner    *bool `xml:"fileOwner"`
+}
+
+func init() {
+	t["FileQueryFlags"] = reflect.TypeOf((*FileQueryFlags)(nil)).Elem()
+}
+
+type FileTooLarge struct {
+	FileFault
+
+	Datastore   string `xml:"datastore"`
+	FileSize    int64  `xml:"fileSize"`
+	MaxFileSize int64  `xml:"maxFileSize,omitempty"`
+}
+
+func init() {
+	t["FileTooLarge"] = reflect.TypeOf((*FileTooLarge)(nil)).Elem()
+}
+
+type FileTooLargeFault FileTooLarge
+
+func init() {
+	t["FileTooLargeFault"] = reflect.TypeOf((*FileTooLargeFault)(nil)).Elem()
+}
+
+type FileTransferInformation struct {
+	DynamicData
+
+	Attributes BaseGuestFileAttributes `xml:"attributes,typeattr"`
+	Size       int64                   `xml:"size"`
+	Url        string                  `xml:"url"`
+}
+
+func init() {
+	t["FileTransferInformation"] = reflect.TypeOf((*FileTransferInformation)(nil)).Elem()
+}
+
+type FilesystemQuiesceFault struct {
+	SnapshotFault
+}
+
+func init() {
+	t["FilesystemQuiesceFault"] = reflect.TypeOf((*FilesystemQuiesceFault)(nil)).Elem()
+}
+
+type FilesystemQuiesceFaultFault FilesystemQuiesceFault
+
+func init() {
+	t["FilesystemQuiesceFaultFault"] = reflect.TypeOf((*FilesystemQuiesceFaultFault)(nil)).Elem()
+}
+
+type FilterInUse struct {
+	ResourceInUse
+
+	Disk []VirtualDiskId `xml:"disk,omitempty"`
+}
+
+func init() {
+	t["FilterInUse"] = reflect.TypeOf((*FilterInUse)(nil)).Elem()
+}
+
+type FilterInUseFault FilterInUse
+
+func init() {
+	t["FilterInUseFault"] = reflect.TypeOf((*FilterInUseFault)(nil)).Elem()
+}
+
+type FindAllByDnsName FindAllByDnsNameRequestType
+
+func init() {
+	t["FindAllByDnsName"] = reflect.TypeOf((*FindAllByDnsName)(nil)).Elem()
+}
+
+type FindAllByDnsNameRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Datacenter *ManagedObjectReference `xml:"datacenter,omitempty"`
+	DnsName    string                  `xml:"dnsName"`
+	VmSearch   bool                    `xml:"vmSearch"`
+}
+
+func init() {
+	t["FindAllByDnsNameRequestType"] = reflect.TypeOf((*FindAllByDnsNameRequestType)(nil)).Elem()
+}
+
+type FindAllByDnsNameResponse struct {
+	Returnval []ManagedObjectReference `xml:"returnval"`
+}
+
+type FindAllByIp FindAllByIpRequestType
+
+func init() {
+	t["FindAllByIp"] = reflect.TypeOf((*FindAllByIp)(nil)).Elem()
+}
+
+type FindAllByIpRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Datacenter *ManagedObjectReference `xml:"datacenter,omitempty"`
+	Ip         string                  `xml:"ip"`
+	VmSearch   bool                    `xml:"vmSearch"`
+}
+
+func init() {
+	t["FindAllByIpRequestType"] = reflect.TypeOf((*FindAllByIpRequestType)(nil)).Elem()
+}
+
+type FindAllByIpResponse struct {
+	Returnval []ManagedObjectReference `xml:"returnval"`
+}
+
+type FindAllByUuid FindAllByUuidRequestType
+
+func init() {
+	t["FindAllByUuid"] = reflect.TypeOf((*FindAllByUuid)(nil)).Elem()
+}
+
+type FindAllByUuidRequestType struct {
+	This         ManagedObjectReference  `xml:"_this"`
+	Datacenter   *ManagedObjectReference `xml:"datacenter,omitempty"`
+	Uuid         string                  `xml:"uuid"`
+	VmSearch     bool                    `xml:"vmSearch"`
+	InstanceUuid *bool                   `xml:"instanceUuid"`
+}
+
+func init() {
+	t["FindAllByUuidRequestType"] = reflect.TypeOf((*FindAllByUuidRequestType)(nil)).Elem()
+}
+
+type FindAllByUuidResponse struct {
+	Returnval []ManagedObjectReference `xml:"returnval"`
+}
+
+type FindAssociatedProfile FindAssociatedProfileRequestType
+
+func init() {
+	t["FindAssociatedProfile"] = reflect.TypeOf((*FindAssociatedProfile)(nil)).Elem()
+}
+
+type FindAssociatedProfileRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Entity ManagedObjectReference `xml:"entity"`
+}
+
+func init() {
+	t["FindAssociatedProfileRequestType"] = reflect.TypeOf((*FindAssociatedProfileRequestType)(nil)).Elem()
+}
+
+type FindAssociatedProfileResponse struct {
+	Returnval []ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type FindByDatastorePath FindByDatastorePathRequestType
+
+func init() {
+	t["FindByDatastorePath"] = reflect.TypeOf((*FindByDatastorePath)(nil)).Elem()
+}
+
+type FindByDatastorePathRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	Datacenter ManagedObjectReference `xml:"datacenter"`
+	Path       string                 `xml:"path"`
+}
+
+func init() {
+	t["FindByDatastorePathRequestType"] = reflect.TypeOf((*FindByDatastorePathRequestType)(nil)).Elem()
+}
+
+type FindByDatastorePathResponse struct {
+	Returnval *ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type FindByDnsName FindByDnsNameRequestType
+
+func init() {
+	t["FindByDnsName"] = reflect.TypeOf((*FindByDnsName)(nil)).Elem()
+}
+
+type FindByDnsNameRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Datacenter *ManagedObjectReference `xml:"datacenter,omitempty"`
+	DnsName    string                  `xml:"dnsName"`
+	VmSearch   bool                    `xml:"vmSearch"`
+}
+
+func init() {
+	t["FindByDnsNameRequestType"] = reflect.TypeOf((*FindByDnsNameRequestType)(nil)).Elem()
+}
+
+type FindByDnsNameResponse struct {
+	Returnval *ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type FindByInventoryPath FindByInventoryPathRequestType
+
+func init() {
+	t["FindByInventoryPath"] = reflect.TypeOf((*FindByInventoryPath)(nil)).Elem()
+}
+
+type FindByInventoryPathRequestType struct {
+	This          ManagedObjectReference `xml:"_this"`
+	InventoryPath string                 `xml:"inventoryPath"`
+}
+
+func init() {
+	t["FindByInventoryPathRequestType"] = reflect.TypeOf((*FindByInventoryPathRequestType)(nil)).Elem()
+}
+
+type FindByInventoryPathResponse struct {
+	Returnval *ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type FindByIp FindByIpRequestType
+
+func init() {
+	t["FindByIp"] = reflect.TypeOf((*FindByIp)(nil)).Elem()
+}
+
+type FindByIpRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Datacenter *ManagedObjectReference `xml:"datacenter,omitempty"`
+	Ip         string                  `xml:"ip"`
+	VmSearch   bool                    `xml:"vmSearch"`
+}
+
+func init() {
+	t["FindByIpRequestType"] = reflect.TypeOf((*FindByIpRequestType)(nil)).Elem()
+}
+
+type FindByIpResponse struct {
+	Returnval *ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type FindByUuid FindByUuidRequestType
+
+func init() {
+	t["FindByUuid"] = reflect.TypeOf((*FindByUuid)(nil)).Elem()
+}
+
+type FindByUuidRequestType struct {
+	This         ManagedObjectReference  `xml:"_this"`
+	Datacenter   *ManagedObjectReference `xml:"datacenter,omitempty"`
+	Uuid         string                  `xml:"uuid"`
+	VmSearch     bool                    `xml:"vmSearch"`
+	InstanceUuid *bool                   `xml:"instanceUuid"`
+}
+
+func init() {
+	t["FindByUuidRequestType"] = reflect.TypeOf((*FindByUuidRequestType)(nil)).Elem()
+}
+
+type FindByUuidResponse struct {
+	Returnval *ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type FindChild FindChildRequestType
+
+func init() {
+	t["FindChild"] = reflect.TypeOf((*FindChild)(nil)).Elem()
+}
+
+type FindChildRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Entity ManagedObjectReference `xml:"entity"`
+	Name   string                 `xml:"name"`
+}
+
+func init() {
+	t["FindChildRequestType"] = reflect.TypeOf((*FindChildRequestType)(nil)).Elem()
+}
+
+type FindChildResponse struct {
+	Returnval *ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type FindExtension FindExtensionRequestType
+
+func init() {
+	t["FindExtension"] = reflect.TypeOf((*FindExtension)(nil)).Elem()
+}
+
+type FindExtensionRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	ExtensionKey string                 `xml:"extensionKey"`
+}
+
+func init() {
+	t["FindExtensionRequestType"] = reflect.TypeOf((*FindExtensionRequestType)(nil)).Elem()
+}
+
+type FindExtensionResponse struct {
+	Returnval *Extension `xml:"returnval,omitempty"`
+}
+
+type FindRulesForVm FindRulesForVmRequestType
+
+func init() {
+	t["FindRulesForVm"] = reflect.TypeOf((*FindRulesForVm)(nil)).Elem()
+}
+
+type FindRulesForVmRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Vm   ManagedObjectReference `xml:"vm"`
+}
+
+func init() {
+	t["FindRulesForVmRequestType"] = reflect.TypeOf((*FindRulesForVmRequestType)(nil)).Elem()
+}
+
+type FindRulesForVmResponse struct {
+	Returnval []BaseClusterRuleInfo `xml:"returnval,omitempty,typeattr"`
+}
+
+type FirewallProfile struct {
+	ApplyProfile
+
+	Ruleset []FirewallProfileRulesetProfile `xml:"ruleset,omitempty"`
+}
+
+func init() {
+	t["FirewallProfile"] = reflect.TypeOf((*FirewallProfile)(nil)).Elem()
+}
+
+type FirewallProfileRulesetProfile struct {
+	ApplyProfile
+
+	Key string `xml:"key"`
+}
+
+func init() {
+	t["FirewallProfileRulesetProfile"] = reflect.TypeOf((*FirewallProfileRulesetProfile)(nil)).Elem()
+}
+
+type FloatOption struct {
+	OptionType
+
+	Min          float32 `xml:"min"`
+	Max          float32 `xml:"max"`
+	DefaultValue float32 `xml:"defaultValue"`
+}
+
+func init() {
+	t["FloatOption"] = reflect.TypeOf((*FloatOption)(nil)).Elem()
+}
+
+type FloppyImageFileInfo struct {
+	FileInfo
+}
+
+func init() {
+	t["FloppyImageFileInfo"] = reflect.TypeOf((*FloppyImageFileInfo)(nil)).Elem()
+}
+
+type FloppyImageFileQuery struct {
+	FileQuery
+}
+
+func init() {
+	t["FloppyImageFileQuery"] = reflect.TypeOf((*FloppyImageFileQuery)(nil)).Elem()
+}
+
+type FolderEventArgument struct {
+	EntityEventArgument
+
+	Folder ManagedObjectReference `xml:"folder"`
+}
+
+func init() {
+	t["FolderEventArgument"] = reflect.TypeOf((*FolderEventArgument)(nil)).Elem()
+}
+
+type FolderFileInfo struct {
+	FileInfo
+}
+
+func init() {
+	t["FolderFileInfo"] = reflect.TypeOf((*FolderFileInfo)(nil)).Elem()
+}
+
+type FolderFileQuery struct {
+	FileQuery
+}
+
+func init() {
+	t["FolderFileQuery"] = reflect.TypeOf((*FolderFileQuery)(nil)).Elem()
+}
+
+type FormatVffs FormatVffsRequestType
+
+func init() {
+	t["FormatVffs"] = reflect.TypeOf((*FormatVffs)(nil)).Elem()
+}
+
+type FormatVffsRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	CreateSpec HostVffsSpec           `xml:"createSpec"`
+}
+
+func init() {
+	t["FormatVffsRequestType"] = reflect.TypeOf((*FormatVffsRequestType)(nil)).Elem()
+}
+
+type FormatVffsResponse struct {
+	Returnval HostVffsVolume `xml:"returnval"`
+}
+
+type FormatVmfs FormatVmfsRequestType
+
+func init() {
+	t["FormatVmfs"] = reflect.TypeOf((*FormatVmfs)(nil)).Elem()
+}
+
+type FormatVmfsRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	CreateSpec HostVmfsSpec           `xml:"createSpec"`
+}
+
+func init() {
+	t["FormatVmfsRequestType"] = reflect.TypeOf((*FormatVmfsRequestType)(nil)).Elem()
+}
+
+type FormatVmfsResponse struct {
+	Returnval HostVmfsVolume `xml:"returnval"`
+}
+
+type FtIssuesOnHost struct {
+	VmFaultToleranceIssue
+
+	Host     ManagedObjectReference `xml:"host"`
+	HostName string                 `xml:"hostName"`
+	Errors   []LocalizedMethodFault `xml:"errors,omitempty"`
+}
+
+func init() {
+	t["FtIssuesOnHost"] = reflect.TypeOf((*FtIssuesOnHost)(nil)).Elem()
+}
+
+type FtIssuesOnHostFault FtIssuesOnHost
+
+func init() {
+	t["FtIssuesOnHostFault"] = reflect.TypeOf((*FtIssuesOnHostFault)(nil)).Elem()
+}
+
+type FullStorageVMotionNotSupported struct {
+	MigrationFeatureNotSupported
+}
+
+func init() {
+	t["FullStorageVMotionNotSupported"] = reflect.TypeOf((*FullStorageVMotionNotSupported)(nil)).Elem()
+}
+
+type FullStorageVMotionNotSupportedFault FullStorageVMotionNotSupported
+
+func init() {
+	t["FullStorageVMotionNotSupportedFault"] = reflect.TypeOf((*FullStorageVMotionNotSupportedFault)(nil)).Elem()
+}
+
+type GatewayConnectFault struct {
+	HostConnectFault
+
+	GatewayType string              `xml:"gatewayType"`
+	GatewayId   string              `xml:"gatewayId"`
+	GatewayInfo string              `xml:"gatewayInfo"`
+	Details     *LocalizableMessage `xml:"details,omitempty"`
+}
+
+func init() {
+	t["GatewayConnectFault"] = reflect.TypeOf((*GatewayConnectFault)(nil)).Elem()
+}
+
+type GatewayConnectFaultFault BaseGatewayConnectFault
+
+func init() {
+	t["GatewayConnectFaultFault"] = reflect.TypeOf((*GatewayConnectFaultFault)(nil)).Elem()
+}
+
+type GatewayHostNotReachable struct {
+	GatewayToHostConnectFault
+}
+
+func init() {
+	t["GatewayHostNotReachable"] = reflect.TypeOf((*GatewayHostNotReachable)(nil)).Elem()
+}
+
+type GatewayHostNotReachableFault GatewayHostNotReachable
+
+func init() {
+	t["GatewayHostNotReachableFault"] = reflect.TypeOf((*GatewayHostNotReachableFault)(nil)).Elem()
+}
+
+type GatewayNotFound struct {
+	GatewayConnectFault
+}
+
+func init() {
+	t["GatewayNotFound"] = reflect.TypeOf((*GatewayNotFound)(nil)).Elem()
+}
+
+type GatewayNotFoundFault GatewayNotFound
+
+func init() {
+	t["GatewayNotFoundFault"] = reflect.TypeOf((*GatewayNotFoundFault)(nil)).Elem()
+}
+
+type GatewayNotReachable struct {
+	GatewayConnectFault
+}
+
+func init() {
+	t["GatewayNotReachable"] = reflect.TypeOf((*GatewayNotReachable)(nil)).Elem()
+}
+
+type GatewayNotReachableFault GatewayNotReachable
+
+func init() {
+	t["GatewayNotReachableFault"] = reflect.TypeOf((*GatewayNotReachableFault)(nil)).Elem()
+}
+
+type GatewayOperationRefused struct {
+	GatewayConnectFault
+}
+
+func init() {
+	t["GatewayOperationRefused"] = reflect.TypeOf((*GatewayOperationRefused)(nil)).Elem()
+}
+
+type GatewayOperationRefusedFault GatewayOperationRefused
+
+func init() {
+	t["GatewayOperationRefusedFault"] = reflect.TypeOf((*GatewayOperationRefusedFault)(nil)).Elem()
+}
+
+type GatewayToHostAuthFault struct {
+	GatewayToHostConnectFault
+
+	InvalidProperties []string `xml:"invalidProperties"`
+	MissingProperties []string `xml:"missingProperties"`
+}
+
+func init() {
+	t["GatewayToHostAuthFault"] = reflect.TypeOf((*GatewayToHostAuthFault)(nil)).Elem()
+}
+
+type GatewayToHostAuthFaultFault GatewayToHostAuthFault
+
+func init() {
+	t["GatewayToHostAuthFaultFault"] = reflect.TypeOf((*GatewayToHostAuthFaultFault)(nil)).Elem()
+}
+
+type GatewayToHostConnectFault struct {
+	GatewayConnectFault
+
+	Hostname string `xml:"hostname"`
+	Port     int32  `xml:"port,omitempty"`
+}
+
+func init() {
+	t["GatewayToHostConnectFault"] = reflect.TypeOf((*GatewayToHostConnectFault)(nil)).Elem()
+}
+
+type GatewayToHostConnectFaultFault BaseGatewayToHostConnectFault
+
+func init() {
+	t["GatewayToHostConnectFaultFault"] = reflect.TypeOf((*GatewayToHostConnectFaultFault)(nil)).Elem()
+}
+
+type GatewayToHostTrustVerifyFault struct {
+	GatewayToHostConnectFault
+
+	VerificationToken  string     `xml:"verificationToken"`
+	PropertiesToVerify []KeyValue `xml:"propertiesToVerify"`
+}
+
+func init() {
+	t["GatewayToHostTrustVerifyFault"] = reflect.TypeOf((*GatewayToHostTrustVerifyFault)(nil)).Elem()
+}
+
+type GatewayToHostTrustVerifyFaultFault GatewayToHostTrustVerifyFault
+
+func init() {
+	t["GatewayToHostTrustVerifyFaultFault"] = reflect.TypeOf((*GatewayToHostTrustVerifyFaultFault)(nil)).Elem()
+}
+
+type GeneralEvent struct {
+	Event
+
+	Message string `xml:"message"`
+}
+
+func init() {
+	t["GeneralEvent"] = reflect.TypeOf((*GeneralEvent)(nil)).Elem()
+}
+
+type GeneralHostErrorEvent struct {
+	GeneralEvent
+}
+
+func init() {
+	t["GeneralHostErrorEvent"] = reflect.TypeOf((*GeneralHostErrorEvent)(nil)).Elem()
+}
+
+type GeneralHostInfoEvent struct {
+	GeneralEvent
+}
+
+func init() {
+	t["GeneralHostInfoEvent"] = reflect.TypeOf((*GeneralHostInfoEvent)(nil)).Elem()
+}
+
+type GeneralHostWarningEvent struct {
+	GeneralEvent
+}
+
+func init() {
+	t["GeneralHostWarningEvent"] = reflect.TypeOf((*GeneralHostWarningEvent)(nil)).Elem()
+}
+
+type GeneralUserEvent struct {
+	GeneralEvent
+
+	Entity *ManagedEntityEventArgument `xml:"entity,omitempty"`
+}
+
+func init() {
+	t["GeneralUserEvent"] = reflect.TypeOf((*GeneralUserEvent)(nil)).Elem()
+}
+
+type GeneralVmErrorEvent struct {
+	GeneralEvent
+}
+
+func init() {
+	t["GeneralVmErrorEvent"] = reflect.TypeOf((*GeneralVmErrorEvent)(nil)).Elem()
+}
+
+type GeneralVmInfoEvent struct {
+	GeneralEvent
+}
+
+func init() {
+	t["GeneralVmInfoEvent"] = reflect.TypeOf((*GeneralVmInfoEvent)(nil)).Elem()
+}
+
+type GeneralVmWarningEvent struct {
+	GeneralEvent
+}
+
+func init() {
+	t["GeneralVmWarningEvent"] = reflect.TypeOf((*GeneralVmWarningEvent)(nil)).Elem()
+}
+
+type GenerateCertificateSigningRequest GenerateCertificateSigningRequestRequestType
+
+func init() {
+	t["GenerateCertificateSigningRequest"] = reflect.TypeOf((*GenerateCertificateSigningRequest)(nil)).Elem()
+}
+
+type GenerateCertificateSigningRequestByDn GenerateCertificateSigningRequestByDnRequestType
+
+func init() {
+	t["GenerateCertificateSigningRequestByDn"] = reflect.TypeOf((*GenerateCertificateSigningRequestByDn)(nil)).Elem()
+}
+
+type GenerateCertificateSigningRequestByDnRequestType struct {
+	This              ManagedObjectReference `xml:"_this"`
+	DistinguishedName string                 `xml:"distinguishedName"`
+}
+
+func init() {
+	t["GenerateCertificateSigningRequestByDnRequestType"] = reflect.TypeOf((*GenerateCertificateSigningRequestByDnRequestType)(nil)).Elem()
+}
+
+type GenerateCertificateSigningRequestByDnResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type GenerateCertificateSigningRequestRequestType struct {
+	This                     ManagedObjectReference `xml:"_this"`
+	UseIpAddressAsCommonName bool                   `xml:"useIpAddressAsCommonName"`
+}
+
+func init() {
+	t["GenerateCertificateSigningRequestRequestType"] = reflect.TypeOf((*GenerateCertificateSigningRequestRequestType)(nil)).Elem()
+}
+
+type GenerateCertificateSigningRequestResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type GenerateClientCsr GenerateClientCsrRequestType
+
+func init() {
+	t["GenerateClientCsr"] = reflect.TypeOf((*GenerateClientCsr)(nil)).Elem()
+}
+
+type GenerateClientCsrRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Cluster KeyProviderId          `xml:"cluster"`
+}
+
+func init() {
+	t["GenerateClientCsrRequestType"] = reflect.TypeOf((*GenerateClientCsrRequestType)(nil)).Elem()
+}
+
+type GenerateClientCsrResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type GenerateConfigTaskList GenerateConfigTaskListRequestType
+
+func init() {
+	t["GenerateConfigTaskList"] = reflect.TypeOf((*GenerateConfigTaskList)(nil)).Elem()
+}
+
+type GenerateConfigTaskListRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	ConfigSpec HostConfigSpec         `xml:"configSpec"`
+	Host       ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["GenerateConfigTaskListRequestType"] = reflect.TypeOf((*GenerateConfigTaskListRequestType)(nil)).Elem()
+}
+
+type GenerateConfigTaskListResponse struct {
+	Returnval HostProfileManagerConfigTaskList `xml:"returnval"`
+}
+
+type GenerateHostConfigTaskSpecRequestType struct {
+	This      ManagedObjectReference     `xml:"_this"`
+	HostsInfo []StructuredCustomizations `xml:"hostsInfo,omitempty"`
+}
+
+func init() {
+	t["GenerateHostConfigTaskSpecRequestType"] = reflect.TypeOf((*GenerateHostConfigTaskSpecRequestType)(nil)).Elem()
+}
+
+type GenerateHostConfigTaskSpec_Task GenerateHostConfigTaskSpecRequestType
+
+func init() {
+	t["GenerateHostConfigTaskSpec_Task"] = reflect.TypeOf((*GenerateHostConfigTaskSpec_Task)(nil)).Elem()
+}
+
+type GenerateHostConfigTaskSpec_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type GenerateHostProfileTaskListRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	ConfigSpec HostConfigSpec         `xml:"configSpec"`
+	Host       ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["GenerateHostProfileTaskListRequestType"] = reflect.TypeOf((*GenerateHostProfileTaskListRequestType)(nil)).Elem()
+}
+
+type GenerateHostProfileTaskList_Task GenerateHostProfileTaskListRequestType
+
+func init() {
+	t["GenerateHostProfileTaskList_Task"] = reflect.TypeOf((*GenerateHostProfileTaskList_Task)(nil)).Elem()
+}
+
+type GenerateHostProfileTaskList_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type GenerateKey GenerateKeyRequestType
+
+func init() {
+	t["GenerateKey"] = reflect.TypeOf((*GenerateKey)(nil)).Elem()
+}
+
+type GenerateKeyRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	KeyProvider *KeyProviderId         `xml:"keyProvider,omitempty"`
+}
+
+func init() {
+	t["GenerateKeyRequestType"] = reflect.TypeOf((*GenerateKeyRequestType)(nil)).Elem()
+}
+
+type GenerateKeyResponse struct {
+	Returnval CryptoKeyResult `xml:"returnval"`
+}
+
+type GenerateLogBundlesRequestType struct {
+	This           ManagedObjectReference   `xml:"_this"`
+	IncludeDefault bool                     `xml:"includeDefault"`
+	Host           []ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["GenerateLogBundlesRequestType"] = reflect.TypeOf((*GenerateLogBundlesRequestType)(nil)).Elem()
+}
+
+type GenerateLogBundles_Task GenerateLogBundlesRequestType
+
+func init() {
+	t["GenerateLogBundles_Task"] = reflect.TypeOf((*GenerateLogBundles_Task)(nil)).Elem()
+}
+
+type GenerateLogBundles_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type GenerateSelfSignedClientCert GenerateSelfSignedClientCertRequestType
+
+func init() {
+	t["GenerateSelfSignedClientCert"] = reflect.TypeOf((*GenerateSelfSignedClientCert)(nil)).Elem()
+}
+
+type GenerateSelfSignedClientCertRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Cluster KeyProviderId          `xml:"cluster"`
+}
+
+func init() {
+	t["GenerateSelfSignedClientCertRequestType"] = reflect.TypeOf((*GenerateSelfSignedClientCertRequestType)(nil)).Elem()
+}
+
+type GenerateSelfSignedClientCertResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type GenericDrsFault struct {
+	VimFault
+
+	HostFaults []LocalizedMethodFault `xml:"hostFaults,omitempty"`
+}
+
+func init() {
+	t["GenericDrsFault"] = reflect.TypeOf((*GenericDrsFault)(nil)).Elem()
+}
+
+type GenericDrsFaultFault GenericDrsFault
+
+func init() {
+	t["GenericDrsFaultFault"] = reflect.TypeOf((*GenericDrsFaultFault)(nil)).Elem()
+}
+
+type GenericVmConfigFault struct {
+	VmConfigFault
+
+	Reason string `xml:"reason"`
+}
+
+func init() {
+	t["GenericVmConfigFault"] = reflect.TypeOf((*GenericVmConfigFault)(nil)).Elem()
+}
+
+type GenericVmConfigFaultFault GenericVmConfigFault
+
+func init() {
+	t["GenericVmConfigFaultFault"] = reflect.TypeOf((*GenericVmConfigFaultFault)(nil)).Elem()
+}
+
+type GetAlarm GetAlarmRequestType
+
+func init() {
+	t["GetAlarm"] = reflect.TypeOf((*GetAlarm)(nil)).Elem()
+}
+
+type GetAlarmRequestType struct {
+	This   ManagedObjectReference  `xml:"_this"`
+	Entity *ManagedObjectReference `xml:"entity,omitempty"`
+}
+
+func init() {
+	t["GetAlarmRequestType"] = reflect.TypeOf((*GetAlarmRequestType)(nil)).Elem()
+}
+
+type GetAlarmResponse struct {
+	Returnval []ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type GetAlarmState GetAlarmStateRequestType
+
+func init() {
+	t["GetAlarmState"] = reflect.TypeOf((*GetAlarmState)(nil)).Elem()
+}
+
+type GetAlarmStateRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Entity ManagedObjectReference `xml:"entity"`
+}
+
+func init() {
+	t["GetAlarmStateRequestType"] = reflect.TypeOf((*GetAlarmStateRequestType)(nil)).Elem()
+}
+
+type GetAlarmStateResponse struct {
+	Returnval []AlarmState `xml:"returnval,omitempty"`
+}
+
+type GetCustomizationSpec GetCustomizationSpecRequestType
+
+func init() {
+	t["GetCustomizationSpec"] = reflect.TypeOf((*GetCustomizationSpec)(nil)).Elem()
+}
+
+type GetCustomizationSpecRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Name string                 `xml:"name"`
+}
+
+func init() {
+	t["GetCustomizationSpecRequestType"] = reflect.TypeOf((*GetCustomizationSpecRequestType)(nil)).Elem()
+}
+
+type GetCustomizationSpecResponse struct {
+	Returnval CustomizationSpecItem `xml:"returnval"`
+}
+
+type GetPublicKey GetPublicKeyRequestType
+
+func init() {
+	t["GetPublicKey"] = reflect.TypeOf((*GetPublicKey)(nil)).Elem()
+}
+
+type GetPublicKeyRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["GetPublicKeyRequestType"] = reflect.TypeOf((*GetPublicKeyRequestType)(nil)).Elem()
+}
+
+type GetPublicKeyResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type GetResourceUsage GetResourceUsageRequestType
+
+func init() {
+	t["GetResourceUsage"] = reflect.TypeOf((*GetResourceUsage)(nil)).Elem()
+}
+
+type GetResourceUsageRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["GetResourceUsageRequestType"] = reflect.TypeOf((*GetResourceUsageRequestType)(nil)).Elem()
+}
+
+type GetResourceUsageResponse struct {
+	Returnval ClusterResourceUsageSummary `xml:"returnval"`
+}
+
+type GetVchaClusterHealth GetVchaClusterHealthRequestType
+
+func init() {
+	t["GetVchaClusterHealth"] = reflect.TypeOf((*GetVchaClusterHealth)(nil)).Elem()
+}
+
+type GetVchaClusterHealthRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["GetVchaClusterHealthRequestType"] = reflect.TypeOf((*GetVchaClusterHealthRequestType)(nil)).Elem()
+}
+
+type GetVchaClusterHealthResponse struct {
+	Returnval VchaClusterHealth `xml:"returnval"`
+}
+
+type GetVsanObjExtAttrs GetVsanObjExtAttrsRequestType
+
+func init() {
+	t["GetVsanObjExtAttrs"] = reflect.TypeOf((*GetVsanObjExtAttrs)(nil)).Elem()
+}
+
+type GetVsanObjExtAttrsRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Uuids []string               `xml:"uuids"`
+}
+
+func init() {
+	t["GetVsanObjExtAttrsRequestType"] = reflect.TypeOf((*GetVsanObjExtAttrsRequestType)(nil)).Elem()
+}
+
+type GetVsanObjExtAttrsResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type GhostDvsProxySwitchDetectedEvent struct {
+	HostEvent
+
+	SwitchUuid []string `xml:"switchUuid"`
+}
+
+func init() {
+	t["GhostDvsProxySwitchDetectedEvent"] = reflect.TypeOf((*GhostDvsProxySwitchDetectedEvent)(nil)).Elem()
+}
+
+type GhostDvsProxySwitchRemovedEvent struct {
+	HostEvent
+
+	SwitchUuid []string `xml:"switchUuid"`
+}
+
+func init() {
+	t["GhostDvsProxySwitchRemovedEvent"] = reflect.TypeOf((*GhostDvsProxySwitchRemovedEvent)(nil)).Elem()
+}
+
+type GlobalMessageChangedEvent struct {
+	SessionEvent
+
+	Message     string `xml:"message"`
+	PrevMessage string `xml:"prevMessage,omitempty"`
+}
+
+func init() {
+	t["GlobalMessageChangedEvent"] = reflect.TypeOf((*GlobalMessageChangedEvent)(nil)).Elem()
+}
+
+type GroupAlarmAction struct {
+	AlarmAction
+
+	Action []BaseAlarmAction `xml:"action,typeattr"`
+}
+
+func init() {
+	t["GroupAlarmAction"] = reflect.TypeOf((*GroupAlarmAction)(nil)).Elem()
+}
+
+type GuestAliases struct {
+	DynamicData
+
+	Base64Cert string               `xml:"base64Cert"`
+	Aliases    []GuestAuthAliasInfo `xml:"aliases"`
+}
+
+func init() {
+	t["GuestAliases"] = reflect.TypeOf((*GuestAliases)(nil)).Elem()
+}
+
+type GuestAuthAliasInfo struct {
+	DynamicData
+
+	Subject BaseGuestAuthSubject `xml:"subject,typeattr"`
+	Comment string               `xml:"comment"`
+}
+
+func init() {
+	t["GuestAuthAliasInfo"] = reflect.TypeOf((*GuestAuthAliasInfo)(nil)).Elem()
+}
+
+type GuestAuthAnySubject struct {
+	GuestAuthSubject
+}
+
+func init() {
+	t["GuestAuthAnySubject"] = reflect.TypeOf((*GuestAuthAnySubject)(nil)).Elem()
+}
+
+type GuestAuthNamedSubject struct {
+	GuestAuthSubject
+
+	Name string `xml:"name"`
+}
+
+func init() {
+	t["GuestAuthNamedSubject"] = reflect.TypeOf((*GuestAuthNamedSubject)(nil)).Elem()
+}
+
+type GuestAuthSubject struct {
+	DynamicData
+}
+
+func init() {
+	t["GuestAuthSubject"] = reflect.TypeOf((*GuestAuthSubject)(nil)).Elem()
+}
+
+type GuestAuthentication struct {
+	DynamicData
+
+	InteractiveSession bool `xml:"interactiveSession"`
+}
+
+func init() {
+	t["GuestAuthentication"] = reflect.TypeOf((*GuestAuthentication)(nil)).Elem()
+}
+
+type GuestAuthenticationChallenge struct {
+	GuestOperationsFault
+
+	ServerChallenge BaseGuestAuthentication `xml:"serverChallenge,typeattr"`
+	SessionID       int64                   `xml:"sessionID"`
+}
+
+func init() {
+	t["GuestAuthenticationChallenge"] = reflect.TypeOf((*GuestAuthenticationChallenge)(nil)).Elem()
+}
+
+type GuestAuthenticationChallengeFault GuestAuthenticationChallenge
+
+func init() {
+	t["GuestAuthenticationChallengeFault"] = reflect.TypeOf((*GuestAuthenticationChallengeFault)(nil)).Elem()
+}
+
+type GuestComponentsOutOfDate struct {
+	GuestOperationsFault
+}
+
+func init() {
+	t["GuestComponentsOutOfDate"] = reflect.TypeOf((*GuestComponentsOutOfDate)(nil)).Elem()
+}
+
+type GuestComponentsOutOfDateFault GuestComponentsOutOfDate
+
+func init() {
+	t["GuestComponentsOutOfDateFault"] = reflect.TypeOf((*GuestComponentsOutOfDateFault)(nil)).Elem()
+}
+
+type GuestDiskInfo struct {
+	DynamicData
+
+	DiskPath  string `xml:"diskPath,omitempty"`
+	Capacity  int64  `xml:"capacity,omitempty"`
+	FreeSpace int64  `xml:"freeSpace,omitempty"`
+}
+
+func init() {
+	t["GuestDiskInfo"] = reflect.TypeOf((*GuestDiskInfo)(nil)).Elem()
+}
+
+type GuestFileAttributes struct {
+	DynamicData
+
+	ModificationTime *time.Time `xml:"modificationTime"`
+	AccessTime       *time.Time `xml:"accessTime"`
+	SymlinkTarget    string     `xml:"symlinkTarget,omitempty"`
+}
+
+func init() {
+	t["GuestFileAttributes"] = reflect.TypeOf((*GuestFileAttributes)(nil)).Elem()
+}
+
+type GuestFileInfo struct {
+	DynamicData
+
+	Path       string                  `xml:"path"`
+	Type       string                  `xml:"type"`
+	Size       int64                   `xml:"size"`
+	Attributes BaseGuestFileAttributes `xml:"attributes,typeattr"`
+}
+
+func init() {
+	t["GuestFileInfo"] = reflect.TypeOf((*GuestFileInfo)(nil)).Elem()
+}
+
+type GuestInfo struct {
+	DynamicData
+
+	ToolsStatus                     VirtualMachineToolsStatus          `xml:"toolsStatus,omitempty"`
+	ToolsVersionStatus              string                             `xml:"toolsVersionStatus,omitempty"`
+	ToolsVersionStatus2             string                             `xml:"toolsVersionStatus2,omitempty"`
+	ToolsRunningStatus              string                             `xml:"toolsRunningStatus,omitempty"`
+	ToolsVersion                    string                             `xml:"toolsVersion,omitempty"`
+	ToolsInstallType                string                             `xml:"toolsInstallType,omitempty"`
+	GuestId                         string                             `xml:"guestId,omitempty"`
+	GuestFamily                     string                             `xml:"guestFamily,omitempty"`
+	GuestFullName                   string                             `xml:"guestFullName,omitempty"`
+	HostName                        string                             `xml:"hostName,omitempty"`
+	IpAddress                       string                             `xml:"ipAddress,omitempty"`
+	Net                             []GuestNicInfo                     `xml:"net,omitempty"`
+	IpStack                         []GuestStackInfo                   `xml:"ipStack,omitempty"`
+	Disk                            []GuestDiskInfo                    `xml:"disk,omitempty"`
+	Screen                          *GuestScreenInfo                   `xml:"screen,omitempty"`
+	GuestState                      string                             `xml:"guestState"`
+	AppHeartbeatStatus              string                             `xml:"appHeartbeatStatus,omitempty"`
+	GuestKernelCrashed              *bool                              `xml:"guestKernelCrashed"`
+	AppState                        string                             `xml:"appState,omitempty"`
+	GuestOperationsReady            *bool                              `xml:"guestOperationsReady"`
+	InteractiveGuestOperationsReady *bool                              `xml:"interactiveGuestOperationsReady"`
+	GuestStateChangeSupported       *bool                              `xml:"guestStateChangeSupported"`
+	GenerationInfo                  []GuestInfoNamespaceGenerationInfo `xml:"generationInfo,omitempty"`
+}
+
+func init() {
+	t["GuestInfo"] = reflect.TypeOf((*GuestInfo)(nil)).Elem()
+}
+
+type GuestInfoNamespaceGenerationInfo struct {
+	DynamicData
+
+	Key          string `xml:"key"`
+	GenerationNo int32  `xml:"generationNo"`
+}
+
+func init() {
+	t["GuestInfoNamespaceGenerationInfo"] = reflect.TypeOf((*GuestInfoNamespaceGenerationInfo)(nil)).Elem()
+}
+
+type GuestListFileInfo struct {
+	DynamicData
+
+	Files     []GuestFileInfo `xml:"files,omitempty"`
+	Remaining int32           `xml:"remaining"`
+}
+
+func init() {
+	t["GuestListFileInfo"] = reflect.TypeOf((*GuestListFileInfo)(nil)).Elem()
+}
+
+type GuestMappedAliases struct {
+	DynamicData
+
+	Base64Cert string                 `xml:"base64Cert"`
+	Username   string                 `xml:"username"`
+	Subjects   []BaseGuestAuthSubject `xml:"subjects,typeattr"`
+}
+
+func init() {
+	t["GuestMappedAliases"] = reflect.TypeOf((*GuestMappedAliases)(nil)).Elem()
+}
+
+type GuestMultipleMappings struct {
+	GuestOperationsFault
+}
+
+func init() {
+	t["GuestMultipleMappings"] = reflect.TypeOf((*GuestMultipleMappings)(nil)).Elem()
+}
+
+type GuestMultipleMappingsFault GuestMultipleMappings
+
+func init() {
+	t["GuestMultipleMappingsFault"] = reflect.TypeOf((*GuestMultipleMappingsFault)(nil)).Elem()
+}
+
+type GuestNicInfo struct {
+	DynamicData
+
+	Network        string                `xml:"network,omitempty"`
+	IpAddress      []string              `xml:"ipAddress,omitempty"`
+	MacAddress     string                `xml:"macAddress,omitempty"`
+	Connected      bool                  `xml:"connected"`
+	DeviceConfigId int32                 `xml:"deviceConfigId"`
+	DnsConfig      *NetDnsConfigInfo     `xml:"dnsConfig,omitempty"`
+	IpConfig       *NetIpConfigInfo      `xml:"ipConfig,omitempty"`
+	NetBIOSConfig  BaseNetBIOSConfigInfo `xml:"netBIOSConfig,omitempty,typeattr"`
+}
+
+func init() {
+	t["GuestNicInfo"] = reflect.TypeOf((*GuestNicInfo)(nil)).Elem()
+}
+
+type GuestOperationsFault struct {
+	VimFault
+}
+
+func init() {
+	t["GuestOperationsFault"] = reflect.TypeOf((*GuestOperationsFault)(nil)).Elem()
+}
+
+type GuestOperationsFaultFault BaseGuestOperationsFault
+
+func init() {
+	t["GuestOperationsFaultFault"] = reflect.TypeOf((*GuestOperationsFaultFault)(nil)).Elem()
+}
+
+type GuestOperationsUnavailable struct {
+	GuestOperationsFault
+}
+
+func init() {
+	t["GuestOperationsUnavailable"] = reflect.TypeOf((*GuestOperationsUnavailable)(nil)).Elem()
+}
+
+type GuestOperationsUnavailableFault GuestOperationsUnavailable
+
+func init() {
+	t["GuestOperationsUnavailableFault"] = reflect.TypeOf((*GuestOperationsUnavailableFault)(nil)).Elem()
+}
+
+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"`
+}
+
+func init() {
+	t["GuestOsDescriptor"] = reflect.TypeOf((*GuestOsDescriptor)(nil)).Elem()
+}
+
+type GuestPermissionDenied struct {
+	GuestOperationsFault
+}
+
+func init() {
+	t["GuestPermissionDenied"] = reflect.TypeOf((*GuestPermissionDenied)(nil)).Elem()
+}
+
+type GuestPermissionDeniedFault GuestPermissionDenied
+
+func init() {
+	t["GuestPermissionDeniedFault"] = reflect.TypeOf((*GuestPermissionDeniedFault)(nil)).Elem()
+}
+
+type GuestPosixFileAttributes struct {
+	GuestFileAttributes
+
+	OwnerId     int32 `xml:"ownerId,omitempty"`
+	GroupId     int32 `xml:"groupId,omitempty"`
+	Permissions int64 `xml:"permissions,omitempty"`
+}
+
+func init() {
+	t["GuestPosixFileAttributes"] = reflect.TypeOf((*GuestPosixFileAttributes)(nil)).Elem()
+}
+
+type GuestProcessInfo struct {
+	DynamicData
+
+	Name      string     `xml:"name"`
+	Pid       int64      `xml:"pid"`
+	Owner     string     `xml:"owner"`
+	CmdLine   string     `xml:"cmdLine"`
+	StartTime time.Time  `xml:"startTime"`
+	EndTime   *time.Time `xml:"endTime"`
+	ExitCode  int32      `xml:"exitCode,omitempty"`
+}
+
+func init() {
+	t["GuestProcessInfo"] = reflect.TypeOf((*GuestProcessInfo)(nil)).Elem()
+}
+
+type GuestProcessNotFound struct {
+	GuestOperationsFault
+
+	Pid int64 `xml:"pid"`
+}
+
+func init() {
+	t["GuestProcessNotFound"] = reflect.TypeOf((*GuestProcessNotFound)(nil)).Elem()
+}
+
+type GuestProcessNotFoundFault GuestProcessNotFound
+
+func init() {
+	t["GuestProcessNotFoundFault"] = reflect.TypeOf((*GuestProcessNotFoundFault)(nil)).Elem()
+}
+
+type GuestProgramSpec struct {
+	DynamicData
+
+	ProgramPath      string   `xml:"programPath"`
+	Arguments        string   `xml:"arguments"`
+	WorkingDirectory string   `xml:"workingDirectory,omitempty"`
+	EnvVariables     []string `xml:"envVariables,omitempty"`
+}
+
+func init() {
+	t["GuestProgramSpec"] = reflect.TypeOf((*GuestProgramSpec)(nil)).Elem()
+}
+
+type GuestRegKeyNameSpec struct {
+	DynamicData
+
+	RegistryPath string `xml:"registryPath"`
+	WowBitness   string `xml:"wowBitness"`
+}
+
+func init() {
+	t["GuestRegKeyNameSpec"] = reflect.TypeOf((*GuestRegKeyNameSpec)(nil)).Elem()
+}
+
+type GuestRegKeyRecordSpec struct {
+	DynamicData
+
+	Key   GuestRegKeySpec       `xml:"key"`
+	Fault *LocalizedMethodFault `xml:"fault,omitempty"`
+}
+
+func init() {
+	t["GuestRegKeyRecordSpec"] = reflect.TypeOf((*GuestRegKeyRecordSpec)(nil)).Elem()
+}
+
+type GuestRegKeySpec struct {
+	DynamicData
+
+	KeyName     GuestRegKeyNameSpec `xml:"keyName"`
+	ClassType   string              `xml:"classType"`
+	LastWritten time.Time           `xml:"lastWritten"`
+}
+
+func init() {
+	t["GuestRegKeySpec"] = reflect.TypeOf((*GuestRegKeySpec)(nil)).Elem()
+}
+
+type GuestRegValueBinarySpec struct {
+	GuestRegValueDataSpec
+
+	Value []byte `xml:"value,omitempty"`
+}
+
+func init() {
+	t["GuestRegValueBinarySpec"] = reflect.TypeOf((*GuestRegValueBinarySpec)(nil)).Elem()
+}
+
+type GuestRegValueDataSpec struct {
+	DynamicData
+}
+
+func init() {
+	t["GuestRegValueDataSpec"] = reflect.TypeOf((*GuestRegValueDataSpec)(nil)).Elem()
+}
+
+type GuestRegValueDwordSpec struct {
+	GuestRegValueDataSpec
+
+	Value int32 `xml:"value"`
+}
+
+func init() {
+	t["GuestRegValueDwordSpec"] = reflect.TypeOf((*GuestRegValueDwordSpec)(nil)).Elem()
+}
+
+type GuestRegValueExpandStringSpec struct {
+	GuestRegValueDataSpec
+
+	Value string `xml:"value,omitempty"`
+}
+
+func init() {
+	t["GuestRegValueExpandStringSpec"] = reflect.TypeOf((*GuestRegValueExpandStringSpec)(nil)).Elem()
+}
+
+type GuestRegValueMultiStringSpec struct {
+	GuestRegValueDataSpec
+
+	Value []string `xml:"value,omitempty"`
+}
+
+func init() {
+	t["GuestRegValueMultiStringSpec"] = reflect.TypeOf((*GuestRegValueMultiStringSpec)(nil)).Elem()
+}
+
+type GuestRegValueNameSpec struct {
+	DynamicData
+
+	KeyName GuestRegKeyNameSpec `xml:"keyName"`
+	Name    string              `xml:"name"`
+}
+
+func init() {
+	t["GuestRegValueNameSpec"] = reflect.TypeOf((*GuestRegValueNameSpec)(nil)).Elem()
+}
+
+type GuestRegValueQwordSpec struct {
+	GuestRegValueDataSpec
+
+	Value int64 `xml:"value"`
+}
+
+func init() {
+	t["GuestRegValueQwordSpec"] = reflect.TypeOf((*GuestRegValueQwordSpec)(nil)).Elem()
+}
+
+type GuestRegValueSpec struct {
+	DynamicData
+
+	Name GuestRegValueNameSpec     `xml:"name"`
+	Data BaseGuestRegValueDataSpec `xml:"data,typeattr"`
+}
+
+func init() {
+	t["GuestRegValueSpec"] = reflect.TypeOf((*GuestRegValueSpec)(nil)).Elem()
+}
+
+type GuestRegValueStringSpec struct {
+	GuestRegValueDataSpec
+
+	Value string `xml:"value,omitempty"`
+}
+
+func init() {
+	t["GuestRegValueStringSpec"] = reflect.TypeOf((*GuestRegValueStringSpec)(nil)).Elem()
+}
+
+type GuestRegistryFault struct {
+	GuestOperationsFault
+
+	WindowsSystemErrorCode int64 `xml:"windowsSystemErrorCode"`
+}
+
+func init() {
+	t["GuestRegistryFault"] = reflect.TypeOf((*GuestRegistryFault)(nil)).Elem()
+}
+
+type GuestRegistryFaultFault BaseGuestRegistryFault
+
+func init() {
+	t["GuestRegistryFaultFault"] = reflect.TypeOf((*GuestRegistryFaultFault)(nil)).Elem()
+}
+
+type GuestRegistryKeyAlreadyExists struct {
+	GuestRegistryKeyFault
+}
+
+func init() {
+	t["GuestRegistryKeyAlreadyExists"] = reflect.TypeOf((*GuestRegistryKeyAlreadyExists)(nil)).Elem()
+}
+
+type GuestRegistryKeyAlreadyExistsFault GuestRegistryKeyAlreadyExists
+
+func init() {
+	t["GuestRegistryKeyAlreadyExistsFault"] = reflect.TypeOf((*GuestRegistryKeyAlreadyExistsFault)(nil)).Elem()
+}
+
+type GuestRegistryKeyFault struct {
+	GuestRegistryFault
+
+	KeyName string `xml:"keyName"`
+}
+
+func init() {
+	t["GuestRegistryKeyFault"] = reflect.TypeOf((*GuestRegistryKeyFault)(nil)).Elem()
+}
+
+type GuestRegistryKeyFaultFault BaseGuestRegistryKeyFault
+
+func init() {
+	t["GuestRegistryKeyFaultFault"] = reflect.TypeOf((*GuestRegistryKeyFaultFault)(nil)).Elem()
+}
+
+type GuestRegistryKeyHasSubkeys struct {
+	GuestRegistryKeyFault
+}
+
+func init() {
+	t["GuestRegistryKeyHasSubkeys"] = reflect.TypeOf((*GuestRegistryKeyHasSubkeys)(nil)).Elem()
+}
+
+type GuestRegistryKeyHasSubkeysFault GuestRegistryKeyHasSubkeys
+
+func init() {
+	t["GuestRegistryKeyHasSubkeysFault"] = reflect.TypeOf((*GuestRegistryKeyHasSubkeysFault)(nil)).Elem()
+}
+
+type GuestRegistryKeyInvalid struct {
+	GuestRegistryKeyFault
+}
+
+func init() {
+	t["GuestRegistryKeyInvalid"] = reflect.TypeOf((*GuestRegistryKeyInvalid)(nil)).Elem()
+}
+
+type GuestRegistryKeyInvalidFault GuestRegistryKeyInvalid
+
+func init() {
+	t["GuestRegistryKeyInvalidFault"] = reflect.TypeOf((*GuestRegistryKeyInvalidFault)(nil)).Elem()
+}
+
+type GuestRegistryKeyParentVolatile struct {
+	GuestRegistryKeyFault
+}
+
+func init() {
+	t["GuestRegistryKeyParentVolatile"] = reflect.TypeOf((*GuestRegistryKeyParentVolatile)(nil)).Elem()
+}
+
+type GuestRegistryKeyParentVolatileFault GuestRegistryKeyParentVolatile
+
+func init() {
+	t["GuestRegistryKeyParentVolatileFault"] = reflect.TypeOf((*GuestRegistryKeyParentVolatileFault)(nil)).Elem()
+}
+
+type GuestRegistryValueFault struct {
+	GuestRegistryFault
+
+	KeyName   string `xml:"keyName"`
+	ValueName string `xml:"valueName"`
+}
+
+func init() {
+	t["GuestRegistryValueFault"] = reflect.TypeOf((*GuestRegistryValueFault)(nil)).Elem()
+}
+
+type GuestRegistryValueFaultFault BaseGuestRegistryValueFault
+
+func init() {
+	t["GuestRegistryValueFaultFault"] = reflect.TypeOf((*GuestRegistryValueFaultFault)(nil)).Elem()
+}
+
+type GuestRegistryValueNotFound struct {
+	GuestRegistryValueFault
+}
+
+func init() {
+	t["GuestRegistryValueNotFound"] = reflect.TypeOf((*GuestRegistryValueNotFound)(nil)).Elem()
+}
+
+type GuestRegistryValueNotFoundFault GuestRegistryValueNotFound
+
+func init() {
+	t["GuestRegistryValueNotFoundFault"] = reflect.TypeOf((*GuestRegistryValueNotFoundFault)(nil)).Elem()
+}
+
+type GuestScreenInfo struct {
+	DynamicData
+
+	Width  int32 `xml:"width"`
+	Height int32 `xml:"height"`
+}
+
+func init() {
+	t["GuestScreenInfo"] = reflect.TypeOf((*GuestScreenInfo)(nil)).Elem()
+}
+
+type GuestStackInfo struct {
+	DynamicData
+
+	DnsConfig     *NetDnsConfigInfo     `xml:"dnsConfig,omitempty"`
+	IpRouteConfig *NetIpRouteConfigInfo `xml:"ipRouteConfig,omitempty"`
+	IpStackConfig []KeyValue            `xml:"ipStackConfig,omitempty"`
+	DhcpConfig    *NetDhcpConfigInfo    `xml:"dhcpConfig,omitempty"`
+}
+
+func init() {
+	t["GuestStackInfo"] = reflect.TypeOf((*GuestStackInfo)(nil)).Elem()
+}
+
+type GuestWindowsFileAttributes struct {
+	GuestFileAttributes
+
+	Hidden     *bool      `xml:"hidden"`
+	ReadOnly   *bool      `xml:"readOnly"`
+	CreateTime *time.Time `xml:"createTime"`
+}
+
+func init() {
+	t["GuestWindowsFileAttributes"] = reflect.TypeOf((*GuestWindowsFileAttributes)(nil)).Elem()
+}
+
+type GuestWindowsProgramSpec struct {
+	GuestProgramSpec
+
+	StartMinimized bool `xml:"startMinimized"`
+}
+
+func init() {
+	t["GuestWindowsProgramSpec"] = reflect.TypeOf((*GuestWindowsProgramSpec)(nil)).Elem()
+}
+
+type HAErrorsAtDest struct {
+	MigrationFault
+}
+
+func init() {
+	t["HAErrorsAtDest"] = reflect.TypeOf((*HAErrorsAtDest)(nil)).Elem()
+}
+
+type HAErrorsAtDestFault HAErrorsAtDest
+
+func init() {
+	t["HAErrorsAtDestFault"] = reflect.TypeOf((*HAErrorsAtDestFault)(nil)).Elem()
+}
+
+type HasMonitoredEntity HasMonitoredEntityRequestType
+
+func init() {
+	t["HasMonitoredEntity"] = reflect.TypeOf((*HasMonitoredEntity)(nil)).Elem()
+}
+
+type HasMonitoredEntityRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	ProviderId string                 `xml:"providerId"`
+	Entity     ManagedObjectReference `xml:"entity"`
+}
+
+func init() {
+	t["HasMonitoredEntityRequestType"] = reflect.TypeOf((*HasMonitoredEntityRequestType)(nil)).Elem()
+}
+
+type HasMonitoredEntityResponse struct {
+	Returnval bool `xml:"returnval"`
+}
+
+type HasPrivilegeOnEntities HasPrivilegeOnEntitiesRequestType
+
+func init() {
+	t["HasPrivilegeOnEntities"] = reflect.TypeOf((*HasPrivilegeOnEntities)(nil)).Elem()
+}
+
+type HasPrivilegeOnEntitiesRequestType struct {
+	This      ManagedObjectReference   `xml:"_this"`
+	Entity    []ManagedObjectReference `xml:"entity"`
+	SessionId string                   `xml:"sessionId"`
+	PrivId    []string                 `xml:"privId,omitempty"`
+}
+
+func init() {
+	t["HasPrivilegeOnEntitiesRequestType"] = reflect.TypeOf((*HasPrivilegeOnEntitiesRequestType)(nil)).Elem()
+}
+
+type HasPrivilegeOnEntitiesResponse struct {
+	Returnval []EntityPrivilege `xml:"returnval,omitempty"`
+}
+
+type HasPrivilegeOnEntity HasPrivilegeOnEntityRequestType
+
+func init() {
+	t["HasPrivilegeOnEntity"] = reflect.TypeOf((*HasPrivilegeOnEntity)(nil)).Elem()
+}
+
+type HasPrivilegeOnEntityRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Entity    ManagedObjectReference `xml:"entity"`
+	SessionId string                 `xml:"sessionId"`
+	PrivId    []string               `xml:"privId,omitempty"`
+}
+
+func init() {
+	t["HasPrivilegeOnEntityRequestType"] = reflect.TypeOf((*HasPrivilegeOnEntityRequestType)(nil)).Elem()
+}
+
+type HasPrivilegeOnEntityResponse struct {
+	Returnval []bool `xml:"returnval,omitempty"`
+}
+
+type HasProvider HasProviderRequestType
+
+func init() {
+	t["HasProvider"] = reflect.TypeOf((*HasProvider)(nil)).Elem()
+}
+
+type HasProviderRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Id   string                 `xml:"id"`
+}
+
+func init() {
+	t["HasProviderRequestType"] = reflect.TypeOf((*HasProviderRequestType)(nil)).Elem()
+}
+
+type HasProviderResponse struct {
+	Returnval bool `xml:"returnval"`
+}
+
+type HasUserPrivilegeOnEntities HasUserPrivilegeOnEntitiesRequestType
+
+func init() {
+	t["HasUserPrivilegeOnEntities"] = reflect.TypeOf((*HasUserPrivilegeOnEntities)(nil)).Elem()
+}
+
+type HasUserPrivilegeOnEntitiesRequestType struct {
+	This     ManagedObjectReference   `xml:"_this"`
+	Entities []ManagedObjectReference `xml:"entities"`
+	UserName string                   `xml:"userName"`
+	PrivId   []string                 `xml:"privId,omitempty"`
+}
+
+func init() {
+	t["HasUserPrivilegeOnEntitiesRequestType"] = reflect.TypeOf((*HasUserPrivilegeOnEntitiesRequestType)(nil)).Elem()
+}
+
+type HasUserPrivilegeOnEntitiesResponse struct {
+	Returnval []EntityPrivilege `xml:"returnval,omitempty"`
+}
+
+type HbrDiskMigrationAction struct {
+	ClusterAction
+
+	CollectionId       string                 `xml:"collectionId"`
+	CollectionName     string                 `xml:"collectionName"`
+	DiskIds            []string               `xml:"diskIds"`
+	Source             ManagedObjectReference `xml:"source"`
+	Destination        ManagedObjectReference `xml:"destination"`
+	SizeTransferred    int64                  `xml:"sizeTransferred"`
+	SpaceUtilSrcBefore float32                `xml:"spaceUtilSrcBefore,omitempty"`
+	SpaceUtilDstBefore float32                `xml:"spaceUtilDstBefore,omitempty"`
+	SpaceUtilSrcAfter  float32                `xml:"spaceUtilSrcAfter,omitempty"`
+	SpaceUtilDstAfter  float32                `xml:"spaceUtilDstAfter,omitempty"`
+	IoLatencySrcBefore float32                `xml:"ioLatencySrcBefore,omitempty"`
+	IoLatencyDstBefore float32                `xml:"ioLatencyDstBefore,omitempty"`
+}
+
+func init() {
+	t["HbrDiskMigrationAction"] = reflect.TypeOf((*HbrDiskMigrationAction)(nil)).Elem()
+}
+
+type HbrManagerReplicationVmInfo struct {
+	DynamicData
+
+	State        string                     `xml:"state"`
+	ProgressInfo *ReplicationVmProgressInfo `xml:"progressInfo,omitempty"`
+	ImageId      string                     `xml:"imageId,omitempty"`
+	LastError    *LocalizedMethodFault      `xml:"lastError,omitempty"`
+}
+
+func init() {
+	t["HbrManagerReplicationVmInfo"] = reflect.TypeOf((*HbrManagerReplicationVmInfo)(nil)).Elem()
+}
+
+type HbrManagerVmReplicationCapability struct {
+	DynamicData
+
+	Vm                             ManagedObjectReference `xml:"vm"`
+	SupportedQuiesceMode           string                 `xml:"supportedQuiesceMode"`
+	CompressionSupported           bool                   `xml:"compressionSupported"`
+	MaxSupportedSourceDiskCapacity int64                  `xml:"maxSupportedSourceDiskCapacity"`
+	MinRpo                         int64                  `xml:"minRpo,omitempty"`
+	Fault                          *LocalizedMethodFault  `xml:"fault,omitempty"`
+}
+
+func init() {
+	t["HbrManagerVmReplicationCapability"] = reflect.TypeOf((*HbrManagerVmReplicationCapability)(nil)).Elem()
+}
+
+type HealthStatusChangedEvent struct {
+	Event
+
+	ComponentId   string `xml:"componentId"`
+	OldStatus     string `xml:"oldStatus"`
+	NewStatus     string `xml:"newStatus"`
+	ComponentName string `xml:"componentName"`
+	ServiceId     string `xml:"serviceId,omitempty"`
+}
+
+func init() {
+	t["HealthStatusChangedEvent"] = reflect.TypeOf((*HealthStatusChangedEvent)(nil)).Elem()
+}
+
+type HealthSystemRuntime struct {
+	DynamicData
+
+	SystemHealthInfo   *HostSystemHealthInfo   `xml:"systemHealthInfo,omitempty"`
+	HardwareStatusInfo *HostHardwareStatusInfo `xml:"hardwareStatusInfo,omitempty"`
+}
+
+func init() {
+	t["HealthSystemRuntime"] = reflect.TypeOf((*HealthSystemRuntime)(nil)).Elem()
+}
+
+type HealthUpdate struct {
+	DynamicData
+
+	Entity             ManagedObjectReference `xml:"entity"`
+	HealthUpdateInfoId string                 `xml:"healthUpdateInfoId"`
+	Id                 string                 `xml:"id"`
+	Status             ManagedEntityStatus    `xml:"status"`
+	Remediation        string                 `xml:"remediation"`
+}
+
+func init() {
+	t["HealthUpdate"] = reflect.TypeOf((*HealthUpdate)(nil)).Elem()
+}
+
+type HealthUpdateInfo struct {
+	DynamicData
+
+	Id            string `xml:"id"`
+	ComponentType string `xml:"componentType"`
+	Description   string `xml:"description"`
+}
+
+func init() {
+	t["HealthUpdateInfo"] = reflect.TypeOf((*HealthUpdateInfo)(nil)).Elem()
+}
+
+type HeterogenousHostsBlockingEVC struct {
+	EVCConfigFault
+}
+
+func init() {
+	t["HeterogenousHostsBlockingEVC"] = reflect.TypeOf((*HeterogenousHostsBlockingEVC)(nil)).Elem()
+}
+
+type HeterogenousHostsBlockingEVCFault HeterogenousHostsBlockingEVC
+
+func init() {
+	t["HeterogenousHostsBlockingEVCFault"] = reflect.TypeOf((*HeterogenousHostsBlockingEVCFault)(nil)).Elem()
+}
+
+type HostAccessControlEntry struct {
+	DynamicData
+
+	Principal  string         `xml:"principal"`
+	Group      bool           `xml:"group"`
+	AccessMode HostAccessMode `xml:"accessMode"`
+}
+
+func init() {
+	t["HostAccessControlEntry"] = reflect.TypeOf((*HostAccessControlEntry)(nil)).Elem()
+}
+
+type HostAccessRestrictedToManagementServer struct {
+	NotSupported
+
+	ManagementServer string `xml:"managementServer"`
+}
+
+func init() {
+	t["HostAccessRestrictedToManagementServer"] = reflect.TypeOf((*HostAccessRestrictedToManagementServer)(nil)).Elem()
+}
+
+type HostAccessRestrictedToManagementServerFault HostAccessRestrictedToManagementServer
+
+func init() {
+	t["HostAccessRestrictedToManagementServerFault"] = reflect.TypeOf((*HostAccessRestrictedToManagementServerFault)(nil)).Elem()
+}
+
+type HostAccountSpec struct {
+	DynamicData
+
+	Id          string `xml:"id"`
+	Password    string `xml:"password,omitempty"`
+	Description string `xml:"description,omitempty"`
+}
+
+func init() {
+	t["HostAccountSpec"] = reflect.TypeOf((*HostAccountSpec)(nil)).Elem()
+}
+
+type HostActiveDirectory struct {
+	DynamicData
+
+	ChangeOperation string                   `xml:"changeOperation"`
+	Spec            *HostActiveDirectorySpec `xml:"spec,omitempty"`
+}
+
+func init() {
+	t["HostActiveDirectory"] = reflect.TypeOf((*HostActiveDirectory)(nil)).Elem()
+}
+
+type HostActiveDirectoryInfo struct {
+	HostDirectoryStoreInfo
+
+	JoinedDomain                   string   `xml:"joinedDomain,omitempty"`
+	TrustedDomain                  []string `xml:"trustedDomain,omitempty"`
+	DomainMembershipStatus         string   `xml:"domainMembershipStatus,omitempty"`
+	SmartCardAuthenticationEnabled *bool    `xml:"smartCardAuthenticationEnabled"`
+}
+
+func init() {
+	t["HostActiveDirectoryInfo"] = reflect.TypeOf((*HostActiveDirectoryInfo)(nil)).Elem()
+}
+
+type HostActiveDirectorySpec struct {
+	DynamicData
+
+	DomainName                     string   `xml:"domainName,omitempty"`
+	UserName                       string   `xml:"userName,omitempty"`
+	Password                       string   `xml:"password,omitempty"`
+	CamServer                      string   `xml:"camServer,omitempty"`
+	Thumbprint                     string   `xml:"thumbprint,omitempty"`
+	SmartCardAuthenticationEnabled *bool    `xml:"smartCardAuthenticationEnabled"`
+	SmartCardTrustAnchors          []string `xml:"smartCardTrustAnchors,omitempty"`
+}
+
+func init() {
+	t["HostActiveDirectorySpec"] = reflect.TypeOf((*HostActiveDirectorySpec)(nil)).Elem()
+}
+
+type HostAddFailedEvent struct {
+	HostEvent
+
+	Hostname string `xml:"hostname"`
+}
+
+func init() {
+	t["HostAddFailedEvent"] = reflect.TypeOf((*HostAddFailedEvent)(nil)).Elem()
+}
+
+type HostAddedEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostAddedEvent"] = reflect.TypeOf((*HostAddedEvent)(nil)).Elem()
+}
+
+type HostAdminDisableEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostAdminDisableEvent"] = reflect.TypeOf((*HostAdminDisableEvent)(nil)).Elem()
+}
+
+type HostAdminEnableEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostAdminEnableEvent"] = reflect.TypeOf((*HostAdminEnableEvent)(nil)).Elem()
+}
+
+type HostApplyProfile struct {
+	ApplyProfile
+
+	Memory           *HostMemoryProfile     `xml:"memory,omitempty"`
+	Storage          *StorageProfile        `xml:"storage,omitempty"`
+	Network          *NetworkProfile        `xml:"network,omitempty"`
+	Datetime         *DateTimeProfile       `xml:"datetime,omitempty"`
+	Firewall         *FirewallProfile       `xml:"firewall,omitempty"`
+	Security         *SecurityProfile       `xml:"security,omitempty"`
+	Service          []ServiceProfile       `xml:"service,omitempty"`
+	Option           []OptionProfile        `xml:"option,omitempty"`
+	UserAccount      []UserProfile          `xml:"userAccount,omitempty"`
+	UsergroupAccount []UserGroupProfile     `xml:"usergroupAccount,omitempty"`
+	Authentication   *AuthenticationProfile `xml:"authentication,omitempty"`
+}
+
+func init() {
+	t["HostApplyProfile"] = reflect.TypeOf((*HostApplyProfile)(nil)).Elem()
+}
+
+type HostAuthenticationManagerInfo struct {
+	DynamicData
+
+	AuthConfig []BaseHostAuthenticationStoreInfo `xml:"authConfig,typeattr"`
+}
+
+func init() {
+	t["HostAuthenticationManagerInfo"] = reflect.TypeOf((*HostAuthenticationManagerInfo)(nil)).Elem()
+}
+
+type HostAuthenticationStoreInfo struct {
+	DynamicData
+
+	Enabled bool `xml:"enabled"`
+}
+
+func init() {
+	t["HostAuthenticationStoreInfo"] = reflect.TypeOf((*HostAuthenticationStoreInfo)(nil)).Elem()
+}
+
+type HostAutoStartManagerConfig struct {
+	DynamicData
+
+	Defaults  *AutoStartDefaults   `xml:"defaults,omitempty"`
+	PowerInfo []AutoStartPowerInfo `xml:"powerInfo,omitempty"`
+}
+
+func init() {
+	t["HostAutoStartManagerConfig"] = reflect.TypeOf((*HostAutoStartManagerConfig)(nil)).Elem()
+}
+
+type HostBIOSInfo struct {
+	DynamicData
+
+	BiosVersion          string     `xml:"biosVersion,omitempty"`
+	ReleaseDate          *time.Time `xml:"releaseDate"`
+	Vendor               string     `xml:"vendor,omitempty"`
+	MajorRelease         int32      `xml:"majorRelease,omitempty"`
+	MinorRelease         int32      `xml:"minorRelease,omitempty"`
+	FirmwareMajorRelease int32      `xml:"firmwareMajorRelease,omitempty"`
+	FirmwareMinorRelease int32      `xml:"firmwareMinorRelease,omitempty"`
+}
+
+func init() {
+	t["HostBIOSInfo"] = reflect.TypeOf((*HostBIOSInfo)(nil)).Elem()
+}
+
+type HostBlockAdapterTargetTransport struct {
+	HostTargetTransport
+}
+
+func init() {
+	t["HostBlockAdapterTargetTransport"] = reflect.TypeOf((*HostBlockAdapterTargetTransport)(nil)).Elem()
+}
+
+type HostBlockHba struct {
+	HostHostBusAdapter
+}
+
+func init() {
+	t["HostBlockHba"] = reflect.TypeOf((*HostBlockHba)(nil)).Elem()
+}
+
+type HostBootDevice struct {
+	DynamicData
+
+	Key         string `xml:"key"`
+	Description string `xml:"description"`
+}
+
+func init() {
+	t["HostBootDevice"] = reflect.TypeOf((*HostBootDevice)(nil)).Elem()
+}
+
+type HostBootDeviceInfo struct {
+	DynamicData
+
+	BootDevices          []HostBootDevice `xml:"bootDevices,omitempty"`
+	CurrentBootDeviceKey string           `xml:"currentBootDeviceKey,omitempty"`
+}
+
+func init() {
+	t["HostBootDeviceInfo"] = reflect.TypeOf((*HostBootDeviceInfo)(nil)).Elem()
+}
+
+type HostCacheConfigurationInfo struct {
+	DynamicData
+
+	Key      ManagedObjectReference `xml:"key"`
+	SwapSize int64                  `xml:"swapSize"`
+}
+
+func init() {
+	t["HostCacheConfigurationInfo"] = reflect.TypeOf((*HostCacheConfigurationInfo)(nil)).Elem()
+}
+
+type HostCacheConfigurationSpec struct {
+	DynamicData
+
+	Datastore ManagedObjectReference `xml:"datastore"`
+	SwapSize  int64                  `xml:"swapSize"`
+}
+
+func init() {
+	t["HostCacheConfigurationSpec"] = reflect.TypeOf((*HostCacheConfigurationSpec)(nil)).Elem()
+}
+
+type HostCapability struct {
+	DynamicData
+
+	RecursiveResourcePoolsSupported           bool            `xml:"recursiveResourcePoolsSupported"`
+	CpuMemoryResourceConfigurationSupported   bool            `xml:"cpuMemoryResourceConfigurationSupported"`
+	RebootSupported                           bool            `xml:"rebootSupported"`
+	ShutdownSupported                         bool            `xml:"shutdownSupported"`
+	VmotionSupported                          bool            `xml:"vmotionSupported"`
+	StandbySupported                          bool            `xml:"standbySupported"`
+	IpmiSupported                             *bool           `xml:"ipmiSupported"`
+	MaxSupportedVMs                           int32           `xml:"maxSupportedVMs,omitempty"`
+	MaxRunningVMs                             int32           `xml:"maxRunningVMs,omitempty"`
+	MaxSupportedVcpus                         int32           `xml:"maxSupportedVcpus,omitempty"`
+	MaxRegisteredVMs                          int32           `xml:"maxRegisteredVMs,omitempty"`
+	DatastorePrincipalSupported               bool            `xml:"datastorePrincipalSupported"`
+	SanSupported                              bool            `xml:"sanSupported"`
+	NfsSupported                              bool            `xml:"nfsSupported"`
+	IscsiSupported                            bool            `xml:"iscsiSupported"`
+	VlanTaggingSupported                      bool            `xml:"vlanTaggingSupported"`
+	NicTeamingSupported                       bool            `xml:"nicTeamingSupported"`
+	HighGuestMemSupported                     bool            `xml:"highGuestMemSupported"`
+	MaintenanceModeSupported                  bool            `xml:"maintenanceModeSupported"`
+	SuspendedRelocateSupported                bool            `xml:"suspendedRelocateSupported"`
+	RestrictedSnapshotRelocateSupported       bool            `xml:"restrictedSnapshotRelocateSupported"`
+	PerVmSwapFiles                            bool            `xml:"perVmSwapFiles"`
+	LocalSwapDatastoreSupported               bool            `xml:"localSwapDatastoreSupported"`
+	UnsharedSwapVMotionSupported              bool            `xml:"unsharedSwapVMotionSupported"`
+	BackgroundSnapshotsSupported              bool            `xml:"backgroundSnapshotsSupported"`
+	PreAssignedPCIUnitNumbersSupported        bool            `xml:"preAssignedPCIUnitNumbersSupported"`
+	ScreenshotSupported                       bool            `xml:"screenshotSupported"`
+	ScaledScreenshotSupported                 bool            `xml:"scaledScreenshotSupported"`
+	StorageVMotionSupported                   *bool           `xml:"storageVMotionSupported"`
+	VmotionWithStorageVMotionSupported        *bool           `xml:"vmotionWithStorageVMotionSupported"`
+	VmotionAcrossNetworkSupported             *bool           `xml:"vmotionAcrossNetworkSupported"`
+	MaxNumDisksSVMotion                       int32           `xml:"maxNumDisksSVMotion,omitempty"`
+	HbrNicSelectionSupported                  *bool           `xml:"hbrNicSelectionSupported"`
+	VrNfcNicSelectionSupported                *bool           `xml:"vrNfcNicSelectionSupported"`
+	RecordReplaySupported                     *bool           `xml:"recordReplaySupported"`
+	FtSupported                               *bool           `xml:"ftSupported"`
+	ReplayUnsupportedReason                   string          `xml:"replayUnsupportedReason,omitempty"`
+	ReplayCompatibilityIssues                 []string        `xml:"replayCompatibilityIssues,omitempty"`
+	SmpFtSupported                            *bool           `xml:"smpFtSupported"`
+	FtCompatibilityIssues                     []string        `xml:"ftCompatibilityIssues,omitempty"`
+	SmpFtCompatibilityIssues                  []string        `xml:"smpFtCompatibilityIssues,omitempty"`
+	MaxVcpusPerFtVm                           int32           `xml:"maxVcpusPerFtVm,omitempty"`
+	LoginBySSLThumbprintSupported             *bool           `xml:"loginBySSLThumbprintSupported"`
+	CloneFromSnapshotSupported                *bool           `xml:"cloneFromSnapshotSupported"`
+	DeltaDiskBackingsSupported                *bool           `xml:"deltaDiskBackingsSupported"`
+	PerVMNetworkTrafficShapingSupported       *bool           `xml:"perVMNetworkTrafficShapingSupported"`
+	TpmSupported                              *bool           `xml:"tpmSupported"`
+	SupportedCpuFeature                       []HostCpuIdInfo `xml:"supportedCpuFeature,omitempty"`
+	VirtualExecUsageSupported                 *bool           `xml:"virtualExecUsageSupported"`
+	StorageIORMSupported                      *bool           `xml:"storageIORMSupported"`
+	VmDirectPathGen2Supported                 *bool           `xml:"vmDirectPathGen2Supported"`
+	VmDirectPathGen2UnsupportedReason         []string        `xml:"vmDirectPathGen2UnsupportedReason,omitempty"`
+	VmDirectPathGen2UnsupportedReasonExtended string          `xml:"vmDirectPathGen2UnsupportedReasonExtended,omitempty"`
+	SupportedVmfsMajorVersion                 []int32         `xml:"supportedVmfsMajorVersion,omitempty"`
+	VStorageCapable                           *bool           `xml:"vStorageCapable"`
+	SnapshotRelayoutSupported                 *bool           `xml:"snapshotRelayoutSupported"`
+	FirewallIpRulesSupported                  *bool           `xml:"firewallIpRulesSupported"`
+	ServicePackageInfoSupported               *bool           `xml:"servicePackageInfoSupported"`
+	MaxHostRunningVms                         int32           `xml:"maxHostRunningVms,omitempty"`
+	MaxHostSupportedVcpus                     int32           `xml:"maxHostSupportedVcpus,omitempty"`
+	VmfsDatastoreMountCapable                 *bool           `xml:"vmfsDatastoreMountCapable"`
+	EightPlusHostVmfsSharedAccessSupported    *bool           `xml:"eightPlusHostVmfsSharedAccessSupported"`
+	NestedHVSupported                         *bool           `xml:"nestedHVSupported"`
+	VPMCSupported                             *bool           `xml:"vPMCSupported"`
+	InterVMCommunicationThroughVMCISupported  *bool           `xml:"interVMCommunicationThroughVMCISupported"`
+	ScheduledHardwareUpgradeSupported         *bool           `xml:"scheduledHardwareUpgradeSupported"`
+	FeatureCapabilitiesSupported              *bool           `xml:"featureCapabilitiesSupported"`
+	LatencySensitivitySupported               *bool           `xml:"latencySensitivitySupported"`
+	StoragePolicySupported                    *bool           `xml:"storagePolicySupported"`
+	Accel3dSupported                          *bool           `xml:"accel3dSupported"`
+	ReliableMemoryAware                       *bool           `xml:"reliableMemoryAware"`
+	MultipleNetworkStackInstanceSupported     *bool           `xml:"multipleNetworkStackInstanceSupported"`
+	MessageBusProxySupported                  *bool           `xml:"messageBusProxySupported"`
+	VsanSupported                             *bool           `xml:"vsanSupported"`
+	VFlashSupported                           *bool           `xml:"vFlashSupported"`
+	HostAccessManagerSupported                *bool           `xml:"hostAccessManagerSupported"`
+	ProvisioningNicSelectionSupported         *bool           `xml:"provisioningNicSelectionSupported"`
+	Nfs41Supported                            *bool           `xml:"nfs41Supported"`
+	Nfs41Krb5iSupported                       *bool           `xml:"nfs41Krb5iSupported"`
+	TurnDiskLocatorLedSupported               *bool           `xml:"turnDiskLocatorLedSupported"`
+	VirtualVolumeDatastoreSupported           *bool           `xml:"virtualVolumeDatastoreSupported"`
+	MarkAsSsdSupported                        *bool           `xml:"markAsSsdSupported"`
+	MarkAsLocalSupported                      *bool           `xml:"markAsLocalSupported"`
+	SmartCardAuthenticationSupported          *bool           `xml:"smartCardAuthenticationSupported"`
+	CryptoSupported                           *bool           `xml:"cryptoSupported"`
+	OneKVolumeAPIsSupported                   *bool           `xml:"oneKVolumeAPIsSupported"`
+	GatewayOnNicSupported                     *bool           `xml:"gatewayOnNicSupported"`
+	UpitSupported                             *bool           `xml:"upitSupported"`
+	CpuHwMmuSupported                         *bool           `xml:"cpuHwMmuSupported"`
+	EncryptedVMotionSupported                 *bool           `xml:"encryptedVMotionSupported"`
+	EncryptionChangeOnAddRemoveSupported      *bool           `xml:"encryptionChangeOnAddRemoveSupported"`
+	EncryptionHotOperationSupported           *bool           `xml:"encryptionHotOperationSupported"`
+	EncryptionWithSnapshotsSupported          *bool           `xml:"encryptionWithSnapshotsSupported"`
+	EncryptionFaultToleranceSupported         *bool           `xml:"encryptionFaultToleranceSupported"`
+	EncryptionMemorySaveSupported             *bool           `xml:"encryptionMemorySaveSupported"`
+	EncryptionRDMSupported                    *bool           `xml:"encryptionRDMSupported"`
+	EncryptionVFlashSupported                 *bool           `xml:"encryptionVFlashSupported"`
+	EncryptionCBRCSupported                   *bool           `xml:"encryptionCBRCSupported"`
+	EncryptionHBRSupported                    *bool           `xml:"encryptionHBRSupported"`
+}
+
+func init() {
+	t["HostCapability"] = reflect.TypeOf((*HostCapability)(nil)).Elem()
+}
+
+type HostCertificateManagerCertificateInfo struct {
+	DynamicData
+
+	Issuer    string     `xml:"issuer,omitempty"`
+	NotBefore *time.Time `xml:"notBefore"`
+	NotAfter  *time.Time `xml:"notAfter"`
+	Subject   string     `xml:"subject,omitempty"`
+	Status    string     `xml:"status"`
+}
+
+func init() {
+	t["HostCertificateManagerCertificateInfo"] = reflect.TypeOf((*HostCertificateManagerCertificateInfo)(nil)).Elem()
+}
+
+type HostCloneVStorageObjectRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Id        ID                     `xml:"id"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+	Spec      VslmCloneSpec          `xml:"spec"`
+}
+
+func init() {
+	t["HostCloneVStorageObjectRequestType"] = reflect.TypeOf((*HostCloneVStorageObjectRequestType)(nil)).Elem()
+}
+
+type HostCloneVStorageObject_Task HostCloneVStorageObjectRequestType
+
+func init() {
+	t["HostCloneVStorageObject_Task"] = reflect.TypeOf((*HostCloneVStorageObject_Task)(nil)).Elem()
+}
+
+type HostCloneVStorageObject_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type HostCnxFailedAccountFailedEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostCnxFailedAccountFailedEvent"] = reflect.TypeOf((*HostCnxFailedAccountFailedEvent)(nil)).Elem()
+}
+
+type HostCnxFailedAlreadyManagedEvent struct {
+	HostEvent
+
+	ServerName string `xml:"serverName"`
+}
+
+func init() {
+	t["HostCnxFailedAlreadyManagedEvent"] = reflect.TypeOf((*HostCnxFailedAlreadyManagedEvent)(nil)).Elem()
+}
+
+type HostCnxFailedBadCcagentEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostCnxFailedBadCcagentEvent"] = reflect.TypeOf((*HostCnxFailedBadCcagentEvent)(nil)).Elem()
+}
+
+type HostCnxFailedBadUsernameEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostCnxFailedBadUsernameEvent"] = reflect.TypeOf((*HostCnxFailedBadUsernameEvent)(nil)).Elem()
+}
+
+type HostCnxFailedBadVersionEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostCnxFailedBadVersionEvent"] = reflect.TypeOf((*HostCnxFailedBadVersionEvent)(nil)).Elem()
+}
+
+type HostCnxFailedCcagentUpgradeEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostCnxFailedCcagentUpgradeEvent"] = reflect.TypeOf((*HostCnxFailedCcagentUpgradeEvent)(nil)).Elem()
+}
+
+type HostCnxFailedEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostCnxFailedEvent"] = reflect.TypeOf((*HostCnxFailedEvent)(nil)).Elem()
+}
+
+type HostCnxFailedNetworkErrorEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostCnxFailedNetworkErrorEvent"] = reflect.TypeOf((*HostCnxFailedNetworkErrorEvent)(nil)).Elem()
+}
+
+type HostCnxFailedNoAccessEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostCnxFailedNoAccessEvent"] = reflect.TypeOf((*HostCnxFailedNoAccessEvent)(nil)).Elem()
+}
+
+type HostCnxFailedNoConnectionEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostCnxFailedNoConnectionEvent"] = reflect.TypeOf((*HostCnxFailedNoConnectionEvent)(nil)).Elem()
+}
+
+type HostCnxFailedNoLicenseEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostCnxFailedNoLicenseEvent"] = reflect.TypeOf((*HostCnxFailedNoLicenseEvent)(nil)).Elem()
+}
+
+type HostCnxFailedNotFoundEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostCnxFailedNotFoundEvent"] = reflect.TypeOf((*HostCnxFailedNotFoundEvent)(nil)).Elem()
+}
+
+type HostCnxFailedTimeoutEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostCnxFailedTimeoutEvent"] = reflect.TypeOf((*HostCnxFailedTimeoutEvent)(nil)).Elem()
+}
+
+type HostCommunication struct {
+	RuntimeFault
+}
+
+func init() {
+	t["HostCommunication"] = reflect.TypeOf((*HostCommunication)(nil)).Elem()
+}
+
+type HostCommunicationFault BaseHostCommunication
+
+func init() {
+	t["HostCommunicationFault"] = reflect.TypeOf((*HostCommunicationFault)(nil)).Elem()
+}
+
+type HostComplianceCheckedEvent struct {
+	HostEvent
+
+	Profile ProfileEventArgument `xml:"profile"`
+}
+
+func init() {
+	t["HostComplianceCheckedEvent"] = reflect.TypeOf((*HostComplianceCheckedEvent)(nil)).Elem()
+}
+
+type HostCompliantEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostCompliantEvent"] = reflect.TypeOf((*HostCompliantEvent)(nil)).Elem()
+}
+
+type HostConfigAppliedEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostConfigAppliedEvent"] = reflect.TypeOf((*HostConfigAppliedEvent)(nil)).Elem()
+}
+
+type HostConfigChange struct {
+	DynamicData
+}
+
+func init() {
+	t["HostConfigChange"] = reflect.TypeOf((*HostConfigChange)(nil)).Elem()
+}
+
+type HostConfigFailed struct {
+	HostConfigFault
+
+	Failure []LocalizedMethodFault `xml:"failure"`
+}
+
+func init() {
+	t["HostConfigFailed"] = reflect.TypeOf((*HostConfigFailed)(nil)).Elem()
+}
+
+type HostConfigFailedFault HostConfigFailed
+
+func init() {
+	t["HostConfigFailedFault"] = reflect.TypeOf((*HostConfigFailedFault)(nil)).Elem()
+}
+
+type HostConfigFault struct {
+	VimFault
+}
+
+func init() {
+	t["HostConfigFault"] = reflect.TypeOf((*HostConfigFault)(nil)).Elem()
+}
+
+type HostConfigFaultFault BaseHostConfigFault
+
+func init() {
+	t["HostConfigFaultFault"] = reflect.TypeOf((*HostConfigFaultFault)(nil)).Elem()
+}
+
+type HostConfigInfo struct {
+	DynamicData
+
+	Host                      ManagedObjectReference               `xml:"host"`
+	Product                   AboutInfo                            `xml:"product"`
+	DeploymentInfo            *HostDeploymentInfo                  `xml:"deploymentInfo,omitempty"`
+	HyperThread               *HostHyperThreadScheduleInfo         `xml:"hyperThread,omitempty"`
+	ConsoleReservation        *ServiceConsoleReservationInfo       `xml:"consoleReservation,omitempty"`
+	VirtualMachineReservation *VirtualMachineMemoryReservationInfo `xml:"virtualMachineReservation,omitempty"`
+	StorageDevice             *HostStorageDeviceInfo               `xml:"storageDevice,omitempty"`
+	MultipathState            *HostMultipathStateInfo              `xml:"multipathState,omitempty"`
+	FileSystemVolume          *HostFileSystemVolumeInfo            `xml:"fileSystemVolume,omitempty"`
+	SystemFile                []string                             `xml:"systemFile,omitempty"`
+	Network                   *HostNetworkInfo                     `xml:"network,omitempty"`
+	Vmotion                   *HostVMotionInfo                     `xml:"vmotion,omitempty"`
+	VirtualNicManagerInfo     *HostVirtualNicManagerInfo           `xml:"virtualNicManagerInfo,omitempty"`
+	Capabilities              *HostNetCapabilities                 `xml:"capabilities,omitempty"`
+	DatastoreCapabilities     *HostDatastoreSystemCapabilities     `xml:"datastoreCapabilities,omitempty"`
+	OffloadCapabilities       *HostNetOffloadCapabilities          `xml:"offloadCapabilities,omitempty"`
+	Service                   *HostServiceInfo                     `xml:"service,omitempty"`
+	Firewall                  *HostFirewallInfo                    `xml:"firewall,omitempty"`
+	AutoStart                 *HostAutoStartManagerConfig          `xml:"autoStart,omitempty"`
+	ActiveDiagnosticPartition *HostDiagnosticPartition             `xml:"activeDiagnosticPartition,omitempty"`
+	Option                    []BaseOptionValue                    `xml:"option,omitempty,typeattr"`
+	OptionDef                 []OptionDef                          `xml:"optionDef,omitempty"`
+	DatastorePrincipal        string                               `xml:"datastorePrincipal,omitempty"`
+	LocalSwapDatastore        *ManagedObjectReference              `xml:"localSwapDatastore,omitempty"`
+	SystemSwapConfiguration   *HostSystemSwapConfiguration         `xml:"systemSwapConfiguration,omitempty"`
+	SystemResources           *HostSystemResourceInfo              `xml:"systemResources,omitempty"`
+	DateTimeInfo              *HostDateTimeInfo                    `xml:"dateTimeInfo,omitempty"`
+	Flags                     *HostFlagInfo                        `xml:"flags,omitempty"`
+	AdminDisabled             *bool                                `xml:"adminDisabled"`
+	LockdownMode              HostLockdownMode                     `xml:"lockdownMode,omitempty"`
+	Ipmi                      *HostIpmiInfo                        `xml:"ipmi,omitempty"`
+	SslThumbprintInfo         *HostSslThumbprintInfo               `xml:"sslThumbprintInfo,omitempty"`
+	SslThumbprintData         []HostSslThumbprintInfo              `xml:"sslThumbprintData,omitempty"`
+	Certificate               []byte                               `xml:"certificate,omitempty"`
+	PciPassthruInfo           []BaseHostPciPassthruInfo            `xml:"pciPassthruInfo,omitempty,typeattr"`
+	AuthenticationManagerInfo *HostAuthenticationManagerInfo       `xml:"authenticationManagerInfo,omitempty"`
+	FeatureVersion            []HostFeatureVersionInfo             `xml:"featureVersion,omitempty"`
+	PowerSystemCapability     *PowerSystemCapability               `xml:"powerSystemCapability,omitempty"`
+	PowerSystemInfo           *PowerSystemInfo                     `xml:"powerSystemInfo,omitempty"`
+	CacheConfigurationInfo    []HostCacheConfigurationInfo         `xml:"cacheConfigurationInfo,omitempty"`
+	WakeOnLanCapable          *bool                                `xml:"wakeOnLanCapable"`
+	FeatureCapability         []HostFeatureCapability              `xml:"featureCapability,omitempty"`
+	MaskedFeatureCapability   []HostFeatureCapability              `xml:"maskedFeatureCapability,omitempty"`
+	VFlashConfigInfo          *HostVFlashManagerVFlashConfigInfo   `xml:"vFlashConfigInfo,omitempty"`
+	VsanHostConfig            *VsanHostConfigInfo                  `xml:"vsanHostConfig,omitempty"`
+	DomainList                []string                             `xml:"domainList,omitempty"`
+	ScriptCheckSum            []byte                               `xml:"scriptCheckSum,omitempty"`
+	HostConfigCheckSum        []byte                               `xml:"hostConfigCheckSum,omitempty"`
+	GraphicsInfo              []HostGraphicsInfo                   `xml:"graphicsInfo,omitempty"`
+	SharedPassthruGpuTypes    []string                             `xml:"sharedPassthruGpuTypes,omitempty"`
+	GraphicsConfig            *HostGraphicsConfig                  `xml:"graphicsConfig,omitempty"`
+	IoFilterInfo              []HostIoFilterInfo                   `xml:"ioFilterInfo,omitempty"`
+	SriovDevicePool           []BaseHostSriovDevicePoolInfo        `xml:"sriovDevicePool,omitempty,typeattr"`
+}
+
+func init() {
+	t["HostConfigInfo"] = reflect.TypeOf((*HostConfigInfo)(nil)).Elem()
+}
+
+type HostConfigManager struct {
+	DynamicData
+
+	CpuScheduler              *ManagedObjectReference `xml:"cpuScheduler,omitempty"`
+	DatastoreSystem           *ManagedObjectReference `xml:"datastoreSystem,omitempty"`
+	MemoryManager             *ManagedObjectReference `xml:"memoryManager,omitempty"`
+	StorageSystem             *ManagedObjectReference `xml:"storageSystem,omitempty"`
+	NetworkSystem             *ManagedObjectReference `xml:"networkSystem,omitempty"`
+	VmotionSystem             *ManagedObjectReference `xml:"vmotionSystem,omitempty"`
+	VirtualNicManager         *ManagedObjectReference `xml:"virtualNicManager,omitempty"`
+	ServiceSystem             *ManagedObjectReference `xml:"serviceSystem,omitempty"`
+	FirewallSystem            *ManagedObjectReference `xml:"firewallSystem,omitempty"`
+	AdvancedOption            *ManagedObjectReference `xml:"advancedOption,omitempty"`
+	DiagnosticSystem          *ManagedObjectReference `xml:"diagnosticSystem,omitempty"`
+	AutoStartManager          *ManagedObjectReference `xml:"autoStartManager,omitempty"`
+	SnmpSystem                *ManagedObjectReference `xml:"snmpSystem,omitempty"`
+	DateTimeSystem            *ManagedObjectReference `xml:"dateTimeSystem,omitempty"`
+	PatchManager              *ManagedObjectReference `xml:"patchManager,omitempty"`
+	ImageConfigManager        *ManagedObjectReference `xml:"imageConfigManager,omitempty"`
+	BootDeviceSystem          *ManagedObjectReference `xml:"bootDeviceSystem,omitempty"`
+	FirmwareSystem            *ManagedObjectReference `xml:"firmwareSystem,omitempty"`
+	HealthStatusSystem        *ManagedObjectReference `xml:"healthStatusSystem,omitempty"`
+	PciPassthruSystem         *ManagedObjectReference `xml:"pciPassthruSystem,omitempty"`
+	LicenseManager            *ManagedObjectReference `xml:"licenseManager,omitempty"`
+	KernelModuleSystem        *ManagedObjectReference `xml:"kernelModuleSystem,omitempty"`
+	AuthenticationManager     *ManagedObjectReference `xml:"authenticationManager,omitempty"`
+	PowerSystem               *ManagedObjectReference `xml:"powerSystem,omitempty"`
+	CacheConfigurationManager *ManagedObjectReference `xml:"cacheConfigurationManager,omitempty"`
+	EsxAgentHostManager       *ManagedObjectReference `xml:"esxAgentHostManager,omitempty"`
+	IscsiManager              *ManagedObjectReference `xml:"iscsiManager,omitempty"`
+	VFlashManager             *ManagedObjectReference `xml:"vFlashManager,omitempty"`
+	VsanSystem                *ManagedObjectReference `xml:"vsanSystem,omitempty"`
+	MessageBusProxy           *ManagedObjectReference `xml:"messageBusProxy,omitempty"`
+	UserDirectory             *ManagedObjectReference `xml:"userDirectory,omitempty"`
+	AccountManager            *ManagedObjectReference `xml:"accountManager,omitempty"`
+	HostAccessManager         *ManagedObjectReference `xml:"hostAccessManager,omitempty"`
+	GraphicsManager           *ManagedObjectReference `xml:"graphicsManager,omitempty"`
+	VsanInternalSystem        *ManagedObjectReference `xml:"vsanInternalSystem,omitempty"`
+	CertificateManager        *ManagedObjectReference `xml:"certificateManager,omitempty"`
+	CryptoManager             *ManagedObjectReference `xml:"cryptoManager,omitempty"`
+}
+
+func init() {
+	t["HostConfigManager"] = reflect.TypeOf((*HostConfigManager)(nil)).Elem()
+}
+
+type HostConfigSpec struct {
+	DynamicData
+
+	NasDatastore             []HostNasVolumeConfig                   `xml:"nasDatastore,omitempty"`
+	Network                  *HostNetworkConfig                      `xml:"network,omitempty"`
+	NicTypeSelection         []HostVirtualNicManagerNicTypeSelection `xml:"nicTypeSelection,omitempty"`
+	Service                  []HostServiceConfig                     `xml:"service,omitempty"`
+	Firewall                 *HostFirewallConfig                     `xml:"firewall,omitempty"`
+	Option                   []BaseOptionValue                       `xml:"option,omitempty,typeattr"`
+	DatastorePrincipal       string                                  `xml:"datastorePrincipal,omitempty"`
+	DatastorePrincipalPasswd string                                  `xml:"datastorePrincipalPasswd,omitempty"`
+	Datetime                 *HostDateTimeConfig                     `xml:"datetime,omitempty"`
+	StorageDevice            *HostStorageDeviceInfo                  `xml:"storageDevice,omitempty"`
+	License                  *HostLicenseSpec                        `xml:"license,omitempty"`
+	Security                 *HostSecuritySpec                       `xml:"security,omitempty"`
+	UserAccount              []BaseHostAccountSpec                   `xml:"userAccount,omitempty,typeattr"`
+	UsergroupAccount         []BaseHostAccountSpec                   `xml:"usergroupAccount,omitempty,typeattr"`
+	Memory                   *HostMemorySpec                         `xml:"memory,omitempty"`
+	ActiveDirectory          []HostActiveDirectory                   `xml:"activeDirectory,omitempty"`
+	GenericConfig            []KeyAnyValue                           `xml:"genericConfig,omitempty"`
+	GraphicsConfig           *HostGraphicsConfig                     `xml:"graphicsConfig,omitempty"`
+}
+
+func init() {
+	t["HostConfigSpec"] = reflect.TypeOf((*HostConfigSpec)(nil)).Elem()
+}
+
+type HostConfigSummary struct {
+	DynamicData
+
+	Name                  string                   `xml:"name"`
+	Port                  int32                    `xml:"port"`
+	SslThumbprint         string                   `xml:"sslThumbprint,omitempty"`
+	Product               *AboutInfo               `xml:"product,omitempty"`
+	VmotionEnabled        bool                     `xml:"vmotionEnabled"`
+	FaultToleranceEnabled *bool                    `xml:"faultToleranceEnabled"`
+	FeatureVersion        []HostFeatureVersionInfo `xml:"featureVersion,omitempty"`
+	AgentVmDatastore      *ManagedObjectReference  `xml:"agentVmDatastore,omitempty"`
+	AgentVmNetwork        *ManagedObjectReference  `xml:"agentVmNetwork,omitempty"`
+}
+
+func init() {
+	t["HostConfigSummary"] = reflect.TypeOf((*HostConfigSummary)(nil)).Elem()
+}
+
+type HostConfigVFlashCache HostConfigVFlashCacheRequestType
+
+func init() {
+	t["HostConfigVFlashCache"] = reflect.TypeOf((*HostConfigVFlashCache)(nil)).Elem()
+}
+
+type HostConfigVFlashCacheRequestType struct {
+	This ManagedObjectReference                 `xml:"_this"`
+	Spec HostVFlashManagerVFlashCacheConfigSpec `xml:"spec"`
+}
+
+func init() {
+	t["HostConfigVFlashCacheRequestType"] = reflect.TypeOf((*HostConfigVFlashCacheRequestType)(nil)).Elem()
+}
+
+type HostConfigVFlashCacheResponse struct {
+}
+
+type HostConfigureVFlashResource HostConfigureVFlashResourceRequestType
+
+func init() {
+	t["HostConfigureVFlashResource"] = reflect.TypeOf((*HostConfigureVFlashResource)(nil)).Elem()
+}
+
+type HostConfigureVFlashResourceRequestType struct {
+	This ManagedObjectReference                    `xml:"_this"`
+	Spec HostVFlashManagerVFlashResourceConfigSpec `xml:"spec"`
+}
+
+func init() {
+	t["HostConfigureVFlashResourceRequestType"] = reflect.TypeOf((*HostConfigureVFlashResourceRequestType)(nil)).Elem()
+}
+
+type HostConfigureVFlashResourceResponse struct {
+}
+
+type HostConnectFault struct {
+	VimFault
+}
+
+func init() {
+	t["HostConnectFault"] = reflect.TypeOf((*HostConnectFault)(nil)).Elem()
+}
+
+type HostConnectFaultFault BaseHostConnectFault
+
+func init() {
+	t["HostConnectFaultFault"] = reflect.TypeOf((*HostConnectFaultFault)(nil)).Elem()
+}
+
+type HostConnectInfo struct {
+	DynamicData
+
+	ServerIp               string                           `xml:"serverIp,omitempty"`
+	InDasCluster           *bool                            `xml:"inDasCluster"`
+	Host                   HostListSummary                  `xml:"host"`
+	Vm                     []VirtualMachineSummary          `xml:"vm,omitempty"`
+	VimAccountNameRequired *bool                            `xml:"vimAccountNameRequired"`
+	ClusterSupported       *bool                            `xml:"clusterSupported"`
+	Network                []BaseHostConnectInfoNetworkInfo `xml:"network,omitempty,typeattr"`
+	Datastore              []BaseHostDatastoreConnectInfo   `xml:"datastore,omitempty,typeattr"`
+	License                *HostLicenseConnectInfo          `xml:"license,omitempty"`
+	Capability             *HostCapability                  `xml:"capability,omitempty"`
+}
+
+func init() {
+	t["HostConnectInfo"] = reflect.TypeOf((*HostConnectInfo)(nil)).Elem()
+}
+
+type HostConnectInfoNetworkInfo struct {
+	DynamicData
+
+	Summary BaseNetworkSummary `xml:"summary,typeattr"`
+}
+
+func init() {
+	t["HostConnectInfoNetworkInfo"] = reflect.TypeOf((*HostConnectInfoNetworkInfo)(nil)).Elem()
+}
+
+type HostConnectSpec struct {
+	DynamicData
+
+	HostName           string                  `xml:"hostName,omitempty"`
+	Port               int32                   `xml:"port,omitempty"`
+	SslThumbprint      string                  `xml:"sslThumbprint,omitempty"`
+	UserName           string                  `xml:"userName,omitempty"`
+	Password           string                  `xml:"password,omitempty"`
+	VmFolder           *ManagedObjectReference `xml:"vmFolder,omitempty"`
+	Force              bool                    `xml:"force"`
+	VimAccountName     string                  `xml:"vimAccountName,omitempty"`
+	VimAccountPassword string                  `xml:"vimAccountPassword,omitempty"`
+	ManagementIp       string                  `xml:"managementIp,omitempty"`
+	LockdownMode       HostLockdownMode        `xml:"lockdownMode,omitempty"`
+	HostGateway        *HostGatewaySpec        `xml:"hostGateway,omitempty"`
+}
+
+func init() {
+	t["HostConnectSpec"] = reflect.TypeOf((*HostConnectSpec)(nil)).Elem()
+}
+
+type HostConnectedEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostConnectedEvent"] = reflect.TypeOf((*HostConnectedEvent)(nil)).Elem()
+}
+
+type HostConnectionLostEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostConnectionLostEvent"] = reflect.TypeOf((*HostConnectionLostEvent)(nil)).Elem()
+}
+
+type HostCpuIdInfo struct {
+	DynamicData
+
+	Level  int32  `xml:"level"`
+	Vendor string `xml:"vendor,omitempty"`
+	Eax    string `xml:"eax,omitempty"`
+	Ebx    string `xml:"ebx,omitempty"`
+	Ecx    string `xml:"ecx,omitempty"`
+	Edx    string `xml:"edx,omitempty"`
+}
+
+func init() {
+	t["HostCpuIdInfo"] = reflect.TypeOf((*HostCpuIdInfo)(nil)).Elem()
+}
+
+type HostCpuInfo struct {
+	DynamicData
+
+	NumCpuPackages int16 `xml:"numCpuPackages"`
+	NumCpuCores    int16 `xml:"numCpuCores"`
+	NumCpuThreads  int16 `xml:"numCpuThreads"`
+	Hz             int64 `xml:"hz"`
+}
+
+func init() {
+	t["HostCpuInfo"] = reflect.TypeOf((*HostCpuInfo)(nil)).Elem()
+}
+
+type HostCpuPackage struct {
+	DynamicData
+
+	Index       int16           `xml:"index"`
+	Vendor      string          `xml:"vendor"`
+	Hz          int64           `xml:"hz"`
+	BusHz       int64           `xml:"busHz"`
+	Description string          `xml:"description"`
+	ThreadId    []int16         `xml:"threadId"`
+	CpuFeature  []HostCpuIdInfo `xml:"cpuFeature,omitempty"`
+}
+
+func init() {
+	t["HostCpuPackage"] = reflect.TypeOf((*HostCpuPackage)(nil)).Elem()
+}
+
+type HostCpuPowerManagementInfo struct {
+	DynamicData
+
+	CurrentPolicy   string `xml:"currentPolicy,omitempty"`
+	HardwareSupport string `xml:"hardwareSupport,omitempty"`
+}
+
+func init() {
+	t["HostCpuPowerManagementInfo"] = reflect.TypeOf((*HostCpuPowerManagementInfo)(nil)).Elem()
+}
+
+type HostCreateDiskRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Spec VslmCreateSpec         `xml:"spec"`
+}
+
+func init() {
+	t["HostCreateDiskRequestType"] = reflect.TypeOf((*HostCreateDiskRequestType)(nil)).Elem()
+}
+
+type HostCreateDisk_Task HostCreateDiskRequestType
+
+func init() {
+	t["HostCreateDisk_Task"] = reflect.TypeOf((*HostCreateDisk_Task)(nil)).Elem()
+}
+
+type HostCreateDisk_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type HostDasDisabledEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostDasDisabledEvent"] = reflect.TypeOf((*HostDasDisabledEvent)(nil)).Elem()
+}
+
+type HostDasDisablingEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostDasDisablingEvent"] = reflect.TypeOf((*HostDasDisablingEvent)(nil)).Elem()
+}
+
+type HostDasEnabledEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostDasEnabledEvent"] = reflect.TypeOf((*HostDasEnabledEvent)(nil)).Elem()
+}
+
+type HostDasEnablingEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostDasEnablingEvent"] = reflect.TypeOf((*HostDasEnablingEvent)(nil)).Elem()
+}
+
+type HostDasErrorEvent struct {
+	HostEvent
+
+	Message string `xml:"message,omitempty"`
+	Reason  string `xml:"reason,omitempty"`
+}
+
+func init() {
+	t["HostDasErrorEvent"] = reflect.TypeOf((*HostDasErrorEvent)(nil)).Elem()
+}
+
+type HostDasEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostDasEvent"] = reflect.TypeOf((*HostDasEvent)(nil)).Elem()
+}
+
+type HostDasOkEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostDasOkEvent"] = reflect.TypeOf((*HostDasOkEvent)(nil)).Elem()
+}
+
+type HostDatastoreBrowserSearchResults struct {
+	DynamicData
+
+	Datastore  *ManagedObjectReference `xml:"datastore,omitempty"`
+	FolderPath string                  `xml:"folderPath,omitempty"`
+	File       []BaseFileInfo          `xml:"file,omitempty,typeattr"`
+}
+
+func init() {
+	t["HostDatastoreBrowserSearchResults"] = reflect.TypeOf((*HostDatastoreBrowserSearchResults)(nil)).Elem()
+}
+
+type HostDatastoreBrowserSearchSpec struct {
+	DynamicData
+
+	Query                 []BaseFileQuery `xml:"query,omitempty,typeattr"`
+	Details               *FileQueryFlags `xml:"details,omitempty"`
+	SearchCaseInsensitive *bool           `xml:"searchCaseInsensitive"`
+	MatchPattern          []string        `xml:"matchPattern,omitempty"`
+	SortFoldersFirst      *bool           `xml:"sortFoldersFirst"`
+}
+
+func init() {
+	t["HostDatastoreBrowserSearchSpec"] = reflect.TypeOf((*HostDatastoreBrowserSearchSpec)(nil)).Elem()
+}
+
+type HostDatastoreConnectInfo struct {
+	DynamicData
+
+	Summary DatastoreSummary `xml:"summary"`
+}
+
+func init() {
+	t["HostDatastoreConnectInfo"] = reflect.TypeOf((*HostDatastoreConnectInfo)(nil)).Elem()
+}
+
+type HostDatastoreExistsConnectInfo struct {
+	HostDatastoreConnectInfo
+
+	NewDatastoreName string `xml:"newDatastoreName"`
+}
+
+func init() {
+	t["HostDatastoreExistsConnectInfo"] = reflect.TypeOf((*HostDatastoreExistsConnectInfo)(nil)).Elem()
+}
+
+type HostDatastoreNameConflictConnectInfo struct {
+	HostDatastoreConnectInfo
+
+	NewDatastoreName string `xml:"newDatastoreName"`
+}
+
+func init() {
+	t["HostDatastoreNameConflictConnectInfo"] = reflect.TypeOf((*HostDatastoreNameConflictConnectInfo)(nil)).Elem()
+}
+
+type HostDatastoreSystemCapabilities struct {
+	DynamicData
+
+	NfsMountCreationRequired     bool  `xml:"nfsMountCreationRequired"`
+	NfsMountCreationSupported    bool  `xml:"nfsMountCreationSupported"`
+	LocalDatastoreSupported      bool  `xml:"localDatastoreSupported"`
+	VmfsExtentExpansionSupported *bool `xml:"vmfsExtentExpansionSupported"`
+}
+
+func init() {
+	t["HostDatastoreSystemCapabilities"] = reflect.TypeOf((*HostDatastoreSystemCapabilities)(nil)).Elem()
+}
+
+type HostDatastoreSystemDatastoreResult struct {
+	DynamicData
+
+	Key   ManagedObjectReference `xml:"key"`
+	Fault *LocalizedMethodFault  `xml:"fault,omitempty"`
+}
+
+func init() {
+	t["HostDatastoreSystemDatastoreResult"] = reflect.TypeOf((*HostDatastoreSystemDatastoreResult)(nil)).Elem()
+}
+
+type HostDatastoreSystemVvolDatastoreSpec struct {
+	DynamicData
+
+	Name string `xml:"name"`
+	ScId string `xml:"scId"`
+}
+
+func init() {
+	t["HostDatastoreSystemVvolDatastoreSpec"] = reflect.TypeOf((*HostDatastoreSystemVvolDatastoreSpec)(nil)).Elem()
+}
+
+type HostDateTimeConfig struct {
+	DynamicData
+
+	TimeZone  string         `xml:"timeZone,omitempty"`
+	NtpConfig *HostNtpConfig `xml:"ntpConfig,omitempty"`
+}
+
+func init() {
+	t["HostDateTimeConfig"] = reflect.TypeOf((*HostDateTimeConfig)(nil)).Elem()
+}
+
+type HostDateTimeInfo struct {
+	DynamicData
+
+	TimeZone  HostDateTimeSystemTimeZone `xml:"timeZone"`
+	NtpConfig *HostNtpConfig             `xml:"ntpConfig,omitempty"`
+}
+
+func init() {
+	t["HostDateTimeInfo"] = reflect.TypeOf((*HostDateTimeInfo)(nil)).Elem()
+}
+
+type HostDateTimeSystemTimeZone struct {
+	DynamicData
+
+	Key         string `xml:"key"`
+	Name        string `xml:"name"`
+	Description string `xml:"description"`
+	GmtOffset   int32  `xml:"gmtOffset"`
+}
+
+func init() {
+	t["HostDateTimeSystemTimeZone"] = reflect.TypeOf((*HostDateTimeSystemTimeZone)(nil)).Elem()
+}
+
+type HostDeleteVStorageObjectRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Id        ID                     `xml:"id"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["HostDeleteVStorageObjectRequestType"] = reflect.TypeOf((*HostDeleteVStorageObjectRequestType)(nil)).Elem()
+}
+
+type HostDeleteVStorageObject_Task HostDeleteVStorageObjectRequestType
+
+func init() {
+	t["HostDeleteVStorageObject_Task"] = reflect.TypeOf((*HostDeleteVStorageObject_Task)(nil)).Elem()
+}
+
+type HostDeleteVStorageObject_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type HostDeploymentInfo struct {
+	DynamicData
+
+	BootedFromStatelessCache *bool `xml:"bootedFromStatelessCache"`
+}
+
+func init() {
+	t["HostDeploymentInfo"] = reflect.TypeOf((*HostDeploymentInfo)(nil)).Elem()
+}
+
+type HostDevice struct {
+	DynamicData
+
+	DeviceName string `xml:"deviceName"`
+	DeviceType string `xml:"deviceType"`
+}
+
+func init() {
+	t["HostDevice"] = reflect.TypeOf((*HostDevice)(nil)).Elem()
+}
+
+type HostDhcpService struct {
+	DynamicData
+
+	Key  string              `xml:"key"`
+	Spec HostDhcpServiceSpec `xml:"spec"`
+}
+
+func init() {
+	t["HostDhcpService"] = reflect.TypeOf((*HostDhcpService)(nil)).Elem()
+}
+
+type HostDhcpServiceConfig struct {
+	DynamicData
+
+	ChangeOperation string              `xml:"changeOperation,omitempty"`
+	Key             string              `xml:"key"`
+	Spec            HostDhcpServiceSpec `xml:"spec"`
+}
+
+func init() {
+	t["HostDhcpServiceConfig"] = reflect.TypeOf((*HostDhcpServiceConfig)(nil)).Elem()
+}
+
+type HostDhcpServiceSpec struct {
+	DynamicData
+
+	VirtualSwitch        string `xml:"virtualSwitch"`
+	DefaultLeaseDuration int32  `xml:"defaultLeaseDuration"`
+	LeaseBeginIp         string `xml:"leaseBeginIp"`
+	LeaseEndIp           string `xml:"leaseEndIp"`
+	MaxLeaseDuration     int32  `xml:"maxLeaseDuration"`
+	UnlimitedLease       bool   `xml:"unlimitedLease"`
+	IpSubnetAddr         string `xml:"ipSubnetAddr"`
+	IpSubnetMask         string `xml:"ipSubnetMask"`
+}
+
+func init() {
+	t["HostDhcpServiceSpec"] = reflect.TypeOf((*HostDhcpServiceSpec)(nil)).Elem()
+}
+
+type HostDiagnosticPartition struct {
+	DynamicData
+
+	StorageType    string                `xml:"storageType"`
+	DiagnosticType string                `xml:"diagnosticType"`
+	Slots          int32                 `xml:"slots"`
+	Id             HostScsiDiskPartition `xml:"id"`
+}
+
+func init() {
+	t["HostDiagnosticPartition"] = reflect.TypeOf((*HostDiagnosticPartition)(nil)).Elem()
+}
+
+type HostDiagnosticPartitionCreateDescription struct {
+	DynamicData
+
+	Layout   HostDiskPartitionLayout           `xml:"layout"`
+	DiskUuid string                            `xml:"diskUuid"`
+	Spec     HostDiagnosticPartitionCreateSpec `xml:"spec"`
+}
+
+func init() {
+	t["HostDiagnosticPartitionCreateDescription"] = reflect.TypeOf((*HostDiagnosticPartitionCreateDescription)(nil)).Elem()
+}
+
+type HostDiagnosticPartitionCreateOption struct {
+	DynamicData
+
+	StorageType    string       `xml:"storageType"`
+	DiagnosticType string       `xml:"diagnosticType"`
+	Disk           HostScsiDisk `xml:"disk"`
+}
+
+func init() {
+	t["HostDiagnosticPartitionCreateOption"] = reflect.TypeOf((*HostDiagnosticPartitionCreateOption)(nil)).Elem()
+}
+
+type HostDiagnosticPartitionCreateSpec struct {
+	DynamicData
+
+	StorageType    string                `xml:"storageType"`
+	DiagnosticType string                `xml:"diagnosticType"`
+	Id             HostScsiDiskPartition `xml:"id"`
+	Partition      HostDiskPartitionSpec `xml:"partition"`
+	Active         *bool                 `xml:"active"`
+}
+
+func init() {
+	t["HostDiagnosticPartitionCreateSpec"] = reflect.TypeOf((*HostDiagnosticPartitionCreateSpec)(nil)).Elem()
+}
+
+type HostDigestInfo struct {
+	DynamicData
+
+	DigestMethod string `xml:"digestMethod"`
+	DigestValue  []byte `xml:"digestValue"`
+	ObjectName   string `xml:"objectName,omitempty"`
+}
+
+func init() {
+	t["HostDigestInfo"] = reflect.TypeOf((*HostDigestInfo)(nil)).Elem()
+}
+
+type HostDirectoryStoreInfo struct {
+	HostAuthenticationStoreInfo
+}
+
+func init() {
+	t["HostDirectoryStoreInfo"] = reflect.TypeOf((*HostDirectoryStoreInfo)(nil)).Elem()
+}
+
+type HostDisconnectedEvent struct {
+	HostEvent
+
+	Reason string `xml:"reason,omitempty"`
+}
+
+func init() {
+	t["HostDisconnectedEvent"] = reflect.TypeOf((*HostDisconnectedEvent)(nil)).Elem()
+}
+
+type HostDiskConfigurationResult struct {
+	DynamicData
+
+	DevicePath string                `xml:"devicePath,omitempty"`
+	Success    *bool                 `xml:"success"`
+	Fault      *LocalizedMethodFault `xml:"fault,omitempty"`
+}
+
+func init() {
+	t["HostDiskConfigurationResult"] = reflect.TypeOf((*HostDiskConfigurationResult)(nil)).Elem()
+}
+
+type HostDiskDimensions struct {
+	DynamicData
+}
+
+func init() {
+	t["HostDiskDimensions"] = reflect.TypeOf((*HostDiskDimensions)(nil)).Elem()
+}
+
+type HostDiskDimensionsChs struct {
+	DynamicData
+
+	Cylinder int64 `xml:"cylinder"`
+	Head     int32 `xml:"head"`
+	Sector   int32 `xml:"sector"`
+}
+
+func init() {
+	t["HostDiskDimensionsChs"] = reflect.TypeOf((*HostDiskDimensionsChs)(nil)).Elem()
+}
+
+type HostDiskDimensionsLba struct {
+	DynamicData
+
+	BlockSize int32 `xml:"blockSize"`
+	Block     int64 `xml:"block"`
+}
+
+func init() {
+	t["HostDiskDimensionsLba"] = reflect.TypeOf((*HostDiskDimensionsLba)(nil)).Elem()
+}
+
+type HostDiskMappingInfo struct {
+	DynamicData
+
+	PhysicalPartition *HostDiskMappingPartitionInfo `xml:"physicalPartition,omitempty"`
+	Name              string                        `xml:"name"`
+	Exclusive         *bool                         `xml:"exclusive"`
+}
+
+func init() {
+	t["HostDiskMappingInfo"] = reflect.TypeOf((*HostDiskMappingInfo)(nil)).Elem()
+}
+
+type HostDiskMappingOption struct {
+	DynamicData
+
+	PhysicalPartition []HostDiskMappingPartitionOption `xml:"physicalPartition,omitempty"`
+	Name              string                           `xml:"name"`
+}
+
+func init() {
+	t["HostDiskMappingOption"] = reflect.TypeOf((*HostDiskMappingOption)(nil)).Elem()
+}
+
+type HostDiskMappingPartitionInfo struct {
+	DynamicData
+
+	Name         string `xml:"name"`
+	FileSystem   string `xml:"fileSystem"`
+	CapacityInKb int64  `xml:"capacityInKb"`
+}
+
+func init() {
+	t["HostDiskMappingPartitionInfo"] = reflect.TypeOf((*HostDiskMappingPartitionInfo)(nil)).Elem()
+}
+
+type HostDiskMappingPartitionOption struct {
+	DynamicData
+
+	Name         string `xml:"name"`
+	FileSystem   string `xml:"fileSystem"`
+	CapacityInKb int64  `xml:"capacityInKb"`
+}
+
+func init() {
+	t["HostDiskMappingPartitionOption"] = reflect.TypeOf((*HostDiskMappingPartitionOption)(nil)).Elem()
+}
+
+type HostDiskPartitionAttributes struct {
+	DynamicData
+
+	Partition          int32  `xml:"partition"`
+	StartSector        int64  `xml:"startSector"`
+	EndSector          int64  `xml:"endSector"`
+	Type               string `xml:"type"`
+	Guid               string `xml:"guid,omitempty"`
+	Logical            bool   `xml:"logical"`
+	Attributes         byte   `xml:"attributes"`
+	PartitionAlignment int64  `xml:"partitionAlignment,omitempty"`
+}
+
+func init() {
+	t["HostDiskPartitionAttributes"] = reflect.TypeOf((*HostDiskPartitionAttributes)(nil)).Elem()
+}
+
+type HostDiskPartitionBlockRange struct {
+	DynamicData
+
+	Partition int32                 `xml:"partition,omitempty"`
+	Type      string                `xml:"type"`
+	Start     HostDiskDimensionsLba `xml:"start"`
+	End       HostDiskDimensionsLba `xml:"end"`
+}
+
+func init() {
+	t["HostDiskPartitionBlockRange"] = reflect.TypeOf((*HostDiskPartitionBlockRange)(nil)).Elem()
+}
+
+type HostDiskPartitionInfo struct {
+	DynamicData
+
+	DeviceName string                  `xml:"deviceName"`
+	Spec       HostDiskPartitionSpec   `xml:"spec"`
+	Layout     HostDiskPartitionLayout `xml:"layout"`
+}
+
+func init() {
+	t["HostDiskPartitionInfo"] = reflect.TypeOf((*HostDiskPartitionInfo)(nil)).Elem()
+}
+
+type HostDiskPartitionLayout struct {
+	DynamicData
+
+	Total     *HostDiskDimensionsLba        `xml:"total,omitempty"`
+	Partition []HostDiskPartitionBlockRange `xml:"partition"`
+}
+
+func init() {
+	t["HostDiskPartitionLayout"] = reflect.TypeOf((*HostDiskPartitionLayout)(nil)).Elem()
+}
+
+type HostDiskPartitionSpec struct {
+	DynamicData
+
+	PartitionFormat string                        `xml:"partitionFormat,omitempty"`
+	Chs             *HostDiskDimensionsChs        `xml:"chs,omitempty"`
+	TotalSectors    int64                         `xml:"totalSectors,omitempty"`
+	Partition       []HostDiskPartitionAttributes `xml:"partition,omitempty"`
+}
+
+func init() {
+	t["HostDiskPartitionSpec"] = reflect.TypeOf((*HostDiskPartitionSpec)(nil)).Elem()
+}
+
+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"`
+}
+
+func init() {
+	t["HostDnsConfig"] = reflect.TypeOf((*HostDnsConfig)(nil)).Elem()
+}
+
+type HostDnsConfigSpec struct {
+	HostDnsConfig
+
+	VirtualNicConnection *HostVirtualNicConnection `xml:"virtualNicConnection,omitempty"`
+}
+
+func init() {
+	t["HostDnsConfigSpec"] = reflect.TypeOf((*HostDnsConfigSpec)(nil)).Elem()
+}
+
+type HostEnableAdminFailedEvent struct {
+	HostEvent
+
+	Permissions []Permission `xml:"permissions"`
+}
+
+func init() {
+	t["HostEnableAdminFailedEvent"] = reflect.TypeOf((*HostEnableAdminFailedEvent)(nil)).Elem()
+}
+
+type HostEsxAgentHostManagerConfigInfo struct {
+	DynamicData
+
+	AgentVmDatastore *ManagedObjectReference `xml:"agentVmDatastore,omitempty"`
+	AgentVmNetwork   *ManagedObjectReference `xml:"agentVmNetwork,omitempty"`
+}
+
+func init() {
+	t["HostEsxAgentHostManagerConfigInfo"] = reflect.TypeOf((*HostEsxAgentHostManagerConfigInfo)(nil)).Elem()
+}
+
+type HostEvent struct {
+	Event
+}
+
+func init() {
+	t["HostEvent"] = reflect.TypeOf((*HostEvent)(nil)).Elem()
+}
+
+type HostEventArgument struct {
+	EntityEventArgument
+
+	Host ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["HostEventArgument"] = reflect.TypeOf((*HostEventArgument)(nil)).Elem()
+}
+
+type HostExtendDiskRequestType struct {
+	This            ManagedObjectReference `xml:"_this"`
+	Id              ID                     `xml:"id"`
+	Datastore       ManagedObjectReference `xml:"datastore"`
+	NewCapacityInMB int64                  `xml:"newCapacityInMB"`
+}
+
+func init() {
+	t["HostExtendDiskRequestType"] = reflect.TypeOf((*HostExtendDiskRequestType)(nil)).Elem()
+}
+
+type HostExtendDisk_Task HostExtendDiskRequestType
+
+func init() {
+	t["HostExtendDisk_Task"] = reflect.TypeOf((*HostExtendDisk_Task)(nil)).Elem()
+}
+
+type HostExtendDisk_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type HostExtraNetworksEvent struct {
+	HostDasEvent
+
+	Ips string `xml:"ips,omitempty"`
+}
+
+func init() {
+	t["HostExtraNetworksEvent"] = reflect.TypeOf((*HostExtraNetworksEvent)(nil)).Elem()
+}
+
+type HostFaultToleranceManagerComponentHealthInfo struct {
+	DynamicData
+
+	IsStorageHealthy bool `xml:"isStorageHealthy"`
+	IsNetworkHealthy bool `xml:"isNetworkHealthy"`
+}
+
+func init() {
+	t["HostFaultToleranceManagerComponentHealthInfo"] = reflect.TypeOf((*HostFaultToleranceManagerComponentHealthInfo)(nil)).Elem()
+}
+
+type HostFeatureCapability struct {
+	DynamicData
+
+	Key         string `xml:"key"`
+	FeatureName string `xml:"featureName"`
+	Value       string `xml:"value"`
+}
+
+func init() {
+	t["HostFeatureCapability"] = reflect.TypeOf((*HostFeatureCapability)(nil)).Elem()
+}
+
+type HostFeatureMask struct {
+	DynamicData
+
+	Key         string `xml:"key"`
+	FeatureName string `xml:"featureName"`
+	Value       string `xml:"value"`
+}
+
+func init() {
+	t["HostFeatureMask"] = reflect.TypeOf((*HostFeatureMask)(nil)).Elem()
+}
+
+type HostFeatureVersionInfo struct {
+	DynamicData
+
+	Key   string `xml:"key"`
+	Value string `xml:"value"`
+}
+
+func init() {
+	t["HostFeatureVersionInfo"] = reflect.TypeOf((*HostFeatureVersionInfo)(nil)).Elem()
+}
+
+type HostFibreChannelHba struct {
+	HostHostBusAdapter
+
+	PortWorldWideName int64                `xml:"portWorldWideName"`
+	NodeWorldWideName int64                `xml:"nodeWorldWideName"`
+	PortType          FibreChannelPortType `xml:"portType"`
+	Speed             int64                `xml:"speed"`
+}
+
+func init() {
+	t["HostFibreChannelHba"] = reflect.TypeOf((*HostFibreChannelHba)(nil)).Elem()
+}
+
+type HostFibreChannelOverEthernetHba struct {
+	HostFibreChannelHba
+
+	UnderlyingNic    string                                  `xml:"underlyingNic"`
+	LinkInfo         HostFibreChannelOverEthernetHbaLinkInfo `xml:"linkInfo"`
+	IsSoftwareFcoe   bool                                    `xml:"isSoftwareFcoe"`
+	MarkedForRemoval bool                                    `xml:"markedForRemoval"`
+}
+
+func init() {
+	t["HostFibreChannelOverEthernetHba"] = reflect.TypeOf((*HostFibreChannelOverEthernetHba)(nil)).Elem()
+}
+
+type HostFibreChannelOverEthernetHbaLinkInfo struct {
+	DynamicData
+
+	VnportMac string `xml:"vnportMac"`
+	FcfMac    string `xml:"fcfMac"`
+	VlanId    int32  `xml:"vlanId"`
+}
+
+func init() {
+	t["HostFibreChannelOverEthernetHbaLinkInfo"] = reflect.TypeOf((*HostFibreChannelOverEthernetHbaLinkInfo)(nil)).Elem()
+}
+
+type HostFibreChannelOverEthernetTargetTransport struct {
+	HostFibreChannelTargetTransport
+
+	VnportMac string `xml:"vnportMac"`
+	FcfMac    string `xml:"fcfMac"`
+	VlanId    int32  `xml:"vlanId"`
+}
+
+func init() {
+	t["HostFibreChannelOverEthernetTargetTransport"] = reflect.TypeOf((*HostFibreChannelOverEthernetTargetTransport)(nil)).Elem()
+}
+
+type HostFibreChannelTargetTransport struct {
+	HostTargetTransport
+
+	PortWorldWideName int64 `xml:"portWorldWideName"`
+	NodeWorldWideName int64 `xml:"nodeWorldWideName"`
+}
+
+func init() {
+	t["HostFibreChannelTargetTransport"] = reflect.TypeOf((*HostFibreChannelTargetTransport)(nil)).Elem()
+}
+
+type HostFileAccess struct {
+	DynamicData
+
+	Who  string `xml:"who"`
+	What string `xml:"what"`
+}
+
+func init() {
+	t["HostFileAccess"] = reflect.TypeOf((*HostFileAccess)(nil)).Elem()
+}
+
+type HostFileSystemMountInfo struct {
+	DynamicData
+
+	MountInfo       HostMountInfo            `xml:"mountInfo"`
+	Volume          BaseHostFileSystemVolume `xml:"volume,typeattr"`
+	VStorageSupport string                   `xml:"vStorageSupport,omitempty"`
+}
+
+func init() {
+	t["HostFileSystemMountInfo"] = reflect.TypeOf((*HostFileSystemMountInfo)(nil)).Elem()
+}
+
+type HostFileSystemVolume struct {
+	DynamicData
+
+	Type     string `xml:"type"`
+	Name     string `xml:"name"`
+	Capacity int64  `xml:"capacity"`
+}
+
+func init() {
+	t["HostFileSystemVolume"] = reflect.TypeOf((*HostFileSystemVolume)(nil)).Elem()
+}
+
+type HostFileSystemVolumeInfo struct {
+	DynamicData
+
+	VolumeTypeList []string                  `xml:"volumeTypeList,omitempty"`
+	MountInfo      []HostFileSystemMountInfo `xml:"mountInfo,omitempty"`
+}
+
+func init() {
+	t["HostFileSystemVolumeInfo"] = reflect.TypeOf((*HostFileSystemVolumeInfo)(nil)).Elem()
+}
+
+type HostFirewallConfig struct {
+	DynamicData
+
+	Rule                  []HostFirewallConfigRuleSetConfig `xml:"rule,omitempty"`
+	DefaultBlockingPolicy HostFirewallDefaultPolicy         `xml:"defaultBlockingPolicy"`
+}
+
+func init() {
+	t["HostFirewallConfig"] = reflect.TypeOf((*HostFirewallConfig)(nil)).Elem()
+}
+
+type HostFirewallConfigRuleSetConfig struct {
+	DynamicData
+
+	RulesetId    string                     `xml:"rulesetId"`
+	Enabled      bool                       `xml:"enabled"`
+	AllowedHosts *HostFirewallRulesetIpList `xml:"allowedHosts,omitempty"`
+}
+
+func init() {
+	t["HostFirewallConfigRuleSetConfig"] = reflect.TypeOf((*HostFirewallConfigRuleSetConfig)(nil)).Elem()
+}
+
+type HostFirewallDefaultPolicy struct {
+	DynamicData
+
+	IncomingBlocked *bool `xml:"incomingBlocked"`
+	OutgoingBlocked *bool `xml:"outgoingBlocked"`
+}
+
+func init() {
+	t["HostFirewallDefaultPolicy"] = reflect.TypeOf((*HostFirewallDefaultPolicy)(nil)).Elem()
+}
+
+type HostFirewallInfo struct {
+	DynamicData
+
+	DefaultPolicy HostFirewallDefaultPolicy `xml:"defaultPolicy"`
+	Ruleset       []HostFirewallRuleset     `xml:"ruleset,omitempty"`
+}
+
+func init() {
+	t["HostFirewallInfo"] = reflect.TypeOf((*HostFirewallInfo)(nil)).Elem()
+}
+
+type HostFirewallRule struct {
+	DynamicData
+
+	Port      int32                     `xml:"port"`
+	EndPort   int32                     `xml:"endPort,omitempty"`
+	Direction HostFirewallRuleDirection `xml:"direction"`
+	PortType  HostFirewallRulePortType  `xml:"portType,omitempty"`
+	Protocol  string                    `xml:"protocol"`
+}
+
+func init() {
+	t["HostFirewallRule"] = reflect.TypeOf((*HostFirewallRule)(nil)).Elem()
+}
+
+type HostFirewallRuleset struct {
+	DynamicData
+
+	Key          string                     `xml:"key"`
+	Label        string                     `xml:"label"`
+	Required     bool                       `xml:"required"`
+	Rule         []HostFirewallRule         `xml:"rule"`
+	Service      string                     `xml:"service,omitempty"`
+	Enabled      bool                       `xml:"enabled"`
+	AllowedHosts *HostFirewallRulesetIpList `xml:"allowedHosts,omitempty"`
+}
+
+func init() {
+	t["HostFirewallRuleset"] = reflect.TypeOf((*HostFirewallRuleset)(nil)).Elem()
+}
+
+type HostFirewallRulesetIpList struct {
+	DynamicData
+
+	IpAddress []string                       `xml:"ipAddress,omitempty"`
+	IpNetwork []HostFirewallRulesetIpNetwork `xml:"ipNetwork,omitempty"`
+	AllIp     bool                           `xml:"allIp"`
+}
+
+func init() {
+	t["HostFirewallRulesetIpList"] = reflect.TypeOf((*HostFirewallRulesetIpList)(nil)).Elem()
+}
+
+type HostFirewallRulesetIpNetwork struct {
+	DynamicData
+
+	Network      string `xml:"network"`
+	PrefixLength int32  `xml:"prefixLength"`
+}
+
+func init() {
+	t["HostFirewallRulesetIpNetwork"] = reflect.TypeOf((*HostFirewallRulesetIpNetwork)(nil)).Elem()
+}
+
+type HostFirewallRulesetRulesetSpec struct {
+	DynamicData
+
+	AllowedHosts HostFirewallRulesetIpList `xml:"allowedHosts"`
+}
+
+func init() {
+	t["HostFirewallRulesetRulesetSpec"] = reflect.TypeOf((*HostFirewallRulesetRulesetSpec)(nil)).Elem()
+}
+
+type HostFlagInfo struct {
+	DynamicData
+
+	BackgroundSnapshotsEnabled *bool `xml:"backgroundSnapshotsEnabled"`
+}
+
+func init() {
+	t["HostFlagInfo"] = reflect.TypeOf((*HostFlagInfo)(nil)).Elem()
+}
+
+type HostForceMountedInfo struct {
+	DynamicData
+
+	Persist bool `xml:"persist"`
+	Mounted bool `xml:"mounted"`
+}
+
+func init() {
+	t["HostForceMountedInfo"] = reflect.TypeOf((*HostForceMountedInfo)(nil)).Elem()
+}
+
+type HostGatewaySpec struct {
+	DynamicData
+
+	GatewayType            string     `xml:"gatewayType"`
+	GatewayId              string     `xml:"gatewayId,omitempty"`
+	TrustVerificationToken string     `xml:"trustVerificationToken,omitempty"`
+	HostAuthParams         []KeyValue `xml:"hostAuthParams,omitempty"`
+}
+
+func init() {
+	t["HostGatewaySpec"] = reflect.TypeOf((*HostGatewaySpec)(nil)).Elem()
+}
+
+type HostGetShortNameFailedEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostGetShortNameFailedEvent"] = reflect.TypeOf((*HostGetShortNameFailedEvent)(nil)).Elem()
+}
+
+type HostGetVFlashModuleDefaultConfig HostGetVFlashModuleDefaultConfigRequestType
+
+func init() {
+	t["HostGetVFlashModuleDefaultConfig"] = reflect.TypeOf((*HostGetVFlashModuleDefaultConfig)(nil)).Elem()
+}
+
+type HostGetVFlashModuleDefaultConfigRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	VFlashModule string                 `xml:"vFlashModule"`
+}
+
+func init() {
+	t["HostGetVFlashModuleDefaultConfigRequestType"] = reflect.TypeOf((*HostGetVFlashModuleDefaultConfigRequestType)(nil)).Elem()
+}
+
+type HostGetVFlashModuleDefaultConfigResponse struct {
+	Returnval VirtualDiskVFlashCacheConfigInfo `xml:"returnval"`
+}
+
+type HostGraphicsConfig struct {
+	DynamicData
+
+	HostDefaultGraphicsType        string                         `xml:"hostDefaultGraphicsType"`
+	SharedPassthruAssignmentPolicy string                         `xml:"sharedPassthruAssignmentPolicy"`
+	DeviceType                     []HostGraphicsConfigDeviceType `xml:"deviceType,omitempty"`
+}
+
+func init() {
+	t["HostGraphicsConfig"] = reflect.TypeOf((*HostGraphicsConfig)(nil)).Elem()
+}
+
+type HostGraphicsConfigDeviceType struct {
+	DynamicData
+
+	DeviceId     string `xml:"deviceId"`
+	GraphicsType string `xml:"graphicsType"`
+}
+
+func init() {
+	t["HostGraphicsConfigDeviceType"] = reflect.TypeOf((*HostGraphicsConfigDeviceType)(nil)).Elem()
+}
+
+type HostGraphicsInfo struct {
+	DynamicData
+
+	DeviceName     string                   `xml:"deviceName"`
+	VendorName     string                   `xml:"vendorName"`
+	PciId          string                   `xml:"pciId"`
+	GraphicsType   string                   `xml:"graphicsType"`
+	MemorySizeInKB int64                    `xml:"memorySizeInKB"`
+	Vm             []ManagedObjectReference `xml:"vm,omitempty"`
+}
+
+func init() {
+	t["HostGraphicsInfo"] = reflect.TypeOf((*HostGraphicsInfo)(nil)).Elem()
+}
+
+type HostHardwareElementInfo struct {
+	DynamicData
+
+	Name   string                 `xml:"name"`
+	Status BaseElementDescription `xml:"status,typeattr"`
+}
+
+func init() {
+	t["HostHardwareElementInfo"] = reflect.TypeOf((*HostHardwareElementInfo)(nil)).Elem()
+}
+
+type HostHardwareInfo struct {
+	DynamicData
+
+	SystemInfo             HostSystemInfo              `xml:"systemInfo"`
+	CpuPowerManagementInfo *HostCpuPowerManagementInfo `xml:"cpuPowerManagementInfo,omitempty"`
+	CpuInfo                HostCpuInfo                 `xml:"cpuInfo"`
+	CpuPkg                 []HostCpuPackage            `xml:"cpuPkg"`
+	MemorySize             int64                       `xml:"memorySize"`
+	NumaInfo               *HostNumaInfo               `xml:"numaInfo,omitempty"`
+	SmcPresent             *bool                       `xml:"smcPresent"`
+	PciDevice              []HostPciDevice             `xml:"pciDevice,omitempty"`
+	CpuFeature             []HostCpuIdInfo             `xml:"cpuFeature,omitempty"`
+	BiosInfo               *HostBIOSInfo               `xml:"biosInfo,omitempty"`
+	ReliableMemoryInfo     *HostReliableMemoryInfo     `xml:"reliableMemoryInfo,omitempty"`
+}
+
+func init() {
+	t["HostHardwareInfo"] = reflect.TypeOf((*HostHardwareInfo)(nil)).Elem()
+}
+
+type HostHardwareStatusInfo struct {
+	DynamicData
+
+	MemoryStatusInfo  []BaseHostHardwareElementInfo `xml:"memoryStatusInfo,omitempty,typeattr"`
+	CpuStatusInfo     []BaseHostHardwareElementInfo `xml:"cpuStatusInfo,omitempty,typeattr"`
+	StorageStatusInfo []HostStorageElementInfo      `xml:"storageStatusInfo,omitempty"`
+}
+
+func init() {
+	t["HostHardwareStatusInfo"] = reflect.TypeOf((*HostHardwareStatusInfo)(nil)).Elem()
+}
+
+type HostHardwareSummary struct {
+	DynamicData
+
+	Vendor               string                         `xml:"vendor"`
+	Model                string                         `xml:"model"`
+	Uuid                 string                         `xml:"uuid"`
+	OtherIdentifyingInfo []HostSystemIdentificationInfo `xml:"otherIdentifyingInfo,omitempty"`
+	MemorySize           int64                          `xml:"memorySize"`
+	CpuModel             string                         `xml:"cpuModel"`
+	CpuMhz               int32                          `xml:"cpuMhz"`
+	NumCpuPkgs           int16                          `xml:"numCpuPkgs"`
+	NumCpuCores          int16                          `xml:"numCpuCores"`
+	NumCpuThreads        int16                          `xml:"numCpuThreads"`
+	NumNics              int32                          `xml:"numNics"`
+	NumHBAs              int32                          `xml:"numHBAs"`
+}
+
+func init() {
+	t["HostHardwareSummary"] = reflect.TypeOf((*HostHardwareSummary)(nil)).Elem()
+}
+
+type HostHasComponentFailure struct {
+	VimFault
+
+	HostName      string `xml:"hostName"`
+	ComponentType string `xml:"componentType"`
+	ComponentName string `xml:"componentName"`
+}
+
+func init() {
+	t["HostHasComponentFailure"] = reflect.TypeOf((*HostHasComponentFailure)(nil)).Elem()
+}
+
+type HostHasComponentFailureFault HostHasComponentFailure
+
+func init() {
+	t["HostHasComponentFailureFault"] = reflect.TypeOf((*HostHasComponentFailureFault)(nil)).Elem()
+}
+
+type HostHostBusAdapter struct {
+	DynamicData
+
+	Key    string `xml:"key,omitempty"`
+	Device string `xml:"device"`
+	Bus    int32  `xml:"bus"`
+	Status string `xml:"status"`
+	Model  string `xml:"model"`
+	Driver string `xml:"driver,omitempty"`
+	Pci    string `xml:"pci,omitempty"`
+}
+
+func init() {
+	t["HostHostBusAdapter"] = reflect.TypeOf((*HostHostBusAdapter)(nil)).Elem()
+}
+
+type HostHyperThreadScheduleInfo struct {
+	DynamicData
+
+	Available bool `xml:"available"`
+	Active    bool `xml:"active"`
+	Config    bool `xml:"config"`
+}
+
+func init() {
+	t["HostHyperThreadScheduleInfo"] = reflect.TypeOf((*HostHyperThreadScheduleInfo)(nil)).Elem()
+}
+
+type HostImageConfigGetAcceptance HostImageConfigGetAcceptanceRequestType
+
+func init() {
+	t["HostImageConfigGetAcceptance"] = reflect.TypeOf((*HostImageConfigGetAcceptance)(nil)).Elem()
+}
+
+type HostImageConfigGetAcceptanceRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["HostImageConfigGetAcceptanceRequestType"] = reflect.TypeOf((*HostImageConfigGetAcceptanceRequestType)(nil)).Elem()
+}
+
+type HostImageConfigGetAcceptanceResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type HostImageConfigGetProfile HostImageConfigGetProfileRequestType
+
+func init() {
+	t["HostImageConfigGetProfile"] = reflect.TypeOf((*HostImageConfigGetProfile)(nil)).Elem()
+}
+
+type HostImageConfigGetProfileRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["HostImageConfigGetProfileRequestType"] = reflect.TypeOf((*HostImageConfigGetProfileRequestType)(nil)).Elem()
+}
+
+type HostImageConfigGetProfileResponse struct {
+	Returnval HostImageProfileSummary `xml:"returnval"`
+}
+
+type HostImageProfileSummary struct {
+	DynamicData
+
+	Name   string `xml:"name"`
+	Vendor string `xml:"vendor"`
+}
+
+func init() {
+	t["HostImageProfileSummary"] = reflect.TypeOf((*HostImageProfileSummary)(nil)).Elem()
+}
+
+type HostInAuditModeEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostInAuditModeEvent"] = reflect.TypeOf((*HostInAuditModeEvent)(nil)).Elem()
+}
+
+type HostInDomain struct {
+	HostConfigFault
+}
+
+func init() {
+	t["HostInDomain"] = reflect.TypeOf((*HostInDomain)(nil)).Elem()
+}
+
+type HostInDomainFault HostInDomain
+
+func init() {
+	t["HostInDomainFault"] = reflect.TypeOf((*HostInDomainFault)(nil)).Elem()
+}
+
+type HostIncompatibleForFaultTolerance struct {
+	VmFaultToleranceIssue
+
+	HostName string `xml:"hostName,omitempty"`
+	Reason   string `xml:"reason,omitempty"`
+}
+
+func init() {
+	t["HostIncompatibleForFaultTolerance"] = reflect.TypeOf((*HostIncompatibleForFaultTolerance)(nil)).Elem()
+}
+
+type HostIncompatibleForFaultToleranceFault HostIncompatibleForFaultTolerance
+
+func init() {
+	t["HostIncompatibleForFaultToleranceFault"] = reflect.TypeOf((*HostIncompatibleForFaultToleranceFault)(nil)).Elem()
+}
+
+type HostIncompatibleForRecordReplay struct {
+	VimFault
+
+	HostName string `xml:"hostName,omitempty"`
+	Reason   string `xml:"reason,omitempty"`
+}
+
+func init() {
+	t["HostIncompatibleForRecordReplay"] = reflect.TypeOf((*HostIncompatibleForRecordReplay)(nil)).Elem()
+}
+
+type HostIncompatibleForRecordReplayFault HostIncompatibleForRecordReplay
+
+func init() {
+	t["HostIncompatibleForRecordReplayFault"] = reflect.TypeOf((*HostIncompatibleForRecordReplayFault)(nil)).Elem()
+}
+
+type HostInflateDiskRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Id        ID                     `xml:"id"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["HostInflateDiskRequestType"] = reflect.TypeOf((*HostInflateDiskRequestType)(nil)).Elem()
+}
+
+type HostInflateDisk_Task HostInflateDiskRequestType
+
+func init() {
+	t["HostInflateDisk_Task"] = reflect.TypeOf((*HostInflateDisk_Task)(nil)).Elem()
+}
+
+type HostInflateDisk_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type HostInternetScsiHba struct {
+	HostHostBusAdapter
+
+	IsSoftwareBased            bool                                          `xml:"isSoftwareBased"`
+	CanBeDisabled              *bool                                         `xml:"canBeDisabled"`
+	NetworkBindingSupport      HostInternetScsiHbaNetworkBindingSupportType  `xml:"networkBindingSupport,omitempty"`
+	DiscoveryCapabilities      HostInternetScsiHbaDiscoveryCapabilities      `xml:"discoveryCapabilities"`
+	DiscoveryProperties        HostInternetScsiHbaDiscoveryProperties        `xml:"discoveryProperties"`
+	AuthenticationCapabilities HostInternetScsiHbaAuthenticationCapabilities `xml:"authenticationCapabilities"`
+	AuthenticationProperties   HostInternetScsiHbaAuthenticationProperties   `xml:"authenticationProperties"`
+	DigestCapabilities         *HostInternetScsiHbaDigestCapabilities        `xml:"digestCapabilities,omitempty"`
+	DigestProperties           *HostInternetScsiHbaDigestProperties          `xml:"digestProperties,omitempty"`
+	IpCapabilities             HostInternetScsiHbaIPCapabilities             `xml:"ipCapabilities"`
+	IpProperties               HostInternetScsiHbaIPProperties               `xml:"ipProperties"`
+	SupportedAdvancedOptions   []OptionDef                                   `xml:"supportedAdvancedOptions,omitempty"`
+	AdvancedOptions            []HostInternetScsiHbaParamValue               `xml:"advancedOptions,omitempty"`
+	IScsiName                  string                                        `xml:"iScsiName"`
+	IScsiAlias                 string                                        `xml:"iScsiAlias,omitempty"`
+	ConfiguredSendTarget       []HostInternetScsiHbaSendTarget               `xml:"configuredSendTarget,omitempty"`
+	ConfiguredStaticTarget     []HostInternetScsiHbaStaticTarget             `xml:"configuredStaticTarget,omitempty"`
+	MaxSpeedMb                 int32                                         `xml:"maxSpeedMb,omitempty"`
+	CurrentSpeedMb             int32                                         `xml:"currentSpeedMb,omitempty"`
+}
+
+func init() {
+	t["HostInternetScsiHba"] = reflect.TypeOf((*HostInternetScsiHba)(nil)).Elem()
+}
+
+type HostInternetScsiHbaAuthenticationCapabilities struct {
+	DynamicData
+
+	ChapAuthSettable         bool  `xml:"chapAuthSettable"`
+	Krb5AuthSettable         bool  `xml:"krb5AuthSettable"`
+	SrpAuthSettable          bool  `xml:"srpAuthSettable"`
+	SpkmAuthSettable         bool  `xml:"spkmAuthSettable"`
+	MutualChapSettable       *bool `xml:"mutualChapSettable"`
+	TargetChapSettable       *bool `xml:"targetChapSettable"`
+	TargetMutualChapSettable *bool `xml:"targetMutualChapSettable"`
+}
+
+func init() {
+	t["HostInternetScsiHbaAuthenticationCapabilities"] = reflect.TypeOf((*HostInternetScsiHbaAuthenticationCapabilities)(nil)).Elem()
+}
+
+type HostInternetScsiHbaAuthenticationProperties struct {
+	DynamicData
+
+	ChapAuthEnabled              bool   `xml:"chapAuthEnabled"`
+	ChapName                     string `xml:"chapName,omitempty"`
+	ChapSecret                   string `xml:"chapSecret,omitempty"`
+	ChapAuthenticationType       string `xml:"chapAuthenticationType,omitempty"`
+	ChapInherited                *bool  `xml:"chapInherited"`
+	MutualChapName               string `xml:"mutualChapName,omitempty"`
+	MutualChapSecret             string `xml:"mutualChapSecret,omitempty"`
+	MutualChapAuthenticationType string `xml:"mutualChapAuthenticationType,omitempty"`
+	MutualChapInherited          *bool  `xml:"mutualChapInherited"`
+}
+
+func init() {
+	t["HostInternetScsiHbaAuthenticationProperties"] = reflect.TypeOf((*HostInternetScsiHbaAuthenticationProperties)(nil)).Elem()
+}
+
+type HostInternetScsiHbaDigestCapabilities struct {
+	DynamicData
+
+	HeaderDigestSettable       *bool `xml:"headerDigestSettable"`
+	DataDigestSettable         *bool `xml:"dataDigestSettable"`
+	TargetHeaderDigestSettable *bool `xml:"targetHeaderDigestSettable"`
+	TargetDataDigestSettable   *bool `xml:"targetDataDigestSettable"`
+}
+
+func init() {
+	t["HostInternetScsiHbaDigestCapabilities"] = reflect.TypeOf((*HostInternetScsiHbaDigestCapabilities)(nil)).Elem()
+}
+
+type HostInternetScsiHbaDigestProperties struct {
+	DynamicData
+
+	HeaderDigestType      string `xml:"headerDigestType,omitempty"`
+	HeaderDigestInherited *bool  `xml:"headerDigestInherited"`
+	DataDigestType        string `xml:"dataDigestType,omitempty"`
+	DataDigestInherited   *bool  `xml:"dataDigestInherited"`
+}
+
+func init() {
+	t["HostInternetScsiHbaDigestProperties"] = reflect.TypeOf((*HostInternetScsiHbaDigestProperties)(nil)).Elem()
+}
+
+type HostInternetScsiHbaDiscoveryCapabilities struct {
+	DynamicData
+
+	ISnsDiscoverySettable         bool `xml:"iSnsDiscoverySettable"`
+	SlpDiscoverySettable          bool `xml:"slpDiscoverySettable"`
+	StaticTargetDiscoverySettable bool `xml:"staticTargetDiscoverySettable"`
+	SendTargetsDiscoverySettable  bool `xml:"sendTargetsDiscoverySettable"`
+}
+
+func init() {
+	t["HostInternetScsiHbaDiscoveryCapabilities"] = reflect.TypeOf((*HostInternetScsiHbaDiscoveryCapabilities)(nil)).Elem()
+}
+
+type HostInternetScsiHbaDiscoveryProperties struct {
+	DynamicData
+
+	ISnsDiscoveryEnabled         bool   `xml:"iSnsDiscoveryEnabled"`
+	ISnsDiscoveryMethod          string `xml:"iSnsDiscoveryMethod,omitempty"`
+	ISnsHost                     string `xml:"iSnsHost,omitempty"`
+	SlpDiscoveryEnabled          bool   `xml:"slpDiscoveryEnabled"`
+	SlpDiscoveryMethod           string `xml:"slpDiscoveryMethod,omitempty"`
+	SlpHost                      string `xml:"slpHost,omitempty"`
+	StaticTargetDiscoveryEnabled bool   `xml:"staticTargetDiscoveryEnabled"`
+	SendTargetsDiscoveryEnabled  bool   `xml:"sendTargetsDiscoveryEnabled"`
+}
+
+func init() {
+	t["HostInternetScsiHbaDiscoveryProperties"] = reflect.TypeOf((*HostInternetScsiHbaDiscoveryProperties)(nil)).Elem()
+}
+
+type HostInternetScsiHbaIPCapabilities struct {
+	DynamicData
+
+	AddressSettable                              bool  `xml:"addressSettable"`
+	IpConfigurationMethodSettable                bool  `xml:"ipConfigurationMethodSettable"`
+	SubnetMaskSettable                           bool  `xml:"subnetMaskSettable"`
+	DefaultGatewaySettable                       bool  `xml:"defaultGatewaySettable"`
+	PrimaryDnsServerAddressSettable              bool  `xml:"primaryDnsServerAddressSettable"`
+	AlternateDnsServerAddressSettable            bool  `xml:"alternateDnsServerAddressSettable"`
+	Ipv6Supported                                *bool `xml:"ipv6Supported"`
+	ArpRedirectSettable                          *bool `xml:"arpRedirectSettable"`
+	MtuSettable                                  *bool `xml:"mtuSettable"`
+	HostNameAsTargetAddress                      *bool `xml:"hostNameAsTargetAddress"`
+	NameAliasSettable                            *bool `xml:"nameAliasSettable"`
+	Ipv4EnableSettable                           *bool `xml:"ipv4EnableSettable"`
+	Ipv6EnableSettable                           *bool `xml:"ipv6EnableSettable"`
+	Ipv6PrefixLengthSettable                     *bool `xml:"ipv6PrefixLengthSettable"`
+	Ipv6PrefixLength                             int32 `xml:"ipv6PrefixLength,omitempty"`
+	Ipv6DhcpConfigurationSettable                *bool `xml:"ipv6DhcpConfigurationSettable"`
+	Ipv6LinkLocalAutoConfigurationSettable       *bool `xml:"ipv6LinkLocalAutoConfigurationSettable"`
+	Ipv6RouterAdvertisementConfigurationSettable *bool `xml:"ipv6RouterAdvertisementConfigurationSettable"`
+	Ipv6DefaultGatewaySettable                   *bool `xml:"ipv6DefaultGatewaySettable"`
+	Ipv6MaxStaticAddressesSupported              int32 `xml:"ipv6MaxStaticAddressesSupported,omitempty"`
+}
+
+func init() {
+	t["HostInternetScsiHbaIPCapabilities"] = reflect.TypeOf((*HostInternetScsiHbaIPCapabilities)(nil)).Elem()
+}
+
+type HostInternetScsiHbaIPProperties struct {
+	DynamicData
+
+	Mac                       string                             `xml:"mac,omitempty"`
+	Address                   string                             `xml:"address,omitempty"`
+	DhcpConfigurationEnabled  bool                               `xml:"dhcpConfigurationEnabled"`
+	SubnetMask                string                             `xml:"subnetMask,omitempty"`
+	DefaultGateway            string                             `xml:"defaultGateway,omitempty"`
+	PrimaryDnsServerAddress   string                             `xml:"primaryDnsServerAddress,omitempty"`
+	AlternateDnsServerAddress string                             `xml:"alternateDnsServerAddress,omitempty"`
+	Ipv6Address               string                             `xml:"ipv6Address,omitempty"`
+	Ipv6SubnetMask            string                             `xml:"ipv6SubnetMask,omitempty"`
+	Ipv6DefaultGateway        string                             `xml:"ipv6DefaultGateway,omitempty"`
+	ArpRedirectEnabled        *bool                              `xml:"arpRedirectEnabled"`
+	Mtu                       int32                              `xml:"mtu,omitempty"`
+	JumboFramesEnabled        *bool                              `xml:"jumboFramesEnabled"`
+	Ipv4Enabled               *bool                              `xml:"ipv4Enabled"`
+	Ipv6Enabled               *bool                              `xml:"ipv6Enabled"`
+	Ipv6properties            *HostInternetScsiHbaIPv6Properties `xml:"ipv6properties,omitempty"`
+}
+
+func init() {
+	t["HostInternetScsiHbaIPProperties"] = reflect.TypeOf((*HostInternetScsiHbaIPProperties)(nil)).Elem()
+}
+
+type HostInternetScsiHbaIPv6Properties struct {
+	DynamicData
+
+	IscsiIpv6Address                            []HostInternetScsiHbaIscsiIpv6Address `xml:"iscsiIpv6Address,omitempty"`
+	Ipv6DhcpConfigurationEnabled                *bool                                 `xml:"ipv6DhcpConfigurationEnabled"`
+	Ipv6LinkLocalAutoConfigurationEnabled       *bool                                 `xml:"ipv6LinkLocalAutoConfigurationEnabled"`
+	Ipv6RouterAdvertisementConfigurationEnabled *bool                                 `xml:"ipv6RouterAdvertisementConfigurationEnabled"`
+	Ipv6DefaultGateway                          string                                `xml:"ipv6DefaultGateway,omitempty"`
+}
+
+func init() {
+	t["HostInternetScsiHbaIPv6Properties"] = reflect.TypeOf((*HostInternetScsiHbaIPv6Properties)(nil)).Elem()
+}
+
+type HostInternetScsiHbaIscsiIpv6Address struct {
+	DynamicData
+
+	Address      string `xml:"address"`
+	PrefixLength int32  `xml:"prefixLength"`
+	Origin       string `xml:"origin"`
+	Operation    string `xml:"operation,omitempty"`
+}
+
+func init() {
+	t["HostInternetScsiHbaIscsiIpv6Address"] = reflect.TypeOf((*HostInternetScsiHbaIscsiIpv6Address)(nil)).Elem()
+}
+
+type HostInternetScsiHbaParamValue struct {
+	OptionValue
+
+	IsInherited *bool `xml:"isInherited"`
+}
+
+func init() {
+	t["HostInternetScsiHbaParamValue"] = reflect.TypeOf((*HostInternetScsiHbaParamValue)(nil)).Elem()
+}
+
+type HostInternetScsiHbaSendTarget struct {
+	DynamicData
+
+	Address                  string                                       `xml:"address"`
+	Port                     int32                                        `xml:"port,omitempty"`
+	AuthenticationProperties *HostInternetScsiHbaAuthenticationProperties `xml:"authenticationProperties,omitempty"`
+	DigestProperties         *HostInternetScsiHbaDigestProperties         `xml:"digestProperties,omitempty"`
+	SupportedAdvancedOptions []OptionDef                                  `xml:"supportedAdvancedOptions,omitempty"`
+	AdvancedOptions          []HostInternetScsiHbaParamValue              `xml:"advancedOptions,omitempty"`
+	Parent                   string                                       `xml:"parent,omitempty"`
+}
+
+func init() {
+	t["HostInternetScsiHbaSendTarget"] = reflect.TypeOf((*HostInternetScsiHbaSendTarget)(nil)).Elem()
+}
+
+type HostInternetScsiHbaStaticTarget struct {
+	DynamicData
+
+	Address                  string                                       `xml:"address"`
+	Port                     int32                                        `xml:"port,omitempty"`
+	IScsiName                string                                       `xml:"iScsiName"`
+	DiscoveryMethod          string                                       `xml:"discoveryMethod,omitempty"`
+	AuthenticationProperties *HostInternetScsiHbaAuthenticationProperties `xml:"authenticationProperties,omitempty"`
+	DigestProperties         *HostInternetScsiHbaDigestProperties         `xml:"digestProperties,omitempty"`
+	SupportedAdvancedOptions []OptionDef                                  `xml:"supportedAdvancedOptions,omitempty"`
+	AdvancedOptions          []HostInternetScsiHbaParamValue              `xml:"advancedOptions,omitempty"`
+	Parent                   string                                       `xml:"parent,omitempty"`
+}
+
+func init() {
+	t["HostInternetScsiHbaStaticTarget"] = reflect.TypeOf((*HostInternetScsiHbaStaticTarget)(nil)).Elem()
+}
+
+type HostInternetScsiHbaTargetSet struct {
+	DynamicData
+
+	StaticTargets []HostInternetScsiHbaStaticTarget `xml:"staticTargets,omitempty"`
+	SendTargets   []HostInternetScsiHbaSendTarget   `xml:"sendTargets,omitempty"`
+}
+
+func init() {
+	t["HostInternetScsiHbaTargetSet"] = reflect.TypeOf((*HostInternetScsiHbaTargetSet)(nil)).Elem()
+}
+
+type HostInternetScsiTargetTransport struct {
+	HostTargetTransport
+
+	IScsiName  string   `xml:"iScsiName"`
+	IScsiAlias string   `xml:"iScsiAlias"`
+	Address    []string `xml:"address,omitempty"`
+}
+
+func init() {
+	t["HostInternetScsiTargetTransport"] = reflect.TypeOf((*HostInternetScsiTargetTransport)(nil)).Elem()
+}
+
+type HostInventoryFull struct {
+	NotEnoughLicenses
+
+	Capacity int32 `xml:"capacity"`
+}
+
+func init() {
+	t["HostInventoryFull"] = reflect.TypeOf((*HostInventoryFull)(nil)).Elem()
+}
+
+type HostInventoryFullEvent struct {
+	LicenseEvent
+
+	Capacity int32 `xml:"capacity"`
+}
+
+func init() {
+	t["HostInventoryFullEvent"] = reflect.TypeOf((*HostInventoryFullEvent)(nil)).Elem()
+}
+
+type HostInventoryFullFault HostInventoryFull
+
+func init() {
+	t["HostInventoryFullFault"] = reflect.TypeOf((*HostInventoryFullFault)(nil)).Elem()
+}
+
+type HostInventoryUnreadableEvent struct {
+	Event
+}
+
+func init() {
+	t["HostInventoryUnreadableEvent"] = reflect.TypeOf((*HostInventoryUnreadableEvent)(nil)).Elem()
+}
+
+type HostIoFilterInfo struct {
+	IoFilterInfo
+
+	Available bool `xml:"available"`
+}
+
+func init() {
+	t["HostIoFilterInfo"] = reflect.TypeOf((*HostIoFilterInfo)(nil)).Elem()
+}
+
+type HostIpChangedEvent struct {
+	HostEvent
+
+	OldIP string `xml:"oldIP"`
+	NewIP string `xml:"newIP"`
+}
+
+func init() {
+	t["HostIpChangedEvent"] = reflect.TypeOf((*HostIpChangedEvent)(nil)).Elem()
+}
+
+type HostIpConfig struct {
+	DynamicData
+
+	Dhcp       bool                                  `xml:"dhcp"`
+	IpAddress  string                                `xml:"ipAddress,omitempty"`
+	SubnetMask string                                `xml:"subnetMask,omitempty"`
+	IpV6Config *HostIpConfigIpV6AddressConfiguration `xml:"ipV6Config,omitempty"`
+}
+
+func init() {
+	t["HostIpConfig"] = reflect.TypeOf((*HostIpConfig)(nil)).Elem()
+}
+
+type HostIpConfigIpV6Address struct {
+	DynamicData
+
+	IpAddress    string     `xml:"ipAddress"`
+	PrefixLength int32      `xml:"prefixLength"`
+	Origin       string     `xml:"origin,omitempty"`
+	DadState     string     `xml:"dadState,omitempty"`
+	Lifetime     *time.Time `xml:"lifetime"`
+	Operation    string     `xml:"operation,omitempty"`
+}
+
+func init() {
+	t["HostIpConfigIpV6Address"] = reflect.TypeOf((*HostIpConfigIpV6Address)(nil)).Elem()
+}
+
+type HostIpConfigIpV6AddressConfiguration struct {
+	DynamicData
+
+	IpV6Address              []HostIpConfigIpV6Address `xml:"ipV6Address,omitempty"`
+	AutoConfigurationEnabled *bool                     `xml:"autoConfigurationEnabled"`
+	DhcpV6Enabled            *bool                     `xml:"dhcpV6Enabled"`
+}
+
+func init() {
+	t["HostIpConfigIpV6AddressConfiguration"] = reflect.TypeOf((*HostIpConfigIpV6AddressConfiguration)(nil)).Elem()
+}
+
+type HostIpInconsistentEvent struct {
+	HostEvent
+
+	IpAddress  string `xml:"ipAddress"`
+	IpAddress2 string `xml:"ipAddress2"`
+}
+
+func init() {
+	t["HostIpInconsistentEvent"] = reflect.TypeOf((*HostIpInconsistentEvent)(nil)).Elem()
+}
+
+type HostIpRouteConfig struct {
+	DynamicData
+
+	DefaultGateway     string `xml:"defaultGateway,omitempty"`
+	GatewayDevice      string `xml:"gatewayDevice,omitempty"`
+	IpV6DefaultGateway string `xml:"ipV6DefaultGateway,omitempty"`
+	IpV6GatewayDevice  string `xml:"ipV6GatewayDevice,omitempty"`
+}
+
+func init() {
+	t["HostIpRouteConfig"] = reflect.TypeOf((*HostIpRouteConfig)(nil)).Elem()
+}
+
+type HostIpRouteConfigSpec struct {
+	HostIpRouteConfig
+
+	GatewayDeviceConnection     *HostVirtualNicConnection `xml:"gatewayDeviceConnection,omitempty"`
+	IpV6GatewayDeviceConnection *HostVirtualNicConnection `xml:"ipV6GatewayDeviceConnection,omitempty"`
+}
+
+func init() {
+	t["HostIpRouteConfigSpec"] = reflect.TypeOf((*HostIpRouteConfigSpec)(nil)).Elem()
+}
+
+type HostIpRouteEntry struct {
+	DynamicData
+
+	Network      string `xml:"network"`
+	PrefixLength int32  `xml:"prefixLength"`
+	Gateway      string `xml:"gateway"`
+	DeviceName   string `xml:"deviceName,omitempty"`
+}
+
+func init() {
+	t["HostIpRouteEntry"] = reflect.TypeOf((*HostIpRouteEntry)(nil)).Elem()
+}
+
+type HostIpRouteOp struct {
+	DynamicData
+
+	ChangeOperation string           `xml:"changeOperation"`
+	Route           HostIpRouteEntry `xml:"route"`
+}
+
+func init() {
+	t["HostIpRouteOp"] = reflect.TypeOf((*HostIpRouteOp)(nil)).Elem()
+}
+
+type HostIpRouteTableConfig struct {
+	DynamicData
+
+	IpRoute   []HostIpRouteOp `xml:"ipRoute,omitempty"`
+	Ipv6Route []HostIpRouteOp `xml:"ipv6Route,omitempty"`
+}
+
+func init() {
+	t["HostIpRouteTableConfig"] = reflect.TypeOf((*HostIpRouteTableConfig)(nil)).Elem()
+}
+
+type HostIpRouteTableInfo struct {
+	DynamicData
+
+	IpRoute   []HostIpRouteEntry `xml:"ipRoute,omitempty"`
+	Ipv6Route []HostIpRouteEntry `xml:"ipv6Route,omitempty"`
+}
+
+func init() {
+	t["HostIpRouteTableInfo"] = reflect.TypeOf((*HostIpRouteTableInfo)(nil)).Elem()
+}
+
+type HostIpToShortNameFailedEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostIpToShortNameFailedEvent"] = reflect.TypeOf((*HostIpToShortNameFailedEvent)(nil)).Elem()
+}
+
+type HostIpmiInfo struct {
+	DynamicData
+
+	BmcIpAddress  string `xml:"bmcIpAddress,omitempty"`
+	BmcMacAddress string `xml:"bmcMacAddress,omitempty"`
+	Login         string `xml:"login,omitempty"`
+	Password      string `xml:"password,omitempty"`
+}
+
+func init() {
+	t["HostIpmiInfo"] = reflect.TypeOf((*HostIpmiInfo)(nil)).Elem()
+}
+
+type HostIsolationIpPingFailedEvent struct {
+	HostDasEvent
+
+	IsolationIp string `xml:"isolationIp"`
+}
+
+func init() {
+	t["HostIsolationIpPingFailedEvent"] = reflect.TypeOf((*HostIsolationIpPingFailedEvent)(nil)).Elem()
+}
+
+type HostLicensableResourceInfo struct {
+	DynamicData
+
+	Resource []KeyAnyValue `xml:"resource"`
+}
+
+func init() {
+	t["HostLicensableResourceInfo"] = reflect.TypeOf((*HostLicensableResourceInfo)(nil)).Elem()
+}
+
+type HostLicenseConnectInfo struct {
+	DynamicData
+
+	License    LicenseManagerLicenseInfo    `xml:"license"`
+	Evaluation LicenseManagerEvaluationInfo `xml:"evaluation"`
+	Resource   *HostLicensableResourceInfo  `xml:"resource,omitempty"`
+}
+
+func init() {
+	t["HostLicenseConnectInfo"] = reflect.TypeOf((*HostLicenseConnectInfo)(nil)).Elem()
+}
+
+type HostLicenseExpiredEvent struct {
+	LicenseEvent
+}
+
+func init() {
+	t["HostLicenseExpiredEvent"] = reflect.TypeOf((*HostLicenseExpiredEvent)(nil)).Elem()
+}
+
+type HostLicenseSpec struct {
+	DynamicData
+
+	Source             BaseLicenseSource `xml:"source,omitempty,typeattr"`
+	EditionKey         string            `xml:"editionKey,omitempty"`
+	DisabledFeatureKey []string          `xml:"disabledFeatureKey,omitempty"`
+	EnabledFeatureKey  []string          `xml:"enabledFeatureKey,omitempty"`
+}
+
+func init() {
+	t["HostLicenseSpec"] = reflect.TypeOf((*HostLicenseSpec)(nil)).Elem()
+}
+
+type HostListSummary struct {
+	DynamicData
+
+	Host               *ManagedObjectReference        `xml:"host,omitempty"`
+	Hardware           *HostHardwareSummary           `xml:"hardware,omitempty"`
+	Runtime            *HostRuntimeInfo               `xml:"runtime,omitempty"`
+	Config             HostConfigSummary              `xml:"config"`
+	QuickStats         HostListSummaryQuickStats      `xml:"quickStats"`
+	OverallStatus      ManagedEntityStatus            `xml:"overallStatus"`
+	RebootRequired     bool                           `xml:"rebootRequired"`
+	CustomValue        []BaseCustomFieldValue         `xml:"customValue,omitempty,typeattr"`
+	ManagementServerIp string                         `xml:"managementServerIp,omitempty"`
+	MaxEVCModeKey      string                         `xml:"maxEVCModeKey,omitempty"`
+	CurrentEVCModeKey  string                         `xml:"currentEVCModeKey,omitempty"`
+	Gateway            *HostListSummaryGatewaySummary `xml:"gateway,omitempty"`
+}
+
+func init() {
+	t["HostListSummary"] = reflect.TypeOf((*HostListSummary)(nil)).Elem()
+}
+
+type HostListSummaryGatewaySummary struct {
+	DynamicData
+
+	GatewayType string `xml:"gatewayType"`
+	GatewayId   string `xml:"gatewayId"`
+}
+
+func init() {
+	t["HostListSummaryGatewaySummary"] = reflect.TypeOf((*HostListSummaryGatewaySummary)(nil)).Elem()
+}
+
+type HostListSummaryQuickStats struct {
+	DynamicData
+
+	OverallCpuUsage           int32 `xml:"overallCpuUsage,omitempty"`
+	OverallMemoryUsage        int32 `xml:"overallMemoryUsage,omitempty"`
+	DistributedCpuFairness    int32 `xml:"distributedCpuFairness,omitempty"`
+	DistributedMemoryFairness int32 `xml:"distributedMemoryFairness,omitempty"`
+	Uptime                    int32 `xml:"uptime,omitempty"`
+}
+
+func init() {
+	t["HostListSummaryQuickStats"] = reflect.TypeOf((*HostListSummaryQuickStats)(nil)).Elem()
+}
+
+type HostListVStorageObject HostListVStorageObjectRequestType
+
+func init() {
+	t["HostListVStorageObject"] = reflect.TypeOf((*HostListVStorageObject)(nil)).Elem()
+}
+
+type HostListVStorageObjectRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["HostListVStorageObjectRequestType"] = reflect.TypeOf((*HostListVStorageObjectRequestType)(nil)).Elem()
+}
+
+type HostListVStorageObjectResponse struct {
+	Returnval []ID `xml:"returnval,omitempty"`
+}
+
+type HostLocalAuthenticationInfo struct {
+	HostAuthenticationStoreInfo
+}
+
+func init() {
+	t["HostLocalAuthenticationInfo"] = reflect.TypeOf((*HostLocalAuthenticationInfo)(nil)).Elem()
+}
+
+type HostLocalFileSystemVolume struct {
+	HostFileSystemVolume
+
+	Device string `xml:"device"`
+}
+
+func init() {
+	t["HostLocalFileSystemVolume"] = reflect.TypeOf((*HostLocalFileSystemVolume)(nil)).Elem()
+}
+
+type HostLocalFileSystemVolumeSpec struct {
+	DynamicData
+
+	Device    string `xml:"device"`
+	LocalPath string `xml:"localPath"`
+}
+
+func init() {
+	t["HostLocalFileSystemVolumeSpec"] = reflect.TypeOf((*HostLocalFileSystemVolumeSpec)(nil)).Elem()
+}
+
+type HostLocalPortCreatedEvent struct {
+	DvsEvent
+
+	HostLocalPort DVSHostLocalPortInfo `xml:"hostLocalPort"`
+}
+
+func init() {
+	t["HostLocalPortCreatedEvent"] = reflect.TypeOf((*HostLocalPortCreatedEvent)(nil)).Elem()
+}
+
+type HostLowLevelProvisioningManagerDiskLayoutSpec struct {
+	DynamicData
+
+	ControllerType string `xml:"controllerType"`
+	BusNumber      int32  `xml:"busNumber"`
+	UnitNumber     *int32 `xml:"unitNumber"`
+	SrcFilename    string `xml:"srcFilename"`
+	DstFilename    string `xml:"dstFilename"`
+}
+
+func init() {
+	t["HostLowLevelProvisioningManagerDiskLayoutSpec"] = reflect.TypeOf((*HostLowLevelProvisioningManagerDiskLayoutSpec)(nil)).Elem()
+}
+
+type HostLowLevelProvisioningManagerFileDeleteResult struct {
+	DynamicData
+
+	FileName string               `xml:"fileName"`
+	Fault    LocalizedMethodFault `xml:"fault"`
+}
+
+func init() {
+	t["HostLowLevelProvisioningManagerFileDeleteResult"] = reflect.TypeOf((*HostLowLevelProvisioningManagerFileDeleteResult)(nil)).Elem()
+}
+
+type HostLowLevelProvisioningManagerFileDeleteSpec struct {
+	DynamicData
+
+	FileName string `xml:"fileName"`
+	FileType string `xml:"fileType"`
+}
+
+func init() {
+	t["HostLowLevelProvisioningManagerFileDeleteSpec"] = reflect.TypeOf((*HostLowLevelProvisioningManagerFileDeleteSpec)(nil)).Elem()
+}
+
+type HostLowLevelProvisioningManagerFileReserveResult struct {
+	DynamicData
+
+	BaseName     string `xml:"baseName"`
+	ParentDir    string `xml:"parentDir"`
+	ReservedName string `xml:"reservedName"`
+}
+
+func init() {
+	t["HostLowLevelProvisioningManagerFileReserveResult"] = reflect.TypeOf((*HostLowLevelProvisioningManagerFileReserveResult)(nil)).Elem()
+}
+
+type HostLowLevelProvisioningManagerFileReserveSpec struct {
+	DynamicData
+
+	BaseName       string `xml:"baseName"`
+	ParentDir      string `xml:"parentDir"`
+	FileType       string `xml:"fileType"`
+	StorageProfile string `xml:"storageProfile"`
+}
+
+func init() {
+	t["HostLowLevelProvisioningManagerFileReserveSpec"] = reflect.TypeOf((*HostLowLevelProvisioningManagerFileReserveSpec)(nil)).Elem()
+}
+
+type HostLowLevelProvisioningManagerSnapshotLayoutSpec struct {
+	DynamicData
+
+	Id          int32                                           `xml:"id"`
+	SrcFilename string                                          `xml:"srcFilename"`
+	DstFilename string                                          `xml:"dstFilename"`
+	Disk        []HostLowLevelProvisioningManagerDiskLayoutSpec `xml:"disk,omitempty"`
+}
+
+func init() {
+	t["HostLowLevelProvisioningManagerSnapshotLayoutSpec"] = reflect.TypeOf((*HostLowLevelProvisioningManagerSnapshotLayoutSpec)(nil)).Elem()
+}
+
+type HostLowLevelProvisioningManagerVmMigrationStatus struct {
+	DynamicData
+
+	MigrationId          int64  `xml:"migrationId"`
+	Type                 string `xml:"type"`
+	Source               bool   `xml:"source"`
+	ConsideredSuccessful bool   `xml:"consideredSuccessful"`
+}
+
+func init() {
+	t["HostLowLevelProvisioningManagerVmMigrationStatus"] = reflect.TypeOf((*HostLowLevelProvisioningManagerVmMigrationStatus)(nil)).Elem()
+}
+
+type HostLowLevelProvisioningManagerVmRecoveryInfo struct {
+	DynamicData
+
+	Version      string                       `xml:"version"`
+	BiosUUID     string                       `xml:"biosUUID"`
+	InstanceUUID string                       `xml:"instanceUUID"`
+	FtInfo       BaseFaultToleranceConfigInfo `xml:"ftInfo,omitempty,typeattr"`
+}
+
+func init() {
+	t["HostLowLevelProvisioningManagerVmRecoveryInfo"] = reflect.TypeOf((*HostLowLevelProvisioningManagerVmRecoveryInfo)(nil)).Elem()
+}
+
+type HostMaintenanceSpec struct {
+	DynamicData
+
+	VsanMode *VsanHostDecommissionMode `xml:"vsanMode,omitempty"`
+}
+
+func init() {
+	t["HostMaintenanceSpec"] = reflect.TypeOf((*HostMaintenanceSpec)(nil)).Elem()
+}
+
+type HostMemberHealthCheckResult struct {
+	DynamicData
+
+	Summary string `xml:"summary,omitempty"`
+}
+
+func init() {
+	t["HostMemberHealthCheckResult"] = reflect.TypeOf((*HostMemberHealthCheckResult)(nil)).Elem()
+}
+
+type HostMemberRuntimeInfo struct {
+	DynamicData
+
+	Host              ManagedObjectReference            `xml:"host"`
+	Status            string                            `xml:"status,omitempty"`
+	StatusDetail      string                            `xml:"statusDetail,omitempty"`
+	HealthCheckResult []BaseHostMemberHealthCheckResult `xml:"healthCheckResult,omitempty,typeattr"`
+}
+
+func init() {
+	t["HostMemberRuntimeInfo"] = reflect.TypeOf((*HostMemberRuntimeInfo)(nil)).Elem()
+}
+
+type HostMemberUplinkHealthCheckResult struct {
+	HostMemberHealthCheckResult
+
+	UplinkPortKey string `xml:"uplinkPortKey"`
+}
+
+func init() {
+	t["HostMemberUplinkHealthCheckResult"] = reflect.TypeOf((*HostMemberUplinkHealthCheckResult)(nil)).Elem()
+}
+
+type HostMemoryProfile struct {
+	ApplyProfile
+}
+
+func init() {
+	t["HostMemoryProfile"] = reflect.TypeOf((*HostMemoryProfile)(nil)).Elem()
+}
+
+type HostMemorySpec struct {
+	DynamicData
+
+	ServiceConsoleReservation int64 `xml:"serviceConsoleReservation,omitempty"`
+}
+
+func init() {
+	t["HostMemorySpec"] = reflect.TypeOf((*HostMemorySpec)(nil)).Elem()
+}
+
+type HostMissingNetworksEvent struct {
+	HostDasEvent
+
+	Ips string `xml:"ips,omitempty"`
+}
+
+func init() {
+	t["HostMissingNetworksEvent"] = reflect.TypeOf((*HostMissingNetworksEvent)(nil)).Elem()
+}
+
+type HostMonitoringStateChangedEvent struct {
+	ClusterEvent
+
+	State     string `xml:"state"`
+	PrevState string `xml:"prevState,omitempty"`
+}
+
+func init() {
+	t["HostMonitoringStateChangedEvent"] = reflect.TypeOf((*HostMonitoringStateChangedEvent)(nil)).Elem()
+}
+
+type HostMountInfo struct {
+	DynamicData
+
+	Path               string `xml:"path,omitempty"`
+	AccessMode         string `xml:"accessMode"`
+	Mounted            *bool  `xml:"mounted"`
+	Accessible         *bool  `xml:"accessible"`
+	InaccessibleReason string `xml:"inaccessibleReason,omitempty"`
+}
+
+func init() {
+	t["HostMountInfo"] = reflect.TypeOf((*HostMountInfo)(nil)).Elem()
+}
+
+type HostMultipathInfo struct {
+	DynamicData
+
+	Lun []HostMultipathInfoLogicalUnit `xml:"lun,omitempty"`
+}
+
+func init() {
+	t["HostMultipathInfo"] = reflect.TypeOf((*HostMultipathInfo)(nil)).Elem()
+}
+
+type HostMultipathInfoFixedLogicalUnitPolicy struct {
+	HostMultipathInfoLogicalUnitPolicy
+
+	Prefer string `xml:"prefer"`
+}
+
+func init() {
+	t["HostMultipathInfoFixedLogicalUnitPolicy"] = reflect.TypeOf((*HostMultipathInfoFixedLogicalUnitPolicy)(nil)).Elem()
+}
+
+type HostMultipathInfoLogicalUnit struct {
+	DynamicData
+
+	Key                    string                                              `xml:"key"`
+	Id                     string                                              `xml:"id"`
+	Lun                    string                                              `xml:"lun"`
+	Path                   []HostMultipathInfoPath                             `xml:"path"`
+	Policy                 BaseHostMultipathInfoLogicalUnitPolicy              `xml:"policy,typeattr"`
+	StorageArrayTypePolicy *HostMultipathInfoLogicalUnitStorageArrayTypePolicy `xml:"storageArrayTypePolicy,omitempty"`
+}
+
+func init() {
+	t["HostMultipathInfoLogicalUnit"] = reflect.TypeOf((*HostMultipathInfoLogicalUnit)(nil)).Elem()
+}
+
+type HostMultipathInfoLogicalUnitPolicy struct {
+	DynamicData
+
+	Policy string `xml:"policy"`
+}
+
+func init() {
+	t["HostMultipathInfoLogicalUnitPolicy"] = reflect.TypeOf((*HostMultipathInfoLogicalUnitPolicy)(nil)).Elem()
+}
+
+type HostMultipathInfoLogicalUnitStorageArrayTypePolicy struct {
+	DynamicData
+
+	Policy string `xml:"policy"`
+}
+
+func init() {
+	t["HostMultipathInfoLogicalUnitStorageArrayTypePolicy"] = reflect.TypeOf((*HostMultipathInfoLogicalUnitStorageArrayTypePolicy)(nil)).Elem()
+}
+
+type HostMultipathInfoPath struct {
+	DynamicData
+
+	Key           string                  `xml:"key"`
+	Name          string                  `xml:"name"`
+	PathState     string                  `xml:"pathState"`
+	State         string                  `xml:"state,omitempty"`
+	IsWorkingPath *bool                   `xml:"isWorkingPath"`
+	Adapter       string                  `xml:"adapter"`
+	Lun           string                  `xml:"lun"`
+	Transport     BaseHostTargetTransport `xml:"transport,omitempty,typeattr"`
+}
+
+func init() {
+	t["HostMultipathInfoPath"] = reflect.TypeOf((*HostMultipathInfoPath)(nil)).Elem()
+}
+
+type HostMultipathStateInfo struct {
+	DynamicData
+
+	Path []HostMultipathStateInfoPath `xml:"path,omitempty"`
+}
+
+func init() {
+	t["HostMultipathStateInfo"] = reflect.TypeOf((*HostMultipathStateInfo)(nil)).Elem()
+}
+
+type HostMultipathStateInfoPath struct {
+	DynamicData
+
+	Name      string `xml:"name"`
+	PathState string `xml:"pathState"`
+}
+
+func init() {
+	t["HostMultipathStateInfoPath"] = reflect.TypeOf((*HostMultipathStateInfoPath)(nil)).Elem()
+}
+
+type HostNasVolume struct {
+	HostFileSystemVolume
+
+	RemoteHost       string   `xml:"remoteHost"`
+	RemotePath       string   `xml:"remotePath"`
+	UserName         string   `xml:"userName,omitempty"`
+	RemoteHostNames  []string `xml:"remoteHostNames,omitempty"`
+	SecurityType     string   `xml:"securityType,omitempty"`
+	ProtocolEndpoint *bool    `xml:"protocolEndpoint"`
+}
+
+func init() {
+	t["HostNasVolume"] = reflect.TypeOf((*HostNasVolume)(nil)).Elem()
+}
+
+type HostNasVolumeConfig struct {
+	DynamicData
+
+	ChangeOperation string             `xml:"changeOperation,omitempty"`
+	Spec            *HostNasVolumeSpec `xml:"spec,omitempty"`
+}
+
+func init() {
+	t["HostNasVolumeConfig"] = reflect.TypeOf((*HostNasVolumeConfig)(nil)).Elem()
+}
+
+type HostNasVolumeSpec struct {
+	DynamicData
+
+	RemoteHost      string   `xml:"remoteHost"`
+	RemotePath      string   `xml:"remotePath"`
+	LocalPath       string   `xml:"localPath"`
+	AccessMode      string   `xml:"accessMode"`
+	Type            string   `xml:"type,omitempty"`
+	UserName        string   `xml:"userName,omitempty"`
+	Password        string   `xml:"password,omitempty"`
+	RemoteHostNames []string `xml:"remoteHostNames,omitempty"`
+	SecurityType    string   `xml:"securityType,omitempty"`
+}
+
+func init() {
+	t["HostNasVolumeSpec"] = reflect.TypeOf((*HostNasVolumeSpec)(nil)).Elem()
+}
+
+type HostNasVolumeUserInfo struct {
+	DynamicData
+
+	User string `xml:"user"`
+}
+
+func init() {
+	t["HostNasVolumeUserInfo"] = reflect.TypeOf((*HostNasVolumeUserInfo)(nil)).Elem()
+}
+
+type HostNatService struct {
+	DynamicData
+
+	Key  string             `xml:"key"`
+	Spec HostNatServiceSpec `xml:"spec"`
+}
+
+func init() {
+	t["HostNatService"] = reflect.TypeOf((*HostNatService)(nil)).Elem()
+}
+
+type HostNatServiceConfig struct {
+	DynamicData
+
+	ChangeOperation string             `xml:"changeOperation,omitempty"`
+	Key             string             `xml:"key"`
+	Spec            HostNatServiceSpec `xml:"spec"`
+}
+
+func init() {
+	t["HostNatServiceConfig"] = reflect.TypeOf((*HostNatServiceConfig)(nil)).Elem()
+}
+
+type HostNatServiceNameServiceSpec struct {
+	DynamicData
+
+	DnsAutoDetect bool     `xml:"dnsAutoDetect"`
+	DnsPolicy     string   `xml:"dnsPolicy"`
+	DnsRetries    int32    `xml:"dnsRetries"`
+	DnsTimeout    int32    `xml:"dnsTimeout"`
+	DnsNameServer []string `xml:"dnsNameServer,omitempty"`
+	NbdsTimeout   int32    `xml:"nbdsTimeout"`
+	NbnsRetries   int32    `xml:"nbnsRetries"`
+	NbnsTimeout   int32    `xml:"nbnsTimeout"`
+}
+
+func init() {
+	t["HostNatServiceNameServiceSpec"] = reflect.TypeOf((*HostNatServiceNameServiceSpec)(nil)).Elem()
+}
+
+type HostNatServicePortForwardSpec struct {
+	DynamicData
+
+	Type           string `xml:"type"`
+	Name           string `xml:"name"`
+	HostPort       int32  `xml:"hostPort"`
+	GuestPort      int32  `xml:"guestPort"`
+	GuestIpAddress string `xml:"guestIpAddress"`
+}
+
+func init() {
+	t["HostNatServicePortForwardSpec"] = reflect.TypeOf((*HostNatServicePortForwardSpec)(nil)).Elem()
+}
+
+type HostNatServiceSpec struct {
+	DynamicData
+
+	VirtualSwitch    string                          `xml:"virtualSwitch"`
+	ActiveFtp        bool                            `xml:"activeFtp"`
+	AllowAnyOui      bool                            `xml:"allowAnyOui"`
+	ConfigPort       bool                            `xml:"configPort"`
+	IpGatewayAddress string                          `xml:"ipGatewayAddress"`
+	UdpTimeout       int32                           `xml:"udpTimeout"`
+	PortForward      []HostNatServicePortForwardSpec `xml:"portForward,omitempty"`
+	NameService      *HostNatServiceNameServiceSpec  `xml:"nameService,omitempty"`
+}
+
+func init() {
+	t["HostNatServiceSpec"] = reflect.TypeOf((*HostNatServiceSpec)(nil)).Elem()
+}
+
+type HostNetCapabilities struct {
+	DynamicData
+
+	CanSetPhysicalNicLinkSpeed bool     `xml:"canSetPhysicalNicLinkSpeed"`
+	SupportsNicTeaming         bool     `xml:"supportsNicTeaming"`
+	NicTeamingPolicy           []string `xml:"nicTeamingPolicy,omitempty"`
+	SupportsVlan               bool     `xml:"supportsVlan"`
+	UsesServiceConsoleNic      bool     `xml:"usesServiceConsoleNic"`
+	SupportsNetworkHints       bool     `xml:"supportsNetworkHints"`
+	MaxPortGroupsPerVswitch    int32    `xml:"maxPortGroupsPerVswitch,omitempty"`
+	VswitchConfigSupported     bool     `xml:"vswitchConfigSupported"`
+	VnicConfigSupported        bool     `xml:"vnicConfigSupported"`
+	IpRouteConfigSupported     bool     `xml:"ipRouteConfigSupported"`
+	DnsConfigSupported         bool     `xml:"dnsConfigSupported"`
+	DhcpOnVnicSupported        bool     `xml:"dhcpOnVnicSupported"`
+	IpV6Supported              *bool    `xml:"ipV6Supported"`
+}
+
+func init() {
+	t["HostNetCapabilities"] = reflect.TypeOf((*HostNetCapabilities)(nil)).Elem()
+}
+
+type HostNetOffloadCapabilities struct {
+	DynamicData
+
+	CsumOffload     *bool `xml:"csumOffload"`
+	TcpSegmentation *bool `xml:"tcpSegmentation"`
+	ZeroCopyXmit    *bool `xml:"zeroCopyXmit"`
+}
+
+func init() {
+	t["HostNetOffloadCapabilities"] = reflect.TypeOf((*HostNetOffloadCapabilities)(nil)).Elem()
+}
+
+type HostNetStackInstance struct {
+	DynamicData
+
+	Key                             string                  `xml:"key,omitempty"`
+	Name                            string                  `xml:"name,omitempty"`
+	DnsConfig                       BaseHostDnsConfig       `xml:"dnsConfig,omitempty,typeattr"`
+	IpRouteConfig                   BaseHostIpRouteConfig   `xml:"ipRouteConfig,omitempty,typeattr"`
+	RequestedMaxNumberOfConnections int32                   `xml:"requestedMaxNumberOfConnections,omitempty"`
+	CongestionControlAlgorithm      string                  `xml:"congestionControlAlgorithm,omitempty"`
+	IpV6Enabled                     *bool                   `xml:"ipV6Enabled"`
+	RouteTableConfig                *HostIpRouteTableConfig `xml:"routeTableConfig,omitempty"`
+}
+
+func init() {
+	t["HostNetStackInstance"] = reflect.TypeOf((*HostNetStackInstance)(nil)).Elem()
+}
+
+type HostNetworkConfig struct {
+	DynamicData
+
+	Vswitch              []HostVirtualSwitchConfig       `xml:"vswitch,omitempty"`
+	ProxySwitch          []HostProxySwitchConfig         `xml:"proxySwitch,omitempty"`
+	Portgroup            []HostPortGroupConfig           `xml:"portgroup,omitempty"`
+	Pnic                 []PhysicalNicConfig             `xml:"pnic,omitempty"`
+	Vnic                 []HostVirtualNicConfig          `xml:"vnic,omitempty"`
+	ConsoleVnic          []HostVirtualNicConfig          `xml:"consoleVnic,omitempty"`
+	DnsConfig            BaseHostDnsConfig               `xml:"dnsConfig,omitempty,typeattr"`
+	IpRouteConfig        BaseHostIpRouteConfig           `xml:"ipRouteConfig,omitempty,typeattr"`
+	ConsoleIpRouteConfig BaseHostIpRouteConfig           `xml:"consoleIpRouteConfig,omitempty,typeattr"`
+	RouteTableConfig     *HostIpRouteTableConfig         `xml:"routeTableConfig,omitempty"`
+	Dhcp                 []HostDhcpServiceConfig         `xml:"dhcp,omitempty"`
+	Nat                  []HostNatServiceConfig          `xml:"nat,omitempty"`
+	IpV6Enabled          *bool                           `xml:"ipV6Enabled"`
+	NetStackSpec         []HostNetworkConfigNetStackSpec `xml:"netStackSpec,omitempty"`
+}
+
+func init() {
+	t["HostNetworkConfig"] = reflect.TypeOf((*HostNetworkConfig)(nil)).Elem()
+}
+
+type HostNetworkConfigNetStackSpec struct {
+	DynamicData
+
+	NetStackInstance HostNetStackInstance `xml:"netStackInstance"`
+	Operation        string               `xml:"operation,omitempty"`
+}
+
+func init() {
+	t["HostNetworkConfigNetStackSpec"] = reflect.TypeOf((*HostNetworkConfigNetStackSpec)(nil)).Elem()
+}
+
+type HostNetworkConfigResult struct {
+	DynamicData
+
+	VnicDevice        []string `xml:"vnicDevice,omitempty"`
+	ConsoleVnicDevice []string `xml:"consoleVnicDevice,omitempty"`
+}
+
+func init() {
+	t["HostNetworkConfigResult"] = reflect.TypeOf((*HostNetworkConfigResult)(nil)).Elem()
+}
+
+type HostNetworkInfo struct {
+	DynamicData
+
+	Vswitch              []HostVirtualSwitch     `xml:"vswitch,omitempty"`
+	ProxySwitch          []HostProxySwitch       `xml:"proxySwitch,omitempty"`
+	Portgroup            []HostPortGroup         `xml:"portgroup,omitempty"`
+	Pnic                 []PhysicalNic           `xml:"pnic,omitempty"`
+	Vnic                 []HostVirtualNic        `xml:"vnic,omitempty"`
+	ConsoleVnic          []HostVirtualNic        `xml:"consoleVnic,omitempty"`
+	DnsConfig            BaseHostDnsConfig       `xml:"dnsConfig,omitempty,typeattr"`
+	IpRouteConfig        BaseHostIpRouteConfig   `xml:"ipRouteConfig,omitempty,typeattr"`
+	ConsoleIpRouteConfig BaseHostIpRouteConfig   `xml:"consoleIpRouteConfig,omitempty,typeattr"`
+	RouteTableInfo       *HostIpRouteTableInfo   `xml:"routeTableInfo,omitempty"`
+	Dhcp                 []HostDhcpService       `xml:"dhcp,omitempty"`
+	Nat                  []HostNatService        `xml:"nat,omitempty"`
+	IpV6Enabled          *bool                   `xml:"ipV6Enabled"`
+	AtBootIpV6Enabled    *bool                   `xml:"atBootIpV6Enabled"`
+	NetStackInstance     []HostNetStackInstance  `xml:"netStackInstance,omitempty"`
+	OpaqueSwitch         []HostOpaqueSwitch      `xml:"opaqueSwitch,omitempty"`
+	OpaqueNetwork        []HostOpaqueNetworkInfo `xml:"opaqueNetwork,omitempty"`
+}
+
+func init() {
+	t["HostNetworkInfo"] = reflect.TypeOf((*HostNetworkInfo)(nil)).Elem()
+}
+
+type HostNetworkPolicy struct {
+	DynamicData
+
+	Security      *HostNetworkSecurityPolicy       `xml:"security,omitempty"`
+	NicTeaming    *HostNicTeamingPolicy            `xml:"nicTeaming,omitempty"`
+	OffloadPolicy *HostNetOffloadCapabilities      `xml:"offloadPolicy,omitempty"`
+	ShapingPolicy *HostNetworkTrafficShapingPolicy `xml:"shapingPolicy,omitempty"`
+}
+
+func init() {
+	t["HostNetworkPolicy"] = reflect.TypeOf((*HostNetworkPolicy)(nil)).Elem()
+}
+
+type HostNetworkResourceRuntime struct {
+	DynamicData
+
+	PnicResourceInfo []HostPnicNetworkResourceInfo `xml:"pnicResourceInfo"`
+}
+
+func init() {
+	t["HostNetworkResourceRuntime"] = reflect.TypeOf((*HostNetworkResourceRuntime)(nil)).Elem()
+}
+
+type HostNetworkSecurityPolicy struct {
+	DynamicData
+
+	AllowPromiscuous *bool `xml:"allowPromiscuous"`
+	MacChanges       *bool `xml:"macChanges"`
+	ForgedTransmits  *bool `xml:"forgedTransmits"`
+}
+
+func init() {
+	t["HostNetworkSecurityPolicy"] = reflect.TypeOf((*HostNetworkSecurityPolicy)(nil)).Elem()
+}
+
+type HostNetworkTrafficShapingPolicy struct {
+	DynamicData
+
+	Enabled          *bool `xml:"enabled"`
+	AverageBandwidth int64 `xml:"averageBandwidth,omitempty"`
+	PeakBandwidth    int64 `xml:"peakBandwidth,omitempty"`
+	BurstSize        int64 `xml:"burstSize,omitempty"`
+}
+
+func init() {
+	t["HostNetworkTrafficShapingPolicy"] = reflect.TypeOf((*HostNetworkTrafficShapingPolicy)(nil)).Elem()
+}
+
+type HostNewNetworkConnectInfo struct {
+	HostConnectInfoNetworkInfo
+}
+
+func init() {
+	t["HostNewNetworkConnectInfo"] = reflect.TypeOf((*HostNewNetworkConnectInfo)(nil)).Elem()
+}
+
+type HostNicFailureCriteria struct {
+	DynamicData
+
+	CheckSpeed        string `xml:"checkSpeed,omitempty"`
+	Speed             int32  `xml:"speed,omitempty"`
+	CheckDuplex       *bool  `xml:"checkDuplex"`
+	FullDuplex        *bool  `xml:"fullDuplex"`
+	CheckErrorPercent *bool  `xml:"checkErrorPercent"`
+	Percentage        int32  `xml:"percentage,omitempty"`
+	CheckBeacon       *bool  `xml:"checkBeacon"`
+}
+
+func init() {
+	t["HostNicFailureCriteria"] = reflect.TypeOf((*HostNicFailureCriteria)(nil)).Elem()
+}
+
+type HostNicOrderPolicy struct {
+	DynamicData
+
+	ActiveNic  []string `xml:"activeNic,omitempty"`
+	StandbyNic []string `xml:"standbyNic,omitempty"`
+}
+
+func init() {
+	t["HostNicOrderPolicy"] = reflect.TypeOf((*HostNicOrderPolicy)(nil)).Elem()
+}
+
+type HostNicTeamingPolicy struct {
+	DynamicData
+
+	Policy          string                  `xml:"policy,omitempty"`
+	ReversePolicy   *bool                   `xml:"reversePolicy"`
+	NotifySwitches  *bool                   `xml:"notifySwitches"`
+	RollingOrder    *bool                   `xml:"rollingOrder"`
+	FailureCriteria *HostNicFailureCriteria `xml:"failureCriteria,omitempty"`
+	NicOrder        *HostNicOrderPolicy     `xml:"nicOrder,omitempty"`
+}
+
+func init() {
+	t["HostNicTeamingPolicy"] = reflect.TypeOf((*HostNicTeamingPolicy)(nil)).Elem()
+}
+
+type HostNoAvailableNetworksEvent struct {
+	HostDasEvent
+
+	Ips string `xml:"ips,omitempty"`
+}
+
+func init() {
+	t["HostNoAvailableNetworksEvent"] = reflect.TypeOf((*HostNoAvailableNetworksEvent)(nil)).Elem()
+}
+
+type HostNoHAEnabledPortGroupsEvent struct {
+	HostDasEvent
+}
+
+func init() {
+	t["HostNoHAEnabledPortGroupsEvent"] = reflect.TypeOf((*HostNoHAEnabledPortGroupsEvent)(nil)).Elem()
+}
+
+type HostNoRedundantManagementNetworkEvent struct {
+	HostDasEvent
+}
+
+func init() {
+	t["HostNoRedundantManagementNetworkEvent"] = reflect.TypeOf((*HostNoRedundantManagementNetworkEvent)(nil)).Elem()
+}
+
+type HostNonCompliantEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostNonCompliantEvent"] = reflect.TypeOf((*HostNonCompliantEvent)(nil)).Elem()
+}
+
+type HostNotConnected struct {
+	HostCommunication
+}
+
+func init() {
+	t["HostNotConnected"] = reflect.TypeOf((*HostNotConnected)(nil)).Elem()
+}
+
+type HostNotConnectedFault HostNotConnected
+
+func init() {
+	t["HostNotConnectedFault"] = reflect.TypeOf((*HostNotConnectedFault)(nil)).Elem()
+}
+
+type HostNotInClusterEvent struct {
+	HostDasEvent
+}
+
+func init() {
+	t["HostNotInClusterEvent"] = reflect.TypeOf((*HostNotInClusterEvent)(nil)).Elem()
+}
+
+type HostNotReachable struct {
+	HostCommunication
+}
+
+func init() {
+	t["HostNotReachable"] = reflect.TypeOf((*HostNotReachable)(nil)).Elem()
+}
+
+type HostNotReachableFault HostNotReachable
+
+func init() {
+	t["HostNotReachableFault"] = reflect.TypeOf((*HostNotReachableFault)(nil)).Elem()
+}
+
+type HostNtpConfig struct {
+	DynamicData
+
+	Server     []string `xml:"server,omitempty"`
+	ConfigFile []string `xml:"configFile,omitempty"`
+}
+
+func init() {
+	t["HostNtpConfig"] = reflect.TypeOf((*HostNtpConfig)(nil)).Elem()
+}
+
+type HostNumaInfo struct {
+	DynamicData
+
+	Type     string         `xml:"type"`
+	NumNodes int32          `xml:"numNodes"`
+	NumaNode []HostNumaNode `xml:"numaNode,omitempty"`
+}
+
+func init() {
+	t["HostNumaInfo"] = reflect.TypeOf((*HostNumaInfo)(nil)).Elem()
+}
+
+type HostNumaNode struct {
+	DynamicData
+
+	TypeId            byte    `xml:"typeId"`
+	CpuID             []int16 `xml:"cpuID"`
+	MemoryRangeBegin  int64   `xml:"memoryRangeBegin"`
+	MemoryRangeLength int64   `xml:"memoryRangeLength"`
+}
+
+func init() {
+	t["HostNumaNode"] = reflect.TypeOf((*HostNumaNode)(nil)).Elem()
+}
+
+type HostNumericSensorInfo struct {
+	DynamicData
+
+	Name           string                 `xml:"name"`
+	HealthState    BaseElementDescription `xml:"healthState,omitempty,typeattr"`
+	CurrentReading int64                  `xml:"currentReading"`
+	UnitModifier   int32                  `xml:"unitModifier"`
+	BaseUnits      string                 `xml:"baseUnits"`
+	RateUnits      string                 `xml:"rateUnits,omitempty"`
+	SensorType     string                 `xml:"sensorType"`
+	Id             string                 `xml:"id,omitempty"`
+	TimeStamp      string                 `xml:"timeStamp,omitempty"`
+}
+
+func init() {
+	t["HostNumericSensorInfo"] = reflect.TypeOf((*HostNumericSensorInfo)(nil)).Elem()
+}
+
+type HostOpaqueNetworkInfo struct {
+	DynamicData
+
+	OpaqueNetworkId   string                   `xml:"opaqueNetworkId"`
+	OpaqueNetworkName string                   `xml:"opaqueNetworkName"`
+	OpaqueNetworkType string                   `xml:"opaqueNetworkType"`
+	PnicZone          []string                 `xml:"pnicZone,omitempty"`
+	Capability        *OpaqueNetworkCapability `xml:"capability,omitempty"`
+	ExtraConfig       []BaseOptionValue        `xml:"extraConfig,omitempty,typeattr"`
+}
+
+func init() {
+	t["HostOpaqueNetworkInfo"] = reflect.TypeOf((*HostOpaqueNetworkInfo)(nil)).Elem()
+}
+
+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"`
+}
+
+func init() {
+	t["HostOpaqueSwitch"] = reflect.TypeOf((*HostOpaqueSwitch)(nil)).Elem()
+}
+
+type HostOpaqueSwitchPhysicalNicZone struct {
+	DynamicData
+
+	Key        string   `xml:"key"`
+	PnicDevice []string `xml:"pnicDevice,omitempty"`
+}
+
+func init() {
+	t["HostOpaqueSwitchPhysicalNicZone"] = reflect.TypeOf((*HostOpaqueSwitchPhysicalNicZone)(nil)).Elem()
+}
+
+type HostOvercommittedEvent struct {
+	ClusterOvercommittedEvent
+}
+
+func init() {
+	t["HostOvercommittedEvent"] = reflect.TypeOf((*HostOvercommittedEvent)(nil)).Elem()
+}
+
+type HostParallelScsiHba struct {
+	HostHostBusAdapter
+}
+
+func init() {
+	t["HostParallelScsiHba"] = reflect.TypeOf((*HostParallelScsiHba)(nil)).Elem()
+}
+
+type HostParallelScsiTargetTransport struct {
+	HostTargetTransport
+}
+
+func init() {
+	t["HostParallelScsiTargetTransport"] = reflect.TypeOf((*HostParallelScsiTargetTransport)(nil)).Elem()
+}
+
+type HostPatchManagerLocator struct {
+	DynamicData
+
+	Url   string `xml:"url"`
+	Proxy string `xml:"proxy,omitempty"`
+}
+
+func init() {
+	t["HostPatchManagerLocator"] = reflect.TypeOf((*HostPatchManagerLocator)(nil)).Elem()
+}
+
+type HostPatchManagerPatchManagerOperationSpec struct {
+	DynamicData
+
+	Proxy     string `xml:"proxy,omitempty"`
+	Port      int32  `xml:"port,omitempty"`
+	UserName  string `xml:"userName,omitempty"`
+	Password  string `xml:"password,omitempty"`
+	CmdOption string `xml:"cmdOption,omitempty"`
+}
+
+func init() {
+	t["HostPatchManagerPatchManagerOperationSpec"] = reflect.TypeOf((*HostPatchManagerPatchManagerOperationSpec)(nil)).Elem()
+}
+
+type HostPatchManagerResult struct {
+	DynamicData
+
+	Version   string                   `xml:"version"`
+	Status    []HostPatchManagerStatus `xml:"status,omitempty"`
+	XmlResult string                   `xml:"xmlResult,omitempty"`
+}
+
+func init() {
+	t["HostPatchManagerResult"] = reflect.TypeOf((*HostPatchManagerResult)(nil)).Elem()
+}
+
+type HostPatchManagerStatus struct {
+	DynamicData
+
+	Id                 string                                    `xml:"id"`
+	Applicable         bool                                      `xml:"applicable"`
+	Reason             []string                                  `xml:"reason,omitempty"`
+	Integrity          string                                    `xml:"integrity,omitempty"`
+	Installed          bool                                      `xml:"installed"`
+	InstallState       []string                                  `xml:"installState,omitempty"`
+	PrerequisitePatch  []HostPatchManagerStatusPrerequisitePatch `xml:"prerequisitePatch,omitempty"`
+	RestartRequired    bool                                      `xml:"restartRequired"`
+	ReconnectRequired  bool                                      `xml:"reconnectRequired"`
+	VmOffRequired      bool                                      `xml:"vmOffRequired"`
+	SupersededPatchIds []string                                  `xml:"supersededPatchIds,omitempty"`
+}
+
+func init() {
+	t["HostPatchManagerStatus"] = reflect.TypeOf((*HostPatchManagerStatus)(nil)).Elem()
+}
+
+type HostPatchManagerStatusPrerequisitePatch struct {
+	DynamicData
+
+	Id           string   `xml:"id"`
+	InstallState []string `xml:"installState,omitempty"`
+}
+
+func init() {
+	t["HostPatchManagerStatusPrerequisitePatch"] = reflect.TypeOf((*HostPatchManagerStatusPrerequisitePatch)(nil)).Elem()
+}
+
+type HostPathSelectionPolicyOption struct {
+	DynamicData
+
+	Policy BaseElementDescription `xml:"policy,typeattr"`
+}
+
+func init() {
+	t["HostPathSelectionPolicyOption"] = reflect.TypeOf((*HostPathSelectionPolicyOption)(nil)).Elem()
+}
+
+type HostPciDevice struct {
+	DynamicData
+
+	Id           string `xml:"id"`
+	ClassId      int16  `xml:"classId"`
+	Bus          byte   `xml:"bus"`
+	Slot         byte   `xml:"slot"`
+	Function     byte   `xml:"function"`
+	VendorId     int16  `xml:"vendorId"`
+	SubVendorId  int16  `xml:"subVendorId"`
+	VendorName   string `xml:"vendorName"`
+	DeviceId     int16  `xml:"deviceId"`
+	SubDeviceId  int16  `xml:"subDeviceId"`
+	ParentBridge string `xml:"parentBridge,omitempty"`
+	DeviceName   string `xml:"deviceName"`
+}
+
+func init() {
+	t["HostPciDevice"] = reflect.TypeOf((*HostPciDevice)(nil)).Elem()
+}
+
+type HostPciPassthruConfig struct {
+	DynamicData
+
+	Id              string `xml:"id"`
+	PassthruEnabled bool   `xml:"passthruEnabled"`
+}
+
+func init() {
+	t["HostPciPassthruConfig"] = reflect.TypeOf((*HostPciPassthruConfig)(nil)).Elem()
+}
+
+type HostPciPassthruInfo struct {
+	DynamicData
+
+	Id              string `xml:"id"`
+	DependentDevice string `xml:"dependentDevice"`
+	PassthruEnabled bool   `xml:"passthruEnabled"`
+	PassthruCapable bool   `xml:"passthruCapable"`
+	PassthruActive  bool   `xml:"passthruActive"`
+}
+
+func init() {
+	t["HostPciPassthruInfo"] = reflect.TypeOf((*HostPciPassthruInfo)(nil)).Elem()
+}
+
+type HostPlacedVirtualNicIdentifier struct {
+	DynamicData
+
+	Vm          ManagedObjectReference `xml:"vm"`
+	VnicKey     string                 `xml:"vnicKey"`
+	Reservation int32                  `xml:"reservation,omitempty"`
+}
+
+func init() {
+	t["HostPlacedVirtualNicIdentifier"] = reflect.TypeOf((*HostPlacedVirtualNicIdentifier)(nil)).Elem()
+}
+
+type HostPlugStoreTopology struct {
+	DynamicData
+
+	Adapter []HostPlugStoreTopologyAdapter `xml:"adapter,omitempty"`
+	Path    []HostPlugStoreTopologyPath    `xml:"path,omitempty"`
+	Target  []HostPlugStoreTopologyTarget  `xml:"target,omitempty"`
+	Device  []HostPlugStoreTopologyDevice  `xml:"device,omitempty"`
+	Plugin  []HostPlugStoreTopologyPlugin  `xml:"plugin,omitempty"`
+}
+
+func init() {
+	t["HostPlugStoreTopology"] = reflect.TypeOf((*HostPlugStoreTopology)(nil)).Elem()
+}
+
+type HostPlugStoreTopologyAdapter struct {
+	DynamicData
+
+	Key     string   `xml:"key"`
+	Adapter string   `xml:"adapter"`
+	Path    []string `xml:"path,omitempty"`
+}
+
+func init() {
+	t["HostPlugStoreTopologyAdapter"] = reflect.TypeOf((*HostPlugStoreTopologyAdapter)(nil)).Elem()
+}
+
+type HostPlugStoreTopologyDevice struct {
+	DynamicData
+
+	Key  string   `xml:"key"`
+	Lun  string   `xml:"lun"`
+	Path []string `xml:"path,omitempty"`
+}
+
+func init() {
+	t["HostPlugStoreTopologyDevice"] = reflect.TypeOf((*HostPlugStoreTopologyDevice)(nil)).Elem()
+}
+
+type HostPlugStoreTopologyPath struct {
+	DynamicData
+
+	Key           string `xml:"key"`
+	Name          string `xml:"name"`
+	ChannelNumber int32  `xml:"channelNumber,omitempty"`
+	TargetNumber  int32  `xml:"targetNumber,omitempty"`
+	LunNumber     int32  `xml:"lunNumber,omitempty"`
+	Adapter       string `xml:"adapter,omitempty"`
+	Target        string `xml:"target,omitempty"`
+	Device        string `xml:"device,omitempty"`
+}
+
+func init() {
+	t["HostPlugStoreTopologyPath"] = reflect.TypeOf((*HostPlugStoreTopologyPath)(nil)).Elem()
+}
+
+type HostPlugStoreTopologyPlugin struct {
+	DynamicData
+
+	Key         string   `xml:"key"`
+	Name        string   `xml:"name"`
+	Device      []string `xml:"device,omitempty"`
+	ClaimedPath []string `xml:"claimedPath,omitempty"`
+}
+
+func init() {
+	t["HostPlugStoreTopologyPlugin"] = reflect.TypeOf((*HostPlugStoreTopologyPlugin)(nil)).Elem()
+}
+
+type HostPlugStoreTopologyTarget struct {
+	DynamicData
+
+	Key       string                  `xml:"key"`
+	Transport BaseHostTargetTransport `xml:"transport,omitempty,typeattr"`
+}
+
+func init() {
+	t["HostPlugStoreTopologyTarget"] = reflect.TypeOf((*HostPlugStoreTopologyTarget)(nil)).Elem()
+}
+
+type HostPnicNetworkResourceInfo struct {
+	DynamicData
+
+	PnicDevice                     string                           `xml:"pnicDevice"`
+	AvailableBandwidthForVMTraffic int64                            `xml:"availableBandwidthForVMTraffic,omitempty"`
+	UnusedBandwidthForVMTraffic    int64                            `xml:"unusedBandwidthForVMTraffic,omitempty"`
+	PlacedVirtualNics              []HostPlacedVirtualNicIdentifier `xml:"placedVirtualNics,omitempty"`
+}
+
+func init() {
+	t["HostPnicNetworkResourceInfo"] = reflect.TypeOf((*HostPnicNetworkResourceInfo)(nil)).Elem()
+}
+
+type HostPortGroup struct {
+	DynamicData
+
+	Key            string              `xml:"key,omitempty"`
+	Port           []HostPortGroupPort `xml:"port,omitempty"`
+	Vswitch        string              `xml:"vswitch,omitempty"`
+	ComputedPolicy HostNetworkPolicy   `xml:"computedPolicy"`
+	Spec           HostPortGroupSpec   `xml:"spec"`
+}
+
+func init() {
+	t["HostPortGroup"] = reflect.TypeOf((*HostPortGroup)(nil)).Elem()
+}
+
+type HostPortGroupConfig struct {
+	DynamicData
+
+	ChangeOperation string             `xml:"changeOperation,omitempty"`
+	Spec            *HostPortGroupSpec `xml:"spec,omitempty"`
+}
+
+func init() {
+	t["HostPortGroupConfig"] = reflect.TypeOf((*HostPortGroupConfig)(nil)).Elem()
+}
+
+type HostPortGroupPort struct {
+	DynamicData
+
+	Key  string   `xml:"key,omitempty"`
+	Mac  []string `xml:"mac,omitempty"`
+	Type string   `xml:"type"`
+}
+
+func init() {
+	t["HostPortGroupPort"] = reflect.TypeOf((*HostPortGroupPort)(nil)).Elem()
+}
+
+type HostPortGroupProfile struct {
+	PortGroupProfile
+
+	IpConfig IpAddressProfile `xml:"ipConfig"`
+}
+
+func init() {
+	t["HostPortGroupProfile"] = reflect.TypeOf((*HostPortGroupProfile)(nil)).Elem()
+}
+
+type HostPortGroupSpec struct {
+	DynamicData
+
+	Name        string            `xml:"name"`
+	VlanId      int32             `xml:"vlanId"`
+	VswitchName string            `xml:"vswitchName"`
+	Policy      HostNetworkPolicy `xml:"policy"`
+}
+
+func init() {
+	t["HostPortGroupSpec"] = reflect.TypeOf((*HostPortGroupSpec)(nil)).Elem()
+}
+
+type HostPosixAccountSpec struct {
+	HostAccountSpec
+
+	PosixId     int32 `xml:"posixId,omitempty"`
+	ShellAccess *bool `xml:"shellAccess"`
+}
+
+func init() {
+	t["HostPosixAccountSpec"] = reflect.TypeOf((*HostPosixAccountSpec)(nil)).Elem()
+}
+
+type HostPowerOpFailed struct {
+	VimFault
+}
+
+func init() {
+	t["HostPowerOpFailed"] = reflect.TypeOf((*HostPowerOpFailed)(nil)).Elem()
+}
+
+type HostPowerOpFailedFault BaseHostPowerOpFailed
+
+func init() {
+	t["HostPowerOpFailedFault"] = reflect.TypeOf((*HostPowerOpFailedFault)(nil)).Elem()
+}
+
+type HostPowerPolicy struct {
+	DynamicData
+
+	Key         int32  `xml:"key"`
+	Name        string `xml:"name"`
+	ShortName   string `xml:"shortName"`
+	Description string `xml:"description"`
+}
+
+func init() {
+	t["HostPowerPolicy"] = reflect.TypeOf((*HostPowerPolicy)(nil)).Elem()
+}
+
+type HostPrimaryAgentNotShortNameEvent struct {
+	HostDasEvent
+
+	PrimaryAgent string `xml:"primaryAgent"`
+}
+
+func init() {
+	t["HostPrimaryAgentNotShortNameEvent"] = reflect.TypeOf((*HostPrimaryAgentNotShortNameEvent)(nil)).Elem()
+}
+
+type HostProfileAppliedEvent struct {
+	HostEvent
+
+	Profile ProfileEventArgument `xml:"profile"`
+}
+
+func init() {
+	t["HostProfileAppliedEvent"] = reflect.TypeOf((*HostProfileAppliedEvent)(nil)).Elem()
+}
+
+type HostProfileCompleteConfigSpec struct {
+	HostProfileConfigSpec
+
+	ApplyProfile                  *HostApplyProfile       `xml:"applyProfile,omitempty"`
+	CustomComplyProfile           *ComplianceProfile      `xml:"customComplyProfile,omitempty"`
+	DisabledExpressionListChanged bool                    `xml:"disabledExpressionListChanged"`
+	DisabledExpressionList        []string                `xml:"disabledExpressionList,omitempty"`
+	ValidatorHost                 *ManagedObjectReference `xml:"validatorHost,omitempty"`
+	Validating                    *bool                   `xml:"validating"`
+	HostConfig                    *HostProfileConfigInfo  `xml:"hostConfig,omitempty"`
+}
+
+func init() {
+	t["HostProfileCompleteConfigSpec"] = reflect.TypeOf((*HostProfileCompleteConfigSpec)(nil)).Elem()
+}
+
+type HostProfileConfigInfo struct {
+	ProfileConfigInfo
+
+	ApplyProfile           *HostApplyProfile   `xml:"applyProfile,omitempty"`
+	DefaultComplyProfile   *ComplianceProfile  `xml:"defaultComplyProfile,omitempty"`
+	DefaultComplyLocator   []ComplianceLocator `xml:"defaultComplyLocator,omitempty"`
+	CustomComplyProfile    *ComplianceProfile  `xml:"customComplyProfile,omitempty"`
+	DisabledExpressionList []string            `xml:"disabledExpressionList,omitempty"`
+	Description            *ProfileDescription `xml:"description,omitempty"`
+}
+
+func init() {
+	t["HostProfileConfigInfo"] = reflect.TypeOf((*HostProfileConfigInfo)(nil)).Elem()
+}
+
+type HostProfileConfigSpec struct {
+	ProfileCreateSpec
+}
+
+func init() {
+	t["HostProfileConfigSpec"] = reflect.TypeOf((*HostProfileConfigSpec)(nil)).Elem()
+}
+
+type HostProfileHostBasedConfigSpec struct {
+	HostProfileConfigSpec
+
+	Host                 ManagedObjectReference `xml:"host"`
+	UseHostProfileEngine *bool                  `xml:"useHostProfileEngine"`
+}
+
+func init() {
+	t["HostProfileHostBasedConfigSpec"] = reflect.TypeOf((*HostProfileHostBasedConfigSpec)(nil)).Elem()
+}
+
+type HostProfileManagerCompositionValidationResultResultElement struct {
+	DynamicData
+
+	Target                  ManagedObjectReference `xml:"target"`
+	Status                  string                 `xml:"status"`
+	Errors                  []LocalizableMessage   `xml:"errors,omitempty"`
+	SourceDiffForToBeMerged *HostApplyProfile      `xml:"sourceDiffForToBeMerged,omitempty"`
+	TargetDiffForToBeMerged *HostApplyProfile      `xml:"targetDiffForToBeMerged,omitempty"`
+	ToBeAdded               *HostApplyProfile      `xml:"toBeAdded,omitempty"`
+	ToBeDeleted             *HostApplyProfile      `xml:"toBeDeleted,omitempty"`
+	ToBeDisabled            *HostApplyProfile      `xml:"toBeDisabled,omitempty"`
+	ToBeEnabled             *HostApplyProfile      `xml:"toBeEnabled,omitempty"`
+	ToBeReenableCC          *HostApplyProfile      `xml:"toBeReenableCC,omitempty"`
+}
+
+func init() {
+	t["HostProfileManagerCompositionValidationResultResultElement"] = reflect.TypeOf((*HostProfileManagerCompositionValidationResultResultElement)(nil)).Elem()
+}
+
+type HostProfileManagerConfigTaskList struct {
+	DynamicData
+
+	ConfigSpec          *HostConfigSpec      `xml:"configSpec,omitempty"`
+	TaskDescription     []LocalizableMessage `xml:"taskDescription,omitempty"`
+	TaskListRequirement []string             `xml:"taskListRequirement,omitempty"`
+}
+
+func init() {
+	t["HostProfileManagerConfigTaskList"] = reflect.TypeOf((*HostProfileManagerConfigTaskList)(nil)).Elem()
+}
+
+type HostProfileManagerHostToConfigSpecMap struct {
+	DynamicData
+
+	Host       ManagedObjectReference   `xml:"host"`
+	ConfigSpec BaseAnswerFileCreateSpec `xml:"configSpec,typeattr"`
+}
+
+func init() {
+	t["HostProfileManagerHostToConfigSpecMap"] = reflect.TypeOf((*HostProfileManagerHostToConfigSpecMap)(nil)).Elem()
+}
+
+type HostProfileSerializedHostProfileSpec struct {
+	ProfileSerializedCreateSpec
+
+	ValidatorHost *ManagedObjectReference `xml:"validatorHost,omitempty"`
+	Validating    *bool                   `xml:"validating"`
+}
+
+func init() {
+	t["HostProfileSerializedHostProfileSpec"] = reflect.TypeOf((*HostProfileSerializedHostProfileSpec)(nil)).Elem()
+}
+
+type HostProfilesEntityCustomizations struct {
+	DynamicData
+}
+
+func init() {
+	t["HostProfilesEntityCustomizations"] = reflect.TypeOf((*HostProfilesEntityCustomizations)(nil)).Elem()
+}
+
+type HostProtocolEndpoint struct {
+	DynamicData
+
+	PeType            string                   `xml:"peType"`
+	Type              string                   `xml:"type,omitempty"`
+	Uuid              string                   `xml:"uuid"`
+	HostKey           []ManagedObjectReference `xml:"hostKey,omitempty"`
+	StorageArray      string                   `xml:"storageArray,omitempty"`
+	NfsServer         string                   `xml:"nfsServer,omitempty"`
+	NfsDir            string                   `xml:"nfsDir,omitempty"`
+	NfsServerScope    string                   `xml:"nfsServerScope,omitempty"`
+	NfsServerMajor    string                   `xml:"nfsServerMajor,omitempty"`
+	NfsServerAuthType string                   `xml:"nfsServerAuthType,omitempty"`
+	NfsServerUser     string                   `xml:"nfsServerUser,omitempty"`
+	DeviceId          string                   `xml:"deviceId,omitempty"`
+}
+
+func init() {
+	t["HostProtocolEndpoint"] = reflect.TypeOf((*HostProtocolEndpoint)(nil)).Elem()
+}
+
+type HostProxySwitch struct {
+	DynamicData
+
+	DvsUuid                     string                         `xml:"dvsUuid"`
+	DvsName                     string                         `xml:"dvsName"`
+	Key                         string                         `xml:"key"`
+	NumPorts                    int32                          `xml:"numPorts"`
+	ConfigNumPorts              int32                          `xml:"configNumPorts,omitempty"`
+	NumPortsAvailable           int32                          `xml:"numPortsAvailable"`
+	UplinkPort                  []KeyValue                     `xml:"uplinkPort,omitempty"`
+	Mtu                         int32                          `xml:"mtu,omitempty"`
+	Pnic                        []string                       `xml:"pnic,omitempty"`
+	Spec                        HostProxySwitchSpec            `xml:"spec"`
+	HostLag                     []HostProxySwitchHostLagConfig `xml:"hostLag,omitempty"`
+	NetworkReservationSupported *bool                          `xml:"networkReservationSupported"`
+}
+
+func init() {
+	t["HostProxySwitch"] = reflect.TypeOf((*HostProxySwitch)(nil)).Elem()
+}
+
+type HostProxySwitchConfig struct {
+	DynamicData
+
+	ChangeOperation string               `xml:"changeOperation,omitempty"`
+	Uuid            string               `xml:"uuid"`
+	Spec            *HostProxySwitchSpec `xml:"spec,omitempty"`
+}
+
+func init() {
+	t["HostProxySwitchConfig"] = reflect.TypeOf((*HostProxySwitchConfig)(nil)).Elem()
+}
+
+type HostProxySwitchHostLagConfig struct {
+	DynamicData
+
+	LagKey     string     `xml:"lagKey"`
+	LagName    string     `xml:"lagName,omitempty"`
+	UplinkPort []KeyValue `xml:"uplinkPort,omitempty"`
+}
+
+func init() {
+	t["HostProxySwitchHostLagConfig"] = reflect.TypeOf((*HostProxySwitchHostLagConfig)(nil)).Elem()
+}
+
+type HostProxySwitchSpec struct {
+	DynamicData
+
+	Backing BaseDistributedVirtualSwitchHostMemberBacking `xml:"backing,omitempty,typeattr"`
+}
+
+func init() {
+	t["HostProxySwitchSpec"] = reflect.TypeOf((*HostProxySwitchSpec)(nil)).Elem()
+}
+
+type HostReconcileDatastoreInventoryRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["HostReconcileDatastoreInventoryRequestType"] = reflect.TypeOf((*HostReconcileDatastoreInventoryRequestType)(nil)).Elem()
+}
+
+type HostReconcileDatastoreInventory_Task HostReconcileDatastoreInventoryRequestType
+
+func init() {
+	t["HostReconcileDatastoreInventory_Task"] = reflect.TypeOf((*HostReconcileDatastoreInventory_Task)(nil)).Elem()
+}
+
+type HostReconcileDatastoreInventory_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type HostReconnectionFailedEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostReconnectionFailedEvent"] = reflect.TypeOf((*HostReconnectionFailedEvent)(nil)).Elem()
+}
+
+type HostRegisterDisk HostRegisterDiskRequestType
+
+func init() {
+	t["HostRegisterDisk"] = reflect.TypeOf((*HostRegisterDisk)(nil)).Elem()
+}
+
+type HostRegisterDiskRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Path string                 `xml:"path"`
+	Name string                 `xml:"name,omitempty"`
+}
+
+func init() {
+	t["HostRegisterDiskRequestType"] = reflect.TypeOf((*HostRegisterDiskRequestType)(nil)).Elem()
+}
+
+type HostRegisterDiskResponse struct {
+	Returnval VStorageObject `xml:"returnval"`
+}
+
+type HostReliableMemoryInfo struct {
+	DynamicData
+
+	MemorySize int64 `xml:"memorySize"`
+}
+
+func init() {
+	t["HostReliableMemoryInfo"] = reflect.TypeOf((*HostReliableMemoryInfo)(nil)).Elem()
+}
+
+type HostRelocateVStorageObjectRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Id        ID                     `xml:"id"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+	Spec      VslmRelocateSpec       `xml:"spec"`
+}
+
+func init() {
+	t["HostRelocateVStorageObjectRequestType"] = reflect.TypeOf((*HostRelocateVStorageObjectRequestType)(nil)).Elem()
+}
+
+type HostRelocateVStorageObject_Task HostRelocateVStorageObjectRequestType
+
+func init() {
+	t["HostRelocateVStorageObject_Task"] = reflect.TypeOf((*HostRelocateVStorageObject_Task)(nil)).Elem()
+}
+
+type HostRelocateVStorageObject_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type HostRemoveVFlashResource HostRemoveVFlashResourceRequestType
+
+func init() {
+	t["HostRemoveVFlashResource"] = reflect.TypeOf((*HostRemoveVFlashResource)(nil)).Elem()
+}
+
+type HostRemoveVFlashResourceRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["HostRemoveVFlashResourceRequestType"] = reflect.TypeOf((*HostRemoveVFlashResourceRequestType)(nil)).Elem()
+}
+
+type HostRemoveVFlashResourceResponse struct {
+}
+
+type HostRemovedEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostRemovedEvent"] = reflect.TypeOf((*HostRemovedEvent)(nil)).Elem()
+}
+
+type HostRenameVStorageObject HostRenameVStorageObjectRequestType
+
+func init() {
+	t["HostRenameVStorageObject"] = reflect.TypeOf((*HostRenameVStorageObject)(nil)).Elem()
+}
+
+type HostRenameVStorageObjectRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Id        ID                     `xml:"id"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+	Name      string                 `xml:"name"`
+}
+
+func init() {
+	t["HostRenameVStorageObjectRequestType"] = reflect.TypeOf((*HostRenameVStorageObjectRequestType)(nil)).Elem()
+}
+
+type HostRenameVStorageObjectResponse struct {
+}
+
+type HostResignatureRescanResult struct {
+	DynamicData
+
+	Rescan []HostVmfsRescanResult `xml:"rescan,omitempty"`
+	Result ManagedObjectReference `xml:"result"`
+}
+
+func init() {
+	t["HostResignatureRescanResult"] = reflect.TypeOf((*HostResignatureRescanResult)(nil)).Elem()
+}
+
+type HostRetrieveVStorageObject HostRetrieveVStorageObjectRequestType
+
+func init() {
+	t["HostRetrieveVStorageObject"] = reflect.TypeOf((*HostRetrieveVStorageObject)(nil)).Elem()
+}
+
+type HostRetrieveVStorageObjectRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Id        ID                     `xml:"id"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["HostRetrieveVStorageObjectRequestType"] = reflect.TypeOf((*HostRetrieveVStorageObjectRequestType)(nil)).Elem()
+}
+
+type HostRetrieveVStorageObjectResponse struct {
+	Returnval VStorageObject `xml:"returnval"`
+}
+
+type HostRetrieveVStorageObjectState HostRetrieveVStorageObjectStateRequestType
+
+func init() {
+	t["HostRetrieveVStorageObjectState"] = reflect.TypeOf((*HostRetrieveVStorageObjectState)(nil)).Elem()
+}
+
+type HostRetrieveVStorageObjectStateRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Id        ID                     `xml:"id"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["HostRetrieveVStorageObjectStateRequestType"] = reflect.TypeOf((*HostRetrieveVStorageObjectStateRequestType)(nil)).Elem()
+}
+
+type HostRetrieveVStorageObjectStateResponse struct {
+	Returnval VStorageObjectStateInfo `xml:"returnval"`
+}
+
+type HostRuntimeInfo struct {
+	DynamicData
+
+	ConnectionState            HostSystemConnectionState                   `xml:"connectionState"`
+	PowerState                 HostSystemPowerState                        `xml:"powerState"`
+	StandbyMode                string                                      `xml:"standbyMode,omitempty"`
+	InMaintenanceMode          bool                                        `xml:"inMaintenanceMode"`
+	InQuarantineMode           *bool                                       `xml:"inQuarantineMode"`
+	BootTime                   *time.Time                                  `xml:"bootTime"`
+	HealthSystemRuntime        *HealthSystemRuntime                        `xml:"healthSystemRuntime,omitempty"`
+	DasHostState               *ClusterDasFdmHostState                     `xml:"dasHostState,omitempty"`
+	TpmPcrValues               []HostTpmDigestInfo                         `xml:"tpmPcrValues,omitempty"`
+	VsanRuntimeInfo            *VsanHostRuntimeInfo                        `xml:"vsanRuntimeInfo,omitempty"`
+	NetworkRuntimeInfo         *HostRuntimeInfoNetworkRuntimeInfo          `xml:"networkRuntimeInfo,omitempty"`
+	VFlashResourceRuntimeInfo  *HostVFlashManagerVFlashResourceRunTimeInfo `xml:"vFlashResourceRuntimeInfo,omitempty"`
+	HostMaxVirtualDiskCapacity int64                                       `xml:"hostMaxVirtualDiskCapacity,omitempty"`
+	CryptoState                string                                      `xml:"cryptoState,omitempty"`
+	CryptoKeyId                *CryptoKeyId                                `xml:"cryptoKeyId,omitempty"`
+}
+
+func init() {
+	t["HostRuntimeInfo"] = reflect.TypeOf((*HostRuntimeInfo)(nil)).Elem()
+}
+
+type HostRuntimeInfoNetStackInstanceRuntimeInfo struct {
+	DynamicData
+
+	NetStackInstanceKey    string   `xml:"netStackInstanceKey"`
+	State                  string   `xml:"state,omitempty"`
+	VmknicKeys             []string `xml:"vmknicKeys,omitempty"`
+	MaxNumberOfConnections int32    `xml:"maxNumberOfConnections,omitempty"`
+	CurrentIpV6Enabled     *bool    `xml:"currentIpV6Enabled"`
+}
+
+func init() {
+	t["HostRuntimeInfoNetStackInstanceRuntimeInfo"] = reflect.TypeOf((*HostRuntimeInfoNetStackInstanceRuntimeInfo)(nil)).Elem()
+}
+
+type HostRuntimeInfoNetworkRuntimeInfo struct {
+	DynamicData
+
+	NetStackInstanceRuntimeInfo []HostRuntimeInfoNetStackInstanceRuntimeInfo `xml:"netStackInstanceRuntimeInfo,omitempty"`
+	NetworkResourceRuntime      *HostNetworkResourceRuntime                  `xml:"networkResourceRuntime,omitempty"`
+}
+
+func init() {
+	t["HostRuntimeInfoNetworkRuntimeInfo"] = reflect.TypeOf((*HostRuntimeInfoNetworkRuntimeInfo)(nil)).Elem()
+}
+
+type HostScheduleReconcileDatastoreInventory HostScheduleReconcileDatastoreInventoryRequestType
+
+func init() {
+	t["HostScheduleReconcileDatastoreInventory"] = reflect.TypeOf((*HostScheduleReconcileDatastoreInventory)(nil)).Elem()
+}
+
+type HostScheduleReconcileDatastoreInventoryRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["HostScheduleReconcileDatastoreInventoryRequestType"] = reflect.TypeOf((*HostScheduleReconcileDatastoreInventoryRequestType)(nil)).Elem()
+}
+
+type HostScheduleReconcileDatastoreInventoryResponse struct {
+}
+
+type HostScsiDisk struct {
+	ScsiLun
+
+	Capacity              HostDiskDimensionsLba `xml:"capacity"`
+	DevicePath            string                `xml:"devicePath"`
+	Ssd                   *bool                 `xml:"ssd"`
+	LocalDisk             *bool                 `xml:"localDisk"`
+	PhysicalLocation      []string              `xml:"physicalLocation,omitempty"`
+	EmulatedDIXDIFEnabled *bool                 `xml:"emulatedDIXDIFEnabled"`
+	VsanDiskInfo          *VsanHostVsanDiskInfo `xml:"vsanDiskInfo,omitempty"`
+	ScsiDiskType          string                `xml:"scsiDiskType,omitempty"`
+}
+
+func init() {
+	t["HostScsiDisk"] = reflect.TypeOf((*HostScsiDisk)(nil)).Elem()
+}
+
+type HostScsiDiskPartition struct {
+	DynamicData
+
+	DiskName  string `xml:"diskName"`
+	Partition int32  `xml:"partition"`
+}
+
+func init() {
+	t["HostScsiDiskPartition"] = reflect.TypeOf((*HostScsiDiskPartition)(nil)).Elem()
+}
+
+type HostScsiTopology struct {
+	DynamicData
+
+	Adapter []HostScsiTopologyInterface `xml:"adapter,omitempty"`
+}
+
+func init() {
+	t["HostScsiTopology"] = reflect.TypeOf((*HostScsiTopology)(nil)).Elem()
+}
+
+type HostScsiTopologyInterface struct {
+	DynamicData
+
+	Key     string                   `xml:"key"`
+	Adapter string                   `xml:"adapter"`
+	Target  []HostScsiTopologyTarget `xml:"target,omitempty"`
+}
+
+func init() {
+	t["HostScsiTopologyInterface"] = reflect.TypeOf((*HostScsiTopologyInterface)(nil)).Elem()
+}
+
+type HostScsiTopologyLun struct {
+	DynamicData
+
+	Key     string `xml:"key"`
+	Lun     int32  `xml:"lun"`
+	ScsiLun string `xml:"scsiLun"`
+}
+
+func init() {
+	t["HostScsiTopologyLun"] = reflect.TypeOf((*HostScsiTopologyLun)(nil)).Elem()
+}
+
+type HostScsiTopologyTarget struct {
+	DynamicData
+
+	Key       string                  `xml:"key"`
+	Target    int32                   `xml:"target"`
+	Lun       []HostScsiTopologyLun   `xml:"lun,omitempty"`
+	Transport BaseHostTargetTransport `xml:"transport,omitempty,typeattr"`
+}
+
+func init() {
+	t["HostScsiTopologyTarget"] = reflect.TypeOf((*HostScsiTopologyTarget)(nil)).Elem()
+}
+
+type HostSecuritySpec struct {
+	DynamicData
+
+	AdminPassword    string       `xml:"adminPassword,omitempty"`
+	RemovePermission []Permission `xml:"removePermission,omitempty"`
+	AddPermission    []Permission `xml:"addPermission,omitempty"`
+}
+
+func init() {
+	t["HostSecuritySpec"] = reflect.TypeOf((*HostSecuritySpec)(nil)).Elem()
+}
+
+type HostSerialAttachedHba struct {
+	HostHostBusAdapter
+
+	NodeWorldWideName string `xml:"nodeWorldWideName"`
+}
+
+func init() {
+	t["HostSerialAttachedHba"] = reflect.TypeOf((*HostSerialAttachedHba)(nil)).Elem()
+}
+
+type HostSerialAttachedTargetTransport struct {
+	HostTargetTransport
+}
+
+func init() {
+	t["HostSerialAttachedTargetTransport"] = reflect.TypeOf((*HostSerialAttachedTargetTransport)(nil)).Elem()
+}
+
+type HostService struct {
+	DynamicData
+
+	Key           string                    `xml:"key"`
+	Label         string                    `xml:"label"`
+	Required      bool                      `xml:"required"`
+	Uninstallable bool                      `xml:"uninstallable"`
+	Running       bool                      `xml:"running"`
+	Ruleset       []string                  `xml:"ruleset,omitempty"`
+	Policy        string                    `xml:"policy"`
+	SourcePackage *HostServiceSourcePackage `xml:"sourcePackage,omitempty"`
+}
+
+func init() {
+	t["HostService"] = reflect.TypeOf((*HostService)(nil)).Elem()
+}
+
+type HostServiceConfig struct {
+	DynamicData
+
+	ServiceId     string `xml:"serviceId"`
+	StartupPolicy string `xml:"startupPolicy"`
+}
+
+func init() {
+	t["HostServiceConfig"] = reflect.TypeOf((*HostServiceConfig)(nil)).Elem()
+}
+
+type HostServiceInfo struct {
+	DynamicData
+
+	Service []HostService `xml:"service,omitempty"`
+}
+
+func init() {
+	t["HostServiceInfo"] = reflect.TypeOf((*HostServiceInfo)(nil)).Elem()
+}
+
+type HostServiceSourcePackage struct {
+	DynamicData
+
+	SourcePackageName string `xml:"sourcePackageName"`
+	Description       string `xml:"description"`
+}
+
+func init() {
+	t["HostServiceSourcePackage"] = reflect.TypeOf((*HostServiceSourcePackage)(nil)).Elem()
+}
+
+type HostServiceTicket struct {
+	DynamicData
+
+	Host           string `xml:"host,omitempty"`
+	Port           int32  `xml:"port,omitempty"`
+	SslThumbprint  string `xml:"sslThumbprint,omitempty"`
+	Service        string `xml:"service"`
+	ServiceVersion string `xml:"serviceVersion"`
+	SessionId      string `xml:"sessionId"`
+}
+
+func init() {
+	t["HostServiceTicket"] = reflect.TypeOf((*HostServiceTicket)(nil)).Elem()
+}
+
+type HostShortNameInconsistentEvent struct {
+	HostDasEvent
+
+	ShortName  string `xml:"shortName"`
+	ShortName2 string `xml:"shortName2"`
+}
+
+func init() {
+	t["HostShortNameInconsistentEvent"] = reflect.TypeOf((*HostShortNameInconsistentEvent)(nil)).Elem()
+}
+
+type HostShortNameToIpFailedEvent struct {
+	HostEvent
+
+	ShortName string `xml:"shortName"`
+}
+
+func init() {
+	t["HostShortNameToIpFailedEvent"] = reflect.TypeOf((*HostShortNameToIpFailedEvent)(nil)).Elem()
+}
+
+type HostShutdownEvent struct {
+	HostEvent
+
+	Reason string `xml:"reason"`
+}
+
+func init() {
+	t["HostShutdownEvent"] = reflect.TypeOf((*HostShutdownEvent)(nil)).Elem()
+}
+
+type HostSnmpConfigSpec struct {
+	DynamicData
+
+	Enabled             *bool                 `xml:"enabled"`
+	Port                int32                 `xml:"port,omitempty"`
+	ReadOnlyCommunities []string              `xml:"readOnlyCommunities,omitempty"`
+	TrapTargets         []HostSnmpDestination `xml:"trapTargets,omitempty"`
+	Option              []KeyValue            `xml:"option,omitempty"`
+}
+
+func init() {
+	t["HostSnmpConfigSpec"] = reflect.TypeOf((*HostSnmpConfigSpec)(nil)).Elem()
+}
+
+type HostSnmpDestination struct {
+	DynamicData
+
+	HostName  string `xml:"hostName"`
+	Port      int32  `xml:"port"`
+	Community string `xml:"community"`
+}
+
+func init() {
+	t["HostSnmpDestination"] = reflect.TypeOf((*HostSnmpDestination)(nil)).Elem()
+}
+
+type HostSnmpSystemAgentLimits struct {
+	DynamicData
+
+	MaxReadOnlyCommunities int32                   `xml:"maxReadOnlyCommunities"`
+	MaxTrapDestinations    int32                   `xml:"maxTrapDestinations"`
+	MaxCommunityLength     int32                   `xml:"maxCommunityLength"`
+	MaxBufferSize          int32                   `xml:"maxBufferSize"`
+	Capability             HostSnmpAgentCapability `xml:"capability,omitempty"`
+}
+
+func init() {
+	t["HostSnmpSystemAgentLimits"] = reflect.TypeOf((*HostSnmpSystemAgentLimits)(nil)).Elem()
+}
+
+type HostSpecGetUpdatedHosts HostSpecGetUpdatedHostsRequestType
+
+func init() {
+	t["HostSpecGetUpdatedHosts"] = reflect.TypeOf((*HostSpecGetUpdatedHosts)(nil)).Elem()
+}
+
+type HostSpecGetUpdatedHostsRequestType struct {
+	This          ManagedObjectReference `xml:"_this"`
+	StartChangeID string                 `xml:"startChangeID,omitempty"`
+	EndChangeID   string                 `xml:"endChangeID,omitempty"`
+}
+
+func init() {
+	t["HostSpecGetUpdatedHostsRequestType"] = reflect.TypeOf((*HostSpecGetUpdatedHostsRequestType)(nil)).Elem()
+}
+
+type HostSpecGetUpdatedHostsResponse struct {
+	Returnval []ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type HostSpecification struct {
+	DynamicData
+
+	CreatedTime  time.Time              `xml:"createdTime"`
+	LastModified *time.Time             `xml:"lastModified"`
+	Host         ManagedObjectReference `xml:"host"`
+	SubSpecs     []HostSubSpecification `xml:"subSpecs,omitempty"`
+	ChangeID     string                 `xml:"changeID,omitempty"`
+}
+
+func init() {
+	t["HostSpecification"] = reflect.TypeOf((*HostSpecification)(nil)).Elem()
+}
+
+type HostSpecificationOperationFailed struct {
+	VimFault
+
+	Host ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["HostSpecificationOperationFailed"] = reflect.TypeOf((*HostSpecificationOperationFailed)(nil)).Elem()
+}
+
+type HostSpecificationOperationFailedFault HostSpecificationOperationFailed
+
+func init() {
+	t["HostSpecificationOperationFailedFault"] = reflect.TypeOf((*HostSpecificationOperationFailedFault)(nil)).Elem()
+}
+
+type HostSriovConfig struct {
+	HostPciPassthruConfig
+
+	SriovEnabled       bool  `xml:"sriovEnabled"`
+	NumVirtualFunction int32 `xml:"numVirtualFunction"`
+}
+
+func init() {
+	t["HostSriovConfig"] = reflect.TypeOf((*HostSriovConfig)(nil)).Elem()
+}
+
+type HostSriovDevicePoolInfo struct {
+	DynamicData
+
+	Key string `xml:"key"`
+}
+
+func init() {
+	t["HostSriovDevicePoolInfo"] = reflect.TypeOf((*HostSriovDevicePoolInfo)(nil)).Elem()
+}
+
+type HostSriovInfo struct {
+	HostPciPassthruInfo
+
+	SriovEnabled                bool  `xml:"sriovEnabled"`
+	SriovCapable                bool  `xml:"sriovCapable"`
+	SriovActive                 bool  `xml:"sriovActive"`
+	NumVirtualFunctionRequested int32 `xml:"numVirtualFunctionRequested"`
+	NumVirtualFunction          int32 `xml:"numVirtualFunction"`
+	MaxVirtualFunctionSupported int32 `xml:"maxVirtualFunctionSupported"`
+}
+
+func init() {
+	t["HostSriovInfo"] = reflect.TypeOf((*HostSriovInfo)(nil)).Elem()
+}
+
+type HostSriovNetworkDevicePoolInfo struct {
+	HostSriovDevicePoolInfo
+
+	SwitchKey  string        `xml:"switchKey,omitempty"`
+	SwitchUuid string        `xml:"switchUuid,omitempty"`
+	Pnic       []PhysicalNic `xml:"pnic,omitempty"`
+}
+
+func init() {
+	t["HostSriovNetworkDevicePoolInfo"] = reflect.TypeOf((*HostSriovNetworkDevicePoolInfo)(nil)).Elem()
+}
+
+type HostSslThumbprintInfo struct {
+	DynamicData
+
+	Principal      string   `xml:"principal"`
+	OwnerTag       string   `xml:"ownerTag,omitempty"`
+	SslThumbprints []string `xml:"sslThumbprints,omitempty"`
+}
+
+func init() {
+	t["HostSslThumbprintInfo"] = reflect.TypeOf((*HostSslThumbprintInfo)(nil)).Elem()
+}
+
+type HostStatusChangedEvent struct {
+	ClusterStatusChangedEvent
+}
+
+func init() {
+	t["HostStatusChangedEvent"] = reflect.TypeOf((*HostStatusChangedEvent)(nil)).Elem()
+}
+
+type HostStorageArrayTypePolicyOption struct {
+	DynamicData
+
+	Policy BaseElementDescription `xml:"policy,typeattr"`
+}
+
+func init() {
+	t["HostStorageArrayTypePolicyOption"] = reflect.TypeOf((*HostStorageArrayTypePolicyOption)(nil)).Elem()
+}
+
+type HostStorageDeviceInfo struct {
+	DynamicData
+
+	HostBusAdapter              []BaseHostHostBusAdapter `xml:"hostBusAdapter,omitempty,typeattr"`
+	ScsiLun                     []BaseScsiLun            `xml:"scsiLun,omitempty,typeattr"`
+	ScsiTopology                *HostScsiTopology        `xml:"scsiTopology,omitempty"`
+	MultipathInfo               *HostMultipathInfo       `xml:"multipathInfo,omitempty"`
+	PlugStoreTopology           *HostPlugStoreTopology   `xml:"plugStoreTopology,omitempty"`
+	SoftwareInternetScsiEnabled bool                     `xml:"softwareInternetScsiEnabled"`
+}
+
+func init() {
+	t["HostStorageDeviceInfo"] = reflect.TypeOf((*HostStorageDeviceInfo)(nil)).Elem()
+}
+
+type HostStorageElementInfo struct {
+	HostHardwareElementInfo
+
+	OperationalInfo []HostStorageOperationalInfo `xml:"operationalInfo,omitempty"`
+}
+
+func init() {
+	t["HostStorageElementInfo"] = reflect.TypeOf((*HostStorageElementInfo)(nil)).Elem()
+}
+
+type HostStorageOperationalInfo struct {
+	DynamicData
+
+	Property string `xml:"property"`
+	Value    string `xml:"value"`
+}
+
+func init() {
+	t["HostStorageOperationalInfo"] = reflect.TypeOf((*HostStorageOperationalInfo)(nil)).Elem()
+}
+
+type HostStorageSystemDiskLocatorLedResult struct {
+	DynamicData
+
+	Key   string               `xml:"key"`
+	Fault LocalizedMethodFault `xml:"fault"`
+}
+
+func init() {
+	t["HostStorageSystemDiskLocatorLedResult"] = reflect.TypeOf((*HostStorageSystemDiskLocatorLedResult)(nil)).Elem()
+}
+
+type HostStorageSystemScsiLunResult struct {
+	DynamicData
+
+	Key   string                `xml:"key"`
+	Fault *LocalizedMethodFault `xml:"fault,omitempty"`
+}
+
+func init() {
+	t["HostStorageSystemScsiLunResult"] = reflect.TypeOf((*HostStorageSystemScsiLunResult)(nil)).Elem()
+}
+
+type HostStorageSystemVmfsVolumeResult struct {
+	DynamicData
+
+	Key   string                `xml:"key"`
+	Fault *LocalizedMethodFault `xml:"fault,omitempty"`
+}
+
+func init() {
+	t["HostStorageSystemVmfsVolumeResult"] = reflect.TypeOf((*HostStorageSystemVmfsVolumeResult)(nil)).Elem()
+}
+
+type HostSubSpecification struct {
+	DynamicData
+
+	Name        string    `xml:"name"`
+	CreatedTime time.Time `xml:"createdTime"`
+	Data        []byte    `xml:"data,omitempty"`
+}
+
+func init() {
+	t["HostSubSpecification"] = reflect.TypeOf((*HostSubSpecification)(nil)).Elem()
+}
+
+type HostSyncFailedEvent struct {
+	HostEvent
+
+	Reason LocalizedMethodFault `xml:"reason"`
+}
+
+func init() {
+	t["HostSyncFailedEvent"] = reflect.TypeOf((*HostSyncFailedEvent)(nil)).Elem()
+}
+
+type HostSystemHealthInfo struct {
+	DynamicData
+
+	NumericSensorInfo []HostNumericSensorInfo `xml:"numericSensorInfo,omitempty"`
+}
+
+func init() {
+	t["HostSystemHealthInfo"] = reflect.TypeOf((*HostSystemHealthInfo)(nil)).Elem()
+}
+
+type HostSystemIdentificationInfo struct {
+	DynamicData
+
+	IdentifierValue string                 `xml:"identifierValue"`
+	IdentifierType  BaseElementDescription `xml:"identifierType,typeattr"`
+}
+
+func init() {
+	t["HostSystemIdentificationInfo"] = reflect.TypeOf((*HostSystemIdentificationInfo)(nil)).Elem()
+}
+
+type HostSystemInfo struct {
+	DynamicData
+
+	Vendor               string                         `xml:"vendor"`
+	Model                string                         `xml:"model"`
+	Uuid                 string                         `xml:"uuid"`
+	OtherIdentifyingInfo []HostSystemIdentificationInfo `xml:"otherIdentifyingInfo,omitempty"`
+}
+
+func init() {
+	t["HostSystemInfo"] = reflect.TypeOf((*HostSystemInfo)(nil)).Elem()
+}
+
+type HostSystemReconnectSpec struct {
+	DynamicData
+
+	SyncState *bool `xml:"syncState"`
+}
+
+func init() {
+	t["HostSystemReconnectSpec"] = reflect.TypeOf((*HostSystemReconnectSpec)(nil)).Elem()
+}
+
+type HostSystemResourceInfo struct {
+	DynamicData
+
+	Key    string                   `xml:"key"`
+	Config *ResourceConfigSpec      `xml:"config,omitempty"`
+	Child  []HostSystemResourceInfo `xml:"child,omitempty"`
+}
+
+func init() {
+	t["HostSystemResourceInfo"] = reflect.TypeOf((*HostSystemResourceInfo)(nil)).Elem()
+}
+
+type HostSystemSwapConfiguration struct {
+	DynamicData
+
+	Option []BaseHostSystemSwapConfigurationSystemSwapOption `xml:"option,omitempty,typeattr"`
+}
+
+func init() {
+	t["HostSystemSwapConfiguration"] = reflect.TypeOf((*HostSystemSwapConfiguration)(nil)).Elem()
+}
+
+type HostSystemSwapConfigurationDatastoreOption struct {
+	HostSystemSwapConfigurationSystemSwapOption
+
+	Datastore string `xml:"datastore"`
+}
+
+func init() {
+	t["HostSystemSwapConfigurationDatastoreOption"] = reflect.TypeOf((*HostSystemSwapConfigurationDatastoreOption)(nil)).Elem()
+}
+
+type HostSystemSwapConfigurationDisabledOption struct {
+	HostSystemSwapConfigurationSystemSwapOption
+}
+
+func init() {
+	t["HostSystemSwapConfigurationDisabledOption"] = reflect.TypeOf((*HostSystemSwapConfigurationDisabledOption)(nil)).Elem()
+}
+
+type HostSystemSwapConfigurationHostCacheOption struct {
+	HostSystemSwapConfigurationSystemSwapOption
+}
+
+func init() {
+	t["HostSystemSwapConfigurationHostCacheOption"] = reflect.TypeOf((*HostSystemSwapConfigurationHostCacheOption)(nil)).Elem()
+}
+
+type HostSystemSwapConfigurationHostLocalSwapOption struct {
+	HostSystemSwapConfigurationSystemSwapOption
+}
+
+func init() {
+	t["HostSystemSwapConfigurationHostLocalSwapOption"] = reflect.TypeOf((*HostSystemSwapConfigurationHostLocalSwapOption)(nil)).Elem()
+}
+
+type HostSystemSwapConfigurationSystemSwapOption struct {
+	DynamicData
+
+	Key int32 `xml:"key"`
+}
+
+func init() {
+	t["HostSystemSwapConfigurationSystemSwapOption"] = reflect.TypeOf((*HostSystemSwapConfigurationSystemSwapOption)(nil)).Elem()
+}
+
+type HostTargetTransport struct {
+	DynamicData
+}
+
+func init() {
+	t["HostTargetTransport"] = reflect.TypeOf((*HostTargetTransport)(nil)).Elem()
+}
+
+type HostTpmAttestationReport struct {
+	DynamicData
+
+	TpmPcrValues   []HostTpmDigestInfo    `xml:"tpmPcrValues"`
+	TpmEvents      []HostTpmEventLogEntry `xml:"tpmEvents"`
+	TpmLogReliable bool                   `xml:"tpmLogReliable"`
+}
+
+func init() {
+	t["HostTpmAttestationReport"] = reflect.TypeOf((*HostTpmAttestationReport)(nil)).Elem()
+}
+
+type HostTpmBootSecurityOptionEventDetails struct {
+	HostTpmEventDetails
+
+	BootSecurityOption string `xml:"bootSecurityOption"`
+}
+
+func init() {
+	t["HostTpmBootSecurityOptionEventDetails"] = reflect.TypeOf((*HostTpmBootSecurityOptionEventDetails)(nil)).Elem()
+}
+
+type HostTpmCommandEventDetails struct {
+	HostTpmEventDetails
+
+	CommandLine string `xml:"commandLine"`
+}
+
+func init() {
+	t["HostTpmCommandEventDetails"] = reflect.TypeOf((*HostTpmCommandEventDetails)(nil)).Elem()
+}
+
+type HostTpmDigestInfo struct {
+	HostDigestInfo
+
+	PcrNumber int32 `xml:"pcrNumber"`
+}
+
+func init() {
+	t["HostTpmDigestInfo"] = reflect.TypeOf((*HostTpmDigestInfo)(nil)).Elem()
+}
+
+type HostTpmEventDetails struct {
+	DynamicData
+
+	DataHash []byte `xml:"dataHash"`
+}
+
+func init() {
+	t["HostTpmEventDetails"] = reflect.TypeOf((*HostTpmEventDetails)(nil)).Elem()
+}
+
+type HostTpmEventLogEntry struct {
+	DynamicData
+
+	PcrIndex     int32                   `xml:"pcrIndex"`
+	EventDetails BaseHostTpmEventDetails `xml:"eventDetails,typeattr"`
+}
+
+func init() {
+	t["HostTpmEventLogEntry"] = reflect.TypeOf((*HostTpmEventLogEntry)(nil)).Elem()
+}
+
+type HostTpmOptionEventDetails struct {
+	HostTpmEventDetails
+
+	OptionsFileName string `xml:"optionsFileName"`
+	BootOptions     []byte `xml:"bootOptions,omitempty"`
+}
+
+func init() {
+	t["HostTpmOptionEventDetails"] = reflect.TypeOf((*HostTpmOptionEventDetails)(nil)).Elem()
+}
+
+type HostTpmSoftwareComponentEventDetails struct {
+	HostTpmEventDetails
+
+	ComponentName string `xml:"componentName"`
+	VibName       string `xml:"vibName"`
+	VibVersion    string `xml:"vibVersion"`
+	VibVendor     string `xml:"vibVendor"`
+}
+
+func init() {
+	t["HostTpmSoftwareComponentEventDetails"] = reflect.TypeOf((*HostTpmSoftwareComponentEventDetails)(nil)).Elem()
+}
+
+type HostUnresolvedVmfsExtent struct {
+	DynamicData
+
+	Device       HostScsiDiskPartition `xml:"device"`
+	DevicePath   string                `xml:"devicePath"`
+	VmfsUuid     string                `xml:"vmfsUuid"`
+	IsHeadExtent bool                  `xml:"isHeadExtent"`
+	Ordinal      int32                 `xml:"ordinal"`
+	StartBlock   int32                 `xml:"startBlock"`
+	EndBlock     int32                 `xml:"endBlock"`
+	Reason       string                `xml:"reason"`
+}
+
+func init() {
+	t["HostUnresolvedVmfsExtent"] = reflect.TypeOf((*HostUnresolvedVmfsExtent)(nil)).Elem()
+}
+
+type HostUnresolvedVmfsResignatureSpec struct {
+	DynamicData
+
+	ExtentDevicePath []string `xml:"extentDevicePath"`
+}
+
+func init() {
+	t["HostUnresolvedVmfsResignatureSpec"] = reflect.TypeOf((*HostUnresolvedVmfsResignatureSpec)(nil)).Elem()
+}
+
+type HostUnresolvedVmfsResolutionResult struct {
+	DynamicData
+
+	Spec  HostUnresolvedVmfsResolutionSpec `xml:"spec"`
+	Vmfs  *HostVmfsVolume                  `xml:"vmfs,omitempty"`
+	Fault *LocalizedMethodFault            `xml:"fault,omitempty"`
+}
+
+func init() {
+	t["HostUnresolvedVmfsResolutionResult"] = reflect.TypeOf((*HostUnresolvedVmfsResolutionResult)(nil)).Elem()
+}
+
+type HostUnresolvedVmfsResolutionSpec struct {
+	DynamicData
+
+	ExtentDevicePath []string `xml:"extentDevicePath"`
+	UuidResolution   string   `xml:"uuidResolution"`
+}
+
+func init() {
+	t["HostUnresolvedVmfsResolutionSpec"] = reflect.TypeOf((*HostUnresolvedVmfsResolutionSpec)(nil)).Elem()
+}
+
+type HostUnresolvedVmfsVolume struct {
+	DynamicData
+
+	Extent        []HostUnresolvedVmfsExtent            `xml:"extent"`
+	VmfsLabel     string                                `xml:"vmfsLabel"`
+	VmfsUuid      string                                `xml:"vmfsUuid"`
+	TotalBlocks   int32                                 `xml:"totalBlocks"`
+	ResolveStatus HostUnresolvedVmfsVolumeResolveStatus `xml:"resolveStatus"`
+}
+
+func init() {
+	t["HostUnresolvedVmfsVolume"] = reflect.TypeOf((*HostUnresolvedVmfsVolume)(nil)).Elem()
+}
+
+type HostUnresolvedVmfsVolumeResolveStatus struct {
+	DynamicData
+
+	Resolvable        bool  `xml:"resolvable"`
+	IncompleteExtents *bool `xml:"incompleteExtents"`
+	MultipleCopies    *bool `xml:"multipleCopies"`
+}
+
+func init() {
+	t["HostUnresolvedVmfsVolumeResolveStatus"] = reflect.TypeOf((*HostUnresolvedVmfsVolumeResolveStatus)(nil)).Elem()
+}
+
+type HostUpgradeFailedEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostUpgradeFailedEvent"] = reflect.TypeOf((*HostUpgradeFailedEvent)(nil)).Elem()
+}
+
+type HostUserWorldSwapNotEnabledEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["HostUserWorldSwapNotEnabledEvent"] = reflect.TypeOf((*HostUserWorldSwapNotEnabledEvent)(nil)).Elem()
+}
+
+type HostVFlashManagerVFlashCacheConfigInfo struct {
+	DynamicData
+
+	VFlashModuleConfigOption []HostVFlashManagerVFlashCacheConfigInfoVFlashModuleConfigOption `xml:"vFlashModuleConfigOption,omitempty"`
+	DefaultVFlashModule      string                                                           `xml:"defaultVFlashModule,omitempty"`
+	SwapCacheReservationInGB int64                                                            `xml:"swapCacheReservationInGB,omitempty"`
+}
+
+func init() {
+	t["HostVFlashManagerVFlashCacheConfigInfo"] = reflect.TypeOf((*HostVFlashManagerVFlashCacheConfigInfo)(nil)).Elem()
+}
+
+type HostVFlashManagerVFlashCacheConfigInfoVFlashModuleConfigOption struct {
+	DynamicData
+
+	VFlashModule              string       `xml:"vFlashModule"`
+	VFlashModuleVersion       string       `xml:"vFlashModuleVersion"`
+	MinSupportedModuleVersion string       `xml:"minSupportedModuleVersion"`
+	CacheConsistencyType      ChoiceOption `xml:"cacheConsistencyType"`
+	CacheMode                 ChoiceOption `xml:"cacheMode"`
+	BlockSizeInKBOption       LongOption   `xml:"blockSizeInKBOption"`
+	ReservationInMBOption     LongOption   `xml:"reservationInMBOption"`
+	MaxDiskSizeInKB           int64        `xml:"maxDiskSizeInKB"`
+}
+
+func init() {
+	t["HostVFlashManagerVFlashCacheConfigInfoVFlashModuleConfigOption"] = reflect.TypeOf((*HostVFlashManagerVFlashCacheConfigInfoVFlashModuleConfigOption)(nil)).Elem()
+}
+
+type HostVFlashManagerVFlashCacheConfigSpec struct {
+	DynamicData
+
+	DefaultVFlashModule      string `xml:"defaultVFlashModule"`
+	SwapCacheReservationInGB int64  `xml:"swapCacheReservationInGB"`
+}
+
+func init() {
+	t["HostVFlashManagerVFlashCacheConfigSpec"] = reflect.TypeOf((*HostVFlashManagerVFlashCacheConfigSpec)(nil)).Elem()
+}
+
+type HostVFlashManagerVFlashConfigInfo struct {
+	DynamicData
+
+	VFlashResourceConfigInfo *HostVFlashManagerVFlashResourceConfigInfo `xml:"vFlashResourceConfigInfo,omitempty"`
+	VFlashCacheConfigInfo    *HostVFlashManagerVFlashCacheConfigInfo    `xml:"vFlashCacheConfigInfo,omitempty"`
+}
+
+func init() {
+	t["HostVFlashManagerVFlashConfigInfo"] = reflect.TypeOf((*HostVFlashManagerVFlashConfigInfo)(nil)).Elem()
+}
+
+type HostVFlashManagerVFlashResourceConfigInfo struct {
+	DynamicData
+
+	Vffs     *HostVffsVolume `xml:"vffs,omitempty"`
+	Capacity int64           `xml:"capacity"`
+}
+
+func init() {
+	t["HostVFlashManagerVFlashResourceConfigInfo"] = reflect.TypeOf((*HostVFlashManagerVFlashResourceConfigInfo)(nil)).Elem()
+}
+
+type HostVFlashManagerVFlashResourceConfigSpec struct {
+	DynamicData
+
+	VffsUuid string `xml:"vffsUuid"`
+}
+
+func init() {
+	t["HostVFlashManagerVFlashResourceConfigSpec"] = reflect.TypeOf((*HostVFlashManagerVFlashResourceConfigSpec)(nil)).Elem()
+}
+
+type HostVFlashManagerVFlashResourceRunTimeInfo struct {
+	DynamicData
+
+	Usage              int64 `xml:"usage"`
+	Capacity           int64 `xml:"capacity"`
+	Accessible         bool  `xml:"accessible"`
+	CapacityForVmCache int64 `xml:"capacityForVmCache"`
+	FreeForVmCache     int64 `xml:"freeForVmCache"`
+}
+
+func init() {
+	t["HostVFlashManagerVFlashResourceRunTimeInfo"] = reflect.TypeOf((*HostVFlashManagerVFlashResourceRunTimeInfo)(nil)).Elem()
+}
+
+type HostVFlashResourceConfigurationResult struct {
+	DynamicData
+
+	DevicePath              []string                      `xml:"devicePath,omitempty"`
+	Vffs                    *HostVffsVolume               `xml:"vffs,omitempty"`
+	DiskConfigurationResult []HostDiskConfigurationResult `xml:"diskConfigurationResult,omitempty"`
+}
+
+func init() {
+	t["HostVFlashResourceConfigurationResult"] = reflect.TypeOf((*HostVFlashResourceConfigurationResult)(nil)).Elem()
+}
+
+type HostVMotionCompatibility struct {
+	DynamicData
+
+	Host          ManagedObjectReference `xml:"host"`
+	Compatibility []string               `xml:"compatibility,omitempty"`
+}
+
+func init() {
+	t["HostVMotionCompatibility"] = reflect.TypeOf((*HostVMotionCompatibility)(nil)).Elem()
+}
+
+type HostVMotionConfig struct {
+	DynamicData
+
+	VmotionNicKey string `xml:"vmotionNicKey,omitempty"`
+	Enabled       bool   `xml:"enabled"`
+}
+
+func init() {
+	t["HostVMotionConfig"] = reflect.TypeOf((*HostVMotionConfig)(nil)).Elem()
+}
+
+type HostVMotionInfo struct {
+	DynamicData
+
+	NetConfig *HostVMotionNetConfig `xml:"netConfig,omitempty"`
+	IpConfig  *HostIpConfig         `xml:"ipConfig,omitempty"`
+}
+
+func init() {
+	t["HostVMotionInfo"] = reflect.TypeOf((*HostVMotionInfo)(nil)).Elem()
+}
+
+type HostVMotionNetConfig struct {
+	DynamicData
+
+	CandidateVnic []HostVirtualNic `xml:"candidateVnic,omitempty"`
+	SelectedVnic  string           `xml:"selectedVnic,omitempty"`
+}
+
+func init() {
+	t["HostVMotionNetConfig"] = reflect.TypeOf((*HostVMotionNetConfig)(nil)).Elem()
+}
+
+type HostVfatVolume struct {
+	HostFileSystemVolume
+}
+
+func init() {
+	t["HostVfatVolume"] = reflect.TypeOf((*HostVfatVolume)(nil)).Elem()
+}
+
+type HostVffsSpec struct {
+	DynamicData
+
+	DevicePath   string                 `xml:"devicePath"`
+	Partition    *HostDiskPartitionSpec `xml:"partition,omitempty"`
+	MajorVersion int32                  `xml:"majorVersion"`
+	VolumeName   string                 `xml:"volumeName"`
+}
+
+func init() {
+	t["HostVffsSpec"] = reflect.TypeOf((*HostVffsSpec)(nil)).Elem()
+}
+
+type HostVffsVolume struct {
+	HostFileSystemVolume
+
+	MajorVersion int32                   `xml:"majorVersion"`
+	Version      string                  `xml:"version"`
+	Uuid         string                  `xml:"uuid"`
+	Extent       []HostScsiDiskPartition `xml:"extent"`
+}
+
+func init() {
+	t["HostVffsVolume"] = reflect.TypeOf((*HostVffsVolume)(nil)).Elem()
+}
+
+type HostVirtualNic struct {
+	DynamicData
+
+	Device    string             `xml:"device"`
+	Key       string             `xml:"key"`
+	Portgroup string             `xml:"portgroup"`
+	Spec      HostVirtualNicSpec `xml:"spec"`
+	Port      string             `xml:"port,omitempty"`
+}
+
+func init() {
+	t["HostVirtualNic"] = reflect.TypeOf((*HostVirtualNic)(nil)).Elem()
+}
+
+type HostVirtualNicConfig struct {
+	DynamicData
+
+	ChangeOperation string              `xml:"changeOperation,omitempty"`
+	Device          string              `xml:"device,omitempty"`
+	Portgroup       string              `xml:"portgroup"`
+	Spec            *HostVirtualNicSpec `xml:"spec,omitempty"`
+}
+
+func init() {
+	t["HostVirtualNicConfig"] = reflect.TypeOf((*HostVirtualNicConfig)(nil)).Elem()
+}
+
+type HostVirtualNicConnection struct {
+	DynamicData
+
+	Portgroup string                                  `xml:"portgroup,omitempty"`
+	DvPort    *DistributedVirtualSwitchPortConnection `xml:"dvPort,omitempty"`
+}
+
+func init() {
+	t["HostVirtualNicConnection"] = reflect.TypeOf((*HostVirtualNicConnection)(nil)).Elem()
+}
+
+type HostVirtualNicIpRouteSpec struct {
+	DynamicData
+
+	IpRouteConfig BaseHostIpRouteConfig `xml:"ipRouteConfig,omitempty,typeattr"`
+}
+
+func init() {
+	t["HostVirtualNicIpRouteSpec"] = reflect.TypeOf((*HostVirtualNicIpRouteSpec)(nil)).Elem()
+}
+
+type HostVirtualNicManagerInfo struct {
+	DynamicData
+
+	NetConfig []VirtualNicManagerNetConfig `xml:"netConfig,omitempty"`
+}
+
+func init() {
+	t["HostVirtualNicManagerInfo"] = reflect.TypeOf((*HostVirtualNicManagerInfo)(nil)).Elem()
+}
+
+type HostVirtualNicManagerNicTypeSelection struct {
+	DynamicData
+
+	Vnic    HostVirtualNicConnection `xml:"vnic"`
+	NicType []string                 `xml:"nicType,omitempty"`
+}
+
+func init() {
+	t["HostVirtualNicManagerNicTypeSelection"] = reflect.TypeOf((*HostVirtualNicManagerNicTypeSelection)(nil)).Elem()
+}
+
+type HostVirtualNicOpaqueNetworkSpec struct {
+	DynamicData
+
+	OpaqueNetworkId   string `xml:"opaqueNetworkId"`
+	OpaqueNetworkType string `xml:"opaqueNetworkType"`
+}
+
+func init() {
+	t["HostVirtualNicOpaqueNetworkSpec"] = reflect.TypeOf((*HostVirtualNicOpaqueNetworkSpec)(nil)).Elem()
+}
+
+type HostVirtualNicSpec struct {
+	DynamicData
+
+	Ip                     *HostIpConfig                           `xml:"ip,omitempty"`
+	Mac                    string                                  `xml:"mac,omitempty"`
+	DistributedVirtualPort *DistributedVirtualSwitchPortConnection `xml:"distributedVirtualPort,omitempty"`
+	Portgroup              string                                  `xml:"portgroup,omitempty"`
+	Mtu                    int32                                   `xml:"mtu,omitempty"`
+	TsoEnabled             *bool                                   `xml:"tsoEnabled"`
+	NetStackInstanceKey    string                                  `xml:"netStackInstanceKey,omitempty"`
+	OpaqueNetwork          *HostVirtualNicOpaqueNetworkSpec        `xml:"opaqueNetwork,omitempty"`
+	ExternalId             string                                  `xml:"externalId,omitempty"`
+	PinnedPnic             string                                  `xml:"pinnedPnic,omitempty"`
+	IpRouteSpec            *HostVirtualNicIpRouteSpec              `xml:"ipRouteSpec,omitempty"`
+}
+
+func init() {
+	t["HostVirtualNicSpec"] = reflect.TypeOf((*HostVirtualNicSpec)(nil)).Elem()
+}
+
+type HostVirtualSwitch struct {
+	DynamicData
+
+	Name              string                `xml:"name"`
+	Key               string                `xml:"key"`
+	NumPorts          int32                 `xml:"numPorts"`
+	NumPortsAvailable int32                 `xml:"numPortsAvailable"`
+	Mtu               int32                 `xml:"mtu,omitempty"`
+	Portgroup         []string              `xml:"portgroup,omitempty"`
+	Pnic              []string              `xml:"pnic,omitempty"`
+	Spec              HostVirtualSwitchSpec `xml:"spec"`
+}
+
+func init() {
+	t["HostVirtualSwitch"] = reflect.TypeOf((*HostVirtualSwitch)(nil)).Elem()
+}
+
+type HostVirtualSwitchAutoBridge struct {
+	HostVirtualSwitchBridge
+
+	ExcludedNicDevice []string `xml:"excludedNicDevice,omitempty"`
+}
+
+func init() {
+	t["HostVirtualSwitchAutoBridge"] = reflect.TypeOf((*HostVirtualSwitchAutoBridge)(nil)).Elem()
+}
+
+type HostVirtualSwitchBeaconConfig struct {
+	DynamicData
+
+	Interval int32 `xml:"interval"`
+}
+
+func init() {
+	t["HostVirtualSwitchBeaconConfig"] = reflect.TypeOf((*HostVirtualSwitchBeaconConfig)(nil)).Elem()
+}
+
+type HostVirtualSwitchBondBridge struct {
+	HostVirtualSwitchBridge
+
+	NicDevice                   []string                       `xml:"nicDevice"`
+	Beacon                      *HostVirtualSwitchBeaconConfig `xml:"beacon,omitempty"`
+	LinkDiscoveryProtocolConfig *LinkDiscoveryProtocolConfig   `xml:"linkDiscoveryProtocolConfig,omitempty"`
+}
+
+func init() {
+	t["HostVirtualSwitchBondBridge"] = reflect.TypeOf((*HostVirtualSwitchBondBridge)(nil)).Elem()
+}
+
+type HostVirtualSwitchBridge struct {
+	DynamicData
+}
+
+func init() {
+	t["HostVirtualSwitchBridge"] = reflect.TypeOf((*HostVirtualSwitchBridge)(nil)).Elem()
+}
+
+type HostVirtualSwitchConfig struct {
+	DynamicData
+
+	ChangeOperation string                 `xml:"changeOperation,omitempty"`
+	Name            string                 `xml:"name"`
+	Spec            *HostVirtualSwitchSpec `xml:"spec,omitempty"`
+}
+
+func init() {
+	t["HostVirtualSwitchConfig"] = reflect.TypeOf((*HostVirtualSwitchConfig)(nil)).Elem()
+}
+
+type HostVirtualSwitchSimpleBridge struct {
+	HostVirtualSwitchBridge
+
+	NicDevice string `xml:"nicDevice"`
+}
+
+func init() {
+	t["HostVirtualSwitchSimpleBridge"] = reflect.TypeOf((*HostVirtualSwitchSimpleBridge)(nil)).Elem()
+}
+
+type HostVirtualSwitchSpec struct {
+	DynamicData
+
+	NumPorts int32                       `xml:"numPorts"`
+	Bridge   BaseHostVirtualSwitchBridge `xml:"bridge,omitempty,typeattr"`
+	Policy   *HostNetworkPolicy          `xml:"policy,omitempty"`
+	Mtu      int32                       `xml:"mtu,omitempty"`
+}
+
+func init() {
+	t["HostVirtualSwitchSpec"] = reflect.TypeOf((*HostVirtualSwitchSpec)(nil)).Elem()
+}
+
+type HostVmciAccessManagerAccessSpec struct {
+	DynamicData
+
+	Vm       ManagedObjectReference `xml:"vm"`
+	Services []string               `xml:"services,omitempty"`
+	Mode     string                 `xml:"mode"`
+}
+
+func init() {
+	t["HostVmciAccessManagerAccessSpec"] = reflect.TypeOf((*HostVmciAccessManagerAccessSpec)(nil)).Elem()
+}
+
+type HostVmfsRescanResult struct {
+	DynamicData
+
+	Host  ManagedObjectReference `xml:"host"`
+	Fault *LocalizedMethodFault  `xml:"fault,omitempty"`
+}
+
+func init() {
+	t["HostVmfsRescanResult"] = reflect.TypeOf((*HostVmfsRescanResult)(nil)).Elem()
+}
+
+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"`
+}
+
+func init() {
+	t["HostVmfsSpec"] = reflect.TypeOf((*HostVmfsSpec)(nil)).Elem()
+}
+
+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"`
+}
+
+func init() {
+	t["HostVmfsVolume"] = reflect.TypeOf((*HostVmfsVolume)(nil)).Elem()
+}
+
+type HostVnicConnectedToCustomizedDVPortEvent struct {
+	HostEvent
+
+	Vnic        VnicPortArgument `xml:"vnic"`
+	PrevPortKey string           `xml:"prevPortKey,omitempty"`
+}
+
+func init() {
+	t["HostVnicConnectedToCustomizedDVPortEvent"] = reflect.TypeOf((*HostVnicConnectedToCustomizedDVPortEvent)(nil)).Elem()
+}
+
+type HostVsanInternalSystemCmmdsQuery struct {
+	DynamicData
+
+	Type  string `xml:"type,omitempty"`
+	Uuid  string `xml:"uuid,omitempty"`
+	Owner string `xml:"owner,omitempty"`
+}
+
+func init() {
+	t["HostVsanInternalSystemCmmdsQuery"] = reflect.TypeOf((*HostVsanInternalSystemCmmdsQuery)(nil)).Elem()
+}
+
+type HostVsanInternalSystemDeleteVsanObjectsResult struct {
+	DynamicData
+
+	Uuid          string               `xml:"uuid"`
+	Success       bool                 `xml:"success"`
+	FailureReason []LocalizableMessage `xml:"failureReason,omitempty"`
+}
+
+func init() {
+	t["HostVsanInternalSystemDeleteVsanObjectsResult"] = reflect.TypeOf((*HostVsanInternalSystemDeleteVsanObjectsResult)(nil)).Elem()
+}
+
+type HostVsanInternalSystemVsanObjectOperationResult struct {
+	DynamicData
+
+	Uuid          string               `xml:"uuid"`
+	FailureReason []LocalizableMessage `xml:"failureReason,omitempty"`
+}
+
+func init() {
+	t["HostVsanInternalSystemVsanObjectOperationResult"] = reflect.TypeOf((*HostVsanInternalSystemVsanObjectOperationResult)(nil)).Elem()
+}
+
+type HostVsanInternalSystemVsanPhysicalDiskDiagnosticsResult struct {
+	DynamicData
+
+	DiskUuid      string `xml:"diskUuid"`
+	Success       bool   `xml:"success"`
+	FailureReason string `xml:"failureReason,omitempty"`
+}
+
+func init() {
+	t["HostVsanInternalSystemVsanPhysicalDiskDiagnosticsResult"] = reflect.TypeOf((*HostVsanInternalSystemVsanPhysicalDiskDiagnosticsResult)(nil)).Elem()
+}
+
+type HostVvolVolume struct {
+	HostFileSystemVolume
+
+	ScId             string                `xml:"scId"`
+	HostPE           []VVolHostPE          `xml:"hostPE,omitempty"`
+	VasaProviderInfo []VimVasaProviderInfo `xml:"vasaProviderInfo,omitempty"`
+	StorageArray     []VASAStorageArray    `xml:"storageArray,omitempty"`
+}
+
+func init() {
+	t["HostVvolVolume"] = reflect.TypeOf((*HostVvolVolume)(nil)).Elem()
+}
+
+type HostVvolVolumeSpecification struct {
+	DynamicData
+
+	MaxSizeInMB      int64                 `xml:"maxSizeInMB"`
+	VolumeName       string                `xml:"volumeName"`
+	VasaProviderInfo []VimVasaProviderInfo `xml:"vasaProviderInfo,omitempty"`
+	StorageArray     []VASAStorageArray    `xml:"storageArray,omitempty"`
+	Uuid             string                `xml:"uuid"`
+}
+
+func init() {
+	t["HostVvolVolumeSpecification"] = reflect.TypeOf((*HostVvolVolumeSpecification)(nil)).Elem()
+}
+
+type HostWwnChangedEvent struct {
+	HostEvent
+
+	OldNodeWwns []int64 `xml:"oldNodeWwns,omitempty"`
+	OldPortWwns []int64 `xml:"oldPortWwns,omitempty"`
+	NewNodeWwns []int64 `xml:"newNodeWwns,omitempty"`
+	NewPortWwns []int64 `xml:"newPortWwns,omitempty"`
+}
+
+func init() {
+	t["HostWwnChangedEvent"] = reflect.TypeOf((*HostWwnChangedEvent)(nil)).Elem()
+}
+
+type HostWwnConflictEvent struct {
+	HostEvent
+
+	ConflictedVms   []VmEventArgument   `xml:"conflictedVms,omitempty"`
+	ConflictedHosts []HostEventArgument `xml:"conflictedHosts,omitempty"`
+	Wwn             int64               `xml:"wwn"`
+}
+
+func init() {
+	t["HostWwnConflictEvent"] = reflect.TypeOf((*HostWwnConflictEvent)(nil)).Elem()
+}
+
+type HotSnapshotMoveNotSupported struct {
+	SnapshotCopyNotSupported
+}
+
+func init() {
+	t["HotSnapshotMoveNotSupported"] = reflect.TypeOf((*HotSnapshotMoveNotSupported)(nil)).Elem()
+}
+
+type HotSnapshotMoveNotSupportedFault HotSnapshotMoveNotSupported
+
+func init() {
+	t["HotSnapshotMoveNotSupportedFault"] = reflect.TypeOf((*HotSnapshotMoveNotSupportedFault)(nil)).Elem()
+}
+
+type HourlyTaskScheduler struct {
+	RecurrentTaskScheduler
+
+	Minute int32 `xml:"minute"`
+}
+
+func init() {
+	t["HourlyTaskScheduler"] = reflect.TypeOf((*HourlyTaskScheduler)(nil)).Elem()
+}
+
+type HttpNfcLeaseAbort HttpNfcLeaseAbortRequestType
+
+func init() {
+	t["HttpNfcLeaseAbort"] = reflect.TypeOf((*HttpNfcLeaseAbort)(nil)).Elem()
+}
+
+type HttpNfcLeaseAbortRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Fault *LocalizedMethodFault  `xml:"fault,omitempty"`
+}
+
+func init() {
+	t["HttpNfcLeaseAbortRequestType"] = reflect.TypeOf((*HttpNfcLeaseAbortRequestType)(nil)).Elem()
+}
+
+type HttpNfcLeaseAbortResponse struct {
+}
+
+type HttpNfcLeaseComplete HttpNfcLeaseCompleteRequestType
+
+func init() {
+	t["HttpNfcLeaseComplete"] = reflect.TypeOf((*HttpNfcLeaseComplete)(nil)).Elem()
+}
+
+type HttpNfcLeaseCompleteRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["HttpNfcLeaseCompleteRequestType"] = reflect.TypeOf((*HttpNfcLeaseCompleteRequestType)(nil)).Elem()
+}
+
+type HttpNfcLeaseCompleteResponse struct {
+}
+
+type HttpNfcLeaseDatastoreLeaseInfo struct {
+	DynamicData
+
+	DatastoreKey string                 `xml:"datastoreKey"`
+	Hosts        []HttpNfcLeaseHostInfo `xml:"hosts"`
+}
+
+func init() {
+	t["HttpNfcLeaseDatastoreLeaseInfo"] = reflect.TypeOf((*HttpNfcLeaseDatastoreLeaseInfo)(nil)).Elem()
+}
+
+type HttpNfcLeaseDeviceUrl struct {
+	DynamicData
+
+	Key           string `xml:"key"`
+	ImportKey     string `xml:"importKey"`
+	Url           string `xml:"url"`
+	SslThumbprint string `xml:"sslThumbprint"`
+	Disk          *bool  `xml:"disk"`
+	TargetId      string `xml:"targetId,omitempty"`
+	DatastoreKey  string `xml:"datastoreKey,omitempty"`
+	FileSize      int64  `xml:"fileSize,omitempty"`
+}
+
+func init() {
+	t["HttpNfcLeaseDeviceUrl"] = reflect.TypeOf((*HttpNfcLeaseDeviceUrl)(nil)).Elem()
+}
+
+type HttpNfcLeaseGetManifest HttpNfcLeaseGetManifestRequestType
+
+func init() {
+	t["HttpNfcLeaseGetManifest"] = reflect.TypeOf((*HttpNfcLeaseGetManifest)(nil)).Elem()
+}
+
+type HttpNfcLeaseGetManifestRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["HttpNfcLeaseGetManifestRequestType"] = reflect.TypeOf((*HttpNfcLeaseGetManifestRequestType)(nil)).Elem()
+}
+
+type HttpNfcLeaseGetManifestResponse struct {
+	Returnval []HttpNfcLeaseManifestEntry `xml:"returnval,omitempty"`
+}
+
+type HttpNfcLeaseHostInfo struct {
+	DynamicData
+
+	Url           string `xml:"url"`
+	SslThumbprint string `xml:"sslThumbprint"`
+}
+
+func init() {
+	t["HttpNfcLeaseHostInfo"] = reflect.TypeOf((*HttpNfcLeaseHostInfo)(nil)).Elem()
+}
+
+type HttpNfcLeaseInfo struct {
+	DynamicData
+
+	Lease                 ManagedObjectReference           `xml:"lease"`
+	Entity                ManagedObjectReference           `xml:"entity"`
+	DeviceUrl             []HttpNfcLeaseDeviceUrl          `xml:"deviceUrl,omitempty"`
+	TotalDiskCapacityInKB int64                            `xml:"totalDiskCapacityInKB"`
+	LeaseTimeout          int32                            `xml:"leaseTimeout"`
+	HostMap               []HttpNfcLeaseDatastoreLeaseInfo `xml:"hostMap,omitempty"`
+}
+
+func init() {
+	t["HttpNfcLeaseInfo"] = reflect.TypeOf((*HttpNfcLeaseInfo)(nil)).Elem()
+}
+
+type HttpNfcLeaseManifestEntry struct {
+	DynamicData
+
+	Key           string `xml:"key"`
+	Sha1          string `xml:"sha1"`
+	Size          int64  `xml:"size"`
+	Disk          bool   `xml:"disk"`
+	Capacity      int64  `xml:"capacity,omitempty"`
+	PopulatedSize int64  `xml:"populatedSize,omitempty"`
+}
+
+func init() {
+	t["HttpNfcLeaseManifestEntry"] = reflect.TypeOf((*HttpNfcLeaseManifestEntry)(nil)).Elem()
+}
+
+type HttpNfcLeaseProgress HttpNfcLeaseProgressRequestType
+
+func init() {
+	t["HttpNfcLeaseProgress"] = reflect.TypeOf((*HttpNfcLeaseProgress)(nil)).Elem()
+}
+
+type HttpNfcLeaseProgressRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Percent int32                  `xml:"percent"`
+}
+
+func init() {
+	t["HttpNfcLeaseProgressRequestType"] = reflect.TypeOf((*HttpNfcLeaseProgressRequestType)(nil)).Elem()
+}
+
+type HttpNfcLeaseProgressResponse struct {
+}
+
+type ID struct {
+	DynamicData
+
+	Id string `xml:"id"`
+}
+
+func init() {
+	t["ID"] = reflect.TypeOf((*ID)(nil)).Elem()
+}
+
+type IDEDiskNotSupported struct {
+	DiskNotSupported
+}
+
+func init() {
+	t["IDEDiskNotSupported"] = reflect.TypeOf((*IDEDiskNotSupported)(nil)).Elem()
+}
+
+type IDEDiskNotSupportedFault IDEDiskNotSupported
+
+func init() {
+	t["IDEDiskNotSupportedFault"] = reflect.TypeOf((*IDEDiskNotSupportedFault)(nil)).Elem()
+}
+
+type IORMNotSupportedHostOnDatastore struct {
+	VimFault
+
+	Datastore     ManagedObjectReference   `xml:"datastore"`
+	DatastoreName string                   `xml:"datastoreName"`
+	Host          []ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["IORMNotSupportedHostOnDatastore"] = reflect.TypeOf((*IORMNotSupportedHostOnDatastore)(nil)).Elem()
+}
+
+type IORMNotSupportedHostOnDatastoreFault IORMNotSupportedHostOnDatastore
+
+func init() {
+	t["IORMNotSupportedHostOnDatastoreFault"] = reflect.TypeOf((*IORMNotSupportedHostOnDatastoreFault)(nil)).Elem()
+}
+
+type IScsiBootFailureEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["IScsiBootFailureEvent"] = reflect.TypeOf((*IScsiBootFailureEvent)(nil)).Elem()
+}
+
+type ImpersonateUser ImpersonateUserRequestType
+
+func init() {
+	t["ImpersonateUser"] = reflect.TypeOf((*ImpersonateUser)(nil)).Elem()
+}
+
+type ImpersonateUserRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	UserName string                 `xml:"userName"`
+	Locale   string                 `xml:"locale,omitempty"`
+}
+
+func init() {
+	t["ImpersonateUserRequestType"] = reflect.TypeOf((*ImpersonateUserRequestType)(nil)).Elem()
+}
+
+type ImpersonateUserResponse struct {
+	Returnval UserSession `xml:"returnval"`
+}
+
+type ImportCertificateForCAMRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	CertPath  string                 `xml:"certPath"`
+	CamServer string                 `xml:"camServer"`
+}
+
+func init() {
+	t["ImportCertificateForCAMRequestType"] = reflect.TypeOf((*ImportCertificateForCAMRequestType)(nil)).Elem()
+}
+
+type ImportCertificateForCAM_Task ImportCertificateForCAMRequestType
+
+func init() {
+	t["ImportCertificateForCAM_Task"] = reflect.TypeOf((*ImportCertificateForCAM_Task)(nil)).Elem()
+}
+
+type ImportCertificateForCAM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ImportHostAddFailure struct {
+	DvsFault
+
+	HostIp []string `xml:"hostIp"`
+}
+
+func init() {
+	t["ImportHostAddFailure"] = reflect.TypeOf((*ImportHostAddFailure)(nil)).Elem()
+}
+
+type ImportHostAddFailureFault ImportHostAddFailure
+
+func init() {
+	t["ImportHostAddFailureFault"] = reflect.TypeOf((*ImportHostAddFailureFault)(nil)).Elem()
+}
+
+type ImportOperationBulkFault struct {
+	DvsFault
+
+	ImportFaults []ImportOperationBulkFaultFaultOnImport `xml:"importFaults"`
+}
+
+func init() {
+	t["ImportOperationBulkFault"] = reflect.TypeOf((*ImportOperationBulkFault)(nil)).Elem()
+}
+
+type ImportOperationBulkFaultFault ImportOperationBulkFault
+
+func init() {
+	t["ImportOperationBulkFaultFault"] = reflect.TypeOf((*ImportOperationBulkFaultFault)(nil)).Elem()
+}
+
+type ImportOperationBulkFaultFaultOnImport struct {
+	DynamicData
+
+	EntityType string               `xml:"entityType,omitempty"`
+	Key        string               `xml:"key,omitempty"`
+	Fault      LocalizedMethodFault `xml:"fault"`
+}
+
+func init() {
+	t["ImportOperationBulkFaultFaultOnImport"] = reflect.TypeOf((*ImportOperationBulkFaultFaultOnImport)(nil)).Elem()
+}
+
+type ImportSpec struct {
+	DynamicData
+
+	EntityConfig     *VAppEntityConfigInfo `xml:"entityConfig,omitempty"`
+	InstantiationOst *OvfConsumerOstNode   `xml:"instantiationOst,omitempty"`
+}
+
+func init() {
+	t["ImportSpec"] = reflect.TypeOf((*ImportSpec)(nil)).Elem()
+}
+
+type ImportUnmanagedSnapshot ImportUnmanagedSnapshotRequestType
+
+func init() {
+	t["ImportUnmanagedSnapshot"] = reflect.TypeOf((*ImportUnmanagedSnapshot)(nil)).Elem()
+}
+
+type ImportUnmanagedSnapshotRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Vdisk      string                  `xml:"vdisk"`
+	Datacenter *ManagedObjectReference `xml:"datacenter,omitempty"`
+	VvolId     string                  `xml:"vvolId"`
+}
+
+func init() {
+	t["ImportUnmanagedSnapshotRequestType"] = reflect.TypeOf((*ImportUnmanagedSnapshotRequestType)(nil)).Elem()
+}
+
+type ImportUnmanagedSnapshotResponse struct {
+}
+
+type ImportVApp ImportVAppRequestType
+
+func init() {
+	t["ImportVApp"] = reflect.TypeOf((*ImportVApp)(nil)).Elem()
+}
+
+type ImportVAppRequestType struct {
+	This   ManagedObjectReference  `xml:"_this"`
+	Spec   BaseImportSpec          `xml:"spec,typeattr"`
+	Folder *ManagedObjectReference `xml:"folder,omitempty"`
+	Host   *ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["ImportVAppRequestType"] = reflect.TypeOf((*ImportVAppRequestType)(nil)).Elem()
+}
+
+type ImportVAppResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type InUseFeatureManipulationDisallowed struct {
+	NotEnoughLicenses
+}
+
+func init() {
+	t["InUseFeatureManipulationDisallowed"] = reflect.TypeOf((*InUseFeatureManipulationDisallowed)(nil)).Elem()
+}
+
+type InUseFeatureManipulationDisallowedFault InUseFeatureManipulationDisallowed
+
+func init() {
+	t["InUseFeatureManipulationDisallowedFault"] = reflect.TypeOf((*InUseFeatureManipulationDisallowedFault)(nil)).Elem()
+}
+
+type InaccessibleDatastore struct {
+	InvalidDatastore
+
+	Detail string `xml:"detail,omitempty"`
+}
+
+func init() {
+	t["InaccessibleDatastore"] = reflect.TypeOf((*InaccessibleDatastore)(nil)).Elem()
+}
+
+type InaccessibleDatastoreFault BaseInaccessibleDatastore
+
+func init() {
+	t["InaccessibleDatastoreFault"] = reflect.TypeOf((*InaccessibleDatastoreFault)(nil)).Elem()
+}
+
+type InaccessibleFTMetadataDatastore struct {
+	InaccessibleDatastore
+}
+
+func init() {
+	t["InaccessibleFTMetadataDatastore"] = reflect.TypeOf((*InaccessibleFTMetadataDatastore)(nil)).Elem()
+}
+
+type InaccessibleFTMetadataDatastoreFault InaccessibleFTMetadataDatastore
+
+func init() {
+	t["InaccessibleFTMetadataDatastoreFault"] = reflect.TypeOf((*InaccessibleFTMetadataDatastoreFault)(nil)).Elem()
+}
+
+type InaccessibleVFlashSource struct {
+	VimFault
+
+	HostName string `xml:"hostName"`
+}
+
+func init() {
+	t["InaccessibleVFlashSource"] = reflect.TypeOf((*InaccessibleVFlashSource)(nil)).Elem()
+}
+
+type InaccessibleVFlashSourceFault InaccessibleVFlashSource
+
+func init() {
+	t["InaccessibleVFlashSourceFault"] = reflect.TypeOf((*InaccessibleVFlashSourceFault)(nil)).Elem()
+}
+
+type IncompatibleDefaultDevice struct {
+	MigrationFault
+
+	Device string `xml:"device"`
+}
+
+func init() {
+	t["IncompatibleDefaultDevice"] = reflect.TypeOf((*IncompatibleDefaultDevice)(nil)).Elem()
+}
+
+type IncompatibleDefaultDeviceFault IncompatibleDefaultDevice
+
+func init() {
+	t["IncompatibleDefaultDeviceFault"] = reflect.TypeOf((*IncompatibleDefaultDeviceFault)(nil)).Elem()
+}
+
+type IncompatibleHostForFtSecondary struct {
+	VmFaultToleranceIssue
+
+	Host  ManagedObjectReference `xml:"host"`
+	Error []LocalizedMethodFault `xml:"error,omitempty"`
+}
+
+func init() {
+	t["IncompatibleHostForFtSecondary"] = reflect.TypeOf((*IncompatibleHostForFtSecondary)(nil)).Elem()
+}
+
+type IncompatibleHostForFtSecondaryFault IncompatibleHostForFtSecondary
+
+func init() {
+	t["IncompatibleHostForFtSecondaryFault"] = reflect.TypeOf((*IncompatibleHostForFtSecondaryFault)(nil)).Elem()
+}
+
+type IncompatibleHostForVmReplication struct {
+	ReplicationFault
+
+	VmName   string `xml:"vmName"`
+	HostName string `xml:"hostName"`
+	Reason   string `xml:"reason"`
+}
+
+func init() {
+	t["IncompatibleHostForVmReplication"] = reflect.TypeOf((*IncompatibleHostForVmReplication)(nil)).Elem()
+}
+
+type IncompatibleHostForVmReplicationFault IncompatibleHostForVmReplication
+
+func init() {
+	t["IncompatibleHostForVmReplicationFault"] = reflect.TypeOf((*IncompatibleHostForVmReplicationFault)(nil)).Elem()
+}
+
+type IncompatibleSetting struct {
+	InvalidArgument
+
+	ConflictingProperty string `xml:"conflictingProperty"`
+}
+
+func init() {
+	t["IncompatibleSetting"] = reflect.TypeOf((*IncompatibleSetting)(nil)).Elem()
+}
+
+type IncompatibleSettingFault IncompatibleSetting
+
+func init() {
+	t["IncompatibleSettingFault"] = reflect.TypeOf((*IncompatibleSettingFault)(nil)).Elem()
+}
+
+type IncorrectFileType struct {
+	FileFault
+}
+
+func init() {
+	t["IncorrectFileType"] = reflect.TypeOf((*IncorrectFileType)(nil)).Elem()
+}
+
+type IncorrectFileTypeFault IncorrectFileType
+
+func init() {
+	t["IncorrectFileTypeFault"] = reflect.TypeOf((*IncorrectFileTypeFault)(nil)).Elem()
+}
+
+type IncorrectHostInformation struct {
+	NotEnoughLicenses
+}
+
+func init() {
+	t["IncorrectHostInformation"] = reflect.TypeOf((*IncorrectHostInformation)(nil)).Elem()
+}
+
+type IncorrectHostInformationEvent struct {
+	LicenseEvent
+}
+
+func init() {
+	t["IncorrectHostInformationEvent"] = reflect.TypeOf((*IncorrectHostInformationEvent)(nil)).Elem()
+}
+
+type IncorrectHostInformationFault IncorrectHostInformation
+
+func init() {
+	t["IncorrectHostInformationFault"] = reflect.TypeOf((*IncorrectHostInformationFault)(nil)).Elem()
+}
+
+type IndependentDiskVMotionNotSupported struct {
+	MigrationFeatureNotSupported
+}
+
+func init() {
+	t["IndependentDiskVMotionNotSupported"] = reflect.TypeOf((*IndependentDiskVMotionNotSupported)(nil)).Elem()
+}
+
+type IndependentDiskVMotionNotSupportedFault IndependentDiskVMotionNotSupported
+
+func init() {
+	t["IndependentDiskVMotionNotSupportedFault"] = reflect.TypeOf((*IndependentDiskVMotionNotSupportedFault)(nil)).Elem()
+}
+
+type InflateDiskRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Id        ID                     `xml:"id"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["InflateDiskRequestType"] = reflect.TypeOf((*InflateDiskRequestType)(nil)).Elem()
+}
+
+type InflateDisk_Task InflateDiskRequestType
+
+func init() {
+	t["InflateDisk_Task"] = reflect.TypeOf((*InflateDisk_Task)(nil)).Elem()
+}
+
+type InflateDisk_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type InflateVirtualDiskRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Name       string                  `xml:"name"`
+	Datacenter *ManagedObjectReference `xml:"datacenter,omitempty"`
+}
+
+func init() {
+	t["InflateVirtualDiskRequestType"] = reflect.TypeOf((*InflateVirtualDiskRequestType)(nil)).Elem()
+}
+
+type InflateVirtualDisk_Task InflateVirtualDiskRequestType
+
+func init() {
+	t["InflateVirtualDisk_Task"] = reflect.TypeOf((*InflateVirtualDisk_Task)(nil)).Elem()
+}
+
+type InflateVirtualDisk_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type InfoUpgradeEvent struct {
+	UpgradeEvent
+}
+
+func init() {
+	t["InfoUpgradeEvent"] = reflect.TypeOf((*InfoUpgradeEvent)(nil)).Elem()
+}
+
+type InheritablePolicy struct {
+	DynamicData
+
+	Inherited bool `xml:"inherited"`
+}
+
+func init() {
+	t["InheritablePolicy"] = reflect.TypeOf((*InheritablePolicy)(nil)).Elem()
+}
+
+type InitializeDisksRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Mapping []VsanHostDiskMapping  `xml:"mapping"`
+}
+
+func init() {
+	t["InitializeDisksRequestType"] = reflect.TypeOf((*InitializeDisksRequestType)(nil)).Elem()
+}
+
+type InitializeDisks_Task InitializeDisksRequestType
+
+func init() {
+	t["InitializeDisks_Task"] = reflect.TypeOf((*InitializeDisks_Task)(nil)).Elem()
+}
+
+type InitializeDisks_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type InitiateFileTransferFromGuest InitiateFileTransferFromGuestRequestType
+
+func init() {
+	t["InitiateFileTransferFromGuest"] = reflect.TypeOf((*InitiateFileTransferFromGuest)(nil)).Elem()
+}
+
+type InitiateFileTransferFromGuestRequestType struct {
+	This          ManagedObjectReference  `xml:"_this"`
+	Vm            ManagedObjectReference  `xml:"vm"`
+	Auth          BaseGuestAuthentication `xml:"auth,typeattr"`
+	GuestFilePath string                  `xml:"guestFilePath"`
+}
+
+func init() {
+	t["InitiateFileTransferFromGuestRequestType"] = reflect.TypeOf((*InitiateFileTransferFromGuestRequestType)(nil)).Elem()
+}
+
+type InitiateFileTransferFromGuestResponse struct {
+	Returnval FileTransferInformation `xml:"returnval"`
+}
+
+type InitiateFileTransferToGuest InitiateFileTransferToGuestRequestType
+
+func init() {
+	t["InitiateFileTransferToGuest"] = reflect.TypeOf((*InitiateFileTransferToGuest)(nil)).Elem()
+}
+
+type InitiateFileTransferToGuestRequestType struct {
+	This           ManagedObjectReference  `xml:"_this"`
+	Vm             ManagedObjectReference  `xml:"vm"`
+	Auth           BaseGuestAuthentication `xml:"auth,typeattr"`
+	GuestFilePath  string                  `xml:"guestFilePath"`
+	FileAttributes BaseGuestFileAttributes `xml:"fileAttributes,typeattr"`
+	FileSize       int64                   `xml:"fileSize"`
+	Overwrite      bool                    `xml:"overwrite"`
+}
+
+func init() {
+	t["InitiateFileTransferToGuestRequestType"] = reflect.TypeOf((*InitiateFileTransferToGuestRequestType)(nil)).Elem()
+}
+
+type InitiateFileTransferToGuestResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type InstallHostPatchRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Repository HostPatchManagerLocator `xml:"repository"`
+	UpdateID   string                  `xml:"updateID"`
+	Force      *bool                   `xml:"force"`
+}
+
+func init() {
+	t["InstallHostPatchRequestType"] = reflect.TypeOf((*InstallHostPatchRequestType)(nil)).Elem()
+}
+
+type InstallHostPatchV2RequestType struct {
+	This       ManagedObjectReference                     `xml:"_this"`
+	MetaUrls   []string                                   `xml:"metaUrls,omitempty"`
+	BundleUrls []string                                   `xml:"bundleUrls,omitempty"`
+	VibUrls    []string                                   `xml:"vibUrls,omitempty"`
+	Spec       *HostPatchManagerPatchManagerOperationSpec `xml:"spec,omitempty"`
+}
+
+func init() {
+	t["InstallHostPatchV2RequestType"] = reflect.TypeOf((*InstallHostPatchV2RequestType)(nil)).Elem()
+}
+
+type InstallHostPatchV2_Task InstallHostPatchV2RequestType
+
+func init() {
+	t["InstallHostPatchV2_Task"] = reflect.TypeOf((*InstallHostPatchV2_Task)(nil)).Elem()
+}
+
+type InstallHostPatchV2_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type InstallHostPatch_Task InstallHostPatchRequestType
+
+func init() {
+	t["InstallHostPatch_Task"] = reflect.TypeOf((*InstallHostPatch_Task)(nil)).Elem()
+}
+
+type InstallHostPatch_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type InstallIoFilterRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	VibUrl  string                 `xml:"vibUrl"`
+	CompRes ManagedObjectReference `xml:"compRes"`
+}
+
+func init() {
+	t["InstallIoFilterRequestType"] = reflect.TypeOf((*InstallIoFilterRequestType)(nil)).Elem()
+}
+
+type InstallIoFilter_Task InstallIoFilterRequestType
+
+func init() {
+	t["InstallIoFilter_Task"] = reflect.TypeOf((*InstallIoFilter_Task)(nil)).Elem()
+}
+
+type InstallIoFilter_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type InstallServerCertificate InstallServerCertificateRequestType
+
+func init() {
+	t["InstallServerCertificate"] = reflect.TypeOf((*InstallServerCertificate)(nil)).Elem()
+}
+
+type InstallServerCertificateRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Cert string                 `xml:"cert"`
+}
+
+func init() {
+	t["InstallServerCertificateRequestType"] = reflect.TypeOf((*InstallServerCertificateRequestType)(nil)).Elem()
+}
+
+type InstallServerCertificateResponse struct {
+}
+
+type InstallSmartCardTrustAnchor InstallSmartCardTrustAnchorRequestType
+
+func init() {
+	t["InstallSmartCardTrustAnchor"] = reflect.TypeOf((*InstallSmartCardTrustAnchor)(nil)).Elem()
+}
+
+type InstallSmartCardTrustAnchorRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Cert string                 `xml:"cert"`
+}
+
+func init() {
+	t["InstallSmartCardTrustAnchorRequestType"] = reflect.TypeOf((*InstallSmartCardTrustAnchorRequestType)(nil)).Elem()
+}
+
+type InstallSmartCardTrustAnchorResponse struct {
+}
+
+type InsufficientAgentVmsDeployed struct {
+	InsufficientResourcesFault
+
+	HostName            string `xml:"hostName"`
+	RequiredNumAgentVms int32  `xml:"requiredNumAgentVms"`
+	CurrentNumAgentVms  int32  `xml:"currentNumAgentVms"`
+}
+
+func init() {
+	t["InsufficientAgentVmsDeployed"] = reflect.TypeOf((*InsufficientAgentVmsDeployed)(nil)).Elem()
+}
+
+type InsufficientAgentVmsDeployedFault InsufficientAgentVmsDeployed
+
+func init() {
+	t["InsufficientAgentVmsDeployedFault"] = reflect.TypeOf((*InsufficientAgentVmsDeployedFault)(nil)).Elem()
+}
+
+type InsufficientCpuResourcesFault struct {
+	InsufficientResourcesFault
+
+	Unreserved int64 `xml:"unreserved"`
+	Requested  int64 `xml:"requested"`
+}
+
+func init() {
+	t["InsufficientCpuResourcesFault"] = reflect.TypeOf((*InsufficientCpuResourcesFault)(nil)).Elem()
+}
+
+type InsufficientCpuResourcesFaultFault InsufficientCpuResourcesFault
+
+func init() {
+	t["InsufficientCpuResourcesFaultFault"] = reflect.TypeOf((*InsufficientCpuResourcesFaultFault)(nil)).Elem()
+}
+
+type InsufficientDisks struct {
+	VsanDiskFault
+}
+
+func init() {
+	t["InsufficientDisks"] = reflect.TypeOf((*InsufficientDisks)(nil)).Elem()
+}
+
+type InsufficientDisksFault InsufficientDisks
+
+func init() {
+	t["InsufficientDisksFault"] = reflect.TypeOf((*InsufficientDisksFault)(nil)).Elem()
+}
+
+type InsufficientFailoverResourcesEvent struct {
+	ClusterEvent
+}
+
+func init() {
+	t["InsufficientFailoverResourcesEvent"] = reflect.TypeOf((*InsufficientFailoverResourcesEvent)(nil)).Elem()
+}
+
+type InsufficientFailoverResourcesFault struct {
+	InsufficientResourcesFault
+}
+
+func init() {
+	t["InsufficientFailoverResourcesFault"] = reflect.TypeOf((*InsufficientFailoverResourcesFault)(nil)).Elem()
+}
+
+type InsufficientFailoverResourcesFaultFault InsufficientFailoverResourcesFault
+
+func init() {
+	t["InsufficientFailoverResourcesFaultFault"] = reflect.TypeOf((*InsufficientFailoverResourcesFaultFault)(nil)).Elem()
+}
+
+type InsufficientGraphicsResourcesFault struct {
+	InsufficientResourcesFault
+}
+
+func init() {
+	t["InsufficientGraphicsResourcesFault"] = reflect.TypeOf((*InsufficientGraphicsResourcesFault)(nil)).Elem()
+}
+
+type InsufficientGraphicsResourcesFaultFault InsufficientGraphicsResourcesFault
+
+func init() {
+	t["InsufficientGraphicsResourcesFaultFault"] = reflect.TypeOf((*InsufficientGraphicsResourcesFaultFault)(nil)).Elem()
+}
+
+type InsufficientHostCapacityFault struct {
+	InsufficientResourcesFault
+
+	Host *ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["InsufficientHostCapacityFault"] = reflect.TypeOf((*InsufficientHostCapacityFault)(nil)).Elem()
+}
+
+type InsufficientHostCapacityFaultFault BaseInsufficientHostCapacityFault
+
+func init() {
+	t["InsufficientHostCapacityFaultFault"] = reflect.TypeOf((*InsufficientHostCapacityFaultFault)(nil)).Elem()
+}
+
+type InsufficientHostCpuCapacityFault struct {
+	InsufficientHostCapacityFault
+
+	Unreserved int64 `xml:"unreserved"`
+	Requested  int64 `xml:"requested"`
+}
+
+func init() {
+	t["InsufficientHostCpuCapacityFault"] = reflect.TypeOf((*InsufficientHostCpuCapacityFault)(nil)).Elem()
+}
+
+type InsufficientHostCpuCapacityFaultFault InsufficientHostCpuCapacityFault
+
+func init() {
+	t["InsufficientHostCpuCapacityFaultFault"] = reflect.TypeOf((*InsufficientHostCpuCapacityFaultFault)(nil)).Elem()
+}
+
+type InsufficientHostMemoryCapacityFault struct {
+	InsufficientHostCapacityFault
+
+	Unreserved int64 `xml:"unreserved"`
+	Requested  int64 `xml:"requested"`
+}
+
+func init() {
+	t["InsufficientHostMemoryCapacityFault"] = reflect.TypeOf((*InsufficientHostMemoryCapacityFault)(nil)).Elem()
+}
+
+type InsufficientHostMemoryCapacityFaultFault InsufficientHostMemoryCapacityFault
+
+func init() {
+	t["InsufficientHostMemoryCapacityFaultFault"] = reflect.TypeOf((*InsufficientHostMemoryCapacityFaultFault)(nil)).Elem()
+}
+
+type InsufficientMemoryResourcesFault struct {
+	InsufficientResourcesFault
+
+	Unreserved int64 `xml:"unreserved"`
+	Requested  int64 `xml:"requested"`
+}
+
+func init() {
+	t["InsufficientMemoryResourcesFault"] = reflect.TypeOf((*InsufficientMemoryResourcesFault)(nil)).Elem()
+}
+
+type InsufficientMemoryResourcesFaultFault InsufficientMemoryResourcesFault
+
+func init() {
+	t["InsufficientMemoryResourcesFaultFault"] = reflect.TypeOf((*InsufficientMemoryResourcesFaultFault)(nil)).Elem()
+}
+
+type InsufficientNetworkCapacity struct {
+	InsufficientResourcesFault
+}
+
+func init() {
+	t["InsufficientNetworkCapacity"] = reflect.TypeOf((*InsufficientNetworkCapacity)(nil)).Elem()
+}
+
+type InsufficientNetworkCapacityFault InsufficientNetworkCapacity
+
+func init() {
+	t["InsufficientNetworkCapacityFault"] = reflect.TypeOf((*InsufficientNetworkCapacityFault)(nil)).Elem()
+}
+
+type InsufficientNetworkResourcePoolCapacity struct {
+	InsufficientResourcesFault
+
+	DvsName         string   `xml:"dvsName"`
+	DvsUuid         string   `xml:"dvsUuid"`
+	ResourcePoolKey string   `xml:"resourcePoolKey"`
+	Available       int64    `xml:"available"`
+	Requested       int64    `xml:"requested"`
+	Device          []string `xml:"device"`
+}
+
+func init() {
+	t["InsufficientNetworkResourcePoolCapacity"] = reflect.TypeOf((*InsufficientNetworkResourcePoolCapacity)(nil)).Elem()
+}
+
+type InsufficientNetworkResourcePoolCapacityFault InsufficientNetworkResourcePoolCapacity
+
+func init() {
+	t["InsufficientNetworkResourcePoolCapacityFault"] = reflect.TypeOf((*InsufficientNetworkResourcePoolCapacityFault)(nil)).Elem()
+}
+
+type InsufficientPerCpuCapacity struct {
+	InsufficientHostCapacityFault
+}
+
+func init() {
+	t["InsufficientPerCpuCapacity"] = reflect.TypeOf((*InsufficientPerCpuCapacity)(nil)).Elem()
+}
+
+type InsufficientPerCpuCapacityFault InsufficientPerCpuCapacity
+
+func init() {
+	t["InsufficientPerCpuCapacityFault"] = reflect.TypeOf((*InsufficientPerCpuCapacityFault)(nil)).Elem()
+}
+
+type InsufficientResourcesFault struct {
+	VimFault
+}
+
+func init() {
+	t["InsufficientResourcesFault"] = reflect.TypeOf((*InsufficientResourcesFault)(nil)).Elem()
+}
+
+type InsufficientResourcesFaultFault BaseInsufficientResourcesFault
+
+func init() {
+	t["InsufficientResourcesFaultFault"] = reflect.TypeOf((*InsufficientResourcesFaultFault)(nil)).Elem()
+}
+
+type InsufficientStandbyCpuResource struct {
+	InsufficientStandbyResource
+
+	Available int64 `xml:"available"`
+	Requested int64 `xml:"requested"`
+}
+
+func init() {
+	t["InsufficientStandbyCpuResource"] = reflect.TypeOf((*InsufficientStandbyCpuResource)(nil)).Elem()
+}
+
+type InsufficientStandbyCpuResourceFault InsufficientStandbyCpuResource
+
+func init() {
+	t["InsufficientStandbyCpuResourceFault"] = reflect.TypeOf((*InsufficientStandbyCpuResourceFault)(nil)).Elem()
+}
+
+type InsufficientStandbyMemoryResource struct {
+	InsufficientStandbyResource
+
+	Available int64 `xml:"available"`
+	Requested int64 `xml:"requested"`
+}
+
+func init() {
+	t["InsufficientStandbyMemoryResource"] = reflect.TypeOf((*InsufficientStandbyMemoryResource)(nil)).Elem()
+}
+
+type InsufficientStandbyMemoryResourceFault InsufficientStandbyMemoryResource
+
+func init() {
+	t["InsufficientStandbyMemoryResourceFault"] = reflect.TypeOf((*InsufficientStandbyMemoryResourceFault)(nil)).Elem()
+}
+
+type InsufficientStandbyResource struct {
+	InsufficientResourcesFault
+}
+
+func init() {
+	t["InsufficientStandbyResource"] = reflect.TypeOf((*InsufficientStandbyResource)(nil)).Elem()
+}
+
+type InsufficientStandbyResourceFault BaseInsufficientStandbyResource
+
+func init() {
+	t["InsufficientStandbyResourceFault"] = reflect.TypeOf((*InsufficientStandbyResourceFault)(nil)).Elem()
+}
+
+type InsufficientStorageIops struct {
+	VimFault
+
+	UnreservedIops int64  `xml:"unreservedIops"`
+	RequestedIops  int64  `xml:"requestedIops"`
+	DatastoreName  string `xml:"datastoreName"`
+}
+
+func init() {
+	t["InsufficientStorageIops"] = reflect.TypeOf((*InsufficientStorageIops)(nil)).Elem()
+}
+
+type InsufficientStorageIopsFault InsufficientStorageIops
+
+func init() {
+	t["InsufficientStorageIopsFault"] = reflect.TypeOf((*InsufficientStorageIopsFault)(nil)).Elem()
+}
+
+type InsufficientStorageSpace struct {
+	InsufficientResourcesFault
+}
+
+func init() {
+	t["InsufficientStorageSpace"] = reflect.TypeOf((*InsufficientStorageSpace)(nil)).Elem()
+}
+
+type InsufficientStorageSpaceFault InsufficientStorageSpace
+
+func init() {
+	t["InsufficientStorageSpaceFault"] = reflect.TypeOf((*InsufficientStorageSpaceFault)(nil)).Elem()
+}
+
+type InsufficientVFlashResourcesFault struct {
+	InsufficientResourcesFault
+
+	FreeSpaceInMB      int64 `xml:"freeSpaceInMB,omitempty"`
+	FreeSpace          int64 `xml:"freeSpace"`
+	RequestedSpaceInMB int64 `xml:"requestedSpaceInMB,omitempty"`
+	RequestedSpace     int64 `xml:"requestedSpace"`
+}
+
+func init() {
+	t["InsufficientVFlashResourcesFault"] = reflect.TypeOf((*InsufficientVFlashResourcesFault)(nil)).Elem()
+}
+
+type InsufficientVFlashResourcesFaultFault InsufficientVFlashResourcesFault
+
+func init() {
+	t["InsufficientVFlashResourcesFaultFault"] = reflect.TypeOf((*InsufficientVFlashResourcesFaultFault)(nil)).Elem()
+}
+
+type IntExpression struct {
+	NegatableExpression
+
+	Value int32 `xml:"value,omitempty"`
+}
+
+func init() {
+	t["IntExpression"] = reflect.TypeOf((*IntExpression)(nil)).Elem()
+}
+
+type IntOption struct {
+	OptionType
+
+	Min          int32 `xml:"min"`
+	Max          int32 `xml:"max"`
+	DefaultValue int32 `xml:"defaultValue"`
+}
+
+func init() {
+	t["IntOption"] = reflect.TypeOf((*IntOption)(nil)).Elem()
+}
+
+type IntPolicy struct {
+	InheritablePolicy
+
+	Value int32 `xml:"value,omitempty"`
+}
+
+func init() {
+	t["IntPolicy"] = reflect.TypeOf((*IntPolicy)(nil)).Elem()
+}
+
+type InvalidAffinitySettingFault struct {
+	VimFault
+}
+
+func init() {
+	t["InvalidAffinitySettingFault"] = reflect.TypeOf((*InvalidAffinitySettingFault)(nil)).Elem()
+}
+
+type InvalidAffinitySettingFaultFault InvalidAffinitySettingFault
+
+func init() {
+	t["InvalidAffinitySettingFaultFault"] = reflect.TypeOf((*InvalidAffinitySettingFaultFault)(nil)).Elem()
+}
+
+type InvalidArgument struct {
+	RuntimeFault
+
+	InvalidProperty string `xml:"invalidProperty,omitempty"`
+}
+
+func init() {
+	t["InvalidArgument"] = reflect.TypeOf((*InvalidArgument)(nil)).Elem()
+}
+
+type InvalidArgumentFault BaseInvalidArgument
+
+func init() {
+	t["InvalidArgumentFault"] = reflect.TypeOf((*InvalidArgumentFault)(nil)).Elem()
+}
+
+type InvalidBmcRole struct {
+	VimFault
+}
+
+func init() {
+	t["InvalidBmcRole"] = reflect.TypeOf((*InvalidBmcRole)(nil)).Elem()
+}
+
+type InvalidBmcRoleFault InvalidBmcRole
+
+func init() {
+	t["InvalidBmcRoleFault"] = reflect.TypeOf((*InvalidBmcRoleFault)(nil)).Elem()
+}
+
+type InvalidBundle struct {
+	PlatformConfigFault
+}
+
+func init() {
+	t["InvalidBundle"] = reflect.TypeOf((*InvalidBundle)(nil)).Elem()
+}
+
+type InvalidBundleFault InvalidBundle
+
+func init() {
+	t["InvalidBundleFault"] = reflect.TypeOf((*InvalidBundleFault)(nil)).Elem()
+}
+
+type InvalidCAMCertificate struct {
+	InvalidCAMServer
+}
+
+func init() {
+	t["InvalidCAMCertificate"] = reflect.TypeOf((*InvalidCAMCertificate)(nil)).Elem()
+}
+
+type InvalidCAMCertificateFault InvalidCAMCertificate
+
+func init() {
+	t["InvalidCAMCertificateFault"] = reflect.TypeOf((*InvalidCAMCertificateFault)(nil)).Elem()
+}
+
+type InvalidCAMServer struct {
+	ActiveDirectoryFault
+
+	CamServer string `xml:"camServer"`
+}
+
+func init() {
+	t["InvalidCAMServer"] = reflect.TypeOf((*InvalidCAMServer)(nil)).Elem()
+}
+
+type InvalidCAMServerFault BaseInvalidCAMServer
+
+func init() {
+	t["InvalidCAMServerFault"] = reflect.TypeOf((*InvalidCAMServerFault)(nil)).Elem()
+}
+
+type InvalidClientCertificate struct {
+	InvalidLogin
+}
+
+func init() {
+	t["InvalidClientCertificate"] = reflect.TypeOf((*InvalidClientCertificate)(nil)).Elem()
+}
+
+type InvalidClientCertificateFault InvalidClientCertificate
+
+func init() {
+	t["InvalidClientCertificateFault"] = reflect.TypeOf((*InvalidClientCertificateFault)(nil)).Elem()
+}
+
+type InvalidCollectorVersion struct {
+	MethodFault
+}
+
+func init() {
+	t["InvalidCollectorVersion"] = reflect.TypeOf((*InvalidCollectorVersion)(nil)).Elem()
+}
+
+type InvalidCollectorVersionFault InvalidCollectorVersion
+
+func init() {
+	t["InvalidCollectorVersionFault"] = reflect.TypeOf((*InvalidCollectorVersionFault)(nil)).Elem()
+}
+
+type InvalidController struct {
+	InvalidDeviceSpec
+
+	ControllerKey int32 `xml:"controllerKey"`
+}
+
+func init() {
+	t["InvalidController"] = reflect.TypeOf((*InvalidController)(nil)).Elem()
+}
+
+type InvalidControllerFault InvalidController
+
+func init() {
+	t["InvalidControllerFault"] = reflect.TypeOf((*InvalidControllerFault)(nil)).Elem()
+}
+
+type InvalidDasConfigArgument struct {
+	InvalidArgument
+
+	Entry       string `xml:"entry,omitempty"`
+	ClusterName string `xml:"clusterName,omitempty"`
+}
+
+func init() {
+	t["InvalidDasConfigArgument"] = reflect.TypeOf((*InvalidDasConfigArgument)(nil)).Elem()
+}
+
+type InvalidDasConfigArgumentFault InvalidDasConfigArgument
+
+func init() {
+	t["InvalidDasConfigArgumentFault"] = reflect.TypeOf((*InvalidDasConfigArgumentFault)(nil)).Elem()
+}
+
+type InvalidDasRestartPriorityForFtVm struct {
+	InvalidArgument
+
+	Vm     ManagedObjectReference `xml:"vm"`
+	VmName string                 `xml:"vmName"`
+}
+
+func init() {
+	t["InvalidDasRestartPriorityForFtVm"] = reflect.TypeOf((*InvalidDasRestartPriorityForFtVm)(nil)).Elem()
+}
+
+type InvalidDasRestartPriorityForFtVmFault InvalidDasRestartPriorityForFtVm
+
+func init() {
+	t["InvalidDasRestartPriorityForFtVmFault"] = reflect.TypeOf((*InvalidDasRestartPriorityForFtVmFault)(nil)).Elem()
+}
+
+type InvalidDatastore struct {
+	VimFault
+
+	Datastore *ManagedObjectReference `xml:"datastore,omitempty"`
+	Name      string                  `xml:"name,omitempty"`
+}
+
+func init() {
+	t["InvalidDatastore"] = reflect.TypeOf((*InvalidDatastore)(nil)).Elem()
+}
+
+type InvalidDatastoreFault BaseInvalidDatastore
+
+func init() {
+	t["InvalidDatastoreFault"] = reflect.TypeOf((*InvalidDatastoreFault)(nil)).Elem()
+}
+
+type InvalidDatastorePath struct {
+	InvalidDatastore
+
+	DatastorePath string `xml:"datastorePath"`
+}
+
+func init() {
+	t["InvalidDatastorePath"] = reflect.TypeOf((*InvalidDatastorePath)(nil)).Elem()
+}
+
+type InvalidDatastorePathFault InvalidDatastorePath
+
+func init() {
+	t["InvalidDatastorePathFault"] = reflect.TypeOf((*InvalidDatastorePathFault)(nil)).Elem()
+}
+
+type InvalidDatastoreState struct {
+	InvalidState
+
+	DatastoreName string `xml:"datastoreName,omitempty"`
+}
+
+func init() {
+	t["InvalidDatastoreState"] = reflect.TypeOf((*InvalidDatastoreState)(nil)).Elem()
+}
+
+type InvalidDatastoreStateFault InvalidDatastoreState
+
+func init() {
+	t["InvalidDatastoreStateFault"] = reflect.TypeOf((*InvalidDatastoreStateFault)(nil)).Elem()
+}
+
+type InvalidDeviceBacking struct {
+	InvalidDeviceSpec
+}
+
+func init() {
+	t["InvalidDeviceBacking"] = reflect.TypeOf((*InvalidDeviceBacking)(nil)).Elem()
+}
+
+type InvalidDeviceBackingFault InvalidDeviceBacking
+
+func init() {
+	t["InvalidDeviceBackingFault"] = reflect.TypeOf((*InvalidDeviceBackingFault)(nil)).Elem()
+}
+
+type InvalidDeviceOperation struct {
+	InvalidDeviceSpec
+
+	BadOp     VirtualDeviceConfigSpecOperation     `xml:"badOp,omitempty"`
+	BadFileOp VirtualDeviceConfigSpecFileOperation `xml:"badFileOp,omitempty"`
+}
+
+func init() {
+	t["InvalidDeviceOperation"] = reflect.TypeOf((*InvalidDeviceOperation)(nil)).Elem()
+}
+
+type InvalidDeviceOperationFault InvalidDeviceOperation
+
+func init() {
+	t["InvalidDeviceOperationFault"] = reflect.TypeOf((*InvalidDeviceOperationFault)(nil)).Elem()
+}
+
+type InvalidDeviceSpec struct {
+	InvalidVmConfig
+
+	DeviceIndex int32 `xml:"deviceIndex"`
+}
+
+func init() {
+	t["InvalidDeviceSpec"] = reflect.TypeOf((*InvalidDeviceSpec)(nil)).Elem()
+}
+
+type InvalidDeviceSpecFault BaseInvalidDeviceSpec
+
+func init() {
+	t["InvalidDeviceSpecFault"] = reflect.TypeOf((*InvalidDeviceSpecFault)(nil)).Elem()
+}
+
+type InvalidDiskFormat struct {
+	InvalidFormat
+}
+
+func init() {
+	t["InvalidDiskFormat"] = reflect.TypeOf((*InvalidDiskFormat)(nil)).Elem()
+}
+
+type InvalidDiskFormatFault InvalidDiskFormat
+
+func init() {
+	t["InvalidDiskFormatFault"] = reflect.TypeOf((*InvalidDiskFormatFault)(nil)).Elem()
+}
+
+type InvalidDrsBehaviorForFtVm struct {
+	InvalidArgument
+
+	Vm     ManagedObjectReference `xml:"vm"`
+	VmName string                 `xml:"vmName"`
+}
+
+func init() {
+	t["InvalidDrsBehaviorForFtVm"] = reflect.TypeOf((*InvalidDrsBehaviorForFtVm)(nil)).Elem()
+}
+
+type InvalidDrsBehaviorForFtVmFault InvalidDrsBehaviorForFtVm
+
+func init() {
+	t["InvalidDrsBehaviorForFtVmFault"] = reflect.TypeOf((*InvalidDrsBehaviorForFtVmFault)(nil)).Elem()
+}
+
+type InvalidEditionEvent struct {
+	LicenseEvent
+
+	Feature string `xml:"feature"`
+}
+
+func init() {
+	t["InvalidEditionEvent"] = reflect.TypeOf((*InvalidEditionEvent)(nil)).Elem()
+}
+
+type InvalidEditionLicense struct {
+	NotEnoughLicenses
+
+	Feature string `xml:"feature"`
+}
+
+func init() {
+	t["InvalidEditionLicense"] = reflect.TypeOf((*InvalidEditionLicense)(nil)).Elem()
+}
+
+type InvalidEditionLicenseFault InvalidEditionLicense
+
+func init() {
+	t["InvalidEditionLicenseFault"] = reflect.TypeOf((*InvalidEditionLicenseFault)(nil)).Elem()
+}
+
+type InvalidEvent struct {
+	VimFault
+}
+
+func init() {
+	t["InvalidEvent"] = reflect.TypeOf((*InvalidEvent)(nil)).Elem()
+}
+
+type InvalidEventFault InvalidEvent
+
+func init() {
+	t["InvalidEventFault"] = reflect.TypeOf((*InvalidEventFault)(nil)).Elem()
+}
+
+type InvalidFolder struct {
+	VimFault
+
+	Target ManagedObjectReference `xml:"target"`
+}
+
+func init() {
+	t["InvalidFolder"] = reflect.TypeOf((*InvalidFolder)(nil)).Elem()
+}
+
+type InvalidFolderFault BaseInvalidFolder
+
+func init() {
+	t["InvalidFolderFault"] = reflect.TypeOf((*InvalidFolderFault)(nil)).Elem()
+}
+
+type InvalidFormat struct {
+	VmConfigFault
+}
+
+func init() {
+	t["InvalidFormat"] = reflect.TypeOf((*InvalidFormat)(nil)).Elem()
+}
+
+type InvalidFormatFault BaseInvalidFormat
+
+func init() {
+	t["InvalidFormatFault"] = reflect.TypeOf((*InvalidFormatFault)(nil)).Elem()
+}
+
+type InvalidGuestLogin struct {
+	GuestOperationsFault
+}
+
+func init() {
+	t["InvalidGuestLogin"] = reflect.TypeOf((*InvalidGuestLogin)(nil)).Elem()
+}
+
+type InvalidGuestLoginFault InvalidGuestLogin
+
+func init() {
+	t["InvalidGuestLoginFault"] = reflect.TypeOf((*InvalidGuestLoginFault)(nil)).Elem()
+}
+
+type InvalidHostConnectionState struct {
+	InvalidHostState
+}
+
+func init() {
+	t["InvalidHostConnectionState"] = reflect.TypeOf((*InvalidHostConnectionState)(nil)).Elem()
+}
+
+type InvalidHostConnectionStateFault InvalidHostConnectionState
+
+func init() {
+	t["InvalidHostConnectionStateFault"] = reflect.TypeOf((*InvalidHostConnectionStateFault)(nil)).Elem()
+}
+
+type InvalidHostName struct {
+	HostConfigFault
+}
+
+func init() {
+	t["InvalidHostName"] = reflect.TypeOf((*InvalidHostName)(nil)).Elem()
+}
+
+type InvalidHostNameFault InvalidHostName
+
+func init() {
+	t["InvalidHostNameFault"] = reflect.TypeOf((*InvalidHostNameFault)(nil)).Elem()
+}
+
+type InvalidHostState struct {
+	InvalidState
+
+	Host *ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["InvalidHostState"] = reflect.TypeOf((*InvalidHostState)(nil)).Elem()
+}
+
+type InvalidHostStateFault BaseInvalidHostState
+
+func init() {
+	t["InvalidHostStateFault"] = reflect.TypeOf((*InvalidHostStateFault)(nil)).Elem()
+}
+
+type InvalidIndexArgument struct {
+	InvalidArgument
+
+	Key string `xml:"key"`
+}
+
+func init() {
+	t["InvalidIndexArgument"] = reflect.TypeOf((*InvalidIndexArgument)(nil)).Elem()
+}
+
+type InvalidIndexArgumentFault InvalidIndexArgument
+
+func init() {
+	t["InvalidIndexArgumentFault"] = reflect.TypeOf((*InvalidIndexArgumentFault)(nil)).Elem()
+}
+
+type InvalidIpfixConfig struct {
+	DvsFault
+
+	Property string `xml:"property,omitempty"`
+}
+
+func init() {
+	t["InvalidIpfixConfig"] = reflect.TypeOf((*InvalidIpfixConfig)(nil)).Elem()
+}
+
+type InvalidIpfixConfigFault InvalidIpfixConfig
+
+func init() {
+	t["InvalidIpfixConfigFault"] = reflect.TypeOf((*InvalidIpfixConfigFault)(nil)).Elem()
+}
+
+type InvalidIpmiLoginInfo struct {
+	VimFault
+}
+
+func init() {
+	t["InvalidIpmiLoginInfo"] = reflect.TypeOf((*InvalidIpmiLoginInfo)(nil)).Elem()
+}
+
+type InvalidIpmiLoginInfoFault InvalidIpmiLoginInfo
+
+func init() {
+	t["InvalidIpmiLoginInfoFault"] = reflect.TypeOf((*InvalidIpmiLoginInfoFault)(nil)).Elem()
+}
+
+type InvalidIpmiMacAddress struct {
+	VimFault
+
+	UserProvidedMacAddress string `xml:"userProvidedMacAddress"`
+	ObservedMacAddress     string `xml:"observedMacAddress"`
+}
+
+func init() {
+	t["InvalidIpmiMacAddress"] = reflect.TypeOf((*InvalidIpmiMacAddress)(nil)).Elem()
+}
+
+type InvalidIpmiMacAddressFault InvalidIpmiMacAddress
+
+func init() {
+	t["InvalidIpmiMacAddressFault"] = reflect.TypeOf((*InvalidIpmiMacAddressFault)(nil)).Elem()
+}
+
+type InvalidLicense struct {
+	VimFault
+
+	LicenseContent string `xml:"licenseContent"`
+}
+
+func init() {
+	t["InvalidLicense"] = reflect.TypeOf((*InvalidLicense)(nil)).Elem()
+}
+
+type InvalidLicenseFault InvalidLicense
+
+func init() {
+	t["InvalidLicenseFault"] = reflect.TypeOf((*InvalidLicenseFault)(nil)).Elem()
+}
+
+type InvalidLocale struct {
+	VimFault
+}
+
+func init() {
+	t["InvalidLocale"] = reflect.TypeOf((*InvalidLocale)(nil)).Elem()
+}
+
+type InvalidLocaleFault InvalidLocale
+
+func init() {
+	t["InvalidLocaleFault"] = reflect.TypeOf((*InvalidLocaleFault)(nil)).Elem()
+}
+
+type InvalidLogin struct {
+	VimFault
+}
+
+func init() {
+	t["InvalidLogin"] = reflect.TypeOf((*InvalidLogin)(nil)).Elem()
+}
+
+type InvalidLoginFault BaseInvalidLogin
+
+func init() {
+	t["InvalidLoginFault"] = reflect.TypeOf((*InvalidLoginFault)(nil)).Elem()
+}
+
+type InvalidName struct {
+	VimFault
+
+	Name   string                  `xml:"name"`
+	Entity *ManagedObjectReference `xml:"entity,omitempty"`
+}
+
+func init() {
+	t["InvalidName"] = reflect.TypeOf((*InvalidName)(nil)).Elem()
+}
+
+type InvalidNameFault InvalidName
+
+func init() {
+	t["InvalidNameFault"] = reflect.TypeOf((*InvalidNameFault)(nil)).Elem()
+}
+
+type InvalidNasCredentials struct {
+	NasConfigFault
+
+	UserName string `xml:"userName"`
+}
+
+func init() {
+	t["InvalidNasCredentials"] = reflect.TypeOf((*InvalidNasCredentials)(nil)).Elem()
+}
+
+type InvalidNasCredentialsFault InvalidNasCredentials
+
+func init() {
+	t["InvalidNasCredentialsFault"] = reflect.TypeOf((*InvalidNasCredentialsFault)(nil)).Elem()
+}
+
+type InvalidNetworkInType struct {
+	VAppPropertyFault
+}
+
+func init() {
+	t["InvalidNetworkInType"] = reflect.TypeOf((*InvalidNetworkInType)(nil)).Elem()
+}
+
+type InvalidNetworkInTypeFault InvalidNetworkInType
+
+func init() {
+	t["InvalidNetworkInTypeFault"] = reflect.TypeOf((*InvalidNetworkInTypeFault)(nil)).Elem()
+}
+
+type InvalidNetworkResource struct {
+	NasConfigFault
+
+	RemoteHost string `xml:"remoteHost"`
+	RemotePath string `xml:"remotePath"`
+}
+
+func init() {
+	t["InvalidNetworkResource"] = reflect.TypeOf((*InvalidNetworkResource)(nil)).Elem()
+}
+
+type InvalidNetworkResourceFault InvalidNetworkResource
+
+func init() {
+	t["InvalidNetworkResourceFault"] = reflect.TypeOf((*InvalidNetworkResourceFault)(nil)).Elem()
+}
+
+type InvalidOperationOnSecondaryVm struct {
+	VmFaultToleranceIssue
+
+	InstanceUuid string `xml:"instanceUuid,omitempty"`
+}
+
+func init() {
+	t["InvalidOperationOnSecondaryVm"] = reflect.TypeOf((*InvalidOperationOnSecondaryVm)(nil)).Elem()
+}
+
+type InvalidOperationOnSecondaryVmFault InvalidOperationOnSecondaryVm
+
+func init() {
+	t["InvalidOperationOnSecondaryVmFault"] = reflect.TypeOf((*InvalidOperationOnSecondaryVmFault)(nil)).Elem()
+}
+
+type InvalidPowerState struct {
+	InvalidState
+
+	RequestedState VirtualMachinePowerState `xml:"requestedState,omitempty"`
+	ExistingState  VirtualMachinePowerState `xml:"existingState"`
+}
+
+func init() {
+	t["InvalidPowerState"] = reflect.TypeOf((*InvalidPowerState)(nil)).Elem()
+}
+
+type InvalidPowerStateFault InvalidPowerState
+
+func init() {
+	t["InvalidPowerStateFault"] = reflect.TypeOf((*InvalidPowerStateFault)(nil)).Elem()
+}
+
+type InvalidPrivilege struct {
+	VimFault
+
+	Privilege string `xml:"privilege"`
+}
+
+func init() {
+	t["InvalidPrivilege"] = reflect.TypeOf((*InvalidPrivilege)(nil)).Elem()
+}
+
+type InvalidPrivilegeFault InvalidPrivilege
+
+func init() {
+	t["InvalidPrivilegeFault"] = reflect.TypeOf((*InvalidPrivilegeFault)(nil)).Elem()
+}
+
+type InvalidProfileReferenceHost struct {
+	RuntimeFault
+
+	Reason      string                  `xml:"reason,omitempty"`
+	Host        *ManagedObjectReference `xml:"host,omitempty"`
+	Profile     *ManagedObjectReference `xml:"profile,omitempty"`
+	ProfileName string                  `xml:"profileName,omitempty"`
+}
+
+func init() {
+	t["InvalidProfileReferenceHost"] = reflect.TypeOf((*InvalidProfileReferenceHost)(nil)).Elem()
+}
+
+type InvalidProfileReferenceHostFault InvalidProfileReferenceHost
+
+func init() {
+	t["InvalidProfileReferenceHostFault"] = reflect.TypeOf((*InvalidProfileReferenceHostFault)(nil)).Elem()
+}
+
+type InvalidProperty struct {
+	MethodFault
+
+	Name string `xml:"name"`
+}
+
+func init() {
+	t["InvalidProperty"] = reflect.TypeOf((*InvalidProperty)(nil)).Elem()
+}
+
+type InvalidPropertyFault InvalidProperty
+
+func init() {
+	t["InvalidPropertyFault"] = reflect.TypeOf((*InvalidPropertyFault)(nil)).Elem()
+}
+
+type InvalidPropertyType struct {
+	VAppPropertyFault
+}
+
+func init() {
+	t["InvalidPropertyType"] = reflect.TypeOf((*InvalidPropertyType)(nil)).Elem()
+}
+
+type InvalidPropertyTypeFault InvalidPropertyType
+
+func init() {
+	t["InvalidPropertyTypeFault"] = reflect.TypeOf((*InvalidPropertyTypeFault)(nil)).Elem()
+}
+
+type InvalidPropertyValue struct {
+	VAppPropertyFault
+}
+
+func init() {
+	t["InvalidPropertyValue"] = reflect.TypeOf((*InvalidPropertyValue)(nil)).Elem()
+}
+
+type InvalidPropertyValueFault BaseInvalidPropertyValue
+
+func init() {
+	t["InvalidPropertyValueFault"] = reflect.TypeOf((*InvalidPropertyValueFault)(nil)).Elem()
+}
+
+type InvalidRequest struct {
+	RuntimeFault
+}
+
+func init() {
+	t["InvalidRequest"] = reflect.TypeOf((*InvalidRequest)(nil)).Elem()
+}
+
+type InvalidRequestFault BaseInvalidRequest
+
+func init() {
+	t["InvalidRequestFault"] = reflect.TypeOf((*InvalidRequestFault)(nil)).Elem()
+}
+
+type InvalidResourcePoolStructureFault struct {
+	InsufficientResourcesFault
+}
+
+func init() {
+	t["InvalidResourcePoolStructureFault"] = reflect.TypeOf((*InvalidResourcePoolStructureFault)(nil)).Elem()
+}
+
+type InvalidResourcePoolStructureFaultFault InvalidResourcePoolStructureFault
+
+func init() {
+	t["InvalidResourcePoolStructureFaultFault"] = reflect.TypeOf((*InvalidResourcePoolStructureFaultFault)(nil)).Elem()
+}
+
+type InvalidSnapshotFormat struct {
+	InvalidFormat
+}
+
+func init() {
+	t["InvalidSnapshotFormat"] = reflect.TypeOf((*InvalidSnapshotFormat)(nil)).Elem()
+}
+
+type InvalidSnapshotFormatFault InvalidSnapshotFormat
+
+func init() {
+	t["InvalidSnapshotFormatFault"] = reflect.TypeOf((*InvalidSnapshotFormatFault)(nil)).Elem()
+}
+
+type InvalidState struct {
+	VimFault
+}
+
+func init() {
+	t["InvalidState"] = reflect.TypeOf((*InvalidState)(nil)).Elem()
+}
+
+type InvalidStateFault BaseInvalidState
+
+func init() {
+	t["InvalidStateFault"] = reflect.TypeOf((*InvalidStateFault)(nil)).Elem()
+}
+
+type InvalidType struct {
+	InvalidRequest
+
+	Argument string `xml:"argument,omitempty"`
+}
+
+func init() {
+	t["InvalidType"] = reflect.TypeOf((*InvalidType)(nil)).Elem()
+}
+
+type InvalidTypeFault InvalidType
+
+func init() {
+	t["InvalidTypeFault"] = reflect.TypeOf((*InvalidTypeFault)(nil)).Elem()
+}
+
+type InvalidVmConfig struct {
+	VmConfigFault
+
+	Property string `xml:"property,omitempty"`
+}
+
+func init() {
+	t["InvalidVmConfig"] = reflect.TypeOf((*InvalidVmConfig)(nil)).Elem()
+}
+
+type InvalidVmConfigFault BaseInvalidVmConfig
+
+func init() {
+	t["InvalidVmConfigFault"] = reflect.TypeOf((*InvalidVmConfigFault)(nil)).Elem()
+}
+
+type InvalidVmState struct {
+	InvalidState
+
+	Vm ManagedObjectReference `xml:"vm"`
+}
+
+func init() {
+	t["InvalidVmState"] = reflect.TypeOf((*InvalidVmState)(nil)).Elem()
+}
+
+type InvalidVmStateFault InvalidVmState
+
+func init() {
+	t["InvalidVmStateFault"] = reflect.TypeOf((*InvalidVmStateFault)(nil)).Elem()
+}
+
+type InventoryDescription struct {
+	DynamicData
+
+	NumHosts           int32 `xml:"numHosts"`
+	NumVirtualMachines int32 `xml:"numVirtualMachines"`
+	NumResourcePools   int32 `xml:"numResourcePools,omitempty"`
+	NumClusters        int32 `xml:"numClusters,omitempty"`
+	NumCpuDev          int32 `xml:"numCpuDev,omitempty"`
+	NumNetDev          int32 `xml:"numNetDev,omitempty"`
+	NumDiskDev         int32 `xml:"numDiskDev,omitempty"`
+	NumvCpuDev         int32 `xml:"numvCpuDev,omitempty"`
+	NumvNetDev         int32 `xml:"numvNetDev,omitempty"`
+	NumvDiskDev        int32 `xml:"numvDiskDev,omitempty"`
+}
+
+func init() {
+	t["InventoryDescription"] = reflect.TypeOf((*InventoryDescription)(nil)).Elem()
+}
+
+type InventoryHasStandardAloneHosts struct {
+	NotEnoughLicenses
+
+	Hosts []string `xml:"hosts"`
+}
+
+func init() {
+	t["InventoryHasStandardAloneHosts"] = reflect.TypeOf((*InventoryHasStandardAloneHosts)(nil)).Elem()
+}
+
+type InventoryHasStandardAloneHostsFault InventoryHasStandardAloneHosts
+
+func init() {
+	t["InventoryHasStandardAloneHostsFault"] = reflect.TypeOf((*InventoryHasStandardAloneHostsFault)(nil)).Elem()
+}
+
+type IoFilterHostIssue struct {
+	DynamicData
+
+	Host  ManagedObjectReference `xml:"host"`
+	Issue []LocalizedMethodFault `xml:"issue"`
+}
+
+func init() {
+	t["IoFilterHostIssue"] = reflect.TypeOf((*IoFilterHostIssue)(nil)).Elem()
+}
+
+type IoFilterInfo struct {
+	DynamicData
+
+	Id          string `xml:"id"`
+	Name        string `xml:"name"`
+	Vendor      string `xml:"vendor"`
+	Version     string `xml:"version"`
+	Type        string `xml:"type,omitempty"`
+	Summary     string `xml:"summary,omitempty"`
+	ReleaseDate string `xml:"releaseDate,omitempty"`
+}
+
+func init() {
+	t["IoFilterInfo"] = reflect.TypeOf((*IoFilterInfo)(nil)).Elem()
+}
+
+type IoFilterQueryIssueResult struct {
+	DynamicData
+
+	OpType    string              `xml:"opType"`
+	HostIssue []IoFilterHostIssue `xml:"hostIssue,omitempty"`
+}
+
+func init() {
+	t["IoFilterQueryIssueResult"] = reflect.TypeOf((*IoFilterQueryIssueResult)(nil)).Elem()
+}
+
+type IpAddress struct {
+	NegatableExpression
+}
+
+func init() {
+	t["IpAddress"] = reflect.TypeOf((*IpAddress)(nil)).Elem()
+}
+
+type IpAddressProfile struct {
+	ApplyProfile
+}
+
+func init() {
+	t["IpAddressProfile"] = reflect.TypeOf((*IpAddressProfile)(nil)).Elem()
+}
+
+type IpHostnameGeneratorError struct {
+	CustomizationFault
+}
+
+func init() {
+	t["IpHostnameGeneratorError"] = reflect.TypeOf((*IpHostnameGeneratorError)(nil)).Elem()
+}
+
+type IpHostnameGeneratorErrorFault IpHostnameGeneratorError
+
+func init() {
+	t["IpHostnameGeneratorErrorFault"] = reflect.TypeOf((*IpHostnameGeneratorErrorFault)(nil)).Elem()
+}
+
+type IpPool struct {
+	DynamicData
+
+	Id                     int32                   `xml:"id,omitempty"`
+	Name                   string                  `xml:"name,omitempty"`
+	Ipv4Config             *IpPoolIpPoolConfigInfo `xml:"ipv4Config,omitempty"`
+	Ipv6Config             *IpPoolIpPoolConfigInfo `xml:"ipv6Config,omitempty"`
+	DnsDomain              string                  `xml:"dnsDomain,omitempty"`
+	DnsSearchPath          string                  `xml:"dnsSearchPath,omitempty"`
+	HostPrefix             string                  `xml:"hostPrefix,omitempty"`
+	HttpProxy              string                  `xml:"httpProxy,omitempty"`
+	NetworkAssociation     []IpPoolAssociation     `xml:"networkAssociation,omitempty"`
+	AvailableIpv4Addresses int32                   `xml:"availableIpv4Addresses,omitempty"`
+	AvailableIpv6Addresses int32                   `xml:"availableIpv6Addresses,omitempty"`
+	AllocatedIpv4Addresses int32                   `xml:"allocatedIpv4Addresses,omitempty"`
+	AllocatedIpv6Addresses int32                   `xml:"allocatedIpv6Addresses,omitempty"`
+}
+
+func init() {
+	t["IpPool"] = reflect.TypeOf((*IpPool)(nil)).Elem()
+}
+
+type IpPoolAssociation struct {
+	DynamicData
+
+	Network     *ManagedObjectReference `xml:"network,omitempty"`
+	NetworkName string                  `xml:"networkName"`
+}
+
+func init() {
+	t["IpPoolAssociation"] = reflect.TypeOf((*IpPoolAssociation)(nil)).Elem()
+}
+
+type IpPoolIpPoolConfigInfo struct {
+	DynamicData
+
+	SubnetAddress       string   `xml:"subnetAddress,omitempty"`
+	Netmask             string   `xml:"netmask,omitempty"`
+	Gateway             string   `xml:"gateway,omitempty"`
+	Range               string   `xml:"range,omitempty"`
+	Dns                 []string `xml:"dns,omitempty"`
+	DhcpServerAvailable *bool    `xml:"dhcpServerAvailable"`
+	IpPoolEnabled       *bool    `xml:"ipPoolEnabled"`
+}
+
+func init() {
+	t["IpPoolIpPoolConfigInfo"] = reflect.TypeOf((*IpPoolIpPoolConfigInfo)(nil)).Elem()
+}
+
+type IpPoolManagerIpAllocation struct {
+	DynamicData
+
+	IpAddress    string `xml:"ipAddress"`
+	AllocationId string `xml:"allocationId"`
+}
+
+func init() {
+	t["IpPoolManagerIpAllocation"] = reflect.TypeOf((*IpPoolManagerIpAllocation)(nil)).Elem()
+}
+
+type IpRange struct {
+	IpAddress
+
+	AddressPrefix string `xml:"addressPrefix"`
+	PrefixLength  int32  `xml:"prefixLength,omitempty"`
+}
+
+func init() {
+	t["IpRange"] = reflect.TypeOf((*IpRange)(nil)).Elem()
+}
+
+type IpRouteProfile struct {
+	ApplyProfile
+
+	StaticRoute []StaticRouteProfile `xml:"staticRoute,omitempty"`
+}
+
+func init() {
+	t["IpRouteProfile"] = reflect.TypeOf((*IpRouteProfile)(nil)).Elem()
+}
+
+type IsSharedGraphicsActive IsSharedGraphicsActiveRequestType
+
+func init() {
+	t["IsSharedGraphicsActive"] = reflect.TypeOf((*IsSharedGraphicsActive)(nil)).Elem()
+}
+
+type IsSharedGraphicsActiveRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["IsSharedGraphicsActiveRequestType"] = reflect.TypeOf((*IsSharedGraphicsActiveRequestType)(nil)).Elem()
+}
+
+type IsSharedGraphicsActiveResponse struct {
+	Returnval bool `xml:"returnval"`
+}
+
+type IscsiDependencyEntity struct {
+	DynamicData
+
+	PnicDevice string `xml:"pnicDevice"`
+	VnicDevice string `xml:"vnicDevice"`
+	VmhbaName  string `xml:"vmhbaName"`
+}
+
+func init() {
+	t["IscsiDependencyEntity"] = reflect.TypeOf((*IscsiDependencyEntity)(nil)).Elem()
+}
+
+type IscsiFault struct {
+	VimFault
+}
+
+func init() {
+	t["IscsiFault"] = reflect.TypeOf((*IscsiFault)(nil)).Elem()
+}
+
+type IscsiFaultFault BaseIscsiFault
+
+func init() {
+	t["IscsiFaultFault"] = reflect.TypeOf((*IscsiFaultFault)(nil)).Elem()
+}
+
+type IscsiFaultInvalidVnic struct {
+	IscsiFault
+
+	VnicDevice string `xml:"vnicDevice"`
+}
+
+func init() {
+	t["IscsiFaultInvalidVnic"] = reflect.TypeOf((*IscsiFaultInvalidVnic)(nil)).Elem()
+}
+
+type IscsiFaultInvalidVnicFault IscsiFaultInvalidVnic
+
+func init() {
+	t["IscsiFaultInvalidVnicFault"] = reflect.TypeOf((*IscsiFaultInvalidVnicFault)(nil)).Elem()
+}
+
+type IscsiFaultPnicInUse struct {
+	IscsiFault
+
+	PnicDevice string `xml:"pnicDevice"`
+}
+
+func init() {
+	t["IscsiFaultPnicInUse"] = reflect.TypeOf((*IscsiFaultPnicInUse)(nil)).Elem()
+}
+
+type IscsiFaultPnicInUseFault IscsiFaultPnicInUse
+
+func init() {
+	t["IscsiFaultPnicInUseFault"] = reflect.TypeOf((*IscsiFaultPnicInUseFault)(nil)).Elem()
+}
+
+type IscsiFaultVnicAlreadyBound struct {
+	IscsiFault
+
+	VnicDevice string `xml:"vnicDevice"`
+}
+
+func init() {
+	t["IscsiFaultVnicAlreadyBound"] = reflect.TypeOf((*IscsiFaultVnicAlreadyBound)(nil)).Elem()
+}
+
+type IscsiFaultVnicAlreadyBoundFault IscsiFaultVnicAlreadyBound
+
+func init() {
+	t["IscsiFaultVnicAlreadyBoundFault"] = reflect.TypeOf((*IscsiFaultVnicAlreadyBoundFault)(nil)).Elem()
+}
+
+type IscsiFaultVnicHasActivePaths struct {
+	IscsiFault
+
+	VnicDevice string `xml:"vnicDevice"`
+}
+
+func init() {
+	t["IscsiFaultVnicHasActivePaths"] = reflect.TypeOf((*IscsiFaultVnicHasActivePaths)(nil)).Elem()
+}
+
+type IscsiFaultVnicHasActivePathsFault IscsiFaultVnicHasActivePaths
+
+func init() {
+	t["IscsiFaultVnicHasActivePathsFault"] = reflect.TypeOf((*IscsiFaultVnicHasActivePathsFault)(nil)).Elem()
+}
+
+type IscsiFaultVnicHasMultipleUplinks struct {
+	IscsiFault
+
+	VnicDevice string `xml:"vnicDevice"`
+}
+
+func init() {
+	t["IscsiFaultVnicHasMultipleUplinks"] = reflect.TypeOf((*IscsiFaultVnicHasMultipleUplinks)(nil)).Elem()
+}
+
+type IscsiFaultVnicHasMultipleUplinksFault IscsiFaultVnicHasMultipleUplinks
+
+func init() {
+	t["IscsiFaultVnicHasMultipleUplinksFault"] = reflect.TypeOf((*IscsiFaultVnicHasMultipleUplinksFault)(nil)).Elem()
+}
+
+type IscsiFaultVnicHasNoUplinks struct {
+	IscsiFault
+
+	VnicDevice string `xml:"vnicDevice"`
+}
+
+func init() {
+	t["IscsiFaultVnicHasNoUplinks"] = reflect.TypeOf((*IscsiFaultVnicHasNoUplinks)(nil)).Elem()
+}
+
+type IscsiFaultVnicHasNoUplinksFault IscsiFaultVnicHasNoUplinks
+
+func init() {
+	t["IscsiFaultVnicHasNoUplinksFault"] = reflect.TypeOf((*IscsiFaultVnicHasNoUplinksFault)(nil)).Elem()
+}
+
+type IscsiFaultVnicHasWrongUplink struct {
+	IscsiFault
+
+	VnicDevice string `xml:"vnicDevice"`
+}
+
+func init() {
+	t["IscsiFaultVnicHasWrongUplink"] = reflect.TypeOf((*IscsiFaultVnicHasWrongUplink)(nil)).Elem()
+}
+
+type IscsiFaultVnicHasWrongUplinkFault IscsiFaultVnicHasWrongUplink
+
+func init() {
+	t["IscsiFaultVnicHasWrongUplinkFault"] = reflect.TypeOf((*IscsiFaultVnicHasWrongUplinkFault)(nil)).Elem()
+}
+
+type IscsiFaultVnicInUse struct {
+	IscsiFault
+
+	VnicDevice string `xml:"vnicDevice"`
+}
+
+func init() {
+	t["IscsiFaultVnicInUse"] = reflect.TypeOf((*IscsiFaultVnicInUse)(nil)).Elem()
+}
+
+type IscsiFaultVnicInUseFault IscsiFaultVnicInUse
+
+func init() {
+	t["IscsiFaultVnicInUseFault"] = reflect.TypeOf((*IscsiFaultVnicInUseFault)(nil)).Elem()
+}
+
+type IscsiFaultVnicIsLastPath struct {
+	IscsiFault
+
+	VnicDevice string `xml:"vnicDevice"`
+}
+
+func init() {
+	t["IscsiFaultVnicIsLastPath"] = reflect.TypeOf((*IscsiFaultVnicIsLastPath)(nil)).Elem()
+}
+
+type IscsiFaultVnicIsLastPathFault IscsiFaultVnicIsLastPath
+
+func init() {
+	t["IscsiFaultVnicIsLastPathFault"] = reflect.TypeOf((*IscsiFaultVnicIsLastPathFault)(nil)).Elem()
+}
+
+type IscsiFaultVnicNotBound struct {
+	IscsiFault
+
+	VnicDevice string `xml:"vnicDevice"`
+}
+
+func init() {
+	t["IscsiFaultVnicNotBound"] = reflect.TypeOf((*IscsiFaultVnicNotBound)(nil)).Elem()
+}
+
+type IscsiFaultVnicNotBoundFault IscsiFaultVnicNotBound
+
+func init() {
+	t["IscsiFaultVnicNotBoundFault"] = reflect.TypeOf((*IscsiFaultVnicNotBoundFault)(nil)).Elem()
+}
+
+type IscsiFaultVnicNotFound struct {
+	IscsiFault
+
+	VnicDevice string `xml:"vnicDevice"`
+}
+
+func init() {
+	t["IscsiFaultVnicNotFound"] = reflect.TypeOf((*IscsiFaultVnicNotFound)(nil)).Elem()
+}
+
+type IscsiFaultVnicNotFoundFault IscsiFaultVnicNotFound
+
+func init() {
+	t["IscsiFaultVnicNotFoundFault"] = reflect.TypeOf((*IscsiFaultVnicNotFoundFault)(nil)).Elem()
+}
+
+type IscsiMigrationDependency struct {
+	DynamicData
+
+	MigrationAllowed bool                    `xml:"migrationAllowed"`
+	DisallowReason   *IscsiStatus            `xml:"disallowReason,omitempty"`
+	Dependency       []IscsiDependencyEntity `xml:"dependency,omitempty"`
+}
+
+func init() {
+	t["IscsiMigrationDependency"] = reflect.TypeOf((*IscsiMigrationDependency)(nil)).Elem()
+}
+
+type IscsiPortInfo struct {
+	DynamicData
+
+	VnicDevice        string          `xml:"vnicDevice,omitempty"`
+	Vnic              *HostVirtualNic `xml:"vnic,omitempty"`
+	PnicDevice        string          `xml:"pnicDevice,omitempty"`
+	Pnic              *PhysicalNic    `xml:"pnic,omitempty"`
+	SwitchName        string          `xml:"switchName,omitempty"`
+	SwitchUuid        string          `xml:"switchUuid,omitempty"`
+	PortgroupName     string          `xml:"portgroupName,omitempty"`
+	PortgroupKey      string          `xml:"portgroupKey,omitempty"`
+	PortKey           string          `xml:"portKey,omitempty"`
+	OpaqueNetworkId   string          `xml:"opaqueNetworkId,omitempty"`
+	OpaqueNetworkType string          `xml:"opaqueNetworkType,omitempty"`
+	OpaqueNetworkName string          `xml:"opaqueNetworkName,omitempty"`
+	ExternalId        string          `xml:"externalId,omitempty"`
+	ComplianceStatus  *IscsiStatus    `xml:"complianceStatus,omitempty"`
+	PathStatus        string          `xml:"pathStatus,omitempty"`
+}
+
+func init() {
+	t["IscsiPortInfo"] = reflect.TypeOf((*IscsiPortInfo)(nil)).Elem()
+}
+
+type IscsiStatus struct {
+	DynamicData
+
+	Reason []LocalizedMethodFault `xml:"reason,omitempty"`
+}
+
+func init() {
+	t["IscsiStatus"] = reflect.TypeOf((*IscsiStatus)(nil)).Elem()
+}
+
+type IsoImageFileInfo struct {
+	FileInfo
+}
+
+func init() {
+	t["IsoImageFileInfo"] = reflect.TypeOf((*IsoImageFileInfo)(nil)).Elem()
+}
+
+type IsoImageFileQuery struct {
+	FileQuery
+}
+
+func init() {
+	t["IsoImageFileQuery"] = reflect.TypeOf((*IsoImageFileQuery)(nil)).Elem()
+}
+
+type JoinDomainRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	DomainName string                 `xml:"domainName"`
+	UserName   string                 `xml:"userName"`
+	Password   string                 `xml:"password"`
+}
+
+func init() {
+	t["JoinDomainRequestType"] = reflect.TypeOf((*JoinDomainRequestType)(nil)).Elem()
+}
+
+type JoinDomainWithCAMRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	DomainName string                 `xml:"domainName"`
+	CamServer  string                 `xml:"camServer"`
+}
+
+func init() {
+	t["JoinDomainWithCAMRequestType"] = reflect.TypeOf((*JoinDomainWithCAMRequestType)(nil)).Elem()
+}
+
+type JoinDomainWithCAM_Task JoinDomainWithCAMRequestType
+
+func init() {
+	t["JoinDomainWithCAM_Task"] = reflect.TypeOf((*JoinDomainWithCAM_Task)(nil)).Elem()
+}
+
+type JoinDomainWithCAM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type JoinDomain_Task JoinDomainRequestType
+
+func init() {
+	t["JoinDomain_Task"] = reflect.TypeOf((*JoinDomain_Task)(nil)).Elem()
+}
+
+type JoinDomain_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type KernelModuleInfo struct {
+	DynamicData
+
+	Id              int32                   `xml:"id"`
+	Name            string                  `xml:"name"`
+	Version         string                  `xml:"version"`
+	Filename        string                  `xml:"filename"`
+	OptionString    string                  `xml:"optionString"`
+	Loaded          bool                    `xml:"loaded"`
+	Enabled         bool                    `xml:"enabled"`
+	UseCount        int32                   `xml:"useCount"`
+	ReadOnlySection KernelModuleSectionInfo `xml:"readOnlySection"`
+	WritableSection KernelModuleSectionInfo `xml:"writableSection"`
+	TextSection     KernelModuleSectionInfo `xml:"textSection"`
+	DataSection     KernelModuleSectionInfo `xml:"dataSection"`
+	BssSection      KernelModuleSectionInfo `xml:"bssSection"`
+}
+
+func init() {
+	t["KernelModuleInfo"] = reflect.TypeOf((*KernelModuleInfo)(nil)).Elem()
+}
+
+type KernelModuleSectionInfo struct {
+	DynamicData
+
+	Address int64 `xml:"address"`
+	Length  int32 `xml:"length,omitempty"`
+}
+
+func init() {
+	t["KernelModuleSectionInfo"] = reflect.TypeOf((*KernelModuleSectionInfo)(nil)).Elem()
+}
+
+type KeyAnyValue struct {
+	DynamicData
+
+	Key   string  `xml:"key"`
+	Value AnyType `xml:"value,typeattr"`
+}
+
+func init() {
+	t["KeyAnyValue"] = reflect.TypeOf((*KeyAnyValue)(nil)).Elem()
+}
+
+type KeyProviderId struct {
+	DynamicData
+
+	Id string `xml:"id"`
+}
+
+func init() {
+	t["KeyProviderId"] = reflect.TypeOf((*KeyProviderId)(nil)).Elem()
+}
+
+type KeyValue struct {
+	DynamicData
+
+	Key   string `xml:"key"`
+	Value string `xml:"value"`
+}
+
+func init() {
+	t["KeyValue"] = reflect.TypeOf((*KeyValue)(nil)).Elem()
+}
+
+type KmipClusterInfo struct {
+	DynamicData
+
+	ClusterId    KeyProviderId    `xml:"clusterId"`
+	Servers      []KmipServerInfo `xml:"servers,omitempty"`
+	UseAsDefault bool             `xml:"useAsDefault"`
+}
+
+func init() {
+	t["KmipClusterInfo"] = reflect.TypeOf((*KmipClusterInfo)(nil)).Elem()
+}
+
+type KmipServerInfo struct {
+	DynamicData
+
+	Name         string `xml:"name"`
+	Address      string `xml:"address"`
+	Port         int32  `xml:"port"`
+	ProxyAddress string `xml:"proxyAddress,omitempty"`
+	ProxyPort    int32  `xml:"proxyPort,omitempty"`
+	Reconnect    int32  `xml:"reconnect,omitempty"`
+	Protocol     string `xml:"protocol,omitempty"`
+	Nbio         int32  `xml:"nbio,omitempty"`
+	Timeout      int32  `xml:"timeout,omitempty"`
+	UserName     string `xml:"userName,omitempty"`
+}
+
+func init() {
+	t["KmipServerInfo"] = reflect.TypeOf((*KmipServerInfo)(nil)).Elem()
+}
+
+type KmipServerSpec struct {
+	DynamicData
+
+	ClusterId KeyProviderId  `xml:"clusterId"`
+	Info      KmipServerInfo `xml:"info"`
+	Password  string         `xml:"password,omitempty"`
+}
+
+func init() {
+	t["KmipServerSpec"] = reflect.TypeOf((*KmipServerSpec)(nil)).Elem()
+}
+
+type KmipServerStatus struct {
+	DynamicData
+
+	ClusterId   KeyProviderId       `xml:"clusterId"`
+	Name        string              `xml:"name"`
+	Status      ManagedEntityStatus `xml:"status"`
+	Description string              `xml:"description"`
+}
+
+func init() {
+	t["KmipServerStatus"] = reflect.TypeOf((*KmipServerStatus)(nil)).Elem()
+}
+
+type LargeRDMConversionNotSupported struct {
+	MigrationFault
+
+	Device string `xml:"device"`
+}
+
+func init() {
+	t["LargeRDMConversionNotSupported"] = reflect.TypeOf((*LargeRDMConversionNotSupported)(nil)).Elem()
+}
+
+type LargeRDMConversionNotSupportedFault LargeRDMConversionNotSupported
+
+func init() {
+	t["LargeRDMConversionNotSupportedFault"] = reflect.TypeOf((*LargeRDMConversionNotSupportedFault)(nil)).Elem()
+}
+
+type LargeRDMNotSupportedOnDatastore struct {
+	VmConfigFault
+
+	Device        string                 `xml:"device"`
+	Datastore     ManagedObjectReference `xml:"datastore"`
+	DatastoreName string                 `xml:"datastoreName"`
+}
+
+func init() {
+	t["LargeRDMNotSupportedOnDatastore"] = reflect.TypeOf((*LargeRDMNotSupportedOnDatastore)(nil)).Elem()
+}
+
+type LargeRDMNotSupportedOnDatastoreFault LargeRDMNotSupportedOnDatastore
+
+func init() {
+	t["LargeRDMNotSupportedOnDatastoreFault"] = reflect.TypeOf((*LargeRDMNotSupportedOnDatastoreFault)(nil)).Elem()
+}
+
+type LatencySensitivity struct {
+	DynamicData
+
+	Level       LatencySensitivitySensitivityLevel `xml:"level"`
+	Sensitivity int32                              `xml:"sensitivity,omitempty"`
+}
+
+func init() {
+	t["LatencySensitivity"] = reflect.TypeOf((*LatencySensitivity)(nil)).Elem()
+}
+
+type LeaveCurrentDomainRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Force bool                   `xml:"force"`
+}
+
+func init() {
+	t["LeaveCurrentDomainRequestType"] = reflect.TypeOf((*LeaveCurrentDomainRequestType)(nil)).Elem()
+}
+
+type LeaveCurrentDomain_Task LeaveCurrentDomainRequestType
+
+func init() {
+	t["LeaveCurrentDomain_Task"] = reflect.TypeOf((*LeaveCurrentDomain_Task)(nil)).Elem()
+}
+
+type LeaveCurrentDomain_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type LegacyNetworkInterfaceInUse struct {
+	CannotAccessNetwork
+}
+
+func init() {
+	t["LegacyNetworkInterfaceInUse"] = reflect.TypeOf((*LegacyNetworkInterfaceInUse)(nil)).Elem()
+}
+
+type LegacyNetworkInterfaceInUseFault LegacyNetworkInterfaceInUse
+
+func init() {
+	t["LegacyNetworkInterfaceInUseFault"] = reflect.TypeOf((*LegacyNetworkInterfaceInUseFault)(nil)).Elem()
+}
+
+type LicenseAssignmentFailed struct {
+	RuntimeFault
+
+	Reason string `xml:"reason,omitempty"`
+}
+
+func init() {
+	t["LicenseAssignmentFailed"] = reflect.TypeOf((*LicenseAssignmentFailed)(nil)).Elem()
+}
+
+type LicenseAssignmentFailedFault LicenseAssignmentFailed
+
+func init() {
+	t["LicenseAssignmentFailedFault"] = reflect.TypeOf((*LicenseAssignmentFailedFault)(nil)).Elem()
+}
+
+type LicenseAssignmentManagerLicenseAssignment struct {
+	DynamicData
+
+	EntityId          string                    `xml:"entityId"`
+	Scope             string                    `xml:"scope,omitempty"`
+	EntityDisplayName string                    `xml:"entityDisplayName,omitempty"`
+	AssignedLicense   LicenseManagerLicenseInfo `xml:"assignedLicense"`
+	Properties        []KeyAnyValue             `xml:"properties,omitempty"`
+}
+
+func init() {
+	t["LicenseAssignmentManagerLicenseAssignment"] = reflect.TypeOf((*LicenseAssignmentManagerLicenseAssignment)(nil)).Elem()
+}
+
+type LicenseAvailabilityInfo struct {
+	DynamicData
+
+	Feature   LicenseFeatureInfo `xml:"feature"`
+	Total     int32              `xml:"total"`
+	Available int32              `xml:"available"`
+}
+
+func init() {
+	t["LicenseAvailabilityInfo"] = reflect.TypeOf((*LicenseAvailabilityInfo)(nil)).Elem()
+}
+
+type LicenseDiagnostics struct {
+	DynamicData
+
+	SourceLastChanged      time.Time           `xml:"sourceLastChanged"`
+	SourceLost             string              `xml:"sourceLost"`
+	SourceLatency          float32             `xml:"sourceLatency"`
+	LicenseRequests        string              `xml:"licenseRequests"`
+	LicenseRequestFailures string              `xml:"licenseRequestFailures"`
+	LicenseFeatureUnknowns string              `xml:"licenseFeatureUnknowns"`
+	OpState                LicenseManagerState `xml:"opState"`
+	LastStatusUpdate       time.Time           `xml:"lastStatusUpdate"`
+	OpFailureMessage       string              `xml:"opFailureMessage"`
+}
+
+func init() {
+	t["LicenseDiagnostics"] = reflect.TypeOf((*LicenseDiagnostics)(nil)).Elem()
+}
+
+type LicenseDowngradeDisallowed struct {
+	NotEnoughLicenses
+
+	Edition  string        `xml:"edition"`
+	EntityId string        `xml:"entityId"`
+	Features []KeyAnyValue `xml:"features"`
+}
+
+func init() {
+	t["LicenseDowngradeDisallowed"] = reflect.TypeOf((*LicenseDowngradeDisallowed)(nil)).Elem()
+}
+
+type LicenseDowngradeDisallowedFault LicenseDowngradeDisallowed
+
+func init() {
+	t["LicenseDowngradeDisallowedFault"] = reflect.TypeOf((*LicenseDowngradeDisallowedFault)(nil)).Elem()
+}
+
+type LicenseEntityNotFound struct {
+	VimFault
+
+	EntityId string `xml:"entityId"`
+}
+
+func init() {
+	t["LicenseEntityNotFound"] = reflect.TypeOf((*LicenseEntityNotFound)(nil)).Elem()
+}
+
+type LicenseEntityNotFoundFault LicenseEntityNotFound
+
+func init() {
+	t["LicenseEntityNotFoundFault"] = reflect.TypeOf((*LicenseEntityNotFoundFault)(nil)).Elem()
+}
+
+type LicenseEvent struct {
+	Event
+}
+
+func init() {
+	t["LicenseEvent"] = reflect.TypeOf((*LicenseEvent)(nil)).Elem()
+}
+
+type LicenseExpired struct {
+	NotEnoughLicenses
+
+	LicenseKey string `xml:"licenseKey"`
+}
+
+func init() {
+	t["LicenseExpired"] = reflect.TypeOf((*LicenseExpired)(nil)).Elem()
+}
+
+type LicenseExpiredEvent struct {
+	Event
+
+	Feature LicenseFeatureInfo `xml:"feature"`
+}
+
+func init() {
+	t["LicenseExpiredEvent"] = reflect.TypeOf((*LicenseExpiredEvent)(nil)).Elem()
+}
+
+type LicenseExpiredFault LicenseExpired
+
+func init() {
+	t["LicenseExpiredFault"] = reflect.TypeOf((*LicenseExpiredFault)(nil)).Elem()
+}
+
+type LicenseFeatureInfo struct {
+	DynamicData
+
+	Key                string                  `xml:"key"`
+	FeatureName        string                  `xml:"featureName"`
+	FeatureDescription string                  `xml:"featureDescription,omitempty"`
+	State              LicenseFeatureInfoState `xml:"state,omitempty"`
+	CostUnit           string                  `xml:"costUnit"`
+	SourceRestriction  string                  `xml:"sourceRestriction,omitempty"`
+	DependentKey       []string                `xml:"dependentKey,omitempty"`
+	Edition            *bool                   `xml:"edition"`
+	ExpiresOn          *time.Time              `xml:"expiresOn"`
+}
+
+func init() {
+	t["LicenseFeatureInfo"] = reflect.TypeOf((*LicenseFeatureInfo)(nil)).Elem()
+}
+
+type LicenseKeyEntityMismatch struct {
+	NotEnoughLicenses
+}
+
+func init() {
+	t["LicenseKeyEntityMismatch"] = reflect.TypeOf((*LicenseKeyEntityMismatch)(nil)).Elem()
+}
+
+type LicenseKeyEntityMismatchFault LicenseKeyEntityMismatch
+
+func init() {
+	t["LicenseKeyEntityMismatchFault"] = reflect.TypeOf((*LicenseKeyEntityMismatchFault)(nil)).Elem()
+}
+
+type LicenseManagerEvaluationInfo struct {
+	DynamicData
+
+	Properties []KeyAnyValue `xml:"properties"`
+}
+
+func init() {
+	t["LicenseManagerEvaluationInfo"] = reflect.TypeOf((*LicenseManagerEvaluationInfo)(nil)).Elem()
+}
+
+type LicenseManagerLicenseInfo struct {
+	DynamicData
+
+	LicenseKey string        `xml:"licenseKey"`
+	EditionKey string        `xml:"editionKey"`
+	Name       string        `xml:"name"`
+	Total      int32         `xml:"total"`
+	Used       int32         `xml:"used,omitempty"`
+	CostUnit   string        `xml:"costUnit"`
+	Properties []KeyAnyValue `xml:"properties,omitempty"`
+	Labels     []KeyValue    `xml:"labels,omitempty"`
+}
+
+func init() {
+	t["LicenseManagerLicenseInfo"] = reflect.TypeOf((*LicenseManagerLicenseInfo)(nil)).Elem()
+}
+
+type LicenseNonComplianceEvent struct {
+	LicenseEvent
+
+	Url string `xml:"url"`
+}
+
+func init() {
+	t["LicenseNonComplianceEvent"] = reflect.TypeOf((*LicenseNonComplianceEvent)(nil)).Elem()
+}
+
+type LicenseReservationInfo struct {
+	DynamicData
+
+	Key      string                      `xml:"key"`
+	State    LicenseReservationInfoState `xml:"state"`
+	Required int32                       `xml:"required"`
+}
+
+func init() {
+	t["LicenseReservationInfo"] = reflect.TypeOf((*LicenseReservationInfo)(nil)).Elem()
+}
+
+type LicenseRestricted struct {
+	NotEnoughLicenses
+}
+
+func init() {
+	t["LicenseRestricted"] = reflect.TypeOf((*LicenseRestricted)(nil)).Elem()
+}
+
+type LicenseRestrictedEvent struct {
+	LicenseEvent
+}
+
+func init() {
+	t["LicenseRestrictedEvent"] = reflect.TypeOf((*LicenseRestrictedEvent)(nil)).Elem()
+}
+
+type LicenseRestrictedFault LicenseRestricted
+
+func init() {
+	t["LicenseRestrictedFault"] = reflect.TypeOf((*LicenseRestrictedFault)(nil)).Elem()
+}
+
+type LicenseServerAvailableEvent struct {
+	LicenseEvent
+
+	LicenseServer string `xml:"licenseServer"`
+}
+
+func init() {
+	t["LicenseServerAvailableEvent"] = reflect.TypeOf((*LicenseServerAvailableEvent)(nil)).Elem()
+}
+
+type LicenseServerSource struct {
+	LicenseSource
+
+	LicenseServer string `xml:"licenseServer"`
+}
+
+func init() {
+	t["LicenseServerSource"] = reflect.TypeOf((*LicenseServerSource)(nil)).Elem()
+}
+
+type LicenseServerUnavailable struct {
+	VimFault
+
+	LicenseServer string `xml:"licenseServer"`
+}
+
+func init() {
+	t["LicenseServerUnavailable"] = reflect.TypeOf((*LicenseServerUnavailable)(nil)).Elem()
+}
+
+type LicenseServerUnavailableEvent struct {
+	LicenseEvent
+
+	LicenseServer string `xml:"licenseServer"`
+}
+
+func init() {
+	t["LicenseServerUnavailableEvent"] = reflect.TypeOf((*LicenseServerUnavailableEvent)(nil)).Elem()
+}
+
+type LicenseServerUnavailableFault LicenseServerUnavailable
+
+func init() {
+	t["LicenseServerUnavailableFault"] = reflect.TypeOf((*LicenseServerUnavailableFault)(nil)).Elem()
+}
+
+type LicenseSource struct {
+	DynamicData
+}
+
+func init() {
+	t["LicenseSource"] = reflect.TypeOf((*LicenseSource)(nil)).Elem()
+}
+
+type LicenseSourceUnavailable struct {
+	NotEnoughLicenses
+
+	LicenseSource BaseLicenseSource `xml:"licenseSource,typeattr"`
+}
+
+func init() {
+	t["LicenseSourceUnavailable"] = reflect.TypeOf((*LicenseSourceUnavailable)(nil)).Elem()
+}
+
+type LicenseSourceUnavailableFault LicenseSourceUnavailable
+
+func init() {
+	t["LicenseSourceUnavailableFault"] = reflect.TypeOf((*LicenseSourceUnavailableFault)(nil)).Elem()
+}
+
+type LicenseUsageInfo struct {
+	DynamicData
+
+	Source          BaseLicenseSource        `xml:"source,typeattr"`
+	SourceAvailable bool                     `xml:"sourceAvailable"`
+	ReservationInfo []LicenseReservationInfo `xml:"reservationInfo,omitempty"`
+	FeatureInfo     []LicenseFeatureInfo     `xml:"featureInfo,omitempty"`
+}
+
+func init() {
+	t["LicenseUsageInfo"] = reflect.TypeOf((*LicenseUsageInfo)(nil)).Elem()
+}
+
+type LimitExceeded struct {
+	VimFault
+
+	Property string `xml:"property,omitempty"`
+	Limit    int32  `xml:"limit,omitempty"`
+}
+
+func init() {
+	t["LimitExceeded"] = reflect.TypeOf((*LimitExceeded)(nil)).Elem()
+}
+
+type LimitExceededFault LimitExceeded
+
+func init() {
+	t["LimitExceededFault"] = reflect.TypeOf((*LimitExceededFault)(nil)).Elem()
+}
+
+type LinkDiscoveryProtocolConfig struct {
+	DynamicData
+
+	Protocol  string `xml:"protocol"`
+	Operation string `xml:"operation"`
+}
+
+func init() {
+	t["LinkDiscoveryProtocolConfig"] = reflect.TypeOf((*LinkDiscoveryProtocolConfig)(nil)).Elem()
+}
+
+type LinkLayerDiscoveryProtocolInfo struct {
+	DynamicData
+
+	ChassisId  string        `xml:"chassisId"`
+	PortId     string        `xml:"portId"`
+	TimeToLive int32         `xml:"timeToLive"`
+	Parameter  []KeyAnyValue `xml:"parameter,omitempty"`
+}
+
+func init() {
+	t["LinkLayerDiscoveryProtocolInfo"] = reflect.TypeOf((*LinkLayerDiscoveryProtocolInfo)(nil)).Elem()
+}
+
+type LinkProfile struct {
+	ApplyProfile
+}
+
+func init() {
+	t["LinkProfile"] = reflect.TypeOf((*LinkProfile)(nil)).Elem()
+}
+
+type LinuxVolumeNotClean struct {
+	CustomizationFault
+}
+
+func init() {
+	t["LinuxVolumeNotClean"] = reflect.TypeOf((*LinuxVolumeNotClean)(nil)).Elem()
+}
+
+type LinuxVolumeNotCleanFault LinuxVolumeNotClean
+
+func init() {
+	t["LinuxVolumeNotCleanFault"] = reflect.TypeOf((*LinuxVolumeNotCleanFault)(nil)).Elem()
+}
+
+type ListCACertificateRevocationLists ListCACertificateRevocationListsRequestType
+
+func init() {
+	t["ListCACertificateRevocationLists"] = reflect.TypeOf((*ListCACertificateRevocationLists)(nil)).Elem()
+}
+
+type ListCACertificateRevocationListsRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["ListCACertificateRevocationListsRequestType"] = reflect.TypeOf((*ListCACertificateRevocationListsRequestType)(nil)).Elem()
+}
+
+type ListCACertificateRevocationListsResponse struct {
+	Returnval []string `xml:"returnval,omitempty"`
+}
+
+type ListCACertificates ListCACertificatesRequestType
+
+func init() {
+	t["ListCACertificates"] = reflect.TypeOf((*ListCACertificates)(nil)).Elem()
+}
+
+type ListCACertificatesRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["ListCACertificatesRequestType"] = reflect.TypeOf((*ListCACertificatesRequestType)(nil)).Elem()
+}
+
+type ListCACertificatesResponse struct {
+	Returnval []string `xml:"returnval,omitempty"`
+}
+
+type ListFilesInGuest ListFilesInGuestRequestType
+
+func init() {
+	t["ListFilesInGuest"] = reflect.TypeOf((*ListFilesInGuest)(nil)).Elem()
+}
+
+type ListFilesInGuestRequestType struct {
+	This         ManagedObjectReference  `xml:"_this"`
+	Vm           ManagedObjectReference  `xml:"vm"`
+	Auth         BaseGuestAuthentication `xml:"auth,typeattr"`
+	FilePath     string                  `xml:"filePath"`
+	Index        int32                   `xml:"index,omitempty"`
+	MaxResults   int32                   `xml:"maxResults,omitempty"`
+	MatchPattern string                  `xml:"matchPattern,omitempty"`
+}
+
+func init() {
+	t["ListFilesInGuestRequestType"] = reflect.TypeOf((*ListFilesInGuestRequestType)(nil)).Elem()
+}
+
+type ListFilesInGuestResponse struct {
+	Returnval GuestListFileInfo `xml:"returnval"`
+}
+
+type ListGuestAliases ListGuestAliasesRequestType
+
+func init() {
+	t["ListGuestAliases"] = reflect.TypeOf((*ListGuestAliases)(nil)).Elem()
+}
+
+type ListGuestAliasesRequestType struct {
+	This     ManagedObjectReference  `xml:"_this"`
+	Vm       ManagedObjectReference  `xml:"vm"`
+	Auth     BaseGuestAuthentication `xml:"auth,typeattr"`
+	Username string                  `xml:"username"`
+}
+
+func init() {
+	t["ListGuestAliasesRequestType"] = reflect.TypeOf((*ListGuestAliasesRequestType)(nil)).Elem()
+}
+
+type ListGuestAliasesResponse struct {
+	Returnval []GuestAliases `xml:"returnval,omitempty"`
+}
+
+type ListGuestMappedAliases ListGuestMappedAliasesRequestType
+
+func init() {
+	t["ListGuestMappedAliases"] = reflect.TypeOf((*ListGuestMappedAliases)(nil)).Elem()
+}
+
+type ListGuestMappedAliasesRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Vm   ManagedObjectReference  `xml:"vm"`
+	Auth BaseGuestAuthentication `xml:"auth,typeattr"`
+}
+
+func init() {
+	t["ListGuestMappedAliasesRequestType"] = reflect.TypeOf((*ListGuestMappedAliasesRequestType)(nil)).Elem()
+}
+
+type ListGuestMappedAliasesResponse struct {
+	Returnval []GuestMappedAliases `xml:"returnval,omitempty"`
+}
+
+type ListKeys ListKeysRequestType
+
+func init() {
+	t["ListKeys"] = reflect.TypeOf((*ListKeys)(nil)).Elem()
+}
+
+type ListKeysRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Limit int32                  `xml:"limit,omitempty"`
+}
+
+func init() {
+	t["ListKeysRequestType"] = reflect.TypeOf((*ListKeysRequestType)(nil)).Elem()
+}
+
+type ListKeysResponse struct {
+	Returnval []CryptoKeyId `xml:"returnval,omitempty"`
+}
+
+type ListKmipServers ListKmipServersRequestType
+
+func init() {
+	t["ListKmipServers"] = reflect.TypeOf((*ListKmipServers)(nil)).Elem()
+}
+
+type ListKmipServersRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Limit int32                  `xml:"limit,omitempty"`
+}
+
+func init() {
+	t["ListKmipServersRequestType"] = reflect.TypeOf((*ListKmipServersRequestType)(nil)).Elem()
+}
+
+type ListKmipServersResponse struct {
+	Returnval []KmipClusterInfo `xml:"returnval,omitempty"`
+}
+
+type ListProcessesInGuest ListProcessesInGuestRequestType
+
+func init() {
+	t["ListProcessesInGuest"] = reflect.TypeOf((*ListProcessesInGuest)(nil)).Elem()
+}
+
+type ListProcessesInGuestRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Vm   ManagedObjectReference  `xml:"vm"`
+	Auth BaseGuestAuthentication `xml:"auth,typeattr"`
+	Pids []int64                 `xml:"pids,omitempty"`
+}
+
+func init() {
+	t["ListProcessesInGuestRequestType"] = reflect.TypeOf((*ListProcessesInGuestRequestType)(nil)).Elem()
+}
+
+type ListProcessesInGuestResponse struct {
+	Returnval []GuestProcessInfo `xml:"returnval,omitempty"`
+}
+
+type ListRegistryKeysInGuest ListRegistryKeysInGuestRequestType
+
+func init() {
+	t["ListRegistryKeysInGuest"] = reflect.TypeOf((*ListRegistryKeysInGuest)(nil)).Elem()
+}
+
+type ListRegistryKeysInGuestRequestType struct {
+	This         ManagedObjectReference  `xml:"_this"`
+	Vm           ManagedObjectReference  `xml:"vm"`
+	Auth         BaseGuestAuthentication `xml:"auth,typeattr"`
+	KeyName      GuestRegKeyNameSpec     `xml:"keyName"`
+	Recursive    bool                    `xml:"recursive"`
+	MatchPattern string                  `xml:"matchPattern,omitempty"`
+}
+
+func init() {
+	t["ListRegistryKeysInGuestRequestType"] = reflect.TypeOf((*ListRegistryKeysInGuestRequestType)(nil)).Elem()
+}
+
+type ListRegistryKeysInGuestResponse struct {
+	Returnval []GuestRegKeyRecordSpec `xml:"returnval,omitempty"`
+}
+
+type ListRegistryValuesInGuest ListRegistryValuesInGuestRequestType
+
+func init() {
+	t["ListRegistryValuesInGuest"] = reflect.TypeOf((*ListRegistryValuesInGuest)(nil)).Elem()
+}
+
+type ListRegistryValuesInGuestRequestType struct {
+	This          ManagedObjectReference  `xml:"_this"`
+	Vm            ManagedObjectReference  `xml:"vm"`
+	Auth          BaseGuestAuthentication `xml:"auth,typeattr"`
+	KeyName       GuestRegKeyNameSpec     `xml:"keyName"`
+	ExpandStrings bool                    `xml:"expandStrings"`
+	MatchPattern  string                  `xml:"matchPattern,omitempty"`
+}
+
+func init() {
+	t["ListRegistryValuesInGuestRequestType"] = reflect.TypeOf((*ListRegistryValuesInGuestRequestType)(nil)).Elem()
+}
+
+type ListRegistryValuesInGuestResponse struct {
+	Returnval []GuestRegValueSpec `xml:"returnval,omitempty"`
+}
+
+type ListSmartCardTrustAnchors ListSmartCardTrustAnchorsRequestType
+
+func init() {
+	t["ListSmartCardTrustAnchors"] = reflect.TypeOf((*ListSmartCardTrustAnchors)(nil)).Elem()
+}
+
+type ListSmartCardTrustAnchorsRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["ListSmartCardTrustAnchorsRequestType"] = reflect.TypeOf((*ListSmartCardTrustAnchorsRequestType)(nil)).Elem()
+}
+
+type ListSmartCardTrustAnchorsResponse struct {
+	Returnval []string `xml:"returnval,omitempty"`
+}
+
+type ListTagsAttachedToVStorageObject ListTagsAttachedToVStorageObjectRequestType
+
+func init() {
+	t["ListTagsAttachedToVStorageObject"] = reflect.TypeOf((*ListTagsAttachedToVStorageObject)(nil)).Elem()
+}
+
+type ListTagsAttachedToVStorageObjectRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Id   ID                     `xml:"id"`
+}
+
+func init() {
+	t["ListTagsAttachedToVStorageObjectRequestType"] = reflect.TypeOf((*ListTagsAttachedToVStorageObjectRequestType)(nil)).Elem()
+}
+
+type ListTagsAttachedToVStorageObjectResponse struct {
+	Returnval []VslmTagEntry `xml:"returnval,omitempty"`
+}
+
+type ListVStorageObject ListVStorageObjectRequestType
+
+func init() {
+	t["ListVStorageObject"] = reflect.TypeOf((*ListVStorageObject)(nil)).Elem()
+}
+
+type ListVStorageObjectRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["ListVStorageObjectRequestType"] = reflect.TypeOf((*ListVStorageObjectRequestType)(nil)).Elem()
+}
+
+type ListVStorageObjectResponse struct {
+	Returnval []ID `xml:"returnval,omitempty"`
+}
+
+type ListVStorageObjectsAttachedToTag ListVStorageObjectsAttachedToTagRequestType
+
+func init() {
+	t["ListVStorageObjectsAttachedToTag"] = reflect.TypeOf((*ListVStorageObjectsAttachedToTag)(nil)).Elem()
+}
+
+type ListVStorageObjectsAttachedToTagRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	Category string                 `xml:"category"`
+	Tag      string                 `xml:"tag"`
+}
+
+func init() {
+	t["ListVStorageObjectsAttachedToTagRequestType"] = reflect.TypeOf((*ListVStorageObjectsAttachedToTagRequestType)(nil)).Elem()
+}
+
+type ListVStorageObjectsAttachedToTagResponse struct {
+	Returnval []ID `xml:"returnval,omitempty"`
+}
+
+type LocalDatastoreCreatedEvent struct {
+	HostEvent
+
+	Datastore    DatastoreEventArgument `xml:"datastore"`
+	DatastoreUrl string                 `xml:"datastoreUrl,omitempty"`
+}
+
+func init() {
+	t["LocalDatastoreCreatedEvent"] = reflect.TypeOf((*LocalDatastoreCreatedEvent)(nil)).Elem()
+}
+
+type LocalDatastoreInfo struct {
+	DatastoreInfo
+
+	Path string `xml:"path,omitempty"`
+}
+
+func init() {
+	t["LocalDatastoreInfo"] = reflect.TypeOf((*LocalDatastoreInfo)(nil)).Elem()
+}
+
+type LocalLicenseSource struct {
+	LicenseSource
+
+	LicenseKeys string `xml:"licenseKeys"`
+}
+
+func init() {
+	t["LocalLicenseSource"] = reflect.TypeOf((*LocalLicenseSource)(nil)).Elem()
+}
+
+type LocalTSMEnabledEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["LocalTSMEnabledEvent"] = reflect.TypeOf((*LocalTSMEnabledEvent)(nil)).Elem()
+}
+
+type LocalizableMessage struct {
+	DynamicData
+
+	Key     string        `xml:"key"`
+	Arg     []KeyAnyValue `xml:"arg,omitempty"`
+	Message string        `xml:"message,omitempty"`
+}
+
+func init() {
+	t["LocalizableMessage"] = reflect.TypeOf((*LocalizableMessage)(nil)).Elem()
+}
+
+type LocalizationManagerMessageCatalog struct {
+	DynamicData
+
+	ModuleName   string     `xml:"moduleName"`
+	CatalogName  string     `xml:"catalogName"`
+	Locale       string     `xml:"locale"`
+	CatalogUri   string     `xml:"catalogUri"`
+	LastModified *time.Time `xml:"lastModified"`
+	Md5sum       string     `xml:"md5sum,omitempty"`
+	Version      string     `xml:"version,omitempty"`
+}
+
+func init() {
+	t["LocalizationManagerMessageCatalog"] = reflect.TypeOf((*LocalizationManagerMessageCatalog)(nil)).Elem()
+}
+
+type LocalizedMethodFault struct {
+	DynamicData
+
+	Fault            BaseMethodFault `xml:"fault,typeattr"`
+	LocalizedMessage string          `xml:"localizedMessage,omitempty"`
+}
+
+func init() {
+	t["LocalizedMethodFault"] = reflect.TypeOf((*LocalizedMethodFault)(nil)).Elem()
+}
+
+type LockerMisconfiguredEvent struct {
+	Event
+
+	Datastore DatastoreEventArgument `xml:"datastore"`
+}
+
+func init() {
+	t["LockerMisconfiguredEvent"] = reflect.TypeOf((*LockerMisconfiguredEvent)(nil)).Elem()
+}
+
+type LockerReconfiguredEvent struct {
+	Event
+
+	OldDatastore *DatastoreEventArgument `xml:"oldDatastore,omitempty"`
+	NewDatastore *DatastoreEventArgument `xml:"newDatastore,omitempty"`
+}
+
+func init() {
+	t["LockerReconfiguredEvent"] = reflect.TypeOf((*LockerReconfiguredEvent)(nil)).Elem()
+}
+
+type LogBundlingFailed struct {
+	VimFault
+}
+
+func init() {
+	t["LogBundlingFailed"] = reflect.TypeOf((*LogBundlingFailed)(nil)).Elem()
+}
+
+type LogBundlingFailedFault LogBundlingFailed
+
+func init() {
+	t["LogBundlingFailedFault"] = reflect.TypeOf((*LogBundlingFailedFault)(nil)).Elem()
+}
+
+type LogUserEvent LogUserEventRequestType
+
+func init() {
+	t["LogUserEvent"] = reflect.TypeOf((*LogUserEvent)(nil)).Elem()
+}
+
+type LogUserEventRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Entity ManagedObjectReference `xml:"entity"`
+	Msg    string                 `xml:"msg"`
+}
+
+func init() {
+	t["LogUserEventRequestType"] = reflect.TypeOf((*LogUserEventRequestType)(nil)).Elem()
+}
+
+type LogUserEventResponse struct {
+}
+
+type Login LoginRequestType
+
+func init() {
+	t["Login"] = reflect.TypeOf((*Login)(nil)).Elem()
+}
+
+type LoginBySSPI LoginBySSPIRequestType
+
+func init() {
+	t["LoginBySSPI"] = reflect.TypeOf((*LoginBySSPI)(nil)).Elem()
+}
+
+type LoginBySSPIRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	Base64Token string                 `xml:"base64Token"`
+	Locale      string                 `xml:"locale,omitempty"`
+}
+
+func init() {
+	t["LoginBySSPIRequestType"] = reflect.TypeOf((*LoginBySSPIRequestType)(nil)).Elem()
+}
+
+type LoginBySSPIResponse struct {
+	Returnval UserSession `xml:"returnval"`
+}
+
+type LoginByToken LoginByTokenRequestType
+
+func init() {
+	t["LoginByToken"] = reflect.TypeOf((*LoginByToken)(nil)).Elem()
+}
+
+type LoginByTokenRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Locale string                 `xml:"locale,omitempty"`
+}
+
+func init() {
+	t["LoginByTokenRequestType"] = reflect.TypeOf((*LoginByTokenRequestType)(nil)).Elem()
+}
+
+type LoginByTokenResponse struct {
+	Returnval UserSession `xml:"returnval"`
+}
+
+type LoginExtensionByCertificate LoginExtensionByCertificateRequestType
+
+func init() {
+	t["LoginExtensionByCertificate"] = reflect.TypeOf((*LoginExtensionByCertificate)(nil)).Elem()
+}
+
+type LoginExtensionByCertificateRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	ExtensionKey string                 `xml:"extensionKey"`
+	Locale       string                 `xml:"locale,omitempty"`
+}
+
+func init() {
+	t["LoginExtensionByCertificateRequestType"] = reflect.TypeOf((*LoginExtensionByCertificateRequestType)(nil)).Elem()
+}
+
+type LoginExtensionByCertificateResponse struct {
+	Returnval UserSession `xml:"returnval"`
+}
+
+type LoginExtensionBySubjectName LoginExtensionBySubjectNameRequestType
+
+func init() {
+	t["LoginExtensionBySubjectName"] = reflect.TypeOf((*LoginExtensionBySubjectName)(nil)).Elem()
+}
+
+type LoginExtensionBySubjectNameRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	ExtensionKey string                 `xml:"extensionKey"`
+	Locale       string                 `xml:"locale,omitempty"`
+}
+
+func init() {
+	t["LoginExtensionBySubjectNameRequestType"] = reflect.TypeOf((*LoginExtensionBySubjectNameRequestType)(nil)).Elem()
+}
+
+type LoginExtensionBySubjectNameResponse struct {
+	Returnval UserSession `xml:"returnval"`
+}
+
+type LoginRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	UserName string                 `xml:"userName"`
+	Password string                 `xml:"password"`
+	Locale   string                 `xml:"locale,omitempty"`
+}
+
+func init() {
+	t["LoginRequestType"] = reflect.TypeOf((*LoginRequestType)(nil)).Elem()
+}
+
+type LoginResponse struct {
+	Returnval UserSession `xml:"returnval"`
+}
+
+type Logout LogoutRequestType
+
+func init() {
+	t["Logout"] = reflect.TypeOf((*Logout)(nil)).Elem()
+}
+
+type LogoutRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["LogoutRequestType"] = reflect.TypeOf((*LogoutRequestType)(nil)).Elem()
+}
+
+type LogoutResponse struct {
+}
+
+type LongOption struct {
+	OptionType
+
+	Min          int64 `xml:"min"`
+	Max          int64 `xml:"max"`
+	DefaultValue int64 `xml:"defaultValue"`
+}
+
+func init() {
+	t["LongOption"] = reflect.TypeOf((*LongOption)(nil)).Elem()
+}
+
+type LongPolicy struct {
+	InheritablePolicy
+
+	Value int64 `xml:"value,omitempty"`
+}
+
+func init() {
+	t["LongPolicy"] = reflect.TypeOf((*LongPolicy)(nil)).Elem()
+}
+
+type LookupDvPortGroup LookupDvPortGroupRequestType
+
+func init() {
+	t["LookupDvPortGroup"] = reflect.TypeOf((*LookupDvPortGroup)(nil)).Elem()
+}
+
+type LookupDvPortGroupRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	PortgroupKey string                 `xml:"portgroupKey"`
+}
+
+func init() {
+	t["LookupDvPortGroupRequestType"] = reflect.TypeOf((*LookupDvPortGroupRequestType)(nil)).Elem()
+}
+
+type LookupDvPortGroupResponse struct {
+	Returnval *ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type LookupVmOverheadMemory LookupVmOverheadMemoryRequestType
+
+func init() {
+	t["LookupVmOverheadMemory"] = reflect.TypeOf((*LookupVmOverheadMemory)(nil)).Elem()
+}
+
+type LookupVmOverheadMemoryRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Vm   ManagedObjectReference `xml:"vm"`
+	Host ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["LookupVmOverheadMemoryRequestType"] = reflect.TypeOf((*LookupVmOverheadMemoryRequestType)(nil)).Elem()
+}
+
+type LookupVmOverheadMemoryResponse struct {
+	Returnval int64 `xml:"returnval"`
+}
+
+type MacAddress struct {
+	NegatableExpression
+}
+
+func init() {
+	t["MacAddress"] = reflect.TypeOf((*MacAddress)(nil)).Elem()
+}
+
+type MacRange struct {
+	MacAddress
+
+	Address string `xml:"address"`
+	Mask    string `xml:"mask"`
+}
+
+func init() {
+	t["MacRange"] = reflect.TypeOf((*MacRange)(nil)).Elem()
+}
+
+type MaintenanceModeFileMove struct {
+	MigrationFault
+}
+
+func init() {
+	t["MaintenanceModeFileMove"] = reflect.TypeOf((*MaintenanceModeFileMove)(nil)).Elem()
+}
+
+type MaintenanceModeFileMoveFault MaintenanceModeFileMove
+
+func init() {
+	t["MaintenanceModeFileMoveFault"] = reflect.TypeOf((*MaintenanceModeFileMoveFault)(nil)).Elem()
+}
+
+type MakeDirectory MakeDirectoryRequestType
+
+func init() {
+	t["MakeDirectory"] = reflect.TypeOf((*MakeDirectory)(nil)).Elem()
+}
+
+type MakeDirectoryInGuest MakeDirectoryInGuestRequestType
+
+func init() {
+	t["MakeDirectoryInGuest"] = reflect.TypeOf((*MakeDirectoryInGuest)(nil)).Elem()
+}
+
+type MakeDirectoryInGuestRequestType struct {
+	This                    ManagedObjectReference  `xml:"_this"`
+	Vm                      ManagedObjectReference  `xml:"vm"`
+	Auth                    BaseGuestAuthentication `xml:"auth,typeattr"`
+	DirectoryPath           string                  `xml:"directoryPath"`
+	CreateParentDirectories bool                    `xml:"createParentDirectories"`
+}
+
+func init() {
+	t["MakeDirectoryInGuestRequestType"] = reflect.TypeOf((*MakeDirectoryInGuestRequestType)(nil)).Elem()
+}
+
+type MakeDirectoryInGuestResponse struct {
+}
+
+type MakeDirectoryRequestType struct {
+	This                    ManagedObjectReference  `xml:"_this"`
+	Name                    string                  `xml:"name"`
+	Datacenter              *ManagedObjectReference `xml:"datacenter,omitempty"`
+	CreateParentDirectories *bool                   `xml:"createParentDirectories"`
+}
+
+func init() {
+	t["MakeDirectoryRequestType"] = reflect.TypeOf((*MakeDirectoryRequestType)(nil)).Elem()
+}
+
+type MakeDirectoryResponse struct {
+}
+
+type MakePrimaryVMRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Vm   ManagedObjectReference `xml:"vm"`
+}
+
+func init() {
+	t["MakePrimaryVMRequestType"] = reflect.TypeOf((*MakePrimaryVMRequestType)(nil)).Elem()
+}
+
+type MakePrimaryVM_Task MakePrimaryVMRequestType
+
+func init() {
+	t["MakePrimaryVM_Task"] = reflect.TypeOf((*MakePrimaryVM_Task)(nil)).Elem()
+}
+
+type MakePrimaryVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ManagedByInfo struct {
+	DynamicData
+
+	ExtensionKey string `xml:"extensionKey"`
+	Type         string `xml:"type"`
+}
+
+func init() {
+	t["ManagedByInfo"] = reflect.TypeOf((*ManagedByInfo)(nil)).Elem()
+}
+
+type ManagedEntityEventArgument struct {
+	EntityEventArgument
+
+	Entity ManagedObjectReference `xml:"entity"`
+}
+
+func init() {
+	t["ManagedEntityEventArgument"] = reflect.TypeOf((*ManagedEntityEventArgument)(nil)).Elem()
+}
+
+type ManagedObjectNotFound struct {
+	RuntimeFault
+
+	Obj ManagedObjectReference `xml:"obj"`
+}
+
+func init() {
+	t["ManagedObjectNotFound"] = reflect.TypeOf((*ManagedObjectNotFound)(nil)).Elem()
+}
+
+type ManagedObjectNotFoundFault ManagedObjectNotFound
+
+func init() {
+	t["ManagedObjectNotFoundFault"] = reflect.TypeOf((*ManagedObjectNotFoundFault)(nil)).Elem()
+}
+
+type ManagedObjectReference struct {
+	Type  string `xml:"type,attr"`
+	Value string `xml:",chardata"`
+}
+
+func init() {
+	t["ManagedObjectReference"] = reflect.TypeOf((*ManagedObjectReference)(nil)).Elem()
+}
+
+type MarkAsLocalRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	ScsiDiskUuid string                 `xml:"scsiDiskUuid"`
+}
+
+func init() {
+	t["MarkAsLocalRequestType"] = reflect.TypeOf((*MarkAsLocalRequestType)(nil)).Elem()
+}
+
+type MarkAsLocal_Task MarkAsLocalRequestType
+
+func init() {
+	t["MarkAsLocal_Task"] = reflect.TypeOf((*MarkAsLocal_Task)(nil)).Elem()
+}
+
+type MarkAsLocal_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type MarkAsNonLocalRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	ScsiDiskUuid string                 `xml:"scsiDiskUuid"`
+}
+
+func init() {
+	t["MarkAsNonLocalRequestType"] = reflect.TypeOf((*MarkAsNonLocalRequestType)(nil)).Elem()
+}
+
+type MarkAsNonLocal_Task MarkAsNonLocalRequestType
+
+func init() {
+	t["MarkAsNonLocal_Task"] = reflect.TypeOf((*MarkAsNonLocal_Task)(nil)).Elem()
+}
+
+type MarkAsNonLocal_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type MarkAsNonSsdRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	ScsiDiskUuid string                 `xml:"scsiDiskUuid"`
+}
+
+func init() {
+	t["MarkAsNonSsdRequestType"] = reflect.TypeOf((*MarkAsNonSsdRequestType)(nil)).Elem()
+}
+
+type MarkAsNonSsd_Task MarkAsNonSsdRequestType
+
+func init() {
+	t["MarkAsNonSsd_Task"] = reflect.TypeOf((*MarkAsNonSsd_Task)(nil)).Elem()
+}
+
+type MarkAsNonSsd_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type MarkAsSsdRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	ScsiDiskUuid string                 `xml:"scsiDiskUuid"`
+}
+
+func init() {
+	t["MarkAsSsdRequestType"] = reflect.TypeOf((*MarkAsSsdRequestType)(nil)).Elem()
+}
+
+type MarkAsSsd_Task MarkAsSsdRequestType
+
+func init() {
+	t["MarkAsSsd_Task"] = reflect.TypeOf((*MarkAsSsd_Task)(nil)).Elem()
+}
+
+type MarkAsSsd_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type MarkAsTemplate MarkAsTemplateRequestType
+
+func init() {
+	t["MarkAsTemplate"] = reflect.TypeOf((*MarkAsTemplate)(nil)).Elem()
+}
+
+type MarkAsTemplateRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["MarkAsTemplateRequestType"] = reflect.TypeOf((*MarkAsTemplateRequestType)(nil)).Elem()
+}
+
+type MarkAsTemplateResponse struct {
+}
+
+type MarkAsVirtualMachine MarkAsVirtualMachineRequestType
+
+func init() {
+	t["MarkAsVirtualMachine"] = reflect.TypeOf((*MarkAsVirtualMachine)(nil)).Elem()
+}
+
+type MarkAsVirtualMachineRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Pool ManagedObjectReference  `xml:"pool"`
+	Host *ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["MarkAsVirtualMachineRequestType"] = reflect.TypeOf((*MarkAsVirtualMachineRequestType)(nil)).Elem()
+}
+
+type MarkAsVirtualMachineResponse struct {
+}
+
+type MarkDefault MarkDefaultRequestType
+
+func init() {
+	t["MarkDefault"] = reflect.TypeOf((*MarkDefault)(nil)).Elem()
+}
+
+type MarkDefaultRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	ClusterId KeyProviderId          `xml:"clusterId"`
+}
+
+func init() {
+	t["MarkDefaultRequestType"] = reflect.TypeOf((*MarkDefaultRequestType)(nil)).Elem()
+}
+
+type MarkDefaultResponse struct {
+}
+
+type MarkForRemoval MarkForRemovalRequestType
+
+func init() {
+	t["MarkForRemoval"] = reflect.TypeOf((*MarkForRemoval)(nil)).Elem()
+}
+
+type MarkForRemovalRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	HbaName string                 `xml:"hbaName"`
+	Remove  bool                   `xml:"remove"`
+}
+
+func init() {
+	t["MarkForRemovalRequestType"] = reflect.TypeOf((*MarkForRemovalRequestType)(nil)).Elem()
+}
+
+type MarkForRemovalResponse struct {
+}
+
+type MemoryFileFormatNotSupportedByDatastore struct {
+	UnsupportedDatastore
+
+	DatastoreName string `xml:"datastoreName"`
+	Type          string `xml:"type"`
+}
+
+func init() {
+	t["MemoryFileFormatNotSupportedByDatastore"] = reflect.TypeOf((*MemoryFileFormatNotSupportedByDatastore)(nil)).Elem()
+}
+
+type MemoryFileFormatNotSupportedByDatastoreFault MemoryFileFormatNotSupportedByDatastore
+
+func init() {
+	t["MemoryFileFormatNotSupportedByDatastoreFault"] = reflect.TypeOf((*MemoryFileFormatNotSupportedByDatastoreFault)(nil)).Elem()
+}
+
+type MemoryHotPlugNotSupported struct {
+	VmConfigFault
+}
+
+func init() {
+	t["MemoryHotPlugNotSupported"] = reflect.TypeOf((*MemoryHotPlugNotSupported)(nil)).Elem()
+}
+
+type MemoryHotPlugNotSupportedFault MemoryHotPlugNotSupported
+
+func init() {
+	t["MemoryHotPlugNotSupportedFault"] = reflect.TypeOf((*MemoryHotPlugNotSupportedFault)(nil)).Elem()
+}
+
+type MemorySizeNotRecommended struct {
+	VirtualHardwareCompatibilityIssue
+
+	MemorySizeMB    int32 `xml:"memorySizeMB"`
+	MinMemorySizeMB int32 `xml:"minMemorySizeMB"`
+	MaxMemorySizeMB int32 `xml:"maxMemorySizeMB"`
+}
+
+func init() {
+	t["MemorySizeNotRecommended"] = reflect.TypeOf((*MemorySizeNotRecommended)(nil)).Elem()
+}
+
+type MemorySizeNotRecommendedFault MemorySizeNotRecommended
+
+func init() {
+	t["MemorySizeNotRecommendedFault"] = reflect.TypeOf((*MemorySizeNotRecommendedFault)(nil)).Elem()
+}
+
+type MemorySizeNotSupported struct {
+	VirtualHardwareCompatibilityIssue
+
+	MemorySizeMB    int32 `xml:"memorySizeMB"`
+	MinMemorySizeMB int32 `xml:"minMemorySizeMB"`
+	MaxMemorySizeMB int32 `xml:"maxMemorySizeMB"`
+}
+
+func init() {
+	t["MemorySizeNotSupported"] = reflect.TypeOf((*MemorySizeNotSupported)(nil)).Elem()
+}
+
+type MemorySizeNotSupportedByDatastore struct {
+	VirtualHardwareCompatibilityIssue
+
+	Datastore       ManagedObjectReference `xml:"datastore"`
+	MemorySizeMB    int32                  `xml:"memorySizeMB"`
+	MaxMemorySizeMB int32                  `xml:"maxMemorySizeMB"`
+}
+
+func init() {
+	t["MemorySizeNotSupportedByDatastore"] = reflect.TypeOf((*MemorySizeNotSupportedByDatastore)(nil)).Elem()
+}
+
+type MemorySizeNotSupportedByDatastoreFault MemorySizeNotSupportedByDatastore
+
+func init() {
+	t["MemorySizeNotSupportedByDatastoreFault"] = reflect.TypeOf((*MemorySizeNotSupportedByDatastoreFault)(nil)).Elem()
+}
+
+type MemorySizeNotSupportedFault MemorySizeNotSupported
+
+func init() {
+	t["MemorySizeNotSupportedFault"] = reflect.TypeOf((*MemorySizeNotSupportedFault)(nil)).Elem()
+}
+
+type MemorySnapshotOnIndependentDisk struct {
+	SnapshotFault
+}
+
+func init() {
+	t["MemorySnapshotOnIndependentDisk"] = reflect.TypeOf((*MemorySnapshotOnIndependentDisk)(nil)).Elem()
+}
+
+type MemorySnapshotOnIndependentDiskFault MemorySnapshotOnIndependentDisk
+
+func init() {
+	t["MemorySnapshotOnIndependentDiskFault"] = reflect.TypeOf((*MemorySnapshotOnIndependentDiskFault)(nil)).Elem()
+}
+
+type MergeDvsRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Dvs  ManagedObjectReference `xml:"dvs"`
+}
+
+func init() {
+	t["MergeDvsRequestType"] = reflect.TypeOf((*MergeDvsRequestType)(nil)).Elem()
+}
+
+type MergeDvs_Task MergeDvsRequestType
+
+func init() {
+	t["MergeDvs_Task"] = reflect.TypeOf((*MergeDvs_Task)(nil)).Elem()
+}
+
+type MergeDvs_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type MergePermissions MergePermissionsRequestType
+
+func init() {
+	t["MergePermissions"] = reflect.TypeOf((*MergePermissions)(nil)).Elem()
+}
+
+type MergePermissionsRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	SrcRoleId int32                  `xml:"srcRoleId"`
+	DstRoleId int32                  `xml:"dstRoleId"`
+}
+
+func init() {
+	t["MergePermissionsRequestType"] = reflect.TypeOf((*MergePermissionsRequestType)(nil)).Elem()
+}
+
+type MergePermissionsResponse struct {
+}
+
+type MethodAction struct {
+	Action
+
+	Name     string                 `xml:"name"`
+	Argument []MethodActionArgument `xml:"argument,omitempty"`
+}
+
+func init() {
+	t["MethodAction"] = reflect.TypeOf((*MethodAction)(nil)).Elem()
+}
+
+type MethodActionArgument struct {
+	DynamicData
+
+	Value AnyType `xml:"value,omitempty,typeattr"`
+}
+
+func init() {
+	t["MethodActionArgument"] = reflect.TypeOf((*MethodActionArgument)(nil)).Elem()
+}
+
+type MethodAlreadyDisabledFault struct {
+	RuntimeFault
+
+	SourceId string `xml:"sourceId"`
+}
+
+func init() {
+	t["MethodAlreadyDisabledFault"] = reflect.TypeOf((*MethodAlreadyDisabledFault)(nil)).Elem()
+}
+
+type MethodAlreadyDisabledFaultFault MethodAlreadyDisabledFault
+
+func init() {
+	t["MethodAlreadyDisabledFaultFault"] = reflect.TypeOf((*MethodAlreadyDisabledFaultFault)(nil)).Elem()
+}
+
+type MethodDescription struct {
+	Description
+
+	Key string `xml:"key"`
+}
+
+func init() {
+	t["MethodDescription"] = reflect.TypeOf((*MethodDescription)(nil)).Elem()
+}
+
+type MethodDisabled struct {
+	RuntimeFault
+
+	Source string `xml:"source,omitempty"`
+}
+
+func init() {
+	t["MethodDisabled"] = reflect.TypeOf((*MethodDisabled)(nil)).Elem()
+}
+
+type MethodDisabledFault MethodDisabled
+
+func init() {
+	t["MethodDisabledFault"] = reflect.TypeOf((*MethodDisabledFault)(nil)).Elem()
+}
+
+type MethodFault struct {
+	FaultCause   *LocalizedMethodFault `xml:"faultCause,omitempty"`
+	FaultMessage []LocalizableMessage  `xml:"faultMessage,omitempty"`
+}
+
+func init() {
+	t["MethodFault"] = reflect.TypeOf((*MethodFault)(nil)).Elem()
+}
+
+type MethodFaultFault BaseMethodFault
+
+func init() {
+	t["MethodFaultFault"] = reflect.TypeOf((*MethodFaultFault)(nil)).Elem()
+}
+
+type MethodNotFound struct {
+	InvalidRequest
+
+	Receiver ManagedObjectReference `xml:"receiver"`
+	Method   string                 `xml:"method"`
+}
+
+func init() {
+	t["MethodNotFound"] = reflect.TypeOf((*MethodNotFound)(nil)).Elem()
+}
+
+type MethodNotFoundFault MethodNotFound
+
+func init() {
+	t["MethodNotFoundFault"] = reflect.TypeOf((*MethodNotFoundFault)(nil)).Elem()
+}
+
+type MetricAlarmExpression struct {
+	AlarmExpression
+
+	Operator       MetricAlarmOperator `xml:"operator"`
+	Type           string              `xml:"type"`
+	Metric         PerfMetricId        `xml:"metric"`
+	Yellow         int32               `xml:"yellow,omitempty"`
+	YellowInterval int32               `xml:"yellowInterval,omitempty"`
+	Red            int32               `xml:"red,omitempty"`
+	RedInterval    int32               `xml:"redInterval,omitempty"`
+}
+
+func init() {
+	t["MetricAlarmExpression"] = reflect.TypeOf((*MetricAlarmExpression)(nil)).Elem()
+}
+
+type MigrateVMRequestType struct {
+	This     ManagedObjectReference     `xml:"_this"`
+	Pool     *ManagedObjectReference    `xml:"pool,omitempty"`
+	Host     *ManagedObjectReference    `xml:"host,omitempty"`
+	Priority VirtualMachineMovePriority `xml:"priority"`
+	State    VirtualMachinePowerState   `xml:"state,omitempty"`
+}
+
+func init() {
+	t["MigrateVMRequestType"] = reflect.TypeOf((*MigrateVMRequestType)(nil)).Elem()
+}
+
+type MigrateVM_Task MigrateVMRequestType
+
+func init() {
+	t["MigrateVM_Task"] = reflect.TypeOf((*MigrateVM_Task)(nil)).Elem()
+}
+
+type MigrateVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type MigrationDisabled struct {
+	MigrationFault
+}
+
+func init() {
+	t["MigrationDisabled"] = reflect.TypeOf((*MigrationDisabled)(nil)).Elem()
+}
+
+type MigrationDisabledFault MigrationDisabled
+
+func init() {
+	t["MigrationDisabledFault"] = reflect.TypeOf((*MigrationDisabledFault)(nil)).Elem()
+}
+
+type MigrationErrorEvent struct {
+	MigrationEvent
+}
+
+func init() {
+	t["MigrationErrorEvent"] = reflect.TypeOf((*MigrationErrorEvent)(nil)).Elem()
+}
+
+type MigrationEvent struct {
+	VmEvent
+
+	Fault LocalizedMethodFault `xml:"fault"`
+}
+
+func init() {
+	t["MigrationEvent"] = reflect.TypeOf((*MigrationEvent)(nil)).Elem()
+}
+
+type MigrationFault struct {
+	VimFault
+}
+
+func init() {
+	t["MigrationFault"] = reflect.TypeOf((*MigrationFault)(nil)).Elem()
+}
+
+type MigrationFaultFault BaseMigrationFault
+
+func init() {
+	t["MigrationFaultFault"] = reflect.TypeOf((*MigrationFaultFault)(nil)).Elem()
+}
+
+type MigrationFeatureNotSupported struct {
+	MigrationFault
+
+	AtSourceHost   bool                   `xml:"atSourceHost"`
+	FailedHostName string                 `xml:"failedHostName"`
+	FailedHost     ManagedObjectReference `xml:"failedHost"`
+}
+
+func init() {
+	t["MigrationFeatureNotSupported"] = reflect.TypeOf((*MigrationFeatureNotSupported)(nil)).Elem()
+}
+
+type MigrationFeatureNotSupportedFault BaseMigrationFeatureNotSupported
+
+func init() {
+	t["MigrationFeatureNotSupportedFault"] = reflect.TypeOf((*MigrationFeatureNotSupportedFault)(nil)).Elem()
+}
+
+type MigrationHostErrorEvent struct {
+	MigrationEvent
+
+	DstHost HostEventArgument `xml:"dstHost"`
+}
+
+func init() {
+	t["MigrationHostErrorEvent"] = reflect.TypeOf((*MigrationHostErrorEvent)(nil)).Elem()
+}
+
+type MigrationHostWarningEvent struct {
+	MigrationEvent
+
+	DstHost HostEventArgument `xml:"dstHost"`
+}
+
+func init() {
+	t["MigrationHostWarningEvent"] = reflect.TypeOf((*MigrationHostWarningEvent)(nil)).Elem()
+}
+
+type MigrationNotReady struct {
+	MigrationFault
+
+	Reason string `xml:"reason"`
+}
+
+func init() {
+	t["MigrationNotReady"] = reflect.TypeOf((*MigrationNotReady)(nil)).Elem()
+}
+
+type MigrationNotReadyFault MigrationNotReady
+
+func init() {
+	t["MigrationNotReadyFault"] = reflect.TypeOf((*MigrationNotReadyFault)(nil)).Elem()
+}
+
+type MigrationResourceErrorEvent struct {
+	MigrationEvent
+
+	DstPool ResourcePoolEventArgument `xml:"dstPool"`
+	DstHost HostEventArgument         `xml:"dstHost"`
+}
+
+func init() {
+	t["MigrationResourceErrorEvent"] = reflect.TypeOf((*MigrationResourceErrorEvent)(nil)).Elem()
+}
+
+type MigrationResourceWarningEvent struct {
+	MigrationEvent
+
+	DstPool ResourcePoolEventArgument `xml:"dstPool"`
+	DstHost HostEventArgument         `xml:"dstHost"`
+}
+
+func init() {
+	t["MigrationResourceWarningEvent"] = reflect.TypeOf((*MigrationResourceWarningEvent)(nil)).Elem()
+}
+
+type MigrationWarningEvent struct {
+	MigrationEvent
+}
+
+func init() {
+	t["MigrationWarningEvent"] = reflect.TypeOf((*MigrationWarningEvent)(nil)).Elem()
+}
+
+type MismatchedBundle struct {
+	VimFault
+
+	BundleUuid        string `xml:"bundleUuid"`
+	HostUuid          string `xml:"hostUuid"`
+	BundleBuildNumber int32  `xml:"bundleBuildNumber"`
+	HostBuildNumber   int32  `xml:"hostBuildNumber"`
+}
+
+func init() {
+	t["MismatchedBundle"] = reflect.TypeOf((*MismatchedBundle)(nil)).Elem()
+}
+
+type MismatchedBundleFault MismatchedBundle
+
+func init() {
+	t["MismatchedBundleFault"] = reflect.TypeOf((*MismatchedBundleFault)(nil)).Elem()
+}
+
+type MismatchedNetworkPolicies struct {
+	MigrationFault
+
+	Device    string `xml:"device"`
+	Backing   string `xml:"backing"`
+	Connected bool   `xml:"connected"`
+}
+
+func init() {
+	t["MismatchedNetworkPolicies"] = reflect.TypeOf((*MismatchedNetworkPolicies)(nil)).Elem()
+}
+
+type MismatchedNetworkPoliciesFault MismatchedNetworkPolicies
+
+func init() {
+	t["MismatchedNetworkPoliciesFault"] = reflect.TypeOf((*MismatchedNetworkPoliciesFault)(nil)).Elem()
+}
+
+type MismatchedVMotionNetworkNames struct {
+	MigrationFault
+
+	SourceNetwork string `xml:"sourceNetwork"`
+	DestNetwork   string `xml:"destNetwork"`
+}
+
+func init() {
+	t["MismatchedVMotionNetworkNames"] = reflect.TypeOf((*MismatchedVMotionNetworkNames)(nil)).Elem()
+}
+
+type MismatchedVMotionNetworkNamesFault MismatchedVMotionNetworkNames
+
+func init() {
+	t["MismatchedVMotionNetworkNamesFault"] = reflect.TypeOf((*MismatchedVMotionNetworkNamesFault)(nil)).Elem()
+}
+
+type MissingBmcSupport struct {
+	VimFault
+}
+
+func init() {
+	t["MissingBmcSupport"] = reflect.TypeOf((*MissingBmcSupport)(nil)).Elem()
+}
+
+type MissingBmcSupportFault MissingBmcSupport
+
+func init() {
+	t["MissingBmcSupportFault"] = reflect.TypeOf((*MissingBmcSupportFault)(nil)).Elem()
+}
+
+type MissingController struct {
+	InvalidDeviceSpec
+}
+
+func init() {
+	t["MissingController"] = reflect.TypeOf((*MissingController)(nil)).Elem()
+}
+
+type MissingControllerFault MissingController
+
+func init() {
+	t["MissingControllerFault"] = reflect.TypeOf((*MissingControllerFault)(nil)).Elem()
+}
+
+type MissingIpPool struct {
+	VAppPropertyFault
+}
+
+func init() {
+	t["MissingIpPool"] = reflect.TypeOf((*MissingIpPool)(nil)).Elem()
+}
+
+type MissingIpPoolFault MissingIpPool
+
+func init() {
+	t["MissingIpPoolFault"] = reflect.TypeOf((*MissingIpPoolFault)(nil)).Elem()
+}
+
+type MissingLinuxCustResources struct {
+	CustomizationFault
+}
+
+func init() {
+	t["MissingLinuxCustResources"] = reflect.TypeOf((*MissingLinuxCustResources)(nil)).Elem()
+}
+
+type MissingLinuxCustResourcesFault MissingLinuxCustResources
+
+func init() {
+	t["MissingLinuxCustResourcesFault"] = reflect.TypeOf((*MissingLinuxCustResourcesFault)(nil)).Elem()
+}
+
+type MissingNetworkIpConfig struct {
+	VAppPropertyFault
+}
+
+func init() {
+	t["MissingNetworkIpConfig"] = reflect.TypeOf((*MissingNetworkIpConfig)(nil)).Elem()
+}
+
+type MissingNetworkIpConfigFault MissingNetworkIpConfig
+
+func init() {
+	t["MissingNetworkIpConfigFault"] = reflect.TypeOf((*MissingNetworkIpConfigFault)(nil)).Elem()
+}
+
+type MissingObject struct {
+	DynamicData
+
+	Obj   ManagedObjectReference `xml:"obj"`
+	Fault LocalizedMethodFault   `xml:"fault"`
+}
+
+func init() {
+	t["MissingObject"] = reflect.TypeOf((*MissingObject)(nil)).Elem()
+}
+
+type MissingPowerOffConfiguration struct {
+	VAppConfigFault
+}
+
+func init() {
+	t["MissingPowerOffConfiguration"] = reflect.TypeOf((*MissingPowerOffConfiguration)(nil)).Elem()
+}
+
+type MissingPowerOffConfigurationFault MissingPowerOffConfiguration
+
+func init() {
+	t["MissingPowerOffConfigurationFault"] = reflect.TypeOf((*MissingPowerOffConfigurationFault)(nil)).Elem()
+}
+
+type MissingPowerOnConfiguration struct {
+	VAppConfigFault
+}
+
+func init() {
+	t["MissingPowerOnConfiguration"] = reflect.TypeOf((*MissingPowerOnConfiguration)(nil)).Elem()
+}
+
+type MissingPowerOnConfigurationFault MissingPowerOnConfiguration
+
+func init() {
+	t["MissingPowerOnConfigurationFault"] = reflect.TypeOf((*MissingPowerOnConfigurationFault)(nil)).Elem()
+}
+
+type MissingProperty struct {
+	DynamicData
+
+	Path  string               `xml:"path"`
+	Fault LocalizedMethodFault `xml:"fault"`
+}
+
+func init() {
+	t["MissingProperty"] = reflect.TypeOf((*MissingProperty)(nil)).Elem()
+}
+
+type MissingWindowsCustResources struct {
+	CustomizationFault
+}
+
+func init() {
+	t["MissingWindowsCustResources"] = reflect.TypeOf((*MissingWindowsCustResources)(nil)).Elem()
+}
+
+type MissingWindowsCustResourcesFault MissingWindowsCustResources
+
+func init() {
+	t["MissingWindowsCustResourcesFault"] = reflect.TypeOf((*MissingWindowsCustResourcesFault)(nil)).Elem()
+}
+
+type MksConnectionLimitReached struct {
+	InvalidState
+
+	ConnectionLimit int32 `xml:"connectionLimit"`
+}
+
+func init() {
+	t["MksConnectionLimitReached"] = reflect.TypeOf((*MksConnectionLimitReached)(nil)).Elem()
+}
+
+type MksConnectionLimitReachedFault MksConnectionLimitReached
+
+func init() {
+	t["MksConnectionLimitReachedFault"] = reflect.TypeOf((*MksConnectionLimitReachedFault)(nil)).Elem()
+}
+
+type ModeInfo struct {
+	DynamicData
+
+	Browse string `xml:"browse,omitempty"`
+	Read   string `xml:"read"`
+	Modify string `xml:"modify"`
+	Use    string `xml:"use"`
+	Admin  string `xml:"admin,omitempty"`
+	Full   string `xml:"full"`
+}
+
+func init() {
+	t["ModeInfo"] = reflect.TypeOf((*ModeInfo)(nil)).Elem()
+}
+
+type ModifyListView ModifyListViewRequestType
+
+func init() {
+	t["ModifyListView"] = reflect.TypeOf((*ModifyListView)(nil)).Elem()
+}
+
+type ModifyListViewRequestType struct {
+	This   ManagedObjectReference   `xml:"_this"`
+	Add    []ManagedObjectReference `xml:"add,omitempty"`
+	Remove []ManagedObjectReference `xml:"remove,omitempty"`
+}
+
+func init() {
+	t["ModifyListViewRequestType"] = reflect.TypeOf((*ModifyListViewRequestType)(nil)).Elem()
+}
+
+type ModifyListViewResponse struct {
+	Returnval []ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type MonthlyByDayTaskScheduler struct {
+	MonthlyTaskScheduler
+
+	Day int32 `xml:"day"`
+}
+
+func init() {
+	t["MonthlyByDayTaskScheduler"] = reflect.TypeOf((*MonthlyByDayTaskScheduler)(nil)).Elem()
+}
+
+type MonthlyByWeekdayTaskScheduler struct {
+	MonthlyTaskScheduler
+
+	Offset  WeekOfMonth `xml:"offset"`
+	Weekday DayOfWeek   `xml:"weekday"`
+}
+
+func init() {
+	t["MonthlyByWeekdayTaskScheduler"] = reflect.TypeOf((*MonthlyByWeekdayTaskScheduler)(nil)).Elem()
+}
+
+type MonthlyTaskScheduler struct {
+	DailyTaskScheduler
+}
+
+func init() {
+	t["MonthlyTaskScheduler"] = reflect.TypeOf((*MonthlyTaskScheduler)(nil)).Elem()
+}
+
+type MountError struct {
+	CustomizationFault
+
+	Vm        ManagedObjectReference `xml:"vm"`
+	DiskIndex int32                  `xml:"diskIndex"`
+}
+
+func init() {
+	t["MountError"] = reflect.TypeOf((*MountError)(nil)).Elem()
+}
+
+type MountErrorFault MountError
+
+func init() {
+	t["MountErrorFault"] = reflect.TypeOf((*MountErrorFault)(nil)).Elem()
+}
+
+type MountToolsInstaller MountToolsInstallerRequestType
+
+func init() {
+	t["MountToolsInstaller"] = reflect.TypeOf((*MountToolsInstaller)(nil)).Elem()
+}
+
+type MountToolsInstallerRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["MountToolsInstallerRequestType"] = reflect.TypeOf((*MountToolsInstallerRequestType)(nil)).Elem()
+}
+
+type MountToolsInstallerResponse struct {
+}
+
+type MountVffsVolume MountVffsVolumeRequestType
+
+func init() {
+	t["MountVffsVolume"] = reflect.TypeOf((*MountVffsVolume)(nil)).Elem()
+}
+
+type MountVffsVolumeRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	VffsUuid string                 `xml:"vffsUuid"`
+}
+
+func init() {
+	t["MountVffsVolumeRequestType"] = reflect.TypeOf((*MountVffsVolumeRequestType)(nil)).Elem()
+}
+
+type MountVffsVolumeResponse struct {
+}
+
+type MountVmfsVolume MountVmfsVolumeRequestType
+
+func init() {
+	t["MountVmfsVolume"] = reflect.TypeOf((*MountVmfsVolume)(nil)).Elem()
+}
+
+type MountVmfsVolumeExRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	VmfsUuid []string               `xml:"vmfsUuid"`
+}
+
+func init() {
+	t["MountVmfsVolumeExRequestType"] = reflect.TypeOf((*MountVmfsVolumeExRequestType)(nil)).Elem()
+}
+
+type MountVmfsVolumeEx_Task MountVmfsVolumeExRequestType
+
+func init() {
+	t["MountVmfsVolumeEx_Task"] = reflect.TypeOf((*MountVmfsVolumeEx_Task)(nil)).Elem()
+}
+
+type MountVmfsVolumeEx_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type MountVmfsVolumeRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	VmfsUuid string                 `xml:"vmfsUuid"`
+}
+
+func init() {
+	t["MountVmfsVolumeRequestType"] = reflect.TypeOf((*MountVmfsVolumeRequestType)(nil)).Elem()
+}
+
+type MountVmfsVolumeResponse struct {
+}
+
+type MoveDVPortRequestType struct {
+	This                    ManagedObjectReference `xml:"_this"`
+	PortKey                 []string               `xml:"portKey"`
+	DestinationPortgroupKey string                 `xml:"destinationPortgroupKey,omitempty"`
+}
+
+func init() {
+	t["MoveDVPortRequestType"] = reflect.TypeOf((*MoveDVPortRequestType)(nil)).Elem()
+}
+
+type MoveDVPort_Task MoveDVPortRequestType
+
+func init() {
+	t["MoveDVPort_Task"] = reflect.TypeOf((*MoveDVPort_Task)(nil)).Elem()
+}
+
+type MoveDVPort_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type MoveDatastoreFileRequestType struct {
+	This                  ManagedObjectReference  `xml:"_this"`
+	SourceName            string                  `xml:"sourceName"`
+	SourceDatacenter      *ManagedObjectReference `xml:"sourceDatacenter,omitempty"`
+	DestinationName       string                  `xml:"destinationName"`
+	DestinationDatacenter *ManagedObjectReference `xml:"destinationDatacenter,omitempty"`
+	Force                 *bool                   `xml:"force"`
+}
+
+func init() {
+	t["MoveDatastoreFileRequestType"] = reflect.TypeOf((*MoveDatastoreFileRequestType)(nil)).Elem()
+}
+
+type MoveDatastoreFile_Task MoveDatastoreFileRequestType
+
+func init() {
+	t["MoveDatastoreFile_Task"] = reflect.TypeOf((*MoveDatastoreFile_Task)(nil)).Elem()
+}
+
+type MoveDatastoreFile_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type MoveDirectoryInGuest MoveDirectoryInGuestRequestType
+
+func init() {
+	t["MoveDirectoryInGuest"] = reflect.TypeOf((*MoveDirectoryInGuest)(nil)).Elem()
+}
+
+type MoveDirectoryInGuestRequestType struct {
+	This             ManagedObjectReference  `xml:"_this"`
+	Vm               ManagedObjectReference  `xml:"vm"`
+	Auth             BaseGuestAuthentication `xml:"auth,typeattr"`
+	SrcDirectoryPath string                  `xml:"srcDirectoryPath"`
+	DstDirectoryPath string                  `xml:"dstDirectoryPath"`
+}
+
+func init() {
+	t["MoveDirectoryInGuestRequestType"] = reflect.TypeOf((*MoveDirectoryInGuestRequestType)(nil)).Elem()
+}
+
+type MoveDirectoryInGuestResponse struct {
+}
+
+type MoveFileInGuest MoveFileInGuestRequestType
+
+func init() {
+	t["MoveFileInGuest"] = reflect.TypeOf((*MoveFileInGuest)(nil)).Elem()
+}
+
+type MoveFileInGuestRequestType struct {
+	This        ManagedObjectReference  `xml:"_this"`
+	Vm          ManagedObjectReference  `xml:"vm"`
+	Auth        BaseGuestAuthentication `xml:"auth,typeattr"`
+	SrcFilePath string                  `xml:"srcFilePath"`
+	DstFilePath string                  `xml:"dstFilePath"`
+	Overwrite   bool                    `xml:"overwrite"`
+}
+
+func init() {
+	t["MoveFileInGuestRequestType"] = reflect.TypeOf((*MoveFileInGuestRequestType)(nil)).Elem()
+}
+
+type MoveFileInGuestResponse struct {
+}
+
+type MoveHostIntoRequestType struct {
+	This         ManagedObjectReference  `xml:"_this"`
+	Host         ManagedObjectReference  `xml:"host"`
+	ResourcePool *ManagedObjectReference `xml:"resourcePool,omitempty"`
+}
+
+func init() {
+	t["MoveHostIntoRequestType"] = reflect.TypeOf((*MoveHostIntoRequestType)(nil)).Elem()
+}
+
+type MoveHostInto_Task MoveHostIntoRequestType
+
+func init() {
+	t["MoveHostInto_Task"] = reflect.TypeOf((*MoveHostInto_Task)(nil)).Elem()
+}
+
+type MoveHostInto_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type MoveIntoFolderRequestType struct {
+	This ManagedObjectReference   `xml:"_this"`
+	List []ManagedObjectReference `xml:"list"`
+}
+
+func init() {
+	t["MoveIntoFolderRequestType"] = reflect.TypeOf((*MoveIntoFolderRequestType)(nil)).Elem()
+}
+
+type MoveIntoFolder_Task MoveIntoFolderRequestType
+
+func init() {
+	t["MoveIntoFolder_Task"] = reflect.TypeOf((*MoveIntoFolder_Task)(nil)).Elem()
+}
+
+type MoveIntoFolder_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type MoveIntoRequestType struct {
+	This ManagedObjectReference   `xml:"_this"`
+	Host []ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["MoveIntoRequestType"] = reflect.TypeOf((*MoveIntoRequestType)(nil)).Elem()
+}
+
+type MoveIntoResourcePool MoveIntoResourcePoolRequestType
+
+func init() {
+	t["MoveIntoResourcePool"] = reflect.TypeOf((*MoveIntoResourcePool)(nil)).Elem()
+}
+
+type MoveIntoResourcePoolRequestType struct {
+	This ManagedObjectReference   `xml:"_this"`
+	List []ManagedObjectReference `xml:"list"`
+}
+
+func init() {
+	t["MoveIntoResourcePoolRequestType"] = reflect.TypeOf((*MoveIntoResourcePoolRequestType)(nil)).Elem()
+}
+
+type MoveIntoResourcePoolResponse struct {
+}
+
+type MoveInto_Task MoveIntoRequestType
+
+func init() {
+	t["MoveInto_Task"] = reflect.TypeOf((*MoveInto_Task)(nil)).Elem()
+}
+
+type MoveInto_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type MoveVirtualDiskRequestType struct {
+	This             ManagedObjectReference          `xml:"_this"`
+	SourceName       string                          `xml:"sourceName"`
+	SourceDatacenter *ManagedObjectReference         `xml:"sourceDatacenter,omitempty"`
+	DestName         string                          `xml:"destName"`
+	DestDatacenter   *ManagedObjectReference         `xml:"destDatacenter,omitempty"`
+	Force            *bool                           `xml:"force"`
+	Profile          []BaseVirtualMachineProfileSpec `xml:"profile,omitempty,typeattr"`
+}
+
+func init() {
+	t["MoveVirtualDiskRequestType"] = reflect.TypeOf((*MoveVirtualDiskRequestType)(nil)).Elem()
+}
+
+type MoveVirtualDisk_Task MoveVirtualDiskRequestType
+
+func init() {
+	t["MoveVirtualDisk_Task"] = reflect.TypeOf((*MoveVirtualDisk_Task)(nil)).Elem()
+}
+
+type MoveVirtualDisk_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type MtuMatchEvent struct {
+	DvsHealthStatusChangeEvent
+}
+
+func init() {
+	t["MtuMatchEvent"] = reflect.TypeOf((*MtuMatchEvent)(nil)).Elem()
+}
+
+type MtuMismatchEvent struct {
+	DvsHealthStatusChangeEvent
+}
+
+func init() {
+	t["MtuMismatchEvent"] = reflect.TypeOf((*MtuMismatchEvent)(nil)).Elem()
+}
+
+type MultiWriterNotSupported struct {
+	DeviceNotSupported
+}
+
+func init() {
+	t["MultiWriterNotSupported"] = reflect.TypeOf((*MultiWriterNotSupported)(nil)).Elem()
+}
+
+type MultiWriterNotSupportedFault MultiWriterNotSupported
+
+func init() {
+	t["MultiWriterNotSupportedFault"] = reflect.TypeOf((*MultiWriterNotSupportedFault)(nil)).Elem()
+}
+
+type MultipleCertificatesVerifyFault struct {
+	HostConnectFault
+
+	ThumbprintData []MultipleCertificatesVerifyFaultThumbprintData `xml:"thumbprintData"`
+}
+
+func init() {
+	t["MultipleCertificatesVerifyFault"] = reflect.TypeOf((*MultipleCertificatesVerifyFault)(nil)).Elem()
+}
+
+type MultipleCertificatesVerifyFaultFault MultipleCertificatesVerifyFault
+
+func init() {
+	t["MultipleCertificatesVerifyFaultFault"] = reflect.TypeOf((*MultipleCertificatesVerifyFaultFault)(nil)).Elem()
+}
+
+type MultipleCertificatesVerifyFaultThumbprintData struct {
+	DynamicData
+
+	Port       int32  `xml:"port"`
+	Thumbprint string `xml:"thumbprint"`
+}
+
+func init() {
+	t["MultipleCertificatesVerifyFaultThumbprintData"] = reflect.TypeOf((*MultipleCertificatesVerifyFaultThumbprintData)(nil)).Elem()
+}
+
+type MultipleSnapshotsNotSupported struct {
+	SnapshotFault
+}
+
+func init() {
+	t["MultipleSnapshotsNotSupported"] = reflect.TypeOf((*MultipleSnapshotsNotSupported)(nil)).Elem()
+}
+
+type MultipleSnapshotsNotSupportedFault MultipleSnapshotsNotSupported
+
+func init() {
+	t["MultipleSnapshotsNotSupportedFault"] = reflect.TypeOf((*MultipleSnapshotsNotSupportedFault)(nil)).Elem()
+}
+
+type NASDatastoreCreatedEvent struct {
+	HostEvent
+
+	Datastore    DatastoreEventArgument `xml:"datastore"`
+	DatastoreUrl string                 `xml:"datastoreUrl,omitempty"`
+}
+
+func init() {
+	t["NASDatastoreCreatedEvent"] = reflect.TypeOf((*NASDatastoreCreatedEvent)(nil)).Elem()
+}
+
+type NamePasswordAuthentication struct {
+	GuestAuthentication
+
+	Username string `xml:"username"`
+	Password string `xml:"password"`
+}
+
+func init() {
+	t["NamePasswordAuthentication"] = reflect.TypeOf((*NamePasswordAuthentication)(nil)).Elem()
+}
+
+type NamespaceFull struct {
+	VimFault
+
+	Name           string `xml:"name"`
+	CurrentMaxSize int64  `xml:"currentMaxSize"`
+	RequiredSize   int64  `xml:"requiredSize,omitempty"`
+}
+
+func init() {
+	t["NamespaceFull"] = reflect.TypeOf((*NamespaceFull)(nil)).Elem()
+}
+
+type NamespaceFullFault NamespaceFull
+
+func init() {
+	t["NamespaceFullFault"] = reflect.TypeOf((*NamespaceFullFault)(nil)).Elem()
+}
+
+type NamespaceLimitReached struct {
+	VimFault
+
+	Limit int32 `xml:"limit,omitempty"`
+}
+
+func init() {
+	t["NamespaceLimitReached"] = reflect.TypeOf((*NamespaceLimitReached)(nil)).Elem()
+}
+
+type NamespaceLimitReachedFault NamespaceLimitReached
+
+func init() {
+	t["NamespaceLimitReachedFault"] = reflect.TypeOf((*NamespaceLimitReachedFault)(nil)).Elem()
+}
+
+type NamespaceWriteProtected struct {
+	VimFault
+
+	Name string `xml:"name"`
+}
+
+func init() {
+	t["NamespaceWriteProtected"] = reflect.TypeOf((*NamespaceWriteProtected)(nil)).Elem()
+}
+
+type NamespaceWriteProtectedFault NamespaceWriteProtected
+
+func init() {
+	t["NamespaceWriteProtectedFault"] = reflect.TypeOf((*NamespaceWriteProtectedFault)(nil)).Elem()
+}
+
+type NasConfigFault struct {
+	HostConfigFault
+
+	Name string `xml:"name"`
+}
+
+func init() {
+	t["NasConfigFault"] = reflect.TypeOf((*NasConfigFault)(nil)).Elem()
+}
+
+type NasConfigFaultFault BaseNasConfigFault
+
+func init() {
+	t["NasConfigFaultFault"] = reflect.TypeOf((*NasConfigFaultFault)(nil)).Elem()
+}
+
+type NasConnectionLimitReached struct {
+	NasConfigFault
+
+	RemoteHost string `xml:"remoteHost"`
+	RemotePath string `xml:"remotePath"`
+}
+
+func init() {
+	t["NasConnectionLimitReached"] = reflect.TypeOf((*NasConnectionLimitReached)(nil)).Elem()
+}
+
+type NasConnectionLimitReachedFault NasConnectionLimitReached
+
+func init() {
+	t["NasConnectionLimitReachedFault"] = reflect.TypeOf((*NasConnectionLimitReachedFault)(nil)).Elem()
+}
+
+type NasDatastoreInfo struct {
+	DatastoreInfo
+
+	Nas *HostNasVolume `xml:"nas,omitempty"`
+}
+
+func init() {
+	t["NasDatastoreInfo"] = reflect.TypeOf((*NasDatastoreInfo)(nil)).Elem()
+}
+
+type NasSessionCredentialConflict struct {
+	NasConfigFault
+
+	RemoteHost string `xml:"remoteHost"`
+	RemotePath string `xml:"remotePath"`
+	UserName   string `xml:"userName"`
+}
+
+func init() {
+	t["NasSessionCredentialConflict"] = reflect.TypeOf((*NasSessionCredentialConflict)(nil)).Elem()
+}
+
+type NasSessionCredentialConflictFault NasSessionCredentialConflict
+
+func init() {
+	t["NasSessionCredentialConflictFault"] = reflect.TypeOf((*NasSessionCredentialConflictFault)(nil)).Elem()
+}
+
+type NasStorageProfile struct {
+	ApplyProfile
+
+	Key string `xml:"key"`
+}
+
+func init() {
+	t["NasStorageProfile"] = reflect.TypeOf((*NasStorageProfile)(nil)).Elem()
+}
+
+type NasVolumeNotMounted struct {
+	NasConfigFault
+
+	RemoteHost string `xml:"remoteHost"`
+	RemotePath string `xml:"remotePath"`
+}
+
+func init() {
+	t["NasVolumeNotMounted"] = reflect.TypeOf((*NasVolumeNotMounted)(nil)).Elem()
+}
+
+type NasVolumeNotMountedFault NasVolumeNotMounted
+
+func init() {
+	t["NasVolumeNotMountedFault"] = reflect.TypeOf((*NasVolumeNotMountedFault)(nil)).Elem()
+}
+
+type NegatableExpression struct {
+	DynamicData
+
+	Negate *bool `xml:"negate"`
+}
+
+func init() {
+	t["NegatableExpression"] = reflect.TypeOf((*NegatableExpression)(nil)).Elem()
+}
+
+type NetBIOSConfigInfo struct {
+	DynamicData
+
+	Mode string `xml:"mode"`
+}
+
+func init() {
+	t["NetBIOSConfigInfo"] = reflect.TypeOf((*NetBIOSConfigInfo)(nil)).Elem()
+}
+
+type NetDhcpConfigInfo struct {
+	DynamicData
+
+	Ipv6 *NetDhcpConfigInfoDhcpOptions `xml:"ipv6,omitempty"`
+	Ipv4 *NetDhcpConfigInfoDhcpOptions `xml:"ipv4,omitempty"`
+}
+
+func init() {
+	t["NetDhcpConfigInfo"] = reflect.TypeOf((*NetDhcpConfigInfo)(nil)).Elem()
+}
+
+type NetDhcpConfigInfoDhcpOptions struct {
+	DynamicData
+
+	Enable bool       `xml:"enable"`
+	Config []KeyValue `xml:"config,omitempty"`
+}
+
+func init() {
+	t["NetDhcpConfigInfoDhcpOptions"] = reflect.TypeOf((*NetDhcpConfigInfoDhcpOptions)(nil)).Elem()
+}
+
+type NetDhcpConfigSpec struct {
+	DynamicData
+
+	Ipv6 *NetDhcpConfigSpecDhcpOptionsSpec `xml:"ipv6,omitempty"`
+	Ipv4 *NetDhcpConfigSpecDhcpOptionsSpec `xml:"ipv4,omitempty"`
+}
+
+func init() {
+	t["NetDhcpConfigSpec"] = reflect.TypeOf((*NetDhcpConfigSpec)(nil)).Elem()
+}
+
+type NetDhcpConfigSpecDhcpOptionsSpec struct {
+	DynamicData
+
+	Enable    *bool      `xml:"enable"`
+	Config    []KeyValue `xml:"config"`
+	Operation string     `xml:"operation"`
+}
+
+func init() {
+	t["NetDhcpConfigSpecDhcpOptionsSpec"] = reflect.TypeOf((*NetDhcpConfigSpecDhcpOptionsSpec)(nil)).Elem()
+}
+
+type NetDnsConfigInfo struct {
+	DynamicData
+
+	Dhcp         bool     `xml:"dhcp"`
+	HostName     string   `xml:"hostName"`
+	DomainName   string   `xml:"domainName"`
+	IpAddress    []string `xml:"ipAddress,omitempty"`
+	SearchDomain []string `xml:"searchDomain,omitempty"`
+}
+
+func init() {
+	t["NetDnsConfigInfo"] = reflect.TypeOf((*NetDnsConfigInfo)(nil)).Elem()
+}
+
+type NetDnsConfigSpec struct {
+	DynamicData
+
+	Dhcp         *bool    `xml:"dhcp"`
+	HostName     string   `xml:"hostName,omitempty"`
+	DomainName   string   `xml:"domainName,omitempty"`
+	IpAddress    []string `xml:"ipAddress,omitempty"`
+	SearchDomain []string `xml:"searchDomain,omitempty"`
+}
+
+func init() {
+	t["NetDnsConfigSpec"] = reflect.TypeOf((*NetDnsConfigSpec)(nil)).Elem()
+}
+
+type NetIpConfigInfo struct {
+	DynamicData
+
+	IpAddress                []NetIpConfigInfoIpAddress `xml:"ipAddress,omitempty"`
+	Dhcp                     *NetDhcpConfigInfo         `xml:"dhcp,omitempty"`
+	AutoConfigurationEnabled *bool                      `xml:"autoConfigurationEnabled"`
+}
+
+func init() {
+	t["NetIpConfigInfo"] = reflect.TypeOf((*NetIpConfigInfo)(nil)).Elem()
+}
+
+type NetIpConfigInfoIpAddress struct {
+	DynamicData
+
+	IpAddress    string     `xml:"ipAddress"`
+	PrefixLength int32      `xml:"prefixLength"`
+	Origin       string     `xml:"origin,omitempty"`
+	State        string     `xml:"state,omitempty"`
+	Lifetime     *time.Time `xml:"lifetime"`
+}
+
+func init() {
+	t["NetIpConfigInfoIpAddress"] = reflect.TypeOf((*NetIpConfigInfoIpAddress)(nil)).Elem()
+}
+
+type NetIpConfigSpec struct {
+	DynamicData
+
+	IpAddress                []NetIpConfigSpecIpAddressSpec `xml:"ipAddress,omitempty"`
+	Dhcp                     *NetDhcpConfigSpec             `xml:"dhcp,omitempty"`
+	AutoConfigurationEnabled *bool                          `xml:"autoConfigurationEnabled"`
+}
+
+func init() {
+	t["NetIpConfigSpec"] = reflect.TypeOf((*NetIpConfigSpec)(nil)).Elem()
+}
+
+type NetIpConfigSpecIpAddressSpec struct {
+	DynamicData
+
+	IpAddress    string `xml:"ipAddress"`
+	PrefixLength int32  `xml:"prefixLength"`
+	Operation    string `xml:"operation"`
+}
+
+func init() {
+	t["NetIpConfigSpecIpAddressSpec"] = reflect.TypeOf((*NetIpConfigSpecIpAddressSpec)(nil)).Elem()
+}
+
+type NetIpRouteConfigInfo struct {
+	DynamicData
+
+	IpRoute []NetIpRouteConfigInfoIpRoute `xml:"ipRoute,omitempty"`
+}
+
+func init() {
+	t["NetIpRouteConfigInfo"] = reflect.TypeOf((*NetIpRouteConfigInfo)(nil)).Elem()
+}
+
+type NetIpRouteConfigInfoGateway struct {
+	DynamicData
+
+	IpAddress string `xml:"ipAddress,omitempty"`
+	Device    string `xml:"device,omitempty"`
+}
+
+func init() {
+	t["NetIpRouteConfigInfoGateway"] = reflect.TypeOf((*NetIpRouteConfigInfoGateway)(nil)).Elem()
+}
+
+type NetIpRouteConfigInfoIpRoute struct {
+	DynamicData
+
+	Network      string                      `xml:"network"`
+	PrefixLength int32                       `xml:"prefixLength"`
+	Gateway      NetIpRouteConfigInfoGateway `xml:"gateway"`
+}
+
+func init() {
+	t["NetIpRouteConfigInfoIpRoute"] = reflect.TypeOf((*NetIpRouteConfigInfoIpRoute)(nil)).Elem()
+}
+
+type NetIpRouteConfigSpec struct {
+	DynamicData
+
+	IpRoute []NetIpRouteConfigSpecIpRouteSpec `xml:"ipRoute,omitempty"`
+}
+
+func init() {
+	t["NetIpRouteConfigSpec"] = reflect.TypeOf((*NetIpRouteConfigSpec)(nil)).Elem()
+}
+
+type NetIpRouteConfigSpecGatewaySpec struct {
+	DynamicData
+
+	IpAddress string `xml:"ipAddress,omitempty"`
+	Device    string `xml:"device,omitempty"`
+}
+
+func init() {
+	t["NetIpRouteConfigSpecGatewaySpec"] = reflect.TypeOf((*NetIpRouteConfigSpecGatewaySpec)(nil)).Elem()
+}
+
+type NetIpRouteConfigSpecIpRouteSpec struct {
+	DynamicData
+
+	Network      string                          `xml:"network"`
+	PrefixLength int32                           `xml:"prefixLength"`
+	Gateway      NetIpRouteConfigSpecGatewaySpec `xml:"gateway"`
+	Operation    string                          `xml:"operation"`
+}
+
+func init() {
+	t["NetIpRouteConfigSpecIpRouteSpec"] = reflect.TypeOf((*NetIpRouteConfigSpecIpRouteSpec)(nil)).Elem()
+}
+
+type NetIpStackInfo struct {
+	DynamicData
+
+	Neighbor      []NetIpStackInfoNetToMedia    `xml:"neighbor,omitempty"`
+	DefaultRouter []NetIpStackInfoDefaultRouter `xml:"defaultRouter,omitempty"`
+}
+
+func init() {
+	t["NetIpStackInfo"] = reflect.TypeOf((*NetIpStackInfo)(nil)).Elem()
+}
+
+type NetIpStackInfoDefaultRouter struct {
+	DynamicData
+
+	IpAddress  string    `xml:"ipAddress"`
+	Device     string    `xml:"device"`
+	Lifetime   time.Time `xml:"lifetime"`
+	Preference string    `xml:"preference"`
+}
+
+func init() {
+	t["NetIpStackInfoDefaultRouter"] = reflect.TypeOf((*NetIpStackInfoDefaultRouter)(nil)).Elem()
+}
+
+type NetIpStackInfoNetToMedia struct {
+	DynamicData
+
+	IpAddress       string `xml:"ipAddress"`
+	PhysicalAddress string `xml:"physicalAddress"`
+	Device          string `xml:"device"`
+	Type            string `xml:"type"`
+}
+
+func init() {
+	t["NetIpStackInfoNetToMedia"] = reflect.TypeOf((*NetIpStackInfoNetToMedia)(nil)).Elem()
+}
+
+type NetStackInstanceProfile struct {
+	ApplyProfile
+
+	Key           string                         `xml:"key"`
+	DnsConfig     NetworkProfileDnsConfigProfile `xml:"dnsConfig"`
+	IpRouteConfig IpRouteProfile                 `xml:"ipRouteConfig"`
+}
+
+func init() {
+	t["NetStackInstanceProfile"] = reflect.TypeOf((*NetStackInstanceProfile)(nil)).Elem()
+}
+
+type NetworkCopyFault struct {
+	FileFault
+}
+
+func init() {
+	t["NetworkCopyFault"] = reflect.TypeOf((*NetworkCopyFault)(nil)).Elem()
+}
+
+type NetworkCopyFaultFault NetworkCopyFault
+
+func init() {
+	t["NetworkCopyFaultFault"] = reflect.TypeOf((*NetworkCopyFaultFault)(nil)).Elem()
+}
+
+type NetworkDisruptedAndConfigRolledBack struct {
+	VimFault
+
+	Host string `xml:"host"`
+}
+
+func init() {
+	t["NetworkDisruptedAndConfigRolledBack"] = reflect.TypeOf((*NetworkDisruptedAndConfigRolledBack)(nil)).Elem()
+}
+
+type NetworkDisruptedAndConfigRolledBackFault NetworkDisruptedAndConfigRolledBack
+
+func init() {
+	t["NetworkDisruptedAndConfigRolledBackFault"] = reflect.TypeOf((*NetworkDisruptedAndConfigRolledBackFault)(nil)).Elem()
+}
+
+type NetworkEventArgument struct {
+	EntityEventArgument
+
+	Network ManagedObjectReference `xml:"network"`
+}
+
+func init() {
+	t["NetworkEventArgument"] = reflect.TypeOf((*NetworkEventArgument)(nil)).Elem()
+}
+
+type NetworkInaccessible struct {
+	NasConfigFault
+}
+
+func init() {
+	t["NetworkInaccessible"] = reflect.TypeOf((*NetworkInaccessible)(nil)).Elem()
+}
+
+type NetworkInaccessibleFault NetworkInaccessible
+
+func init() {
+	t["NetworkInaccessibleFault"] = reflect.TypeOf((*NetworkInaccessibleFault)(nil)).Elem()
+}
+
+type NetworkPolicyProfile struct {
+	ApplyProfile
+}
+
+func init() {
+	t["NetworkPolicyProfile"] = reflect.TypeOf((*NetworkPolicyProfile)(nil)).Elem()
+}
+
+type NetworkProfile struct {
+	ApplyProfile
+
+	Vswitch                 []VirtualSwitchProfile           `xml:"vswitch,omitempty"`
+	VmPortGroup             []VmPortGroupProfile             `xml:"vmPortGroup,omitempty"`
+	HostPortGroup           []HostPortGroupProfile           `xml:"hostPortGroup,omitempty"`
+	ServiceConsolePortGroup []ServiceConsolePortGroupProfile `xml:"serviceConsolePortGroup,omitempty"`
+	DnsConfig               *NetworkProfileDnsConfigProfile  `xml:"dnsConfig,omitempty"`
+	IpRouteConfig           *IpRouteProfile                  `xml:"ipRouteConfig,omitempty"`
+	ConsoleIpRouteConfig    *IpRouteProfile                  `xml:"consoleIpRouteConfig,omitempty"`
+	Pnic                    []PhysicalNicProfile             `xml:"pnic,omitempty"`
+	Dvswitch                []DvsProfile                     `xml:"dvswitch,omitempty"`
+	DvsServiceConsoleNic    []DvsServiceConsoleVNicProfile   `xml:"dvsServiceConsoleNic,omitempty"`
+	DvsHostNic              []DvsHostVNicProfile             `xml:"dvsHostNic,omitempty"`
+	NetStackInstance        []NetStackInstanceProfile        `xml:"netStackInstance,omitempty"`
+}
+
+func init() {
+	t["NetworkProfile"] = reflect.TypeOf((*NetworkProfile)(nil)).Elem()
+}
+
+type NetworkProfileDnsConfigProfile struct {
+	ApplyProfile
+}
+
+func init() {
+	t["NetworkProfileDnsConfigProfile"] = reflect.TypeOf((*NetworkProfileDnsConfigProfile)(nil)).Elem()
+}
+
+type NetworkRollbackEvent struct {
+	Event
+
+	MethodName    string `xml:"methodName"`
+	TransactionId string `xml:"transactionId"`
+}
+
+func init() {
+	t["NetworkRollbackEvent"] = reflect.TypeOf((*NetworkRollbackEvent)(nil)).Elem()
+}
+
+type NetworkSummary struct {
+	DynamicData
+
+	Network    *ManagedObjectReference `xml:"network,omitempty"`
+	Name       string                  `xml:"name"`
+	Accessible bool                    `xml:"accessible"`
+	IpPoolName string                  `xml:"ipPoolName,omitempty"`
+	IpPoolId   int32                   `xml:"ipPoolId,omitempty"`
+}
+
+func init() {
+	t["NetworkSummary"] = reflect.TypeOf((*NetworkSummary)(nil)).Elem()
+}
+
+type NetworksMayNotBeTheSame struct {
+	MigrationFault
+
+	Name string `xml:"name,omitempty"`
+}
+
+func init() {
+	t["NetworksMayNotBeTheSame"] = reflect.TypeOf((*NetworksMayNotBeTheSame)(nil)).Elem()
+}
+
+type NetworksMayNotBeTheSameFault NetworksMayNotBeTheSame
+
+func init() {
+	t["NetworksMayNotBeTheSameFault"] = reflect.TypeOf((*NetworksMayNotBeTheSameFault)(nil)).Elem()
+}
+
+type NicSettingMismatch struct {
+	CustomizationFault
+
+	NumberOfNicsInSpec int32 `xml:"numberOfNicsInSpec"`
+	NumberOfNicsInVM   int32 `xml:"numberOfNicsInVM"`
+}
+
+func init() {
+	t["NicSettingMismatch"] = reflect.TypeOf((*NicSettingMismatch)(nil)).Elem()
+}
+
+type NicSettingMismatchFault NicSettingMismatch
+
+func init() {
+	t["NicSettingMismatchFault"] = reflect.TypeOf((*NicSettingMismatchFault)(nil)).Elem()
+}
+
+type NoAccessUserEvent struct {
+	SessionEvent
+
+	IpAddress string `xml:"ipAddress"`
+}
+
+func init() {
+	t["NoAccessUserEvent"] = reflect.TypeOf((*NoAccessUserEvent)(nil)).Elem()
+}
+
+type NoActiveHostInCluster struct {
+	InvalidState
+
+	ComputeResource ManagedObjectReference `xml:"computeResource"`
+}
+
+func init() {
+	t["NoActiveHostInCluster"] = reflect.TypeOf((*NoActiveHostInCluster)(nil)).Elem()
+}
+
+type NoActiveHostInClusterFault NoActiveHostInCluster
+
+func init() {
+	t["NoActiveHostInClusterFault"] = reflect.TypeOf((*NoActiveHostInClusterFault)(nil)).Elem()
+}
+
+type NoAvailableIp struct {
+	VAppPropertyFault
+
+	Network ManagedObjectReference `xml:"network"`
+}
+
+func init() {
+	t["NoAvailableIp"] = reflect.TypeOf((*NoAvailableIp)(nil)).Elem()
+}
+
+type NoAvailableIpFault NoAvailableIp
+
+func init() {
+	t["NoAvailableIpFault"] = reflect.TypeOf((*NoAvailableIpFault)(nil)).Elem()
+}
+
+type NoClientCertificate struct {
+	VimFault
+}
+
+func init() {
+	t["NoClientCertificate"] = reflect.TypeOf((*NoClientCertificate)(nil)).Elem()
+}
+
+type NoClientCertificateFault NoClientCertificate
+
+func init() {
+	t["NoClientCertificateFault"] = reflect.TypeOf((*NoClientCertificateFault)(nil)).Elem()
+}
+
+type NoCompatibleDatastore struct {
+	VimFault
+}
+
+func init() {
+	t["NoCompatibleDatastore"] = reflect.TypeOf((*NoCompatibleDatastore)(nil)).Elem()
+}
+
+type NoCompatibleDatastoreFault NoCompatibleDatastore
+
+func init() {
+	t["NoCompatibleDatastoreFault"] = reflect.TypeOf((*NoCompatibleDatastoreFault)(nil)).Elem()
+}
+
+type NoCompatibleHardAffinityHost struct {
+	VmConfigFault
+
+	VmName string `xml:"vmName"`
+}
+
+func init() {
+	t["NoCompatibleHardAffinityHost"] = reflect.TypeOf((*NoCompatibleHardAffinityHost)(nil)).Elem()
+}
+
+type NoCompatibleHardAffinityHostFault NoCompatibleHardAffinityHost
+
+func init() {
+	t["NoCompatibleHardAffinityHostFault"] = reflect.TypeOf((*NoCompatibleHardAffinityHostFault)(nil)).Elem()
+}
+
+type NoCompatibleHost struct {
+	VimFault
+
+	Host  []ManagedObjectReference `xml:"host,omitempty"`
+	Error []LocalizedMethodFault   `xml:"error,omitempty"`
+}
+
+func init() {
+	t["NoCompatibleHost"] = reflect.TypeOf((*NoCompatibleHost)(nil)).Elem()
+}
+
+type NoCompatibleHostFault BaseNoCompatibleHost
+
+func init() {
+	t["NoCompatibleHostFault"] = reflect.TypeOf((*NoCompatibleHostFault)(nil)).Elem()
+}
+
+type NoCompatibleHostWithAccessToDevice struct {
+	NoCompatibleHost
+}
+
+func init() {
+	t["NoCompatibleHostWithAccessToDevice"] = reflect.TypeOf((*NoCompatibleHostWithAccessToDevice)(nil)).Elem()
+}
+
+type NoCompatibleHostWithAccessToDeviceFault NoCompatibleHostWithAccessToDevice
+
+func init() {
+	t["NoCompatibleHostWithAccessToDeviceFault"] = reflect.TypeOf((*NoCompatibleHostWithAccessToDeviceFault)(nil)).Elem()
+}
+
+type NoCompatibleSoftAffinityHost struct {
+	VmConfigFault
+
+	VmName string `xml:"vmName"`
+}
+
+func init() {
+	t["NoCompatibleSoftAffinityHost"] = reflect.TypeOf((*NoCompatibleSoftAffinityHost)(nil)).Elem()
+}
+
+type NoCompatibleSoftAffinityHostFault NoCompatibleSoftAffinityHost
+
+func init() {
+	t["NoCompatibleSoftAffinityHostFault"] = reflect.TypeOf((*NoCompatibleSoftAffinityHostFault)(nil)).Elem()
+}
+
+type NoConnectedDatastore struct {
+	VimFault
+}
+
+func init() {
+	t["NoConnectedDatastore"] = reflect.TypeOf((*NoConnectedDatastore)(nil)).Elem()
+}
+
+type NoConnectedDatastoreFault NoConnectedDatastore
+
+func init() {
+	t["NoConnectedDatastoreFault"] = reflect.TypeOf((*NoConnectedDatastoreFault)(nil)).Elem()
+}
+
+type NoDatastoresConfiguredEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["NoDatastoresConfiguredEvent"] = reflect.TypeOf((*NoDatastoresConfiguredEvent)(nil)).Elem()
+}
+
+type NoDiskFound struct {
+	VimFault
+}
+
+func init() {
+	t["NoDiskFound"] = reflect.TypeOf((*NoDiskFound)(nil)).Elem()
+}
+
+type NoDiskFoundFault NoDiskFound
+
+func init() {
+	t["NoDiskFoundFault"] = reflect.TypeOf((*NoDiskFoundFault)(nil)).Elem()
+}
+
+type NoDiskSpace struct {
+	FileFault
+
+	Datastore string `xml:"datastore"`
+}
+
+func init() {
+	t["NoDiskSpace"] = reflect.TypeOf((*NoDiskSpace)(nil)).Elem()
+}
+
+type NoDiskSpaceFault NoDiskSpace
+
+func init() {
+	t["NoDiskSpaceFault"] = reflect.TypeOf((*NoDiskSpaceFault)(nil)).Elem()
+}
+
+type NoDisksToCustomize struct {
+	CustomizationFault
+}
+
+func init() {
+	t["NoDisksToCustomize"] = reflect.TypeOf((*NoDisksToCustomize)(nil)).Elem()
+}
+
+type NoDisksToCustomizeFault NoDisksToCustomize
+
+func init() {
+	t["NoDisksToCustomizeFault"] = reflect.TypeOf((*NoDisksToCustomizeFault)(nil)).Elem()
+}
+
+type NoGateway struct {
+	HostConfigFault
+}
+
+func init() {
+	t["NoGateway"] = reflect.TypeOf((*NoGateway)(nil)).Elem()
+}
+
+type NoGatewayFault NoGateway
+
+func init() {
+	t["NoGatewayFault"] = reflect.TypeOf((*NoGatewayFault)(nil)).Elem()
+}
+
+type NoGuestHeartbeat struct {
+	MigrationFault
+}
+
+func init() {
+	t["NoGuestHeartbeat"] = reflect.TypeOf((*NoGuestHeartbeat)(nil)).Elem()
+}
+
+type NoGuestHeartbeatFault NoGuestHeartbeat
+
+func init() {
+	t["NoGuestHeartbeatFault"] = reflect.TypeOf((*NoGuestHeartbeatFault)(nil)).Elem()
+}
+
+type NoHost struct {
+	HostConnectFault
+
+	Name string `xml:"name,omitempty"`
+}
+
+func init() {
+	t["NoHost"] = reflect.TypeOf((*NoHost)(nil)).Elem()
+}
+
+type NoHostFault NoHost
+
+func init() {
+	t["NoHostFault"] = reflect.TypeOf((*NoHostFault)(nil)).Elem()
+}
+
+type NoHostSuitableForFtSecondary struct {
+	VmFaultToleranceIssue
+
+	Vm     ManagedObjectReference `xml:"vm"`
+	VmName string                 `xml:"vmName"`
+}
+
+func init() {
+	t["NoHostSuitableForFtSecondary"] = reflect.TypeOf((*NoHostSuitableForFtSecondary)(nil)).Elem()
+}
+
+type NoHostSuitableForFtSecondaryFault NoHostSuitableForFtSecondary
+
+func init() {
+	t["NoHostSuitableForFtSecondaryFault"] = reflect.TypeOf((*NoHostSuitableForFtSecondaryFault)(nil)).Elem()
+}
+
+type NoLicenseEvent struct {
+	LicenseEvent
+
+	Feature LicenseFeatureInfo `xml:"feature"`
+}
+
+func init() {
+	t["NoLicenseEvent"] = reflect.TypeOf((*NoLicenseEvent)(nil)).Elem()
+}
+
+type NoLicenseServerConfigured struct {
+	NotEnoughLicenses
+}
+
+func init() {
+	t["NoLicenseServerConfigured"] = reflect.TypeOf((*NoLicenseServerConfigured)(nil)).Elem()
+}
+
+type NoLicenseServerConfiguredFault NoLicenseServerConfigured
+
+func init() {
+	t["NoLicenseServerConfiguredFault"] = reflect.TypeOf((*NoLicenseServerConfiguredFault)(nil)).Elem()
+}
+
+type NoMaintenanceModeDrsRecommendationForVM struct {
+	VmEvent
+}
+
+func init() {
+	t["NoMaintenanceModeDrsRecommendationForVM"] = reflect.TypeOf((*NoMaintenanceModeDrsRecommendationForVM)(nil)).Elem()
+}
+
+type NoPeerHostFound struct {
+	HostPowerOpFailed
+}
+
+func init() {
+	t["NoPeerHostFound"] = reflect.TypeOf((*NoPeerHostFound)(nil)).Elem()
+}
+
+type NoPeerHostFoundFault NoPeerHostFound
+
+func init() {
+	t["NoPeerHostFoundFault"] = reflect.TypeOf((*NoPeerHostFoundFault)(nil)).Elem()
+}
+
+type NoPermission struct {
+	SecurityError
+
+	Object      ManagedObjectReference `xml:"object"`
+	PrivilegeId string                 `xml:"privilegeId"`
+}
+
+func init() {
+	t["NoPermission"] = reflect.TypeOf((*NoPermission)(nil)).Elem()
+}
+
+type NoPermissionFault BaseNoPermission
+
+func init() {
+	t["NoPermissionFault"] = reflect.TypeOf((*NoPermissionFault)(nil)).Elem()
+}
+
+type NoPermissionOnAD struct {
+	ActiveDirectoryFault
+}
+
+func init() {
+	t["NoPermissionOnAD"] = reflect.TypeOf((*NoPermissionOnAD)(nil)).Elem()
+}
+
+type NoPermissionOnADFault NoPermissionOnAD
+
+func init() {
+	t["NoPermissionOnADFault"] = reflect.TypeOf((*NoPermissionOnADFault)(nil)).Elem()
+}
+
+type NoPermissionOnHost struct {
+	HostConnectFault
+}
+
+func init() {
+	t["NoPermissionOnHost"] = reflect.TypeOf((*NoPermissionOnHost)(nil)).Elem()
+}
+
+type NoPermissionOnHostFault NoPermissionOnHost
+
+func init() {
+	t["NoPermissionOnHostFault"] = reflect.TypeOf((*NoPermissionOnHostFault)(nil)).Elem()
+}
+
+type NoPermissionOnNasVolume struct {
+	NasConfigFault
+
+	UserName string `xml:"userName,omitempty"`
+}
+
+func init() {
+	t["NoPermissionOnNasVolume"] = reflect.TypeOf((*NoPermissionOnNasVolume)(nil)).Elem()
+}
+
+type NoPermissionOnNasVolumeFault NoPermissionOnNasVolume
+
+func init() {
+	t["NoPermissionOnNasVolumeFault"] = reflect.TypeOf((*NoPermissionOnNasVolumeFault)(nil)).Elem()
+}
+
+type NoSubjectName struct {
+	VimFault
+}
+
+func init() {
+	t["NoSubjectName"] = reflect.TypeOf((*NoSubjectName)(nil)).Elem()
+}
+
+type NoSubjectNameFault NoSubjectName
+
+func init() {
+	t["NoSubjectNameFault"] = reflect.TypeOf((*NoSubjectNameFault)(nil)).Elem()
+}
+
+type NoVcManagedIpConfigured struct {
+	VAppPropertyFault
+}
+
+func init() {
+	t["NoVcManagedIpConfigured"] = reflect.TypeOf((*NoVcManagedIpConfigured)(nil)).Elem()
+}
+
+type NoVcManagedIpConfiguredFault NoVcManagedIpConfigured
+
+func init() {
+	t["NoVcManagedIpConfiguredFault"] = reflect.TypeOf((*NoVcManagedIpConfiguredFault)(nil)).Elem()
+}
+
+type NoVirtualNic struct {
+	HostConfigFault
+}
+
+func init() {
+	t["NoVirtualNic"] = reflect.TypeOf((*NoVirtualNic)(nil)).Elem()
+}
+
+type NoVirtualNicFault NoVirtualNic
+
+func init() {
+	t["NoVirtualNicFault"] = reflect.TypeOf((*NoVirtualNicFault)(nil)).Elem()
+}
+
+type NoVmInVApp struct {
+	VAppConfigFault
+}
+
+func init() {
+	t["NoVmInVApp"] = reflect.TypeOf((*NoVmInVApp)(nil)).Elem()
+}
+
+type NoVmInVAppFault NoVmInVApp
+
+func init() {
+	t["NoVmInVAppFault"] = reflect.TypeOf((*NoVmInVAppFault)(nil)).Elem()
+}
+
+type NodeDeploymentSpec struct {
+	DynamicData
+
+	EsxHost                 *ManagedObjectReference `xml:"esxHost,omitempty"`
+	Datastore               *ManagedObjectReference `xml:"datastore,omitempty"`
+	PublicNetworkPortGroup  *ManagedObjectReference `xml:"publicNetworkPortGroup,omitempty"`
+	ClusterNetworkPortGroup *ManagedObjectReference `xml:"clusterNetworkPortGroup,omitempty"`
+	Folder                  ManagedObjectReference  `xml:"folder"`
+	ResourcePool            *ManagedObjectReference `xml:"resourcePool,omitempty"`
+	ManagementVc            *ServiceLocator         `xml:"managementVc,omitempty"`
+	NodeName                string                  `xml:"nodeName"`
+	IpSettings              CustomizationIPSettings `xml:"ipSettings"`
+}
+
+func init() {
+	t["NodeDeploymentSpec"] = reflect.TypeOf((*NodeDeploymentSpec)(nil)).Elem()
+}
+
+type NodeNetworkSpec struct {
+	DynamicData
+
+	IpSettings CustomizationIPSettings `xml:"ipSettings"`
+}
+
+func init() {
+	t["NodeNetworkSpec"] = reflect.TypeOf((*NodeNetworkSpec)(nil)).Elem()
+}
+
+type NonADUserRequired struct {
+	ActiveDirectoryFault
+}
+
+func init() {
+	t["NonADUserRequired"] = reflect.TypeOf((*NonADUserRequired)(nil)).Elem()
+}
+
+type NonADUserRequiredFault NonADUserRequired
+
+func init() {
+	t["NonADUserRequiredFault"] = reflect.TypeOf((*NonADUserRequiredFault)(nil)).Elem()
+}
+
+type NonHomeRDMVMotionNotSupported struct {
+	MigrationFeatureNotSupported
+
+	Device string `xml:"device"`
+}
+
+func init() {
+	t["NonHomeRDMVMotionNotSupported"] = reflect.TypeOf((*NonHomeRDMVMotionNotSupported)(nil)).Elem()
+}
+
+type NonHomeRDMVMotionNotSupportedFault NonHomeRDMVMotionNotSupported
+
+func init() {
+	t["NonHomeRDMVMotionNotSupportedFault"] = reflect.TypeOf((*NonHomeRDMVMotionNotSupportedFault)(nil)).Elem()
+}
+
+type NonPersistentDisksNotSupported struct {
+	DeviceNotSupported
+}
+
+func init() {
+	t["NonPersistentDisksNotSupported"] = reflect.TypeOf((*NonPersistentDisksNotSupported)(nil)).Elem()
+}
+
+type NonPersistentDisksNotSupportedFault NonPersistentDisksNotSupported
+
+func init() {
+	t["NonPersistentDisksNotSupportedFault"] = reflect.TypeOf((*NonPersistentDisksNotSupportedFault)(nil)).Elem()
+}
+
+type NonVIWorkloadDetectedOnDatastoreEvent struct {
+	DatastoreEvent
+}
+
+func init() {
+	t["NonVIWorkloadDetectedOnDatastoreEvent"] = reflect.TypeOf((*NonVIWorkloadDetectedOnDatastoreEvent)(nil)).Elem()
+}
+
+type NonVmwareOuiMacNotSupportedHost struct {
+	NotSupportedHost
+
+	HostName string `xml:"hostName"`
+}
+
+func init() {
+	t["NonVmwareOuiMacNotSupportedHost"] = reflect.TypeOf((*NonVmwareOuiMacNotSupportedHost)(nil)).Elem()
+}
+
+type NonVmwareOuiMacNotSupportedHostFault NonVmwareOuiMacNotSupportedHost
+
+func init() {
+	t["NonVmwareOuiMacNotSupportedHostFault"] = reflect.TypeOf((*NonVmwareOuiMacNotSupportedHostFault)(nil)).Elem()
+}
+
+type NotADirectory struct {
+	FileFault
+}
+
+func init() {
+	t["NotADirectory"] = reflect.TypeOf((*NotADirectory)(nil)).Elem()
+}
+
+type NotADirectoryFault NotADirectory
+
+func init() {
+	t["NotADirectoryFault"] = reflect.TypeOf((*NotADirectoryFault)(nil)).Elem()
+}
+
+type NotAFile struct {
+	FileFault
+}
+
+func init() {
+	t["NotAFile"] = reflect.TypeOf((*NotAFile)(nil)).Elem()
+}
+
+type NotAFileFault NotAFile
+
+func init() {
+	t["NotAFileFault"] = reflect.TypeOf((*NotAFileFault)(nil)).Elem()
+}
+
+type NotAuthenticated struct {
+	NoPermission
+}
+
+func init() {
+	t["NotAuthenticated"] = reflect.TypeOf((*NotAuthenticated)(nil)).Elem()
+}
+
+type NotAuthenticatedFault NotAuthenticated
+
+func init() {
+	t["NotAuthenticatedFault"] = reflect.TypeOf((*NotAuthenticatedFault)(nil)).Elem()
+}
+
+type NotEnoughCpus struct {
+	VirtualHardwareCompatibilityIssue
+
+	NumCpuDest int32 `xml:"numCpuDest"`
+	NumCpuVm   int32 `xml:"numCpuVm"`
+}
+
+func init() {
+	t["NotEnoughCpus"] = reflect.TypeOf((*NotEnoughCpus)(nil)).Elem()
+}
+
+type NotEnoughCpusFault BaseNotEnoughCpus
+
+func init() {
+	t["NotEnoughCpusFault"] = reflect.TypeOf((*NotEnoughCpusFault)(nil)).Elem()
+}
+
+type NotEnoughLicenses struct {
+	RuntimeFault
+}
+
+func init() {
+	t["NotEnoughLicenses"] = reflect.TypeOf((*NotEnoughLicenses)(nil)).Elem()
+}
+
+type NotEnoughLicensesFault BaseNotEnoughLicenses
+
+func init() {
+	t["NotEnoughLicensesFault"] = reflect.TypeOf((*NotEnoughLicensesFault)(nil)).Elem()
+}
+
+type NotEnoughLogicalCpus struct {
+	NotEnoughCpus
+
+	Host *ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["NotEnoughLogicalCpus"] = reflect.TypeOf((*NotEnoughLogicalCpus)(nil)).Elem()
+}
+
+type NotEnoughLogicalCpusFault NotEnoughLogicalCpus
+
+func init() {
+	t["NotEnoughLogicalCpusFault"] = reflect.TypeOf((*NotEnoughLogicalCpusFault)(nil)).Elem()
+}
+
+type NotEnoughResourcesToStartVmEvent struct {
+	VmEvent
+
+	Reason string `xml:"reason,omitempty"`
+}
+
+func init() {
+	t["NotEnoughResourcesToStartVmEvent"] = reflect.TypeOf((*NotEnoughResourcesToStartVmEvent)(nil)).Elem()
+}
+
+type NotFound struct {
+	VimFault
+}
+
+func init() {
+	t["NotFound"] = reflect.TypeOf((*NotFound)(nil)).Elem()
+}
+
+type NotFoundFault NotFound
+
+func init() {
+	t["NotFoundFault"] = reflect.TypeOf((*NotFoundFault)(nil)).Elem()
+}
+
+type NotImplemented struct {
+	RuntimeFault
+}
+
+func init() {
+	t["NotImplemented"] = reflect.TypeOf((*NotImplemented)(nil)).Elem()
+}
+
+type NotImplementedFault NotImplemented
+
+func init() {
+	t["NotImplementedFault"] = reflect.TypeOf((*NotImplementedFault)(nil)).Elem()
+}
+
+type NotSupported struct {
+	RuntimeFault
+}
+
+func init() {
+	t["NotSupported"] = reflect.TypeOf((*NotSupported)(nil)).Elem()
+}
+
+type NotSupportedDeviceForFT struct {
+	VmFaultToleranceIssue
+
+	Host        ManagedObjectReference `xml:"host"`
+	HostName    string                 `xml:"hostName,omitempty"`
+	Vm          ManagedObjectReference `xml:"vm"`
+	VmName      string                 `xml:"vmName,omitempty"`
+	DeviceType  string                 `xml:"deviceType"`
+	DeviceLabel string                 `xml:"deviceLabel,omitempty"`
+}
+
+func init() {
+	t["NotSupportedDeviceForFT"] = reflect.TypeOf((*NotSupportedDeviceForFT)(nil)).Elem()
+}
+
+type NotSupportedDeviceForFTFault NotSupportedDeviceForFT
+
+func init() {
+	t["NotSupportedDeviceForFTFault"] = reflect.TypeOf((*NotSupportedDeviceForFTFault)(nil)).Elem()
+}
+
+type NotSupportedFault BaseNotSupported
+
+func init() {
+	t["NotSupportedFault"] = reflect.TypeOf((*NotSupportedFault)(nil)).Elem()
+}
+
+type NotSupportedHost struct {
+	HostConnectFault
+
+	ProductName    string `xml:"productName,omitempty"`
+	ProductVersion string `xml:"productVersion,omitempty"`
+}
+
+func init() {
+	t["NotSupportedHost"] = reflect.TypeOf((*NotSupportedHost)(nil)).Elem()
+}
+
+type NotSupportedHostFault BaseNotSupportedHost
+
+func init() {
+	t["NotSupportedHostFault"] = reflect.TypeOf((*NotSupportedHostFault)(nil)).Elem()
+}
+
+type NotSupportedHostForChecksum struct {
+	VimFault
+}
+
+func init() {
+	t["NotSupportedHostForChecksum"] = reflect.TypeOf((*NotSupportedHostForChecksum)(nil)).Elem()
+}
+
+type NotSupportedHostForChecksumFault NotSupportedHostForChecksum
+
+func init() {
+	t["NotSupportedHostForChecksumFault"] = reflect.TypeOf((*NotSupportedHostForChecksumFault)(nil)).Elem()
+}
+
+type NotSupportedHostForVFlash struct {
+	NotSupportedHost
+
+	HostName string `xml:"hostName"`
+}
+
+func init() {
+	t["NotSupportedHostForVFlash"] = reflect.TypeOf((*NotSupportedHostForVFlash)(nil)).Elem()
+}
+
+type NotSupportedHostForVFlashFault NotSupportedHostForVFlash
+
+func init() {
+	t["NotSupportedHostForVFlashFault"] = reflect.TypeOf((*NotSupportedHostForVFlashFault)(nil)).Elem()
+}
+
+type NotSupportedHostForVmcp struct {
+	NotSupportedHost
+
+	HostName string `xml:"hostName"`
+}
+
+func init() {
+	t["NotSupportedHostForVmcp"] = reflect.TypeOf((*NotSupportedHostForVmcp)(nil)).Elem()
+}
+
+type NotSupportedHostForVmcpFault NotSupportedHostForVmcp
+
+func init() {
+	t["NotSupportedHostForVmcpFault"] = reflect.TypeOf((*NotSupportedHostForVmcpFault)(nil)).Elem()
+}
+
+type NotSupportedHostForVmemFile struct {
+	NotSupportedHost
+
+	HostName string `xml:"hostName"`
+}
+
+func init() {
+	t["NotSupportedHostForVmemFile"] = reflect.TypeOf((*NotSupportedHostForVmemFile)(nil)).Elem()
+}
+
+type NotSupportedHostForVmemFileFault NotSupportedHostForVmemFile
+
+func init() {
+	t["NotSupportedHostForVmemFileFault"] = reflect.TypeOf((*NotSupportedHostForVmemFileFault)(nil)).Elem()
+}
+
+type NotSupportedHostForVsan struct {
+	NotSupportedHost
+
+	HostName string `xml:"hostName"`
+}
+
+func init() {
+	t["NotSupportedHostForVsan"] = reflect.TypeOf((*NotSupportedHostForVsan)(nil)).Elem()
+}
+
+type NotSupportedHostForVsanFault NotSupportedHostForVsan
+
+func init() {
+	t["NotSupportedHostForVsanFault"] = reflect.TypeOf((*NotSupportedHostForVsanFault)(nil)).Elem()
+}
+
+type NotSupportedHostInCluster struct {
+	NotSupportedHost
+}
+
+func init() {
+	t["NotSupportedHostInCluster"] = reflect.TypeOf((*NotSupportedHostInCluster)(nil)).Elem()
+}
+
+type NotSupportedHostInClusterFault BaseNotSupportedHostInCluster
+
+func init() {
+	t["NotSupportedHostInClusterFault"] = reflect.TypeOf((*NotSupportedHostInClusterFault)(nil)).Elem()
+}
+
+type NotSupportedHostInDvs struct {
+	NotSupportedHost
+
+	SwitchProductSpec DistributedVirtualSwitchProductSpec `xml:"switchProductSpec"`
+}
+
+func init() {
+	t["NotSupportedHostInDvs"] = reflect.TypeOf((*NotSupportedHostInDvs)(nil)).Elem()
+}
+
+type NotSupportedHostInDvsFault NotSupportedHostInDvs
+
+func init() {
+	t["NotSupportedHostInDvsFault"] = reflect.TypeOf((*NotSupportedHostInDvsFault)(nil)).Elem()
+}
+
+type NotSupportedHostInHACluster struct {
+	NotSupportedHost
+
+	HostName string `xml:"hostName"`
+	Build    string `xml:"build"`
+}
+
+func init() {
+	t["NotSupportedHostInHACluster"] = reflect.TypeOf((*NotSupportedHostInHACluster)(nil)).Elem()
+}
+
+type NotSupportedHostInHAClusterFault NotSupportedHostInHACluster
+
+func init() {
+	t["NotSupportedHostInHAClusterFault"] = reflect.TypeOf((*NotSupportedHostInHAClusterFault)(nil)).Elem()
+}
+
+type NotUserConfigurableProperty struct {
+	VAppPropertyFault
+}
+
+func init() {
+	t["NotUserConfigurableProperty"] = reflect.TypeOf((*NotUserConfigurableProperty)(nil)).Elem()
+}
+
+type NotUserConfigurablePropertyFault NotUserConfigurableProperty
+
+func init() {
+	t["NotUserConfigurablePropertyFault"] = reflect.TypeOf((*NotUserConfigurablePropertyFault)(nil)).Elem()
+}
+
+type NumPortsProfile struct {
+	ApplyProfile
+}
+
+func init() {
+	t["NumPortsProfile"] = reflect.TypeOf((*NumPortsProfile)(nil)).Elem()
+}
+
+type NumVirtualCoresPerSocketNotSupported struct {
+	VirtualHardwareCompatibilityIssue
+
+	MaxSupportedCoresPerSocketDest int32 `xml:"maxSupportedCoresPerSocketDest"`
+	NumCoresPerSocketVm            int32 `xml:"numCoresPerSocketVm"`
+}
+
+func init() {
+	t["NumVirtualCoresPerSocketNotSupported"] = reflect.TypeOf((*NumVirtualCoresPerSocketNotSupported)(nil)).Elem()
+}
+
+type NumVirtualCoresPerSocketNotSupportedFault NumVirtualCoresPerSocketNotSupported
+
+func init() {
+	t["NumVirtualCoresPerSocketNotSupportedFault"] = reflect.TypeOf((*NumVirtualCoresPerSocketNotSupportedFault)(nil)).Elem()
+}
+
+type NumVirtualCpusExceedsLimit struct {
+	InsufficientResourcesFault
+
+	MaxSupportedVcpus int32 `xml:"maxSupportedVcpus"`
+}
+
+func init() {
+	t["NumVirtualCpusExceedsLimit"] = reflect.TypeOf((*NumVirtualCpusExceedsLimit)(nil)).Elem()
+}
+
+type NumVirtualCpusExceedsLimitFault NumVirtualCpusExceedsLimit
+
+func init() {
+	t["NumVirtualCpusExceedsLimitFault"] = reflect.TypeOf((*NumVirtualCpusExceedsLimitFault)(nil)).Elem()
+}
+
+type NumVirtualCpusIncompatible struct {
+	VmConfigFault
+
+	Reason string `xml:"reason"`
+	NumCpu int32  `xml:"numCpu"`
+}
+
+func init() {
+	t["NumVirtualCpusIncompatible"] = reflect.TypeOf((*NumVirtualCpusIncompatible)(nil)).Elem()
+}
+
+type NumVirtualCpusIncompatibleFault NumVirtualCpusIncompatible
+
+func init() {
+	t["NumVirtualCpusIncompatibleFault"] = reflect.TypeOf((*NumVirtualCpusIncompatibleFault)(nil)).Elem()
+}
+
+type NumVirtualCpusNotSupported struct {
+	VirtualHardwareCompatibilityIssue
+
+	MaxSupportedVcpusDest int32 `xml:"maxSupportedVcpusDest"`
+	NumCpuVm              int32 `xml:"numCpuVm"`
+}
+
+func init() {
+	t["NumVirtualCpusNotSupported"] = reflect.TypeOf((*NumVirtualCpusNotSupported)(nil)).Elem()
+}
+
+type NumVirtualCpusNotSupportedFault NumVirtualCpusNotSupported
+
+func init() {
+	t["NumVirtualCpusNotSupportedFault"] = reflect.TypeOf((*NumVirtualCpusNotSupportedFault)(nil)).Elem()
+}
+
+type NumericRange struct {
+	DynamicData
+
+	Start int32 `xml:"start"`
+	End   int32 `xml:"end"`
+}
+
+func init() {
+	t["NumericRange"] = reflect.TypeOf((*NumericRange)(nil)).Elem()
+}
+
+type ObjectContent struct {
+	DynamicData
+
+	Obj        ManagedObjectReference `xml:"obj"`
+	PropSet    []DynamicProperty      `xml:"propSet,omitempty"`
+	MissingSet []MissingProperty      `xml:"missingSet,omitempty"`
+}
+
+func init() {
+	t["ObjectContent"] = reflect.TypeOf((*ObjectContent)(nil)).Elem()
+}
+
+type ObjectSpec struct {
+	DynamicData
+
+	Obj       ManagedObjectReference `xml:"obj"`
+	Skip      *bool                  `xml:"skip"`
+	SelectSet []BaseSelectionSpec    `xml:"selectSet,omitempty,typeattr"`
+}
+
+func init() {
+	t["ObjectSpec"] = reflect.TypeOf((*ObjectSpec)(nil)).Elem()
+}
+
+type ObjectUpdate struct {
+	DynamicData
+
+	Kind       ObjectUpdateKind       `xml:"kind"`
+	Obj        ManagedObjectReference `xml:"obj"`
+	ChangeSet  []PropertyChange       `xml:"changeSet,omitempty"`
+	MissingSet []MissingProperty      `xml:"missingSet,omitempty"`
+}
+
+func init() {
+	t["ObjectUpdate"] = reflect.TypeOf((*ObjectUpdate)(nil)).Elem()
+}
+
+type OnceTaskScheduler struct {
+	TaskScheduler
+
+	RunAt *time.Time `xml:"runAt"`
+}
+
+func init() {
+	t["OnceTaskScheduler"] = reflect.TypeOf((*OnceTaskScheduler)(nil)).Elem()
+}
+
+type OpaqueNetworkCapability struct {
+	DynamicData
+
+	NetworkReservationSupported bool `xml:"networkReservationSupported"`
+}
+
+func init() {
+	t["OpaqueNetworkCapability"] = reflect.TypeOf((*OpaqueNetworkCapability)(nil)).Elem()
+}
+
+type OpaqueNetworkSummary struct {
+	NetworkSummary
+
+	OpaqueNetworkId   string `xml:"opaqueNetworkId"`
+	OpaqueNetworkType string `xml:"opaqueNetworkType"`
+}
+
+func init() {
+	t["OpaqueNetworkSummary"] = reflect.TypeOf((*OpaqueNetworkSummary)(nil)).Elem()
+}
+
+type OpaqueNetworkTargetInfo struct {
+	VirtualMachineTargetInfo
+
+	Network                     OpaqueNetworkSummary `xml:"network"`
+	NetworkReservationSupported *bool                `xml:"networkReservationSupported"`
+}
+
+func init() {
+	t["OpaqueNetworkTargetInfo"] = reflect.TypeOf((*OpaqueNetworkTargetInfo)(nil)).Elem()
+}
+
+type OpenInventoryViewFolder OpenInventoryViewFolderRequestType
+
+func init() {
+	t["OpenInventoryViewFolder"] = reflect.TypeOf((*OpenInventoryViewFolder)(nil)).Elem()
+}
+
+type OpenInventoryViewFolderRequestType struct {
+	This   ManagedObjectReference   `xml:"_this"`
+	Entity []ManagedObjectReference `xml:"entity"`
+}
+
+func init() {
+	t["OpenInventoryViewFolderRequestType"] = reflect.TypeOf((*OpenInventoryViewFolderRequestType)(nil)).Elem()
+}
+
+type OpenInventoryViewFolderResponse struct {
+	Returnval []ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type OperationDisabledByGuest struct {
+	GuestOperationsFault
+}
+
+func init() {
+	t["OperationDisabledByGuest"] = reflect.TypeOf((*OperationDisabledByGuest)(nil)).Elem()
+}
+
+type OperationDisabledByGuestFault OperationDisabledByGuest
+
+func init() {
+	t["OperationDisabledByGuestFault"] = reflect.TypeOf((*OperationDisabledByGuestFault)(nil)).Elem()
+}
+
+type OperationDisallowedOnHost struct {
+	RuntimeFault
+}
+
+func init() {
+	t["OperationDisallowedOnHost"] = reflect.TypeOf((*OperationDisallowedOnHost)(nil)).Elem()
+}
+
+type OperationDisallowedOnHostFault OperationDisallowedOnHost
+
+func init() {
+	t["OperationDisallowedOnHostFault"] = reflect.TypeOf((*OperationDisallowedOnHostFault)(nil)).Elem()
+}
+
+type OperationNotSupportedByGuest struct {
+	GuestOperationsFault
+}
+
+func init() {
+	t["OperationNotSupportedByGuest"] = reflect.TypeOf((*OperationNotSupportedByGuest)(nil)).Elem()
+}
+
+type OperationNotSupportedByGuestFault OperationNotSupportedByGuest
+
+func init() {
+	t["OperationNotSupportedByGuestFault"] = reflect.TypeOf((*OperationNotSupportedByGuestFault)(nil)).Elem()
+}
+
+type OptionDef struct {
+	ElementDescription
+
+	OptionType BaseOptionType `xml:"optionType,typeattr"`
+}
+
+func init() {
+	t["OptionDef"] = reflect.TypeOf((*OptionDef)(nil)).Elem()
+}
+
+type OptionProfile struct {
+	ApplyProfile
+
+	Key string `xml:"key"`
+}
+
+func init() {
+	t["OptionProfile"] = reflect.TypeOf((*OptionProfile)(nil)).Elem()
+}
+
+type OptionType struct {
+	DynamicData
+
+	ValueIsReadonly *bool `xml:"valueIsReadonly"`
+}
+
+func init() {
+	t["OptionType"] = reflect.TypeOf((*OptionType)(nil)).Elem()
+}
+
+type OptionValue struct {
+	DynamicData
+
+	Key   string  `xml:"key"`
+	Value AnyType `xml:"value,omitempty,typeattr"`
+}
+
+func init() {
+	t["OptionValue"] = reflect.TypeOf((*OptionValue)(nil)).Elem()
+}
+
+type OrAlarmExpression struct {
+	AlarmExpression
+
+	Expression []BaseAlarmExpression `xml:"expression,typeattr"`
+}
+
+func init() {
+	t["OrAlarmExpression"] = reflect.TypeOf((*OrAlarmExpression)(nil)).Elem()
+}
+
+type OutOfBounds struct {
+	VimFault
+
+	ArgumentName string `xml:"argumentName"`
+}
+
+func init() {
+	t["OutOfBounds"] = reflect.TypeOf((*OutOfBounds)(nil)).Elem()
+}
+
+type OutOfBoundsFault OutOfBounds
+
+func init() {
+	t["OutOfBoundsFault"] = reflect.TypeOf((*OutOfBoundsFault)(nil)).Elem()
+}
+
+type OutOfSyncDvsHost struct {
+	DvsEvent
+
+	HostOutOfSync []DvsOutOfSyncHostArgument `xml:"hostOutOfSync"`
+}
+
+func init() {
+	t["OutOfSyncDvsHost"] = reflect.TypeOf((*OutOfSyncDvsHost)(nil)).Elem()
+}
+
+type OverwriteCustomizationSpec OverwriteCustomizationSpecRequestType
+
+func init() {
+	t["OverwriteCustomizationSpec"] = reflect.TypeOf((*OverwriteCustomizationSpec)(nil)).Elem()
+}
+
+type OverwriteCustomizationSpecRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Item CustomizationSpecItem  `xml:"item"`
+}
+
+func init() {
+	t["OverwriteCustomizationSpecRequestType"] = reflect.TypeOf((*OverwriteCustomizationSpecRequestType)(nil)).Elem()
+}
+
+type OverwriteCustomizationSpecResponse struct {
+}
+
+type OvfAttribute struct {
+	OvfInvalidPackage
+
+	ElementName   string `xml:"elementName"`
+	AttributeName string `xml:"attributeName"`
+}
+
+func init() {
+	t["OvfAttribute"] = reflect.TypeOf((*OvfAttribute)(nil)).Elem()
+}
+
+type OvfAttributeFault BaseOvfAttribute
+
+func init() {
+	t["OvfAttributeFault"] = reflect.TypeOf((*OvfAttributeFault)(nil)).Elem()
+}
+
+type OvfConnectedDevice struct {
+	OvfHardwareExport
+}
+
+func init() {
+	t["OvfConnectedDevice"] = reflect.TypeOf((*OvfConnectedDevice)(nil)).Elem()
+}
+
+type OvfConnectedDeviceFault BaseOvfConnectedDevice
+
+func init() {
+	t["OvfConnectedDeviceFault"] = reflect.TypeOf((*OvfConnectedDeviceFault)(nil)).Elem()
+}
+
+type OvfConnectedDeviceFloppy struct {
+	OvfConnectedDevice
+
+	Filename string `xml:"filename"`
+}
+
+func init() {
+	t["OvfConnectedDeviceFloppy"] = reflect.TypeOf((*OvfConnectedDeviceFloppy)(nil)).Elem()
+}
+
+type OvfConnectedDeviceFloppyFault OvfConnectedDeviceFloppy
+
+func init() {
+	t["OvfConnectedDeviceFloppyFault"] = reflect.TypeOf((*OvfConnectedDeviceFloppyFault)(nil)).Elem()
+}
+
+type OvfConnectedDeviceIso struct {
+	OvfConnectedDevice
+
+	Filename string `xml:"filename"`
+}
+
+func init() {
+	t["OvfConnectedDeviceIso"] = reflect.TypeOf((*OvfConnectedDeviceIso)(nil)).Elem()
+}
+
+type OvfConnectedDeviceIsoFault OvfConnectedDeviceIso
+
+func init() {
+	t["OvfConnectedDeviceIsoFault"] = reflect.TypeOf((*OvfConnectedDeviceIsoFault)(nil)).Elem()
+}
+
+type OvfConstraint struct {
+	OvfInvalidPackage
+
+	Name string `xml:"name"`
+}
+
+func init() {
+	t["OvfConstraint"] = reflect.TypeOf((*OvfConstraint)(nil)).Elem()
+}
+
+type OvfConstraintFault BaseOvfConstraint
+
+func init() {
+	t["OvfConstraintFault"] = reflect.TypeOf((*OvfConstraintFault)(nil)).Elem()
+}
+
+type OvfConsumerCallbackFault struct {
+	OvfFault
+
+	ExtensionKey  string `xml:"extensionKey"`
+	ExtensionName string `xml:"extensionName"`
+}
+
+func init() {
+	t["OvfConsumerCallbackFault"] = reflect.TypeOf((*OvfConsumerCallbackFault)(nil)).Elem()
+}
+
+type OvfConsumerCallbackFaultFault BaseOvfConsumerCallbackFault
+
+func init() {
+	t["OvfConsumerCallbackFaultFault"] = reflect.TypeOf((*OvfConsumerCallbackFaultFault)(nil)).Elem()
+}
+
+type OvfConsumerCommunicationError struct {
+	OvfConsumerCallbackFault
+
+	Description string `xml:"description"`
+}
+
+func init() {
+	t["OvfConsumerCommunicationError"] = reflect.TypeOf((*OvfConsumerCommunicationError)(nil)).Elem()
+}
+
+type OvfConsumerCommunicationErrorFault OvfConsumerCommunicationError
+
+func init() {
+	t["OvfConsumerCommunicationErrorFault"] = reflect.TypeOf((*OvfConsumerCommunicationErrorFault)(nil)).Elem()
+}
+
+type OvfConsumerFault struct {
+	OvfConsumerCallbackFault
+
+	ErrorKey string     `xml:"errorKey"`
+	Message  string     `xml:"message"`
+	Params   []KeyValue `xml:"params,omitempty"`
+}
+
+func init() {
+	t["OvfConsumerFault"] = reflect.TypeOf((*OvfConsumerFault)(nil)).Elem()
+}
+
+type OvfConsumerFaultFault OvfConsumerFault
+
+func init() {
+	t["OvfConsumerFaultFault"] = reflect.TypeOf((*OvfConsumerFaultFault)(nil)).Elem()
+}
+
+type OvfConsumerInvalidSection struct {
+	OvfConsumerCallbackFault
+
+	LineNumber  int32  `xml:"lineNumber"`
+	Description string `xml:"description"`
+}
+
+func init() {
+	t["OvfConsumerInvalidSection"] = reflect.TypeOf((*OvfConsumerInvalidSection)(nil)).Elem()
+}
+
+type OvfConsumerInvalidSectionFault OvfConsumerInvalidSection
+
+func init() {
+	t["OvfConsumerInvalidSectionFault"] = reflect.TypeOf((*OvfConsumerInvalidSectionFault)(nil)).Elem()
+}
+
+type OvfConsumerOstNode struct {
+	DynamicData
+
+	Id      string                  `xml:"id"`
+	Type    string                  `xml:"type"`
+	Section []OvfConsumerOvfSection `xml:"section,omitempty"`
+	Child   []OvfConsumerOstNode    `xml:"child,omitempty"`
+	Entity  *ManagedObjectReference `xml:"entity,omitempty"`
+}
+
+func init() {
+	t["OvfConsumerOstNode"] = reflect.TypeOf((*OvfConsumerOstNode)(nil)).Elem()
+}
+
+type OvfConsumerOvfSection struct {
+	DynamicData
+
+	LineNumber int32  `xml:"lineNumber"`
+	Xml        string `xml:"xml"`
+}
+
+func init() {
+	t["OvfConsumerOvfSection"] = reflect.TypeOf((*OvfConsumerOvfSection)(nil)).Elem()
+}
+
+type OvfConsumerPowerOnFault struct {
+	InvalidState
+
+	ExtensionKey  string `xml:"extensionKey"`
+	ExtensionName string `xml:"extensionName"`
+	Description   string `xml:"description"`
+}
+
+func init() {
+	t["OvfConsumerPowerOnFault"] = reflect.TypeOf((*OvfConsumerPowerOnFault)(nil)).Elem()
+}
+
+type OvfConsumerPowerOnFaultFault OvfConsumerPowerOnFault
+
+func init() {
+	t["OvfConsumerPowerOnFaultFault"] = reflect.TypeOf((*OvfConsumerPowerOnFaultFault)(nil)).Elem()
+}
+
+type OvfConsumerUndeclaredSection struct {
+	OvfConsumerCallbackFault
+
+	QualifiedSectionType string `xml:"qualifiedSectionType"`
+}
+
+func init() {
+	t["OvfConsumerUndeclaredSection"] = reflect.TypeOf((*OvfConsumerUndeclaredSection)(nil)).Elem()
+}
+
+type OvfConsumerUndeclaredSectionFault OvfConsumerUndeclaredSection
+
+func init() {
+	t["OvfConsumerUndeclaredSectionFault"] = reflect.TypeOf((*OvfConsumerUndeclaredSectionFault)(nil)).Elem()
+}
+
+type OvfConsumerUndefinedPrefix struct {
+	OvfConsumerCallbackFault
+
+	Prefix string `xml:"prefix"`
+}
+
+func init() {
+	t["OvfConsumerUndefinedPrefix"] = reflect.TypeOf((*OvfConsumerUndefinedPrefix)(nil)).Elem()
+}
+
+type OvfConsumerUndefinedPrefixFault OvfConsumerUndefinedPrefix
+
+func init() {
+	t["OvfConsumerUndefinedPrefixFault"] = reflect.TypeOf((*OvfConsumerUndefinedPrefixFault)(nil)).Elem()
+}
+
+type OvfConsumerValidationFault struct {
+	VmConfigFault
+
+	ExtensionKey  string `xml:"extensionKey"`
+	ExtensionName string `xml:"extensionName"`
+	Message       string `xml:"message"`
+}
+
+func init() {
+	t["OvfConsumerValidationFault"] = reflect.TypeOf((*OvfConsumerValidationFault)(nil)).Elem()
+}
+
+type OvfConsumerValidationFaultFault OvfConsumerValidationFault
+
+func init() {
+	t["OvfConsumerValidationFaultFault"] = reflect.TypeOf((*OvfConsumerValidationFaultFault)(nil)).Elem()
+}
+
+type OvfCpuCompatibility struct {
+	OvfImport
+
+	RegisterName         string `xml:"registerName"`
+	Level                int32  `xml:"level"`
+	RegisterValue        string `xml:"registerValue"`
+	DesiredRegisterValue string `xml:"desiredRegisterValue"`
+}
+
+func init() {
+	t["OvfCpuCompatibility"] = reflect.TypeOf((*OvfCpuCompatibility)(nil)).Elem()
+}
+
+type OvfCpuCompatibilityCheckNotSupported struct {
+	OvfImport
+}
+
+func init() {
+	t["OvfCpuCompatibilityCheckNotSupported"] = reflect.TypeOf((*OvfCpuCompatibilityCheckNotSupported)(nil)).Elem()
+}
+
+type OvfCpuCompatibilityCheckNotSupportedFault OvfCpuCompatibilityCheckNotSupported
+
+func init() {
+	t["OvfCpuCompatibilityCheckNotSupportedFault"] = reflect.TypeOf((*OvfCpuCompatibilityCheckNotSupportedFault)(nil)).Elem()
+}
+
+type OvfCpuCompatibilityFault OvfCpuCompatibility
+
+func init() {
+	t["OvfCpuCompatibilityFault"] = reflect.TypeOf((*OvfCpuCompatibilityFault)(nil)).Elem()
+}
+
+type OvfCreateDescriptorParams struct {
+	DynamicData
+
+	OvfFiles          []OvfFile               `xml:"ovfFiles,omitempty"`
+	Name              string                  `xml:"name,omitempty"`
+	Description       string                  `xml:"description,omitempty"`
+	IncludeImageFiles *bool                   `xml:"includeImageFiles"`
+	ExportOption      []string                `xml:"exportOption,omitempty"`
+	Snapshot          *ManagedObjectReference `xml:"snapshot,omitempty"`
+}
+
+func init() {
+	t["OvfCreateDescriptorParams"] = reflect.TypeOf((*OvfCreateDescriptorParams)(nil)).Elem()
+}
+
+type OvfCreateDescriptorResult struct {
+	DynamicData
+
+	OvfDescriptor     string                 `xml:"ovfDescriptor"`
+	Error             []LocalizedMethodFault `xml:"error,omitempty"`
+	Warning           []LocalizedMethodFault `xml:"warning,omitempty"`
+	IncludeImageFiles *bool                  `xml:"includeImageFiles"`
+}
+
+func init() {
+	t["OvfCreateDescriptorResult"] = reflect.TypeOf((*OvfCreateDescriptorResult)(nil)).Elem()
+}
+
+type OvfCreateImportSpecParams struct {
+	OvfManagerCommonParams
+
+	EntityName         string                  `xml:"entityName"`
+	HostSystem         *ManagedObjectReference `xml:"hostSystem,omitempty"`
+	NetworkMapping     []OvfNetworkMapping     `xml:"networkMapping,omitempty"`
+	IpAllocationPolicy string                  `xml:"ipAllocationPolicy,omitempty"`
+	IpProtocol         string                  `xml:"ipProtocol,omitempty"`
+	PropertyMapping    []KeyValue              `xml:"propertyMapping,omitempty"`
+	ResourceMapping    []OvfResourceMap        `xml:"resourceMapping,omitempty"`
+	DiskProvisioning   string                  `xml:"diskProvisioning,omitempty"`
+	InstantiationOst   *OvfConsumerOstNode     `xml:"instantiationOst,omitempty"`
+}
+
+func init() {
+	t["OvfCreateImportSpecParams"] = reflect.TypeOf((*OvfCreateImportSpecParams)(nil)).Elem()
+}
+
+type OvfCreateImportSpecResult struct {
+	DynamicData
+
+	ImportSpec BaseImportSpec         `xml:"importSpec,omitempty,typeattr"`
+	FileItem   []OvfFileItem          `xml:"fileItem,omitempty"`
+	Warning    []LocalizedMethodFault `xml:"warning,omitempty"`
+	Error      []LocalizedMethodFault `xml:"error,omitempty"`
+}
+
+func init() {
+	t["OvfCreateImportSpecResult"] = reflect.TypeOf((*OvfCreateImportSpecResult)(nil)).Elem()
+}
+
+type OvfDeploymentOption struct {
+	DynamicData
+
+	Key         string `xml:"key"`
+	Label       string `xml:"label"`
+	Description string `xml:"description"`
+}
+
+func init() {
+	t["OvfDeploymentOption"] = reflect.TypeOf((*OvfDeploymentOption)(nil)).Elem()
+}
+
+type OvfDiskMappingNotFound struct {
+	OvfSystemFault
+
+	DiskName string `xml:"diskName"`
+	VmName   string `xml:"vmName"`
+}
+
+func init() {
+	t["OvfDiskMappingNotFound"] = reflect.TypeOf((*OvfDiskMappingNotFound)(nil)).Elem()
+}
+
+type OvfDiskMappingNotFoundFault OvfDiskMappingNotFound
+
+func init() {
+	t["OvfDiskMappingNotFoundFault"] = reflect.TypeOf((*OvfDiskMappingNotFoundFault)(nil)).Elem()
+}
+
+type OvfDiskOrderConstraint struct {
+	OvfConstraint
+}
+
+func init() {
+	t["OvfDiskOrderConstraint"] = reflect.TypeOf((*OvfDiskOrderConstraint)(nil)).Elem()
+}
+
+type OvfDiskOrderConstraintFault OvfDiskOrderConstraint
+
+func init() {
+	t["OvfDiskOrderConstraintFault"] = reflect.TypeOf((*OvfDiskOrderConstraintFault)(nil)).Elem()
+}
+
+type OvfDuplicateElement struct {
+	OvfElement
+}
+
+func init() {
+	t["OvfDuplicateElement"] = reflect.TypeOf((*OvfDuplicateElement)(nil)).Elem()
+}
+
+type OvfDuplicateElementFault OvfDuplicateElement
+
+func init() {
+	t["OvfDuplicateElementFault"] = reflect.TypeOf((*OvfDuplicateElementFault)(nil)).Elem()
+}
+
+type OvfDuplicatedElementBoundary struct {
+	OvfElement
+
+	Boundary string `xml:"boundary"`
+}
+
+func init() {
+	t["OvfDuplicatedElementBoundary"] = reflect.TypeOf((*OvfDuplicatedElementBoundary)(nil)).Elem()
+}
+
+type OvfDuplicatedElementBoundaryFault OvfDuplicatedElementBoundary
+
+func init() {
+	t["OvfDuplicatedElementBoundaryFault"] = reflect.TypeOf((*OvfDuplicatedElementBoundaryFault)(nil)).Elem()
+}
+
+type OvfDuplicatedPropertyIdExport struct {
+	OvfExport
+
+	Fqid string `xml:"fqid"`
+}
+
+func init() {
+	t["OvfDuplicatedPropertyIdExport"] = reflect.TypeOf((*OvfDuplicatedPropertyIdExport)(nil)).Elem()
+}
+
+type OvfDuplicatedPropertyIdExportFault OvfDuplicatedPropertyIdExport
+
+func init() {
+	t["OvfDuplicatedPropertyIdExportFault"] = reflect.TypeOf((*OvfDuplicatedPropertyIdExportFault)(nil)).Elem()
+}
+
+type OvfDuplicatedPropertyIdImport struct {
+	OvfExport
+}
+
+func init() {
+	t["OvfDuplicatedPropertyIdImport"] = reflect.TypeOf((*OvfDuplicatedPropertyIdImport)(nil)).Elem()
+}
+
+type OvfDuplicatedPropertyIdImportFault OvfDuplicatedPropertyIdImport
+
+func init() {
+	t["OvfDuplicatedPropertyIdImportFault"] = reflect.TypeOf((*OvfDuplicatedPropertyIdImportFault)(nil)).Elem()
+}
+
+type OvfElement struct {
+	OvfInvalidPackage
+
+	Name string `xml:"name"`
+}
+
+func init() {
+	t["OvfElement"] = reflect.TypeOf((*OvfElement)(nil)).Elem()
+}
+
+type OvfElementFault BaseOvfElement
+
+func init() {
+	t["OvfElementFault"] = reflect.TypeOf((*OvfElementFault)(nil)).Elem()
+}
+
+type OvfElementInvalidValue struct {
+	OvfElement
+
+	Value string `xml:"value"`
+}
+
+func init() {
+	t["OvfElementInvalidValue"] = reflect.TypeOf((*OvfElementInvalidValue)(nil)).Elem()
+}
+
+type OvfElementInvalidValueFault OvfElementInvalidValue
+
+func init() {
+	t["OvfElementInvalidValueFault"] = reflect.TypeOf((*OvfElementInvalidValueFault)(nil)).Elem()
+}
+
+type OvfExport struct {
+	OvfFault
+}
+
+func init() {
+	t["OvfExport"] = reflect.TypeOf((*OvfExport)(nil)).Elem()
+}
+
+type OvfExportFailed struct {
+	OvfExport
+}
+
+func init() {
+	t["OvfExportFailed"] = reflect.TypeOf((*OvfExportFailed)(nil)).Elem()
+}
+
+type OvfExportFailedFault OvfExportFailed
+
+func init() {
+	t["OvfExportFailedFault"] = reflect.TypeOf((*OvfExportFailedFault)(nil)).Elem()
+}
+
+type OvfExportFault BaseOvfExport
+
+func init() {
+	t["OvfExportFault"] = reflect.TypeOf((*OvfExportFault)(nil)).Elem()
+}
+
+type OvfFault struct {
+	VimFault
+}
+
+func init() {
+	t["OvfFault"] = reflect.TypeOf((*OvfFault)(nil)).Elem()
+}
+
+type OvfFaultFault BaseOvfFault
+
+func init() {
+	t["OvfFaultFault"] = reflect.TypeOf((*OvfFaultFault)(nil)).Elem()
+}
+
+type OvfFile struct {
+	DynamicData
+
+	DeviceId          string `xml:"deviceId"`
+	Path              string `xml:"path"`
+	CompressionMethod string `xml:"compressionMethod,omitempty"`
+	ChunkSize         int64  `xml:"chunkSize,omitempty"`
+	Size              int64  `xml:"size"`
+	Capacity          int64  `xml:"capacity,omitempty"`
+	PopulatedSize     int64  `xml:"populatedSize,omitempty"`
+}
+
+func init() {
+	t["OvfFile"] = reflect.TypeOf((*OvfFile)(nil)).Elem()
+}
+
+type OvfFileItem struct {
+	DynamicData
+
+	DeviceId          string `xml:"deviceId"`
+	Path              string `xml:"path"`
+	CompressionMethod string `xml:"compressionMethod,omitempty"`
+	ChunkSize         int64  `xml:"chunkSize,omitempty"`
+	Size              int64  `xml:"size,omitempty"`
+	CimType           int32  `xml:"cimType"`
+	Create            bool   `xml:"create"`
+}
+
+func init() {
+	t["OvfFileItem"] = reflect.TypeOf((*OvfFileItem)(nil)).Elem()
+}
+
+type OvfHardwareCheck struct {
+	OvfImport
+}
+
+func init() {
+	t["OvfHardwareCheck"] = reflect.TypeOf((*OvfHardwareCheck)(nil)).Elem()
+}
+
+type OvfHardwareCheckFault OvfHardwareCheck
+
+func init() {
+	t["OvfHardwareCheckFault"] = reflect.TypeOf((*OvfHardwareCheckFault)(nil)).Elem()
+}
+
+type OvfHardwareExport struct {
+	OvfExport
+
+	Device BaseVirtualDevice `xml:"device,omitempty,typeattr"`
+	VmPath string            `xml:"vmPath"`
+}
+
+func init() {
+	t["OvfHardwareExport"] = reflect.TypeOf((*OvfHardwareExport)(nil)).Elem()
+}
+
+type OvfHardwareExportFault BaseOvfHardwareExport
+
+func init() {
+	t["OvfHardwareExportFault"] = reflect.TypeOf((*OvfHardwareExportFault)(nil)).Elem()
+}
+
+type OvfHostResourceConstraint struct {
+	OvfConstraint
+
+	Value string `xml:"value"`
+}
+
+func init() {
+	t["OvfHostResourceConstraint"] = reflect.TypeOf((*OvfHostResourceConstraint)(nil)).Elem()
+}
+
+type OvfHostResourceConstraintFault OvfHostResourceConstraint
+
+func init() {
+	t["OvfHostResourceConstraintFault"] = reflect.TypeOf((*OvfHostResourceConstraintFault)(nil)).Elem()
+}
+
+type OvfHostValueNotParsed struct {
+	OvfSystemFault
+
+	Property string `xml:"property"`
+	Value    string `xml:"value"`
+}
+
+func init() {
+	t["OvfHostValueNotParsed"] = reflect.TypeOf((*OvfHostValueNotParsed)(nil)).Elem()
+}
+
+type OvfHostValueNotParsedFault OvfHostValueNotParsed
+
+func init() {
+	t["OvfHostValueNotParsedFault"] = reflect.TypeOf((*OvfHostValueNotParsedFault)(nil)).Elem()
+}
+
+type OvfImport struct {
+	OvfFault
+}
+
+func init() {
+	t["OvfImport"] = reflect.TypeOf((*OvfImport)(nil)).Elem()
+}
+
+type OvfImportFailed struct {
+	OvfImport
+}
+
+func init() {
+	t["OvfImportFailed"] = reflect.TypeOf((*OvfImportFailed)(nil)).Elem()
+}
+
+type OvfImportFailedFault OvfImportFailed
+
+func init() {
+	t["OvfImportFailedFault"] = reflect.TypeOf((*OvfImportFailedFault)(nil)).Elem()
+}
+
+type OvfImportFault BaseOvfImport
+
+func init() {
+	t["OvfImportFault"] = reflect.TypeOf((*OvfImportFault)(nil)).Elem()
+}
+
+type OvfInternalError struct {
+	OvfSystemFault
+}
+
+func init() {
+	t["OvfInternalError"] = reflect.TypeOf((*OvfInternalError)(nil)).Elem()
+}
+
+type OvfInternalErrorFault OvfInternalError
+
+func init() {
+	t["OvfInternalErrorFault"] = reflect.TypeOf((*OvfInternalErrorFault)(nil)).Elem()
+}
+
+type OvfInvalidPackage struct {
+	OvfFault
+
+	LineNumber int32 `xml:"lineNumber"`
+}
+
+func init() {
+	t["OvfInvalidPackage"] = reflect.TypeOf((*OvfInvalidPackage)(nil)).Elem()
+}
+
+type OvfInvalidPackageFault BaseOvfInvalidPackage
+
+func init() {
+	t["OvfInvalidPackageFault"] = reflect.TypeOf((*OvfInvalidPackageFault)(nil)).Elem()
+}
+
+type OvfInvalidValue struct {
+	OvfAttribute
+
+	Value string `xml:"value"`
+}
+
+func init() {
+	t["OvfInvalidValue"] = reflect.TypeOf((*OvfInvalidValue)(nil)).Elem()
+}
+
+type OvfInvalidValueConfiguration struct {
+	OvfInvalidValue
+}
+
+func init() {
+	t["OvfInvalidValueConfiguration"] = reflect.TypeOf((*OvfInvalidValueConfiguration)(nil)).Elem()
+}
+
+type OvfInvalidValueConfigurationFault OvfInvalidValueConfiguration
+
+func init() {
+	t["OvfInvalidValueConfigurationFault"] = reflect.TypeOf((*OvfInvalidValueConfigurationFault)(nil)).Elem()
+}
+
+type OvfInvalidValueEmpty struct {
+	OvfInvalidValue
+}
+
+func init() {
+	t["OvfInvalidValueEmpty"] = reflect.TypeOf((*OvfInvalidValueEmpty)(nil)).Elem()
+}
+
+type OvfInvalidValueEmptyFault OvfInvalidValueEmpty
+
+func init() {
+	t["OvfInvalidValueEmptyFault"] = reflect.TypeOf((*OvfInvalidValueEmptyFault)(nil)).Elem()
+}
+
+type OvfInvalidValueFault BaseOvfInvalidValue
+
+func init() {
+	t["OvfInvalidValueFault"] = reflect.TypeOf((*OvfInvalidValueFault)(nil)).Elem()
+}
+
+type OvfInvalidValueFormatMalformed struct {
+	OvfInvalidValue
+}
+
+func init() {
+	t["OvfInvalidValueFormatMalformed"] = reflect.TypeOf((*OvfInvalidValueFormatMalformed)(nil)).Elem()
+}
+
+type OvfInvalidValueFormatMalformedFault OvfInvalidValueFormatMalformed
+
+func init() {
+	t["OvfInvalidValueFormatMalformedFault"] = reflect.TypeOf((*OvfInvalidValueFormatMalformedFault)(nil)).Elem()
+}
+
+type OvfInvalidValueReference struct {
+	OvfInvalidValue
+}
+
+func init() {
+	t["OvfInvalidValueReference"] = reflect.TypeOf((*OvfInvalidValueReference)(nil)).Elem()
+}
+
+type OvfInvalidValueReferenceFault OvfInvalidValueReference
+
+func init() {
+	t["OvfInvalidValueReferenceFault"] = reflect.TypeOf((*OvfInvalidValueReferenceFault)(nil)).Elem()
+}
+
+type OvfInvalidVmName struct {
+	OvfUnsupportedPackage
+
+	Name string `xml:"name"`
+}
+
+func init() {
+	t["OvfInvalidVmName"] = reflect.TypeOf((*OvfInvalidVmName)(nil)).Elem()
+}
+
+type OvfInvalidVmNameFault OvfInvalidVmName
+
+func init() {
+	t["OvfInvalidVmNameFault"] = reflect.TypeOf((*OvfInvalidVmNameFault)(nil)).Elem()
+}
+
+type OvfManagerCommonParams struct {
+	DynamicData
+
+	Locale           string     `xml:"locale"`
+	DeploymentOption string     `xml:"deploymentOption"`
+	MsgBundle        []KeyValue `xml:"msgBundle,omitempty"`
+	ImportOption     []string   `xml:"importOption,omitempty"`
+}
+
+func init() {
+	t["OvfManagerCommonParams"] = reflect.TypeOf((*OvfManagerCommonParams)(nil)).Elem()
+}
+
+type OvfMappedOsId struct {
+	OvfImport
+
+	OvfId             int32  `xml:"ovfId"`
+	OvfDescription    string `xml:"ovfDescription"`
+	TargetDescription string `xml:"targetDescription"`
+}
+
+func init() {
+	t["OvfMappedOsId"] = reflect.TypeOf((*OvfMappedOsId)(nil)).Elem()
+}
+
+type OvfMappedOsIdFault OvfMappedOsId
+
+func init() {
+	t["OvfMappedOsIdFault"] = reflect.TypeOf((*OvfMappedOsIdFault)(nil)).Elem()
+}
+
+type OvfMissingAttribute struct {
+	OvfAttribute
+}
+
+func init() {
+	t["OvfMissingAttribute"] = reflect.TypeOf((*OvfMissingAttribute)(nil)).Elem()
+}
+
+type OvfMissingAttributeFault OvfMissingAttribute
+
+func init() {
+	t["OvfMissingAttributeFault"] = reflect.TypeOf((*OvfMissingAttributeFault)(nil)).Elem()
+}
+
+type OvfMissingElement struct {
+	OvfElement
+}
+
+func init() {
+	t["OvfMissingElement"] = reflect.TypeOf((*OvfMissingElement)(nil)).Elem()
+}
+
+type OvfMissingElementFault BaseOvfMissingElement
+
+func init() {
+	t["OvfMissingElementFault"] = reflect.TypeOf((*OvfMissingElementFault)(nil)).Elem()
+}
+
+type OvfMissingElementNormalBoundary struct {
+	OvfMissingElement
+
+	Boundary string `xml:"boundary"`
+}
+
+func init() {
+	t["OvfMissingElementNormalBoundary"] = reflect.TypeOf((*OvfMissingElementNormalBoundary)(nil)).Elem()
+}
+
+type OvfMissingElementNormalBoundaryFault OvfMissingElementNormalBoundary
+
+func init() {
+	t["OvfMissingElementNormalBoundaryFault"] = reflect.TypeOf((*OvfMissingElementNormalBoundaryFault)(nil)).Elem()
+}
+
+type OvfMissingHardware struct {
+	OvfImport
+
+	Name         string `xml:"name"`
+	ResourceType int32  `xml:"resourceType"`
+}
+
+func init() {
+	t["OvfMissingHardware"] = reflect.TypeOf((*OvfMissingHardware)(nil)).Elem()
+}
+
+type OvfMissingHardwareFault OvfMissingHardware
+
+func init() {
+	t["OvfMissingHardwareFault"] = reflect.TypeOf((*OvfMissingHardwareFault)(nil)).Elem()
+}
+
+type OvfNetworkInfo struct {
+	DynamicData
+
+	Name        string `xml:"name"`
+	Description string `xml:"description"`
+}
+
+func init() {
+	t["OvfNetworkInfo"] = reflect.TypeOf((*OvfNetworkInfo)(nil)).Elem()
+}
+
+type OvfNetworkMapping struct {
+	DynamicData
+
+	Name    string                 `xml:"name"`
+	Network ManagedObjectReference `xml:"network"`
+}
+
+func init() {
+	t["OvfNetworkMapping"] = reflect.TypeOf((*OvfNetworkMapping)(nil)).Elem()
+}
+
+type OvfNetworkMappingNotSupported struct {
+	OvfImport
+}
+
+func init() {
+	t["OvfNetworkMappingNotSupported"] = reflect.TypeOf((*OvfNetworkMappingNotSupported)(nil)).Elem()
+}
+
+type OvfNetworkMappingNotSupportedFault OvfNetworkMappingNotSupported
+
+func init() {
+	t["OvfNetworkMappingNotSupportedFault"] = reflect.TypeOf((*OvfNetworkMappingNotSupportedFault)(nil)).Elem()
+}
+
+type OvfNoHostNic struct {
+	OvfUnsupportedPackage
+}
+
+func init() {
+	t["OvfNoHostNic"] = reflect.TypeOf((*OvfNoHostNic)(nil)).Elem()
+}
+
+type OvfNoHostNicFault OvfNoHostNic
+
+func init() {
+	t["OvfNoHostNicFault"] = reflect.TypeOf((*OvfNoHostNicFault)(nil)).Elem()
+}
+
+type OvfNoSpaceOnController struct {
+	OvfUnsupportedElement
+
+	Parent string `xml:"parent"`
+}
+
+func init() {
+	t["OvfNoSpaceOnController"] = reflect.TypeOf((*OvfNoSpaceOnController)(nil)).Elem()
+}
+
+type OvfNoSpaceOnControllerFault OvfNoSpaceOnController
+
+func init() {
+	t["OvfNoSpaceOnControllerFault"] = reflect.TypeOf((*OvfNoSpaceOnControllerFault)(nil)).Elem()
+}
+
+type OvfNoSupportedHardwareFamily struct {
+	OvfUnsupportedPackage
+
+	Version string `xml:"version"`
+}
+
+func init() {
+	t["OvfNoSupportedHardwareFamily"] = reflect.TypeOf((*OvfNoSupportedHardwareFamily)(nil)).Elem()
+}
+
+type OvfNoSupportedHardwareFamilyFault OvfNoSupportedHardwareFamily
+
+func init() {
+	t["OvfNoSupportedHardwareFamilyFault"] = reflect.TypeOf((*OvfNoSupportedHardwareFamilyFault)(nil)).Elem()
+}
+
+type OvfOptionInfo struct {
+	DynamicData
+
+	Option      string             `xml:"option"`
+	Description LocalizableMessage `xml:"description"`
+}
+
+func init() {
+	t["OvfOptionInfo"] = reflect.TypeOf((*OvfOptionInfo)(nil)).Elem()
+}
+
+type OvfParseDescriptorParams struct {
+	OvfManagerCommonParams
+}
+
+func init() {
+	t["OvfParseDescriptorParams"] = reflect.TypeOf((*OvfParseDescriptorParams)(nil)).Elem()
+}
+
+type OvfParseDescriptorResult struct {
+	DynamicData
+
+	Eula                            []string               `xml:"eula,omitempty"`
+	Network                         []OvfNetworkInfo       `xml:"network,omitempty"`
+	IpAllocationScheme              []string               `xml:"ipAllocationScheme,omitempty"`
+	IpProtocols                     []string               `xml:"ipProtocols,omitempty"`
+	Property                        []VAppPropertyInfo     `xml:"property,omitempty"`
+	ProductInfo                     *VAppProductInfo       `xml:"productInfo,omitempty"`
+	Annotation                      string                 `xml:"annotation"`
+	ApproximateDownloadSize         int64                  `xml:"approximateDownloadSize,omitempty"`
+	ApproximateFlatDeploymentSize   int64                  `xml:"approximateFlatDeploymentSize,omitempty"`
+	ApproximateSparseDeploymentSize int64                  `xml:"approximateSparseDeploymentSize,omitempty"`
+	DefaultEntityName               string                 `xml:"defaultEntityName"`
+	VirtualApp                      bool                   `xml:"virtualApp"`
+	DeploymentOption                []OvfDeploymentOption  `xml:"deploymentOption,omitempty"`
+	DefaultDeploymentOption         string                 `xml:"defaultDeploymentOption"`
+	EntityName                      []KeyValue             `xml:"entityName,omitempty"`
+	AnnotatedOst                    *OvfConsumerOstNode    `xml:"annotatedOst,omitempty"`
+	Error                           []LocalizedMethodFault `xml:"error,omitempty"`
+	Warning                         []LocalizedMethodFault `xml:"warning,omitempty"`
+}
+
+func init() {
+	t["OvfParseDescriptorResult"] = reflect.TypeOf((*OvfParseDescriptorResult)(nil)).Elem()
+}
+
+type OvfProperty struct {
+	OvfInvalidPackage
+
+	Type  string `xml:"type"`
+	Value string `xml:"value"`
+}
+
+func init() {
+	t["OvfProperty"] = reflect.TypeOf((*OvfProperty)(nil)).Elem()
+}
+
+type OvfPropertyExport struct {
+	OvfExport
+
+	Type  string `xml:"type"`
+	Value string `xml:"value"`
+}
+
+func init() {
+	t["OvfPropertyExport"] = reflect.TypeOf((*OvfPropertyExport)(nil)).Elem()
+}
+
+type OvfPropertyExportFault OvfPropertyExport
+
+func init() {
+	t["OvfPropertyExportFault"] = reflect.TypeOf((*OvfPropertyExportFault)(nil)).Elem()
+}
+
+type OvfPropertyFault BaseOvfProperty
+
+func init() {
+	t["OvfPropertyFault"] = reflect.TypeOf((*OvfPropertyFault)(nil)).Elem()
+}
+
+type OvfPropertyNetwork struct {
+	OvfProperty
+}
+
+func init() {
+	t["OvfPropertyNetwork"] = reflect.TypeOf((*OvfPropertyNetwork)(nil)).Elem()
+}
+
+type OvfPropertyNetworkExport struct {
+	OvfExport
+
+	Network string `xml:"network"`
+}
+
+func init() {
+	t["OvfPropertyNetworkExport"] = reflect.TypeOf((*OvfPropertyNetworkExport)(nil)).Elem()
+}
+
+type OvfPropertyNetworkExportFault OvfPropertyNetworkExport
+
+func init() {
+	t["OvfPropertyNetworkExportFault"] = reflect.TypeOf((*OvfPropertyNetworkExportFault)(nil)).Elem()
+}
+
+type OvfPropertyNetworkFault OvfPropertyNetwork
+
+func init() {
+	t["OvfPropertyNetworkFault"] = reflect.TypeOf((*OvfPropertyNetworkFault)(nil)).Elem()
+}
+
+type OvfPropertyQualifier struct {
+	OvfProperty
+
+	Qualifier string `xml:"qualifier"`
+}
+
+func init() {
+	t["OvfPropertyQualifier"] = reflect.TypeOf((*OvfPropertyQualifier)(nil)).Elem()
+}
+
+type OvfPropertyQualifierDuplicate struct {
+	OvfProperty
+
+	Qualifier string `xml:"qualifier"`
+}
+
+func init() {
+	t["OvfPropertyQualifierDuplicate"] = reflect.TypeOf((*OvfPropertyQualifierDuplicate)(nil)).Elem()
+}
+
+type OvfPropertyQualifierDuplicateFault OvfPropertyQualifierDuplicate
+
+func init() {
+	t["OvfPropertyQualifierDuplicateFault"] = reflect.TypeOf((*OvfPropertyQualifierDuplicateFault)(nil)).Elem()
+}
+
+type OvfPropertyQualifierFault OvfPropertyQualifier
+
+func init() {
+	t["OvfPropertyQualifierFault"] = reflect.TypeOf((*OvfPropertyQualifierFault)(nil)).Elem()
+}
+
+type OvfPropertyQualifierIgnored struct {
+	OvfProperty
+
+	Qualifier string `xml:"qualifier"`
+}
+
+func init() {
+	t["OvfPropertyQualifierIgnored"] = reflect.TypeOf((*OvfPropertyQualifierIgnored)(nil)).Elem()
+}
+
+type OvfPropertyQualifierIgnoredFault OvfPropertyQualifierIgnored
+
+func init() {
+	t["OvfPropertyQualifierIgnoredFault"] = reflect.TypeOf((*OvfPropertyQualifierIgnoredFault)(nil)).Elem()
+}
+
+type OvfPropertyType struct {
+	OvfProperty
+}
+
+func init() {
+	t["OvfPropertyType"] = reflect.TypeOf((*OvfPropertyType)(nil)).Elem()
+}
+
+type OvfPropertyTypeFault OvfPropertyType
+
+func init() {
+	t["OvfPropertyTypeFault"] = reflect.TypeOf((*OvfPropertyTypeFault)(nil)).Elem()
+}
+
+type OvfPropertyValue struct {
+	OvfProperty
+}
+
+func init() {
+	t["OvfPropertyValue"] = reflect.TypeOf((*OvfPropertyValue)(nil)).Elem()
+}
+
+type OvfPropertyValueFault OvfPropertyValue
+
+func init() {
+	t["OvfPropertyValueFault"] = reflect.TypeOf((*OvfPropertyValueFault)(nil)).Elem()
+}
+
+type OvfResourceMap struct {
+	DynamicData
+
+	Source       string                  `xml:"source"`
+	Parent       *ManagedObjectReference `xml:"parent,omitempty"`
+	ResourceSpec *ResourceConfigSpec     `xml:"resourceSpec,omitempty"`
+	Datastore    *ManagedObjectReference `xml:"datastore,omitempty"`
+}
+
+func init() {
+	t["OvfResourceMap"] = reflect.TypeOf((*OvfResourceMap)(nil)).Elem()
+}
+
+type OvfSystemFault struct {
+	OvfFault
+}
+
+func init() {
+	t["OvfSystemFault"] = reflect.TypeOf((*OvfSystemFault)(nil)).Elem()
+}
+
+type OvfSystemFaultFault BaseOvfSystemFault
+
+func init() {
+	t["OvfSystemFaultFault"] = reflect.TypeOf((*OvfSystemFaultFault)(nil)).Elem()
+}
+
+type OvfToXmlUnsupportedElement struct {
+	OvfSystemFault
+
+	Name string `xml:"name,omitempty"`
+}
+
+func init() {
+	t["OvfToXmlUnsupportedElement"] = reflect.TypeOf((*OvfToXmlUnsupportedElement)(nil)).Elem()
+}
+
+type OvfToXmlUnsupportedElementFault OvfToXmlUnsupportedElement
+
+func init() {
+	t["OvfToXmlUnsupportedElementFault"] = reflect.TypeOf((*OvfToXmlUnsupportedElementFault)(nil)).Elem()
+}
+
+type OvfUnableToExportDisk struct {
+	OvfHardwareExport
+
+	DiskName string `xml:"diskName"`
+}
+
+func init() {
+	t["OvfUnableToExportDisk"] = reflect.TypeOf((*OvfUnableToExportDisk)(nil)).Elem()
+}
+
+type OvfUnableToExportDiskFault OvfUnableToExportDisk
+
+func init() {
+	t["OvfUnableToExportDiskFault"] = reflect.TypeOf((*OvfUnableToExportDiskFault)(nil)).Elem()
+}
+
+type OvfUnexpectedElement struct {
+	OvfElement
+}
+
+func init() {
+	t["OvfUnexpectedElement"] = reflect.TypeOf((*OvfUnexpectedElement)(nil)).Elem()
+}
+
+type OvfUnexpectedElementFault OvfUnexpectedElement
+
+func init() {
+	t["OvfUnexpectedElementFault"] = reflect.TypeOf((*OvfUnexpectedElementFault)(nil)).Elem()
+}
+
+type OvfUnknownDevice struct {
+	OvfSystemFault
+
+	Device BaseVirtualDevice `xml:"device,omitempty,typeattr"`
+	VmName string            `xml:"vmName"`
+}
+
+func init() {
+	t["OvfUnknownDevice"] = reflect.TypeOf((*OvfUnknownDevice)(nil)).Elem()
+}
+
+type OvfUnknownDeviceBacking struct {
+	OvfHardwareExport
+
+	Backing BaseVirtualDeviceBackingInfo `xml:"backing,typeattr"`
+}
+
+func init() {
+	t["OvfUnknownDeviceBacking"] = reflect.TypeOf((*OvfUnknownDeviceBacking)(nil)).Elem()
+}
+
+type OvfUnknownDeviceBackingFault OvfUnknownDeviceBacking
+
+func init() {
+	t["OvfUnknownDeviceBackingFault"] = reflect.TypeOf((*OvfUnknownDeviceBackingFault)(nil)).Elem()
+}
+
+type OvfUnknownDeviceFault OvfUnknownDevice
+
+func init() {
+	t["OvfUnknownDeviceFault"] = reflect.TypeOf((*OvfUnknownDeviceFault)(nil)).Elem()
+}
+
+type OvfUnknownEntity struct {
+	OvfSystemFault
+
+	LineNumber int32 `xml:"lineNumber"`
+}
+
+func init() {
+	t["OvfUnknownEntity"] = reflect.TypeOf((*OvfUnknownEntity)(nil)).Elem()
+}
+
+type OvfUnknownEntityFault OvfUnknownEntity
+
+func init() {
+	t["OvfUnknownEntityFault"] = reflect.TypeOf((*OvfUnknownEntityFault)(nil)).Elem()
+}
+
+type OvfUnsupportedAttribute struct {
+	OvfUnsupportedPackage
+
+	ElementName   string `xml:"elementName"`
+	AttributeName string `xml:"attributeName"`
+}
+
+func init() {
+	t["OvfUnsupportedAttribute"] = reflect.TypeOf((*OvfUnsupportedAttribute)(nil)).Elem()
+}
+
+type OvfUnsupportedAttributeFault BaseOvfUnsupportedAttribute
+
+func init() {
+	t["OvfUnsupportedAttributeFault"] = reflect.TypeOf((*OvfUnsupportedAttributeFault)(nil)).Elem()
+}
+
+type OvfUnsupportedAttributeValue struct {
+	OvfUnsupportedAttribute
+
+	Value string `xml:"value"`
+}
+
+func init() {
+	t["OvfUnsupportedAttributeValue"] = reflect.TypeOf((*OvfUnsupportedAttributeValue)(nil)).Elem()
+}
+
+type OvfUnsupportedAttributeValueFault OvfUnsupportedAttributeValue
+
+func init() {
+	t["OvfUnsupportedAttributeValueFault"] = reflect.TypeOf((*OvfUnsupportedAttributeValueFault)(nil)).Elem()
+}
+
+type OvfUnsupportedDeviceBackingInfo struct {
+	OvfSystemFault
+
+	ElementName string `xml:"elementName,omitempty"`
+	InstanceId  string `xml:"instanceId,omitempty"`
+	DeviceName  string `xml:"deviceName"`
+	BackingName string `xml:"backingName,omitempty"`
+}
+
+func init() {
+	t["OvfUnsupportedDeviceBackingInfo"] = reflect.TypeOf((*OvfUnsupportedDeviceBackingInfo)(nil)).Elem()
+}
+
+type OvfUnsupportedDeviceBackingInfoFault OvfUnsupportedDeviceBackingInfo
+
+func init() {
+	t["OvfUnsupportedDeviceBackingInfoFault"] = reflect.TypeOf((*OvfUnsupportedDeviceBackingInfoFault)(nil)).Elem()
+}
+
+type OvfUnsupportedDeviceBackingOption struct {
+	OvfSystemFault
+
+	ElementName string `xml:"elementName,omitempty"`
+	InstanceId  string `xml:"instanceId,omitempty"`
+	DeviceName  string `xml:"deviceName"`
+	BackingName string `xml:"backingName,omitempty"`
+}
+
+func init() {
+	t["OvfUnsupportedDeviceBackingOption"] = reflect.TypeOf((*OvfUnsupportedDeviceBackingOption)(nil)).Elem()
+}
+
+type OvfUnsupportedDeviceBackingOptionFault OvfUnsupportedDeviceBackingOption
+
+func init() {
+	t["OvfUnsupportedDeviceBackingOptionFault"] = reflect.TypeOf((*OvfUnsupportedDeviceBackingOptionFault)(nil)).Elem()
+}
+
+type OvfUnsupportedDeviceExport struct {
+	OvfHardwareExport
+}
+
+func init() {
+	t["OvfUnsupportedDeviceExport"] = reflect.TypeOf((*OvfUnsupportedDeviceExport)(nil)).Elem()
+}
+
+type OvfUnsupportedDeviceExportFault OvfUnsupportedDeviceExport
+
+func init() {
+	t["OvfUnsupportedDeviceExportFault"] = reflect.TypeOf((*OvfUnsupportedDeviceExportFault)(nil)).Elem()
+}
+
+type OvfUnsupportedDiskProvisioning struct {
+	OvfImport
+
+	DiskProvisioning          string `xml:"diskProvisioning"`
+	SupportedDiskProvisioning string `xml:"supportedDiskProvisioning"`
+}
+
+func init() {
+	t["OvfUnsupportedDiskProvisioning"] = reflect.TypeOf((*OvfUnsupportedDiskProvisioning)(nil)).Elem()
+}
+
+type OvfUnsupportedDiskProvisioningFault OvfUnsupportedDiskProvisioning
+
+func init() {
+	t["OvfUnsupportedDiskProvisioningFault"] = reflect.TypeOf((*OvfUnsupportedDiskProvisioningFault)(nil)).Elem()
+}
+
+type OvfUnsupportedElement struct {
+	OvfUnsupportedPackage
+
+	Name string `xml:"name"`
+}
+
+func init() {
+	t["OvfUnsupportedElement"] = reflect.TypeOf((*OvfUnsupportedElement)(nil)).Elem()
+}
+
+type OvfUnsupportedElementFault BaseOvfUnsupportedElement
+
+func init() {
+	t["OvfUnsupportedElementFault"] = reflect.TypeOf((*OvfUnsupportedElementFault)(nil)).Elem()
+}
+
+type OvfUnsupportedElementValue struct {
+	OvfUnsupportedElement
+
+	Value string `xml:"value"`
+}
+
+func init() {
+	t["OvfUnsupportedElementValue"] = reflect.TypeOf((*OvfUnsupportedElementValue)(nil)).Elem()
+}
+
+type OvfUnsupportedElementValueFault OvfUnsupportedElementValue
+
+func init() {
+	t["OvfUnsupportedElementValueFault"] = reflect.TypeOf((*OvfUnsupportedElementValueFault)(nil)).Elem()
+}
+
+type OvfUnsupportedPackage struct {
+	OvfFault
+
+	LineNumber int32 `xml:"lineNumber,omitempty"`
+}
+
+func init() {
+	t["OvfUnsupportedPackage"] = reflect.TypeOf((*OvfUnsupportedPackage)(nil)).Elem()
+}
+
+type OvfUnsupportedPackageFault BaseOvfUnsupportedPackage
+
+func init() {
+	t["OvfUnsupportedPackageFault"] = reflect.TypeOf((*OvfUnsupportedPackageFault)(nil)).Elem()
+}
+
+type OvfUnsupportedSection struct {
+	OvfUnsupportedElement
+
+	Info string `xml:"info"`
+}
+
+func init() {
+	t["OvfUnsupportedSection"] = reflect.TypeOf((*OvfUnsupportedSection)(nil)).Elem()
+}
+
+type OvfUnsupportedSectionFault OvfUnsupportedSection
+
+func init() {
+	t["OvfUnsupportedSectionFault"] = reflect.TypeOf((*OvfUnsupportedSectionFault)(nil)).Elem()
+}
+
+type OvfUnsupportedSubType struct {
+	OvfUnsupportedPackage
+
+	ElementName   string `xml:"elementName"`
+	InstanceId    string `xml:"instanceId"`
+	DeviceType    int32  `xml:"deviceType"`
+	DeviceSubType string `xml:"deviceSubType"`
+}
+
+func init() {
+	t["OvfUnsupportedSubType"] = reflect.TypeOf((*OvfUnsupportedSubType)(nil)).Elem()
+}
+
+type OvfUnsupportedSubTypeFault OvfUnsupportedSubType
+
+func init() {
+	t["OvfUnsupportedSubTypeFault"] = reflect.TypeOf((*OvfUnsupportedSubTypeFault)(nil)).Elem()
+}
+
+type OvfUnsupportedType struct {
+	OvfUnsupportedPackage
+
+	Name       string `xml:"name"`
+	InstanceId string `xml:"instanceId"`
+	DeviceType int32  `xml:"deviceType"`
+}
+
+func init() {
+	t["OvfUnsupportedType"] = reflect.TypeOf((*OvfUnsupportedType)(nil)).Elem()
+}
+
+type OvfUnsupportedTypeFault OvfUnsupportedType
+
+func init() {
+	t["OvfUnsupportedTypeFault"] = reflect.TypeOf((*OvfUnsupportedTypeFault)(nil)).Elem()
+}
+
+type OvfValidateHostParams struct {
+	OvfManagerCommonParams
+}
+
+func init() {
+	t["OvfValidateHostParams"] = reflect.TypeOf((*OvfValidateHostParams)(nil)).Elem()
+}
+
+type OvfValidateHostResult struct {
+	DynamicData
+
+	DownloadSize              int64                  `xml:"downloadSize,omitempty"`
+	FlatDeploymentSize        int64                  `xml:"flatDeploymentSize,omitempty"`
+	SparseDeploymentSize      int64                  `xml:"sparseDeploymentSize,omitempty"`
+	Error                     []LocalizedMethodFault `xml:"error,omitempty"`
+	Warning                   []LocalizedMethodFault `xml:"warning,omitempty"`
+	SupportedDiskProvisioning []string               `xml:"supportedDiskProvisioning,omitempty"`
+}
+
+func init() {
+	t["OvfValidateHostResult"] = reflect.TypeOf((*OvfValidateHostResult)(nil)).Elem()
+}
+
+type OvfWrongElement struct {
+	OvfElement
+}
+
+func init() {
+	t["OvfWrongElement"] = reflect.TypeOf((*OvfWrongElement)(nil)).Elem()
+}
+
+type OvfWrongElementFault OvfWrongElement
+
+func init() {
+	t["OvfWrongElementFault"] = reflect.TypeOf((*OvfWrongElementFault)(nil)).Elem()
+}
+
+type OvfWrongNamespace struct {
+	OvfInvalidPackage
+
+	NamespaceName string `xml:"namespaceName"`
+}
+
+func init() {
+	t["OvfWrongNamespace"] = reflect.TypeOf((*OvfWrongNamespace)(nil)).Elem()
+}
+
+type OvfWrongNamespaceFault OvfWrongNamespace
+
+func init() {
+	t["OvfWrongNamespaceFault"] = reflect.TypeOf((*OvfWrongNamespaceFault)(nil)).Elem()
+}
+
+type OvfXmlFormat struct {
+	OvfInvalidPackage
+
+	Description string `xml:"description"`
+}
+
+func init() {
+	t["OvfXmlFormat"] = reflect.TypeOf((*OvfXmlFormat)(nil)).Elem()
+}
+
+type OvfXmlFormatFault OvfXmlFormat
+
+func init() {
+	t["OvfXmlFormatFault"] = reflect.TypeOf((*OvfXmlFormatFault)(nil)).Elem()
+}
+
+type ParaVirtualSCSIController struct {
+	VirtualSCSIController
+}
+
+func init() {
+	t["ParaVirtualSCSIController"] = reflect.TypeOf((*ParaVirtualSCSIController)(nil)).Elem()
+}
+
+type ParaVirtualSCSIControllerOption struct {
+	VirtualSCSIControllerOption
+}
+
+func init() {
+	t["ParaVirtualSCSIControllerOption"] = reflect.TypeOf((*ParaVirtualSCSIControllerOption)(nil)).Elem()
+}
+
+type ParseDescriptor ParseDescriptorRequestType
+
+func init() {
+	t["ParseDescriptor"] = reflect.TypeOf((*ParseDescriptor)(nil)).Elem()
+}
+
+type ParseDescriptorRequestType struct {
+	This          ManagedObjectReference   `xml:"_this"`
+	OvfDescriptor string                   `xml:"ovfDescriptor"`
+	Pdp           OvfParseDescriptorParams `xml:"pdp"`
+}
+
+func init() {
+	t["ParseDescriptorRequestType"] = reflect.TypeOf((*ParseDescriptorRequestType)(nil)).Elem()
+}
+
+type ParseDescriptorResponse struct {
+	Returnval OvfParseDescriptorResult `xml:"returnval"`
+}
+
+type PassiveNodeDeploymentSpec struct {
+	NodeDeploymentSpec
+
+	FailoverIpSettings *CustomizationIPSettings `xml:"failoverIpSettings,omitempty"`
+}
+
+func init() {
+	t["PassiveNodeDeploymentSpec"] = reflect.TypeOf((*PassiveNodeDeploymentSpec)(nil)).Elem()
+}
+
+type PassiveNodeNetworkSpec struct {
+	NodeNetworkSpec
+
+	FailoverIpSettings *CustomizationIPSettings `xml:"failoverIpSettings,omitempty"`
+}
+
+func init() {
+	t["PassiveNodeNetworkSpec"] = reflect.TypeOf((*PassiveNodeNetworkSpec)(nil)).Elem()
+}
+
+type PasswordField struct {
+	DynamicData
+
+	Value string `xml:"value"`
+}
+
+func init() {
+	t["PasswordField"] = reflect.TypeOf((*PasswordField)(nil)).Elem()
+}
+
+type PatchAlreadyInstalled struct {
+	PatchNotApplicable
+}
+
+func init() {
+	t["PatchAlreadyInstalled"] = reflect.TypeOf((*PatchAlreadyInstalled)(nil)).Elem()
+}
+
+type PatchAlreadyInstalledFault PatchAlreadyInstalled
+
+func init() {
+	t["PatchAlreadyInstalledFault"] = reflect.TypeOf((*PatchAlreadyInstalledFault)(nil)).Elem()
+}
+
+type PatchBinariesNotFound struct {
+	VimFault
+
+	PatchID string   `xml:"patchID"`
+	Binary  []string `xml:"binary,omitempty"`
+}
+
+func init() {
+	t["PatchBinariesNotFound"] = reflect.TypeOf((*PatchBinariesNotFound)(nil)).Elem()
+}
+
+type PatchBinariesNotFoundFault PatchBinariesNotFound
+
+func init() {
+	t["PatchBinariesNotFoundFault"] = reflect.TypeOf((*PatchBinariesNotFoundFault)(nil)).Elem()
+}
+
+type PatchInstallFailed struct {
+	PlatformConfigFault
+
+	RolledBack bool `xml:"rolledBack"`
+}
+
+func init() {
+	t["PatchInstallFailed"] = reflect.TypeOf((*PatchInstallFailed)(nil)).Elem()
+}
+
+type PatchInstallFailedFault PatchInstallFailed
+
+func init() {
+	t["PatchInstallFailedFault"] = reflect.TypeOf((*PatchInstallFailedFault)(nil)).Elem()
+}
+
+type PatchIntegrityError struct {
+	PlatformConfigFault
+}
+
+func init() {
+	t["PatchIntegrityError"] = reflect.TypeOf((*PatchIntegrityError)(nil)).Elem()
+}
+
+type PatchIntegrityErrorFault PatchIntegrityError
+
+func init() {
+	t["PatchIntegrityErrorFault"] = reflect.TypeOf((*PatchIntegrityErrorFault)(nil)).Elem()
+}
+
+type PatchMetadataCorrupted struct {
+	PatchMetadataInvalid
+}
+
+func init() {
+	t["PatchMetadataCorrupted"] = reflect.TypeOf((*PatchMetadataCorrupted)(nil)).Elem()
+}
+
+type PatchMetadataCorruptedFault PatchMetadataCorrupted
+
+func init() {
+	t["PatchMetadataCorruptedFault"] = reflect.TypeOf((*PatchMetadataCorruptedFault)(nil)).Elem()
+}
+
+type PatchMetadataInvalid struct {
+	VimFault
+
+	PatchID  string   `xml:"patchID"`
+	MetaData []string `xml:"metaData,omitempty"`
+}
+
+func init() {
+	t["PatchMetadataInvalid"] = reflect.TypeOf((*PatchMetadataInvalid)(nil)).Elem()
+}
+
+type PatchMetadataInvalidFault BasePatchMetadataInvalid
+
+func init() {
+	t["PatchMetadataInvalidFault"] = reflect.TypeOf((*PatchMetadataInvalidFault)(nil)).Elem()
+}
+
+type PatchMetadataNotFound struct {
+	PatchMetadataInvalid
+}
+
+func init() {
+	t["PatchMetadataNotFound"] = reflect.TypeOf((*PatchMetadataNotFound)(nil)).Elem()
+}
+
+type PatchMetadataNotFoundFault PatchMetadataNotFound
+
+func init() {
+	t["PatchMetadataNotFoundFault"] = reflect.TypeOf((*PatchMetadataNotFoundFault)(nil)).Elem()
+}
+
+type PatchMissingDependencies struct {
+	PatchNotApplicable
+
+	PrerequisitePatch []string `xml:"prerequisitePatch,omitempty"`
+	PrerequisiteLib   []string `xml:"prerequisiteLib,omitempty"`
+}
+
+func init() {
+	t["PatchMissingDependencies"] = reflect.TypeOf((*PatchMissingDependencies)(nil)).Elem()
+}
+
+type PatchMissingDependenciesFault PatchMissingDependencies
+
+func init() {
+	t["PatchMissingDependenciesFault"] = reflect.TypeOf((*PatchMissingDependenciesFault)(nil)).Elem()
+}
+
+type PatchNotApplicable struct {
+	VimFault
+
+	PatchID string `xml:"patchID"`
+}
+
+func init() {
+	t["PatchNotApplicable"] = reflect.TypeOf((*PatchNotApplicable)(nil)).Elem()
+}
+
+type PatchNotApplicableFault BasePatchNotApplicable
+
+func init() {
+	t["PatchNotApplicableFault"] = reflect.TypeOf((*PatchNotApplicableFault)(nil)).Elem()
+}
+
+type PatchSuperseded struct {
+	PatchNotApplicable
+
+	Supersede []string `xml:"supersede,omitempty"`
+}
+
+func init() {
+	t["PatchSuperseded"] = reflect.TypeOf((*PatchSuperseded)(nil)).Elem()
+}
+
+type PatchSupersededFault PatchSuperseded
+
+func init() {
+	t["PatchSupersededFault"] = reflect.TypeOf((*PatchSupersededFault)(nil)).Elem()
+}
+
+type PerfCompositeMetric struct {
+	DynamicData
+
+	Entity      BasePerfEntityMetricBase   `xml:"entity,omitempty,typeattr"`
+	ChildEntity []BasePerfEntityMetricBase `xml:"childEntity,omitempty,typeattr"`
+}
+
+func init() {
+	t["PerfCompositeMetric"] = reflect.TypeOf((*PerfCompositeMetric)(nil)).Elem()
+}
+
+type PerfCounterInfo struct {
+	DynamicData
+
+	Key                 int32                  `xml:"key"`
+	NameInfo            BaseElementDescription `xml:"nameInfo,typeattr"`
+	GroupInfo           BaseElementDescription `xml:"groupInfo,typeattr"`
+	UnitInfo            BaseElementDescription `xml:"unitInfo,typeattr"`
+	RollupType          PerfSummaryType        `xml:"rollupType"`
+	StatsType           PerfStatsType          `xml:"statsType"`
+	Level               int32                  `xml:"level,omitempty"`
+	PerDeviceLevel      int32                  `xml:"perDeviceLevel,omitempty"`
+	AssociatedCounterId []int32                `xml:"associatedCounterId,omitempty"`
+}
+
+func init() {
+	t["PerfCounterInfo"] = reflect.TypeOf((*PerfCounterInfo)(nil)).Elem()
+}
+
+type PerfEntityMetric struct {
+	PerfEntityMetricBase
+
+	SampleInfo []PerfSampleInfo       `xml:"sampleInfo,omitempty"`
+	Value      []BasePerfMetricSeries `xml:"value,omitempty,typeattr"`
+}
+
+func init() {
+	t["PerfEntityMetric"] = reflect.TypeOf((*PerfEntityMetric)(nil)).Elem()
+}
+
+type PerfEntityMetricBase struct {
+	DynamicData
+
+	Entity ManagedObjectReference `xml:"entity"`
+}
+
+func init() {
+	t["PerfEntityMetricBase"] = reflect.TypeOf((*PerfEntityMetricBase)(nil)).Elem()
+}
+
+type PerfEntityMetricCSV struct {
+	PerfEntityMetricBase
+
+	SampleInfoCSV string                `xml:"sampleInfoCSV"`
+	Value         []PerfMetricSeriesCSV `xml:"value,omitempty"`
+}
+
+func init() {
+	t["PerfEntityMetricCSV"] = reflect.TypeOf((*PerfEntityMetricCSV)(nil)).Elem()
+}
+
+type PerfInterval struct {
+	DynamicData
+
+	Key            int32  `xml:"key"`
+	SamplingPeriod int32  `xml:"samplingPeriod"`
+	Name           string `xml:"name"`
+	Length         int32  `xml:"length"`
+	Level          int32  `xml:"level,omitempty"`
+	Enabled        bool   `xml:"enabled"`
+}
+
+func init() {
+	t["PerfInterval"] = reflect.TypeOf((*PerfInterval)(nil)).Elem()
+}
+
+type PerfMetricId struct {
+	DynamicData
+
+	CounterId int32  `xml:"counterId"`
+	Instance  string `xml:"instance"`
+}
+
+func init() {
+	t["PerfMetricId"] = reflect.TypeOf((*PerfMetricId)(nil)).Elem()
+}
+
+type PerfMetricIntSeries struct {
+	PerfMetricSeries
+
+	Value []int64 `xml:"value,omitempty"`
+}
+
+func init() {
+	t["PerfMetricIntSeries"] = reflect.TypeOf((*PerfMetricIntSeries)(nil)).Elem()
+}
+
+type PerfMetricSeries struct {
+	DynamicData
+
+	Id PerfMetricId `xml:"id"`
+}
+
+func init() {
+	t["PerfMetricSeries"] = reflect.TypeOf((*PerfMetricSeries)(nil)).Elem()
+}
+
+type PerfMetricSeriesCSV struct {
+	PerfMetricSeries
+
+	Value string `xml:"value,omitempty"`
+}
+
+func init() {
+	t["PerfMetricSeriesCSV"] = reflect.TypeOf((*PerfMetricSeriesCSV)(nil)).Elem()
+}
+
+type PerfProviderSummary struct {
+	DynamicData
+
+	Entity           ManagedObjectReference `xml:"entity"`
+	CurrentSupported bool                   `xml:"currentSupported"`
+	SummarySupported bool                   `xml:"summarySupported"`
+	RefreshRate      int32                  `xml:"refreshRate,omitempty"`
+}
+
+func init() {
+	t["PerfProviderSummary"] = reflect.TypeOf((*PerfProviderSummary)(nil)).Elem()
+}
+
+type PerfQuerySpec struct {
+	DynamicData
+
+	Entity     ManagedObjectReference `xml:"entity"`
+	StartTime  *time.Time             `xml:"startTime"`
+	EndTime    *time.Time             `xml:"endTime"`
+	MaxSample  int32                  `xml:"maxSample,omitempty"`
+	MetricId   []PerfMetricId         `xml:"metricId,omitempty"`
+	IntervalId int32                  `xml:"intervalId,omitempty"`
+	Format     string                 `xml:"format,omitempty"`
+}
+
+func init() {
+	t["PerfQuerySpec"] = reflect.TypeOf((*PerfQuerySpec)(nil)).Elem()
+}
+
+type PerfSampleInfo struct {
+	DynamicData
+
+	Timestamp time.Time `xml:"timestamp"`
+	Interval  int32     `xml:"interval"`
+}
+
+func init() {
+	t["PerfSampleInfo"] = reflect.TypeOf((*PerfSampleInfo)(nil)).Elem()
+}
+
+type PerformDvsProductSpecOperationRequestType struct {
+	This        ManagedObjectReference               `xml:"_this"`
+	Operation   string                               `xml:"operation"`
+	ProductSpec *DistributedVirtualSwitchProductSpec `xml:"productSpec,omitempty"`
+}
+
+func init() {
+	t["PerformDvsProductSpecOperationRequestType"] = reflect.TypeOf((*PerformDvsProductSpecOperationRequestType)(nil)).Elem()
+}
+
+type PerformDvsProductSpecOperation_Task PerformDvsProductSpecOperationRequestType
+
+func init() {
+	t["PerformDvsProductSpecOperation_Task"] = reflect.TypeOf((*PerformDvsProductSpecOperation_Task)(nil)).Elem()
+}
+
+type PerformDvsProductSpecOperation_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type PerformVsanUpgradePreflightCheck PerformVsanUpgradePreflightCheckRequestType
+
+func init() {
+	t["PerformVsanUpgradePreflightCheck"] = reflect.TypeOf((*PerformVsanUpgradePreflightCheck)(nil)).Elem()
+}
+
+type PerformVsanUpgradePreflightCheckRequestType struct {
+	This            ManagedObjectReference `xml:"_this"`
+	Cluster         ManagedObjectReference `xml:"cluster"`
+	DowngradeFormat *bool                  `xml:"downgradeFormat"`
+}
+
+func init() {
+	t["PerformVsanUpgradePreflightCheckRequestType"] = reflect.TypeOf((*PerformVsanUpgradePreflightCheckRequestType)(nil)).Elem()
+}
+
+type PerformVsanUpgradePreflightCheckResponse struct {
+	Returnval VsanUpgradeSystemPreflightCheckResult `xml:"returnval"`
+}
+
+type PerformVsanUpgradeRequestType struct {
+	This                   ManagedObjectReference   `xml:"_this"`
+	Cluster                ManagedObjectReference   `xml:"cluster"`
+	PerformObjectUpgrade   *bool                    `xml:"performObjectUpgrade"`
+	DowngradeFormat        *bool                    `xml:"downgradeFormat"`
+	AllowReducedRedundancy *bool                    `xml:"allowReducedRedundancy"`
+	ExcludeHosts           []ManagedObjectReference `xml:"excludeHosts,omitempty"`
+}
+
+func init() {
+	t["PerformVsanUpgradeRequestType"] = reflect.TypeOf((*PerformVsanUpgradeRequestType)(nil)).Elem()
+}
+
+type PerformVsanUpgrade_Task PerformVsanUpgradeRequestType
+
+func init() {
+	t["PerformVsanUpgrade_Task"] = reflect.TypeOf((*PerformVsanUpgrade_Task)(nil)).Elem()
+}
+
+type PerformVsanUpgrade_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type PerformanceDescription struct {
+	DynamicData
+
+	CounterType []BaseElementDescription `xml:"counterType,typeattr"`
+	StatsType   []BaseElementDescription `xml:"statsType,typeattr"`
+}
+
+func init() {
+	t["PerformanceDescription"] = reflect.TypeOf((*PerformanceDescription)(nil)).Elem()
+}
+
+type PerformanceManagerCounterLevelMapping struct {
+	DynamicData
+
+	CounterId      int32 `xml:"counterId"`
+	AggregateLevel int32 `xml:"aggregateLevel,omitempty"`
+	PerDeviceLevel int32 `xml:"perDeviceLevel,omitempty"`
+}
+
+func init() {
+	t["PerformanceManagerCounterLevelMapping"] = reflect.TypeOf((*PerformanceManagerCounterLevelMapping)(nil)).Elem()
+}
+
+type PerformanceStatisticsDescription struct {
+	DynamicData
+
+	Intervals []PerfInterval `xml:"intervals,omitempty"`
+}
+
+func init() {
+	t["PerformanceStatisticsDescription"] = reflect.TypeOf((*PerformanceStatisticsDescription)(nil)).Elem()
+}
+
+type Permission struct {
+	DynamicData
+
+	Entity    *ManagedObjectReference `xml:"entity,omitempty"`
+	Principal string                  `xml:"principal"`
+	Group     bool                    `xml:"group"`
+	RoleId    int32                   `xml:"roleId"`
+	Propagate bool                    `xml:"propagate"`
+}
+
+func init() {
+	t["Permission"] = reflect.TypeOf((*Permission)(nil)).Elem()
+}
+
+type PermissionAddedEvent struct {
+	PermissionEvent
+
+	Role      RoleEventArgument `xml:"role"`
+	Propagate bool              `xml:"propagate"`
+}
+
+func init() {
+	t["PermissionAddedEvent"] = reflect.TypeOf((*PermissionAddedEvent)(nil)).Elem()
+}
+
+type PermissionEvent struct {
+	AuthorizationEvent
+
+	Entity    ManagedEntityEventArgument `xml:"entity"`
+	Principal string                     `xml:"principal"`
+	Group     bool                       `xml:"group"`
+}
+
+func init() {
+	t["PermissionEvent"] = reflect.TypeOf((*PermissionEvent)(nil)).Elem()
+}
+
+type PermissionProfile struct {
+	ApplyProfile
+
+	Key string `xml:"key"`
+}
+
+func init() {
+	t["PermissionProfile"] = reflect.TypeOf((*PermissionProfile)(nil)).Elem()
+}
+
+type PermissionRemovedEvent struct {
+	PermissionEvent
+}
+
+func init() {
+	t["PermissionRemovedEvent"] = reflect.TypeOf((*PermissionRemovedEvent)(nil)).Elem()
+}
+
+type PermissionUpdatedEvent struct {
+	PermissionEvent
+
+	Role          RoleEventArgument  `xml:"role"`
+	Propagate     bool               `xml:"propagate"`
+	PrevRole      *RoleEventArgument `xml:"prevRole,omitempty"`
+	PrevPropagate *bool              `xml:"prevPropagate"`
+}
+
+func init() {
+	t["PermissionUpdatedEvent"] = reflect.TypeOf((*PermissionUpdatedEvent)(nil)).Elem()
+}
+
+type PhysCompatRDMNotSupported struct {
+	RDMNotSupported
+}
+
+func init() {
+	t["PhysCompatRDMNotSupported"] = reflect.TypeOf((*PhysCompatRDMNotSupported)(nil)).Elem()
+}
+
+type PhysCompatRDMNotSupportedFault PhysCompatRDMNotSupported
+
+func init() {
+	t["PhysCompatRDMNotSupportedFault"] = reflect.TypeOf((*PhysCompatRDMNotSupportedFault)(nil)).Elem()
+}
+
+type PhysicalNic struct {
+	DynamicData
+
+	Key                                   string                `xml:"key,omitempty"`
+	Device                                string                `xml:"device"`
+	Pci                                   string                `xml:"pci"`
+	Driver                                string                `xml:"driver,omitempty"`
+	LinkSpeed                             *PhysicalNicLinkInfo  `xml:"linkSpeed,omitempty"`
+	ValidLinkSpecification                []PhysicalNicLinkInfo `xml:"validLinkSpecification,omitempty"`
+	Spec                                  PhysicalNicSpec       `xml:"spec"`
+	WakeOnLanSupported                    bool                  `xml:"wakeOnLanSupported"`
+	Mac                                   string                `xml:"mac"`
+	FcoeConfiguration                     *FcoeConfig           `xml:"fcoeConfiguration,omitempty"`
+	VmDirectPathGen2Supported             *bool                 `xml:"vmDirectPathGen2Supported"`
+	VmDirectPathGen2SupportedMode         string                `xml:"vmDirectPathGen2SupportedMode,omitempty"`
+	ResourcePoolSchedulerAllowed          *bool                 `xml:"resourcePoolSchedulerAllowed"`
+	ResourcePoolSchedulerDisallowedReason []string              `xml:"resourcePoolSchedulerDisallowedReason,omitempty"`
+	AutoNegotiateSupported                *bool                 `xml:"autoNegotiateSupported"`
+}
+
+func init() {
+	t["PhysicalNic"] = reflect.TypeOf((*PhysicalNic)(nil)).Elem()
+}
+
+type PhysicalNicCdpDeviceCapability struct {
+	DynamicData
+
+	Router            bool `xml:"router"`
+	TransparentBridge bool `xml:"transparentBridge"`
+	SourceRouteBridge bool `xml:"sourceRouteBridge"`
+	NetworkSwitch     bool `xml:"networkSwitch"`
+	Host              bool `xml:"host"`
+	IgmpEnabled       bool `xml:"igmpEnabled"`
+	Repeater          bool `xml:"repeater"`
+}
+
+func init() {
+	t["PhysicalNicCdpDeviceCapability"] = reflect.TypeOf((*PhysicalNicCdpDeviceCapability)(nil)).Elem()
+}
+
+type PhysicalNicCdpInfo struct {
+	DynamicData
+
+	CdpVersion       int32                           `xml:"cdpVersion,omitempty"`
+	Timeout          int32                           `xml:"timeout,omitempty"`
+	Ttl              int32                           `xml:"ttl,omitempty"`
+	Samples          int32                           `xml:"samples,omitempty"`
+	DevId            string                          `xml:"devId,omitempty"`
+	Address          string                          `xml:"address,omitempty"`
+	PortId           string                          `xml:"portId,omitempty"`
+	DeviceCapability *PhysicalNicCdpDeviceCapability `xml:"deviceCapability,omitempty"`
+	SoftwareVersion  string                          `xml:"softwareVersion,omitempty"`
+	HardwarePlatform string                          `xml:"hardwarePlatform,omitempty"`
+	IpPrefix         string                          `xml:"ipPrefix,omitempty"`
+	IpPrefixLen      int32                           `xml:"ipPrefixLen,omitempty"`
+	Vlan             int32                           `xml:"vlan,omitempty"`
+	FullDuplex       *bool                           `xml:"fullDuplex"`
+	Mtu              int32                           `xml:"mtu,omitempty"`
+	SystemName       string                          `xml:"systemName,omitempty"`
+	SystemOID        string                          `xml:"systemOID,omitempty"`
+	MgmtAddr         string                          `xml:"mgmtAddr,omitempty"`
+	Location         string                          `xml:"location,omitempty"`
+}
+
+func init() {
+	t["PhysicalNicCdpInfo"] = reflect.TypeOf((*PhysicalNicCdpInfo)(nil)).Elem()
+}
+
+type PhysicalNicConfig struct {
+	DynamicData
+
+	Device string          `xml:"device"`
+	Spec   PhysicalNicSpec `xml:"spec"`
+}
+
+func init() {
+	t["PhysicalNicConfig"] = reflect.TypeOf((*PhysicalNicConfig)(nil)).Elem()
+}
+
+type PhysicalNicHint struct {
+	DynamicData
+
+	VlanId int32 `xml:"vlanId,omitempty"`
+}
+
+func init() {
+	t["PhysicalNicHint"] = reflect.TypeOf((*PhysicalNicHint)(nil)).Elem()
+}
+
+type PhysicalNicHintInfo struct {
+	DynamicData
+
+	Device              string                          `xml:"device"`
+	Subnet              []PhysicalNicIpHint             `xml:"subnet,omitempty"`
+	Network             []PhysicalNicNameHint           `xml:"network,omitempty"`
+	ConnectedSwitchPort *PhysicalNicCdpInfo             `xml:"connectedSwitchPort,omitempty"`
+	LldpInfo            *LinkLayerDiscoveryProtocolInfo `xml:"lldpInfo,omitempty"`
+}
+
+func init() {
+	t["PhysicalNicHintInfo"] = reflect.TypeOf((*PhysicalNicHintInfo)(nil)).Elem()
+}
+
+type PhysicalNicIpHint struct {
+	PhysicalNicHint
+
+	IpSubnet string `xml:"ipSubnet"`
+}
+
+func init() {
+	t["PhysicalNicIpHint"] = reflect.TypeOf((*PhysicalNicIpHint)(nil)).Elem()
+}
+
+type PhysicalNicLinkInfo struct {
+	DynamicData
+
+	SpeedMb int32 `xml:"speedMb"`
+	Duplex  bool  `xml:"duplex"`
+}
+
+func init() {
+	t["PhysicalNicLinkInfo"] = reflect.TypeOf((*PhysicalNicLinkInfo)(nil)).Elem()
+}
+
+type PhysicalNicNameHint struct {
+	PhysicalNicHint
+
+	Network string `xml:"network"`
+}
+
+func init() {
+	t["PhysicalNicNameHint"] = reflect.TypeOf((*PhysicalNicNameHint)(nil)).Elem()
+}
+
+type PhysicalNicProfile struct {
+	ApplyProfile
+
+	Key string `xml:"key"`
+}
+
+func init() {
+	t["PhysicalNicProfile"] = reflect.TypeOf((*PhysicalNicProfile)(nil)).Elem()
+}
+
+type PhysicalNicSpec struct {
+	DynamicData
+
+	Ip        *HostIpConfig        `xml:"ip,omitempty"`
+	LinkSpeed *PhysicalNicLinkInfo `xml:"linkSpeed,omitempty"`
+}
+
+func init() {
+	t["PhysicalNicSpec"] = reflect.TypeOf((*PhysicalNicSpec)(nil)).Elem()
+}
+
+type PlaceVm PlaceVmRequestType
+
+func init() {
+	t["PlaceVm"] = reflect.TypeOf((*PlaceVm)(nil)).Elem()
+}
+
+type PlaceVmRequestType struct {
+	This          ManagedObjectReference `xml:"_this"`
+	PlacementSpec PlacementSpec          `xml:"placementSpec"`
+}
+
+func init() {
+	t["PlaceVmRequestType"] = reflect.TypeOf((*PlaceVmRequestType)(nil)).Elem()
+}
+
+type PlaceVmResponse struct {
+	Returnval PlacementResult `xml:"returnval"`
+}
+
+type PlacementAction struct {
+	ClusterAction
+
+	Vm           *ManagedObjectReference     `xml:"vm,omitempty"`
+	TargetHost   *ManagedObjectReference     `xml:"targetHost,omitempty"`
+	RelocateSpec *VirtualMachineRelocateSpec `xml:"relocateSpec,omitempty"`
+}
+
+func init() {
+	t["PlacementAction"] = reflect.TypeOf((*PlacementAction)(nil)).Elem()
+}
+
+type PlacementAffinityRule struct {
+	DynamicData
+
+	RuleType  string                   `xml:"ruleType"`
+	RuleScope string                   `xml:"ruleScope"`
+	Vms       []ManagedObjectReference `xml:"vms,omitempty"`
+	Keys      []string                 `xml:"keys,omitempty"`
+}
+
+func init() {
+	t["PlacementAffinityRule"] = reflect.TypeOf((*PlacementAffinityRule)(nil)).Elem()
+}
+
+type PlacementRankResult struct {
+	DynamicData
+
+	Key             string                 `xml:"key"`
+	Candidate       ManagedObjectReference `xml:"candidate"`
+	ReservedSpaceMB int64                  `xml:"reservedSpaceMB"`
+	UsedSpaceMB     int64                  `xml:"usedSpaceMB"`
+	TotalSpaceMB    int64                  `xml:"totalSpaceMB"`
+	Utilization     float64                `xml:"utilization"`
+	Faults          []LocalizedMethodFault `xml:"faults,omitempty"`
+}
+
+func init() {
+	t["PlacementRankResult"] = reflect.TypeOf((*PlacementRankResult)(nil)).Elem()
+}
+
+type PlacementRankSpec struct {
+	DynamicData
+
+	Specs             []PlacementSpec                 `xml:"specs"`
+	Clusters          []ManagedObjectReference        `xml:"clusters"`
+	Rules             []PlacementAffinityRule         `xml:"rules,omitempty"`
+	PlacementRankByVm []StorageDrsPlacementRankVmSpec `xml:"placementRankByVm,omitempty"`
+}
+
+func init() {
+	t["PlacementRankSpec"] = reflect.TypeOf((*PlacementRankSpec)(nil)).Elem()
+}
+
+type PlacementResult struct {
+	DynamicData
+
+	Recommendations []ClusterRecommendation `xml:"recommendations,omitempty"`
+	DrsFault        *ClusterDrsFaults       `xml:"drsFault,omitempty"`
+}
+
+func init() {
+	t["PlacementResult"] = reflect.TypeOf((*PlacementResult)(nil)).Elem()
+}
+
+type PlacementSpec struct {
+	DynamicData
+
+	Priority                  VirtualMachineMovePriority  `xml:"priority,omitempty"`
+	Vm                        *ManagedObjectReference     `xml:"vm,omitempty"`
+	ConfigSpec                *VirtualMachineConfigSpec   `xml:"configSpec,omitempty"`
+	RelocateSpec              *VirtualMachineRelocateSpec `xml:"relocateSpec,omitempty"`
+	Hosts                     []ManagedObjectReference    `xml:"hosts,omitempty"`
+	Datastores                []ManagedObjectReference    `xml:"datastores,omitempty"`
+	StoragePods               []ManagedObjectReference    `xml:"storagePods,omitempty"`
+	DisallowPrerequisiteMoves *bool                       `xml:"disallowPrerequisiteMoves"`
+	Rules                     []BaseClusterRuleInfo       `xml:"rules,omitempty,typeattr"`
+	Key                       string                      `xml:"key,omitempty"`
+	PlacementType             string                      `xml:"placementType,omitempty"`
+	CloneSpec                 *VirtualMachineCloneSpec    `xml:"cloneSpec,omitempty"`
+	CloneName                 string                      `xml:"cloneName,omitempty"`
+}
+
+func init() {
+	t["PlacementSpec"] = reflect.TypeOf((*PlacementSpec)(nil)).Elem()
+}
+
+type PlatformConfigFault struct {
+	HostConfigFault
+
+	Text string `xml:"text"`
+}
+
+func init() {
+	t["PlatformConfigFault"] = reflect.TypeOf((*PlatformConfigFault)(nil)).Elem()
+}
+
+type PlatformConfigFaultFault BasePlatformConfigFault
+
+func init() {
+	t["PlatformConfigFaultFault"] = reflect.TypeOf((*PlatformConfigFaultFault)(nil)).Elem()
+}
+
+type PnicUplinkProfile struct {
+	ApplyProfile
+
+	Key string `xml:"key"`
+}
+
+func init() {
+	t["PnicUplinkProfile"] = reflect.TypeOf((*PnicUplinkProfile)(nil)).Elem()
+}
+
+type PodDiskLocator struct {
+	DynamicData
+
+	DiskId          int32                           `xml:"diskId"`
+	DiskMoveType    string                          `xml:"diskMoveType,omitempty"`
+	DiskBackingInfo BaseVirtualDeviceBackingInfo    `xml:"diskBackingInfo,omitempty,typeattr"`
+	Profile         []BaseVirtualMachineProfileSpec `xml:"profile,omitempty,typeattr"`
+}
+
+func init() {
+	t["PodDiskLocator"] = reflect.TypeOf((*PodDiskLocator)(nil)).Elem()
+}
+
+type PodStorageDrsEntry struct {
+	DynamicData
+
+	StorageDrsConfig StorageDrsConfigInfo    `xml:"storageDrsConfig"`
+	Recommendation   []ClusterRecommendation `xml:"recommendation,omitempty"`
+	DrsFault         []ClusterDrsFaults      `xml:"drsFault,omitempty"`
+	ActionHistory    []ClusterActionHistory  `xml:"actionHistory,omitempty"`
+}
+
+func init() {
+	t["PodStorageDrsEntry"] = reflect.TypeOf((*PodStorageDrsEntry)(nil)).Elem()
+}
+
+type PolicyOption struct {
+	DynamicData
+
+	Id        string        `xml:"id"`
+	Parameter []KeyAnyValue `xml:"parameter,omitempty"`
+}
+
+func init() {
+	t["PolicyOption"] = reflect.TypeOf((*PolicyOption)(nil)).Elem()
+}
+
+type PortGroupProfile struct {
+	ApplyProfile
+
+	Key           string                        `xml:"key"`
+	Name          string                        `xml:"name"`
+	Vlan          VlanProfile                   `xml:"vlan"`
+	Vswitch       VirtualSwitchSelectionProfile `xml:"vswitch"`
+	NetworkPolicy NetworkPolicyProfile          `xml:"networkPolicy"`
+}
+
+func init() {
+	t["PortGroupProfile"] = reflect.TypeOf((*PortGroupProfile)(nil)).Elem()
+}
+
+type PosixUserSearchResult struct {
+	UserSearchResult
+
+	Id          int32 `xml:"id"`
+	ShellAccess *bool `xml:"shellAccess"`
+}
+
+func init() {
+	t["PosixUserSearchResult"] = reflect.TypeOf((*PosixUserSearchResult)(nil)).Elem()
+}
+
+type PostEvent PostEventRequestType
+
+func init() {
+	t["PostEvent"] = reflect.TypeOf((*PostEvent)(nil)).Elem()
+}
+
+type PostEventRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	EventToPost BaseEvent              `xml:"eventToPost,typeattr"`
+	TaskInfo    *TaskInfo              `xml:"taskInfo,omitempty"`
+}
+
+func init() {
+	t["PostEventRequestType"] = reflect.TypeOf((*PostEventRequestType)(nil)).Elem()
+}
+
+type PostEventResponse struct {
+}
+
+type PostHealthUpdates PostHealthUpdatesRequestType
+
+func init() {
+	t["PostHealthUpdates"] = reflect.TypeOf((*PostHealthUpdates)(nil)).Elem()
+}
+
+type PostHealthUpdatesRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	ProviderId string                 `xml:"providerId"`
+	Updates    []HealthUpdate         `xml:"updates,omitempty"`
+}
+
+func init() {
+	t["PostHealthUpdatesRequestType"] = reflect.TypeOf((*PostHealthUpdatesRequestType)(nil)).Elem()
+}
+
+type PostHealthUpdatesResponse struct {
+}
+
+type PowerDownHostToStandByRequestType struct {
+	This                  ManagedObjectReference `xml:"_this"`
+	TimeoutSec            int32                  `xml:"timeoutSec"`
+	EvacuatePoweredOffVms *bool                  `xml:"evacuatePoweredOffVms"`
+}
+
+func init() {
+	t["PowerDownHostToStandByRequestType"] = reflect.TypeOf((*PowerDownHostToStandByRequestType)(nil)).Elem()
+}
+
+type PowerDownHostToStandBy_Task PowerDownHostToStandByRequestType
+
+func init() {
+	t["PowerDownHostToStandBy_Task"] = reflect.TypeOf((*PowerDownHostToStandBy_Task)(nil)).Elem()
+}
+
+type PowerDownHostToStandBy_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type PowerOffVAppRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Force bool                   `xml:"force"`
+}
+
+func init() {
+	t["PowerOffVAppRequestType"] = reflect.TypeOf((*PowerOffVAppRequestType)(nil)).Elem()
+}
+
+type PowerOffVApp_Task PowerOffVAppRequestType
+
+func init() {
+	t["PowerOffVApp_Task"] = reflect.TypeOf((*PowerOffVApp_Task)(nil)).Elem()
+}
+
+type PowerOffVApp_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type PowerOffVMRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["PowerOffVMRequestType"] = reflect.TypeOf((*PowerOffVMRequestType)(nil)).Elem()
+}
+
+type PowerOffVM_Task PowerOffVMRequestType
+
+func init() {
+	t["PowerOffVM_Task"] = reflect.TypeOf((*PowerOffVM_Task)(nil)).Elem()
+}
+
+type PowerOffVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type PowerOnFtSecondaryFailed struct {
+	VmFaultToleranceIssue
+
+	Vm              ManagedObjectReference          `xml:"vm"`
+	VmName          string                          `xml:"vmName"`
+	HostSelectionBy FtIssuesOnHostHostSelectionType `xml:"hostSelectionBy"`
+	HostErrors      []LocalizedMethodFault          `xml:"hostErrors,omitempty"`
+	RootCause       LocalizedMethodFault            `xml:"rootCause"`
+}
+
+func init() {
+	t["PowerOnFtSecondaryFailed"] = reflect.TypeOf((*PowerOnFtSecondaryFailed)(nil)).Elem()
+}
+
+type PowerOnFtSecondaryFailedFault PowerOnFtSecondaryFailed
+
+func init() {
+	t["PowerOnFtSecondaryFailedFault"] = reflect.TypeOf((*PowerOnFtSecondaryFailedFault)(nil)).Elem()
+}
+
+type PowerOnFtSecondaryTimedout struct {
+	Timedout
+
+	Vm      ManagedObjectReference `xml:"vm"`
+	VmName  string                 `xml:"vmName"`
+	Timeout int32                  `xml:"timeout"`
+}
+
+func init() {
+	t["PowerOnFtSecondaryTimedout"] = reflect.TypeOf((*PowerOnFtSecondaryTimedout)(nil)).Elem()
+}
+
+type PowerOnFtSecondaryTimedoutFault PowerOnFtSecondaryTimedout
+
+func init() {
+	t["PowerOnFtSecondaryTimedoutFault"] = reflect.TypeOf((*PowerOnFtSecondaryTimedoutFault)(nil)).Elem()
+}
+
+type PowerOnMultiVMRequestType struct {
+	This   ManagedObjectReference   `xml:"_this"`
+	Vm     []ManagedObjectReference `xml:"vm"`
+	Option []BaseOptionValue        `xml:"option,omitempty,typeattr"`
+}
+
+func init() {
+	t["PowerOnMultiVMRequestType"] = reflect.TypeOf((*PowerOnMultiVMRequestType)(nil)).Elem()
+}
+
+type PowerOnMultiVM_Task PowerOnMultiVMRequestType
+
+func init() {
+	t["PowerOnMultiVM_Task"] = reflect.TypeOf((*PowerOnMultiVM_Task)(nil)).Elem()
+}
+
+type PowerOnMultiVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type PowerOnVAppRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["PowerOnVAppRequestType"] = reflect.TypeOf((*PowerOnVAppRequestType)(nil)).Elem()
+}
+
+type PowerOnVApp_Task PowerOnVAppRequestType
+
+func init() {
+	t["PowerOnVApp_Task"] = reflect.TypeOf((*PowerOnVApp_Task)(nil)).Elem()
+}
+
+type PowerOnVApp_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type PowerOnVMRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Host *ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["PowerOnVMRequestType"] = reflect.TypeOf((*PowerOnVMRequestType)(nil)).Elem()
+}
+
+type PowerOnVM_Task PowerOnVMRequestType
+
+func init() {
+	t["PowerOnVM_Task"] = reflect.TypeOf((*PowerOnVM_Task)(nil)).Elem()
+}
+
+type PowerOnVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type PowerSystemCapability struct {
+	DynamicData
+
+	AvailablePolicy []HostPowerPolicy `xml:"availablePolicy"`
+}
+
+func init() {
+	t["PowerSystemCapability"] = reflect.TypeOf((*PowerSystemCapability)(nil)).Elem()
+}
+
+type PowerSystemInfo struct {
+	DynamicData
+
+	CurrentPolicy HostPowerPolicy `xml:"currentPolicy"`
+}
+
+func init() {
+	t["PowerSystemInfo"] = reflect.TypeOf((*PowerSystemInfo)(nil)).Elem()
+}
+
+type PowerUpHostFromStandByRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	TimeoutSec int32                  `xml:"timeoutSec"`
+}
+
+func init() {
+	t["PowerUpHostFromStandByRequestType"] = reflect.TypeOf((*PowerUpHostFromStandByRequestType)(nil)).Elem()
+}
+
+type PowerUpHostFromStandBy_Task PowerUpHostFromStandByRequestType
+
+func init() {
+	t["PowerUpHostFromStandBy_Task"] = reflect.TypeOf((*PowerUpHostFromStandBy_Task)(nil)).Elem()
+}
+
+type PowerUpHostFromStandBy_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type PrepareCrypto PrepareCryptoRequestType
+
+func init() {
+	t["PrepareCrypto"] = reflect.TypeOf((*PrepareCrypto)(nil)).Elem()
+}
+
+type PrepareCryptoRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["PrepareCryptoRequestType"] = reflect.TypeOf((*PrepareCryptoRequestType)(nil)).Elem()
+}
+
+type PrepareCryptoResponse struct {
+}
+
+type PrivilegeAvailability struct {
+	DynamicData
+
+	PrivId    string `xml:"privId"`
+	IsGranted bool   `xml:"isGranted"`
+}
+
+func init() {
+	t["PrivilegeAvailability"] = reflect.TypeOf((*PrivilegeAvailability)(nil)).Elem()
+}
+
+type PrivilegePolicyDef struct {
+	DynamicData
+
+	CreatePrivilege string `xml:"createPrivilege"`
+	ReadPrivilege   string `xml:"readPrivilege"`
+	UpdatePrivilege string `xml:"updatePrivilege"`
+	DeletePrivilege string `xml:"deletePrivilege"`
+}
+
+func init() {
+	t["PrivilegePolicyDef"] = reflect.TypeOf((*PrivilegePolicyDef)(nil)).Elem()
+}
+
+type ProductComponentInfo struct {
+	DynamicData
+
+	Id      string `xml:"id"`
+	Name    string `xml:"name"`
+	Version string `xml:"version"`
+	Release int32  `xml:"release"`
+}
+
+func init() {
+	t["ProductComponentInfo"] = reflect.TypeOf((*ProductComponentInfo)(nil)).Elem()
+}
+
+type ProfileApplyProfileElement struct {
+	ApplyProfile
+
+	Key string `xml:"key"`
+}
+
+func init() {
+	t["ProfileApplyProfileElement"] = reflect.TypeOf((*ProfileApplyProfileElement)(nil)).Elem()
+}
+
+type ProfileApplyProfileProperty struct {
+	DynamicData
+
+	PropertyName string             `xml:"propertyName"`
+	Array        bool               `xml:"array"`
+	Profile      []BaseApplyProfile `xml:"profile,omitempty,typeattr"`
+}
+
+func init() {
+	t["ProfileApplyProfileProperty"] = reflect.TypeOf((*ProfileApplyProfileProperty)(nil)).Elem()
+}
+
+type ProfileAssociatedEvent struct {
+	ProfileEvent
+}
+
+func init() {
+	t["ProfileAssociatedEvent"] = reflect.TypeOf((*ProfileAssociatedEvent)(nil)).Elem()
+}
+
+type ProfileChangedEvent struct {
+	ProfileEvent
+}
+
+func init() {
+	t["ProfileChangedEvent"] = reflect.TypeOf((*ProfileChangedEvent)(nil)).Elem()
+}
+
+type ProfileCompositeExpression struct {
+	ProfileExpression
+
+	Operator       string   `xml:"operator"`
+	ExpressionName []string `xml:"expressionName"`
+}
+
+func init() {
+	t["ProfileCompositeExpression"] = reflect.TypeOf((*ProfileCompositeExpression)(nil)).Elem()
+}
+
+type ProfileCompositePolicyOptionMetadata struct {
+	ProfilePolicyOptionMetadata
+
+	Option []string `xml:"option"`
+}
+
+func init() {
+	t["ProfileCompositePolicyOptionMetadata"] = reflect.TypeOf((*ProfileCompositePolicyOptionMetadata)(nil)).Elem()
+}
+
+type ProfileConfigInfo struct {
+	DynamicData
+
+	Name       string `xml:"name"`
+	Annotation string `xml:"annotation,omitempty"`
+	Enabled    bool   `xml:"enabled"`
+}
+
+func init() {
+	t["ProfileConfigInfo"] = reflect.TypeOf((*ProfileConfigInfo)(nil)).Elem()
+}
+
+type ProfileCreateSpec struct {
+	DynamicData
+
+	Name       string `xml:"name,omitempty"`
+	Annotation string `xml:"annotation,omitempty"`
+	Enabled    *bool  `xml:"enabled"`
+}
+
+func init() {
+	t["ProfileCreateSpec"] = reflect.TypeOf((*ProfileCreateSpec)(nil)).Elem()
+}
+
+type ProfileCreatedEvent struct {
+	ProfileEvent
+}
+
+func init() {
+	t["ProfileCreatedEvent"] = reflect.TypeOf((*ProfileCreatedEvent)(nil)).Elem()
+}
+
+type ProfileDeferredPolicyOptionParameter struct {
+	DynamicData
+
+	InputPath ProfilePropertyPath `xml:"inputPath"`
+	Parameter []KeyAnyValue       `xml:"parameter,omitempty"`
+}
+
+func init() {
+	t["ProfileDeferredPolicyOptionParameter"] = reflect.TypeOf((*ProfileDeferredPolicyOptionParameter)(nil)).Elem()
+}
+
+type ProfileDescription struct {
+	DynamicData
+
+	Section []ProfileDescriptionSection `xml:"section"`
+}
+
+func init() {
+	t["ProfileDescription"] = reflect.TypeOf((*ProfileDescription)(nil)).Elem()
+}
+
+type ProfileDescriptionSection struct {
+	DynamicData
+
+	Description ExtendedElementDescription `xml:"description"`
+	Message     []LocalizableMessage       `xml:"message,omitempty"`
+}
+
+func init() {
+	t["ProfileDescriptionSection"] = reflect.TypeOf((*ProfileDescriptionSection)(nil)).Elem()
+}
+
+type ProfileDissociatedEvent struct {
+	ProfileEvent
+}
+
+func init() {
+	t["ProfileDissociatedEvent"] = reflect.TypeOf((*ProfileDissociatedEvent)(nil)).Elem()
+}
+
+type ProfileEvent struct {
+	Event
+
+	Profile ProfileEventArgument `xml:"profile"`
+}
+
+func init() {
+	t["ProfileEvent"] = reflect.TypeOf((*ProfileEvent)(nil)).Elem()
+}
+
+type ProfileEventArgument struct {
+	EventArgument
+
+	Profile ManagedObjectReference `xml:"profile"`
+	Name    string                 `xml:"name"`
+}
+
+func init() {
+	t["ProfileEventArgument"] = reflect.TypeOf((*ProfileEventArgument)(nil)).Elem()
+}
+
+type ProfileExecuteError struct {
+	DynamicData
+
+	Path    *ProfilePropertyPath `xml:"path,omitempty"`
+	Message LocalizableMessage   `xml:"message"`
+}
+
+func init() {
+	t["ProfileExecuteError"] = reflect.TypeOf((*ProfileExecuteError)(nil)).Elem()
+}
+
+type ProfileExecuteResult struct {
+	DynamicData
+
+	Status           string                                 `xml:"status"`
+	ConfigSpec       *HostConfigSpec                        `xml:"configSpec,omitempty"`
+	InapplicablePath []string                               `xml:"inapplicablePath,omitempty"`
+	RequireInput     []ProfileDeferredPolicyOptionParameter `xml:"requireInput,omitempty"`
+	Error            []ProfileExecuteError                  `xml:"error,omitempty"`
+}
+
+func init() {
+	t["ProfileExecuteResult"] = reflect.TypeOf((*ProfileExecuteResult)(nil)).Elem()
+}
+
+type ProfileExpression struct {
+	DynamicData
+
+	Id          string `xml:"id"`
+	DisplayName string `xml:"displayName"`
+	Negated     bool   `xml:"negated"`
+}
+
+func init() {
+	t["ProfileExpression"] = reflect.TypeOf((*ProfileExpression)(nil)).Elem()
+}
+
+type ProfileExpressionMetadata struct {
+	DynamicData
+
+	ExpressionId ExtendedElementDescription `xml:"expressionId"`
+	Parameter    []ProfileParameterMetadata `xml:"parameter,omitempty"`
+}
+
+func init() {
+	t["ProfileExpressionMetadata"] = reflect.TypeOf((*ProfileExpressionMetadata)(nil)).Elem()
+}
+
+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"`
+}
+
+func init() {
+	t["ProfileMetadata"] = reflect.TypeOf((*ProfileMetadata)(nil)).Elem()
+}
+
+type ProfileMetadataProfileSortSpec struct {
+	DynamicData
+
+	PolicyId  string `xml:"policyId"`
+	Parameter string `xml:"parameter"`
+}
+
+func init() {
+	t["ProfileMetadataProfileSortSpec"] = reflect.TypeOf((*ProfileMetadataProfileSortSpec)(nil)).Elem()
+}
+
+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"`
+}
+
+func init() {
+	t["ProfileParameterMetadata"] = reflect.TypeOf((*ProfileParameterMetadata)(nil)).Elem()
+}
+
+type ProfilePolicy struct {
+	DynamicData
+
+	Id           string           `xml:"id"`
+	PolicyOption BasePolicyOption `xml:"policyOption,typeattr"`
+}
+
+func init() {
+	t["ProfilePolicy"] = reflect.TypeOf((*ProfilePolicy)(nil)).Elem()
+}
+
+type ProfilePolicyMetadata struct {
+	DynamicData
+
+	Id             ExtendedElementDescription        `xml:"id"`
+	PossibleOption []BaseProfilePolicyOptionMetadata `xml:"possibleOption,typeattr"`
+}
+
+func init() {
+	t["ProfilePolicyMetadata"] = reflect.TypeOf((*ProfilePolicyMetadata)(nil)).Elem()
+}
+
+type ProfilePolicyOptionMetadata struct {
+	DynamicData
+
+	Id        ExtendedElementDescription `xml:"id"`
+	Parameter []ProfileParameterMetadata `xml:"parameter,omitempty"`
+}
+
+func init() {
+	t["ProfilePolicyOptionMetadata"] = reflect.TypeOf((*ProfilePolicyOptionMetadata)(nil)).Elem()
+}
+
+type ProfileProfileStructure struct {
+	DynamicData
+
+	ProfileTypeName string                            `xml:"profileTypeName"`
+	Child           []ProfileProfileStructureProperty `xml:"child,omitempty"`
+}
+
+func init() {
+	t["ProfileProfileStructure"] = reflect.TypeOf((*ProfileProfileStructure)(nil)).Elem()
+}
+
+type ProfileProfileStructureProperty struct {
+	DynamicData
+
+	PropertyName string                  `xml:"propertyName"`
+	Array        bool                    `xml:"array"`
+	Element      ProfileProfileStructure `xml:"element"`
+}
+
+func init() {
+	t["ProfileProfileStructureProperty"] = reflect.TypeOf((*ProfileProfileStructureProperty)(nil)).Elem()
+}
+
+type ProfilePropertyPath struct {
+	DynamicData
+
+	ProfilePath string `xml:"profilePath"`
+	PolicyId    string `xml:"policyId,omitempty"`
+	ParameterId string `xml:"parameterId,omitempty"`
+}
+
+func init() {
+	t["ProfilePropertyPath"] = reflect.TypeOf((*ProfilePropertyPath)(nil)).Elem()
+}
+
+type ProfileReferenceHostChangedEvent struct {
+	ProfileEvent
+
+	ReferenceHost         *ManagedObjectReference `xml:"referenceHost,omitempty"`
+	ReferenceHostName     string                  `xml:"referenceHostName,omitempty"`
+	PrevReferenceHostName string                  `xml:"prevReferenceHostName,omitempty"`
+}
+
+func init() {
+	t["ProfileReferenceHostChangedEvent"] = reflect.TypeOf((*ProfileReferenceHostChangedEvent)(nil)).Elem()
+}
+
+type ProfileRemovedEvent struct {
+	ProfileEvent
+}
+
+func init() {
+	t["ProfileRemovedEvent"] = reflect.TypeOf((*ProfileRemovedEvent)(nil)).Elem()
+}
+
+type ProfileSerializedCreateSpec struct {
+	ProfileCreateSpec
+
+	ProfileConfigString string `xml:"profileConfigString"`
+}
+
+func init() {
+	t["ProfileSerializedCreateSpec"] = reflect.TypeOf((*ProfileSerializedCreateSpec)(nil)).Elem()
+}
+
+type ProfileSimpleExpression struct {
+	ProfileExpression
+
+	ExpressionType string        `xml:"expressionType"`
+	Parameter      []KeyAnyValue `xml:"parameter,omitempty"`
+}
+
+func init() {
+	t["ProfileSimpleExpression"] = reflect.TypeOf((*ProfileSimpleExpression)(nil)).Elem()
+}
+
+type ProfileUpdateFailed struct {
+	VimFault
+
+	Failure []ProfileUpdateFailedUpdateFailure `xml:"failure"`
+}
+
+func init() {
+	t["ProfileUpdateFailed"] = reflect.TypeOf((*ProfileUpdateFailed)(nil)).Elem()
+}
+
+type ProfileUpdateFailedFault ProfileUpdateFailed
+
+func init() {
+	t["ProfileUpdateFailedFault"] = reflect.TypeOf((*ProfileUpdateFailedFault)(nil)).Elem()
+}
+
+type ProfileUpdateFailedUpdateFailure struct {
+	DynamicData
+
+	ProfilePath ProfilePropertyPath `xml:"profilePath"`
+	ErrMsg      LocalizableMessage  `xml:"errMsg"`
+}
+
+func init() {
+	t["ProfileUpdateFailedUpdateFailure"] = reflect.TypeOf((*ProfileUpdateFailedUpdateFailure)(nil)).Elem()
+}
+
+type PromoteDisksRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Unlink bool                   `xml:"unlink"`
+	Disks  []VirtualDisk          `xml:"disks,omitempty"`
+}
+
+func init() {
+	t["PromoteDisksRequestType"] = reflect.TypeOf((*PromoteDisksRequestType)(nil)).Elem()
+}
+
+type PromoteDisks_Task PromoteDisksRequestType
+
+func init() {
+	t["PromoteDisks_Task"] = reflect.TypeOf((*PromoteDisks_Task)(nil)).Elem()
+}
+
+type PromoteDisks_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type PropertyChange struct {
+	DynamicData
+
+	Name string           `xml:"name"`
+	Op   PropertyChangeOp `xml:"op"`
+	Val  AnyType          `xml:"val,omitempty,typeattr"`
+}
+
+func init() {
+	t["PropertyChange"] = reflect.TypeOf((*PropertyChange)(nil)).Elem()
+}
+
+type PropertyFilterSpec struct {
+	DynamicData
+
+	PropSet                       []PropertySpec `xml:"propSet"`
+	ObjectSet                     []ObjectSpec   `xml:"objectSet"`
+	ReportMissingObjectsInResults *bool          `xml:"reportMissingObjectsInResults"`
+}
+
+func init() {
+	t["PropertyFilterSpec"] = reflect.TypeOf((*PropertyFilterSpec)(nil)).Elem()
+}
+
+type PropertyFilterUpdate struct {
+	DynamicData
+
+	Filter     ManagedObjectReference `xml:"filter"`
+	ObjectSet  []ObjectUpdate         `xml:"objectSet,omitempty"`
+	MissingSet []MissingObject        `xml:"missingSet,omitempty"`
+}
+
+func init() {
+	t["PropertyFilterUpdate"] = reflect.TypeOf((*PropertyFilterUpdate)(nil)).Elem()
+}
+
+type PropertySpec struct {
+	DynamicData
+
+	Type    string   `xml:"type"`
+	All     *bool    `xml:"all"`
+	PathSet []string `xml:"pathSet,omitempty"`
+}
+
+func init() {
+	t["PropertySpec"] = reflect.TypeOf((*PropertySpec)(nil)).Elem()
+}
+
+type PutUsbScanCodes PutUsbScanCodesRequestType
+
+func init() {
+	t["PutUsbScanCodes"] = reflect.TypeOf((*PutUsbScanCodes)(nil)).Elem()
+}
+
+type PutUsbScanCodesRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Spec UsbScanCodeSpec        `xml:"spec"`
+}
+
+func init() {
+	t["PutUsbScanCodesRequestType"] = reflect.TypeOf((*PutUsbScanCodesRequestType)(nil)).Elem()
+}
+
+type PutUsbScanCodesResponse struct {
+	Returnval int32 `xml:"returnval"`
+}
+
+type QuarantineModeFault struct {
+	VmConfigFault
+
+	VmName    string `xml:"vmName"`
+	FaultType string `xml:"faultType"`
+}
+
+func init() {
+	t["QuarantineModeFault"] = reflect.TypeOf((*QuarantineModeFault)(nil)).Elem()
+}
+
+type QuarantineModeFaultFault QuarantineModeFault
+
+func init() {
+	t["QuarantineModeFaultFault"] = reflect.TypeOf((*QuarantineModeFaultFault)(nil)).Elem()
+}
+
+type QueryAnswerFileStatus QueryAnswerFileStatusRequestType
+
+func init() {
+	t["QueryAnswerFileStatus"] = reflect.TypeOf((*QueryAnswerFileStatus)(nil)).Elem()
+}
+
+type QueryAnswerFileStatusRequestType struct {
+	This ManagedObjectReference   `xml:"_this"`
+	Host []ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["QueryAnswerFileStatusRequestType"] = reflect.TypeOf((*QueryAnswerFileStatusRequestType)(nil)).Elem()
+}
+
+type QueryAnswerFileStatusResponse struct {
+	Returnval []AnswerFileStatusResult `xml:"returnval,omitempty"`
+}
+
+type QueryAssignedLicenses QueryAssignedLicensesRequestType
+
+func init() {
+	t["QueryAssignedLicenses"] = reflect.TypeOf((*QueryAssignedLicenses)(nil)).Elem()
+}
+
+type QueryAssignedLicensesRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	EntityId string                 `xml:"entityId,omitempty"`
+}
+
+func init() {
+	t["QueryAssignedLicensesRequestType"] = reflect.TypeOf((*QueryAssignedLicensesRequestType)(nil)).Elem()
+}
+
+type QueryAssignedLicensesResponse struct {
+	Returnval []LicenseAssignmentManagerLicenseAssignment `xml:"returnval"`
+}
+
+type QueryAvailableDisksForVmfs QueryAvailableDisksForVmfsRequestType
+
+func init() {
+	t["QueryAvailableDisksForVmfs"] = reflect.TypeOf((*QueryAvailableDisksForVmfs)(nil)).Elem()
+}
+
+type QueryAvailableDisksForVmfsRequestType struct {
+	This      ManagedObjectReference  `xml:"_this"`
+	Datastore *ManagedObjectReference `xml:"datastore,omitempty"`
+}
+
+func init() {
+	t["QueryAvailableDisksForVmfsRequestType"] = reflect.TypeOf((*QueryAvailableDisksForVmfsRequestType)(nil)).Elem()
+}
+
+type QueryAvailableDisksForVmfsResponse struct {
+	Returnval []HostScsiDisk `xml:"returnval,omitempty"`
+}
+
+type QueryAvailableDvsSpec QueryAvailableDvsSpecRequestType
+
+func init() {
+	t["QueryAvailableDvsSpec"] = reflect.TypeOf((*QueryAvailableDvsSpec)(nil)).Elem()
+}
+
+type QueryAvailableDvsSpecRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	Recommended *bool                  `xml:"recommended"`
+}
+
+func init() {
+	t["QueryAvailableDvsSpecRequestType"] = reflect.TypeOf((*QueryAvailableDvsSpecRequestType)(nil)).Elem()
+}
+
+type QueryAvailableDvsSpecResponse struct {
+	Returnval []DistributedVirtualSwitchProductSpec `xml:"returnval,omitempty"`
+}
+
+type QueryAvailablePartition QueryAvailablePartitionRequestType
+
+func init() {
+	t["QueryAvailablePartition"] = reflect.TypeOf((*QueryAvailablePartition)(nil)).Elem()
+}
+
+type QueryAvailablePartitionRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryAvailablePartitionRequestType"] = reflect.TypeOf((*QueryAvailablePartitionRequestType)(nil)).Elem()
+}
+
+type QueryAvailablePartitionResponse struct {
+	Returnval []HostDiagnosticPartition `xml:"returnval,omitempty"`
+}
+
+type QueryAvailablePerfMetric QueryAvailablePerfMetricRequestType
+
+func init() {
+	t["QueryAvailablePerfMetric"] = reflect.TypeOf((*QueryAvailablePerfMetric)(nil)).Elem()
+}
+
+type QueryAvailablePerfMetricRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	Entity     ManagedObjectReference `xml:"entity"`
+	BeginTime  *time.Time             `xml:"beginTime"`
+	EndTime    *time.Time             `xml:"endTime"`
+	IntervalId int32                  `xml:"intervalId,omitempty"`
+}
+
+func init() {
+	t["QueryAvailablePerfMetricRequestType"] = reflect.TypeOf((*QueryAvailablePerfMetricRequestType)(nil)).Elem()
+}
+
+type QueryAvailablePerfMetricResponse struct {
+	Returnval []PerfMetricId `xml:"returnval,omitempty"`
+}
+
+type QueryAvailableSsds QueryAvailableSsdsRequestType
+
+func init() {
+	t["QueryAvailableSsds"] = reflect.TypeOf((*QueryAvailableSsds)(nil)).Elem()
+}
+
+type QueryAvailableSsdsRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	VffsPath string                 `xml:"vffsPath,omitempty"`
+}
+
+func init() {
+	t["QueryAvailableSsdsRequestType"] = reflect.TypeOf((*QueryAvailableSsdsRequestType)(nil)).Elem()
+}
+
+type QueryAvailableSsdsResponse struct {
+	Returnval []HostScsiDisk `xml:"returnval,omitempty"`
+}
+
+type QueryAvailableTimeZones QueryAvailableTimeZonesRequestType
+
+func init() {
+	t["QueryAvailableTimeZones"] = reflect.TypeOf((*QueryAvailableTimeZones)(nil)).Elem()
+}
+
+type QueryAvailableTimeZonesRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryAvailableTimeZonesRequestType"] = reflect.TypeOf((*QueryAvailableTimeZonesRequestType)(nil)).Elem()
+}
+
+type QueryAvailableTimeZonesResponse struct {
+	Returnval []HostDateTimeSystemTimeZone `xml:"returnval,omitempty"`
+}
+
+type QueryBootDevices QueryBootDevicesRequestType
+
+func init() {
+	t["QueryBootDevices"] = reflect.TypeOf((*QueryBootDevices)(nil)).Elem()
+}
+
+type QueryBootDevicesRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryBootDevicesRequestType"] = reflect.TypeOf((*QueryBootDevicesRequestType)(nil)).Elem()
+}
+
+type QueryBootDevicesResponse struct {
+	Returnval *HostBootDeviceInfo `xml:"returnval,omitempty"`
+}
+
+type QueryBoundVnics QueryBoundVnicsRequestType
+
+func init() {
+	t["QueryBoundVnics"] = reflect.TypeOf((*QueryBoundVnics)(nil)).Elem()
+}
+
+type QueryBoundVnicsRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	IScsiHbaName string                 `xml:"iScsiHbaName"`
+}
+
+func init() {
+	t["QueryBoundVnicsRequestType"] = reflect.TypeOf((*QueryBoundVnicsRequestType)(nil)).Elem()
+}
+
+type QueryBoundVnicsResponse struct {
+	Returnval []IscsiPortInfo `xml:"returnval,omitempty"`
+}
+
+type QueryCandidateNics QueryCandidateNicsRequestType
+
+func init() {
+	t["QueryCandidateNics"] = reflect.TypeOf((*QueryCandidateNics)(nil)).Elem()
+}
+
+type QueryCandidateNicsRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	IScsiHbaName string                 `xml:"iScsiHbaName"`
+}
+
+func init() {
+	t["QueryCandidateNicsRequestType"] = reflect.TypeOf((*QueryCandidateNicsRequestType)(nil)).Elem()
+}
+
+type QueryCandidateNicsResponse struct {
+	Returnval []IscsiPortInfo `xml:"returnval,omitempty"`
+}
+
+type QueryChangedDiskAreas QueryChangedDiskAreasRequestType
+
+func init() {
+	t["QueryChangedDiskAreas"] = reflect.TypeOf((*QueryChangedDiskAreas)(nil)).Elem()
+}
+
+type QueryChangedDiskAreasRequestType struct {
+	This        ManagedObjectReference  `xml:"_this"`
+	Snapshot    *ManagedObjectReference `xml:"snapshot,omitempty"`
+	DeviceKey   int32                   `xml:"deviceKey"`
+	StartOffset int64                   `xml:"startOffset"`
+	ChangeId    string                  `xml:"changeId"`
+}
+
+func init() {
+	t["QueryChangedDiskAreasRequestType"] = reflect.TypeOf((*QueryChangedDiskAreasRequestType)(nil)).Elem()
+}
+
+type QueryChangedDiskAreasResponse struct {
+	Returnval DiskChangeInfo `xml:"returnval"`
+}
+
+type QueryCmmds QueryCmmdsRequestType
+
+func init() {
+	t["QueryCmmds"] = reflect.TypeOf((*QueryCmmds)(nil)).Elem()
+}
+
+type QueryCmmdsRequestType struct {
+	This    ManagedObjectReference             `xml:"_this"`
+	Queries []HostVsanInternalSystemCmmdsQuery `xml:"queries"`
+}
+
+func init() {
+	t["QueryCmmdsRequestType"] = reflect.TypeOf((*QueryCmmdsRequestType)(nil)).Elem()
+}
+
+type QueryCmmdsResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type QueryCompatibleHostForExistingDvs QueryCompatibleHostForExistingDvsRequestType
+
+func init() {
+	t["QueryCompatibleHostForExistingDvs"] = reflect.TypeOf((*QueryCompatibleHostForExistingDvs)(nil)).Elem()
+}
+
+type QueryCompatibleHostForExistingDvsRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Container ManagedObjectReference `xml:"container"`
+	Recursive bool                   `xml:"recursive"`
+	Dvs       ManagedObjectReference `xml:"dvs"`
+}
+
+func init() {
+	t["QueryCompatibleHostForExistingDvsRequestType"] = reflect.TypeOf((*QueryCompatibleHostForExistingDvsRequestType)(nil)).Elem()
+}
+
+type QueryCompatibleHostForExistingDvsResponse struct {
+	Returnval []ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type QueryCompatibleHostForNewDvs QueryCompatibleHostForNewDvsRequestType
+
+func init() {
+	t["QueryCompatibleHostForNewDvs"] = reflect.TypeOf((*QueryCompatibleHostForNewDvs)(nil)).Elem()
+}
+
+type QueryCompatibleHostForNewDvsRequestType struct {
+	This              ManagedObjectReference               `xml:"_this"`
+	Container         ManagedObjectReference               `xml:"container"`
+	Recursive         bool                                 `xml:"recursive"`
+	SwitchProductSpec *DistributedVirtualSwitchProductSpec `xml:"switchProductSpec,omitempty"`
+}
+
+func init() {
+	t["QueryCompatibleHostForNewDvsRequestType"] = reflect.TypeOf((*QueryCompatibleHostForNewDvsRequestType)(nil)).Elem()
+}
+
+type QueryCompatibleHostForNewDvsResponse struct {
+	Returnval []ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type QueryComplianceStatus QueryComplianceStatusRequestType
+
+func init() {
+	t["QueryComplianceStatus"] = reflect.TypeOf((*QueryComplianceStatus)(nil)).Elem()
+}
+
+type QueryComplianceStatusRequestType struct {
+	This    ManagedObjectReference   `xml:"_this"`
+	Profile []ManagedObjectReference `xml:"profile,omitempty"`
+	Entity  []ManagedObjectReference `xml:"entity,omitempty"`
+}
+
+func init() {
+	t["QueryComplianceStatusRequestType"] = reflect.TypeOf((*QueryComplianceStatusRequestType)(nil)).Elem()
+}
+
+type QueryComplianceStatusResponse struct {
+	Returnval []ComplianceResult `xml:"returnval,omitempty"`
+}
+
+type QueryConfigOption QueryConfigOptionRequestType
+
+func init() {
+	t["QueryConfigOption"] = reflect.TypeOf((*QueryConfigOption)(nil)).Elem()
+}
+
+type QueryConfigOptionDescriptor QueryConfigOptionDescriptorRequestType
+
+func init() {
+	t["QueryConfigOptionDescriptor"] = reflect.TypeOf((*QueryConfigOptionDescriptor)(nil)).Elem()
+}
+
+type QueryConfigOptionDescriptorRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryConfigOptionDescriptorRequestType"] = reflect.TypeOf((*QueryConfigOptionDescriptorRequestType)(nil)).Elem()
+}
+
+type QueryConfigOptionDescriptorResponse struct {
+	Returnval []VirtualMachineConfigOptionDescriptor `xml:"returnval,omitempty"`
+}
+
+type QueryConfigOptionEx QueryConfigOptionExRequestType
+
+func init() {
+	t["QueryConfigOptionEx"] = reflect.TypeOf((*QueryConfigOptionEx)(nil)).Elem()
+}
+
+type QueryConfigOptionExRequestType struct {
+	This ManagedObjectReference                   `xml:"_this"`
+	Spec *EnvironmentBrowserConfigOptionQuerySpec `xml:"spec,omitempty"`
+}
+
+func init() {
+	t["QueryConfigOptionExRequestType"] = reflect.TypeOf((*QueryConfigOptionExRequestType)(nil)).Elem()
+}
+
+type QueryConfigOptionExResponse struct {
+	Returnval *VirtualMachineConfigOption `xml:"returnval,omitempty"`
+}
+
+type QueryConfigOptionRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Key  string                  `xml:"key,omitempty"`
+	Host *ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["QueryConfigOptionRequestType"] = reflect.TypeOf((*QueryConfigOptionRequestType)(nil)).Elem()
+}
+
+type QueryConfigOptionResponse struct {
+	Returnval *VirtualMachineConfigOption `xml:"returnval,omitempty"`
+}
+
+type QueryConfigTarget QueryConfigTargetRequestType
+
+func init() {
+	t["QueryConfigTarget"] = reflect.TypeOf((*QueryConfigTarget)(nil)).Elem()
+}
+
+type QueryConfigTargetRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Host *ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["QueryConfigTargetRequestType"] = reflect.TypeOf((*QueryConfigTargetRequestType)(nil)).Elem()
+}
+
+type QueryConfigTargetResponse struct {
+	Returnval *ConfigTarget `xml:"returnval,omitempty"`
+}
+
+type QueryConfiguredModuleOptionString QueryConfiguredModuleOptionStringRequestType
+
+func init() {
+	t["QueryConfiguredModuleOptionString"] = reflect.TypeOf((*QueryConfiguredModuleOptionString)(nil)).Elem()
+}
+
+type QueryConfiguredModuleOptionStringRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Name string                 `xml:"name"`
+}
+
+func init() {
+	t["QueryConfiguredModuleOptionStringRequestType"] = reflect.TypeOf((*QueryConfiguredModuleOptionStringRequestType)(nil)).Elem()
+}
+
+type QueryConfiguredModuleOptionStringResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type QueryConnectionInfo QueryConnectionInfoRequestType
+
+func init() {
+	t["QueryConnectionInfo"] = reflect.TypeOf((*QueryConnectionInfo)(nil)).Elem()
+}
+
+type QueryConnectionInfoRequestType struct {
+	This          ManagedObjectReference `xml:"_this"`
+	Hostname      string                 `xml:"hostname"`
+	Port          int32                  `xml:"port"`
+	Username      string                 `xml:"username"`
+	Password      string                 `xml:"password"`
+	SslThumbprint string                 `xml:"sslThumbprint,omitempty"`
+}
+
+func init() {
+	t["QueryConnectionInfoRequestType"] = reflect.TypeOf((*QueryConnectionInfoRequestType)(nil)).Elem()
+}
+
+type QueryConnectionInfoResponse struct {
+	Returnval HostConnectInfo `xml:"returnval"`
+}
+
+type QueryConnectionInfoViaSpec QueryConnectionInfoViaSpecRequestType
+
+func init() {
+	t["QueryConnectionInfoViaSpec"] = reflect.TypeOf((*QueryConnectionInfoViaSpec)(nil)).Elem()
+}
+
+type QueryConnectionInfoViaSpecRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Spec HostConnectSpec        `xml:"spec"`
+}
+
+func init() {
+	t["QueryConnectionInfoViaSpecRequestType"] = reflect.TypeOf((*QueryConnectionInfoViaSpecRequestType)(nil)).Elem()
+}
+
+type QueryConnectionInfoViaSpecResponse struct {
+	Returnval HostConnectInfo `xml:"returnval"`
+}
+
+type QueryDatastorePerformanceSummary QueryDatastorePerformanceSummaryRequestType
+
+func init() {
+	t["QueryDatastorePerformanceSummary"] = reflect.TypeOf((*QueryDatastorePerformanceSummary)(nil)).Elem()
+}
+
+type QueryDatastorePerformanceSummaryRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["QueryDatastorePerformanceSummaryRequestType"] = reflect.TypeOf((*QueryDatastorePerformanceSummaryRequestType)(nil)).Elem()
+}
+
+type QueryDatastorePerformanceSummaryResponse struct {
+	Returnval []StoragePerformanceSummary `xml:"returnval,omitempty"`
+}
+
+type QueryDateTime QueryDateTimeRequestType
+
+func init() {
+	t["QueryDateTime"] = reflect.TypeOf((*QueryDateTime)(nil)).Elem()
+}
+
+type QueryDateTimeRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryDateTimeRequestType"] = reflect.TypeOf((*QueryDateTimeRequestType)(nil)).Elem()
+}
+
+type QueryDateTimeResponse struct {
+	Returnval time.Time `xml:"returnval"`
+}
+
+type QueryDescriptions QueryDescriptionsRequestType
+
+func init() {
+	t["QueryDescriptions"] = reflect.TypeOf((*QueryDescriptions)(nil)).Elem()
+}
+
+type QueryDescriptionsRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Host *ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["QueryDescriptionsRequestType"] = reflect.TypeOf((*QueryDescriptionsRequestType)(nil)).Elem()
+}
+
+type QueryDescriptionsResponse struct {
+	Returnval []DiagnosticManagerLogDescriptor `xml:"returnval,omitempty"`
+}
+
+type QueryDisksForVsan QueryDisksForVsanRequestType
+
+func init() {
+	t["QueryDisksForVsan"] = reflect.TypeOf((*QueryDisksForVsan)(nil)).Elem()
+}
+
+type QueryDisksForVsanRequestType struct {
+	This          ManagedObjectReference `xml:"_this"`
+	CanonicalName []string               `xml:"canonicalName,omitempty"`
+}
+
+func init() {
+	t["QueryDisksForVsanRequestType"] = reflect.TypeOf((*QueryDisksForVsanRequestType)(nil)).Elem()
+}
+
+type QueryDisksForVsanResponse struct {
+	Returnval []VsanHostDiskResult `xml:"returnval,omitempty"`
+}
+
+type QueryDisksUsingFilter QueryDisksUsingFilterRequestType
+
+func init() {
+	t["QueryDisksUsingFilter"] = reflect.TypeOf((*QueryDisksUsingFilter)(nil)).Elem()
+}
+
+type QueryDisksUsingFilterRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	FilterId string                 `xml:"filterId"`
+	CompRes  ManagedObjectReference `xml:"compRes"`
+}
+
+func init() {
+	t["QueryDisksUsingFilterRequestType"] = reflect.TypeOf((*QueryDisksUsingFilterRequestType)(nil)).Elem()
+}
+
+type QueryDisksUsingFilterResponse struct {
+	Returnval []VirtualDiskId `xml:"returnval"`
+}
+
+type QueryDvsByUuid QueryDvsByUuidRequestType
+
+func init() {
+	t["QueryDvsByUuid"] = reflect.TypeOf((*QueryDvsByUuid)(nil)).Elem()
+}
+
+type QueryDvsByUuidRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Uuid string                 `xml:"uuid"`
+}
+
+func init() {
+	t["QueryDvsByUuidRequestType"] = reflect.TypeOf((*QueryDvsByUuidRequestType)(nil)).Elem()
+}
+
+type QueryDvsByUuidResponse struct {
+	Returnval *ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type QueryDvsCheckCompatibility QueryDvsCheckCompatibilityRequestType
+
+func init() {
+	t["QueryDvsCheckCompatibility"] = reflect.TypeOf((*QueryDvsCheckCompatibility)(nil)).Elem()
+}
+
+type QueryDvsCheckCompatibilityRequestType struct {
+	This           ManagedObjectReference                                 `xml:"_this"`
+	HostContainer  DistributedVirtualSwitchManagerHostContainer           `xml:"hostContainer"`
+	DvsProductSpec *DistributedVirtualSwitchManagerDvsProductSpec         `xml:"dvsProductSpec,omitempty"`
+	HostFilterSpec []BaseDistributedVirtualSwitchManagerHostDvsFilterSpec `xml:"hostFilterSpec,omitempty,typeattr"`
+}
+
+func init() {
+	t["QueryDvsCheckCompatibilityRequestType"] = reflect.TypeOf((*QueryDvsCheckCompatibilityRequestType)(nil)).Elem()
+}
+
+type QueryDvsCheckCompatibilityResponse struct {
+	Returnval []DistributedVirtualSwitchManagerCompatibilityResult `xml:"returnval,omitempty"`
+}
+
+type QueryDvsCompatibleHostSpec QueryDvsCompatibleHostSpecRequestType
+
+func init() {
+	t["QueryDvsCompatibleHostSpec"] = reflect.TypeOf((*QueryDvsCompatibleHostSpec)(nil)).Elem()
+}
+
+type QueryDvsCompatibleHostSpecRequestType struct {
+	This              ManagedObjectReference               `xml:"_this"`
+	SwitchProductSpec *DistributedVirtualSwitchProductSpec `xml:"switchProductSpec,omitempty"`
+}
+
+func init() {
+	t["QueryDvsCompatibleHostSpecRequestType"] = reflect.TypeOf((*QueryDvsCompatibleHostSpecRequestType)(nil)).Elem()
+}
+
+type QueryDvsCompatibleHostSpecResponse struct {
+	Returnval []DistributedVirtualSwitchHostProductSpec `xml:"returnval,omitempty"`
+}
+
+type QueryDvsConfigTarget QueryDvsConfigTargetRequestType
+
+func init() {
+	t["QueryDvsConfigTarget"] = reflect.TypeOf((*QueryDvsConfigTarget)(nil)).Elem()
+}
+
+type QueryDvsConfigTargetRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Host *ManagedObjectReference `xml:"host,omitempty"`
+	Dvs  *ManagedObjectReference `xml:"dvs,omitempty"`
+}
+
+func init() {
+	t["QueryDvsConfigTargetRequestType"] = reflect.TypeOf((*QueryDvsConfigTargetRequestType)(nil)).Elem()
+}
+
+type QueryDvsConfigTargetResponse struct {
+	Returnval DVSManagerDvsConfigTarget `xml:"returnval"`
+}
+
+type QueryDvsFeatureCapability QueryDvsFeatureCapabilityRequestType
+
+func init() {
+	t["QueryDvsFeatureCapability"] = reflect.TypeOf((*QueryDvsFeatureCapability)(nil)).Elem()
+}
+
+type QueryDvsFeatureCapabilityRequestType struct {
+	This              ManagedObjectReference               `xml:"_this"`
+	SwitchProductSpec *DistributedVirtualSwitchProductSpec `xml:"switchProductSpec,omitempty"`
+}
+
+func init() {
+	t["QueryDvsFeatureCapabilityRequestType"] = reflect.TypeOf((*QueryDvsFeatureCapabilityRequestType)(nil)).Elem()
+}
+
+type QueryDvsFeatureCapabilityResponse struct {
+	Returnval BaseDVSFeatureCapability `xml:"returnval,omitempty,typeattr"`
+}
+
+type QueryEvents QueryEventsRequestType
+
+func init() {
+	t["QueryEvents"] = reflect.TypeOf((*QueryEvents)(nil)).Elem()
+}
+
+type QueryEventsRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Filter EventFilterSpec        `xml:"filter"`
+}
+
+func init() {
+	t["QueryEventsRequestType"] = reflect.TypeOf((*QueryEventsRequestType)(nil)).Elem()
+}
+
+type QueryEventsResponse struct {
+	Returnval []BaseEvent `xml:"returnval,omitempty,typeattr"`
+}
+
+type QueryExpressionMetadata QueryExpressionMetadataRequestType
+
+func init() {
+	t["QueryExpressionMetadata"] = reflect.TypeOf((*QueryExpressionMetadata)(nil)).Elem()
+}
+
+type QueryExpressionMetadataRequestType struct {
+	This           ManagedObjectReference  `xml:"_this"`
+	ExpressionName []string                `xml:"expressionName,omitempty"`
+	Profile        *ManagedObjectReference `xml:"profile,omitempty"`
+}
+
+func init() {
+	t["QueryExpressionMetadataRequestType"] = reflect.TypeOf((*QueryExpressionMetadataRequestType)(nil)).Elem()
+}
+
+type QueryExpressionMetadataResponse struct {
+	Returnval []ProfileExpressionMetadata `xml:"returnval,omitempty"`
+}
+
+type QueryExtensionIpAllocationUsage QueryExtensionIpAllocationUsageRequestType
+
+func init() {
+	t["QueryExtensionIpAllocationUsage"] = reflect.TypeOf((*QueryExtensionIpAllocationUsage)(nil)).Elem()
+}
+
+type QueryExtensionIpAllocationUsageRequestType struct {
+	This          ManagedObjectReference `xml:"_this"`
+	ExtensionKeys []string               `xml:"extensionKeys,omitempty"`
+}
+
+func init() {
+	t["QueryExtensionIpAllocationUsageRequestType"] = reflect.TypeOf((*QueryExtensionIpAllocationUsageRequestType)(nil)).Elem()
+}
+
+type QueryExtensionIpAllocationUsageResponse struct {
+	Returnval []ExtensionManagerIpAllocationUsage `xml:"returnval,omitempty"`
+}
+
+type QueryFaultToleranceCompatibility QueryFaultToleranceCompatibilityRequestType
+
+func init() {
+	t["QueryFaultToleranceCompatibility"] = reflect.TypeOf((*QueryFaultToleranceCompatibility)(nil)).Elem()
+}
+
+type QueryFaultToleranceCompatibilityEx QueryFaultToleranceCompatibilityExRequestType
+
+func init() {
+	t["QueryFaultToleranceCompatibilityEx"] = reflect.TypeOf((*QueryFaultToleranceCompatibilityEx)(nil)).Elem()
+}
+
+type QueryFaultToleranceCompatibilityExRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	ForLegacyFt *bool                  `xml:"forLegacyFt"`
+}
+
+func init() {
+	t["QueryFaultToleranceCompatibilityExRequestType"] = reflect.TypeOf((*QueryFaultToleranceCompatibilityExRequestType)(nil)).Elem()
+}
+
+type QueryFaultToleranceCompatibilityExResponse struct {
+	Returnval []LocalizedMethodFault `xml:"returnval,omitempty"`
+}
+
+type QueryFaultToleranceCompatibilityRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryFaultToleranceCompatibilityRequestType"] = reflect.TypeOf((*QueryFaultToleranceCompatibilityRequestType)(nil)).Elem()
+}
+
+type QueryFaultToleranceCompatibilityResponse struct {
+	Returnval []LocalizedMethodFault `xml:"returnval,omitempty"`
+}
+
+type QueryFilterEntities QueryFilterEntitiesRequestType
+
+func init() {
+	t["QueryFilterEntities"] = reflect.TypeOf((*QueryFilterEntities)(nil)).Elem()
+}
+
+type QueryFilterEntitiesRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	FilterId string                 `xml:"filterId"`
+}
+
+func init() {
+	t["QueryFilterEntitiesRequestType"] = reflect.TypeOf((*QueryFilterEntitiesRequestType)(nil)).Elem()
+}
+
+type QueryFilterEntitiesResponse struct {
+	Returnval []ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type QueryFilterInfoIds QueryFilterInfoIdsRequestType
+
+func init() {
+	t["QueryFilterInfoIds"] = reflect.TypeOf((*QueryFilterInfoIds)(nil)).Elem()
+}
+
+type QueryFilterInfoIdsRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	FilterId string                 `xml:"filterId"`
+}
+
+func init() {
+	t["QueryFilterInfoIdsRequestType"] = reflect.TypeOf((*QueryFilterInfoIdsRequestType)(nil)).Elem()
+}
+
+type QueryFilterInfoIdsResponse struct {
+	Returnval []string `xml:"returnval,omitempty"`
+}
+
+type QueryFilterList QueryFilterListRequestType
+
+func init() {
+	t["QueryFilterList"] = reflect.TypeOf((*QueryFilterList)(nil)).Elem()
+}
+
+type QueryFilterListRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	ProviderId string                 `xml:"providerId"`
+}
+
+func init() {
+	t["QueryFilterListRequestType"] = reflect.TypeOf((*QueryFilterListRequestType)(nil)).Elem()
+}
+
+type QueryFilterListResponse struct {
+	Returnval []string `xml:"returnval,omitempty"`
+}
+
+type QueryFilterName QueryFilterNameRequestType
+
+func init() {
+	t["QueryFilterName"] = reflect.TypeOf((*QueryFilterName)(nil)).Elem()
+}
+
+type QueryFilterNameRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	FilterId string                 `xml:"filterId"`
+}
+
+func init() {
+	t["QueryFilterNameRequestType"] = reflect.TypeOf((*QueryFilterNameRequestType)(nil)).Elem()
+}
+
+type QueryFilterNameResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type QueryFirmwareConfigUploadURL QueryFirmwareConfigUploadURLRequestType
+
+func init() {
+	t["QueryFirmwareConfigUploadURL"] = reflect.TypeOf((*QueryFirmwareConfigUploadURL)(nil)).Elem()
+}
+
+type QueryFirmwareConfigUploadURLRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryFirmwareConfigUploadURLRequestType"] = reflect.TypeOf((*QueryFirmwareConfigUploadURLRequestType)(nil)).Elem()
+}
+
+type QueryFirmwareConfigUploadURLResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type QueryHealthUpdateInfos QueryHealthUpdateInfosRequestType
+
+func init() {
+	t["QueryHealthUpdateInfos"] = reflect.TypeOf((*QueryHealthUpdateInfos)(nil)).Elem()
+}
+
+type QueryHealthUpdateInfosRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	ProviderId string                 `xml:"providerId"`
+}
+
+func init() {
+	t["QueryHealthUpdateInfosRequestType"] = reflect.TypeOf((*QueryHealthUpdateInfosRequestType)(nil)).Elem()
+}
+
+type QueryHealthUpdateInfosResponse struct {
+	Returnval []HealthUpdateInfo `xml:"returnval,omitempty"`
+}
+
+type QueryHealthUpdates QueryHealthUpdatesRequestType
+
+func init() {
+	t["QueryHealthUpdates"] = reflect.TypeOf((*QueryHealthUpdates)(nil)).Elem()
+}
+
+type QueryHealthUpdatesRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	ProviderId string                 `xml:"providerId"`
+}
+
+func init() {
+	t["QueryHealthUpdatesRequestType"] = reflect.TypeOf((*QueryHealthUpdatesRequestType)(nil)).Elem()
+}
+
+type QueryHealthUpdatesResponse struct {
+	Returnval []HealthUpdate `xml:"returnval,omitempty"`
+}
+
+type QueryHostConnectionInfo QueryHostConnectionInfoRequestType
+
+func init() {
+	t["QueryHostConnectionInfo"] = reflect.TypeOf((*QueryHostConnectionInfo)(nil)).Elem()
+}
+
+type QueryHostConnectionInfoRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryHostConnectionInfoRequestType"] = reflect.TypeOf((*QueryHostConnectionInfoRequestType)(nil)).Elem()
+}
+
+type QueryHostConnectionInfoResponse struct {
+	Returnval HostConnectInfo `xml:"returnval"`
+}
+
+type QueryHostPatchRequestType struct {
+	This ManagedObjectReference                     `xml:"_this"`
+	Spec *HostPatchManagerPatchManagerOperationSpec `xml:"spec,omitempty"`
+}
+
+func init() {
+	t["QueryHostPatchRequestType"] = reflect.TypeOf((*QueryHostPatchRequestType)(nil)).Elem()
+}
+
+type QueryHostPatch_Task QueryHostPatchRequestType
+
+func init() {
+	t["QueryHostPatch_Task"] = reflect.TypeOf((*QueryHostPatch_Task)(nil)).Elem()
+}
+
+type QueryHostPatch_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type QueryHostProfileMetadata QueryHostProfileMetadataRequestType
+
+func init() {
+	t["QueryHostProfileMetadata"] = reflect.TypeOf((*QueryHostProfileMetadata)(nil)).Elem()
+}
+
+type QueryHostProfileMetadataRequestType struct {
+	This        ManagedObjectReference  `xml:"_this"`
+	ProfileName []string                `xml:"profileName,omitempty"`
+	Profile     *ManagedObjectReference `xml:"profile,omitempty"`
+}
+
+func init() {
+	t["QueryHostProfileMetadataRequestType"] = reflect.TypeOf((*QueryHostProfileMetadataRequestType)(nil)).Elem()
+}
+
+type QueryHostProfileMetadataResponse struct {
+	Returnval []ProfileMetadata `xml:"returnval,omitempty"`
+}
+
+type QueryHostStatus QueryHostStatusRequestType
+
+func init() {
+	t["QueryHostStatus"] = reflect.TypeOf((*QueryHostStatus)(nil)).Elem()
+}
+
+type QueryHostStatusRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryHostStatusRequestType"] = reflect.TypeOf((*QueryHostStatusRequestType)(nil)).Elem()
+}
+
+type QueryHostStatusResponse struct {
+	Returnval VsanHostClusterStatus `xml:"returnval"`
+}
+
+type QueryIORMConfigOption QueryIORMConfigOptionRequestType
+
+func init() {
+	t["QueryIORMConfigOption"] = reflect.TypeOf((*QueryIORMConfigOption)(nil)).Elem()
+}
+
+type QueryIORMConfigOptionRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Host ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["QueryIORMConfigOptionRequestType"] = reflect.TypeOf((*QueryIORMConfigOptionRequestType)(nil)).Elem()
+}
+
+type QueryIORMConfigOptionResponse struct {
+	Returnval StorageIORMConfigOption `xml:"returnval"`
+}
+
+type QueryIPAllocations QueryIPAllocationsRequestType
+
+func init() {
+	t["QueryIPAllocations"] = reflect.TypeOf((*QueryIPAllocations)(nil)).Elem()
+}
+
+type QueryIPAllocationsRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	Dc           ManagedObjectReference `xml:"dc"`
+	PoolId       int32                  `xml:"poolId"`
+	ExtensionKey string                 `xml:"extensionKey"`
+}
+
+func init() {
+	t["QueryIPAllocationsRequestType"] = reflect.TypeOf((*QueryIPAllocationsRequestType)(nil)).Elem()
+}
+
+type QueryIPAllocationsResponse struct {
+	Returnval []IpPoolManagerIpAllocation `xml:"returnval"`
+}
+
+type QueryIoFilterInfo QueryIoFilterInfoRequestType
+
+func init() {
+	t["QueryIoFilterInfo"] = reflect.TypeOf((*QueryIoFilterInfo)(nil)).Elem()
+}
+
+type QueryIoFilterInfoRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	CompRes ManagedObjectReference `xml:"compRes"`
+}
+
+func init() {
+	t["QueryIoFilterInfoRequestType"] = reflect.TypeOf((*QueryIoFilterInfoRequestType)(nil)).Elem()
+}
+
+type QueryIoFilterInfoResponse struct {
+	Returnval []ClusterIoFilterInfo `xml:"returnval,omitempty"`
+}
+
+type QueryIoFilterIssues QueryIoFilterIssuesRequestType
+
+func init() {
+	t["QueryIoFilterIssues"] = reflect.TypeOf((*QueryIoFilterIssues)(nil)).Elem()
+}
+
+type QueryIoFilterIssuesRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	FilterId string                 `xml:"filterId"`
+	CompRes  ManagedObjectReference `xml:"compRes"`
+}
+
+func init() {
+	t["QueryIoFilterIssuesRequestType"] = reflect.TypeOf((*QueryIoFilterIssuesRequestType)(nil)).Elem()
+}
+
+type QueryIoFilterIssuesResponse struct {
+	Returnval IoFilterQueryIssueResult `xml:"returnval"`
+}
+
+type QueryIpPools QueryIpPoolsRequestType
+
+func init() {
+	t["QueryIpPools"] = reflect.TypeOf((*QueryIpPools)(nil)).Elem()
+}
+
+type QueryIpPoolsRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Dc   ManagedObjectReference `xml:"dc"`
+}
+
+func init() {
+	t["QueryIpPoolsRequestType"] = reflect.TypeOf((*QueryIpPoolsRequestType)(nil)).Elem()
+}
+
+type QueryIpPoolsResponse struct {
+	Returnval []IpPool `xml:"returnval,omitempty"`
+}
+
+type QueryLicenseSourceAvailability QueryLicenseSourceAvailabilityRequestType
+
+func init() {
+	t["QueryLicenseSourceAvailability"] = reflect.TypeOf((*QueryLicenseSourceAvailability)(nil)).Elem()
+}
+
+type QueryLicenseSourceAvailabilityRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Host *ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["QueryLicenseSourceAvailabilityRequestType"] = reflect.TypeOf((*QueryLicenseSourceAvailabilityRequestType)(nil)).Elem()
+}
+
+type QueryLicenseSourceAvailabilityResponse struct {
+	Returnval []LicenseAvailabilityInfo `xml:"returnval,omitempty"`
+}
+
+type QueryLicenseUsage QueryLicenseUsageRequestType
+
+func init() {
+	t["QueryLicenseUsage"] = reflect.TypeOf((*QueryLicenseUsage)(nil)).Elem()
+}
+
+type QueryLicenseUsageRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Host *ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["QueryLicenseUsageRequestType"] = reflect.TypeOf((*QueryLicenseUsageRequestType)(nil)).Elem()
+}
+
+type QueryLicenseUsageResponse struct {
+	Returnval LicenseUsageInfo `xml:"returnval"`
+}
+
+type QueryLockdownExceptions QueryLockdownExceptionsRequestType
+
+func init() {
+	t["QueryLockdownExceptions"] = reflect.TypeOf((*QueryLockdownExceptions)(nil)).Elem()
+}
+
+type QueryLockdownExceptionsRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryLockdownExceptionsRequestType"] = reflect.TypeOf((*QueryLockdownExceptionsRequestType)(nil)).Elem()
+}
+
+type QueryLockdownExceptionsResponse struct {
+	Returnval []string `xml:"returnval,omitempty"`
+}
+
+type QueryManagedBy QueryManagedByRequestType
+
+func init() {
+	t["QueryManagedBy"] = reflect.TypeOf((*QueryManagedBy)(nil)).Elem()
+}
+
+type QueryManagedByRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	ExtensionKey string                 `xml:"extensionKey"`
+}
+
+func init() {
+	t["QueryManagedByRequestType"] = reflect.TypeOf((*QueryManagedByRequestType)(nil)).Elem()
+}
+
+type QueryManagedByResponse struct {
+	Returnval []ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type QueryMemoryOverhead QueryMemoryOverheadRequestType
+
+func init() {
+	t["QueryMemoryOverhead"] = reflect.TypeOf((*QueryMemoryOverhead)(nil)).Elem()
+}
+
+type QueryMemoryOverheadEx QueryMemoryOverheadExRequestType
+
+func init() {
+	t["QueryMemoryOverheadEx"] = reflect.TypeOf((*QueryMemoryOverheadEx)(nil)).Elem()
+}
+
+type QueryMemoryOverheadExRequestType struct {
+	This         ManagedObjectReference   `xml:"_this"`
+	VmConfigInfo VirtualMachineConfigInfo `xml:"vmConfigInfo"`
+}
+
+func init() {
+	t["QueryMemoryOverheadExRequestType"] = reflect.TypeOf((*QueryMemoryOverheadExRequestType)(nil)).Elem()
+}
+
+type QueryMemoryOverheadExResponse struct {
+	Returnval int64 `xml:"returnval"`
+}
+
+type QueryMemoryOverheadRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	MemorySize   int64                  `xml:"memorySize"`
+	VideoRamSize int32                  `xml:"videoRamSize,omitempty"`
+	NumVcpus     int32                  `xml:"numVcpus"`
+}
+
+func init() {
+	t["QueryMemoryOverheadRequestType"] = reflect.TypeOf((*QueryMemoryOverheadRequestType)(nil)).Elem()
+}
+
+type QueryMemoryOverheadResponse struct {
+	Returnval int64 `xml:"returnval"`
+}
+
+type QueryMigrationDependencies QueryMigrationDependenciesRequestType
+
+func init() {
+	t["QueryMigrationDependencies"] = reflect.TypeOf((*QueryMigrationDependencies)(nil)).Elem()
+}
+
+type QueryMigrationDependenciesRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	PnicDevice []string               `xml:"pnicDevice"`
+}
+
+func init() {
+	t["QueryMigrationDependenciesRequestType"] = reflect.TypeOf((*QueryMigrationDependenciesRequestType)(nil)).Elem()
+}
+
+type QueryMigrationDependenciesResponse struct {
+	Returnval IscsiMigrationDependency `xml:"returnval"`
+}
+
+type QueryModules QueryModulesRequestType
+
+func init() {
+	t["QueryModules"] = reflect.TypeOf((*QueryModules)(nil)).Elem()
+}
+
+type QueryModulesRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryModulesRequestType"] = reflect.TypeOf((*QueryModulesRequestType)(nil)).Elem()
+}
+
+type QueryModulesResponse struct {
+	Returnval []KernelModuleInfo `xml:"returnval,omitempty"`
+}
+
+type QueryMonitoredEntities QueryMonitoredEntitiesRequestType
+
+func init() {
+	t["QueryMonitoredEntities"] = reflect.TypeOf((*QueryMonitoredEntities)(nil)).Elem()
+}
+
+type QueryMonitoredEntitiesRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	ProviderId string                 `xml:"providerId"`
+}
+
+func init() {
+	t["QueryMonitoredEntitiesRequestType"] = reflect.TypeOf((*QueryMonitoredEntitiesRequestType)(nil)).Elem()
+}
+
+type QueryMonitoredEntitiesResponse struct {
+	Returnval []ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type QueryNFSUser QueryNFSUserRequestType
+
+func init() {
+	t["QueryNFSUser"] = reflect.TypeOf((*QueryNFSUser)(nil)).Elem()
+}
+
+type QueryNFSUserRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryNFSUserRequestType"] = reflect.TypeOf((*QueryNFSUserRequestType)(nil)).Elem()
+}
+
+type QueryNFSUserResponse struct {
+	Returnval *HostNasVolumeUserInfo `xml:"returnval,omitempty"`
+}
+
+type QueryNetConfig QueryNetConfigRequestType
+
+func init() {
+	t["QueryNetConfig"] = reflect.TypeOf((*QueryNetConfig)(nil)).Elem()
+}
+
+type QueryNetConfigRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	NicType string                 `xml:"nicType"`
+}
+
+func init() {
+	t["QueryNetConfigRequestType"] = reflect.TypeOf((*QueryNetConfigRequestType)(nil)).Elem()
+}
+
+type QueryNetConfigResponse struct {
+	Returnval *VirtualNicManagerNetConfig `xml:"returnval,omitempty"`
+}
+
+type QueryNetworkHint QueryNetworkHintRequestType
+
+func init() {
+	t["QueryNetworkHint"] = reflect.TypeOf((*QueryNetworkHint)(nil)).Elem()
+}
+
+type QueryNetworkHintRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Device []string               `xml:"device,omitempty"`
+}
+
+func init() {
+	t["QueryNetworkHintRequestType"] = reflect.TypeOf((*QueryNetworkHintRequestType)(nil)).Elem()
+}
+
+type QueryNetworkHintResponse struct {
+	Returnval []PhysicalNicHintInfo `xml:"returnval,omitempty"`
+}
+
+type QueryObjectsOnPhysicalVsanDisk QueryObjectsOnPhysicalVsanDiskRequestType
+
+func init() {
+	t["QueryObjectsOnPhysicalVsanDisk"] = reflect.TypeOf((*QueryObjectsOnPhysicalVsanDisk)(nil)).Elem()
+}
+
+type QueryObjectsOnPhysicalVsanDiskRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Disks []string               `xml:"disks"`
+}
+
+func init() {
+	t["QueryObjectsOnPhysicalVsanDiskRequestType"] = reflect.TypeOf((*QueryObjectsOnPhysicalVsanDiskRequestType)(nil)).Elem()
+}
+
+type QueryObjectsOnPhysicalVsanDiskResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type QueryOptions QueryOptionsRequestType
+
+func init() {
+	t["QueryOptions"] = reflect.TypeOf((*QueryOptions)(nil)).Elem()
+}
+
+type QueryOptionsRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Name string                 `xml:"name,omitempty"`
+}
+
+func init() {
+	t["QueryOptionsRequestType"] = reflect.TypeOf((*QueryOptionsRequestType)(nil)).Elem()
+}
+
+type QueryOptionsResponse struct {
+	Returnval []BaseOptionValue `xml:"returnval,omitempty,typeattr"`
+}
+
+type QueryPartitionCreateDesc QueryPartitionCreateDescRequestType
+
+func init() {
+	t["QueryPartitionCreateDesc"] = reflect.TypeOf((*QueryPartitionCreateDesc)(nil)).Elem()
+}
+
+type QueryPartitionCreateDescRequestType struct {
+	This           ManagedObjectReference `xml:"_this"`
+	DiskUuid       string                 `xml:"diskUuid"`
+	DiagnosticType string                 `xml:"diagnosticType"`
+}
+
+func init() {
+	t["QueryPartitionCreateDescRequestType"] = reflect.TypeOf((*QueryPartitionCreateDescRequestType)(nil)).Elem()
+}
+
+type QueryPartitionCreateDescResponse struct {
+	Returnval HostDiagnosticPartitionCreateDescription `xml:"returnval"`
+}
+
+type QueryPartitionCreateOptions QueryPartitionCreateOptionsRequestType
+
+func init() {
+	t["QueryPartitionCreateOptions"] = reflect.TypeOf((*QueryPartitionCreateOptions)(nil)).Elem()
+}
+
+type QueryPartitionCreateOptionsRequestType struct {
+	This           ManagedObjectReference `xml:"_this"`
+	StorageType    string                 `xml:"storageType"`
+	DiagnosticType string                 `xml:"diagnosticType"`
+}
+
+func init() {
+	t["QueryPartitionCreateOptionsRequestType"] = reflect.TypeOf((*QueryPartitionCreateOptionsRequestType)(nil)).Elem()
+}
+
+type QueryPartitionCreateOptionsResponse struct {
+	Returnval []HostDiagnosticPartitionCreateOption `xml:"returnval,omitempty"`
+}
+
+type QueryPathSelectionPolicyOptions QueryPathSelectionPolicyOptionsRequestType
+
+func init() {
+	t["QueryPathSelectionPolicyOptions"] = reflect.TypeOf((*QueryPathSelectionPolicyOptions)(nil)).Elem()
+}
+
+type QueryPathSelectionPolicyOptionsRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryPathSelectionPolicyOptionsRequestType"] = reflect.TypeOf((*QueryPathSelectionPolicyOptionsRequestType)(nil)).Elem()
+}
+
+type QueryPathSelectionPolicyOptionsResponse struct {
+	Returnval []HostPathSelectionPolicyOption `xml:"returnval,omitempty"`
+}
+
+type QueryPerf QueryPerfRequestType
+
+func init() {
+	t["QueryPerf"] = reflect.TypeOf((*QueryPerf)(nil)).Elem()
+}
+
+type QueryPerfComposite QueryPerfCompositeRequestType
+
+func init() {
+	t["QueryPerfComposite"] = reflect.TypeOf((*QueryPerfComposite)(nil)).Elem()
+}
+
+type QueryPerfCompositeRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	QuerySpec PerfQuerySpec          `xml:"querySpec"`
+}
+
+func init() {
+	t["QueryPerfCompositeRequestType"] = reflect.TypeOf((*QueryPerfCompositeRequestType)(nil)).Elem()
+}
+
+type QueryPerfCompositeResponse struct {
+	Returnval PerfCompositeMetric `xml:"returnval"`
+}
+
+type QueryPerfCounter QueryPerfCounterRequestType
+
+func init() {
+	t["QueryPerfCounter"] = reflect.TypeOf((*QueryPerfCounter)(nil)).Elem()
+}
+
+type QueryPerfCounterByLevel QueryPerfCounterByLevelRequestType
+
+func init() {
+	t["QueryPerfCounterByLevel"] = reflect.TypeOf((*QueryPerfCounterByLevel)(nil)).Elem()
+}
+
+type QueryPerfCounterByLevelRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Level int32                  `xml:"level"`
+}
+
+func init() {
+	t["QueryPerfCounterByLevelRequestType"] = reflect.TypeOf((*QueryPerfCounterByLevelRequestType)(nil)).Elem()
+}
+
+type QueryPerfCounterByLevelResponse struct {
+	Returnval []PerfCounterInfo `xml:"returnval"`
+}
+
+type QueryPerfCounterRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	CounterId []int32                `xml:"counterId"`
+}
+
+func init() {
+	t["QueryPerfCounterRequestType"] = reflect.TypeOf((*QueryPerfCounterRequestType)(nil)).Elem()
+}
+
+type QueryPerfCounterResponse struct {
+	Returnval []PerfCounterInfo `xml:"returnval,omitempty"`
+}
+
+type QueryPerfProviderSummary QueryPerfProviderSummaryRequestType
+
+func init() {
+	t["QueryPerfProviderSummary"] = reflect.TypeOf((*QueryPerfProviderSummary)(nil)).Elem()
+}
+
+type QueryPerfProviderSummaryRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Entity ManagedObjectReference `xml:"entity"`
+}
+
+func init() {
+	t["QueryPerfProviderSummaryRequestType"] = reflect.TypeOf((*QueryPerfProviderSummaryRequestType)(nil)).Elem()
+}
+
+type QueryPerfProviderSummaryResponse struct {
+	Returnval PerfProviderSummary `xml:"returnval"`
+}
+
+type QueryPerfRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	QuerySpec []PerfQuerySpec        `xml:"querySpec"`
+}
+
+func init() {
+	t["QueryPerfRequestType"] = reflect.TypeOf((*QueryPerfRequestType)(nil)).Elem()
+}
+
+type QueryPerfResponse struct {
+	Returnval []BasePerfEntityMetricBase `xml:"returnval,omitempty,typeattr"`
+}
+
+type QueryPhysicalVsanDisks QueryPhysicalVsanDisksRequestType
+
+func init() {
+	t["QueryPhysicalVsanDisks"] = reflect.TypeOf((*QueryPhysicalVsanDisks)(nil)).Elem()
+}
+
+type QueryPhysicalVsanDisksRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Props []string               `xml:"props,omitempty"`
+}
+
+func init() {
+	t["QueryPhysicalVsanDisksRequestType"] = reflect.TypeOf((*QueryPhysicalVsanDisksRequestType)(nil)).Elem()
+}
+
+type QueryPhysicalVsanDisksResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type QueryPnicStatus QueryPnicStatusRequestType
+
+func init() {
+	t["QueryPnicStatus"] = reflect.TypeOf((*QueryPnicStatus)(nil)).Elem()
+}
+
+type QueryPnicStatusRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	PnicDevice string                 `xml:"pnicDevice"`
+}
+
+func init() {
+	t["QueryPnicStatusRequestType"] = reflect.TypeOf((*QueryPnicStatusRequestType)(nil)).Elem()
+}
+
+type QueryPnicStatusResponse struct {
+	Returnval IscsiStatus `xml:"returnval"`
+}
+
+type QueryPolicyMetadata QueryPolicyMetadataRequestType
+
+func init() {
+	t["QueryPolicyMetadata"] = reflect.TypeOf((*QueryPolicyMetadata)(nil)).Elem()
+}
+
+type QueryPolicyMetadataRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	PolicyName []string                `xml:"policyName,omitempty"`
+	Profile    *ManagedObjectReference `xml:"profile,omitempty"`
+}
+
+func init() {
+	t["QueryPolicyMetadataRequestType"] = reflect.TypeOf((*QueryPolicyMetadataRequestType)(nil)).Elem()
+}
+
+type QueryPolicyMetadataResponse struct {
+	Returnval []ProfilePolicyMetadata `xml:"returnval,omitempty"`
+}
+
+type QueryProfileStructure QueryProfileStructureRequestType
+
+func init() {
+	t["QueryProfileStructure"] = reflect.TypeOf((*QueryProfileStructure)(nil)).Elem()
+}
+
+type QueryProfileStructureRequestType struct {
+	This    ManagedObjectReference  `xml:"_this"`
+	Profile *ManagedObjectReference `xml:"profile,omitempty"`
+}
+
+func init() {
+	t["QueryProfileStructureRequestType"] = reflect.TypeOf((*QueryProfileStructureRequestType)(nil)).Elem()
+}
+
+type QueryProfileStructureResponse struct {
+	Returnval ProfileProfileStructure `xml:"returnval"`
+}
+
+type QueryProviderList QueryProviderListRequestType
+
+func init() {
+	t["QueryProviderList"] = reflect.TypeOf((*QueryProviderList)(nil)).Elem()
+}
+
+type QueryProviderListRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryProviderListRequestType"] = reflect.TypeOf((*QueryProviderListRequestType)(nil)).Elem()
+}
+
+type QueryProviderListResponse struct {
+	Returnval []string `xml:"returnval,omitempty"`
+}
+
+type QueryProviderName QueryProviderNameRequestType
+
+func init() {
+	t["QueryProviderName"] = reflect.TypeOf((*QueryProviderName)(nil)).Elem()
+}
+
+type QueryProviderNameRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Id   string                 `xml:"id"`
+}
+
+func init() {
+	t["QueryProviderNameRequestType"] = reflect.TypeOf((*QueryProviderNameRequestType)(nil)).Elem()
+}
+
+type QueryProviderNameResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type QueryResourceConfigOption QueryResourceConfigOptionRequestType
+
+func init() {
+	t["QueryResourceConfigOption"] = reflect.TypeOf((*QueryResourceConfigOption)(nil)).Elem()
+}
+
+type QueryResourceConfigOptionRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryResourceConfigOptionRequestType"] = reflect.TypeOf((*QueryResourceConfigOptionRequestType)(nil)).Elem()
+}
+
+type QueryResourceConfigOptionResponse struct {
+	Returnval ResourceConfigOption `xml:"returnval"`
+}
+
+type QueryServiceList QueryServiceListRequestType
+
+func init() {
+	t["QueryServiceList"] = reflect.TypeOf((*QueryServiceList)(nil)).Elem()
+}
+
+type QueryServiceListRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	ServiceName string                 `xml:"serviceName,omitempty"`
+	Location    []string               `xml:"location,omitempty"`
+}
+
+func init() {
+	t["QueryServiceListRequestType"] = reflect.TypeOf((*QueryServiceListRequestType)(nil)).Elem()
+}
+
+type QueryServiceListResponse struct {
+	Returnval []ServiceManagerServiceInfo `xml:"returnval,omitempty"`
+}
+
+type QueryStorageArrayTypePolicyOptions QueryStorageArrayTypePolicyOptionsRequestType
+
+func init() {
+	t["QueryStorageArrayTypePolicyOptions"] = reflect.TypeOf((*QueryStorageArrayTypePolicyOptions)(nil)).Elem()
+}
+
+type QueryStorageArrayTypePolicyOptionsRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryStorageArrayTypePolicyOptionsRequestType"] = reflect.TypeOf((*QueryStorageArrayTypePolicyOptionsRequestType)(nil)).Elem()
+}
+
+type QueryStorageArrayTypePolicyOptionsResponse struct {
+	Returnval []HostStorageArrayTypePolicyOption `xml:"returnval,omitempty"`
+}
+
+type QuerySupportedFeatures QuerySupportedFeaturesRequestType
+
+func init() {
+	t["QuerySupportedFeatures"] = reflect.TypeOf((*QuerySupportedFeatures)(nil)).Elem()
+}
+
+type QuerySupportedFeaturesRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Host *ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["QuerySupportedFeaturesRequestType"] = reflect.TypeOf((*QuerySupportedFeaturesRequestType)(nil)).Elem()
+}
+
+type QuerySupportedFeaturesResponse struct {
+	Returnval []LicenseFeatureInfo `xml:"returnval,omitempty"`
+}
+
+type QuerySyncingVsanObjects QuerySyncingVsanObjectsRequestType
+
+func init() {
+	t["QuerySyncingVsanObjects"] = reflect.TypeOf((*QuerySyncingVsanObjects)(nil)).Elem()
+}
+
+type QuerySyncingVsanObjectsRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Uuids []string               `xml:"uuids,omitempty"`
+}
+
+func init() {
+	t["QuerySyncingVsanObjectsRequestType"] = reflect.TypeOf((*QuerySyncingVsanObjectsRequestType)(nil)).Elem()
+}
+
+type QuerySyncingVsanObjectsResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type QuerySystemUsers QuerySystemUsersRequestType
+
+func init() {
+	t["QuerySystemUsers"] = reflect.TypeOf((*QuerySystemUsers)(nil)).Elem()
+}
+
+type QuerySystemUsersRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QuerySystemUsersRequestType"] = reflect.TypeOf((*QuerySystemUsersRequestType)(nil)).Elem()
+}
+
+type QuerySystemUsersResponse struct {
+	Returnval []string `xml:"returnval,omitempty"`
+}
+
+type QueryTargetCapabilities QueryTargetCapabilitiesRequestType
+
+func init() {
+	t["QueryTargetCapabilities"] = reflect.TypeOf((*QueryTargetCapabilities)(nil)).Elem()
+}
+
+type QueryTargetCapabilitiesRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Host *ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["QueryTargetCapabilitiesRequestType"] = reflect.TypeOf((*QueryTargetCapabilitiesRequestType)(nil)).Elem()
+}
+
+type QueryTargetCapabilitiesResponse struct {
+	Returnval *HostCapability `xml:"returnval,omitempty"`
+}
+
+type QueryTpmAttestationReport QueryTpmAttestationReportRequestType
+
+func init() {
+	t["QueryTpmAttestationReport"] = reflect.TypeOf((*QueryTpmAttestationReport)(nil)).Elem()
+}
+
+type QueryTpmAttestationReportRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryTpmAttestationReportRequestType"] = reflect.TypeOf((*QueryTpmAttestationReportRequestType)(nil)).Elem()
+}
+
+type QueryTpmAttestationReportResponse struct {
+	Returnval *HostTpmAttestationReport `xml:"returnval,omitempty"`
+}
+
+type QueryUnmonitoredHosts QueryUnmonitoredHostsRequestType
+
+func init() {
+	t["QueryUnmonitoredHosts"] = reflect.TypeOf((*QueryUnmonitoredHosts)(nil)).Elem()
+}
+
+type QueryUnmonitoredHostsRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	ProviderId string                 `xml:"providerId"`
+	Cluster    ManagedObjectReference `xml:"cluster"`
+}
+
+func init() {
+	t["QueryUnmonitoredHostsRequestType"] = reflect.TypeOf((*QueryUnmonitoredHostsRequestType)(nil)).Elem()
+}
+
+type QueryUnmonitoredHostsResponse struct {
+	Returnval []ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type QueryUnownedFiles QueryUnownedFilesRequestType
+
+func init() {
+	t["QueryUnownedFiles"] = reflect.TypeOf((*QueryUnownedFiles)(nil)).Elem()
+}
+
+type QueryUnownedFilesRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryUnownedFilesRequestType"] = reflect.TypeOf((*QueryUnownedFilesRequestType)(nil)).Elem()
+}
+
+type QueryUnownedFilesResponse struct {
+	Returnval []string `xml:"returnval,omitempty"`
+}
+
+type QueryUnresolvedVmfsVolume QueryUnresolvedVmfsVolumeRequestType
+
+func init() {
+	t["QueryUnresolvedVmfsVolume"] = reflect.TypeOf((*QueryUnresolvedVmfsVolume)(nil)).Elem()
+}
+
+type QueryUnresolvedVmfsVolumeRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryUnresolvedVmfsVolumeRequestType"] = reflect.TypeOf((*QueryUnresolvedVmfsVolumeRequestType)(nil)).Elem()
+}
+
+type QueryUnresolvedVmfsVolumeResponse struct {
+	Returnval []HostUnresolvedVmfsVolume `xml:"returnval,omitempty"`
+}
+
+type QueryUnresolvedVmfsVolumes QueryUnresolvedVmfsVolumesRequestType
+
+func init() {
+	t["QueryUnresolvedVmfsVolumes"] = reflect.TypeOf((*QueryUnresolvedVmfsVolumes)(nil)).Elem()
+}
+
+type QueryUnresolvedVmfsVolumesRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryUnresolvedVmfsVolumesRequestType"] = reflect.TypeOf((*QueryUnresolvedVmfsVolumesRequestType)(nil)).Elem()
+}
+
+type QueryUnresolvedVmfsVolumesResponse struct {
+	Returnval []HostUnresolvedVmfsVolume `xml:"returnval,omitempty"`
+}
+
+type QueryUsedVlanIdInDvs QueryUsedVlanIdInDvsRequestType
+
+func init() {
+	t["QueryUsedVlanIdInDvs"] = reflect.TypeOf((*QueryUsedVlanIdInDvs)(nil)).Elem()
+}
+
+type QueryUsedVlanIdInDvsRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryUsedVlanIdInDvsRequestType"] = reflect.TypeOf((*QueryUsedVlanIdInDvsRequestType)(nil)).Elem()
+}
+
+type QueryUsedVlanIdInDvsResponse struct {
+	Returnval []int32 `xml:"returnval,omitempty"`
+}
+
+type QueryVMotionCompatibility QueryVMotionCompatibilityRequestType
+
+func init() {
+	t["QueryVMotionCompatibility"] = reflect.TypeOf((*QueryVMotionCompatibility)(nil)).Elem()
+}
+
+type QueryVMotionCompatibilityExRequestType struct {
+	This ManagedObjectReference   `xml:"_this"`
+	Vm   []ManagedObjectReference `xml:"vm"`
+	Host []ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["QueryVMotionCompatibilityExRequestType"] = reflect.TypeOf((*QueryVMotionCompatibilityExRequestType)(nil)).Elem()
+}
+
+type QueryVMotionCompatibilityEx_Task QueryVMotionCompatibilityExRequestType
+
+func init() {
+	t["QueryVMotionCompatibilityEx_Task"] = reflect.TypeOf((*QueryVMotionCompatibilityEx_Task)(nil)).Elem()
+}
+
+type QueryVMotionCompatibilityEx_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type QueryVMotionCompatibilityRequestType struct {
+	This          ManagedObjectReference   `xml:"_this"`
+	Vm            ManagedObjectReference   `xml:"vm"`
+	Host          []ManagedObjectReference `xml:"host"`
+	Compatibility []string                 `xml:"compatibility,omitempty"`
+}
+
+func init() {
+	t["QueryVMotionCompatibilityRequestType"] = reflect.TypeOf((*QueryVMotionCompatibilityRequestType)(nil)).Elem()
+}
+
+type QueryVMotionCompatibilityResponse struct {
+	Returnval []HostVMotionCompatibility `xml:"returnval,omitempty"`
+}
+
+type QueryVirtualDiskFragmentation QueryVirtualDiskFragmentationRequestType
+
+func init() {
+	t["QueryVirtualDiskFragmentation"] = reflect.TypeOf((*QueryVirtualDiskFragmentation)(nil)).Elem()
+}
+
+type QueryVirtualDiskFragmentationRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Name       string                  `xml:"name"`
+	Datacenter *ManagedObjectReference `xml:"datacenter,omitempty"`
+}
+
+func init() {
+	t["QueryVirtualDiskFragmentationRequestType"] = reflect.TypeOf((*QueryVirtualDiskFragmentationRequestType)(nil)).Elem()
+}
+
+type QueryVirtualDiskFragmentationResponse struct {
+	Returnval int32 `xml:"returnval"`
+}
+
+type QueryVirtualDiskGeometry QueryVirtualDiskGeometryRequestType
+
+func init() {
+	t["QueryVirtualDiskGeometry"] = reflect.TypeOf((*QueryVirtualDiskGeometry)(nil)).Elem()
+}
+
+type QueryVirtualDiskGeometryRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Name       string                  `xml:"name"`
+	Datacenter *ManagedObjectReference `xml:"datacenter,omitempty"`
+}
+
+func init() {
+	t["QueryVirtualDiskGeometryRequestType"] = reflect.TypeOf((*QueryVirtualDiskGeometryRequestType)(nil)).Elem()
+}
+
+type QueryVirtualDiskGeometryResponse struct {
+	Returnval HostDiskDimensionsChs `xml:"returnval"`
+}
+
+type QueryVirtualDiskUuid QueryVirtualDiskUuidRequestType
+
+func init() {
+	t["QueryVirtualDiskUuid"] = reflect.TypeOf((*QueryVirtualDiskUuid)(nil)).Elem()
+}
+
+type QueryVirtualDiskUuidRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Name       string                  `xml:"name"`
+	Datacenter *ManagedObjectReference `xml:"datacenter,omitempty"`
+}
+
+func init() {
+	t["QueryVirtualDiskUuidRequestType"] = reflect.TypeOf((*QueryVirtualDiskUuidRequestType)(nil)).Elem()
+}
+
+type QueryVirtualDiskUuidResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type QueryVmfsConfigOption QueryVmfsConfigOptionRequestType
+
+func init() {
+	t["QueryVmfsConfigOption"] = reflect.TypeOf((*QueryVmfsConfigOption)(nil)).Elem()
+}
+
+type QueryVmfsConfigOptionRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["QueryVmfsConfigOptionRequestType"] = reflect.TypeOf((*QueryVmfsConfigOptionRequestType)(nil)).Elem()
+}
+
+type QueryVmfsConfigOptionResponse struct {
+	Returnval []VmfsConfigOption `xml:"returnval,omitempty"`
+}
+
+type QueryVmfsDatastoreCreateOptions QueryVmfsDatastoreCreateOptionsRequestType
+
+func init() {
+	t["QueryVmfsDatastoreCreateOptions"] = reflect.TypeOf((*QueryVmfsDatastoreCreateOptions)(nil)).Elem()
+}
+
+type QueryVmfsDatastoreCreateOptionsRequestType struct {
+	This             ManagedObjectReference `xml:"_this"`
+	DevicePath       string                 `xml:"devicePath"`
+	VmfsMajorVersion int32                  `xml:"vmfsMajorVersion,omitempty"`
+}
+
+func init() {
+	t["QueryVmfsDatastoreCreateOptionsRequestType"] = reflect.TypeOf((*QueryVmfsDatastoreCreateOptionsRequestType)(nil)).Elem()
+}
+
+type QueryVmfsDatastoreCreateOptionsResponse struct {
+	Returnval []VmfsDatastoreOption `xml:"returnval,omitempty"`
+}
+
+type QueryVmfsDatastoreExpandOptions QueryVmfsDatastoreExpandOptionsRequestType
+
+func init() {
+	t["QueryVmfsDatastoreExpandOptions"] = reflect.TypeOf((*QueryVmfsDatastoreExpandOptions)(nil)).Elem()
+}
+
+type QueryVmfsDatastoreExpandOptionsRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["QueryVmfsDatastoreExpandOptionsRequestType"] = reflect.TypeOf((*QueryVmfsDatastoreExpandOptionsRequestType)(nil)).Elem()
+}
+
+type QueryVmfsDatastoreExpandOptionsResponse struct {
+	Returnval []VmfsDatastoreOption `xml:"returnval,omitempty"`
+}
+
+type QueryVmfsDatastoreExtendOptions QueryVmfsDatastoreExtendOptionsRequestType
+
+func init() {
+	t["QueryVmfsDatastoreExtendOptions"] = reflect.TypeOf((*QueryVmfsDatastoreExtendOptions)(nil)).Elem()
+}
+
+type QueryVmfsDatastoreExtendOptionsRequestType struct {
+	This                     ManagedObjectReference `xml:"_this"`
+	Datastore                ManagedObjectReference `xml:"datastore"`
+	DevicePath               string                 `xml:"devicePath"`
+	SuppressExpandCandidates *bool                  `xml:"suppressExpandCandidates"`
+}
+
+func init() {
+	t["QueryVmfsDatastoreExtendOptionsRequestType"] = reflect.TypeOf((*QueryVmfsDatastoreExtendOptionsRequestType)(nil)).Elem()
+}
+
+type QueryVmfsDatastoreExtendOptionsResponse struct {
+	Returnval []VmfsDatastoreOption `xml:"returnval,omitempty"`
+}
+
+type QueryVnicStatus QueryVnicStatusRequestType
+
+func init() {
+	t["QueryVnicStatus"] = reflect.TypeOf((*QueryVnicStatus)(nil)).Elem()
+}
+
+type QueryVnicStatusRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	VnicDevice string                 `xml:"vnicDevice"`
+}
+
+func init() {
+	t["QueryVnicStatusRequestType"] = reflect.TypeOf((*QueryVnicStatusRequestType)(nil)).Elem()
+}
+
+type QueryVnicStatusResponse struct {
+	Returnval IscsiStatus `xml:"returnval"`
+}
+
+type QueryVsanObjectUuidsByFilter QueryVsanObjectUuidsByFilterRequestType
+
+func init() {
+	t["QueryVsanObjectUuidsByFilter"] = reflect.TypeOf((*QueryVsanObjectUuidsByFilter)(nil)).Elem()
+}
+
+type QueryVsanObjectUuidsByFilterRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Uuids   []string               `xml:"uuids,omitempty"`
+	Limit   int32                  `xml:"limit,omitempty"`
+	Version int32                  `xml:"version,omitempty"`
+}
+
+func init() {
+	t["QueryVsanObjectUuidsByFilterRequestType"] = reflect.TypeOf((*QueryVsanObjectUuidsByFilterRequestType)(nil)).Elem()
+}
+
+type QueryVsanObjectUuidsByFilterResponse struct {
+	Returnval []string `xml:"returnval,omitempty"`
+}
+
+type QueryVsanObjects QueryVsanObjectsRequestType
+
+func init() {
+	t["QueryVsanObjects"] = reflect.TypeOf((*QueryVsanObjects)(nil)).Elem()
+}
+
+type QueryVsanObjectsRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Uuids []string               `xml:"uuids,omitempty"`
+}
+
+func init() {
+	t["QueryVsanObjectsRequestType"] = reflect.TypeOf((*QueryVsanObjectsRequestType)(nil)).Elem()
+}
+
+type QueryVsanObjectsResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type QueryVsanStatistics QueryVsanStatisticsRequestType
+
+func init() {
+	t["QueryVsanStatistics"] = reflect.TypeOf((*QueryVsanStatistics)(nil)).Elem()
+}
+
+type QueryVsanStatisticsRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Labels []string               `xml:"labels"`
+}
+
+func init() {
+	t["QueryVsanStatisticsRequestType"] = reflect.TypeOf((*QueryVsanStatisticsRequestType)(nil)).Elem()
+}
+
+type QueryVsanStatisticsResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type QueryVsanUpgradeStatus QueryVsanUpgradeStatusRequestType
+
+func init() {
+	t["QueryVsanUpgradeStatus"] = reflect.TypeOf((*QueryVsanUpgradeStatus)(nil)).Elem()
+}
+
+type QueryVsanUpgradeStatusRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Cluster ManagedObjectReference `xml:"cluster"`
+}
+
+func init() {
+	t["QueryVsanUpgradeStatusRequestType"] = reflect.TypeOf((*QueryVsanUpgradeStatusRequestType)(nil)).Elem()
+}
+
+type QueryVsanUpgradeStatusResponse struct {
+	Returnval VsanUpgradeSystemUpgradeStatus `xml:"returnval"`
+}
+
+type QuestionPending struct {
+	InvalidState
+
+	Text string `xml:"text"`
+}
+
+func init() {
+	t["QuestionPending"] = reflect.TypeOf((*QuestionPending)(nil)).Elem()
+}
+
+type QuestionPendingFault QuestionPending
+
+func init() {
+	t["QuestionPendingFault"] = reflect.TypeOf((*QuestionPendingFault)(nil)).Elem()
+}
+
+type QuiesceDatastoreIOForHAFailed struct {
+	ResourceInUse
+
+	Host     ManagedObjectReference `xml:"host"`
+	HostName string                 `xml:"hostName"`
+	Ds       ManagedObjectReference `xml:"ds"`
+	DsName   string                 `xml:"dsName"`
+}
+
+func init() {
+	t["QuiesceDatastoreIOForHAFailed"] = reflect.TypeOf((*QuiesceDatastoreIOForHAFailed)(nil)).Elem()
+}
+
+type QuiesceDatastoreIOForHAFailedFault QuiesceDatastoreIOForHAFailed
+
+func init() {
+	t["QuiesceDatastoreIOForHAFailedFault"] = reflect.TypeOf((*QuiesceDatastoreIOForHAFailedFault)(nil)).Elem()
+}
+
+type RDMConversionNotSupported struct {
+	MigrationFault
+
+	Device string `xml:"device"`
+}
+
+func init() {
+	t["RDMConversionNotSupported"] = reflect.TypeOf((*RDMConversionNotSupported)(nil)).Elem()
+}
+
+type RDMConversionNotSupportedFault RDMConversionNotSupported
+
+func init() {
+	t["RDMConversionNotSupportedFault"] = reflect.TypeOf((*RDMConversionNotSupportedFault)(nil)).Elem()
+}
+
+type RDMNotPreserved struct {
+	MigrationFault
+
+	Device string `xml:"device"`
+}
+
+func init() {
+	t["RDMNotPreserved"] = reflect.TypeOf((*RDMNotPreserved)(nil)).Elem()
+}
+
+type RDMNotPreservedFault RDMNotPreserved
+
+func init() {
+	t["RDMNotPreservedFault"] = reflect.TypeOf((*RDMNotPreservedFault)(nil)).Elem()
+}
+
+type RDMNotSupported struct {
+	DeviceNotSupported
+}
+
+func init() {
+	t["RDMNotSupported"] = reflect.TypeOf((*RDMNotSupported)(nil)).Elem()
+}
+
+type RDMNotSupportedFault BaseRDMNotSupported
+
+func init() {
+	t["RDMNotSupportedFault"] = reflect.TypeOf((*RDMNotSupportedFault)(nil)).Elem()
+}
+
+type RDMNotSupportedOnDatastore struct {
+	VmConfigFault
+
+	Device        string                 `xml:"device"`
+	Datastore     ManagedObjectReference `xml:"datastore"`
+	DatastoreName string                 `xml:"datastoreName"`
+}
+
+func init() {
+	t["RDMNotSupportedOnDatastore"] = reflect.TypeOf((*RDMNotSupportedOnDatastore)(nil)).Elem()
+}
+
+type RDMNotSupportedOnDatastoreFault RDMNotSupportedOnDatastore
+
+func init() {
+	t["RDMNotSupportedOnDatastoreFault"] = reflect.TypeOf((*RDMNotSupportedOnDatastoreFault)(nil)).Elem()
+}
+
+type RDMPointsToInaccessibleDisk struct {
+	CannotAccessVmDisk
+}
+
+func init() {
+	t["RDMPointsToInaccessibleDisk"] = reflect.TypeOf((*RDMPointsToInaccessibleDisk)(nil)).Elem()
+}
+
+type RDMPointsToInaccessibleDiskFault RDMPointsToInaccessibleDisk
+
+func init() {
+	t["RDMPointsToInaccessibleDiskFault"] = reflect.TypeOf((*RDMPointsToInaccessibleDiskFault)(nil)).Elem()
+}
+
+type RawDiskNotSupported struct {
+	DeviceNotSupported
+}
+
+func init() {
+	t["RawDiskNotSupported"] = reflect.TypeOf((*RawDiskNotSupported)(nil)).Elem()
+}
+
+type RawDiskNotSupportedFault RawDiskNotSupported
+
+func init() {
+	t["RawDiskNotSupportedFault"] = reflect.TypeOf((*RawDiskNotSupportedFault)(nil)).Elem()
+}
+
+type ReadEnvironmentVariableInGuest ReadEnvironmentVariableInGuestRequestType
+
+func init() {
+	t["ReadEnvironmentVariableInGuest"] = reflect.TypeOf((*ReadEnvironmentVariableInGuest)(nil)).Elem()
+}
+
+type ReadEnvironmentVariableInGuestRequestType struct {
+	This  ManagedObjectReference  `xml:"_this"`
+	Vm    ManagedObjectReference  `xml:"vm"`
+	Auth  BaseGuestAuthentication `xml:"auth,typeattr"`
+	Names []string                `xml:"names,omitempty"`
+}
+
+func init() {
+	t["ReadEnvironmentVariableInGuestRequestType"] = reflect.TypeOf((*ReadEnvironmentVariableInGuestRequestType)(nil)).Elem()
+}
+
+type ReadEnvironmentVariableInGuestResponse struct {
+	Returnval []string `xml:"returnval,omitempty"`
+}
+
+type ReadHostResourcePoolTreeFailed struct {
+	HostConnectFault
+}
+
+func init() {
+	t["ReadHostResourcePoolTreeFailed"] = reflect.TypeOf((*ReadHostResourcePoolTreeFailed)(nil)).Elem()
+}
+
+type ReadHostResourcePoolTreeFailedFault ReadHostResourcePoolTreeFailed
+
+func init() {
+	t["ReadHostResourcePoolTreeFailedFault"] = reflect.TypeOf((*ReadHostResourcePoolTreeFailedFault)(nil)).Elem()
+}
+
+type ReadNextEvents ReadNextEventsRequestType
+
+func init() {
+	t["ReadNextEvents"] = reflect.TypeOf((*ReadNextEvents)(nil)).Elem()
+}
+
+type ReadNextEventsRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	MaxCount int32                  `xml:"maxCount"`
+}
+
+func init() {
+	t["ReadNextEventsRequestType"] = reflect.TypeOf((*ReadNextEventsRequestType)(nil)).Elem()
+}
+
+type ReadNextEventsResponse struct {
+	Returnval []BaseEvent `xml:"returnval,omitempty,typeattr"`
+}
+
+type ReadNextTasks ReadNextTasksRequestType
+
+func init() {
+	t["ReadNextTasks"] = reflect.TypeOf((*ReadNextTasks)(nil)).Elem()
+}
+
+type ReadNextTasksRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	MaxCount int32                  `xml:"maxCount"`
+}
+
+func init() {
+	t["ReadNextTasksRequestType"] = reflect.TypeOf((*ReadNextTasksRequestType)(nil)).Elem()
+}
+
+type ReadNextTasksResponse struct {
+	Returnval []TaskInfo `xml:"returnval,omitempty"`
+}
+
+type ReadOnlyDisksWithLegacyDestination struct {
+	MigrationFault
+
+	RoDiskCount   int32 `xml:"roDiskCount"`
+	TimeoutDanger bool  `xml:"timeoutDanger"`
+}
+
+func init() {
+	t["ReadOnlyDisksWithLegacyDestination"] = reflect.TypeOf((*ReadOnlyDisksWithLegacyDestination)(nil)).Elem()
+}
+
+type ReadOnlyDisksWithLegacyDestinationFault ReadOnlyDisksWithLegacyDestination
+
+func init() {
+	t["ReadOnlyDisksWithLegacyDestinationFault"] = reflect.TypeOf((*ReadOnlyDisksWithLegacyDestinationFault)(nil)).Elem()
+}
+
+type ReadPreviousEvents ReadPreviousEventsRequestType
+
+func init() {
+	t["ReadPreviousEvents"] = reflect.TypeOf((*ReadPreviousEvents)(nil)).Elem()
+}
+
+type ReadPreviousEventsRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	MaxCount int32                  `xml:"maxCount"`
+}
+
+func init() {
+	t["ReadPreviousEventsRequestType"] = reflect.TypeOf((*ReadPreviousEventsRequestType)(nil)).Elem()
+}
+
+type ReadPreviousEventsResponse struct {
+	Returnval []BaseEvent `xml:"returnval,omitempty,typeattr"`
+}
+
+type ReadPreviousTasks ReadPreviousTasksRequestType
+
+func init() {
+	t["ReadPreviousTasks"] = reflect.TypeOf((*ReadPreviousTasks)(nil)).Elem()
+}
+
+type ReadPreviousTasksRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	MaxCount int32                  `xml:"maxCount"`
+}
+
+func init() {
+	t["ReadPreviousTasksRequestType"] = reflect.TypeOf((*ReadPreviousTasksRequestType)(nil)).Elem()
+}
+
+type ReadPreviousTasksResponse struct {
+	Returnval []TaskInfo `xml:"returnval,omitempty"`
+}
+
+type RebootGuest RebootGuestRequestType
+
+func init() {
+	t["RebootGuest"] = reflect.TypeOf((*RebootGuest)(nil)).Elem()
+}
+
+type RebootGuestRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RebootGuestRequestType"] = reflect.TypeOf((*RebootGuestRequestType)(nil)).Elem()
+}
+
+type RebootGuestResponse struct {
+}
+
+type RebootHostRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Force bool                   `xml:"force"`
+}
+
+func init() {
+	t["RebootHostRequestType"] = reflect.TypeOf((*RebootHostRequestType)(nil)).Elem()
+}
+
+type RebootHost_Task RebootHostRequestType
+
+func init() {
+	t["RebootHost_Task"] = reflect.TypeOf((*RebootHost_Task)(nil)).Elem()
+}
+
+type RebootHost_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type RebootRequired struct {
+	VimFault
+
+	Patch string `xml:"patch,omitempty"`
+}
+
+func init() {
+	t["RebootRequired"] = reflect.TypeOf((*RebootRequired)(nil)).Elem()
+}
+
+type RebootRequiredFault RebootRequired
+
+func init() {
+	t["RebootRequiredFault"] = reflect.TypeOf((*RebootRequiredFault)(nil)).Elem()
+}
+
+type RecommendDatastores RecommendDatastoresRequestType
+
+func init() {
+	t["RecommendDatastores"] = reflect.TypeOf((*RecommendDatastores)(nil)).Elem()
+}
+
+type RecommendDatastoresRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	StorageSpec StoragePlacementSpec   `xml:"storageSpec"`
+}
+
+func init() {
+	t["RecommendDatastoresRequestType"] = reflect.TypeOf((*RecommendDatastoresRequestType)(nil)).Elem()
+}
+
+type RecommendDatastoresResponse struct {
+	Returnval StoragePlacementResult `xml:"returnval"`
+}
+
+type RecommendHostsForVm RecommendHostsForVmRequestType
+
+func init() {
+	t["RecommendHostsForVm"] = reflect.TypeOf((*RecommendHostsForVm)(nil)).Elem()
+}
+
+type RecommendHostsForVmRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Vm   ManagedObjectReference  `xml:"vm"`
+	Pool *ManagedObjectReference `xml:"pool,omitempty"`
+}
+
+func init() {
+	t["RecommendHostsForVmRequestType"] = reflect.TypeOf((*RecommendHostsForVmRequestType)(nil)).Elem()
+}
+
+type RecommendHostsForVmResponse struct {
+	Returnval []ClusterHostRecommendation `xml:"returnval,omitempty"`
+}
+
+type RecommissionVsanNodeRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RecommissionVsanNodeRequestType"] = reflect.TypeOf((*RecommissionVsanNodeRequestType)(nil)).Elem()
+}
+
+type RecommissionVsanNode_Task RecommissionVsanNodeRequestType
+
+func init() {
+	t["RecommissionVsanNode_Task"] = reflect.TypeOf((*RecommissionVsanNode_Task)(nil)).Elem()
+}
+
+type RecommissionVsanNode_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ReconcileDatastoreInventoryRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["ReconcileDatastoreInventoryRequestType"] = reflect.TypeOf((*ReconcileDatastoreInventoryRequestType)(nil)).Elem()
+}
+
+type ReconcileDatastoreInventory_Task ReconcileDatastoreInventoryRequestType
+
+func init() {
+	t["ReconcileDatastoreInventory_Task"] = reflect.TypeOf((*ReconcileDatastoreInventory_Task)(nil)).Elem()
+}
+
+type ReconcileDatastoreInventory_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ReconfigVMRequestType struct {
+	This ManagedObjectReference   `xml:"_this"`
+	Spec VirtualMachineConfigSpec `xml:"spec"`
+}
+
+func init() {
+	t["ReconfigVMRequestType"] = reflect.TypeOf((*ReconfigVMRequestType)(nil)).Elem()
+}
+
+type ReconfigVM_Task ReconfigVMRequestType
+
+func init() {
+	t["ReconfigVM_Task"] = reflect.TypeOf((*ReconfigVM_Task)(nil)).Elem()
+}
+
+type ReconfigVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ReconfigurationSatisfiable ReconfigurationSatisfiableRequestType
+
+func init() {
+	t["ReconfigurationSatisfiable"] = reflect.TypeOf((*ReconfigurationSatisfiable)(nil)).Elem()
+}
+
+type ReconfigurationSatisfiableRequestType struct {
+	This                 ManagedObjectReference  `xml:"_this"`
+	Pcbs                 []VsanPolicyChangeBatch `xml:"pcbs"`
+	IgnoreSatisfiability *bool                   `xml:"ignoreSatisfiability"`
+}
+
+func init() {
+	t["ReconfigurationSatisfiableRequestType"] = reflect.TypeOf((*ReconfigurationSatisfiableRequestType)(nil)).Elem()
+}
+
+type ReconfigurationSatisfiableResponse struct {
+	Returnval []VsanPolicySatisfiability `xml:"returnval"`
+}
+
+type ReconfigureAlarm ReconfigureAlarmRequestType
+
+func init() {
+	t["ReconfigureAlarm"] = reflect.TypeOf((*ReconfigureAlarm)(nil)).Elem()
+}
+
+type ReconfigureAlarmRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Spec BaseAlarmSpec          `xml:"spec,typeattr"`
+}
+
+func init() {
+	t["ReconfigureAlarmRequestType"] = reflect.TypeOf((*ReconfigureAlarmRequestType)(nil)).Elem()
+}
+
+type ReconfigureAlarmResponse struct {
+}
+
+type ReconfigureAutostart ReconfigureAutostartRequestType
+
+func init() {
+	t["ReconfigureAutostart"] = reflect.TypeOf((*ReconfigureAutostart)(nil)).Elem()
+}
+
+type ReconfigureAutostartRequestType struct {
+	This ManagedObjectReference     `xml:"_this"`
+	Spec HostAutoStartManagerConfig `xml:"spec"`
+}
+
+func init() {
+	t["ReconfigureAutostartRequestType"] = reflect.TypeOf((*ReconfigureAutostartRequestType)(nil)).Elem()
+}
+
+type ReconfigureAutostartResponse struct {
+}
+
+type ReconfigureClusterRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Spec   ClusterConfigSpec      `xml:"spec"`
+	Modify bool                   `xml:"modify"`
+}
+
+func init() {
+	t["ReconfigureClusterRequestType"] = reflect.TypeOf((*ReconfigureClusterRequestType)(nil)).Elem()
+}
+
+type ReconfigureCluster_Task ReconfigureClusterRequestType
+
+func init() {
+	t["ReconfigureCluster_Task"] = reflect.TypeOf((*ReconfigureCluster_Task)(nil)).Elem()
+}
+
+type ReconfigureCluster_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ReconfigureComputeResourceRequestType struct {
+	This   ManagedObjectReference        `xml:"_this"`
+	Spec   BaseComputeResourceConfigSpec `xml:"spec,typeattr"`
+	Modify bool                          `xml:"modify"`
+}
+
+func init() {
+	t["ReconfigureComputeResourceRequestType"] = reflect.TypeOf((*ReconfigureComputeResourceRequestType)(nil)).Elem()
+}
+
+type ReconfigureComputeResource_Task ReconfigureComputeResourceRequestType
+
+func init() {
+	t["ReconfigureComputeResource_Task"] = reflect.TypeOf((*ReconfigureComputeResource_Task)(nil)).Elem()
+}
+
+type ReconfigureComputeResource_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ReconfigureDVPortRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Port []DVPortConfigSpec     `xml:"port"`
+}
+
+func init() {
+	t["ReconfigureDVPortRequestType"] = reflect.TypeOf((*ReconfigureDVPortRequestType)(nil)).Elem()
+}
+
+type ReconfigureDVPort_Task ReconfigureDVPortRequestType
+
+func init() {
+	t["ReconfigureDVPort_Task"] = reflect.TypeOf((*ReconfigureDVPort_Task)(nil)).Elem()
+}
+
+type ReconfigureDVPort_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ReconfigureDVPortgroupRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Spec DVPortgroupConfigSpec  `xml:"spec"`
+}
+
+func init() {
+	t["ReconfigureDVPortgroupRequestType"] = reflect.TypeOf((*ReconfigureDVPortgroupRequestType)(nil)).Elem()
+}
+
+type ReconfigureDVPortgroup_Task ReconfigureDVPortgroupRequestType
+
+func init() {
+	t["ReconfigureDVPortgroup_Task"] = reflect.TypeOf((*ReconfigureDVPortgroup_Task)(nil)).Elem()
+}
+
+type ReconfigureDVPortgroup_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ReconfigureDatacenterRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Spec   DatacenterConfigSpec   `xml:"spec"`
+	Modify bool                   `xml:"modify"`
+}
+
+func init() {
+	t["ReconfigureDatacenterRequestType"] = reflect.TypeOf((*ReconfigureDatacenterRequestType)(nil)).Elem()
+}
+
+type ReconfigureDatacenter_Task ReconfigureDatacenterRequestType
+
+func init() {
+	t["ReconfigureDatacenter_Task"] = reflect.TypeOf((*ReconfigureDatacenter_Task)(nil)).Elem()
+}
+
+type ReconfigureDatacenter_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ReconfigureDomObject ReconfigureDomObjectRequestType
+
+func init() {
+	t["ReconfigureDomObject"] = reflect.TypeOf((*ReconfigureDomObject)(nil)).Elem()
+}
+
+type ReconfigureDomObjectRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Uuid   string                 `xml:"uuid"`
+	Policy string                 `xml:"policy"`
+}
+
+func init() {
+	t["ReconfigureDomObjectRequestType"] = reflect.TypeOf((*ReconfigureDomObjectRequestType)(nil)).Elem()
+}
+
+type ReconfigureDomObjectResponse struct {
+}
+
+type ReconfigureDvsRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Spec BaseDVSConfigSpec      `xml:"spec,typeattr"`
+}
+
+func init() {
+	t["ReconfigureDvsRequestType"] = reflect.TypeOf((*ReconfigureDvsRequestType)(nil)).Elem()
+}
+
+type ReconfigureDvs_Task ReconfigureDvsRequestType
+
+func init() {
+	t["ReconfigureDvs_Task"] = reflect.TypeOf((*ReconfigureDvs_Task)(nil)).Elem()
+}
+
+type ReconfigureDvs_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ReconfigureHostForDASRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["ReconfigureHostForDASRequestType"] = reflect.TypeOf((*ReconfigureHostForDASRequestType)(nil)).Elem()
+}
+
+type ReconfigureHostForDAS_Task ReconfigureHostForDASRequestType
+
+func init() {
+	t["ReconfigureHostForDAS_Task"] = reflect.TypeOf((*ReconfigureHostForDAS_Task)(nil)).Elem()
+}
+
+type ReconfigureHostForDAS_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ReconfigureScheduledTask ReconfigureScheduledTaskRequestType
+
+func init() {
+	t["ReconfigureScheduledTask"] = reflect.TypeOf((*ReconfigureScheduledTask)(nil)).Elem()
+}
+
+type ReconfigureScheduledTaskRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Spec BaseScheduledTaskSpec  `xml:"spec,typeattr"`
+}
+
+func init() {
+	t["ReconfigureScheduledTaskRequestType"] = reflect.TypeOf((*ReconfigureScheduledTaskRequestType)(nil)).Elem()
+}
+
+type ReconfigureScheduledTaskResponse struct {
+}
+
+type ReconfigureServiceConsoleReservation ReconfigureServiceConsoleReservationRequestType
+
+func init() {
+	t["ReconfigureServiceConsoleReservation"] = reflect.TypeOf((*ReconfigureServiceConsoleReservation)(nil)).Elem()
+}
+
+type ReconfigureServiceConsoleReservationRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	CfgBytes int64                  `xml:"cfgBytes"`
+}
+
+func init() {
+	t["ReconfigureServiceConsoleReservationRequestType"] = reflect.TypeOf((*ReconfigureServiceConsoleReservationRequestType)(nil)).Elem()
+}
+
+type ReconfigureServiceConsoleReservationResponse struct {
+}
+
+type ReconfigureSnmpAgent ReconfigureSnmpAgentRequestType
+
+func init() {
+	t["ReconfigureSnmpAgent"] = reflect.TypeOf((*ReconfigureSnmpAgent)(nil)).Elem()
+}
+
+type ReconfigureSnmpAgentRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Spec HostSnmpConfigSpec     `xml:"spec"`
+}
+
+func init() {
+	t["ReconfigureSnmpAgentRequestType"] = reflect.TypeOf((*ReconfigureSnmpAgentRequestType)(nil)).Elem()
+}
+
+type ReconfigureSnmpAgentResponse struct {
+}
+
+type ReconfigureVirtualMachineReservation ReconfigureVirtualMachineReservationRequestType
+
+func init() {
+	t["ReconfigureVirtualMachineReservation"] = reflect.TypeOf((*ReconfigureVirtualMachineReservation)(nil)).Elem()
+}
+
+type ReconfigureVirtualMachineReservationRequestType struct {
+	This ManagedObjectReference              `xml:"_this"`
+	Spec VirtualMachineMemoryReservationSpec `xml:"spec"`
+}
+
+func init() {
+	t["ReconfigureVirtualMachineReservationRequestType"] = reflect.TypeOf((*ReconfigureVirtualMachineReservationRequestType)(nil)).Elem()
+}
+
+type ReconfigureVirtualMachineReservationResponse struct {
+}
+
+type ReconnectHostRequestType struct {
+	This          ManagedObjectReference   `xml:"_this"`
+	CnxSpec       *HostConnectSpec         `xml:"cnxSpec,omitempty"`
+	ReconnectSpec *HostSystemReconnectSpec `xml:"reconnectSpec,omitempty"`
+}
+
+func init() {
+	t["ReconnectHostRequestType"] = reflect.TypeOf((*ReconnectHostRequestType)(nil)).Elem()
+}
+
+type ReconnectHost_Task ReconnectHostRequestType
+
+func init() {
+	t["ReconnectHost_Task"] = reflect.TypeOf((*ReconnectHost_Task)(nil)).Elem()
+}
+
+type ReconnectHost_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type RecordReplayDisabled struct {
+	VimFault
+}
+
+func init() {
+	t["RecordReplayDisabled"] = reflect.TypeOf((*RecordReplayDisabled)(nil)).Elem()
+}
+
+type RecordReplayDisabledFault RecordReplayDisabled
+
+func init() {
+	t["RecordReplayDisabledFault"] = reflect.TypeOf((*RecordReplayDisabledFault)(nil)).Elem()
+}
+
+type RecoveryEvent struct {
+	DvsEvent
+
+	HostName string `xml:"hostName"`
+	PortKey  string `xml:"portKey"`
+	DvsUuid  string `xml:"dvsUuid,omitempty"`
+	Vnic     string `xml:"vnic,omitempty"`
+}
+
+func init() {
+	t["RecoveryEvent"] = reflect.TypeOf((*RecoveryEvent)(nil)).Elem()
+}
+
+type RectifyDvsHostRequestType struct {
+	This  ManagedObjectReference   `xml:"_this"`
+	Hosts []ManagedObjectReference `xml:"hosts,omitempty"`
+}
+
+func init() {
+	t["RectifyDvsHostRequestType"] = reflect.TypeOf((*RectifyDvsHostRequestType)(nil)).Elem()
+}
+
+type RectifyDvsHost_Task RectifyDvsHostRequestType
+
+func init() {
+	t["RectifyDvsHost_Task"] = reflect.TypeOf((*RectifyDvsHost_Task)(nil)).Elem()
+}
+
+type RectifyDvsHost_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type RectifyDvsOnHostRequestType struct {
+	This  ManagedObjectReference   `xml:"_this"`
+	Hosts []ManagedObjectReference `xml:"hosts"`
+}
+
+func init() {
+	t["RectifyDvsOnHostRequestType"] = reflect.TypeOf((*RectifyDvsOnHostRequestType)(nil)).Elem()
+}
+
+type RectifyDvsOnHost_Task RectifyDvsOnHostRequestType
+
+func init() {
+	t["RectifyDvsOnHost_Task"] = reflect.TypeOf((*RectifyDvsOnHost_Task)(nil)).Elem()
+}
+
+type RectifyDvsOnHost_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type RecurrentTaskScheduler struct {
+	TaskScheduler
+
+	Interval int32 `xml:"interval"`
+}
+
+func init() {
+	t["RecurrentTaskScheduler"] = reflect.TypeOf((*RecurrentTaskScheduler)(nil)).Elem()
+}
+
+type Refresh RefreshRequestType
+
+func init() {
+	t["Refresh"] = reflect.TypeOf((*Refresh)(nil)).Elem()
+}
+
+type RefreshDVPortState RefreshDVPortStateRequestType
+
+func init() {
+	t["RefreshDVPortState"] = reflect.TypeOf((*RefreshDVPortState)(nil)).Elem()
+}
+
+type RefreshDVPortStateRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	PortKeys []string               `xml:"portKeys,omitempty"`
+}
+
+func init() {
+	t["RefreshDVPortStateRequestType"] = reflect.TypeOf((*RefreshDVPortStateRequestType)(nil)).Elem()
+}
+
+type RefreshDVPortStateResponse struct {
+}
+
+type RefreshDatastore RefreshDatastoreRequestType
+
+func init() {
+	t["RefreshDatastore"] = reflect.TypeOf((*RefreshDatastore)(nil)).Elem()
+}
+
+type RefreshDatastoreRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RefreshDatastoreRequestType"] = reflect.TypeOf((*RefreshDatastoreRequestType)(nil)).Elem()
+}
+
+type RefreshDatastoreResponse struct {
+}
+
+type RefreshDatastoreStorageInfo RefreshDatastoreStorageInfoRequestType
+
+func init() {
+	t["RefreshDatastoreStorageInfo"] = reflect.TypeOf((*RefreshDatastoreStorageInfo)(nil)).Elem()
+}
+
+type RefreshDatastoreStorageInfoRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RefreshDatastoreStorageInfoRequestType"] = reflect.TypeOf((*RefreshDatastoreStorageInfoRequestType)(nil)).Elem()
+}
+
+type RefreshDatastoreStorageInfoResponse struct {
+}
+
+type RefreshDateTimeSystem RefreshDateTimeSystemRequestType
+
+func init() {
+	t["RefreshDateTimeSystem"] = reflect.TypeOf((*RefreshDateTimeSystem)(nil)).Elem()
+}
+
+type RefreshDateTimeSystemRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RefreshDateTimeSystemRequestType"] = reflect.TypeOf((*RefreshDateTimeSystemRequestType)(nil)).Elem()
+}
+
+type RefreshDateTimeSystemResponse struct {
+}
+
+type RefreshFirewall RefreshFirewallRequestType
+
+func init() {
+	t["RefreshFirewall"] = reflect.TypeOf((*RefreshFirewall)(nil)).Elem()
+}
+
+type RefreshFirewallRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RefreshFirewallRequestType"] = reflect.TypeOf((*RefreshFirewallRequestType)(nil)).Elem()
+}
+
+type RefreshFirewallResponse struct {
+}
+
+type RefreshGraphicsManager RefreshGraphicsManagerRequestType
+
+func init() {
+	t["RefreshGraphicsManager"] = reflect.TypeOf((*RefreshGraphicsManager)(nil)).Elem()
+}
+
+type RefreshGraphicsManagerRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RefreshGraphicsManagerRequestType"] = reflect.TypeOf((*RefreshGraphicsManagerRequestType)(nil)).Elem()
+}
+
+type RefreshGraphicsManagerResponse struct {
+}
+
+type RefreshHealthStatusSystem RefreshHealthStatusSystemRequestType
+
+func init() {
+	t["RefreshHealthStatusSystem"] = reflect.TypeOf((*RefreshHealthStatusSystem)(nil)).Elem()
+}
+
+type RefreshHealthStatusSystemRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RefreshHealthStatusSystemRequestType"] = reflect.TypeOf((*RefreshHealthStatusSystemRequestType)(nil)).Elem()
+}
+
+type RefreshHealthStatusSystemResponse struct {
+}
+
+type RefreshNetworkSystem RefreshNetworkSystemRequestType
+
+func init() {
+	t["RefreshNetworkSystem"] = reflect.TypeOf((*RefreshNetworkSystem)(nil)).Elem()
+}
+
+type RefreshNetworkSystemRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RefreshNetworkSystemRequestType"] = reflect.TypeOf((*RefreshNetworkSystemRequestType)(nil)).Elem()
+}
+
+type RefreshNetworkSystemResponse struct {
+}
+
+type RefreshRecommendation RefreshRecommendationRequestType
+
+func init() {
+	t["RefreshRecommendation"] = reflect.TypeOf((*RefreshRecommendation)(nil)).Elem()
+}
+
+type RefreshRecommendationRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RefreshRecommendationRequestType"] = reflect.TypeOf((*RefreshRecommendationRequestType)(nil)).Elem()
+}
+
+type RefreshRecommendationResponse struct {
+}
+
+type RefreshRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RefreshRequestType"] = reflect.TypeOf((*RefreshRequestType)(nil)).Elem()
+}
+
+type RefreshResponse struct {
+}
+
+type RefreshRuntime RefreshRuntimeRequestType
+
+func init() {
+	t["RefreshRuntime"] = reflect.TypeOf((*RefreshRuntime)(nil)).Elem()
+}
+
+type RefreshRuntimeRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RefreshRuntimeRequestType"] = reflect.TypeOf((*RefreshRuntimeRequestType)(nil)).Elem()
+}
+
+type RefreshRuntimeResponse struct {
+}
+
+type RefreshServices RefreshServicesRequestType
+
+func init() {
+	t["RefreshServices"] = reflect.TypeOf((*RefreshServices)(nil)).Elem()
+}
+
+type RefreshServicesRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RefreshServicesRequestType"] = reflect.TypeOf((*RefreshServicesRequestType)(nil)).Elem()
+}
+
+type RefreshServicesResponse struct {
+}
+
+type RefreshStorageDrsRecommendation RefreshStorageDrsRecommendationRequestType
+
+func init() {
+	t["RefreshStorageDrsRecommendation"] = reflect.TypeOf((*RefreshStorageDrsRecommendation)(nil)).Elem()
+}
+
+type RefreshStorageDrsRecommendationRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Pod  ManagedObjectReference `xml:"pod"`
+}
+
+func init() {
+	t["RefreshStorageDrsRecommendationRequestType"] = reflect.TypeOf((*RefreshStorageDrsRecommendationRequestType)(nil)).Elem()
+}
+
+type RefreshStorageDrsRecommendationResponse struct {
+}
+
+type RefreshStorageInfo RefreshStorageInfoRequestType
+
+func init() {
+	t["RefreshStorageInfo"] = reflect.TypeOf((*RefreshStorageInfo)(nil)).Elem()
+}
+
+type RefreshStorageInfoRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RefreshStorageInfoRequestType"] = reflect.TypeOf((*RefreshStorageInfoRequestType)(nil)).Elem()
+}
+
+type RefreshStorageInfoResponse struct {
+}
+
+type RefreshStorageSystem RefreshStorageSystemRequestType
+
+func init() {
+	t["RefreshStorageSystem"] = reflect.TypeOf((*RefreshStorageSystem)(nil)).Elem()
+}
+
+type RefreshStorageSystemRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RefreshStorageSystemRequestType"] = reflect.TypeOf((*RefreshStorageSystemRequestType)(nil)).Elem()
+}
+
+type RefreshStorageSystemResponse struct {
+}
+
+type RegisterChildVMRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Path string                  `xml:"path"`
+	Name string                  `xml:"name,omitempty"`
+	Host *ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["RegisterChildVMRequestType"] = reflect.TypeOf((*RegisterChildVMRequestType)(nil)).Elem()
+}
+
+type RegisterChildVM_Task RegisterChildVMRequestType
+
+func init() {
+	t["RegisterChildVM_Task"] = reflect.TypeOf((*RegisterChildVM_Task)(nil)).Elem()
+}
+
+type RegisterChildVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type RegisterDisk RegisterDiskRequestType
+
+func init() {
+	t["RegisterDisk"] = reflect.TypeOf((*RegisterDisk)(nil)).Elem()
+}
+
+type RegisterDiskRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Path string                 `xml:"path"`
+	Name string                 `xml:"name,omitempty"`
+}
+
+func init() {
+	t["RegisterDiskRequestType"] = reflect.TypeOf((*RegisterDiskRequestType)(nil)).Elem()
+}
+
+type RegisterDiskResponse struct {
+	Returnval VStorageObject `xml:"returnval"`
+}
+
+type RegisterExtension RegisterExtensionRequestType
+
+func init() {
+	t["RegisterExtension"] = reflect.TypeOf((*RegisterExtension)(nil)).Elem()
+}
+
+type RegisterExtensionRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Extension Extension              `xml:"extension"`
+}
+
+func init() {
+	t["RegisterExtensionRequestType"] = reflect.TypeOf((*RegisterExtensionRequestType)(nil)).Elem()
+}
+
+type RegisterExtensionResponse struct {
+}
+
+type RegisterHealthUpdateProvider RegisterHealthUpdateProviderRequestType
+
+func init() {
+	t["RegisterHealthUpdateProvider"] = reflect.TypeOf((*RegisterHealthUpdateProvider)(nil)).Elem()
+}
+
+type RegisterHealthUpdateProviderRequestType struct {
+	This             ManagedObjectReference `xml:"_this"`
+	Name             string                 `xml:"name"`
+	HealthUpdateInfo []HealthUpdateInfo     `xml:"healthUpdateInfo,omitempty"`
+}
+
+func init() {
+	t["RegisterHealthUpdateProviderRequestType"] = reflect.TypeOf((*RegisterHealthUpdateProviderRequestType)(nil)).Elem()
+}
+
+type RegisterHealthUpdateProviderResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type RegisterKmipServer RegisterKmipServerRequestType
+
+func init() {
+	t["RegisterKmipServer"] = reflect.TypeOf((*RegisterKmipServer)(nil)).Elem()
+}
+
+type RegisterKmipServerRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Server KmipServerSpec         `xml:"server"`
+}
+
+func init() {
+	t["RegisterKmipServerRequestType"] = reflect.TypeOf((*RegisterKmipServerRequestType)(nil)).Elem()
+}
+
+type RegisterKmipServerResponse struct {
+}
+
+type RegisterVMRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Path       string                  `xml:"path"`
+	Name       string                  `xml:"name,omitempty"`
+	AsTemplate bool                    `xml:"asTemplate"`
+	Pool       *ManagedObjectReference `xml:"pool,omitempty"`
+	Host       *ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["RegisterVMRequestType"] = reflect.TypeOf((*RegisterVMRequestType)(nil)).Elem()
+}
+
+type RegisterVM_Task RegisterVMRequestType
+
+func init() {
+	t["RegisterVM_Task"] = reflect.TypeOf((*RegisterVM_Task)(nil)).Elem()
+}
+
+type RegisterVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type Relation struct {
+	DynamicData
+
+	Constraint string `xml:"constraint,omitempty"`
+	Name       string `xml:"name"`
+	Version    string `xml:"version,omitempty"`
+}
+
+func init() {
+	t["Relation"] = reflect.TypeOf((*Relation)(nil)).Elem()
+}
+
+type ReleaseCredentialsInGuest ReleaseCredentialsInGuestRequestType
+
+func init() {
+	t["ReleaseCredentialsInGuest"] = reflect.TypeOf((*ReleaseCredentialsInGuest)(nil)).Elem()
+}
+
+type ReleaseCredentialsInGuestRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Vm   ManagedObjectReference  `xml:"vm"`
+	Auth BaseGuestAuthentication `xml:"auth,typeattr"`
+}
+
+func init() {
+	t["ReleaseCredentialsInGuestRequestType"] = reflect.TypeOf((*ReleaseCredentialsInGuestRequestType)(nil)).Elem()
+}
+
+type ReleaseCredentialsInGuestResponse struct {
+}
+
+type ReleaseIpAllocation ReleaseIpAllocationRequestType
+
+func init() {
+	t["ReleaseIpAllocation"] = reflect.TypeOf((*ReleaseIpAllocation)(nil)).Elem()
+}
+
+type ReleaseIpAllocationRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	Dc           ManagedObjectReference `xml:"dc"`
+	PoolId       int32                  `xml:"poolId"`
+	AllocationId string                 `xml:"allocationId"`
+}
+
+func init() {
+	t["ReleaseIpAllocationRequestType"] = reflect.TypeOf((*ReleaseIpAllocationRequestType)(nil)).Elem()
+}
+
+type ReleaseIpAllocationResponse struct {
+}
+
+type ReleaseManagedSnapshot ReleaseManagedSnapshotRequestType
+
+func init() {
+	t["ReleaseManagedSnapshot"] = reflect.TypeOf((*ReleaseManagedSnapshot)(nil)).Elem()
+}
+
+type ReleaseManagedSnapshotRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Vdisk      string                  `xml:"vdisk"`
+	Datacenter *ManagedObjectReference `xml:"datacenter,omitempty"`
+}
+
+func init() {
+	t["ReleaseManagedSnapshotRequestType"] = reflect.TypeOf((*ReleaseManagedSnapshotRequestType)(nil)).Elem()
+}
+
+type ReleaseManagedSnapshotResponse struct {
+}
+
+type Reload ReloadRequestType
+
+func init() {
+	t["Reload"] = reflect.TypeOf((*Reload)(nil)).Elem()
+}
+
+type ReloadRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["ReloadRequestType"] = reflect.TypeOf((*ReloadRequestType)(nil)).Elem()
+}
+
+type ReloadResponse struct {
+}
+
+type RelocateVMRequestType struct {
+	This     ManagedObjectReference     `xml:"_this"`
+	Spec     VirtualMachineRelocateSpec `xml:"spec"`
+	Priority VirtualMachineMovePriority `xml:"priority,omitempty"`
+}
+
+func init() {
+	t["RelocateVMRequestType"] = reflect.TypeOf((*RelocateVMRequestType)(nil)).Elem()
+}
+
+type RelocateVM_Task RelocateVMRequestType
+
+func init() {
+	t["RelocateVM_Task"] = reflect.TypeOf((*RelocateVM_Task)(nil)).Elem()
+}
+
+type RelocateVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type RelocateVStorageObjectRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Id        ID                     `xml:"id"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+	Spec      VslmRelocateSpec       `xml:"spec"`
+}
+
+func init() {
+	t["RelocateVStorageObjectRequestType"] = reflect.TypeOf((*RelocateVStorageObjectRequestType)(nil)).Elem()
+}
+
+type RelocateVStorageObject_Task RelocateVStorageObjectRequestType
+
+func init() {
+	t["RelocateVStorageObject_Task"] = reflect.TypeOf((*RelocateVStorageObject_Task)(nil)).Elem()
+}
+
+type RelocateVStorageObject_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type RemoteDeviceNotSupported struct {
+	DeviceNotSupported
+}
+
+func init() {
+	t["RemoteDeviceNotSupported"] = reflect.TypeOf((*RemoteDeviceNotSupported)(nil)).Elem()
+}
+
+type RemoteDeviceNotSupportedFault RemoteDeviceNotSupported
+
+func init() {
+	t["RemoteDeviceNotSupportedFault"] = reflect.TypeOf((*RemoteDeviceNotSupportedFault)(nil)).Elem()
+}
+
+type RemoteTSMEnabledEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["RemoteTSMEnabledEvent"] = reflect.TypeOf((*RemoteTSMEnabledEvent)(nil)).Elem()
+}
+
+type RemoveAlarm RemoveAlarmRequestType
+
+func init() {
+	t["RemoveAlarm"] = reflect.TypeOf((*RemoveAlarm)(nil)).Elem()
+}
+
+type RemoveAlarmRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RemoveAlarmRequestType"] = reflect.TypeOf((*RemoveAlarmRequestType)(nil)).Elem()
+}
+
+type RemoveAlarmResponse struct {
+}
+
+type RemoveAllSnapshotsRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	Consolidate *bool                  `xml:"consolidate"`
+}
+
+func init() {
+	t["RemoveAllSnapshotsRequestType"] = reflect.TypeOf((*RemoveAllSnapshotsRequestType)(nil)).Elem()
+}
+
+type RemoveAllSnapshots_Task RemoveAllSnapshotsRequestType
+
+func init() {
+	t["RemoveAllSnapshots_Task"] = reflect.TypeOf((*RemoveAllSnapshots_Task)(nil)).Elem()
+}
+
+type RemoveAllSnapshots_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type RemoveAssignedLicense RemoveAssignedLicenseRequestType
+
+func init() {
+	t["RemoveAssignedLicense"] = reflect.TypeOf((*RemoveAssignedLicense)(nil)).Elem()
+}
+
+type RemoveAssignedLicenseRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	EntityId string                 `xml:"entityId"`
+}
+
+func init() {
+	t["RemoveAssignedLicenseRequestType"] = reflect.TypeOf((*RemoveAssignedLicenseRequestType)(nil)).Elem()
+}
+
+type RemoveAssignedLicenseResponse struct {
+}
+
+type RemoveAuthorizationRole RemoveAuthorizationRoleRequestType
+
+func init() {
+	t["RemoveAuthorizationRole"] = reflect.TypeOf((*RemoveAuthorizationRole)(nil)).Elem()
+}
+
+type RemoveAuthorizationRoleRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	RoleId     int32                  `xml:"roleId"`
+	FailIfUsed bool                   `xml:"failIfUsed"`
+}
+
+func init() {
+	t["RemoveAuthorizationRoleRequestType"] = reflect.TypeOf((*RemoveAuthorizationRoleRequestType)(nil)).Elem()
+}
+
+type RemoveAuthorizationRoleResponse struct {
+}
+
+type RemoveCustomFieldDef RemoveCustomFieldDefRequestType
+
+func init() {
+	t["RemoveCustomFieldDef"] = reflect.TypeOf((*RemoveCustomFieldDef)(nil)).Elem()
+}
+
+type RemoveCustomFieldDefRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Key  int32                  `xml:"key"`
+}
+
+func init() {
+	t["RemoveCustomFieldDefRequestType"] = reflect.TypeOf((*RemoveCustomFieldDefRequestType)(nil)).Elem()
+}
+
+type RemoveCustomFieldDefResponse struct {
+}
+
+type RemoveDatastore RemoveDatastoreRequestType
+
+func init() {
+	t["RemoveDatastore"] = reflect.TypeOf((*RemoveDatastore)(nil)).Elem()
+}
+
+type RemoveDatastoreExRequestType struct {
+	This      ManagedObjectReference   `xml:"_this"`
+	Datastore []ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["RemoveDatastoreExRequestType"] = reflect.TypeOf((*RemoveDatastoreExRequestType)(nil)).Elem()
+}
+
+type RemoveDatastoreEx_Task RemoveDatastoreExRequestType
+
+func init() {
+	t["RemoveDatastoreEx_Task"] = reflect.TypeOf((*RemoveDatastoreEx_Task)(nil)).Elem()
+}
+
+type RemoveDatastoreEx_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type RemoveDatastoreRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["RemoveDatastoreRequestType"] = reflect.TypeOf((*RemoveDatastoreRequestType)(nil)).Elem()
+}
+
+type RemoveDatastoreResponse struct {
+}
+
+type RemoveDiskMappingRequestType struct {
+	This            ManagedObjectReference `xml:"_this"`
+	Mapping         []VsanHostDiskMapping  `xml:"mapping"`
+	MaintenanceSpec *HostMaintenanceSpec   `xml:"maintenanceSpec,omitempty"`
+	Timeout         int32                  `xml:"timeout,omitempty"`
+}
+
+func init() {
+	t["RemoveDiskMappingRequestType"] = reflect.TypeOf((*RemoveDiskMappingRequestType)(nil)).Elem()
+}
+
+type RemoveDiskMapping_Task RemoveDiskMappingRequestType
+
+func init() {
+	t["RemoveDiskMapping_Task"] = reflect.TypeOf((*RemoveDiskMapping_Task)(nil)).Elem()
+}
+
+type RemoveDiskMapping_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type RemoveDiskRequestType struct {
+	This            ManagedObjectReference `xml:"_this"`
+	Disk            []HostScsiDisk         `xml:"disk"`
+	MaintenanceSpec *HostMaintenanceSpec   `xml:"maintenanceSpec,omitempty"`
+	Timeout         int32                  `xml:"timeout,omitempty"`
+}
+
+func init() {
+	t["RemoveDiskRequestType"] = reflect.TypeOf((*RemoveDiskRequestType)(nil)).Elem()
+}
+
+type RemoveDisk_Task RemoveDiskRequestType
+
+func init() {
+	t["RemoveDisk_Task"] = reflect.TypeOf((*RemoveDisk_Task)(nil)).Elem()
+}
+
+type RemoveDisk_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type RemoveEntityPermission RemoveEntityPermissionRequestType
+
+func init() {
+	t["RemoveEntityPermission"] = reflect.TypeOf((*RemoveEntityPermission)(nil)).Elem()
+}
+
+type RemoveEntityPermissionRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Entity  ManagedObjectReference `xml:"entity"`
+	User    string                 `xml:"user"`
+	IsGroup bool                   `xml:"isGroup"`
+}
+
+func init() {
+	t["RemoveEntityPermissionRequestType"] = reflect.TypeOf((*RemoveEntityPermissionRequestType)(nil)).Elem()
+}
+
+type RemoveEntityPermissionResponse struct {
+}
+
+type RemoveFailed struct {
+	VimFault
+}
+
+func init() {
+	t["RemoveFailed"] = reflect.TypeOf((*RemoveFailed)(nil)).Elem()
+}
+
+type RemoveFailedFault RemoveFailed
+
+func init() {
+	t["RemoveFailedFault"] = reflect.TypeOf((*RemoveFailedFault)(nil)).Elem()
+}
+
+type RemoveFilter RemoveFilterRequestType
+
+func init() {
+	t["RemoveFilter"] = reflect.TypeOf((*RemoveFilter)(nil)).Elem()
+}
+
+type RemoveFilterEntities RemoveFilterEntitiesRequestType
+
+func init() {
+	t["RemoveFilterEntities"] = reflect.TypeOf((*RemoveFilterEntities)(nil)).Elem()
+}
+
+type RemoveFilterEntitiesRequestType struct {
+	This     ManagedObjectReference   `xml:"_this"`
+	FilterId string                   `xml:"filterId"`
+	Entities []ManagedObjectReference `xml:"entities,omitempty"`
+}
+
+func init() {
+	t["RemoveFilterEntitiesRequestType"] = reflect.TypeOf((*RemoveFilterEntitiesRequestType)(nil)).Elem()
+}
+
+type RemoveFilterEntitiesResponse struct {
+}
+
+type RemoveFilterRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	FilterId string                 `xml:"filterId"`
+}
+
+func init() {
+	t["RemoveFilterRequestType"] = reflect.TypeOf((*RemoveFilterRequestType)(nil)).Elem()
+}
+
+type RemoveFilterResponse struct {
+}
+
+type RemoveGroup RemoveGroupRequestType
+
+func init() {
+	t["RemoveGroup"] = reflect.TypeOf((*RemoveGroup)(nil)).Elem()
+}
+
+type RemoveGroupRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	GroupName string                 `xml:"groupName"`
+}
+
+func init() {
+	t["RemoveGroupRequestType"] = reflect.TypeOf((*RemoveGroupRequestType)(nil)).Elem()
+}
+
+type RemoveGroupResponse struct {
+}
+
+type RemoveGuestAlias RemoveGuestAliasRequestType
+
+func init() {
+	t["RemoveGuestAlias"] = reflect.TypeOf((*RemoveGuestAlias)(nil)).Elem()
+}
+
+type RemoveGuestAliasByCert RemoveGuestAliasByCertRequestType
+
+func init() {
+	t["RemoveGuestAliasByCert"] = reflect.TypeOf((*RemoveGuestAliasByCert)(nil)).Elem()
+}
+
+type RemoveGuestAliasByCertRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Vm         ManagedObjectReference  `xml:"vm"`
+	Auth       BaseGuestAuthentication `xml:"auth,typeattr"`
+	Username   string                  `xml:"username"`
+	Base64Cert string                  `xml:"base64Cert"`
+}
+
+func init() {
+	t["RemoveGuestAliasByCertRequestType"] = reflect.TypeOf((*RemoveGuestAliasByCertRequestType)(nil)).Elem()
+}
+
+type RemoveGuestAliasByCertResponse struct {
+}
+
+type RemoveGuestAliasRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Vm         ManagedObjectReference  `xml:"vm"`
+	Auth       BaseGuestAuthentication `xml:"auth,typeattr"`
+	Username   string                  `xml:"username"`
+	Base64Cert string                  `xml:"base64Cert"`
+	Subject    BaseGuestAuthSubject    `xml:"subject,typeattr"`
+}
+
+func init() {
+	t["RemoveGuestAliasRequestType"] = reflect.TypeOf((*RemoveGuestAliasRequestType)(nil)).Elem()
+}
+
+type RemoveGuestAliasResponse struct {
+}
+
+type RemoveInternetScsiSendTargets RemoveInternetScsiSendTargetsRequestType
+
+func init() {
+	t["RemoveInternetScsiSendTargets"] = reflect.TypeOf((*RemoveInternetScsiSendTargets)(nil)).Elem()
+}
+
+type RemoveInternetScsiSendTargetsRequestType struct {
+	This           ManagedObjectReference          `xml:"_this"`
+	IScsiHbaDevice string                          `xml:"iScsiHbaDevice"`
+	Targets        []HostInternetScsiHbaSendTarget `xml:"targets"`
+}
+
+func init() {
+	t["RemoveInternetScsiSendTargetsRequestType"] = reflect.TypeOf((*RemoveInternetScsiSendTargetsRequestType)(nil)).Elem()
+}
+
+type RemoveInternetScsiSendTargetsResponse struct {
+}
+
+type RemoveInternetScsiStaticTargets RemoveInternetScsiStaticTargetsRequestType
+
+func init() {
+	t["RemoveInternetScsiStaticTargets"] = reflect.TypeOf((*RemoveInternetScsiStaticTargets)(nil)).Elem()
+}
+
+type RemoveInternetScsiStaticTargetsRequestType struct {
+	This           ManagedObjectReference            `xml:"_this"`
+	IScsiHbaDevice string                            `xml:"iScsiHbaDevice"`
+	Targets        []HostInternetScsiHbaStaticTarget `xml:"targets"`
+}
+
+func init() {
+	t["RemoveInternetScsiStaticTargetsRequestType"] = reflect.TypeOf((*RemoveInternetScsiStaticTargetsRequestType)(nil)).Elem()
+}
+
+type RemoveInternetScsiStaticTargetsResponse struct {
+}
+
+type RemoveKey RemoveKeyRequestType
+
+func init() {
+	t["RemoveKey"] = reflect.TypeOf((*RemoveKey)(nil)).Elem()
+}
+
+type RemoveKeyRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Key   CryptoKeyId            `xml:"key"`
+	Force bool                   `xml:"force"`
+}
+
+func init() {
+	t["RemoveKeyRequestType"] = reflect.TypeOf((*RemoveKeyRequestType)(nil)).Elem()
+}
+
+type RemoveKeyResponse struct {
+}
+
+type RemoveKeys RemoveKeysRequestType
+
+func init() {
+	t["RemoveKeys"] = reflect.TypeOf((*RemoveKeys)(nil)).Elem()
+}
+
+type RemoveKeysRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Keys  []CryptoKeyId          `xml:"keys,omitempty"`
+	Force bool                   `xml:"force"`
+}
+
+func init() {
+	t["RemoveKeysRequestType"] = reflect.TypeOf((*RemoveKeysRequestType)(nil)).Elem()
+}
+
+type RemoveKeysResponse struct {
+	Returnval []CryptoKeyResult `xml:"returnval,omitempty"`
+}
+
+type RemoveKmipServer RemoveKmipServerRequestType
+
+func init() {
+	t["RemoveKmipServer"] = reflect.TypeOf((*RemoveKmipServer)(nil)).Elem()
+}
+
+type RemoveKmipServerRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	ClusterId  KeyProviderId          `xml:"clusterId"`
+	ServerName string                 `xml:"serverName"`
+}
+
+func init() {
+	t["RemoveKmipServerRequestType"] = reflect.TypeOf((*RemoveKmipServerRequestType)(nil)).Elem()
+}
+
+type RemoveKmipServerResponse struct {
+}
+
+type RemoveLicense RemoveLicenseRequestType
+
+func init() {
+	t["RemoveLicense"] = reflect.TypeOf((*RemoveLicense)(nil)).Elem()
+}
+
+type RemoveLicenseLabel RemoveLicenseLabelRequestType
+
+func init() {
+	t["RemoveLicenseLabel"] = reflect.TypeOf((*RemoveLicenseLabel)(nil)).Elem()
+}
+
+type RemoveLicenseLabelRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	LicenseKey string                 `xml:"licenseKey"`
+	LabelKey   string                 `xml:"labelKey"`
+}
+
+func init() {
+	t["RemoveLicenseLabelRequestType"] = reflect.TypeOf((*RemoveLicenseLabelRequestType)(nil)).Elem()
+}
+
+type RemoveLicenseLabelResponse struct {
+}
+
+type RemoveLicenseRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	LicenseKey string                 `xml:"licenseKey"`
+}
+
+func init() {
+	t["RemoveLicenseRequestType"] = reflect.TypeOf((*RemoveLicenseRequestType)(nil)).Elem()
+}
+
+type RemoveLicenseResponse struct {
+}
+
+type RemoveMonitoredEntities RemoveMonitoredEntitiesRequestType
+
+func init() {
+	t["RemoveMonitoredEntities"] = reflect.TypeOf((*RemoveMonitoredEntities)(nil)).Elem()
+}
+
+type RemoveMonitoredEntitiesRequestType struct {
+	This       ManagedObjectReference   `xml:"_this"`
+	ProviderId string                   `xml:"providerId"`
+	Entities   []ManagedObjectReference `xml:"entities,omitempty"`
+}
+
+func init() {
+	t["RemoveMonitoredEntitiesRequestType"] = reflect.TypeOf((*RemoveMonitoredEntitiesRequestType)(nil)).Elem()
+}
+
+type RemoveMonitoredEntitiesResponse struct {
+}
+
+type RemoveNetworkResourcePool RemoveNetworkResourcePoolRequestType
+
+func init() {
+	t["RemoveNetworkResourcePool"] = reflect.TypeOf((*RemoveNetworkResourcePool)(nil)).Elem()
+}
+
+type RemoveNetworkResourcePoolRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Key  []string               `xml:"key"`
+}
+
+func init() {
+	t["RemoveNetworkResourcePoolRequestType"] = reflect.TypeOf((*RemoveNetworkResourcePoolRequestType)(nil)).Elem()
+}
+
+type RemoveNetworkResourcePoolResponse struct {
+}
+
+type RemovePerfInterval RemovePerfIntervalRequestType
+
+func init() {
+	t["RemovePerfInterval"] = reflect.TypeOf((*RemovePerfInterval)(nil)).Elem()
+}
+
+type RemovePerfIntervalRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	SamplePeriod int32                  `xml:"samplePeriod"`
+}
+
+func init() {
+	t["RemovePerfIntervalRequestType"] = reflect.TypeOf((*RemovePerfIntervalRequestType)(nil)).Elem()
+}
+
+type RemovePerfIntervalResponse struct {
+}
+
+type RemovePortGroup RemovePortGroupRequestType
+
+func init() {
+	t["RemovePortGroup"] = reflect.TypeOf((*RemovePortGroup)(nil)).Elem()
+}
+
+type RemovePortGroupRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	PgName string                 `xml:"pgName"`
+}
+
+func init() {
+	t["RemovePortGroupRequestType"] = reflect.TypeOf((*RemovePortGroupRequestType)(nil)).Elem()
+}
+
+type RemovePortGroupResponse struct {
+}
+
+type RemoveScheduledTask RemoveScheduledTaskRequestType
+
+func init() {
+	t["RemoveScheduledTask"] = reflect.TypeOf((*RemoveScheduledTask)(nil)).Elem()
+}
+
+type RemoveScheduledTaskRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RemoveScheduledTaskRequestType"] = reflect.TypeOf((*RemoveScheduledTaskRequestType)(nil)).Elem()
+}
+
+type RemoveScheduledTaskResponse struct {
+}
+
+type RemoveServiceConsoleVirtualNic RemoveServiceConsoleVirtualNicRequestType
+
+func init() {
+	t["RemoveServiceConsoleVirtualNic"] = reflect.TypeOf((*RemoveServiceConsoleVirtualNic)(nil)).Elem()
+}
+
+type RemoveServiceConsoleVirtualNicRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Device string                 `xml:"device"`
+}
+
+func init() {
+	t["RemoveServiceConsoleVirtualNicRequestType"] = reflect.TypeOf((*RemoveServiceConsoleVirtualNicRequestType)(nil)).Elem()
+}
+
+type RemoveServiceConsoleVirtualNicResponse struct {
+}
+
+type RemoveSmartCardTrustAnchor RemoveSmartCardTrustAnchorRequestType
+
+func init() {
+	t["RemoveSmartCardTrustAnchor"] = reflect.TypeOf((*RemoveSmartCardTrustAnchor)(nil)).Elem()
+}
+
+type RemoveSmartCardTrustAnchorByFingerprint RemoveSmartCardTrustAnchorByFingerprintRequestType
+
+func init() {
+	t["RemoveSmartCardTrustAnchorByFingerprint"] = reflect.TypeOf((*RemoveSmartCardTrustAnchorByFingerprint)(nil)).Elem()
+}
+
+type RemoveSmartCardTrustAnchorByFingerprintRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	Fingerprint string                 `xml:"fingerprint"`
+	Digest      string                 `xml:"digest"`
+}
+
+func init() {
+	t["RemoveSmartCardTrustAnchorByFingerprintRequestType"] = reflect.TypeOf((*RemoveSmartCardTrustAnchorByFingerprintRequestType)(nil)).Elem()
+}
+
+type RemoveSmartCardTrustAnchorByFingerprintResponse struct {
+}
+
+type RemoveSmartCardTrustAnchorRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Issuer string                 `xml:"issuer"`
+	Serial string                 `xml:"serial"`
+}
+
+func init() {
+	t["RemoveSmartCardTrustAnchorRequestType"] = reflect.TypeOf((*RemoveSmartCardTrustAnchorRequestType)(nil)).Elem()
+}
+
+type RemoveSmartCardTrustAnchorResponse struct {
+}
+
+type RemoveSnapshotRequestType struct {
+	This           ManagedObjectReference `xml:"_this"`
+	RemoveChildren bool                   `xml:"removeChildren"`
+	Consolidate    *bool                  `xml:"consolidate"`
+}
+
+func init() {
+	t["RemoveSnapshotRequestType"] = reflect.TypeOf((*RemoveSnapshotRequestType)(nil)).Elem()
+}
+
+type RemoveSnapshot_Task RemoveSnapshotRequestType
+
+func init() {
+	t["RemoveSnapshot_Task"] = reflect.TypeOf((*RemoveSnapshot_Task)(nil)).Elem()
+}
+
+type RemoveSnapshot_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type RemoveUser RemoveUserRequestType
+
+func init() {
+	t["RemoveUser"] = reflect.TypeOf((*RemoveUser)(nil)).Elem()
+}
+
+type RemoveUserRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	UserName string                 `xml:"userName"`
+}
+
+func init() {
+	t["RemoveUserRequestType"] = reflect.TypeOf((*RemoveUserRequestType)(nil)).Elem()
+}
+
+type RemoveUserResponse struct {
+}
+
+type RemoveVirtualNic RemoveVirtualNicRequestType
+
+func init() {
+	t["RemoveVirtualNic"] = reflect.TypeOf((*RemoveVirtualNic)(nil)).Elem()
+}
+
+type RemoveVirtualNicRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Device string                 `xml:"device"`
+}
+
+func init() {
+	t["RemoveVirtualNicRequestType"] = reflect.TypeOf((*RemoveVirtualNicRequestType)(nil)).Elem()
+}
+
+type RemoveVirtualNicResponse struct {
+}
+
+type RemoveVirtualSwitch RemoveVirtualSwitchRequestType
+
+func init() {
+	t["RemoveVirtualSwitch"] = reflect.TypeOf((*RemoveVirtualSwitch)(nil)).Elem()
+}
+
+type RemoveVirtualSwitchRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	VswitchName string                 `xml:"vswitchName"`
+}
+
+func init() {
+	t["RemoveVirtualSwitchRequestType"] = reflect.TypeOf((*RemoveVirtualSwitchRequestType)(nil)).Elem()
+}
+
+type RemoveVirtualSwitchResponse struct {
+}
+
+type RenameCustomFieldDef RenameCustomFieldDefRequestType
+
+func init() {
+	t["RenameCustomFieldDef"] = reflect.TypeOf((*RenameCustomFieldDef)(nil)).Elem()
+}
+
+type RenameCustomFieldDefRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Key  int32                  `xml:"key"`
+	Name string                 `xml:"name"`
+}
+
+func init() {
+	t["RenameCustomFieldDefRequestType"] = reflect.TypeOf((*RenameCustomFieldDefRequestType)(nil)).Elem()
+}
+
+type RenameCustomFieldDefResponse struct {
+}
+
+type RenameCustomizationSpec RenameCustomizationSpecRequestType
+
+func init() {
+	t["RenameCustomizationSpec"] = reflect.TypeOf((*RenameCustomizationSpec)(nil)).Elem()
+}
+
+type RenameCustomizationSpecRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Name    string                 `xml:"name"`
+	NewName string                 `xml:"newName"`
+}
+
+func init() {
+	t["RenameCustomizationSpecRequestType"] = reflect.TypeOf((*RenameCustomizationSpecRequestType)(nil)).Elem()
+}
+
+type RenameCustomizationSpecResponse struct {
+}
+
+type RenameDatastore RenameDatastoreRequestType
+
+func init() {
+	t["RenameDatastore"] = reflect.TypeOf((*RenameDatastore)(nil)).Elem()
+}
+
+type RenameDatastoreRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	NewName string                 `xml:"newName"`
+}
+
+func init() {
+	t["RenameDatastoreRequestType"] = reflect.TypeOf((*RenameDatastoreRequestType)(nil)).Elem()
+}
+
+type RenameDatastoreResponse struct {
+}
+
+type RenameRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	NewName string                 `xml:"newName"`
+}
+
+func init() {
+	t["RenameRequestType"] = reflect.TypeOf((*RenameRequestType)(nil)).Elem()
+}
+
+type RenameSnapshot RenameSnapshotRequestType
+
+func init() {
+	t["RenameSnapshot"] = reflect.TypeOf((*RenameSnapshot)(nil)).Elem()
+}
+
+type RenameSnapshotRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	Name        string                 `xml:"name,omitempty"`
+	Description string                 `xml:"description,omitempty"`
+}
+
+func init() {
+	t["RenameSnapshotRequestType"] = reflect.TypeOf((*RenameSnapshotRequestType)(nil)).Elem()
+}
+
+type RenameSnapshotResponse struct {
+}
+
+type RenameVStorageObject RenameVStorageObjectRequestType
+
+func init() {
+	t["RenameVStorageObject"] = reflect.TypeOf((*RenameVStorageObject)(nil)).Elem()
+}
+
+type RenameVStorageObjectRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Id        ID                     `xml:"id"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+	Name      string                 `xml:"name"`
+}
+
+func init() {
+	t["RenameVStorageObjectRequestType"] = reflect.TypeOf((*RenameVStorageObjectRequestType)(nil)).Elem()
+}
+
+type RenameVStorageObjectResponse struct {
+}
+
+type Rename_Task RenameRequestType
+
+func init() {
+	t["Rename_Task"] = reflect.TypeOf((*Rename_Task)(nil)).Elem()
+}
+
+type Rename_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ReplaceCACertificatesAndCRLs ReplaceCACertificatesAndCRLsRequestType
+
+func init() {
+	t["ReplaceCACertificatesAndCRLs"] = reflect.TypeOf((*ReplaceCACertificatesAndCRLs)(nil)).Elem()
+}
+
+type ReplaceCACertificatesAndCRLsRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	CaCert []string               `xml:"caCert"`
+	CaCrl  []string               `xml:"caCrl,omitempty"`
+}
+
+func init() {
+	t["ReplaceCACertificatesAndCRLsRequestType"] = reflect.TypeOf((*ReplaceCACertificatesAndCRLsRequestType)(nil)).Elem()
+}
+
+type ReplaceCACertificatesAndCRLsResponse struct {
+}
+
+type ReplaceSmartCardTrustAnchors ReplaceSmartCardTrustAnchorsRequestType
+
+func init() {
+	t["ReplaceSmartCardTrustAnchors"] = reflect.TypeOf((*ReplaceSmartCardTrustAnchors)(nil)).Elem()
+}
+
+type ReplaceSmartCardTrustAnchorsRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Certs []string               `xml:"certs,omitempty"`
+}
+
+func init() {
+	t["ReplaceSmartCardTrustAnchorsRequestType"] = reflect.TypeOf((*ReplaceSmartCardTrustAnchorsRequestType)(nil)).Elem()
+}
+
+type ReplaceSmartCardTrustAnchorsResponse struct {
+}
+
+type ReplicationConfigFault struct {
+	ReplicationFault
+}
+
+func init() {
+	t["ReplicationConfigFault"] = reflect.TypeOf((*ReplicationConfigFault)(nil)).Elem()
+}
+
+type ReplicationConfigFaultFault BaseReplicationConfigFault
+
+func init() {
+	t["ReplicationConfigFaultFault"] = reflect.TypeOf((*ReplicationConfigFaultFault)(nil)).Elem()
+}
+
+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"`
+}
+
+func init() {
+	t["ReplicationConfigSpec"] = reflect.TypeOf((*ReplicationConfigSpec)(nil)).Elem()
+}
+
+type ReplicationDiskConfigFault struct {
+	ReplicationConfigFault
+
+	Reason string                  `xml:"reason,omitempty"`
+	VmRef  *ManagedObjectReference `xml:"vmRef,omitempty"`
+	Key    int32                   `xml:"key,omitempty"`
+}
+
+func init() {
+	t["ReplicationDiskConfigFault"] = reflect.TypeOf((*ReplicationDiskConfigFault)(nil)).Elem()
+}
+
+type ReplicationDiskConfigFaultFault ReplicationDiskConfigFault
+
+func init() {
+	t["ReplicationDiskConfigFaultFault"] = reflect.TypeOf((*ReplicationDiskConfigFaultFault)(nil)).Elem()
+}
+
+type ReplicationFault struct {
+	VimFault
+}
+
+func init() {
+	t["ReplicationFault"] = reflect.TypeOf((*ReplicationFault)(nil)).Elem()
+}
+
+type ReplicationFaultFault BaseReplicationFault
+
+func init() {
+	t["ReplicationFaultFault"] = reflect.TypeOf((*ReplicationFaultFault)(nil)).Elem()
+}
+
+type ReplicationGroupId struct {
+	DynamicData
+
+	FaultDomainId FaultDomainId `xml:"faultDomainId"`
+	DeviceGroupId DeviceGroupId `xml:"deviceGroupId"`
+}
+
+func init() {
+	t["ReplicationGroupId"] = reflect.TypeOf((*ReplicationGroupId)(nil)).Elem()
+}
+
+type ReplicationIncompatibleWithFT struct {
+	ReplicationFault
+}
+
+func init() {
+	t["ReplicationIncompatibleWithFT"] = reflect.TypeOf((*ReplicationIncompatibleWithFT)(nil)).Elem()
+}
+
+type ReplicationIncompatibleWithFTFault ReplicationIncompatibleWithFT
+
+func init() {
+	t["ReplicationIncompatibleWithFTFault"] = reflect.TypeOf((*ReplicationIncompatibleWithFTFault)(nil)).Elem()
+}
+
+type ReplicationInfoDiskSettings struct {
+	DynamicData
+
+	Key               int32  `xml:"key"`
+	DiskReplicationId string `xml:"diskReplicationId"`
+}
+
+func init() {
+	t["ReplicationInfoDiskSettings"] = reflect.TypeOf((*ReplicationInfoDiskSettings)(nil)).Elem()
+}
+
+type ReplicationInvalidOptions struct {
+	ReplicationFault
+
+	Options string                  `xml:"options"`
+	Entity  *ManagedObjectReference `xml:"entity,omitempty"`
+}
+
+func init() {
+	t["ReplicationInvalidOptions"] = reflect.TypeOf((*ReplicationInvalidOptions)(nil)).Elem()
+}
+
+type ReplicationInvalidOptionsFault ReplicationInvalidOptions
+
+func init() {
+	t["ReplicationInvalidOptionsFault"] = reflect.TypeOf((*ReplicationInvalidOptionsFault)(nil)).Elem()
+}
+
+type ReplicationNotSupportedOnHost struct {
+	ReplicationFault
+}
+
+func init() {
+	t["ReplicationNotSupportedOnHost"] = reflect.TypeOf((*ReplicationNotSupportedOnHost)(nil)).Elem()
+}
+
+type ReplicationNotSupportedOnHostFault ReplicationNotSupportedOnHost
+
+func init() {
+	t["ReplicationNotSupportedOnHostFault"] = reflect.TypeOf((*ReplicationNotSupportedOnHostFault)(nil)).Elem()
+}
+
+type ReplicationSpec struct {
+	DynamicData
+
+	ReplicationGroupId ReplicationGroupId `xml:"replicationGroupId"`
+}
+
+func init() {
+	t["ReplicationSpec"] = reflect.TypeOf((*ReplicationSpec)(nil)).Elem()
+}
+
+type ReplicationVmConfigFault struct {
+	ReplicationConfigFault
+
+	Reason string                  `xml:"reason,omitempty"`
+	VmRef  *ManagedObjectReference `xml:"vmRef,omitempty"`
+}
+
+func init() {
+	t["ReplicationVmConfigFault"] = reflect.TypeOf((*ReplicationVmConfigFault)(nil)).Elem()
+}
+
+type ReplicationVmConfigFaultFault ReplicationVmConfigFault
+
+func init() {
+	t["ReplicationVmConfigFaultFault"] = reflect.TypeOf((*ReplicationVmConfigFaultFault)(nil)).Elem()
+}
+
+type ReplicationVmFault struct {
+	ReplicationFault
+
+	Reason     string                  `xml:"reason,omitempty"`
+	State      string                  `xml:"state,omitempty"`
+	InstanceId string                  `xml:"instanceId,omitempty"`
+	Vm         *ManagedObjectReference `xml:"vm,omitempty"`
+}
+
+func init() {
+	t["ReplicationVmFault"] = reflect.TypeOf((*ReplicationVmFault)(nil)).Elem()
+}
+
+type ReplicationVmFaultFault BaseReplicationVmFault
+
+func init() {
+	t["ReplicationVmFaultFault"] = reflect.TypeOf((*ReplicationVmFaultFault)(nil)).Elem()
+}
+
+type ReplicationVmInProgressFault struct {
+	ReplicationVmFault
+
+	RequestedActivity  string `xml:"requestedActivity"`
+	InProgressActivity string `xml:"inProgressActivity"`
+}
+
+func init() {
+	t["ReplicationVmInProgressFault"] = reflect.TypeOf((*ReplicationVmInProgressFault)(nil)).Elem()
+}
+
+type ReplicationVmInProgressFaultFault ReplicationVmInProgressFault
+
+func init() {
+	t["ReplicationVmInProgressFaultFault"] = reflect.TypeOf((*ReplicationVmInProgressFaultFault)(nil)).Elem()
+}
+
+type ReplicationVmProgressInfo struct {
+	DynamicData
+
+	Progress              int32 `xml:"progress"`
+	BytesTransferred      int64 `xml:"bytesTransferred"`
+	BytesToTransfer       int64 `xml:"bytesToTransfer"`
+	ChecksumTotalBytes    int64 `xml:"checksumTotalBytes,omitempty"`
+	ChecksumComparedBytes int64 `xml:"checksumComparedBytes,omitempty"`
+}
+
+func init() {
+	t["ReplicationVmProgressInfo"] = reflect.TypeOf((*ReplicationVmProgressInfo)(nil)).Elem()
+}
+
+type RequestCanceled struct {
+	RuntimeFault
+}
+
+func init() {
+	t["RequestCanceled"] = reflect.TypeOf((*RequestCanceled)(nil)).Elem()
+}
+
+type RequestCanceledFault RequestCanceled
+
+func init() {
+	t["RequestCanceledFault"] = reflect.TypeOf((*RequestCanceledFault)(nil)).Elem()
+}
+
+type RescanAllHba RescanAllHbaRequestType
+
+func init() {
+	t["RescanAllHba"] = reflect.TypeOf((*RescanAllHba)(nil)).Elem()
+}
+
+type RescanAllHbaRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RescanAllHbaRequestType"] = reflect.TypeOf((*RescanAllHbaRequestType)(nil)).Elem()
+}
+
+type RescanAllHbaResponse struct {
+}
+
+type RescanHba RescanHbaRequestType
+
+func init() {
+	t["RescanHba"] = reflect.TypeOf((*RescanHba)(nil)).Elem()
+}
+
+type RescanHbaRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	HbaDevice string                 `xml:"hbaDevice"`
+}
+
+func init() {
+	t["RescanHbaRequestType"] = reflect.TypeOf((*RescanHbaRequestType)(nil)).Elem()
+}
+
+type RescanHbaResponse struct {
+}
+
+type RescanVffs RescanVffsRequestType
+
+func init() {
+	t["RescanVffs"] = reflect.TypeOf((*RescanVffs)(nil)).Elem()
+}
+
+type RescanVffsRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RescanVffsRequestType"] = reflect.TypeOf((*RescanVffsRequestType)(nil)).Elem()
+}
+
+type RescanVffsResponse struct {
+}
+
+type RescanVmfs RescanVmfsRequestType
+
+func init() {
+	t["RescanVmfs"] = reflect.TypeOf((*RescanVmfs)(nil)).Elem()
+}
+
+type RescanVmfsRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RescanVmfsRequestType"] = reflect.TypeOf((*RescanVmfsRequestType)(nil)).Elem()
+}
+
+type RescanVmfsResponse struct {
+}
+
+type ResetCollector ResetCollectorRequestType
+
+func init() {
+	t["ResetCollector"] = reflect.TypeOf((*ResetCollector)(nil)).Elem()
+}
+
+type ResetCollectorRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["ResetCollectorRequestType"] = reflect.TypeOf((*ResetCollectorRequestType)(nil)).Elem()
+}
+
+type ResetCollectorResponse struct {
+}
+
+type ResetCounterLevelMapping ResetCounterLevelMappingRequestType
+
+func init() {
+	t["ResetCounterLevelMapping"] = reflect.TypeOf((*ResetCounterLevelMapping)(nil)).Elem()
+}
+
+type ResetCounterLevelMappingRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	Counters []int32                `xml:"counters"`
+}
+
+func init() {
+	t["ResetCounterLevelMappingRequestType"] = reflect.TypeOf((*ResetCounterLevelMappingRequestType)(nil)).Elem()
+}
+
+type ResetCounterLevelMappingResponse struct {
+}
+
+type ResetEntityPermissions ResetEntityPermissionsRequestType
+
+func init() {
+	t["ResetEntityPermissions"] = reflect.TypeOf((*ResetEntityPermissions)(nil)).Elem()
+}
+
+type ResetEntityPermissionsRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	Entity     ManagedObjectReference `xml:"entity"`
+	Permission []Permission           `xml:"permission,omitempty"`
+}
+
+func init() {
+	t["ResetEntityPermissionsRequestType"] = reflect.TypeOf((*ResetEntityPermissionsRequestType)(nil)).Elem()
+}
+
+type ResetEntityPermissionsResponse struct {
+}
+
+type ResetFirmwareToFactoryDefaults ResetFirmwareToFactoryDefaultsRequestType
+
+func init() {
+	t["ResetFirmwareToFactoryDefaults"] = reflect.TypeOf((*ResetFirmwareToFactoryDefaults)(nil)).Elem()
+}
+
+type ResetFirmwareToFactoryDefaultsRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["ResetFirmwareToFactoryDefaultsRequestType"] = reflect.TypeOf((*ResetFirmwareToFactoryDefaultsRequestType)(nil)).Elem()
+}
+
+type ResetFirmwareToFactoryDefaultsResponse struct {
+}
+
+type ResetGuestInformation ResetGuestInformationRequestType
+
+func init() {
+	t["ResetGuestInformation"] = reflect.TypeOf((*ResetGuestInformation)(nil)).Elem()
+}
+
+type ResetGuestInformationRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["ResetGuestInformationRequestType"] = reflect.TypeOf((*ResetGuestInformationRequestType)(nil)).Elem()
+}
+
+type ResetGuestInformationResponse struct {
+}
+
+type ResetListView ResetListViewRequestType
+
+func init() {
+	t["ResetListView"] = reflect.TypeOf((*ResetListView)(nil)).Elem()
+}
+
+type ResetListViewFromView ResetListViewFromViewRequestType
+
+func init() {
+	t["ResetListViewFromView"] = reflect.TypeOf((*ResetListViewFromView)(nil)).Elem()
+}
+
+type ResetListViewFromViewRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	View ManagedObjectReference `xml:"view"`
+}
+
+func init() {
+	t["ResetListViewFromViewRequestType"] = reflect.TypeOf((*ResetListViewFromViewRequestType)(nil)).Elem()
+}
+
+type ResetListViewFromViewResponse struct {
+}
+
+type ResetListViewRequestType struct {
+	This ManagedObjectReference   `xml:"_this"`
+	Obj  []ManagedObjectReference `xml:"obj,omitempty"`
+}
+
+func init() {
+	t["ResetListViewRequestType"] = reflect.TypeOf((*ResetListViewRequestType)(nil)).Elem()
+}
+
+type ResetListViewResponse struct {
+	Returnval []ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type ResetSystemHealthInfo ResetSystemHealthInfoRequestType
+
+func init() {
+	t["ResetSystemHealthInfo"] = reflect.TypeOf((*ResetSystemHealthInfo)(nil)).Elem()
+}
+
+type ResetSystemHealthInfoRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["ResetSystemHealthInfoRequestType"] = reflect.TypeOf((*ResetSystemHealthInfoRequestType)(nil)).Elem()
+}
+
+type ResetSystemHealthInfoResponse struct {
+}
+
+type ResetVMRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["ResetVMRequestType"] = reflect.TypeOf((*ResetVMRequestType)(nil)).Elem()
+}
+
+type ResetVM_Task ResetVMRequestType
+
+func init() {
+	t["ResetVM_Task"] = reflect.TypeOf((*ResetVM_Task)(nil)).Elem()
+}
+
+type ResetVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ResignatureUnresolvedVmfsVolumeRequestType struct {
+	This           ManagedObjectReference            `xml:"_this"`
+	ResolutionSpec HostUnresolvedVmfsResignatureSpec `xml:"resolutionSpec"`
+}
+
+func init() {
+	t["ResignatureUnresolvedVmfsVolumeRequestType"] = reflect.TypeOf((*ResignatureUnresolvedVmfsVolumeRequestType)(nil)).Elem()
+}
+
+type ResignatureUnresolvedVmfsVolume_Task ResignatureUnresolvedVmfsVolumeRequestType
+
+func init() {
+	t["ResignatureUnresolvedVmfsVolume_Task"] = reflect.TypeOf((*ResignatureUnresolvedVmfsVolume_Task)(nil)).Elem()
+}
+
+type ResignatureUnresolvedVmfsVolume_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ResolveInstallationErrorsOnClusterRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	FilterId string                 `xml:"filterId"`
+	Cluster  ManagedObjectReference `xml:"cluster"`
+}
+
+func init() {
+	t["ResolveInstallationErrorsOnClusterRequestType"] = reflect.TypeOf((*ResolveInstallationErrorsOnClusterRequestType)(nil)).Elem()
+}
+
+type ResolveInstallationErrorsOnCluster_Task ResolveInstallationErrorsOnClusterRequestType
+
+func init() {
+	t["ResolveInstallationErrorsOnCluster_Task"] = reflect.TypeOf((*ResolveInstallationErrorsOnCluster_Task)(nil)).Elem()
+}
+
+type ResolveInstallationErrorsOnCluster_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ResolveInstallationErrorsOnHostRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	FilterId string                 `xml:"filterId"`
+	Host     ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["ResolveInstallationErrorsOnHostRequestType"] = reflect.TypeOf((*ResolveInstallationErrorsOnHostRequestType)(nil)).Elem()
+}
+
+type ResolveInstallationErrorsOnHost_Task ResolveInstallationErrorsOnHostRequestType
+
+func init() {
+	t["ResolveInstallationErrorsOnHost_Task"] = reflect.TypeOf((*ResolveInstallationErrorsOnHost_Task)(nil)).Elem()
+}
+
+type ResolveInstallationErrorsOnHost_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ResolveMultipleUnresolvedVmfsVolumes ResolveMultipleUnresolvedVmfsVolumesRequestType
+
+func init() {
+	t["ResolveMultipleUnresolvedVmfsVolumes"] = reflect.TypeOf((*ResolveMultipleUnresolvedVmfsVolumes)(nil)).Elem()
+}
+
+type ResolveMultipleUnresolvedVmfsVolumesExRequestType struct {
+	This           ManagedObjectReference             `xml:"_this"`
+	ResolutionSpec []HostUnresolvedVmfsResolutionSpec `xml:"resolutionSpec"`
+}
+
+func init() {
+	t["ResolveMultipleUnresolvedVmfsVolumesExRequestType"] = reflect.TypeOf((*ResolveMultipleUnresolvedVmfsVolumesExRequestType)(nil)).Elem()
+}
+
+type ResolveMultipleUnresolvedVmfsVolumesEx_Task ResolveMultipleUnresolvedVmfsVolumesExRequestType
+
+func init() {
+	t["ResolveMultipleUnresolvedVmfsVolumesEx_Task"] = reflect.TypeOf((*ResolveMultipleUnresolvedVmfsVolumesEx_Task)(nil)).Elem()
+}
+
+type ResolveMultipleUnresolvedVmfsVolumesEx_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ResolveMultipleUnresolvedVmfsVolumesRequestType struct {
+	This           ManagedObjectReference             `xml:"_this"`
+	ResolutionSpec []HostUnresolvedVmfsResolutionSpec `xml:"resolutionSpec"`
+}
+
+func init() {
+	t["ResolveMultipleUnresolvedVmfsVolumesRequestType"] = reflect.TypeOf((*ResolveMultipleUnresolvedVmfsVolumesRequestType)(nil)).Elem()
+}
+
+type ResolveMultipleUnresolvedVmfsVolumesResponse struct {
+	Returnval []HostUnresolvedVmfsResolutionResult `xml:"returnval,omitempty"`
+}
+
+type ResourceAllocationInfo struct {
+	DynamicData
+
+	Reservation           int64       `xml:"reservation,omitempty"`
+	ExpandableReservation *bool       `xml:"expandableReservation"`
+	Limit                 int64       `xml:"limit,omitempty"`
+	Shares                *SharesInfo `xml:"shares,omitempty"`
+	OverheadLimit         int64       `xml:"overheadLimit,omitempty"`
+}
+
+func init() {
+	t["ResourceAllocationInfo"] = reflect.TypeOf((*ResourceAllocationInfo)(nil)).Elem()
+}
+
+type ResourceAllocationOption struct {
+	DynamicData
+
+	SharesOption SharesOption `xml:"sharesOption"`
+}
+
+func init() {
+	t["ResourceAllocationOption"] = reflect.TypeOf((*ResourceAllocationOption)(nil)).Elem()
+}
+
+type ResourceConfigOption struct {
+	DynamicData
+
+	CpuAllocationOption    ResourceAllocationOption `xml:"cpuAllocationOption"`
+	MemoryAllocationOption ResourceAllocationOption `xml:"memoryAllocationOption"`
+}
+
+func init() {
+	t["ResourceConfigOption"] = reflect.TypeOf((*ResourceConfigOption)(nil)).Elem()
+}
+
+type ResourceConfigSpec struct {
+	DynamicData
+
+	Entity           *ManagedObjectReference    `xml:"entity,omitempty"`
+	ChangeVersion    string                     `xml:"changeVersion,omitempty"`
+	LastModified     *time.Time                 `xml:"lastModified"`
+	CpuAllocation    BaseResourceAllocationInfo `xml:"cpuAllocation,typeattr"`
+	MemoryAllocation BaseResourceAllocationInfo `xml:"memoryAllocation,typeattr"`
+}
+
+func init() {
+	t["ResourceConfigSpec"] = reflect.TypeOf((*ResourceConfigSpec)(nil)).Elem()
+}
+
+type ResourceInUse struct {
+	VimFault
+
+	Type string `xml:"type,omitempty"`
+	Name string `xml:"name,omitempty"`
+}
+
+func init() {
+	t["ResourceInUse"] = reflect.TypeOf((*ResourceInUse)(nil)).Elem()
+}
+
+type ResourceInUseFault BaseResourceInUse
+
+func init() {
+	t["ResourceInUseFault"] = reflect.TypeOf((*ResourceInUseFault)(nil)).Elem()
+}
+
+type ResourceNotAvailable struct {
+	VimFault
+
+	ContainerType string `xml:"containerType,omitempty"`
+	ContainerName string `xml:"containerName,omitempty"`
+	Type          string `xml:"type,omitempty"`
+}
+
+func init() {
+	t["ResourceNotAvailable"] = reflect.TypeOf((*ResourceNotAvailable)(nil)).Elem()
+}
+
+type ResourceNotAvailableFault ResourceNotAvailable
+
+func init() {
+	t["ResourceNotAvailableFault"] = reflect.TypeOf((*ResourceNotAvailableFault)(nil)).Elem()
+}
+
+type ResourcePoolCreatedEvent struct {
+	ResourcePoolEvent
+
+	Parent ResourcePoolEventArgument `xml:"parent"`
+}
+
+func init() {
+	t["ResourcePoolCreatedEvent"] = reflect.TypeOf((*ResourcePoolCreatedEvent)(nil)).Elem()
+}
+
+type ResourcePoolDestroyedEvent struct {
+	ResourcePoolEvent
+}
+
+func init() {
+	t["ResourcePoolDestroyedEvent"] = reflect.TypeOf((*ResourcePoolDestroyedEvent)(nil)).Elem()
+}
+
+type ResourcePoolEvent struct {
+	Event
+
+	ResourcePool ResourcePoolEventArgument `xml:"resourcePool"`
+}
+
+func init() {
+	t["ResourcePoolEvent"] = reflect.TypeOf((*ResourcePoolEvent)(nil)).Elem()
+}
+
+type ResourcePoolEventArgument struct {
+	EntityEventArgument
+
+	ResourcePool ManagedObjectReference `xml:"resourcePool"`
+}
+
+func init() {
+	t["ResourcePoolEventArgument"] = reflect.TypeOf((*ResourcePoolEventArgument)(nil)).Elem()
+}
+
+type ResourcePoolMovedEvent struct {
+	ResourcePoolEvent
+
+	OldParent ResourcePoolEventArgument `xml:"oldParent"`
+	NewParent ResourcePoolEventArgument `xml:"newParent"`
+}
+
+func init() {
+	t["ResourcePoolMovedEvent"] = reflect.TypeOf((*ResourcePoolMovedEvent)(nil)).Elem()
+}
+
+type ResourcePoolQuickStats struct {
+	DynamicData
+
+	OverallCpuUsage              int64 `xml:"overallCpuUsage,omitempty"`
+	OverallCpuDemand             int64 `xml:"overallCpuDemand,omitempty"`
+	GuestMemoryUsage             int64 `xml:"guestMemoryUsage,omitempty"`
+	HostMemoryUsage              int64 `xml:"hostMemoryUsage,omitempty"`
+	DistributedCpuEntitlement    int64 `xml:"distributedCpuEntitlement,omitempty"`
+	DistributedMemoryEntitlement int64 `xml:"distributedMemoryEntitlement,omitempty"`
+	StaticCpuEntitlement         int32 `xml:"staticCpuEntitlement,omitempty"`
+	StaticMemoryEntitlement      int32 `xml:"staticMemoryEntitlement,omitempty"`
+	PrivateMemory                int64 `xml:"privateMemory,omitempty"`
+	SharedMemory                 int64 `xml:"sharedMemory,omitempty"`
+	SwappedMemory                int64 `xml:"swappedMemory,omitempty"`
+	BalloonedMemory              int64 `xml:"balloonedMemory,omitempty"`
+	OverheadMemory               int64 `xml:"overheadMemory,omitempty"`
+	ConsumedOverheadMemory       int64 `xml:"consumedOverheadMemory,omitempty"`
+	CompressedMemory             int64 `xml:"compressedMemory,omitempty"`
+}
+
+func init() {
+	t["ResourcePoolQuickStats"] = reflect.TypeOf((*ResourcePoolQuickStats)(nil)).Elem()
+}
+
+type ResourcePoolReconfiguredEvent struct {
+	ResourcePoolEvent
+
+	ConfigChanges *ChangesInfoEventArgument `xml:"configChanges,omitempty"`
+}
+
+func init() {
+	t["ResourcePoolReconfiguredEvent"] = reflect.TypeOf((*ResourcePoolReconfiguredEvent)(nil)).Elem()
+}
+
+type ResourcePoolResourceUsage struct {
+	DynamicData
+
+	ReservationUsed      int64 `xml:"reservationUsed"`
+	ReservationUsedForVm int64 `xml:"reservationUsedForVm"`
+	UnreservedForPool    int64 `xml:"unreservedForPool"`
+	UnreservedForVm      int64 `xml:"unreservedForVm"`
+	OverallUsage         int64 `xml:"overallUsage"`
+	MaxUsage             int64 `xml:"maxUsage"`
+}
+
+func init() {
+	t["ResourcePoolResourceUsage"] = reflect.TypeOf((*ResourcePoolResourceUsage)(nil)).Elem()
+}
+
+type ResourcePoolRuntimeInfo struct {
+	DynamicData
+
+	Memory        ResourcePoolResourceUsage `xml:"memory"`
+	Cpu           ResourcePoolResourceUsage `xml:"cpu"`
+	OverallStatus ManagedEntityStatus       `xml:"overallStatus"`
+}
+
+func init() {
+	t["ResourcePoolRuntimeInfo"] = reflect.TypeOf((*ResourcePoolRuntimeInfo)(nil)).Elem()
+}
+
+type ResourcePoolSummary struct {
+	DynamicData
+
+	Name               string                  `xml:"name"`
+	Config             ResourceConfigSpec      `xml:"config"`
+	Runtime            ResourcePoolRuntimeInfo `xml:"runtime"`
+	QuickStats         *ResourcePoolQuickStats `xml:"quickStats,omitempty"`
+	ConfiguredMemoryMB int32                   `xml:"configuredMemoryMB,omitempty"`
+}
+
+func init() {
+	t["ResourcePoolSummary"] = reflect.TypeOf((*ResourcePoolSummary)(nil)).Elem()
+}
+
+type ResourceViolatedEvent struct {
+	ResourcePoolEvent
+}
+
+func init() {
+	t["ResourceViolatedEvent"] = reflect.TypeOf((*ResourceViolatedEvent)(nil)).Elem()
+}
+
+type RestartService RestartServiceRequestType
+
+func init() {
+	t["RestartService"] = reflect.TypeOf((*RestartService)(nil)).Elem()
+}
+
+type RestartServiceConsoleVirtualNic RestartServiceConsoleVirtualNicRequestType
+
+func init() {
+	t["RestartServiceConsoleVirtualNic"] = reflect.TypeOf((*RestartServiceConsoleVirtualNic)(nil)).Elem()
+}
+
+type RestartServiceConsoleVirtualNicRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Device string                 `xml:"device"`
+}
+
+func init() {
+	t["RestartServiceConsoleVirtualNicRequestType"] = reflect.TypeOf((*RestartServiceConsoleVirtualNicRequestType)(nil)).Elem()
+}
+
+type RestartServiceConsoleVirtualNicResponse struct {
+}
+
+type RestartServiceRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Id   string                 `xml:"id"`
+}
+
+func init() {
+	t["RestartServiceRequestType"] = reflect.TypeOf((*RestartServiceRequestType)(nil)).Elem()
+}
+
+type RestartServiceResponse struct {
+}
+
+type RestoreFirmwareConfiguration RestoreFirmwareConfigurationRequestType
+
+func init() {
+	t["RestoreFirmwareConfiguration"] = reflect.TypeOf((*RestoreFirmwareConfiguration)(nil)).Elem()
+}
+
+type RestoreFirmwareConfigurationRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Force bool                   `xml:"force"`
+}
+
+func init() {
+	t["RestoreFirmwareConfigurationRequestType"] = reflect.TypeOf((*RestoreFirmwareConfigurationRequestType)(nil)).Elem()
+}
+
+type RestoreFirmwareConfigurationResponse struct {
+}
+
+type RestrictedByAdministrator struct {
+	RuntimeFault
+
+	Details string `xml:"details"`
+}
+
+func init() {
+	t["RestrictedByAdministrator"] = reflect.TypeOf((*RestrictedByAdministrator)(nil)).Elem()
+}
+
+type RestrictedByAdministratorFault RestrictedByAdministrator
+
+func init() {
+	t["RestrictedByAdministratorFault"] = reflect.TypeOf((*RestrictedByAdministratorFault)(nil)).Elem()
+}
+
+type RestrictedVersion struct {
+	SecurityError
+}
+
+func init() {
+	t["RestrictedVersion"] = reflect.TypeOf((*RestrictedVersion)(nil)).Elem()
+}
+
+type RestrictedVersionFault RestrictedVersion
+
+func init() {
+	t["RestrictedVersionFault"] = reflect.TypeOf((*RestrictedVersionFault)(nil)).Elem()
+}
+
+type RetrieveAllPermissions RetrieveAllPermissionsRequestType
+
+func init() {
+	t["RetrieveAllPermissions"] = reflect.TypeOf((*RetrieveAllPermissions)(nil)).Elem()
+}
+
+type RetrieveAllPermissionsRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RetrieveAllPermissionsRequestType"] = reflect.TypeOf((*RetrieveAllPermissionsRequestType)(nil)).Elem()
+}
+
+type RetrieveAllPermissionsResponse struct {
+	Returnval []Permission `xml:"returnval,omitempty"`
+}
+
+type RetrieveAnswerFile RetrieveAnswerFileRequestType
+
+func init() {
+	t["RetrieveAnswerFile"] = reflect.TypeOf((*RetrieveAnswerFile)(nil)).Elem()
+}
+
+type RetrieveAnswerFileForProfile RetrieveAnswerFileForProfileRequestType
+
+func init() {
+	t["RetrieveAnswerFileForProfile"] = reflect.TypeOf((*RetrieveAnswerFileForProfile)(nil)).Elem()
+}
+
+type RetrieveAnswerFileForProfileRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	Host         ManagedObjectReference `xml:"host"`
+	ApplyProfile HostApplyProfile       `xml:"applyProfile"`
+}
+
+func init() {
+	t["RetrieveAnswerFileForProfileRequestType"] = reflect.TypeOf((*RetrieveAnswerFileForProfileRequestType)(nil)).Elem()
+}
+
+type RetrieveAnswerFileForProfileResponse struct {
+	Returnval *AnswerFile `xml:"returnval,omitempty"`
+}
+
+type RetrieveAnswerFileRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Host ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["RetrieveAnswerFileRequestType"] = reflect.TypeOf((*RetrieveAnswerFileRequestType)(nil)).Elem()
+}
+
+type RetrieveAnswerFileResponse struct {
+	Returnval *AnswerFile `xml:"returnval,omitempty"`
+}
+
+type RetrieveArgumentDescription RetrieveArgumentDescriptionRequestType
+
+func init() {
+	t["RetrieveArgumentDescription"] = reflect.TypeOf((*RetrieveArgumentDescription)(nil)).Elem()
+}
+
+type RetrieveArgumentDescriptionRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	EventTypeId string                 `xml:"eventTypeId"`
+}
+
+func init() {
+	t["RetrieveArgumentDescriptionRequestType"] = reflect.TypeOf((*RetrieveArgumentDescriptionRequestType)(nil)).Elem()
+}
+
+type RetrieveArgumentDescriptionResponse struct {
+	Returnval []EventArgDesc `xml:"returnval,omitempty"`
+}
+
+type RetrieveClientCert RetrieveClientCertRequestType
+
+func init() {
+	t["RetrieveClientCert"] = reflect.TypeOf((*RetrieveClientCert)(nil)).Elem()
+}
+
+type RetrieveClientCertRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Cluster KeyProviderId          `xml:"cluster"`
+}
+
+func init() {
+	t["RetrieveClientCertRequestType"] = reflect.TypeOf((*RetrieveClientCertRequestType)(nil)).Elem()
+}
+
+type RetrieveClientCertResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type RetrieveClientCsr RetrieveClientCsrRequestType
+
+func init() {
+	t["RetrieveClientCsr"] = reflect.TypeOf((*RetrieveClientCsr)(nil)).Elem()
+}
+
+type RetrieveClientCsrRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Cluster KeyProviderId          `xml:"cluster"`
+}
+
+func init() {
+	t["RetrieveClientCsrRequestType"] = reflect.TypeOf((*RetrieveClientCsrRequestType)(nil)).Elem()
+}
+
+type RetrieveClientCsrResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type RetrieveDasAdvancedRuntimeInfo RetrieveDasAdvancedRuntimeInfoRequestType
+
+func init() {
+	t["RetrieveDasAdvancedRuntimeInfo"] = reflect.TypeOf((*RetrieveDasAdvancedRuntimeInfo)(nil)).Elem()
+}
+
+type RetrieveDasAdvancedRuntimeInfoRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RetrieveDasAdvancedRuntimeInfoRequestType"] = reflect.TypeOf((*RetrieveDasAdvancedRuntimeInfoRequestType)(nil)).Elem()
+}
+
+type RetrieveDasAdvancedRuntimeInfoResponse struct {
+	Returnval BaseClusterDasAdvancedRuntimeInfo `xml:"returnval,omitempty,typeattr"`
+}
+
+type RetrieveDescription RetrieveDescriptionRequestType
+
+func init() {
+	t["RetrieveDescription"] = reflect.TypeOf((*RetrieveDescription)(nil)).Elem()
+}
+
+type RetrieveDescriptionRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RetrieveDescriptionRequestType"] = reflect.TypeOf((*RetrieveDescriptionRequestType)(nil)).Elem()
+}
+
+type RetrieveDescriptionResponse struct {
+	Returnval *ProfileDescription `xml:"returnval,omitempty"`
+}
+
+type RetrieveDiskPartitionInfo RetrieveDiskPartitionInfoRequestType
+
+func init() {
+	t["RetrieveDiskPartitionInfo"] = reflect.TypeOf((*RetrieveDiskPartitionInfo)(nil)).Elem()
+}
+
+type RetrieveDiskPartitionInfoRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	DevicePath []string               `xml:"devicePath"`
+}
+
+func init() {
+	t["RetrieveDiskPartitionInfoRequestType"] = reflect.TypeOf((*RetrieveDiskPartitionInfoRequestType)(nil)).Elem()
+}
+
+type RetrieveDiskPartitionInfoResponse struct {
+	Returnval []HostDiskPartitionInfo `xml:"returnval,omitempty"`
+}
+
+type RetrieveEntityPermissions RetrieveEntityPermissionsRequestType
+
+func init() {
+	t["RetrieveEntityPermissions"] = reflect.TypeOf((*RetrieveEntityPermissions)(nil)).Elem()
+}
+
+type RetrieveEntityPermissionsRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Entity    ManagedObjectReference `xml:"entity"`
+	Inherited bool                   `xml:"inherited"`
+}
+
+func init() {
+	t["RetrieveEntityPermissionsRequestType"] = reflect.TypeOf((*RetrieveEntityPermissionsRequestType)(nil)).Elem()
+}
+
+type RetrieveEntityPermissionsResponse struct {
+	Returnval []Permission `xml:"returnval,omitempty"`
+}
+
+type RetrieveEntityScheduledTask RetrieveEntityScheduledTaskRequestType
+
+func init() {
+	t["RetrieveEntityScheduledTask"] = reflect.TypeOf((*RetrieveEntityScheduledTask)(nil)).Elem()
+}
+
+type RetrieveEntityScheduledTaskRequestType struct {
+	This   ManagedObjectReference  `xml:"_this"`
+	Entity *ManagedObjectReference `xml:"entity,omitempty"`
+}
+
+func init() {
+	t["RetrieveEntityScheduledTaskRequestType"] = reflect.TypeOf((*RetrieveEntityScheduledTaskRequestType)(nil)).Elem()
+}
+
+type RetrieveEntityScheduledTaskResponse struct {
+	Returnval []ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type RetrieveHardwareUptime RetrieveHardwareUptimeRequestType
+
+func init() {
+	t["RetrieveHardwareUptime"] = reflect.TypeOf((*RetrieveHardwareUptime)(nil)).Elem()
+}
+
+type RetrieveHardwareUptimeRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RetrieveHardwareUptimeRequestType"] = reflect.TypeOf((*RetrieveHardwareUptimeRequestType)(nil)).Elem()
+}
+
+type RetrieveHardwareUptimeResponse struct {
+	Returnval int64 `xml:"returnval"`
+}
+
+type RetrieveHostAccessControlEntries RetrieveHostAccessControlEntriesRequestType
+
+func init() {
+	t["RetrieveHostAccessControlEntries"] = reflect.TypeOf((*RetrieveHostAccessControlEntries)(nil)).Elem()
+}
+
+type RetrieveHostAccessControlEntriesRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RetrieveHostAccessControlEntriesRequestType"] = reflect.TypeOf((*RetrieveHostAccessControlEntriesRequestType)(nil)).Elem()
+}
+
+type RetrieveHostAccessControlEntriesResponse struct {
+	Returnval []HostAccessControlEntry `xml:"returnval,omitempty"`
+}
+
+type RetrieveHostCustomizations RetrieveHostCustomizationsRequestType
+
+func init() {
+	t["RetrieveHostCustomizations"] = reflect.TypeOf((*RetrieveHostCustomizations)(nil)).Elem()
+}
+
+type RetrieveHostCustomizationsForProfile RetrieveHostCustomizationsForProfileRequestType
+
+func init() {
+	t["RetrieveHostCustomizationsForProfile"] = reflect.TypeOf((*RetrieveHostCustomizationsForProfile)(nil)).Elem()
+}
+
+type RetrieveHostCustomizationsForProfileRequestType struct {
+	This         ManagedObjectReference   `xml:"_this"`
+	Hosts        []ManagedObjectReference `xml:"hosts,omitempty"`
+	ApplyProfile HostApplyProfile         `xml:"applyProfile"`
+}
+
+func init() {
+	t["RetrieveHostCustomizationsForProfileRequestType"] = reflect.TypeOf((*RetrieveHostCustomizationsForProfileRequestType)(nil)).Elem()
+}
+
+type RetrieveHostCustomizationsForProfileResponse struct {
+	Returnval []StructuredCustomizations `xml:"returnval,omitempty"`
+}
+
+type RetrieveHostCustomizationsRequestType struct {
+	This  ManagedObjectReference   `xml:"_this"`
+	Hosts []ManagedObjectReference `xml:"hosts,omitempty"`
+}
+
+func init() {
+	t["RetrieveHostCustomizationsRequestType"] = reflect.TypeOf((*RetrieveHostCustomizationsRequestType)(nil)).Elem()
+}
+
+type RetrieveHostCustomizationsResponse struct {
+	Returnval []StructuredCustomizations `xml:"returnval,omitempty"`
+}
+
+type RetrieveHostSpecification RetrieveHostSpecificationRequestType
+
+func init() {
+	t["RetrieveHostSpecification"] = reflect.TypeOf((*RetrieveHostSpecification)(nil)).Elem()
+}
+
+type RetrieveHostSpecificationRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	Host     ManagedObjectReference `xml:"host"`
+	FromHost bool                   `xml:"fromHost"`
+}
+
+func init() {
+	t["RetrieveHostSpecificationRequestType"] = reflect.TypeOf((*RetrieveHostSpecificationRequestType)(nil)).Elem()
+}
+
+type RetrieveHostSpecificationResponse struct {
+	Returnval HostSpecification `xml:"returnval"`
+}
+
+type RetrieveKmipServerCert RetrieveKmipServerCertRequestType
+
+func init() {
+	t["RetrieveKmipServerCert"] = reflect.TypeOf((*RetrieveKmipServerCert)(nil)).Elem()
+}
+
+type RetrieveKmipServerCertRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	KeyProvider KeyProviderId          `xml:"keyProvider"`
+	Server      KmipServerInfo         `xml:"server"`
+}
+
+func init() {
+	t["RetrieveKmipServerCertRequestType"] = reflect.TypeOf((*RetrieveKmipServerCertRequestType)(nil)).Elem()
+}
+
+type RetrieveKmipServerCertResponse struct {
+	Returnval CryptoManagerKmipServerCertInfo `xml:"returnval"`
+}
+
+type RetrieveKmipServersStatusRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	Clusters []KmipClusterInfo      `xml:"clusters,omitempty"`
+}
+
+func init() {
+	t["RetrieveKmipServersStatusRequestType"] = reflect.TypeOf((*RetrieveKmipServersStatusRequestType)(nil)).Elem()
+}
+
+type RetrieveKmipServersStatus_Task RetrieveKmipServersStatusRequestType
+
+func init() {
+	t["RetrieveKmipServersStatus_Task"] = reflect.TypeOf((*RetrieveKmipServersStatus_Task)(nil)).Elem()
+}
+
+type RetrieveKmipServersStatus_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type RetrieveObjectScheduledTask RetrieveObjectScheduledTaskRequestType
+
+func init() {
+	t["RetrieveObjectScheduledTask"] = reflect.TypeOf((*RetrieveObjectScheduledTask)(nil)).Elem()
+}
+
+type RetrieveObjectScheduledTaskRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Obj  *ManagedObjectReference `xml:"obj,omitempty"`
+}
+
+func init() {
+	t["RetrieveObjectScheduledTaskRequestType"] = reflect.TypeOf((*RetrieveObjectScheduledTaskRequestType)(nil)).Elem()
+}
+
+type RetrieveObjectScheduledTaskResponse struct {
+	Returnval []ManagedObjectReference `xml:"returnval,omitempty"`
+}
+
+type RetrieveOptions struct {
+	DynamicData
+
+	MaxObjects int32 `xml:"maxObjects,omitempty"`
+}
+
+func init() {
+	t["RetrieveOptions"] = reflect.TypeOf((*RetrieveOptions)(nil)).Elem()
+}
+
+type RetrieveProductComponents RetrieveProductComponentsRequestType
+
+func init() {
+	t["RetrieveProductComponents"] = reflect.TypeOf((*RetrieveProductComponents)(nil)).Elem()
+}
+
+type RetrieveProductComponentsRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RetrieveProductComponentsRequestType"] = reflect.TypeOf((*RetrieveProductComponentsRequestType)(nil)).Elem()
+}
+
+type RetrieveProductComponentsResponse struct {
+	Returnval []ProductComponentInfo `xml:"returnval,omitempty"`
+}
+
+type RetrieveProperties RetrievePropertiesRequestType
+
+func init() {
+	t["RetrieveProperties"] = reflect.TypeOf((*RetrieveProperties)(nil)).Elem()
+}
+
+type RetrievePropertiesEx RetrievePropertiesExRequestType
+
+func init() {
+	t["RetrievePropertiesEx"] = reflect.TypeOf((*RetrievePropertiesEx)(nil)).Elem()
+}
+
+type RetrievePropertiesExRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	SpecSet []PropertyFilterSpec   `xml:"specSet"`
+	Options RetrieveOptions        `xml:"options"`
+}
+
+func init() {
+	t["RetrievePropertiesExRequestType"] = reflect.TypeOf((*RetrievePropertiesExRequestType)(nil)).Elem()
+}
+
+type RetrievePropertiesExResponse struct {
+	Returnval *RetrieveResult `xml:"returnval,omitempty"`
+}
+
+type RetrievePropertiesRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	SpecSet []PropertyFilterSpec   `xml:"specSet"`
+}
+
+func init() {
+	t["RetrievePropertiesRequestType"] = reflect.TypeOf((*RetrievePropertiesRequestType)(nil)).Elem()
+}
+
+type RetrievePropertiesResponse struct {
+	Returnval []ObjectContent `xml:"returnval,omitempty"`
+}
+
+type RetrieveResult struct {
+	DynamicData
+
+	Token   string          `xml:"token,omitempty"`
+	Objects []ObjectContent `xml:"objects"`
+}
+
+func init() {
+	t["RetrieveResult"] = reflect.TypeOf((*RetrieveResult)(nil)).Elem()
+}
+
+type RetrieveRolePermissions RetrieveRolePermissionsRequestType
+
+func init() {
+	t["RetrieveRolePermissions"] = reflect.TypeOf((*RetrieveRolePermissions)(nil)).Elem()
+}
+
+type RetrieveRolePermissionsRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	RoleId int32                  `xml:"roleId"`
+}
+
+func init() {
+	t["RetrieveRolePermissionsRequestType"] = reflect.TypeOf((*RetrieveRolePermissionsRequestType)(nil)).Elem()
+}
+
+type RetrieveRolePermissionsResponse struct {
+	Returnval []Permission `xml:"returnval,omitempty"`
+}
+
+type RetrieveSelfSignedClientCert RetrieveSelfSignedClientCertRequestType
+
+func init() {
+	t["RetrieveSelfSignedClientCert"] = reflect.TypeOf((*RetrieveSelfSignedClientCert)(nil)).Elem()
+}
+
+type RetrieveSelfSignedClientCertRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Cluster KeyProviderId          `xml:"cluster"`
+}
+
+func init() {
+	t["RetrieveSelfSignedClientCertRequestType"] = reflect.TypeOf((*RetrieveSelfSignedClientCertRequestType)(nil)).Elem()
+}
+
+type RetrieveSelfSignedClientCertResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type RetrieveServiceContent RetrieveServiceContentRequestType
+
+func init() {
+	t["RetrieveServiceContent"] = reflect.TypeOf((*RetrieveServiceContent)(nil)).Elem()
+}
+
+type RetrieveServiceContentRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RetrieveServiceContentRequestType"] = reflect.TypeOf((*RetrieveServiceContentRequestType)(nil)).Elem()
+}
+
+type RetrieveServiceContentResponse struct {
+	Returnval ServiceContent `xml:"returnval"`
+}
+
+type RetrieveUserGroups RetrieveUserGroupsRequestType
+
+func init() {
+	t["RetrieveUserGroups"] = reflect.TypeOf((*RetrieveUserGroups)(nil)).Elem()
+}
+
+type RetrieveUserGroupsRequestType struct {
+	This           ManagedObjectReference `xml:"_this"`
+	Domain         string                 `xml:"domain,omitempty"`
+	SearchStr      string                 `xml:"searchStr"`
+	BelongsToGroup string                 `xml:"belongsToGroup,omitempty"`
+	BelongsToUser  string                 `xml:"belongsToUser,omitempty"`
+	ExactMatch     bool                   `xml:"exactMatch"`
+	FindUsers      bool                   `xml:"findUsers"`
+	FindGroups     bool                   `xml:"findGroups"`
+}
+
+func init() {
+	t["RetrieveUserGroupsRequestType"] = reflect.TypeOf((*RetrieveUserGroupsRequestType)(nil)).Elem()
+}
+
+type RetrieveUserGroupsResponse struct {
+	Returnval []BaseUserSearchResult `xml:"returnval,omitempty,typeattr"`
+}
+
+type RetrieveVStorageObject RetrieveVStorageObjectRequestType
+
+func init() {
+	t["RetrieveVStorageObject"] = reflect.TypeOf((*RetrieveVStorageObject)(nil)).Elem()
+}
+
+type RetrieveVStorageObjectRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Id        ID                     `xml:"id"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["RetrieveVStorageObjectRequestType"] = reflect.TypeOf((*RetrieveVStorageObjectRequestType)(nil)).Elem()
+}
+
+type RetrieveVStorageObjectResponse struct {
+	Returnval VStorageObject `xml:"returnval"`
+}
+
+type RetrieveVStorageObjectState RetrieveVStorageObjectStateRequestType
+
+func init() {
+	t["RetrieveVStorageObjectState"] = reflect.TypeOf((*RetrieveVStorageObjectState)(nil)).Elem()
+}
+
+type RetrieveVStorageObjectStateRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Id        ID                     `xml:"id"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["RetrieveVStorageObjectStateRequestType"] = reflect.TypeOf((*RetrieveVStorageObjectStateRequestType)(nil)).Elem()
+}
+
+type RetrieveVStorageObjectStateResponse struct {
+	Returnval VStorageObjectStateInfo `xml:"returnval"`
+}
+
+type RevertToCurrentSnapshotRequestType struct {
+	This            ManagedObjectReference  `xml:"_this"`
+	Host            *ManagedObjectReference `xml:"host,omitempty"`
+	SuppressPowerOn *bool                   `xml:"suppressPowerOn"`
+}
+
+func init() {
+	t["RevertToCurrentSnapshotRequestType"] = reflect.TypeOf((*RevertToCurrentSnapshotRequestType)(nil)).Elem()
+}
+
+type RevertToCurrentSnapshot_Task RevertToCurrentSnapshotRequestType
+
+func init() {
+	t["RevertToCurrentSnapshot_Task"] = reflect.TypeOf((*RevertToCurrentSnapshot_Task)(nil)).Elem()
+}
+
+type RevertToCurrentSnapshot_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type RevertToSnapshotRequestType struct {
+	This            ManagedObjectReference  `xml:"_this"`
+	Host            *ManagedObjectReference `xml:"host,omitempty"`
+	SuppressPowerOn *bool                   `xml:"suppressPowerOn"`
+}
+
+func init() {
+	t["RevertToSnapshotRequestType"] = reflect.TypeOf((*RevertToSnapshotRequestType)(nil)).Elem()
+}
+
+type RevertToSnapshot_Task RevertToSnapshotRequestType
+
+func init() {
+	t["RevertToSnapshot_Task"] = reflect.TypeOf((*RevertToSnapshot_Task)(nil)).Elem()
+}
+
+type RevertToSnapshot_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type RewindCollector RewindCollectorRequestType
+
+func init() {
+	t["RewindCollector"] = reflect.TypeOf((*RewindCollector)(nil)).Elem()
+}
+
+type RewindCollectorRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RewindCollectorRequestType"] = reflect.TypeOf((*RewindCollectorRequestType)(nil)).Elem()
+}
+
+type RewindCollectorResponse struct {
+}
+
+type RoleAddedEvent struct {
+	RoleEvent
+
+	PrivilegeList []string `xml:"privilegeList,omitempty"`
+}
+
+func init() {
+	t["RoleAddedEvent"] = reflect.TypeOf((*RoleAddedEvent)(nil)).Elem()
+}
+
+type RoleEvent struct {
+	AuthorizationEvent
+
+	Role RoleEventArgument `xml:"role"`
+}
+
+func init() {
+	t["RoleEvent"] = reflect.TypeOf((*RoleEvent)(nil)).Elem()
+}
+
+type RoleEventArgument struct {
+	EventArgument
+
+	RoleId int32  `xml:"roleId"`
+	Name   string `xml:"name"`
+}
+
+func init() {
+	t["RoleEventArgument"] = reflect.TypeOf((*RoleEventArgument)(nil)).Elem()
+}
+
+type RoleRemovedEvent struct {
+	RoleEvent
+}
+
+func init() {
+	t["RoleRemovedEvent"] = reflect.TypeOf((*RoleRemovedEvent)(nil)).Elem()
+}
+
+type RoleUpdatedEvent struct {
+	RoleEvent
+
+	PrivilegeList     []string `xml:"privilegeList,omitempty"`
+	PrevRoleName      string   `xml:"prevRoleName,omitempty"`
+	PrivilegesAdded   []string `xml:"privilegesAdded,omitempty"`
+	PrivilegesRemoved []string `xml:"privilegesRemoved,omitempty"`
+}
+
+func init() {
+	t["RoleUpdatedEvent"] = reflect.TypeOf((*RoleUpdatedEvent)(nil)).Elem()
+}
+
+type RollbackEvent struct {
+	DvsEvent
+
+	HostName   string `xml:"hostName"`
+	MethodName string `xml:"methodName,omitempty"`
+}
+
+func init() {
+	t["RollbackEvent"] = reflect.TypeOf((*RollbackEvent)(nil)).Elem()
+}
+
+type RollbackFailure struct {
+	DvsFault
+
+	EntityName string `xml:"entityName"`
+	EntityType string `xml:"entityType"`
+}
+
+func init() {
+	t["RollbackFailure"] = reflect.TypeOf((*RollbackFailure)(nil)).Elem()
+}
+
+type RollbackFailureFault RollbackFailure
+
+func init() {
+	t["RollbackFailureFault"] = reflect.TypeOf((*RollbackFailureFault)(nil)).Elem()
+}
+
+type RuleViolation struct {
+	VmConfigFault
+
+	Host *ManagedObjectReference `xml:"host,omitempty"`
+	Rule BaseClusterRuleInfo     `xml:"rule,omitempty,typeattr"`
+}
+
+func init() {
+	t["RuleViolation"] = reflect.TypeOf((*RuleViolation)(nil)).Elem()
+}
+
+type RuleViolationFault RuleViolation
+
+func init() {
+	t["RuleViolationFault"] = reflect.TypeOf((*RuleViolationFault)(nil)).Elem()
+}
+
+type RunScheduledTask RunScheduledTaskRequestType
+
+func init() {
+	t["RunScheduledTask"] = reflect.TypeOf((*RunScheduledTask)(nil)).Elem()
+}
+
+type RunScheduledTaskRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["RunScheduledTaskRequestType"] = reflect.TypeOf((*RunScheduledTaskRequestType)(nil)).Elem()
+}
+
+type RunScheduledTaskResponse struct {
+}
+
+type RunScriptAction struct {
+	Action
+
+	Script string `xml:"script"`
+}
+
+func init() {
+	t["RunScriptAction"] = reflect.TypeOf((*RunScriptAction)(nil)).Elem()
+}
+
+type RunVsanPhysicalDiskDiagnostics RunVsanPhysicalDiskDiagnosticsRequestType
+
+func init() {
+	t["RunVsanPhysicalDiskDiagnostics"] = reflect.TypeOf((*RunVsanPhysicalDiskDiagnostics)(nil)).Elem()
+}
+
+type RunVsanPhysicalDiskDiagnosticsRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Disks []string               `xml:"disks,omitempty"`
+}
+
+func init() {
+	t["RunVsanPhysicalDiskDiagnosticsRequestType"] = reflect.TypeOf((*RunVsanPhysicalDiskDiagnosticsRequestType)(nil)).Elem()
+}
+
+type RunVsanPhysicalDiskDiagnosticsResponse struct {
+	Returnval []HostVsanInternalSystemVsanPhysicalDiskDiagnosticsResult `xml:"returnval"`
+}
+
+type RuntimeFault struct {
+	MethodFault
+}
+
+func init() {
+	t["RuntimeFault"] = reflect.TypeOf((*RuntimeFault)(nil)).Elem()
+}
+
+type RuntimeFaultFault BaseRuntimeFault
+
+func init() {
+	t["RuntimeFaultFault"] = reflect.TypeOf((*RuntimeFaultFault)(nil)).Elem()
+}
+
+type SAMLTokenAuthentication struct {
+	GuestAuthentication
+
+	Token    string `xml:"token"`
+	Username string `xml:"username,omitempty"`
+}
+
+func init() {
+	t["SAMLTokenAuthentication"] = reflect.TypeOf((*SAMLTokenAuthentication)(nil)).Elem()
+}
+
+type SSLDisabledFault struct {
+	HostConnectFault
+}
+
+func init() {
+	t["SSLDisabledFault"] = reflect.TypeOf((*SSLDisabledFault)(nil)).Elem()
+}
+
+type SSLDisabledFaultFault SSLDisabledFault
+
+func init() {
+	t["SSLDisabledFaultFault"] = reflect.TypeOf((*SSLDisabledFaultFault)(nil)).Elem()
+}
+
+type SSLVerifyFault struct {
+	HostConnectFault
+
+	SelfSigned bool   `xml:"selfSigned"`
+	Thumbprint string `xml:"thumbprint"`
+}
+
+func init() {
+	t["SSLVerifyFault"] = reflect.TypeOf((*SSLVerifyFault)(nil)).Elem()
+}
+
+type SSLVerifyFaultFault SSLVerifyFault
+
+func init() {
+	t["SSLVerifyFaultFault"] = reflect.TypeOf((*SSLVerifyFaultFault)(nil)).Elem()
+}
+
+type SSPIAuthentication struct {
+	GuestAuthentication
+
+	SspiToken string `xml:"sspiToken"`
+}
+
+func init() {
+	t["SSPIAuthentication"] = reflect.TypeOf((*SSPIAuthentication)(nil)).Elem()
+}
+
+type SSPIChallenge struct {
+	VimFault
+
+	Base64Token string `xml:"base64Token"`
+}
+
+func init() {
+	t["SSPIChallenge"] = reflect.TypeOf((*SSPIChallenge)(nil)).Elem()
+}
+
+type SSPIChallengeFault SSPIChallenge
+
+func init() {
+	t["SSPIChallengeFault"] = reflect.TypeOf((*SSPIChallengeFault)(nil)).Elem()
+}
+
+type ScanHostPatchRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Repository HostPatchManagerLocator `xml:"repository"`
+	UpdateID   []string                `xml:"updateID,omitempty"`
+}
+
+func init() {
+	t["ScanHostPatchRequestType"] = reflect.TypeOf((*ScanHostPatchRequestType)(nil)).Elem()
+}
+
+type ScanHostPatchV2RequestType struct {
+	This       ManagedObjectReference                     `xml:"_this"`
+	MetaUrls   []string                                   `xml:"metaUrls,omitempty"`
+	BundleUrls []string                                   `xml:"bundleUrls,omitempty"`
+	Spec       *HostPatchManagerPatchManagerOperationSpec `xml:"spec,omitempty"`
+}
+
+func init() {
+	t["ScanHostPatchV2RequestType"] = reflect.TypeOf((*ScanHostPatchV2RequestType)(nil)).Elem()
+}
+
+type ScanHostPatchV2_Task ScanHostPatchV2RequestType
+
+func init() {
+	t["ScanHostPatchV2_Task"] = reflect.TypeOf((*ScanHostPatchV2_Task)(nil)).Elem()
+}
+
+type ScanHostPatchV2_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ScanHostPatch_Task ScanHostPatchRequestType
+
+func init() {
+	t["ScanHostPatch_Task"] = reflect.TypeOf((*ScanHostPatch_Task)(nil)).Elem()
+}
+
+type ScanHostPatch_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ScheduleReconcileDatastoreInventory ScheduleReconcileDatastoreInventoryRequestType
+
+func init() {
+	t["ScheduleReconcileDatastoreInventory"] = reflect.TypeOf((*ScheduleReconcileDatastoreInventory)(nil)).Elem()
+}
+
+type ScheduleReconcileDatastoreInventoryRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["ScheduleReconcileDatastoreInventoryRequestType"] = reflect.TypeOf((*ScheduleReconcileDatastoreInventoryRequestType)(nil)).Elem()
+}
+
+type ScheduleReconcileDatastoreInventoryResponse struct {
+}
+
+type ScheduledHardwareUpgradeInfo struct {
+	DynamicData
+
+	UpgradePolicy                  string                `xml:"upgradePolicy,omitempty"`
+	VersionKey                     string                `xml:"versionKey,omitempty"`
+	ScheduledHardwareUpgradeStatus string                `xml:"scheduledHardwareUpgradeStatus,omitempty"`
+	Fault                          *LocalizedMethodFault `xml:"fault,omitempty"`
+}
+
+func init() {
+	t["ScheduledHardwareUpgradeInfo"] = reflect.TypeOf((*ScheduledHardwareUpgradeInfo)(nil)).Elem()
+}
+
+type ScheduledTaskCompletedEvent struct {
+	ScheduledTaskEvent
+}
+
+func init() {
+	t["ScheduledTaskCompletedEvent"] = reflect.TypeOf((*ScheduledTaskCompletedEvent)(nil)).Elem()
+}
+
+type ScheduledTaskCreatedEvent struct {
+	ScheduledTaskEvent
+}
+
+func init() {
+	t["ScheduledTaskCreatedEvent"] = reflect.TypeOf((*ScheduledTaskCreatedEvent)(nil)).Elem()
+}
+
+type ScheduledTaskDescription struct {
+	DynamicData
+
+	Action        []BaseTypeDescription    `xml:"action,typeattr"`
+	SchedulerInfo []ScheduledTaskDetail    `xml:"schedulerInfo"`
+	State         []BaseElementDescription `xml:"state,typeattr"`
+	DayOfWeek     []BaseElementDescription `xml:"dayOfWeek,typeattr"`
+	WeekOfMonth   []BaseElementDescription `xml:"weekOfMonth,typeattr"`
+}
+
+func init() {
+	t["ScheduledTaskDescription"] = reflect.TypeOf((*ScheduledTaskDescription)(nil)).Elem()
+}
+
+type ScheduledTaskDetail struct {
+	TypeDescription
+
+	Frequency string `xml:"frequency"`
+}
+
+func init() {
+	t["ScheduledTaskDetail"] = reflect.TypeOf((*ScheduledTaskDetail)(nil)).Elem()
+}
+
+type ScheduledTaskEmailCompletedEvent struct {
+	ScheduledTaskEvent
+
+	To string `xml:"to"`
+}
+
+func init() {
+	t["ScheduledTaskEmailCompletedEvent"] = reflect.TypeOf((*ScheduledTaskEmailCompletedEvent)(nil)).Elem()
+}
+
+type ScheduledTaskEmailFailedEvent struct {
+	ScheduledTaskEvent
+
+	To     string               `xml:"to"`
+	Reason LocalizedMethodFault `xml:"reason"`
+}
+
+func init() {
+	t["ScheduledTaskEmailFailedEvent"] = reflect.TypeOf((*ScheduledTaskEmailFailedEvent)(nil)).Elem()
+}
+
+type ScheduledTaskEvent struct {
+	Event
+
+	ScheduledTask ScheduledTaskEventArgument `xml:"scheduledTask"`
+	Entity        ManagedEntityEventArgument `xml:"entity"`
+}
+
+func init() {
+	t["ScheduledTaskEvent"] = reflect.TypeOf((*ScheduledTaskEvent)(nil)).Elem()
+}
+
+type ScheduledTaskEventArgument struct {
+	EntityEventArgument
+
+	ScheduledTask ManagedObjectReference `xml:"scheduledTask"`
+}
+
+func init() {
+	t["ScheduledTaskEventArgument"] = reflect.TypeOf((*ScheduledTaskEventArgument)(nil)).Elem()
+}
+
+type ScheduledTaskFailedEvent struct {
+	ScheduledTaskEvent
+
+	Reason LocalizedMethodFault `xml:"reason"`
+}
+
+func init() {
+	t["ScheduledTaskFailedEvent"] = reflect.TypeOf((*ScheduledTaskFailedEvent)(nil)).Elem()
+}
+
+type ScheduledTaskInfo struct {
+	ScheduledTaskSpec
+
+	ScheduledTask    ManagedObjectReference  `xml:"scheduledTask"`
+	Entity           ManagedObjectReference  `xml:"entity"`
+	LastModifiedTime time.Time               `xml:"lastModifiedTime"`
+	LastModifiedUser string                  `xml:"lastModifiedUser"`
+	NextRunTime      *time.Time              `xml:"nextRunTime"`
+	PrevRunTime      *time.Time              `xml:"prevRunTime"`
+	State            TaskInfoState           `xml:"state"`
+	Error            *LocalizedMethodFault   `xml:"error,omitempty"`
+	Result           AnyType                 `xml:"result,omitempty,typeattr"`
+	Progress         int32                   `xml:"progress,omitempty"`
+	ActiveTask       *ManagedObjectReference `xml:"activeTask,omitempty"`
+	TaskObject       *ManagedObjectReference `xml:"taskObject,omitempty"`
+}
+
+func init() {
+	t["ScheduledTaskInfo"] = reflect.TypeOf((*ScheduledTaskInfo)(nil)).Elem()
+}
+
+type ScheduledTaskReconfiguredEvent struct {
+	ScheduledTaskEvent
+
+	ConfigChanges *ChangesInfoEventArgument `xml:"configChanges,omitempty"`
+}
+
+func init() {
+	t["ScheduledTaskReconfiguredEvent"] = reflect.TypeOf((*ScheduledTaskReconfiguredEvent)(nil)).Elem()
+}
+
+type ScheduledTaskRemovedEvent struct {
+	ScheduledTaskEvent
+}
+
+func init() {
+	t["ScheduledTaskRemovedEvent"] = reflect.TypeOf((*ScheduledTaskRemovedEvent)(nil)).Elem()
+}
+
+type ScheduledTaskSpec struct {
+	DynamicData
+
+	Name         string            `xml:"name"`
+	Description  string            `xml:"description"`
+	Enabled      bool              `xml:"enabled"`
+	Scheduler    BaseTaskScheduler `xml:"scheduler,typeattr"`
+	Action       BaseAction        `xml:"action,typeattr"`
+	Notification string            `xml:"notification,omitempty"`
+}
+
+func init() {
+	t["ScheduledTaskSpec"] = reflect.TypeOf((*ScheduledTaskSpec)(nil)).Elem()
+}
+
+type ScheduledTaskStartedEvent struct {
+	ScheduledTaskEvent
+}
+
+func init() {
+	t["ScheduledTaskStartedEvent"] = reflect.TypeOf((*ScheduledTaskStartedEvent)(nil)).Elem()
+}
+
+type ScsiLun struct {
+	HostDevice
+
+	Key              string               `xml:"key,omitempty"`
+	Uuid             string               `xml:"uuid"`
+	Descriptor       []ScsiLunDescriptor  `xml:"descriptor,omitempty"`
+	CanonicalName    string               `xml:"canonicalName,omitempty"`
+	DisplayName      string               `xml:"displayName,omitempty"`
+	LunType          string               `xml:"lunType"`
+	Vendor           string               `xml:"vendor,omitempty"`
+	Model            string               `xml:"model,omitempty"`
+	Revision         string               `xml:"revision,omitempty"`
+	ScsiLevel        int32                `xml:"scsiLevel,omitempty"`
+	SerialNumber     string               `xml:"serialNumber,omitempty"`
+	DurableName      *ScsiLunDurableName  `xml:"durableName,omitempty"`
+	AlternateName    []ScsiLunDurableName `xml:"alternateName,omitempty"`
+	StandardInquiry  []byte               `xml:"standardInquiry,omitempty"`
+	QueueDepth       int32                `xml:"queueDepth,omitempty"`
+	OperationalState []string             `xml:"operationalState"`
+	Capabilities     *ScsiLunCapabilities `xml:"capabilities,omitempty"`
+	VStorageSupport  string               `xml:"vStorageSupport,omitempty"`
+	ProtocolEndpoint *bool                `xml:"protocolEndpoint"`
+}
+
+func init() {
+	t["ScsiLun"] = reflect.TypeOf((*ScsiLun)(nil)).Elem()
+}
+
+type ScsiLunCapabilities struct {
+	DynamicData
+
+	UpdateDisplayNameSupported bool `xml:"updateDisplayNameSupported"`
+}
+
+func init() {
+	t["ScsiLunCapabilities"] = reflect.TypeOf((*ScsiLunCapabilities)(nil)).Elem()
+}
+
+type ScsiLunDescriptor struct {
+	DynamicData
+
+	Quality string `xml:"quality"`
+	Id      string `xml:"id"`
+}
+
+func init() {
+	t["ScsiLunDescriptor"] = reflect.TypeOf((*ScsiLunDescriptor)(nil)).Elem()
+}
+
+type ScsiLunDurableName struct {
+	DynamicData
+
+	Namespace   string `xml:"namespace"`
+	NamespaceId byte   `xml:"namespaceId"`
+	Data        []byte `xml:"data,omitempty"`
+}
+
+func init() {
+	t["ScsiLunDurableName"] = reflect.TypeOf((*ScsiLunDurableName)(nil)).Elem()
+}
+
+type SeSparseVirtualDiskSpec struct {
+	FileBackedVirtualDiskSpec
+
+	GrainSizeKb int32 `xml:"grainSizeKb,omitempty"`
+}
+
+func init() {
+	t["SeSparseVirtualDiskSpec"] = reflect.TypeOf((*SeSparseVirtualDiskSpec)(nil)).Elem()
+}
+
+type SearchDatastoreRequestType struct {
+	This          ManagedObjectReference          `xml:"_this"`
+	DatastorePath string                          `xml:"datastorePath"`
+	SearchSpec    *HostDatastoreBrowserSearchSpec `xml:"searchSpec,omitempty"`
+}
+
+func init() {
+	t["SearchDatastoreRequestType"] = reflect.TypeOf((*SearchDatastoreRequestType)(nil)).Elem()
+}
+
+type SearchDatastoreSubFoldersRequestType struct {
+	This          ManagedObjectReference          `xml:"_this"`
+	DatastorePath string                          `xml:"datastorePath"`
+	SearchSpec    *HostDatastoreBrowserSearchSpec `xml:"searchSpec,omitempty"`
+}
+
+func init() {
+	t["SearchDatastoreSubFoldersRequestType"] = reflect.TypeOf((*SearchDatastoreSubFoldersRequestType)(nil)).Elem()
+}
+
+type SearchDatastoreSubFolders_Task SearchDatastoreSubFoldersRequestType
+
+func init() {
+	t["SearchDatastoreSubFolders_Task"] = reflect.TypeOf((*SearchDatastoreSubFolders_Task)(nil)).Elem()
+}
+
+type SearchDatastoreSubFolders_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type SearchDatastore_Task SearchDatastoreRequestType
+
+func init() {
+	t["SearchDatastore_Task"] = reflect.TypeOf((*SearchDatastore_Task)(nil)).Elem()
+}
+
+type SearchDatastore_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type SecondaryVmAlreadyDisabled struct {
+	VmFaultToleranceIssue
+
+	InstanceUuid string `xml:"instanceUuid"`
+}
+
+func init() {
+	t["SecondaryVmAlreadyDisabled"] = reflect.TypeOf((*SecondaryVmAlreadyDisabled)(nil)).Elem()
+}
+
+type SecondaryVmAlreadyDisabledFault SecondaryVmAlreadyDisabled
+
+func init() {
+	t["SecondaryVmAlreadyDisabledFault"] = reflect.TypeOf((*SecondaryVmAlreadyDisabledFault)(nil)).Elem()
+}
+
+type SecondaryVmAlreadyEnabled struct {
+	VmFaultToleranceIssue
+
+	InstanceUuid string `xml:"instanceUuid"`
+}
+
+func init() {
+	t["SecondaryVmAlreadyEnabled"] = reflect.TypeOf((*SecondaryVmAlreadyEnabled)(nil)).Elem()
+}
+
+type SecondaryVmAlreadyEnabledFault SecondaryVmAlreadyEnabled
+
+func init() {
+	t["SecondaryVmAlreadyEnabledFault"] = reflect.TypeOf((*SecondaryVmAlreadyEnabledFault)(nil)).Elem()
+}
+
+type SecondaryVmAlreadyRegistered struct {
+	VmFaultToleranceIssue
+
+	InstanceUuid string `xml:"instanceUuid,omitempty"`
+}
+
+func init() {
+	t["SecondaryVmAlreadyRegistered"] = reflect.TypeOf((*SecondaryVmAlreadyRegistered)(nil)).Elem()
+}
+
+type SecondaryVmAlreadyRegisteredFault SecondaryVmAlreadyRegistered
+
+func init() {
+	t["SecondaryVmAlreadyRegisteredFault"] = reflect.TypeOf((*SecondaryVmAlreadyRegisteredFault)(nil)).Elem()
+}
+
+type SecondaryVmNotRegistered struct {
+	VmFaultToleranceIssue
+
+	InstanceUuid string `xml:"instanceUuid,omitempty"`
+}
+
+func init() {
+	t["SecondaryVmNotRegistered"] = reflect.TypeOf((*SecondaryVmNotRegistered)(nil)).Elem()
+}
+
+type SecondaryVmNotRegisteredFault SecondaryVmNotRegistered
+
+func init() {
+	t["SecondaryVmNotRegisteredFault"] = reflect.TypeOf((*SecondaryVmNotRegisteredFault)(nil)).Elem()
+}
+
+type SecurityError struct {
+	RuntimeFault
+}
+
+func init() {
+	t["SecurityError"] = reflect.TypeOf((*SecurityError)(nil)).Elem()
+}
+
+type SecurityErrorFault BaseSecurityError
+
+func init() {
+	t["SecurityErrorFault"] = reflect.TypeOf((*SecurityErrorFault)(nil)).Elem()
+}
+
+type SecurityProfile struct {
+	ApplyProfile
+
+	Permission []PermissionProfile `xml:"permission,omitempty"`
+}
+
+func init() {
+	t["SecurityProfile"] = reflect.TypeOf((*SecurityProfile)(nil)).Elem()
+}
+
+type SelectActivePartition SelectActivePartitionRequestType
+
+func init() {
+	t["SelectActivePartition"] = reflect.TypeOf((*SelectActivePartition)(nil)).Elem()
+}
+
+type SelectActivePartitionRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Partition *HostScsiDiskPartition `xml:"partition,omitempty"`
+}
+
+func init() {
+	t["SelectActivePartitionRequestType"] = reflect.TypeOf((*SelectActivePartitionRequestType)(nil)).Elem()
+}
+
+type SelectActivePartitionResponse struct {
+}
+
+type SelectVnic SelectVnicRequestType
+
+func init() {
+	t["SelectVnic"] = reflect.TypeOf((*SelectVnic)(nil)).Elem()
+}
+
+type SelectVnicForNicType SelectVnicForNicTypeRequestType
+
+func init() {
+	t["SelectVnicForNicType"] = reflect.TypeOf((*SelectVnicForNicType)(nil)).Elem()
+}
+
+type SelectVnicForNicTypeRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	NicType string                 `xml:"nicType"`
+	Device  string                 `xml:"device"`
+}
+
+func init() {
+	t["SelectVnicForNicTypeRequestType"] = reflect.TypeOf((*SelectVnicForNicTypeRequestType)(nil)).Elem()
+}
+
+type SelectVnicForNicTypeResponse struct {
+}
+
+type SelectVnicRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Device string                 `xml:"device"`
+}
+
+func init() {
+	t["SelectVnicRequestType"] = reflect.TypeOf((*SelectVnicRequestType)(nil)).Elem()
+}
+
+type SelectVnicResponse struct {
+}
+
+type SelectionSet struct {
+	DynamicData
+}
+
+func init() {
+	t["SelectionSet"] = reflect.TypeOf((*SelectionSet)(nil)).Elem()
+}
+
+type SelectionSpec struct {
+	DynamicData
+
+	Name string `xml:"name,omitempty"`
+}
+
+func init() {
+	t["SelectionSpec"] = reflect.TypeOf((*SelectionSpec)(nil)).Elem()
+}
+
+type SendEmailAction struct {
+	Action
+
+	ToList  string `xml:"toList"`
+	CcList  string `xml:"ccList"`
+	Subject string `xml:"subject"`
+	Body    string `xml:"body"`
+}
+
+func init() {
+	t["SendEmailAction"] = reflect.TypeOf((*SendEmailAction)(nil)).Elem()
+}
+
+type SendNMI SendNMIRequestType
+
+func init() {
+	t["SendNMI"] = reflect.TypeOf((*SendNMI)(nil)).Elem()
+}
+
+type SendNMIRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["SendNMIRequestType"] = reflect.TypeOf((*SendNMIRequestType)(nil)).Elem()
+}
+
+type SendNMIResponse struct {
+}
+
+type SendSNMPAction struct {
+	Action
+}
+
+func init() {
+	t["SendSNMPAction"] = reflect.TypeOf((*SendSNMPAction)(nil)).Elem()
+}
+
+type SendTestNotification SendTestNotificationRequestType
+
+func init() {
+	t["SendTestNotification"] = reflect.TypeOf((*SendTestNotification)(nil)).Elem()
+}
+
+type SendTestNotificationRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["SendTestNotificationRequestType"] = reflect.TypeOf((*SendTestNotificationRequestType)(nil)).Elem()
+}
+
+type SendTestNotificationResponse struct {
+}
+
+type ServerLicenseExpiredEvent struct {
+	LicenseEvent
+
+	Product string `xml:"product"`
+}
+
+func init() {
+	t["ServerLicenseExpiredEvent"] = reflect.TypeOf((*ServerLicenseExpiredEvent)(nil)).Elem()
+}
+
+type ServerStartedSessionEvent struct {
+	SessionEvent
+}
+
+func init() {
+	t["ServerStartedSessionEvent"] = reflect.TypeOf((*ServerStartedSessionEvent)(nil)).Elem()
+}
+
+type ServiceConsolePortGroupProfile struct {
+	PortGroupProfile
+
+	IpConfig IpAddressProfile `xml:"ipConfig"`
+}
+
+func init() {
+	t["ServiceConsolePortGroupProfile"] = reflect.TypeOf((*ServiceConsolePortGroupProfile)(nil)).Elem()
+}
+
+type ServiceConsoleReservationInfo struct {
+	DynamicData
+
+	ServiceConsoleReservedCfg int64 `xml:"serviceConsoleReservedCfg"`
+	ServiceConsoleReserved    int64 `xml:"serviceConsoleReserved"`
+	Unreserved                int64 `xml:"unreserved"`
+}
+
+func init() {
+	t["ServiceConsoleReservationInfo"] = reflect.TypeOf((*ServiceConsoleReservationInfo)(nil)).Elem()
+}
+
+type ServiceContent struct {
+	DynamicData
+
+	RootFolder                  ManagedObjectReference  `xml:"rootFolder"`
+	PropertyCollector           ManagedObjectReference  `xml:"propertyCollector"`
+	ViewManager                 *ManagedObjectReference `xml:"viewManager,omitempty"`
+	About                       AboutInfo               `xml:"about"`
+	Setting                     *ManagedObjectReference `xml:"setting,omitempty"`
+	UserDirectory               *ManagedObjectReference `xml:"userDirectory,omitempty"`
+	SessionManager              *ManagedObjectReference `xml:"sessionManager,omitempty"`
+	AuthorizationManager        *ManagedObjectReference `xml:"authorizationManager,omitempty"`
+	ServiceManager              *ManagedObjectReference `xml:"serviceManager,omitempty"`
+	PerfManager                 *ManagedObjectReference `xml:"perfManager,omitempty"`
+	ScheduledTaskManager        *ManagedObjectReference `xml:"scheduledTaskManager,omitempty"`
+	AlarmManager                *ManagedObjectReference `xml:"alarmManager,omitempty"`
+	EventManager                *ManagedObjectReference `xml:"eventManager,omitempty"`
+	TaskManager                 *ManagedObjectReference `xml:"taskManager,omitempty"`
+	ExtensionManager            *ManagedObjectReference `xml:"extensionManager,omitempty"`
+	CustomizationSpecManager    *ManagedObjectReference `xml:"customizationSpecManager,omitempty"`
+	CustomFieldsManager         *ManagedObjectReference `xml:"customFieldsManager,omitempty"`
+	AccountManager              *ManagedObjectReference `xml:"accountManager,omitempty"`
+	DiagnosticManager           *ManagedObjectReference `xml:"diagnosticManager,omitempty"`
+	LicenseManager              *ManagedObjectReference `xml:"licenseManager,omitempty"`
+	SearchIndex                 *ManagedObjectReference `xml:"searchIndex,omitempty"`
+	FileManager                 *ManagedObjectReference `xml:"fileManager,omitempty"`
+	DatastoreNamespaceManager   *ManagedObjectReference `xml:"datastoreNamespaceManager,omitempty"`
+	VirtualDiskManager          *ManagedObjectReference `xml:"virtualDiskManager,omitempty"`
+	VirtualizationManager       *ManagedObjectReference `xml:"virtualizationManager,omitempty"`
+	SnmpSystem                  *ManagedObjectReference `xml:"snmpSystem,omitempty"`
+	VmProvisioningChecker       *ManagedObjectReference `xml:"vmProvisioningChecker,omitempty"`
+	VmCompatibilityChecker      *ManagedObjectReference `xml:"vmCompatibilityChecker,omitempty"`
+	OvfManager                  *ManagedObjectReference `xml:"ovfManager,omitempty"`
+	IpPoolManager               *ManagedObjectReference `xml:"ipPoolManager,omitempty"`
+	DvSwitchManager             *ManagedObjectReference `xml:"dvSwitchManager,omitempty"`
+	HostProfileManager          *ManagedObjectReference `xml:"hostProfileManager,omitempty"`
+	ClusterProfileManager       *ManagedObjectReference `xml:"clusterProfileManager,omitempty"`
+	ComplianceManager           *ManagedObjectReference `xml:"complianceManager,omitempty"`
+	LocalizationManager         *ManagedObjectReference `xml:"localizationManager,omitempty"`
+	StorageResourceManager      *ManagedObjectReference `xml:"storageResourceManager,omitempty"`
+	GuestOperationsManager      *ManagedObjectReference `xml:"guestOperationsManager,omitempty"`
+	OverheadMemoryManager       *ManagedObjectReference `xml:"overheadMemoryManager,omitempty"`
+	CertificateManager          *ManagedObjectReference `xml:"certificateManager,omitempty"`
+	IoFilterManager             *ManagedObjectReference `xml:"ioFilterManager,omitempty"`
+	VStorageObjectManager       *ManagedObjectReference `xml:"vStorageObjectManager,omitempty"`
+	HostSpecManager             *ManagedObjectReference `xml:"hostSpecManager,omitempty"`
+	CryptoManager               *ManagedObjectReference `xml:"cryptoManager,omitempty"`
+	HealthUpdateManager         *ManagedObjectReference `xml:"healthUpdateManager,omitempty"`
+	FailoverClusterConfigurator *ManagedObjectReference `xml:"failoverClusterConfigurator,omitempty"`
+	FailoverClusterManager      *ManagedObjectReference `xml:"failoverClusterManager,omitempty"`
+}
+
+func init() {
+	t["ServiceContent"] = reflect.TypeOf((*ServiceContent)(nil)).Elem()
+}
+
+type ServiceLocator struct {
+	DynamicData
+
+	InstanceUuid  string                       `xml:"instanceUuid"`
+	Url           string                       `xml:"url"`
+	Credential    BaseServiceLocatorCredential `xml:"credential,typeattr"`
+	SslThumbprint string                       `xml:"sslThumbprint,omitempty"`
+}
+
+func init() {
+	t["ServiceLocator"] = reflect.TypeOf((*ServiceLocator)(nil)).Elem()
+}
+
+type ServiceLocatorCredential struct {
+	DynamicData
+}
+
+func init() {
+	t["ServiceLocatorCredential"] = reflect.TypeOf((*ServiceLocatorCredential)(nil)).Elem()
+}
+
+type ServiceLocatorNamePassword struct {
+	ServiceLocatorCredential
+
+	Username string `xml:"username"`
+	Password string `xml:"password"`
+}
+
+func init() {
+	t["ServiceLocatorNamePassword"] = reflect.TypeOf((*ServiceLocatorNamePassword)(nil)).Elem()
+}
+
+type ServiceLocatorSAMLCredential struct {
+	ServiceLocatorCredential
+
+	Token string `xml:"token,omitempty"`
+}
+
+func init() {
+	t["ServiceLocatorSAMLCredential"] = reflect.TypeOf((*ServiceLocatorSAMLCredential)(nil)).Elem()
+}
+
+type ServiceManagerServiceInfo struct {
+	DynamicData
+
+	ServiceName string                 `xml:"serviceName"`
+	Location    []string               `xml:"location,omitempty"`
+	Service     ManagedObjectReference `xml:"service"`
+	Description string                 `xml:"description"`
+}
+
+func init() {
+	t["ServiceManagerServiceInfo"] = reflect.TypeOf((*ServiceManagerServiceInfo)(nil)).Elem()
+}
+
+type ServiceProfile struct {
+	ApplyProfile
+
+	Key string `xml:"key"`
+}
+
+func init() {
+	t["ServiceProfile"] = reflect.TypeOf((*ServiceProfile)(nil)).Elem()
+}
+
+type SessionEvent struct {
+	Event
+}
+
+func init() {
+	t["SessionEvent"] = reflect.TypeOf((*SessionEvent)(nil)).Elem()
+}
+
+type SessionIsActive SessionIsActiveRequestType
+
+func init() {
+	t["SessionIsActive"] = reflect.TypeOf((*SessionIsActive)(nil)).Elem()
+}
+
+type SessionIsActiveRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	SessionID string                 `xml:"sessionID"`
+	UserName  string                 `xml:"userName"`
+}
+
+func init() {
+	t["SessionIsActiveRequestType"] = reflect.TypeOf((*SessionIsActiveRequestType)(nil)).Elem()
+}
+
+type SessionIsActiveResponse struct {
+	Returnval bool `xml:"returnval"`
+}
+
+type SessionManagerGenericServiceTicket struct {
+	DynamicData
+
+	Id            string `xml:"id"`
+	HostName      string `xml:"hostName,omitempty"`
+	SslThumbprint string `xml:"sslThumbprint,omitempty"`
+}
+
+func init() {
+	t["SessionManagerGenericServiceTicket"] = reflect.TypeOf((*SessionManagerGenericServiceTicket)(nil)).Elem()
+}
+
+type SessionManagerHttpServiceRequestSpec struct {
+	SessionManagerServiceRequestSpec
+
+	Method string `xml:"method,omitempty"`
+	Url    string `xml:"url"`
+}
+
+func init() {
+	t["SessionManagerHttpServiceRequestSpec"] = reflect.TypeOf((*SessionManagerHttpServiceRequestSpec)(nil)).Elem()
+}
+
+type SessionManagerLocalTicket struct {
+	DynamicData
+
+	UserName         string `xml:"userName"`
+	PasswordFilePath string `xml:"passwordFilePath"`
+}
+
+func init() {
+	t["SessionManagerLocalTicket"] = reflect.TypeOf((*SessionManagerLocalTicket)(nil)).Elem()
+}
+
+type SessionManagerServiceRequestSpec struct {
+	DynamicData
+}
+
+func init() {
+	t["SessionManagerServiceRequestSpec"] = reflect.TypeOf((*SessionManagerServiceRequestSpec)(nil)).Elem()
+}
+
+type SessionManagerVmomiServiceRequestSpec struct {
+	SessionManagerServiceRequestSpec
+
+	Method string `xml:"method"`
+}
+
+func init() {
+	t["SessionManagerVmomiServiceRequestSpec"] = reflect.TypeOf((*SessionManagerVmomiServiceRequestSpec)(nil)).Elem()
+}
+
+type SessionTerminatedEvent struct {
+	SessionEvent
+
+	SessionId          string `xml:"sessionId"`
+	TerminatedUsername string `xml:"terminatedUsername"`
+}
+
+func init() {
+	t["SessionTerminatedEvent"] = reflect.TypeOf((*SessionTerminatedEvent)(nil)).Elem()
+}
+
+type SetCollectorPageSize SetCollectorPageSizeRequestType
+
+func init() {
+	t["SetCollectorPageSize"] = reflect.TypeOf((*SetCollectorPageSize)(nil)).Elem()
+}
+
+type SetCollectorPageSizeRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	MaxCount int32                  `xml:"maxCount"`
+}
+
+func init() {
+	t["SetCollectorPageSizeRequestType"] = reflect.TypeOf((*SetCollectorPageSizeRequestType)(nil)).Elem()
+}
+
+type SetCollectorPageSizeResponse struct {
+}
+
+type SetDisplayTopology SetDisplayTopologyRequestType
+
+func init() {
+	t["SetDisplayTopology"] = reflect.TypeOf((*SetDisplayTopology)(nil)).Elem()
+}
+
+type SetDisplayTopologyRequestType struct {
+	This     ManagedObjectReference          `xml:"_this"`
+	Displays []VirtualMachineDisplayTopology `xml:"displays"`
+}
+
+func init() {
+	t["SetDisplayTopologyRequestType"] = reflect.TypeOf((*SetDisplayTopologyRequestType)(nil)).Elem()
+}
+
+type SetDisplayTopologyResponse struct {
+}
+
+type SetEntityPermissions SetEntityPermissionsRequestType
+
+func init() {
+	t["SetEntityPermissions"] = reflect.TypeOf((*SetEntityPermissions)(nil)).Elem()
+}
+
+type SetEntityPermissionsRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	Entity     ManagedObjectReference `xml:"entity"`
+	Permission []Permission           `xml:"permission,omitempty"`
+}
+
+func init() {
+	t["SetEntityPermissionsRequestType"] = reflect.TypeOf((*SetEntityPermissionsRequestType)(nil)).Elem()
+}
+
+type SetEntityPermissionsResponse struct {
+}
+
+type SetExtensionCertificate SetExtensionCertificateRequestType
+
+func init() {
+	t["SetExtensionCertificate"] = reflect.TypeOf((*SetExtensionCertificate)(nil)).Elem()
+}
+
+type SetExtensionCertificateRequestType struct {
+	This           ManagedObjectReference `xml:"_this"`
+	ExtensionKey   string                 `xml:"extensionKey"`
+	CertificatePem string                 `xml:"certificatePem,omitempty"`
+}
+
+func init() {
+	t["SetExtensionCertificateRequestType"] = reflect.TypeOf((*SetExtensionCertificateRequestType)(nil)).Elem()
+}
+
+type SetExtensionCertificateResponse struct {
+}
+
+type SetField SetFieldRequestType
+
+func init() {
+	t["SetField"] = reflect.TypeOf((*SetField)(nil)).Elem()
+}
+
+type SetFieldRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Entity ManagedObjectReference `xml:"entity"`
+	Key    int32                  `xml:"key"`
+	Value  string                 `xml:"value"`
+}
+
+func init() {
+	t["SetFieldRequestType"] = reflect.TypeOf((*SetFieldRequestType)(nil)).Elem()
+}
+
+type SetFieldResponse struct {
+}
+
+type SetLicenseEdition SetLicenseEditionRequestType
+
+func init() {
+	t["SetLicenseEdition"] = reflect.TypeOf((*SetLicenseEdition)(nil)).Elem()
+}
+
+type SetLicenseEditionRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Host       *ManagedObjectReference `xml:"host,omitempty"`
+	FeatureKey string                  `xml:"featureKey,omitempty"`
+}
+
+func init() {
+	t["SetLicenseEditionRequestType"] = reflect.TypeOf((*SetLicenseEditionRequestType)(nil)).Elem()
+}
+
+type SetLicenseEditionResponse struct {
+}
+
+type SetLocale SetLocaleRequestType
+
+func init() {
+	t["SetLocale"] = reflect.TypeOf((*SetLocale)(nil)).Elem()
+}
+
+type SetLocaleRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Locale string                 `xml:"locale"`
+}
+
+func init() {
+	t["SetLocaleRequestType"] = reflect.TypeOf((*SetLocaleRequestType)(nil)).Elem()
+}
+
+type SetLocaleResponse struct {
+}
+
+type SetMultipathLunPolicy SetMultipathLunPolicyRequestType
+
+func init() {
+	t["SetMultipathLunPolicy"] = reflect.TypeOf((*SetMultipathLunPolicy)(nil)).Elem()
+}
+
+type SetMultipathLunPolicyRequestType struct {
+	This   ManagedObjectReference                 `xml:"_this"`
+	LunId  string                                 `xml:"lunId"`
+	Policy BaseHostMultipathInfoLogicalUnitPolicy `xml:"policy,typeattr"`
+}
+
+func init() {
+	t["SetMultipathLunPolicyRequestType"] = reflect.TypeOf((*SetMultipathLunPolicyRequestType)(nil)).Elem()
+}
+
+type SetMultipathLunPolicyResponse struct {
+}
+
+type SetNFSUser SetNFSUserRequestType
+
+func init() {
+	t["SetNFSUser"] = reflect.TypeOf((*SetNFSUser)(nil)).Elem()
+}
+
+type SetNFSUserRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	User     string                 `xml:"user"`
+	Password string                 `xml:"password"`
+}
+
+func init() {
+	t["SetNFSUserRequestType"] = reflect.TypeOf((*SetNFSUserRequestType)(nil)).Elem()
+}
+
+type SetNFSUserResponse struct {
+}
+
+type SetPublicKey SetPublicKeyRequestType
+
+func init() {
+	t["SetPublicKey"] = reflect.TypeOf((*SetPublicKey)(nil)).Elem()
+}
+
+type SetPublicKeyRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	ExtensionKey string                 `xml:"extensionKey"`
+	PublicKey    string                 `xml:"publicKey"`
+}
+
+func init() {
+	t["SetPublicKeyRequestType"] = reflect.TypeOf((*SetPublicKeyRequestType)(nil)).Elem()
+}
+
+type SetPublicKeyResponse struct {
+}
+
+type SetRegistryValueInGuest SetRegistryValueInGuestRequestType
+
+func init() {
+	t["SetRegistryValueInGuest"] = reflect.TypeOf((*SetRegistryValueInGuest)(nil)).Elem()
+}
+
+type SetRegistryValueInGuestRequestType struct {
+	This  ManagedObjectReference  `xml:"_this"`
+	Vm    ManagedObjectReference  `xml:"vm"`
+	Auth  BaseGuestAuthentication `xml:"auth,typeattr"`
+	Value GuestRegValueSpec       `xml:"value"`
+}
+
+func init() {
+	t["SetRegistryValueInGuestRequestType"] = reflect.TypeOf((*SetRegistryValueInGuestRequestType)(nil)).Elem()
+}
+
+type SetRegistryValueInGuestResponse struct {
+}
+
+type SetScreenResolution SetScreenResolutionRequestType
+
+func init() {
+	t["SetScreenResolution"] = reflect.TypeOf((*SetScreenResolution)(nil)).Elem()
+}
+
+type SetScreenResolutionRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Width  int32                  `xml:"width"`
+	Height int32                  `xml:"height"`
+}
+
+func init() {
+	t["SetScreenResolutionRequestType"] = reflect.TypeOf((*SetScreenResolutionRequestType)(nil)).Elem()
+}
+
+type SetScreenResolutionResponse struct {
+}
+
+type SetTaskDescription SetTaskDescriptionRequestType
+
+func init() {
+	t["SetTaskDescription"] = reflect.TypeOf((*SetTaskDescription)(nil)).Elem()
+}
+
+type SetTaskDescriptionRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	Description LocalizableMessage     `xml:"description"`
+}
+
+func init() {
+	t["SetTaskDescriptionRequestType"] = reflect.TypeOf((*SetTaskDescriptionRequestType)(nil)).Elem()
+}
+
+type SetTaskDescriptionResponse struct {
+}
+
+type SetTaskState SetTaskStateRequestType
+
+func init() {
+	t["SetTaskState"] = reflect.TypeOf((*SetTaskState)(nil)).Elem()
+}
+
+type SetTaskStateRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	State  TaskInfoState          `xml:"state"`
+	Result AnyType                `xml:"result,omitempty,typeattr"`
+	Fault  *LocalizedMethodFault  `xml:"fault,omitempty"`
+}
+
+func init() {
+	t["SetTaskStateRequestType"] = reflect.TypeOf((*SetTaskStateRequestType)(nil)).Elem()
+}
+
+type SetTaskStateResponse struct {
+}
+
+type SetVirtualDiskUuid SetVirtualDiskUuidRequestType
+
+func init() {
+	t["SetVirtualDiskUuid"] = reflect.TypeOf((*SetVirtualDiskUuid)(nil)).Elem()
+}
+
+type SetVirtualDiskUuidRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Name       string                  `xml:"name"`
+	Datacenter *ManagedObjectReference `xml:"datacenter,omitempty"`
+	Uuid       string                  `xml:"uuid"`
+}
+
+func init() {
+	t["SetVirtualDiskUuidRequestType"] = reflect.TypeOf((*SetVirtualDiskUuidRequestType)(nil)).Elem()
+}
+
+type SetVirtualDiskUuidResponse struct {
+}
+
+type SharedBusControllerNotSupported struct {
+	DeviceNotSupported
+}
+
+func init() {
+	t["SharedBusControllerNotSupported"] = reflect.TypeOf((*SharedBusControllerNotSupported)(nil)).Elem()
+}
+
+type SharedBusControllerNotSupportedFault SharedBusControllerNotSupported
+
+func init() {
+	t["SharedBusControllerNotSupportedFault"] = reflect.TypeOf((*SharedBusControllerNotSupportedFault)(nil)).Elem()
+}
+
+type SharesInfo struct {
+	DynamicData
+
+	Shares int32       `xml:"shares"`
+	Level  SharesLevel `xml:"level"`
+}
+
+func init() {
+	t["SharesInfo"] = reflect.TypeOf((*SharesInfo)(nil)).Elem()
+}
+
+type SharesOption struct {
+	DynamicData
+
+	SharesOption IntOption   `xml:"sharesOption"`
+	DefaultLevel SharesLevel `xml:"defaultLevel"`
+}
+
+func init() {
+	t["SharesOption"] = reflect.TypeOf((*SharesOption)(nil)).Elem()
+}
+
+type ShrinkDiskFault struct {
+	VimFault
+
+	DiskId int32 `xml:"diskId,omitempty"`
+}
+
+func init() {
+	t["ShrinkDiskFault"] = reflect.TypeOf((*ShrinkDiskFault)(nil)).Elem()
+}
+
+type ShrinkDiskFaultFault ShrinkDiskFault
+
+func init() {
+	t["ShrinkDiskFaultFault"] = reflect.TypeOf((*ShrinkDiskFaultFault)(nil)).Elem()
+}
+
+type ShrinkVirtualDiskRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Name       string                  `xml:"name"`
+	Datacenter *ManagedObjectReference `xml:"datacenter,omitempty"`
+	Copy       *bool                   `xml:"copy"`
+}
+
+func init() {
+	t["ShrinkVirtualDiskRequestType"] = reflect.TypeOf((*ShrinkVirtualDiskRequestType)(nil)).Elem()
+}
+
+type ShrinkVirtualDisk_Task ShrinkVirtualDiskRequestType
+
+func init() {
+	t["ShrinkVirtualDisk_Task"] = reflect.TypeOf((*ShrinkVirtualDisk_Task)(nil)).Elem()
+}
+
+type ShrinkVirtualDisk_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type ShutdownGuest ShutdownGuestRequestType
+
+func init() {
+	t["ShutdownGuest"] = reflect.TypeOf((*ShutdownGuest)(nil)).Elem()
+}
+
+type ShutdownGuestRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["ShutdownGuestRequestType"] = reflect.TypeOf((*ShutdownGuestRequestType)(nil)).Elem()
+}
+
+type ShutdownGuestResponse struct {
+}
+
+type ShutdownHostRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Force bool                   `xml:"force"`
+}
+
+func init() {
+	t["ShutdownHostRequestType"] = reflect.TypeOf((*ShutdownHostRequestType)(nil)).Elem()
+}
+
+type ShutdownHost_Task ShutdownHostRequestType
+
+func init() {
+	t["ShutdownHost_Task"] = reflect.TypeOf((*ShutdownHost_Task)(nil)).Elem()
+}
+
+type ShutdownHost_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type SingleIp struct {
+	IpAddress
+
+	Address string `xml:"address"`
+}
+
+func init() {
+	t["SingleIp"] = reflect.TypeOf((*SingleIp)(nil)).Elem()
+}
+
+type SingleMac struct {
+	MacAddress
+
+	Address string `xml:"address"`
+}
+
+func init() {
+	t["SingleMac"] = reflect.TypeOf((*SingleMac)(nil)).Elem()
+}
+
+type SnapshotCloneNotSupported struct {
+	SnapshotCopyNotSupported
+}
+
+func init() {
+	t["SnapshotCloneNotSupported"] = reflect.TypeOf((*SnapshotCloneNotSupported)(nil)).Elem()
+}
+
+type SnapshotCloneNotSupportedFault SnapshotCloneNotSupported
+
+func init() {
+	t["SnapshotCloneNotSupportedFault"] = reflect.TypeOf((*SnapshotCloneNotSupportedFault)(nil)).Elem()
+}
+
+type SnapshotCopyNotSupported struct {
+	MigrationFault
+}
+
+func init() {
+	t["SnapshotCopyNotSupported"] = reflect.TypeOf((*SnapshotCopyNotSupported)(nil)).Elem()
+}
+
+type SnapshotCopyNotSupportedFault BaseSnapshotCopyNotSupported
+
+func init() {
+	t["SnapshotCopyNotSupportedFault"] = reflect.TypeOf((*SnapshotCopyNotSupportedFault)(nil)).Elem()
+}
+
+type SnapshotDisabled struct {
+	SnapshotFault
+}
+
+func init() {
+	t["SnapshotDisabled"] = reflect.TypeOf((*SnapshotDisabled)(nil)).Elem()
+}
+
+type SnapshotDisabledFault SnapshotDisabled
+
+func init() {
+	t["SnapshotDisabledFault"] = reflect.TypeOf((*SnapshotDisabledFault)(nil)).Elem()
+}
+
+type SnapshotFault struct {
+	VimFault
+}
+
+func init() {
+	t["SnapshotFault"] = reflect.TypeOf((*SnapshotFault)(nil)).Elem()
+}
+
+type SnapshotFaultFault BaseSnapshotFault
+
+func init() {
+	t["SnapshotFaultFault"] = reflect.TypeOf((*SnapshotFaultFault)(nil)).Elem()
+}
+
+type SnapshotIncompatibleDeviceInVm struct {
+	SnapshotFault
+
+	Fault LocalizedMethodFault `xml:"fault"`
+}
+
+func init() {
+	t["SnapshotIncompatibleDeviceInVm"] = reflect.TypeOf((*SnapshotIncompatibleDeviceInVm)(nil)).Elem()
+}
+
+type SnapshotIncompatibleDeviceInVmFault SnapshotIncompatibleDeviceInVm
+
+func init() {
+	t["SnapshotIncompatibleDeviceInVmFault"] = reflect.TypeOf((*SnapshotIncompatibleDeviceInVmFault)(nil)).Elem()
+}
+
+type SnapshotLocked struct {
+	SnapshotFault
+}
+
+func init() {
+	t["SnapshotLocked"] = reflect.TypeOf((*SnapshotLocked)(nil)).Elem()
+}
+
+type SnapshotLockedFault SnapshotLocked
+
+func init() {
+	t["SnapshotLockedFault"] = reflect.TypeOf((*SnapshotLockedFault)(nil)).Elem()
+}
+
+type SnapshotMoveFromNonHomeNotSupported struct {
+	SnapshotCopyNotSupported
+}
+
+func init() {
+	t["SnapshotMoveFromNonHomeNotSupported"] = reflect.TypeOf((*SnapshotMoveFromNonHomeNotSupported)(nil)).Elem()
+}
+
+type SnapshotMoveFromNonHomeNotSupportedFault SnapshotMoveFromNonHomeNotSupported
+
+func init() {
+	t["SnapshotMoveFromNonHomeNotSupportedFault"] = reflect.TypeOf((*SnapshotMoveFromNonHomeNotSupportedFault)(nil)).Elem()
+}
+
+type SnapshotMoveNotSupported struct {
+	SnapshotCopyNotSupported
+}
+
+func init() {
+	t["SnapshotMoveNotSupported"] = reflect.TypeOf((*SnapshotMoveNotSupported)(nil)).Elem()
+}
+
+type SnapshotMoveNotSupportedFault SnapshotMoveNotSupported
+
+func init() {
+	t["SnapshotMoveNotSupportedFault"] = reflect.TypeOf((*SnapshotMoveNotSupportedFault)(nil)).Elem()
+}
+
+type SnapshotMoveToNonHomeNotSupported struct {
+	SnapshotCopyNotSupported
+}
+
+func init() {
+	t["SnapshotMoveToNonHomeNotSupported"] = reflect.TypeOf((*SnapshotMoveToNonHomeNotSupported)(nil)).Elem()
+}
+
+type SnapshotMoveToNonHomeNotSupportedFault SnapshotMoveToNonHomeNotSupported
+
+func init() {
+	t["SnapshotMoveToNonHomeNotSupportedFault"] = reflect.TypeOf((*SnapshotMoveToNonHomeNotSupportedFault)(nil)).Elem()
+}
+
+type SnapshotNoChange struct {
+	SnapshotFault
+}
+
+func init() {
+	t["SnapshotNoChange"] = reflect.TypeOf((*SnapshotNoChange)(nil)).Elem()
+}
+
+type SnapshotNoChangeFault SnapshotNoChange
+
+func init() {
+	t["SnapshotNoChangeFault"] = reflect.TypeOf((*SnapshotNoChangeFault)(nil)).Elem()
+}
+
+type SnapshotRevertIssue struct {
+	MigrationFault
+
+	SnapshotName string      `xml:"snapshotName,omitempty"`
+	Event        []BaseEvent `xml:"event,omitempty,typeattr"`
+	Errors       bool        `xml:"errors"`
+}
+
+func init() {
+	t["SnapshotRevertIssue"] = reflect.TypeOf((*SnapshotRevertIssue)(nil)).Elem()
+}
+
+type SnapshotRevertIssueFault SnapshotRevertIssue
+
+func init() {
+	t["SnapshotRevertIssueFault"] = reflect.TypeOf((*SnapshotRevertIssueFault)(nil)).Elem()
+}
+
+type SoftRuleVioCorrectionDisallowed struct {
+	VmConfigFault
+
+	VmName string `xml:"vmName"`
+}
+
+func init() {
+	t["SoftRuleVioCorrectionDisallowed"] = reflect.TypeOf((*SoftRuleVioCorrectionDisallowed)(nil)).Elem()
+}
+
+type SoftRuleVioCorrectionDisallowedFault SoftRuleVioCorrectionDisallowed
+
+func init() {
+	t["SoftRuleVioCorrectionDisallowedFault"] = reflect.TypeOf((*SoftRuleVioCorrectionDisallowedFault)(nil)).Elem()
+}
+
+type SoftRuleVioCorrectionImpact struct {
+	VmConfigFault
+
+	VmName string `xml:"vmName"`
+}
+
+func init() {
+	t["SoftRuleVioCorrectionImpact"] = reflect.TypeOf((*SoftRuleVioCorrectionImpact)(nil)).Elem()
+}
+
+type SoftRuleVioCorrectionImpactFault SoftRuleVioCorrectionImpact
+
+func init() {
+	t["SoftRuleVioCorrectionImpactFault"] = reflect.TypeOf((*SoftRuleVioCorrectionImpactFault)(nil)).Elem()
+}
+
+type SoftwarePackage struct {
+	DynamicData
+
+	Name                      string                    `xml:"name"`
+	Version                   string                    `xml:"version"`
+	Type                      string                    `xml:"type"`
+	Vendor                    string                    `xml:"vendor"`
+	AcceptanceLevel           string                    `xml:"acceptanceLevel"`
+	Summary                   string                    `xml:"summary"`
+	Description               string                    `xml:"description"`
+	ReferenceURL              []string                  `xml:"referenceURL,omitempty"`
+	CreationDate              *time.Time                `xml:"creationDate"`
+	Depends                   []Relation                `xml:"depends,omitempty"`
+	Conflicts                 []Relation                `xml:"conflicts,omitempty"`
+	Replaces                  []Relation                `xml:"replaces,omitempty"`
+	Provides                  []string                  `xml:"provides,omitempty"`
+	MaintenanceModeRequired   *bool                     `xml:"maintenanceModeRequired"`
+	HardwarePlatformsRequired []string                  `xml:"hardwarePlatformsRequired,omitempty"`
+	Capability                SoftwarePackageCapability `xml:"capability"`
+	Tag                       []string                  `xml:"tag,omitempty"`
+	Payload                   []string                  `xml:"payload,omitempty"`
+}
+
+func init() {
+	t["SoftwarePackage"] = reflect.TypeOf((*SoftwarePackage)(nil)).Elem()
+}
+
+type SoftwarePackageCapability struct {
+	DynamicData
+
+	LiveInstallAllowed *bool `xml:"liveInstallAllowed"`
+	LiveRemoveAllowed  *bool `xml:"liveRemoveAllowed"`
+	StatelessReady     *bool `xml:"statelessReady"`
+	Overlay            *bool `xml:"overlay"`
+}
+
+func init() {
+	t["SoftwarePackageCapability"] = reflect.TypeOf((*SoftwarePackageCapability)(nil)).Elem()
+}
+
+type SourceNodeSpec struct {
+	DynamicData
+
+	ManagementVc ServiceLocator         `xml:"managementVc"`
+	ActiveVc     ManagedObjectReference `xml:"activeVc"`
+}
+
+func init() {
+	t["SourceNodeSpec"] = reflect.TypeOf((*SourceNodeSpec)(nil)).Elem()
+}
+
+type SsdDiskNotAvailable struct {
+	VimFault
+
+	DevicePath string `xml:"devicePath"`
+}
+
+func init() {
+	t["SsdDiskNotAvailable"] = reflect.TypeOf((*SsdDiskNotAvailable)(nil)).Elem()
+}
+
+type SsdDiskNotAvailableFault SsdDiskNotAvailable
+
+func init() {
+	t["SsdDiskNotAvailableFault"] = reflect.TypeOf((*SsdDiskNotAvailableFault)(nil)).Elem()
+}
+
+type StageHostPatchRequestType struct {
+	This       ManagedObjectReference                     `xml:"_this"`
+	MetaUrls   []string                                   `xml:"metaUrls,omitempty"`
+	BundleUrls []string                                   `xml:"bundleUrls,omitempty"`
+	VibUrls    []string                                   `xml:"vibUrls,omitempty"`
+	Spec       *HostPatchManagerPatchManagerOperationSpec `xml:"spec,omitempty"`
+}
+
+func init() {
+	t["StageHostPatchRequestType"] = reflect.TypeOf((*StageHostPatchRequestType)(nil)).Elem()
+}
+
+type StageHostPatch_Task StageHostPatchRequestType
+
+func init() {
+	t["StageHostPatch_Task"] = reflect.TypeOf((*StageHostPatch_Task)(nil)).Elem()
+}
+
+type StageHostPatch_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type StampAllRulesWithUuidRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["StampAllRulesWithUuidRequestType"] = reflect.TypeOf((*StampAllRulesWithUuidRequestType)(nil)).Elem()
+}
+
+type StampAllRulesWithUuid_Task StampAllRulesWithUuidRequestType
+
+func init() {
+	t["StampAllRulesWithUuid_Task"] = reflect.TypeOf((*StampAllRulesWithUuid_Task)(nil)).Elem()
+}
+
+type StampAllRulesWithUuid_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type StandbyGuest StandbyGuestRequestType
+
+func init() {
+	t["StandbyGuest"] = reflect.TypeOf((*StandbyGuest)(nil)).Elem()
+}
+
+type StandbyGuestRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["StandbyGuestRequestType"] = reflect.TypeOf((*StandbyGuestRequestType)(nil)).Elem()
+}
+
+type StandbyGuestResponse struct {
+}
+
+type StartProgramInGuest StartProgramInGuestRequestType
+
+func init() {
+	t["StartProgramInGuest"] = reflect.TypeOf((*StartProgramInGuest)(nil)).Elem()
+}
+
+type StartProgramInGuestRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Vm   ManagedObjectReference  `xml:"vm"`
+	Auth BaseGuestAuthentication `xml:"auth,typeattr"`
+	Spec BaseGuestProgramSpec    `xml:"spec,typeattr"`
+}
+
+func init() {
+	t["StartProgramInGuestRequestType"] = reflect.TypeOf((*StartProgramInGuestRequestType)(nil)).Elem()
+}
+
+type StartProgramInGuestResponse struct {
+	Returnval int64 `xml:"returnval"`
+}
+
+type StartRecordingRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	Name        string                 `xml:"name"`
+	Description string                 `xml:"description,omitempty"`
+}
+
+func init() {
+	t["StartRecordingRequestType"] = reflect.TypeOf((*StartRecordingRequestType)(nil)).Elem()
+}
+
+type StartRecording_Task StartRecordingRequestType
+
+func init() {
+	t["StartRecording_Task"] = reflect.TypeOf((*StartRecording_Task)(nil)).Elem()
+}
+
+type StartRecording_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type StartReplayingRequestType struct {
+	This           ManagedObjectReference `xml:"_this"`
+	ReplaySnapshot ManagedObjectReference `xml:"replaySnapshot"`
+}
+
+func init() {
+	t["StartReplayingRequestType"] = reflect.TypeOf((*StartReplayingRequestType)(nil)).Elem()
+}
+
+type StartReplaying_Task StartReplayingRequestType
+
+func init() {
+	t["StartReplaying_Task"] = reflect.TypeOf((*StartReplaying_Task)(nil)).Elem()
+}
+
+type StartReplaying_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type StartService StartServiceRequestType
+
+func init() {
+	t["StartService"] = reflect.TypeOf((*StartService)(nil)).Elem()
+}
+
+type StartServiceRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Id   string                 `xml:"id"`
+}
+
+func init() {
+	t["StartServiceRequestType"] = reflect.TypeOf((*StartServiceRequestType)(nil)).Elem()
+}
+
+type StartServiceResponse struct {
+}
+
+type StateAlarmExpression struct {
+	AlarmExpression
+
+	Operator  StateAlarmOperator `xml:"operator"`
+	Type      string             `xml:"type"`
+	StatePath string             `xml:"statePath"`
+	Yellow    string             `xml:"yellow,omitempty"`
+	Red       string             `xml:"red,omitempty"`
+}
+
+func init() {
+	t["StateAlarmExpression"] = reflect.TypeOf((*StateAlarmExpression)(nil)).Elem()
+}
+
+type StaticRouteProfile struct {
+	ApplyProfile
+
+	Key string `xml:"key,omitempty"`
+}
+
+func init() {
+	t["StaticRouteProfile"] = reflect.TypeOf((*StaticRouteProfile)(nil)).Elem()
+}
+
+type StopRecordingRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["StopRecordingRequestType"] = reflect.TypeOf((*StopRecordingRequestType)(nil)).Elem()
+}
+
+type StopRecording_Task StopRecordingRequestType
+
+func init() {
+	t["StopRecording_Task"] = reflect.TypeOf((*StopRecording_Task)(nil)).Elem()
+}
+
+type StopRecording_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type StopReplayingRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["StopReplayingRequestType"] = reflect.TypeOf((*StopReplayingRequestType)(nil)).Elem()
+}
+
+type StopReplaying_Task StopReplayingRequestType
+
+func init() {
+	t["StopReplaying_Task"] = reflect.TypeOf((*StopReplaying_Task)(nil)).Elem()
+}
+
+type StopReplaying_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type StopService StopServiceRequestType
+
+func init() {
+	t["StopService"] = reflect.TypeOf((*StopService)(nil)).Elem()
+}
+
+type StopServiceRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Id   string                 `xml:"id"`
+}
+
+func init() {
+	t["StopServiceRequestType"] = reflect.TypeOf((*StopServiceRequestType)(nil)).Elem()
+}
+
+type StopServiceResponse struct {
+}
+
+type StorageDrsAutomationConfig struct {
+	DynamicData
+
+	SpaceLoadBalanceAutomationMode  string `xml:"spaceLoadBalanceAutomationMode,omitempty"`
+	IoLoadBalanceAutomationMode     string `xml:"ioLoadBalanceAutomationMode,omitempty"`
+	RuleEnforcementAutomationMode   string `xml:"ruleEnforcementAutomationMode,omitempty"`
+	PolicyEnforcementAutomationMode string `xml:"policyEnforcementAutomationMode,omitempty"`
+	VmEvacuationAutomationMode      string `xml:"vmEvacuationAutomationMode,omitempty"`
+}
+
+func init() {
+	t["StorageDrsAutomationConfig"] = reflect.TypeOf((*StorageDrsAutomationConfig)(nil)).Elem()
+}
+
+type StorageDrsCannotMoveDiskInMultiWriterMode struct {
+	VimFault
+}
+
+func init() {
+	t["StorageDrsCannotMoveDiskInMultiWriterMode"] = reflect.TypeOf((*StorageDrsCannotMoveDiskInMultiWriterMode)(nil)).Elem()
+}
+
+type StorageDrsCannotMoveDiskInMultiWriterModeFault StorageDrsCannotMoveDiskInMultiWriterMode
+
+func init() {
+	t["StorageDrsCannotMoveDiskInMultiWriterModeFault"] = reflect.TypeOf((*StorageDrsCannotMoveDiskInMultiWriterModeFault)(nil)).Elem()
+}
+
+type StorageDrsCannotMoveFTVm struct {
+	VimFault
+}
+
+func init() {
+	t["StorageDrsCannotMoveFTVm"] = reflect.TypeOf((*StorageDrsCannotMoveFTVm)(nil)).Elem()
+}
+
+type StorageDrsCannotMoveFTVmFault StorageDrsCannotMoveFTVm
+
+func init() {
+	t["StorageDrsCannotMoveFTVmFault"] = reflect.TypeOf((*StorageDrsCannotMoveFTVmFault)(nil)).Elem()
+}
+
+type StorageDrsCannotMoveIndependentDisk struct {
+	VimFault
+}
+
+func init() {
+	t["StorageDrsCannotMoveIndependentDisk"] = reflect.TypeOf((*StorageDrsCannotMoveIndependentDisk)(nil)).Elem()
+}
+
+type StorageDrsCannotMoveIndependentDiskFault StorageDrsCannotMoveIndependentDisk
+
+func init() {
+	t["StorageDrsCannotMoveIndependentDiskFault"] = reflect.TypeOf((*StorageDrsCannotMoveIndependentDiskFault)(nil)).Elem()
+}
+
+type StorageDrsCannotMoveManuallyPlacedSwapFile struct {
+	VimFault
+}
+
+func init() {
+	t["StorageDrsCannotMoveManuallyPlacedSwapFile"] = reflect.TypeOf((*StorageDrsCannotMoveManuallyPlacedSwapFile)(nil)).Elem()
+}
+
+type StorageDrsCannotMoveManuallyPlacedSwapFileFault StorageDrsCannotMoveManuallyPlacedSwapFile
+
+func init() {
+	t["StorageDrsCannotMoveManuallyPlacedSwapFileFault"] = reflect.TypeOf((*StorageDrsCannotMoveManuallyPlacedSwapFileFault)(nil)).Elem()
+}
+
+type StorageDrsCannotMoveManuallyPlacedVm struct {
+	VimFault
+}
+
+func init() {
+	t["StorageDrsCannotMoveManuallyPlacedVm"] = reflect.TypeOf((*StorageDrsCannotMoveManuallyPlacedVm)(nil)).Elem()
+}
+
+type StorageDrsCannotMoveManuallyPlacedVmFault StorageDrsCannotMoveManuallyPlacedVm
+
+func init() {
+	t["StorageDrsCannotMoveManuallyPlacedVmFault"] = reflect.TypeOf((*StorageDrsCannotMoveManuallyPlacedVmFault)(nil)).Elem()
+}
+
+type StorageDrsCannotMoveSharedDisk struct {
+	VimFault
+}
+
+func init() {
+	t["StorageDrsCannotMoveSharedDisk"] = reflect.TypeOf((*StorageDrsCannotMoveSharedDisk)(nil)).Elem()
+}
+
+type StorageDrsCannotMoveSharedDiskFault StorageDrsCannotMoveSharedDisk
+
+func init() {
+	t["StorageDrsCannotMoveSharedDiskFault"] = reflect.TypeOf((*StorageDrsCannotMoveSharedDiskFault)(nil)).Elem()
+}
+
+type StorageDrsCannotMoveTemplate struct {
+	VimFault
+}
+
+func init() {
+	t["StorageDrsCannotMoveTemplate"] = reflect.TypeOf((*StorageDrsCannotMoveTemplate)(nil)).Elem()
+}
+
+type StorageDrsCannotMoveTemplateFault StorageDrsCannotMoveTemplate
+
+func init() {
+	t["StorageDrsCannotMoveTemplateFault"] = reflect.TypeOf((*StorageDrsCannotMoveTemplateFault)(nil)).Elem()
+}
+
+type StorageDrsCannotMoveVmInUserFolder struct {
+	VimFault
+}
+
+func init() {
+	t["StorageDrsCannotMoveVmInUserFolder"] = reflect.TypeOf((*StorageDrsCannotMoveVmInUserFolder)(nil)).Elem()
+}
+
+type StorageDrsCannotMoveVmInUserFolderFault StorageDrsCannotMoveVmInUserFolder
+
+func init() {
+	t["StorageDrsCannotMoveVmInUserFolderFault"] = reflect.TypeOf((*StorageDrsCannotMoveVmInUserFolderFault)(nil)).Elem()
+}
+
+type StorageDrsCannotMoveVmWithMountedCDROM struct {
+	VimFault
+}
+
+func init() {
+	t["StorageDrsCannotMoveVmWithMountedCDROM"] = reflect.TypeOf((*StorageDrsCannotMoveVmWithMountedCDROM)(nil)).Elem()
+}
+
+type StorageDrsCannotMoveVmWithMountedCDROMFault StorageDrsCannotMoveVmWithMountedCDROM
+
+func init() {
+	t["StorageDrsCannotMoveVmWithMountedCDROMFault"] = reflect.TypeOf((*StorageDrsCannotMoveVmWithMountedCDROMFault)(nil)).Elem()
+}
+
+type StorageDrsCannotMoveVmWithNoFilesInLayout struct {
+	VimFault
+}
+
+func init() {
+	t["StorageDrsCannotMoveVmWithNoFilesInLayout"] = reflect.TypeOf((*StorageDrsCannotMoveVmWithNoFilesInLayout)(nil)).Elem()
+}
+
+type StorageDrsCannotMoveVmWithNoFilesInLayoutFault StorageDrsCannotMoveVmWithNoFilesInLayout
+
+func init() {
+	t["StorageDrsCannotMoveVmWithNoFilesInLayoutFault"] = reflect.TypeOf((*StorageDrsCannotMoveVmWithNoFilesInLayoutFault)(nil)).Elem()
+}
+
+type StorageDrsConfigInfo struct {
+	DynamicData
+
+	PodConfig StorageDrsPodConfigInfo  `xml:"podConfig"`
+	VmConfig  []StorageDrsVmConfigInfo `xml:"vmConfig,omitempty"`
+}
+
+func init() {
+	t["StorageDrsConfigInfo"] = reflect.TypeOf((*StorageDrsConfigInfo)(nil)).Elem()
+}
+
+type StorageDrsConfigSpec struct {
+	DynamicData
+
+	PodConfigSpec *StorageDrsPodConfigSpec `xml:"podConfigSpec,omitempty"`
+	VmConfigSpec  []StorageDrsVmConfigSpec `xml:"vmConfigSpec,omitempty"`
+}
+
+func init() {
+	t["StorageDrsConfigSpec"] = reflect.TypeOf((*StorageDrsConfigSpec)(nil)).Elem()
+}
+
+type StorageDrsDatacentersCannotShareDatastore struct {
+	VimFault
+}
+
+func init() {
+	t["StorageDrsDatacentersCannotShareDatastore"] = reflect.TypeOf((*StorageDrsDatacentersCannotShareDatastore)(nil)).Elem()
+}
+
+type StorageDrsDatacentersCannotShareDatastoreFault StorageDrsDatacentersCannotShareDatastore
+
+func init() {
+	t["StorageDrsDatacentersCannotShareDatastoreFault"] = reflect.TypeOf((*StorageDrsDatacentersCannotShareDatastoreFault)(nil)).Elem()
+}
+
+type StorageDrsDisabledOnVm struct {
+	VimFault
+}
+
+func init() {
+	t["StorageDrsDisabledOnVm"] = reflect.TypeOf((*StorageDrsDisabledOnVm)(nil)).Elem()
+}
+
+type StorageDrsDisabledOnVmFault StorageDrsDisabledOnVm
+
+func init() {
+	t["StorageDrsDisabledOnVmFault"] = reflect.TypeOf((*StorageDrsDisabledOnVmFault)(nil)).Elem()
+}
+
+type StorageDrsHbrDiskNotMovable struct {
+	VimFault
+
+	NonMovableDiskIds string `xml:"nonMovableDiskIds"`
+}
+
+func init() {
+	t["StorageDrsHbrDiskNotMovable"] = reflect.TypeOf((*StorageDrsHbrDiskNotMovable)(nil)).Elem()
+}
+
+type StorageDrsHbrDiskNotMovableFault StorageDrsHbrDiskNotMovable
+
+func init() {
+	t["StorageDrsHbrDiskNotMovableFault"] = reflect.TypeOf((*StorageDrsHbrDiskNotMovableFault)(nil)).Elem()
+}
+
+type StorageDrsHmsMoveInProgress struct {
+	VimFault
+}
+
+func init() {
+	t["StorageDrsHmsMoveInProgress"] = reflect.TypeOf((*StorageDrsHmsMoveInProgress)(nil)).Elem()
+}
+
+type StorageDrsHmsMoveInProgressFault StorageDrsHmsMoveInProgress
+
+func init() {
+	t["StorageDrsHmsMoveInProgressFault"] = reflect.TypeOf((*StorageDrsHmsMoveInProgressFault)(nil)).Elem()
+}
+
+type StorageDrsHmsUnreachable struct {
+	VimFault
+}
+
+func init() {
+	t["StorageDrsHmsUnreachable"] = reflect.TypeOf((*StorageDrsHmsUnreachable)(nil)).Elem()
+}
+
+type StorageDrsHmsUnreachableFault StorageDrsHmsUnreachable
+
+func init() {
+	t["StorageDrsHmsUnreachableFault"] = reflect.TypeOf((*StorageDrsHmsUnreachableFault)(nil)).Elem()
+}
+
+type StorageDrsIoLoadBalanceConfig struct {
+	DynamicData
+
+	ReservablePercentThreshold int32  `xml:"reservablePercentThreshold,omitempty"`
+	ReservableIopsThreshold    int32  `xml:"reservableIopsThreshold,omitempty"`
+	ReservableThresholdMode    string `xml:"reservableThresholdMode,omitempty"`
+	IoLatencyThreshold         int32  `xml:"ioLatencyThreshold,omitempty"`
+	IoLoadImbalanceThreshold   int32  `xml:"ioLoadImbalanceThreshold,omitempty"`
+}
+
+func init() {
+	t["StorageDrsIoLoadBalanceConfig"] = reflect.TypeOf((*StorageDrsIoLoadBalanceConfig)(nil)).Elem()
+}
+
+type StorageDrsIolbDisabledInternally struct {
+	VimFault
+}
+
+func init() {
+	t["StorageDrsIolbDisabledInternally"] = reflect.TypeOf((*StorageDrsIolbDisabledInternally)(nil)).Elem()
+}
+
+type StorageDrsIolbDisabledInternallyFault StorageDrsIolbDisabledInternally
+
+func init() {
+	t["StorageDrsIolbDisabledInternallyFault"] = reflect.TypeOf((*StorageDrsIolbDisabledInternallyFault)(nil)).Elem()
+}
+
+type StorageDrsOptionSpec struct {
+	ArrayUpdateSpec
+
+	Option BaseOptionValue `xml:"option,omitempty,typeattr"`
+}
+
+func init() {
+	t["StorageDrsOptionSpec"] = reflect.TypeOf((*StorageDrsOptionSpec)(nil)).Elem()
+}
+
+type StorageDrsPlacementRankVmSpec struct {
+	DynamicData
+
+	VmPlacementSpec PlacementSpec            `xml:"vmPlacementSpec"`
+	VmClusters      []ManagedObjectReference `xml:"vmClusters"`
+}
+
+func init() {
+	t["StorageDrsPlacementRankVmSpec"] = reflect.TypeOf((*StorageDrsPlacementRankVmSpec)(nil)).Elem()
+}
+
+type StorageDrsPodConfigInfo struct {
+	DynamicData
+
+	Enabled                bool                              `xml:"enabled"`
+	IoLoadBalanceEnabled   bool                              `xml:"ioLoadBalanceEnabled"`
+	DefaultVmBehavior      string                            `xml:"defaultVmBehavior"`
+	LoadBalanceInterval    int32                             `xml:"loadBalanceInterval,omitempty"`
+	DefaultIntraVmAffinity *bool                             `xml:"defaultIntraVmAffinity"`
+	SpaceLoadBalanceConfig *StorageDrsSpaceLoadBalanceConfig `xml:"spaceLoadBalanceConfig,omitempty"`
+	IoLoadBalanceConfig    *StorageDrsIoLoadBalanceConfig    `xml:"ioLoadBalanceConfig,omitempty"`
+	AutomationOverrides    *StorageDrsAutomationConfig       `xml:"automationOverrides,omitempty"`
+	Rule                   []BaseClusterRuleInfo             `xml:"rule,omitempty,typeattr"`
+	Option                 []BaseOptionValue                 `xml:"option,omitempty,typeattr"`
+}
+
+func init() {
+	t["StorageDrsPodConfigInfo"] = reflect.TypeOf((*StorageDrsPodConfigInfo)(nil)).Elem()
+}
+
+type StorageDrsPodConfigSpec struct {
+	DynamicData
+
+	Enabled                *bool                             `xml:"enabled"`
+	IoLoadBalanceEnabled   *bool                             `xml:"ioLoadBalanceEnabled"`
+	DefaultVmBehavior      string                            `xml:"defaultVmBehavior,omitempty"`
+	LoadBalanceInterval    int32                             `xml:"loadBalanceInterval,omitempty"`
+	DefaultIntraVmAffinity *bool                             `xml:"defaultIntraVmAffinity"`
+	SpaceLoadBalanceConfig *StorageDrsSpaceLoadBalanceConfig `xml:"spaceLoadBalanceConfig,omitempty"`
+	IoLoadBalanceConfig    *StorageDrsIoLoadBalanceConfig    `xml:"ioLoadBalanceConfig,omitempty"`
+	AutomationOverrides    *StorageDrsAutomationConfig       `xml:"automationOverrides,omitempty"`
+	Rule                   []ClusterRuleSpec                 `xml:"rule,omitempty"`
+	Option                 []StorageDrsOptionSpec            `xml:"option,omitempty"`
+}
+
+func init() {
+	t["StorageDrsPodConfigSpec"] = reflect.TypeOf((*StorageDrsPodConfigSpec)(nil)).Elem()
+}
+
+type StorageDrsPodSelectionSpec struct {
+	DynamicData
+
+	InitialVmConfig []VmPodConfigForPlacement `xml:"initialVmConfig,omitempty"`
+	StoragePod      *ManagedObjectReference   `xml:"storagePod,omitempty"`
+}
+
+func init() {
+	t["StorageDrsPodSelectionSpec"] = reflect.TypeOf((*StorageDrsPodSelectionSpec)(nil)).Elem()
+}
+
+type StorageDrsRelocateDisabled struct {
+	VimFault
+}
+
+func init() {
+	t["StorageDrsRelocateDisabled"] = reflect.TypeOf((*StorageDrsRelocateDisabled)(nil)).Elem()
+}
+
+type StorageDrsRelocateDisabledFault StorageDrsRelocateDisabled
+
+func init() {
+	t["StorageDrsRelocateDisabledFault"] = reflect.TypeOf((*StorageDrsRelocateDisabledFault)(nil)).Elem()
+}
+
+type StorageDrsSpaceLoadBalanceConfig struct {
+	DynamicData
+
+	SpaceThresholdMode            string `xml:"spaceThresholdMode,omitempty"`
+	SpaceUtilizationThreshold     int32  `xml:"spaceUtilizationThreshold,omitempty"`
+	FreeSpaceThresholdGB          int32  `xml:"freeSpaceThresholdGB,omitempty"`
+	MinSpaceUtilizationDifference int32  `xml:"minSpaceUtilizationDifference,omitempty"`
+}
+
+func init() {
+	t["StorageDrsSpaceLoadBalanceConfig"] = reflect.TypeOf((*StorageDrsSpaceLoadBalanceConfig)(nil)).Elem()
+}
+
+type StorageDrsStaleHmsCollection struct {
+	VimFault
+}
+
+func init() {
+	t["StorageDrsStaleHmsCollection"] = reflect.TypeOf((*StorageDrsStaleHmsCollection)(nil)).Elem()
+}
+
+type StorageDrsStaleHmsCollectionFault StorageDrsStaleHmsCollection
+
+func init() {
+	t["StorageDrsStaleHmsCollectionFault"] = reflect.TypeOf((*StorageDrsStaleHmsCollectionFault)(nil)).Elem()
+}
+
+type StorageDrsUnableToMoveFiles struct {
+	VimFault
+}
+
+func init() {
+	t["StorageDrsUnableToMoveFiles"] = reflect.TypeOf((*StorageDrsUnableToMoveFiles)(nil)).Elem()
+}
+
+type StorageDrsUnableToMoveFilesFault StorageDrsUnableToMoveFiles
+
+func init() {
+	t["StorageDrsUnableToMoveFilesFault"] = reflect.TypeOf((*StorageDrsUnableToMoveFilesFault)(nil)).Elem()
+}
+
+type StorageDrsVmConfigInfo struct {
+	DynamicData
+
+	Vm                  *ManagedObjectReference          `xml:"vm,omitempty"`
+	Enabled             *bool                            `xml:"enabled"`
+	Behavior            string                           `xml:"behavior,omitempty"`
+	IntraVmAffinity     *bool                            `xml:"intraVmAffinity"`
+	IntraVmAntiAffinity *VirtualDiskAntiAffinityRuleSpec `xml:"intraVmAntiAffinity,omitempty"`
+}
+
+func init() {
+	t["StorageDrsVmConfigInfo"] = reflect.TypeOf((*StorageDrsVmConfigInfo)(nil)).Elem()
+}
+
+type StorageDrsVmConfigSpec struct {
+	ArrayUpdateSpec
+
+	Info *StorageDrsVmConfigInfo `xml:"info,omitempty"`
+}
+
+func init() {
+	t["StorageDrsVmConfigSpec"] = reflect.TypeOf((*StorageDrsVmConfigSpec)(nil)).Elem()
+}
+
+type StorageIOAllocationInfo struct {
+	DynamicData
+
+	Limit       int64       `xml:"limit,omitempty"`
+	Shares      *SharesInfo `xml:"shares,omitempty"`
+	Reservation int32       `xml:"reservation,omitempty"`
+}
+
+func init() {
+	t["StorageIOAllocationInfo"] = reflect.TypeOf((*StorageIOAllocationInfo)(nil)).Elem()
+}
+
+type StorageIOAllocationOption struct {
+	DynamicData
+
+	LimitOption  LongOption   `xml:"limitOption"`
+	SharesOption SharesOption `xml:"sharesOption"`
+}
+
+func init() {
+	t["StorageIOAllocationOption"] = reflect.TypeOf((*StorageIOAllocationOption)(nil)).Elem()
+}
+
+type StorageIORMConfigOption struct {
+	DynamicData
+
+	EnabledOption                BoolOption  `xml:"enabledOption"`
+	CongestionThresholdOption    IntOption   `xml:"congestionThresholdOption"`
+	StatsCollectionEnabledOption *BoolOption `xml:"statsCollectionEnabledOption,omitempty"`
+	ReservationEnabledOption     *BoolOption `xml:"reservationEnabledOption,omitempty"`
+}
+
+func init() {
+	t["StorageIORMConfigOption"] = reflect.TypeOf((*StorageIORMConfigOption)(nil)).Elem()
+}
+
+type StorageIORMConfigSpec struct {
+	DynamicData
+
+	Enabled                  *bool  `xml:"enabled"`
+	CongestionThresholdMode  string `xml:"congestionThresholdMode,omitempty"`
+	CongestionThreshold      int32  `xml:"congestionThreshold,omitempty"`
+	PercentOfPeakThroughput  int32  `xml:"percentOfPeakThroughput,omitempty"`
+	StatsCollectionEnabled   *bool  `xml:"statsCollectionEnabled"`
+	ReservationEnabled       *bool  `xml:"reservationEnabled"`
+	StatsAggregationDisabled *bool  `xml:"statsAggregationDisabled"`
+	ReservableIopsThreshold  int32  `xml:"reservableIopsThreshold,omitempty"`
+}
+
+func init() {
+	t["StorageIORMConfigSpec"] = reflect.TypeOf((*StorageIORMConfigSpec)(nil)).Elem()
+}
+
+type StorageIORMInfo struct {
+	DynamicData
+
+	Enabled                  bool   `xml:"enabled"`
+	CongestionThresholdMode  string `xml:"congestionThresholdMode,omitempty"`
+	CongestionThreshold      int32  `xml:"congestionThreshold"`
+	PercentOfPeakThroughput  int32  `xml:"percentOfPeakThroughput,omitempty"`
+	StatsCollectionEnabled   *bool  `xml:"statsCollectionEnabled"`
+	ReservationEnabled       *bool  `xml:"reservationEnabled"`
+	StatsAggregationDisabled *bool  `xml:"statsAggregationDisabled"`
+	ReservableIopsThreshold  int32  `xml:"reservableIopsThreshold,omitempty"`
+}
+
+func init() {
+	t["StorageIORMInfo"] = reflect.TypeOf((*StorageIORMInfo)(nil)).Elem()
+}
+
+type StorageMigrationAction struct {
+	ClusterAction
+
+	Vm                 ManagedObjectReference     `xml:"vm"`
+	RelocateSpec       VirtualMachineRelocateSpec `xml:"relocateSpec"`
+	Source             ManagedObjectReference     `xml:"source"`
+	Destination        ManagedObjectReference     `xml:"destination"`
+	SizeTransferred    int64                      `xml:"sizeTransferred"`
+	SpaceUtilSrcBefore float32                    `xml:"spaceUtilSrcBefore,omitempty"`
+	SpaceUtilDstBefore float32                    `xml:"spaceUtilDstBefore,omitempty"`
+	SpaceUtilSrcAfter  float32                    `xml:"spaceUtilSrcAfter,omitempty"`
+	SpaceUtilDstAfter  float32                    `xml:"spaceUtilDstAfter,omitempty"`
+	IoLatencySrcBefore float32                    `xml:"ioLatencySrcBefore,omitempty"`
+	IoLatencyDstBefore float32                    `xml:"ioLatencyDstBefore,omitempty"`
+}
+
+func init() {
+	t["StorageMigrationAction"] = reflect.TypeOf((*StorageMigrationAction)(nil)).Elem()
+}
+
+type StoragePerformanceSummary struct {
+	DynamicData
+
+	Interval              int32     `xml:"interval"`
+	Percentile            []int32   `xml:"percentile"`
+	DatastoreReadLatency  []float64 `xml:"datastoreReadLatency"`
+	DatastoreWriteLatency []float64 `xml:"datastoreWriteLatency"`
+	DatastoreVmLatency    []float64 `xml:"datastoreVmLatency"`
+	DatastoreReadIops     []float64 `xml:"datastoreReadIops"`
+	DatastoreWriteIops    []float64 `xml:"datastoreWriteIops"`
+	SiocActivityDuration  int32     `xml:"siocActivityDuration"`
+}
+
+func init() {
+	t["StoragePerformanceSummary"] = reflect.TypeOf((*StoragePerformanceSummary)(nil)).Elem()
+}
+
+type StoragePlacementAction struct {
+	ClusterAction
+
+	Vm                *ManagedObjectReference    `xml:"vm,omitempty"`
+	RelocateSpec      VirtualMachineRelocateSpec `xml:"relocateSpec"`
+	Destination       ManagedObjectReference     `xml:"destination"`
+	SpaceUtilBefore   float32                    `xml:"spaceUtilBefore,omitempty"`
+	SpaceDemandBefore float32                    `xml:"spaceDemandBefore,omitempty"`
+	SpaceUtilAfter    float32                    `xml:"spaceUtilAfter,omitempty"`
+	SpaceDemandAfter  float32                    `xml:"spaceDemandAfter,omitempty"`
+	IoLatencyBefore   float32                    `xml:"ioLatencyBefore,omitempty"`
+}
+
+func init() {
+	t["StoragePlacementAction"] = reflect.TypeOf((*StoragePlacementAction)(nil)).Elem()
+}
+
+type StoragePlacementResult struct {
+	DynamicData
+
+	Recommendations []ClusterRecommendation `xml:"recommendations,omitempty"`
+	DrsFault        *ClusterDrsFaults       `xml:"drsFault,omitempty"`
+	Task            *ManagedObjectReference `xml:"task,omitempty"`
+}
+
+func init() {
+	t["StoragePlacementResult"] = reflect.TypeOf((*StoragePlacementResult)(nil)).Elem()
+}
+
+type StoragePlacementSpec struct {
+	DynamicData
+
+	Type                      string                      `xml:"type"`
+	Priority                  VirtualMachineMovePriority  `xml:"priority,omitempty"`
+	Vm                        *ManagedObjectReference     `xml:"vm,omitempty"`
+	PodSelectionSpec          StorageDrsPodSelectionSpec  `xml:"podSelectionSpec"`
+	CloneSpec                 *VirtualMachineCloneSpec    `xml:"cloneSpec,omitempty"`
+	CloneName                 string                      `xml:"cloneName,omitempty"`
+	ConfigSpec                *VirtualMachineConfigSpec   `xml:"configSpec,omitempty"`
+	RelocateSpec              *VirtualMachineRelocateSpec `xml:"relocateSpec,omitempty"`
+	ResourcePool              *ManagedObjectReference     `xml:"resourcePool,omitempty"`
+	Host                      *ManagedObjectReference     `xml:"host,omitempty"`
+	Folder                    *ManagedObjectReference     `xml:"folder,omitempty"`
+	DisallowPrerequisiteMoves *bool                       `xml:"disallowPrerequisiteMoves"`
+	ResourceLeaseDurationSec  int32                       `xml:"resourceLeaseDurationSec,omitempty"`
+}
+
+func init() {
+	t["StoragePlacementSpec"] = reflect.TypeOf((*StoragePlacementSpec)(nil)).Elem()
+}
+
+type StoragePodSummary struct {
+	DynamicData
+
+	Name      string `xml:"name"`
+	Capacity  int64  `xml:"capacity"`
+	FreeSpace int64  `xml:"freeSpace"`
+}
+
+func init() {
+	t["StoragePodSummary"] = reflect.TypeOf((*StoragePodSummary)(nil)).Elem()
+}
+
+type StorageProfile struct {
+	ApplyProfile
+
+	NasStorage []NasStorageProfile `xml:"nasStorage,omitempty"`
+}
+
+func init() {
+	t["StorageProfile"] = reflect.TypeOf((*StorageProfile)(nil)).Elem()
+}
+
+type StorageRequirement struct {
+	DynamicData
+
+	Datastore             ManagedObjectReference `xml:"datastore"`
+	FreeSpaceRequiredInKb int64                  `xml:"freeSpaceRequiredInKb"`
+}
+
+func init() {
+	t["StorageRequirement"] = reflect.TypeOf((*StorageRequirement)(nil)).Elem()
+}
+
+type StorageResourceManagerStorageProfileStatistics struct {
+	DynamicData
+
+	ProfileId    string `xml:"profileId"`
+	TotalSpaceMB int64  `xml:"totalSpaceMB"`
+	UsedSpaceMB  int64  `xml:"usedSpaceMB"`
+}
+
+func init() {
+	t["StorageResourceManagerStorageProfileStatistics"] = reflect.TypeOf((*StorageResourceManagerStorageProfileStatistics)(nil)).Elem()
+}
+
+type StorageVMotionNotSupported struct {
+	MigrationFeatureNotSupported
+}
+
+func init() {
+	t["StorageVMotionNotSupported"] = reflect.TypeOf((*StorageVMotionNotSupported)(nil)).Elem()
+}
+
+type StorageVMotionNotSupportedFault StorageVMotionNotSupported
+
+func init() {
+	t["StorageVMotionNotSupportedFault"] = reflect.TypeOf((*StorageVMotionNotSupportedFault)(nil)).Elem()
+}
+
+type StorageVmotionIncompatible struct {
+	VirtualHardwareCompatibilityIssue
+
+	Datastore *ManagedObjectReference `xml:"datastore,omitempty"`
+}
+
+func init() {
+	t["StorageVmotionIncompatible"] = reflect.TypeOf((*StorageVmotionIncompatible)(nil)).Elem()
+}
+
+type StorageVmotionIncompatibleFault StorageVmotionIncompatible
+
+func init() {
+	t["StorageVmotionIncompatibleFault"] = reflect.TypeOf((*StorageVmotionIncompatibleFault)(nil)).Elem()
+}
+
+type StringExpression struct {
+	NegatableExpression
+
+	Value string `xml:"value,omitempty"`
+}
+
+func init() {
+	t["StringExpression"] = reflect.TypeOf((*StringExpression)(nil)).Elem()
+}
+
+type StringOption struct {
+	OptionType
+
+	DefaultValue    string `xml:"defaultValue"`
+	ValidCharacters string `xml:"validCharacters,omitempty"`
+}
+
+func init() {
+	t["StringOption"] = reflect.TypeOf((*StringOption)(nil)).Elem()
+}
+
+type StringPolicy struct {
+	InheritablePolicy
+
+	Value string `xml:"value,omitempty"`
+}
+
+func init() {
+	t["StringPolicy"] = reflect.TypeOf((*StringPolicy)(nil)).Elem()
+}
+
+type StructuredCustomizations struct {
+	HostProfilesEntityCustomizations
+
+	Entity         ManagedObjectReference `xml:"entity"`
+	Customizations *AnswerFile            `xml:"customizations,omitempty"`
+}
+
+func init() {
+	t["StructuredCustomizations"] = reflect.TypeOf((*StructuredCustomizations)(nil)).Elem()
+}
+
+type SuspendVAppRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["SuspendVAppRequestType"] = reflect.TypeOf((*SuspendVAppRequestType)(nil)).Elem()
+}
+
+type SuspendVApp_Task SuspendVAppRequestType
+
+func init() {
+	t["SuspendVApp_Task"] = reflect.TypeOf((*SuspendVApp_Task)(nil)).Elem()
+}
+
+type SuspendVApp_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type SuspendVMRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["SuspendVMRequestType"] = reflect.TypeOf((*SuspendVMRequestType)(nil)).Elem()
+}
+
+type SuspendVM_Task SuspendVMRequestType
+
+func init() {
+	t["SuspendVM_Task"] = reflect.TypeOf((*SuspendVM_Task)(nil)).Elem()
+}
+
+type SuspendVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type SuspendedRelocateNotSupported struct {
+	MigrationFault
+}
+
+func init() {
+	t["SuspendedRelocateNotSupported"] = reflect.TypeOf((*SuspendedRelocateNotSupported)(nil)).Elem()
+}
+
+type SuspendedRelocateNotSupportedFault SuspendedRelocateNotSupported
+
+func init() {
+	t["SuspendedRelocateNotSupportedFault"] = reflect.TypeOf((*SuspendedRelocateNotSupportedFault)(nil)).Elem()
+}
+
+type SwapDatastoreNotWritableOnHost struct {
+	DatastoreNotWritableOnHost
+}
+
+func init() {
+	t["SwapDatastoreNotWritableOnHost"] = reflect.TypeOf((*SwapDatastoreNotWritableOnHost)(nil)).Elem()
+}
+
+type SwapDatastoreNotWritableOnHostFault SwapDatastoreNotWritableOnHost
+
+func init() {
+	t["SwapDatastoreNotWritableOnHostFault"] = reflect.TypeOf((*SwapDatastoreNotWritableOnHostFault)(nil)).Elem()
+}
+
+type SwapDatastoreUnset struct {
+	VimFault
+}
+
+func init() {
+	t["SwapDatastoreUnset"] = reflect.TypeOf((*SwapDatastoreUnset)(nil)).Elem()
+}
+
+type SwapDatastoreUnsetFault SwapDatastoreUnset
+
+func init() {
+	t["SwapDatastoreUnsetFault"] = reflect.TypeOf((*SwapDatastoreUnsetFault)(nil)).Elem()
+}
+
+type SwapPlacementOverrideNotSupported struct {
+	InvalidVmConfig
+}
+
+func init() {
+	t["SwapPlacementOverrideNotSupported"] = reflect.TypeOf((*SwapPlacementOverrideNotSupported)(nil)).Elem()
+}
+
+type SwapPlacementOverrideNotSupportedFault SwapPlacementOverrideNotSupported
+
+func init() {
+	t["SwapPlacementOverrideNotSupportedFault"] = reflect.TypeOf((*SwapPlacementOverrideNotSupportedFault)(nil)).Elem()
+}
+
+type SwitchIpUnset struct {
+	DvsFault
+}
+
+func init() {
+	t["SwitchIpUnset"] = reflect.TypeOf((*SwitchIpUnset)(nil)).Elem()
+}
+
+type SwitchIpUnsetFault SwitchIpUnset
+
+func init() {
+	t["SwitchIpUnsetFault"] = reflect.TypeOf((*SwitchIpUnsetFault)(nil)).Elem()
+}
+
+type SwitchNotInUpgradeMode struct {
+	DvsFault
+}
+
+func init() {
+	t["SwitchNotInUpgradeMode"] = reflect.TypeOf((*SwitchNotInUpgradeMode)(nil)).Elem()
+}
+
+type SwitchNotInUpgradeModeFault SwitchNotInUpgradeMode
+
+func init() {
+	t["SwitchNotInUpgradeModeFault"] = reflect.TypeOf((*SwitchNotInUpgradeModeFault)(nil)).Elem()
+}
+
+type SystemError struct {
+	RuntimeFault
+
+	Reason string `xml:"reason"`
+}
+
+func init() {
+	t["SystemError"] = reflect.TypeOf((*SystemError)(nil)).Elem()
+}
+
+type SystemErrorFault SystemError
+
+func init() {
+	t["SystemErrorFault"] = reflect.TypeOf((*SystemErrorFault)(nil)).Elem()
+}
+
+type SystemEventInfo struct {
+	DynamicData
+
+	RecordId     int64  `xml:"recordId"`
+	When         string `xml:"when"`
+	SelType      int64  `xml:"selType"`
+	Message      string `xml:"message"`
+	SensorNumber int64  `xml:"sensorNumber"`
+}
+
+func init() {
+	t["SystemEventInfo"] = reflect.TypeOf((*SystemEventInfo)(nil)).Elem()
+}
+
+type Tag struct {
+	DynamicData
+
+	Key string `xml:"key"`
+}
+
+func init() {
+	t["Tag"] = reflect.TypeOf((*Tag)(nil)).Elem()
+}
+
+type TaskDescription struct {
+	DynamicData
+
+	MethodInfo []BaseElementDescription `xml:"methodInfo,typeattr"`
+	State      []BaseElementDescription `xml:"state,typeattr"`
+	Reason     []BaseTypeDescription    `xml:"reason,typeattr"`
+}
+
+func init() {
+	t["TaskDescription"] = reflect.TypeOf((*TaskDescription)(nil)).Elem()
+}
+
+type TaskEvent struct {
+	Event
+
+	Info TaskInfo `xml:"info"`
+}
+
+func init() {
+	t["TaskEvent"] = reflect.TypeOf((*TaskEvent)(nil)).Elem()
+}
+
+type TaskFilterSpec struct {
+	DynamicData
+
+	Entity        *TaskFilterSpecByEntity   `xml:"entity,omitempty"`
+	Time          *TaskFilterSpecByTime     `xml:"time,omitempty"`
+	UserName      *TaskFilterSpecByUsername `xml:"userName,omitempty"`
+	ActivationId  []string                  `xml:"activationId,omitempty"`
+	State         []TaskInfoState           `xml:"state,omitempty"`
+	Alarm         *ManagedObjectReference   `xml:"alarm,omitempty"`
+	ScheduledTask *ManagedObjectReference   `xml:"scheduledTask,omitempty"`
+	EventChainId  []int32                   `xml:"eventChainId,omitempty"`
+	Tag           []string                  `xml:"tag,omitempty"`
+	ParentTaskKey []string                  `xml:"parentTaskKey,omitempty"`
+	RootTaskKey   []string                  `xml:"rootTaskKey,omitempty"`
+}
+
+func init() {
+	t["TaskFilterSpec"] = reflect.TypeOf((*TaskFilterSpec)(nil)).Elem()
+}
+
+type TaskFilterSpecByEntity struct {
+	DynamicData
+
+	Entity    ManagedObjectReference        `xml:"entity"`
+	Recursion TaskFilterSpecRecursionOption `xml:"recursion"`
+}
+
+func init() {
+	t["TaskFilterSpecByEntity"] = reflect.TypeOf((*TaskFilterSpecByEntity)(nil)).Elem()
+}
+
+type TaskFilterSpecByTime struct {
+	DynamicData
+
+	TimeType  TaskFilterSpecTimeOption `xml:"timeType"`
+	BeginTime *time.Time               `xml:"beginTime"`
+	EndTime   *time.Time               `xml:"endTime"`
+}
+
+func init() {
+	t["TaskFilterSpecByTime"] = reflect.TypeOf((*TaskFilterSpecByTime)(nil)).Elem()
+}
+
+type TaskFilterSpecByUsername struct {
+	DynamicData
+
+	SystemUser bool     `xml:"systemUser"`
+	UserList   []string `xml:"userList,omitempty"`
+}
+
+func init() {
+	t["TaskFilterSpecByUsername"] = reflect.TypeOf((*TaskFilterSpecByUsername)(nil)).Elem()
+}
+
+type TaskInProgress struct {
+	VimFault
+
+	Task ManagedObjectReference `xml:"task"`
+}
+
+func init() {
+	t["TaskInProgress"] = reflect.TypeOf((*TaskInProgress)(nil)).Elem()
+}
+
+type TaskInProgressFault BaseTaskInProgress
+
+func init() {
+	t["TaskInProgressFault"] = reflect.TypeOf((*TaskInProgressFault)(nil)).Elem()
+}
+
+type TaskInfo struct {
+	DynamicData
+
+	Key           string                   `xml:"key"`
+	Task          ManagedObjectReference   `xml:"task"`
+	Description   *LocalizableMessage      `xml:"description,omitempty"`
+	Name          string                   `xml:"name,omitempty"`
+	DescriptionId string                   `xml:"descriptionId"`
+	Entity        *ManagedObjectReference  `xml:"entity,omitempty"`
+	EntityName    string                   `xml:"entityName,omitempty"`
+	Locked        []ManagedObjectReference `xml:"locked,omitempty"`
+	State         TaskInfoState            `xml:"state"`
+	Cancelled     bool                     `xml:"cancelled"`
+	Cancelable    bool                     `xml:"cancelable"`
+	Error         *LocalizedMethodFault    `xml:"error,omitempty"`
+	Result        AnyType                  `xml:"result,omitempty,typeattr"`
+	Progress      int32                    `xml:"progress,omitempty"`
+	Reason        BaseTaskReason           `xml:"reason,typeattr"`
+	QueueTime     time.Time                `xml:"queueTime"`
+	StartTime     *time.Time               `xml:"startTime"`
+	CompleteTime  *time.Time               `xml:"completeTime"`
+	EventChainId  int32                    `xml:"eventChainId"`
+	ChangeTag     string                   `xml:"changeTag,omitempty"`
+	ParentTaskKey string                   `xml:"parentTaskKey,omitempty"`
+	RootTaskKey   string                   `xml:"rootTaskKey,omitempty"`
+	ActivationId  string                   `xml:"activationId,omitempty"`
+}
+
+func init() {
+	t["TaskInfo"] = reflect.TypeOf((*TaskInfo)(nil)).Elem()
+}
+
+type TaskReason struct {
+	DynamicData
+}
+
+func init() {
+	t["TaskReason"] = reflect.TypeOf((*TaskReason)(nil)).Elem()
+}
+
+type TaskReasonAlarm struct {
+	TaskReason
+
+	AlarmName  string                 `xml:"alarmName"`
+	Alarm      ManagedObjectReference `xml:"alarm"`
+	EntityName string                 `xml:"entityName"`
+	Entity     ManagedObjectReference `xml:"entity"`
+}
+
+func init() {
+	t["TaskReasonAlarm"] = reflect.TypeOf((*TaskReasonAlarm)(nil)).Elem()
+}
+
+type TaskReasonSchedule struct {
+	TaskReason
+
+	Name          string                 `xml:"name"`
+	ScheduledTask ManagedObjectReference `xml:"scheduledTask"`
+}
+
+func init() {
+	t["TaskReasonSchedule"] = reflect.TypeOf((*TaskReasonSchedule)(nil)).Elem()
+}
+
+type TaskReasonSystem struct {
+	TaskReason
+}
+
+func init() {
+	t["TaskReasonSystem"] = reflect.TypeOf((*TaskReasonSystem)(nil)).Elem()
+}
+
+type TaskReasonUser struct {
+	TaskReason
+
+	UserName string `xml:"userName"`
+}
+
+func init() {
+	t["TaskReasonUser"] = reflect.TypeOf((*TaskReasonUser)(nil)).Elem()
+}
+
+type TaskScheduler struct {
+	DynamicData
+
+	ActiveTime *time.Time `xml:"activeTime"`
+	ExpireTime *time.Time `xml:"expireTime"`
+}
+
+func init() {
+	t["TaskScheduler"] = reflect.TypeOf((*TaskScheduler)(nil)).Elem()
+}
+
+type TaskTimeoutEvent struct {
+	TaskEvent
+}
+
+func init() {
+	t["TaskTimeoutEvent"] = reflect.TypeOf((*TaskTimeoutEvent)(nil)).Elem()
+}
+
+type TeamingMatchEvent struct {
+	DvsHealthStatusChangeEvent
+}
+
+func init() {
+	t["TeamingMatchEvent"] = reflect.TypeOf((*TeamingMatchEvent)(nil)).Elem()
+}
+
+type TeamingMisMatchEvent struct {
+	DvsHealthStatusChangeEvent
+}
+
+func init() {
+	t["TeamingMisMatchEvent"] = reflect.TypeOf((*TeamingMisMatchEvent)(nil)).Elem()
+}
+
+type TemplateBeingUpgradedEvent struct {
+	TemplateUpgradeEvent
+}
+
+func init() {
+	t["TemplateBeingUpgradedEvent"] = reflect.TypeOf((*TemplateBeingUpgradedEvent)(nil)).Elem()
+}
+
+type TemplateConfigFileInfo struct {
+	VmConfigFileInfo
+}
+
+func init() {
+	t["TemplateConfigFileInfo"] = reflect.TypeOf((*TemplateConfigFileInfo)(nil)).Elem()
+}
+
+type TemplateConfigFileQuery struct {
+	VmConfigFileQuery
+}
+
+func init() {
+	t["TemplateConfigFileQuery"] = reflect.TypeOf((*TemplateConfigFileQuery)(nil)).Elem()
+}
+
+type TemplateUpgradeEvent struct {
+	Event
+
+	LegacyTemplate string `xml:"legacyTemplate"`
+}
+
+func init() {
+	t["TemplateUpgradeEvent"] = reflect.TypeOf((*TemplateUpgradeEvent)(nil)).Elem()
+}
+
+type TemplateUpgradeFailedEvent struct {
+	TemplateUpgradeEvent
+
+	Reason LocalizedMethodFault `xml:"reason"`
+}
+
+func init() {
+	t["TemplateUpgradeFailedEvent"] = reflect.TypeOf((*TemplateUpgradeFailedEvent)(nil)).Elem()
+}
+
+type TemplateUpgradedEvent struct {
+	TemplateUpgradeEvent
+}
+
+func init() {
+	t["TemplateUpgradedEvent"] = reflect.TypeOf((*TemplateUpgradedEvent)(nil)).Elem()
+}
+
+type TerminateFaultTolerantVMRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Vm   *ManagedObjectReference `xml:"vm,omitempty"`
+}
+
+func init() {
+	t["TerminateFaultTolerantVMRequestType"] = reflect.TypeOf((*TerminateFaultTolerantVMRequestType)(nil)).Elem()
+}
+
+type TerminateFaultTolerantVM_Task TerminateFaultTolerantVMRequestType
+
+func init() {
+	t["TerminateFaultTolerantVM_Task"] = reflect.TypeOf((*TerminateFaultTolerantVM_Task)(nil)).Elem()
+}
+
+type TerminateFaultTolerantVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type TerminateProcessInGuest TerminateProcessInGuestRequestType
+
+func init() {
+	t["TerminateProcessInGuest"] = reflect.TypeOf((*TerminateProcessInGuest)(nil)).Elem()
+}
+
+type TerminateProcessInGuestRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Vm   ManagedObjectReference  `xml:"vm"`
+	Auth BaseGuestAuthentication `xml:"auth,typeattr"`
+	Pid  int64                   `xml:"pid"`
+}
+
+func init() {
+	t["TerminateProcessInGuestRequestType"] = reflect.TypeOf((*TerminateProcessInGuestRequestType)(nil)).Elem()
+}
+
+type TerminateProcessInGuestResponse struct {
+}
+
+type TerminateSession TerminateSessionRequestType
+
+func init() {
+	t["TerminateSession"] = reflect.TypeOf((*TerminateSession)(nil)).Elem()
+}
+
+type TerminateSessionRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	SessionId []string               `xml:"sessionId"`
+}
+
+func init() {
+	t["TerminateSessionRequestType"] = reflect.TypeOf((*TerminateSessionRequestType)(nil)).Elem()
+}
+
+type TerminateSessionResponse struct {
+}
+
+type TerminateVM TerminateVMRequestType
+
+func init() {
+	t["TerminateVM"] = reflect.TypeOf((*TerminateVM)(nil)).Elem()
+}
+
+type TerminateVMRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["TerminateVMRequestType"] = reflect.TypeOf((*TerminateVMRequestType)(nil)).Elem()
+}
+
+type TerminateVMResponse struct {
+}
+
+type ThirdPartyLicenseAssignmentFailed struct {
+	RuntimeFault
+
+	Host   ManagedObjectReference `xml:"host"`
+	Module string                 `xml:"module"`
+	Reason string                 `xml:"reason,omitempty"`
+}
+
+func init() {
+	t["ThirdPartyLicenseAssignmentFailed"] = reflect.TypeOf((*ThirdPartyLicenseAssignmentFailed)(nil)).Elem()
+}
+
+type ThirdPartyLicenseAssignmentFailedFault ThirdPartyLicenseAssignmentFailed
+
+func init() {
+	t["ThirdPartyLicenseAssignmentFailedFault"] = reflect.TypeOf((*ThirdPartyLicenseAssignmentFailedFault)(nil)).Elem()
+}
+
+type TicketedSessionAuthentication struct {
+	GuestAuthentication
+
+	Ticket string `xml:"ticket"`
+}
+
+func init() {
+	t["TicketedSessionAuthentication"] = reflect.TypeOf((*TicketedSessionAuthentication)(nil)).Elem()
+}
+
+type TimedOutHostOperationEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["TimedOutHostOperationEvent"] = reflect.TypeOf((*TimedOutHostOperationEvent)(nil)).Elem()
+}
+
+type Timedout struct {
+	VimFault
+}
+
+func init() {
+	t["Timedout"] = reflect.TypeOf((*Timedout)(nil)).Elem()
+}
+
+type TimedoutFault BaseTimedout
+
+func init() {
+	t["TimedoutFault"] = reflect.TypeOf((*TimedoutFault)(nil)).Elem()
+}
+
+type TooManyConcurrentNativeClones struct {
+	FileFault
+}
+
+func init() {
+	t["TooManyConcurrentNativeClones"] = reflect.TypeOf((*TooManyConcurrentNativeClones)(nil)).Elem()
+}
+
+type TooManyConcurrentNativeClonesFault TooManyConcurrentNativeClones
+
+func init() {
+	t["TooManyConcurrentNativeClonesFault"] = reflect.TypeOf((*TooManyConcurrentNativeClonesFault)(nil)).Elem()
+}
+
+type TooManyConsecutiveOverrides struct {
+	VimFault
+}
+
+func init() {
+	t["TooManyConsecutiveOverrides"] = reflect.TypeOf((*TooManyConsecutiveOverrides)(nil)).Elem()
+}
+
+type TooManyConsecutiveOverridesFault TooManyConsecutiveOverrides
+
+func init() {
+	t["TooManyConsecutiveOverridesFault"] = reflect.TypeOf((*TooManyConsecutiveOverridesFault)(nil)).Elem()
+}
+
+type TooManyDevices struct {
+	InvalidVmConfig
+}
+
+func init() {
+	t["TooManyDevices"] = reflect.TypeOf((*TooManyDevices)(nil)).Elem()
+}
+
+type TooManyDevicesFault TooManyDevices
+
+func init() {
+	t["TooManyDevicesFault"] = reflect.TypeOf((*TooManyDevicesFault)(nil)).Elem()
+}
+
+type TooManyDisksOnLegacyHost struct {
+	MigrationFault
+
+	DiskCount     int32 `xml:"diskCount"`
+	TimeoutDanger bool  `xml:"timeoutDanger"`
+}
+
+func init() {
+	t["TooManyDisksOnLegacyHost"] = reflect.TypeOf((*TooManyDisksOnLegacyHost)(nil)).Elem()
+}
+
+type TooManyDisksOnLegacyHostFault TooManyDisksOnLegacyHost
+
+func init() {
+	t["TooManyDisksOnLegacyHostFault"] = reflect.TypeOf((*TooManyDisksOnLegacyHostFault)(nil)).Elem()
+}
+
+type TooManyGuestLogons struct {
+	GuestOperationsFault
+}
+
+func init() {
+	t["TooManyGuestLogons"] = reflect.TypeOf((*TooManyGuestLogons)(nil)).Elem()
+}
+
+type TooManyGuestLogonsFault TooManyGuestLogons
+
+func init() {
+	t["TooManyGuestLogonsFault"] = reflect.TypeOf((*TooManyGuestLogonsFault)(nil)).Elem()
+}
+
+type TooManyHosts struct {
+	HostConnectFault
+}
+
+func init() {
+	t["TooManyHosts"] = reflect.TypeOf((*TooManyHosts)(nil)).Elem()
+}
+
+type TooManyHostsFault TooManyHosts
+
+func init() {
+	t["TooManyHostsFault"] = reflect.TypeOf((*TooManyHostsFault)(nil)).Elem()
+}
+
+type TooManyNativeCloneLevels struct {
+	FileFault
+}
+
+func init() {
+	t["TooManyNativeCloneLevels"] = reflect.TypeOf((*TooManyNativeCloneLevels)(nil)).Elem()
+}
+
+type TooManyNativeCloneLevelsFault TooManyNativeCloneLevels
+
+func init() {
+	t["TooManyNativeCloneLevelsFault"] = reflect.TypeOf((*TooManyNativeCloneLevelsFault)(nil)).Elem()
+}
+
+type TooManyNativeClonesOnFile struct {
+	FileFault
+}
+
+func init() {
+	t["TooManyNativeClonesOnFile"] = reflect.TypeOf((*TooManyNativeClonesOnFile)(nil)).Elem()
+}
+
+type TooManyNativeClonesOnFileFault TooManyNativeClonesOnFile
+
+func init() {
+	t["TooManyNativeClonesOnFileFault"] = reflect.TypeOf((*TooManyNativeClonesOnFileFault)(nil)).Elem()
+}
+
+type TooManySnapshotLevels struct {
+	SnapshotFault
+}
+
+func init() {
+	t["TooManySnapshotLevels"] = reflect.TypeOf((*TooManySnapshotLevels)(nil)).Elem()
+}
+
+type TooManySnapshotLevelsFault TooManySnapshotLevels
+
+func init() {
+	t["TooManySnapshotLevelsFault"] = reflect.TypeOf((*TooManySnapshotLevelsFault)(nil)).Elem()
+}
+
+type ToolsAlreadyUpgraded struct {
+	VmToolsUpgradeFault
+}
+
+func init() {
+	t["ToolsAlreadyUpgraded"] = reflect.TypeOf((*ToolsAlreadyUpgraded)(nil)).Elem()
+}
+
+type ToolsAlreadyUpgradedFault ToolsAlreadyUpgraded
+
+func init() {
+	t["ToolsAlreadyUpgradedFault"] = reflect.TypeOf((*ToolsAlreadyUpgradedFault)(nil)).Elem()
+}
+
+type ToolsAutoUpgradeNotSupported struct {
+	VmToolsUpgradeFault
+}
+
+func init() {
+	t["ToolsAutoUpgradeNotSupported"] = reflect.TypeOf((*ToolsAutoUpgradeNotSupported)(nil)).Elem()
+}
+
+type ToolsAutoUpgradeNotSupportedFault ToolsAutoUpgradeNotSupported
+
+func init() {
+	t["ToolsAutoUpgradeNotSupportedFault"] = reflect.TypeOf((*ToolsAutoUpgradeNotSupportedFault)(nil)).Elem()
+}
+
+type ToolsConfigInfo struct {
+	DynamicData
+
+	ToolsVersion         int32                                `xml:"toolsVersion,omitempty"`
+	ToolsInstallType     string                               `xml:"toolsInstallType,omitempty"`
+	AfterPowerOn         *bool                                `xml:"afterPowerOn"`
+	AfterResume          *bool                                `xml:"afterResume"`
+	BeforeGuestStandby   *bool                                `xml:"beforeGuestStandby"`
+	BeforeGuestShutdown  *bool                                `xml:"beforeGuestShutdown"`
+	BeforeGuestReboot    *bool                                `xml:"beforeGuestReboot"`
+	ToolsUpgradePolicy   string                               `xml:"toolsUpgradePolicy,omitempty"`
+	PendingCustomization string                               `xml:"pendingCustomization,omitempty"`
+	CustomizationKeyId   *CryptoKeyId                         `xml:"customizationKeyId,omitempty"`
+	SyncTimeWithHost     *bool                                `xml:"syncTimeWithHost"`
+	LastInstallInfo      *ToolsConfigInfoToolsLastInstallInfo `xml:"lastInstallInfo,omitempty"`
+}
+
+func init() {
+	t["ToolsConfigInfo"] = reflect.TypeOf((*ToolsConfigInfo)(nil)).Elem()
+}
+
+type ToolsConfigInfoToolsLastInstallInfo struct {
+	DynamicData
+
+	Counter int32                 `xml:"counter"`
+	Fault   *LocalizedMethodFault `xml:"fault,omitempty"`
+}
+
+func init() {
+	t["ToolsConfigInfoToolsLastInstallInfo"] = reflect.TypeOf((*ToolsConfigInfoToolsLastInstallInfo)(nil)).Elem()
+}
+
+type ToolsImageCopyFailed struct {
+	VmToolsUpgradeFault
+}
+
+func init() {
+	t["ToolsImageCopyFailed"] = reflect.TypeOf((*ToolsImageCopyFailed)(nil)).Elem()
+}
+
+type ToolsImageCopyFailedFault ToolsImageCopyFailed
+
+func init() {
+	t["ToolsImageCopyFailedFault"] = reflect.TypeOf((*ToolsImageCopyFailedFault)(nil)).Elem()
+}
+
+type ToolsImageNotAvailable struct {
+	VmToolsUpgradeFault
+}
+
+func init() {
+	t["ToolsImageNotAvailable"] = reflect.TypeOf((*ToolsImageNotAvailable)(nil)).Elem()
+}
+
+type ToolsImageNotAvailableFault ToolsImageNotAvailable
+
+func init() {
+	t["ToolsImageNotAvailableFault"] = reflect.TypeOf((*ToolsImageNotAvailableFault)(nil)).Elem()
+}
+
+type ToolsImageSignatureCheckFailed struct {
+	VmToolsUpgradeFault
+}
+
+func init() {
+	t["ToolsImageSignatureCheckFailed"] = reflect.TypeOf((*ToolsImageSignatureCheckFailed)(nil)).Elem()
+}
+
+type ToolsImageSignatureCheckFailedFault ToolsImageSignatureCheckFailed
+
+func init() {
+	t["ToolsImageSignatureCheckFailedFault"] = reflect.TypeOf((*ToolsImageSignatureCheckFailedFault)(nil)).Elem()
+}
+
+type ToolsInstallationInProgress struct {
+	MigrationFault
+}
+
+func init() {
+	t["ToolsInstallationInProgress"] = reflect.TypeOf((*ToolsInstallationInProgress)(nil)).Elem()
+}
+
+type ToolsInstallationInProgressFault ToolsInstallationInProgress
+
+func init() {
+	t["ToolsInstallationInProgressFault"] = reflect.TypeOf((*ToolsInstallationInProgressFault)(nil)).Elem()
+}
+
+type ToolsUnavailable struct {
+	VimFault
+}
+
+func init() {
+	t["ToolsUnavailable"] = reflect.TypeOf((*ToolsUnavailable)(nil)).Elem()
+}
+
+type ToolsUnavailableFault ToolsUnavailable
+
+func init() {
+	t["ToolsUnavailableFault"] = reflect.TypeOf((*ToolsUnavailableFault)(nil)).Elem()
+}
+
+type ToolsUpgradeCancelled struct {
+	VmToolsUpgradeFault
+}
+
+func init() {
+	t["ToolsUpgradeCancelled"] = reflect.TypeOf((*ToolsUpgradeCancelled)(nil)).Elem()
+}
+
+type ToolsUpgradeCancelledFault ToolsUpgradeCancelled
+
+func init() {
+	t["ToolsUpgradeCancelledFault"] = reflect.TypeOf((*ToolsUpgradeCancelledFault)(nil)).Elem()
+}
+
+type TraversalSpec struct {
+	SelectionSpec
+
+	Type      string              `xml:"type"`
+	Path      string              `xml:"path"`
+	Skip      *bool               `xml:"skip"`
+	SelectSet []BaseSelectionSpec `xml:"selectSet,omitempty,typeattr"`
+}
+
+func init() {
+	t["TraversalSpec"] = reflect.TypeOf((*TraversalSpec)(nil)).Elem()
+}
+
+type TurnDiskLocatorLedOffRequestType struct {
+	This          ManagedObjectReference `xml:"_this"`
+	ScsiDiskUuids []string               `xml:"scsiDiskUuids"`
+}
+
+func init() {
+	t["TurnDiskLocatorLedOffRequestType"] = reflect.TypeOf((*TurnDiskLocatorLedOffRequestType)(nil)).Elem()
+}
+
+type TurnDiskLocatorLedOff_Task TurnDiskLocatorLedOffRequestType
+
+func init() {
+	t["TurnDiskLocatorLedOff_Task"] = reflect.TypeOf((*TurnDiskLocatorLedOff_Task)(nil)).Elem()
+}
+
+type TurnDiskLocatorLedOff_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type TurnDiskLocatorLedOnRequestType struct {
+	This          ManagedObjectReference `xml:"_this"`
+	ScsiDiskUuids []string               `xml:"scsiDiskUuids"`
+}
+
+func init() {
+	t["TurnDiskLocatorLedOnRequestType"] = reflect.TypeOf((*TurnDiskLocatorLedOnRequestType)(nil)).Elem()
+}
+
+type TurnDiskLocatorLedOn_Task TurnDiskLocatorLedOnRequestType
+
+func init() {
+	t["TurnDiskLocatorLedOn_Task"] = reflect.TypeOf((*TurnDiskLocatorLedOn_Task)(nil)).Elem()
+}
+
+type TurnDiskLocatorLedOn_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type TurnOffFaultToleranceForVMRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["TurnOffFaultToleranceForVMRequestType"] = reflect.TypeOf((*TurnOffFaultToleranceForVMRequestType)(nil)).Elem()
+}
+
+type TurnOffFaultToleranceForVM_Task TurnOffFaultToleranceForVMRequestType
+
+func init() {
+	t["TurnOffFaultToleranceForVM_Task"] = reflect.TypeOf((*TurnOffFaultToleranceForVM_Task)(nil)).Elem()
+}
+
+type TurnOffFaultToleranceForVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type TypeDescription struct {
+	Description
+
+	Key string `xml:"key"`
+}
+
+func init() {
+	t["TypeDescription"] = reflect.TypeOf((*TypeDescription)(nil)).Elem()
+}
+
+type UnSupportedDatastoreForVFlash struct {
+	UnsupportedDatastore
+
+	DatastoreName string `xml:"datastoreName"`
+	Type          string `xml:"type"`
+}
+
+func init() {
+	t["UnSupportedDatastoreForVFlash"] = reflect.TypeOf((*UnSupportedDatastoreForVFlash)(nil)).Elem()
+}
+
+type UnSupportedDatastoreForVFlashFault UnSupportedDatastoreForVFlash
+
+func init() {
+	t["UnSupportedDatastoreForVFlashFault"] = reflect.TypeOf((*UnSupportedDatastoreForVFlashFault)(nil)).Elem()
+}
+
+type UnassignUserFromGroup UnassignUserFromGroupRequestType
+
+func init() {
+	t["UnassignUserFromGroup"] = reflect.TypeOf((*UnassignUserFromGroup)(nil)).Elem()
+}
+
+type UnassignUserFromGroupRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	User  string                 `xml:"user"`
+	Group string                 `xml:"group"`
+}
+
+func init() {
+	t["UnassignUserFromGroupRequestType"] = reflect.TypeOf((*UnassignUserFromGroupRequestType)(nil)).Elem()
+}
+
+type UnassignUserFromGroupResponse struct {
+}
+
+type UnbindVnic UnbindVnicRequestType
+
+func init() {
+	t["UnbindVnic"] = reflect.TypeOf((*UnbindVnic)(nil)).Elem()
+}
+
+type UnbindVnicRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	IScsiHbaName string                 `xml:"iScsiHbaName"`
+	VnicDevice   string                 `xml:"vnicDevice"`
+	Force        bool                   `xml:"force"`
+}
+
+func init() {
+	t["UnbindVnicRequestType"] = reflect.TypeOf((*UnbindVnicRequestType)(nil)).Elem()
+}
+
+type UnbindVnicResponse struct {
+}
+
+type UncommittedUndoableDisk struct {
+	MigrationFault
+}
+
+func init() {
+	t["UncommittedUndoableDisk"] = reflect.TypeOf((*UncommittedUndoableDisk)(nil)).Elem()
+}
+
+type UncommittedUndoableDiskFault UncommittedUndoableDisk
+
+func init() {
+	t["UncommittedUndoableDiskFault"] = reflect.TypeOf((*UncommittedUndoableDiskFault)(nil)).Elem()
+}
+
+type UnconfiguredPropertyValue struct {
+	InvalidPropertyValue
+}
+
+func init() {
+	t["UnconfiguredPropertyValue"] = reflect.TypeOf((*UnconfiguredPropertyValue)(nil)).Elem()
+}
+
+type UnconfiguredPropertyValueFault UnconfiguredPropertyValue
+
+func init() {
+	t["UnconfiguredPropertyValueFault"] = reflect.TypeOf((*UnconfiguredPropertyValueFault)(nil)).Elem()
+}
+
+type UncustomizableGuest struct {
+	CustomizationFault
+
+	UncustomizableGuestOS string `xml:"uncustomizableGuestOS"`
+}
+
+func init() {
+	t["UncustomizableGuest"] = reflect.TypeOf((*UncustomizableGuest)(nil)).Elem()
+}
+
+type UncustomizableGuestFault UncustomizableGuest
+
+func init() {
+	t["UncustomizableGuestFault"] = reflect.TypeOf((*UncustomizableGuestFault)(nil)).Elem()
+}
+
+type UnexpectedCustomizationFault struct {
+	CustomizationFault
+}
+
+func init() {
+	t["UnexpectedCustomizationFault"] = reflect.TypeOf((*UnexpectedCustomizationFault)(nil)).Elem()
+}
+
+type UnexpectedCustomizationFaultFault UnexpectedCustomizationFault
+
+func init() {
+	t["UnexpectedCustomizationFaultFault"] = reflect.TypeOf((*UnexpectedCustomizationFaultFault)(nil)).Elem()
+}
+
+type UnexpectedFault struct {
+	RuntimeFault
+
+	FaultName string                `xml:"faultName"`
+	Fault     *LocalizedMethodFault `xml:"fault,omitempty"`
+}
+
+func init() {
+	t["UnexpectedFault"] = reflect.TypeOf((*UnexpectedFault)(nil)).Elem()
+}
+
+type UnexpectedFaultFault UnexpectedFault
+
+func init() {
+	t["UnexpectedFaultFault"] = reflect.TypeOf((*UnexpectedFaultFault)(nil)).Elem()
+}
+
+type UninstallHostPatchRequestType struct {
+	This        ManagedObjectReference                     `xml:"_this"`
+	BulletinIds []string                                   `xml:"bulletinIds,omitempty"`
+	Spec        *HostPatchManagerPatchManagerOperationSpec `xml:"spec,omitempty"`
+}
+
+func init() {
+	t["UninstallHostPatchRequestType"] = reflect.TypeOf((*UninstallHostPatchRequestType)(nil)).Elem()
+}
+
+type UninstallHostPatch_Task UninstallHostPatchRequestType
+
+func init() {
+	t["UninstallHostPatch_Task"] = reflect.TypeOf((*UninstallHostPatch_Task)(nil)).Elem()
+}
+
+type UninstallHostPatch_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type UninstallIoFilterRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	FilterId string                 `xml:"filterId"`
+	CompRes  ManagedObjectReference `xml:"compRes"`
+}
+
+func init() {
+	t["UninstallIoFilterRequestType"] = reflect.TypeOf((*UninstallIoFilterRequestType)(nil)).Elem()
+}
+
+type UninstallIoFilter_Task UninstallIoFilterRequestType
+
+func init() {
+	t["UninstallIoFilter_Task"] = reflect.TypeOf((*UninstallIoFilter_Task)(nil)).Elem()
+}
+
+type UninstallIoFilter_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type UninstallService UninstallServiceRequestType
+
+func init() {
+	t["UninstallService"] = reflect.TypeOf((*UninstallService)(nil)).Elem()
+}
+
+type UninstallServiceRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Id   string                 `xml:"id"`
+}
+
+func init() {
+	t["UninstallServiceRequestType"] = reflect.TypeOf((*UninstallServiceRequestType)(nil)).Elem()
+}
+
+type UninstallServiceResponse struct {
+}
+
+type UnlicensedVirtualMachinesEvent struct {
+	LicenseEvent
+
+	Unlicensed int32 `xml:"unlicensed"`
+	Available  int32 `xml:"available"`
+}
+
+func init() {
+	t["UnlicensedVirtualMachinesEvent"] = reflect.TypeOf((*UnlicensedVirtualMachinesEvent)(nil)).Elem()
+}
+
+type UnlicensedVirtualMachinesFoundEvent struct {
+	LicenseEvent
+
+	Available int32 `xml:"available"`
+}
+
+func init() {
+	t["UnlicensedVirtualMachinesFoundEvent"] = reflect.TypeOf((*UnlicensedVirtualMachinesFoundEvent)(nil)).Elem()
+}
+
+type UnmapVmfsVolumeExRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	VmfsUuid []string               `xml:"vmfsUuid"`
+}
+
+func init() {
+	t["UnmapVmfsVolumeExRequestType"] = reflect.TypeOf((*UnmapVmfsVolumeExRequestType)(nil)).Elem()
+}
+
+type UnmapVmfsVolumeEx_Task UnmapVmfsVolumeExRequestType
+
+func init() {
+	t["UnmapVmfsVolumeEx_Task"] = reflect.TypeOf((*UnmapVmfsVolumeEx_Task)(nil)).Elem()
+}
+
+type UnmapVmfsVolumeEx_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type UnmountDiskMappingRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Mapping []VsanHostDiskMapping  `xml:"mapping"`
+}
+
+func init() {
+	t["UnmountDiskMappingRequestType"] = reflect.TypeOf((*UnmountDiskMappingRequestType)(nil)).Elem()
+}
+
+type UnmountDiskMapping_Task UnmountDiskMappingRequestType
+
+func init() {
+	t["UnmountDiskMapping_Task"] = reflect.TypeOf((*UnmountDiskMapping_Task)(nil)).Elem()
+}
+
+type UnmountDiskMapping_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type UnmountForceMountedVmfsVolume UnmountForceMountedVmfsVolumeRequestType
+
+func init() {
+	t["UnmountForceMountedVmfsVolume"] = reflect.TypeOf((*UnmountForceMountedVmfsVolume)(nil)).Elem()
+}
+
+type UnmountForceMountedVmfsVolumeRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	VmfsUuid string                 `xml:"vmfsUuid"`
+}
+
+func init() {
+	t["UnmountForceMountedVmfsVolumeRequestType"] = reflect.TypeOf((*UnmountForceMountedVmfsVolumeRequestType)(nil)).Elem()
+}
+
+type UnmountForceMountedVmfsVolumeResponse struct {
+}
+
+type UnmountToolsInstaller UnmountToolsInstallerRequestType
+
+func init() {
+	t["UnmountToolsInstaller"] = reflect.TypeOf((*UnmountToolsInstaller)(nil)).Elem()
+}
+
+type UnmountToolsInstallerRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["UnmountToolsInstallerRequestType"] = reflect.TypeOf((*UnmountToolsInstallerRequestType)(nil)).Elem()
+}
+
+type UnmountToolsInstallerResponse struct {
+}
+
+type UnmountVffsVolume UnmountVffsVolumeRequestType
+
+func init() {
+	t["UnmountVffsVolume"] = reflect.TypeOf((*UnmountVffsVolume)(nil)).Elem()
+}
+
+type UnmountVffsVolumeRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	VffsUuid string                 `xml:"vffsUuid"`
+}
+
+func init() {
+	t["UnmountVffsVolumeRequestType"] = reflect.TypeOf((*UnmountVffsVolumeRequestType)(nil)).Elem()
+}
+
+type UnmountVffsVolumeResponse struct {
+}
+
+type UnmountVmfsVolume UnmountVmfsVolumeRequestType
+
+func init() {
+	t["UnmountVmfsVolume"] = reflect.TypeOf((*UnmountVmfsVolume)(nil)).Elem()
+}
+
+type UnmountVmfsVolumeExRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	VmfsUuid []string               `xml:"vmfsUuid"`
+}
+
+func init() {
+	t["UnmountVmfsVolumeExRequestType"] = reflect.TypeOf((*UnmountVmfsVolumeExRequestType)(nil)).Elem()
+}
+
+type UnmountVmfsVolumeEx_Task UnmountVmfsVolumeExRequestType
+
+func init() {
+	t["UnmountVmfsVolumeEx_Task"] = reflect.TypeOf((*UnmountVmfsVolumeEx_Task)(nil)).Elem()
+}
+
+type UnmountVmfsVolumeEx_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type UnmountVmfsVolumeRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	VmfsUuid string                 `xml:"vmfsUuid"`
+}
+
+func init() {
+	t["UnmountVmfsVolumeRequestType"] = reflect.TypeOf((*UnmountVmfsVolumeRequestType)(nil)).Elem()
+}
+
+type UnmountVmfsVolumeResponse struct {
+}
+
+type UnrecognizedHost struct {
+	VimFault
+
+	HostName string `xml:"hostName"`
+}
+
+func init() {
+	t["UnrecognizedHost"] = reflect.TypeOf((*UnrecognizedHost)(nil)).Elem()
+}
+
+type UnrecognizedHostFault UnrecognizedHost
+
+func init() {
+	t["UnrecognizedHostFault"] = reflect.TypeOf((*UnrecognizedHostFault)(nil)).Elem()
+}
+
+type UnregisterAndDestroyRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["UnregisterAndDestroyRequestType"] = reflect.TypeOf((*UnregisterAndDestroyRequestType)(nil)).Elem()
+}
+
+type UnregisterAndDestroy_Task UnregisterAndDestroyRequestType
+
+func init() {
+	t["UnregisterAndDestroy_Task"] = reflect.TypeOf((*UnregisterAndDestroy_Task)(nil)).Elem()
+}
+
+type UnregisterAndDestroy_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type UnregisterExtension UnregisterExtensionRequestType
+
+func init() {
+	t["UnregisterExtension"] = reflect.TypeOf((*UnregisterExtension)(nil)).Elem()
+}
+
+type UnregisterExtensionRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	ExtensionKey string                 `xml:"extensionKey"`
+}
+
+func init() {
+	t["UnregisterExtensionRequestType"] = reflect.TypeOf((*UnregisterExtensionRequestType)(nil)).Elem()
+}
+
+type UnregisterExtensionResponse struct {
+}
+
+type UnregisterHealthUpdateProvider UnregisterHealthUpdateProviderRequestType
+
+func init() {
+	t["UnregisterHealthUpdateProvider"] = reflect.TypeOf((*UnregisterHealthUpdateProvider)(nil)).Elem()
+}
+
+type UnregisterHealthUpdateProviderRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	ProviderId string                 `xml:"providerId"`
+}
+
+func init() {
+	t["UnregisterHealthUpdateProviderRequestType"] = reflect.TypeOf((*UnregisterHealthUpdateProviderRequestType)(nil)).Elem()
+}
+
+type UnregisterHealthUpdateProviderResponse struct {
+}
+
+type UnregisterVM UnregisterVMRequestType
+
+func init() {
+	t["UnregisterVM"] = reflect.TypeOf((*UnregisterVM)(nil)).Elem()
+}
+
+type UnregisterVMRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["UnregisterVMRequestType"] = reflect.TypeOf((*UnregisterVMRequestType)(nil)).Elem()
+}
+
+type UnregisterVMResponse struct {
+}
+
+type UnsharedSwapVMotionNotSupported struct {
+	MigrationFeatureNotSupported
+}
+
+func init() {
+	t["UnsharedSwapVMotionNotSupported"] = reflect.TypeOf((*UnsharedSwapVMotionNotSupported)(nil)).Elem()
+}
+
+type UnsharedSwapVMotionNotSupportedFault UnsharedSwapVMotionNotSupported
+
+func init() {
+	t["UnsharedSwapVMotionNotSupportedFault"] = reflect.TypeOf((*UnsharedSwapVMotionNotSupportedFault)(nil)).Elem()
+}
+
+type UnsupportedDatastore struct {
+	VmConfigFault
+
+	Datastore *ManagedObjectReference `xml:"datastore,omitempty"`
+}
+
+func init() {
+	t["UnsupportedDatastore"] = reflect.TypeOf((*UnsupportedDatastore)(nil)).Elem()
+}
+
+type UnsupportedDatastoreFault BaseUnsupportedDatastore
+
+func init() {
+	t["UnsupportedDatastoreFault"] = reflect.TypeOf((*UnsupportedDatastoreFault)(nil)).Elem()
+}
+
+type UnsupportedGuest struct {
+	InvalidVmConfig
+
+	UnsupportedGuestOS string `xml:"unsupportedGuestOS"`
+}
+
+func init() {
+	t["UnsupportedGuest"] = reflect.TypeOf((*UnsupportedGuest)(nil)).Elem()
+}
+
+type UnsupportedGuestFault UnsupportedGuest
+
+func init() {
+	t["UnsupportedGuestFault"] = reflect.TypeOf((*UnsupportedGuestFault)(nil)).Elem()
+}
+
+type UnsupportedVimApiVersion struct {
+	VimFault
+
+	Version string `xml:"version,omitempty"`
+}
+
+func init() {
+	t["UnsupportedVimApiVersion"] = reflect.TypeOf((*UnsupportedVimApiVersion)(nil)).Elem()
+}
+
+type UnsupportedVimApiVersionFault UnsupportedVimApiVersion
+
+func init() {
+	t["UnsupportedVimApiVersionFault"] = reflect.TypeOf((*UnsupportedVimApiVersionFault)(nil)).Elem()
+}
+
+type UnsupportedVmxLocation struct {
+	VmConfigFault
+}
+
+func init() {
+	t["UnsupportedVmxLocation"] = reflect.TypeOf((*UnsupportedVmxLocation)(nil)).Elem()
+}
+
+type UnsupportedVmxLocationFault UnsupportedVmxLocation
+
+func init() {
+	t["UnsupportedVmxLocationFault"] = reflect.TypeOf((*UnsupportedVmxLocationFault)(nil)).Elem()
+}
+
+type UnusedVirtualDiskBlocksNotScrubbed struct {
+	DeviceBackingNotSupported
+}
+
+func init() {
+	t["UnusedVirtualDiskBlocksNotScrubbed"] = reflect.TypeOf((*UnusedVirtualDiskBlocksNotScrubbed)(nil)).Elem()
+}
+
+type UnusedVirtualDiskBlocksNotScrubbedFault UnusedVirtualDiskBlocksNotScrubbed
+
+func init() {
+	t["UnusedVirtualDiskBlocksNotScrubbedFault"] = reflect.TypeOf((*UnusedVirtualDiskBlocksNotScrubbedFault)(nil)).Elem()
+}
+
+type UpdateAnswerFileRequestType struct {
+	This       ManagedObjectReference   `xml:"_this"`
+	Host       ManagedObjectReference   `xml:"host"`
+	ConfigSpec BaseAnswerFileCreateSpec `xml:"configSpec,typeattr"`
+}
+
+func init() {
+	t["UpdateAnswerFileRequestType"] = reflect.TypeOf((*UpdateAnswerFileRequestType)(nil)).Elem()
+}
+
+type UpdateAnswerFile_Task UpdateAnswerFileRequestType
+
+func init() {
+	t["UpdateAnswerFile_Task"] = reflect.TypeOf((*UpdateAnswerFile_Task)(nil)).Elem()
+}
+
+type UpdateAnswerFile_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type UpdateAssignedLicense UpdateAssignedLicenseRequestType
+
+func init() {
+	t["UpdateAssignedLicense"] = reflect.TypeOf((*UpdateAssignedLicense)(nil)).Elem()
+}
+
+type UpdateAssignedLicenseRequestType struct {
+	This              ManagedObjectReference `xml:"_this"`
+	Entity            string                 `xml:"entity"`
+	LicenseKey        string                 `xml:"licenseKey"`
+	EntityDisplayName string                 `xml:"entityDisplayName,omitempty"`
+}
+
+func init() {
+	t["UpdateAssignedLicenseRequestType"] = reflect.TypeOf((*UpdateAssignedLicenseRequestType)(nil)).Elem()
+}
+
+type UpdateAssignedLicenseResponse struct {
+	Returnval LicenseManagerLicenseInfo `xml:"returnval"`
+}
+
+type UpdateAuthorizationRole UpdateAuthorizationRoleRequestType
+
+func init() {
+	t["UpdateAuthorizationRole"] = reflect.TypeOf((*UpdateAuthorizationRole)(nil)).Elem()
+}
+
+type UpdateAuthorizationRoleRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	RoleId  int32                  `xml:"roleId"`
+	NewName string                 `xml:"newName"`
+	PrivIds []string               `xml:"privIds,omitempty"`
+}
+
+func init() {
+	t["UpdateAuthorizationRoleRequestType"] = reflect.TypeOf((*UpdateAuthorizationRoleRequestType)(nil)).Elem()
+}
+
+type UpdateAuthorizationRoleResponse struct {
+}
+
+type UpdateBootDevice UpdateBootDeviceRequestType
+
+func init() {
+	t["UpdateBootDevice"] = reflect.TypeOf((*UpdateBootDevice)(nil)).Elem()
+}
+
+type UpdateBootDeviceRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Key  string                 `xml:"key"`
+}
+
+func init() {
+	t["UpdateBootDeviceRequestType"] = reflect.TypeOf((*UpdateBootDeviceRequestType)(nil)).Elem()
+}
+
+type UpdateBootDeviceResponse struct {
+}
+
+type UpdateChildResourceConfiguration UpdateChildResourceConfigurationRequestType
+
+func init() {
+	t["UpdateChildResourceConfiguration"] = reflect.TypeOf((*UpdateChildResourceConfiguration)(nil)).Elem()
+}
+
+type UpdateChildResourceConfigurationRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Spec []ResourceConfigSpec   `xml:"spec"`
+}
+
+func init() {
+	t["UpdateChildResourceConfigurationRequestType"] = reflect.TypeOf((*UpdateChildResourceConfigurationRequestType)(nil)).Elem()
+}
+
+type UpdateChildResourceConfigurationResponse struct {
+}
+
+type UpdateClusterProfile UpdateClusterProfileRequestType
+
+func init() {
+	t["UpdateClusterProfile"] = reflect.TypeOf((*UpdateClusterProfile)(nil)).Elem()
+}
+
+type UpdateClusterProfileRequestType struct {
+	This   ManagedObjectReference       `xml:"_this"`
+	Config BaseClusterProfileConfigSpec `xml:"config,typeattr"`
+}
+
+func init() {
+	t["UpdateClusterProfileRequestType"] = reflect.TypeOf((*UpdateClusterProfileRequestType)(nil)).Elem()
+}
+
+type UpdateClusterProfileResponse struct {
+}
+
+type UpdateConfig UpdateConfigRequestType
+
+func init() {
+	t["UpdateConfig"] = reflect.TypeOf((*UpdateConfig)(nil)).Elem()
+}
+
+type UpdateConfigRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Name   string                 `xml:"name,omitempty"`
+	Config *ResourceConfigSpec    `xml:"config,omitempty"`
+}
+
+func init() {
+	t["UpdateConfigRequestType"] = reflect.TypeOf((*UpdateConfigRequestType)(nil)).Elem()
+}
+
+type UpdateConfigResponse struct {
+}
+
+type UpdateConsoleIpRouteConfig UpdateConsoleIpRouteConfigRequestType
+
+func init() {
+	t["UpdateConsoleIpRouteConfig"] = reflect.TypeOf((*UpdateConsoleIpRouteConfig)(nil)).Elem()
+}
+
+type UpdateConsoleIpRouteConfigRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Config BaseHostIpRouteConfig  `xml:"config,typeattr"`
+}
+
+func init() {
+	t["UpdateConsoleIpRouteConfigRequestType"] = reflect.TypeOf((*UpdateConsoleIpRouteConfigRequestType)(nil)).Elem()
+}
+
+type UpdateConsoleIpRouteConfigResponse struct {
+}
+
+type UpdateCounterLevelMapping UpdateCounterLevelMappingRequestType
+
+func init() {
+	t["UpdateCounterLevelMapping"] = reflect.TypeOf((*UpdateCounterLevelMapping)(nil)).Elem()
+}
+
+type UpdateCounterLevelMappingRequestType struct {
+	This            ManagedObjectReference                  `xml:"_this"`
+	CounterLevelMap []PerformanceManagerCounterLevelMapping `xml:"counterLevelMap"`
+}
+
+func init() {
+	t["UpdateCounterLevelMappingRequestType"] = reflect.TypeOf((*UpdateCounterLevelMappingRequestType)(nil)).Elem()
+}
+
+type UpdateCounterLevelMappingResponse struct {
+}
+
+type UpdateDVSHealthCheckConfigRequestType struct {
+	This              ManagedObjectReference     `xml:"_this"`
+	HealthCheckConfig []BaseDVSHealthCheckConfig `xml:"healthCheckConfig,typeattr"`
+}
+
+func init() {
+	t["UpdateDVSHealthCheckConfigRequestType"] = reflect.TypeOf((*UpdateDVSHealthCheckConfigRequestType)(nil)).Elem()
+}
+
+type UpdateDVSHealthCheckConfig_Task UpdateDVSHealthCheckConfigRequestType
+
+func init() {
+	t["UpdateDVSHealthCheckConfig_Task"] = reflect.TypeOf((*UpdateDVSHealthCheckConfig_Task)(nil)).Elem()
+}
+
+type UpdateDVSHealthCheckConfig_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type UpdateDVSLacpGroupConfigRequestType struct {
+	This          ManagedObjectReference   `xml:"_this"`
+	LacpGroupSpec []VMwareDvsLacpGroupSpec `xml:"lacpGroupSpec"`
+}
+
+func init() {
+	t["UpdateDVSLacpGroupConfigRequestType"] = reflect.TypeOf((*UpdateDVSLacpGroupConfigRequestType)(nil)).Elem()
+}
+
+type UpdateDVSLacpGroupConfig_Task UpdateDVSLacpGroupConfigRequestType
+
+func init() {
+	t["UpdateDVSLacpGroupConfig_Task"] = reflect.TypeOf((*UpdateDVSLacpGroupConfig_Task)(nil)).Elem()
+}
+
+type UpdateDVSLacpGroupConfig_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type UpdateDateTime UpdateDateTimeRequestType
+
+func init() {
+	t["UpdateDateTime"] = reflect.TypeOf((*UpdateDateTime)(nil)).Elem()
+}
+
+type UpdateDateTimeConfig UpdateDateTimeConfigRequestType
+
+func init() {
+	t["UpdateDateTimeConfig"] = reflect.TypeOf((*UpdateDateTimeConfig)(nil)).Elem()
+}
+
+type UpdateDateTimeConfigRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Config HostDateTimeConfig     `xml:"config"`
+}
+
+func init() {
+	t["UpdateDateTimeConfigRequestType"] = reflect.TypeOf((*UpdateDateTimeConfigRequestType)(nil)).Elem()
+}
+
+type UpdateDateTimeConfigResponse struct {
+}
+
+type UpdateDateTimeRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	DateTime time.Time              `xml:"dateTime"`
+}
+
+func init() {
+	t["UpdateDateTimeRequestType"] = reflect.TypeOf((*UpdateDateTimeRequestType)(nil)).Elem()
+}
+
+type UpdateDateTimeResponse struct {
+}
+
+type UpdateDefaultPolicy UpdateDefaultPolicyRequestType
+
+func init() {
+	t["UpdateDefaultPolicy"] = reflect.TypeOf((*UpdateDefaultPolicy)(nil)).Elem()
+}
+
+type UpdateDefaultPolicyRequestType struct {
+	This          ManagedObjectReference    `xml:"_this"`
+	DefaultPolicy HostFirewallDefaultPolicy `xml:"defaultPolicy"`
+}
+
+func init() {
+	t["UpdateDefaultPolicyRequestType"] = reflect.TypeOf((*UpdateDefaultPolicyRequestType)(nil)).Elem()
+}
+
+type UpdateDefaultPolicyResponse struct {
+}
+
+type UpdateDiskPartitions UpdateDiskPartitionsRequestType
+
+func init() {
+	t["UpdateDiskPartitions"] = reflect.TypeOf((*UpdateDiskPartitions)(nil)).Elem()
+}
+
+type UpdateDiskPartitionsRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	DevicePath string                 `xml:"devicePath"`
+	Spec       HostDiskPartitionSpec  `xml:"spec"`
+}
+
+func init() {
+	t["UpdateDiskPartitionsRequestType"] = reflect.TypeOf((*UpdateDiskPartitionsRequestType)(nil)).Elem()
+}
+
+type UpdateDiskPartitionsResponse struct {
+}
+
+type UpdateDnsConfig UpdateDnsConfigRequestType
+
+func init() {
+	t["UpdateDnsConfig"] = reflect.TypeOf((*UpdateDnsConfig)(nil)).Elem()
+}
+
+type UpdateDnsConfigRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Config BaseHostDnsConfig      `xml:"config,typeattr"`
+}
+
+func init() {
+	t["UpdateDnsConfigRequestType"] = reflect.TypeOf((*UpdateDnsConfigRequestType)(nil)).Elem()
+}
+
+type UpdateDnsConfigResponse struct {
+}
+
+type UpdateDvsCapability UpdateDvsCapabilityRequestType
+
+func init() {
+	t["UpdateDvsCapability"] = reflect.TypeOf((*UpdateDvsCapability)(nil)).Elem()
+}
+
+type UpdateDvsCapabilityRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	Capability DVSCapability          `xml:"capability"`
+}
+
+func init() {
+	t["UpdateDvsCapabilityRequestType"] = reflect.TypeOf((*UpdateDvsCapabilityRequestType)(nil)).Elem()
+}
+
+type UpdateDvsCapabilityResponse struct {
+}
+
+type UpdateExtension UpdateExtensionRequestType
+
+func init() {
+	t["UpdateExtension"] = reflect.TypeOf((*UpdateExtension)(nil)).Elem()
+}
+
+type UpdateExtensionRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Extension Extension              `xml:"extension"`
+}
+
+func init() {
+	t["UpdateExtensionRequestType"] = reflect.TypeOf((*UpdateExtensionRequestType)(nil)).Elem()
+}
+
+type UpdateExtensionResponse struct {
+}
+
+type UpdateFlags UpdateFlagsRequestType
+
+func init() {
+	t["UpdateFlags"] = reflect.TypeOf((*UpdateFlags)(nil)).Elem()
+}
+
+type UpdateFlagsRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	FlagInfo HostFlagInfo           `xml:"flagInfo"`
+}
+
+func init() {
+	t["UpdateFlagsRequestType"] = reflect.TypeOf((*UpdateFlagsRequestType)(nil)).Elem()
+}
+
+type UpdateFlagsResponse struct {
+}
+
+type UpdateGraphicsConfig UpdateGraphicsConfigRequestType
+
+func init() {
+	t["UpdateGraphicsConfig"] = reflect.TypeOf((*UpdateGraphicsConfig)(nil)).Elem()
+}
+
+type UpdateGraphicsConfigRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Config HostGraphicsConfig     `xml:"config"`
+}
+
+func init() {
+	t["UpdateGraphicsConfigRequestType"] = reflect.TypeOf((*UpdateGraphicsConfigRequestType)(nil)).Elem()
+}
+
+type UpdateGraphicsConfigResponse struct {
+}
+
+type UpdateHostCustomizationsRequestType struct {
+	This                ManagedObjectReference                  `xml:"_this"`
+	HostToConfigSpecMap []HostProfileManagerHostToConfigSpecMap `xml:"hostToConfigSpecMap,omitempty"`
+}
+
+func init() {
+	t["UpdateHostCustomizationsRequestType"] = reflect.TypeOf((*UpdateHostCustomizationsRequestType)(nil)).Elem()
+}
+
+type UpdateHostCustomizations_Task UpdateHostCustomizationsRequestType
+
+func init() {
+	t["UpdateHostCustomizations_Task"] = reflect.TypeOf((*UpdateHostCustomizations_Task)(nil)).Elem()
+}
+
+type UpdateHostCustomizations_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type UpdateHostImageAcceptanceLevel UpdateHostImageAcceptanceLevelRequestType
+
+func init() {
+	t["UpdateHostImageAcceptanceLevel"] = reflect.TypeOf((*UpdateHostImageAcceptanceLevel)(nil)).Elem()
+}
+
+type UpdateHostImageAcceptanceLevelRequestType struct {
+	This               ManagedObjectReference `xml:"_this"`
+	NewAcceptanceLevel string                 `xml:"newAcceptanceLevel"`
+}
+
+func init() {
+	t["UpdateHostImageAcceptanceLevelRequestType"] = reflect.TypeOf((*UpdateHostImageAcceptanceLevelRequestType)(nil)).Elem()
+}
+
+type UpdateHostImageAcceptanceLevelResponse struct {
+}
+
+type UpdateHostProfile UpdateHostProfileRequestType
+
+func init() {
+	t["UpdateHostProfile"] = reflect.TypeOf((*UpdateHostProfile)(nil)).Elem()
+}
+
+type UpdateHostProfileRequestType struct {
+	This   ManagedObjectReference    `xml:"_this"`
+	Config BaseHostProfileConfigSpec `xml:"config,typeattr"`
+}
+
+func init() {
+	t["UpdateHostProfileRequestType"] = reflect.TypeOf((*UpdateHostProfileRequestType)(nil)).Elem()
+}
+
+type UpdateHostProfileResponse struct {
+}
+
+type UpdateHostSpecification UpdateHostSpecificationRequestType
+
+func init() {
+	t["UpdateHostSpecification"] = reflect.TypeOf((*UpdateHostSpecification)(nil)).Elem()
+}
+
+type UpdateHostSpecificationRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	Host     ManagedObjectReference `xml:"host"`
+	HostSpec HostSpecification      `xml:"hostSpec"`
+}
+
+func init() {
+	t["UpdateHostSpecificationRequestType"] = reflect.TypeOf((*UpdateHostSpecificationRequestType)(nil)).Elem()
+}
+
+type UpdateHostSpecificationResponse struct {
+}
+
+type UpdateHostSubSpecification UpdateHostSubSpecificationRequestType
+
+func init() {
+	t["UpdateHostSubSpecification"] = reflect.TypeOf((*UpdateHostSubSpecification)(nil)).Elem()
+}
+
+type UpdateHostSubSpecificationRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	Host        ManagedObjectReference `xml:"host"`
+	HostSubSpec HostSubSpecification   `xml:"hostSubSpec"`
+}
+
+func init() {
+	t["UpdateHostSubSpecificationRequestType"] = reflect.TypeOf((*UpdateHostSubSpecificationRequestType)(nil)).Elem()
+}
+
+type UpdateHostSubSpecificationResponse struct {
+}
+
+type UpdateInternetScsiAdvancedOptions UpdateInternetScsiAdvancedOptionsRequestType
+
+func init() {
+	t["UpdateInternetScsiAdvancedOptions"] = reflect.TypeOf((*UpdateInternetScsiAdvancedOptions)(nil)).Elem()
+}
+
+type UpdateInternetScsiAdvancedOptionsRequestType struct {
+	This           ManagedObjectReference          `xml:"_this"`
+	IScsiHbaDevice string                          `xml:"iScsiHbaDevice"`
+	TargetSet      *HostInternetScsiHbaTargetSet   `xml:"targetSet,omitempty"`
+	Options        []HostInternetScsiHbaParamValue `xml:"options"`
+}
+
+func init() {
+	t["UpdateInternetScsiAdvancedOptionsRequestType"] = reflect.TypeOf((*UpdateInternetScsiAdvancedOptionsRequestType)(nil)).Elem()
+}
+
+type UpdateInternetScsiAdvancedOptionsResponse struct {
+}
+
+type UpdateInternetScsiAlias UpdateInternetScsiAliasRequestType
+
+func init() {
+	t["UpdateInternetScsiAlias"] = reflect.TypeOf((*UpdateInternetScsiAlias)(nil)).Elem()
+}
+
+type UpdateInternetScsiAliasRequestType struct {
+	This           ManagedObjectReference `xml:"_this"`
+	IScsiHbaDevice string                 `xml:"iScsiHbaDevice"`
+	IScsiAlias     string                 `xml:"iScsiAlias"`
+}
+
+func init() {
+	t["UpdateInternetScsiAliasRequestType"] = reflect.TypeOf((*UpdateInternetScsiAliasRequestType)(nil)).Elem()
+}
+
+type UpdateInternetScsiAliasResponse struct {
+}
+
+type UpdateInternetScsiAuthenticationProperties UpdateInternetScsiAuthenticationPropertiesRequestType
+
+func init() {
+	t["UpdateInternetScsiAuthenticationProperties"] = reflect.TypeOf((*UpdateInternetScsiAuthenticationProperties)(nil)).Elem()
+}
+
+type UpdateInternetScsiAuthenticationPropertiesRequestType struct {
+	This                     ManagedObjectReference                      `xml:"_this"`
+	IScsiHbaDevice           string                                      `xml:"iScsiHbaDevice"`
+	AuthenticationProperties HostInternetScsiHbaAuthenticationProperties `xml:"authenticationProperties"`
+	TargetSet                *HostInternetScsiHbaTargetSet               `xml:"targetSet,omitempty"`
+}
+
+func init() {
+	t["UpdateInternetScsiAuthenticationPropertiesRequestType"] = reflect.TypeOf((*UpdateInternetScsiAuthenticationPropertiesRequestType)(nil)).Elem()
+}
+
+type UpdateInternetScsiAuthenticationPropertiesResponse struct {
+}
+
+type UpdateInternetScsiDigestProperties UpdateInternetScsiDigestPropertiesRequestType
+
+func init() {
+	t["UpdateInternetScsiDigestProperties"] = reflect.TypeOf((*UpdateInternetScsiDigestProperties)(nil)).Elem()
+}
+
+type UpdateInternetScsiDigestPropertiesRequestType struct {
+	This             ManagedObjectReference              `xml:"_this"`
+	IScsiHbaDevice   string                              `xml:"iScsiHbaDevice"`
+	TargetSet        *HostInternetScsiHbaTargetSet       `xml:"targetSet,omitempty"`
+	DigestProperties HostInternetScsiHbaDigestProperties `xml:"digestProperties"`
+}
+
+func init() {
+	t["UpdateInternetScsiDigestPropertiesRequestType"] = reflect.TypeOf((*UpdateInternetScsiDigestPropertiesRequestType)(nil)).Elem()
+}
+
+type UpdateInternetScsiDigestPropertiesResponse struct {
+}
+
+type UpdateInternetScsiDiscoveryProperties UpdateInternetScsiDiscoveryPropertiesRequestType
+
+func init() {
+	t["UpdateInternetScsiDiscoveryProperties"] = reflect.TypeOf((*UpdateInternetScsiDiscoveryProperties)(nil)).Elem()
+}
+
+type UpdateInternetScsiDiscoveryPropertiesRequestType struct {
+	This                ManagedObjectReference                 `xml:"_this"`
+	IScsiHbaDevice      string                                 `xml:"iScsiHbaDevice"`
+	DiscoveryProperties HostInternetScsiHbaDiscoveryProperties `xml:"discoveryProperties"`
+}
+
+func init() {
+	t["UpdateInternetScsiDiscoveryPropertiesRequestType"] = reflect.TypeOf((*UpdateInternetScsiDiscoveryPropertiesRequestType)(nil)).Elem()
+}
+
+type UpdateInternetScsiDiscoveryPropertiesResponse struct {
+}
+
+type UpdateInternetScsiIPProperties UpdateInternetScsiIPPropertiesRequestType
+
+func init() {
+	t["UpdateInternetScsiIPProperties"] = reflect.TypeOf((*UpdateInternetScsiIPProperties)(nil)).Elem()
+}
+
+type UpdateInternetScsiIPPropertiesRequestType struct {
+	This           ManagedObjectReference          `xml:"_this"`
+	IScsiHbaDevice string                          `xml:"iScsiHbaDevice"`
+	IpProperties   HostInternetScsiHbaIPProperties `xml:"ipProperties"`
+}
+
+func init() {
+	t["UpdateInternetScsiIPPropertiesRequestType"] = reflect.TypeOf((*UpdateInternetScsiIPPropertiesRequestType)(nil)).Elem()
+}
+
+type UpdateInternetScsiIPPropertiesResponse struct {
+}
+
+type UpdateInternetScsiName UpdateInternetScsiNameRequestType
+
+func init() {
+	t["UpdateInternetScsiName"] = reflect.TypeOf((*UpdateInternetScsiName)(nil)).Elem()
+}
+
+type UpdateInternetScsiNameRequestType struct {
+	This           ManagedObjectReference `xml:"_this"`
+	IScsiHbaDevice string                 `xml:"iScsiHbaDevice"`
+	IScsiName      string                 `xml:"iScsiName"`
+}
+
+func init() {
+	t["UpdateInternetScsiNameRequestType"] = reflect.TypeOf((*UpdateInternetScsiNameRequestType)(nil)).Elem()
+}
+
+type UpdateInternetScsiNameResponse struct {
+}
+
+type UpdateIpConfig UpdateIpConfigRequestType
+
+func init() {
+	t["UpdateIpConfig"] = reflect.TypeOf((*UpdateIpConfig)(nil)).Elem()
+}
+
+type UpdateIpConfigRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	IpConfig HostIpConfig           `xml:"ipConfig"`
+}
+
+func init() {
+	t["UpdateIpConfigRequestType"] = reflect.TypeOf((*UpdateIpConfigRequestType)(nil)).Elem()
+}
+
+type UpdateIpConfigResponse struct {
+}
+
+type UpdateIpPool UpdateIpPoolRequestType
+
+func init() {
+	t["UpdateIpPool"] = reflect.TypeOf((*UpdateIpPool)(nil)).Elem()
+}
+
+type UpdateIpPoolRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Dc   ManagedObjectReference `xml:"dc"`
+	Pool IpPool                 `xml:"pool"`
+}
+
+func init() {
+	t["UpdateIpPoolRequestType"] = reflect.TypeOf((*UpdateIpPoolRequestType)(nil)).Elem()
+}
+
+type UpdateIpPoolResponse struct {
+}
+
+type UpdateIpRouteConfig UpdateIpRouteConfigRequestType
+
+func init() {
+	t["UpdateIpRouteConfig"] = reflect.TypeOf((*UpdateIpRouteConfig)(nil)).Elem()
+}
+
+type UpdateIpRouteConfigRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Config BaseHostIpRouteConfig  `xml:"config,typeattr"`
+}
+
+func init() {
+	t["UpdateIpRouteConfigRequestType"] = reflect.TypeOf((*UpdateIpRouteConfigRequestType)(nil)).Elem()
+}
+
+type UpdateIpRouteConfigResponse struct {
+}
+
+type UpdateIpRouteTableConfig UpdateIpRouteTableConfigRequestType
+
+func init() {
+	t["UpdateIpRouteTableConfig"] = reflect.TypeOf((*UpdateIpRouteTableConfig)(nil)).Elem()
+}
+
+type UpdateIpRouteTableConfigRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Config HostIpRouteTableConfig `xml:"config"`
+}
+
+func init() {
+	t["UpdateIpRouteTableConfigRequestType"] = reflect.TypeOf((*UpdateIpRouteTableConfigRequestType)(nil)).Elem()
+}
+
+type UpdateIpRouteTableConfigResponse struct {
+}
+
+type UpdateIpmi UpdateIpmiRequestType
+
+func init() {
+	t["UpdateIpmi"] = reflect.TypeOf((*UpdateIpmi)(nil)).Elem()
+}
+
+type UpdateIpmiRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	IpmiInfo HostIpmiInfo           `xml:"ipmiInfo"`
+}
+
+func init() {
+	t["UpdateIpmiRequestType"] = reflect.TypeOf((*UpdateIpmiRequestType)(nil)).Elem()
+}
+
+type UpdateIpmiResponse struct {
+}
+
+type UpdateKmipServer UpdateKmipServerRequestType
+
+func init() {
+	t["UpdateKmipServer"] = reflect.TypeOf((*UpdateKmipServer)(nil)).Elem()
+}
+
+type UpdateKmipServerRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Server KmipServerSpec         `xml:"server"`
+}
+
+func init() {
+	t["UpdateKmipServerRequestType"] = reflect.TypeOf((*UpdateKmipServerRequestType)(nil)).Elem()
+}
+
+type UpdateKmipServerResponse struct {
+}
+
+type UpdateKmsSignedCsrClientCert UpdateKmsSignedCsrClientCertRequestType
+
+func init() {
+	t["UpdateKmsSignedCsrClientCert"] = reflect.TypeOf((*UpdateKmsSignedCsrClientCert)(nil)).Elem()
+}
+
+type UpdateKmsSignedCsrClientCertRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	Cluster     KeyProviderId          `xml:"cluster"`
+	Certificate string                 `xml:"certificate"`
+}
+
+func init() {
+	t["UpdateKmsSignedCsrClientCertRequestType"] = reflect.TypeOf((*UpdateKmsSignedCsrClientCertRequestType)(nil)).Elem()
+}
+
+type UpdateKmsSignedCsrClientCertResponse struct {
+}
+
+type UpdateLicense UpdateLicenseRequestType
+
+func init() {
+	t["UpdateLicense"] = reflect.TypeOf((*UpdateLicense)(nil)).Elem()
+}
+
+type UpdateLicenseLabel UpdateLicenseLabelRequestType
+
+func init() {
+	t["UpdateLicenseLabel"] = reflect.TypeOf((*UpdateLicenseLabel)(nil)).Elem()
+}
+
+type UpdateLicenseLabelRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	LicenseKey string                 `xml:"licenseKey"`
+	LabelKey   string                 `xml:"labelKey"`
+	LabelValue string                 `xml:"labelValue"`
+}
+
+func init() {
+	t["UpdateLicenseLabelRequestType"] = reflect.TypeOf((*UpdateLicenseLabelRequestType)(nil)).Elem()
+}
+
+type UpdateLicenseLabelResponse struct {
+}
+
+type UpdateLicenseRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	LicenseKey string                 `xml:"licenseKey"`
+	Labels     []KeyValue             `xml:"labels,omitempty"`
+}
+
+func init() {
+	t["UpdateLicenseRequestType"] = reflect.TypeOf((*UpdateLicenseRequestType)(nil)).Elem()
+}
+
+type UpdateLicenseResponse struct {
+	Returnval LicenseManagerLicenseInfo `xml:"returnval"`
+}
+
+type UpdateLinkedChildren UpdateLinkedChildrenRequestType
+
+func init() {
+	t["UpdateLinkedChildren"] = reflect.TypeOf((*UpdateLinkedChildren)(nil)).Elem()
+}
+
+type UpdateLinkedChildrenRequestType struct {
+	This         ManagedObjectReference   `xml:"_this"`
+	AddChangeSet []VirtualAppLinkInfo     `xml:"addChangeSet,omitempty"`
+	RemoveSet    []ManagedObjectReference `xml:"removeSet,omitempty"`
+}
+
+func init() {
+	t["UpdateLinkedChildrenRequestType"] = reflect.TypeOf((*UpdateLinkedChildrenRequestType)(nil)).Elem()
+}
+
+type UpdateLinkedChildrenResponse struct {
+}
+
+type UpdateLocalSwapDatastore UpdateLocalSwapDatastoreRequestType
+
+func init() {
+	t["UpdateLocalSwapDatastore"] = reflect.TypeOf((*UpdateLocalSwapDatastore)(nil)).Elem()
+}
+
+type UpdateLocalSwapDatastoreRequestType struct {
+	This      ManagedObjectReference  `xml:"_this"`
+	Datastore *ManagedObjectReference `xml:"datastore,omitempty"`
+}
+
+func init() {
+	t["UpdateLocalSwapDatastoreRequestType"] = reflect.TypeOf((*UpdateLocalSwapDatastoreRequestType)(nil)).Elem()
+}
+
+type UpdateLocalSwapDatastoreResponse struct {
+}
+
+type UpdateLockdownExceptions UpdateLockdownExceptionsRequestType
+
+func init() {
+	t["UpdateLockdownExceptions"] = reflect.TypeOf((*UpdateLockdownExceptions)(nil)).Elem()
+}
+
+type UpdateLockdownExceptionsRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Users []string               `xml:"users,omitempty"`
+}
+
+func init() {
+	t["UpdateLockdownExceptionsRequestType"] = reflect.TypeOf((*UpdateLockdownExceptionsRequestType)(nil)).Elem()
+}
+
+type UpdateLockdownExceptionsResponse struct {
+}
+
+type UpdateModuleOptionString UpdateModuleOptionStringRequestType
+
+func init() {
+	t["UpdateModuleOptionString"] = reflect.TypeOf((*UpdateModuleOptionString)(nil)).Elem()
+}
+
+type UpdateModuleOptionStringRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Name    string                 `xml:"name"`
+	Options string                 `xml:"options"`
+}
+
+func init() {
+	t["UpdateModuleOptionStringRequestType"] = reflect.TypeOf((*UpdateModuleOptionStringRequestType)(nil)).Elem()
+}
+
+type UpdateModuleOptionStringResponse struct {
+}
+
+type UpdateNetworkConfig UpdateNetworkConfigRequestType
+
+func init() {
+	t["UpdateNetworkConfig"] = reflect.TypeOf((*UpdateNetworkConfig)(nil)).Elem()
+}
+
+type UpdateNetworkConfigRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	Config     HostNetworkConfig      `xml:"config"`
+	ChangeMode string                 `xml:"changeMode"`
+}
+
+func init() {
+	t["UpdateNetworkConfigRequestType"] = reflect.TypeOf((*UpdateNetworkConfigRequestType)(nil)).Elem()
+}
+
+type UpdateNetworkConfigResponse struct {
+	Returnval HostNetworkConfigResult `xml:"returnval"`
+}
+
+type UpdateNetworkResourcePool UpdateNetworkResourcePoolRequestType
+
+func init() {
+	t["UpdateNetworkResourcePool"] = reflect.TypeOf((*UpdateNetworkResourcePool)(nil)).Elem()
+}
+
+type UpdateNetworkResourcePoolRequestType struct {
+	This       ManagedObjectReference             `xml:"_this"`
+	ConfigSpec []DVSNetworkResourcePoolConfigSpec `xml:"configSpec"`
+}
+
+func init() {
+	t["UpdateNetworkResourcePoolRequestType"] = reflect.TypeOf((*UpdateNetworkResourcePoolRequestType)(nil)).Elem()
+}
+
+type UpdateNetworkResourcePoolResponse struct {
+}
+
+type UpdateOptions UpdateOptionsRequestType
+
+func init() {
+	t["UpdateOptions"] = reflect.TypeOf((*UpdateOptions)(nil)).Elem()
+}
+
+type UpdateOptionsRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	ChangedValue []BaseOptionValue      `xml:"changedValue,typeattr"`
+}
+
+func init() {
+	t["UpdateOptionsRequestType"] = reflect.TypeOf((*UpdateOptionsRequestType)(nil)).Elem()
+}
+
+type UpdateOptionsResponse struct {
+}
+
+type UpdatePassthruConfig UpdatePassthruConfigRequestType
+
+func init() {
+	t["UpdatePassthruConfig"] = reflect.TypeOf((*UpdatePassthruConfig)(nil)).Elem()
+}
+
+type UpdatePassthruConfigRequestType struct {
+	This   ManagedObjectReference      `xml:"_this"`
+	Config []BaseHostPciPassthruConfig `xml:"config,typeattr"`
+}
+
+func init() {
+	t["UpdatePassthruConfigRequestType"] = reflect.TypeOf((*UpdatePassthruConfigRequestType)(nil)).Elem()
+}
+
+type UpdatePassthruConfigResponse struct {
+}
+
+type UpdatePerfInterval UpdatePerfIntervalRequestType
+
+func init() {
+	t["UpdatePerfInterval"] = reflect.TypeOf((*UpdatePerfInterval)(nil)).Elem()
+}
+
+type UpdatePerfIntervalRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	Interval PerfInterval           `xml:"interval"`
+}
+
+func init() {
+	t["UpdatePerfIntervalRequestType"] = reflect.TypeOf((*UpdatePerfIntervalRequestType)(nil)).Elem()
+}
+
+type UpdatePerfIntervalResponse struct {
+}
+
+type UpdatePhysicalNicLinkSpeed UpdatePhysicalNicLinkSpeedRequestType
+
+func init() {
+	t["UpdatePhysicalNicLinkSpeed"] = reflect.TypeOf((*UpdatePhysicalNicLinkSpeed)(nil)).Elem()
+}
+
+type UpdatePhysicalNicLinkSpeedRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Device    string                 `xml:"device"`
+	LinkSpeed *PhysicalNicLinkInfo   `xml:"linkSpeed,omitempty"`
+}
+
+func init() {
+	t["UpdatePhysicalNicLinkSpeedRequestType"] = reflect.TypeOf((*UpdatePhysicalNicLinkSpeedRequestType)(nil)).Elem()
+}
+
+type UpdatePhysicalNicLinkSpeedResponse struct {
+}
+
+type UpdatePortGroup UpdatePortGroupRequestType
+
+func init() {
+	t["UpdatePortGroup"] = reflect.TypeOf((*UpdatePortGroup)(nil)).Elem()
+}
+
+type UpdatePortGroupRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	PgName  string                 `xml:"pgName"`
+	Portgrp HostPortGroupSpec      `xml:"portgrp"`
+}
+
+func init() {
+	t["UpdatePortGroupRequestType"] = reflect.TypeOf((*UpdatePortGroupRequestType)(nil)).Elem()
+}
+
+type UpdatePortGroupResponse struct {
+}
+
+type UpdateProgress UpdateProgressRequestType
+
+func init() {
+	t["UpdateProgress"] = reflect.TypeOf((*UpdateProgress)(nil)).Elem()
+}
+
+type UpdateProgressRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	PercentDone int32                  `xml:"percentDone"`
+}
+
+func init() {
+	t["UpdateProgressRequestType"] = reflect.TypeOf((*UpdateProgressRequestType)(nil)).Elem()
+}
+
+type UpdateProgressResponse struct {
+}
+
+type UpdateReferenceHost UpdateReferenceHostRequestType
+
+func init() {
+	t["UpdateReferenceHost"] = reflect.TypeOf((*UpdateReferenceHost)(nil)).Elem()
+}
+
+type UpdateReferenceHostRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Host *ManagedObjectReference `xml:"host,omitempty"`
+}
+
+func init() {
+	t["UpdateReferenceHostRequestType"] = reflect.TypeOf((*UpdateReferenceHostRequestType)(nil)).Elem()
+}
+
+type UpdateReferenceHostResponse struct {
+}
+
+type UpdateRuleset UpdateRulesetRequestType
+
+func init() {
+	t["UpdateRuleset"] = reflect.TypeOf((*UpdateRuleset)(nil)).Elem()
+}
+
+type UpdateRulesetRequestType struct {
+	This ManagedObjectReference         `xml:"_this"`
+	Id   string                         `xml:"id"`
+	Spec HostFirewallRulesetRulesetSpec `xml:"spec"`
+}
+
+func init() {
+	t["UpdateRulesetRequestType"] = reflect.TypeOf((*UpdateRulesetRequestType)(nil)).Elem()
+}
+
+type UpdateRulesetResponse struct {
+}
+
+type UpdateScsiLunDisplayName UpdateScsiLunDisplayNameRequestType
+
+func init() {
+	t["UpdateScsiLunDisplayName"] = reflect.TypeOf((*UpdateScsiLunDisplayName)(nil)).Elem()
+}
+
+type UpdateScsiLunDisplayNameRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	LunUuid     string                 `xml:"lunUuid"`
+	DisplayName string                 `xml:"displayName"`
+}
+
+func init() {
+	t["UpdateScsiLunDisplayNameRequestType"] = reflect.TypeOf((*UpdateScsiLunDisplayNameRequestType)(nil)).Elem()
+}
+
+type UpdateScsiLunDisplayNameResponse struct {
+}
+
+type UpdateSelfSignedClientCert UpdateSelfSignedClientCertRequestType
+
+func init() {
+	t["UpdateSelfSignedClientCert"] = reflect.TypeOf((*UpdateSelfSignedClientCert)(nil)).Elem()
+}
+
+type UpdateSelfSignedClientCertRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	Cluster     KeyProviderId          `xml:"cluster"`
+	Certificate string                 `xml:"certificate"`
+}
+
+func init() {
+	t["UpdateSelfSignedClientCertRequestType"] = reflect.TypeOf((*UpdateSelfSignedClientCertRequestType)(nil)).Elem()
+}
+
+type UpdateSelfSignedClientCertResponse struct {
+}
+
+type UpdateServiceConsoleVirtualNic UpdateServiceConsoleVirtualNicRequestType
+
+func init() {
+	t["UpdateServiceConsoleVirtualNic"] = reflect.TypeOf((*UpdateServiceConsoleVirtualNic)(nil)).Elem()
+}
+
+type UpdateServiceConsoleVirtualNicRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Device string                 `xml:"device"`
+	Nic    HostVirtualNicSpec     `xml:"nic"`
+}
+
+func init() {
+	t["UpdateServiceConsoleVirtualNicRequestType"] = reflect.TypeOf((*UpdateServiceConsoleVirtualNicRequestType)(nil)).Elem()
+}
+
+type UpdateServiceConsoleVirtualNicResponse struct {
+}
+
+type UpdateServiceMessage UpdateServiceMessageRequestType
+
+func init() {
+	t["UpdateServiceMessage"] = reflect.TypeOf((*UpdateServiceMessage)(nil)).Elem()
+}
+
+type UpdateServiceMessageRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Message string                 `xml:"message"`
+}
+
+func init() {
+	t["UpdateServiceMessageRequestType"] = reflect.TypeOf((*UpdateServiceMessageRequestType)(nil)).Elem()
+}
+
+type UpdateServiceMessageResponse struct {
+}
+
+type UpdateServicePolicy UpdateServicePolicyRequestType
+
+func init() {
+	t["UpdateServicePolicy"] = reflect.TypeOf((*UpdateServicePolicy)(nil)).Elem()
+}
+
+type UpdateServicePolicyRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Id     string                 `xml:"id"`
+	Policy string                 `xml:"policy"`
+}
+
+func init() {
+	t["UpdateServicePolicyRequestType"] = reflect.TypeOf((*UpdateServicePolicyRequestType)(nil)).Elem()
+}
+
+type UpdateServicePolicyResponse struct {
+}
+
+type UpdateSet struct {
+	DynamicData
+
+	Version   string                 `xml:"version"`
+	FilterSet []PropertyFilterUpdate `xml:"filterSet,omitempty"`
+	Truncated *bool                  `xml:"truncated"`
+}
+
+func init() {
+	t["UpdateSet"] = reflect.TypeOf((*UpdateSet)(nil)).Elem()
+}
+
+type UpdateSoftwareInternetScsiEnabled UpdateSoftwareInternetScsiEnabledRequestType
+
+func init() {
+	t["UpdateSoftwareInternetScsiEnabled"] = reflect.TypeOf((*UpdateSoftwareInternetScsiEnabled)(nil)).Elem()
+}
+
+type UpdateSoftwareInternetScsiEnabledRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Enabled bool                   `xml:"enabled"`
+}
+
+func init() {
+	t["UpdateSoftwareInternetScsiEnabledRequestType"] = reflect.TypeOf((*UpdateSoftwareInternetScsiEnabledRequestType)(nil)).Elem()
+}
+
+type UpdateSoftwareInternetScsiEnabledResponse struct {
+}
+
+type UpdateSystemResources UpdateSystemResourcesRequestType
+
+func init() {
+	t["UpdateSystemResources"] = reflect.TypeOf((*UpdateSystemResources)(nil)).Elem()
+}
+
+type UpdateSystemResourcesRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	ResourceInfo HostSystemResourceInfo `xml:"resourceInfo"`
+}
+
+func init() {
+	t["UpdateSystemResourcesRequestType"] = reflect.TypeOf((*UpdateSystemResourcesRequestType)(nil)).Elem()
+}
+
+type UpdateSystemResourcesResponse struct {
+}
+
+type UpdateSystemSwapConfiguration UpdateSystemSwapConfigurationRequestType
+
+func init() {
+	t["UpdateSystemSwapConfiguration"] = reflect.TypeOf((*UpdateSystemSwapConfiguration)(nil)).Elem()
+}
+
+type UpdateSystemSwapConfigurationRequestType struct {
+	This          ManagedObjectReference      `xml:"_this"`
+	SysSwapConfig HostSystemSwapConfiguration `xml:"sysSwapConfig"`
+}
+
+func init() {
+	t["UpdateSystemSwapConfigurationRequestType"] = reflect.TypeOf((*UpdateSystemSwapConfigurationRequestType)(nil)).Elem()
+}
+
+type UpdateSystemSwapConfigurationResponse struct {
+}
+
+type UpdateSystemUsers UpdateSystemUsersRequestType
+
+func init() {
+	t["UpdateSystemUsers"] = reflect.TypeOf((*UpdateSystemUsers)(nil)).Elem()
+}
+
+type UpdateSystemUsersRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Users []string               `xml:"users,omitempty"`
+}
+
+func init() {
+	t["UpdateSystemUsersRequestType"] = reflect.TypeOf((*UpdateSystemUsersRequestType)(nil)).Elem()
+}
+
+type UpdateSystemUsersResponse struct {
+}
+
+type UpdateUser UpdateUserRequestType
+
+func init() {
+	t["UpdateUser"] = reflect.TypeOf((*UpdateUser)(nil)).Elem()
+}
+
+type UpdateUserRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	User BaseHostAccountSpec    `xml:"user,typeattr"`
+}
+
+func init() {
+	t["UpdateUserRequestType"] = reflect.TypeOf((*UpdateUserRequestType)(nil)).Elem()
+}
+
+type UpdateUserResponse struct {
+}
+
+type UpdateVAppConfig UpdateVAppConfigRequestType
+
+func init() {
+	t["UpdateVAppConfig"] = reflect.TypeOf((*UpdateVAppConfig)(nil)).Elem()
+}
+
+type UpdateVAppConfigRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Spec VAppConfigSpec         `xml:"spec"`
+}
+
+func init() {
+	t["UpdateVAppConfigRequestType"] = reflect.TypeOf((*UpdateVAppConfigRequestType)(nil)).Elem()
+}
+
+type UpdateVAppConfigResponse struct {
+}
+
+type UpdateVVolVirtualMachineFilesRequestType struct {
+	This         ManagedObjectReference               `xml:"_this"`
+	FailoverPair []DatastoreVVolContainerFailoverPair `xml:"failoverPair,omitempty"`
+}
+
+func init() {
+	t["UpdateVVolVirtualMachineFilesRequestType"] = reflect.TypeOf((*UpdateVVolVirtualMachineFilesRequestType)(nil)).Elem()
+}
+
+type UpdateVVolVirtualMachineFiles_Task UpdateVVolVirtualMachineFilesRequestType
+
+func init() {
+	t["UpdateVVolVirtualMachineFiles_Task"] = reflect.TypeOf((*UpdateVVolVirtualMachineFiles_Task)(nil)).Elem()
+}
+
+type UpdateVVolVirtualMachineFiles_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type UpdateVirtualMachineFilesRequestType struct {
+	This                      ManagedObjectReference            `xml:"_this"`
+	MountPathDatastoreMapping []DatastoreMountPathDatastorePair `xml:"mountPathDatastoreMapping"`
+}
+
+func init() {
+	t["UpdateVirtualMachineFilesRequestType"] = reflect.TypeOf((*UpdateVirtualMachineFilesRequestType)(nil)).Elem()
+}
+
+type UpdateVirtualMachineFilesResult struct {
+	DynamicData
+
+	FailedVmFile []UpdateVirtualMachineFilesResultFailedVmFileInfo `xml:"failedVmFile,omitempty"`
+}
+
+func init() {
+	t["UpdateVirtualMachineFilesResult"] = reflect.TypeOf((*UpdateVirtualMachineFilesResult)(nil)).Elem()
+}
+
+type UpdateVirtualMachineFilesResultFailedVmFileInfo struct {
+	DynamicData
+
+	VmFile string               `xml:"vmFile"`
+	Fault  LocalizedMethodFault `xml:"fault"`
+}
+
+func init() {
+	t["UpdateVirtualMachineFilesResultFailedVmFileInfo"] = reflect.TypeOf((*UpdateVirtualMachineFilesResultFailedVmFileInfo)(nil)).Elem()
+}
+
+type UpdateVirtualMachineFiles_Task UpdateVirtualMachineFilesRequestType
+
+func init() {
+	t["UpdateVirtualMachineFiles_Task"] = reflect.TypeOf((*UpdateVirtualMachineFiles_Task)(nil)).Elem()
+}
+
+type UpdateVirtualMachineFiles_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type UpdateVirtualNic UpdateVirtualNicRequestType
+
+func init() {
+	t["UpdateVirtualNic"] = reflect.TypeOf((*UpdateVirtualNic)(nil)).Elem()
+}
+
+type UpdateVirtualNicRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Device string                 `xml:"device"`
+	Nic    HostVirtualNicSpec     `xml:"nic"`
+}
+
+func init() {
+	t["UpdateVirtualNicRequestType"] = reflect.TypeOf((*UpdateVirtualNicRequestType)(nil)).Elem()
+}
+
+type UpdateVirtualNicResponse struct {
+}
+
+type UpdateVirtualSwitch UpdateVirtualSwitchRequestType
+
+func init() {
+	t["UpdateVirtualSwitch"] = reflect.TypeOf((*UpdateVirtualSwitch)(nil)).Elem()
+}
+
+type UpdateVirtualSwitchRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	VswitchName string                 `xml:"vswitchName"`
+	Spec        HostVirtualSwitchSpec  `xml:"spec"`
+}
+
+func init() {
+	t["UpdateVirtualSwitchRequestType"] = reflect.TypeOf((*UpdateVirtualSwitchRequestType)(nil)).Elem()
+}
+
+type UpdateVirtualSwitchResponse struct {
+}
+
+type UpdateVmfsUnmapPriority UpdateVmfsUnmapPriorityRequestType
+
+func init() {
+	t["UpdateVmfsUnmapPriority"] = reflect.TypeOf((*UpdateVmfsUnmapPriority)(nil)).Elem()
+}
+
+type UpdateVmfsUnmapPriorityRequestType struct {
+	This          ManagedObjectReference `xml:"_this"`
+	VmfsUuid      string                 `xml:"vmfsUuid"`
+	UnmapPriority string                 `xml:"unmapPriority"`
+}
+
+func init() {
+	t["UpdateVmfsUnmapPriorityRequestType"] = reflect.TypeOf((*UpdateVmfsUnmapPriorityRequestType)(nil)).Elem()
+}
+
+type UpdateVmfsUnmapPriorityResponse struct {
+}
+
+type UpdateVsanRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Config VsanHostConfigInfo     `xml:"config"`
+}
+
+func init() {
+	t["UpdateVsanRequestType"] = reflect.TypeOf((*UpdateVsanRequestType)(nil)).Elem()
+}
+
+type UpdateVsan_Task UpdateVsanRequestType
+
+func init() {
+	t["UpdateVsan_Task"] = reflect.TypeOf((*UpdateVsan_Task)(nil)).Elem()
+}
+
+type UpdateVsan_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type UpdatedAgentBeingRestartedEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["UpdatedAgentBeingRestartedEvent"] = reflect.TypeOf((*UpdatedAgentBeingRestartedEvent)(nil)).Elem()
+}
+
+type UpgradeEvent struct {
+	Event
+
+	Message string `xml:"message"`
+}
+
+func init() {
+	t["UpgradeEvent"] = reflect.TypeOf((*UpgradeEvent)(nil)).Elem()
+}
+
+type UpgradeIoFilterRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	FilterId string                 `xml:"filterId"`
+	CompRes  ManagedObjectReference `xml:"compRes"`
+	VibUrl   string                 `xml:"vibUrl"`
+}
+
+func init() {
+	t["UpgradeIoFilterRequestType"] = reflect.TypeOf((*UpgradeIoFilterRequestType)(nil)).Elem()
+}
+
+type UpgradeIoFilter_Task UpgradeIoFilterRequestType
+
+func init() {
+	t["UpgradeIoFilter_Task"] = reflect.TypeOf((*UpgradeIoFilter_Task)(nil)).Elem()
+}
+
+type UpgradeIoFilter_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type UpgradeToolsRequestType struct {
+	This             ManagedObjectReference `xml:"_this"`
+	InstallerOptions string                 `xml:"installerOptions,omitempty"`
+}
+
+func init() {
+	t["UpgradeToolsRequestType"] = reflect.TypeOf((*UpgradeToolsRequestType)(nil)).Elem()
+}
+
+type UpgradeTools_Task UpgradeToolsRequestType
+
+func init() {
+	t["UpgradeTools_Task"] = reflect.TypeOf((*UpgradeTools_Task)(nil)).Elem()
+}
+
+type UpgradeTools_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type UpgradeVMRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Version string                 `xml:"version,omitempty"`
+}
+
+func init() {
+	t["UpgradeVMRequestType"] = reflect.TypeOf((*UpgradeVMRequestType)(nil)).Elem()
+}
+
+type UpgradeVM_Task UpgradeVMRequestType
+
+func init() {
+	t["UpgradeVM_Task"] = reflect.TypeOf((*UpgradeVM_Task)(nil)).Elem()
+}
+
+type UpgradeVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type UpgradeVmLayout UpgradeVmLayoutRequestType
+
+func init() {
+	t["UpgradeVmLayout"] = reflect.TypeOf((*UpgradeVmLayout)(nil)).Elem()
+}
+
+type UpgradeVmLayoutRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["UpgradeVmLayoutRequestType"] = reflect.TypeOf((*UpgradeVmLayoutRequestType)(nil)).Elem()
+}
+
+type UpgradeVmLayoutResponse struct {
+}
+
+type UpgradeVmfs UpgradeVmfsRequestType
+
+func init() {
+	t["UpgradeVmfs"] = reflect.TypeOf((*UpgradeVmfs)(nil)).Elem()
+}
+
+type UpgradeVmfsRequestType struct {
+	This     ManagedObjectReference `xml:"_this"`
+	VmfsPath string                 `xml:"vmfsPath"`
+}
+
+func init() {
+	t["UpgradeVmfsRequestType"] = reflect.TypeOf((*UpgradeVmfsRequestType)(nil)).Elem()
+}
+
+type UpgradeVmfsResponse struct {
+}
+
+type UpgradeVsanObjects UpgradeVsanObjectsRequestType
+
+func init() {
+	t["UpgradeVsanObjects"] = reflect.TypeOf((*UpgradeVsanObjects)(nil)).Elem()
+}
+
+type UpgradeVsanObjectsRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	Uuids      []string               `xml:"uuids"`
+	NewVersion int32                  `xml:"newVersion"`
+}
+
+func init() {
+	t["UpgradeVsanObjectsRequestType"] = reflect.TypeOf((*UpgradeVsanObjectsRequestType)(nil)).Elem()
+}
+
+type UpgradeVsanObjectsResponse struct {
+	Returnval []HostVsanInternalSystemVsanObjectOperationResult `xml:"returnval,omitempty"`
+}
+
+type UplinkPortMtuNotSupportEvent struct {
+	DvsHealthStatusChangeEvent
+}
+
+func init() {
+	t["UplinkPortMtuNotSupportEvent"] = reflect.TypeOf((*UplinkPortMtuNotSupportEvent)(nil)).Elem()
+}
+
+type UplinkPortMtuSupportEvent struct {
+	DvsHealthStatusChangeEvent
+}
+
+func init() {
+	t["UplinkPortMtuSupportEvent"] = reflect.TypeOf((*UplinkPortMtuSupportEvent)(nil)).Elem()
+}
+
+type UplinkPortVlanTrunkedEvent struct {
+	DvsHealthStatusChangeEvent
+}
+
+func init() {
+	t["UplinkPortVlanTrunkedEvent"] = reflect.TypeOf((*UplinkPortVlanTrunkedEvent)(nil)).Elem()
+}
+
+type UplinkPortVlanUntrunkedEvent struct {
+	DvsHealthStatusChangeEvent
+}
+
+func init() {
+	t["UplinkPortVlanUntrunkedEvent"] = reflect.TypeOf((*UplinkPortVlanUntrunkedEvent)(nil)).Elem()
+}
+
+type UploadClientCert UploadClientCertRequestType
+
+func init() {
+	t["UploadClientCert"] = reflect.TypeOf((*UploadClientCert)(nil)).Elem()
+}
+
+type UploadClientCertRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	Cluster     KeyProviderId          `xml:"cluster"`
+	Certificate string                 `xml:"certificate"`
+	PrivateKey  string                 `xml:"privateKey"`
+}
+
+func init() {
+	t["UploadClientCertRequestType"] = reflect.TypeOf((*UploadClientCertRequestType)(nil)).Elem()
+}
+
+type UploadClientCertResponse struct {
+}
+
+type UploadKmipServerCert UploadKmipServerCertRequestType
+
+func init() {
+	t["UploadKmipServerCert"] = reflect.TypeOf((*UploadKmipServerCert)(nil)).Elem()
+}
+
+type UploadKmipServerCertRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	Cluster     KeyProviderId          `xml:"cluster"`
+	Certificate string                 `xml:"certificate"`
+}
+
+func init() {
+	t["UploadKmipServerCertRequestType"] = reflect.TypeOf((*UploadKmipServerCertRequestType)(nil)).Elem()
+}
+
+type UploadKmipServerCertResponse struct {
+}
+
+type UsbScanCodeSpec struct {
+	DynamicData
+
+	KeyEvents []UsbScanCodeSpecKeyEvent `xml:"keyEvents"`
+}
+
+func init() {
+	t["UsbScanCodeSpec"] = reflect.TypeOf((*UsbScanCodeSpec)(nil)).Elem()
+}
+
+type UsbScanCodeSpecKeyEvent struct {
+	DynamicData
+
+	UsbHidCode int32                        `xml:"usbHidCode"`
+	Modifiers  *UsbScanCodeSpecModifierType `xml:"modifiers,omitempty"`
+}
+
+func init() {
+	t["UsbScanCodeSpecKeyEvent"] = reflect.TypeOf((*UsbScanCodeSpecKeyEvent)(nil)).Elem()
+}
+
+type UsbScanCodeSpecModifierType struct {
+	DynamicData
+
+	LeftControl  *bool `xml:"leftControl"`
+	LeftShift    *bool `xml:"leftShift"`
+	LeftAlt      *bool `xml:"leftAlt"`
+	LeftGui      *bool `xml:"leftGui"`
+	RightControl *bool `xml:"rightControl"`
+	RightShift   *bool `xml:"rightShift"`
+	RightAlt     *bool `xml:"rightAlt"`
+	RightGui     *bool `xml:"rightGui"`
+}
+
+func init() {
+	t["UsbScanCodeSpecModifierType"] = reflect.TypeOf((*UsbScanCodeSpecModifierType)(nil)).Elem()
+}
+
+type UserAssignedToGroup struct {
+	HostEvent
+
+	UserLogin string `xml:"userLogin"`
+	Group     string `xml:"group"`
+}
+
+func init() {
+	t["UserAssignedToGroup"] = reflect.TypeOf((*UserAssignedToGroup)(nil)).Elem()
+}
+
+type UserGroupProfile struct {
+	ApplyProfile
+
+	Key string `xml:"key"`
+}
+
+func init() {
+	t["UserGroupProfile"] = reflect.TypeOf((*UserGroupProfile)(nil)).Elem()
+}
+
+type UserInputRequiredParameterMetadata struct {
+	ProfilePolicyOptionMetadata
+
+	UserInputParameter []ProfileParameterMetadata `xml:"userInputParameter,omitempty"`
+}
+
+func init() {
+	t["UserInputRequiredParameterMetadata"] = reflect.TypeOf((*UserInputRequiredParameterMetadata)(nil)).Elem()
+}
+
+type UserLoginSessionEvent struct {
+	SessionEvent
+
+	IpAddress string `xml:"ipAddress"`
+	UserAgent string `xml:"userAgent,omitempty"`
+	Locale    string `xml:"locale"`
+	SessionId string `xml:"sessionId"`
+}
+
+func init() {
+	t["UserLoginSessionEvent"] = reflect.TypeOf((*UserLoginSessionEvent)(nil)).Elem()
+}
+
+type UserLogoutSessionEvent struct {
+	SessionEvent
+
+	IpAddress string     `xml:"ipAddress,omitempty"`
+	UserAgent string     `xml:"userAgent,omitempty"`
+	CallCount int64      `xml:"callCount,omitempty"`
+	SessionId string     `xml:"sessionId,omitempty"`
+	LoginTime *time.Time `xml:"loginTime"`
+}
+
+func init() {
+	t["UserLogoutSessionEvent"] = reflect.TypeOf((*UserLogoutSessionEvent)(nil)).Elem()
+}
+
+type UserNotFound struct {
+	VimFault
+
+	Principal  string `xml:"principal"`
+	Unresolved bool   `xml:"unresolved"`
+}
+
+func init() {
+	t["UserNotFound"] = reflect.TypeOf((*UserNotFound)(nil)).Elem()
+}
+
+type UserNotFoundFault UserNotFound
+
+func init() {
+	t["UserNotFoundFault"] = reflect.TypeOf((*UserNotFoundFault)(nil)).Elem()
+}
+
+type UserPasswordChanged struct {
+	HostEvent
+
+	UserLogin string `xml:"userLogin"`
+}
+
+func init() {
+	t["UserPasswordChanged"] = reflect.TypeOf((*UserPasswordChanged)(nil)).Elem()
+}
+
+type UserPrivilegeResult struct {
+	DynamicData
+
+	Entity     ManagedObjectReference `xml:"entity"`
+	Privileges []string               `xml:"privileges,omitempty"`
+}
+
+func init() {
+	t["UserPrivilegeResult"] = reflect.TypeOf((*UserPrivilegeResult)(nil)).Elem()
+}
+
+type UserProfile struct {
+	ApplyProfile
+
+	Key string `xml:"key"`
+}
+
+func init() {
+	t["UserProfile"] = reflect.TypeOf((*UserProfile)(nil)).Elem()
+}
+
+type UserSearchResult struct {
+	DynamicData
+
+	Principal string `xml:"principal"`
+	FullName  string `xml:"fullName,omitempty"`
+	Group     bool   `xml:"group"`
+}
+
+func init() {
+	t["UserSearchResult"] = reflect.TypeOf((*UserSearchResult)(nil)).Elem()
+}
+
+type UserSession struct {
+	DynamicData
+
+	Key              string    `xml:"key"`
+	UserName         string    `xml:"userName"`
+	FullName         string    `xml:"fullName"`
+	LoginTime        time.Time `xml:"loginTime"`
+	LastActiveTime   time.Time `xml:"lastActiveTime"`
+	Locale           string    `xml:"locale"`
+	MessageLocale    string    `xml:"messageLocale"`
+	ExtensionSession *bool     `xml:"extensionSession"`
+	IpAddress        string    `xml:"ipAddress,omitempty"`
+	UserAgent        string    `xml:"userAgent,omitempty"`
+	CallCount        int64     `xml:"callCount,omitempty"`
+}
+
+func init() {
+	t["UserSession"] = reflect.TypeOf((*UserSession)(nil)).Elem()
+}
+
+type UserUnassignedFromGroup struct {
+	HostEvent
+
+	UserLogin string `xml:"userLogin"`
+	Group     string `xml:"group"`
+}
+
+func init() {
+	t["UserUnassignedFromGroup"] = reflect.TypeOf((*UserUnassignedFromGroup)(nil)).Elem()
+}
+
+type UserUpgradeEvent struct {
+	UpgradeEvent
+}
+
+func init() {
+	t["UserUpgradeEvent"] = reflect.TypeOf((*UserUpgradeEvent)(nil)).Elem()
+}
+
+type VASAStorageArray struct {
+	DynamicData
+
+	Name     string `xml:"name"`
+	Uuid     string `xml:"uuid"`
+	VendorId string `xml:"vendorId"`
+	ModelId  string `xml:"modelId"`
+}
+
+func init() {
+	t["VASAStorageArray"] = reflect.TypeOf((*VASAStorageArray)(nil)).Elem()
+}
+
+type VAppCloneSpec struct {
+	DynamicData
+
+	Location        ManagedObjectReference            `xml:"location"`
+	Host            *ManagedObjectReference           `xml:"host,omitempty"`
+	ResourceSpec    *ResourceConfigSpec               `xml:"resourceSpec,omitempty"`
+	VmFolder        *ManagedObjectReference           `xml:"vmFolder,omitempty"`
+	NetworkMapping  []VAppCloneSpecNetworkMappingPair `xml:"networkMapping,omitempty"`
+	Property        []KeyValue                        `xml:"property,omitempty"`
+	ResourceMapping []VAppCloneSpecResourceMap        `xml:"resourceMapping,omitempty"`
+	Provisioning    string                            `xml:"provisioning,omitempty"`
+}
+
+func init() {
+	t["VAppCloneSpec"] = reflect.TypeOf((*VAppCloneSpec)(nil)).Elem()
+}
+
+type VAppCloneSpecNetworkMappingPair struct {
+	DynamicData
+
+	Source      ManagedObjectReference `xml:"source"`
+	Destination ManagedObjectReference `xml:"destination"`
+}
+
+func init() {
+	t["VAppCloneSpecNetworkMappingPair"] = reflect.TypeOf((*VAppCloneSpecNetworkMappingPair)(nil)).Elem()
+}
+
+type VAppCloneSpecResourceMap struct {
+	DynamicData
+
+	Source       ManagedObjectReference  `xml:"source"`
+	Parent       *ManagedObjectReference `xml:"parent,omitempty"`
+	ResourceSpec *ResourceConfigSpec     `xml:"resourceSpec,omitempty"`
+	Location     *ManagedObjectReference `xml:"location,omitempty"`
+}
+
+func init() {
+	t["VAppCloneSpecResourceMap"] = reflect.TypeOf((*VAppCloneSpecResourceMap)(nil)).Elem()
+}
+
+type VAppConfigFault struct {
+	VimFault
+}
+
+func init() {
+	t["VAppConfigFault"] = reflect.TypeOf((*VAppConfigFault)(nil)).Elem()
+}
+
+type VAppConfigFaultFault BaseVAppConfigFault
+
+func init() {
+	t["VAppConfigFaultFault"] = reflect.TypeOf((*VAppConfigFaultFault)(nil)).Elem()
+}
+
+type VAppConfigInfo struct {
+	VmConfigInfo
+
+	EntityConfig []VAppEntityConfigInfo `xml:"entityConfig,omitempty"`
+	Annotation   string                 `xml:"annotation"`
+	InstanceUuid string                 `xml:"instanceUuid,omitempty"`
+	ManagedBy    *ManagedByInfo         `xml:"managedBy,omitempty"`
+}
+
+func init() {
+	t["VAppConfigInfo"] = reflect.TypeOf((*VAppConfigInfo)(nil)).Elem()
+}
+
+type VAppConfigSpec struct {
+	VmConfigSpec
+
+	EntityConfig []VAppEntityConfigInfo `xml:"entityConfig,omitempty"`
+	Annotation   string                 `xml:"annotation,omitempty"`
+	InstanceUuid string                 `xml:"instanceUuid,omitempty"`
+	ManagedBy    *ManagedByInfo         `xml:"managedBy,omitempty"`
+}
+
+func init() {
+	t["VAppConfigSpec"] = reflect.TypeOf((*VAppConfigSpec)(nil)).Elem()
+}
+
+type VAppEntityConfigInfo struct {
+	DynamicData
+
+	Key               *ManagedObjectReference `xml:"key,omitempty"`
+	Tag               string                  `xml:"tag,omitempty"`
+	StartOrder        int32                   `xml:"startOrder,omitempty"`
+	StartDelay        int32                   `xml:"startDelay,omitempty"`
+	WaitingForGuest   *bool                   `xml:"waitingForGuest"`
+	StartAction       string                  `xml:"startAction,omitempty"`
+	StopDelay         int32                   `xml:"stopDelay,omitempty"`
+	StopAction        string                  `xml:"stopAction,omitempty"`
+	DestroyWithParent *bool                   `xml:"destroyWithParent"`
+}
+
+func init() {
+	t["VAppEntityConfigInfo"] = reflect.TypeOf((*VAppEntityConfigInfo)(nil)).Elem()
+}
+
+type VAppIPAssignmentInfo struct {
+	DynamicData
+
+	SupportedAllocationScheme []string `xml:"supportedAllocationScheme,omitempty"`
+	IpAllocationPolicy        string   `xml:"ipAllocationPolicy,omitempty"`
+	SupportedIpProtocol       []string `xml:"supportedIpProtocol,omitempty"`
+	IpProtocol                string   `xml:"ipProtocol,omitempty"`
+}
+
+func init() {
+	t["VAppIPAssignmentInfo"] = reflect.TypeOf((*VAppIPAssignmentInfo)(nil)).Elem()
+}
+
+type VAppNotRunning struct {
+	VmConfigFault
+}
+
+func init() {
+	t["VAppNotRunning"] = reflect.TypeOf((*VAppNotRunning)(nil)).Elem()
+}
+
+type VAppNotRunningFault VAppNotRunning
+
+func init() {
+	t["VAppNotRunningFault"] = reflect.TypeOf((*VAppNotRunningFault)(nil)).Elem()
+}
+
+type VAppOperationInProgress struct {
+	RuntimeFault
+}
+
+func init() {
+	t["VAppOperationInProgress"] = reflect.TypeOf((*VAppOperationInProgress)(nil)).Elem()
+}
+
+type VAppOperationInProgressFault VAppOperationInProgress
+
+func init() {
+	t["VAppOperationInProgressFault"] = reflect.TypeOf((*VAppOperationInProgressFault)(nil)).Elem()
+}
+
+type VAppOvfSectionInfo struct {
+	DynamicData
+
+	Key             int32  `xml:"key,omitempty"`
+	Namespace       string `xml:"namespace,omitempty"`
+	Type            string `xml:"type,omitempty"`
+	AtEnvelopeLevel *bool  `xml:"atEnvelopeLevel"`
+	Contents        string `xml:"contents,omitempty"`
+}
+
+func init() {
+	t["VAppOvfSectionInfo"] = reflect.TypeOf((*VAppOvfSectionInfo)(nil)).Elem()
+}
+
+type VAppOvfSectionSpec struct {
+	ArrayUpdateSpec
+
+	Info *VAppOvfSectionInfo `xml:"info,omitempty"`
+}
+
+func init() {
+	t["VAppOvfSectionSpec"] = reflect.TypeOf((*VAppOvfSectionSpec)(nil)).Elem()
+}
+
+type VAppProductInfo struct {
+	DynamicData
+
+	Key         int32  `xml:"key"`
+	ClassId     string `xml:"classId,omitempty"`
+	InstanceId  string `xml:"instanceId,omitempty"`
+	Name        string `xml:"name,omitempty"`
+	Vendor      string `xml:"vendor,omitempty"`
+	Version     string `xml:"version,omitempty"`
+	FullVersion string `xml:"fullVersion,omitempty"`
+	VendorUrl   string `xml:"vendorUrl,omitempty"`
+	ProductUrl  string `xml:"productUrl,omitempty"`
+	AppUrl      string `xml:"appUrl,omitempty"`
+}
+
+func init() {
+	t["VAppProductInfo"] = reflect.TypeOf((*VAppProductInfo)(nil)).Elem()
+}
+
+type VAppProductSpec struct {
+	ArrayUpdateSpec
+
+	Info *VAppProductInfo `xml:"info,omitempty"`
+}
+
+func init() {
+	t["VAppProductSpec"] = reflect.TypeOf((*VAppProductSpec)(nil)).Elem()
+}
+
+type VAppPropertyFault struct {
+	VmConfigFault
+
+	Id       string `xml:"id"`
+	Category string `xml:"category"`
+	Label    string `xml:"label"`
+	Type     string `xml:"type"`
+	Value    string `xml:"value"`
+}
+
+func init() {
+	t["VAppPropertyFault"] = reflect.TypeOf((*VAppPropertyFault)(nil)).Elem()
+}
+
+type VAppPropertyFaultFault BaseVAppPropertyFault
+
+func init() {
+	t["VAppPropertyFaultFault"] = reflect.TypeOf((*VAppPropertyFaultFault)(nil)).Elem()
+}
+
+type VAppPropertyInfo struct {
+	DynamicData
+
+	Key              int32  `xml:"key"`
+	ClassId          string `xml:"classId,omitempty"`
+	InstanceId       string `xml:"instanceId,omitempty"`
+	Id               string `xml:"id,omitempty"`
+	Category         string `xml:"category,omitempty"`
+	Label            string `xml:"label,omitempty"`
+	Type             string `xml:"type,omitempty"`
+	TypeReference    string `xml:"typeReference,omitempty"`
+	UserConfigurable *bool  `xml:"userConfigurable"`
+	DefaultValue     string `xml:"defaultValue,omitempty"`
+	Value            string `xml:"value,omitempty"`
+	Description      string `xml:"description,omitempty"`
+}
+
+func init() {
+	t["VAppPropertyInfo"] = reflect.TypeOf((*VAppPropertyInfo)(nil)).Elem()
+}
+
+type VAppPropertySpec struct {
+	ArrayUpdateSpec
+
+	Info *VAppPropertyInfo `xml:"info,omitempty"`
+}
+
+func init() {
+	t["VAppPropertySpec"] = reflect.TypeOf((*VAppPropertySpec)(nil)).Elem()
+}
+
+type VAppTaskInProgress struct {
+	TaskInProgress
+}
+
+func init() {
+	t["VAppTaskInProgress"] = reflect.TypeOf((*VAppTaskInProgress)(nil)).Elem()
+}
+
+type VAppTaskInProgressFault VAppTaskInProgress
+
+func init() {
+	t["VAppTaskInProgressFault"] = reflect.TypeOf((*VAppTaskInProgressFault)(nil)).Elem()
+}
+
+type VFlashCacheHotConfigNotSupported struct {
+	VmConfigFault
+}
+
+func init() {
+	t["VFlashCacheHotConfigNotSupported"] = reflect.TypeOf((*VFlashCacheHotConfigNotSupported)(nil)).Elem()
+}
+
+type VFlashCacheHotConfigNotSupportedFault VFlashCacheHotConfigNotSupported
+
+func init() {
+	t["VFlashCacheHotConfigNotSupportedFault"] = reflect.TypeOf((*VFlashCacheHotConfigNotSupportedFault)(nil)).Elem()
+}
+
+type VFlashModuleNotSupported struct {
+	VmConfigFault
+
+	VmName     string `xml:"vmName"`
+	ModuleName string `xml:"moduleName"`
+	Reason     string `xml:"reason"`
+	HostName   string `xml:"hostName"`
+}
+
+func init() {
+	t["VFlashModuleNotSupported"] = reflect.TypeOf((*VFlashModuleNotSupported)(nil)).Elem()
+}
+
+type VFlashModuleNotSupportedFault VFlashModuleNotSupported
+
+func init() {
+	t["VFlashModuleNotSupportedFault"] = reflect.TypeOf((*VFlashModuleNotSupportedFault)(nil)).Elem()
+}
+
+type VFlashModuleVersionIncompatible struct {
+	VimFault
+
+	ModuleName             string `xml:"moduleName"`
+	VmRequestModuleVersion string `xml:"vmRequestModuleVersion"`
+	HostMinSupportedVerson string `xml:"hostMinSupportedVerson"`
+	HostModuleVersion      string `xml:"hostModuleVersion"`
+}
+
+func init() {
+	t["VFlashModuleVersionIncompatible"] = reflect.TypeOf((*VFlashModuleVersionIncompatible)(nil)).Elem()
+}
+
+type VFlashModuleVersionIncompatibleFault VFlashModuleVersionIncompatible
+
+func init() {
+	t["VFlashModuleVersionIncompatibleFault"] = reflect.TypeOf((*VFlashModuleVersionIncompatibleFault)(nil)).Elem()
+}
+
+type VMFSDatastoreCreatedEvent struct {
+	HostEvent
+
+	Datastore    DatastoreEventArgument `xml:"datastore"`
+	DatastoreUrl string                 `xml:"datastoreUrl,omitempty"`
+}
+
+func init() {
+	t["VMFSDatastoreCreatedEvent"] = reflect.TypeOf((*VMFSDatastoreCreatedEvent)(nil)).Elem()
+}
+
+type VMFSDatastoreExpandedEvent struct {
+	HostEvent
+
+	Datastore DatastoreEventArgument `xml:"datastore"`
+}
+
+func init() {
+	t["VMFSDatastoreExpandedEvent"] = reflect.TypeOf((*VMFSDatastoreExpandedEvent)(nil)).Elem()
+}
+
+type VMFSDatastoreExtendedEvent struct {
+	HostEvent
+
+	Datastore DatastoreEventArgument `xml:"datastore"`
+}
+
+func init() {
+	t["VMFSDatastoreExtendedEvent"] = reflect.TypeOf((*VMFSDatastoreExtendedEvent)(nil)).Elem()
+}
+
+type VMINotSupported struct {
+	DeviceNotSupported
+}
+
+func init() {
+	t["VMINotSupported"] = reflect.TypeOf((*VMINotSupported)(nil)).Elem()
+}
+
+type VMINotSupportedFault VMINotSupported
+
+func init() {
+	t["VMINotSupportedFault"] = reflect.TypeOf((*VMINotSupportedFault)(nil)).Elem()
+}
+
+type VMOnConflictDVPort struct {
+	CannotAccessNetwork
+}
+
+func init() {
+	t["VMOnConflictDVPort"] = reflect.TypeOf((*VMOnConflictDVPort)(nil)).Elem()
+}
+
+type VMOnConflictDVPortFault VMOnConflictDVPort
+
+func init() {
+	t["VMOnConflictDVPortFault"] = reflect.TypeOf((*VMOnConflictDVPortFault)(nil)).Elem()
+}
+
+type VMOnVirtualIntranet struct {
+	CannotAccessNetwork
+}
+
+func init() {
+	t["VMOnVirtualIntranet"] = reflect.TypeOf((*VMOnVirtualIntranet)(nil)).Elem()
+}
+
+type VMOnVirtualIntranetFault VMOnVirtualIntranet
+
+func init() {
+	t["VMOnVirtualIntranetFault"] = reflect.TypeOf((*VMOnVirtualIntranetFault)(nil)).Elem()
+}
+
+type VMotionAcrossNetworkNotSupported struct {
+	MigrationFeatureNotSupported
+}
+
+func init() {
+	t["VMotionAcrossNetworkNotSupported"] = reflect.TypeOf((*VMotionAcrossNetworkNotSupported)(nil)).Elem()
+}
+
+type VMotionAcrossNetworkNotSupportedFault VMotionAcrossNetworkNotSupported
+
+func init() {
+	t["VMotionAcrossNetworkNotSupportedFault"] = reflect.TypeOf((*VMotionAcrossNetworkNotSupportedFault)(nil)).Elem()
+}
+
+type VMotionInterfaceIssue struct {
+	MigrationFault
+
+	AtSourceHost     bool                    `xml:"atSourceHost"`
+	FailedHost       string                  `xml:"failedHost"`
+	FailedHostEntity *ManagedObjectReference `xml:"failedHostEntity,omitempty"`
+}
+
+func init() {
+	t["VMotionInterfaceIssue"] = reflect.TypeOf((*VMotionInterfaceIssue)(nil)).Elem()
+}
+
+type VMotionInterfaceIssueFault BaseVMotionInterfaceIssue
+
+func init() {
+	t["VMotionInterfaceIssueFault"] = reflect.TypeOf((*VMotionInterfaceIssueFault)(nil)).Elem()
+}
+
+type VMotionLicenseExpiredEvent struct {
+	LicenseEvent
+}
+
+func init() {
+	t["VMotionLicenseExpiredEvent"] = reflect.TypeOf((*VMotionLicenseExpiredEvent)(nil)).Elem()
+}
+
+type VMotionLinkCapacityLow struct {
+	VMotionInterfaceIssue
+
+	Network string `xml:"network"`
+}
+
+func init() {
+	t["VMotionLinkCapacityLow"] = reflect.TypeOf((*VMotionLinkCapacityLow)(nil)).Elem()
+}
+
+type VMotionLinkCapacityLowFault VMotionLinkCapacityLow
+
+func init() {
+	t["VMotionLinkCapacityLowFault"] = reflect.TypeOf((*VMotionLinkCapacityLowFault)(nil)).Elem()
+}
+
+type VMotionLinkDown struct {
+	VMotionInterfaceIssue
+
+	Network string `xml:"network"`
+}
+
+func init() {
+	t["VMotionLinkDown"] = reflect.TypeOf((*VMotionLinkDown)(nil)).Elem()
+}
+
+type VMotionLinkDownFault VMotionLinkDown
+
+func init() {
+	t["VMotionLinkDownFault"] = reflect.TypeOf((*VMotionLinkDownFault)(nil)).Elem()
+}
+
+type VMotionNotConfigured struct {
+	VMotionInterfaceIssue
+}
+
+func init() {
+	t["VMotionNotConfigured"] = reflect.TypeOf((*VMotionNotConfigured)(nil)).Elem()
+}
+
+type VMotionNotConfiguredFault VMotionNotConfigured
+
+func init() {
+	t["VMotionNotConfiguredFault"] = reflect.TypeOf((*VMotionNotConfiguredFault)(nil)).Elem()
+}
+
+type VMotionNotLicensed struct {
+	VMotionInterfaceIssue
+}
+
+func init() {
+	t["VMotionNotLicensed"] = reflect.TypeOf((*VMotionNotLicensed)(nil)).Elem()
+}
+
+type VMotionNotLicensedFault VMotionNotLicensed
+
+func init() {
+	t["VMotionNotLicensedFault"] = reflect.TypeOf((*VMotionNotLicensedFault)(nil)).Elem()
+}
+
+type VMotionNotSupported struct {
+	VMotionInterfaceIssue
+}
+
+func init() {
+	t["VMotionNotSupported"] = reflect.TypeOf((*VMotionNotSupported)(nil)).Elem()
+}
+
+type VMotionNotSupportedFault VMotionNotSupported
+
+func init() {
+	t["VMotionNotSupportedFault"] = reflect.TypeOf((*VMotionNotSupportedFault)(nil)).Elem()
+}
+
+type VMotionProtocolIncompatible struct {
+	MigrationFault
+}
+
+func init() {
+	t["VMotionProtocolIncompatible"] = reflect.TypeOf((*VMotionProtocolIncompatible)(nil)).Elem()
+}
+
+type VMotionProtocolIncompatibleFault VMotionProtocolIncompatible
+
+func init() {
+	t["VMotionProtocolIncompatibleFault"] = reflect.TypeOf((*VMotionProtocolIncompatibleFault)(nil)).Elem()
+}
+
+type VMwareDVSConfigInfo struct {
+	DVSConfigInfo
+
+	VspanSession                []VMwareVspanSession         `xml:"vspanSession,omitempty"`
+	PvlanConfig                 []VMwareDVSPvlanMapEntry     `xml:"pvlanConfig,omitempty"`
+	MaxMtu                      int32                        `xml:"maxMtu"`
+	LinkDiscoveryProtocolConfig *LinkDiscoveryProtocolConfig `xml:"linkDiscoveryProtocolConfig,omitempty"`
+	IpfixConfig                 *VMwareIpfixConfig           `xml:"ipfixConfig,omitempty"`
+	LacpGroupConfig             []VMwareDvsLacpGroupConfig   `xml:"lacpGroupConfig,omitempty"`
+	LacpApiVersion              string                       `xml:"lacpApiVersion,omitempty"`
+	MulticastFilteringMode      string                       `xml:"multicastFilteringMode,omitempty"`
+}
+
+func init() {
+	t["VMwareDVSConfigInfo"] = reflect.TypeOf((*VMwareDVSConfigInfo)(nil)).Elem()
+}
+
+type VMwareDVSConfigSpec struct {
+	DVSConfigSpec
+
+	PvlanConfigSpec             []VMwareDVSPvlanConfigSpec   `xml:"pvlanConfigSpec,omitempty"`
+	VspanConfigSpec             []VMwareDVSVspanConfigSpec   `xml:"vspanConfigSpec,omitempty"`
+	MaxMtu                      int32                        `xml:"maxMtu,omitempty"`
+	LinkDiscoveryProtocolConfig *LinkDiscoveryProtocolConfig `xml:"linkDiscoveryProtocolConfig,omitempty"`
+	IpfixConfig                 *VMwareIpfixConfig           `xml:"ipfixConfig,omitempty"`
+	LacpApiVersion              string                       `xml:"lacpApiVersion,omitempty"`
+	MulticastFilteringMode      string                       `xml:"multicastFilteringMode,omitempty"`
+}
+
+func init() {
+	t["VMwareDVSConfigSpec"] = reflect.TypeOf((*VMwareDVSConfigSpec)(nil)).Elem()
+}
+
+type VMwareDVSFeatureCapability struct {
+	DVSFeatureCapability
+
+	VspanSupported             *bool                     `xml:"vspanSupported"`
+	LldpSupported              *bool                     `xml:"lldpSupported"`
+	IpfixSupported             *bool                     `xml:"ipfixSupported"`
+	IpfixCapability            *VMwareDvsIpfixCapability `xml:"ipfixCapability,omitempty"`
+	MulticastSnoopingSupported *bool                     `xml:"multicastSnoopingSupported"`
+	VspanCapability            *VMwareDVSVspanCapability `xml:"vspanCapability,omitempty"`
+	LacpCapability             *VMwareDvsLacpCapability  `xml:"lacpCapability,omitempty"`
+}
+
+func init() {
+	t["VMwareDVSFeatureCapability"] = reflect.TypeOf((*VMwareDVSFeatureCapability)(nil)).Elem()
+}
+
+type VMwareDVSHealthCheckCapability struct {
+	DVSHealthCheckCapability
+
+	VlanMtuSupported bool `xml:"vlanMtuSupported"`
+	TeamingSupported bool `xml:"teamingSupported"`
+}
+
+func init() {
+	t["VMwareDVSHealthCheckCapability"] = reflect.TypeOf((*VMwareDVSHealthCheckCapability)(nil)).Elem()
+}
+
+type VMwareDVSHealthCheckConfig struct {
+	DVSHealthCheckConfig
+}
+
+func init() {
+	t["VMwareDVSHealthCheckConfig"] = reflect.TypeOf((*VMwareDVSHealthCheckConfig)(nil)).Elem()
+}
+
+type VMwareDVSMtuHealthCheckResult struct {
+	HostMemberUplinkHealthCheckResult
+
+	MtuMismatch             bool           `xml:"mtuMismatch"`
+	VlanSupportSwitchMtu    []NumericRange `xml:"vlanSupportSwitchMtu,omitempty"`
+	VlanNotSupportSwitchMtu []NumericRange `xml:"vlanNotSupportSwitchMtu,omitempty"`
+}
+
+func init() {
+	t["VMwareDVSMtuHealthCheckResult"] = reflect.TypeOf((*VMwareDVSMtuHealthCheckResult)(nil)).Elem()
+}
+
+type VMwareDVSPortSetting struct {
+	DVPortSetting
+
+	Vlan                BaseVmwareDistributedVirtualSwitchVlanSpec `xml:"vlan,omitempty,typeattr"`
+	QosTag              *IntPolicy                                 `xml:"qosTag,omitempty"`
+	UplinkTeamingPolicy *VmwareUplinkPortTeamingPolicy             `xml:"uplinkTeamingPolicy,omitempty"`
+	SecurityPolicy      *DVSSecurityPolicy                         `xml:"securityPolicy,omitempty"`
+	IpfixEnabled        *BoolPolicy                                `xml:"ipfixEnabled,omitempty"`
+	TxUplink            *BoolPolicy                                `xml:"txUplink,omitempty"`
+	LacpPolicy          *VMwareUplinkLacpPolicy                    `xml:"lacpPolicy,omitempty"`
+}
+
+func init() {
+	t["VMwareDVSPortSetting"] = reflect.TypeOf((*VMwareDVSPortSetting)(nil)).Elem()
+}
+
+type VMwareDVSPortgroupPolicy struct {
+	DVPortgroupPolicy
+
+	VlanOverrideAllowed           bool  `xml:"vlanOverrideAllowed"`
+	UplinkTeamingOverrideAllowed  bool  `xml:"uplinkTeamingOverrideAllowed"`
+	SecurityPolicyOverrideAllowed bool  `xml:"securityPolicyOverrideAllowed"`
+	IpfixOverrideAllowed          *bool `xml:"ipfixOverrideAllowed"`
+}
+
+func init() {
+	t["VMwareDVSPortgroupPolicy"] = reflect.TypeOf((*VMwareDVSPortgroupPolicy)(nil)).Elem()
+}
+
+type VMwareDVSPvlanConfigSpec struct {
+	DynamicData
+
+	PvlanEntry VMwareDVSPvlanMapEntry `xml:"pvlanEntry"`
+	Operation  string                 `xml:"operation"`
+}
+
+func init() {
+	t["VMwareDVSPvlanConfigSpec"] = reflect.TypeOf((*VMwareDVSPvlanConfigSpec)(nil)).Elem()
+}
+
+type VMwareDVSPvlanMapEntry struct {
+	DynamicData
+
+	PrimaryVlanId   int32  `xml:"primaryVlanId"`
+	SecondaryVlanId int32  `xml:"secondaryVlanId"`
+	PvlanType       string `xml:"pvlanType"`
+}
+
+func init() {
+	t["VMwareDVSPvlanMapEntry"] = reflect.TypeOf((*VMwareDVSPvlanMapEntry)(nil)).Elem()
+}
+
+type VMwareDVSTeamingHealthCheckConfig struct {
+	VMwareDVSHealthCheckConfig
+}
+
+func init() {
+	t["VMwareDVSTeamingHealthCheckConfig"] = reflect.TypeOf((*VMwareDVSTeamingHealthCheckConfig)(nil)).Elem()
+}
+
+type VMwareDVSTeamingHealthCheckResult struct {
+	HostMemberHealthCheckResult
+
+	TeamingStatus string `xml:"teamingStatus"`
+}
+
+func init() {
+	t["VMwareDVSTeamingHealthCheckResult"] = reflect.TypeOf((*VMwareDVSTeamingHealthCheckResult)(nil)).Elem()
+}
+
+type VMwareDVSVlanHealthCheckResult struct {
+	HostMemberUplinkHealthCheckResult
+
+	TrunkedVlan   []NumericRange `xml:"trunkedVlan,omitempty"`
+	UntrunkedVlan []NumericRange `xml:"untrunkedVlan,omitempty"`
+}
+
+func init() {
+	t["VMwareDVSVlanHealthCheckResult"] = reflect.TypeOf((*VMwareDVSVlanHealthCheckResult)(nil)).Elem()
+}
+
+type VMwareDVSVlanMtuHealthCheckConfig struct {
+	VMwareDVSHealthCheckConfig
+}
+
+func init() {
+	t["VMwareDVSVlanMtuHealthCheckConfig"] = reflect.TypeOf((*VMwareDVSVlanMtuHealthCheckConfig)(nil)).Elem()
+}
+
+type VMwareDVSVspanCapability struct {
+	DynamicData
+
+	MixedDestSupported         bool  `xml:"mixedDestSupported"`
+	DvportSupported            bool  `xml:"dvportSupported"`
+	RemoteSourceSupported      bool  `xml:"remoteSourceSupported"`
+	RemoteDestSupported        bool  `xml:"remoteDestSupported"`
+	EncapRemoteSourceSupported bool  `xml:"encapRemoteSourceSupported"`
+	ErspanProtocolSupported    *bool `xml:"erspanProtocolSupported"`
+}
+
+func init() {
+	t["VMwareDVSVspanCapability"] = reflect.TypeOf((*VMwareDVSVspanCapability)(nil)).Elem()
+}
+
+type VMwareDVSVspanConfigSpec struct {
+	DynamicData
+
+	VspanSession VMwareVspanSession `xml:"vspanSession"`
+	Operation    string             `xml:"operation"`
+}
+
+func init() {
+	t["VMwareDVSVspanConfigSpec"] = reflect.TypeOf((*VMwareDVSVspanConfigSpec)(nil)).Elem()
+}
+
+type VMwareDvsIpfixCapability struct {
+	DynamicData
+
+	IpfixSupported               *bool `xml:"ipfixSupported"`
+	Ipv6ForIpfixSupported        *bool `xml:"ipv6ForIpfixSupported"`
+	ObservationDomainIdSupported *bool `xml:"observationDomainIdSupported"`
+}
+
+func init() {
+	t["VMwareDvsIpfixCapability"] = reflect.TypeOf((*VMwareDvsIpfixCapability)(nil)).Elem()
+}
+
+type VMwareDvsLacpCapability struct {
+	DynamicData
+
+	LacpSupported           *bool `xml:"lacpSupported"`
+	MultiLacpGroupSupported *bool `xml:"multiLacpGroupSupported"`
+}
+
+func init() {
+	t["VMwareDvsLacpCapability"] = reflect.TypeOf((*VMwareDvsLacpCapability)(nil)).Elem()
+}
+
+type VMwareDvsLacpGroupConfig struct {
+	DynamicData
+
+	Key                  string                   `xml:"key,omitempty"`
+	Name                 string                   `xml:"name,omitempty"`
+	Mode                 string                   `xml:"mode,omitempty"`
+	UplinkNum            int32                    `xml:"uplinkNum,omitempty"`
+	LoadbalanceAlgorithm string                   `xml:"loadbalanceAlgorithm,omitempty"`
+	Vlan                 *VMwareDvsLagVlanConfig  `xml:"vlan,omitempty"`
+	Ipfix                *VMwareDvsLagIpfixConfig `xml:"ipfix,omitempty"`
+	UplinkName           []string                 `xml:"uplinkName,omitempty"`
+	UplinkPortKey        []string                 `xml:"uplinkPortKey,omitempty"`
+}
+
+func init() {
+	t["VMwareDvsLacpGroupConfig"] = reflect.TypeOf((*VMwareDvsLacpGroupConfig)(nil)).Elem()
+}
+
+type VMwareDvsLacpGroupSpec struct {
+	DynamicData
+
+	LacpGroupConfig VMwareDvsLacpGroupConfig `xml:"lacpGroupConfig"`
+	Operation       string                   `xml:"operation"`
+}
+
+func init() {
+	t["VMwareDvsLacpGroupSpec"] = reflect.TypeOf((*VMwareDvsLacpGroupSpec)(nil)).Elem()
+}
+
+type VMwareDvsLagIpfixConfig struct {
+	DynamicData
+
+	IpfixEnabled *bool `xml:"ipfixEnabled"`
+}
+
+func init() {
+	t["VMwareDvsLagIpfixConfig"] = reflect.TypeOf((*VMwareDvsLagIpfixConfig)(nil)).Elem()
+}
+
+type VMwareDvsLagVlanConfig struct {
+	DynamicData
+
+	VlanId []NumericRange `xml:"vlanId,omitempty"`
+}
+
+func init() {
+	t["VMwareDvsLagVlanConfig"] = reflect.TypeOf((*VMwareDvsLagVlanConfig)(nil)).Elem()
+}
+
+type VMwareIpfixConfig struct {
+	DynamicData
+
+	CollectorIpAddress  string `xml:"collectorIpAddress,omitempty"`
+	CollectorPort       int32  `xml:"collectorPort,omitempty"`
+	ObservationDomainId int64  `xml:"observationDomainId,omitempty"`
+	ActiveFlowTimeout   int32  `xml:"activeFlowTimeout"`
+	IdleFlowTimeout     int32  `xml:"idleFlowTimeout"`
+	SamplingRate        int32  `xml:"samplingRate"`
+	InternalFlowsOnly   bool   `xml:"internalFlowsOnly"`
+}
+
+func init() {
+	t["VMwareIpfixConfig"] = reflect.TypeOf((*VMwareIpfixConfig)(nil)).Elem()
+}
+
+type VMwareUplinkLacpPolicy struct {
+	InheritablePolicy
+
+	Enable *BoolPolicy   `xml:"enable,omitempty"`
+	Mode   *StringPolicy `xml:"mode,omitempty"`
+}
+
+func init() {
+	t["VMwareUplinkLacpPolicy"] = reflect.TypeOf((*VMwareUplinkLacpPolicy)(nil)).Elem()
+}
+
+type VMwareUplinkPortOrderPolicy struct {
+	InheritablePolicy
+
+	ActiveUplinkPort  []string `xml:"activeUplinkPort,omitempty"`
+	StandbyUplinkPort []string `xml:"standbyUplinkPort,omitempty"`
+}
+
+func init() {
+	t["VMwareUplinkPortOrderPolicy"] = reflect.TypeOf((*VMwareUplinkPortOrderPolicy)(nil)).Elem()
+}
+
+type VMwareVspanPort struct {
+	DynamicData
+
+	PortKey                   []string `xml:"portKey,omitempty"`
+	UplinkPortName            []string `xml:"uplinkPortName,omitempty"`
+	WildcardPortConnecteeType []string `xml:"wildcardPortConnecteeType,omitempty"`
+	Vlans                     []int32  `xml:"vlans,omitempty"`
+	IpAddress                 []string `xml:"ipAddress,omitempty"`
+}
+
+func init() {
+	t["VMwareVspanPort"] = reflect.TypeOf((*VMwareVspanPort)(nil)).Elem()
+}
+
+type VMwareVspanSession struct {
+	DynamicData
+
+	Key                   string           `xml:"key,omitempty"`
+	Name                  string           `xml:"name,omitempty"`
+	Description           string           `xml:"description,omitempty"`
+	Enabled               bool             `xml:"enabled"`
+	SourcePortTransmitted *VMwareVspanPort `xml:"sourcePortTransmitted,omitempty"`
+	SourcePortReceived    *VMwareVspanPort `xml:"sourcePortReceived,omitempty"`
+	DestinationPort       *VMwareVspanPort `xml:"destinationPort,omitempty"`
+	EncapsulationVlanId   int32            `xml:"encapsulationVlanId,omitempty"`
+	StripOriginalVlan     bool             `xml:"stripOriginalVlan"`
+	MirroredPacketLength  int32            `xml:"mirroredPacketLength,omitempty"`
+	NormalTrafficAllowed  bool             `xml:"normalTrafficAllowed"`
+	SessionType           string           `xml:"sessionType,omitempty"`
+	SamplingRate          int32            `xml:"samplingRate,omitempty"`
+	EncapType             string           `xml:"encapType,omitempty"`
+	ErspanId              int32            `xml:"erspanId,omitempty"`
+	ErspanCOS             int32            `xml:"erspanCOS,omitempty"`
+	ErspanGraNanosec      *bool            `xml:"erspanGraNanosec"`
+}
+
+func init() {
+	t["VMwareVspanSession"] = reflect.TypeOf((*VMwareVspanSession)(nil)).Elem()
+}
+
+type VRPEditSpec 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"`
+}
+
+func init() {
+	t["VRPEditSpec"] = reflect.TypeOf((*VRPEditSpec)(nil)).Elem()
+}
+
+type VStorageObject struct {
+	DynamicData
+
+	Config VStorageObjectConfigInfo `xml:"config"`
+}
+
+func init() {
+	t["VStorageObject"] = reflect.TypeOf((*VStorageObject)(nil)).Elem()
+}
+
+type VStorageObjectConfigInfo struct {
+	BaseConfigInfo
+
+	CapacityInMB    int64    `xml:"capacityInMB"`
+	ConsumptionType []string `xml:"consumptionType,omitempty"`
+	ConsumerId      []ID     `xml:"consumerId,omitempty"`
+}
+
+func init() {
+	t["VStorageObjectConfigInfo"] = reflect.TypeOf((*VStorageObjectConfigInfo)(nil)).Elem()
+}
+
+type VStorageObjectStateInfo struct {
+	DynamicData
+
+	Tentative *bool `xml:"tentative"`
+}
+
+func init() {
+	t["VStorageObjectStateInfo"] = reflect.TypeOf((*VStorageObjectStateInfo)(nil)).Elem()
+}
+
+type VVolHostPE struct {
+	DynamicData
+
+	Key              ManagedObjectReference `xml:"key"`
+	ProtocolEndpoint []HostProtocolEndpoint `xml:"protocolEndpoint"`
+}
+
+func init() {
+	t["VVolHostPE"] = reflect.TypeOf((*VVolHostPE)(nil)).Elem()
+}
+
+type VVolVmConfigFileUpdateResult struct {
+	DynamicData
+
+	SucceededVmConfigFile []KeyValue                                           `xml:"succeededVmConfigFile,omitempty"`
+	FailedVmConfigFile    []VVolVmConfigFileUpdateResultFailedVmConfigFileInfo `xml:"failedVmConfigFile,omitempty"`
+}
+
+func init() {
+	t["VVolVmConfigFileUpdateResult"] = reflect.TypeOf((*VVolVmConfigFileUpdateResult)(nil)).Elem()
+}
+
+type VVolVmConfigFileUpdateResultFailedVmConfigFileInfo struct {
+	DynamicData
+
+	TargetConfigVVolId string               `xml:"targetConfigVVolId"`
+	Fault              LocalizedMethodFault `xml:"fault"`
+}
+
+func init() {
+	t["VVolVmConfigFileUpdateResultFailedVmConfigFileInfo"] = reflect.TypeOf((*VVolVmConfigFileUpdateResultFailedVmConfigFileInfo)(nil)).Elem()
+}
+
+type ValidateCredentialsInGuest ValidateCredentialsInGuestRequestType
+
+func init() {
+	t["ValidateCredentialsInGuest"] = reflect.TypeOf((*ValidateCredentialsInGuest)(nil)).Elem()
+}
+
+type ValidateCredentialsInGuestRequestType struct {
+	This ManagedObjectReference  `xml:"_this"`
+	Vm   ManagedObjectReference  `xml:"vm"`
+	Auth BaseGuestAuthentication `xml:"auth,typeattr"`
+}
+
+func init() {
+	t["ValidateCredentialsInGuestRequestType"] = reflect.TypeOf((*ValidateCredentialsInGuestRequestType)(nil)).Elem()
+}
+
+type ValidateCredentialsInGuestResponse struct {
+}
+
+type ValidateHost ValidateHostRequestType
+
+func init() {
+	t["ValidateHost"] = reflect.TypeOf((*ValidateHost)(nil)).Elem()
+}
+
+type ValidateHostRequestType struct {
+	This          ManagedObjectReference `xml:"_this"`
+	OvfDescriptor string                 `xml:"ovfDescriptor"`
+	Host          ManagedObjectReference `xml:"host"`
+	Vhp           OvfValidateHostParams  `xml:"vhp"`
+}
+
+func init() {
+	t["ValidateHostRequestType"] = reflect.TypeOf((*ValidateHostRequestType)(nil)).Elem()
+}
+
+type ValidateHostResponse struct {
+	Returnval OvfValidateHostResult `xml:"returnval"`
+}
+
+type ValidateMigration ValidateMigrationRequestType
+
+func init() {
+	t["ValidateMigration"] = reflect.TypeOf((*ValidateMigration)(nil)).Elem()
+}
+
+type ValidateMigrationRequestType struct {
+	This     ManagedObjectReference   `xml:"_this"`
+	Vm       []ManagedObjectReference `xml:"vm"`
+	State    VirtualMachinePowerState `xml:"state,omitempty"`
+	TestType []string                 `xml:"testType,omitempty"`
+	Pool     *ManagedObjectReference  `xml:"pool,omitempty"`
+	Host     *ManagedObjectReference  `xml:"host,omitempty"`
+}
+
+func init() {
+	t["ValidateMigrationRequestType"] = reflect.TypeOf((*ValidateMigrationRequestType)(nil)).Elem()
+}
+
+type ValidateMigrationResponse struct {
+	Returnval []BaseEvent `xml:"returnval,omitempty,typeattr"`
+}
+
+type VasaProviderContainerSpec struct {
+	DynamicData
+
+	VasaProviderInfo []VimVasaProviderInfo `xml:"vasaProviderInfo,omitempty"`
+	ScId             string                `xml:"scId"`
+	Deleted          bool                  `xml:"deleted"`
+}
+
+func init() {
+	t["VasaProviderContainerSpec"] = reflect.TypeOf((*VasaProviderContainerSpec)(nil)).Elem()
+}
+
+type VcAgentUninstallFailedEvent struct {
+	HostEvent
+
+	Reason string `xml:"reason,omitempty"`
+}
+
+func init() {
+	t["VcAgentUninstallFailedEvent"] = reflect.TypeOf((*VcAgentUninstallFailedEvent)(nil)).Elem()
+}
+
+type VcAgentUninstalledEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["VcAgentUninstalledEvent"] = reflect.TypeOf((*VcAgentUninstalledEvent)(nil)).Elem()
+}
+
+type VcAgentUpgradeFailedEvent struct {
+	HostEvent
+
+	Reason string `xml:"reason,omitempty"`
+}
+
+func init() {
+	t["VcAgentUpgradeFailedEvent"] = reflect.TypeOf((*VcAgentUpgradeFailedEvent)(nil)).Elem()
+}
+
+type VcAgentUpgradedEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["VcAgentUpgradedEvent"] = reflect.TypeOf((*VcAgentUpgradedEvent)(nil)).Elem()
+}
+
+type VchaClusterConfigInfo struct {
+	DynamicData
+
+	FailoverNodeInfo1 *FailoverNodeInfo `xml:"failoverNodeInfo1,omitempty"`
+	FailoverNodeInfo2 *FailoverNodeInfo `xml:"failoverNodeInfo2,omitempty"`
+	WitnessNodeInfo   *WitnessNodeInfo  `xml:"witnessNodeInfo,omitempty"`
+	State             string            `xml:"state"`
+}
+
+func init() {
+	t["VchaClusterConfigInfo"] = reflect.TypeOf((*VchaClusterConfigInfo)(nil)).Elem()
+}
+
+type VchaClusterConfigSpec struct {
+	DynamicData
+
+	PassiveIp string `xml:"passiveIp"`
+	WitnessIp string `xml:"witnessIp"`
+}
+
+func init() {
+	t["VchaClusterConfigSpec"] = reflect.TypeOf((*VchaClusterConfigSpec)(nil)).Elem()
+}
+
+type VchaClusterDeploymentSpec struct {
+	DynamicData
+
+	PassiveDeploymentSpec PassiveNodeDeploymentSpec `xml:"passiveDeploymentSpec"`
+	WitnessDeploymentSpec BaseNodeDeploymentSpec    `xml:"witnessDeploymentSpec,typeattr"`
+	ActiveVcSpec          SourceNodeSpec            `xml:"activeVcSpec"`
+	ActiveVcNetworkConfig *ClusterNetworkConfigSpec `xml:"activeVcNetworkConfig,omitempty"`
+}
+
+func init() {
+	t["VchaClusterDeploymentSpec"] = reflect.TypeOf((*VchaClusterDeploymentSpec)(nil)).Elem()
+}
+
+type VchaClusterHealth struct {
+	DynamicData
+
+	RuntimeInfo           VchaClusterRuntimeInfo `xml:"runtimeInfo"`
+	HealthMessages        []LocalizableMessage   `xml:"healthMessages,omitempty"`
+	AdditionalInformation []LocalizableMessage   `xml:"additionalInformation,omitempty"`
+}
+
+func init() {
+	t["VchaClusterHealth"] = reflect.TypeOf((*VchaClusterHealth)(nil)).Elem()
+}
+
+type VchaClusterNetworkSpec struct {
+	DynamicData
+
+	WitnessNetworkSpec BaseNodeNetworkSpec    `xml:"witnessNetworkSpec,typeattr"`
+	PassiveNetworkSpec PassiveNodeNetworkSpec `xml:"passiveNetworkSpec"`
+}
+
+func init() {
+	t["VchaClusterNetworkSpec"] = reflect.TypeOf((*VchaClusterNetworkSpec)(nil)).Elem()
+}
+
+type VchaClusterRuntimeInfo struct {
+	DynamicData
+
+	ClusterState string                `xml:"clusterState"`
+	NodeInfo     []VchaNodeRuntimeInfo `xml:"nodeInfo,omitempty"`
+	ClusterMode  string                `xml:"clusterMode"`
+}
+
+func init() {
+	t["VchaClusterRuntimeInfo"] = reflect.TypeOf((*VchaClusterRuntimeInfo)(nil)).Elem()
+}
+
+type VchaNodeRuntimeInfo struct {
+	DynamicData
+
+	NodeState string `xml:"nodeState"`
+	NodeRole  string `xml:"nodeRole"`
+	NodeIp    string `xml:"nodeIp"`
+}
+
+func init() {
+	t["VchaNodeRuntimeInfo"] = reflect.TypeOf((*VchaNodeRuntimeInfo)(nil)).Elem()
+}
+
+type VimAccountPasswordChangedEvent struct {
+	HostEvent
+}
+
+func init() {
+	t["VimAccountPasswordChangedEvent"] = reflect.TypeOf((*VimAccountPasswordChangedEvent)(nil)).Elem()
+}
+
+type VimFault struct {
+	MethodFault
+}
+
+func init() {
+	t["VimFault"] = reflect.TypeOf((*VimFault)(nil)).Elem()
+}
+
+type VimFaultFault BaseVimFault
+
+func init() {
+	t["VimFaultFault"] = reflect.TypeOf((*VimFaultFault)(nil)).Elem()
+}
+
+type VimVasaProvider struct {
+	DynamicData
+
+	Url                   string `xml:"url"`
+	Name                  string `xml:"name,omitempty"`
+	SelfSignedCertificate string `xml:"selfSignedCertificate,omitempty"`
+}
+
+func init() {
+	t["VimVasaProvider"] = reflect.TypeOf((*VimVasaProvider)(nil)).Elem()
+}
+
+type VimVasaProviderInfo struct {
+	DynamicData
+
+	Provider   VimVasaProvider                `xml:"provider"`
+	ArrayState []VimVasaProviderStatePerArray `xml:"arrayState,omitempty"`
+}
+
+func init() {
+	t["VimVasaProviderInfo"] = reflect.TypeOf((*VimVasaProviderInfo)(nil)).Elem()
+}
+
+type VimVasaProviderStatePerArray struct {
+	DynamicData
+
+	Priority int32  `xml:"priority"`
+	ArrayId  string `xml:"arrayId"`
+	Active   bool   `xml:"active"`
+}
+
+func init() {
+	t["VimVasaProviderStatePerArray"] = reflect.TypeOf((*VimVasaProviderStatePerArray)(nil)).Elem()
+}
+
+type VirtualAHCIController struct {
+	VirtualSATAController
+}
+
+func init() {
+	t["VirtualAHCIController"] = reflect.TypeOf((*VirtualAHCIController)(nil)).Elem()
+}
+
+type VirtualAHCIControllerOption struct {
+	VirtualSATAControllerOption
+}
+
+func init() {
+	t["VirtualAHCIControllerOption"] = reflect.TypeOf((*VirtualAHCIControllerOption)(nil)).Elem()
+}
+
+type VirtualAppImportSpec struct {
+	ImportSpec
+
+	Name             string             `xml:"name"`
+	VAppConfigSpec   VAppConfigSpec     `xml:"vAppConfigSpec"`
+	ResourcePoolSpec ResourceConfigSpec `xml:"resourcePoolSpec"`
+	Child            []BaseImportSpec   `xml:"child,omitempty,typeattr"`
+}
+
+func init() {
+	t["VirtualAppImportSpec"] = reflect.TypeOf((*VirtualAppImportSpec)(nil)).Elem()
+}
+
+type VirtualAppLinkInfo struct {
+	DynamicData
+
+	Key               ManagedObjectReference `xml:"key"`
+	DestroyWithParent *bool                  `xml:"destroyWithParent"`
+}
+
+func init() {
+	t["VirtualAppLinkInfo"] = reflect.TypeOf((*VirtualAppLinkInfo)(nil)).Elem()
+}
+
+type VirtualAppSummary struct {
+	ResourcePoolSummary
+
+	Product             *VAppProductInfo    `xml:"product,omitempty"`
+	VAppState           VirtualAppVAppState `xml:"vAppState,omitempty"`
+	Suspended           *bool               `xml:"suspended"`
+	InstallBootRequired *bool               `xml:"installBootRequired"`
+	InstanceUuid        string              `xml:"instanceUuid,omitempty"`
+}
+
+func init() {
+	t["VirtualAppSummary"] = reflect.TypeOf((*VirtualAppSummary)(nil)).Elem()
+}
+
+type VirtualBusLogicController struct {
+	VirtualSCSIController
+}
+
+func init() {
+	t["VirtualBusLogicController"] = reflect.TypeOf((*VirtualBusLogicController)(nil)).Elem()
+}
+
+type VirtualBusLogicControllerOption struct {
+	VirtualSCSIControllerOption
+}
+
+func init() {
+	t["VirtualBusLogicControllerOption"] = reflect.TypeOf((*VirtualBusLogicControllerOption)(nil)).Elem()
+}
+
+type VirtualCdrom struct {
+	VirtualDevice
+}
+
+func init() {
+	t["VirtualCdrom"] = reflect.TypeOf((*VirtualCdrom)(nil)).Elem()
+}
+
+type VirtualCdromAtapiBackingInfo struct {
+	VirtualDeviceDeviceBackingInfo
+}
+
+func init() {
+	t["VirtualCdromAtapiBackingInfo"] = reflect.TypeOf((*VirtualCdromAtapiBackingInfo)(nil)).Elem()
+}
+
+type VirtualCdromAtapiBackingOption struct {
+	VirtualDeviceDeviceBackingOption
+}
+
+func init() {
+	t["VirtualCdromAtapiBackingOption"] = reflect.TypeOf((*VirtualCdromAtapiBackingOption)(nil)).Elem()
+}
+
+type VirtualCdromIsoBackingInfo struct {
+	VirtualDeviceFileBackingInfo
+}
+
+func init() {
+	t["VirtualCdromIsoBackingInfo"] = reflect.TypeOf((*VirtualCdromIsoBackingInfo)(nil)).Elem()
+}
+
+type VirtualCdromIsoBackingOption struct {
+	VirtualDeviceFileBackingOption
+}
+
+func init() {
+	t["VirtualCdromIsoBackingOption"] = reflect.TypeOf((*VirtualCdromIsoBackingOption)(nil)).Elem()
+}
+
+type VirtualCdromOption struct {
+	VirtualDeviceOption
+}
+
+func init() {
+	t["VirtualCdromOption"] = reflect.TypeOf((*VirtualCdromOption)(nil)).Elem()
+}
+
+type VirtualCdromPassthroughBackingInfo struct {
+	VirtualDeviceDeviceBackingInfo
+
+	Exclusive bool `xml:"exclusive"`
+}
+
+func init() {
+	t["VirtualCdromPassthroughBackingInfo"] = reflect.TypeOf((*VirtualCdromPassthroughBackingInfo)(nil)).Elem()
+}
+
+type VirtualCdromPassthroughBackingOption struct {
+	VirtualDeviceDeviceBackingOption
+
+	Exclusive BoolOption `xml:"exclusive"`
+}
+
+func init() {
+	t["VirtualCdromPassthroughBackingOption"] = reflect.TypeOf((*VirtualCdromPassthroughBackingOption)(nil)).Elem()
+}
+
+type VirtualCdromRemoteAtapiBackingInfo struct {
+	VirtualDeviceRemoteDeviceBackingInfo
+}
+
+func init() {
+	t["VirtualCdromRemoteAtapiBackingInfo"] = reflect.TypeOf((*VirtualCdromRemoteAtapiBackingInfo)(nil)).Elem()
+}
+
+type VirtualCdromRemoteAtapiBackingOption struct {
+	VirtualDeviceDeviceBackingOption
+}
+
+func init() {
+	t["VirtualCdromRemoteAtapiBackingOption"] = reflect.TypeOf((*VirtualCdromRemoteAtapiBackingOption)(nil)).Elem()
+}
+
+type VirtualCdromRemotePassthroughBackingInfo struct {
+	VirtualDeviceRemoteDeviceBackingInfo
+
+	Exclusive bool `xml:"exclusive"`
+}
+
+func init() {
+	t["VirtualCdromRemotePassthroughBackingInfo"] = reflect.TypeOf((*VirtualCdromRemotePassthroughBackingInfo)(nil)).Elem()
+}
+
+type VirtualCdromRemotePassthroughBackingOption struct {
+	VirtualDeviceRemoteDeviceBackingOption
+
+	Exclusive BoolOption `xml:"exclusive"`
+}
+
+func init() {
+	t["VirtualCdromRemotePassthroughBackingOption"] = reflect.TypeOf((*VirtualCdromRemotePassthroughBackingOption)(nil)).Elem()
+}
+
+type VirtualController struct {
+	VirtualDevice
+
+	BusNumber int32   `xml:"busNumber"`
+	Device    []int32 `xml:"device,omitempty"`
+}
+
+func init() {
+	t["VirtualController"] = reflect.TypeOf((*VirtualController)(nil)).Elem()
+}
+
+type VirtualControllerOption struct {
+	VirtualDeviceOption
+
+	Devices         IntOption `xml:"devices"`
+	SupportedDevice []string  `xml:"supportedDevice,omitempty"`
+}
+
+func init() {
+	t["VirtualControllerOption"] = reflect.TypeOf((*VirtualControllerOption)(nil)).Elem()
+}
+
+type VirtualDevice struct {
+	DynamicData
+
+	Key           int32                        `xml:"key"`
+	DeviceInfo    BaseDescription              `xml:"deviceInfo,omitempty,typeattr"`
+	Backing       BaseVirtualDeviceBackingInfo `xml:"backing,omitempty,typeattr"`
+	Connectable   *VirtualDeviceConnectInfo    `xml:"connectable,omitempty"`
+	SlotInfo      BaseVirtualDeviceBusSlotInfo `xml:"slotInfo,omitempty,typeattr"`
+	ControllerKey int32                        `xml:"controllerKey,omitempty"`
+	UnitNumber    *int32                       `xml:"unitNumber"`
+}
+
+func init() {
+	t["VirtualDevice"] = reflect.TypeOf((*VirtualDevice)(nil)).Elem()
+}
+
+type VirtualDeviceBackingInfo struct {
+	DynamicData
+}
+
+func init() {
+	t["VirtualDeviceBackingInfo"] = reflect.TypeOf((*VirtualDeviceBackingInfo)(nil)).Elem()
+}
+
+type VirtualDeviceBackingOption struct {
+	DynamicData
+
+	Type string `xml:"type"`
+}
+
+func init() {
+	t["VirtualDeviceBackingOption"] = reflect.TypeOf((*VirtualDeviceBackingOption)(nil)).Elem()
+}
+
+type VirtualDeviceBusSlotInfo struct {
+	DynamicData
+}
+
+func init() {
+	t["VirtualDeviceBusSlotInfo"] = reflect.TypeOf((*VirtualDeviceBusSlotInfo)(nil)).Elem()
+}
+
+type VirtualDeviceBusSlotOption struct {
+	DynamicData
+
+	Type string `xml:"type"`
+}
+
+func init() {
+	t["VirtualDeviceBusSlotOption"] = reflect.TypeOf((*VirtualDeviceBusSlotOption)(nil)).Elem()
+}
+
+type VirtualDeviceConfigSpec struct {
+	DynamicData
+
+	Operation     VirtualDeviceConfigSpecOperation     `xml:"operation,omitempty"`
+	FileOperation VirtualDeviceConfigSpecFileOperation `xml:"fileOperation,omitempty"`
+	Device        BaseVirtualDevice                    `xml:"device,typeattr"`
+	Profile       []BaseVirtualMachineProfileSpec      `xml:"profile,omitempty,typeattr"`
+	Backing       *VirtualDeviceConfigSpecBackingSpec  `xml:"backing,omitempty"`
+}
+
+func init() {
+	t["VirtualDeviceConfigSpec"] = reflect.TypeOf((*VirtualDeviceConfigSpec)(nil)).Elem()
+}
+
+type VirtualDeviceConfigSpecBackingSpec struct {
+	DynamicData
+
+	Parent *VirtualDeviceConfigSpecBackingSpec `xml:"parent,omitempty"`
+	Crypto BaseCryptoSpec                      `xml:"crypto,omitempty,typeattr"`
+}
+
+func init() {
+	t["VirtualDeviceConfigSpecBackingSpec"] = reflect.TypeOf((*VirtualDeviceConfigSpecBackingSpec)(nil)).Elem()
+}
+
+type VirtualDeviceConnectInfo struct {
+	DynamicData
+
+	StartConnected    bool   `xml:"startConnected"`
+	AllowGuestControl bool   `xml:"allowGuestControl"`
+	Connected         bool   `xml:"connected"`
+	Status            string `xml:"status,omitempty"`
+}
+
+func init() {
+	t["VirtualDeviceConnectInfo"] = reflect.TypeOf((*VirtualDeviceConnectInfo)(nil)).Elem()
+}
+
+type VirtualDeviceConnectOption struct {
+	DynamicData
+
+	StartConnected    BoolOption `xml:"startConnected"`
+	AllowGuestControl BoolOption `xml:"allowGuestControl"`
+}
+
+func init() {
+	t["VirtualDeviceConnectOption"] = reflect.TypeOf((*VirtualDeviceConnectOption)(nil)).Elem()
+}
+
+type VirtualDeviceDeviceBackingInfo struct {
+	VirtualDeviceBackingInfo
+
+	DeviceName    string `xml:"deviceName"`
+	UseAutoDetect *bool  `xml:"useAutoDetect"`
+}
+
+func init() {
+	t["VirtualDeviceDeviceBackingInfo"] = reflect.TypeOf((*VirtualDeviceDeviceBackingInfo)(nil)).Elem()
+}
+
+type VirtualDeviceDeviceBackingOption struct {
+	VirtualDeviceBackingOption
+
+	AutoDetectAvailable BoolOption `xml:"autoDetectAvailable"`
+}
+
+func init() {
+	t["VirtualDeviceDeviceBackingOption"] = reflect.TypeOf((*VirtualDeviceDeviceBackingOption)(nil)).Elem()
+}
+
+type VirtualDeviceFileBackingInfo struct {
+	VirtualDeviceBackingInfo
+
+	FileName        string                  `xml:"fileName"`
+	Datastore       *ManagedObjectReference `xml:"datastore,omitempty"`
+	BackingObjectId string                  `xml:"backingObjectId,omitempty"`
+}
+
+func init() {
+	t["VirtualDeviceFileBackingInfo"] = reflect.TypeOf((*VirtualDeviceFileBackingInfo)(nil)).Elem()
+}
+
+type VirtualDeviceFileBackingOption struct {
+	VirtualDeviceBackingOption
+
+	FileNameExtensions *ChoiceOption `xml:"fileNameExtensions,omitempty"`
+}
+
+func init() {
+	t["VirtualDeviceFileBackingOption"] = reflect.TypeOf((*VirtualDeviceFileBackingOption)(nil)).Elem()
+}
+
+type VirtualDeviceOption struct {
+	DynamicData
+
+	Type                      string                           `xml:"type"`
+	ConnectOption             *VirtualDeviceConnectOption      `xml:"connectOption,omitempty"`
+	BusSlotOption             *VirtualDeviceBusSlotOption      `xml:"busSlotOption,omitempty"`
+	ControllerType            string                           `xml:"controllerType,omitempty"`
+	AutoAssignController      *BoolOption                      `xml:"autoAssignController,omitempty"`
+	BackingOption             []BaseVirtualDeviceBackingOption `xml:"backingOption,omitempty,typeattr"`
+	DefaultBackingOptionIndex int32                            `xml:"defaultBackingOptionIndex,omitempty"`
+	LicensingLimit            []string                         `xml:"licensingLimit,omitempty"`
+	Deprecated                bool                             `xml:"deprecated"`
+	PlugAndPlay               bool                             `xml:"plugAndPlay"`
+	HotRemoveSupported        *bool                            `xml:"hotRemoveSupported"`
+}
+
+func init() {
+	t["VirtualDeviceOption"] = reflect.TypeOf((*VirtualDeviceOption)(nil)).Elem()
+}
+
+type VirtualDevicePciBusSlotInfo struct {
+	VirtualDeviceBusSlotInfo
+
+	PciSlotNumber int32 `xml:"pciSlotNumber"`
+}
+
+func init() {
+	t["VirtualDevicePciBusSlotInfo"] = reflect.TypeOf((*VirtualDevicePciBusSlotInfo)(nil)).Elem()
+}
+
+type VirtualDevicePipeBackingInfo struct {
+	VirtualDeviceBackingInfo
+
+	PipeName string `xml:"pipeName"`
+}
+
+func init() {
+	t["VirtualDevicePipeBackingInfo"] = reflect.TypeOf((*VirtualDevicePipeBackingInfo)(nil)).Elem()
+}
+
+type VirtualDevicePipeBackingOption struct {
+	VirtualDeviceBackingOption
+}
+
+func init() {
+	t["VirtualDevicePipeBackingOption"] = reflect.TypeOf((*VirtualDevicePipeBackingOption)(nil)).Elem()
+}
+
+type VirtualDeviceRemoteDeviceBackingInfo struct {
+	VirtualDeviceBackingInfo
+
+	DeviceName    string `xml:"deviceName"`
+	UseAutoDetect *bool  `xml:"useAutoDetect"`
+}
+
+func init() {
+	t["VirtualDeviceRemoteDeviceBackingInfo"] = reflect.TypeOf((*VirtualDeviceRemoteDeviceBackingInfo)(nil)).Elem()
+}
+
+type VirtualDeviceRemoteDeviceBackingOption struct {
+	VirtualDeviceBackingOption
+
+	AutoDetectAvailable BoolOption `xml:"autoDetectAvailable"`
+}
+
+func init() {
+	t["VirtualDeviceRemoteDeviceBackingOption"] = reflect.TypeOf((*VirtualDeviceRemoteDeviceBackingOption)(nil)).Elem()
+}
+
+type VirtualDeviceURIBackingInfo struct {
+	VirtualDeviceBackingInfo
+
+	ServiceURI string `xml:"serviceURI"`
+	Direction  string `xml:"direction"`
+	ProxyURI   string `xml:"proxyURI,omitempty"`
+}
+
+func init() {
+	t["VirtualDeviceURIBackingInfo"] = reflect.TypeOf((*VirtualDeviceURIBackingInfo)(nil)).Elem()
+}
+
+type VirtualDeviceURIBackingOption struct {
+	VirtualDeviceBackingOption
+
+	Directions ChoiceOption `xml:"directions"`
+}
+
+func init() {
+	t["VirtualDeviceURIBackingOption"] = reflect.TypeOf((*VirtualDeviceURIBackingOption)(nil)).Elem()
+}
+
+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"`
+}
+
+func init() {
+	t["VirtualDisk"] = reflect.TypeOf((*VirtualDisk)(nil)).Elem()
+}
+
+type VirtualDiskAntiAffinityRuleSpec struct {
+	ClusterRuleInfo
+
+	DiskId []int32 `xml:"diskId"`
+}
+
+func init() {
+	t["VirtualDiskAntiAffinityRuleSpec"] = reflect.TypeOf((*VirtualDiskAntiAffinityRuleSpec)(nil)).Elem()
+}
+
+type VirtualDiskBlocksNotFullyProvisioned struct {
+	DeviceBackingNotSupported
+}
+
+func init() {
+	t["VirtualDiskBlocksNotFullyProvisioned"] = reflect.TypeOf((*VirtualDiskBlocksNotFullyProvisioned)(nil)).Elem()
+}
+
+type VirtualDiskBlocksNotFullyProvisionedFault VirtualDiskBlocksNotFullyProvisioned
+
+func init() {
+	t["VirtualDiskBlocksNotFullyProvisionedFault"] = reflect.TypeOf((*VirtualDiskBlocksNotFullyProvisionedFault)(nil)).Elem()
+}
+
+type VirtualDiskConfigSpec struct {
+	VirtualDeviceConfigSpec
+
+	DiskMoveType string `xml:"diskMoveType,omitempty"`
+	MigrateCache *bool  `xml:"migrateCache"`
+}
+
+func init() {
+	t["VirtualDiskConfigSpec"] = reflect.TypeOf((*VirtualDiskConfigSpec)(nil)).Elem()
+}
+
+type VirtualDiskDeltaDiskFormatsSupported struct {
+	DynamicData
+
+	DatastoreType   string       `xml:"datastoreType"`
+	DeltaDiskFormat ChoiceOption `xml:"deltaDiskFormat"`
+}
+
+func init() {
+	t["VirtualDiskDeltaDiskFormatsSupported"] = reflect.TypeOf((*VirtualDiskDeltaDiskFormatsSupported)(nil)).Elem()
+}
+
+type VirtualDiskFlatVer1BackingInfo struct {
+	VirtualDeviceFileBackingInfo
+
+	DiskMode     string                          `xml:"diskMode"`
+	Split        *bool                           `xml:"split"`
+	WriteThrough *bool                           `xml:"writeThrough"`
+	ContentId    string                          `xml:"contentId,omitempty"`
+	Parent       *VirtualDiskFlatVer1BackingInfo `xml:"parent,omitempty"`
+}
+
+func init() {
+	t["VirtualDiskFlatVer1BackingInfo"] = reflect.TypeOf((*VirtualDiskFlatVer1BackingInfo)(nil)).Elem()
+}
+
+type VirtualDiskFlatVer1BackingOption struct {
+	VirtualDeviceFileBackingOption
+
+	DiskMode     ChoiceOption `xml:"diskMode"`
+	Split        BoolOption   `xml:"split"`
+	WriteThrough BoolOption   `xml:"writeThrough"`
+	Growable     bool         `xml:"growable"`
+}
+
+func init() {
+	t["VirtualDiskFlatVer1BackingOption"] = reflect.TypeOf((*VirtualDiskFlatVer1BackingOption)(nil)).Elem()
+}
+
+type VirtualDiskFlatVer2BackingInfo struct {
+	VirtualDeviceFileBackingInfo
+
+	DiskMode               string                          `xml:"diskMode"`
+	Split                  *bool                           `xml:"split"`
+	WriteThrough           *bool                           `xml:"writeThrough"`
+	ThinProvisioned        *bool                           `xml:"thinProvisioned"`
+	EagerlyScrub           *bool                           `xml:"eagerlyScrub"`
+	Uuid                   string                          `xml:"uuid,omitempty"`
+	ContentId              string                          `xml:"contentId,omitempty"`
+	ChangeId               string                          `xml:"changeId,omitempty"`
+	Parent                 *VirtualDiskFlatVer2BackingInfo `xml:"parent,omitempty"`
+	DeltaDiskFormat        string                          `xml:"deltaDiskFormat,omitempty"`
+	DigestEnabled          *bool                           `xml:"digestEnabled"`
+	DeltaGrainSize         int32                           `xml:"deltaGrainSize,omitempty"`
+	DeltaDiskFormatVariant string                          `xml:"deltaDiskFormatVariant,omitempty"`
+	Sharing                string                          `xml:"sharing,omitempty"`
+	KeyId                  *CryptoKeyId                    `xml:"keyId,omitempty"`
+}
+
+func init() {
+	t["VirtualDiskFlatVer2BackingInfo"] = reflect.TypeOf((*VirtualDiskFlatVer2BackingInfo)(nil)).Elem()
+}
+
+type VirtualDiskFlatVer2BackingOption struct {
+	VirtualDeviceFileBackingOption
+
+	DiskMode                  ChoiceOption                           `xml:"diskMode"`
+	Split                     BoolOption                             `xml:"split"`
+	WriteThrough              BoolOption                             `xml:"writeThrough"`
+	Growable                  bool                                   `xml:"growable"`
+	HotGrowable               bool                                   `xml:"hotGrowable"`
+	Uuid                      bool                                   `xml:"uuid"`
+	ThinProvisioned           *BoolOption                            `xml:"thinProvisioned,omitempty"`
+	EagerlyScrub              *BoolOption                            `xml:"eagerlyScrub,omitempty"`
+	DeltaDiskFormat           *ChoiceOption                          `xml:"deltaDiskFormat,omitempty"`
+	DeltaDiskFormatsSupported []VirtualDiskDeltaDiskFormatsSupported `xml:"deltaDiskFormatsSupported,omitempty"`
+}
+
+func init() {
+	t["VirtualDiskFlatVer2BackingOption"] = reflect.TypeOf((*VirtualDiskFlatVer2BackingOption)(nil)).Elem()
+}
+
+type VirtualDiskId struct {
+	DynamicData
+
+	Vm     ManagedObjectReference `xml:"vm"`
+	DiskId int32                  `xml:"diskId"`
+}
+
+func init() {
+	t["VirtualDiskId"] = reflect.TypeOf((*VirtualDiskId)(nil)).Elem()
+}
+
+type VirtualDiskModeNotSupported struct {
+	DeviceNotSupported
+
+	Mode string `xml:"mode"`
+}
+
+func init() {
+	t["VirtualDiskModeNotSupported"] = reflect.TypeOf((*VirtualDiskModeNotSupported)(nil)).Elem()
+}
+
+type VirtualDiskModeNotSupportedFault VirtualDiskModeNotSupported
+
+func init() {
+	t["VirtualDiskModeNotSupportedFault"] = reflect.TypeOf((*VirtualDiskModeNotSupportedFault)(nil)).Elem()
+}
+
+type VirtualDiskOption struct {
+	VirtualDeviceOption
+
+	CapacityInKB            LongOption                                `xml:"capacityInKB"`
+	IoAllocationOption      *StorageIOAllocationOption                `xml:"ioAllocationOption,omitempty"`
+	VFlashCacheConfigOption *VirtualDiskOptionVFlashCacheConfigOption `xml:"vFlashCacheConfigOption,omitempty"`
+}
+
+func init() {
+	t["VirtualDiskOption"] = reflect.TypeOf((*VirtualDiskOption)(nil)).Elem()
+}
+
+type VirtualDiskOptionVFlashCacheConfigOption struct {
+	DynamicData
+
+	CacheConsistencyType ChoiceOption `xml:"cacheConsistencyType"`
+	CacheMode            ChoiceOption `xml:"cacheMode"`
+	ReservationInMB      LongOption   `xml:"reservationInMB"`
+	BlockSizeInKB        LongOption   `xml:"blockSizeInKB"`
+}
+
+func init() {
+	t["VirtualDiskOptionVFlashCacheConfigOption"] = reflect.TypeOf((*VirtualDiskOptionVFlashCacheConfigOption)(nil)).Elem()
+}
+
+type VirtualDiskPartitionedRawDiskVer2BackingInfo struct {
+	VirtualDiskRawDiskVer2BackingInfo
+
+	Partition []int32 `xml:"partition"`
+}
+
+func init() {
+	t["VirtualDiskPartitionedRawDiskVer2BackingInfo"] = reflect.TypeOf((*VirtualDiskPartitionedRawDiskVer2BackingInfo)(nil)).Elem()
+}
+
+type VirtualDiskPartitionedRawDiskVer2BackingOption struct {
+	VirtualDiskRawDiskVer2BackingOption
+}
+
+func init() {
+	t["VirtualDiskPartitionedRawDiskVer2BackingOption"] = reflect.TypeOf((*VirtualDiskPartitionedRawDiskVer2BackingOption)(nil)).Elem()
+}
+
+type VirtualDiskRawDiskMappingVer1BackingInfo struct {
+	VirtualDeviceFileBackingInfo
+
+	LunUuid           string                                    `xml:"lunUuid,omitempty"`
+	DeviceName        string                                    `xml:"deviceName,omitempty"`
+	CompatibilityMode string                                    `xml:"compatibilityMode,omitempty"`
+	DiskMode          string                                    `xml:"diskMode,omitempty"`
+	Uuid              string                                    `xml:"uuid,omitempty"`
+	ContentId         string                                    `xml:"contentId,omitempty"`
+	ChangeId          string                                    `xml:"changeId,omitempty"`
+	Parent            *VirtualDiskRawDiskMappingVer1BackingInfo `xml:"parent,omitempty"`
+	Sharing           string                                    `xml:"sharing,omitempty"`
+}
+
+func init() {
+	t["VirtualDiskRawDiskMappingVer1BackingInfo"] = reflect.TypeOf((*VirtualDiskRawDiskMappingVer1BackingInfo)(nil)).Elem()
+}
+
+type VirtualDiskRawDiskMappingVer1BackingOption struct {
+	VirtualDeviceDeviceBackingOption
+
+	DescriptorFileNameExtensions *ChoiceOption `xml:"descriptorFileNameExtensions,omitempty"`
+	CompatibilityMode            ChoiceOption  `xml:"compatibilityMode"`
+	DiskMode                     ChoiceOption  `xml:"diskMode"`
+	Uuid                         bool          `xml:"uuid"`
+}
+
+func init() {
+	t["VirtualDiskRawDiskMappingVer1BackingOption"] = reflect.TypeOf((*VirtualDiskRawDiskMappingVer1BackingOption)(nil)).Elem()
+}
+
+type VirtualDiskRawDiskVer2BackingInfo struct {
+	VirtualDeviceDeviceBackingInfo
+
+	DescriptorFileName string `xml:"descriptorFileName"`
+	Uuid               string `xml:"uuid,omitempty"`
+	ChangeId           string `xml:"changeId,omitempty"`
+	Sharing            string `xml:"sharing,omitempty"`
+}
+
+func init() {
+	t["VirtualDiskRawDiskVer2BackingInfo"] = reflect.TypeOf((*VirtualDiskRawDiskVer2BackingInfo)(nil)).Elem()
+}
+
+type VirtualDiskRawDiskVer2BackingOption struct {
+	VirtualDeviceDeviceBackingOption
+
+	DescriptorFileNameExtensions ChoiceOption `xml:"descriptorFileNameExtensions"`
+	Uuid                         bool         `xml:"uuid"`
+}
+
+func init() {
+	t["VirtualDiskRawDiskVer2BackingOption"] = reflect.TypeOf((*VirtualDiskRawDiskVer2BackingOption)(nil)).Elem()
+}
+
+type VirtualDiskSeSparseBackingInfo struct {
+	VirtualDeviceFileBackingInfo
+
+	DiskMode        string                          `xml:"diskMode"`
+	WriteThrough    *bool                           `xml:"writeThrough"`
+	Uuid            string                          `xml:"uuid,omitempty"`
+	ContentId       string                          `xml:"contentId,omitempty"`
+	ChangeId        string                          `xml:"changeId,omitempty"`
+	Parent          *VirtualDiskSeSparseBackingInfo `xml:"parent,omitempty"`
+	DeltaDiskFormat string                          `xml:"deltaDiskFormat,omitempty"`
+	DigestEnabled   *bool                           `xml:"digestEnabled"`
+	GrainSize       int32                           `xml:"grainSize,omitempty"`
+	KeyId           *CryptoKeyId                    `xml:"keyId,omitempty"`
+}
+
+func init() {
+	t["VirtualDiskSeSparseBackingInfo"] = reflect.TypeOf((*VirtualDiskSeSparseBackingInfo)(nil)).Elem()
+}
+
+type VirtualDiskSeSparseBackingOption struct {
+	VirtualDeviceFileBackingOption
+
+	DiskMode                  ChoiceOption                           `xml:"diskMode"`
+	WriteThrough              BoolOption                             `xml:"writeThrough"`
+	Growable                  bool                                   `xml:"growable"`
+	HotGrowable               bool                                   `xml:"hotGrowable"`
+	Uuid                      bool                                   `xml:"uuid"`
+	DeltaDiskFormatsSupported []VirtualDiskDeltaDiskFormatsSupported `xml:"deltaDiskFormatsSupported"`
+}
+
+func init() {
+	t["VirtualDiskSeSparseBackingOption"] = reflect.TypeOf((*VirtualDiskSeSparseBackingOption)(nil)).Elem()
+}
+
+type VirtualDiskSparseVer1BackingInfo struct {
+	VirtualDeviceFileBackingInfo
+
+	DiskMode      string                            `xml:"diskMode"`
+	Split         *bool                             `xml:"split"`
+	WriteThrough  *bool                             `xml:"writeThrough"`
+	SpaceUsedInKB int64                             `xml:"spaceUsedInKB,omitempty"`
+	ContentId     string                            `xml:"contentId,omitempty"`
+	Parent        *VirtualDiskSparseVer1BackingInfo `xml:"parent,omitempty"`
+}
+
+func init() {
+	t["VirtualDiskSparseVer1BackingInfo"] = reflect.TypeOf((*VirtualDiskSparseVer1BackingInfo)(nil)).Elem()
+}
+
+type VirtualDiskSparseVer1BackingOption struct {
+	VirtualDeviceFileBackingOption
+
+	DiskModes    ChoiceOption `xml:"diskModes"`
+	Split        BoolOption   `xml:"split"`
+	WriteThrough BoolOption   `xml:"writeThrough"`
+	Growable     bool         `xml:"growable"`
+}
+
+func init() {
+	t["VirtualDiskSparseVer1BackingOption"] = reflect.TypeOf((*VirtualDiskSparseVer1BackingOption)(nil)).Elem()
+}
+
+type VirtualDiskSparseVer2BackingInfo struct {
+	VirtualDeviceFileBackingInfo
+
+	DiskMode      string                            `xml:"diskMode"`
+	Split         *bool                             `xml:"split"`
+	WriteThrough  *bool                             `xml:"writeThrough"`
+	SpaceUsedInKB int64                             `xml:"spaceUsedInKB,omitempty"`
+	Uuid          string                            `xml:"uuid,omitempty"`
+	ContentId     string                            `xml:"contentId,omitempty"`
+	ChangeId      string                            `xml:"changeId,omitempty"`
+	Parent        *VirtualDiskSparseVer2BackingInfo `xml:"parent,omitempty"`
+	KeyId         *CryptoKeyId                      `xml:"keyId,omitempty"`
+}
+
+func init() {
+	t["VirtualDiskSparseVer2BackingInfo"] = reflect.TypeOf((*VirtualDiskSparseVer2BackingInfo)(nil)).Elem()
+}
+
+type VirtualDiskSparseVer2BackingOption struct {
+	VirtualDeviceFileBackingOption
+
+	DiskMode     ChoiceOption `xml:"diskMode"`
+	Split        BoolOption   `xml:"split"`
+	WriteThrough BoolOption   `xml:"writeThrough"`
+	Growable     bool         `xml:"growable"`
+	HotGrowable  bool         `xml:"hotGrowable"`
+	Uuid         bool         `xml:"uuid"`
+}
+
+func init() {
+	t["VirtualDiskSparseVer2BackingOption"] = reflect.TypeOf((*VirtualDiskSparseVer2BackingOption)(nil)).Elem()
+}
+
+type VirtualDiskSpec struct {
+	DynamicData
+
+	DiskType    string `xml:"diskType"`
+	AdapterType string `xml:"adapterType"`
+}
+
+func init() {
+	t["VirtualDiskSpec"] = reflect.TypeOf((*VirtualDiskSpec)(nil)).Elem()
+}
+
+type VirtualDiskVFlashCacheConfigInfo struct {
+	DynamicData
+
+	VFlashModule         string `xml:"vFlashModule,omitempty"`
+	ReservationInMB      int64  `xml:"reservationInMB,omitempty"`
+	CacheConsistencyType string `xml:"cacheConsistencyType,omitempty"`
+	CacheMode            string `xml:"cacheMode,omitempty"`
+	BlockSizeInKB        int64  `xml:"blockSizeInKB,omitempty"`
+}
+
+func init() {
+	t["VirtualDiskVFlashCacheConfigInfo"] = reflect.TypeOf((*VirtualDiskVFlashCacheConfigInfo)(nil)).Elem()
+}
+
+type VirtualE1000 struct {
+	VirtualEthernetCard
+}
+
+func init() {
+	t["VirtualE1000"] = reflect.TypeOf((*VirtualE1000)(nil)).Elem()
+}
+
+type VirtualE1000Option struct {
+	VirtualEthernetCardOption
+}
+
+func init() {
+	t["VirtualE1000Option"] = reflect.TypeOf((*VirtualE1000Option)(nil)).Elem()
+}
+
+type VirtualE1000e struct {
+	VirtualEthernetCard
+}
+
+func init() {
+	t["VirtualE1000e"] = reflect.TypeOf((*VirtualE1000e)(nil)).Elem()
+}
+
+type VirtualE1000eOption struct {
+	VirtualEthernetCardOption
+}
+
+func init() {
+	t["VirtualE1000eOption"] = reflect.TypeOf((*VirtualE1000eOption)(nil)).Elem()
+}
+
+type VirtualEnsoniq1371 struct {
+	VirtualSoundCard
+}
+
+func init() {
+	t["VirtualEnsoniq1371"] = reflect.TypeOf((*VirtualEnsoniq1371)(nil)).Elem()
+}
+
+type VirtualEnsoniq1371Option struct {
+	VirtualSoundCardOption
+}
+
+func init() {
+	t["VirtualEnsoniq1371Option"] = reflect.TypeOf((*VirtualEnsoniq1371Option)(nil)).Elem()
+}
+
+type VirtualEthernetCard struct {
+	VirtualDevice
+
+	AddressType             string                                 `xml:"addressType,omitempty"`
+	MacAddress              string                                 `xml:"macAddress,omitempty"`
+	WakeOnLanEnabled        *bool                                  `xml:"wakeOnLanEnabled"`
+	ResourceAllocation      *VirtualEthernetCardResourceAllocation `xml:"resourceAllocation,omitempty"`
+	ExternalId              string                                 `xml:"externalId,omitempty"`
+	UptCompatibilityEnabled *bool                                  `xml:"uptCompatibilityEnabled"`
+}
+
+func init() {
+	t["VirtualEthernetCard"] = reflect.TypeOf((*VirtualEthernetCard)(nil)).Elem()
+}
+
+type VirtualEthernetCardDVPortBackingOption struct {
+	VirtualDeviceBackingOption
+}
+
+func init() {
+	t["VirtualEthernetCardDVPortBackingOption"] = reflect.TypeOf((*VirtualEthernetCardDVPortBackingOption)(nil)).Elem()
+}
+
+type VirtualEthernetCardDistributedVirtualPortBackingInfo struct {
+	VirtualDeviceBackingInfo
+
+	Port DistributedVirtualSwitchPortConnection `xml:"port"`
+}
+
+func init() {
+	t["VirtualEthernetCardDistributedVirtualPortBackingInfo"] = reflect.TypeOf((*VirtualEthernetCardDistributedVirtualPortBackingInfo)(nil)).Elem()
+}
+
+type VirtualEthernetCardLegacyNetworkBackingInfo struct {
+	VirtualDeviceDeviceBackingInfo
+}
+
+func init() {
+	t["VirtualEthernetCardLegacyNetworkBackingInfo"] = reflect.TypeOf((*VirtualEthernetCardLegacyNetworkBackingInfo)(nil)).Elem()
+}
+
+type VirtualEthernetCardLegacyNetworkBackingOption struct {
+	VirtualDeviceDeviceBackingOption
+}
+
+func init() {
+	t["VirtualEthernetCardLegacyNetworkBackingOption"] = reflect.TypeOf((*VirtualEthernetCardLegacyNetworkBackingOption)(nil)).Elem()
+}
+
+type VirtualEthernetCardNetworkBackingInfo struct {
+	VirtualDeviceDeviceBackingInfo
+
+	Network           *ManagedObjectReference `xml:"network,omitempty"`
+	InPassthroughMode *bool                   `xml:"inPassthroughMode"`
+}
+
+func init() {
+	t["VirtualEthernetCardNetworkBackingInfo"] = reflect.TypeOf((*VirtualEthernetCardNetworkBackingInfo)(nil)).Elem()
+}
+
+type VirtualEthernetCardNetworkBackingOption struct {
+	VirtualDeviceDeviceBackingOption
+}
+
+func init() {
+	t["VirtualEthernetCardNetworkBackingOption"] = reflect.TypeOf((*VirtualEthernetCardNetworkBackingOption)(nil)).Elem()
+}
+
+type VirtualEthernetCardNotSupported struct {
+	DeviceNotSupported
+}
+
+func init() {
+	t["VirtualEthernetCardNotSupported"] = reflect.TypeOf((*VirtualEthernetCardNotSupported)(nil)).Elem()
+}
+
+type VirtualEthernetCardNotSupportedFault VirtualEthernetCardNotSupported
+
+func init() {
+	t["VirtualEthernetCardNotSupportedFault"] = reflect.TypeOf((*VirtualEthernetCardNotSupportedFault)(nil)).Elem()
+}
+
+type VirtualEthernetCardOpaqueNetworkBackingInfo struct {
+	VirtualDeviceBackingInfo
+
+	OpaqueNetworkId   string `xml:"opaqueNetworkId"`
+	OpaqueNetworkType string `xml:"opaqueNetworkType"`
+}
+
+func init() {
+	t["VirtualEthernetCardOpaqueNetworkBackingInfo"] = reflect.TypeOf((*VirtualEthernetCardOpaqueNetworkBackingInfo)(nil)).Elem()
+}
+
+type VirtualEthernetCardOpaqueNetworkBackingOption struct {
+	VirtualDeviceBackingOption
+}
+
+func init() {
+	t["VirtualEthernetCardOpaqueNetworkBackingOption"] = reflect.TypeOf((*VirtualEthernetCardOpaqueNetworkBackingOption)(nil)).Elem()
+}
+
+type VirtualEthernetCardOption struct {
+	VirtualDeviceOption
+
+	SupportedOUI              ChoiceOption `xml:"supportedOUI"`
+	MacType                   ChoiceOption `xml:"macType"`
+	WakeOnLanEnabled          BoolOption   `xml:"wakeOnLanEnabled"`
+	VmDirectPathGen2Supported *bool        `xml:"vmDirectPathGen2Supported"`
+	UptCompatibilityEnabled   *BoolOption  `xml:"uptCompatibilityEnabled,omitempty"`
+}
+
+func init() {
+	t["VirtualEthernetCardOption"] = reflect.TypeOf((*VirtualEthernetCardOption)(nil)).Elem()
+}
+
+type VirtualEthernetCardResourceAllocation struct {
+	DynamicData
+
+	Reservation int64      `xml:"reservation,omitempty"`
+	Share       SharesInfo `xml:"share"`
+	Limit       int64      `xml:"limit,omitempty"`
+}
+
+func init() {
+	t["VirtualEthernetCardResourceAllocation"] = reflect.TypeOf((*VirtualEthernetCardResourceAllocation)(nil)).Elem()
+}
+
+type VirtualFloppy struct {
+	VirtualDevice
+}
+
+func init() {
+	t["VirtualFloppy"] = reflect.TypeOf((*VirtualFloppy)(nil)).Elem()
+}
+
+type VirtualFloppyDeviceBackingInfo struct {
+	VirtualDeviceDeviceBackingInfo
+}
+
+func init() {
+	t["VirtualFloppyDeviceBackingInfo"] = reflect.TypeOf((*VirtualFloppyDeviceBackingInfo)(nil)).Elem()
+}
+
+type VirtualFloppyDeviceBackingOption struct {
+	VirtualDeviceDeviceBackingOption
+}
+
+func init() {
+	t["VirtualFloppyDeviceBackingOption"] = reflect.TypeOf((*VirtualFloppyDeviceBackingOption)(nil)).Elem()
+}
+
+type VirtualFloppyImageBackingInfo struct {
+	VirtualDeviceFileBackingInfo
+}
+
+func init() {
+	t["VirtualFloppyImageBackingInfo"] = reflect.TypeOf((*VirtualFloppyImageBackingInfo)(nil)).Elem()
+}
+
+type VirtualFloppyImageBackingOption struct {
+	VirtualDeviceFileBackingOption
+}
+
+func init() {
+	t["VirtualFloppyImageBackingOption"] = reflect.TypeOf((*VirtualFloppyImageBackingOption)(nil)).Elem()
+}
+
+type VirtualFloppyOption struct {
+	VirtualDeviceOption
+}
+
+func init() {
+	t["VirtualFloppyOption"] = reflect.TypeOf((*VirtualFloppyOption)(nil)).Elem()
+}
+
+type VirtualFloppyRemoteDeviceBackingInfo struct {
+	VirtualDeviceRemoteDeviceBackingInfo
+}
+
+func init() {
+	t["VirtualFloppyRemoteDeviceBackingInfo"] = reflect.TypeOf((*VirtualFloppyRemoteDeviceBackingInfo)(nil)).Elem()
+}
+
+type VirtualFloppyRemoteDeviceBackingOption struct {
+	VirtualDeviceRemoteDeviceBackingOption
+}
+
+func init() {
+	t["VirtualFloppyRemoteDeviceBackingOption"] = reflect.TypeOf((*VirtualFloppyRemoteDeviceBackingOption)(nil)).Elem()
+}
+
+type VirtualHardware struct {
+	DynamicData
+
+	NumCPU              int32               `xml:"numCPU"`
+	NumCoresPerSocket   int32               `xml:"numCoresPerSocket,omitempty"`
+	MemoryMB            int32               `xml:"memoryMB"`
+	VirtualICH7MPresent *bool               `xml:"virtualICH7MPresent"`
+	VirtualSMCPresent   *bool               `xml:"virtualSMCPresent"`
+	Device              []BaseVirtualDevice `xml:"device,omitempty,typeattr"`
+}
+
+func init() {
+	t["VirtualHardware"] = reflect.TypeOf((*VirtualHardware)(nil)).Elem()
+}
+
+type VirtualHardwareCompatibilityIssue struct {
+	VmConfigFault
+}
+
+func init() {
+	t["VirtualHardwareCompatibilityIssue"] = reflect.TypeOf((*VirtualHardwareCompatibilityIssue)(nil)).Elem()
+}
+
+type VirtualHardwareCompatibilityIssueFault BaseVirtualHardwareCompatibilityIssue
+
+func init() {
+	t["VirtualHardwareCompatibilityIssueFault"] = reflect.TypeOf((*VirtualHardwareCompatibilityIssueFault)(nil)).Elem()
+}
+
+type VirtualHardwareOption struct {
+	DynamicData
+
+	HwVersion             int32                     `xml:"hwVersion"`
+	VirtualDeviceOption   []BaseVirtualDeviceOption `xml:"virtualDeviceOption,typeattr"`
+	DeviceListReadonly    bool                      `xml:"deviceListReadonly"`
+	NumCPU                []int32                   `xml:"numCPU"`
+	NumCoresPerSocket     *IntOption                `xml:"numCoresPerSocket,omitempty"`
+	NumCpuReadonly        bool                      `xml:"numCpuReadonly"`
+	MemoryMB              LongOption                `xml:"memoryMB"`
+	NumPCIControllers     IntOption                 `xml:"numPCIControllers"`
+	NumIDEControllers     IntOption                 `xml:"numIDEControllers"`
+	NumUSBControllers     IntOption                 `xml:"numUSBControllers"`
+	NumUSBXHCIControllers *IntOption                `xml:"numUSBXHCIControllers,omitempty"`
+	NumSIOControllers     IntOption                 `xml:"numSIOControllers"`
+	NumPS2Controllers     IntOption                 `xml:"numPS2Controllers"`
+	LicensingLimit        []string                  `xml:"licensingLimit,omitempty"`
+	NumSupportedWwnPorts  *IntOption                `xml:"numSupportedWwnPorts,omitempty"`
+	NumSupportedWwnNodes  *IntOption                `xml:"numSupportedWwnNodes,omitempty"`
+	ResourceConfigOption  *ResourceConfigOption     `xml:"resourceConfigOption,omitempty"`
+}
+
+func init() {
+	t["VirtualHardwareOption"] = reflect.TypeOf((*VirtualHardwareOption)(nil)).Elem()
+}
+
+type VirtualHardwareVersionNotSupported struct {
+	VirtualHardwareCompatibilityIssue
+
+	HostName string                 `xml:"hostName"`
+	Host     ManagedObjectReference `xml:"host"`
+}
+
+func init() {
+	t["VirtualHardwareVersionNotSupported"] = reflect.TypeOf((*VirtualHardwareVersionNotSupported)(nil)).Elem()
+}
+
+type VirtualHardwareVersionNotSupportedFault VirtualHardwareVersionNotSupported
+
+func init() {
+	t["VirtualHardwareVersionNotSupportedFault"] = reflect.TypeOf((*VirtualHardwareVersionNotSupportedFault)(nil)).Elem()
+}
+
+type VirtualHdAudioCard struct {
+	VirtualSoundCard
+}
+
+func init() {
+	t["VirtualHdAudioCard"] = reflect.TypeOf((*VirtualHdAudioCard)(nil)).Elem()
+}
+
+type VirtualHdAudioCardOption struct {
+	VirtualSoundCardOption
+}
+
+func init() {
+	t["VirtualHdAudioCardOption"] = reflect.TypeOf((*VirtualHdAudioCardOption)(nil)).Elem()
+}
+
+type VirtualIDEController struct {
+	VirtualController
+}
+
+func init() {
+	t["VirtualIDEController"] = reflect.TypeOf((*VirtualIDEController)(nil)).Elem()
+}
+
+type VirtualIDEControllerOption struct {
+	VirtualControllerOption
+
+	NumIDEDisks  IntOption `xml:"numIDEDisks"`
+	NumIDECdroms IntOption `xml:"numIDECdroms"`
+}
+
+func init() {
+	t["VirtualIDEControllerOption"] = reflect.TypeOf((*VirtualIDEControllerOption)(nil)).Elem()
+}
+
+type VirtualKeyboard struct {
+	VirtualDevice
+}
+
+func init() {
+	t["VirtualKeyboard"] = reflect.TypeOf((*VirtualKeyboard)(nil)).Elem()
+}
+
+type VirtualKeyboardOption struct {
+	VirtualDeviceOption
+}
+
+func init() {
+	t["VirtualKeyboardOption"] = reflect.TypeOf((*VirtualKeyboardOption)(nil)).Elem()
+}
+
+type VirtualLsiLogicController struct {
+	VirtualSCSIController
+}
+
+func init() {
+	t["VirtualLsiLogicController"] = reflect.TypeOf((*VirtualLsiLogicController)(nil)).Elem()
+}
+
+type VirtualLsiLogicControllerOption struct {
+	VirtualSCSIControllerOption
+}
+
+func init() {
+	t["VirtualLsiLogicControllerOption"] = reflect.TypeOf((*VirtualLsiLogicControllerOption)(nil)).Elem()
+}
+
+type VirtualLsiLogicSASController struct {
+	VirtualSCSIController
+}
+
+func init() {
+	t["VirtualLsiLogicSASController"] = reflect.TypeOf((*VirtualLsiLogicSASController)(nil)).Elem()
+}
+
+type VirtualLsiLogicSASControllerOption struct {
+	VirtualSCSIControllerOption
+}
+
+func init() {
+	t["VirtualLsiLogicSASControllerOption"] = reflect.TypeOf((*VirtualLsiLogicSASControllerOption)(nil)).Elem()
+}
+
+type VirtualMachineAffinityInfo struct {
+	DynamicData
+
+	AffinitySet []int32 `xml:"affinitySet,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineAffinityInfo"] = reflect.TypeOf((*VirtualMachineAffinityInfo)(nil)).Elem()
+}
+
+type VirtualMachineBootOptions struct {
+	DynamicData
+
+	BootDelay            int64                                         `xml:"bootDelay,omitempty"`
+	EnterBIOSSetup       *bool                                         `xml:"enterBIOSSetup"`
+	EfiSecureBootEnabled *bool                                         `xml:"efiSecureBootEnabled"`
+	BootRetryEnabled     *bool                                         `xml:"bootRetryEnabled"`
+	BootRetryDelay       int64                                         `xml:"bootRetryDelay,omitempty"`
+	BootOrder            []BaseVirtualMachineBootOptionsBootableDevice `xml:"bootOrder,omitempty,typeattr"`
+	NetworkBootProtocol  string                                        `xml:"networkBootProtocol,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineBootOptions"] = reflect.TypeOf((*VirtualMachineBootOptions)(nil)).Elem()
+}
+
+type VirtualMachineBootOptionsBootableCdromDevice struct {
+	VirtualMachineBootOptionsBootableDevice
+}
+
+func init() {
+	t["VirtualMachineBootOptionsBootableCdromDevice"] = reflect.TypeOf((*VirtualMachineBootOptionsBootableCdromDevice)(nil)).Elem()
+}
+
+type VirtualMachineBootOptionsBootableDevice struct {
+	DynamicData
+}
+
+func init() {
+	t["VirtualMachineBootOptionsBootableDevice"] = reflect.TypeOf((*VirtualMachineBootOptionsBootableDevice)(nil)).Elem()
+}
+
+type VirtualMachineBootOptionsBootableDiskDevice struct {
+	VirtualMachineBootOptionsBootableDevice
+
+	DeviceKey int32 `xml:"deviceKey"`
+}
+
+func init() {
+	t["VirtualMachineBootOptionsBootableDiskDevice"] = reflect.TypeOf((*VirtualMachineBootOptionsBootableDiskDevice)(nil)).Elem()
+}
+
+type VirtualMachineBootOptionsBootableEthernetDevice struct {
+	VirtualMachineBootOptionsBootableDevice
+
+	DeviceKey int32 `xml:"deviceKey"`
+}
+
+func init() {
+	t["VirtualMachineBootOptionsBootableEthernetDevice"] = reflect.TypeOf((*VirtualMachineBootOptionsBootableEthernetDevice)(nil)).Elem()
+}
+
+type VirtualMachineBootOptionsBootableFloppyDevice struct {
+	VirtualMachineBootOptionsBootableDevice
+}
+
+func init() {
+	t["VirtualMachineBootOptionsBootableFloppyDevice"] = reflect.TypeOf((*VirtualMachineBootOptionsBootableFloppyDevice)(nil)).Elem()
+}
+
+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"`
+}
+
+func init() {
+	t["VirtualMachineCapability"] = reflect.TypeOf((*VirtualMachineCapability)(nil)).Elem()
+}
+
+type VirtualMachineCdromInfo struct {
+	VirtualMachineTargetInfo
+
+	Description string `xml:"description,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineCdromInfo"] = reflect.TypeOf((*VirtualMachineCdromInfo)(nil)).Elem()
+}
+
+type VirtualMachineCloneSpec struct {
+	DynamicData
+
+	Location      VirtualMachineRelocateSpec `xml:"location"`
+	Template      bool                       `xml:"template"`
+	Config        *VirtualMachineConfigSpec  `xml:"config,omitempty"`
+	Customization *CustomizationSpec         `xml:"customization,omitempty"`
+	PowerOn       bool                       `xml:"powerOn"`
+	Snapshot      *ManagedObjectReference    `xml:"snapshot,omitempty"`
+	Memory        *bool                      `xml:"memory"`
+}
+
+func init() {
+	t["VirtualMachineCloneSpec"] = reflect.TypeOf((*VirtualMachineCloneSpec)(nil)).Elem()
+}
+
+type VirtualMachineConfigInfo struct {
+	DynamicData
+
+	ChangeVersion                string                                     `xml:"changeVersion"`
+	Modified                     time.Time                                  `xml:"modified"`
+	Name                         string                                     `xml:"name"`
+	GuestFullName                string                                     `xml:"guestFullName"`
+	Version                      string                                     `xml:"version"`
+	Uuid                         string                                     `xml:"uuid"`
+	InstanceUuid                 string                                     `xml:"instanceUuid,omitempty"`
+	NpivNodeWorldWideName        []int64                                    `xml:"npivNodeWorldWideName,omitempty"`
+	NpivPortWorldWideName        []int64                                    `xml:"npivPortWorldWideName,omitempty"`
+	NpivWorldWideNameType        string                                     `xml:"npivWorldWideNameType,omitempty"`
+	NpivDesiredNodeWwns          int16                                      `xml:"npivDesiredNodeWwns,omitempty"`
+	NpivDesiredPortWwns          int16                                      `xml:"npivDesiredPortWwns,omitempty"`
+	NpivTemporaryDisabled        *bool                                      `xml:"npivTemporaryDisabled"`
+	NpivOnNonRdmDisks            *bool                                      `xml:"npivOnNonRdmDisks"`
+	LocationId                   string                                     `xml:"locationId,omitempty"`
+	Template                     bool                                       `xml:"template"`
+	GuestId                      string                                     `xml:"guestId"`
+	AlternateGuestName           string                                     `xml:"alternateGuestName"`
+	Annotation                   string                                     `xml:"annotation,omitempty"`
+	Files                        VirtualMachineFileInfo                     `xml:"files"`
+	Tools                        *ToolsConfigInfo                           `xml:"tools,omitempty"`
+	Flags                        VirtualMachineFlagInfo                     `xml:"flags"`
+	ConsolePreferences           *VirtualMachineConsolePreferences          `xml:"consolePreferences,omitempty"`
+	DefaultPowerOps              VirtualMachineDefaultPowerOpInfo           `xml:"defaultPowerOps"`
+	Hardware                     VirtualHardware                            `xml:"hardware"`
+	CpuAllocation                BaseResourceAllocationInfo                 `xml:"cpuAllocation,omitempty,typeattr"`
+	MemoryAllocation             BaseResourceAllocationInfo                 `xml:"memoryAllocation,omitempty,typeattr"`
+	LatencySensitivity           *LatencySensitivity                        `xml:"latencySensitivity,omitempty"`
+	MemoryHotAddEnabled          *bool                                      `xml:"memoryHotAddEnabled"`
+	CpuHotAddEnabled             *bool                                      `xml:"cpuHotAddEnabled"`
+	CpuHotRemoveEnabled          *bool                                      `xml:"cpuHotRemoveEnabled"`
+	HotPlugMemoryLimit           int64                                      `xml:"hotPlugMemoryLimit,omitempty"`
+	HotPlugMemoryIncrementSize   int64                                      `xml:"hotPlugMemoryIncrementSize,omitempty"`
+	CpuAffinity                  *VirtualMachineAffinityInfo                `xml:"cpuAffinity,omitempty"`
+	MemoryAffinity               *VirtualMachineAffinityInfo                `xml:"memoryAffinity,omitempty"`
+	NetworkShaper                *VirtualMachineNetworkShaperInfo           `xml:"networkShaper,omitempty"`
+	ExtraConfig                  []BaseOptionValue                          `xml:"extraConfig,omitempty,typeattr"`
+	CpuFeatureMask               []HostCpuIdInfo                            `xml:"cpuFeatureMask,omitempty"`
+	DatastoreUrl                 []VirtualMachineConfigInfoDatastoreUrlPair `xml:"datastoreUrl,omitempty"`
+	SwapPlacement                string                                     `xml:"swapPlacement,omitempty"`
+	BootOptions                  *VirtualMachineBootOptions                 `xml:"bootOptions,omitempty"`
+	FtInfo                       BaseFaultToleranceConfigInfo               `xml:"ftInfo,omitempty,typeattr"`
+	RepConfig                    *ReplicationConfigSpec                     `xml:"repConfig,omitempty"`
+	VAppConfig                   BaseVmConfigInfo                           `xml:"vAppConfig,omitempty,typeattr"`
+	VAssertsEnabled              *bool                                      `xml:"vAssertsEnabled"`
+	ChangeTrackingEnabled        *bool                                      `xml:"changeTrackingEnabled"`
+	Firmware                     string                                     `xml:"firmware,omitempty"`
+	MaxMksConnections            int32                                      `xml:"maxMksConnections,omitempty"`
+	GuestAutoLockEnabled         *bool                                      `xml:"guestAutoLockEnabled"`
+	ManagedBy                    *ManagedByInfo                             `xml:"managedBy,omitempty"`
+	MemoryReservationLockedToMax *bool                                      `xml:"memoryReservationLockedToMax"`
+	InitialOverhead              *VirtualMachineConfigInfoOverheadInfo      `xml:"initialOverhead,omitempty"`
+	NestedHVEnabled              *bool                                      `xml:"nestedHVEnabled"`
+	VPMCEnabled                  *bool                                      `xml:"vPMCEnabled"`
+	ScheduledHardwareUpgradeInfo *ScheduledHardwareUpgradeInfo              `xml:"scheduledHardwareUpgradeInfo,omitempty"`
+	ForkConfigInfo               *VirtualMachineForkConfigInfo              `xml:"forkConfigInfo,omitempty"`
+	VFlashCacheReservation       int64                                      `xml:"vFlashCacheReservation,omitempty"`
+	VmxConfigChecksum            []byte                                     `xml:"vmxConfigChecksum,omitempty"`
+	MessageBusTunnelEnabled      *bool                                      `xml:"messageBusTunnelEnabled"`
+	VmStorageObjectId            string                                     `xml:"vmStorageObjectId,omitempty"`
+	SwapStorageObjectId          string                                     `xml:"swapStorageObjectId,omitempty"`
+	KeyId                        *CryptoKeyId                               `xml:"keyId,omitempty"`
+	GuestIntegrityInfo           *VirtualMachineGuestIntegrityInfo          `xml:"guestIntegrityInfo,omitempty"`
+	MigrateEncryption            string                                     `xml:"migrateEncryption,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineConfigInfo"] = reflect.TypeOf((*VirtualMachineConfigInfo)(nil)).Elem()
+}
+
+type VirtualMachineConfigInfoDatastoreUrlPair struct {
+	DynamicData
+
+	Name string `xml:"name"`
+	Url  string `xml:"url"`
+}
+
+func init() {
+	t["VirtualMachineConfigInfoDatastoreUrlPair"] = reflect.TypeOf((*VirtualMachineConfigInfoDatastoreUrlPair)(nil)).Elem()
+}
+
+type VirtualMachineConfigInfoOverheadInfo struct {
+	DynamicData
+
+	InitialMemoryReservation int64 `xml:"initialMemoryReservation,omitempty"`
+	InitialSwapReservation   int64 `xml:"initialSwapReservation,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineConfigInfoOverheadInfo"] = reflect.TypeOf((*VirtualMachineConfigInfoOverheadInfo)(nil)).Elem()
+}
+
+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"`
+}
+
+func init() {
+	t["VirtualMachineConfigOption"] = reflect.TypeOf((*VirtualMachineConfigOption)(nil)).Elem()
+}
+
+type VirtualMachineConfigOptionDescriptor struct {
+	DynamicData
+
+	Key                 string                   `xml:"key"`
+	Description         string                   `xml:"description,omitempty"`
+	Host                []ManagedObjectReference `xml:"host,omitempty"`
+	CreateSupported     *bool                    `xml:"createSupported"`
+	DefaultConfigOption *bool                    `xml:"defaultConfigOption"`
+	RunSupported        *bool                    `xml:"runSupported"`
+	UpgradeSupported    *bool                    `xml:"upgradeSupported"`
+}
+
+func init() {
+	t["VirtualMachineConfigOptionDescriptor"] = reflect.TypeOf((*VirtualMachineConfigOptionDescriptor)(nil)).Elem()
+}
+
+type VirtualMachineConfigSpec struct {
+	DynamicData
+
+	ChangeVersion                string                            `xml:"changeVersion,omitempty"`
+	Name                         string                            `xml:"name,omitempty"`
+	Version                      string                            `xml:"version,omitempty"`
+	Uuid                         string                            `xml:"uuid,omitempty"`
+	InstanceUuid                 string                            `xml:"instanceUuid,omitempty"`
+	NpivNodeWorldWideName        []int64                           `xml:"npivNodeWorldWideName,omitempty"`
+	NpivPortWorldWideName        []int64                           `xml:"npivPortWorldWideName,omitempty"`
+	NpivWorldWideNameType        string                            `xml:"npivWorldWideNameType,omitempty"`
+	NpivDesiredNodeWwns          int16                             `xml:"npivDesiredNodeWwns,omitempty"`
+	NpivDesiredPortWwns          int16                             `xml:"npivDesiredPortWwns,omitempty"`
+	NpivTemporaryDisabled        *bool                             `xml:"npivTemporaryDisabled"`
+	NpivOnNonRdmDisks            *bool                             `xml:"npivOnNonRdmDisks"`
+	NpivWorldWideNameOp          string                            `xml:"npivWorldWideNameOp,omitempty"`
+	LocationId                   string                            `xml:"locationId,omitempty"`
+	GuestId                      string                            `xml:"guestId,omitempty"`
+	AlternateGuestName           string                            `xml:"alternateGuestName,omitempty"`
+	Annotation                   string                            `xml:"annotation,omitempty"`
+	Files                        *VirtualMachineFileInfo           `xml:"files,omitempty"`
+	Tools                        *ToolsConfigInfo                  `xml:"tools,omitempty"`
+	Flags                        *VirtualMachineFlagInfo           `xml:"flags,omitempty"`
+	ConsolePreferences           *VirtualMachineConsolePreferences `xml:"consolePreferences,omitempty"`
+	PowerOpInfo                  *VirtualMachineDefaultPowerOpInfo `xml:"powerOpInfo,omitempty"`
+	NumCPUs                      int32                             `xml:"numCPUs,omitempty"`
+	NumCoresPerSocket            int32                             `xml:"numCoresPerSocket,omitempty"`
+	MemoryMB                     int64                             `xml:"memoryMB,omitempty"`
+	MemoryHotAddEnabled          *bool                             `xml:"memoryHotAddEnabled"`
+	CpuHotAddEnabled             *bool                             `xml:"cpuHotAddEnabled"`
+	CpuHotRemoveEnabled          *bool                             `xml:"cpuHotRemoveEnabled"`
+	VirtualICH7MPresent          *bool                             `xml:"virtualICH7MPresent"`
+	VirtualSMCPresent            *bool                             `xml:"virtualSMCPresent"`
+	DeviceChange                 []BaseVirtualDeviceConfigSpec     `xml:"deviceChange,omitempty,typeattr"`
+	CpuAllocation                BaseResourceAllocationInfo        `xml:"cpuAllocation,omitempty,typeattr"`
+	MemoryAllocation             BaseResourceAllocationInfo        `xml:"memoryAllocation,omitempty,typeattr"`
+	LatencySensitivity           *LatencySensitivity               `xml:"latencySensitivity,omitempty"`
+	CpuAffinity                  *VirtualMachineAffinityInfo       `xml:"cpuAffinity,omitempty"`
+	MemoryAffinity               *VirtualMachineAffinityInfo       `xml:"memoryAffinity,omitempty"`
+	NetworkShaper                *VirtualMachineNetworkShaperInfo  `xml:"networkShaper,omitempty"`
+	CpuFeatureMask               []VirtualMachineCpuIdInfoSpec     `xml:"cpuFeatureMask,omitempty"`
+	ExtraConfig                  []BaseOptionValue                 `xml:"extraConfig,omitempty,typeattr"`
+	SwapPlacement                string                            `xml:"swapPlacement,omitempty"`
+	BootOptions                  *VirtualMachineBootOptions        `xml:"bootOptions,omitempty"`
+	VAppConfig                   BaseVmConfigSpec                  `xml:"vAppConfig,omitempty,typeattr"`
+	FtInfo                       BaseFaultToleranceConfigInfo      `xml:"ftInfo,omitempty,typeattr"`
+	RepConfig                    *ReplicationConfigSpec            `xml:"repConfig,omitempty"`
+	VAppConfigRemoved            *bool                             `xml:"vAppConfigRemoved"`
+	VAssertsEnabled              *bool                             `xml:"vAssertsEnabled"`
+	ChangeTrackingEnabled        *bool                             `xml:"changeTrackingEnabled"`
+	Firmware                     string                            `xml:"firmware,omitempty"`
+	MaxMksConnections            int32                             `xml:"maxMksConnections,omitempty"`
+	GuestAutoLockEnabled         *bool                             `xml:"guestAutoLockEnabled"`
+	ManagedBy                    *ManagedByInfo                    `xml:"managedBy,omitempty"`
+	MemoryReservationLockedToMax *bool                             `xml:"memoryReservationLockedToMax"`
+	NestedHVEnabled              *bool                             `xml:"nestedHVEnabled"`
+	VPMCEnabled                  *bool                             `xml:"vPMCEnabled"`
+	ScheduledHardwareUpgradeInfo *ScheduledHardwareUpgradeInfo     `xml:"scheduledHardwareUpgradeInfo,omitempty"`
+	VmProfile                    []BaseVirtualMachineProfileSpec   `xml:"vmProfile,omitempty,typeattr"`
+	MessageBusTunnelEnabled      *bool                             `xml:"messageBusTunnelEnabled"`
+	Crypto                       BaseCryptoSpec                    `xml:"crypto,omitempty,typeattr"`
+	MigrateEncryption            string                            `xml:"migrateEncryption,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineConfigSpec"] = reflect.TypeOf((*VirtualMachineConfigSpec)(nil)).Elem()
+}
+
+type VirtualMachineConfigSummary struct {
+	DynamicData
+
+	Name                string                       `xml:"name"`
+	Template            bool                         `xml:"template"`
+	VmPathName          string                       `xml:"vmPathName"`
+	MemorySizeMB        int32                        `xml:"memorySizeMB,omitempty"`
+	CpuReservation      int32                        `xml:"cpuReservation,omitempty"`
+	MemoryReservation   int32                        `xml:"memoryReservation,omitempty"`
+	NumCpu              int32                        `xml:"numCpu,omitempty"`
+	NumEthernetCards    int32                        `xml:"numEthernetCards,omitempty"`
+	NumVirtualDisks     int32                        `xml:"numVirtualDisks,omitempty"`
+	Uuid                string                       `xml:"uuid,omitempty"`
+	InstanceUuid        string                       `xml:"instanceUuid,omitempty"`
+	GuestId             string                       `xml:"guestId,omitempty"`
+	GuestFullName       string                       `xml:"guestFullName,omitempty"`
+	Annotation          string                       `xml:"annotation,omitempty"`
+	Product             *VAppProductInfo             `xml:"product,omitempty"`
+	InstallBootRequired *bool                        `xml:"installBootRequired"`
+	FtInfo              BaseFaultToleranceConfigInfo `xml:"ftInfo,omitempty,typeattr"`
+	ManagedBy           *ManagedByInfo               `xml:"managedBy,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineConfigSummary"] = reflect.TypeOf((*VirtualMachineConfigSummary)(nil)).Elem()
+}
+
+type VirtualMachineConsolePreferences struct {
+	DynamicData
+
+	PowerOnWhenOpened        *bool `xml:"powerOnWhenOpened"`
+	EnterFullScreenOnPowerOn *bool `xml:"enterFullScreenOnPowerOn"`
+	CloseOnPowerOffOrSuspend *bool `xml:"closeOnPowerOffOrSuspend"`
+}
+
+func init() {
+	t["VirtualMachineConsolePreferences"] = reflect.TypeOf((*VirtualMachineConsolePreferences)(nil)).Elem()
+}
+
+type VirtualMachineCpuIdInfoSpec struct {
+	ArrayUpdateSpec
+
+	Info *HostCpuIdInfo `xml:"info,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineCpuIdInfoSpec"] = reflect.TypeOf((*VirtualMachineCpuIdInfoSpec)(nil)).Elem()
+}
+
+type VirtualMachineDatastoreInfo struct {
+	VirtualMachineTargetInfo
+
+	Datastore              DatastoreSummary    `xml:"datastore"`
+	Capability             DatastoreCapability `xml:"capability"`
+	MaxFileSize            int64               `xml:"maxFileSize"`
+	MaxVirtualDiskCapacity int64               `xml:"maxVirtualDiskCapacity,omitempty"`
+	MaxPhysicalRDMFileSize int64               `xml:"maxPhysicalRDMFileSize,omitempty"`
+	MaxVirtualRDMFileSize  int64               `xml:"maxVirtualRDMFileSize,omitempty"`
+	Mode                   string              `xml:"mode"`
+	VStorageSupport        string              `xml:"vStorageSupport,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineDatastoreInfo"] = reflect.TypeOf((*VirtualMachineDatastoreInfo)(nil)).Elem()
+}
+
+type VirtualMachineDatastoreVolumeOption struct {
+	DynamicData
+
+	FileSystemType string `xml:"fileSystemType"`
+	MajorVersion   int32  `xml:"majorVersion,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineDatastoreVolumeOption"] = reflect.TypeOf((*VirtualMachineDatastoreVolumeOption)(nil)).Elem()
+}
+
+type VirtualMachineDefaultPowerOpInfo struct {
+	DynamicData
+
+	PowerOffType        string `xml:"powerOffType,omitempty"`
+	SuspendType         string `xml:"suspendType,omitempty"`
+	ResetType           string `xml:"resetType,omitempty"`
+	DefaultPowerOffType string `xml:"defaultPowerOffType,omitempty"`
+	DefaultSuspendType  string `xml:"defaultSuspendType,omitempty"`
+	DefaultResetType    string `xml:"defaultResetType,omitempty"`
+	StandbyAction       string `xml:"standbyAction,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineDefaultPowerOpInfo"] = reflect.TypeOf((*VirtualMachineDefaultPowerOpInfo)(nil)).Elem()
+}
+
+type VirtualMachineDefaultProfileSpec struct {
+	VirtualMachineProfileSpec
+}
+
+func init() {
+	t["VirtualMachineDefaultProfileSpec"] = reflect.TypeOf((*VirtualMachineDefaultProfileSpec)(nil)).Elem()
+}
+
+type VirtualMachineDefinedProfileSpec struct {
+	VirtualMachineProfileSpec
+
+	ProfileId       string                        `xml:"profileId"`
+	ReplicationSpec *ReplicationSpec              `xml:"replicationSpec,omitempty"`
+	ProfileData     *VirtualMachineProfileRawData `xml:"profileData,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineDefinedProfileSpec"] = reflect.TypeOf((*VirtualMachineDefinedProfileSpec)(nil)).Elem()
+}
+
+type VirtualMachineDeviceRuntimeInfo struct {
+	DynamicData
+
+	RuntimeState BaseVirtualMachineDeviceRuntimeInfoDeviceRuntimeState `xml:"runtimeState,typeattr"`
+	Key          int32                                                 `xml:"key"`
+}
+
+func init() {
+	t["VirtualMachineDeviceRuntimeInfo"] = reflect.TypeOf((*VirtualMachineDeviceRuntimeInfo)(nil)).Elem()
+}
+
+type VirtualMachineDeviceRuntimeInfoDeviceRuntimeState struct {
+	DynamicData
+}
+
+func init() {
+	t["VirtualMachineDeviceRuntimeInfoDeviceRuntimeState"] = reflect.TypeOf((*VirtualMachineDeviceRuntimeInfoDeviceRuntimeState)(nil)).Elem()
+}
+
+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"`
+}
+
+func init() {
+	t["VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeState"] = reflect.TypeOf((*VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeState)(nil)).Elem()
+}
+
+type VirtualMachineDiskDeviceInfo struct {
+	VirtualMachineTargetInfo
+
+	Capacity int64                    `xml:"capacity,omitempty"`
+	Vm       []ManagedObjectReference `xml:"vm,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineDiskDeviceInfo"] = reflect.TypeOf((*VirtualMachineDiskDeviceInfo)(nil)).Elem()
+}
+
+type VirtualMachineDisplayTopology struct {
+	DynamicData
+
+	X      int32 `xml:"x"`
+	Y      int32 `xml:"y"`
+	Width  int32 `xml:"width"`
+	Height int32 `xml:"height"`
+}
+
+func init() {
+	t["VirtualMachineDisplayTopology"] = reflect.TypeOf((*VirtualMachineDisplayTopology)(nil)).Elem()
+}
+
+type VirtualMachineEmptyProfileSpec struct {
+	VirtualMachineProfileSpec
+}
+
+func init() {
+	t["VirtualMachineEmptyProfileSpec"] = reflect.TypeOf((*VirtualMachineEmptyProfileSpec)(nil)).Elem()
+}
+
+type VirtualMachineFeatureRequirement struct {
+	DynamicData
+
+	Key         string `xml:"key"`
+	FeatureName string `xml:"featureName"`
+	Value       string `xml:"value"`
+}
+
+func init() {
+	t["VirtualMachineFeatureRequirement"] = reflect.TypeOf((*VirtualMachineFeatureRequirement)(nil)).Elem()
+}
+
+type VirtualMachineFileInfo struct {
+	DynamicData
+
+	VmPathName          string `xml:"vmPathName,omitempty"`
+	SnapshotDirectory   string `xml:"snapshotDirectory,omitempty"`
+	SuspendDirectory    string `xml:"suspendDirectory,omitempty"`
+	LogDirectory        string `xml:"logDirectory,omitempty"`
+	FtMetadataDirectory string `xml:"ftMetadataDirectory,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineFileInfo"] = reflect.TypeOf((*VirtualMachineFileInfo)(nil)).Elem()
+}
+
+type VirtualMachineFileLayout struct {
+	DynamicData
+
+	ConfigFile []string                                 `xml:"configFile,omitempty"`
+	LogFile    []string                                 `xml:"logFile,omitempty"`
+	Disk       []VirtualMachineFileLayoutDiskLayout     `xml:"disk,omitempty"`
+	Snapshot   []VirtualMachineFileLayoutSnapshotLayout `xml:"snapshot,omitempty"`
+	SwapFile   string                                   `xml:"swapFile,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineFileLayout"] = reflect.TypeOf((*VirtualMachineFileLayout)(nil)).Elem()
+}
+
+type VirtualMachineFileLayoutDiskLayout struct {
+	DynamicData
+
+	Key      int32    `xml:"key"`
+	DiskFile []string `xml:"diskFile"`
+}
+
+func init() {
+	t["VirtualMachineFileLayoutDiskLayout"] = reflect.TypeOf((*VirtualMachineFileLayoutDiskLayout)(nil)).Elem()
+}
+
+type VirtualMachineFileLayoutEx struct {
+	DynamicData
+
+	File      []VirtualMachineFileLayoutExFileInfo       `xml:"file,omitempty"`
+	Disk      []VirtualMachineFileLayoutExDiskLayout     `xml:"disk,omitempty"`
+	Snapshot  []VirtualMachineFileLayoutExSnapshotLayout `xml:"snapshot,omitempty"`
+	Timestamp time.Time                                  `xml:"timestamp"`
+}
+
+func init() {
+	t["VirtualMachineFileLayoutEx"] = reflect.TypeOf((*VirtualMachineFileLayoutEx)(nil)).Elem()
+}
+
+type VirtualMachineFileLayoutExDiskLayout struct {
+	DynamicData
+
+	Key   int32                                `xml:"key"`
+	Chain []VirtualMachineFileLayoutExDiskUnit `xml:"chain,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineFileLayoutExDiskLayout"] = reflect.TypeOf((*VirtualMachineFileLayoutExDiskLayout)(nil)).Elem()
+}
+
+type VirtualMachineFileLayoutExDiskUnit struct {
+	DynamicData
+
+	FileKey []int32 `xml:"fileKey"`
+}
+
+func init() {
+	t["VirtualMachineFileLayoutExDiskUnit"] = reflect.TypeOf((*VirtualMachineFileLayoutExDiskUnit)(nil)).Elem()
+}
+
+type VirtualMachineFileLayoutExFileInfo struct {
+	DynamicData
+
+	Key             int32  `xml:"key"`
+	Name            string `xml:"name"`
+	Type            string `xml:"type"`
+	Size            int64  `xml:"size"`
+	UniqueSize      int64  `xml:"uniqueSize,omitempty"`
+	BackingObjectId string `xml:"backingObjectId,omitempty"`
+	Accessible      *bool  `xml:"accessible"`
+}
+
+func init() {
+	t["VirtualMachineFileLayoutExFileInfo"] = reflect.TypeOf((*VirtualMachineFileLayoutExFileInfo)(nil)).Elem()
+}
+
+type VirtualMachineFileLayoutExSnapshotLayout struct {
+	DynamicData
+
+	Key       ManagedObjectReference                 `xml:"key"`
+	DataKey   int32                                  `xml:"dataKey"`
+	MemoryKey int32                                  `xml:"memoryKey,omitempty"`
+	Disk      []VirtualMachineFileLayoutExDiskLayout `xml:"disk,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineFileLayoutExSnapshotLayout"] = reflect.TypeOf((*VirtualMachineFileLayoutExSnapshotLayout)(nil)).Elem()
+}
+
+type VirtualMachineFileLayoutSnapshotLayout struct {
+	DynamicData
+
+	Key          ManagedObjectReference `xml:"key"`
+	SnapshotFile []string               `xml:"snapshotFile"`
+}
+
+func init() {
+	t["VirtualMachineFileLayoutSnapshotLayout"] = reflect.TypeOf((*VirtualMachineFileLayoutSnapshotLayout)(nil)).Elem()
+}
+
+type VirtualMachineFlagInfo struct {
+	DynamicData
+
+	DisableAcceleration      *bool  `xml:"disableAcceleration"`
+	EnableLogging            *bool  `xml:"enableLogging"`
+	UseToe                   *bool  `xml:"useToe"`
+	RunWithDebugInfo         *bool  `xml:"runWithDebugInfo"`
+	MonitorType              string `xml:"monitorType,omitempty"`
+	HtSharing                string `xml:"htSharing,omitempty"`
+	SnapshotDisabled         *bool  `xml:"snapshotDisabled"`
+	SnapshotLocked           *bool  `xml:"snapshotLocked"`
+	DiskUuidEnabled          *bool  `xml:"diskUuidEnabled"`
+	VirtualMmuUsage          string `xml:"virtualMmuUsage,omitempty"`
+	VirtualExecUsage         string `xml:"virtualExecUsage,omitempty"`
+	SnapshotPowerOffBehavior string `xml:"snapshotPowerOffBehavior,omitempty"`
+	RecordReplayEnabled      *bool  `xml:"recordReplayEnabled"`
+	FaultToleranceType       string `xml:"faultToleranceType,omitempty"`
+	CbrcCacheEnabled         *bool  `xml:"cbrcCacheEnabled"`
+}
+
+func init() {
+	t["VirtualMachineFlagInfo"] = reflect.TypeOf((*VirtualMachineFlagInfo)(nil)).Elem()
+}
+
+type VirtualMachineFloppyInfo struct {
+	VirtualMachineTargetInfo
+}
+
+func init() {
+	t["VirtualMachineFloppyInfo"] = reflect.TypeOf((*VirtualMachineFloppyInfo)(nil)).Elem()
+}
+
+type VirtualMachineForkConfigInfo struct {
+	DynamicData
+
+	ParentEnabled     *bool  `xml:"parentEnabled"`
+	ChildForkGroupId  string `xml:"childForkGroupId,omitempty"`
+	ParentForkGroupId string `xml:"parentForkGroupId,omitempty"`
+	ChildType         string `xml:"childType,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineForkConfigInfo"] = reflect.TypeOf((*VirtualMachineForkConfigInfo)(nil)).Elem()
+}
+
+type VirtualMachineGuestIntegrityInfo struct {
+	DynamicData
+
+	Enabled *bool `xml:"enabled"`
+}
+
+func init() {
+	t["VirtualMachineGuestIntegrityInfo"] = reflect.TypeOf((*VirtualMachineGuestIntegrityInfo)(nil)).Elem()
+}
+
+type VirtualMachineGuestQuiesceSpec struct {
+	DynamicData
+
+	Timeout int32 `xml:"timeout,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineGuestQuiesceSpec"] = reflect.TypeOf((*VirtualMachineGuestQuiesceSpec)(nil)).Elem()
+}
+
+type VirtualMachineGuestSummary struct {
+	DynamicData
+
+	GuestId             string                    `xml:"guestId,omitempty"`
+	GuestFullName       string                    `xml:"guestFullName,omitempty"`
+	ToolsStatus         VirtualMachineToolsStatus `xml:"toolsStatus,omitempty"`
+	ToolsVersionStatus  string                    `xml:"toolsVersionStatus,omitempty"`
+	ToolsVersionStatus2 string                    `xml:"toolsVersionStatus2,omitempty"`
+	ToolsRunningStatus  string                    `xml:"toolsRunningStatus,omitempty"`
+	HostName            string                    `xml:"hostName,omitempty"`
+	IpAddress           string                    `xml:"ipAddress,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineGuestSummary"] = reflect.TypeOf((*VirtualMachineGuestSummary)(nil)).Elem()
+}
+
+type VirtualMachineIdeDiskDeviceInfo struct {
+	VirtualMachineDiskDeviceInfo
+
+	PartitionTable []VirtualMachineIdeDiskDevicePartitionInfo `xml:"partitionTable,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineIdeDiskDeviceInfo"] = reflect.TypeOf((*VirtualMachineIdeDiskDeviceInfo)(nil)).Elem()
+}
+
+type VirtualMachineIdeDiskDevicePartitionInfo struct {
+	DynamicData
+
+	Id       int32 `xml:"id"`
+	Capacity int32 `xml:"capacity"`
+}
+
+func init() {
+	t["VirtualMachineIdeDiskDevicePartitionInfo"] = reflect.TypeOf((*VirtualMachineIdeDiskDevicePartitionInfo)(nil)).Elem()
+}
+
+type VirtualMachineImportSpec struct {
+	ImportSpec
+
+	ConfigSpec    VirtualMachineConfigSpec `xml:"configSpec"`
+	ResPoolEntity *ManagedObjectReference  `xml:"resPoolEntity,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineImportSpec"] = reflect.TypeOf((*VirtualMachineImportSpec)(nil)).Elem()
+}
+
+type VirtualMachineLegacyNetworkSwitchInfo struct {
+	DynamicData
+
+	Name string `xml:"name"`
+}
+
+func init() {
+	t["VirtualMachineLegacyNetworkSwitchInfo"] = reflect.TypeOf((*VirtualMachineLegacyNetworkSwitchInfo)(nil)).Elem()
+}
+
+type VirtualMachineMemoryReservationInfo struct {
+	DynamicData
+
+	VirtualMachineMin      int64  `xml:"virtualMachineMin"`
+	VirtualMachineMax      int64  `xml:"virtualMachineMax"`
+	VirtualMachineReserved int64  `xml:"virtualMachineReserved"`
+	AllocationPolicy       string `xml:"allocationPolicy"`
+}
+
+func init() {
+	t["VirtualMachineMemoryReservationInfo"] = reflect.TypeOf((*VirtualMachineMemoryReservationInfo)(nil)).Elem()
+}
+
+type VirtualMachineMemoryReservationSpec struct {
+	DynamicData
+
+	VirtualMachineReserved int64  `xml:"virtualMachineReserved,omitempty"`
+	AllocationPolicy       string `xml:"allocationPolicy,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineMemoryReservationSpec"] = reflect.TypeOf((*VirtualMachineMemoryReservationSpec)(nil)).Elem()
+}
+
+type VirtualMachineMessage struct {
+	DynamicData
+
+	Id       string    `xml:"id"`
+	Argument []AnyType `xml:"argument,omitempty,typeattr"`
+	Text     string    `xml:"text,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineMessage"] = reflect.TypeOf((*VirtualMachineMessage)(nil)).Elem()
+}
+
+type VirtualMachineMetadataManagerVmMetadata struct {
+	DynamicData
+
+	VmId     string `xml:"vmId"`
+	Metadata string `xml:"metadata,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineMetadataManagerVmMetadata"] = reflect.TypeOf((*VirtualMachineMetadataManagerVmMetadata)(nil)).Elem()
+}
+
+type VirtualMachineMetadataManagerVmMetadataInput struct {
+	DynamicData
+
+	Operation  string                                  `xml:"operation"`
+	VmMetadata VirtualMachineMetadataManagerVmMetadata `xml:"vmMetadata"`
+}
+
+func init() {
+	t["VirtualMachineMetadataManagerVmMetadataInput"] = reflect.TypeOf((*VirtualMachineMetadataManagerVmMetadataInput)(nil)).Elem()
+}
+
+type VirtualMachineMetadataManagerVmMetadataOwner struct {
+	DynamicData
+
+	Name string `xml:"name"`
+}
+
+func init() {
+	t["VirtualMachineMetadataManagerVmMetadataOwner"] = reflect.TypeOf((*VirtualMachineMetadataManagerVmMetadataOwner)(nil)).Elem()
+}
+
+type VirtualMachineMetadataManagerVmMetadataResult struct {
+	DynamicData
+
+	VmMetadata VirtualMachineMetadataManagerVmMetadata `xml:"vmMetadata"`
+	Error      *LocalizedMethodFault                   `xml:"error,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineMetadataManagerVmMetadataResult"] = reflect.TypeOf((*VirtualMachineMetadataManagerVmMetadataResult)(nil)).Elem()
+}
+
+type VirtualMachineMksTicket struct {
+	DynamicData
+
+	Ticket        string `xml:"ticket"`
+	CfgFile       string `xml:"cfgFile"`
+	Host          string `xml:"host,omitempty"`
+	Port          int32  `xml:"port,omitempty"`
+	SslThumbprint string `xml:"sslThumbprint,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineMksTicket"] = reflect.TypeOf((*VirtualMachineMksTicket)(nil)).Elem()
+}
+
+type VirtualMachineNetworkInfo struct {
+	VirtualMachineTargetInfo
+
+	Network BaseNetworkSummary `xml:"network,typeattr"`
+	Vswitch string             `xml:"vswitch,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineNetworkInfo"] = reflect.TypeOf((*VirtualMachineNetworkInfo)(nil)).Elem()
+}
+
+type VirtualMachineNetworkShaperInfo struct {
+	DynamicData
+
+	Enabled    *bool `xml:"enabled"`
+	PeakBps    int64 `xml:"peakBps,omitempty"`
+	AverageBps int64 `xml:"averageBps,omitempty"`
+	BurstSize  int64 `xml:"burstSize,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineNetworkShaperInfo"] = reflect.TypeOf((*VirtualMachineNetworkShaperInfo)(nil)).Elem()
+}
+
+type VirtualMachineParallelInfo struct {
+	VirtualMachineTargetInfo
+}
+
+func init() {
+	t["VirtualMachineParallelInfo"] = reflect.TypeOf((*VirtualMachineParallelInfo)(nil)).Elem()
+}
+
+type VirtualMachinePciPassthroughInfo struct {
+	VirtualMachineTargetInfo
+
+	PciDevice HostPciDevice `xml:"pciDevice"`
+	SystemId  string        `xml:"systemId"`
+}
+
+func init() {
+	t["VirtualMachinePciPassthroughInfo"] = reflect.TypeOf((*VirtualMachinePciPassthroughInfo)(nil)).Elem()
+}
+
+type VirtualMachinePciSharedGpuPassthroughInfo struct {
+	VirtualMachineTargetInfo
+
+	Vgpu string `xml:"vgpu"`
+}
+
+func init() {
+	t["VirtualMachinePciSharedGpuPassthroughInfo"] = reflect.TypeOf((*VirtualMachinePciSharedGpuPassthroughInfo)(nil)).Elem()
+}
+
+type VirtualMachineProfileRawData struct {
+	DynamicData
+
+	ExtensionKey string `xml:"extensionKey"`
+	ObjectData   string `xml:"objectData,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineProfileRawData"] = reflect.TypeOf((*VirtualMachineProfileRawData)(nil)).Elem()
+}
+
+type VirtualMachineProfileSpec struct {
+	DynamicData
+}
+
+func init() {
+	t["VirtualMachineProfileSpec"] = reflect.TypeOf((*VirtualMachineProfileSpec)(nil)).Elem()
+}
+
+type VirtualMachineQuestionInfo struct {
+	DynamicData
+
+	Id      string                  `xml:"id"`
+	Text    string                  `xml:"text"`
+	Choice  ChoiceOption            `xml:"choice"`
+	Message []VirtualMachineMessage `xml:"message,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineQuestionInfo"] = reflect.TypeOf((*VirtualMachineQuestionInfo)(nil)).Elem()
+}
+
+type VirtualMachineQuickStats struct {
+	DynamicData
+
+	OverallCpuUsage              int32               `xml:"overallCpuUsage,omitempty"`
+	OverallCpuDemand             int32               `xml:"overallCpuDemand,omitempty"`
+	GuestMemoryUsage             int32               `xml:"guestMemoryUsage,omitempty"`
+	HostMemoryUsage              int32               `xml:"hostMemoryUsage,omitempty"`
+	GuestHeartbeatStatus         ManagedEntityStatus `xml:"guestHeartbeatStatus"`
+	DistributedCpuEntitlement    int32               `xml:"distributedCpuEntitlement,omitempty"`
+	DistributedMemoryEntitlement int32               `xml:"distributedMemoryEntitlement,omitempty"`
+	StaticCpuEntitlement         int32               `xml:"staticCpuEntitlement,omitempty"`
+	StaticMemoryEntitlement      int32               `xml:"staticMemoryEntitlement,omitempty"`
+	PrivateMemory                int32               `xml:"privateMemory,omitempty"`
+	SharedMemory                 int32               `xml:"sharedMemory,omitempty"`
+	SwappedMemory                int32               `xml:"swappedMemory,omitempty"`
+	BalloonedMemory              int32               `xml:"balloonedMemory,omitempty"`
+	ConsumedOverheadMemory       int32               `xml:"consumedOverheadMemory,omitempty"`
+	FtLogBandwidth               int32               `xml:"ftLogBandwidth,omitempty"`
+	FtSecondaryLatency           int32               `xml:"ftSecondaryLatency,omitempty"`
+	FtLatencyStatus              ManagedEntityStatus `xml:"ftLatencyStatus,omitempty"`
+	CompressedMemory             int64               `xml:"compressedMemory,omitempty"`
+	UptimeSeconds                int32               `xml:"uptimeSeconds,omitempty"`
+	SsdSwappedMemory             int64               `xml:"ssdSwappedMemory,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineQuickStats"] = reflect.TypeOf((*VirtualMachineQuickStats)(nil)).Elem()
+}
+
+type VirtualMachineRelocateSpec struct {
+	DynamicData
+
+	Service      *ServiceLocator                         `xml:"service,omitempty"`
+	Folder       *ManagedObjectReference                 `xml:"folder,omitempty"`
+	Datastore    *ManagedObjectReference                 `xml:"datastore,omitempty"`
+	DiskMoveType string                                  `xml:"diskMoveType,omitempty"`
+	Pool         *ManagedObjectReference                 `xml:"pool,omitempty"`
+	Host         *ManagedObjectReference                 `xml:"host,omitempty"`
+	Disk         []VirtualMachineRelocateSpecDiskLocator `xml:"disk,omitempty"`
+	Transform    VirtualMachineRelocateTransformation    `xml:"transform,omitempty"`
+	DeviceChange []BaseVirtualDeviceConfigSpec           `xml:"deviceChange,omitempty,typeattr"`
+	Profile      []BaseVirtualMachineProfileSpec         `xml:"profile,omitempty,typeattr"`
+}
+
+func init() {
+	t["VirtualMachineRelocateSpec"] = reflect.TypeOf((*VirtualMachineRelocateSpec)(nil)).Elem()
+}
+
+type VirtualMachineRelocateSpecDiskLocator struct {
+	DynamicData
+
+	DiskId          int32                           `xml:"diskId"`
+	Datastore       ManagedObjectReference          `xml:"datastore"`
+	DiskMoveType    string                          `xml:"diskMoveType,omitempty"`
+	DiskBackingInfo BaseVirtualDeviceBackingInfo    `xml:"diskBackingInfo,omitempty,typeattr"`
+	Profile         []BaseVirtualMachineProfileSpec `xml:"profile,omitempty,typeattr"`
+}
+
+func init() {
+	t["VirtualMachineRelocateSpecDiskLocator"] = reflect.TypeOf((*VirtualMachineRelocateSpecDiskLocator)(nil)).Elem()
+}
+
+type VirtualMachineRuntimeInfo struct {
+	DynamicData
+
+	Device                    []VirtualMachineDeviceRuntimeInfo            `xml:"device,omitempty"`
+	Host                      *ManagedObjectReference                      `xml:"host,omitempty"`
+	ConnectionState           VirtualMachineConnectionState                `xml:"connectionState"`
+	PowerState                VirtualMachinePowerState                     `xml:"powerState"`
+	FaultToleranceState       VirtualMachineFaultToleranceState            `xml:"faultToleranceState,omitempty"`
+	DasVmProtection           *VirtualMachineRuntimeInfoDasProtectionState `xml:"dasVmProtection,omitempty"`
+	ToolsInstallerMounted     bool                                         `xml:"toolsInstallerMounted"`
+	SuspendTime               *time.Time                                   `xml:"suspendTime"`
+	BootTime                  *time.Time                                   `xml:"bootTime"`
+	SuspendInterval           int64                                        `xml:"suspendInterval,omitempty"`
+	Question                  *VirtualMachineQuestionInfo                  `xml:"question,omitempty"`
+	MemoryOverhead            int64                                        `xml:"memoryOverhead,omitempty"`
+	MaxCpuUsage               int32                                        `xml:"maxCpuUsage,omitempty"`
+	MaxMemoryUsage            int32                                        `xml:"maxMemoryUsage,omitempty"`
+	NumMksConnections         int32                                        `xml:"numMksConnections"`
+	RecordReplayState         VirtualMachineRecordReplayState              `xml:"recordReplayState,omitempty"`
+	CleanPowerOff             *bool                                        `xml:"cleanPowerOff"`
+	NeedSecondaryReason       string                                       `xml:"needSecondaryReason,omitempty"`
+	OnlineStandby             *bool                                        `xml:"onlineStandby"`
+	MinRequiredEVCModeKey     string                                       `xml:"minRequiredEVCModeKey,omitempty"`
+	ConsolidationNeeded       *bool                                        `xml:"consolidationNeeded"`
+	OfflineFeatureRequirement []VirtualMachineFeatureRequirement           `xml:"offlineFeatureRequirement,omitempty"`
+	FeatureRequirement        []VirtualMachineFeatureRequirement           `xml:"featureRequirement,omitempty"`
+	FeatureMask               []HostFeatureMask                            `xml:"featureMask,omitempty"`
+	VFlashCacheAllocation     int64                                        `xml:"vFlashCacheAllocation,omitempty"`
+	Paused                    *bool                                        `xml:"paused"`
+	SnapshotInBackground      *bool                                        `xml:"snapshotInBackground"`
+	QuiescedForkParent        *bool                                        `xml:"quiescedForkParent"`
+}
+
+func init() {
+	t["VirtualMachineRuntimeInfo"] = reflect.TypeOf((*VirtualMachineRuntimeInfo)(nil)).Elem()
+}
+
+type VirtualMachineRuntimeInfoDasProtectionState struct {
+	DynamicData
+
+	DasProtected bool `xml:"dasProtected"`
+}
+
+func init() {
+	t["VirtualMachineRuntimeInfoDasProtectionState"] = reflect.TypeOf((*VirtualMachineRuntimeInfoDasProtectionState)(nil)).Elem()
+}
+
+type VirtualMachineScsiDiskDeviceInfo struct {
+	VirtualMachineDiskDeviceInfo
+
+	Disk          *HostScsiDisk `xml:"disk,omitempty"`
+	TransportHint string        `xml:"transportHint,omitempty"`
+	LunNumber     int32         `xml:"lunNumber,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineScsiDiskDeviceInfo"] = reflect.TypeOf((*VirtualMachineScsiDiskDeviceInfo)(nil)).Elem()
+}
+
+type VirtualMachineScsiPassthroughInfo struct {
+	VirtualMachineTargetInfo
+
+	ScsiClass          string `xml:"scsiClass"`
+	Vendor             string `xml:"vendor"`
+	PhysicalUnitNumber int32  `xml:"physicalUnitNumber"`
+}
+
+func init() {
+	t["VirtualMachineScsiPassthroughInfo"] = reflect.TypeOf((*VirtualMachineScsiPassthroughInfo)(nil)).Elem()
+}
+
+type VirtualMachineSerialInfo struct {
+	VirtualMachineTargetInfo
+}
+
+func init() {
+	t["VirtualMachineSerialInfo"] = reflect.TypeOf((*VirtualMachineSerialInfo)(nil)).Elem()
+}
+
+type VirtualMachineSnapshotInfo struct {
+	DynamicData
+
+	CurrentSnapshot  *ManagedObjectReference      `xml:"currentSnapshot,omitempty"`
+	RootSnapshotList []VirtualMachineSnapshotTree `xml:"rootSnapshotList"`
+}
+
+func init() {
+	t["VirtualMachineSnapshotInfo"] = reflect.TypeOf((*VirtualMachineSnapshotInfo)(nil)).Elem()
+}
+
+type VirtualMachineSnapshotTree struct {
+	DynamicData
+
+	Snapshot          ManagedObjectReference       `xml:"snapshot"`
+	Vm                ManagedObjectReference       `xml:"vm"`
+	Name              string                       `xml:"name"`
+	Description       string                       `xml:"description"`
+	Id                int32                        `xml:"id,omitempty"`
+	CreateTime        time.Time                    `xml:"createTime"`
+	State             VirtualMachinePowerState     `xml:"state"`
+	Quiesced          bool                         `xml:"quiesced"`
+	BackupManifest    string                       `xml:"backupManifest,omitempty"`
+	ChildSnapshotList []VirtualMachineSnapshotTree `xml:"childSnapshotList,omitempty"`
+	ReplaySupported   *bool                        `xml:"replaySupported"`
+}
+
+func init() {
+	t["VirtualMachineSnapshotTree"] = reflect.TypeOf((*VirtualMachineSnapshotTree)(nil)).Elem()
+}
+
+type VirtualMachineSoundInfo struct {
+	VirtualMachineTargetInfo
+}
+
+func init() {
+	t["VirtualMachineSoundInfo"] = reflect.TypeOf((*VirtualMachineSoundInfo)(nil)).Elem()
+}
+
+type VirtualMachineSriovDevicePoolInfo struct {
+	DynamicData
+
+	Key string `xml:"key"`
+}
+
+func init() {
+	t["VirtualMachineSriovDevicePoolInfo"] = reflect.TypeOf((*VirtualMachineSriovDevicePoolInfo)(nil)).Elem()
+}
+
+type VirtualMachineSriovInfo struct {
+	VirtualMachinePciPassthroughInfo
+
+	VirtualFunction bool                                  `xml:"virtualFunction"`
+	Pnic            string                                `xml:"pnic,omitempty"`
+	DevicePool      BaseVirtualMachineSriovDevicePoolInfo `xml:"devicePool,omitempty,typeattr"`
+}
+
+func init() {
+	t["VirtualMachineSriovInfo"] = reflect.TypeOf((*VirtualMachineSriovInfo)(nil)).Elem()
+}
+
+type VirtualMachineSriovNetworkDevicePoolInfo struct {
+	VirtualMachineSriovDevicePoolInfo
+
+	SwitchKey  string `xml:"switchKey,omitempty"`
+	SwitchUuid string `xml:"switchUuid,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineSriovNetworkDevicePoolInfo"] = reflect.TypeOf((*VirtualMachineSriovNetworkDevicePoolInfo)(nil)).Elem()
+}
+
+type VirtualMachineStorageInfo struct {
+	DynamicData
+
+	PerDatastoreUsage []VirtualMachineUsageOnDatastore `xml:"perDatastoreUsage,omitempty"`
+	Timestamp         time.Time                        `xml:"timestamp"`
+}
+
+func init() {
+	t["VirtualMachineStorageInfo"] = reflect.TypeOf((*VirtualMachineStorageInfo)(nil)).Elem()
+}
+
+type VirtualMachineStorageSummary struct {
+	DynamicData
+
+	Committed   int64     `xml:"committed"`
+	Uncommitted int64     `xml:"uncommitted"`
+	Unshared    int64     `xml:"unshared"`
+	Timestamp   time.Time `xml:"timestamp"`
+}
+
+func init() {
+	t["VirtualMachineStorageSummary"] = reflect.TypeOf((*VirtualMachineStorageSummary)(nil)).Elem()
+}
+
+type VirtualMachineSummary struct {
+	DynamicData
+
+	Vm            *ManagedObjectReference       `xml:"vm,omitempty"`
+	Runtime       VirtualMachineRuntimeInfo     `xml:"runtime"`
+	Guest         *VirtualMachineGuestSummary   `xml:"guest,omitempty"`
+	Config        VirtualMachineConfigSummary   `xml:"config"`
+	Storage       *VirtualMachineStorageSummary `xml:"storage,omitempty"`
+	QuickStats    VirtualMachineQuickStats      `xml:"quickStats"`
+	OverallStatus ManagedEntityStatus           `xml:"overallStatus"`
+	CustomValue   []BaseCustomFieldValue        `xml:"customValue,omitempty,typeattr"`
+}
+
+func init() {
+	t["VirtualMachineSummary"] = reflect.TypeOf((*VirtualMachineSummary)(nil)).Elem()
+}
+
+type VirtualMachineTargetInfo struct {
+	DynamicData
+
+	Name             string   `xml:"name"`
+	ConfigurationTag []string `xml:"configurationTag,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineTargetInfo"] = reflect.TypeOf((*VirtualMachineTargetInfo)(nil)).Elem()
+}
+
+type VirtualMachineTicket struct {
+	DynamicData
+
+	Ticket        string `xml:"ticket"`
+	CfgFile       string `xml:"cfgFile"`
+	Host          string `xml:"host,omitempty"`
+	Port          int32  `xml:"port,omitempty"`
+	SslThumbprint string `xml:"sslThumbprint,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineTicket"] = reflect.TypeOf((*VirtualMachineTicket)(nil)).Elem()
+}
+
+type VirtualMachineUsageOnDatastore struct {
+	DynamicData
+
+	Datastore   ManagedObjectReference `xml:"datastore"`
+	Committed   int64                  `xml:"committed"`
+	Uncommitted int64                  `xml:"uncommitted"`
+	Unshared    int64                  `xml:"unshared"`
+}
+
+func init() {
+	t["VirtualMachineUsageOnDatastore"] = reflect.TypeOf((*VirtualMachineUsageOnDatastore)(nil)).Elem()
+}
+
+type VirtualMachineUsbInfo struct {
+	VirtualMachineTargetInfo
+
+	Description  string                 `xml:"description"`
+	Vendor       int32                  `xml:"vendor"`
+	Product      int32                  `xml:"product"`
+	PhysicalPath string                 `xml:"physicalPath"`
+	Family       []string               `xml:"family,omitempty"`
+	Speed        []string               `xml:"speed,omitempty"`
+	Summary      *VirtualMachineSummary `xml:"summary,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineUsbInfo"] = reflect.TypeOf((*VirtualMachineUsbInfo)(nil)).Elem()
+}
+
+type VirtualMachineVFlashModuleInfo struct {
+	VirtualMachineTargetInfo
+
+	VFlashModule HostVFlashManagerVFlashCacheConfigInfoVFlashModuleConfigOption `xml:"vFlashModule"`
+}
+
+func init() {
+	t["VirtualMachineVFlashModuleInfo"] = reflect.TypeOf((*VirtualMachineVFlashModuleInfo)(nil)).Elem()
+}
+
+type VirtualMachineVMCIDevice struct {
+	VirtualDevice
+
+	Id                             int64                               `xml:"id,omitempty"`
+	AllowUnrestrictedCommunication *bool                               `xml:"allowUnrestrictedCommunication"`
+	FilterEnable                   *bool                               `xml:"filterEnable"`
+	FilterInfo                     *VirtualMachineVMCIDeviceFilterInfo `xml:"filterInfo,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineVMCIDevice"] = reflect.TypeOf((*VirtualMachineVMCIDevice)(nil)).Elem()
+}
+
+type VirtualMachineVMCIDeviceFilterInfo struct {
+	DynamicData
+
+	Filters []VirtualMachineVMCIDeviceFilterSpec `xml:"filters,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineVMCIDeviceFilterInfo"] = reflect.TypeOf((*VirtualMachineVMCIDeviceFilterInfo)(nil)).Elem()
+}
+
+type VirtualMachineVMCIDeviceFilterSpec struct {
+	DynamicData
+
+	Rank                 int64  `xml:"rank"`
+	Action               string `xml:"action"`
+	Protocol             string `xml:"protocol"`
+	Direction            string `xml:"direction"`
+	LowerDstPortBoundary int64  `xml:"lowerDstPortBoundary,omitempty"`
+	UpperDstPortBoundary int64  `xml:"upperDstPortBoundary,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineVMCIDeviceFilterSpec"] = reflect.TypeOf((*VirtualMachineVMCIDeviceFilterSpec)(nil)).Elem()
+}
+
+type VirtualMachineVMCIDeviceOption struct {
+	VirtualDeviceOption
+
+	AllowUnrestrictedCommunication BoolOption                                      `xml:"allowUnrestrictedCommunication"`
+	FilterSpecOption               *VirtualMachineVMCIDeviceOptionFilterSpecOption `xml:"filterSpecOption,omitempty"`
+	FilterSupported                *BoolOption                                     `xml:"filterSupported,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineVMCIDeviceOption"] = reflect.TypeOf((*VirtualMachineVMCIDeviceOption)(nil)).Elem()
+}
+
+type VirtualMachineVMCIDeviceOptionFilterSpecOption struct {
+	DynamicData
+
+	Action               ChoiceOption `xml:"action"`
+	Protocol             ChoiceOption `xml:"protocol"`
+	Direction            ChoiceOption `xml:"direction"`
+	LowerDstPortBoundary LongOption   `xml:"lowerDstPortBoundary"`
+	UpperDstPortBoundary LongOption   `xml:"upperDstPortBoundary"`
+}
+
+func init() {
+	t["VirtualMachineVMCIDeviceOptionFilterSpecOption"] = reflect.TypeOf((*VirtualMachineVMCIDeviceOptionFilterSpecOption)(nil)).Elem()
+}
+
+type VirtualMachineVMIROM struct {
+	VirtualDevice
+}
+
+func init() {
+	t["VirtualMachineVMIROM"] = reflect.TypeOf((*VirtualMachineVMIROM)(nil)).Elem()
+}
+
+type VirtualMachineVideoCard struct {
+	VirtualDevice
+
+	VideoRamSizeInKB       int64  `xml:"videoRamSizeInKB,omitempty"`
+	NumDisplays            int32  `xml:"numDisplays,omitempty"`
+	UseAutoDetect          *bool  `xml:"useAutoDetect"`
+	Enable3DSupport        *bool  `xml:"enable3DSupport"`
+	Use3dRenderer          string `xml:"use3dRenderer,omitempty"`
+	GraphicsMemorySizeInKB int64  `xml:"graphicsMemorySizeInKB,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineVideoCard"] = reflect.TypeOf((*VirtualMachineVideoCard)(nil)).Elem()
+}
+
+type VirtualMachineWindowsQuiesceSpec struct {
+	VirtualMachineGuestQuiesceSpec
+
+	VssBackupType          int32  `xml:"vssBackupType,omitempty"`
+	VssBootableSystemState *bool  `xml:"vssBootableSystemState"`
+	VssPartialFileSupport  *bool  `xml:"vssPartialFileSupport"`
+	VssBackupContext       string `xml:"vssBackupContext,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineWindowsQuiesceSpec"] = reflect.TypeOf((*VirtualMachineWindowsQuiesceSpec)(nil)).Elem()
+}
+
+type VirtualMachineWipeResult struct {
+	DynamicData
+
+	DiskId              int32 `xml:"diskId"`
+	ShrinkableDiskSpace int64 `xml:"shrinkableDiskSpace"`
+}
+
+func init() {
+	t["VirtualMachineWipeResult"] = reflect.TypeOf((*VirtualMachineWipeResult)(nil)).Elem()
+}
+
+type VirtualNVMEController struct {
+	VirtualController
+}
+
+func init() {
+	t["VirtualNVMEController"] = reflect.TypeOf((*VirtualNVMEController)(nil)).Elem()
+}
+
+type VirtualNVMEControllerOption struct {
+	VirtualControllerOption
+
+	NumNVMEDisks IntOption `xml:"numNVMEDisks"`
+}
+
+func init() {
+	t["VirtualNVMEControllerOption"] = reflect.TypeOf((*VirtualNVMEControllerOption)(nil)).Elem()
+}
+
+type VirtualNicManagerNetConfig struct {
+	DynamicData
+
+	NicType            string           `xml:"nicType"`
+	MultiSelectAllowed bool             `xml:"multiSelectAllowed"`
+	CandidateVnic      []HostVirtualNic `xml:"candidateVnic,omitempty"`
+	SelectedVnic       []string         `xml:"selectedVnic,omitempty"`
+}
+
+func init() {
+	t["VirtualNicManagerNetConfig"] = reflect.TypeOf((*VirtualNicManagerNetConfig)(nil)).Elem()
+}
+
+type VirtualPCIController struct {
+	VirtualController
+}
+
+func init() {
+	t["VirtualPCIController"] = reflect.TypeOf((*VirtualPCIController)(nil)).Elem()
+}
+
+type VirtualPCIControllerOption struct {
+	VirtualControllerOption
+
+	NumSCSIControllers            IntOption  `xml:"numSCSIControllers"`
+	NumEthernetCards              IntOption  `xml:"numEthernetCards"`
+	NumVideoCards                 IntOption  `xml:"numVideoCards"`
+	NumSoundCards                 IntOption  `xml:"numSoundCards"`
+	NumVmiRoms                    IntOption  `xml:"numVmiRoms"`
+	NumVmciDevices                *IntOption `xml:"numVmciDevices,omitempty"`
+	NumPCIPassthroughDevices      *IntOption `xml:"numPCIPassthroughDevices,omitempty"`
+	NumSasSCSIControllers         *IntOption `xml:"numSasSCSIControllers,omitempty"`
+	NumVmxnet3EthernetCards       *IntOption `xml:"numVmxnet3EthernetCards,omitempty"`
+	NumParaVirtualSCSIControllers *IntOption `xml:"numParaVirtualSCSIControllers,omitempty"`
+	NumSATAControllers            *IntOption `xml:"numSATAControllers,omitempty"`
+	NumNVMEControllers            *IntOption `xml:"numNVMEControllers,omitempty"`
+}
+
+func init() {
+	t["VirtualPCIControllerOption"] = reflect.TypeOf((*VirtualPCIControllerOption)(nil)).Elem()
+}
+
+type VirtualPCIPassthrough struct {
+	VirtualDevice
+}
+
+func init() {
+	t["VirtualPCIPassthrough"] = reflect.TypeOf((*VirtualPCIPassthrough)(nil)).Elem()
+}
+
+type VirtualPCIPassthroughDeviceBackingInfo struct {
+	VirtualDeviceDeviceBackingInfo
+
+	Id       string `xml:"id"`
+	DeviceId string `xml:"deviceId"`
+	SystemId string `xml:"systemId"`
+	VendorId int16  `xml:"vendorId"`
+}
+
+func init() {
+	t["VirtualPCIPassthroughDeviceBackingInfo"] = reflect.TypeOf((*VirtualPCIPassthroughDeviceBackingInfo)(nil)).Elem()
+}
+
+type VirtualPCIPassthroughDeviceBackingOption struct {
+	VirtualDeviceDeviceBackingOption
+}
+
+func init() {
+	t["VirtualPCIPassthroughDeviceBackingOption"] = reflect.TypeOf((*VirtualPCIPassthroughDeviceBackingOption)(nil)).Elem()
+}
+
+type VirtualPCIPassthroughOption struct {
+	VirtualDeviceOption
+}
+
+func init() {
+	t["VirtualPCIPassthroughOption"] = reflect.TypeOf((*VirtualPCIPassthroughOption)(nil)).Elem()
+}
+
+type VirtualPCIPassthroughPluginBackingInfo struct {
+	VirtualDeviceBackingInfo
+}
+
+func init() {
+	t["VirtualPCIPassthroughPluginBackingInfo"] = reflect.TypeOf((*VirtualPCIPassthroughPluginBackingInfo)(nil)).Elem()
+}
+
+type VirtualPCIPassthroughPluginBackingOption struct {
+	VirtualDeviceBackingOption
+}
+
+func init() {
+	t["VirtualPCIPassthroughPluginBackingOption"] = reflect.TypeOf((*VirtualPCIPassthroughPluginBackingOption)(nil)).Elem()
+}
+
+type VirtualPCIPassthroughVmiopBackingInfo struct {
+	VirtualPCIPassthroughPluginBackingInfo
+
+	Vgpu string `xml:"vgpu,omitempty"`
+}
+
+func init() {
+	t["VirtualPCIPassthroughVmiopBackingInfo"] = reflect.TypeOf((*VirtualPCIPassthroughVmiopBackingInfo)(nil)).Elem()
+}
+
+type VirtualPCIPassthroughVmiopBackingOption struct {
+	VirtualPCIPassthroughPluginBackingOption
+
+	Vgpu         StringOption `xml:"vgpu"`
+	MaxInstances int32        `xml:"maxInstances"`
+}
+
+func init() {
+	t["VirtualPCIPassthroughVmiopBackingOption"] = reflect.TypeOf((*VirtualPCIPassthroughVmiopBackingOption)(nil)).Elem()
+}
+
+type VirtualPCNet32 struct {
+	VirtualEthernetCard
+}
+
+func init() {
+	t["VirtualPCNet32"] = reflect.TypeOf((*VirtualPCNet32)(nil)).Elem()
+}
+
+type VirtualPCNet32Option struct {
+	VirtualEthernetCardOption
+
+	SupportsMorphing bool `xml:"supportsMorphing"`
+}
+
+func init() {
+	t["VirtualPCNet32Option"] = reflect.TypeOf((*VirtualPCNet32Option)(nil)).Elem()
+}
+
+type VirtualPS2Controller struct {
+	VirtualController
+}
+
+func init() {
+	t["VirtualPS2Controller"] = reflect.TypeOf((*VirtualPS2Controller)(nil)).Elem()
+}
+
+type VirtualPS2ControllerOption struct {
+	VirtualControllerOption
+
+	NumKeyboards       IntOption `xml:"numKeyboards"`
+	NumPointingDevices IntOption `xml:"numPointingDevices"`
+}
+
+func init() {
+	t["VirtualPS2ControllerOption"] = reflect.TypeOf((*VirtualPS2ControllerOption)(nil)).Elem()
+}
+
+type VirtualParallelPort struct {
+	VirtualDevice
+}
+
+func init() {
+	t["VirtualParallelPort"] = reflect.TypeOf((*VirtualParallelPort)(nil)).Elem()
+}
+
+type VirtualParallelPortDeviceBackingInfo struct {
+	VirtualDeviceDeviceBackingInfo
+}
+
+func init() {
+	t["VirtualParallelPortDeviceBackingInfo"] = reflect.TypeOf((*VirtualParallelPortDeviceBackingInfo)(nil)).Elem()
+}
+
+type VirtualParallelPortDeviceBackingOption struct {
+	VirtualDeviceDeviceBackingOption
+}
+
+func init() {
+	t["VirtualParallelPortDeviceBackingOption"] = reflect.TypeOf((*VirtualParallelPortDeviceBackingOption)(nil)).Elem()
+}
+
+type VirtualParallelPortFileBackingInfo struct {
+	VirtualDeviceFileBackingInfo
+}
+
+func init() {
+	t["VirtualParallelPortFileBackingInfo"] = reflect.TypeOf((*VirtualParallelPortFileBackingInfo)(nil)).Elem()
+}
+
+type VirtualParallelPortFileBackingOption struct {
+	VirtualDeviceFileBackingOption
+}
+
+func init() {
+	t["VirtualParallelPortFileBackingOption"] = reflect.TypeOf((*VirtualParallelPortFileBackingOption)(nil)).Elem()
+}
+
+type VirtualParallelPortOption struct {
+	VirtualDeviceOption
+}
+
+func init() {
+	t["VirtualParallelPortOption"] = reflect.TypeOf((*VirtualParallelPortOption)(nil)).Elem()
+}
+
+type VirtualPointingDevice struct {
+	VirtualDevice
+}
+
+func init() {
+	t["VirtualPointingDevice"] = reflect.TypeOf((*VirtualPointingDevice)(nil)).Elem()
+}
+
+type VirtualPointingDeviceBackingOption struct {
+	VirtualDeviceDeviceBackingOption
+
+	HostPointingDevice ChoiceOption `xml:"hostPointingDevice"`
+}
+
+func init() {
+	t["VirtualPointingDeviceBackingOption"] = reflect.TypeOf((*VirtualPointingDeviceBackingOption)(nil)).Elem()
+}
+
+type VirtualPointingDeviceDeviceBackingInfo struct {
+	VirtualDeviceDeviceBackingInfo
+
+	HostPointingDevice string `xml:"hostPointingDevice"`
+}
+
+func init() {
+	t["VirtualPointingDeviceDeviceBackingInfo"] = reflect.TypeOf((*VirtualPointingDeviceDeviceBackingInfo)(nil)).Elem()
+}
+
+type VirtualPointingDeviceOption struct {
+	VirtualDeviceOption
+}
+
+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
+}
+
+func init() {
+	t["VirtualSATAController"] = reflect.TypeOf((*VirtualSATAController)(nil)).Elem()
+}
+
+type VirtualSATAControllerOption struct {
+	VirtualControllerOption
+
+	NumSATADisks  IntOption `xml:"numSATADisks"`
+	NumSATACdroms IntOption `xml:"numSATACdroms"`
+}
+
+func init() {
+	t["VirtualSATAControllerOption"] = reflect.TypeOf((*VirtualSATAControllerOption)(nil)).Elem()
+}
+
+type VirtualSCSIController struct {
+	VirtualController
+
+	HotAddRemove       *bool              `xml:"hotAddRemove"`
+	SharedBus          VirtualSCSISharing `xml:"sharedBus"`
+	ScsiCtlrUnitNumber int32              `xml:"scsiCtlrUnitNumber,omitempty"`
+}
+
+func init() {
+	t["VirtualSCSIController"] = reflect.TypeOf((*VirtualSCSIController)(nil)).Elem()
+}
+
+type VirtualSCSIControllerOption struct {
+	VirtualControllerOption
+
+	NumSCSIDisks       IntOption            `xml:"numSCSIDisks"`
+	NumSCSICdroms      IntOption            `xml:"numSCSICdroms"`
+	NumSCSIPassthrough IntOption            `xml:"numSCSIPassthrough"`
+	Sharing            []VirtualSCSISharing `xml:"sharing"`
+	DefaultSharedIndex int32                `xml:"defaultSharedIndex"`
+	HotAddRemove       BoolOption           `xml:"hotAddRemove"`
+	ScsiCtlrUnitNumber int32                `xml:"scsiCtlrUnitNumber"`
+}
+
+func init() {
+	t["VirtualSCSIControllerOption"] = reflect.TypeOf((*VirtualSCSIControllerOption)(nil)).Elem()
+}
+
+type VirtualSCSIPassthrough struct {
+	VirtualDevice
+}
+
+func init() {
+	t["VirtualSCSIPassthrough"] = reflect.TypeOf((*VirtualSCSIPassthrough)(nil)).Elem()
+}
+
+type VirtualSCSIPassthroughDeviceBackingInfo struct {
+	VirtualDeviceDeviceBackingInfo
+}
+
+func init() {
+	t["VirtualSCSIPassthroughDeviceBackingInfo"] = reflect.TypeOf((*VirtualSCSIPassthroughDeviceBackingInfo)(nil)).Elem()
+}
+
+type VirtualSCSIPassthroughDeviceBackingOption struct {
+	VirtualDeviceDeviceBackingOption
+}
+
+func init() {
+	t["VirtualSCSIPassthroughDeviceBackingOption"] = reflect.TypeOf((*VirtualSCSIPassthroughDeviceBackingOption)(nil)).Elem()
+}
+
+type VirtualSCSIPassthroughOption struct {
+	VirtualDeviceOption
+}
+
+func init() {
+	t["VirtualSCSIPassthroughOption"] = reflect.TypeOf((*VirtualSCSIPassthroughOption)(nil)).Elem()
+}
+
+type VirtualSIOController struct {
+	VirtualController
+}
+
+func init() {
+	t["VirtualSIOController"] = reflect.TypeOf((*VirtualSIOController)(nil)).Elem()
+}
+
+type VirtualSIOControllerOption struct {
+	VirtualControllerOption
+
+	NumFloppyDrives  IntOption `xml:"numFloppyDrives"`
+	NumSerialPorts   IntOption `xml:"numSerialPorts"`
+	NumParallelPorts IntOption `xml:"numParallelPorts"`
+}
+
+func init() {
+	t["VirtualSIOControllerOption"] = reflect.TypeOf((*VirtualSIOControllerOption)(nil)).Elem()
+}
+
+type VirtualSerialPort struct {
+	VirtualDevice
+
+	YieldOnPoll bool `xml:"yieldOnPoll"`
+}
+
+func init() {
+	t["VirtualSerialPort"] = reflect.TypeOf((*VirtualSerialPort)(nil)).Elem()
+}
+
+type VirtualSerialPortDeviceBackingInfo struct {
+	VirtualDeviceDeviceBackingInfo
+}
+
+func init() {
+	t["VirtualSerialPortDeviceBackingInfo"] = reflect.TypeOf((*VirtualSerialPortDeviceBackingInfo)(nil)).Elem()
+}
+
+type VirtualSerialPortDeviceBackingOption struct {
+	VirtualDeviceDeviceBackingOption
+}
+
+func init() {
+	t["VirtualSerialPortDeviceBackingOption"] = reflect.TypeOf((*VirtualSerialPortDeviceBackingOption)(nil)).Elem()
+}
+
+type VirtualSerialPortFileBackingInfo struct {
+	VirtualDeviceFileBackingInfo
+}
+
+func init() {
+	t["VirtualSerialPortFileBackingInfo"] = reflect.TypeOf((*VirtualSerialPortFileBackingInfo)(nil)).Elem()
+}
+
+type VirtualSerialPortFileBackingOption struct {
+	VirtualDeviceFileBackingOption
+}
+
+func init() {
+	t["VirtualSerialPortFileBackingOption"] = reflect.TypeOf((*VirtualSerialPortFileBackingOption)(nil)).Elem()
+}
+
+type VirtualSerialPortOption struct {
+	VirtualDeviceOption
+
+	YieldOnPoll BoolOption `xml:"yieldOnPoll"`
+}
+
+func init() {
+	t["VirtualSerialPortOption"] = reflect.TypeOf((*VirtualSerialPortOption)(nil)).Elem()
+}
+
+type VirtualSerialPortPipeBackingInfo struct {
+	VirtualDevicePipeBackingInfo
+
+	Endpoint string `xml:"endpoint"`
+	NoRxLoss *bool  `xml:"noRxLoss"`
+}
+
+func init() {
+	t["VirtualSerialPortPipeBackingInfo"] = reflect.TypeOf((*VirtualSerialPortPipeBackingInfo)(nil)).Elem()
+}
+
+type VirtualSerialPortPipeBackingOption struct {
+	VirtualDevicePipeBackingOption
+
+	Endpoint ChoiceOption `xml:"endpoint"`
+	NoRxLoss BoolOption   `xml:"noRxLoss"`
+}
+
+func init() {
+	t["VirtualSerialPortPipeBackingOption"] = reflect.TypeOf((*VirtualSerialPortPipeBackingOption)(nil)).Elem()
+}
+
+type VirtualSerialPortThinPrintBackingInfo struct {
+	VirtualDeviceBackingInfo
+}
+
+func init() {
+	t["VirtualSerialPortThinPrintBackingInfo"] = reflect.TypeOf((*VirtualSerialPortThinPrintBackingInfo)(nil)).Elem()
+}
+
+type VirtualSerialPortThinPrintBackingOption struct {
+	VirtualDeviceBackingOption
+}
+
+func init() {
+	t["VirtualSerialPortThinPrintBackingOption"] = reflect.TypeOf((*VirtualSerialPortThinPrintBackingOption)(nil)).Elem()
+}
+
+type VirtualSerialPortURIBackingInfo struct {
+	VirtualDeviceURIBackingInfo
+}
+
+func init() {
+	t["VirtualSerialPortURIBackingInfo"] = reflect.TypeOf((*VirtualSerialPortURIBackingInfo)(nil)).Elem()
+}
+
+type VirtualSerialPortURIBackingOption struct {
+	VirtualDeviceURIBackingOption
+}
+
+func init() {
+	t["VirtualSerialPortURIBackingOption"] = reflect.TypeOf((*VirtualSerialPortURIBackingOption)(nil)).Elem()
+}
+
+type VirtualSoundBlaster16 struct {
+	VirtualSoundCard
+}
+
+func init() {
+	t["VirtualSoundBlaster16"] = reflect.TypeOf((*VirtualSoundBlaster16)(nil)).Elem()
+}
+
+type VirtualSoundBlaster16Option struct {
+	VirtualSoundCardOption
+}
+
+func init() {
+	t["VirtualSoundBlaster16Option"] = reflect.TypeOf((*VirtualSoundBlaster16Option)(nil)).Elem()
+}
+
+type VirtualSoundCard struct {
+	VirtualDevice
+}
+
+func init() {
+	t["VirtualSoundCard"] = reflect.TypeOf((*VirtualSoundCard)(nil)).Elem()
+}
+
+type VirtualSoundCardDeviceBackingInfo struct {
+	VirtualDeviceDeviceBackingInfo
+}
+
+func init() {
+	t["VirtualSoundCardDeviceBackingInfo"] = reflect.TypeOf((*VirtualSoundCardDeviceBackingInfo)(nil)).Elem()
+}
+
+type VirtualSoundCardDeviceBackingOption struct {
+	VirtualDeviceDeviceBackingOption
+}
+
+func init() {
+	t["VirtualSoundCardDeviceBackingOption"] = reflect.TypeOf((*VirtualSoundCardDeviceBackingOption)(nil)).Elem()
+}
+
+type VirtualSoundCardOption struct {
+	VirtualDeviceOption
+}
+
+func init() {
+	t["VirtualSoundCardOption"] = reflect.TypeOf((*VirtualSoundCardOption)(nil)).Elem()
+}
+
+type VirtualSriovEthernetCard struct {
+	VirtualEthernetCard
+
+	AllowGuestOSMtuChange *bool                                     `xml:"allowGuestOSMtuChange"`
+	SriovBacking          *VirtualSriovEthernetCardSriovBackingInfo `xml:"sriovBacking,omitempty"`
+}
+
+func init() {
+	t["VirtualSriovEthernetCard"] = reflect.TypeOf((*VirtualSriovEthernetCard)(nil)).Elem()
+}
+
+type VirtualSriovEthernetCardOption struct {
+	VirtualEthernetCardOption
+}
+
+func init() {
+	t["VirtualSriovEthernetCardOption"] = reflect.TypeOf((*VirtualSriovEthernetCardOption)(nil)).Elem()
+}
+
+type VirtualSriovEthernetCardSriovBackingInfo struct {
+	VirtualDeviceBackingInfo
+
+	PhysicalFunctionBacking *VirtualPCIPassthroughDeviceBackingInfo `xml:"physicalFunctionBacking,omitempty"`
+	VirtualFunctionBacking  *VirtualPCIPassthroughDeviceBackingInfo `xml:"virtualFunctionBacking,omitempty"`
+	VirtualFunctionIndex    int32                                   `xml:"virtualFunctionIndex,omitempty"`
+}
+
+func init() {
+	t["VirtualSriovEthernetCardSriovBackingInfo"] = reflect.TypeOf((*VirtualSriovEthernetCardSriovBackingInfo)(nil)).Elem()
+}
+
+type VirtualSriovEthernetCardSriovBackingOption struct {
+	VirtualDeviceBackingOption
+}
+
+func init() {
+	t["VirtualSriovEthernetCardSriovBackingOption"] = reflect.TypeOf((*VirtualSriovEthernetCardSriovBackingOption)(nil)).Elem()
+}
+
+type VirtualSwitchProfile struct {
+	ApplyProfile
+
+	Key           string               `xml:"key"`
+	Name          string               `xml:"name"`
+	Link          LinkProfile          `xml:"link"`
+	NumPorts      NumPortsProfile      `xml:"numPorts"`
+	NetworkPolicy NetworkPolicyProfile `xml:"networkPolicy"`
+}
+
+func init() {
+	t["VirtualSwitchProfile"] = reflect.TypeOf((*VirtualSwitchProfile)(nil)).Elem()
+}
+
+type VirtualSwitchSelectionProfile struct {
+	ApplyProfile
+}
+
+func init() {
+	t["VirtualSwitchSelectionProfile"] = reflect.TypeOf((*VirtualSwitchSelectionProfile)(nil)).Elem()
+}
+
+type VirtualUSB struct {
+	VirtualDevice
+
+	Connected bool     `xml:"connected"`
+	Vendor    int32    `xml:"vendor,omitempty"`
+	Product   int32    `xml:"product,omitempty"`
+	Family    []string `xml:"family,omitempty"`
+	Speed     []string `xml:"speed,omitempty"`
+}
+
+func init() {
+	t["VirtualUSB"] = reflect.TypeOf((*VirtualUSB)(nil)).Elem()
+}
+
+type VirtualUSBController struct {
+	VirtualController
+
+	AutoConnectDevices *bool `xml:"autoConnectDevices"`
+	EhciEnabled        *bool `xml:"ehciEnabled"`
+}
+
+func init() {
+	t["VirtualUSBController"] = reflect.TypeOf((*VirtualUSBController)(nil)).Elem()
+}
+
+type VirtualUSBControllerOption struct {
+	VirtualControllerOption
+
+	AutoConnectDevices BoolOption `xml:"autoConnectDevices"`
+	EhciSupported      BoolOption `xml:"ehciSupported"`
+	SupportedSpeeds    []string   `xml:"supportedSpeeds,omitempty"`
+}
+
+func init() {
+	t["VirtualUSBControllerOption"] = reflect.TypeOf((*VirtualUSBControllerOption)(nil)).Elem()
+}
+
+type VirtualUSBControllerPciBusSlotInfo struct {
+	VirtualDevicePciBusSlotInfo
+
+	EhciPciSlotNumber int32 `xml:"ehciPciSlotNumber,omitempty"`
+}
+
+func init() {
+	t["VirtualUSBControllerPciBusSlotInfo"] = reflect.TypeOf((*VirtualUSBControllerPciBusSlotInfo)(nil)).Elem()
+}
+
+type VirtualUSBOption struct {
+	VirtualDeviceOption
+}
+
+func init() {
+	t["VirtualUSBOption"] = reflect.TypeOf((*VirtualUSBOption)(nil)).Elem()
+}
+
+type VirtualUSBRemoteClientBackingInfo struct {
+	VirtualDeviceRemoteDeviceBackingInfo
+
+	Hostname string `xml:"hostname"`
+}
+
+func init() {
+	t["VirtualUSBRemoteClientBackingInfo"] = reflect.TypeOf((*VirtualUSBRemoteClientBackingInfo)(nil)).Elem()
+}
+
+type VirtualUSBRemoteClientBackingOption struct {
+	VirtualDeviceRemoteDeviceBackingOption
+}
+
+func init() {
+	t["VirtualUSBRemoteClientBackingOption"] = reflect.TypeOf((*VirtualUSBRemoteClientBackingOption)(nil)).Elem()
+}
+
+type VirtualUSBRemoteHostBackingInfo struct {
+	VirtualDeviceDeviceBackingInfo
+
+	Hostname string `xml:"hostname"`
+}
+
+func init() {
+	t["VirtualUSBRemoteHostBackingInfo"] = reflect.TypeOf((*VirtualUSBRemoteHostBackingInfo)(nil)).Elem()
+}
+
+type VirtualUSBRemoteHostBackingOption struct {
+	VirtualDeviceDeviceBackingOption
+}
+
+func init() {
+	t["VirtualUSBRemoteHostBackingOption"] = reflect.TypeOf((*VirtualUSBRemoteHostBackingOption)(nil)).Elem()
+}
+
+type VirtualUSBUSBBackingInfo struct {
+	VirtualDeviceDeviceBackingInfo
+}
+
+func init() {
+	t["VirtualUSBUSBBackingInfo"] = reflect.TypeOf((*VirtualUSBUSBBackingInfo)(nil)).Elem()
+}
+
+type VirtualUSBUSBBackingOption struct {
+	VirtualDeviceDeviceBackingOption
+}
+
+func init() {
+	t["VirtualUSBUSBBackingOption"] = reflect.TypeOf((*VirtualUSBUSBBackingOption)(nil)).Elem()
+}
+
+type VirtualUSBXHCIController struct {
+	VirtualController
+
+	AutoConnectDevices *bool `xml:"autoConnectDevices"`
+}
+
+func init() {
+	t["VirtualUSBXHCIController"] = reflect.TypeOf((*VirtualUSBXHCIController)(nil)).Elem()
+}
+
+type VirtualUSBXHCIControllerOption struct {
+	VirtualControllerOption
+
+	AutoConnectDevices BoolOption `xml:"autoConnectDevices"`
+	SupportedSpeeds    []string   `xml:"supportedSpeeds"`
+}
+
+func init() {
+	t["VirtualUSBXHCIControllerOption"] = reflect.TypeOf((*VirtualUSBXHCIControllerOption)(nil)).Elem()
+}
+
+type VirtualVMIROMOption struct {
+	VirtualDeviceOption
+}
+
+func init() {
+	t["VirtualVMIROMOption"] = reflect.TypeOf((*VirtualVMIROMOption)(nil)).Elem()
+}
+
+type VirtualVideoCardOption struct {
+	VirtualDeviceOption
+
+	VideoRamSizeInKB            *LongOption `xml:"videoRamSizeInKB,omitempty"`
+	NumDisplays                 *IntOption  `xml:"numDisplays,omitempty"`
+	UseAutoDetect               *BoolOption `xml:"useAutoDetect,omitempty"`
+	Support3D                   *BoolOption `xml:"support3D,omitempty"`
+	Use3dRendererSupported      *BoolOption `xml:"use3dRendererSupported,omitempty"`
+	GraphicsMemorySizeInKB      *LongOption `xml:"graphicsMemorySizeInKB,omitempty"`
+	GraphicsMemorySizeSupported *BoolOption `xml:"graphicsMemorySizeSupported,omitempty"`
+}
+
+func init() {
+	t["VirtualVideoCardOption"] = reflect.TypeOf((*VirtualVideoCardOption)(nil)).Elem()
+}
+
+type VirtualVmxnet struct {
+	VirtualEthernetCard
+}
+
+func init() {
+	t["VirtualVmxnet"] = reflect.TypeOf((*VirtualVmxnet)(nil)).Elem()
+}
+
+type VirtualVmxnet2 struct {
+	VirtualVmxnet
+}
+
+func init() {
+	t["VirtualVmxnet2"] = reflect.TypeOf((*VirtualVmxnet2)(nil)).Elem()
+}
+
+type VirtualVmxnet2Option struct {
+	VirtualVmxnetOption
+}
+
+func init() {
+	t["VirtualVmxnet2Option"] = reflect.TypeOf((*VirtualVmxnet2Option)(nil)).Elem()
+}
+
+type VirtualVmxnet3 struct {
+	VirtualVmxnet
+}
+
+func init() {
+	t["VirtualVmxnet3"] = reflect.TypeOf((*VirtualVmxnet3)(nil)).Elem()
+}
+
+type VirtualVmxnet3Option struct {
+	VirtualVmxnetOption
+}
+
+func init() {
+	t["VirtualVmxnet3Option"] = reflect.TypeOf((*VirtualVmxnet3Option)(nil)).Elem()
+}
+
+type VirtualVmxnet3Vrdma struct {
+	VirtualVmxnet3
+}
+
+func init() {
+	t["VirtualVmxnet3Vrdma"] = reflect.TypeOf((*VirtualVmxnet3Vrdma)(nil)).Elem()
+}
+
+type VirtualVmxnet3VrdmaOption struct {
+	VirtualVmxnet3Option
+}
+
+func init() {
+	t["VirtualVmxnet3VrdmaOption"] = reflect.TypeOf((*VirtualVmxnet3VrdmaOption)(nil)).Elem()
+}
+
+type VirtualVmxnetOption struct {
+	VirtualEthernetCardOption
+}
+
+func init() {
+	t["VirtualVmxnetOption"] = reflect.TypeOf((*VirtualVmxnetOption)(nil)).Elem()
+}
+
+type VlanProfile struct {
+	ApplyProfile
+}
+
+func init() {
+	t["VlanProfile"] = reflect.TypeOf((*VlanProfile)(nil)).Elem()
+}
+
+type VmAcquiredMksTicketEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmAcquiredMksTicketEvent"] = reflect.TypeOf((*VmAcquiredMksTicketEvent)(nil)).Elem()
+}
+
+type VmAcquiredTicketEvent struct {
+	VmEvent
+
+	TicketType string `xml:"ticketType"`
+}
+
+func init() {
+	t["VmAcquiredTicketEvent"] = reflect.TypeOf((*VmAcquiredTicketEvent)(nil)).Elem()
+}
+
+type VmAlreadyExistsInDatacenter struct {
+	InvalidFolder
+
+	Host     ManagedObjectReference   `xml:"host"`
+	Hostname string                   `xml:"hostname"`
+	Vm       []ManagedObjectReference `xml:"vm"`
+}
+
+func init() {
+	t["VmAlreadyExistsInDatacenter"] = reflect.TypeOf((*VmAlreadyExistsInDatacenter)(nil)).Elem()
+}
+
+type VmAlreadyExistsInDatacenterFault VmAlreadyExistsInDatacenter
+
+func init() {
+	t["VmAlreadyExistsInDatacenterFault"] = reflect.TypeOf((*VmAlreadyExistsInDatacenterFault)(nil)).Elem()
+}
+
+type VmAutoRenameEvent struct {
+	VmEvent
+
+	OldName string `xml:"oldName"`
+	NewName string `xml:"newName"`
+}
+
+func init() {
+	t["VmAutoRenameEvent"] = reflect.TypeOf((*VmAutoRenameEvent)(nil)).Elem()
+}
+
+type VmBeingClonedEvent struct {
+	VmCloneEvent
+
+	DestFolder FolderEventArgument `xml:"destFolder"`
+	DestName   string              `xml:"destName"`
+	DestHost   HostEventArgument   `xml:"destHost"`
+}
+
+func init() {
+	t["VmBeingClonedEvent"] = reflect.TypeOf((*VmBeingClonedEvent)(nil)).Elem()
+}
+
+type VmBeingClonedNoFolderEvent struct {
+	VmCloneEvent
+
+	DestName string            `xml:"destName"`
+	DestHost HostEventArgument `xml:"destHost"`
+}
+
+func init() {
+	t["VmBeingClonedNoFolderEvent"] = reflect.TypeOf((*VmBeingClonedNoFolderEvent)(nil)).Elem()
+}
+
+type VmBeingCreatedEvent struct {
+	VmEvent
+
+	ConfigSpec *VirtualMachineConfigSpec `xml:"configSpec,omitempty"`
+}
+
+func init() {
+	t["VmBeingCreatedEvent"] = reflect.TypeOf((*VmBeingCreatedEvent)(nil)).Elem()
+}
+
+type VmBeingDeployedEvent struct {
+	VmEvent
+
+	SrcTemplate VmEventArgument `xml:"srcTemplate"`
+}
+
+func init() {
+	t["VmBeingDeployedEvent"] = reflect.TypeOf((*VmBeingDeployedEvent)(nil)).Elem()
+}
+
+type VmBeingHotMigratedEvent struct {
+	VmEvent
+
+	DestHost       HostEventArgument        `xml:"destHost"`
+	DestDatacenter *DatacenterEventArgument `xml:"destDatacenter,omitempty"`
+	DestDatastore  *DatastoreEventArgument  `xml:"destDatastore,omitempty"`
+}
+
+func init() {
+	t["VmBeingHotMigratedEvent"] = reflect.TypeOf((*VmBeingHotMigratedEvent)(nil)).Elem()
+}
+
+type VmBeingMigratedEvent struct {
+	VmEvent
+
+	DestHost       HostEventArgument        `xml:"destHost"`
+	DestDatacenter *DatacenterEventArgument `xml:"destDatacenter,omitempty"`
+	DestDatastore  *DatastoreEventArgument  `xml:"destDatastore,omitempty"`
+}
+
+func init() {
+	t["VmBeingMigratedEvent"] = reflect.TypeOf((*VmBeingMigratedEvent)(nil)).Elem()
+}
+
+type VmBeingRelocatedEvent struct {
+	VmRelocateSpecEvent
+
+	DestHost       HostEventArgument        `xml:"destHost"`
+	DestDatacenter *DatacenterEventArgument `xml:"destDatacenter,omitempty"`
+	DestDatastore  *DatastoreEventArgument  `xml:"destDatastore,omitempty"`
+}
+
+func init() {
+	t["VmBeingRelocatedEvent"] = reflect.TypeOf((*VmBeingRelocatedEvent)(nil)).Elem()
+}
+
+type VmCloneEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmCloneEvent"] = reflect.TypeOf((*VmCloneEvent)(nil)).Elem()
+}
+
+type VmCloneFailedEvent struct {
+	VmCloneEvent
+
+	DestFolder FolderEventArgument  `xml:"destFolder"`
+	DestName   string               `xml:"destName"`
+	DestHost   HostEventArgument    `xml:"destHost"`
+	Reason     LocalizedMethodFault `xml:"reason"`
+}
+
+func init() {
+	t["VmCloneFailedEvent"] = reflect.TypeOf((*VmCloneFailedEvent)(nil)).Elem()
+}
+
+type VmClonedEvent struct {
+	VmCloneEvent
+
+	SourceVm VmEventArgument `xml:"sourceVm"`
+}
+
+func init() {
+	t["VmClonedEvent"] = reflect.TypeOf((*VmClonedEvent)(nil)).Elem()
+}
+
+type VmConfigFault struct {
+	VimFault
+}
+
+func init() {
+	t["VmConfigFault"] = reflect.TypeOf((*VmConfigFault)(nil)).Elem()
+}
+
+type VmConfigFaultFault BaseVmConfigFault
+
+func init() {
+	t["VmConfigFaultFault"] = reflect.TypeOf((*VmConfigFaultFault)(nil)).Elem()
+}
+
+type VmConfigFileEncryptionInfo struct {
+	DynamicData
+
+	KeyId *CryptoKeyId `xml:"keyId,omitempty"`
+}
+
+func init() {
+	t["VmConfigFileEncryptionInfo"] = reflect.TypeOf((*VmConfigFileEncryptionInfo)(nil)).Elem()
+}
+
+type VmConfigFileInfo struct {
+	FileInfo
+
+	ConfigVersion int32                       `xml:"configVersion,omitempty"`
+	Encryption    *VmConfigFileEncryptionInfo `xml:"encryption,omitempty"`
+}
+
+func init() {
+	t["VmConfigFileInfo"] = reflect.TypeOf((*VmConfigFileInfo)(nil)).Elem()
+}
+
+type VmConfigFileQuery struct {
+	FileQuery
+
+	Filter  *VmConfigFileQueryFilter `xml:"filter,omitempty"`
+	Details *VmConfigFileQueryFlags  `xml:"details,omitempty"`
+}
+
+func init() {
+	t["VmConfigFileQuery"] = reflect.TypeOf((*VmConfigFileQuery)(nil)).Elem()
+}
+
+type VmConfigFileQueryFilter struct {
+	DynamicData
+
+	MatchConfigVersion []int32 `xml:"matchConfigVersion,omitempty"`
+	Encrypted          *bool   `xml:"encrypted"`
+}
+
+func init() {
+	t["VmConfigFileQueryFilter"] = reflect.TypeOf((*VmConfigFileQueryFilter)(nil)).Elem()
+}
+
+type VmConfigFileQueryFlags struct {
+	DynamicData
+
+	ConfigVersion bool  `xml:"configVersion"`
+	Encryption    *bool `xml:"encryption"`
+}
+
+func init() {
+	t["VmConfigFileQueryFlags"] = reflect.TypeOf((*VmConfigFileQueryFlags)(nil)).Elem()
+}
+
+type VmConfigIncompatibleForFaultTolerance struct {
+	VmConfigFault
+
+	Fault *LocalizedMethodFault `xml:"fault,omitempty"`
+}
+
+func init() {
+	t["VmConfigIncompatibleForFaultTolerance"] = reflect.TypeOf((*VmConfigIncompatibleForFaultTolerance)(nil)).Elem()
+}
+
+type VmConfigIncompatibleForFaultToleranceFault VmConfigIncompatibleForFaultTolerance
+
+func init() {
+	t["VmConfigIncompatibleForFaultToleranceFault"] = reflect.TypeOf((*VmConfigIncompatibleForFaultToleranceFault)(nil)).Elem()
+}
+
+type VmConfigIncompatibleForRecordReplay struct {
+	VmConfigFault
+
+	Fault *LocalizedMethodFault `xml:"fault,omitempty"`
+}
+
+func init() {
+	t["VmConfigIncompatibleForRecordReplay"] = reflect.TypeOf((*VmConfigIncompatibleForRecordReplay)(nil)).Elem()
+}
+
+type VmConfigIncompatibleForRecordReplayFault VmConfigIncompatibleForRecordReplay
+
+func init() {
+	t["VmConfigIncompatibleForRecordReplayFault"] = reflect.TypeOf((*VmConfigIncompatibleForRecordReplayFault)(nil)).Elem()
+}
+
+type VmConfigInfo struct {
+	DynamicData
+
+	Product                 []VAppProductInfo    `xml:"product,omitempty"`
+	Property                []VAppPropertyInfo   `xml:"property,omitempty"`
+	IpAssignment            VAppIPAssignmentInfo `xml:"ipAssignment"`
+	Eula                    []string             `xml:"eula,omitempty"`
+	OvfSection              []VAppOvfSectionInfo `xml:"ovfSection,omitempty"`
+	OvfEnvironmentTransport []string             `xml:"ovfEnvironmentTransport,omitempty"`
+	InstallBootRequired     bool                 `xml:"installBootRequired"`
+	InstallBootStopDelay    int32                `xml:"installBootStopDelay"`
+}
+
+func init() {
+	t["VmConfigInfo"] = reflect.TypeOf((*VmConfigInfo)(nil)).Elem()
+}
+
+type VmConfigMissingEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmConfigMissingEvent"] = reflect.TypeOf((*VmConfigMissingEvent)(nil)).Elem()
+}
+
+type VmConfigSpec struct {
+	DynamicData
+
+	Product                 []VAppProductSpec     `xml:"product,omitempty"`
+	Property                []VAppPropertySpec    `xml:"property,omitempty"`
+	IpAssignment            *VAppIPAssignmentInfo `xml:"ipAssignment,omitempty"`
+	Eula                    []string              `xml:"eula,omitempty"`
+	OvfSection              []VAppOvfSectionSpec  `xml:"ovfSection,omitempty"`
+	OvfEnvironmentTransport []string              `xml:"ovfEnvironmentTransport,omitempty"`
+	InstallBootRequired     *bool                 `xml:"installBootRequired"`
+	InstallBootStopDelay    int32                 `xml:"installBootStopDelay,omitempty"`
+}
+
+func init() {
+	t["VmConfigSpec"] = reflect.TypeOf((*VmConfigSpec)(nil)).Elem()
+}
+
+type VmConnectedEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmConnectedEvent"] = reflect.TypeOf((*VmConnectedEvent)(nil)).Elem()
+}
+
+type VmCreatedEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmCreatedEvent"] = reflect.TypeOf((*VmCreatedEvent)(nil)).Elem()
+}
+
+type VmDasBeingResetEvent struct {
+	VmEvent
+
+	Reason string `xml:"reason,omitempty"`
+}
+
+func init() {
+	t["VmDasBeingResetEvent"] = reflect.TypeOf((*VmDasBeingResetEvent)(nil)).Elem()
+}
+
+type VmDasBeingResetWithScreenshotEvent struct {
+	VmDasBeingResetEvent
+
+	ScreenshotFilePath string `xml:"screenshotFilePath"`
+}
+
+func init() {
+	t["VmDasBeingResetWithScreenshotEvent"] = reflect.TypeOf((*VmDasBeingResetWithScreenshotEvent)(nil)).Elem()
+}
+
+type VmDasResetFailedEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmDasResetFailedEvent"] = reflect.TypeOf((*VmDasResetFailedEvent)(nil)).Elem()
+}
+
+type VmDasUpdateErrorEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmDasUpdateErrorEvent"] = reflect.TypeOf((*VmDasUpdateErrorEvent)(nil)).Elem()
+}
+
+type VmDasUpdateOkEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmDasUpdateOkEvent"] = reflect.TypeOf((*VmDasUpdateOkEvent)(nil)).Elem()
+}
+
+type VmDateRolledBackEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmDateRolledBackEvent"] = reflect.TypeOf((*VmDateRolledBackEvent)(nil)).Elem()
+}
+
+type VmDeployFailedEvent struct {
+	VmEvent
+
+	DestDatastore BaseEntityEventArgument `xml:"destDatastore,typeattr"`
+	Reason        LocalizedMethodFault    `xml:"reason"`
+}
+
+func init() {
+	t["VmDeployFailedEvent"] = reflect.TypeOf((*VmDeployFailedEvent)(nil)).Elem()
+}
+
+type VmDeployedEvent struct {
+	VmEvent
+
+	SrcTemplate VmEventArgument `xml:"srcTemplate"`
+}
+
+func init() {
+	t["VmDeployedEvent"] = reflect.TypeOf((*VmDeployedEvent)(nil)).Elem()
+}
+
+type VmDisconnectedEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmDisconnectedEvent"] = reflect.TypeOf((*VmDisconnectedEvent)(nil)).Elem()
+}
+
+type VmDiscoveredEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmDiscoveredEvent"] = reflect.TypeOf((*VmDiscoveredEvent)(nil)).Elem()
+}
+
+type VmDiskFailedEvent struct {
+	VmEvent
+
+	Disk   string               `xml:"disk"`
+	Reason LocalizedMethodFault `xml:"reason"`
+}
+
+func init() {
+	t["VmDiskFailedEvent"] = reflect.TypeOf((*VmDiskFailedEvent)(nil)).Elem()
+}
+
+type VmDiskFileEncryptionInfo struct {
+	DynamicData
+
+	KeyId *CryptoKeyId `xml:"keyId,omitempty"`
+}
+
+func init() {
+	t["VmDiskFileEncryptionInfo"] = reflect.TypeOf((*VmDiskFileEncryptionInfo)(nil)).Elem()
+}
+
+type VmDiskFileInfo struct {
+	FileInfo
+
+	DiskType        string                    `xml:"diskType,omitempty"`
+	CapacityKb      int64                     `xml:"capacityKb,omitempty"`
+	HardwareVersion int32                     `xml:"hardwareVersion,omitempty"`
+	ControllerType  string                    `xml:"controllerType,omitempty"`
+	DiskExtents     []string                  `xml:"diskExtents,omitempty"`
+	Thin            *bool                     `xml:"thin"`
+	Encryption      *VmDiskFileEncryptionInfo `xml:"encryption,omitempty"`
+}
+
+func init() {
+	t["VmDiskFileInfo"] = reflect.TypeOf((*VmDiskFileInfo)(nil)).Elem()
+}
+
+type VmDiskFileQuery struct {
+	FileQuery
+
+	Filter  *VmDiskFileQueryFilter `xml:"filter,omitempty"`
+	Details *VmDiskFileQueryFlags  `xml:"details,omitempty"`
+}
+
+func init() {
+	t["VmDiskFileQuery"] = reflect.TypeOf((*VmDiskFileQuery)(nil)).Elem()
+}
+
+type VmDiskFileQueryFilter struct {
+	DynamicData
+
+	DiskType             []string `xml:"diskType,omitempty"`
+	MatchHardwareVersion []int32  `xml:"matchHardwareVersion,omitempty"`
+	ControllerType       []string `xml:"controllerType,omitempty"`
+	Thin                 *bool    `xml:"thin"`
+	Encrypted            *bool    `xml:"encrypted"`
+}
+
+func init() {
+	t["VmDiskFileQueryFilter"] = reflect.TypeOf((*VmDiskFileQueryFilter)(nil)).Elem()
+}
+
+type VmDiskFileQueryFlags struct {
+	DynamicData
+
+	DiskType        bool  `xml:"diskType"`
+	CapacityKb      bool  `xml:"capacityKb"`
+	HardwareVersion bool  `xml:"hardwareVersion"`
+	ControllerType  *bool `xml:"controllerType"`
+	DiskExtents     *bool `xml:"diskExtents"`
+	Thin            *bool `xml:"thin"`
+	Encryption      *bool `xml:"encryption"`
+}
+
+func init() {
+	t["VmDiskFileQueryFlags"] = reflect.TypeOf((*VmDiskFileQueryFlags)(nil)).Elem()
+}
+
+type VmEmigratingEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmEmigratingEvent"] = reflect.TypeOf((*VmEmigratingEvent)(nil)).Elem()
+}
+
+type VmEndRecordingEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmEndRecordingEvent"] = reflect.TypeOf((*VmEndRecordingEvent)(nil)).Elem()
+}
+
+type VmEndReplayingEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmEndReplayingEvent"] = reflect.TypeOf((*VmEndReplayingEvent)(nil)).Elem()
+}
+
+type VmEvent struct {
+	Event
+
+	Template bool `xml:"template"`
+}
+
+func init() {
+	t["VmEvent"] = reflect.TypeOf((*VmEvent)(nil)).Elem()
+}
+
+type VmEventArgument struct {
+	EntityEventArgument
+
+	Vm ManagedObjectReference `xml:"vm"`
+}
+
+func init() {
+	t["VmEventArgument"] = reflect.TypeOf((*VmEventArgument)(nil)).Elem()
+}
+
+type VmFailedMigrateEvent struct {
+	VmEvent
+
+	DestHost       HostEventArgument        `xml:"destHost"`
+	Reason         LocalizedMethodFault     `xml:"reason"`
+	DestDatacenter *DatacenterEventArgument `xml:"destDatacenter,omitempty"`
+	DestDatastore  *DatastoreEventArgument  `xml:"destDatastore,omitempty"`
+}
+
+func init() {
+	t["VmFailedMigrateEvent"] = reflect.TypeOf((*VmFailedMigrateEvent)(nil)).Elem()
+}
+
+type VmFailedRelayoutEvent struct {
+	VmEvent
+
+	Reason LocalizedMethodFault `xml:"reason"`
+}
+
+func init() {
+	t["VmFailedRelayoutEvent"] = reflect.TypeOf((*VmFailedRelayoutEvent)(nil)).Elem()
+}
+
+type VmFailedRelayoutOnVmfs2DatastoreEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmFailedRelayoutOnVmfs2DatastoreEvent"] = reflect.TypeOf((*VmFailedRelayoutOnVmfs2DatastoreEvent)(nil)).Elem()
+}
+
+type VmFailedStartingSecondaryEvent struct {
+	VmEvent
+
+	Reason string `xml:"reason,omitempty"`
+}
+
+func init() {
+	t["VmFailedStartingSecondaryEvent"] = reflect.TypeOf((*VmFailedStartingSecondaryEvent)(nil)).Elem()
+}
+
+type VmFailedToPowerOffEvent struct {
+	VmEvent
+
+	Reason LocalizedMethodFault `xml:"reason"`
+}
+
+func init() {
+	t["VmFailedToPowerOffEvent"] = reflect.TypeOf((*VmFailedToPowerOffEvent)(nil)).Elem()
+}
+
+type VmFailedToPowerOnEvent struct {
+	VmEvent
+
+	Reason LocalizedMethodFault `xml:"reason"`
+}
+
+func init() {
+	t["VmFailedToPowerOnEvent"] = reflect.TypeOf((*VmFailedToPowerOnEvent)(nil)).Elem()
+}
+
+type VmFailedToRebootGuestEvent struct {
+	VmEvent
+
+	Reason LocalizedMethodFault `xml:"reason"`
+}
+
+func init() {
+	t["VmFailedToRebootGuestEvent"] = reflect.TypeOf((*VmFailedToRebootGuestEvent)(nil)).Elem()
+}
+
+type VmFailedToResetEvent struct {
+	VmEvent
+
+	Reason LocalizedMethodFault `xml:"reason"`
+}
+
+func init() {
+	t["VmFailedToResetEvent"] = reflect.TypeOf((*VmFailedToResetEvent)(nil)).Elem()
+}
+
+type VmFailedToShutdownGuestEvent struct {
+	VmEvent
+
+	Reason LocalizedMethodFault `xml:"reason"`
+}
+
+func init() {
+	t["VmFailedToShutdownGuestEvent"] = reflect.TypeOf((*VmFailedToShutdownGuestEvent)(nil)).Elem()
+}
+
+type VmFailedToStandbyGuestEvent struct {
+	VmEvent
+
+	Reason LocalizedMethodFault `xml:"reason"`
+}
+
+func init() {
+	t["VmFailedToStandbyGuestEvent"] = reflect.TypeOf((*VmFailedToStandbyGuestEvent)(nil)).Elem()
+}
+
+type VmFailedToSuspendEvent struct {
+	VmEvent
+
+	Reason LocalizedMethodFault `xml:"reason"`
+}
+
+func init() {
+	t["VmFailedToSuspendEvent"] = reflect.TypeOf((*VmFailedToSuspendEvent)(nil)).Elem()
+}
+
+type VmFailedUpdatingSecondaryConfig struct {
+	VmEvent
+}
+
+func init() {
+	t["VmFailedUpdatingSecondaryConfig"] = reflect.TypeOf((*VmFailedUpdatingSecondaryConfig)(nil)).Elem()
+}
+
+type VmFailoverFailed struct {
+	VmEvent
+
+	Reason *LocalizedMethodFault `xml:"reason,omitempty"`
+}
+
+func init() {
+	t["VmFailoverFailed"] = reflect.TypeOf((*VmFailoverFailed)(nil)).Elem()
+}
+
+type VmFaultToleranceConfigIssue struct {
+	VmFaultToleranceIssue
+
+	Reason     string                  `xml:"reason,omitempty"`
+	EntityName string                  `xml:"entityName,omitempty"`
+	Entity     *ManagedObjectReference `xml:"entity,omitempty"`
+}
+
+func init() {
+	t["VmFaultToleranceConfigIssue"] = reflect.TypeOf((*VmFaultToleranceConfigIssue)(nil)).Elem()
+}
+
+type VmFaultToleranceConfigIssueFault VmFaultToleranceConfigIssue
+
+func init() {
+	t["VmFaultToleranceConfigIssueFault"] = reflect.TypeOf((*VmFaultToleranceConfigIssueFault)(nil)).Elem()
+}
+
+type VmFaultToleranceConfigIssueWrapper struct {
+	VmFaultToleranceIssue
+
+	EntityName string                  `xml:"entityName,omitempty"`
+	Entity     *ManagedObjectReference `xml:"entity,omitempty"`
+	Error      *LocalizedMethodFault   `xml:"error,omitempty"`
+}
+
+func init() {
+	t["VmFaultToleranceConfigIssueWrapper"] = reflect.TypeOf((*VmFaultToleranceConfigIssueWrapper)(nil)).Elem()
+}
+
+type VmFaultToleranceConfigIssueWrapperFault VmFaultToleranceConfigIssueWrapper
+
+func init() {
+	t["VmFaultToleranceConfigIssueWrapperFault"] = reflect.TypeOf((*VmFaultToleranceConfigIssueWrapperFault)(nil)).Elem()
+}
+
+type VmFaultToleranceInvalidFileBacking struct {
+	VmFaultToleranceIssue
+
+	BackingType     string `xml:"backingType,omitempty"`
+	BackingFilename string `xml:"backingFilename,omitempty"`
+}
+
+func init() {
+	t["VmFaultToleranceInvalidFileBacking"] = reflect.TypeOf((*VmFaultToleranceInvalidFileBacking)(nil)).Elem()
+}
+
+type VmFaultToleranceInvalidFileBackingFault VmFaultToleranceInvalidFileBacking
+
+func init() {
+	t["VmFaultToleranceInvalidFileBackingFault"] = reflect.TypeOf((*VmFaultToleranceInvalidFileBackingFault)(nil)).Elem()
+}
+
+type VmFaultToleranceIssue struct {
+	VimFault
+}
+
+func init() {
+	t["VmFaultToleranceIssue"] = reflect.TypeOf((*VmFaultToleranceIssue)(nil)).Elem()
+}
+
+type VmFaultToleranceIssueFault BaseVmFaultToleranceIssue
+
+func init() {
+	t["VmFaultToleranceIssueFault"] = reflect.TypeOf((*VmFaultToleranceIssueFault)(nil)).Elem()
+}
+
+type VmFaultToleranceOpIssuesList struct {
+	VmFaultToleranceIssue
+
+	Errors   []LocalizedMethodFault `xml:"errors,omitempty"`
+	Warnings []LocalizedMethodFault `xml:"warnings,omitempty"`
+}
+
+func init() {
+	t["VmFaultToleranceOpIssuesList"] = reflect.TypeOf((*VmFaultToleranceOpIssuesList)(nil)).Elem()
+}
+
+type VmFaultToleranceOpIssuesListFault VmFaultToleranceOpIssuesList
+
+func init() {
+	t["VmFaultToleranceOpIssuesListFault"] = reflect.TypeOf((*VmFaultToleranceOpIssuesListFault)(nil)).Elem()
+}
+
+type VmFaultToleranceStateChangedEvent struct {
+	VmEvent
+
+	OldState VirtualMachineFaultToleranceState `xml:"oldState"`
+	NewState VirtualMachineFaultToleranceState `xml:"newState"`
+}
+
+func init() {
+	t["VmFaultToleranceStateChangedEvent"] = reflect.TypeOf((*VmFaultToleranceStateChangedEvent)(nil)).Elem()
+}
+
+type VmFaultToleranceTooManyFtVcpusOnHost struct {
+	InsufficientResourcesFault
+
+	HostName      string `xml:"hostName,omitempty"`
+	MaxNumFtVcpus int32  `xml:"maxNumFtVcpus"`
+}
+
+func init() {
+	t["VmFaultToleranceTooManyFtVcpusOnHost"] = reflect.TypeOf((*VmFaultToleranceTooManyFtVcpusOnHost)(nil)).Elem()
+}
+
+type VmFaultToleranceTooManyFtVcpusOnHostFault VmFaultToleranceTooManyFtVcpusOnHost
+
+func init() {
+	t["VmFaultToleranceTooManyFtVcpusOnHostFault"] = reflect.TypeOf((*VmFaultToleranceTooManyFtVcpusOnHostFault)(nil)).Elem()
+}
+
+type VmFaultToleranceTooManyVMsOnHost struct {
+	InsufficientResourcesFault
+
+	HostName    string `xml:"hostName,omitempty"`
+	MaxNumFtVms int32  `xml:"maxNumFtVms"`
+}
+
+func init() {
+	t["VmFaultToleranceTooManyVMsOnHost"] = reflect.TypeOf((*VmFaultToleranceTooManyVMsOnHost)(nil)).Elem()
+}
+
+type VmFaultToleranceTooManyVMsOnHostFault VmFaultToleranceTooManyVMsOnHost
+
+func init() {
+	t["VmFaultToleranceTooManyVMsOnHostFault"] = reflect.TypeOf((*VmFaultToleranceTooManyVMsOnHostFault)(nil)).Elem()
+}
+
+type VmFaultToleranceTurnedOffEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmFaultToleranceTurnedOffEvent"] = reflect.TypeOf((*VmFaultToleranceTurnedOffEvent)(nil)).Elem()
+}
+
+type VmFaultToleranceVmTerminatedEvent struct {
+	VmEvent
+
+	Reason string `xml:"reason,omitempty"`
+}
+
+func init() {
+	t["VmFaultToleranceVmTerminatedEvent"] = reflect.TypeOf((*VmFaultToleranceVmTerminatedEvent)(nil)).Elem()
+}
+
+type VmGuestOSCrashedEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmGuestOSCrashedEvent"] = reflect.TypeOf((*VmGuestOSCrashedEvent)(nil)).Elem()
+}
+
+type VmGuestRebootEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmGuestRebootEvent"] = reflect.TypeOf((*VmGuestRebootEvent)(nil)).Elem()
+}
+
+type VmGuestShutdownEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmGuestShutdownEvent"] = reflect.TypeOf((*VmGuestShutdownEvent)(nil)).Elem()
+}
+
+type VmGuestStandbyEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmGuestStandbyEvent"] = reflect.TypeOf((*VmGuestStandbyEvent)(nil)).Elem()
+}
+
+type VmHealthMonitoringStateChangedEvent struct {
+	ClusterEvent
+
+	State     string `xml:"state"`
+	PrevState string `xml:"prevState,omitempty"`
+}
+
+func init() {
+	t["VmHealthMonitoringStateChangedEvent"] = reflect.TypeOf((*VmHealthMonitoringStateChangedEvent)(nil)).Elem()
+}
+
+type VmHostAffinityRuleViolation struct {
+	VmConfigFault
+
+	VmName   string `xml:"vmName"`
+	HostName string `xml:"hostName"`
+}
+
+func init() {
+	t["VmHostAffinityRuleViolation"] = reflect.TypeOf((*VmHostAffinityRuleViolation)(nil)).Elem()
+}
+
+type VmHostAffinityRuleViolationFault VmHostAffinityRuleViolation
+
+func init() {
+	t["VmHostAffinityRuleViolationFault"] = reflect.TypeOf((*VmHostAffinityRuleViolationFault)(nil)).Elem()
+}
+
+type VmInstanceUuidAssignedEvent struct {
+	VmEvent
+
+	InstanceUuid string `xml:"instanceUuid"`
+}
+
+func init() {
+	t["VmInstanceUuidAssignedEvent"] = reflect.TypeOf((*VmInstanceUuidAssignedEvent)(nil)).Elem()
+}
+
+type VmInstanceUuidChangedEvent struct {
+	VmEvent
+
+	OldInstanceUuid string `xml:"oldInstanceUuid"`
+	NewInstanceUuid string `xml:"newInstanceUuid"`
+}
+
+func init() {
+	t["VmInstanceUuidChangedEvent"] = reflect.TypeOf((*VmInstanceUuidChangedEvent)(nil)).Elem()
+}
+
+type VmInstanceUuidConflictEvent struct {
+	VmEvent
+
+	ConflictedVm VmEventArgument `xml:"conflictedVm"`
+	InstanceUuid string          `xml:"instanceUuid"`
+}
+
+func init() {
+	t["VmInstanceUuidConflictEvent"] = reflect.TypeOf((*VmInstanceUuidConflictEvent)(nil)).Elem()
+}
+
+type VmLimitLicense struct {
+	NotEnoughLicenses
+
+	Limit int32 `xml:"limit"`
+}
+
+func init() {
+	t["VmLimitLicense"] = reflect.TypeOf((*VmLimitLicense)(nil)).Elem()
+}
+
+type VmLimitLicenseFault VmLimitLicense
+
+func init() {
+	t["VmLimitLicenseFault"] = reflect.TypeOf((*VmLimitLicenseFault)(nil)).Elem()
+}
+
+type VmLogFileInfo struct {
+	FileInfo
+}
+
+func init() {
+	t["VmLogFileInfo"] = reflect.TypeOf((*VmLogFileInfo)(nil)).Elem()
+}
+
+type VmLogFileQuery struct {
+	FileQuery
+}
+
+func init() {
+	t["VmLogFileQuery"] = reflect.TypeOf((*VmLogFileQuery)(nil)).Elem()
+}
+
+type VmMacAssignedEvent struct {
+	VmEvent
+
+	Adapter string `xml:"adapter"`
+	Mac     string `xml:"mac"`
+}
+
+func init() {
+	t["VmMacAssignedEvent"] = reflect.TypeOf((*VmMacAssignedEvent)(nil)).Elem()
+}
+
+type VmMacChangedEvent struct {
+	VmEvent
+
+	Adapter string `xml:"adapter"`
+	OldMac  string `xml:"oldMac"`
+	NewMac  string `xml:"newMac"`
+}
+
+func init() {
+	t["VmMacChangedEvent"] = reflect.TypeOf((*VmMacChangedEvent)(nil)).Elem()
+}
+
+type VmMacConflictEvent struct {
+	VmEvent
+
+	ConflictedVm VmEventArgument `xml:"conflictedVm"`
+	Mac          string          `xml:"mac"`
+}
+
+func init() {
+	t["VmMacConflictEvent"] = reflect.TypeOf((*VmMacConflictEvent)(nil)).Elem()
+}
+
+type VmMaxFTRestartCountReached struct {
+	VmEvent
+}
+
+func init() {
+	t["VmMaxFTRestartCountReached"] = reflect.TypeOf((*VmMaxFTRestartCountReached)(nil)).Elem()
+}
+
+type VmMaxRestartCountReached struct {
+	VmEvent
+}
+
+func init() {
+	t["VmMaxRestartCountReached"] = reflect.TypeOf((*VmMaxRestartCountReached)(nil)).Elem()
+}
+
+type VmMessageErrorEvent struct {
+	VmEvent
+
+	Message     string                  `xml:"message"`
+	MessageInfo []VirtualMachineMessage `xml:"messageInfo,omitempty"`
+}
+
+func init() {
+	t["VmMessageErrorEvent"] = reflect.TypeOf((*VmMessageErrorEvent)(nil)).Elem()
+}
+
+type VmMessageEvent struct {
+	VmEvent
+
+	Message     string                  `xml:"message"`
+	MessageInfo []VirtualMachineMessage `xml:"messageInfo,omitempty"`
+}
+
+func init() {
+	t["VmMessageEvent"] = reflect.TypeOf((*VmMessageEvent)(nil)).Elem()
+}
+
+type VmMessageWarningEvent struct {
+	VmEvent
+
+	Message     string                  `xml:"message"`
+	MessageInfo []VirtualMachineMessage `xml:"messageInfo,omitempty"`
+}
+
+func init() {
+	t["VmMessageWarningEvent"] = reflect.TypeOf((*VmMessageWarningEvent)(nil)).Elem()
+}
+
+type VmMetadataManagerFault struct {
+	VimFault
+}
+
+func init() {
+	t["VmMetadataManagerFault"] = reflect.TypeOf((*VmMetadataManagerFault)(nil)).Elem()
+}
+
+type VmMetadataManagerFaultFault VmMetadataManagerFault
+
+func init() {
+	t["VmMetadataManagerFaultFault"] = reflect.TypeOf((*VmMetadataManagerFaultFault)(nil)).Elem()
+}
+
+type VmMigratedEvent struct {
+	VmEvent
+
+	SourceHost       HostEventArgument        `xml:"sourceHost"`
+	SourceDatacenter *DatacenterEventArgument `xml:"sourceDatacenter,omitempty"`
+	SourceDatastore  *DatastoreEventArgument  `xml:"sourceDatastore,omitempty"`
+}
+
+func init() {
+	t["VmMigratedEvent"] = reflect.TypeOf((*VmMigratedEvent)(nil)).Elem()
+}
+
+type VmMonitorIncompatibleForFaultTolerance struct {
+	VimFault
+}
+
+func init() {
+	t["VmMonitorIncompatibleForFaultTolerance"] = reflect.TypeOf((*VmMonitorIncompatibleForFaultTolerance)(nil)).Elem()
+}
+
+type VmMonitorIncompatibleForFaultToleranceFault VmMonitorIncompatibleForFaultTolerance
+
+func init() {
+	t["VmMonitorIncompatibleForFaultToleranceFault"] = reflect.TypeOf((*VmMonitorIncompatibleForFaultToleranceFault)(nil)).Elem()
+}
+
+type VmNoCompatibleHostForSecondaryEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmNoCompatibleHostForSecondaryEvent"] = reflect.TypeOf((*VmNoCompatibleHostForSecondaryEvent)(nil)).Elem()
+}
+
+type VmNoNetworkAccessEvent struct {
+	VmEvent
+
+	DestHost HostEventArgument `xml:"destHost"`
+}
+
+func init() {
+	t["VmNoNetworkAccessEvent"] = reflect.TypeOf((*VmNoNetworkAccessEvent)(nil)).Elem()
+}
+
+type VmNvramFileInfo struct {
+	FileInfo
+}
+
+func init() {
+	t["VmNvramFileInfo"] = reflect.TypeOf((*VmNvramFileInfo)(nil)).Elem()
+}
+
+type VmNvramFileQuery struct {
+	FileQuery
+}
+
+func init() {
+	t["VmNvramFileQuery"] = reflect.TypeOf((*VmNvramFileQuery)(nil)).Elem()
+}
+
+type VmOrphanedEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmOrphanedEvent"] = reflect.TypeOf((*VmOrphanedEvent)(nil)).Elem()
+}
+
+type VmPodConfigForPlacement struct {
+	DynamicData
+
+	StoragePod  ManagedObjectReference  `xml:"storagePod"`
+	Disk        []PodDiskLocator        `xml:"disk,omitempty"`
+	VmConfig    *StorageDrsVmConfigInfo `xml:"vmConfig,omitempty"`
+	InterVmRule []BaseClusterRuleInfo   `xml:"interVmRule,omitempty,typeattr"`
+}
+
+func init() {
+	t["VmPodConfigForPlacement"] = reflect.TypeOf((*VmPodConfigForPlacement)(nil)).Elem()
+}
+
+type VmPortGroupProfile struct {
+	PortGroupProfile
+}
+
+func init() {
+	t["VmPortGroupProfile"] = reflect.TypeOf((*VmPortGroupProfile)(nil)).Elem()
+}
+
+type VmPowerOffOnIsolationEvent struct {
+	VmPoweredOffEvent
+
+	IsolatedHost HostEventArgument `xml:"isolatedHost"`
+}
+
+func init() {
+	t["VmPowerOffOnIsolationEvent"] = reflect.TypeOf((*VmPowerOffOnIsolationEvent)(nil)).Elem()
+}
+
+type VmPowerOnDisabled struct {
+	InvalidState
+}
+
+func init() {
+	t["VmPowerOnDisabled"] = reflect.TypeOf((*VmPowerOnDisabled)(nil)).Elem()
+}
+
+type VmPowerOnDisabledFault VmPowerOnDisabled
+
+func init() {
+	t["VmPowerOnDisabledFault"] = reflect.TypeOf((*VmPowerOnDisabledFault)(nil)).Elem()
+}
+
+type VmPoweredOffEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmPoweredOffEvent"] = reflect.TypeOf((*VmPoweredOffEvent)(nil)).Elem()
+}
+
+type VmPoweredOnEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmPoweredOnEvent"] = reflect.TypeOf((*VmPoweredOnEvent)(nil)).Elem()
+}
+
+type VmPoweringOnWithCustomizedDVPortEvent struct {
+	VmEvent
+
+	Vnic []VnicPortArgument `xml:"vnic"`
+}
+
+func init() {
+	t["VmPoweringOnWithCustomizedDVPortEvent"] = reflect.TypeOf((*VmPoweringOnWithCustomizedDVPortEvent)(nil)).Elem()
+}
+
+type VmPrimaryFailoverEvent struct {
+	VmEvent
+
+	Reason string `xml:"reason,omitempty"`
+}
+
+func init() {
+	t["VmPrimaryFailoverEvent"] = reflect.TypeOf((*VmPrimaryFailoverEvent)(nil)).Elem()
+}
+
+type VmReconfiguredEvent struct {
+	VmEvent
+
+	ConfigSpec    VirtualMachineConfigSpec  `xml:"configSpec"`
+	ConfigChanges *ChangesInfoEventArgument `xml:"configChanges,omitempty"`
+}
+
+func init() {
+	t["VmReconfiguredEvent"] = reflect.TypeOf((*VmReconfiguredEvent)(nil)).Elem()
+}
+
+type VmRegisteredEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmRegisteredEvent"] = reflect.TypeOf((*VmRegisteredEvent)(nil)).Elem()
+}
+
+type VmRelayoutSuccessfulEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmRelayoutSuccessfulEvent"] = reflect.TypeOf((*VmRelayoutSuccessfulEvent)(nil)).Elem()
+}
+
+type VmRelayoutUpToDateEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmRelayoutUpToDateEvent"] = reflect.TypeOf((*VmRelayoutUpToDateEvent)(nil)).Elem()
+}
+
+type VmReloadFromPathEvent struct {
+	VmEvent
+
+	ConfigPath string `xml:"configPath"`
+}
+
+func init() {
+	t["VmReloadFromPathEvent"] = reflect.TypeOf((*VmReloadFromPathEvent)(nil)).Elem()
+}
+
+type VmReloadFromPathFailedEvent struct {
+	VmEvent
+
+	ConfigPath string `xml:"configPath"`
+}
+
+func init() {
+	t["VmReloadFromPathFailedEvent"] = reflect.TypeOf((*VmReloadFromPathFailedEvent)(nil)).Elem()
+}
+
+type VmRelocateFailedEvent struct {
+	VmRelocateSpecEvent
+
+	DestHost       HostEventArgument        `xml:"destHost"`
+	Reason         LocalizedMethodFault     `xml:"reason"`
+	DestDatacenter *DatacenterEventArgument `xml:"destDatacenter,omitempty"`
+	DestDatastore  *DatastoreEventArgument  `xml:"destDatastore,omitempty"`
+}
+
+func init() {
+	t["VmRelocateFailedEvent"] = reflect.TypeOf((*VmRelocateFailedEvent)(nil)).Elem()
+}
+
+type VmRelocateSpecEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmRelocateSpecEvent"] = reflect.TypeOf((*VmRelocateSpecEvent)(nil)).Elem()
+}
+
+type VmRelocatedEvent struct {
+	VmRelocateSpecEvent
+
+	SourceHost       HostEventArgument        `xml:"sourceHost"`
+	SourceDatacenter *DatacenterEventArgument `xml:"sourceDatacenter,omitempty"`
+	SourceDatastore  *DatastoreEventArgument  `xml:"sourceDatastore,omitempty"`
+}
+
+func init() {
+	t["VmRelocatedEvent"] = reflect.TypeOf((*VmRelocatedEvent)(nil)).Elem()
+}
+
+type VmRemoteConsoleConnectedEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmRemoteConsoleConnectedEvent"] = reflect.TypeOf((*VmRemoteConsoleConnectedEvent)(nil)).Elem()
+}
+
+type VmRemoteConsoleDisconnectedEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmRemoteConsoleDisconnectedEvent"] = reflect.TypeOf((*VmRemoteConsoleDisconnectedEvent)(nil)).Elem()
+}
+
+type VmRemovedEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmRemovedEvent"] = reflect.TypeOf((*VmRemovedEvent)(nil)).Elem()
+}
+
+type VmRenamedEvent struct {
+	VmEvent
+
+	OldName string `xml:"oldName"`
+	NewName string `xml:"newName"`
+}
+
+func init() {
+	t["VmRenamedEvent"] = reflect.TypeOf((*VmRenamedEvent)(nil)).Elem()
+}
+
+type VmRequirementsExceedCurrentEVCModeEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmRequirementsExceedCurrentEVCModeEvent"] = reflect.TypeOf((*VmRequirementsExceedCurrentEVCModeEvent)(nil)).Elem()
+}
+
+type VmResettingEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmResettingEvent"] = reflect.TypeOf((*VmResettingEvent)(nil)).Elem()
+}
+
+type VmResourcePoolMovedEvent struct {
+	VmEvent
+
+	OldParent ResourcePoolEventArgument `xml:"oldParent"`
+	NewParent ResourcePoolEventArgument `xml:"newParent"`
+}
+
+func init() {
+	t["VmResourcePoolMovedEvent"] = reflect.TypeOf((*VmResourcePoolMovedEvent)(nil)).Elem()
+}
+
+type VmResourceReallocatedEvent struct {
+	VmEvent
+
+	ConfigChanges *ChangesInfoEventArgument `xml:"configChanges,omitempty"`
+}
+
+func init() {
+	t["VmResourceReallocatedEvent"] = reflect.TypeOf((*VmResourceReallocatedEvent)(nil)).Elem()
+}
+
+type VmRestartedOnAlternateHostEvent struct {
+	VmPoweredOnEvent
+
+	SourceHost HostEventArgument `xml:"sourceHost"`
+}
+
+func init() {
+	t["VmRestartedOnAlternateHostEvent"] = reflect.TypeOf((*VmRestartedOnAlternateHostEvent)(nil)).Elem()
+}
+
+type VmResumingEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmResumingEvent"] = reflect.TypeOf((*VmResumingEvent)(nil)).Elem()
+}
+
+type VmSecondaryAddedEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmSecondaryAddedEvent"] = reflect.TypeOf((*VmSecondaryAddedEvent)(nil)).Elem()
+}
+
+type VmSecondaryDisabledBySystemEvent struct {
+	VmEvent
+
+	Reason *LocalizedMethodFault `xml:"reason,omitempty"`
+}
+
+func init() {
+	t["VmSecondaryDisabledBySystemEvent"] = reflect.TypeOf((*VmSecondaryDisabledBySystemEvent)(nil)).Elem()
+}
+
+type VmSecondaryDisabledEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmSecondaryDisabledEvent"] = reflect.TypeOf((*VmSecondaryDisabledEvent)(nil)).Elem()
+}
+
+type VmSecondaryEnabledEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmSecondaryEnabledEvent"] = reflect.TypeOf((*VmSecondaryEnabledEvent)(nil)).Elem()
+}
+
+type VmSecondaryStartedEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmSecondaryStartedEvent"] = reflect.TypeOf((*VmSecondaryStartedEvent)(nil)).Elem()
+}
+
+type VmShutdownOnIsolationEvent struct {
+	VmPoweredOffEvent
+
+	IsolatedHost   HostEventArgument `xml:"isolatedHost"`
+	ShutdownResult string            `xml:"shutdownResult,omitempty"`
+}
+
+func init() {
+	t["VmShutdownOnIsolationEvent"] = reflect.TypeOf((*VmShutdownOnIsolationEvent)(nil)).Elem()
+}
+
+type VmSmpFaultToleranceTooManyVMsOnHost struct {
+	InsufficientResourcesFault
+
+	HostName       string `xml:"hostName,omitempty"`
+	MaxNumSmpFtVms int32  `xml:"maxNumSmpFtVms"`
+}
+
+func init() {
+	t["VmSmpFaultToleranceTooManyVMsOnHost"] = reflect.TypeOf((*VmSmpFaultToleranceTooManyVMsOnHost)(nil)).Elem()
+}
+
+type VmSmpFaultToleranceTooManyVMsOnHostFault VmSmpFaultToleranceTooManyVMsOnHost
+
+func init() {
+	t["VmSmpFaultToleranceTooManyVMsOnHostFault"] = reflect.TypeOf((*VmSmpFaultToleranceTooManyVMsOnHostFault)(nil)).Elem()
+}
+
+type VmSnapshotFileInfo struct {
+	FileInfo
+}
+
+func init() {
+	t["VmSnapshotFileInfo"] = reflect.TypeOf((*VmSnapshotFileInfo)(nil)).Elem()
+}
+
+type VmSnapshotFileQuery struct {
+	FileQuery
+}
+
+func init() {
+	t["VmSnapshotFileQuery"] = reflect.TypeOf((*VmSnapshotFileQuery)(nil)).Elem()
+}
+
+type VmStartRecordingEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmStartRecordingEvent"] = reflect.TypeOf((*VmStartRecordingEvent)(nil)).Elem()
+}
+
+type VmStartReplayingEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmStartReplayingEvent"] = reflect.TypeOf((*VmStartReplayingEvent)(nil)).Elem()
+}
+
+type VmStartingEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmStartingEvent"] = reflect.TypeOf((*VmStartingEvent)(nil)).Elem()
+}
+
+type VmStartingSecondaryEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmStartingSecondaryEvent"] = reflect.TypeOf((*VmStartingSecondaryEvent)(nil)).Elem()
+}
+
+type VmStaticMacConflictEvent struct {
+	VmEvent
+
+	ConflictedVm VmEventArgument `xml:"conflictedVm"`
+	Mac          string          `xml:"mac"`
+}
+
+func init() {
+	t["VmStaticMacConflictEvent"] = reflect.TypeOf((*VmStaticMacConflictEvent)(nil)).Elem()
+}
+
+type VmStoppingEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmStoppingEvent"] = reflect.TypeOf((*VmStoppingEvent)(nil)).Elem()
+}
+
+type VmSuspendedEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmSuspendedEvent"] = reflect.TypeOf((*VmSuspendedEvent)(nil)).Elem()
+}
+
+type VmSuspendingEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmSuspendingEvent"] = reflect.TypeOf((*VmSuspendingEvent)(nil)).Elem()
+}
+
+type VmTimedoutStartingSecondaryEvent struct {
+	VmEvent
+
+	Timeout int64 `xml:"timeout,omitempty"`
+}
+
+func init() {
+	t["VmTimedoutStartingSecondaryEvent"] = reflect.TypeOf((*VmTimedoutStartingSecondaryEvent)(nil)).Elem()
+}
+
+type VmToolsUpgradeFault struct {
+	VimFault
+}
+
+func init() {
+	t["VmToolsUpgradeFault"] = reflect.TypeOf((*VmToolsUpgradeFault)(nil)).Elem()
+}
+
+type VmToolsUpgradeFaultFault BaseVmToolsUpgradeFault
+
+func init() {
+	t["VmToolsUpgradeFaultFault"] = reflect.TypeOf((*VmToolsUpgradeFaultFault)(nil)).Elem()
+}
+
+type VmUnsupportedStartingEvent struct {
+	VmStartingEvent
+
+	GuestId string `xml:"guestId"`
+}
+
+func init() {
+	t["VmUnsupportedStartingEvent"] = reflect.TypeOf((*VmUnsupportedStartingEvent)(nil)).Elem()
+}
+
+type VmUpgradeCompleteEvent struct {
+	VmEvent
+
+	Version string `xml:"version"`
+}
+
+func init() {
+	t["VmUpgradeCompleteEvent"] = reflect.TypeOf((*VmUpgradeCompleteEvent)(nil)).Elem()
+}
+
+type VmUpgradeFailedEvent struct {
+	VmEvent
+}
+
+func init() {
+	t["VmUpgradeFailedEvent"] = reflect.TypeOf((*VmUpgradeFailedEvent)(nil)).Elem()
+}
+
+type VmUpgradingEvent struct {
+	VmEvent
+
+	Version string `xml:"version"`
+}
+
+func init() {
+	t["VmUpgradingEvent"] = reflect.TypeOf((*VmUpgradingEvent)(nil)).Elem()
+}
+
+type VmUuidAssignedEvent struct {
+	VmEvent
+
+	Uuid string `xml:"uuid"`
+}
+
+func init() {
+	t["VmUuidAssignedEvent"] = reflect.TypeOf((*VmUuidAssignedEvent)(nil)).Elem()
+}
+
+type VmUuidChangedEvent struct {
+	VmEvent
+
+	OldUuid string `xml:"oldUuid"`
+	NewUuid string `xml:"newUuid"`
+}
+
+func init() {
+	t["VmUuidChangedEvent"] = reflect.TypeOf((*VmUuidChangedEvent)(nil)).Elem()
+}
+
+type VmUuidConflictEvent struct {
+	VmEvent
+
+	ConflictedVm VmEventArgument `xml:"conflictedVm"`
+	Uuid         string          `xml:"uuid"`
+}
+
+func init() {
+	t["VmUuidConflictEvent"] = reflect.TypeOf((*VmUuidConflictEvent)(nil)).Elem()
+}
+
+type VmValidateMaxDevice struct {
+	VimFault
+
+	Device string `xml:"device"`
+	Max    int32  `xml:"max"`
+	Count  int32  `xml:"count"`
+}
+
+func init() {
+	t["VmValidateMaxDevice"] = reflect.TypeOf((*VmValidateMaxDevice)(nil)).Elem()
+}
+
+type VmValidateMaxDeviceFault VmValidateMaxDevice
+
+func init() {
+	t["VmValidateMaxDeviceFault"] = reflect.TypeOf((*VmValidateMaxDeviceFault)(nil)).Elem()
+}
+
+type VmVnicPoolReservationViolationClearEvent struct {
+	DvsEvent
+
+	VmVnicResourcePoolKey  string `xml:"vmVnicResourcePoolKey"`
+	VmVnicResourcePoolName string `xml:"vmVnicResourcePoolName,omitempty"`
+}
+
+func init() {
+	t["VmVnicPoolReservationViolationClearEvent"] = reflect.TypeOf((*VmVnicPoolReservationViolationClearEvent)(nil)).Elem()
+}
+
+type VmVnicPoolReservationViolationRaiseEvent struct {
+	DvsEvent
+
+	VmVnicResourcePoolKey  string `xml:"vmVnicResourcePoolKey"`
+	VmVnicResourcePoolName string `xml:"vmVnicResourcePoolName,omitempty"`
+}
+
+func init() {
+	t["VmVnicPoolReservationViolationRaiseEvent"] = reflect.TypeOf((*VmVnicPoolReservationViolationRaiseEvent)(nil)).Elem()
+}
+
+type VmWwnAssignedEvent struct {
+	VmEvent
+
+	NodeWwns []int64 `xml:"nodeWwns"`
+	PortWwns []int64 `xml:"portWwns"`
+}
+
+func init() {
+	t["VmWwnAssignedEvent"] = reflect.TypeOf((*VmWwnAssignedEvent)(nil)).Elem()
+}
+
+type VmWwnChangedEvent struct {
+	VmEvent
+
+	OldNodeWwns []int64 `xml:"oldNodeWwns,omitempty"`
+	OldPortWwns []int64 `xml:"oldPortWwns,omitempty"`
+	NewNodeWwns []int64 `xml:"newNodeWwns,omitempty"`
+	NewPortWwns []int64 `xml:"newPortWwns,omitempty"`
+}
+
+func init() {
+	t["VmWwnChangedEvent"] = reflect.TypeOf((*VmWwnChangedEvent)(nil)).Elem()
+}
+
+type VmWwnConflict struct {
+	InvalidVmConfig
+
+	Vm   *ManagedObjectReference `xml:"vm,omitempty"`
+	Host *ManagedObjectReference `xml:"host,omitempty"`
+	Name string                  `xml:"name,omitempty"`
+	Wwn  int64                   `xml:"wwn,omitempty"`
+}
+
+func init() {
+	t["VmWwnConflict"] = reflect.TypeOf((*VmWwnConflict)(nil)).Elem()
+}
+
+type VmWwnConflictEvent struct {
+	VmEvent
+
+	ConflictedVms   []VmEventArgument   `xml:"conflictedVms,omitempty"`
+	ConflictedHosts []HostEventArgument `xml:"conflictedHosts,omitempty"`
+	Wwn             int64               `xml:"wwn"`
+}
+
+func init() {
+	t["VmWwnConflictEvent"] = reflect.TypeOf((*VmWwnConflictEvent)(nil)).Elem()
+}
+
+type VmWwnConflictFault VmWwnConflict
+
+func init() {
+	t["VmWwnConflictFault"] = reflect.TypeOf((*VmWwnConflictFault)(nil)).Elem()
+}
+
+type VmfsAlreadyMounted struct {
+	VmfsMountFault
+}
+
+func init() {
+	t["VmfsAlreadyMounted"] = reflect.TypeOf((*VmfsAlreadyMounted)(nil)).Elem()
+}
+
+type VmfsAlreadyMountedFault VmfsAlreadyMounted
+
+func init() {
+	t["VmfsAlreadyMountedFault"] = reflect.TypeOf((*VmfsAlreadyMountedFault)(nil)).Elem()
+}
+
+type VmfsAmbiguousMount struct {
+	VmfsMountFault
+}
+
+func init() {
+	t["VmfsAmbiguousMount"] = reflect.TypeOf((*VmfsAmbiguousMount)(nil)).Elem()
+}
+
+type VmfsAmbiguousMountFault VmfsAmbiguousMount
+
+func init() {
+	t["VmfsAmbiguousMountFault"] = reflect.TypeOf((*VmfsAmbiguousMountFault)(nil)).Elem()
+}
+
+type VmfsConfigOption struct {
+	DynamicData
+
+	BlockSizeOption        int32   `xml:"blockSizeOption"`
+	UnmapGranularityOption []int32 `xml:"unmapGranularityOption,omitempty"`
+}
+
+func init() {
+	t["VmfsConfigOption"] = reflect.TypeOf((*VmfsConfigOption)(nil)).Elem()
+}
+
+type VmfsDatastoreAllExtentOption struct {
+	VmfsDatastoreSingleExtentOption
+}
+
+func init() {
+	t["VmfsDatastoreAllExtentOption"] = reflect.TypeOf((*VmfsDatastoreAllExtentOption)(nil)).Elem()
+}
+
+type VmfsDatastoreBaseOption struct {
+	DynamicData
+
+	Layout                HostDiskPartitionLayout `xml:"layout"`
+	PartitionFormatChange *bool                   `xml:"partitionFormatChange"`
+}
+
+func init() {
+	t["VmfsDatastoreBaseOption"] = reflect.TypeOf((*VmfsDatastoreBaseOption)(nil)).Elem()
+}
+
+type VmfsDatastoreCreateSpec struct {
+	VmfsDatastoreSpec
+
+	Partition HostDiskPartitionSpec   `xml:"partition"`
+	Vmfs      HostVmfsSpec            `xml:"vmfs"`
+	Extent    []HostScsiDiskPartition `xml:"extent,omitempty"`
+}
+
+func init() {
+	t["VmfsDatastoreCreateSpec"] = reflect.TypeOf((*VmfsDatastoreCreateSpec)(nil)).Elem()
+}
+
+type VmfsDatastoreExpandSpec struct {
+	VmfsDatastoreSpec
+
+	Partition HostDiskPartitionSpec `xml:"partition"`
+	Extent    HostScsiDiskPartition `xml:"extent"`
+}
+
+func init() {
+	t["VmfsDatastoreExpandSpec"] = reflect.TypeOf((*VmfsDatastoreExpandSpec)(nil)).Elem()
+}
+
+type VmfsDatastoreExtendSpec struct {
+	VmfsDatastoreSpec
+
+	Partition HostDiskPartitionSpec   `xml:"partition"`
+	Extent    []HostScsiDiskPartition `xml:"extent"`
+}
+
+func init() {
+	t["VmfsDatastoreExtendSpec"] = reflect.TypeOf((*VmfsDatastoreExtendSpec)(nil)).Elem()
+}
+
+type VmfsDatastoreInfo struct {
+	DatastoreInfo
+
+	MaxPhysicalRDMFileSize int64           `xml:"maxPhysicalRDMFileSize,omitempty"`
+	MaxVirtualRDMFileSize  int64           `xml:"maxVirtualRDMFileSize,omitempty"`
+	Vmfs                   *HostVmfsVolume `xml:"vmfs,omitempty"`
+}
+
+func init() {
+	t["VmfsDatastoreInfo"] = reflect.TypeOf((*VmfsDatastoreInfo)(nil)).Elem()
+}
+
+type VmfsDatastoreMultipleExtentOption struct {
+	VmfsDatastoreBaseOption
+
+	VmfsExtent []HostDiskPartitionBlockRange `xml:"vmfsExtent"`
+}
+
+func init() {
+	t["VmfsDatastoreMultipleExtentOption"] = reflect.TypeOf((*VmfsDatastoreMultipleExtentOption)(nil)).Elem()
+}
+
+type VmfsDatastoreOption struct {
+	DynamicData
+
+	Info BaseVmfsDatastoreBaseOption `xml:"info,typeattr"`
+	Spec BaseVmfsDatastoreSpec       `xml:"spec,typeattr"`
+}
+
+func init() {
+	t["VmfsDatastoreOption"] = reflect.TypeOf((*VmfsDatastoreOption)(nil)).Elem()
+}
+
+type VmfsDatastoreSingleExtentOption struct {
+	VmfsDatastoreBaseOption
+
+	VmfsExtent HostDiskPartitionBlockRange `xml:"vmfsExtent"`
+}
+
+func init() {
+	t["VmfsDatastoreSingleExtentOption"] = reflect.TypeOf((*VmfsDatastoreSingleExtentOption)(nil)).Elem()
+}
+
+type VmfsDatastoreSpec struct {
+	DynamicData
+
+	DiskUuid string `xml:"diskUuid"`
+}
+
+func init() {
+	t["VmfsDatastoreSpec"] = reflect.TypeOf((*VmfsDatastoreSpec)(nil)).Elem()
+}
+
+type VmfsMountFault struct {
+	HostConfigFault
+
+	Uuid string `xml:"uuid"`
+}
+
+func init() {
+	t["VmfsMountFault"] = reflect.TypeOf((*VmfsMountFault)(nil)).Elem()
+}
+
+type VmfsMountFaultFault BaseVmfsMountFault
+
+func init() {
+	t["VmfsMountFaultFault"] = reflect.TypeOf((*VmfsMountFaultFault)(nil)).Elem()
+}
+
+type VmotionInterfaceNotEnabled struct {
+	HostPowerOpFailed
+}
+
+func init() {
+	t["VmotionInterfaceNotEnabled"] = reflect.TypeOf((*VmotionInterfaceNotEnabled)(nil)).Elem()
+}
+
+type VmotionInterfaceNotEnabledFault VmotionInterfaceNotEnabled
+
+func init() {
+	t["VmotionInterfaceNotEnabledFault"] = reflect.TypeOf((*VmotionInterfaceNotEnabledFault)(nil)).Elem()
+}
+
+type VmwareDistributedVirtualSwitchPvlanSpec struct {
+	VmwareDistributedVirtualSwitchVlanSpec
+
+	PvlanId int32 `xml:"pvlanId"`
+}
+
+func init() {
+	t["VmwareDistributedVirtualSwitchPvlanSpec"] = reflect.TypeOf((*VmwareDistributedVirtualSwitchPvlanSpec)(nil)).Elem()
+}
+
+type VmwareDistributedVirtualSwitchTrunkVlanSpec struct {
+	VmwareDistributedVirtualSwitchVlanSpec
+
+	VlanId []NumericRange `xml:"vlanId"`
+}
+
+func init() {
+	t["VmwareDistributedVirtualSwitchTrunkVlanSpec"] = reflect.TypeOf((*VmwareDistributedVirtualSwitchTrunkVlanSpec)(nil)).Elem()
+}
+
+type VmwareDistributedVirtualSwitchVlanIdSpec struct {
+	VmwareDistributedVirtualSwitchVlanSpec
+
+	VlanId int32 `xml:"vlanId"`
+}
+
+func init() {
+	t["VmwareDistributedVirtualSwitchVlanIdSpec"] = reflect.TypeOf((*VmwareDistributedVirtualSwitchVlanIdSpec)(nil)).Elem()
+}
+
+type VmwareDistributedVirtualSwitchVlanSpec struct {
+	InheritablePolicy
+}
+
+func init() {
+	t["VmwareDistributedVirtualSwitchVlanSpec"] = reflect.TypeOf((*VmwareDistributedVirtualSwitchVlanSpec)(nil)).Elem()
+}
+
+type VmwareUplinkPortTeamingPolicy struct {
+	InheritablePolicy
+
+	Policy          *StringPolicy                `xml:"policy,omitempty"`
+	ReversePolicy   *BoolPolicy                  `xml:"reversePolicy,omitempty"`
+	NotifySwitches  *BoolPolicy                  `xml:"notifySwitches,omitempty"`
+	RollingOrder    *BoolPolicy                  `xml:"rollingOrder,omitempty"`
+	FailureCriteria *DVSFailureCriteria          `xml:"failureCriteria,omitempty"`
+	UplinkPortOrder *VMwareUplinkPortOrderPolicy `xml:"uplinkPortOrder,omitempty"`
+}
+
+func init() {
+	t["VmwareUplinkPortTeamingPolicy"] = reflect.TypeOf((*VmwareUplinkPortTeamingPolicy)(nil)).Elem()
+}
+
+type VnicPortArgument struct {
+	DynamicData
+
+	Vnic string                                 `xml:"vnic"`
+	Port DistributedVirtualSwitchPortConnection `xml:"port"`
+}
+
+func init() {
+	t["VnicPortArgument"] = reflect.TypeOf((*VnicPortArgument)(nil)).Elem()
+}
+
+type VolumeEditorError struct {
+	CustomizationFault
+}
+
+func init() {
+	t["VolumeEditorError"] = reflect.TypeOf((*VolumeEditorError)(nil)).Elem()
+}
+
+type VolumeEditorErrorFault VolumeEditorError
+
+func init() {
+	t["VolumeEditorErrorFault"] = reflect.TypeOf((*VolumeEditorErrorFault)(nil)).Elem()
+}
+
+type VramLimitLicense struct {
+	NotEnoughLicenses
+
+	Limit int32 `xml:"limit"`
+}
+
+func init() {
+	t["VramLimitLicense"] = reflect.TypeOf((*VramLimitLicense)(nil)).Elem()
+}
+
+type VramLimitLicenseFault VramLimitLicense
+
+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
+
+	Enabled       *bool                                 `xml:"enabled"`
+	DefaultConfig *VsanClusterConfigInfoHostDefaultInfo `xml:"defaultConfig,omitempty"`
+}
+
+func init() {
+	t["VsanClusterConfigInfo"] = reflect.TypeOf((*VsanClusterConfigInfo)(nil)).Elem()
+}
+
+type VsanClusterConfigInfoHostDefaultInfo struct {
+	DynamicData
+
+	Uuid             string `xml:"uuid,omitempty"`
+	AutoClaimStorage *bool  `xml:"autoClaimStorage"`
+	ChecksumEnabled  *bool  `xml:"checksumEnabled"`
+}
+
+func init() {
+	t["VsanClusterConfigInfoHostDefaultInfo"] = reflect.TypeOf((*VsanClusterConfigInfoHostDefaultInfo)(nil)).Elem()
+}
+
+type VsanClusterUuidMismatch struct {
+	CannotMoveVsanEnabledHost
+
+	HostClusterUuid        string `xml:"hostClusterUuid"`
+	DestinationClusterUuid string `xml:"destinationClusterUuid"`
+}
+
+func init() {
+	t["VsanClusterUuidMismatch"] = reflect.TypeOf((*VsanClusterUuidMismatch)(nil)).Elem()
+}
+
+type VsanClusterUuidMismatchFault VsanClusterUuidMismatch
+
+func init() {
+	t["VsanClusterUuidMismatchFault"] = reflect.TypeOf((*VsanClusterUuidMismatchFault)(nil)).Elem()
+}
+
+type VsanDiskFault struct {
+	VsanFault
+
+	Device string `xml:"device,omitempty"`
+}
+
+func init() {
+	t["VsanDiskFault"] = reflect.TypeOf((*VsanDiskFault)(nil)).Elem()
+}
+
+type VsanDiskFaultFault BaseVsanDiskFault
+
+func init() {
+	t["VsanDiskFaultFault"] = reflect.TypeOf((*VsanDiskFaultFault)(nil)).Elem()
+}
+
+type VsanFault struct {
+	VimFault
+}
+
+func init() {
+	t["VsanFault"] = reflect.TypeOf((*VsanFault)(nil)).Elem()
+}
+
+type VsanFaultFault BaseVsanFault
+
+func init() {
+	t["VsanFaultFault"] = reflect.TypeOf((*VsanFaultFault)(nil)).Elem()
+}
+
+type VsanHostClusterStatus struct {
+	DynamicData
+
+	Uuid       string                     `xml:"uuid,omitempty"`
+	NodeUuid   string                     `xml:"nodeUuid,omitempty"`
+	Health     string                     `xml:"health"`
+	NodeState  VsanHostClusterStatusState `xml:"nodeState"`
+	MemberUuid []string                   `xml:"memberUuid,omitempty"`
+}
+
+func init() {
+	t["VsanHostClusterStatus"] = reflect.TypeOf((*VsanHostClusterStatus)(nil)).Elem()
+}
+
+type VsanHostClusterStatusState struct {
+	DynamicData
+
+	State      string                                        `xml:"state"`
+	Completion *VsanHostClusterStatusStateCompletionEstimate `xml:"completion,omitempty"`
+}
+
+func init() {
+	t["VsanHostClusterStatusState"] = reflect.TypeOf((*VsanHostClusterStatusState)(nil)).Elem()
+}
+
+type VsanHostClusterStatusStateCompletionEstimate struct {
+	DynamicData
+
+	CompleteTime    *time.Time `xml:"completeTime"`
+	PercentComplete int32      `xml:"percentComplete,omitempty"`
+}
+
+func init() {
+	t["VsanHostClusterStatusStateCompletionEstimate"] = reflect.TypeOf((*VsanHostClusterStatusStateCompletionEstimate)(nil)).Elem()
+}
+
+type VsanHostConfigInfo struct {
+	DynamicData
+
+	Enabled         *bool                          `xml:"enabled"`
+	HostSystem      *ManagedObjectReference        `xml:"hostSystem,omitempty"`
+	ClusterInfo     *VsanHostConfigInfoClusterInfo `xml:"clusterInfo,omitempty"`
+	StorageInfo     *VsanHostConfigInfoStorageInfo `xml:"storageInfo,omitempty"`
+	NetworkInfo     *VsanHostConfigInfoNetworkInfo `xml:"networkInfo,omitempty"`
+	FaultDomainInfo *VsanHostFaultDomainInfo       `xml:"faultDomainInfo,omitempty"`
+}
+
+func init() {
+	t["VsanHostConfigInfo"] = reflect.TypeOf((*VsanHostConfigInfo)(nil)).Elem()
+}
+
+type VsanHostConfigInfoClusterInfo struct {
+	DynamicData
+
+	Uuid     string `xml:"uuid,omitempty"`
+	NodeUuid string `xml:"nodeUuid,omitempty"`
+}
+
+func init() {
+	t["VsanHostConfigInfoClusterInfo"] = reflect.TypeOf((*VsanHostConfigInfoClusterInfo)(nil)).Elem()
+}
+
+type VsanHostConfigInfoNetworkInfo struct {
+	DynamicData
+
+	Port []VsanHostConfigInfoNetworkInfoPortConfig `xml:"port,omitempty"`
+}
+
+func init() {
+	t["VsanHostConfigInfoNetworkInfo"] = reflect.TypeOf((*VsanHostConfigInfoNetworkInfo)(nil)).Elem()
+}
+
+type VsanHostConfigInfoNetworkInfoPortConfig struct {
+	DynamicData
+
+	IpConfig *VsanHostIpConfig `xml:"ipConfig,omitempty"`
+	Device   string            `xml:"device"`
+}
+
+func init() {
+	t["VsanHostConfigInfoNetworkInfoPortConfig"] = reflect.TypeOf((*VsanHostConfigInfoNetworkInfoPortConfig)(nil)).Elem()
+}
+
+type VsanHostConfigInfoStorageInfo struct {
+	DynamicData
+
+	AutoClaimStorage *bool                 `xml:"autoClaimStorage"`
+	DiskMapping      []VsanHostDiskMapping `xml:"diskMapping,omitempty"`
+	DiskMapInfo      []VsanHostDiskMapInfo `xml:"diskMapInfo,omitempty"`
+	ChecksumEnabled  *bool                 `xml:"checksumEnabled"`
+}
+
+func init() {
+	t["VsanHostConfigInfoStorageInfo"] = reflect.TypeOf((*VsanHostConfigInfoStorageInfo)(nil)).Elem()
+}
+
+type VsanHostDecommissionMode struct {
+	DynamicData
+
+	ObjectAction string `xml:"objectAction"`
+}
+
+func init() {
+	t["VsanHostDecommissionMode"] = reflect.TypeOf((*VsanHostDecommissionMode)(nil)).Elem()
+}
+
+type VsanHostDiskMapInfo struct {
+	DynamicData
+
+	Mapping VsanHostDiskMapping `xml:"mapping"`
+	Mounted bool                `xml:"mounted"`
+}
+
+func init() {
+	t["VsanHostDiskMapInfo"] = reflect.TypeOf((*VsanHostDiskMapInfo)(nil)).Elem()
+}
+
+type VsanHostDiskMapResult struct {
+	DynamicData
+
+	Mapping    VsanHostDiskMapping   `xml:"mapping"`
+	DiskResult []VsanHostDiskResult  `xml:"diskResult,omitempty"`
+	Error      *LocalizedMethodFault `xml:"error,omitempty"`
+}
+
+func init() {
+	t["VsanHostDiskMapResult"] = reflect.TypeOf((*VsanHostDiskMapResult)(nil)).Elem()
+}
+
+type VsanHostDiskMapping struct {
+	DynamicData
+
+	Ssd    HostScsiDisk   `xml:"ssd"`
+	NonSsd []HostScsiDisk `xml:"nonSsd"`
+}
+
+func init() {
+	t["VsanHostDiskMapping"] = reflect.TypeOf((*VsanHostDiskMapping)(nil)).Elem()
+}
+
+type VsanHostDiskResult struct {
+	DynamicData
+
+	Disk     HostScsiDisk          `xml:"disk"`
+	State    string                `xml:"state"`
+	VsanUuid string                `xml:"vsanUuid,omitempty"`
+	Error    *LocalizedMethodFault `xml:"error,omitempty"`
+	Degraded *bool                 `xml:"degraded"`
+}
+
+func init() {
+	t["VsanHostDiskResult"] = reflect.TypeOf((*VsanHostDiskResult)(nil)).Elem()
+}
+
+type VsanHostFaultDomainInfo struct {
+	DynamicData
+
+	Name string `xml:"name"`
+}
+
+func init() {
+	t["VsanHostFaultDomainInfo"] = reflect.TypeOf((*VsanHostFaultDomainInfo)(nil)).Elem()
+}
+
+type VsanHostIpConfig struct {
+	DynamicData
+
+	UpstreamIpAddress   string `xml:"upstreamIpAddress"`
+	DownstreamIpAddress string `xml:"downstreamIpAddress"`
+}
+
+func init() {
+	t["VsanHostIpConfig"] = reflect.TypeOf((*VsanHostIpConfig)(nil)).Elem()
+}
+
+type VsanHostMembershipInfo struct {
+	DynamicData
+
+	NodeUuid string `xml:"nodeUuid"`
+	Hostname string `xml:"hostname"`
+}
+
+func init() {
+	t["VsanHostMembershipInfo"] = reflect.TypeOf((*VsanHostMembershipInfo)(nil)).Elem()
+}
+
+type VsanHostRuntimeInfo struct {
+	DynamicData
+
+	MembershipList []VsanHostMembershipInfo       `xml:"membershipList,omitempty"`
+	DiskIssues     []VsanHostRuntimeInfoDiskIssue `xml:"diskIssues,omitempty"`
+	AccessGenNo    int32                          `xml:"accessGenNo,omitempty"`
+}
+
+func init() {
+	t["VsanHostRuntimeInfo"] = reflect.TypeOf((*VsanHostRuntimeInfo)(nil)).Elem()
+}
+
+type VsanHostRuntimeInfoDiskIssue struct {
+	DynamicData
+
+	DiskId string `xml:"diskId"`
+	Issue  string `xml:"issue"`
+}
+
+func init() {
+	t["VsanHostRuntimeInfoDiskIssue"] = reflect.TypeOf((*VsanHostRuntimeInfoDiskIssue)(nil)).Elem()
+}
+
+type VsanHostVsanDiskInfo struct {
+	DynamicData
+
+	VsanUuid      string `xml:"vsanUuid"`
+	FormatVersion int32  `xml:"formatVersion"`
+}
+
+func init() {
+	t["VsanHostVsanDiskInfo"] = reflect.TypeOf((*VsanHostVsanDiskInfo)(nil)).Elem()
+}
+
+type VsanIncompatibleDiskMapping struct {
+	VsanDiskFault
+}
+
+func init() {
+	t["VsanIncompatibleDiskMapping"] = reflect.TypeOf((*VsanIncompatibleDiskMapping)(nil)).Elem()
+}
+
+type VsanIncompatibleDiskMappingFault VsanIncompatibleDiskMapping
+
+func init() {
+	t["VsanIncompatibleDiskMappingFault"] = reflect.TypeOf((*VsanIncompatibleDiskMappingFault)(nil)).Elem()
+}
+
+type VsanNewPolicyBatch struct {
+	DynamicData
+
+	Size   []int64 `xml:"size,omitempty"`
+	Policy string  `xml:"policy,omitempty"`
+}
+
+func init() {
+	t["VsanNewPolicyBatch"] = reflect.TypeOf((*VsanNewPolicyBatch)(nil)).Elem()
+}
+
+type VsanPolicyChangeBatch struct {
+	DynamicData
+
+	Uuid   []string `xml:"uuid,omitempty"`
+	Policy string   `xml:"policy,omitempty"`
+}
+
+func init() {
+	t["VsanPolicyChangeBatch"] = reflect.TypeOf((*VsanPolicyChangeBatch)(nil)).Elem()
+}
+
+type VsanPolicyCost struct {
+	DynamicData
+
+	ChangeDataSize                      int64   `xml:"changeDataSize,omitempty"`
+	CurrentDataSize                     int64   `xml:"currentDataSize,omitempty"`
+	TempDataSize                        int64   `xml:"tempDataSize,omitempty"`
+	CopyDataSize                        int64   `xml:"copyDataSize,omitempty"`
+	ChangeFlashReadCacheSize            int64   `xml:"changeFlashReadCacheSize,omitempty"`
+	CurrentFlashReadCacheSize           int64   `xml:"currentFlashReadCacheSize,omitempty"`
+	CurrentDiskSpaceToAddressSpaceRatio float32 `xml:"currentDiskSpaceToAddressSpaceRatio,omitempty"`
+	DiskSpaceToAddressSpaceRatio        float32 `xml:"diskSpaceToAddressSpaceRatio,omitempty"`
+}
+
+func init() {
+	t["VsanPolicyCost"] = reflect.TypeOf((*VsanPolicyCost)(nil)).Elem()
+}
+
+type VsanPolicySatisfiability struct {
+	DynamicData
+
+	Uuid          string              `xml:"uuid,omitempty"`
+	IsSatisfiable bool                `xml:"isSatisfiable"`
+	Reason        *LocalizableMessage `xml:"reason,omitempty"`
+	Cost          *VsanPolicyCost     `xml:"cost,omitempty"`
+}
+
+func init() {
+	t["VsanPolicySatisfiability"] = reflect.TypeOf((*VsanPolicySatisfiability)(nil)).Elem()
+}
+
+type VsanUpgradeSystemAPIBrokenIssue struct {
+	VsanUpgradeSystemPreflightCheckIssue
+
+	Hosts []ManagedObjectReference `xml:"hosts"`
+}
+
+func init() {
+	t["VsanUpgradeSystemAPIBrokenIssue"] = reflect.TypeOf((*VsanUpgradeSystemAPIBrokenIssue)(nil)).Elem()
+}
+
+type VsanUpgradeSystemAutoClaimEnabledOnHostsIssue struct {
+	VsanUpgradeSystemPreflightCheckIssue
+
+	Hosts []ManagedObjectReference `xml:"hosts"`
+}
+
+func init() {
+	t["VsanUpgradeSystemAutoClaimEnabledOnHostsIssue"] = reflect.TypeOf((*VsanUpgradeSystemAutoClaimEnabledOnHostsIssue)(nil)).Elem()
+}
+
+type VsanUpgradeSystemHostsDisconnectedIssue struct {
+	VsanUpgradeSystemPreflightCheckIssue
+
+	Hosts []ManagedObjectReference `xml:"hosts"`
+}
+
+func init() {
+	t["VsanUpgradeSystemHostsDisconnectedIssue"] = reflect.TypeOf((*VsanUpgradeSystemHostsDisconnectedIssue)(nil)).Elem()
+}
+
+type VsanUpgradeSystemMissingHostsInClusterIssue struct {
+	VsanUpgradeSystemPreflightCheckIssue
+
+	Hosts []ManagedObjectReference `xml:"hosts"`
+}
+
+func init() {
+	t["VsanUpgradeSystemMissingHostsInClusterIssue"] = reflect.TypeOf((*VsanUpgradeSystemMissingHostsInClusterIssue)(nil)).Elem()
+}
+
+type VsanUpgradeSystemNetworkPartitionInfo struct {
+	DynamicData
+
+	Hosts []ManagedObjectReference `xml:"hosts"`
+}
+
+func init() {
+	t["VsanUpgradeSystemNetworkPartitionInfo"] = reflect.TypeOf((*VsanUpgradeSystemNetworkPartitionInfo)(nil)).Elem()
+}
+
+type VsanUpgradeSystemNetworkPartitionIssue struct {
+	VsanUpgradeSystemPreflightCheckIssue
+
+	Partitions []VsanUpgradeSystemNetworkPartitionInfo `xml:"partitions"`
+}
+
+func init() {
+	t["VsanUpgradeSystemNetworkPartitionIssue"] = reflect.TypeOf((*VsanUpgradeSystemNetworkPartitionIssue)(nil)).Elem()
+}
+
+type VsanUpgradeSystemNotEnoughFreeCapacityIssue struct {
+	VsanUpgradeSystemPreflightCheckIssue
+
+	ReducedRedundancyUpgradePossible bool `xml:"reducedRedundancyUpgradePossible"`
+}
+
+func init() {
+	t["VsanUpgradeSystemNotEnoughFreeCapacityIssue"] = reflect.TypeOf((*VsanUpgradeSystemNotEnoughFreeCapacityIssue)(nil)).Elem()
+}
+
+type VsanUpgradeSystemPreflightCheckIssue struct {
+	DynamicData
+
+	Msg string `xml:"msg"`
+}
+
+func init() {
+	t["VsanUpgradeSystemPreflightCheckIssue"] = reflect.TypeOf((*VsanUpgradeSystemPreflightCheckIssue)(nil)).Elem()
+}
+
+type VsanUpgradeSystemPreflightCheckResult struct {
+	DynamicData
+
+	Issues               []BaseVsanUpgradeSystemPreflightCheckIssue `xml:"issues,omitempty,typeattr"`
+	DiskMappingToRestore *VsanHostDiskMapping                       `xml:"diskMappingToRestore,omitempty"`
+}
+
+func init() {
+	t["VsanUpgradeSystemPreflightCheckResult"] = reflect.TypeOf((*VsanUpgradeSystemPreflightCheckResult)(nil)).Elem()
+}
+
+type VsanUpgradeSystemRogueHostsInClusterIssue struct {
+	VsanUpgradeSystemPreflightCheckIssue
+
+	Uuids []string `xml:"uuids"`
+}
+
+func init() {
+	t["VsanUpgradeSystemRogueHostsInClusterIssue"] = reflect.TypeOf((*VsanUpgradeSystemRogueHostsInClusterIssue)(nil)).Elem()
+}
+
+type VsanUpgradeSystemUpgradeHistoryDiskGroupOp struct {
+	VsanUpgradeSystemUpgradeHistoryItem
+
+	Operation   string              `xml:"operation"`
+	DiskMapping VsanHostDiskMapping `xml:"diskMapping"`
+}
+
+func init() {
+	t["VsanUpgradeSystemUpgradeHistoryDiskGroupOp"] = reflect.TypeOf((*VsanUpgradeSystemUpgradeHistoryDiskGroupOp)(nil)).Elem()
+}
+
+type VsanUpgradeSystemUpgradeHistoryItem struct {
+	DynamicData
+
+	Timestamp time.Time               `xml:"timestamp"`
+	Host      *ManagedObjectReference `xml:"host,omitempty"`
+	Message   string                  `xml:"message"`
+	Task      *ManagedObjectReference `xml:"task,omitempty"`
+}
+
+func init() {
+	t["VsanUpgradeSystemUpgradeHistoryItem"] = reflect.TypeOf((*VsanUpgradeSystemUpgradeHistoryItem)(nil)).Elem()
+}
+
+type VsanUpgradeSystemUpgradeHistoryPreflightFail struct {
+	VsanUpgradeSystemUpgradeHistoryItem
+
+	PreflightResult VsanUpgradeSystemPreflightCheckResult `xml:"preflightResult"`
+}
+
+func init() {
+	t["VsanUpgradeSystemUpgradeHistoryPreflightFail"] = reflect.TypeOf((*VsanUpgradeSystemUpgradeHistoryPreflightFail)(nil)).Elem()
+}
+
+type VsanUpgradeSystemUpgradeStatus struct {
+	DynamicData
+
+	InProgress bool                                      `xml:"inProgress"`
+	History    []BaseVsanUpgradeSystemUpgradeHistoryItem `xml:"history,omitempty,typeattr"`
+	Aborted    *bool                                     `xml:"aborted"`
+	Completed  *bool                                     `xml:"completed"`
+	Progress   int32                                     `xml:"progress,omitempty"`
+}
+
+func init() {
+	t["VsanUpgradeSystemUpgradeStatus"] = reflect.TypeOf((*VsanUpgradeSystemUpgradeStatus)(nil)).Elem()
+}
+
+type VsanUpgradeSystemV2ObjectsPresentDuringDowngradeIssue struct {
+	VsanUpgradeSystemPreflightCheckIssue
+
+	Uuids []string `xml:"uuids"`
+}
+
+func init() {
+	t["VsanUpgradeSystemV2ObjectsPresentDuringDowngradeIssue"] = reflect.TypeOf((*VsanUpgradeSystemV2ObjectsPresentDuringDowngradeIssue)(nil)).Elem()
+}
+
+type VsanUpgradeSystemWrongEsxVersionIssue struct {
+	VsanUpgradeSystemPreflightCheckIssue
+
+	Hosts []ManagedObjectReference `xml:"hosts"`
+}
+
+func init() {
+	t["VsanUpgradeSystemWrongEsxVersionIssue"] = reflect.TypeOf((*VsanUpgradeSystemWrongEsxVersionIssue)(nil)).Elem()
+}
+
+type VslmCloneSpec struct {
+	VslmMigrateSpec
+
+	Name string `xml:"name"`
+}
+
+func init() {
+	t["VslmCloneSpec"] = reflect.TypeOf((*VslmCloneSpec)(nil)).Elem()
+}
+
+type VslmCreateSpec struct {
+	DynamicData
+
+	Name         string                        `xml:"name"`
+	BackingSpec  BaseVslmCreateSpecBackingSpec `xml:"backingSpec,typeattr"`
+	CapacityInMB int64                         `xml:"capacityInMB"`
+}
+
+func init() {
+	t["VslmCreateSpec"] = reflect.TypeOf((*VslmCreateSpec)(nil)).Elem()
+}
+
+type VslmCreateSpecBackingSpec struct {
+	DynamicData
+
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["VslmCreateSpecBackingSpec"] = reflect.TypeOf((*VslmCreateSpecBackingSpec)(nil)).Elem()
+}
+
+type VslmCreateSpecDiskFileBackingSpec struct {
+	VslmCreateSpecBackingSpec
+
+	ProvisioningType string `xml:"provisioningType,omitempty"`
+}
+
+func init() {
+	t["VslmCreateSpecDiskFileBackingSpec"] = reflect.TypeOf((*VslmCreateSpecDiskFileBackingSpec)(nil)).Elem()
+}
+
+type VslmCreateSpecRawDiskMappingBackingSpec struct {
+	VslmCreateSpecBackingSpec
+
+	LunUuid           string `xml:"lunUuid"`
+	CompatibilityMode string `xml:"compatibilityMode"`
+}
+
+func init() {
+	t["VslmCreateSpecRawDiskMappingBackingSpec"] = reflect.TypeOf((*VslmCreateSpecRawDiskMappingBackingSpec)(nil)).Elem()
+}
+
+type VslmMigrateSpec struct {
+	DynamicData
+
+	BackingSpec BaseVslmCreateSpecBackingSpec `xml:"backingSpec,typeattr"`
+	Consolidate *bool                         `xml:"consolidate"`
+}
+
+func init() {
+	t["VslmMigrateSpec"] = reflect.TypeOf((*VslmMigrateSpec)(nil)).Elem()
+}
+
+type VslmRelocateSpec struct {
+	VslmMigrateSpec
+}
+
+func init() {
+	t["VslmRelocateSpec"] = reflect.TypeOf((*VslmRelocateSpec)(nil)).Elem()
+}
+
+type VslmTagEntry struct {
+	DynamicData
+
+	TagName            string `xml:"tagName"`
+	ParentCategoryName string `xml:"parentCategoryName"`
+}
+
+func init() {
+	t["VslmTagEntry"] = reflect.TypeOf((*VslmTagEntry)(nil)).Elem()
+}
+
+type VspanDestPortConflict struct {
+	DvsFault
+
+	VspanSessionKey1 string `xml:"vspanSessionKey1"`
+	VspanSessionKey2 string `xml:"vspanSessionKey2"`
+	PortKey          string `xml:"portKey"`
+}
+
+func init() {
+	t["VspanDestPortConflict"] = reflect.TypeOf((*VspanDestPortConflict)(nil)).Elem()
+}
+
+type VspanDestPortConflictFault VspanDestPortConflict
+
+func init() {
+	t["VspanDestPortConflictFault"] = reflect.TypeOf((*VspanDestPortConflictFault)(nil)).Elem()
+}
+
+type VspanPortConflict struct {
+	DvsFault
+
+	VspanSessionKey1 string `xml:"vspanSessionKey1"`
+	VspanSessionKey2 string `xml:"vspanSessionKey2"`
+	PortKey          string `xml:"portKey"`
+}
+
+func init() {
+	t["VspanPortConflict"] = reflect.TypeOf((*VspanPortConflict)(nil)).Elem()
+}
+
+type VspanPortConflictFault VspanPortConflict
+
+func init() {
+	t["VspanPortConflictFault"] = reflect.TypeOf((*VspanPortConflictFault)(nil)).Elem()
+}
+
+type VspanPortMoveFault struct {
+	DvsFault
+
+	SrcPortgroupName  string `xml:"srcPortgroupName"`
+	DestPortgroupName string `xml:"destPortgroupName"`
+	PortKey           string `xml:"portKey"`
+}
+
+func init() {
+	t["VspanPortMoveFault"] = reflect.TypeOf((*VspanPortMoveFault)(nil)).Elem()
+}
+
+type VspanPortMoveFaultFault VspanPortMoveFault
+
+func init() {
+	t["VspanPortMoveFaultFault"] = reflect.TypeOf((*VspanPortMoveFaultFault)(nil)).Elem()
+}
+
+type VspanPortPromiscChangeFault struct {
+	DvsFault
+
+	PortKey string `xml:"portKey"`
+}
+
+func init() {
+	t["VspanPortPromiscChangeFault"] = reflect.TypeOf((*VspanPortPromiscChangeFault)(nil)).Elem()
+}
+
+type VspanPortPromiscChangeFaultFault VspanPortPromiscChangeFault
+
+func init() {
+	t["VspanPortPromiscChangeFaultFault"] = reflect.TypeOf((*VspanPortPromiscChangeFaultFault)(nil)).Elem()
+}
+
+type VspanPortgroupPromiscChangeFault struct {
+	DvsFault
+
+	PortgroupName string `xml:"portgroupName"`
+}
+
+func init() {
+	t["VspanPortgroupPromiscChangeFault"] = reflect.TypeOf((*VspanPortgroupPromiscChangeFault)(nil)).Elem()
+}
+
+type VspanPortgroupPromiscChangeFaultFault VspanPortgroupPromiscChangeFault
+
+func init() {
+	t["VspanPortgroupPromiscChangeFaultFault"] = reflect.TypeOf((*VspanPortgroupPromiscChangeFaultFault)(nil)).Elem()
+}
+
+type VspanPortgroupTypeChangeFault struct {
+	DvsFault
+
+	PortgroupName string `xml:"portgroupName"`
+}
+
+func init() {
+	t["VspanPortgroupTypeChangeFault"] = reflect.TypeOf((*VspanPortgroupTypeChangeFault)(nil)).Elem()
+}
+
+type VspanPortgroupTypeChangeFaultFault VspanPortgroupTypeChangeFault
+
+func init() {
+	t["VspanPortgroupTypeChangeFaultFault"] = reflect.TypeOf((*VspanPortgroupTypeChangeFaultFault)(nil)).Elem()
+}
+
+type VspanPromiscuousPortNotSupported struct {
+	DvsFault
+
+	VspanSessionKey string `xml:"vspanSessionKey"`
+	PortKey         string `xml:"portKey"`
+}
+
+func init() {
+	t["VspanPromiscuousPortNotSupported"] = reflect.TypeOf((*VspanPromiscuousPortNotSupported)(nil)).Elem()
+}
+
+type VspanPromiscuousPortNotSupportedFault VspanPromiscuousPortNotSupported
+
+func init() {
+	t["VspanPromiscuousPortNotSupportedFault"] = reflect.TypeOf((*VspanPromiscuousPortNotSupportedFault)(nil)).Elem()
+}
+
+type VspanSameSessionPortConflict struct {
+	DvsFault
+
+	VspanSessionKey string `xml:"vspanSessionKey"`
+	PortKey         string `xml:"portKey"`
+}
+
+func init() {
+	t["VspanSameSessionPortConflict"] = reflect.TypeOf((*VspanSameSessionPortConflict)(nil)).Elem()
+}
+
+type VspanSameSessionPortConflictFault VspanSameSessionPortConflict
+
+func init() {
+	t["VspanSameSessionPortConflictFault"] = reflect.TypeOf((*VspanSameSessionPortConflictFault)(nil)).Elem()
+}
+
+type VvolDatastoreInfo struct {
+	DatastoreInfo
+
+	VvolDS *HostVvolVolume `xml:"vvolDS,omitempty"`
+}
+
+func init() {
+	t["VvolDatastoreInfo"] = reflect.TypeOf((*VvolDatastoreInfo)(nil)).Elem()
+}
+
+type WaitForUpdates WaitForUpdatesRequestType
+
+func init() {
+	t["WaitForUpdates"] = reflect.TypeOf((*WaitForUpdates)(nil)).Elem()
+}
+
+type WaitForUpdatesEx WaitForUpdatesExRequestType
+
+func init() {
+	t["WaitForUpdatesEx"] = reflect.TypeOf((*WaitForUpdatesEx)(nil)).Elem()
+}
+
+type WaitForUpdatesExRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Version string                 `xml:"version,omitempty"`
+	Options *WaitOptions           `xml:"options,omitempty"`
+}
+
+func init() {
+	t["WaitForUpdatesExRequestType"] = reflect.TypeOf((*WaitForUpdatesExRequestType)(nil)).Elem()
+}
+
+type WaitForUpdatesExResponse struct {
+	Returnval *UpdateSet `xml:"returnval,omitempty"`
+}
+
+type WaitForUpdatesRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Version string                 `xml:"version,omitempty"`
+}
+
+func init() {
+	t["WaitForUpdatesRequestType"] = reflect.TypeOf((*WaitForUpdatesRequestType)(nil)).Elem()
+}
+
+type WaitForUpdatesResponse struct {
+	Returnval UpdateSet `xml:"returnval"`
+}
+
+type WaitOptions struct {
+	DynamicData
+
+	MaxWaitSeconds   int32 `xml:"maxWaitSeconds,omitempty"`
+	MaxObjectUpdates int32 `xml:"maxObjectUpdates,omitempty"`
+}
+
+func init() {
+	t["WaitOptions"] = reflect.TypeOf((*WaitOptions)(nil)).Elem()
+}
+
+type WakeOnLanNotSupported struct {
+	VirtualHardwareCompatibilityIssue
+}
+
+func init() {
+	t["WakeOnLanNotSupported"] = reflect.TypeOf((*WakeOnLanNotSupported)(nil)).Elem()
+}
+
+type WakeOnLanNotSupportedByVmotionNIC struct {
+	HostPowerOpFailed
+}
+
+func init() {
+	t["WakeOnLanNotSupportedByVmotionNIC"] = reflect.TypeOf((*WakeOnLanNotSupportedByVmotionNIC)(nil)).Elem()
+}
+
+type WakeOnLanNotSupportedByVmotionNICFault WakeOnLanNotSupportedByVmotionNIC
+
+func init() {
+	t["WakeOnLanNotSupportedByVmotionNICFault"] = reflect.TypeOf((*WakeOnLanNotSupportedByVmotionNICFault)(nil)).Elem()
+}
+
+type WakeOnLanNotSupportedFault WakeOnLanNotSupported
+
+func init() {
+	t["WakeOnLanNotSupportedFault"] = reflect.TypeOf((*WakeOnLanNotSupportedFault)(nil)).Elem()
+}
+
+type WarningUpgradeEvent struct {
+	UpgradeEvent
+}
+
+func init() {
+	t["WarningUpgradeEvent"] = reflect.TypeOf((*WarningUpgradeEvent)(nil)).Elem()
+}
+
+type WeeklyTaskScheduler struct {
+	DailyTaskScheduler
+
+	Sunday    bool `xml:"sunday"`
+	Monday    bool `xml:"monday"`
+	Tuesday   bool `xml:"tuesday"`
+	Wednesday bool `xml:"wednesday"`
+	Thursday  bool `xml:"thursday"`
+	Friday    bool `xml:"friday"`
+	Saturday  bool `xml:"saturday"`
+}
+
+func init() {
+	t["WeeklyTaskScheduler"] = reflect.TypeOf((*WeeklyTaskScheduler)(nil)).Elem()
+}
+
+type WillLoseHAProtection struct {
+	MigrationFault
+
+	Resolution string `xml:"resolution"`
+}
+
+func init() {
+	t["WillLoseHAProtection"] = reflect.TypeOf((*WillLoseHAProtection)(nil)).Elem()
+}
+
+type WillLoseHAProtectionFault WillLoseHAProtection
+
+func init() {
+	t["WillLoseHAProtectionFault"] = reflect.TypeOf((*WillLoseHAProtectionFault)(nil)).Elem()
+}
+
+type WillModifyConfigCpuRequirements struct {
+	MigrationFault
+}
+
+func init() {
+	t["WillModifyConfigCpuRequirements"] = reflect.TypeOf((*WillModifyConfigCpuRequirements)(nil)).Elem()
+}
+
+type WillModifyConfigCpuRequirementsFault WillModifyConfigCpuRequirements
+
+func init() {
+	t["WillModifyConfigCpuRequirementsFault"] = reflect.TypeOf((*WillModifyConfigCpuRequirementsFault)(nil)).Elem()
+}
+
+type WillResetSnapshotDirectory struct {
+	MigrationFault
+}
+
+func init() {
+	t["WillResetSnapshotDirectory"] = reflect.TypeOf((*WillResetSnapshotDirectory)(nil)).Elem()
+}
+
+type WillResetSnapshotDirectoryFault WillResetSnapshotDirectory
+
+func init() {
+	t["WillResetSnapshotDirectoryFault"] = reflect.TypeOf((*WillResetSnapshotDirectoryFault)(nil)).Elem()
+}
+
+type WinNetBIOSConfigInfo struct {
+	NetBIOSConfigInfo
+
+	PrimaryWINS   string `xml:"primaryWINS"`
+	SecondaryWINS string `xml:"secondaryWINS,omitempty"`
+}
+
+func init() {
+	t["WinNetBIOSConfigInfo"] = reflect.TypeOf((*WinNetBIOSConfigInfo)(nil)).Elem()
+}
+
+type WipeDiskFault struct {
+	VimFault
+}
+
+func init() {
+	t["WipeDiskFault"] = reflect.TypeOf((*WipeDiskFault)(nil)).Elem()
+}
+
+type WipeDiskFaultFault WipeDiskFault
+
+func init() {
+	t["WipeDiskFaultFault"] = reflect.TypeOf((*WipeDiskFaultFault)(nil)).Elem()
+}
+
+type WitnessNodeInfo struct {
+	DynamicData
+
+	IpSettings CustomizationIPSettings `xml:"ipSettings"`
+	BiosUuid   string                  `xml:"biosUuid,omitempty"`
+}
+
+func init() {
+	t["WitnessNodeInfo"] = reflect.TypeOf((*WitnessNodeInfo)(nil)).Elem()
+}
+
+type XmlToCustomizationSpecItem XmlToCustomizationSpecItemRequestType
+
+func init() {
+	t["XmlToCustomizationSpecItem"] = reflect.TypeOf((*XmlToCustomizationSpecItem)(nil)).Elem()
+}
+
+type XmlToCustomizationSpecItemRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	SpecItemXml string                 `xml:"specItemXml"`
+}
+
+func init() {
+	t["XmlToCustomizationSpecItemRequestType"] = reflect.TypeOf((*XmlToCustomizationSpecItemRequestType)(nil)).Elem()
+}
+
+type XmlToCustomizationSpecItemResponse struct {
+	Returnval CustomizationSpecItem `xml:"returnval"`
+}
+
+type ZeroFillVirtualDiskRequestType struct {
+	This       ManagedObjectReference  `xml:"_this"`
+	Name       string                  `xml:"name"`
+	Datacenter *ManagedObjectReference `xml:"datacenter,omitempty"`
+}
+
+func init() {
+	t["ZeroFillVirtualDiskRequestType"] = reflect.TypeOf((*ZeroFillVirtualDiskRequestType)(nil)).Elem()
+}
+
+type ZeroFillVirtualDisk_Task ZeroFillVirtualDiskRequestType
+
+func init() {
+	t["ZeroFillVirtualDisk_Task"] = reflect.TypeOf((*ZeroFillVirtualDisk_Task)(nil)).Elem()
+}
+
+type ZeroFillVirtualDisk_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/types/types_test.go b/vendor/github.com/vmware/govmomi/vim25/types/types_test.go
new file mode 100644
index 0000000000..c89f141653
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/types/types_test.go
@@ -0,0 +1,92 @@
+/*
+Copyright (c) 2014-2015 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 types
+
+import (
+	"testing"
+
+	"github.com/vmware/govmomi/vim25/xml"
+)
+
+func TestVirtualMachineConfigSpec(t *testing.T) {
+	spec := VirtualMachineConfigSpec{
+		Name:     "vm-001",
+		GuestId:  "otherGuest",
+		Files:    &VirtualMachineFileInfo{VmPathName: "[datastore1]"},
+		NumCPUs:  1,
+		MemoryMB: 128,
+		DeviceChange: []BaseVirtualDeviceConfigSpec{
+			&VirtualDeviceConfigSpec{
+				Operation: VirtualDeviceConfigSpecOperationAdd,
+				Device: &VirtualLsiLogicController{VirtualSCSIController{
+					SharedBus: VirtualSCSISharingNoSharing,
+					VirtualController: VirtualController{
+						BusNumber: 0,
+						VirtualDevice: VirtualDevice{
+							Key: 1000,
+						},
+					},
+				}},
+			},
+			&VirtualDeviceConfigSpec{
+				Operation:     VirtualDeviceConfigSpecOperationAdd,
+				FileOperation: VirtualDeviceConfigSpecFileOperationCreate,
+				Device: &VirtualDisk{
+					VirtualDevice: VirtualDevice{
+						Key:           0,
+						ControllerKey: 1000,
+						UnitNumber:    new(int32), // zero default value
+						Backing: &VirtualDiskFlatVer2BackingInfo{
+							DiskMode:        string(VirtualDiskModePersistent),
+							ThinProvisioned: NewBool(true),
+							VirtualDeviceFileBackingInfo: VirtualDeviceFileBackingInfo{
+								FileName: "[datastore1]",
+							},
+						},
+					},
+					CapacityInKB: 4000000,
+				},
+			},
+			&VirtualDeviceConfigSpec{
+				Operation: VirtualDeviceConfigSpecOperationAdd,
+				Device: &VirtualE1000{VirtualEthernetCard{
+					VirtualDevice: VirtualDevice{
+						Key: 0,
+						DeviceInfo: &Description{
+							Label:   "Network Adapter 1",
+							Summary: "VM Network",
+						},
+						Backing: &VirtualEthernetCardNetworkBackingInfo{
+							VirtualDeviceDeviceBackingInfo: VirtualDeviceDeviceBackingInfo{
+								DeviceName: "VM Network",
+							},
+						},
+					},
+					AddressType: string(VirtualEthernetCardMacTypeGenerated),
+				}},
+			},
+		},
+		ExtraConfig: []BaseOptionValue{
+			&OptionValue{Key: "bios.bootOrder", Value: "ethernet0"},
+		},
+	}
+
+	_, err := xml.MarshalIndent(spec, "", " ")
+	if err != nil {
+		t.Fatal(err)
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/xml/LICENSE b/vendor/github.com/vmware/govmomi/vim25/xml/LICENSE
new file mode 100644
index 0000000000..7448756763
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/xml/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2012 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/vmware/govmomi/vim25/xml/atom_test.go b/vendor/github.com/vmware/govmomi/vim25/xml/atom_test.go
new file mode 100644
index 0000000000..a71284312a
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/xml/atom_test.go
@@ -0,0 +1,56 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package xml
+
+import "time"
+
+var atomValue = &Feed{
+	XMLName: Name{"http://www.w3.org/2005/Atom", "feed"},
+	Title:   "Example Feed",
+	Link:    []Link{{Href: "http://example.org/"}},
+	Updated: ParseTime("2003-12-13T18:30:02Z"),
+	Author:  Person{Name: "John Doe"},
+	Id:      "urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6",
+
+	Entry: []Entry{
+		{
+			Title:   "Atom-Powered Robots Run Amok",
+			Link:    []Link{{Href: "http://example.org/2003/12/13/atom03"}},
+			Id:      "urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a",
+			Updated: ParseTime("2003-12-13T18:30:02Z"),
+			Summary: NewText("Some text."),
+		},
+	},
+}
+
+var atomXml = `` +
+	`<feed xmlns="http://www.w3.org/2005/Atom" updated="2003-12-13T18:30:02Z">` +
+	`<title>Example Feed</title>` +
+	`<id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id>` +
+	`<link href="http://example.org/"></link>` +
+	`<author><name>John Doe</name><uri></uri><email></email></author>` +
+	`<entry>` +
+	`<title>Atom-Powered Robots Run Amok</title>` +
+	`<id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>` +
+	`<link href="http://example.org/2003/12/13/atom03"></link>` +
+	`<updated>2003-12-13T18:30:02Z</updated>` +
+	`<author><name></name><uri></uri><email></email></author>` +
+	`<summary>Some text.</summary>` +
+	`</entry>` +
+	`</feed>`
+
+func ParseTime(str string) time.Time {
+	t, err := time.Parse(time.RFC3339, str)
+	if err != nil {
+		panic(err)
+	}
+	return t
+}
+
+func NewText(text string) Text {
+	return Text{
+		Body: text,
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/xml/example_test.go b/vendor/github.com/vmware/govmomi/vim25/xml/example_test.go
new file mode 100644
index 0000000000..becedd5839
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/xml/example_test.go
@@ -0,0 +1,151 @@
+// Copyright 2012 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package xml_test
+
+import (
+	"encoding/xml"
+	"fmt"
+	"os"
+)
+
+func ExampleMarshalIndent() {
+	type Address struct {
+		City, State string
+	}
+	type Person struct {
+		XMLName   xml.Name `xml:"person"`
+		Id        int      `xml:"id,attr"`
+		FirstName string   `xml:"name>first"`
+		LastName  string   `xml:"name>last"`
+		Age       int      `xml:"age"`
+		Height    float32  `xml:"height,omitempty"`
+		Married   bool
+		Address
+		Comment string `xml:",comment"`
+	}
+
+	v := &Person{Id: 13, FirstName: "John", LastName: "Doe", Age: 42}
+	v.Comment = " Need more details. "
+	v.Address = Address{"Hanga Roa", "Easter Island"}
+
+	output, err := xml.MarshalIndent(v, "  ", "    ")
+	if err != nil {
+		fmt.Printf("error: %v\n", err)
+	}
+
+	os.Stdout.Write(output)
+	// Output:
+	//   <person id="13">
+	//       <name>
+	//           <first>John</first>
+	//           <last>Doe</last>
+	//       </name>
+	//       <age>42</age>
+	//       <Married>false</Married>
+	//       <City>Hanga Roa</City>
+	//       <State>Easter Island</State>
+	//       <!-- Need more details. -->
+	//   </person>
+}
+
+func ExampleEncoder() {
+	type Address struct {
+		City, State string
+	}
+	type Person struct {
+		XMLName   xml.Name `xml:"person"`
+		Id        int      `xml:"id,attr"`
+		FirstName string   `xml:"name>first"`
+		LastName  string   `xml:"name>last"`
+		Age       int      `xml:"age"`
+		Height    float32  `xml:"height,omitempty"`
+		Married   bool
+		Address
+		Comment string `xml:",comment"`
+	}
+
+	v := &Person{Id: 13, FirstName: "John", LastName: "Doe", Age: 42}
+	v.Comment = " Need more details. "
+	v.Address = Address{"Hanga Roa", "Easter Island"}
+
+	enc := xml.NewEncoder(os.Stdout)
+	enc.Indent("  ", "    ")
+	if err := enc.Encode(v); err != nil {
+		fmt.Printf("error: %v\n", err)
+	}
+
+	// Output:
+	//   <person id="13">
+	//       <name>
+	//           <first>John</first>
+	//           <last>Doe</last>
+	//       </name>
+	//       <age>42</age>
+	//       <Married>false</Married>
+	//       <City>Hanga Roa</City>
+	//       <State>Easter Island</State>
+	//       <!-- Need more details. -->
+	//   </person>
+}
+
+// This example demonstrates unmarshaling an XML excerpt into a value with
+// some preset fields. Note that the Phone field isn't modified and that
+// the XML <Company> element is ignored. Also, the Groups field is assigned
+// considering the element path provided in its tag.
+func ExampleUnmarshal() {
+	type Email struct {
+		Where string `xml:"where,attr"`
+		Addr  string
+	}
+	type Address struct {
+		City, State string
+	}
+	type Result struct {
+		XMLName xml.Name `xml:"Person"`
+		Name    string   `xml:"FullName"`
+		Phone   string
+		Email   []Email
+		Groups  []string `xml:"Group>Value"`
+		Address
+	}
+	v := Result{Name: "none", Phone: "none"}
+
+	data := `
+		<Person>
+			<FullName>Grace R. Emlin</FullName>
+			<Company>Example Inc.</Company>
+			<Email where="home">
+				<Addr>gre@example.com</Addr>
+			</Email>
+			<Email where='work'>
+				<Addr>gre@work.com</Addr>
+			</Email>
+			<Group>
+				<Value>Friends</Value>
+				<Value>Squash</Value>
+			</Group>
+			<City>Hanga Roa</City>
+			<State>Easter Island</State>
+		</Person>
+	`
+	err := xml.Unmarshal([]byte(data), &v)
+	if err != nil {
+		fmt.Printf("error: %v", err)
+		return
+	}
+	fmt.Printf("XMLName: %#v\n", v.XMLName)
+	fmt.Printf("Name: %q\n", v.Name)
+	fmt.Printf("Phone: %q\n", v.Phone)
+	fmt.Printf("Email: %v\n", v.Email)
+	fmt.Printf("Groups: %v\n", v.Groups)
+	fmt.Printf("Address: %v\n", v.Address)
+	// Output:
+	// XMLName: xml.Name{Space:"", Local:"Person"}
+	// Name: "Grace R. Emlin"
+	// Phone: "none"
+	// Email: [{home gre@example.com} {work gre@work.com}]
+	// Groups: [Friends Squash]
+	// Address: {Hanga Roa Easter Island}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/xml/extras.go b/vendor/github.com/vmware/govmomi/vim25/xml/extras.go
new file mode 100644
index 0000000000..3b7f44b01b
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/xml/extras.go
@@ -0,0 +1,97 @@
+/*
+Copyright (c) 2014 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 xml
+
+import (
+	"reflect"
+	"time"
+)
+
+var xmlSchemaInstance = Name{Space: "http://www.w3.org/2001/XMLSchema-instance", Local: "type"}
+
+var stringToTypeMap = map[string]reflect.Type{
+	"xsd:boolean":       reflect.TypeOf((*bool)(nil)).Elem(),
+	"xsd:byte":          reflect.TypeOf((*int8)(nil)).Elem(),
+	"xsd:short":         reflect.TypeOf((*int16)(nil)).Elem(),
+	"xsd:int":           reflect.TypeOf((*int32)(nil)).Elem(),
+	"xsd:long":          reflect.TypeOf((*int64)(nil)).Elem(),
+	"xsd:unsignedByte":  reflect.TypeOf((*uint8)(nil)).Elem(),
+	"xsd:unsignedShort": reflect.TypeOf((*uint16)(nil)).Elem(),
+	"xsd:unsignedInt":   reflect.TypeOf((*uint32)(nil)).Elem(),
+	"xsd:unsignedLong":  reflect.TypeOf((*uint64)(nil)).Elem(),
+	"xsd:float":         reflect.TypeOf((*float32)(nil)).Elem(),
+	"xsd:double":        reflect.TypeOf((*float64)(nil)).Elem(),
+	"xsd:string":        reflect.TypeOf((*string)(nil)).Elem(),
+	"xsd:dateTime":      reflect.TypeOf((*time.Time)(nil)).Elem(),
+	"xsd:base64Binary":  reflect.TypeOf((*[]byte)(nil)).Elem(),
+}
+
+// Return a reflect.Type for the specified type. Nil if unknown.
+func stringToType(s string) reflect.Type {
+	return stringToTypeMap[s]
+}
+
+// Return a string for the specified reflect.Type. Panic if unknown.
+func typeToString(typ reflect.Type) string {
+	switch typ.Kind() {
+	case reflect.Bool:
+		return "xsd:boolean"
+	case reflect.Int8:
+		return "xsd:byte"
+	case reflect.Int16:
+		return "xsd:short"
+	case reflect.Int32:
+		return "xsd:int"
+	case reflect.Int, reflect.Int64:
+		return "xsd:long"
+	case reflect.Uint8:
+		return "xsd:unsignedByte"
+	case reflect.Uint16:
+		return "xsd:unsignedShort"
+	case reflect.Uint32:
+		return "xsd:unsignedInt"
+	case reflect.Uint, reflect.Uint64:
+		return "xsd:unsignedLong"
+	case reflect.Float32:
+		return "xsd:float"
+	case reflect.Float64:
+		return "xsd:double"
+	case reflect.String:
+		name := typ.Name()
+		if name == "string" {
+			return "xsd:string"
+		}
+		return name
+	case reflect.Struct:
+		if typ == stringToTypeMap["xsd:dateTime"] {
+			return "xsd:dateTime"
+		}
+
+		// Expect any other struct to be handled...
+		return typ.Name()
+	case reflect.Slice:
+		if typ.Elem().Kind() == reflect.Uint8 {
+			return "xsd:base64Binary"
+		}
+	case reflect.Array:
+		if typ.Elem().Kind() == reflect.Uint8 {
+			return "xsd:base64Binary"
+		}
+	}
+
+	panic("don't know what to do for type: " + typ.String())
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/xml/extras_test.go b/vendor/github.com/vmware/govmomi/vim25/xml/extras_test.go
new file mode 100644
index 0000000000..8e200578a5
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/xml/extras_test.go
@@ -0,0 +1,222 @@
+/*
+Copyright (c) 2014 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 xml
+
+import (
+	"bytes"
+	"reflect"
+	"testing"
+	"time"
+)
+
+type MyType struct {
+	Value string
+}
+
+var myTypes = map[string]reflect.Type{
+	"MyType":      reflect.TypeOf(MyType{}),
+	"ValueType":   reflect.TypeOf(ValueType{}),
+	"PointerType": reflect.TypeOf(PointerType{}),
+}
+
+func MyTypes(name string) (reflect.Type, bool) {
+	t, ok := myTypes[name]
+	return t, ok
+}
+
+func TestMarshalWithEmptyInterface(t *testing.T) {
+	var r1, r2 struct {
+		XMLName Name          `xml:"root"`
+		Values  []interface{} `xml:"value,typeattr"`
+	}
+
+	var tests = []struct {
+		Value interface{}
+	}{
+		{Value: bool(true)},
+		{Value: int8(-8)},
+		{Value: int16(-16)},
+		{Value: int32(-32)},
+		{Value: int64(-64)},
+		{Value: uint8(8)},
+		{Value: uint16(16)},
+		{Value: uint32(32)},
+		{Value: uint64(64)},
+		{Value: float32(32.0)},
+		{Value: float64(64.0)},
+		{Value: string("string")},
+		{Value: time.Now()},
+		{Value: ParseTime("2009-10-04T01:35:58+00:00")},
+		{Value: []byte("bytes")},
+		{Value: MyType{Value: "v"}},
+	}
+
+	for _, test := range tests {
+		r1.XMLName.Local = "root"
+		r1.Values = []interface{}{test.Value}
+		r2.XMLName = Name{}
+		r2.Values = nil
+
+		b, err := Marshal(r1)
+		if err != nil {
+			t.Fatalf("Marshal: %s", err)
+		}
+
+		dec := NewDecoder(bytes.NewReader(b))
+		dec.TypeFunc = MyTypes
+		err = dec.Decode(&r2)
+		if err != nil {
+			t.Fatalf("Unmarshal: %s", err)
+		}
+
+		switch r1.Values[0].(type) {
+		case time.Time:
+			if !r1.Values[0].(time.Time).Equal(r2.Values[0].(time.Time)) {
+				t.Errorf("Expected: %#v, actual: %#v", r1, r2)
+			}
+		default:
+			if !reflect.DeepEqual(r1, r2) {
+				t.Errorf("Expected: %#v, actual: %#v", r1, r2)
+			}
+		}
+	}
+}
+
+type VIntf interface {
+	V() string
+}
+
+type ValueType struct {
+	Value string `xml:",chardata"`
+}
+
+type PointerType struct {
+	Value string `xml:",chardata"`
+}
+
+func (t ValueType) V() string {
+	return t.Value
+}
+
+func (t *PointerType) V() string {
+	return t.Value
+}
+
+func TestMarshalWithInterface(t *testing.T) {
+	var r1, r2 struct {
+		XMLName Name    `xml:"root"`
+		Values  []VIntf `xml:"value,typeattr"`
+	}
+
+	r1.XMLName.Local = "root"
+	r1.Values = []VIntf{
+		ValueType{"v1"},
+		&PointerType{"v2"},
+	}
+
+	b, err := Marshal(r1)
+	if err != nil {
+		t.Fatalf("Marshal: %s", err)
+	}
+
+	dec := NewDecoder(bytes.NewReader(b))
+	dec.TypeFunc = MyTypes
+	err = dec.Decode(&r2)
+	if err != nil {
+		t.Fatalf("Unmarshal: %s", err)
+	}
+
+	if !reflect.DeepEqual(r1, r2) {
+		t.Errorf("expected: %#v, actual: %#v", r1, r2)
+	}
+}
+
+type test3iface interface {
+	Value() string
+}
+
+type test3a struct {
+	V string `xml:",chardata"`
+}
+
+func (t test3a) Value() string { return t.V }
+
+type test3b struct {
+	V string `xml:",chardata"`
+}
+
+func (t test3b) Value() string { return t.V }
+
+func TestUnmarshalInterfaceWithoutTypeAttr(t *testing.T) {
+	var r struct {
+		XMLName Name         `xml:"root"`
+		Values  []test3iface `xml:"value,typeattr"`
+	}
+
+	b := `
+	<root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<value xsi:type="test3a">A</value>
+	<value>B</value>
+	</root>
+	`
+
+	fn := func(name string) (reflect.Type, bool) {
+		switch name {
+		case "test3a":
+			return reflect.TypeOf(test3a{}), true
+		case "test3iface":
+			return reflect.TypeOf(test3b{}), true
+		default:
+			return nil, false
+		}
+	}
+
+	dec := NewDecoder(bytes.NewReader([]byte(b)))
+	dec.TypeFunc = fn
+	err := dec.Decode(&r)
+	if err != nil {
+		t.Fatalf("Unmarshal: %s", err)
+	}
+
+	if len(r.Values) != 2 {
+		t.Errorf("Expected 2 values")
+	}
+
+	exps := []struct {
+		Typ reflect.Type
+		Val string
+	}{
+		{
+			Typ: reflect.TypeOf(test3a{}),
+			Val: "A",
+		},
+		{
+			Typ: reflect.TypeOf(test3b{}),
+			Val: "B",
+		},
+	}
+
+	for i, e := range exps {
+		if val := r.Values[i].Value(); val != e.Val {
+			t.Errorf("Expected: %s, got: %s", e.Val, val)
+		}
+
+		if typ := reflect.TypeOf(r.Values[i]); typ.Name() != e.Typ.Name() {
+			t.Errorf("Expected: %s, got: %s", e.Typ.Name(), typ.Name())
+		}
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/xml/marshal.go b/vendor/github.com/vmware/govmomi/vim25/xml/marshal.go
new file mode 100644
index 0000000000..39bbac1d17
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/xml/marshal.go
@@ -0,0 +1,949 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package xml
+
+import (
+	"bufio"
+	"bytes"
+	"encoding"
+	"fmt"
+	"io"
+	"reflect"
+	"strconv"
+	"strings"
+)
+
+const (
+	// A generic XML header suitable for use with the output of Marshal.
+	// This is not automatically added to any output of this package,
+	// it is provided as a convenience.
+	Header = `<?xml version="1.0" encoding="UTF-8"?>` + "\n"
+)
+
+// Marshal returns the XML encoding of v.
+//
+// Marshal handles an array or slice by marshalling each of the elements.
+// Marshal handles a pointer by marshalling the value it points at or, if the
+// pointer is nil, by writing nothing.  Marshal handles an interface value by
+// marshalling the value it contains or, if the interface value is nil, by
+// writing nothing.  Marshal handles all other data by writing one or more XML
+// elements containing the data.
+//
+// The name for the XML elements is taken from, in order of preference:
+//     - the tag on the XMLName field, if the data is a struct
+//     - the value of the XMLName field of type xml.Name
+//     - the tag of the struct field used to obtain the data
+//     - the name of the struct field used to obtain the data
+//     - the name of the marshalled type
+//
+// The XML element for a struct contains marshalled elements for each of the
+// exported fields of the struct, with these exceptions:
+//     - the XMLName field, described above, is omitted.
+//     - a field with tag "-" is omitted.
+//     - a field with tag "name,attr" becomes an attribute with
+//       the given name in the XML element.
+//     - a field with tag ",attr" becomes an attribute with the
+//       field name in the XML element.
+//     - a field with tag ",chardata" is written as character data,
+//       not as an XML element.
+//     - a field with tag ",innerxml" is written verbatim, not subject
+//       to the usual marshalling procedure.
+//     - a field with tag ",comment" is written as an XML comment, not
+//       subject to the usual marshalling procedure. It must not contain
+//       the "--" string within it.
+//     - a field with a tag including the "omitempty" option is omitted
+//       if the field value is empty. The empty values are false, 0, any
+//       nil pointer or interface value, and any array, slice, map, or
+//       string of length zero.
+//     - an anonymous struct field is handled as if the fields of its
+//       value were part of the outer struct.
+//
+// If a field uses a tag "a>b>c", then the element c will be nested inside
+// parent elements a and b.  Fields that appear next to each other that name
+// the same parent will be enclosed in one XML element.
+//
+// See MarshalIndent for an example.
+//
+// Marshal will return an error if asked to marshal a channel, function, or map.
+func Marshal(v interface{}) ([]byte, error) {
+	var b bytes.Buffer
+	if err := NewEncoder(&b).Encode(v); err != nil {
+		return nil, err
+	}
+	return b.Bytes(), nil
+}
+
+// Marshaler is the interface implemented by objects that can marshal
+// themselves into valid XML elements.
+//
+// MarshalXML encodes the receiver as zero or more XML elements.
+// By convention, arrays or slices are typically encoded as a sequence
+// of elements, one per entry.
+// Using start as the element tag is not required, but doing so
+// will enable Unmarshal to match the XML elements to the correct
+// struct field.
+// One common implementation strategy is to construct a separate
+// value with a layout corresponding to the desired XML and then
+// to encode it using e.EncodeElement.
+// Another common strategy is to use repeated calls to e.EncodeToken
+// to generate the XML output one token at a time.
+// The sequence of encoded tokens must make up zero or more valid
+// XML elements.
+type Marshaler interface {
+	MarshalXML(e *Encoder, start StartElement) error
+}
+
+// MarshalerAttr is the interface implemented by objects that can marshal
+// themselves into valid XML attributes.
+//
+// MarshalXMLAttr returns an XML attribute with the encoded value of the receiver.
+// Using name as the attribute name is not required, but doing so
+// will enable Unmarshal to match the attribute to the correct
+// struct field.
+// If MarshalXMLAttr returns the zero attribute Attr{}, no attribute
+// will be generated in the output.
+// MarshalXMLAttr is used only for struct fields with the
+// "attr" option in the field tag.
+type MarshalerAttr interface {
+	MarshalXMLAttr(name Name) (Attr, error)
+}
+
+// MarshalIndent works like Marshal, but each XML element begins on a new
+// indented line that starts with prefix and is followed by one or more
+// copies of indent according to the nesting depth.
+func MarshalIndent(v interface{}, prefix, indent string) ([]byte, error) {
+	var b bytes.Buffer
+	enc := NewEncoder(&b)
+	enc.Indent(prefix, indent)
+	if err := enc.Encode(v); err != nil {
+		return nil, err
+	}
+	return b.Bytes(), nil
+}
+
+// An Encoder writes XML data to an output stream.
+type Encoder struct {
+	p printer
+}
+
+// NewEncoder returns a new encoder that writes to w.
+func NewEncoder(w io.Writer) *Encoder {
+	e := &Encoder{printer{Writer: bufio.NewWriter(w)}}
+	e.p.encoder = e
+	return e
+}
+
+// Indent sets the encoder to generate XML in which each element
+// begins on a new indented line that starts with prefix and is followed by
+// one or more copies of indent according to the nesting depth.
+func (enc *Encoder) Indent(prefix, indent string) {
+	enc.p.prefix = prefix
+	enc.p.indent = indent
+}
+
+// Encode writes the XML encoding of v to the stream.
+//
+// See the documentation for Marshal for details about the conversion
+// of Go values to XML.
+//
+// Encode calls Flush before returning.
+func (enc *Encoder) Encode(v interface{}) error {
+	err := enc.p.marshalValue(reflect.ValueOf(v), nil, nil)
+	if err != nil {
+		return err
+	}
+	return enc.p.Flush()
+}
+
+// EncodeElement writes the XML encoding of v to the stream,
+// using start as the outermost tag in the encoding.
+//
+// See the documentation for Marshal for details about the conversion
+// of Go values to XML.
+//
+// EncodeElement calls Flush before returning.
+func (enc *Encoder) EncodeElement(v interface{}, start StartElement) error {
+	err := enc.p.marshalValue(reflect.ValueOf(v), nil, &start)
+	if err != nil {
+		return err
+	}
+	return enc.p.Flush()
+}
+
+var (
+	endComment   = []byte("-->")
+	endProcInst  = []byte("?>")
+	endDirective = []byte(">")
+)
+
+// EncodeToken writes the given XML token to the stream.
+// It returns an error if StartElement and EndElement tokens are not properly matched.
+//
+// EncodeToken does not call Flush, because usually it is part of a larger operation
+// such as Encode or EncodeElement (or a custom Marshaler's MarshalXML invoked
+// during those), and those will call Flush when finished.
+// Callers that create an Encoder and then invoke EncodeToken directly, without
+// using Encode or EncodeElement, need to call Flush when finished to ensure
+// that the XML is written to the underlying writer.
+//
+// EncodeToken allows writing a ProcInst with Target set to "xml" only as the first token
+// in the stream.
+func (enc *Encoder) EncodeToken(t Token) error {
+	p := &enc.p
+	switch t := t.(type) {
+	case StartElement:
+		if err := p.writeStart(&t); err != nil {
+			return err
+		}
+	case EndElement:
+		if err := p.writeEnd(t.Name); err != nil {
+			return err
+		}
+	case CharData:
+		EscapeText(p, t)
+	case Comment:
+		if bytes.Contains(t, endComment) {
+			return fmt.Errorf("xml: EncodeToken of Comment containing --> marker")
+		}
+		p.WriteString("<!--")
+		p.Write(t)
+		p.WriteString("-->")
+		return p.cachedWriteError()
+	case ProcInst:
+		// First token to be encoded which is also a ProcInst with target of xml
+		// is the xml declaration.  The only ProcInst where target of xml is allowed.
+		if t.Target == "xml" && p.Buffered() != 0 {
+			return fmt.Errorf("xml: EncodeToken of ProcInst xml target only valid for xml declaration, first token encoded")
+		}
+		if !isNameString(t.Target) {
+			return fmt.Errorf("xml: EncodeToken of ProcInst with invalid Target")
+		}
+		if bytes.Contains(t.Inst, endProcInst) {
+			return fmt.Errorf("xml: EncodeToken of ProcInst containing ?> marker")
+		}
+		p.WriteString("<?")
+		p.WriteString(t.Target)
+		if len(t.Inst) > 0 {
+			p.WriteByte(' ')
+			p.Write(t.Inst)
+		}
+		p.WriteString("?>")
+	case Directive:
+		if bytes.Contains(t, endDirective) {
+			return fmt.Errorf("xml: EncodeToken of Directive containing > marker")
+		}
+		p.WriteString("<!")
+		p.Write(t)
+		p.WriteString(">")
+	}
+	return p.cachedWriteError()
+}
+
+// Flush flushes any buffered XML to the underlying writer.
+// See the EncodeToken documentation for details about when it is necessary.
+func (enc *Encoder) Flush() error {
+	return enc.p.Flush()
+}
+
+type printer struct {
+	*bufio.Writer
+	encoder    *Encoder
+	seq        int
+	indent     string
+	prefix     string
+	depth      int
+	indentedIn bool
+	putNewline bool
+	attrNS     map[string]string // map prefix -> name space
+	attrPrefix map[string]string // map name space -> prefix
+	prefixes   []string
+	tags       []Name
+}
+
+// createAttrPrefix finds the name space prefix attribute to use for the given name space,
+// defining a new prefix if necessary. It returns the prefix.
+func (p *printer) createAttrPrefix(url string) string {
+	if prefix := p.attrPrefix[url]; prefix != "" {
+		return prefix
+	}
+
+	// The "http://www.w3.org/XML/1998/namespace" name space is predefined as "xml"
+	// and must be referred to that way.
+	// (The "http://www.w3.org/2000/xmlns/" name space is also predefined as "xmlns",
+	// but users should not be trying to use that one directly - that's our job.)
+	if url == xmlURL {
+		return "xml"
+	}
+
+	// Need to define a new name space.
+	if p.attrPrefix == nil {
+		p.attrPrefix = make(map[string]string)
+		p.attrNS = make(map[string]string)
+	}
+
+	// Pick a name. We try to use the final element of the path
+	// but fall back to _.
+	prefix := strings.TrimRight(url, "/")
+	if i := strings.LastIndex(prefix, "/"); i >= 0 {
+		prefix = prefix[i+1:]
+	}
+	if prefix == "" || !isName([]byte(prefix)) || strings.Contains(prefix, ":") {
+		prefix = "_"
+	}
+	if strings.HasPrefix(prefix, "xml") {
+		// xmlanything is reserved.
+		prefix = "_" + prefix
+	}
+	if p.attrNS[prefix] != "" {
+		// Name is taken. Find a better one.
+		for p.seq++; ; p.seq++ {
+			if id := prefix + "_" + strconv.Itoa(p.seq); p.attrNS[id] == "" {
+				prefix = id
+				break
+			}
+		}
+	}
+
+	p.attrPrefix[url] = prefix
+	p.attrNS[prefix] = url
+
+	p.WriteString(`xmlns:`)
+	p.WriteString(prefix)
+	p.WriteString(`="`)
+	EscapeText(p, []byte(url))
+	p.WriteString(`" `)
+
+	p.prefixes = append(p.prefixes, prefix)
+
+	return prefix
+}
+
+// deleteAttrPrefix removes an attribute name space prefix.
+func (p *printer) deleteAttrPrefix(prefix string) {
+	delete(p.attrPrefix, p.attrNS[prefix])
+	delete(p.attrNS, prefix)
+}
+
+func (p *printer) markPrefix() {
+	p.prefixes = append(p.prefixes, "")
+}
+
+func (p *printer) popPrefix() {
+	for len(p.prefixes) > 0 {
+		prefix := p.prefixes[len(p.prefixes)-1]
+		p.prefixes = p.prefixes[:len(p.prefixes)-1]
+		if prefix == "" {
+			break
+		}
+		p.deleteAttrPrefix(prefix)
+	}
+}
+
+var (
+	marshalerType     = reflect.TypeOf((*Marshaler)(nil)).Elem()
+	marshalerAttrType = reflect.TypeOf((*MarshalerAttr)(nil)).Elem()
+	textMarshalerType = reflect.TypeOf((*encoding.TextMarshaler)(nil)).Elem()
+)
+
+// marshalValue writes one or more XML elements representing val.
+// If val was obtained from a struct field, finfo must have its details.
+func (p *printer) marshalValue(val reflect.Value, finfo *fieldInfo, startTemplate *StartElement) error {
+	if startTemplate != nil && startTemplate.Name.Local == "" {
+		return fmt.Errorf("xml: EncodeElement of StartElement with missing name")
+	}
+
+	if !val.IsValid() {
+		return nil
+	}
+	if finfo != nil && finfo.flags&fOmitEmpty != 0 && isEmptyValue(val) {
+		return nil
+	}
+
+	// Drill into interfaces and pointers.
+	// This can turn into an infinite loop given a cyclic chain,
+	// but it matches the Go 1 behavior.
+	for val.Kind() == reflect.Interface || val.Kind() == reflect.Ptr {
+		if val.IsNil() {
+			return nil
+		}
+		val = val.Elem()
+	}
+
+	kind := val.Kind()
+	typ := val.Type()
+
+	// Check for marshaler.
+	if val.CanInterface() && typ.Implements(marshalerType) {
+		return p.marshalInterface(val.Interface().(Marshaler), defaultStart(typ, finfo, startTemplate))
+	}
+	if val.CanAddr() {
+		pv := val.Addr()
+		if pv.CanInterface() && pv.Type().Implements(marshalerType) {
+			return p.marshalInterface(pv.Interface().(Marshaler), defaultStart(pv.Type(), finfo, startTemplate))
+		}
+	}
+
+	// Check for text marshaler.
+	if val.CanInterface() && typ.Implements(textMarshalerType) {
+		return p.marshalTextInterface(val.Interface().(encoding.TextMarshaler), defaultStart(typ, finfo, startTemplate))
+	}
+	if val.CanAddr() {
+		pv := val.Addr()
+		if pv.CanInterface() && pv.Type().Implements(textMarshalerType) {
+			return p.marshalTextInterface(pv.Interface().(encoding.TextMarshaler), defaultStart(pv.Type(), finfo, startTemplate))
+		}
+	}
+
+	// Slices and arrays iterate over the elements. They do not have an enclosing tag.
+	if (kind == reflect.Slice || kind == reflect.Array) && typ.Elem().Kind() != reflect.Uint8 {
+		for i, n := 0, val.Len(); i < n; i++ {
+			if err := p.marshalValue(val.Index(i), finfo, startTemplate); err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+
+	tinfo, err := getTypeInfo(typ)
+	if err != nil {
+		return err
+	}
+
+	// Create start element.
+	// Precedence for the XML element name is:
+	// 0. startTemplate
+	// 1. XMLName field in underlying struct;
+	// 2. field name/tag in the struct field; and
+	// 3. type name
+	var start StartElement
+
+	if startTemplate != nil {
+		start.Name = startTemplate.Name
+		start.Attr = append(start.Attr, startTemplate.Attr...)
+	} else if tinfo.xmlname != nil {
+		xmlname := tinfo.xmlname
+		if xmlname.name != "" {
+			start.Name.Space, start.Name.Local = xmlname.xmlns, xmlname.name
+		} else if v, ok := xmlname.value(val).Interface().(Name); ok && v.Local != "" {
+			start.Name = v
+		}
+	}
+	if start.Name.Local == "" && finfo != nil {
+		start.Name.Space, start.Name.Local = finfo.xmlns, finfo.name
+	}
+	if start.Name.Local == "" {
+		name := typ.Name()
+		if name == "" {
+			return &UnsupportedTypeError{typ}
+		}
+		start.Name.Local = name
+	}
+
+	// Add type attribute if necessary
+	if finfo != nil && finfo.flags&fTypeAttr != 0 {
+		start.Attr = append(start.Attr, Attr{xmlSchemaInstance, typeToString(typ)})
+	}
+
+	// Attributes
+	for i := range tinfo.fields {
+		finfo := &tinfo.fields[i]
+		if finfo.flags&fAttr == 0 {
+			continue
+		}
+		fv := finfo.value(val)
+		name := Name{Space: finfo.xmlns, Local: finfo.name}
+
+		if finfo.flags&fOmitEmpty != 0 && isEmptyValue(fv) {
+			continue
+		}
+
+		if fv.Kind() == reflect.Interface && fv.IsNil() {
+			continue
+		}
+
+		if fv.CanInterface() && fv.Type().Implements(marshalerAttrType) {
+			attr, err := fv.Interface().(MarshalerAttr).MarshalXMLAttr(name)
+			if err != nil {
+				return err
+			}
+			if attr.Name.Local != "" {
+				start.Attr = append(start.Attr, attr)
+			}
+			continue
+		}
+
+		if fv.CanAddr() {
+			pv := fv.Addr()
+			if pv.CanInterface() && pv.Type().Implements(marshalerAttrType) {
+				attr, err := pv.Interface().(MarshalerAttr).MarshalXMLAttr(name)
+				if err != nil {
+					return err
+				}
+				if attr.Name.Local != "" {
+					start.Attr = append(start.Attr, attr)
+				}
+				continue
+			}
+		}
+
+		if fv.CanInterface() && fv.Type().Implements(textMarshalerType) {
+			text, err := fv.Interface().(encoding.TextMarshaler).MarshalText()
+			if err != nil {
+				return err
+			}
+			start.Attr = append(start.Attr, Attr{name, string(text)})
+			continue
+		}
+
+		if fv.CanAddr() {
+			pv := fv.Addr()
+			if pv.CanInterface() && pv.Type().Implements(textMarshalerType) {
+				text, err := pv.Interface().(encoding.TextMarshaler).MarshalText()
+				if err != nil {
+					return err
+				}
+				start.Attr = append(start.Attr, Attr{name, string(text)})
+				continue
+			}
+		}
+
+		// Dereference or skip nil pointer, interface values.
+		switch fv.Kind() {
+		case reflect.Ptr, reflect.Interface:
+			if fv.IsNil() {
+				continue
+			}
+			fv = fv.Elem()
+		}
+
+		s, b, err := p.marshalSimple(fv.Type(), fv)
+		if err != nil {
+			return err
+		}
+		if b != nil {
+			s = string(b)
+		}
+		start.Attr = append(start.Attr, Attr{name, s})
+	}
+
+	if err := p.writeStart(&start); err != nil {
+		return err
+	}
+
+	if val.Kind() == reflect.Struct {
+		err = p.marshalStruct(tinfo, val)
+	} else {
+		s, b, err1 := p.marshalSimple(typ, val)
+		if err1 != nil {
+			err = err1
+		} else if b != nil {
+			EscapeText(p, b)
+		} else {
+			p.EscapeString(s)
+		}
+	}
+	if err != nil {
+		return err
+	}
+
+	if err := p.writeEnd(start.Name); err != nil {
+		return err
+	}
+
+	return p.cachedWriteError()
+}
+
+// defaultStart returns the default start element to use,
+// given the reflect type, field info, and start template.
+func defaultStart(typ reflect.Type, finfo *fieldInfo, startTemplate *StartElement) StartElement {
+	var start StartElement
+	// Precedence for the XML element name is as above,
+	// except that we do not look inside structs for the first field.
+	if startTemplate != nil {
+		start.Name = startTemplate.Name
+		start.Attr = append(start.Attr, startTemplate.Attr...)
+	} else if finfo != nil && finfo.name != "" {
+		start.Name.Local = finfo.name
+		start.Name.Space = finfo.xmlns
+	} else if typ.Name() != "" {
+		start.Name.Local = typ.Name()
+	} else {
+		// Must be a pointer to a named type,
+		// since it has the Marshaler methods.
+		start.Name.Local = typ.Elem().Name()
+	}
+
+	// Add type attribute if necessary
+	if finfo != nil && finfo.flags&fTypeAttr != 0 {
+		start.Attr = append(start.Attr, Attr{xmlSchemaInstance, typeToString(typ)})
+	}
+
+	return start
+}
+
+// marshalInterface marshals a Marshaler interface value.
+func (p *printer) marshalInterface(val Marshaler, start StartElement) error {
+	// Push a marker onto the tag stack so that MarshalXML
+	// cannot close the XML tags that it did not open.
+	p.tags = append(p.tags, Name{})
+	n := len(p.tags)
+
+	err := val.MarshalXML(p.encoder, start)
+	if err != nil {
+		return err
+	}
+
+	// Make sure MarshalXML closed all its tags. p.tags[n-1] is the mark.
+	if len(p.tags) > n {
+		return fmt.Errorf("xml: %s.MarshalXML wrote invalid XML: <%s> not closed", receiverType(val), p.tags[len(p.tags)-1].Local)
+	}
+	p.tags = p.tags[:n-1]
+	return nil
+}
+
+// marshalTextInterface marshals a TextMarshaler interface value.
+func (p *printer) marshalTextInterface(val encoding.TextMarshaler, start StartElement) error {
+	if err := p.writeStart(&start); err != nil {
+		return err
+	}
+	text, err := val.MarshalText()
+	if err != nil {
+		return err
+	}
+	EscapeText(p, text)
+	return p.writeEnd(start.Name)
+}
+
+// writeStart writes the given start element.
+func (p *printer) writeStart(start *StartElement) error {
+	if start.Name.Local == "" {
+		return fmt.Errorf("xml: start tag with no name")
+	}
+
+	p.tags = append(p.tags, start.Name)
+	p.markPrefix()
+
+	p.writeIndent(1)
+	p.WriteByte('<')
+	p.WriteString(start.Name.Local)
+
+	if start.Name.Space != "" {
+		p.WriteString(` xmlns="`)
+		p.EscapeString(start.Name.Space)
+		p.WriteByte('"')
+	}
+
+	// Attributes
+	for _, attr := range start.Attr {
+		name := attr.Name
+		if name.Local == "" {
+			continue
+		}
+		p.WriteByte(' ')
+		if name.Space != "" {
+			p.WriteString(p.createAttrPrefix(name.Space))
+			p.WriteByte(':')
+		}
+		p.WriteString(name.Local)
+		p.WriteString(`="`)
+		p.EscapeString(attr.Value)
+		p.WriteByte('"')
+	}
+	p.WriteByte('>')
+	return nil
+}
+
+func (p *printer) writeEnd(name Name) error {
+	if name.Local == "" {
+		return fmt.Errorf("xml: end tag with no name")
+	}
+	if len(p.tags) == 0 || p.tags[len(p.tags)-1].Local == "" {
+		return fmt.Errorf("xml: end tag </%s> without start tag", name.Local)
+	}
+	if top := p.tags[len(p.tags)-1]; top != name {
+		if top.Local != name.Local {
+			return fmt.Errorf("xml: end tag </%s> does not match start tag <%s>", name.Local, top.Local)
+		}
+		return fmt.Errorf("xml: end tag </%s> in namespace %s does not match start tag <%s> in namespace %s", name.Local, name.Space, top.Local, top.Space)
+	}
+	p.tags = p.tags[:len(p.tags)-1]
+
+	p.writeIndent(-1)
+	p.WriteByte('<')
+	p.WriteByte('/')
+	p.WriteString(name.Local)
+	p.WriteByte('>')
+	p.popPrefix()
+	return nil
+}
+
+func (p *printer) marshalSimple(typ reflect.Type, val reflect.Value) (string, []byte, error) {
+	switch val.Kind() {
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		return strconv.FormatInt(val.Int(), 10), nil, nil
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+		return strconv.FormatUint(val.Uint(), 10), nil, nil
+	case reflect.Float32, reflect.Float64:
+		return strconv.FormatFloat(val.Float(), 'g', -1, val.Type().Bits()), nil, nil
+	case reflect.String:
+		return val.String(), nil, nil
+	case reflect.Bool:
+		return strconv.FormatBool(val.Bool()), nil, nil
+	case reflect.Array:
+		if typ.Elem().Kind() != reflect.Uint8 {
+			break
+		}
+		// [...]byte
+		var bytes []byte
+		if val.CanAddr() {
+			bytes = val.Slice(0, val.Len()).Bytes()
+		} else {
+			bytes = make([]byte, val.Len())
+			reflect.Copy(reflect.ValueOf(bytes), val)
+		}
+		return "", bytes, nil
+	case reflect.Slice:
+		if typ.Elem().Kind() != reflect.Uint8 {
+			break
+		}
+		// []byte
+		return "", val.Bytes(), nil
+	}
+	return "", nil, &UnsupportedTypeError{typ}
+}
+
+var ddBytes = []byte("--")
+
+func (p *printer) marshalStruct(tinfo *typeInfo, val reflect.Value) error {
+	s := parentStack{p: p}
+	for i := range tinfo.fields {
+		finfo := &tinfo.fields[i]
+		if finfo.flags&fAttr != 0 {
+			continue
+		}
+		vf := finfo.value(val)
+
+		// Dereference or skip nil pointer, interface values.
+		switch vf.Kind() {
+		case reflect.Ptr, reflect.Interface:
+			if !vf.IsNil() {
+				vf = vf.Elem()
+			}
+		}
+
+		switch finfo.flags & fMode {
+		case fCharData:
+			if vf.CanInterface() && vf.Type().Implements(textMarshalerType) {
+				data, err := vf.Interface().(encoding.TextMarshaler).MarshalText()
+				if err != nil {
+					return err
+				}
+				Escape(p, data)
+				continue
+			}
+			if vf.CanAddr() {
+				pv := vf.Addr()
+				if pv.CanInterface() && pv.Type().Implements(textMarshalerType) {
+					data, err := pv.Interface().(encoding.TextMarshaler).MarshalText()
+					if err != nil {
+						return err
+					}
+					Escape(p, data)
+					continue
+				}
+			}
+			var scratch [64]byte
+			switch vf.Kind() {
+			case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+				Escape(p, strconv.AppendInt(scratch[:0], vf.Int(), 10))
+			case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+				Escape(p, strconv.AppendUint(scratch[:0], vf.Uint(), 10))
+			case reflect.Float32, reflect.Float64:
+				Escape(p, strconv.AppendFloat(scratch[:0], vf.Float(), 'g', -1, vf.Type().Bits()))
+			case reflect.Bool:
+				Escape(p, strconv.AppendBool(scratch[:0], vf.Bool()))
+			case reflect.String:
+				if err := EscapeText(p, []byte(vf.String())); err != nil {
+					return err
+				}
+			case reflect.Slice:
+				if elem, ok := vf.Interface().([]byte); ok {
+					if err := EscapeText(p, elem); err != nil {
+						return err
+					}
+				}
+			}
+			continue
+
+		case fComment:
+			k := vf.Kind()
+			if !(k == reflect.String || k == reflect.Slice && vf.Type().Elem().Kind() == reflect.Uint8) {
+				return fmt.Errorf("xml: bad type for comment field of %s", val.Type())
+			}
+			if vf.Len() == 0 {
+				continue
+			}
+			p.writeIndent(0)
+			p.WriteString("<!--")
+			dashDash := false
+			dashLast := false
+			switch k {
+			case reflect.String:
+				s := vf.String()
+				dashDash = strings.Index(s, "--") >= 0
+				dashLast = s[len(s)-1] == '-'
+				if !dashDash {
+					p.WriteString(s)
+				}
+			case reflect.Slice:
+				b := vf.Bytes()
+				dashDash = bytes.Index(b, ddBytes) >= 0
+				dashLast = b[len(b)-1] == '-'
+				if !dashDash {
+					p.Write(b)
+				}
+			default:
+				panic("can't happen")
+			}
+			if dashDash {
+				return fmt.Errorf(`xml: comments must not contain "--"`)
+			}
+			if dashLast {
+				// "--->" is invalid grammar. Make it "- -->"
+				p.WriteByte(' ')
+			}
+			p.WriteString("-->")
+			continue
+
+		case fInnerXml:
+			iface := vf.Interface()
+			switch raw := iface.(type) {
+			case []byte:
+				p.Write(raw)
+				continue
+			case string:
+				p.WriteString(raw)
+				continue
+			}
+
+		case fElement, fElement | fAny:
+			if err := s.trim(finfo.parents); err != nil {
+				return err
+			}
+			if len(finfo.parents) > len(s.stack) {
+				if vf.Kind() != reflect.Ptr && vf.Kind() != reflect.Interface || !vf.IsNil() {
+					if err := s.push(finfo.parents[len(s.stack):]); err != nil {
+						return err
+					}
+				}
+			}
+		}
+		if err := p.marshalValue(vf, finfo, nil); err != nil {
+			return err
+		}
+	}
+	s.trim(nil)
+	return p.cachedWriteError()
+}
+
+// return the bufio Writer's cached write error
+func (p *printer) cachedWriteError() error {
+	_, err := p.Write(nil)
+	return err
+}
+
+func (p *printer) writeIndent(depthDelta int) {
+	if len(p.prefix) == 0 && len(p.indent) == 0 {
+		return
+	}
+	if depthDelta < 0 {
+		p.depth--
+		if p.indentedIn {
+			p.indentedIn = false
+			return
+		}
+		p.indentedIn = false
+	}
+	if p.putNewline {
+		p.WriteByte('\n')
+	} else {
+		p.putNewline = true
+	}
+	if len(p.prefix) > 0 {
+		p.WriteString(p.prefix)
+	}
+	if len(p.indent) > 0 {
+		for i := 0; i < p.depth; i++ {
+			p.WriteString(p.indent)
+		}
+	}
+	if depthDelta > 0 {
+		p.depth++
+		p.indentedIn = true
+	}
+}
+
+type parentStack struct {
+	p     *printer
+	stack []string
+}
+
+// trim updates the XML context to match the longest common prefix of the stack
+// and the given parents.  A closing tag will be written for every parent
+// popped.  Passing a zero slice or nil will close all the elements.
+func (s *parentStack) trim(parents []string) error {
+	split := 0
+	for ; split < len(parents) && split < len(s.stack); split++ {
+		if parents[split] != s.stack[split] {
+			break
+		}
+	}
+	for i := len(s.stack) - 1; i >= split; i-- {
+		if err := s.p.writeEnd(Name{Local: s.stack[i]}); err != nil {
+			return err
+		}
+	}
+	s.stack = parents[:split]
+	return nil
+}
+
+// push adds parent elements to the stack and writes open tags.
+func (s *parentStack) push(parents []string) error {
+	for i := 0; i < len(parents); i++ {
+		if err := s.p.writeStart(&StartElement{Name: Name{Local: parents[i]}}); err != nil {
+			return err
+		}
+	}
+	s.stack = append(s.stack, parents...)
+	return nil
+}
+
+// A MarshalXMLError is returned when Marshal encounters a type
+// that cannot be converted into XML.
+type UnsupportedTypeError struct {
+	Type reflect.Type
+}
+
+func (e *UnsupportedTypeError) Error() string {
+	return "xml: unsupported type: " + e.Type.String()
+}
+
+func isEmptyValue(v reflect.Value) bool {
+	switch v.Kind() {
+	case reflect.Array, reflect.Map, reflect.Slice, reflect.String:
+		return v.Len() == 0
+	case reflect.Bool:
+		return !v.Bool()
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		return v.Int() == 0
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+		return v.Uint() == 0
+	case reflect.Float32, reflect.Float64:
+		return v.Float() == 0
+	case reflect.Interface, reflect.Ptr:
+		return v.IsNil()
+	}
+	return false
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/xml/marshal_test.go b/vendor/github.com/vmware/govmomi/vim25/xml/marshal_test.go
new file mode 100644
index 0000000000..14f73a75d5
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/xml/marshal_test.go
@@ -0,0 +1,1266 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package xml
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"reflect"
+	"strconv"
+	"strings"
+	"testing"
+	"time"
+)
+
+type DriveType int
+
+const (
+	HyperDrive DriveType = iota
+	ImprobabilityDrive
+)
+
+type Passenger struct {
+	Name   []string `xml:"name"`
+	Weight float32  `xml:"weight"`
+}
+
+type Ship struct {
+	XMLName struct{} `xml:"spaceship"`
+
+	Name      string       `xml:"name,attr"`
+	Pilot     string       `xml:"pilot,attr"`
+	Drive     DriveType    `xml:"drive"`
+	Age       uint         `xml:"age"`
+	Passenger []*Passenger `xml:"passenger"`
+	secret    string
+}
+
+type NamedType string
+
+type Port struct {
+	XMLName struct{} `xml:"port"`
+	Type    string   `xml:"type,attr,omitempty"`
+	Comment string   `xml:",comment"`
+	Number  string   `xml:",chardata"`
+}
+
+type Domain struct {
+	XMLName struct{} `xml:"domain"`
+	Country string   `xml:",attr,omitempty"`
+	Name    []byte   `xml:",chardata"`
+	Comment []byte   `xml:",comment"`
+}
+
+type Book struct {
+	XMLName struct{} `xml:"book"`
+	Title   string   `xml:",chardata"`
+}
+
+type Event struct {
+	XMLName struct{} `xml:"event"`
+	Year    int      `xml:",chardata"`
+}
+
+type Movie struct {
+	XMLName struct{} `xml:"movie"`
+	Length  uint     `xml:",chardata"`
+}
+
+type Pi struct {
+	XMLName       struct{} `xml:"pi"`
+	Approximation float32  `xml:",chardata"`
+}
+
+type Universe struct {
+	XMLName struct{} `xml:"universe"`
+	Visible float64  `xml:",chardata"`
+}
+
+type Particle struct {
+	XMLName struct{} `xml:"particle"`
+	HasMass bool     `xml:",chardata"`
+}
+
+type Departure struct {
+	XMLName struct{}  `xml:"departure"`
+	When    time.Time `xml:",chardata"`
+}
+
+type SecretAgent struct {
+	XMLName   struct{} `xml:"agent"`
+	Handle    string   `xml:"handle,attr"`
+	Identity  string
+	Obfuscate string `xml:",innerxml"`
+}
+
+type NestedItems struct {
+	XMLName struct{} `xml:"result"`
+	Items   []string `xml:">item"`
+	Item1   []string `xml:"Items>item1"`
+}
+
+type NestedOrder struct {
+	XMLName struct{} `xml:"result"`
+	Field1  string   `xml:"parent>c"`
+	Field2  string   `xml:"parent>b"`
+	Field3  string   `xml:"parent>a"`
+}
+
+type MixedNested struct {
+	XMLName struct{} `xml:"result"`
+	A       string   `xml:"parent1>a"`
+	B       string   `xml:"b"`
+	C       string   `xml:"parent1>parent2>c"`
+	D       string   `xml:"parent1>d"`
+}
+
+type NilTest struct {
+	A interface{} `xml:"parent1>parent2>a"`
+	B interface{} `xml:"parent1>b"`
+	C interface{} `xml:"parent1>parent2>c"`
+}
+
+type Service struct {
+	XMLName struct{} `xml:"service"`
+	Domain  *Domain  `xml:"host>domain"`
+	Port    *Port    `xml:"host>port"`
+	Extra1  interface{}
+	Extra2  interface{} `xml:"host>extra2"`
+}
+
+var nilStruct *Ship
+
+type EmbedA struct {
+	EmbedC
+	EmbedB EmbedB
+	FieldA string
+}
+
+type EmbedB struct {
+	FieldB string
+	*EmbedC
+}
+
+type EmbedC struct {
+	FieldA1 string `xml:"FieldA>A1"`
+	FieldA2 string `xml:"FieldA>A2"`
+	FieldB  string
+	FieldC  string
+}
+
+type NameCasing struct {
+	XMLName struct{} `xml:"casing"`
+	Xy      string
+	XY      string
+	XyA     string `xml:"Xy,attr"`
+	XYA     string `xml:"XY,attr"`
+}
+
+type NamePrecedence struct {
+	XMLName     Name              `xml:"Parent"`
+	FromTag     XMLNameWithoutTag `xml:"InTag"`
+	FromNameVal XMLNameWithoutTag
+	FromNameTag XMLNameWithTag
+	InFieldName string
+}
+
+type XMLNameWithTag struct {
+	XMLName Name   `xml:"InXMLNameTag"`
+	Value   string `xml:",chardata"`
+}
+
+type XMLNameWithoutTag struct {
+	XMLName Name
+	Value   string `xml:",chardata"`
+}
+
+type NameInField struct {
+	Foo Name `xml:"ns foo"`
+}
+
+type AttrTest struct {
+	Int   int     `xml:",attr"`
+	Named int     `xml:"int,attr"`
+	Float float64 `xml:",attr"`
+	Uint8 uint8   `xml:",attr"`
+	Bool  bool    `xml:",attr"`
+	Str   string  `xml:",attr"`
+	Bytes []byte  `xml:",attr"`
+}
+
+type OmitAttrTest struct {
+	Int   int     `xml:",attr,omitempty"`
+	Named int     `xml:"int,attr,omitempty"`
+	Float float64 `xml:",attr,omitempty"`
+	Uint8 uint8   `xml:",attr,omitempty"`
+	Bool  bool    `xml:",attr,omitempty"`
+	Str   string  `xml:",attr,omitempty"`
+	Bytes []byte  `xml:",attr,omitempty"`
+}
+
+type OmitFieldTest struct {
+	Int   int           `xml:",omitempty"`
+	Named int           `xml:"int,omitempty"`
+	Float float64       `xml:",omitempty"`
+	Uint8 uint8         `xml:",omitempty"`
+	Bool  bool          `xml:",omitempty"`
+	Str   string        `xml:",omitempty"`
+	Bytes []byte        `xml:",omitempty"`
+	Ptr   *PresenceTest `xml:",omitempty"`
+}
+
+type AnyTest struct {
+	XMLName  struct{}  `xml:"a"`
+	Nested   string    `xml:"nested>value"`
+	AnyField AnyHolder `xml:",any"`
+}
+
+type AnyOmitTest struct {
+	XMLName  struct{}   `xml:"a"`
+	Nested   string     `xml:"nested>value"`
+	AnyField *AnyHolder `xml:",any,omitempty"`
+}
+
+type AnySliceTest struct {
+	XMLName  struct{}    `xml:"a"`
+	Nested   string      `xml:"nested>value"`
+	AnyField []AnyHolder `xml:",any"`
+}
+
+type AnyHolder struct {
+	XMLName Name
+	XML     string `xml:",innerxml"`
+}
+
+type RecurseA struct {
+	A string
+	B *RecurseB
+}
+
+type RecurseB struct {
+	A *RecurseA
+	B string
+}
+
+type PresenceTest struct {
+	Exists *struct{}
+}
+
+type IgnoreTest struct {
+	PublicSecret string `xml:"-"`
+}
+
+type MyBytes []byte
+
+type Data struct {
+	Bytes  []byte
+	Attr   []byte `xml:",attr"`
+	Custom MyBytes
+}
+
+type Plain struct {
+	V interface{}
+}
+
+type MyInt int
+
+type EmbedInt struct {
+	MyInt
+}
+
+type Strings struct {
+	X []string `xml:"A>B,omitempty"`
+}
+
+type PointerFieldsTest struct {
+	XMLName  Name    `xml:"dummy"`
+	Name     *string `xml:"name,attr"`
+	Age      *uint   `xml:"age,attr"`
+	Empty    *string `xml:"empty,attr"`
+	Contents *string `xml:",chardata"`
+}
+
+type ChardataEmptyTest struct {
+	XMLName  Name    `xml:"test"`
+	Contents *string `xml:",chardata"`
+}
+
+type MyMarshalerTest struct {
+}
+
+var _ Marshaler = (*MyMarshalerTest)(nil)
+
+func (m *MyMarshalerTest) MarshalXML(e *Encoder, start StartElement) error {
+	e.EncodeToken(start)
+	e.EncodeToken(CharData([]byte("hello world")))
+	e.EncodeToken(EndElement{start.Name})
+	return nil
+}
+
+type MyMarshalerAttrTest struct {
+}
+
+var _ MarshalerAttr = (*MyMarshalerAttrTest)(nil)
+
+func (m *MyMarshalerAttrTest) MarshalXMLAttr(name Name) (Attr, error) {
+	return Attr{name, "hello world"}, nil
+}
+
+type MarshalerStruct struct {
+	Foo MyMarshalerAttrTest `xml:",attr"`
+}
+
+type InnerStruct struct {
+	XMLName Name `xml:"testns outer"`
+}
+
+type OuterStruct struct {
+	InnerStruct
+	IntAttr int `xml:"int,attr"`
+}
+
+type OuterNamedStruct struct {
+	InnerStruct
+	XMLName Name `xml:"outerns test"`
+	IntAttr int  `xml:"int,attr"`
+}
+
+type OuterNamedOrderedStruct struct {
+	XMLName Name `xml:"outerns test"`
+	InnerStruct
+	IntAttr int `xml:"int,attr"`
+}
+
+type OuterOuterStruct struct {
+	OuterStruct
+}
+
+func ifaceptr(x interface{}) interface{} {
+	return &x
+}
+
+var (
+	nameAttr     = "Sarah"
+	ageAttr      = uint(12)
+	contentsAttr = "lorem ipsum"
+)
+
+// Unless explicitly stated as such (or *Plain), all of the
+// tests below are two-way tests. When introducing new tests,
+// please try to make them two-way as well to ensure that
+// marshalling and unmarshalling are as symmetrical as feasible.
+var marshalTests = []struct {
+	Value         interface{}
+	ExpectXML     string
+	MarshalOnly   bool
+	UnmarshalOnly bool
+}{
+	// Test nil marshals to nothing
+	{Value: nil, ExpectXML: ``, MarshalOnly: true},
+	{Value: nilStruct, ExpectXML: ``, MarshalOnly: true},
+
+	// Test value types
+	{Value: &Plain{true}, ExpectXML: `<Plain><V>true</V></Plain>`},
+	{Value: &Plain{false}, ExpectXML: `<Plain><V>false</V></Plain>`},
+	{Value: &Plain{int(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
+	{Value: &Plain{int8(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
+	{Value: &Plain{int16(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
+	{Value: &Plain{int32(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
+	{Value: &Plain{uint(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
+	{Value: &Plain{uint8(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
+	{Value: &Plain{uint16(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
+	{Value: &Plain{uint32(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
+	{Value: &Plain{float32(1.25)}, ExpectXML: `<Plain><V>1.25</V></Plain>`},
+	{Value: &Plain{float64(1.25)}, ExpectXML: `<Plain><V>1.25</V></Plain>`},
+	{Value: &Plain{uintptr(0xFFDD)}, ExpectXML: `<Plain><V>65501</V></Plain>`},
+	{Value: &Plain{"gopher"}, ExpectXML: `<Plain><V>gopher</V></Plain>`},
+	{Value: &Plain{[]byte("gopher")}, ExpectXML: `<Plain><V>gopher</V></Plain>`},
+	{Value: &Plain{"</>"}, ExpectXML: `<Plain><V>&lt;/&gt;</V></Plain>`},
+	{Value: &Plain{[]byte("</>")}, ExpectXML: `<Plain><V>&lt;/&gt;</V></Plain>`},
+	{Value: &Plain{[3]byte{'<', '/', '>'}}, ExpectXML: `<Plain><V>&lt;/&gt;</V></Plain>`},
+	{Value: &Plain{NamedType("potato")}, ExpectXML: `<Plain><V>potato</V></Plain>`},
+	{Value: &Plain{[]int{1, 2, 3}}, ExpectXML: `<Plain><V>1</V><V>2</V><V>3</V></Plain>`},
+	{Value: &Plain{[3]int{1, 2, 3}}, ExpectXML: `<Plain><V>1</V><V>2</V><V>3</V></Plain>`},
+	{Value: ifaceptr(true), MarshalOnly: true, ExpectXML: `<bool>true</bool>`},
+
+	// Test time.
+	{
+		Value:     &Plain{time.Unix(1e9, 123456789).UTC()},
+		ExpectXML: `<Plain><V>2001-09-09T01:46:40.123456789Z</V></Plain>`,
+	},
+
+	// A pointer to struct{} may be used to test for an element's presence.
+	{
+		Value:     &PresenceTest{new(struct{})},
+		ExpectXML: `<PresenceTest><Exists></Exists></PresenceTest>`,
+	},
+	{
+		Value:     &PresenceTest{},
+		ExpectXML: `<PresenceTest></PresenceTest>`,
+	},
+
+	// A pointer to struct{} may be used to test for an element's presence.
+	{
+		Value:     &PresenceTest{new(struct{})},
+		ExpectXML: `<PresenceTest><Exists></Exists></PresenceTest>`,
+	},
+	{
+		Value:     &PresenceTest{},
+		ExpectXML: `<PresenceTest></PresenceTest>`,
+	},
+
+	// A []byte field is only nil if the element was not found.
+	{
+		Value:         &Data{},
+		ExpectXML:     `<Data></Data>`,
+		UnmarshalOnly: true,
+	},
+	{
+		Value:         &Data{Bytes: []byte{}, Custom: MyBytes{}, Attr: []byte{}},
+		ExpectXML:     `<Data Attr=""><Bytes></Bytes><Custom></Custom></Data>`,
+		UnmarshalOnly: true,
+	},
+
+	// Check that []byte works, including named []byte types.
+	{
+		Value:     &Data{Bytes: []byte("ab"), Custom: MyBytes("cd"), Attr: []byte{'v'}},
+		ExpectXML: `<Data Attr="v"><Bytes>ab</Bytes><Custom>cd</Custom></Data>`,
+	},
+
+	// Test innerxml
+	{
+		Value: &SecretAgent{
+			Handle:    "007",
+			Identity:  "James Bond",
+			Obfuscate: "<redacted/>",
+		},
+		ExpectXML:   `<agent handle="007"><Identity>James Bond</Identity><redacted/></agent>`,
+		MarshalOnly: true,
+	},
+	{
+		Value: &SecretAgent{
+			Handle:    "007",
+			Identity:  "James Bond",
+			Obfuscate: "<Identity>James Bond</Identity><redacted/>",
+		},
+		ExpectXML:     `<agent handle="007"><Identity>James Bond</Identity><redacted/></agent>`,
+		UnmarshalOnly: true,
+	},
+
+	// Test structs
+	{Value: &Port{Type: "ssl", Number: "443"}, ExpectXML: `<port type="ssl">443</port>`},
+	{Value: &Port{Number: "443"}, ExpectXML: `<port>443</port>`},
+	{Value: &Port{Type: "<unix>"}, ExpectXML: `<port type="&lt;unix&gt;"></port>`},
+	{Value: &Port{Number: "443", Comment: "https"}, ExpectXML: `<port><!--https-->443</port>`},
+	{Value: &Port{Number: "443", Comment: "add space-"}, ExpectXML: `<port><!--add space- -->443</port>`, MarshalOnly: true},
+	{Value: &Domain{Name: []byte("google.com&friends")}, ExpectXML: `<domain>google.com&amp;friends</domain>`},
+	{Value: &Domain{Name: []byte("google.com"), Comment: []byte(" &friends ")}, ExpectXML: `<domain>google.com<!-- &friends --></domain>`},
+	{Value: &Book{Title: "Pride & Prejudice"}, ExpectXML: `<book>Pride &amp; Prejudice</book>`},
+	{Value: &Event{Year: -3114}, ExpectXML: `<event>-3114</event>`},
+	{Value: &Movie{Length: 13440}, ExpectXML: `<movie>13440</movie>`},
+	{Value: &Pi{Approximation: 3.14159265}, ExpectXML: `<pi>3.1415927</pi>`},
+	{Value: &Universe{Visible: 9.3e13}, ExpectXML: `<universe>9.3e+13</universe>`},
+	{Value: &Particle{HasMass: true}, ExpectXML: `<particle>true</particle>`},
+	{Value: &Departure{When: ParseTime("2013-01-09T00:15:00-09:00")}, ExpectXML: `<departure>2013-01-09T00:15:00-09:00</departure>`},
+	{Value: atomValue, ExpectXML: atomXml},
+	{
+		Value: &Ship{
+			Name:  "Heart of Gold",
+			Pilot: "Computer",
+			Age:   1,
+			Drive: ImprobabilityDrive,
+			Passenger: []*Passenger{
+				{
+					Name:   []string{"Zaphod", "Beeblebrox"},
+					Weight: 7.25,
+				},
+				{
+					Name:   []string{"Trisha", "McMillen"},
+					Weight: 5.5,
+				},
+				{
+					Name:   []string{"Ford", "Prefect"},
+					Weight: 7,
+				},
+				{
+					Name:   []string{"Arthur", "Dent"},
+					Weight: 6.75,
+				},
+			},
+		},
+		ExpectXML: `<spaceship name="Heart of Gold" pilot="Computer">` +
+			`<drive>` + strconv.Itoa(int(ImprobabilityDrive)) + `</drive>` +
+			`<age>1</age>` +
+			`<passenger>` +
+			`<name>Zaphod</name>` +
+			`<name>Beeblebrox</name>` +
+			`<weight>7.25</weight>` +
+			`</passenger>` +
+			`<passenger>` +
+			`<name>Trisha</name>` +
+			`<name>McMillen</name>` +
+			`<weight>5.5</weight>` +
+			`</passenger>` +
+			`<passenger>` +
+			`<name>Ford</name>` +
+			`<name>Prefect</name>` +
+			`<weight>7</weight>` +
+			`</passenger>` +
+			`<passenger>` +
+			`<name>Arthur</name>` +
+			`<name>Dent</name>` +
+			`<weight>6.75</weight>` +
+			`</passenger>` +
+			`</spaceship>`,
+	},
+
+	// Test a>b
+	{
+		Value: &NestedItems{Items: nil, Item1: nil},
+		ExpectXML: `<result>` +
+			`<Items>` +
+			`</Items>` +
+			`</result>`,
+	},
+	{
+		Value: &NestedItems{Items: []string{}, Item1: []string{}},
+		ExpectXML: `<result>` +
+			`<Items>` +
+			`</Items>` +
+			`</result>`,
+		MarshalOnly: true,
+	},
+	{
+		Value: &NestedItems{Items: nil, Item1: []string{"A"}},
+		ExpectXML: `<result>` +
+			`<Items>` +
+			`<item1>A</item1>` +
+			`</Items>` +
+			`</result>`,
+	},
+	{
+		Value: &NestedItems{Items: []string{"A", "B"}, Item1: nil},
+		ExpectXML: `<result>` +
+			`<Items>` +
+			`<item>A</item>` +
+			`<item>B</item>` +
+			`</Items>` +
+			`</result>`,
+	},
+	{
+		Value: &NestedItems{Items: []string{"A", "B"}, Item1: []string{"C"}},
+		ExpectXML: `<result>` +
+			`<Items>` +
+			`<item>A</item>` +
+			`<item>B</item>` +
+			`<item1>C</item1>` +
+			`</Items>` +
+			`</result>`,
+	},
+	{
+		Value: &NestedOrder{Field1: "C", Field2: "B", Field3: "A"},
+		ExpectXML: `<result>` +
+			`<parent>` +
+			`<c>C</c>` +
+			`<b>B</b>` +
+			`<a>A</a>` +
+			`</parent>` +
+			`</result>`,
+	},
+	{
+		Value: &NilTest{A: "A", B: nil, C: "C"},
+		ExpectXML: `<NilTest>` +
+			`<parent1>` +
+			`<parent2><a>A</a></parent2>` +
+			`<parent2><c>C</c></parent2>` +
+			`</parent1>` +
+			`</NilTest>`,
+		MarshalOnly: true, // Uses interface{}
+	},
+	{
+		Value: &MixedNested{A: "A", B: "B", C: "C", D: "D"},
+		ExpectXML: `<result>` +
+			`<parent1><a>A</a></parent1>` +
+			`<b>B</b>` +
+			`<parent1>` +
+			`<parent2><c>C</c></parent2>` +
+			`<d>D</d>` +
+			`</parent1>` +
+			`</result>`,
+	},
+	{
+		Value:     &Service{Port: &Port{Number: "80"}},
+		ExpectXML: `<service><host><port>80</port></host></service>`,
+	},
+	{
+		Value:     &Service{},
+		ExpectXML: `<service></service>`,
+	},
+	{
+		Value: &Service{Port: &Port{Number: "80"}, Extra1: "A", Extra2: "B"},
+		ExpectXML: `<service>` +
+			`<host><port>80</port></host>` +
+			`<Extra1>A</Extra1>` +
+			`<host><extra2>B</extra2></host>` +
+			`</service>`,
+		MarshalOnly: true,
+	},
+	{
+		Value: &Service{Port: &Port{Number: "80"}, Extra2: "example"},
+		ExpectXML: `<service>` +
+			`<host><port>80</port></host>` +
+			`<host><extra2>example</extra2></host>` +
+			`</service>`,
+		MarshalOnly: true,
+	},
+
+	// Test struct embedding
+	{
+		Value: &EmbedA{
+			EmbedC: EmbedC{
+				FieldA1: "", // Shadowed by A.A
+				FieldA2: "", // Shadowed by A.A
+				FieldB:  "A.C.B",
+				FieldC:  "A.C.C",
+			},
+			EmbedB: EmbedB{
+				FieldB: "A.B.B",
+				EmbedC: &EmbedC{
+					FieldA1: "A.B.C.A1",
+					FieldA2: "A.B.C.A2",
+					FieldB:  "", // Shadowed by A.B.B
+					FieldC:  "A.B.C.C",
+				},
+			},
+			FieldA: "A.A",
+		},
+		ExpectXML: `<EmbedA>` +
+			`<FieldB>A.C.B</FieldB>` +
+			`<FieldC>A.C.C</FieldC>` +
+			`<EmbedB>` +
+			`<FieldB>A.B.B</FieldB>` +
+			`<FieldA>` +
+			`<A1>A.B.C.A1</A1>` +
+			`<A2>A.B.C.A2</A2>` +
+			`</FieldA>` +
+			`<FieldC>A.B.C.C</FieldC>` +
+			`</EmbedB>` +
+			`<FieldA>A.A</FieldA>` +
+			`</EmbedA>`,
+	},
+
+	// Test that name casing matters
+	{
+		Value:     &NameCasing{Xy: "mixed", XY: "upper", XyA: "mixedA", XYA: "upperA"},
+		ExpectXML: `<casing Xy="mixedA" XY="upperA"><Xy>mixed</Xy><XY>upper</XY></casing>`,
+	},
+
+	// Test the order in which the XML element name is chosen
+	{
+		Value: &NamePrecedence{
+			FromTag:     XMLNameWithoutTag{Value: "A"},
+			FromNameVal: XMLNameWithoutTag{XMLName: Name{Local: "InXMLName"}, Value: "B"},
+			FromNameTag: XMLNameWithTag{Value: "C"},
+			InFieldName: "D",
+		},
+		ExpectXML: `<Parent>` +
+			`<InTag>A</InTag>` +
+			`<InXMLName>B</InXMLName>` +
+			`<InXMLNameTag>C</InXMLNameTag>` +
+			`<InFieldName>D</InFieldName>` +
+			`</Parent>`,
+		MarshalOnly: true,
+	},
+	{
+		Value: &NamePrecedence{
+			XMLName:     Name{Local: "Parent"},
+			FromTag:     XMLNameWithoutTag{XMLName: Name{Local: "InTag"}, Value: "A"},
+			FromNameVal: XMLNameWithoutTag{XMLName: Name{Local: "FromNameVal"}, Value: "B"},
+			FromNameTag: XMLNameWithTag{XMLName: Name{Local: "InXMLNameTag"}, Value: "C"},
+			InFieldName: "D",
+		},
+		ExpectXML: `<Parent>` +
+			`<InTag>A</InTag>` +
+			`<FromNameVal>B</FromNameVal>` +
+			`<InXMLNameTag>C</InXMLNameTag>` +
+			`<InFieldName>D</InFieldName>` +
+			`</Parent>`,
+		UnmarshalOnly: true,
+	},
+
+	// xml.Name works in a plain field as well.
+	{
+		Value:     &NameInField{Name{Space: "ns", Local: "foo"}},
+		ExpectXML: `<NameInField><foo xmlns="ns"></foo></NameInField>`,
+	},
+	{
+		Value:         &NameInField{Name{Space: "ns", Local: "foo"}},
+		ExpectXML:     `<NameInField><foo xmlns="ns"><ignore></ignore></foo></NameInField>`,
+		UnmarshalOnly: true,
+	},
+
+	// Marshaling zero xml.Name uses the tag or field name.
+	{
+		Value:       &NameInField{},
+		ExpectXML:   `<NameInField><foo xmlns="ns"></foo></NameInField>`,
+		MarshalOnly: true,
+	},
+
+	// Test attributes
+	{
+		Value: &AttrTest{
+			Int:   8,
+			Named: 9,
+			Float: 23.5,
+			Uint8: 255,
+			Bool:  true,
+			Str:   "str",
+			Bytes: []byte("byt"),
+		},
+		ExpectXML: `<AttrTest Int="8" int="9" Float="23.5" Uint8="255"` +
+			` Bool="true" Str="str" Bytes="byt"></AttrTest>`,
+	},
+	{
+		Value: &AttrTest{Bytes: []byte{}},
+		ExpectXML: `<AttrTest Int="0" int="0" Float="0" Uint8="0"` +
+			` Bool="false" Str="" Bytes=""></AttrTest>`,
+	},
+	{
+		Value: &OmitAttrTest{
+			Int:   8,
+			Named: 9,
+			Float: 23.5,
+			Uint8: 255,
+			Bool:  true,
+			Str:   "str",
+			Bytes: []byte("byt"),
+		},
+		ExpectXML: `<OmitAttrTest Int="8" int="9" Float="23.5" Uint8="255"` +
+			` Bool="true" Str="str" Bytes="byt"></OmitAttrTest>`,
+	},
+	{
+		Value:     &OmitAttrTest{},
+		ExpectXML: `<OmitAttrTest></OmitAttrTest>`,
+	},
+
+	// pointer fields
+	{
+		Value:       &PointerFieldsTest{Name: &nameAttr, Age: &ageAttr, Contents: &contentsAttr},
+		ExpectXML:   `<dummy name="Sarah" age="12">lorem ipsum</dummy>`,
+		MarshalOnly: true,
+	},
+
+	// empty chardata pointer field
+	{
+		Value:       &ChardataEmptyTest{},
+		ExpectXML:   `<test></test>`,
+		MarshalOnly: true,
+	},
+
+	// omitempty on fields
+	{
+		Value: &OmitFieldTest{
+			Int:   8,
+			Named: 9,
+			Float: 23.5,
+			Uint8: 255,
+			Bool:  true,
+			Str:   "str",
+			Bytes: []byte("byt"),
+			Ptr:   &PresenceTest{},
+		},
+		ExpectXML: `<OmitFieldTest>` +
+			`<Int>8</Int>` +
+			`<int>9</int>` +
+			`<Float>23.5</Float>` +
+			`<Uint8>255</Uint8>` +
+			`<Bool>true</Bool>` +
+			`<Str>str</Str>` +
+			`<Bytes>byt</Bytes>` +
+			`<Ptr></Ptr>` +
+			`</OmitFieldTest>`,
+	},
+	{
+		Value:     &OmitFieldTest{},
+		ExpectXML: `<OmitFieldTest></OmitFieldTest>`,
+	},
+
+	// Test ",any"
+	{
+		ExpectXML: `<a><nested><value>known</value></nested><other><sub>unknown</sub></other></a>`,
+		Value: &AnyTest{
+			Nested: "known",
+			AnyField: AnyHolder{
+				XMLName: Name{Local: "other"},
+				XML:     "<sub>unknown</sub>",
+			},
+		},
+	},
+	{
+		Value: &AnyTest{Nested: "known",
+			AnyField: AnyHolder{
+				XML:     "<unknown/>",
+				XMLName: Name{Local: "AnyField"},
+			},
+		},
+		ExpectXML: `<a><nested><value>known</value></nested><AnyField><unknown/></AnyField></a>`,
+	},
+	{
+		ExpectXML: `<a><nested><value>b</value></nested></a>`,
+		Value: &AnyOmitTest{
+			Nested: "b",
+		},
+	},
+	{
+		ExpectXML: `<a><nested><value>b</value></nested><c><d>e</d></c><g xmlns="f"><h>i</h></g></a>`,
+		Value: &AnySliceTest{
+			Nested: "b",
+			AnyField: []AnyHolder{
+				{
+					XMLName: Name{Local: "c"},
+					XML:     "<d>e</d>",
+				},
+				{
+					XMLName: Name{Space: "f", Local: "g"},
+					XML:     "<h>i</h>",
+				},
+			},
+		},
+	},
+	{
+		ExpectXML: `<a><nested><value>b</value></nested></a>`,
+		Value: &AnySliceTest{
+			Nested: "b",
+		},
+	},
+
+	// Test recursive types.
+	{
+		Value: &RecurseA{
+			A: "a1",
+			B: &RecurseB{
+				A: &RecurseA{"a2", nil},
+				B: "b1",
+			},
+		},
+		ExpectXML: `<RecurseA><A>a1</A><B><A><A>a2</A></A><B>b1</B></B></RecurseA>`,
+	},
+
+	// Test ignoring fields via "-" tag
+	{
+		ExpectXML: `<IgnoreTest></IgnoreTest>`,
+		Value:     &IgnoreTest{},
+	},
+	{
+		ExpectXML:   `<IgnoreTest></IgnoreTest>`,
+		Value:       &IgnoreTest{PublicSecret: "can't tell"},
+		MarshalOnly: true,
+	},
+	{
+		ExpectXML:     `<IgnoreTest><PublicSecret>ignore me</PublicSecret></IgnoreTest>`,
+		Value:         &IgnoreTest{},
+		UnmarshalOnly: true,
+	},
+
+	// Test escaping.
+	{
+		ExpectXML: `<a><nested><value>dquote: &#34;; squote: &#39;; ampersand: &amp;; less: &lt;; greater: &gt;;</value></nested><empty></empty></a>`,
+		Value: &AnyTest{
+			Nested:   `dquote: "; squote: '; ampersand: &; less: <; greater: >;`,
+			AnyField: AnyHolder{XMLName: Name{Local: "empty"}},
+		},
+	},
+	{
+		ExpectXML: `<a><nested><value>newline: &#xA;; cr: &#xD;; tab: &#x9;;</value></nested><AnyField></AnyField></a>`,
+		Value: &AnyTest{
+			Nested:   "newline: \n; cr: \r; tab: \t;",
+			AnyField: AnyHolder{XMLName: Name{Local: "AnyField"}},
+		},
+	},
+	{
+		ExpectXML: "<a><nested><value>1\r2\r\n3\n\r4\n5</value></nested></a>",
+		Value: &AnyTest{
+			Nested: "1\n2\n3\n\n4\n5",
+		},
+		UnmarshalOnly: true,
+	},
+	{
+		ExpectXML: `<EmbedInt><MyInt>42</MyInt></EmbedInt>`,
+		Value: &EmbedInt{
+			MyInt: 42,
+		},
+	},
+	// Test omitempty with parent chain; see golang.org/issue/4168.
+	{
+		ExpectXML: `<Strings><A></A></Strings>`,
+		Value:     &Strings{},
+	},
+	// Custom marshalers.
+	{
+		ExpectXML: `<MyMarshalerTest>hello world</MyMarshalerTest>`,
+		Value:     &MyMarshalerTest{},
+	},
+	{
+		ExpectXML: `<MarshalerStruct Foo="hello world"></MarshalerStruct>`,
+		Value:     &MarshalerStruct{},
+	},
+	{
+		ExpectXML: `<outer xmlns="testns" int="10"></outer>`,
+		Value:     &OuterStruct{IntAttr: 10},
+	},
+	{
+		ExpectXML: `<test xmlns="outerns" int="10"></test>`,
+		Value:     &OuterNamedStruct{XMLName: Name{Space: "outerns", Local: "test"}, IntAttr: 10},
+	},
+	{
+		ExpectXML: `<test xmlns="outerns" int="10"></test>`,
+		Value:     &OuterNamedOrderedStruct{XMLName: Name{Space: "outerns", Local: "test"}, IntAttr: 10},
+	},
+	{
+		ExpectXML: `<outer xmlns="testns" int="10"></outer>`,
+		Value:     &OuterOuterStruct{OuterStruct{IntAttr: 10}},
+	},
+}
+
+func TestMarshal(t *testing.T) {
+	for idx, test := range marshalTests {
+		if test.UnmarshalOnly {
+			continue
+		}
+		data, err := Marshal(test.Value)
+		if err != nil {
+			t.Errorf("#%d: Error: %s", idx, err)
+			continue
+		}
+		if got, want := string(data), test.ExpectXML; got != want {
+			if strings.Contains(want, "\n") {
+				t.Errorf("#%d: marshal(%#v):\nHAVE:\n%s\nWANT:\n%s", idx, test.Value, got, want)
+			} else {
+				t.Errorf("#%d: marshal(%#v):\nhave %#q\nwant %#q", idx, test.Value, got, want)
+			}
+		}
+	}
+}
+
+type AttrParent struct {
+	X string `xml:"X>Y,attr"`
+}
+
+type BadAttr struct {
+	Name []string `xml:"name,attr"`
+}
+
+var marshalErrorTests = []struct {
+	Value interface{}
+	Err   string
+	Kind  reflect.Kind
+}{
+	{
+		Value: make(chan bool),
+		Err:   "xml: unsupported type: chan bool",
+		Kind:  reflect.Chan,
+	},
+	{
+		Value: map[string]string{
+			"question": "What do you get when you multiply six by nine?",
+			"answer":   "42",
+		},
+		Err:  "xml: unsupported type: map[string]string",
+		Kind: reflect.Map,
+	},
+	{
+		Value: map[*Ship]bool{nil: false},
+		Err:   "xml: unsupported type: map[*xml.Ship]bool",
+		Kind:  reflect.Map,
+	},
+	{
+		Value: &Domain{Comment: []byte("f--bar")},
+		Err:   `xml: comments must not contain "--"`,
+	},
+	// Reject parent chain with attr, never worked; see golang.org/issue/5033.
+	{
+		Value: &AttrParent{},
+		Err:   `xml: X>Y chain not valid with attr flag`,
+	},
+	{
+		Value: BadAttr{[]string{"X", "Y"}},
+		Err:   `xml: unsupported type: []string`,
+	},
+}
+
+var marshalIndentTests = []struct {
+	Value     interface{}
+	Prefix    string
+	Indent    string
+	ExpectXML string
+}{
+	{
+		Value: &SecretAgent{
+			Handle:    "007",
+			Identity:  "James Bond",
+			Obfuscate: "<redacted/>",
+		},
+		Prefix:    "",
+		Indent:    "\t",
+		ExpectXML: fmt.Sprintf("<agent handle=\"007\">\n\t<Identity>James Bond</Identity><redacted/>\n</agent>"),
+	},
+}
+
+func TestMarshalErrors(t *testing.T) {
+	for idx, test := range marshalErrorTests {
+		data, err := Marshal(test.Value)
+		if err == nil {
+			t.Errorf("#%d: marshal(%#v) = [success] %q, want error %v", idx, test.Value, data, test.Err)
+			continue
+		}
+		if err.Error() != test.Err {
+			t.Errorf("#%d: marshal(%#v) = [error] %v, want %v", idx, test.Value, err, test.Err)
+		}
+		if test.Kind != reflect.Invalid {
+			if kind := err.(*UnsupportedTypeError).Type.Kind(); kind != test.Kind {
+				t.Errorf("#%d: marshal(%#v) = [error kind] %s, want %s", idx, test.Value, kind, test.Kind)
+			}
+		}
+	}
+}
+
+// Do invertibility testing on the various structures that we test
+func TestUnmarshal(t *testing.T) {
+	for i, test := range marshalTests {
+		if test.MarshalOnly {
+			continue
+		}
+		if _, ok := test.Value.(*Plain); ok {
+			continue
+		}
+
+		vt := reflect.TypeOf(test.Value)
+		dest := reflect.New(vt.Elem()).Interface()
+		err := Unmarshal([]byte(test.ExpectXML), dest)
+
+		switch fix := dest.(type) {
+		case *Feed:
+			fix.Author.InnerXML = ""
+			for i := range fix.Entry {
+				fix.Entry[i].Author.InnerXML = ""
+			}
+		}
+
+		if err != nil {
+			t.Errorf("#%d: unexpected error: %#v", i, err)
+		} else if got, want := dest, test.Value; !reflect.DeepEqual(got, want) {
+			t.Errorf("#%d: unmarshal(%q):\nhave %#v\nwant %#v", i, test.ExpectXML, got, want)
+		}
+	}
+}
+
+func TestMarshalIndent(t *testing.T) {
+	for i, test := range marshalIndentTests {
+		data, err := MarshalIndent(test.Value, test.Prefix, test.Indent)
+		if err != nil {
+			t.Errorf("#%d: Error: %s", i, err)
+			continue
+		}
+		if got, want := string(data), test.ExpectXML; got != want {
+			t.Errorf("#%d: MarshalIndent:\nGot:%s\nWant:\n%s", i, got, want)
+		}
+	}
+}
+
+type limitedBytesWriter struct {
+	w      io.Writer
+	remain int // until writes fail
+}
+
+func (lw *limitedBytesWriter) Write(p []byte) (n int, err error) {
+	if lw.remain <= 0 {
+		println("error")
+		return 0, errors.New("write limit hit")
+	}
+	if len(p) > lw.remain {
+		p = p[:lw.remain]
+		n, _ = lw.w.Write(p)
+		lw.remain = 0
+		return n, errors.New("write limit hit")
+	}
+	n, err = lw.w.Write(p)
+	lw.remain -= n
+	return n, err
+}
+
+func TestMarshalWriteErrors(t *testing.T) {
+	var buf bytes.Buffer
+	const writeCap = 1024
+	w := &limitedBytesWriter{&buf, writeCap}
+	enc := NewEncoder(w)
+	var err error
+	var i int
+	const n = 4000
+	for i = 1; i <= n; i++ {
+		err = enc.Encode(&Passenger{
+			Name:   []string{"Alice", "Bob"},
+			Weight: 5,
+		})
+		if err != nil {
+			break
+		}
+	}
+	if err == nil {
+		t.Error("expected an error")
+	}
+	if i == n {
+		t.Errorf("expected to fail before the end")
+	}
+	if buf.Len() != writeCap {
+		t.Errorf("buf.Len() = %d; want %d", buf.Len(), writeCap)
+	}
+}
+
+func TestMarshalWriteIOErrors(t *testing.T) {
+	enc := NewEncoder(errWriter{})
+
+	expectErr := "unwritable"
+	err := enc.Encode(&Passenger{})
+	if err == nil || err.Error() != expectErr {
+		t.Errorf("EscapeTest = [error] %v, want %v", err, expectErr)
+	}
+}
+
+func TestMarshalFlush(t *testing.T) {
+	var buf bytes.Buffer
+	enc := NewEncoder(&buf)
+	if err := enc.EncodeToken(CharData("hello world")); err != nil {
+		t.Fatalf("enc.EncodeToken: %v", err)
+	}
+	if buf.Len() > 0 {
+		t.Fatalf("enc.EncodeToken caused actual write: %q", buf.Bytes())
+	}
+	if err := enc.Flush(); err != nil {
+		t.Fatalf("enc.Flush: %v", err)
+	}
+	if buf.String() != "hello world" {
+		t.Fatalf("after enc.Flush, buf.String() = %q, want %q", buf.String(), "hello world")
+	}
+}
+
+func BenchmarkMarshal(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		Marshal(atomValue)
+	}
+}
+
+func BenchmarkUnmarshal(b *testing.B) {
+	xml := []byte(atomXml)
+	for i := 0; i < b.N; i++ {
+		Unmarshal(xml, &Feed{})
+	}
+}
+
+// golang.org/issue/6556
+func TestStructPointerMarshal(t *testing.T) {
+	type A struct {
+		XMLName string `xml:"a"`
+		B       []interface{}
+	}
+	type C struct {
+		XMLName Name
+		Value   string `xml:"value"`
+	}
+
+	a := new(A)
+	a.B = append(a.B, &C{
+		XMLName: Name{Local: "c"},
+		Value:   "x",
+	})
+
+	b, err := Marshal(a)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if x := string(b); x != "<a><c><value>x</value></c></a>" {
+		t.Fatal(x)
+	}
+	var v A
+	err = Unmarshal(b, &v)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+var encodeTokenTests = []struct {
+	tok  Token
+	want string
+	ok   bool
+}{
+	{StartElement{Name{"space", "local"}, nil}, "<local xmlns=\"space\">", true},
+	{StartElement{Name{"space", ""}, nil}, "", false},
+	{EndElement{Name{"space", ""}}, "", false},
+	{CharData("foo"), "foo", true},
+	{Comment("foo"), "<!--foo-->", true},
+	{Comment("foo-->"), "", false},
+	{ProcInst{"Target", []byte("Instruction")}, "<?Target Instruction?>", true},
+	{ProcInst{"", []byte("Instruction")}, "", false},
+	{ProcInst{"Target", []byte("Instruction?>")}, "", false},
+	{Directive("foo"), "<!foo>", true},
+	{Directive("foo>"), "", false},
+}
+
+func TestEncodeToken(t *testing.T) {
+	for _, tt := range encodeTokenTests {
+		var buf bytes.Buffer
+		enc := NewEncoder(&buf)
+		err := enc.EncodeToken(tt.tok)
+		switch {
+		case !tt.ok && err == nil:
+			t.Errorf("enc.EncodeToken(%#v): expected error; got none", tt.tok)
+		case tt.ok && err != nil:
+			t.Fatalf("enc.EncodeToken: %v", err)
+		case !tt.ok && err != nil:
+			// expected error, got one
+		}
+		if err := enc.Flush(); err != nil {
+			t.Fatalf("enc.EncodeToken: %v", err)
+		}
+		if got := buf.String(); got != tt.want {
+			t.Errorf("enc.EncodeToken = %s; want: %s", got, tt.want)
+		}
+	}
+}
+
+func TestProcInstEncodeToken(t *testing.T) {
+	var buf bytes.Buffer
+	enc := NewEncoder(&buf)
+
+	if err := enc.EncodeToken(ProcInst{"xml", []byte("Instruction")}); err != nil {
+		t.Fatalf("enc.EncodeToken: expected to be able to encode xml target ProcInst as first token, %s", err)
+	}
+
+	if err := enc.EncodeToken(ProcInst{"Target", []byte("Instruction")}); err != nil {
+		t.Fatalf("enc.EncodeToken: expected to be able to add non-xml target ProcInst")
+	}
+
+	if err := enc.EncodeToken(ProcInst{"xml", []byte("Instruction")}); err == nil {
+		t.Fatalf("enc.EncodeToken: expected to not be allowed to encode xml target ProcInst when not first token")
+	}
+}
+
+func TestDecodeEncode(t *testing.T) {
+	var in, out bytes.Buffer
+	in.WriteString(`<?xml version="1.0" encoding="UTF-8"?>
+<?Target Instruction?>
+<root>
+</root>	
+`)
+	dec := NewDecoder(&in)
+	enc := NewEncoder(&out)
+	for tok, err := dec.Token(); err == nil; tok, err = dec.Token() {
+		err = enc.EncodeToken(tok)
+		if err != nil {
+			t.Fatalf("enc.EncodeToken: Unable to encode token (%#v), %v", tok, err)
+		}
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/xml/read.go b/vendor/github.com/vmware/govmomi/vim25/xml/read.go
new file mode 100644
index 0000000000..5b407b7909
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/xml/read.go
@@ -0,0 +1,779 @@
+// Copyright 2009 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package xml
+
+import (
+	"bytes"
+	"encoding"
+	"errors"
+	"fmt"
+	"reflect"
+	"strconv"
+	"strings"
+)
+
+// BUG(rsc): Mapping between XML elements and data structures is inherently flawed:
+// an XML element is an order-dependent collection of anonymous
+// values, while a data structure is an order-independent collection
+// of named values.
+// See package json for a textual representation more suitable
+// to data structures.
+
+// Unmarshal parses the XML-encoded data and stores the result in
+// the value pointed to by v, which must be an arbitrary struct,
+// slice, or string. Well-formed data that does not fit into v is
+// discarded.
+//
+// Because Unmarshal uses the reflect package, it can only assign
+// to exported (upper case) fields.  Unmarshal uses a case-sensitive
+// comparison to match XML element names to tag values and struct
+// field names.
+//
+// Unmarshal maps an XML element to a struct using the following rules.
+// In the rules, the tag of a field refers to the value associated with the
+// key 'xml' in the struct field's tag (see the example above).
+//
+//   * If the struct has a field of type []byte or string with tag
+//      ",innerxml", Unmarshal accumulates the raw XML nested inside the
+//      element in that field.  The rest of the rules still apply.
+//
+//   * If the struct has a field named XMLName of type xml.Name,
+//      Unmarshal records the element name in that field.
+//
+//   * If the XMLName field has an associated tag of the form
+//      "name" or "namespace-URL name", the XML element must have
+//      the given name (and, optionally, name space) or else Unmarshal
+//      returns an error.
+//
+//   * If the XML element has an attribute whose name matches a
+//      struct field name with an associated tag containing ",attr" or
+//      the explicit name in a struct field tag of the form "name,attr",
+//      Unmarshal records the attribute value in that field.
+//
+//   * If the XML element contains character data, that data is
+//      accumulated in the first struct field that has tag ",chardata".
+//      The struct field may have type []byte or string.
+//      If there is no such field, the character data is discarded.
+//
+//   * If the XML element contains comments, they are accumulated in
+//      the first struct field that has tag ",comment".  The struct
+//      field may have type []byte or string.  If there is no such
+//      field, the comments are discarded.
+//
+//   * If the XML element contains a sub-element whose name matches
+//      the prefix of a tag formatted as "a" or "a>b>c", unmarshal
+//      will descend into the XML structure looking for elements with the
+//      given names, and will map the innermost elements to that struct
+//      field. A tag starting with ">" is equivalent to one starting
+//      with the field name followed by ">".
+//
+//   * If the XML element contains a sub-element whose name matches
+//      a struct field's XMLName tag and the struct field has no
+//      explicit name tag as per the previous rule, unmarshal maps
+//      the sub-element to that struct field.
+//
+//   * If the XML element contains a sub-element whose name matches a
+//      field without any mode flags (",attr", ",chardata", etc), Unmarshal
+//      maps the sub-element to that struct field.
+//
+//   * If the XML element contains a sub-element that hasn't matched any
+//      of the above rules and the struct has a field with tag ",any",
+//      unmarshal maps the sub-element to that struct field.
+//
+//   * An anonymous struct field is handled as if the fields of its
+//      value were part of the outer struct.
+//
+//   * A struct field with tag "-" is never unmarshalled into.
+//
+// Unmarshal maps an XML element to a string or []byte by saving the
+// concatenation of that element's character data in the string or
+// []byte. The saved []byte is never nil.
+//
+// Unmarshal maps an attribute value to a string or []byte by saving
+// the value in the string or slice.
+//
+// Unmarshal maps an XML element to a slice by extending the length of
+// the slice and mapping the element to the newly created value.
+//
+// Unmarshal maps an XML element or attribute value to a bool by
+// setting it to the boolean value represented by the string.
+//
+// Unmarshal maps an XML element or attribute value to an integer or
+// floating-point field by setting the field to the result of
+// interpreting the string value in decimal.  There is no check for
+// overflow.
+//
+// Unmarshal maps an XML element to an xml.Name by recording the
+// element name.
+//
+// Unmarshal maps an XML element to a pointer by setting the pointer
+// to a freshly allocated value and then mapping the element to that value.
+//
+func Unmarshal(data []byte, v interface{}) error {
+	return NewDecoder(bytes.NewReader(data)).Decode(v)
+}
+
+// Decode works like xml.Unmarshal, except it reads the decoder
+// stream to find the start element.
+func (d *Decoder) Decode(v interface{}) error {
+	return d.DecodeElement(v, nil)
+}
+
+// DecodeElement works like xml.Unmarshal except that it takes
+// a pointer to the start XML element to decode into v.
+// It is useful when a client reads some raw XML tokens itself
+// but also wants to defer to Unmarshal for some elements.
+func (d *Decoder) DecodeElement(v interface{}, start *StartElement) error {
+	val := reflect.ValueOf(v)
+	if val.Kind() != reflect.Ptr {
+		return errors.New("non-pointer passed to Unmarshal")
+	}
+	return d.unmarshal(val.Elem(), start)
+}
+
+// An UnmarshalError represents an error in the unmarshalling process.
+type UnmarshalError string
+
+func (e UnmarshalError) Error() string { return string(e) }
+
+// Unmarshaler is the interface implemented by objects that can unmarshal
+// an XML element description of themselves.
+//
+// UnmarshalXML decodes a single XML element
+// beginning with the given start element.
+// If it returns an error, the outer call to Unmarshal stops and
+// returns that error.
+// UnmarshalXML must consume exactly one XML element.
+// One common implementation strategy is to unmarshal into
+// a separate value with a layout matching the expected XML
+// using d.DecodeElement,  and then to copy the data from
+// that value into the receiver.
+// Another common strategy is to use d.Token to process the
+// XML object one token at a time.
+// UnmarshalXML may not use d.RawToken.
+type Unmarshaler interface {
+	UnmarshalXML(d *Decoder, start StartElement) error
+}
+
+// UnmarshalerAttr is the interface implemented by objects that can unmarshal
+// an XML attribute description of themselves.
+//
+// UnmarshalXMLAttr decodes a single XML attribute.
+// If it returns an error, the outer call to Unmarshal stops and
+// returns that error.
+// UnmarshalXMLAttr is used only for struct fields with the
+// "attr" option in the field tag.
+type UnmarshalerAttr interface {
+	UnmarshalXMLAttr(attr Attr) error
+}
+
+// receiverType returns the receiver type to use in an expression like "%s.MethodName".
+func receiverType(val interface{}) string {
+	t := reflect.TypeOf(val)
+	if t.Name() != "" {
+		return t.String()
+	}
+	return "(" + t.String() + ")"
+}
+
+// unmarshalInterface unmarshals a single XML element into val.
+// start is the opening tag of the element.
+func (p *Decoder) unmarshalInterface(val Unmarshaler, start *StartElement) error {
+	// Record that decoder must stop at end tag corresponding to start.
+	p.pushEOF()
+
+	p.unmarshalDepth++
+	err := val.UnmarshalXML(p, *start)
+	p.unmarshalDepth--
+	if err != nil {
+		p.popEOF()
+		return err
+	}
+
+	if !p.popEOF() {
+		return fmt.Errorf("xml: %s.UnmarshalXML did not consume entire <%s> element", receiverType(val), start.Name.Local)
+	}
+
+	return nil
+}
+
+// unmarshalTextInterface unmarshals a single XML element into val.
+// The chardata contained in the element (but not its children)
+// is passed to the text unmarshaler.
+func (p *Decoder) unmarshalTextInterface(val encoding.TextUnmarshaler, start *StartElement) error {
+	var buf []byte
+	depth := 1
+	for depth > 0 {
+		t, err := p.Token()
+		if err != nil {
+			return err
+		}
+		switch t := t.(type) {
+		case CharData:
+			if depth == 1 {
+				buf = append(buf, t...)
+			}
+		case StartElement:
+			depth++
+		case EndElement:
+			depth--
+		}
+	}
+	return val.UnmarshalText(buf)
+}
+
+// unmarshalAttr unmarshals a single XML attribute into val.
+func (p *Decoder) unmarshalAttr(val reflect.Value, attr Attr) error {
+	if val.Kind() == reflect.Ptr {
+		if val.IsNil() {
+			val.Set(reflect.New(val.Type().Elem()))
+		}
+		val = val.Elem()
+	}
+
+	if val.CanInterface() && val.Type().Implements(unmarshalerAttrType) {
+		// This is an unmarshaler with a non-pointer receiver,
+		// so it's likely to be incorrect, but we do what we're told.
+		return val.Interface().(UnmarshalerAttr).UnmarshalXMLAttr(attr)
+	}
+	if val.CanAddr() {
+		pv := val.Addr()
+		if pv.CanInterface() && pv.Type().Implements(unmarshalerAttrType) {
+			return pv.Interface().(UnmarshalerAttr).UnmarshalXMLAttr(attr)
+		}
+	}
+
+	// Not an UnmarshalerAttr; try encoding.TextUnmarshaler.
+	if val.CanInterface() && val.Type().Implements(textUnmarshalerType) {
+		// This is an unmarshaler with a non-pointer receiver,
+		// so it's likely to be incorrect, but we do what we're told.
+		return val.Interface().(encoding.TextUnmarshaler).UnmarshalText([]byte(attr.Value))
+	}
+	if val.CanAddr() {
+		pv := val.Addr()
+		if pv.CanInterface() && pv.Type().Implements(textUnmarshalerType) {
+			return pv.Interface().(encoding.TextUnmarshaler).UnmarshalText([]byte(attr.Value))
+		}
+	}
+
+	copyValue(val, []byte(attr.Value))
+	return nil
+}
+
+var (
+	unmarshalerType     = reflect.TypeOf((*Unmarshaler)(nil)).Elem()
+	unmarshalerAttrType = reflect.TypeOf((*UnmarshalerAttr)(nil)).Elem()
+	textUnmarshalerType = reflect.TypeOf((*encoding.TextUnmarshaler)(nil)).Elem()
+)
+
+// Find reflect.Type for an element's type attribute.
+func (p *Decoder) typeForElement(val reflect.Value, start *StartElement) reflect.Type {
+	t := ""
+	for i, a := range start.Attr {
+		if a.Name == xmlSchemaInstance {
+			t = a.Value
+			// HACK: ensure xsi:type is last in the list to avoid using that value for
+			// a "type" attribute, such as ManagedObjectReference.Type for example.
+			// Note that xsi:type is already the last attribute in VC/ESX responses.
+			// This is only an issue with govmomi simulator generated responses.
+			// Proper fix will require finding a few needles in this xml package haystack.
+			x := len(start.Attr) - 1
+			if i != x {
+				start.Attr[i] = start.Attr[x]
+				start.Attr[x] = a
+			}
+			break
+		}
+	}
+
+	if t == "" {
+		// No type attribute; fall back to looking up type by interface name.
+		t = val.Type().Name()
+	}
+
+	// Maybe the type is a basic xsd:* type.
+	typ := stringToType(t)
+	if typ != nil {
+		return typ
+	}
+
+	// Maybe the type is a custom type.
+	if p.TypeFunc != nil {
+		if typ, ok := p.TypeFunc(t); ok {
+			return typ
+		}
+	}
+
+	return nil
+}
+
+// Unmarshal a single XML element into val.
+func (p *Decoder) unmarshal(val reflect.Value, start *StartElement) error {
+	// Find start element if we need it.
+	if start == nil {
+		for {
+			tok, err := p.Token()
+			if err != nil {
+				return err
+			}
+			if t, ok := tok.(StartElement); ok {
+				start = &t
+				break
+			}
+		}
+	}
+
+	// Try to figure out type for empty interface values.
+	if val.Kind() == reflect.Interface && val.IsNil() {
+		typ := p.typeForElement(val, start)
+		if typ != nil {
+			pval := reflect.New(typ).Elem()
+			err := p.unmarshal(pval, start)
+			if err != nil {
+				return err
+			}
+
+			for i := 0; i < 2; i++ {
+				if typ.Implements(val.Type()) {
+					val.Set(pval)
+					return nil
+				}
+
+				typ = reflect.PtrTo(typ)
+				pval = pval.Addr()
+			}
+
+			val.Set(pval)
+			return nil
+		}
+	}
+
+	// Load value from interface, but only if the result will be
+	// usefully addressable.
+	if val.Kind() == reflect.Interface && !val.IsNil() {
+		e := val.Elem()
+		if e.Kind() == reflect.Ptr && !e.IsNil() {
+			val = e
+		}
+	}
+
+	if val.Kind() == reflect.Ptr {
+		if val.IsNil() {
+			val.Set(reflect.New(val.Type().Elem()))
+		}
+		val = val.Elem()
+	}
+
+	if val.CanInterface() && val.Type().Implements(unmarshalerType) {
+		// This is an unmarshaler with a non-pointer receiver,
+		// so it's likely to be incorrect, but we do what we're told.
+		return p.unmarshalInterface(val.Interface().(Unmarshaler), start)
+	}
+
+	if val.CanAddr() {
+		pv := val.Addr()
+		if pv.CanInterface() && pv.Type().Implements(unmarshalerType) {
+			return p.unmarshalInterface(pv.Interface().(Unmarshaler), start)
+		}
+	}
+
+	if val.CanInterface() && val.Type().Implements(textUnmarshalerType) {
+		return p.unmarshalTextInterface(val.Interface().(encoding.TextUnmarshaler), start)
+	}
+
+	if val.CanAddr() {
+		pv := val.Addr()
+		if pv.CanInterface() && pv.Type().Implements(textUnmarshalerType) {
+			return p.unmarshalTextInterface(pv.Interface().(encoding.TextUnmarshaler), start)
+		}
+	}
+
+	var (
+		data         []byte
+		saveData     reflect.Value
+		comment      []byte
+		saveComment  reflect.Value
+		saveXML      reflect.Value
+		saveXMLIndex int
+		saveXMLData  []byte
+		saveAny      reflect.Value
+		sv           reflect.Value
+		tinfo        *typeInfo
+		err          error
+	)
+
+	switch v := val; v.Kind() {
+	default:
+		return errors.New("unknown type " + v.Type().String())
+
+	case reflect.Interface:
+		// TODO: For now, simply ignore the field. In the near
+		//       future we may choose to unmarshal the start
+		//       element on it, if not nil.
+		return p.Skip()
+
+	case reflect.Slice:
+		typ := v.Type()
+		if typ.Elem().Kind() == reflect.Uint8 {
+			// []byte
+			saveData = v
+			break
+		}
+
+		// Slice of element values.
+		// Grow slice.
+		n := v.Len()
+		if n >= v.Cap() {
+			ncap := 2 * n
+			if ncap < 4 {
+				ncap = 4
+			}
+			new := reflect.MakeSlice(typ, n, ncap)
+			reflect.Copy(new, v)
+			v.Set(new)
+		}
+		v.SetLen(n + 1)
+
+		// Recur to read element into slice.
+		if err := p.unmarshal(v.Index(n), start); err != nil {
+			v.SetLen(n)
+			return err
+		}
+		return nil
+
+	case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr, reflect.String:
+		saveData = v
+
+	case reflect.Struct:
+		typ := v.Type()
+		if typ == nameType {
+			v.Set(reflect.ValueOf(start.Name))
+			break
+		}
+
+		sv = v
+		tinfo, err = getTypeInfo(typ)
+		if err != nil {
+			return err
+		}
+
+		// Validate and assign element name.
+		if tinfo.xmlname != nil {
+			finfo := tinfo.xmlname
+			if finfo.name != "" && finfo.name != start.Name.Local {
+				return UnmarshalError("expected element type <" + finfo.name + "> but have <" + start.Name.Local + ">")
+			}
+			if finfo.xmlns != "" && finfo.xmlns != start.Name.Space {
+				e := "expected element <" + finfo.name + "> in name space " + finfo.xmlns + " but have "
+				if start.Name.Space == "" {
+					e += "no name space"
+				} else {
+					e += start.Name.Space
+				}
+				return UnmarshalError(e)
+			}
+			fv := finfo.value(sv)
+			if _, ok := fv.Interface().(Name); ok {
+				fv.Set(reflect.ValueOf(start.Name))
+			}
+		}
+
+		// Assign attributes.
+		// Also, determine whether we need to save character data or comments.
+		for i := range tinfo.fields {
+			finfo := &tinfo.fields[i]
+			switch finfo.flags & fMode {
+			case fAttr:
+				strv := finfo.value(sv)
+				// Look for attribute.
+				for _, a := range start.Attr {
+					if a.Name.Local == finfo.name && (finfo.xmlns == "" || finfo.xmlns == a.Name.Space) {
+						if err := p.unmarshalAttr(strv, a); err != nil {
+							return err
+						}
+						break
+					}
+				}
+
+			case fCharData:
+				if !saveData.IsValid() {
+					saveData = finfo.value(sv)
+				}
+
+			case fComment:
+				if !saveComment.IsValid() {
+					saveComment = finfo.value(sv)
+				}
+
+			case fAny, fAny | fElement:
+				if !saveAny.IsValid() {
+					saveAny = finfo.value(sv)
+				}
+
+			case fInnerXml:
+				if !saveXML.IsValid() {
+					saveXML = finfo.value(sv)
+					if p.saved == nil {
+						saveXMLIndex = 0
+						p.saved = new(bytes.Buffer)
+					} else {
+						saveXMLIndex = p.savedOffset()
+					}
+				}
+			}
+		}
+	}
+
+	// Find end element.
+	// Process sub-elements along the way.
+Loop:
+	for {
+		var savedOffset int
+		if saveXML.IsValid() {
+			savedOffset = p.savedOffset()
+		}
+		tok, err := p.Token()
+		if err != nil {
+			return err
+		}
+		switch t := tok.(type) {
+		case StartElement:
+			consumed := false
+			if sv.IsValid() {
+				consumed, err = p.unmarshalPath(tinfo, sv, nil, &t)
+				if err != nil {
+					return err
+				}
+				if !consumed && saveAny.IsValid() {
+					consumed = true
+					if err := p.unmarshal(saveAny, &t); err != nil {
+						return err
+					}
+				}
+			}
+			if !consumed {
+				if err := p.Skip(); err != nil {
+					return err
+				}
+			}
+
+		case EndElement:
+			if saveXML.IsValid() {
+				saveXMLData = p.saved.Bytes()[saveXMLIndex:savedOffset]
+				if saveXMLIndex == 0 {
+					p.saved = nil
+				}
+			}
+			break Loop
+
+		case CharData:
+			if saveData.IsValid() {
+				data = append(data, t...)
+			}
+
+		case Comment:
+			if saveComment.IsValid() {
+				comment = append(comment, t...)
+			}
+		}
+	}
+
+	if saveData.IsValid() && saveData.CanInterface() && saveData.Type().Implements(textUnmarshalerType) {
+		if err := saveData.Interface().(encoding.TextUnmarshaler).UnmarshalText(data); err != nil {
+			return err
+		}
+		saveData = reflect.Value{}
+	}
+
+	if saveData.IsValid() && saveData.CanAddr() {
+		pv := saveData.Addr()
+		if pv.CanInterface() && pv.Type().Implements(textUnmarshalerType) {
+			if err := pv.Interface().(encoding.TextUnmarshaler).UnmarshalText(data); err != nil {
+				return err
+			}
+			saveData = reflect.Value{}
+		}
+	}
+
+	if err := copyValue(saveData, data); err != nil {
+		return err
+	}
+
+	switch t := saveComment; t.Kind() {
+	case reflect.String:
+		t.SetString(string(comment))
+	case reflect.Slice:
+		t.Set(reflect.ValueOf(comment))
+	}
+
+	switch t := saveXML; t.Kind() {
+	case reflect.String:
+		t.SetString(string(saveXMLData))
+	case reflect.Slice:
+		t.Set(reflect.ValueOf(saveXMLData))
+	}
+
+	return nil
+}
+
+func copyValue(dst reflect.Value, src []byte) (err error) {
+	dst0 := dst
+
+	if dst.Kind() == reflect.Ptr {
+		if dst.IsNil() {
+			dst.Set(reflect.New(dst.Type().Elem()))
+		}
+		dst = dst.Elem()
+	}
+
+	// Save accumulated data.
+	switch dst.Kind() {
+	case reflect.Invalid:
+		// Probably a comment.
+	default:
+		return errors.New("cannot unmarshal into " + dst0.Type().String())
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		itmp, err := strconv.ParseInt(string(src), 10, dst.Type().Bits())
+		if err != nil {
+			return err
+		}
+		dst.SetInt(itmp)
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+		var utmp uint64
+		if len(src) > 0 && src[0] == '-' {
+			// Negative value for unsigned field.
+			// Assume it was serialized following two's complement.
+			itmp, err := strconv.ParseInt(string(src), 10, dst.Type().Bits())
+			if err != nil {
+				return err
+			}
+			// Reinterpret value based on type width.
+			switch dst.Type().Bits() {
+			case 8:
+				utmp = uint64(uint8(itmp))
+			case 16:
+				utmp = uint64(uint16(itmp))
+			case 32:
+				utmp = uint64(uint32(itmp))
+			case 64:
+				utmp = uint64(uint64(itmp))
+			}
+		} else {
+			utmp, err = strconv.ParseUint(string(src), 10, dst.Type().Bits())
+			if err != nil {
+				return err
+			}
+		}
+		dst.SetUint(utmp)
+	case reflect.Float32, reflect.Float64:
+		ftmp, err := strconv.ParseFloat(string(src), dst.Type().Bits())
+		if err != nil {
+			return err
+		}
+		dst.SetFloat(ftmp)
+	case reflect.Bool:
+		value, err := strconv.ParseBool(strings.TrimSpace(string(src)))
+		if err != nil {
+			return err
+		}
+		dst.SetBool(value)
+	case reflect.String:
+		dst.SetString(string(src))
+	case reflect.Slice:
+		if len(src) == 0 {
+			// non-nil to flag presence
+			src = []byte{}
+		}
+		dst.SetBytes(src)
+	}
+	return nil
+}
+
+// unmarshalPath walks down an XML structure looking for wanted
+// paths, and calls unmarshal on them.
+// The consumed result tells whether XML elements have been consumed
+// from the Decoder until start's matching end element, or if it's
+// still untouched because start is uninteresting for sv's fields.
+func (p *Decoder) unmarshalPath(tinfo *typeInfo, sv reflect.Value, parents []string, start *StartElement) (consumed bool, err error) {
+	recurse := false
+Loop:
+	for i := range tinfo.fields {
+		finfo := &tinfo.fields[i]
+		if finfo.flags&fElement == 0 || len(finfo.parents) < len(parents) || finfo.xmlns != "" && finfo.xmlns != start.Name.Space {
+			continue
+		}
+		for j := range parents {
+			if parents[j] != finfo.parents[j] {
+				continue Loop
+			}
+		}
+		if len(finfo.parents) == len(parents) && finfo.name == start.Name.Local {
+			// It's a perfect match, unmarshal the field.
+			return true, p.unmarshal(finfo.value(sv), start)
+		}
+		if len(finfo.parents) > len(parents) && finfo.parents[len(parents)] == start.Name.Local {
+			// It's a prefix for the field. Break and recurse
+			// since it's not ok for one field path to be itself
+			// the prefix for another field path.
+			recurse = true
+
+			// We can reuse the same slice as long as we
+			// don't try to append to it.
+			parents = finfo.parents[:len(parents)+1]
+			break
+		}
+	}
+	if !recurse {
+		// We have no business with this element.
+		return false, nil
+	}
+	// The element is not a perfect match for any field, but one
+	// or more fields have the path to this element as a parent
+	// prefix. Recurse and attempt to match these.
+	for {
+		var tok Token
+		tok, err = p.Token()
+		if err != nil {
+			return true, err
+		}
+		switch t := tok.(type) {
+		case StartElement:
+			consumed2, err := p.unmarshalPath(tinfo, sv, parents, &t)
+			if err != nil {
+				return true, err
+			}
+			if !consumed2 {
+				if err := p.Skip(); err != nil {
+					return true, err
+				}
+			}
+		case EndElement:
+			return true, nil
+		}
+	}
+}
+
+// Skip reads tokens until it has consumed the end element
+// matching the most recent start element already consumed.
+// It recurs if it encounters a start element, so it can be used to
+// skip nested structures.
+// It returns nil if it finds an end element matching the start
+// element; otherwise it returns an error describing the problem.
+func (d *Decoder) Skip() error {
+	for {
+		tok, err := d.Token()
+		if err != nil {
+			return err
+		}
+		switch tok.(type) {
+		case StartElement:
+			if err := d.Skip(); err != nil {
+				return err
+			}
+		case EndElement:
+			return nil
+		}
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/xml/read_test.go b/vendor/github.com/vmware/govmomi/vim25/xml/read_test.go
new file mode 100644
index 0000000000..77f43023ec
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/xml/read_test.go
@@ -0,0 +1,762 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package xml
+
+import (
+	"io"
+	"reflect"
+	"strings"
+	"testing"
+	"time"
+)
+
+// Stripped down Atom feed data structures.
+
+func TestUnmarshalFeed(t *testing.T) {
+	var f Feed
+	if err := Unmarshal([]byte(atomFeedString), &f); err != nil {
+		t.Fatalf("Unmarshal: %s", err)
+	}
+	if !reflect.DeepEqual(f, atomFeed) {
+		t.Fatalf("have %#v\nwant %#v", f, atomFeed)
+	}
+}
+
+// hget http://codereview.appspot.com/rss/mine/rsc
+const atomFeedString = `
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en-us" updated="2009-10-04T01:35:58+00:00"><title>Code Review - My issues</title><link href="http://codereview.appspot.com/" rel="alternate"></link><link href="http://codereview.appspot.com/rss/mine/rsc" rel="self"></link><id>http://codereview.appspot.com/</id><author><name>rietveld&lt;&gt;</name></author><entry><title>rietveld: an attempt at pubsubhubbub
+</title><link href="http://codereview.appspot.com/126085" rel="alternate"></link><updated>2009-10-04T01:35:58+00:00</updated><author><name>email-address-removed</name></author><id>urn:md5:134d9179c41f806be79b3a5f7877d19a</id><summary type="html">
+  An attempt at adding pubsubhubbub support to Rietveld.
+http://code.google.com/p/pubsubhubbub
+http://code.google.com/p/rietveld/issues/detail?id=155
+
+The server side of the protocol is trivial:
+  1. add a &amp;lt;link rel=&amp;quot;hub&amp;quot; href=&amp;quot;hub-server&amp;quot;&amp;gt; tag to all
+     feeds that will be pubsubhubbubbed.
+  2. every time one of those feeds changes, tell the hub
+     with a simple POST request.
+
+I have tested this by adding debug prints to a local hub
+server and checking that the server got the right publish
+requests.
+
+I can&amp;#39;t quite get the server to work, but I think the bug
+is not in my code.  I think that the server expects to be
+able to grab the feed and see the feed&amp;#39;s actual URL in
+the link rel=&amp;quot;self&amp;quot;, but the default value for that drops
+the :port from the URL, and I cannot for the life of me
+figure out how to get the Atom generator deep inside
+django not to do that, or even where it is doing that,
+or even what code is running to generate the Atom feed.
+(I thought I knew but I added some assert False statements
+and it kept running!)
+
+Ignoring that particular problem, I would appreciate
+feedback on the right way to get the two values at
+the top of feeds.py marked NOTE(rsc).
+
+
+</summary></entry><entry><title>rietveld: correct tab handling
+</title><link href="http://codereview.appspot.com/124106" rel="alternate"></link><updated>2009-10-03T23:02:17+00:00</updated><author><name>email-address-removed</name></author><id>urn:md5:0a2a4f19bb815101f0ba2904aed7c35a</id><summary type="html">
+  This fixes the buggy tab rendering that can be seen at
+http://codereview.appspot.com/116075/diff/1/2
+
+The fundamental problem was that the tab code was
+not being told what column the text began in, so it
+didn&amp;#39;t know where to put the tab stops.  Another problem
+was that some of the code assumed that string byte
+offsets were the same as column offsets, which is only
+true if there are no tabs.
+
+In the process of fixing this, I cleaned up the arguments
+to Fold and ExpandTabs and renamed them Break and
+_ExpandTabs so that I could be sure that I found all the
+call sites.  I also wanted to verify that ExpandTabs was
+not being used from outside intra_region_diff.py.
+
+
+</summary></entry></feed> 	   `
+
+type Feed struct {
+	XMLName Name      `xml:"http://www.w3.org/2005/Atom feed"`
+	Title   string    `xml:"title"`
+	Id      string    `xml:"id"`
+	Link    []Link    `xml:"link"`
+	Updated time.Time `xml:"updated,attr"`
+	Author  Person    `xml:"author"`
+	Entry   []Entry   `xml:"entry"`
+}
+
+type Entry struct {
+	Title   string    `xml:"title"`
+	Id      string    `xml:"id"`
+	Link    []Link    `xml:"link"`
+	Updated time.Time `xml:"updated"`
+	Author  Person    `xml:"author"`
+	Summary Text      `xml:"summary"`
+}
+
+type Link struct {
+	Rel  string `xml:"rel,attr,omitempty"`
+	Href string `xml:"href,attr"`
+}
+
+type Person struct {
+	Name     string `xml:"name"`
+	URI      string `xml:"uri"`
+	Email    string `xml:"email"`
+	InnerXML string `xml:",innerxml"`
+}
+
+type Text struct {
+	Type string `xml:"type,attr,omitempty"`
+	Body string `xml:",chardata"`
+}
+
+var atomFeed = Feed{
+	XMLName: Name{"http://www.w3.org/2005/Atom", "feed"},
+	Title:   "Code Review - My issues",
+	Link: []Link{
+		{Rel: "alternate", Href: "http://codereview.appspot.com/"},
+		{Rel: "self", Href: "http://codereview.appspot.com/rss/mine/rsc"},
+	},
+	Id:      "http://codereview.appspot.com/",
+	Updated: ParseTime("2009-10-04T01:35:58+00:00"),
+	Author: Person{
+		Name:     "rietveld<>",
+		InnerXML: "<name>rietveld&lt;&gt;</name>",
+	},
+	Entry: []Entry{
+		{
+			Title: "rietveld: an attempt at pubsubhubbub\n",
+			Link: []Link{
+				{Rel: "alternate", Href: "http://codereview.appspot.com/126085"},
+			},
+			Updated: ParseTime("2009-10-04T01:35:58+00:00"),
+			Author: Person{
+				Name:     "email-address-removed",
+				InnerXML: "<name>email-address-removed</name>",
+			},
+			Id: "urn:md5:134d9179c41f806be79b3a5f7877d19a",
+			Summary: Text{
+				Type: "html",
+				Body: `
+  An attempt at adding pubsubhubbub support to Rietveld.
+http://code.google.com/p/pubsubhubbub
+http://code.google.com/p/rietveld/issues/detail?id=155
+
+The server side of the protocol is trivial:
+  1. add a &lt;link rel=&quot;hub&quot; href=&quot;hub-server&quot;&gt; tag to all
+     feeds that will be pubsubhubbubbed.
+  2. every time one of those feeds changes, tell the hub
+     with a simple POST request.
+
+I have tested this by adding debug prints to a local hub
+server and checking that the server got the right publish
+requests.
+
+I can&#39;t quite get the server to work, but I think the bug
+is not in my code.  I think that the server expects to be
+able to grab the feed and see the feed&#39;s actual URL in
+the link rel=&quot;self&quot;, but the default value for that drops
+the :port from the URL, and I cannot for the life of me
+figure out how to get the Atom generator deep inside
+django not to do that, or even where it is doing that,
+or even what code is running to generate the Atom feed.
+(I thought I knew but I added some assert False statements
+and it kept running!)
+
+Ignoring that particular problem, I would appreciate
+feedback on the right way to get the two values at
+the top of feeds.py marked NOTE(rsc).
+
+
+`,
+			},
+		},
+		{
+			Title: "rietveld: correct tab handling\n",
+			Link: []Link{
+				{Rel: "alternate", Href: "http://codereview.appspot.com/124106"},
+			},
+			Updated: ParseTime("2009-10-03T23:02:17+00:00"),
+			Author: Person{
+				Name:     "email-address-removed",
+				InnerXML: "<name>email-address-removed</name>",
+			},
+			Id: "urn:md5:0a2a4f19bb815101f0ba2904aed7c35a",
+			Summary: Text{
+				Type: "html",
+				Body: `
+  This fixes the buggy tab rendering that can be seen at
+http://codereview.appspot.com/116075/diff/1/2
+
+The fundamental problem was that the tab code was
+not being told what column the text began in, so it
+didn&#39;t know where to put the tab stops.  Another problem
+was that some of the code assumed that string byte
+offsets were the same as column offsets, which is only
+true if there are no tabs.
+
+In the process of fixing this, I cleaned up the arguments
+to Fold and ExpandTabs and renamed them Break and
+_ExpandTabs so that I could be sure that I found all the
+call sites.  I also wanted to verify that ExpandTabs was
+not being used from outside intra_region_diff.py.
+
+
+`,
+			},
+		},
+	},
+}
+
+const pathTestString = `
+<Result>
+    <Before>1</Before>
+    <Items>
+        <Item1>
+            <Value>A</Value>
+        </Item1>
+        <Item2>
+            <Value>B</Value>
+        </Item2>
+        <Item1>
+            <Value>C</Value>
+            <Value>D</Value>
+        </Item1>
+        <_>
+            <Value>E</Value>
+        </_>
+    </Items>
+    <After>2</After>
+</Result>
+`
+
+type PathTestItem struct {
+	Value string
+}
+
+type PathTestA struct {
+	Items         []PathTestItem `xml:">Item1"`
+	Before, After string
+}
+
+type PathTestB struct {
+	Other         []PathTestItem `xml:"Items>Item1"`
+	Before, After string
+}
+
+type PathTestC struct {
+	Values1       []string `xml:"Items>Item1>Value"`
+	Values2       []string `xml:"Items>Item2>Value"`
+	Before, After string
+}
+
+type PathTestSet struct {
+	Item1 []PathTestItem
+}
+
+type PathTestD struct {
+	Other         PathTestSet `xml:"Items"`
+	Before, After string
+}
+
+type PathTestE struct {
+	Underline     string `xml:"Items>_>Value"`
+	Before, After string
+}
+
+var pathTests = []interface{}{
+	&PathTestA{Items: []PathTestItem{{"A"}, {"D"}}, Before: "1", After: "2"},
+	&PathTestB{Other: []PathTestItem{{"A"}, {"D"}}, Before: "1", After: "2"},
+	&PathTestC{Values1: []string{"A", "C", "D"}, Values2: []string{"B"}, Before: "1", After: "2"},
+	&PathTestD{Other: PathTestSet{Item1: []PathTestItem{{"A"}, {"D"}}}, Before: "1", After: "2"},
+	&PathTestE{Underline: "E", Before: "1", After: "2"},
+}
+
+func TestUnmarshalPaths(t *testing.T) {
+	for _, pt := range pathTests {
+		v := reflect.New(reflect.TypeOf(pt).Elem()).Interface()
+		if err := Unmarshal([]byte(pathTestString), v); err != nil {
+			t.Fatalf("Unmarshal: %s", err)
+		}
+		if !reflect.DeepEqual(v, pt) {
+			t.Fatalf("have %#v\nwant %#v", v, pt)
+		}
+	}
+}
+
+type BadPathTestA struct {
+	First  string `xml:"items>item1"`
+	Other  string `xml:"items>item2"`
+	Second string `xml:"items"`
+}
+
+type BadPathTestB struct {
+	Other  string `xml:"items>item2>value"`
+	First  string `xml:"items>item1"`
+	Second string `xml:"items>item1>value"`
+}
+
+type BadPathTestC struct {
+	First  string
+	Second string `xml:"First"`
+}
+
+type BadPathTestD struct {
+	BadPathEmbeddedA
+	BadPathEmbeddedB
+}
+
+type BadPathEmbeddedA struct {
+	First string
+}
+
+type BadPathEmbeddedB struct {
+	Second string `xml:"First"`
+}
+
+var badPathTests = []struct {
+	v, e interface{}
+}{
+	{&BadPathTestA{}, &TagPathError{reflect.TypeOf(BadPathTestA{}), "First", "items>item1", "Second", "items"}},
+	{&BadPathTestB{}, &TagPathError{reflect.TypeOf(BadPathTestB{}), "First", "items>item1", "Second", "items>item1>value"}},
+	{&BadPathTestC{}, &TagPathError{reflect.TypeOf(BadPathTestC{}), "First", "", "Second", "First"}},
+	{&BadPathTestD{}, &TagPathError{reflect.TypeOf(BadPathTestD{}), "First", "", "Second", "First"}},
+}
+
+func TestUnmarshalBadPaths(t *testing.T) {
+	for _, tt := range badPathTests {
+		err := Unmarshal([]byte(pathTestString), tt.v)
+		if !reflect.DeepEqual(err, tt.e) {
+			t.Fatalf("Unmarshal with %#v didn't fail properly:\nhave %#v,\nwant %#v", tt.v, err, tt.e)
+		}
+	}
+}
+
+const OK = "OK"
+const withoutNameTypeData = `
+<?xml version="1.0" charset="utf-8"?>
+<Test3 Attr="OK" />`
+
+type TestThree struct {
+	XMLName Name   `xml:"Test3"`
+	Attr    string `xml:",attr"`
+}
+
+func TestUnmarshalWithoutNameType(t *testing.T) {
+	var x TestThree
+	if err := Unmarshal([]byte(withoutNameTypeData), &x); err != nil {
+		t.Fatalf("Unmarshal: %s", err)
+	}
+	if x.Attr != OK {
+		t.Fatalf("have %v\nwant %v", x.Attr, OK)
+	}
+}
+
+func TestUnmarshalAttr(t *testing.T) {
+	type ParamVal struct {
+		Int int `xml:"int,attr"`
+	}
+
+	type ParamPtr struct {
+		Int *int `xml:"int,attr"`
+	}
+
+	type ParamStringPtr struct {
+		Int *string `xml:"int,attr"`
+	}
+
+	x := []byte(`<Param int="1" />`)
+
+	p1 := &ParamPtr{}
+	if err := Unmarshal(x, p1); err != nil {
+		t.Fatalf("Unmarshal: %s", err)
+	}
+	if p1.Int == nil {
+		t.Fatalf("Unmarshal failed in to *int field")
+	} else if *p1.Int != 1 {
+		t.Fatalf("Unmarshal with %s failed:\nhave %#v,\n want %#v", x, p1.Int, 1)
+	}
+
+	p2 := &ParamVal{}
+	if err := Unmarshal(x, p2); err != nil {
+		t.Fatalf("Unmarshal: %s", err)
+	}
+	if p2.Int != 1 {
+		t.Fatalf("Unmarshal with %s failed:\nhave %#v,\n want %#v", x, p2.Int, 1)
+	}
+
+	p3 := &ParamStringPtr{}
+	if err := Unmarshal(x, p3); err != nil {
+		t.Fatalf("Unmarshal: %s", err)
+	}
+	if p3.Int == nil {
+		t.Fatalf("Unmarshal failed in to *string field")
+	} else if *p3.Int != "1" {
+		t.Fatalf("Unmarshal with %s failed:\nhave %#v,\n want %#v", x, p3.Int, 1)
+	}
+}
+
+type Tables struct {
+	HTable string `xml:"http://www.w3.org/TR/html4/ table"`
+	FTable string `xml:"http://www.w3schools.com/furniture table"`
+}
+
+var tables = []struct {
+	xml string
+	tab Tables
+	ns  string
+}{
+	{
+		xml: `<Tables>` +
+			`<table xmlns="http://www.w3.org/TR/html4/">hello</table>` +
+			`<table xmlns="http://www.w3schools.com/furniture">world</table>` +
+			`</Tables>`,
+		tab: Tables{"hello", "world"},
+	},
+	{
+		xml: `<Tables>` +
+			`<table xmlns="http://www.w3schools.com/furniture">world</table>` +
+			`<table xmlns="http://www.w3.org/TR/html4/">hello</table>` +
+			`</Tables>`,
+		tab: Tables{"hello", "world"},
+	},
+	{
+		xml: `<Tables xmlns:f="http://www.w3schools.com/furniture" xmlns:h="http://www.w3.org/TR/html4/">` +
+			`<f:table>world</f:table>` +
+			`<h:table>hello</h:table>` +
+			`</Tables>`,
+		tab: Tables{"hello", "world"},
+	},
+	{
+		xml: `<Tables>` +
+			`<table>bogus</table>` +
+			`</Tables>`,
+		tab: Tables{},
+	},
+	{
+		xml: `<Tables>` +
+			`<table>only</table>` +
+			`</Tables>`,
+		tab: Tables{HTable: "only"},
+		ns:  "http://www.w3.org/TR/html4/",
+	},
+	{
+		xml: `<Tables>` +
+			`<table>only</table>` +
+			`</Tables>`,
+		tab: Tables{FTable: "only"},
+		ns:  "http://www.w3schools.com/furniture",
+	},
+	{
+		xml: `<Tables>` +
+			`<table>only</table>` +
+			`</Tables>`,
+		tab: Tables{},
+		ns:  "something else entirely",
+	},
+}
+
+func TestUnmarshalNS(t *testing.T) {
+	for i, tt := range tables {
+		var dst Tables
+		var err error
+		if tt.ns != "" {
+			d := NewDecoder(strings.NewReader(tt.xml))
+			d.DefaultSpace = tt.ns
+			err = d.Decode(&dst)
+		} else {
+			err = Unmarshal([]byte(tt.xml), &dst)
+		}
+		if err != nil {
+			t.Errorf("#%d: Unmarshal: %v", i, err)
+			continue
+		}
+		want := tt.tab
+		if dst != want {
+			t.Errorf("#%d: dst=%+v, want %+v", i, dst, want)
+		}
+	}
+}
+
+func TestMarshalNS(t *testing.T) {
+	dst := Tables{"hello", "world"}
+	data, err := Marshal(&dst)
+	if err != nil {
+		t.Fatalf("Marshal: %v", err)
+	}
+	want := `<Tables><table xmlns="http://www.w3.org/TR/html4/">hello</table><table xmlns="http://www.w3schools.com/furniture">world</table></Tables>`
+	str := string(data)
+	if str != want {
+		t.Errorf("have: %q\nwant: %q\n", str, want)
+	}
+}
+
+type TableAttrs struct {
+	TAttr TAttr
+}
+
+type TAttr struct {
+	HTable string `xml:"http://www.w3.org/TR/html4/ table,attr"`
+	FTable string `xml:"http://www.w3schools.com/furniture table,attr"`
+	Lang   string `xml:"http://www.w3.org/XML/1998/namespace lang,attr,omitempty"`
+	Other1 string `xml:"http://golang.org/xml/ other,attr,omitempty"`
+	Other2 string `xml:"http://golang.org/xmlfoo/ other,attr,omitempty"`
+	Other3 string `xml:"http://golang.org/json/ other,attr,omitempty"`
+	Other4 string `xml:"http://golang.org/2/json/ other,attr,omitempty"`
+}
+
+var tableAttrs = []struct {
+	xml string
+	tab TableAttrs
+	ns  string
+}{
+	{
+		xml: `<TableAttrs xmlns:f="http://www.w3schools.com/furniture" xmlns:h="http://www.w3.org/TR/html4/"><TAttr ` +
+			`h:table="hello" f:table="world" ` +
+			`/></TableAttrs>`,
+		tab: TableAttrs{TAttr{HTable: "hello", FTable: "world"}},
+	},
+	{
+		xml: `<TableAttrs><TAttr xmlns:f="http://www.w3schools.com/furniture" xmlns:h="http://www.w3.org/TR/html4/" ` +
+			`h:table="hello" f:table="world" ` +
+			`/></TableAttrs>`,
+		tab: TableAttrs{TAttr{HTable: "hello", FTable: "world"}},
+	},
+	{
+		xml: `<TableAttrs><TAttr ` +
+			`h:table="hello" f:table="world" xmlns:f="http://www.w3schools.com/furniture" xmlns:h="http://www.w3.org/TR/html4/" ` +
+			`/></TableAttrs>`,
+		tab: TableAttrs{TAttr{HTable: "hello", FTable: "world"}},
+	},
+	{
+		// Default space does not apply to attribute names.
+		xml: `<TableAttrs xmlns="http://www.w3schools.com/furniture" xmlns:h="http://www.w3.org/TR/html4/"><TAttr ` +
+			`h:table="hello" table="world" ` +
+			`/></TableAttrs>`,
+		tab: TableAttrs{TAttr{HTable: "hello", FTable: ""}},
+	},
+	{
+		// Default space does not apply to attribute names.
+		xml: `<TableAttrs xmlns:f="http://www.w3schools.com/furniture"><TAttr xmlns="http://www.w3.org/TR/html4/" ` +
+			`table="hello" f:table="world" ` +
+			`/></TableAttrs>`,
+		tab: TableAttrs{TAttr{HTable: "", FTable: "world"}},
+	},
+	{
+		xml: `<TableAttrs><TAttr ` +
+			`table="bogus" ` +
+			`/></TableAttrs>`,
+		tab: TableAttrs{},
+	},
+	{
+		// Default space does not apply to attribute names.
+		xml: `<TableAttrs xmlns:h="http://www.w3.org/TR/html4/"><TAttr ` +
+			`h:table="hello" table="world" ` +
+			`/></TableAttrs>`,
+		tab: TableAttrs{TAttr{HTable: "hello", FTable: ""}},
+		ns:  "http://www.w3schools.com/furniture",
+	},
+	{
+		// Default space does not apply to attribute names.
+		xml: `<TableAttrs xmlns:f="http://www.w3schools.com/furniture"><TAttr ` +
+			`table="hello" f:table="world" ` +
+			`/></TableAttrs>`,
+		tab: TableAttrs{TAttr{HTable: "", FTable: "world"}},
+		ns:  "http://www.w3.org/TR/html4/",
+	},
+	{
+		xml: `<TableAttrs><TAttr ` +
+			`table="bogus" ` +
+			`/></TableAttrs>`,
+		tab: TableAttrs{},
+		ns:  "something else entirely",
+	},
+}
+
+func TestUnmarshalNSAttr(t *testing.T) {
+	for i, tt := range tableAttrs {
+		var dst TableAttrs
+		var err error
+		if tt.ns != "" {
+			d := NewDecoder(strings.NewReader(tt.xml))
+			d.DefaultSpace = tt.ns
+			err = d.Decode(&dst)
+		} else {
+			err = Unmarshal([]byte(tt.xml), &dst)
+		}
+		if err != nil {
+			t.Errorf("#%d: Unmarshal: %v", i, err)
+			continue
+		}
+		want := tt.tab
+		if dst != want {
+			t.Errorf("#%d: dst=%+v, want %+v", i, dst, want)
+		}
+	}
+}
+
+func TestMarshalNSAttr(t *testing.T) {
+	src := TableAttrs{TAttr{"hello", "world", "en_US", "other1", "other2", "other3", "other4"}}
+	data, err := Marshal(&src)
+	if err != nil {
+		t.Fatalf("Marshal: %v", err)
+	}
+	want := `<TableAttrs><TAttr xmlns:html4="http://www.w3.org/TR/html4/" html4:table="hello" xmlns:furniture="http://www.w3schools.com/furniture" furniture:table="world" xml:lang="en_US" xmlns:_xml="http://golang.org/xml/" _xml:other="other1" xmlns:_xmlfoo="http://golang.org/xmlfoo/" _xmlfoo:other="other2" xmlns:json="http://golang.org/json/" json:other="other3" xmlns:json_1="http://golang.org/2/json/" json_1:other="other4"></TAttr></TableAttrs>`
+	str := string(data)
+	if str != want {
+		t.Errorf("Marshal:\nhave: %#q\nwant: %#q\n", str, want)
+	}
+
+	var dst TableAttrs
+	if err := Unmarshal(data, &dst); err != nil {
+		t.Errorf("Unmarshal: %v", err)
+	}
+
+	if dst != src {
+		t.Errorf("Unmarshal = %q, want %q", dst, src)
+	}
+}
+
+type MyCharData struct {
+	body string
+}
+
+func (m *MyCharData) UnmarshalXML(d *Decoder, start StartElement) error {
+	for {
+		t, err := d.Token()
+		if err == io.EOF { // found end of element
+			break
+		}
+		if err != nil {
+			return err
+		}
+		if char, ok := t.(CharData); ok {
+			m.body += string(char)
+		}
+	}
+	return nil
+}
+
+var _ Unmarshaler = (*MyCharData)(nil)
+
+func (m *MyCharData) UnmarshalXMLAttr(attr Attr) error {
+	panic("must not call")
+}
+
+type MyAttr struct {
+	attr string
+}
+
+func (m *MyAttr) UnmarshalXMLAttr(attr Attr) error {
+	m.attr = attr.Value
+	return nil
+}
+
+var _ UnmarshalerAttr = (*MyAttr)(nil)
+
+type MyStruct struct {
+	Data *MyCharData
+	Attr *MyAttr `xml:",attr"`
+
+	Data2 MyCharData
+	Attr2 MyAttr `xml:",attr"`
+}
+
+func TestUnmarshaler(t *testing.T) {
+	xml := `<?xml version="1.0" encoding="utf-8"?>
+		<MyStruct Attr="attr1" Attr2="attr2">
+		<Data>hello <!-- comment -->world</Data>
+		<Data2>howdy <!-- comment -->world</Data2>
+		</MyStruct>
+	`
+
+	var m MyStruct
+	if err := Unmarshal([]byte(xml), &m); err != nil {
+		t.Fatal(err)
+	}
+
+	if m.Data == nil || m.Attr == nil || m.Data.body != "hello world" || m.Attr.attr != "attr1" || m.Data2.body != "howdy world" || m.Attr2.attr != "attr2" {
+		t.Errorf("m=%#+v\n", m)
+	}
+}
+
+type Pea struct {
+	Cotelydon string
+}
+
+type Pod struct {
+	Pea interface{} `xml:"Pea"`
+}
+
+// https://code.google.com/p/go/issues/detail?id=6836
+func TestUnmarshalIntoInterface(t *testing.T) {
+	pod := new(Pod)
+	pod.Pea = new(Pea)
+	xml := `<Pod><Pea><Cotelydon>Green stuff</Cotelydon></Pea></Pod>`
+	err := Unmarshal([]byte(xml), pod)
+	if err != nil {
+		t.Fatalf("failed to unmarshal %q: %v", xml, err)
+	}
+	pea, ok := pod.Pea.(*Pea)
+	if !ok {
+		t.Fatalf("unmarshalled into wrong type: have %T want *Pea", pod.Pea)
+	}
+	have, want := pea.Cotelydon, "Green stuff"
+	if have != want {
+		t.Errorf("failed to unmarshal into interface, have %q want %q", have, want)
+	}
+}
+
+// https://github.com/vmware/govmomi/issues/246
+func TestNegativeValuesUnsignedFields(t *testing.T) {
+	type T struct {
+		I   string
+		O   interface{}
+		U8  uint8  `xml:"u8"`
+		U16 uint16 `xml:"u16"`
+		U32 uint32 `xml:"u32"`
+		U64 uint64 `xml:"u64"`
+	}
+
+	var tests = []T{
+		{I: "<T><u8>-128</u8></T>", O: uint8(0x80)},
+		{I: "<T><u8>-1</u8></T>", O: uint8(0xff)},
+		{I: "<T><u16>-32768</u16></T>", O: uint16(0x8000)},
+		{I: "<T><u16>-1</u16></T>", O: uint16(0xffff)},
+		{I: "<T><u32>-2147483648</u32></T>", O: uint32(0x80000000)},
+		{I: "<T><u32>-1</u32></T>", O: uint32(0xffffffff)},
+		{I: "<T><u64>-9223372036854775808</u64></T>", O: uint64(0x8000000000000000)},
+		{I: "<T><u64>-1</u64></T>", O: uint64(0xffffffffffffffff)},
+	}
+
+	for _, test := range tests {
+		err := Unmarshal([]byte(test.I), &test)
+		if err != nil {
+			t.Errorf("Unmarshal error: %v", err)
+			continue
+		}
+
+		var expected = test.O
+		var actual interface{}
+		switch reflect.ValueOf(test.O).Type().Kind() {
+		case reflect.Uint8:
+			actual = test.U8
+		case reflect.Uint16:
+			actual = test.U16
+		case reflect.Uint32:
+			actual = test.U32
+		case reflect.Uint64:
+			actual = test.U64
+		}
+
+		if !reflect.DeepEqual(actual, expected) {
+			t.Errorf("Actual: %v, expected: %v", actual, expected)
+		}
+	}
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/xml/typeinfo.go b/vendor/github.com/vmware/govmomi/vim25/xml/typeinfo.go
new file mode 100644
index 0000000000..086e83b699
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/xml/typeinfo.go
@@ -0,0 +1,366 @@
+// Copyright 2011 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package xml
+
+import (
+	"fmt"
+	"reflect"
+	"strings"
+	"sync"
+)
+
+// typeInfo holds details for the xml representation of a type.
+type typeInfo struct {
+	xmlname *fieldInfo
+	fields  []fieldInfo
+}
+
+// fieldInfo holds details for the xml representation of a single field.
+type fieldInfo struct {
+	idx     []int
+	name    string
+	xmlns   string
+	flags   fieldFlags
+	parents []string
+}
+
+type fieldFlags int
+
+const (
+	fElement fieldFlags = 1 << iota
+	fAttr
+	fCharData
+	fInnerXml
+	fComment
+	fAny
+
+	fOmitEmpty
+	fTypeAttr
+
+	fMode = fElement | fAttr | fCharData | fInnerXml | fComment | fAny
+)
+
+var tinfoMap = make(map[reflect.Type]*typeInfo)
+var tinfoLock sync.RWMutex
+
+var nameType = reflect.TypeOf(Name{})
+
+// getTypeInfo returns the typeInfo structure with details necessary
+// for marshalling and unmarshalling typ.
+func getTypeInfo(typ reflect.Type) (*typeInfo, error) {
+	tinfoLock.RLock()
+	tinfo, ok := tinfoMap[typ]
+	tinfoLock.RUnlock()
+	if ok {
+		return tinfo, nil
+	}
+	tinfo = &typeInfo{}
+	if typ.Kind() == reflect.Struct && typ != nameType {
+		n := typ.NumField()
+		for i := 0; i < n; i++ {
+			f := typ.Field(i)
+			if f.PkgPath != "" || f.Tag.Get("xml") == "-" {
+				continue // Private field
+			}
+
+			// For embedded structs, embed its fields.
+			if f.Anonymous {
+				t := f.Type
+				if t.Kind() == reflect.Ptr {
+					t = t.Elem()
+				}
+				if t.Kind() == reflect.Struct {
+					inner, err := getTypeInfo(t)
+					if err != nil {
+						return nil, err
+					}
+					if tinfo.xmlname == nil {
+						tinfo.xmlname = inner.xmlname
+					}
+					for _, finfo := range inner.fields {
+						finfo.idx = append([]int{i}, finfo.idx...)
+						if err := addFieldInfo(typ, tinfo, &finfo); err != nil {
+							return nil, err
+						}
+					}
+					continue
+				}
+			}
+
+			finfo, err := structFieldInfo(typ, &f)
+			if err != nil {
+				return nil, err
+			}
+
+			if f.Name == "XMLName" {
+				tinfo.xmlname = finfo
+				continue
+			}
+
+			// Add the field if it doesn't conflict with other fields.
+			if err := addFieldInfo(typ, tinfo, finfo); err != nil {
+				return nil, err
+			}
+		}
+	}
+	tinfoLock.Lock()
+	tinfoMap[typ] = tinfo
+	tinfoLock.Unlock()
+	return tinfo, nil
+}
+
+// structFieldInfo builds and returns a fieldInfo for f.
+func structFieldInfo(typ reflect.Type, f *reflect.StructField) (*fieldInfo, error) {
+	finfo := &fieldInfo{idx: f.Index}
+
+	// Split the tag from the xml namespace if necessary.
+	tag := f.Tag.Get("xml")
+	if i := strings.Index(tag, " "); i >= 0 {
+		finfo.xmlns, tag = tag[:i], tag[i+1:]
+	}
+
+	// Parse flags.
+	tokens := strings.Split(tag, ",")
+	if len(tokens) == 1 {
+		finfo.flags = fElement
+	} else {
+		tag = tokens[0]
+		for _, flag := range tokens[1:] {
+			switch flag {
+			case "attr":
+				finfo.flags |= fAttr
+			case "chardata":
+				finfo.flags |= fCharData
+			case "innerxml":
+				finfo.flags |= fInnerXml
+			case "comment":
+				finfo.flags |= fComment
+			case "any":
+				finfo.flags |= fAny
+			case "omitempty":
+				finfo.flags |= fOmitEmpty
+			case "typeattr":
+				finfo.flags |= fTypeAttr
+			}
+		}
+
+		// Validate the flags used.
+		valid := true
+		switch mode := finfo.flags & fMode; mode {
+		case 0:
+			finfo.flags |= fElement
+		case fAttr, fCharData, fInnerXml, fComment, fAny:
+			if f.Name == "XMLName" || tag != "" && mode != fAttr {
+				valid = false
+			}
+		default:
+			// This will also catch multiple modes in a single field.
+			valid = false
+		}
+		if finfo.flags&fMode == fAny {
+			finfo.flags |= fElement
+		}
+		if finfo.flags&fOmitEmpty != 0 && finfo.flags&(fElement|fAttr) == 0 {
+			valid = false
+		}
+		if !valid {
+			return nil, fmt.Errorf("xml: invalid tag in field %s of type %s: %q",
+				f.Name, typ, f.Tag.Get("xml"))
+		}
+	}
+
+	// Use of xmlns without a name is not allowed.
+	if finfo.xmlns != "" && tag == "" {
+		return nil, fmt.Errorf("xml: namespace without name in field %s of type %s: %q",
+			f.Name, typ, f.Tag.Get("xml"))
+	}
+
+	if f.Name == "XMLName" {
+		// The XMLName field records the XML element name. Don't
+		// process it as usual because its name should default to
+		// empty rather than to the field name.
+		finfo.name = tag
+		return finfo, nil
+	}
+
+	if tag == "" {
+		// If the name part of the tag is completely empty, get
+		// default from XMLName of underlying struct if feasible,
+		// or field name otherwise.
+		if xmlname := lookupXMLName(f.Type); xmlname != nil {
+			finfo.xmlns, finfo.name = xmlname.xmlns, xmlname.name
+		} else {
+			finfo.name = f.Name
+		}
+		return finfo, nil
+	}
+
+	// Prepare field name and parents.
+	parents := strings.Split(tag, ">")
+	if parents[0] == "" {
+		parents[0] = f.Name
+	}
+	if parents[len(parents)-1] == "" {
+		return nil, fmt.Errorf("xml: trailing '>' in field %s of type %s", f.Name, typ)
+	}
+	finfo.name = parents[len(parents)-1]
+	if len(parents) > 1 {
+		if (finfo.flags & fElement) == 0 {
+			return nil, fmt.Errorf("xml: %s chain not valid with %s flag", tag, strings.Join(tokens[1:], ","))
+		}
+		finfo.parents = parents[:len(parents)-1]
+	}
+
+	// If the field type has an XMLName field, the names must match
+	// so that the behavior of both marshalling and unmarshalling
+	// is straightforward and unambiguous.
+	if finfo.flags&fElement != 0 {
+		ftyp := f.Type
+		xmlname := lookupXMLName(ftyp)
+		if xmlname != nil && xmlname.name != finfo.name {
+			return nil, fmt.Errorf("xml: name %q in tag of %s.%s conflicts with name %q in %s.XMLName",
+				finfo.name, typ, f.Name, xmlname.name, ftyp)
+		}
+	}
+	return finfo, nil
+}
+
+// lookupXMLName returns the fieldInfo for typ's XMLName field
+// in case it exists and has a valid xml field tag, otherwise
+// it returns nil.
+func lookupXMLName(typ reflect.Type) (xmlname *fieldInfo) {
+	for typ.Kind() == reflect.Ptr {
+		typ = typ.Elem()
+	}
+	if typ.Kind() != reflect.Struct {
+		return nil
+	}
+	for i, n := 0, typ.NumField(); i < n; i++ {
+		f := typ.Field(i)
+		if f.Name != "XMLName" {
+			continue
+		}
+		finfo, err := structFieldInfo(typ, &f)
+		if finfo.name != "" && err == nil {
+			return finfo
+		}
+		// Also consider errors as a non-existent field tag
+		// and let getTypeInfo itself report the error.
+		break
+	}
+	return nil
+}
+
+func min(a, b int) int {
+	if a <= b {
+		return a
+	}
+	return b
+}
+
+// addFieldInfo adds finfo to tinfo.fields if there are no
+// conflicts, or if conflicts arise from previous fields that were
+// obtained from deeper embedded structures than finfo. In the latter
+// case, the conflicting entries are dropped.
+// A conflict occurs when the path (parent + name) to a field is
+// itself a prefix of another path, or when two paths match exactly.
+// It is okay for field paths to share a common, shorter prefix.
+func addFieldInfo(typ reflect.Type, tinfo *typeInfo, newf *fieldInfo) error {
+	var conflicts []int
+Loop:
+	// First, figure all conflicts. Most working code will have none.
+	for i := range tinfo.fields {
+		oldf := &tinfo.fields[i]
+		if oldf.flags&fMode != newf.flags&fMode {
+			continue
+		}
+		if oldf.xmlns != "" && newf.xmlns != "" && oldf.xmlns != newf.xmlns {
+			continue
+		}
+		minl := min(len(newf.parents), len(oldf.parents))
+		for p := 0; p < minl; p++ {
+			if oldf.parents[p] != newf.parents[p] {
+				continue Loop
+			}
+		}
+		if len(oldf.parents) > len(newf.parents) {
+			if oldf.parents[len(newf.parents)] == newf.name {
+				conflicts = append(conflicts, i)
+			}
+		} else if len(oldf.parents) < len(newf.parents) {
+			if newf.parents[len(oldf.parents)] == oldf.name {
+				conflicts = append(conflicts, i)
+			}
+		} else {
+			if newf.name == oldf.name {
+				conflicts = append(conflicts, i)
+			}
+		}
+	}
+	// Without conflicts, add the new field and return.
+	if conflicts == nil {
+		tinfo.fields = append(tinfo.fields, *newf)
+		return nil
+	}
+
+	// If any conflict is shallower, ignore the new field.
+	// This matches the Go field resolution on embedding.
+	for _, i := range conflicts {
+		if len(tinfo.fields[i].idx) < len(newf.idx) {
+			return nil
+		}
+	}
+
+	// Otherwise, if any of them is at the same depth level, it's an error.
+	for _, i := range conflicts {
+		oldf := &tinfo.fields[i]
+		if len(oldf.idx) == len(newf.idx) {
+			f1 := typ.FieldByIndex(oldf.idx)
+			f2 := typ.FieldByIndex(newf.idx)
+			return &TagPathError{typ, f1.Name, f1.Tag.Get("xml"), f2.Name, f2.Tag.Get("xml")}
+		}
+	}
+
+	// Otherwise, the new field is shallower, and thus takes precedence,
+	// so drop the conflicting fields from tinfo and append the new one.
+	for c := len(conflicts) - 1; c >= 0; c-- {
+		i := conflicts[c]
+		copy(tinfo.fields[i:], tinfo.fields[i+1:])
+		tinfo.fields = tinfo.fields[:len(tinfo.fields)-1]
+	}
+	tinfo.fields = append(tinfo.fields, *newf)
+	return nil
+}
+
+// A TagPathError represents an error in the unmarshalling process
+// caused by the use of field tags with conflicting paths.
+type TagPathError struct {
+	Struct       reflect.Type
+	Field1, Tag1 string
+	Field2, Tag2 string
+}
+
+func (e *TagPathError) Error() string {
+	return fmt.Sprintf("%s field %q with tag %q conflicts with field %q with tag %q", e.Struct, e.Field1, e.Tag1, e.Field2, e.Tag2)
+}
+
+// value returns v's field value corresponding to finfo.
+// It's equivalent to v.FieldByIndex(finfo.idx), but initializes
+// and dereferences pointers as necessary.
+func (finfo *fieldInfo) value(v reflect.Value) reflect.Value {
+	for i, x := range finfo.idx {
+		if i > 0 {
+			t := v.Type()
+			if t.Kind() == reflect.Ptr && t.Elem().Kind() == reflect.Struct {
+				if v.IsNil() {
+					v.Set(reflect.New(v.Type().Elem()))
+				}
+				v = v.Elem()
+			}
+		}
+		v = v.Field(x)
+	}
+	return v
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/xml/xml.go b/vendor/github.com/vmware/govmomi/vim25/xml/xml.go
new file mode 100644
index 0000000000..6c6c5c8212
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/xml/xml.go
@@ -0,0 +1,1939 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package xml implements a simple XML 1.0 parser that
+// understands XML name spaces.
+package xml
+
+// References:
+//    Annotated XML spec: http://www.xml.com/axml/testaxml.htm
+//    XML name spaces: http://www.w3.org/TR/REC-xml-names/
+
+// TODO(rsc):
+//	Test error handling.
+
+import (
+	"bufio"
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"reflect"
+	"strconv"
+	"strings"
+	"unicode"
+	"unicode/utf8"
+)
+
+// A SyntaxError represents a syntax error in the XML input stream.
+type SyntaxError struct {
+	Msg  string
+	Line int
+}
+
+func (e *SyntaxError) Error() string {
+	return "XML syntax error on line " + strconv.Itoa(e.Line) + ": " + e.Msg
+}
+
+// A Name represents an XML name (Local) annotated
+// with a name space identifier (Space).
+// In tokens returned by Decoder.Token, the Space identifier
+// is given as a canonical URL, not the short prefix used
+// in the document being parsed.
+type Name struct {
+	Space, Local string
+}
+
+// An Attr represents an attribute in an XML element (Name=Value).
+type Attr struct {
+	Name  Name
+	Value string
+}
+
+// A Token is an interface holding one of the token types:
+// StartElement, EndElement, CharData, Comment, ProcInst, or Directive.
+type Token interface{}
+
+// A StartElement represents an XML start element.
+type StartElement struct {
+	Name Name
+	Attr []Attr
+}
+
+func (e StartElement) Copy() StartElement {
+	attrs := make([]Attr, len(e.Attr))
+	copy(attrs, e.Attr)
+	e.Attr = attrs
+	return e
+}
+
+// End returns the corresponding XML end element.
+func (e StartElement) End() EndElement {
+	return EndElement{e.Name}
+}
+
+// An EndElement represents an XML end element.
+type EndElement struct {
+	Name Name
+}
+
+// A CharData represents XML character data (raw text),
+// in which XML escape sequences have been replaced by
+// the characters they represent.
+type CharData []byte
+
+func makeCopy(b []byte) []byte {
+	b1 := make([]byte, len(b))
+	copy(b1, b)
+	return b1
+}
+
+func (c CharData) Copy() CharData { return CharData(makeCopy(c)) }
+
+// A Comment represents an XML comment of the form <!--comment-->.
+// The bytes do not include the <!-- and --> comment markers.
+type Comment []byte
+
+func (c Comment) Copy() Comment { return Comment(makeCopy(c)) }
+
+// A ProcInst represents an XML processing instruction of the form <?target inst?>
+type ProcInst struct {
+	Target string
+	Inst   []byte
+}
+
+func (p ProcInst) Copy() ProcInst {
+	p.Inst = makeCopy(p.Inst)
+	return p
+}
+
+// A Directive represents an XML directive of the form <!text>.
+// The bytes do not include the <! and > markers.
+type Directive []byte
+
+func (d Directive) Copy() Directive { return Directive(makeCopy(d)) }
+
+// CopyToken returns a copy of a Token.
+func CopyToken(t Token) Token {
+	switch v := t.(type) {
+	case CharData:
+		return v.Copy()
+	case Comment:
+		return v.Copy()
+	case Directive:
+		return v.Copy()
+	case ProcInst:
+		return v.Copy()
+	case StartElement:
+		return v.Copy()
+	}
+	return t
+}
+
+// A Decoder represents an XML parser reading a particular input stream.
+// The parser assumes that its input is encoded in UTF-8.
+type Decoder struct {
+	// Strict defaults to true, enforcing the requirements
+	// of the XML specification.
+	// If set to false, the parser allows input containing common
+	// mistakes:
+	//	* If an element is missing an end tag, the parser invents
+	//	  end tags as necessary to keep the return values from Token
+	//	  properly balanced.
+	//	* In attribute values and character data, unknown or malformed
+	//	  character entities (sequences beginning with &) are left alone.
+	//
+	// Setting:
+	//
+	//	d.Strict = false;
+	//	d.AutoClose = HTMLAutoClose;
+	//	d.Entity = HTMLEntity
+	//
+	// creates a parser that can handle typical HTML.
+	//
+	// Strict mode does not enforce the requirements of the XML name spaces TR.
+	// In particular it does not reject name space tags using undefined prefixes.
+	// Such tags are recorded with the unknown prefix as the name space URL.
+	Strict bool
+
+	// When Strict == false, AutoClose indicates a set of elements to
+	// consider closed immediately after they are opened, regardless
+	// of whether an end element is present.
+	AutoClose []string
+
+	// Entity can be used to map non-standard entity names to string replacements.
+	// The parser behaves as if these standard mappings are present in the map,
+	// regardless of the actual map content:
+	//
+	//	"lt": "<",
+	//	"gt": ">",
+	//	"amp": "&",
+	//	"apos": "'",
+	//	"quot": `"`,
+	Entity map[string]string
+
+	// CharsetReader, if non-nil, defines a function to generate
+	// charset-conversion readers, converting from the provided
+	// non-UTF-8 charset into UTF-8. If CharsetReader is nil or
+	// returns an error, parsing stops with an error. One of the
+	// the CharsetReader's result values must be non-nil.
+	CharsetReader func(charset string, input io.Reader) (io.Reader, error)
+
+	// DefaultSpace sets the default name space used for unadorned tags,
+	// as if the entire XML stream were wrapped in an element containing
+	// the attribute xmlns="DefaultSpace".
+	DefaultSpace string
+
+	// TypeFunc is used to map type names to actual types.
+	TypeFunc func(string) (reflect.Type, bool)
+
+	r              io.ByteReader
+	buf            bytes.Buffer
+	saved          *bytes.Buffer
+	stk            *stack
+	free           *stack
+	needClose      bool
+	toClose        Name
+	nextToken      Token
+	nextByte       int
+	ns             map[string]string
+	err            error
+	line           int
+	unmarshalDepth int
+}
+
+// NewDecoder creates a new XML parser reading from r.
+// If r does not implement io.ByteReader, NewDecoder will
+// do its own buffering.
+func NewDecoder(r io.Reader) *Decoder {
+	d := &Decoder{
+		ns:       make(map[string]string),
+		nextByte: -1,
+		line:     1,
+		Strict:   true,
+	}
+	d.switchToReader(r)
+	return d
+}
+
+// Token returns the next XML token in the input stream.
+// At the end of the input stream, Token returns nil, io.EOF.
+//
+// Slices of bytes in the returned token data refer to the
+// parser's internal buffer and remain valid only until the next
+// call to Token.  To acquire a copy of the bytes, call CopyToken
+// or the token's Copy method.
+//
+// Token expands self-closing elements such as <br/>
+// into separate start and end elements returned by successive calls.
+//
+// Token guarantees that the StartElement and EndElement
+// tokens it returns are properly nested and matched:
+// if Token encounters an unexpected end element,
+// it will return an error.
+//
+// Token implements XML name spaces as described by
+// http://www.w3.org/TR/REC-xml-names/.  Each of the
+// Name structures contained in the Token has the Space
+// set to the URL identifying its name space when known.
+// If Token encounters an unrecognized name space prefix,
+// it uses the prefix as the Space rather than report an error.
+func (d *Decoder) Token() (t Token, err error) {
+	if d.stk != nil && d.stk.kind == stkEOF {
+		err = io.EOF
+		return
+	}
+	if d.nextToken != nil {
+		t = d.nextToken
+		d.nextToken = nil
+	} else if t, err = d.rawToken(); err != nil {
+		return
+	}
+
+	if !d.Strict {
+		if t1, ok := d.autoClose(t); ok {
+			d.nextToken = t
+			t = t1
+		}
+	}
+	switch t1 := t.(type) {
+	case StartElement:
+		// In XML name spaces, the translations listed in the
+		// attributes apply to the element name and
+		// to the other attribute names, so process
+		// the translations first.
+		for _, a := range t1.Attr {
+			if a.Name.Space == "xmlns" {
+				v, ok := d.ns[a.Name.Local]
+				d.pushNs(a.Name.Local, v, ok)
+				d.ns[a.Name.Local] = a.Value
+			}
+			if a.Name.Space == "" && a.Name.Local == "xmlns" {
+				// Default space for untagged names
+				v, ok := d.ns[""]
+				d.pushNs("", v, ok)
+				d.ns[""] = a.Value
+			}
+		}
+
+		d.translate(&t1.Name, true)
+		for i := range t1.Attr {
+			d.translate(&t1.Attr[i].Name, false)
+		}
+		d.pushElement(t1.Name)
+		t = t1
+
+	case EndElement:
+		d.translate(&t1.Name, true)
+		if !d.popElement(&t1) {
+			return nil, d.err
+		}
+		t = t1
+	}
+	return
+}
+
+const xmlURL = "http://www.w3.org/XML/1998/namespace"
+
+// Apply name space translation to name n.
+// The default name space (for Space=="")
+// applies only to element names, not to attribute names.
+func (d *Decoder) translate(n *Name, isElementName bool) {
+	switch {
+	case n.Space == "xmlns":
+		return
+	case n.Space == "" && !isElementName:
+		return
+	case n.Space == "xml":
+		n.Space = xmlURL
+	case n.Space == "" && n.Local == "xmlns":
+		return
+	}
+	if v, ok := d.ns[n.Space]; ok {
+		n.Space = v
+	} else if n.Space == "" {
+		n.Space = d.DefaultSpace
+	}
+}
+
+func (d *Decoder) switchToReader(r io.Reader) {
+	// Get efficient byte at a time reader.
+	// Assume that if reader has its own
+	// ReadByte, it's efficient enough.
+	// Otherwise, use bufio.
+	if rb, ok := r.(io.ByteReader); ok {
+		d.r = rb
+	} else {
+		d.r = bufio.NewReader(r)
+	}
+}
+
+// Parsing state - stack holds old name space translations
+// and the current set of open elements.  The translations to pop when
+// ending a given tag are *below* it on the stack, which is
+// more work but forced on us by XML.
+type stack struct {
+	next *stack
+	kind int
+	name Name
+	ok   bool
+}
+
+const (
+	stkStart = iota
+	stkNs
+	stkEOF
+)
+
+func (d *Decoder) push(kind int) *stack {
+	s := d.free
+	if s != nil {
+		d.free = s.next
+	} else {
+		s = new(stack)
+	}
+	s.next = d.stk
+	s.kind = kind
+	d.stk = s
+	return s
+}
+
+func (d *Decoder) pop() *stack {
+	s := d.stk
+	if s != nil {
+		d.stk = s.next
+		s.next = d.free
+		d.free = s
+	}
+	return s
+}
+
+// Record that after the current element is finished
+// (that element is already pushed on the stack)
+// Token should return EOF until popEOF is called.
+func (d *Decoder) pushEOF() {
+	// Walk down stack to find Start.
+	// It might not be the top, because there might be stkNs
+	// entries above it.
+	start := d.stk
+	for start.kind != stkStart {
+		start = start.next
+	}
+	// The stkNs entries below a start are associated with that
+	// element too; skip over them.
+	for start.next != nil && start.next.kind == stkNs {
+		start = start.next
+	}
+	s := d.free
+	if s != nil {
+		d.free = s.next
+	} else {
+		s = new(stack)
+	}
+	s.kind = stkEOF
+	s.next = start.next
+	start.next = s
+}
+
+// Undo a pushEOF.
+// The element must have been finished, so the EOF should be at the top of the stack.
+func (d *Decoder) popEOF() bool {
+	if d.stk == nil || d.stk.kind != stkEOF {
+		return false
+	}
+	d.pop()
+	return true
+}
+
+// Record that we are starting an element with the given name.
+func (d *Decoder) pushElement(name Name) {
+	s := d.push(stkStart)
+	s.name = name
+}
+
+// Record that we are changing the value of ns[local].
+// The old value is url, ok.
+func (d *Decoder) pushNs(local string, url string, ok bool) {
+	s := d.push(stkNs)
+	s.name.Local = local
+	s.name.Space = url
+	s.ok = ok
+}
+
+// Creates a SyntaxError with the current line number.
+func (d *Decoder) syntaxError(msg string) error {
+	return &SyntaxError{Msg: msg, Line: d.line}
+}
+
+// Record that we are ending an element with the given name.
+// The name must match the record at the top of the stack,
+// which must be a pushElement record.
+// After popping the element, apply any undo records from
+// the stack to restore the name translations that existed
+// before we saw this element.
+func (d *Decoder) popElement(t *EndElement) bool {
+	s := d.pop()
+	name := t.Name
+	switch {
+	case s == nil || s.kind != stkStart:
+		d.err = d.syntaxError("unexpected end element </" + name.Local + ">")
+		return false
+	case s.name.Local != name.Local:
+		if !d.Strict {
+			d.needClose = true
+			d.toClose = t.Name
+			t.Name = s.name
+			return true
+		}
+		d.err = d.syntaxError("element <" + s.name.Local + "> closed by </" + name.Local + ">")
+		return false
+	case s.name.Space != name.Space:
+		d.err = d.syntaxError("element <" + s.name.Local + "> in space " + s.name.Space +
+			"closed by </" + name.Local + "> in space " + name.Space)
+		return false
+	}
+
+	// Pop stack until a Start or EOF is on the top, undoing the
+	// translations that were associated with the element we just closed.
+	for d.stk != nil && d.stk.kind != stkStart && d.stk.kind != stkEOF {
+		s := d.pop()
+		if s.ok {
+			d.ns[s.name.Local] = s.name.Space
+		} else {
+			delete(d.ns, s.name.Local)
+		}
+	}
+
+	return true
+}
+
+// If the top element on the stack is autoclosing and
+// t is not the end tag, invent the end tag.
+func (d *Decoder) autoClose(t Token) (Token, bool) {
+	if d.stk == nil || d.stk.kind != stkStart {
+		return nil, false
+	}
+	name := strings.ToLower(d.stk.name.Local)
+	for _, s := range d.AutoClose {
+		if strings.ToLower(s) == name {
+			// This one should be auto closed if t doesn't close it.
+			et, ok := t.(EndElement)
+			if !ok || et.Name.Local != name {
+				return EndElement{d.stk.name}, true
+			}
+			break
+		}
+	}
+	return nil, false
+}
+
+var errRawToken = errors.New("xml: cannot use RawToken from UnmarshalXML method")
+
+// RawToken is like Token but does not verify that
+// start and end elements match and does not translate
+// name space prefixes to their corresponding URLs.
+func (d *Decoder) RawToken() (Token, error) {
+	if d.unmarshalDepth > 0 {
+		return nil, errRawToken
+	}
+	return d.rawToken()
+}
+
+func (d *Decoder) rawToken() (Token, error) {
+	if d.err != nil {
+		return nil, d.err
+	}
+	if d.needClose {
+		// The last element we read was self-closing and
+		// we returned just the StartElement half.
+		// Return the EndElement half now.
+		d.needClose = false
+		return EndElement{d.toClose}, nil
+	}
+
+	b, ok := d.getc()
+	if !ok {
+		return nil, d.err
+	}
+
+	if b != '<' {
+		// Text section.
+		d.ungetc(b)
+		data := d.text(-1, false)
+		if data == nil {
+			return nil, d.err
+		}
+		return CharData(data), nil
+	}
+
+	if b, ok = d.mustgetc(); !ok {
+		return nil, d.err
+	}
+	switch b {
+	case '/':
+		// </: End element
+		var name Name
+		if name, ok = d.nsname(); !ok {
+			if d.err == nil {
+				d.err = d.syntaxError("expected element name after </")
+			}
+			return nil, d.err
+		}
+		d.space()
+		if b, ok = d.mustgetc(); !ok {
+			return nil, d.err
+		}
+		if b != '>' {
+			d.err = d.syntaxError("invalid characters between </" + name.Local + " and >")
+			return nil, d.err
+		}
+		return EndElement{name}, nil
+
+	case '?':
+		// <?: Processing instruction.
+		// TODO(rsc): Should parse the <?xml declaration to make sure the version is 1.0.
+		var target string
+		if target, ok = d.name(); !ok {
+			if d.err == nil {
+				d.err = d.syntaxError("expected target name after <?")
+			}
+			return nil, d.err
+		}
+		d.space()
+		d.buf.Reset()
+		var b0 byte
+		for {
+			if b, ok = d.mustgetc(); !ok {
+				return nil, d.err
+			}
+			d.buf.WriteByte(b)
+			if b0 == '?' && b == '>' {
+				break
+			}
+			b0 = b
+		}
+		data := d.buf.Bytes()
+		data = data[0 : len(data)-2] // chop ?>
+
+		if target == "xml" {
+			enc := procInstEncoding(string(data))
+			if enc != "" && enc != "utf-8" && enc != "UTF-8" {
+				if d.CharsetReader == nil {
+					d.err = fmt.Errorf("xml: encoding %q declared but Decoder.CharsetReader is nil", enc)
+					return nil, d.err
+				}
+				newr, err := d.CharsetReader(enc, d.r.(io.Reader))
+				if err != nil {
+					d.err = fmt.Errorf("xml: opening charset %q: %v", enc, err)
+					return nil, d.err
+				}
+				if newr == nil {
+					panic("CharsetReader returned a nil Reader for charset " + enc)
+				}
+				d.switchToReader(newr)
+			}
+		}
+		return ProcInst{target, data}, nil
+
+	case '!':
+		// <!: Maybe comment, maybe CDATA.
+		if b, ok = d.mustgetc(); !ok {
+			return nil, d.err
+		}
+		switch b {
+		case '-': // <!-
+			// Probably <!-- for a comment.
+			if b, ok = d.mustgetc(); !ok {
+				return nil, d.err
+			}
+			if b != '-' {
+				d.err = d.syntaxError("invalid sequence <!- not part of <!--")
+				return nil, d.err
+			}
+			// Look for terminator.
+			d.buf.Reset()
+			var b0, b1 byte
+			for {
+				if b, ok = d.mustgetc(); !ok {
+					return nil, d.err
+				}
+				d.buf.WriteByte(b)
+				if b0 == '-' && b1 == '-' && b == '>' {
+					break
+				}
+				b0, b1 = b1, b
+			}
+			data := d.buf.Bytes()
+			data = data[0 : len(data)-3] // chop -->
+			return Comment(data), nil
+
+		case '[': // <![
+			// Probably <![CDATA[.
+			for i := 0; i < 6; i++ {
+				if b, ok = d.mustgetc(); !ok {
+					return nil, d.err
+				}
+				if b != "CDATA["[i] {
+					d.err = d.syntaxError("invalid <![ sequence")
+					return nil, d.err
+				}
+			}
+			// Have <![CDATA[.  Read text until ]]>.
+			data := d.text(-1, true)
+			if data == nil {
+				return nil, d.err
+			}
+			return CharData(data), nil
+		}
+
+		// Probably a directive: <!DOCTYPE ...>, <!ENTITY ...>, etc.
+		// We don't care, but accumulate for caller. Quoted angle
+		// brackets do not count for nesting.
+		d.buf.Reset()
+		d.buf.WriteByte(b)
+		inquote := uint8(0)
+		depth := 0
+		for {
+			if b, ok = d.mustgetc(); !ok {
+				return nil, d.err
+			}
+			if inquote == 0 && b == '>' && depth == 0 {
+				break
+			}
+		HandleB:
+			d.buf.WriteByte(b)
+			switch {
+			case b == inquote:
+				inquote = 0
+
+			case inquote != 0:
+				// in quotes, no special action
+
+			case b == '\'' || b == '"':
+				inquote = b
+
+			case b == '>' && inquote == 0:
+				depth--
+
+			case b == '<' && inquote == 0:
+				// Look for <!-- to begin comment.
+				s := "!--"
+				for i := 0; i < len(s); i++ {
+					if b, ok = d.mustgetc(); !ok {
+						return nil, d.err
+					}
+					if b != s[i] {
+						for j := 0; j < i; j++ {
+							d.buf.WriteByte(s[j])
+						}
+						depth++
+						goto HandleB
+					}
+				}
+
+				// Remove < that was written above.
+				d.buf.Truncate(d.buf.Len() - 1)
+
+				// Look for terminator.
+				var b0, b1 byte
+				for {
+					if b, ok = d.mustgetc(); !ok {
+						return nil, d.err
+					}
+					if b0 == '-' && b1 == '-' && b == '>' {
+						break
+					}
+					b0, b1 = b1, b
+				}
+			}
+		}
+		return Directive(d.buf.Bytes()), nil
+	}
+
+	// Must be an open element like <a href="foo">
+	d.ungetc(b)
+
+	var (
+		name  Name
+		empty bool
+		attr  []Attr
+	)
+	if name, ok = d.nsname(); !ok {
+		if d.err == nil {
+			d.err = d.syntaxError("expected element name after <")
+		}
+		return nil, d.err
+	}
+
+	attr = make([]Attr, 0, 4)
+	for {
+		d.space()
+		if b, ok = d.mustgetc(); !ok {
+			return nil, d.err
+		}
+		if b == '/' {
+			empty = true
+			if b, ok = d.mustgetc(); !ok {
+				return nil, d.err
+			}
+			if b != '>' {
+				d.err = d.syntaxError("expected /> in element")
+				return nil, d.err
+			}
+			break
+		}
+		if b == '>' {
+			break
+		}
+		d.ungetc(b)
+
+		n := len(attr)
+		if n >= cap(attr) {
+			nattr := make([]Attr, n, 2*cap(attr))
+			copy(nattr, attr)
+			attr = nattr
+		}
+		attr = attr[0 : n+1]
+		a := &attr[n]
+		if a.Name, ok = d.nsname(); !ok {
+			if d.err == nil {
+				d.err = d.syntaxError("expected attribute name in element")
+			}
+			return nil, d.err
+		}
+		d.space()
+		if b, ok = d.mustgetc(); !ok {
+			return nil, d.err
+		}
+		if b != '=' {
+			if d.Strict {
+				d.err = d.syntaxError("attribute name without = in element")
+				return nil, d.err
+			} else {
+				d.ungetc(b)
+				a.Value = a.Name.Local
+			}
+		} else {
+			d.space()
+			data := d.attrval()
+			if data == nil {
+				return nil, d.err
+			}
+			a.Value = string(data)
+		}
+	}
+	if empty {
+		d.needClose = true
+		d.toClose = name
+	}
+	return StartElement{name, attr}, nil
+}
+
+func (d *Decoder) attrval() []byte {
+	b, ok := d.mustgetc()
+	if !ok {
+		return nil
+	}
+	// Handle quoted attribute values
+	if b == '"' || b == '\'' {
+		return d.text(int(b), false)
+	}
+	// Handle unquoted attribute values for strict parsers
+	if d.Strict {
+		d.err = d.syntaxError("unquoted or missing attribute value in element")
+		return nil
+	}
+	// Handle unquoted attribute values for unstrict parsers
+	d.ungetc(b)
+	d.buf.Reset()
+	for {
+		b, ok = d.mustgetc()
+		if !ok {
+			return nil
+		}
+		// http://www.w3.org/TR/REC-html40/intro/sgmltut.html#h-3.2.2
+		if 'a' <= b && b <= 'z' || 'A' <= b && b <= 'Z' ||
+			'0' <= b && b <= '9' || b == '_' || b == ':' || b == '-' {
+			d.buf.WriteByte(b)
+		} else {
+			d.ungetc(b)
+			break
+		}
+	}
+	return d.buf.Bytes()
+}
+
+// Skip spaces if any
+func (d *Decoder) space() {
+	for {
+		b, ok := d.getc()
+		if !ok {
+			return
+		}
+		switch b {
+		case ' ', '\r', '\n', '\t':
+		default:
+			d.ungetc(b)
+			return
+		}
+	}
+}
+
+// Read a single byte.
+// If there is no byte to read, return ok==false
+// and leave the error in d.err.
+// Maintain line number.
+func (d *Decoder) getc() (b byte, ok bool) {
+	if d.err != nil {
+		return 0, false
+	}
+	if d.nextByte >= 0 {
+		b = byte(d.nextByte)
+		d.nextByte = -1
+	} else {
+		b, d.err = d.r.ReadByte()
+		if d.err != nil {
+			return 0, false
+		}
+		if d.saved != nil {
+			d.saved.WriteByte(b)
+		}
+	}
+	if b == '\n' {
+		d.line++
+	}
+	return b, true
+}
+
+// Return saved offset.
+// If we did ungetc (nextByte >= 0), have to back up one.
+func (d *Decoder) savedOffset() int {
+	n := d.saved.Len()
+	if d.nextByte >= 0 {
+		n--
+	}
+	return n
+}
+
+// Must read a single byte.
+// If there is no byte to read,
+// set d.err to SyntaxError("unexpected EOF")
+// and return ok==false
+func (d *Decoder) mustgetc() (b byte, ok bool) {
+	if b, ok = d.getc(); !ok {
+		if d.err == io.EOF {
+			d.err = d.syntaxError("unexpected EOF")
+		}
+	}
+	return
+}
+
+// Unread a single byte.
+func (d *Decoder) ungetc(b byte) {
+	if b == '\n' {
+		d.line--
+	}
+	d.nextByte = int(b)
+}
+
+var entity = map[string]int{
+	"lt":   '<',
+	"gt":   '>',
+	"amp":  '&',
+	"apos": '\'',
+	"quot": '"',
+}
+
+// Read plain text section (XML calls it character data).
+// If quote >= 0, we are in a quoted string and need to find the matching quote.
+// If cdata == true, we are in a <![CDATA[ section and need to find ]]>.
+// On failure return nil and leave the error in d.err.
+func (d *Decoder) text(quote int, cdata bool) []byte {
+	var b0, b1 byte
+	var trunc int
+	d.buf.Reset()
+Input:
+	for {
+		b, ok := d.getc()
+		if !ok {
+			if cdata {
+				if d.err == io.EOF {
+					d.err = d.syntaxError("unexpected EOF in CDATA section")
+				}
+				return nil
+			}
+			break Input
+		}
+
+		// <![CDATA[ section ends with ]]>.
+		// It is an error for ]]> to appear in ordinary text.
+		if b0 == ']' && b1 == ']' && b == '>' {
+			if cdata {
+				trunc = 2
+				break Input
+			}
+			d.err = d.syntaxError("unescaped ]]> not in CDATA section")
+			return nil
+		}
+
+		// Stop reading text if we see a <.
+		if b == '<' && !cdata {
+			if quote >= 0 {
+				d.err = d.syntaxError("unescaped < inside quoted string")
+				return nil
+			}
+			d.ungetc('<')
+			break Input
+		}
+		if quote >= 0 && b == byte(quote) {
+			break Input
+		}
+		if b == '&' && !cdata {
+			// Read escaped character expression up to semicolon.
+			// XML in all its glory allows a document to define and use
+			// its own character names with <!ENTITY ...> directives.
+			// Parsers are required to recognize lt, gt, amp, apos, and quot
+			// even if they have not been declared.
+			before := d.buf.Len()
+			d.buf.WriteByte('&')
+			var ok bool
+			var text string
+			var haveText bool
+			if b, ok = d.mustgetc(); !ok {
+				return nil
+			}
+			if b == '#' {
+				d.buf.WriteByte(b)
+				if b, ok = d.mustgetc(); !ok {
+					return nil
+				}
+				base := 10
+				if b == 'x' {
+					base = 16
+					d.buf.WriteByte(b)
+					if b, ok = d.mustgetc(); !ok {
+						return nil
+					}
+				}
+				start := d.buf.Len()
+				for '0' <= b && b <= '9' ||
+					base == 16 && 'a' <= b && b <= 'f' ||
+					base == 16 && 'A' <= b && b <= 'F' {
+					d.buf.WriteByte(b)
+					if b, ok = d.mustgetc(); !ok {
+						return nil
+					}
+				}
+				if b != ';' {
+					d.ungetc(b)
+				} else {
+					s := string(d.buf.Bytes()[start:])
+					d.buf.WriteByte(';')
+					n, err := strconv.ParseUint(s, base, 64)
+					if err == nil && n <= unicode.MaxRune {
+						text = string(n)
+						haveText = true
+					}
+				}
+			} else {
+				d.ungetc(b)
+				if !d.readName() {
+					if d.err != nil {
+						return nil
+					}
+					ok = false
+				}
+				if b, ok = d.mustgetc(); !ok {
+					return nil
+				}
+				if b != ';' {
+					d.ungetc(b)
+				} else {
+					name := d.buf.Bytes()[before+1:]
+					d.buf.WriteByte(';')
+					if isName(name) {
+						s := string(name)
+						if r, ok := entity[s]; ok {
+							text = string(r)
+							haveText = true
+						} else if d.Entity != nil {
+							text, haveText = d.Entity[s]
+						}
+					}
+				}
+			}
+
+			if haveText {
+				d.buf.Truncate(before)
+				d.buf.Write([]byte(text))
+				b0, b1 = 0, 0
+				continue Input
+			}
+			if !d.Strict {
+				b0, b1 = 0, 0
+				continue Input
+			}
+			ent := string(d.buf.Bytes()[before:])
+			if ent[len(ent)-1] != ';' {
+				ent += " (no semicolon)"
+			}
+			d.err = d.syntaxError("invalid character entity " + ent)
+			return nil
+		}
+
+		// We must rewrite unescaped \r and \r\n into \n.
+		if b == '\r' {
+			d.buf.WriteByte('\n')
+		} else if b1 == '\r' && b == '\n' {
+			// Skip \r\n--we already wrote \n.
+		} else {
+			d.buf.WriteByte(b)
+		}
+
+		b0, b1 = b1, b
+	}
+	data := d.buf.Bytes()
+	data = data[0 : len(data)-trunc]
+
+	// Inspect each rune for being a disallowed character.
+	buf := data
+	for len(buf) > 0 {
+		r, size := utf8.DecodeRune(buf)
+		if r == utf8.RuneError && size == 1 {
+			d.err = d.syntaxError("invalid UTF-8")
+			return nil
+		}
+		buf = buf[size:]
+		if !isInCharacterRange(r) {
+			d.err = d.syntaxError(fmt.Sprintf("illegal character code %U", r))
+			return nil
+		}
+	}
+
+	return data
+}
+
+// Decide whether the given rune is in the XML Character Range, per
+// the Char production of http://www.xml.com/axml/testaxml.htm,
+// Section 2.2 Characters.
+func isInCharacterRange(r rune) (inrange bool) {
+	return r == 0x09 ||
+		r == 0x0A ||
+		r == 0x0D ||
+		r >= 0x20 && r <= 0xDF77 ||
+		r >= 0xE000 && r <= 0xFFFD ||
+		r >= 0x10000 && r <= 0x10FFFF
+}
+
+// Get name space name: name with a : stuck in the middle.
+// The part before the : is the name space identifier.
+func (d *Decoder) nsname() (name Name, ok bool) {
+	s, ok := d.name()
+	if !ok {
+		return
+	}
+	i := strings.Index(s, ":")
+	if i < 0 {
+		name.Local = s
+	} else {
+		name.Space = s[0:i]
+		name.Local = s[i+1:]
+	}
+	return name, true
+}
+
+// Get name: /first(first|second)*/
+// Do not set d.err if the name is missing (unless unexpected EOF is received):
+// let the caller provide better context.
+func (d *Decoder) name() (s string, ok bool) {
+	d.buf.Reset()
+	if !d.readName() {
+		return "", false
+	}
+
+	// Now we check the characters.
+	s = d.buf.String()
+	if !isName([]byte(s)) {
+		d.err = d.syntaxError("invalid XML name: " + s)
+		return "", false
+	}
+	return s, true
+}
+
+// Read a name and append its bytes to d.buf.
+// The name is delimited by any single-byte character not valid in names.
+// All multi-byte characters are accepted; the caller must check their validity.
+func (d *Decoder) readName() (ok bool) {
+	var b byte
+	if b, ok = d.mustgetc(); !ok {
+		return
+	}
+	if b < utf8.RuneSelf && !isNameByte(b) {
+		d.ungetc(b)
+		return false
+	}
+	d.buf.WriteByte(b)
+
+	for {
+		if b, ok = d.mustgetc(); !ok {
+			return
+		}
+		if b < utf8.RuneSelf && !isNameByte(b) {
+			d.ungetc(b)
+			break
+		}
+		d.buf.WriteByte(b)
+	}
+	return true
+}
+
+func isNameByte(c byte) bool {
+	return 'A' <= c && c <= 'Z' ||
+		'a' <= c && c <= 'z' ||
+		'0' <= c && c <= '9' ||
+		c == '_' || c == ':' || c == '.' || c == '-'
+}
+
+func isName(s []byte) bool {
+	if len(s) == 0 {
+		return false
+	}
+	c, n := utf8.DecodeRune(s)
+	if c == utf8.RuneError && n == 1 {
+		return false
+	}
+	if !unicode.Is(first, c) {
+		return false
+	}
+	for n < len(s) {
+		s = s[n:]
+		c, n = utf8.DecodeRune(s)
+		if c == utf8.RuneError && n == 1 {
+			return false
+		}
+		if !unicode.Is(first, c) && !unicode.Is(second, c) {
+			return false
+		}
+	}
+	return true
+}
+
+func isNameString(s string) bool {
+	if len(s) == 0 {
+		return false
+	}
+	c, n := utf8.DecodeRuneInString(s)
+	if c == utf8.RuneError && n == 1 {
+		return false
+	}
+	if !unicode.Is(first, c) {
+		return false
+	}
+	for n < len(s) {
+		s = s[n:]
+		c, n = utf8.DecodeRuneInString(s)
+		if c == utf8.RuneError && n == 1 {
+			return false
+		}
+		if !unicode.Is(first, c) && !unicode.Is(second, c) {
+			return false
+		}
+	}
+	return true
+}
+
+// These tables were generated by cut and paste from Appendix B of
+// the XML spec at http://www.xml.com/axml/testaxml.htm
+// and then reformatting.  First corresponds to (Letter | '_' | ':')
+// and second corresponds to NameChar.
+
+var first = &unicode.RangeTable{
+	R16: []unicode.Range16{
+		{0x003A, 0x003A, 1},
+		{0x0041, 0x005A, 1},
+		{0x005F, 0x005F, 1},
+		{0x0061, 0x007A, 1},
+		{0x00C0, 0x00D6, 1},
+		{0x00D8, 0x00F6, 1},
+		{0x00F8, 0x00FF, 1},
+		{0x0100, 0x0131, 1},
+		{0x0134, 0x013E, 1},
+		{0x0141, 0x0148, 1},
+		{0x014A, 0x017E, 1},
+		{0x0180, 0x01C3, 1},
+		{0x01CD, 0x01F0, 1},
+		{0x01F4, 0x01F5, 1},
+		{0x01FA, 0x0217, 1},
+		{0x0250, 0x02A8, 1},
+		{0x02BB, 0x02C1, 1},
+		{0x0386, 0x0386, 1},
+		{0x0388, 0x038A, 1},
+		{0x038C, 0x038C, 1},
+		{0x038E, 0x03A1, 1},
+		{0x03A3, 0x03CE, 1},
+		{0x03D0, 0x03D6, 1},
+		{0x03DA, 0x03E0, 2},
+		{0x03E2, 0x03F3, 1},
+		{0x0401, 0x040C, 1},
+		{0x040E, 0x044F, 1},
+		{0x0451, 0x045C, 1},
+		{0x045E, 0x0481, 1},
+		{0x0490, 0x04C4, 1},
+		{0x04C7, 0x04C8, 1},
+		{0x04CB, 0x04CC, 1},
+		{0x04D0, 0x04EB, 1},
+		{0x04EE, 0x04F5, 1},
+		{0x04F8, 0x04F9, 1},
+		{0x0531, 0x0556, 1},
+		{0x0559, 0x0559, 1},
+		{0x0561, 0x0586, 1},
+		{0x05D0, 0x05EA, 1},
+		{0x05F0, 0x05F2, 1},
+		{0x0621, 0x063A, 1},
+		{0x0641, 0x064A, 1},
+		{0x0671, 0x06B7, 1},
+		{0x06BA, 0x06BE, 1},
+		{0x06C0, 0x06CE, 1},
+		{0x06D0, 0x06D3, 1},
+		{0x06D5, 0x06D5, 1},
+		{0x06E5, 0x06E6, 1},
+		{0x0905, 0x0939, 1},
+		{0x093D, 0x093D, 1},
+		{0x0958, 0x0961, 1},
+		{0x0985, 0x098C, 1},
+		{0x098F, 0x0990, 1},
+		{0x0993, 0x09A8, 1},
+		{0x09AA, 0x09B0, 1},
+		{0x09B2, 0x09B2, 1},
+		{0x09B6, 0x09B9, 1},
+		{0x09DC, 0x09DD, 1},
+		{0x09DF, 0x09E1, 1},
+		{0x09F0, 0x09F1, 1},
+		{0x0A05, 0x0A0A, 1},
+		{0x0A0F, 0x0A10, 1},
+		{0x0A13, 0x0A28, 1},
+		{0x0A2A, 0x0A30, 1},
+		{0x0A32, 0x0A33, 1},
+		{0x0A35, 0x0A36, 1},
+		{0x0A38, 0x0A39, 1},
+		{0x0A59, 0x0A5C, 1},
+		{0x0A5E, 0x0A5E, 1},
+		{0x0A72, 0x0A74, 1},
+		{0x0A85, 0x0A8B, 1},
+		{0x0A8D, 0x0A8D, 1},
+		{0x0A8F, 0x0A91, 1},
+		{0x0A93, 0x0AA8, 1},
+		{0x0AAA, 0x0AB0, 1},
+		{0x0AB2, 0x0AB3, 1},
+		{0x0AB5, 0x0AB9, 1},
+		{0x0ABD, 0x0AE0, 0x23},
+		{0x0B05, 0x0B0C, 1},
+		{0x0B0F, 0x0B10, 1},
+		{0x0B13, 0x0B28, 1},
+		{0x0B2A, 0x0B30, 1},
+		{0x0B32, 0x0B33, 1},
+		{0x0B36, 0x0B39, 1},
+		{0x0B3D, 0x0B3D, 1},
+		{0x0B5C, 0x0B5D, 1},
+		{0x0B5F, 0x0B61, 1},
+		{0x0B85, 0x0B8A, 1},
+		{0x0B8E, 0x0B90, 1},
+		{0x0B92, 0x0B95, 1},
+		{0x0B99, 0x0B9A, 1},
+		{0x0B9C, 0x0B9C, 1},
+		{0x0B9E, 0x0B9F, 1},
+		{0x0BA3, 0x0BA4, 1},
+		{0x0BA8, 0x0BAA, 1},
+		{0x0BAE, 0x0BB5, 1},
+		{0x0BB7, 0x0BB9, 1},
+		{0x0C05, 0x0C0C, 1},
+		{0x0C0E, 0x0C10, 1},
+		{0x0C12, 0x0C28, 1},
+		{0x0C2A, 0x0C33, 1},
+		{0x0C35, 0x0C39, 1},
+		{0x0C60, 0x0C61, 1},
+		{0x0C85, 0x0C8C, 1},
+		{0x0C8E, 0x0C90, 1},
+		{0x0C92, 0x0CA8, 1},
+		{0x0CAA, 0x0CB3, 1},
+		{0x0CB5, 0x0CB9, 1},
+		{0x0CDE, 0x0CDE, 1},
+		{0x0CE0, 0x0CE1, 1},
+		{0x0D05, 0x0D0C, 1},
+		{0x0D0E, 0x0D10, 1},
+		{0x0D12, 0x0D28, 1},
+		{0x0D2A, 0x0D39, 1},
+		{0x0D60, 0x0D61, 1},
+		{0x0E01, 0x0E2E, 1},
+		{0x0E30, 0x0E30, 1},
+		{0x0E32, 0x0E33, 1},
+		{0x0E40, 0x0E45, 1},
+		{0x0E81, 0x0E82, 1},
+		{0x0E84, 0x0E84, 1},
+		{0x0E87, 0x0E88, 1},
+		{0x0E8A, 0x0E8D, 3},
+		{0x0E94, 0x0E97, 1},
+		{0x0E99, 0x0E9F, 1},
+		{0x0EA1, 0x0EA3, 1},
+		{0x0EA5, 0x0EA7, 2},
+		{0x0EAA, 0x0EAB, 1},
+		{0x0EAD, 0x0EAE, 1},
+		{0x0EB0, 0x0EB0, 1},
+		{0x0EB2, 0x0EB3, 1},
+		{0x0EBD, 0x0EBD, 1},
+		{0x0EC0, 0x0EC4, 1},
+		{0x0F40, 0x0F47, 1},
+		{0x0F49, 0x0F69, 1},
+		{0x10A0, 0x10C5, 1},
+		{0x10D0, 0x10F6, 1},
+		{0x1100, 0x1100, 1},
+		{0x1102, 0x1103, 1},
+		{0x1105, 0x1107, 1},
+		{0x1109, 0x1109, 1},
+		{0x110B, 0x110C, 1},
+		{0x110E, 0x1112, 1},
+		{0x113C, 0x1140, 2},
+		{0x114C, 0x1150, 2},
+		{0x1154, 0x1155, 1},
+		{0x1159, 0x1159, 1},
+		{0x115F, 0x1161, 1},
+		{0x1163, 0x1169, 2},
+		{0x116D, 0x116E, 1},
+		{0x1172, 0x1173, 1},
+		{0x1175, 0x119E, 0x119E - 0x1175},
+		{0x11A8, 0x11AB, 0x11AB - 0x11A8},
+		{0x11AE, 0x11AF, 1},
+		{0x11B7, 0x11B8, 1},
+		{0x11BA, 0x11BA, 1},
+		{0x11BC, 0x11C2, 1},
+		{0x11EB, 0x11F0, 0x11F0 - 0x11EB},
+		{0x11F9, 0x11F9, 1},
+		{0x1E00, 0x1E9B, 1},
+		{0x1EA0, 0x1EF9, 1},
+		{0x1F00, 0x1F15, 1},
+		{0x1F18, 0x1F1D, 1},
+		{0x1F20, 0x1F45, 1},
+		{0x1F48, 0x1F4D, 1},
+		{0x1F50, 0x1F57, 1},
+		{0x1F59, 0x1F5B, 0x1F5B - 0x1F59},
+		{0x1F5D, 0x1F5D, 1},
+		{0x1F5F, 0x1F7D, 1},
+		{0x1F80, 0x1FB4, 1},
+		{0x1FB6, 0x1FBC, 1},
+		{0x1FBE, 0x1FBE, 1},
+		{0x1FC2, 0x1FC4, 1},
+		{0x1FC6, 0x1FCC, 1},
+		{0x1FD0, 0x1FD3, 1},
+		{0x1FD6, 0x1FDB, 1},
+		{0x1FE0, 0x1FEC, 1},
+		{0x1FF2, 0x1FF4, 1},
+		{0x1FF6, 0x1FFC, 1},
+		{0x2126, 0x2126, 1},
+		{0x212A, 0x212B, 1},
+		{0x212E, 0x212E, 1},
+		{0x2180, 0x2182, 1},
+		{0x3007, 0x3007, 1},
+		{0x3021, 0x3029, 1},
+		{0x3041, 0x3094, 1},
+		{0x30A1, 0x30FA, 1},
+		{0x3105, 0x312C, 1},
+		{0x4E00, 0x9FA5, 1},
+		{0xAC00, 0xD7A3, 1},
+	},
+}
+
+var second = &unicode.RangeTable{
+	R16: []unicode.Range16{
+		{0x002D, 0x002E, 1},
+		{0x0030, 0x0039, 1},
+		{0x00B7, 0x00B7, 1},
+		{0x02D0, 0x02D1, 1},
+		{0x0300, 0x0345, 1},
+		{0x0360, 0x0361, 1},
+		{0x0387, 0x0387, 1},
+		{0x0483, 0x0486, 1},
+		{0x0591, 0x05A1, 1},
+		{0x05A3, 0x05B9, 1},
+		{0x05BB, 0x05BD, 1},
+		{0x05BF, 0x05BF, 1},
+		{0x05C1, 0x05C2, 1},
+		{0x05C4, 0x0640, 0x0640 - 0x05C4},
+		{0x064B, 0x0652, 1},
+		{0x0660, 0x0669, 1},
+		{0x0670, 0x0670, 1},
+		{0x06D6, 0x06DC, 1},
+		{0x06DD, 0x06DF, 1},
+		{0x06E0, 0x06E4, 1},
+		{0x06E7, 0x06E8, 1},
+		{0x06EA, 0x06ED, 1},
+		{0x06F0, 0x06F9, 1},
+		{0x0901, 0x0903, 1},
+		{0x093C, 0x093C, 1},
+		{0x093E, 0x094C, 1},
+		{0x094D, 0x094D, 1},
+		{0x0951, 0x0954, 1},
+		{0x0962, 0x0963, 1},
+		{0x0966, 0x096F, 1},
+		{0x0981, 0x0983, 1},
+		{0x09BC, 0x09BC, 1},
+		{0x09BE, 0x09BF, 1},
+		{0x09C0, 0x09C4, 1},
+		{0x09C7, 0x09C8, 1},
+		{0x09CB, 0x09CD, 1},
+		{0x09D7, 0x09D7, 1},
+		{0x09E2, 0x09E3, 1},
+		{0x09E6, 0x09EF, 1},
+		{0x0A02, 0x0A3C, 0x3A},
+		{0x0A3E, 0x0A3F, 1},
+		{0x0A40, 0x0A42, 1},
+		{0x0A47, 0x0A48, 1},
+		{0x0A4B, 0x0A4D, 1},
+		{0x0A66, 0x0A6F, 1},
+		{0x0A70, 0x0A71, 1},
+		{0x0A81, 0x0A83, 1},
+		{0x0ABC, 0x0ABC, 1},
+		{0x0ABE, 0x0AC5, 1},
+		{0x0AC7, 0x0AC9, 1},
+		{0x0ACB, 0x0ACD, 1},
+		{0x0AE6, 0x0AEF, 1},
+		{0x0B01, 0x0B03, 1},
+		{0x0B3C, 0x0B3C, 1},
+		{0x0B3E, 0x0B43, 1},
+		{0x0B47, 0x0B48, 1},
+		{0x0B4B, 0x0B4D, 1},
+		{0x0B56, 0x0B57, 1},
+		{0x0B66, 0x0B6F, 1},
+		{0x0B82, 0x0B83, 1},
+		{0x0BBE, 0x0BC2, 1},
+		{0x0BC6, 0x0BC8, 1},
+		{0x0BCA, 0x0BCD, 1},
+		{0x0BD7, 0x0BD7, 1},
+		{0x0BE7, 0x0BEF, 1},
+		{0x0C01, 0x0C03, 1},
+		{0x0C3E, 0x0C44, 1},
+		{0x0C46, 0x0C48, 1},
+		{0x0C4A, 0x0C4D, 1},
+		{0x0C55, 0x0C56, 1},
+		{0x0C66, 0x0C6F, 1},
+		{0x0C82, 0x0C83, 1},
+		{0x0CBE, 0x0CC4, 1},
+		{0x0CC6, 0x0CC8, 1},
+		{0x0CCA, 0x0CCD, 1},
+		{0x0CD5, 0x0CD6, 1},
+		{0x0CE6, 0x0CEF, 1},
+		{0x0D02, 0x0D03, 1},
+		{0x0D3E, 0x0D43, 1},
+		{0x0D46, 0x0D48, 1},
+		{0x0D4A, 0x0D4D, 1},
+		{0x0D57, 0x0D57, 1},
+		{0x0D66, 0x0D6F, 1},
+		{0x0E31, 0x0E31, 1},
+		{0x0E34, 0x0E3A, 1},
+		{0x0E46, 0x0E46, 1},
+		{0x0E47, 0x0E4E, 1},
+		{0x0E50, 0x0E59, 1},
+		{0x0EB1, 0x0EB1, 1},
+		{0x0EB4, 0x0EB9, 1},
+		{0x0EBB, 0x0EBC, 1},
+		{0x0EC6, 0x0EC6, 1},
+		{0x0EC8, 0x0ECD, 1},
+		{0x0ED0, 0x0ED9, 1},
+		{0x0F18, 0x0F19, 1},
+		{0x0F20, 0x0F29, 1},
+		{0x0F35, 0x0F39, 2},
+		{0x0F3E, 0x0F3F, 1},
+		{0x0F71, 0x0F84, 1},
+		{0x0F86, 0x0F8B, 1},
+		{0x0F90, 0x0F95, 1},
+		{0x0F97, 0x0F97, 1},
+		{0x0F99, 0x0FAD, 1},
+		{0x0FB1, 0x0FB7, 1},
+		{0x0FB9, 0x0FB9, 1},
+		{0x20D0, 0x20DC, 1},
+		{0x20E1, 0x3005, 0x3005 - 0x20E1},
+		{0x302A, 0x302F, 1},
+		{0x3031, 0x3035, 1},
+		{0x3099, 0x309A, 1},
+		{0x309D, 0x309E, 1},
+		{0x30FC, 0x30FE, 1},
+	},
+}
+
+// HTMLEntity is an entity map containing translations for the
+// standard HTML entity characters.
+var HTMLEntity = htmlEntity
+
+var htmlEntity = map[string]string{
+	/*
+		hget http://www.w3.org/TR/html4/sgml/entities.html |
+		ssam '
+			,y /\&gt;/ x/\&lt;(.|\n)+/ s/\n/ /g
+			,x v/^\&lt;!ENTITY/d
+			,s/\&lt;!ENTITY ([^ ]+) .*U\+([0-9A-F][0-9A-F][0-9A-F][0-9A-F]) .+/	"\1": "\\u\2",/g
+		'
+	*/
+	"nbsp":     "\u00A0",
+	"iexcl":    "\u00A1",
+	"cent":     "\u00A2",
+	"pound":    "\u00A3",
+	"curren":   "\u00A4",
+	"yen":      "\u00A5",
+	"brvbar":   "\u00A6",
+	"sect":     "\u00A7",
+	"uml":      "\u00A8",
+	"copy":     "\u00A9",
+	"ordf":     "\u00AA",
+	"laquo":    "\u00AB",
+	"not":      "\u00AC",
+	"shy":      "\u00AD",
+	"reg":      "\u00AE",
+	"macr":     "\u00AF",
+	"deg":      "\u00B0",
+	"plusmn":   "\u00B1",
+	"sup2":     "\u00B2",
+	"sup3":     "\u00B3",
+	"acute":    "\u00B4",
+	"micro":    "\u00B5",
+	"para":     "\u00B6",
+	"middot":   "\u00B7",
+	"cedil":    "\u00B8",
+	"sup1":     "\u00B9",
+	"ordm":     "\u00BA",
+	"raquo":    "\u00BB",
+	"frac14":   "\u00BC",
+	"frac12":   "\u00BD",
+	"frac34":   "\u00BE",
+	"iquest":   "\u00BF",
+	"Agrave":   "\u00C0",
+	"Aacute":   "\u00C1",
+	"Acirc":    "\u00C2",
+	"Atilde":   "\u00C3",
+	"Auml":     "\u00C4",
+	"Aring":    "\u00C5",
+	"AElig":    "\u00C6",
+	"Ccedil":   "\u00C7",
+	"Egrave":   "\u00C8",
+	"Eacute":   "\u00C9",
+	"Ecirc":    "\u00CA",
+	"Euml":     "\u00CB",
+	"Igrave":   "\u00CC",
+	"Iacute":   "\u00CD",
+	"Icirc":    "\u00CE",
+	"Iuml":     "\u00CF",
+	"ETH":      "\u00D0",
+	"Ntilde":   "\u00D1",
+	"Ograve":   "\u00D2",
+	"Oacute":   "\u00D3",
+	"Ocirc":    "\u00D4",
+	"Otilde":   "\u00D5",
+	"Ouml":     "\u00D6",
+	"times":    "\u00D7",
+	"Oslash":   "\u00D8",
+	"Ugrave":   "\u00D9",
+	"Uacute":   "\u00DA",
+	"Ucirc":    "\u00DB",
+	"Uuml":     "\u00DC",
+	"Yacute":   "\u00DD",
+	"THORN":    "\u00DE",
+	"szlig":    "\u00DF",
+	"agrave":   "\u00E0",
+	"aacute":   "\u00E1",
+	"acirc":    "\u00E2",
+	"atilde":   "\u00E3",
+	"auml":     "\u00E4",
+	"aring":    "\u00E5",
+	"aelig":    "\u00E6",
+	"ccedil":   "\u00E7",
+	"egrave":   "\u00E8",
+	"eacute":   "\u00E9",
+	"ecirc":    "\u00EA",
+	"euml":     "\u00EB",
+	"igrave":   "\u00EC",
+	"iacute":   "\u00ED",
+	"icirc":    "\u00EE",
+	"iuml":     "\u00EF",
+	"eth":      "\u00F0",
+	"ntilde":   "\u00F1",
+	"ograve":   "\u00F2",
+	"oacute":   "\u00F3",
+	"ocirc":    "\u00F4",
+	"otilde":   "\u00F5",
+	"ouml":     "\u00F6",
+	"divide":   "\u00F7",
+	"oslash":   "\u00F8",
+	"ugrave":   "\u00F9",
+	"uacute":   "\u00FA",
+	"ucirc":    "\u00FB",
+	"uuml":     "\u00FC",
+	"yacute":   "\u00FD",
+	"thorn":    "\u00FE",
+	"yuml":     "\u00FF",
+	"fnof":     "\u0192",
+	"Alpha":    "\u0391",
+	"Beta":     "\u0392",
+	"Gamma":    "\u0393",
+	"Delta":    "\u0394",
+	"Epsilon":  "\u0395",
+	"Zeta":     "\u0396",
+	"Eta":      "\u0397",
+	"Theta":    "\u0398",
+	"Iota":     "\u0399",
+	"Kappa":    "\u039A",
+	"Lambda":   "\u039B",
+	"Mu":       "\u039C",
+	"Nu":       "\u039D",
+	"Xi":       "\u039E",
+	"Omicron":  "\u039F",
+	"Pi":       "\u03A0",
+	"Rho":      "\u03A1",
+	"Sigma":    "\u03A3",
+	"Tau":      "\u03A4",
+	"Upsilon":  "\u03A5",
+	"Phi":      "\u03A6",
+	"Chi":      "\u03A7",
+	"Psi":      "\u03A8",
+	"Omega":    "\u03A9",
+	"alpha":    "\u03B1",
+	"beta":     "\u03B2",
+	"gamma":    "\u03B3",
+	"delta":    "\u03B4",
+	"epsilon":  "\u03B5",
+	"zeta":     "\u03B6",
+	"eta":      "\u03B7",
+	"theta":    "\u03B8",
+	"iota":     "\u03B9",
+	"kappa":    "\u03BA",
+	"lambda":   "\u03BB",
+	"mu":       "\u03BC",
+	"nu":       "\u03BD",
+	"xi":       "\u03BE",
+	"omicron":  "\u03BF",
+	"pi":       "\u03C0",
+	"rho":      "\u03C1",
+	"sigmaf":   "\u03C2",
+	"sigma":    "\u03C3",
+	"tau":      "\u03C4",
+	"upsilon":  "\u03C5",
+	"phi":      "\u03C6",
+	"chi":      "\u03C7",
+	"psi":      "\u03C8",
+	"omega":    "\u03C9",
+	"thetasym": "\u03D1",
+	"upsih":    "\u03D2",
+	"piv":      "\u03D6",
+	"bull":     "\u2022",
+	"hellip":   "\u2026",
+	"prime":    "\u2032",
+	"Prime":    "\u2033",
+	"oline":    "\u203E",
+	"frasl":    "\u2044",
+	"weierp":   "\u2118",
+	"image":    "\u2111",
+	"real":     "\u211C",
+	"trade":    "\u2122",
+	"alefsym":  "\u2135",
+	"larr":     "\u2190",
+	"uarr":     "\u2191",
+	"rarr":     "\u2192",
+	"darr":     "\u2193",
+	"harr":     "\u2194",
+	"crarr":    "\u21B5",
+	"lArr":     "\u21D0",
+	"uArr":     "\u21D1",
+	"rArr":     "\u21D2",
+	"dArr":     "\u21D3",
+	"hArr":     "\u21D4",
+	"forall":   "\u2200",
+	"part":     "\u2202",
+	"exist":    "\u2203",
+	"empty":    "\u2205",
+	"nabla":    "\u2207",
+	"isin":     "\u2208",
+	"notin":    "\u2209",
+	"ni":       "\u220B",
+	"prod":     "\u220F",
+	"sum":      "\u2211",
+	"minus":    "\u2212",
+	"lowast":   "\u2217",
+	"radic":    "\u221A",
+	"prop":     "\u221D",
+	"infin":    "\u221E",
+	"ang":      "\u2220",
+	"and":      "\u2227",
+	"or":       "\u2228",
+	"cap":      "\u2229",
+	"cup":      "\u222A",
+	"int":      "\u222B",
+	"there4":   "\u2234",
+	"sim":      "\u223C",
+	"cong":     "\u2245",
+	"asymp":    "\u2248",
+	"ne":       "\u2260",
+	"equiv":    "\u2261",
+	"le":       "\u2264",
+	"ge":       "\u2265",
+	"sub":      "\u2282",
+	"sup":      "\u2283",
+	"nsub":     "\u2284",
+	"sube":     "\u2286",
+	"supe":     "\u2287",
+	"oplus":    "\u2295",
+	"otimes":   "\u2297",
+	"perp":     "\u22A5",
+	"sdot":     "\u22C5",
+	"lceil":    "\u2308",
+	"rceil":    "\u2309",
+	"lfloor":   "\u230A",
+	"rfloor":   "\u230B",
+	"lang":     "\u2329",
+	"rang":     "\u232A",
+	"loz":      "\u25CA",
+	"spades":   "\u2660",
+	"clubs":    "\u2663",
+	"hearts":   "\u2665",
+	"diams":    "\u2666",
+	"quot":     "\u0022",
+	"amp":      "\u0026",
+	"lt":       "\u003C",
+	"gt":       "\u003E",
+	"OElig":    "\u0152",
+	"oelig":    "\u0153",
+	"Scaron":   "\u0160",
+	"scaron":   "\u0161",
+	"Yuml":     "\u0178",
+	"circ":     "\u02C6",
+	"tilde":    "\u02DC",
+	"ensp":     "\u2002",
+	"emsp":     "\u2003",
+	"thinsp":   "\u2009",
+	"zwnj":     "\u200C",
+	"zwj":      "\u200D",
+	"lrm":      "\u200E",
+	"rlm":      "\u200F",
+	"ndash":    "\u2013",
+	"mdash":    "\u2014",
+	"lsquo":    "\u2018",
+	"rsquo":    "\u2019",
+	"sbquo":    "\u201A",
+	"ldquo":    "\u201C",
+	"rdquo":    "\u201D",
+	"bdquo":    "\u201E",
+	"dagger":   "\u2020",
+	"Dagger":   "\u2021",
+	"permil":   "\u2030",
+	"lsaquo":   "\u2039",
+	"rsaquo":   "\u203A",
+	"euro":     "\u20AC",
+}
+
+// HTMLAutoClose is the set of HTML elements that
+// should be considered to close automatically.
+var HTMLAutoClose = htmlAutoClose
+
+var htmlAutoClose = []string{
+	/*
+		hget http://www.w3.org/TR/html4/loose.dtd |
+		9 sed -n 's/<!ELEMENT ([^ ]*) +- O EMPTY.+/	"\1",/p' | tr A-Z a-z
+	*/
+	"basefont",
+	"br",
+	"area",
+	"link",
+	"img",
+	"param",
+	"hr",
+	"input",
+	"col",
+	"frame",
+	"isindex",
+	"base",
+	"meta",
+}
+
+var (
+	esc_quot = []byte("&#34;") // shorter than "&quot;"
+	esc_apos = []byte("&#39;") // shorter than "&apos;"
+	esc_amp  = []byte("&amp;")
+	esc_lt   = []byte("&lt;")
+	esc_gt   = []byte("&gt;")
+	esc_tab  = []byte("&#x9;")
+	esc_nl   = []byte("&#xA;")
+	esc_cr   = []byte("&#xD;")
+	esc_fffd = []byte("\uFFFD") // Unicode replacement character
+)
+
+// EscapeText writes to w the properly escaped XML equivalent
+// of the plain text data s.
+func EscapeText(w io.Writer, s []byte) error {
+	var esc []byte
+	last := 0
+	for i := 0; i < len(s); {
+		r, width := utf8.DecodeRune(s[i:])
+		i += width
+		switch r {
+		case '"':
+			esc = esc_quot
+		case '\'':
+			esc = esc_apos
+		case '&':
+			esc = esc_amp
+		case '<':
+			esc = esc_lt
+		case '>':
+			esc = esc_gt
+		case '\t':
+			esc = esc_tab
+		case '\n':
+			esc = esc_nl
+		case '\r':
+			esc = esc_cr
+		default:
+			if !isInCharacterRange(r) || (r == 0xFFFD && width == 1) {
+				esc = esc_fffd
+				break
+			}
+			continue
+		}
+		if _, err := w.Write(s[last : i-width]); err != nil {
+			return err
+		}
+		if _, err := w.Write(esc); err != nil {
+			return err
+		}
+		last = i
+	}
+	if _, err := w.Write(s[last:]); err != nil {
+		return err
+	}
+	return nil
+}
+
+// EscapeString writes to p the properly escaped XML equivalent
+// of the plain text data s.
+func (p *printer) EscapeString(s string) {
+	var esc []byte
+	last := 0
+	for i := 0; i < len(s); {
+		r, width := utf8.DecodeRuneInString(s[i:])
+		i += width
+		switch r {
+		case '"':
+			esc = esc_quot
+		case '\'':
+			esc = esc_apos
+		case '&':
+			esc = esc_amp
+		case '<':
+			esc = esc_lt
+		case '>':
+			esc = esc_gt
+		case '\t':
+			esc = esc_tab
+		case '\n':
+			esc = esc_nl
+		case '\r':
+			esc = esc_cr
+		default:
+			if !isInCharacterRange(r) || (r == 0xFFFD && width == 1) {
+				esc = esc_fffd
+				break
+			}
+			continue
+		}
+		p.WriteString(s[last : i-width])
+		p.Write(esc)
+		last = i
+	}
+	p.WriteString(s[last:])
+}
+
+// Escape is like EscapeText but omits the error return value.
+// It is provided for backwards compatibility with Go 1.0.
+// Code targeting Go 1.1 or later should use EscapeText.
+func Escape(w io.Writer, s []byte) {
+	EscapeText(w, s)
+}
+
+// procInstEncoding parses the `encoding="..."` or `encoding='...'`
+// value out of the provided string, returning "" if not found.
+func procInstEncoding(s string) string {
+	// TODO: this parsing is somewhat lame and not exact.
+	// It works for all actual cases, though.
+	idx := strings.Index(s, "encoding=")
+	if idx == -1 {
+		return ""
+	}
+	v := s[idx+len("encoding="):]
+	if v == "" {
+		return ""
+	}
+	if v[0] != '\'' && v[0] != '"' {
+		return ""
+	}
+	idx = strings.IndexRune(v[1:], rune(v[0]))
+	if idx == -1 {
+		return ""
+	}
+	return v[1 : idx+1]
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/xml/xml_test.go b/vendor/github.com/vmware/govmomi/vim25/xml/xml_test.go
new file mode 100644
index 0000000000..7723ab1c9f
--- /dev/null
+++ b/vendor/github.com/vmware/govmomi/vim25/xml/xml_test.go
@@ -0,0 +1,726 @@
+// Copyright 2009 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package xml
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"reflect"
+	"strings"
+	"testing"
+	"unicode/utf8"
+)
+
+const testInput = `
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<body xmlns:foo="ns1" xmlns="ns2" xmlns:tag="ns3" ` +
+	"\r\n\t" + `  >
+  <hello lang="en">World &lt;&gt;&apos;&quot; &#x767d;&#40300;翔</hello>
+  <query>&何; &is-it;</query>
+  <goodbye />
+  <outer foo:attr="value" xmlns:tag="ns4">
+    <inner/>
+  </outer>
+  <tag:name>
+    <![CDATA[Some text here.]]>
+  </tag:name>
+</body><!-- missing final newline -->`
+
+var testEntity = map[string]string{"何": "What", "is-it": "is it?"}
+
+var rawTokens = []Token{
+	CharData("\n"),
+	ProcInst{"xml", []byte(`version="1.0" encoding="UTF-8"`)},
+	CharData("\n"),
+	Directive(`DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"`),
+	CharData("\n"),
+	StartElement{Name{"", "body"}, []Attr{{Name{"xmlns", "foo"}, "ns1"}, {Name{"", "xmlns"}, "ns2"}, {Name{"xmlns", "tag"}, "ns3"}}},
+	CharData("\n  "),
+	StartElement{Name{"", "hello"}, []Attr{{Name{"", "lang"}, "en"}}},
+	CharData("World <>'\" 白鵬翔"),
+	EndElement{Name{"", "hello"}},
+	CharData("\n  "),
+	StartElement{Name{"", "query"}, []Attr{}},
+	CharData("What is it?"),
+	EndElement{Name{"", "query"}},
+	CharData("\n  "),
+	StartElement{Name{"", "goodbye"}, []Attr{}},
+	EndElement{Name{"", "goodbye"}},
+	CharData("\n  "),
+	StartElement{Name{"", "outer"}, []Attr{{Name{"foo", "attr"}, "value"}, {Name{"xmlns", "tag"}, "ns4"}}},
+	CharData("\n    "),
+	StartElement{Name{"", "inner"}, []Attr{}},
+	EndElement{Name{"", "inner"}},
+	CharData("\n  "),
+	EndElement{Name{"", "outer"}},
+	CharData("\n  "),
+	StartElement{Name{"tag", "name"}, []Attr{}},
+	CharData("\n    "),
+	CharData("Some text here."),
+	CharData("\n  "),
+	EndElement{Name{"tag", "name"}},
+	CharData("\n"),
+	EndElement{Name{"", "body"}},
+	Comment(" missing final newline "),
+}
+
+var cookedTokens = []Token{
+	CharData("\n"),
+	ProcInst{"xml", []byte(`version="1.0" encoding="UTF-8"`)},
+	CharData("\n"),
+	Directive(`DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"`),
+	CharData("\n"),
+	StartElement{Name{"ns2", "body"}, []Attr{{Name{"xmlns", "foo"}, "ns1"}, {Name{"", "xmlns"}, "ns2"}, {Name{"xmlns", "tag"}, "ns3"}}},
+	CharData("\n  "),
+	StartElement{Name{"ns2", "hello"}, []Attr{{Name{"", "lang"}, "en"}}},
+	CharData("World <>'\" 白鵬翔"),
+	EndElement{Name{"ns2", "hello"}},
+	CharData("\n  "),
+	StartElement{Name{"ns2", "query"}, []Attr{}},
+	CharData("What is it?"),
+	EndElement{Name{"ns2", "query"}},
+	CharData("\n  "),
+	StartElement{Name{"ns2", "goodbye"}, []Attr{}},
+	EndElement{Name{"ns2", "goodbye"}},
+	CharData("\n  "),
+	StartElement{Name{"ns2", "outer"}, []Attr{{Name{"ns1", "attr"}, "value"}, {Name{"xmlns", "tag"}, "ns4"}}},
+	CharData("\n    "),
+	StartElement{Name{"ns2", "inner"}, []Attr{}},
+	EndElement{Name{"ns2", "inner"}},
+	CharData("\n  "),
+	EndElement{Name{"ns2", "outer"}},
+	CharData("\n  "),
+	StartElement{Name{"ns3", "name"}, []Attr{}},
+	CharData("\n    "),
+	CharData("Some text here."),
+	CharData("\n  "),
+	EndElement{Name{"ns3", "name"}},
+	CharData("\n"),
+	EndElement{Name{"ns2", "body"}},
+	Comment(" missing final newline "),
+}
+
+const testInputAltEncoding = `
+<?xml version="1.0" encoding="x-testing-uppercase"?>
+<TAG>VALUE</TAG>`
+
+var rawTokensAltEncoding = []Token{
+	CharData("\n"),
+	ProcInst{"xml", []byte(`version="1.0" encoding="x-testing-uppercase"`)},
+	CharData("\n"),
+	StartElement{Name{"", "tag"}, []Attr{}},
+	CharData("value"),
+	EndElement{Name{"", "tag"}},
+}
+
+var xmlInput = []string{
+	// unexpected EOF cases
+	"<",
+	"<t",
+	"<t ",
+	"<t/",
+	"<!",
+	"<!-",
+	"<!--",
+	"<!--c-",
+	"<!--c--",
+	"<!d",
+	"<t></",
+	"<t></t",
+	"<?",
+	"<?p",
+	"<t a",
+	"<t a=",
+	"<t a='",
+	"<t a=''",
+	"<t/><![",
+	"<t/><![C",
+	"<t/><![CDATA[d",
+	"<t/><![CDATA[d]",
+	"<t/><![CDATA[d]]",
+
+	// other Syntax errors
+	"<>",
+	"<t/a",
+	"<0 />",
+	"<?0 >",
+	//	"<!0 >",	// let the Token() caller handle
+	"</0>",
+	"<t 0=''>",
+	"<t a='&'>",
+	"<t a='<'>",
+	"<t>&nbspc;</t>",
+	"<t a>",
+	"<t a=>",
+	"<t a=v>",
+	//	"<![CDATA[d]]>",	// let the Token() caller handle
+	"<t></e>",
+	"<t></>",
+	"<t></t!",
+	"<t>cdata]]></t>",
+}
+
+func TestRawToken(t *testing.T) {
+	d := NewDecoder(strings.NewReader(testInput))
+	d.Entity = testEntity
+	testRawToken(t, d, rawTokens)
+}
+
+const nonStrictInput = `
+<tag>non&entity</tag>
+<tag>&unknown;entity</tag>
+<tag>&#123</tag>
+<tag>&#zzz;</tag>
+<tag>&なまえ3;</tag>
+<tag>&lt-gt;</tag>
+<tag>&;</tag>
+<tag>&0a;</tag>
+`
+
+var nonStringEntity = map[string]string{"": "oops!", "0a": "oops!"}
+
+var nonStrictTokens = []Token{
+	CharData("\n"),
+	StartElement{Name{"", "tag"}, []Attr{}},
+	CharData("non&entity"),
+	EndElement{Name{"", "tag"}},
+	CharData("\n"),
+	StartElement{Name{"", "tag"}, []Attr{}},
+	CharData("&unknown;entity"),
+	EndElement{Name{"", "tag"}},
+	CharData("\n"),
+	StartElement{Name{"", "tag"}, []Attr{}},
+	CharData("&#123"),
+	EndElement{Name{"", "tag"}},
+	CharData("\n"),
+	StartElement{Name{"", "tag"}, []Attr{}},
+	CharData("&#zzz;"),
+	EndElement{Name{"", "tag"}},
+	CharData("\n"),
+	StartElement{Name{"", "tag"}, []Attr{}},
+	CharData("&なまえ3;"),
+	EndElement{Name{"", "tag"}},
+	CharData("\n"),
+	StartElement{Name{"", "tag"}, []Attr{}},
+	CharData("&lt-gt;"),
+	EndElement{Name{"", "tag"}},
+	CharData("\n"),
+	StartElement{Name{"", "tag"}, []Attr{}},
+	CharData("&;"),
+	EndElement{Name{"", "tag"}},
+	CharData("\n"),
+	StartElement{Name{"", "tag"}, []Attr{}},
+	CharData("&0a;"),
+	EndElement{Name{"", "tag"}},
+	CharData("\n"),
+}
+
+func TestNonStrictRawToken(t *testing.T) {
+	d := NewDecoder(strings.NewReader(nonStrictInput))
+	d.Strict = false
+	testRawToken(t, d, nonStrictTokens)
+}
+
+type downCaser struct {
+	t *testing.T
+	r io.ByteReader
+}
+
+func (d *downCaser) ReadByte() (c byte, err error) {
+	c, err = d.r.ReadByte()
+	if c >= 'A' && c <= 'Z' {
+		c += 'a' - 'A'
+	}
+	return
+}
+
+func (d *downCaser) Read(p []byte) (int, error) {
+	d.t.Fatalf("unexpected Read call on downCaser reader")
+	panic("unreachable")
+}
+
+func TestRawTokenAltEncoding(t *testing.T) {
+	d := NewDecoder(strings.NewReader(testInputAltEncoding))
+	d.CharsetReader = func(charset string, input io.Reader) (io.Reader, error) {
+		if charset != "x-testing-uppercase" {
+			t.Fatalf("unexpected charset %q", charset)
+		}
+		return &downCaser{t, input.(io.ByteReader)}, nil
+	}
+	testRawToken(t, d, rawTokensAltEncoding)
+}
+
+func TestRawTokenAltEncodingNoConverter(t *testing.T) {
+	d := NewDecoder(strings.NewReader(testInputAltEncoding))
+	token, err := d.RawToken()
+	if token == nil {
+		t.Fatalf("expected a token on first RawToken call")
+	}
+	if err != nil {
+		t.Fatal(err)
+	}
+	token, err = d.RawToken()
+	if token != nil {
+		t.Errorf("expected a nil token; got %#v", token)
+	}
+	if err == nil {
+		t.Fatalf("expected an error on second RawToken call")
+	}
+	const encoding = "x-testing-uppercase"
+	if !strings.Contains(err.Error(), encoding) {
+		t.Errorf("expected error to contain %q; got error: %v",
+			encoding, err)
+	}
+}
+
+func testRawToken(t *testing.T, d *Decoder, rawTokens []Token) {
+	for i, want := range rawTokens {
+		have, err := d.RawToken()
+		if err != nil {
+			t.Fatalf("token %d: unexpected error: %s", i, err)
+		}
+		if !reflect.DeepEqual(have, want) {
+			var shave, swant string
+			if _, ok := have.(CharData); ok {
+				shave = fmt.Sprintf("CharData(%q)", have)
+			} else {
+				shave = fmt.Sprintf("%#v", have)
+			}
+			if _, ok := want.(CharData); ok {
+				swant = fmt.Sprintf("CharData(%q)", want)
+			} else {
+				swant = fmt.Sprintf("%#v", want)
+			}
+			t.Errorf("token %d = %s, want %s", i, shave, swant)
+		}
+	}
+}
+
+// Ensure that directives (specifically !DOCTYPE) include the complete
+// text of any nested directives, noting that < and > do not change
+// nesting depth if they are in single or double quotes.
+
+var nestedDirectivesInput = `
+<!DOCTYPE [<!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">]>
+<!DOCTYPE [<!ENTITY xlt ">">]>
+<!DOCTYPE [<!ENTITY xlt "<">]>
+<!DOCTYPE [<!ENTITY xlt '>'>]>
+<!DOCTYPE [<!ENTITY xlt '<'>]>
+<!DOCTYPE [<!ENTITY xlt '">'>]>
+<!DOCTYPE [<!ENTITY xlt "'<">]>
+`
+
+var nestedDirectivesTokens = []Token{
+	CharData("\n"),
+	Directive(`DOCTYPE [<!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">]`),
+	CharData("\n"),
+	Directive(`DOCTYPE [<!ENTITY xlt ">">]`),
+	CharData("\n"),
+	Directive(`DOCTYPE [<!ENTITY xlt "<">]`),
+	CharData("\n"),
+	Directive(`DOCTYPE [<!ENTITY xlt '>'>]`),
+	CharData("\n"),
+	Directive(`DOCTYPE [<!ENTITY xlt '<'>]`),
+	CharData("\n"),
+	Directive(`DOCTYPE [<!ENTITY xlt '">'>]`),
+	CharData("\n"),
+	Directive(`DOCTYPE [<!ENTITY xlt "'<">]`),
+	CharData("\n"),
+}
+
+func TestNestedDirectives(t *testing.T) {
+	d := NewDecoder(strings.NewReader(nestedDirectivesInput))
+
+	for i, want := range nestedDirectivesTokens {
+		have, err := d.Token()
+		if err != nil {
+			t.Fatalf("token %d: unexpected error: %s", i, err)
+		}
+		if !reflect.DeepEqual(have, want) {
+			t.Errorf("token %d = %#v want %#v", i, have, want)
+		}
+	}
+}
+
+func TestToken(t *testing.T) {
+	d := NewDecoder(strings.NewReader(testInput))
+	d.Entity = testEntity
+
+	for i, want := range cookedTokens {
+		have, err := d.Token()
+		if err != nil {
+			t.Fatalf("token %d: unexpected error: %s", i, err)
+		}
+		if !reflect.DeepEqual(have, want) {
+			t.Errorf("token %d = %#v want %#v", i, have, want)
+		}
+	}
+}
+
+func TestSyntax(t *testing.T) {
+	for i := range xmlInput {
+		d := NewDecoder(strings.NewReader(xmlInput[i]))
+		var err error
+		for _, err = d.Token(); err == nil; _, err = d.Token() {
+		}
+		if _, ok := err.(*SyntaxError); !ok {
+			t.Fatalf(`xmlInput "%s": expected SyntaxError not received`, xmlInput[i])
+		}
+	}
+}
+
+type allScalars struct {
+	True1     bool
+	True2     bool
+	False1    bool
+	False2    bool
+	Int       int
+	Int8      int8
+	Int16     int16
+	Int32     int32
+	Int64     int64
+	Uint      int
+	Uint8     uint8
+	Uint16    uint16
+	Uint32    uint32
+	Uint64    uint64
+	Uintptr   uintptr
+	Float32   float32
+	Float64   float64
+	String    string
+	PtrString *string
+}
+
+var all = allScalars{
+	True1:     true,
+	True2:     true,
+	False1:    false,
+	False2:    false,
+	Int:       1,
+	Int8:      -2,
+	Int16:     3,
+	Int32:     -4,
+	Int64:     5,
+	Uint:      6,
+	Uint8:     7,
+	Uint16:    8,
+	Uint32:    9,
+	Uint64:    10,
+	Uintptr:   11,
+	Float32:   13.0,
+	Float64:   14.0,
+	String:    "15",
+	PtrString: &sixteen,
+}
+
+var sixteen = "16"
+
+const testScalarsInput = `<allscalars>
+	<True1>true</True1>
+	<True2>1</True2>
+	<False1>false</False1>
+	<False2>0</False2>
+	<Int>1</Int>
+	<Int8>-2</Int8>
+	<Int16>3</Int16>
+	<Int32>-4</Int32>
+	<Int64>5</Int64>
+	<Uint>6</Uint>
+	<Uint8>7</Uint8>
+	<Uint16>8</Uint16>
+	<Uint32>9</Uint32>
+	<Uint64>10</Uint64>
+	<Uintptr>11</Uintptr>
+	<Float>12.0</Float>
+	<Float32>13.0</Float32>
+	<Float64>14.0</Float64>
+	<String>15</String>
+	<PtrString>16</PtrString>
+</allscalars>`
+
+func TestAllScalars(t *testing.T) {
+	var a allScalars
+	err := Unmarshal([]byte(testScalarsInput), &a)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !reflect.DeepEqual(a, all) {
+		t.Errorf("have %+v want %+v", a, all)
+	}
+}
+
+type item struct {
+	Field_a string
+}
+
+func TestIssue569(t *testing.T) {
+	data := `<item><Field_a>abcd</Field_a></item>`
+	var i item
+	err := Unmarshal([]byte(data), &i)
+
+	if err != nil || i.Field_a != "abcd" {
+		t.Fatal("Expecting abcd")
+	}
+}
+
+func TestUnquotedAttrs(t *testing.T) {
+	data := "<tag attr=azAZ09:-_\t>"
+	d := NewDecoder(strings.NewReader(data))
+	d.Strict = false
+	token, err := d.Token()
+	if _, ok := err.(*SyntaxError); ok {
+		t.Errorf("Unexpected error: %v", err)
+	}
+	if token.(StartElement).Name.Local != "tag" {
+		t.Errorf("Unexpected tag name: %v", token.(StartElement).Name.Local)
+	}
+	attr := token.(StartElement).Attr[0]
+	if attr.Value != "azAZ09:-_" {
+		t.Errorf("Unexpected attribute value: %v", attr.Value)
+	}
+	if attr.Name.Local != "attr" {
+		t.Errorf("Unexpected attribute name: %v", attr.Name.Local)
+	}
+}
+
+func TestValuelessAttrs(t *testing.T) {
+	tests := [][3]string{
+		{"<p nowrap>", "p", "nowrap"},
+		{"<p nowrap >", "p", "nowrap"},
+		{"<input checked/>", "input", "checked"},
+		{"<input checked />", "input", "checked"},
+	}
+	for _, test := range tests {
+		d := NewDecoder(strings.NewReader(test[0]))
+		d.Strict = false
+		token, err := d.Token()
+		if _, ok := err.(*SyntaxError); ok {
+			t.Errorf("Unexpected error: %v", err)
+		}
+		if token.(StartElement).Name.Local != test[1] {
+			t.Errorf("Unexpected tag name: %v", token.(StartElement).Name.Local)
+		}
+		attr := token.(StartElement).Attr[0]
+		if attr.Value != test[2] {
+			t.Errorf("Unexpected attribute value: %v", attr.Value)
+		}
+		if attr.Name.Local != test[2] {
+			t.Errorf("Unexpected attribute name: %v", attr.Name.Local)
+		}
+	}
+}
+
+func TestCopyTokenCharData(t *testing.T) {
+	data := []byte("same data")
+	var tok1 Token = CharData(data)
+	tok2 := CopyToken(tok1)
+	if !reflect.DeepEqual(tok1, tok2) {
+		t.Error("CopyToken(CharData) != CharData")
+	}
+	data[1] = 'o'
+	if reflect.DeepEqual(tok1, tok2) {
+		t.Error("CopyToken(CharData) uses same buffer.")
+	}
+}
+
+func TestCopyTokenStartElement(t *testing.T) {
+	elt := StartElement{Name{"", "hello"}, []Attr{{Name{"", "lang"}, "en"}}}
+	var tok1 Token = elt
+	tok2 := CopyToken(tok1)
+	if tok1.(StartElement).Attr[0].Value != "en" {
+		t.Error("CopyToken overwrote Attr[0]")
+	}
+	if !reflect.DeepEqual(tok1, tok2) {
+		t.Error("CopyToken(StartElement) != StartElement")
+	}
+	tok1.(StartElement).Attr[0] = Attr{Name{"", "lang"}, "de"}
+	if reflect.DeepEqual(tok1, tok2) {
+		t.Error("CopyToken(CharData) uses same buffer.")
+	}
+}
+
+func TestSyntaxErrorLineNum(t *testing.T) {
+	testInput := "<P>Foo<P>\n\n<P>Bar</>\n"
+	d := NewDecoder(strings.NewReader(testInput))
+	var err error
+	for _, err = d.Token(); err == nil; _, err = d.Token() {
+	}
+	synerr, ok := err.(*SyntaxError)
+	if !ok {
+		t.Error("Expected SyntaxError.")
+	}
+	if synerr.Line != 3 {
+		t.Error("SyntaxError didn't have correct line number.")
+	}
+}
+
+func TestTrailingRawToken(t *testing.T) {
+	input := `<FOO></FOO>  `
+	d := NewDecoder(strings.NewReader(input))
+	var err error
+	for _, err = d.RawToken(); err == nil; _, err = d.RawToken() {
+	}
+	if err != io.EOF {
+		t.Fatalf("d.RawToken() = _, %v, want _, io.EOF", err)
+	}
+}
+
+func TestTrailingToken(t *testing.T) {
+	input := `<FOO></FOO>  `
+	d := NewDecoder(strings.NewReader(input))
+	var err error
+	for _, err = d.Token(); err == nil; _, err = d.Token() {
+	}
+	if err != io.EOF {
+		t.Fatalf("d.Token() = _, %v, want _, io.EOF", err)
+	}
+}
+
+func TestEntityInsideCDATA(t *testing.T) {
+	input := `<test><![CDATA[ &val=foo ]]></test>`
+	d := NewDecoder(strings.NewReader(input))
+	var err error
+	for _, err = d.Token(); err == nil; _, err = d.Token() {
+	}
+	if err != io.EOF {
+		t.Fatalf("d.Token() = _, %v, want _, io.EOF", err)
+	}
+}
+
+var characterTests = []struct {
+	in  string
+	err string
+}{
+	{"\x12<doc/>", "illegal character code U+0012"},
+	{"<?xml version=\"1.0\"?>\x0b<doc/>", "illegal character code U+000B"},
+	{"\xef\xbf\xbe<doc/>", "illegal character code U+FFFE"},
+	{"<?xml version=\"1.0\"?><doc>\r\n<hiya/>\x07<toots/></doc>", "illegal character code U+0007"},
+	{"<?xml version=\"1.0\"?><doc \x12='value'>what's up</doc>", "expected attribute name in element"},
+	{"<doc>&abc\x01;</doc>", "invalid character entity &abc (no semicolon)"},
+	{"<doc>&\x01;</doc>", "invalid character entity & (no semicolon)"},
+	{"<doc>&\xef\xbf\xbe;</doc>", "invalid character entity &\uFFFE;"},
+	{"<doc>&hello;</doc>", "invalid character entity &hello;"},
+}
+
+func TestDisallowedCharacters(t *testing.T) {
+
+	for i, tt := range characterTests {
+		d := NewDecoder(strings.NewReader(tt.in))
+		var err error
+
+		for err == nil {
+			_, err = d.Token()
+		}
+		synerr, ok := err.(*SyntaxError)
+		if !ok {
+			t.Fatalf("input %d d.Token() = _, %v, want _, *SyntaxError", i, err)
+		}
+		if synerr.Msg != tt.err {
+			t.Fatalf("input %d synerr.Msg wrong: want %q, got %q", i, tt.err, synerr.Msg)
+		}
+	}
+}
+
+type procInstEncodingTest struct {
+	expect, got string
+}
+
+var procInstTests = []struct {
+	input, expect string
+}{
+	{`version="1.0" encoding="utf-8"`, "utf-8"},
+	{`version="1.0" encoding='utf-8'`, "utf-8"},
+	{`version="1.0" encoding='utf-8' `, "utf-8"},
+	{`version="1.0" encoding=utf-8`, ""},
+	{`encoding="FOO" `, "FOO"},
+}
+
+func TestProcInstEncoding(t *testing.T) {
+	for _, test := range procInstTests {
+		got := procInstEncoding(test.input)
+		if got != test.expect {
+			t.Errorf("procInstEncoding(%q) = %q; want %q", test.input, got, test.expect)
+		}
+	}
+}
+
+// Ensure that directives with comments include the complete
+// text of any nested directives.
+
+var directivesWithCommentsInput = `
+<!DOCTYPE [<!-- a comment --><!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">]>
+<!DOCTYPE [<!ENTITY go "Golang"><!-- a comment-->]>
+<!DOCTYPE <!-> <!> <!----> <!-->--> <!--->--> [<!ENTITY go "Golang"><!-- a comment-->]>
+`
+
+var directivesWithCommentsTokens = []Token{
+	CharData("\n"),
+	Directive(`DOCTYPE [<!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">]`),
+	CharData("\n"),
+	Directive(`DOCTYPE [<!ENTITY go "Golang">]`),
+	CharData("\n"),
+	Directive(`DOCTYPE <!-> <!>    [<!ENTITY go "Golang">]`),
+	CharData("\n"),
+}
+
+func TestDirectivesWithComments(t *testing.T) {
+	d := NewDecoder(strings.NewReader(directivesWithCommentsInput))
+
+	for i, want := range directivesWithCommentsTokens {
+		have, err := d.Token()
+		if err != nil {
+			t.Fatalf("token %d: unexpected error: %s", i, err)
+		}
+		if !reflect.DeepEqual(have, want) {
+			t.Errorf("token %d = %#v want %#v", i, have, want)
+		}
+	}
+}
+
+// Writer whose Write method always returns an error.
+type errWriter struct{}
+
+func (errWriter) Write(p []byte) (n int, err error) { return 0, fmt.Errorf("unwritable") }
+
+func TestEscapeTextIOErrors(t *testing.T) {
+	expectErr := "unwritable"
+	err := EscapeText(errWriter{}, []byte{'A'})
+
+	if err == nil || err.Error() != expectErr {
+		t.Errorf("have %v, want %v", err, expectErr)
+	}
+}
+
+func TestEscapeTextInvalidChar(t *testing.T) {
+	input := []byte("A \x00 terminated string.")
+	expected := "A \uFFFD terminated string."
+
+	buff := new(bytes.Buffer)
+	if err := EscapeText(buff, input); err != nil {
+		t.Fatalf("have %v, want nil", err)
+	}
+	text := buff.String()
+
+	if text != expected {
+		t.Errorf("have %v, want %v", text, expected)
+	}
+}
+
+func TestIssue5880(t *testing.T) {
+	type T []byte
+	data, err := Marshal(T{192, 168, 0, 1})
+	if err != nil {
+		t.Errorf("Marshal error: %v", err)
+	}
+	if !utf8.Valid(data) {
+		t.Errorf("Marshal generated invalid UTF-8: %x", data)
+	}
+}