Merge pull request #2547 from yuyin002/issue-2545

fix: Regenerated interface and type to include BaseAgencyConfigInfo. …
vmware · Aug 12, 2021 · ec5a4a7 · ec5a4a7
2 parents 4a7de71 + a366e35
commit ec5a4a7
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 12 deletions.
diff --git a/eam/object/agency.go b/eam/object/agency.go
@@ -61,7 +61,7 @@ func (m Agency) Config(ctx context.Context) (*types.AgencyConfigInfo, error) {
 	if err != nil {
 		return nil, err
 	}
-	return &resp.Returnval, nil
+	return resp.Returnval.GetAgencyConfigInfo(), nil
 }
 
 func (m Agency) Runtime(ctx context.Context) (*types.EamObjectRuntimeInfo, error) {

diff --git a/eam/object/esx_agent_manager.go b/eam/object/esx_agent_manager.go
@@ -47,7 +47,7 @@ func (m EsxAgentManager) CreateAgency(
 	var agency Agency
 	resp, err := methods.CreateAgency(ctx, m.c, &types.CreateAgency{
 		This:             m.r,
-		AgencyConfigInfo: config,
+		AgencyConfigInfo: config.GetAgencyConfigInfo(),
 		InitialGoalState: initialGoalState,
 	})
 	if err != nil {

diff --git a/eam/simulator/agency.go b/eam/simulator/agency.go
@@ -197,7 +197,7 @@ func (m *Agency) QueryConfig(
 
 	return &methods.QueryConfigBody{
 		Res: &types.QueryConfigResponse{
-			Returnval: m.Config,
+			Returnval: &m.Config,
 		},
 	}
 }
@@ -237,7 +237,7 @@ func (m *Agency) Update(
 	ctx *simulator.Context,
 	req *types.Update) soap.HasFault {
 
-	m.Config = req.Config
+	m.Config = *req.Config.GetAgencyConfigInfo()
 
 	return &methods.UpdateBody{
 		Res: &types.UpdateResponse{},

diff --git a/eam/simulator/esx_agent_manager.go b/eam/simulator/esx_agent_manager.go
@@ -39,7 +39,7 @@ func (m *EsxAgentManager) CreateAgency(
 
 	if agency, err := NewAgency(
 		ctx,
-		req.AgencyConfigInfo,
+		*req.AgencyConfigInfo.GetAgencyConfigInfo(),
 		req.InitialGoalState); err != nil {
 
 		res.Fault_ = simulator.Fault("", err)

diff --git a/eam/types/if.go b/eam/types/if.go
@@ -22,6 +22,16 @@ import (
 	"github.com/vmware/govmomi/vim25/types"
 )
 
+func (b *AgencyConfigInfo) GetAgencyConfigInfo() *AgencyConfigInfo { return b }
+
+type BaseAgencyConfigInfo interface {
+	GetAgencyConfigInfo() *AgencyConfigInfo
+}
+
+func init() {
+	types.Add("BaseAgencyConfigInfo", reflect.TypeOf((*AgencyConfigInfo)(nil)).Elem())
+}
+
 func (b *AgencyIssue) GetAgencyIssue() *AgencyIssue { return b }
 
 type BaseAgencyIssue interface {

diff --git a/eam/types/types.go b/eam/types/types.go
@@ -500,7 +500,7 @@ func init() {
 
 type CreateAgencyRequestType struct {
 	This             types.ManagedObjectReference `xml:"_this"`
-	AgencyConfigInfo AgencyConfigInfo             `xml:"agencyConfigInfo"`
+	AgencyConfigInfo BaseAgencyConfigInfo         `xml:"agencyConfigInfo,typeattr"`
 	InitialGoalState string                       `xml:"initialGoalState"`
 }
 
@@ -1201,7 +1201,7 @@ func init() {
 }
 
 type QueryConfigResponse struct {
-	Returnval AgencyConfigInfo `xml:"returnval"`
+	Returnval BaseAgencyConfigInfo `xml:"returnval,typeattr"`
 }
 
 type QueryIssue QueryIssueRequestType
@@ -1375,7 +1375,7 @@ func init() {
 
 type UpdateRequestType struct {
 	This   types.ManagedObjectReference `xml:"_this"`
-	Config AgencyConfigInfo             `xml:"config"`
+	Config BaseAgencyConfigInfo         `xml:"config,typeattr"`
 }
 
 func init() {

diff --git a/gen/gen.sh b/gen/gen.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2014 VMware, Inc. All Rights Reserved.
+# Copyright (c) 2014-2021 VMware, Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -52,6 +52,13 @@ generate() {
 #
 export COPYRIGHT_DATE_RANGE="2014-2021"
 
+#
+# FORCE_BASE_INTERFACE_FOR_TYPES defines the types that we want to
+# generate base interfaces for. The type names should be comma seperated -
+# e.g. "TypeA,TypeB,TypeC"
+#
+export FORCE_BASE_INTERFACE_FOR_TYPES="AgencyConfigInfo"
+
 # ./sdk/ contains the contents of wsdl.zip from vimbase build 17354719
 generate "../vim25" "vim" "./rbvmomi/vmodl.db" # from github.com/vmware/rbvmomi@v3.0.0
 generate "../pbm" "pbm"

diff --git a/gen/vim_wsdl.rb b/gen/vim_wsdl.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2018 VMware, Inc. All Rights Reserved.
+# Copyright (c) 2014-2021 VMware, Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 require "test/unit"
 
 $namespaces = %w(vim25)
+$force_base_interface_for_types = ENV['FORCE_BASE_INTERFACE_FOR_TYPES']
 
 def valid_ns?(t)
   $namespaces.include?(t)
@@ -62,7 +63,7 @@ def base?
       # VrpResourceAllocationInfo is removed in 6.7, so base will no longer generated
       return false if ["ResourceAllocationInfo", "FaultDomainId"].include?(@name)
 
-      return !children.empty?
+      return !children.empty? || $force_base_interface_for_types.split(",").include?(@name)
     end
   end
 
@@ -193,7 +194,7 @@ def vim_type(t = self.type)
   end
 
   def base_type?
-    vim_type? && Peek.base?(vim_type)
+    vim_type? && (Peek.base?(vim_type) || $force_base_interface_for_types.split(",").include?(vim_type))
   end
 
   def enum_type?