Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Update generated types #2891

Merged
merged 1 commit into from
Jun 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 0 additions & 40 deletions eam/methods/methods.go
Original file line number Diff line number Diff line change
Expand Up @@ -183,26 +183,6 @@ func DestroyAgency(ctx context.Context, r soap.RoundTripper, req *types.DestroyA
return resBody.Res, nil
}

type GetMaintenanceModePolicyBody struct {
Req *types.GetMaintenanceModePolicy `xml:"urn:eam GetMaintenanceModePolicy,omitempty"`
Res *types.GetMaintenanceModePolicyResponse `xml:"urn:eam GetMaintenanceModePolicyResponse,omitempty"`
Fault_ *soap.Fault `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
}

func (b *GetMaintenanceModePolicyBody) Fault() *soap.Fault { return b.Fault_ }

func GetMaintenanceModePolicy(ctx context.Context, r soap.RoundTripper, req *types.GetMaintenanceModePolicy) (*types.GetMaintenanceModePolicyResponse, error) {
var reqBody, resBody GetMaintenanceModePolicyBody

reqBody.Req = req

if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
return nil, err
}

return resBody.Res, nil
}

type MarkAsAvailableBody struct {
Req *types.MarkAsAvailable `xml:"urn:eam MarkAsAvailable,omitempty"`
Res *types.MarkAsAvailableResponse `xml:"urn:eam MarkAsAvailableResponse,omitempty"`
Expand Down Expand Up @@ -403,26 +383,6 @@ func ScanForUnknownAgentVm(ctx context.Context, r soap.RoundTripper, req *types.
return resBody.Res, nil
}

type SetMaintenanceModePolicyBody struct {
Req *types.SetMaintenanceModePolicy `xml:"urn:eam SetMaintenanceModePolicy,omitempty"`
Res *types.SetMaintenanceModePolicyResponse `xml:"urn:eam SetMaintenanceModePolicyResponse,omitempty"`
Fault_ *soap.Fault `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
}

func (b *SetMaintenanceModePolicyBody) Fault() *soap.Fault { return b.Fault_ }

func SetMaintenanceModePolicy(ctx context.Context, r soap.RoundTripper, req *types.SetMaintenanceModePolicy) (*types.SetMaintenanceModePolicyResponse, error) {
var reqBody, resBody SetMaintenanceModePolicyBody

reqBody.Req = req

if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
return nil, err
}

return resBody.Res, nil
}

type UninstallBody struct {
Req *types.Uninstall `xml:"urn:eam Uninstall,omitempty"`
Res *types.UninstallResponse `xml:"urn:eam UninstallResponse,omitempty"`
Expand Down
31 changes: 0 additions & 31 deletions eam/types/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -582,12 +582,6 @@ func init() {
types.Add("eam:DisabledClusterFault", reflect.TypeOf((*DisabledClusterFault)(nil)).Elem())
}

type DisabledClusterFaultFault DisabledClusterFault

func init() {
types.Add("eam:DisabledClusterFaultFault", reflect.TypeOf((*DisabledClusterFaultFault)(nil)).Elem())
}

type EamAppFault struct {
EamRuntimeFault
}
Expand Down Expand Up @@ -652,12 +646,6 @@ func init() {
types.Add("eam:EamInvalidState", reflect.TypeOf((*EamInvalidState)(nil)).Elem())
}

type EamInvalidStateFault EamInvalidState

func init() {
types.Add("eam:EamInvalidStateFault", reflect.TypeOf((*EamInvalidStateFault)(nil)).Elem())
}

type EamInvalidVibPackage struct {
EamRuntimeFault
}
Expand Down Expand Up @@ -741,12 +729,6 @@ func init() {
types.Add("eam:ExtensibleIssue", reflect.TypeOf((*ExtensibleIssue)(nil)).Elem())
}

type GetMaintenanceModePolicy GetMaintenanceModePolicyRequestType

func init() {
types.Add("eam:GetMaintenanceModePolicy", reflect.TypeOf((*GetMaintenanceModePolicy)(nil)).Elem())
}

type GetMaintenanceModePolicyRequestType struct {
This types.ManagedObjectReference `xml:"_this"`
}
Expand All @@ -755,10 +737,6 @@ func init() {
types.Add("eam:GetMaintenanceModePolicyRequestType", reflect.TypeOf((*GetMaintenanceModePolicyRequestType)(nil)).Elem())
}

type GetMaintenanceModePolicyResponse struct {
Returnval string `xml:"returnval"`
}

type HostInMaintenanceMode struct {
VmDeployed
}
Expand Down Expand Up @@ -1354,12 +1332,6 @@ func init() {
type ScanForUnknownAgentVmResponse struct {
}

type SetMaintenanceModePolicy SetMaintenanceModePolicyRequestType

func init() {
types.Add("eam:SetMaintenanceModePolicy", reflect.TypeOf((*SetMaintenanceModePolicy)(nil)).Elem())
}

type SetMaintenanceModePolicyRequestType struct {
This types.ManagedObjectReference `xml:"_this"`
Policy string `xml:"policy"`
Expand All @@ -1369,9 +1341,6 @@ func init() {
types.Add("eam:SetMaintenanceModePolicyRequestType", reflect.TypeOf((*SetMaintenanceModePolicyRequestType)(nil)).Elem())
}

type SetMaintenanceModePolicyResponse struct {
}

type Uninstall UninstallRequestType

func init() {
Expand Down
10 changes: 5 additions & 5 deletions gen/gen.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Copyright (c) 2014-2021 VMware, Inc. All Rights Reserved.
# Copyright (c) 2014-2022 VMware, Inc. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -48,9 +48,9 @@ generate() {
}

#
# All types derive from vCenter build 18700403, vSphere 7.0U3.
# All types derive from vCenter build 20023987, vSphere 8.0.
#
export COPYRIGHT_DATE_RANGE="2014-2021"
export COPYRIGHT_DATE_RANGE="2014-2022"

#
# FORCE_BASE_INTERFACE_FOR_TYPES defines the types that we want to
Expand All @@ -59,14 +59,14 @@ export COPYRIGHT_DATE_RANGE="2014-2021"
#
export FORCE_BASE_INTERFACE_FOR_TYPES="AgencyConfigInfo"

# ./sdk/ contains the contents of wsdl.zip from vimbase build 18281059.
# ./sdk/ contains the contents of wsdl.zip from vimbase build 19936444.
generate "../vim25" "vim" "./rbvmomi/vmodl.db" # from github.com/vmware/rbvmomi@v3.0.0
generate "../pbm" "pbm"
generate "../vslm" "vslm"
generate "../sms" "sms"

# ./sdk/ contains the files eam-messagetypes.xsd and eam-types.xsd from
# eam-wsdl.zip, from eam-vcenter build 18281060.
# eam-wsdl.zip, from eam-vcenter build 19970683.
#
# Please note the EAM files are also available at the following, public URL --
# http://bit.ly/eam-sdk, therefore the WSDL resource for EAM are in fact
Expand Down
2 changes: 1 addition & 1 deletion pbm/methods/methods.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2014-2021 VMware, Inc. All Rights Reserved.
Copyright (c) 2014-2022 VMware, Inc. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
61 changes: 57 additions & 4 deletions pbm/types/enum.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2014-2021 VMware, Inc. All Rights Reserved.
Copyright (c) 2014-2022 VMware, Inc. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -116,6 +116,17 @@ func init() {
types.Add("pbm:PbmComplianceStatus", reflect.TypeOf((*PbmComplianceStatus)(nil)).Elem())
}

type PbmDebugManagerKeystoreName string

const (
PbmDebugManagerKeystoreNameSMS = PbmDebugManagerKeystoreName("SMS")
PbmDebugManagerKeystoreNameTRUSTED_ROOTS = PbmDebugManagerKeystoreName("TRUSTED_ROOTS")
)

func init() {
types.Add("pbm:PbmDebugManagerKeystoreName", reflect.TypeOf((*PbmDebugManagerKeystoreName)(nil)).Elem())
}

type PbmHealthStatusForEntity string

const (
Expand Down Expand Up @@ -163,6 +174,35 @@ func init() {
types.Add("pbm:PbmLineOfServiceInfoLineOfServiceEnum", reflect.TypeOf((*PbmLineOfServiceInfoLineOfServiceEnum)(nil)).Elem())
}

type PbmLoggingConfigurationComponent string

const (
PbmLoggingConfigurationComponentPbm = PbmLoggingConfigurationComponent("pbm")
PbmLoggingConfigurationComponentVslm = PbmLoggingConfigurationComponent("vslm")
PbmLoggingConfigurationComponentSms = PbmLoggingConfigurationComponent("sms")
PbmLoggingConfigurationComponentSpbm = PbmLoggingConfigurationComponent("spbm")
PbmLoggingConfigurationComponentSps = PbmLoggingConfigurationComponent("sps")
PbmLoggingConfigurationComponentHttpclient_header = PbmLoggingConfigurationComponent("httpclient_header")
PbmLoggingConfigurationComponentHttpclient_content = PbmLoggingConfigurationComponent("httpclient_content")
PbmLoggingConfigurationComponentVmomi = PbmLoggingConfigurationComponent("vmomi")
)

func init() {
types.Add("pbm:PbmLoggingConfigurationComponent", reflect.TypeOf((*PbmLoggingConfigurationComponent)(nil)).Elem())
}

type PbmLoggingConfigurationLogLevel string

const (
PbmLoggingConfigurationLogLevelINFO = PbmLoggingConfigurationLogLevel("INFO")
PbmLoggingConfigurationLogLevelDEBUG = PbmLoggingConfigurationLogLevel("DEBUG")
PbmLoggingConfigurationLogLevelTRACE = PbmLoggingConfigurationLogLevel("TRACE")
)

func init() {
types.Add("pbm:PbmLoggingConfigurationLogLevel", reflect.TypeOf((*PbmLoggingConfigurationLogLevel)(nil)).Elem())
}

type PbmObjectType string

const (
Expand Down Expand Up @@ -194,6 +234,18 @@ func init() {
types.Add("pbm:PbmOperation", reflect.TypeOf((*PbmOperation)(nil)).Elem())
}

type PbmPolicyAssociationVolumeAllocationType string

const (
PbmPolicyAssociationVolumeAllocationTypeFullyInitialized = PbmPolicyAssociationVolumeAllocationType("FullyInitialized")
PbmPolicyAssociationVolumeAllocationTypeReserveSpace = PbmPolicyAssociationVolumeAllocationType("ReserveSpace")
PbmPolicyAssociationVolumeAllocationTypeConserveSpaceWhenPossible = PbmPolicyAssociationVolumeAllocationType("ConserveSpaceWhenPossible")
)

func init() {
types.Add("pbm:PbmPolicyAssociationVolumeAllocationType", reflect.TypeOf((*PbmPolicyAssociationVolumeAllocationType)(nil)).Elem())
}

type PbmProfileCategoryEnum string

const (
Expand All @@ -219,9 +271,10 @@ func init() {
type PbmSystemCreatedProfileType string

const (
PbmSystemCreatedProfileTypeVsanDefaultProfile = PbmSystemCreatedProfileType("VsanDefaultProfile")
PbmSystemCreatedProfileTypeVVolDefaultProfile = PbmSystemCreatedProfileType("VVolDefaultProfile")
PbmSystemCreatedProfileTypePmemDefaultProfile = PbmSystemCreatedProfileType("PmemDefaultProfile")
PbmSystemCreatedProfileTypeVsanDefaultProfile = PbmSystemCreatedProfileType("VsanDefaultProfile")
PbmSystemCreatedProfileTypeVVolDefaultProfile = PbmSystemCreatedProfileType("VVolDefaultProfile")
PbmSystemCreatedProfileTypePmemDefaultProfile = PbmSystemCreatedProfileType("PmemDefaultProfile")
PbmSystemCreatedProfileTypeVsanMaxDefaultProfile = PbmSystemCreatedProfileType("VsanMaxDefaultProfile")
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion pbm/types/if.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2014-2021 VMware, Inc. All Rights Reserved.
Copyright (c) 2014-2022 VMware, Inc. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
24 changes: 23 additions & 1 deletion pbm/types/types.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2014-2021 VMware, Inc. All Rights Reserved.
Copyright (c) 2014-2022 VMware, Inc. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -909,6 +909,17 @@ func init() {
types.Add("pbm:PbmFaultInvalidLoginFault", reflect.TypeOf((*PbmFaultInvalidLoginFault)(nil)).Elem())
}

type PbmFaultNoPermissionEntityPrivileges struct {
types.DynamicData

ProfileId *PbmProfileId `xml:"profileId,omitempty"`
PrivilegeIds []string `xml:"privilegeIds,omitempty"`
}

func init() {
types.Add("pbm:PbmFaultNoPermissionEntityPrivileges", reflect.TypeOf((*PbmFaultNoPermissionEntityPrivileges)(nil)).Elem())
}

type PbmFaultNotFound struct {
PbmFault
}
Expand Down Expand Up @@ -1125,6 +1136,17 @@ func init() {
types.Add("pbm:PbmLineOfServiceInfo", reflect.TypeOf((*PbmLineOfServiceInfo)(nil)).Elem())
}

type PbmLoggingConfiguration struct {
types.DynamicData

Component string `xml:"component"`
LogLevel string `xml:"logLevel"`
}

func init() {
types.Add("pbm:PbmLoggingConfiguration", reflect.TypeOf((*PbmLoggingConfiguration)(nil)).Elem())
}

type PbmNonExistentHubs struct {
PbmFault

Expand Down
2 changes: 1 addition & 1 deletion simulator/property_collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ func (rr *retrieveResult) add(ctx *Context, name string, val types.AnyType, cont
Path: name,
Fault: types.LocalizedMethodFault{Fault: &types.NotAuthenticated{
NoPermission: types.NoPermission{
Object: content.Obj,
Object: &content.Obj,
PrivilegeId: "System.Read",
}},
},
Expand Down
2 changes: 1 addition & 1 deletion simulator/simulator.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ func (s *Service) call(ctx *Context, method *Method) soap.HasFault {
default:
fault := &types.NotAuthenticated{
NoPermission: types.NoPermission{
Object: method.This,
Object: &method.This,
PrivilegeId: "System.View",
},
}
Expand Down
2 changes: 1 addition & 1 deletion sms/methods/methods.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2014-2021 VMware, Inc. All Rights Reserved.
Copyright (c) 2014-2022 VMware, Inc. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
15 changes: 14 additions & 1 deletion sms/types/enum.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2014-2021 VMware, Inc. All Rights Reserved.
Copyright (c) 2014-2022 VMware, Inc. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -183,6 +183,19 @@ func init() {
types.Add("sms:SmsTaskState", reflect.TypeOf((*SmsTaskState)(nil)).Elem())
}

type StorageContainerVvolContainerTypeEnum string

const (
StorageContainerVvolContainerTypeEnumNFS = StorageContainerVvolContainerTypeEnum("NFS")
StorageContainerVvolContainerTypeEnumNFS4x = StorageContainerVvolContainerTypeEnum("NFS4x")
StorageContainerVvolContainerTypeEnumSCSI = StorageContainerVvolContainerTypeEnum("SCSI")
StorageContainerVvolContainerTypeEnumNVMe = StorageContainerVvolContainerTypeEnum("NVMe")
)

func init() {
types.Add("sms:StorageContainerVvolContainerTypeEnum", reflect.TypeOf((*StorageContainerVvolContainerTypeEnum)(nil)).Elem())
}

type ThinProvisioningStatus string

const (
Expand Down
2 changes: 1 addition & 1 deletion sms/types/if.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2014-2021 VMware, Inc. All Rights Reserved.
Copyright (c) 2014-2022 VMware, Inc. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Loading