opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

huawei rebuild root fix

Browse Source
This commit is contained in:
TangBin
2019-07-26 18:08:49 +08:00
parent d6f5099ccc
commit 894bac0097
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/huawei/client/client.go
+2
View File
@@ -50,6 +50,7 @@ type Client struct {
SecurityGroups *modules.SSecurityGroupManager
NovaSecurityGroups *modules.SSecurityGroupManager
Servers *modules.SServerManager
ServersV2 *modules.SServerManager
NovaServers *modules.SServerManager
Snapshots *modules.SSnapshotManager
OsSnapshots *modules.SSnapshotManager
@@ -94,6 +95,7 @@ func (self *Client) InitWithAccessKey(regionId, projectId, accessKey, secretKey
func (self *Client) initManagers() {
if !self.init {
self.Servers = modules.NewServerManager(self.regionId, self.projectId, self.signer, self.debug)
self.ServersV2 = modules.NewServerV2Manager(self.regionId, self.projectId, self.signer, self.debug)
self.NovaServers = modules.NewNovaServerManager(self.regionId, self.projectId, self.signer, self.debug)
self.Snapshots = modules.NewSnapshotManager(self.regionId, self.projectId, self.signer, self.debug)
self.OsSnapshots = modules.NewOsSnapshotManager(self.regionId, self.projectId, self.signer, self.debug)
pkg/util/huawei/client/modules/mod_servers.go
+15
View File
@@ -107,3 +107,18 @@ func NewNovaServerManager(regionId, projectId string, signer auth.Signer, debug
ResourceKeyword: "servers",
}}
}
// 重装弹性云服务器操作系统（安装Cloud-init）,请用这个manager
func NewServerV2Manager(regionId, projectId string, signer auth.Signer, debug bool) *SServerManager {
return &SServerManager{SResourceManager: SResourceManager{
SBaseManager: NewBaseManager(signer, debug),
ServiceName: ServiceNameECS,
Region: regionId,
ProjectId: projectId,
version: "v2",
Keyword: "server",
KeywordPlural: "servers",
ResourceKeyword: "cloudservers",
}}
}
pkg/util/huawei/instance.go
+2 -2
View File
@@ -1038,7 +1038,7 @@ func (self *SRegion) RebuildRoot(ctx context.Context, userId, instanceId, passwd
}
params.Add(reinstallObj, "os-reinstall")
ret, err := self.ecsClient.Servers.PerformAction2("reinstallos", instanceId, params, "")
ret, err := self.ecsClient.ServersV2.PerformAction2("reinstallos", instanceId, params, "")
if err != nil {
return "", err
}
@@ -1077,7 +1077,7 @@ func (self *SRegion) ChangeRoot(ctx context.Context, userId, instanceId, imageId
changeOsObj.Add(jsonutils.NewString(imageId), "imageid")
params.Add(changeOsObj, "os-change")
ret, err := self.ecsClient.Servers.PerformAction2("changeos", instanceId, params, "")
ret, err := self.ecsClient.ServersV2.PerformAction2("changeos", instanceId, params, "")
if err != nil {
return "", err
}