Merge pull request #4634 from tb365/bugfix/tb-bugfix-0106

huawei image delete bugfix
This commit is contained in:
yunion-ci-robot
2020-01-08 11:25:57 +08:00
committed by GitHub
2 changed files with 8 additions and 3 deletions
+1 -1
View File
@@ -120,7 +120,7 @@ func (self *Client) initManagers() {
self.Snapshots = modules.NewSnapshotManager(self.regionId, self.projectId, self.signer, self.debug)
self.OsSnapshots = modules.NewOsSnapshotManager(self.regionId, self.projectId, self.signer, self.debug)
self.Images = modules.NewImageManager(self.regionId, self.projectId, self.signer, self.debug)
self.OpenStackImages = modules.NewOpenstackImageManager(self.regionId, self.signer, self.debug)
self.OpenStackImages = modules.NewOpenstackImageManager(self.regionId, self.projectId, self.signer, self.debug)
self.Projects = modules.NewProjectManager(self.signer, self.debug)
self.Regions = modules.NewRegionManager(self.signer, self.debug)
self.Zones = modules.NewZoneManager(self.regionId, self.projectId, self.signer, self.debug)
@@ -81,9 +81,14 @@ func (self *SImageManager) Get(id string, querys map[string]string) (jsonutils.J
// https://support.huaweicloud.com/api-ims/zh-cn_topic_0020092108.html
// 删除image只能用这个manager
func NewOpenstackImageManager(regionId string, signer auth.Signer, debug bool) *SImageManager {
func NewOpenstackImageManager(regionId string, projectId string, signer auth.Signer, debug bool) *SImageManager {
var requestHook imageProject
if len(projectId) > 0 {
requestHook = imageProject{projectId: projectId}
}
return &SImageManager{SResourceManager: SResourceManager{
SBaseManager: NewBaseManager(signer, debug),
SBaseManager: NewBaseManager2(signer, debug, &requestHook),
ServiceName: ServiceNameIMS,
Region: regionId,
ProjectId: "",