From 6282a405306bc4190ee526e08667737fbf858c6f Mon Sep 17 00:00:00 2001 From: Divyen Patel Date: Mon, 16 Jul 2018 10:19:32 -0700 Subject: [PATCH] Fix locating resporce-pool for volume provisioning --- .../providers/vsphere/vclib/datacenter.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkg/cloudprovider/providers/vsphere/vclib/datacenter.go b/pkg/cloudprovider/providers/vsphere/vclib/datacenter.go index d60448d1ccf..96107a4a3d7 100644 --- a/pkg/cloudprovider/providers/vsphere/vclib/datacenter.go +++ b/pkg/cloudprovider/providers/vsphere/vclib/datacenter.go @@ -155,20 +155,16 @@ func (dc *Datacenter) GetDatastoreByName(ctx context.Context, name string) (*Dat } // GetResourcePool gets the resource pool for the given path -func (dc *Datacenter) GetResourcePool(ctx context.Context, computePath string) (*object.ResourcePool, error) { +func (dc *Datacenter) GetResourcePool(ctx context.Context, resourcePoolPath string) (*object.ResourcePool, error) { finder := getFinder(dc) - var computeResource *object.ComputeResource + var resourcePool *object.ResourcePool var err error - if computePath == "" { - computeResource, err = finder.DefaultComputeResource(ctx) - } else { - computeResource, err = finder.ComputeResource(ctx, computePath) - } + resourcePool, err = finder.ResourcePoolOrDefault(ctx, resourcePoolPath) if err != nil { - glog.Errorf("Failed to get the ResourcePool for computePath '%s'. err: %+v", computePath, err) + glog.Errorf("Failed to get the ResourcePool for path '%s'. err: %+v", resourcePoolPath, err) return nil, err } - return computeResource.ResourcePool(ctx) + return resourcePool, nil } // GetFolderByPath gets the Folder Object from the given folder path