From ebf3692ba0b583e58fdaf779da53cfd0ddf069ad Mon Sep 17 00:00:00 2001 From: rainzm Date: Wed, 9 Sep 2020 21:32:49 +0800 Subject: [PATCH] refactor(esxi): replace GetTemplateVMById with FetchTemplateVMById MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit FetchTemplateVMById 更好,因为它更轻量,更快。 --- .../storageman/imagecachemanager_agent.go | 2 +- pkg/multicloud/esxi/datacenter.go | 21 ------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/pkg/hostman/storageman/imagecachemanager_agent.go b/pkg/hostman/storageman/imagecachemanager_agent.go index bd76c366db..5c6d1a1d37 100644 --- a/pkg/hostman/storageman/imagecachemanager_agent.go +++ b/pkg/hostman/storageman/imagecachemanager_agent.go @@ -225,7 +225,7 @@ func (c *SAgentImageCacheManager) perfetchTemplateVMImageCache(ctx context.Conte if err != nil { return nil, errors.Wrap(err, "host.GetDatacenter") } - _, err = dc.GetTemplateVMById(data.ImageExternalId) + _, err = dc.FetchTemplateVMById(data.ImageExternalId) if err != nil { return nil, err } diff --git a/pkg/multicloud/esxi/datacenter.go b/pkg/multicloud/esxi/datacenter.go index 8a6bc9e0e5..5ad5e2a536 100644 --- a/pkg/multicloud/esxi/datacenter.go +++ b/pkg/multicloud/esxi/datacenter.go @@ -436,24 +436,3 @@ func (dc *SDatacenter) GetTemplateVMs() ([]*SVirtualMachine, error) { } return templateVms, nil } - -func (dc *SDatacenter) GetTemplateVMById(id string) (*SVirtualMachine, error) { - id = dc.manager.getPrivateId(id) - hosts, err := dc.GetIHosts() - if err != nil { - return nil, errors.Wrap(err, "SDatacenter.GetIHosts") - } - for _, ihost := range hosts { - host := ihost.(*SHost) - tvms, err := host.GetTemplateVMs() - if err != nil { - return nil, errors.Wrap(err, "host.GetTemplateVMs") - } - for i := range tvms { - if tvms[i].GetGlobalId() == id { - return tvms[i], nil - } - } - } - return nil, cloudprovider.ErrNotFound -}