From 68980704b1ae7161556b72f69d5cb8358dcbc9ae Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Tue, 3 Sep 2019 14:52:33 -0700 Subject: [PATCH] Update generated code to vSphere 6.7u3 --- gen/gen.sh | 2 +- vim25/mo/mo.go | 13 +++++----- vim25/types/types.go | 11 +++++++++ vslm/methods/methods.go | 20 +++++++++++++++ vslm/types/types.go | 54 +++++++++++++++++++++++++++++++++++------ 5 files changed, 86 insertions(+), 14 deletions(-) diff --git a/gen/gen.sh b/gen/gen.sh index fa3ff1921..1b93f6b9f 100755 --- a/gen/gen.sh +++ b/gen/gen.sh @@ -47,7 +47,7 @@ generate() { done } -# ./sdk/ contains the contents of wsdl.zip from vimbase build 12317751 (vSphere 6.7u2) +# ./sdk/ contains the contents of wsdl.zip from vimbase build 14360549 (vSphere 6.7u3) generate "../vim25" "vim" "./rbvmomi/vmodl.db" # from github.com/vmware/rbvmomi@1cc9f9e generate "../pbm" "pbm" diff --git a/vim25/mo/mo.go b/vim25/mo/mo.go index 4f19988e3..f7ae32eab 100644 --- a/vim25/mo/mo.go +++ b/vim25/mo/mo.go @@ -79,12 +79,13 @@ func init() { 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"` + Configuration types.ClusterConfigInfo `mo:"configuration"` + Recommendation []types.ClusterRecommendation `mo:"recommendation"` + DrsRecommendation []types.ClusterDrsRecommendation `mo:"drsRecommendation"` + HciConfig *types.ClusterComputeResourceHCIConfigInfo `mo:"hciConfig"` + MigrationHistory []types.ClusterDrsMigration `mo:"migrationHistory"` + ActionHistory []types.ClusterActionHistory `mo:"actionHistory"` + DrsFault []types.ClusterDrsFaults `mo:"drsFault"` } func init() { diff --git a/vim25/types/types.go b/vim25/types/types.go index 628a4cd6a..54b82d869 100644 --- a/vim25/types/types.go +++ b/vim25/types/types.go @@ -49027,6 +49027,17 @@ type VStorageObjectCreateSnapshot_TaskResponse struct { Returnval ManagedObjectReference `xml:"returnval"` } +type VStorageObjectSnapshotDetails struct { + DynamicData + + Path string `xml:"path,omitempty"` + ChangedBlockTrackingId string `xml:"changedBlockTrackingId,omitempty"` +} + +func init() { + t["VStorageObjectSnapshotDetails"] = reflect.TypeOf((*VStorageObjectSnapshotDetails)(nil)).Elem() +} + type VStorageObjectSnapshotInfo struct { DynamicData diff --git a/vslm/methods/methods.go b/vslm/methods/methods.go index 0fac9be65..42806f458 100644 --- a/vslm/methods/methods.go +++ b/vslm/methods/methods.go @@ -603,6 +603,26 @@ func VslmRenameVStorageObject(ctx context.Context, r soap.RoundTripper, req *typ return resBody.Res, nil } +type VslmRetrieveSnapshotDetailsBody struct { + Req *types.VslmRetrieveSnapshotDetails `xml:"urn:vslm VslmRetrieveSnapshotDetails,omitempty"` + Res *types.VslmRetrieveSnapshotDetailsResponse `xml:"urn:vslm VslmRetrieveSnapshotDetailsResponse,omitempty"` + Fault_ *soap.Fault `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"` +} + +func (b *VslmRetrieveSnapshotDetailsBody) Fault() *soap.Fault { return b.Fault_ } + +func VslmRetrieveSnapshotDetails(ctx context.Context, r soap.RoundTripper, req *types.VslmRetrieveSnapshotDetails) (*types.VslmRetrieveSnapshotDetailsResponse, error) { + var reqBody, resBody VslmRetrieveSnapshotDetailsBody + + reqBody.Req = req + + if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil { + return nil, err + } + + return resBody.Res, nil +} + type VslmRetrieveSnapshotInfoBody struct { Req *types.VslmRetrieveSnapshotInfo `xml:"urn:vslm VslmRetrieveSnapshotInfo,omitempty"` Res *types.VslmRetrieveSnapshotInfoResponse `xml:"urn:vslm VslmRetrieveSnapshotInfoResponse,omitempty"` diff --git a/vslm/types/types.go b/vslm/types/types.go index be38f4f3a..c19bb4fe0 100644 --- a/vslm/types/types.go +++ b/vslm/types/types.go @@ -71,6 +71,14 @@ func init() { types.Add("vslm:ArrayOfVslmVsoVStorageObjectResult", reflect.TypeOf((*ArrayOfVslmVsoVStorageObjectResult)(nil)).Elem()) } +type ArrayOfVslmVsoVStorageObjectSnapshotResult struct { + VslmVsoVStorageObjectSnapshotResult []VslmVsoVStorageObjectSnapshotResult `xml:"VslmVsoVStorageObjectSnapshotResult,omitempty"` +} + +func init() { + types.Add("vslm:ArrayOfVslmVsoVStorageObjectSnapshotResult", reflect.TypeOf((*ArrayOfVslmVsoVStorageObjectSnapshotResult)(nil)).Elem()) +} + type RetrieveContent RetrieveContentRequestType func init() { @@ -690,6 +698,26 @@ func init() { type VslmRenameVStorageObjectResponse struct { } +type VslmRetrieveSnapshotDetails VslmRetrieveSnapshotDetailsRequestType + +func init() { + types.Add("vslm:VslmRetrieveSnapshotDetails", reflect.TypeOf((*VslmRetrieveSnapshotDetails)(nil)).Elem()) +} + +type VslmRetrieveSnapshotDetailsRequestType struct { + This types.ManagedObjectReference `xml:"_this"` + Id types.ID `xml:"id"` + SnapshotId types.ID `xml:"snapshotId"` +} + +func init() { + types.Add("vslm:VslmRetrieveSnapshotDetailsRequestType", reflect.TypeOf((*VslmRetrieveSnapshotDetailsRequestType)(nil)).Elem()) +} + +type VslmRetrieveSnapshotDetailsResponse struct { + Returnval types.VStorageObjectSnapshotDetails `xml:"returnval"` +} + type VslmRetrieveSnapshotInfo VslmRetrieveSnapshotInfoRequestType func init() { @@ -1141,19 +1169,31 @@ func init() { type VslmVsoVStorageObjectResult struct { types.DynamicData - Id types.ID `xml:"id"` - Name string `xml:"name,omitempty"` - CapacityInMB int64 `xml:"capacityInMB"` - CreateTime *time.Time `xml:"createTime"` - DatastoreUrl string `xml:"datastoreUrl,omitempty"` - Metadata []types.KeyValue `xml:"metadata,omitempty"` - Error *types.LocalizedMethodFault `xml:"error,omitempty"` + Id types.ID `xml:"id"` + Name string `xml:"name,omitempty"` + CapacityInMB int64 `xml:"capacityInMB"` + CreateTime *time.Time `xml:"createTime"` + DatastoreUrl string `xml:"datastoreUrl,omitempty"` + BackingObjectId *types.ID `xml:"backingObjectId,omitempty"` + SnapshotInfo []VslmVsoVStorageObjectSnapshotResult `xml:"snapshotInfo,omitempty"` + Metadata []types.KeyValue `xml:"metadata,omitempty"` + Error *types.LocalizedMethodFault `xml:"error,omitempty"` } func init() { types.Add("vslm:VslmVsoVStorageObjectResult", reflect.TypeOf((*VslmVsoVStorageObjectResult)(nil)).Elem()) } +type VslmVsoVStorageObjectSnapshotResult struct { + types.DynamicData + + BackingObjectId types.ID `xml:"backingObjectId"` +} + +func init() { + types.Add("vslm:VslmVsoVStorageObjectSnapshotResult", reflect.TypeOf((*VslmVsoVStorageObjectSnapshotResult)(nil)).Elem()) +} + type VersionURI string func init() {