Skip to content

Commit 1d768d5

Browse files
ZhengYa-0110SongZhen0704
authored andcommitted
feat: replace the adandoned APIs in huawei
1 parent 7dc1776 commit 1d768d5

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

server/controller/cloud/huawei/az.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func (h *HuaWei) getAZs() ([]model.AZ, error) {
2929
var azs []model.AZ
3030
for project, token := range h.projectTokenMap {
3131
jAZs, err := h.getRawData(newRawDataGetContext(
32-
fmt.Sprintf("https://ecs.%s.%s/v2.1/%s/os-availability-zone", project.name, h.config.Domain, project.id), token.token, "availabilityZoneInfo", pageQueryMethodNotPage,
32+
fmt.Sprintf("https://ecs.%s.%s/v1/%s/availability-zones", project.name, h.config.Domain, project.id), token.token, "availability_zones", pageQueryMethodNotPage,
3333
))
3434
if err != nil {
3535
return nil, err
@@ -38,8 +38,8 @@ func (h *HuaWei) getAZs() ([]model.AZ, error) {
3838
regionLcuuid := h.projectNameToRegionLcuuid(project.name)
3939
for i := range jAZs {
4040
ja := jAZs[i]
41-
zname := ja.Get("zoneName").MustString()
42-
if !cloudcommon.CheckJsonAttributes(ja, []string{"zoneName"}) {
41+
zname := ja.Get("availability_zone_id").MustString()
42+
if !cloudcommon.CheckJsonAttributes(ja, []string{"availability_zone_id"}) {
4343
log.Infof("exclude az: %s, missing attr", zname, logger.NewORGPrefix(h.orgID))
4444
continue
4545
}

server/controller/cloud/huawei/lb.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func (h *HuaWei) getLBs() (
3232
requiredAttrs := []string{"id", "name", "vip_port_id", "vip_subnet_id", "vip_address"}
3333
for project, token := range h.projectTokenMap {
3434
jLBs, err := h.getRawData(newRawDataGetContext(
35-
fmt.Sprintf("https://vpc.%s.%s/v2.0/lbaas/loadbalancers", project.name, h.config.Domain), token.token, "loadbalancers", pageQueryMethodMarker,
35+
fmt.Sprintf("https://elb.%s.%s/v2/%s/elb/loadbalancers", project.name, h.config.Domain, project.id), token.token, "loadbalancers", pageQueryMethodMarker,
3636
))
3737
if err != nil {
3838
return nil, nil, nil, nil, nil, err
@@ -113,7 +113,7 @@ func (h *HuaWei) getLBs() (
113113
h.toolDataSet.lbLcuuidToIP[id] = ip
114114
}
115115

116-
lls, ltss, err := h.formatListenersAndTargetServers(project.name, token.token)
116+
lls, ltss, err := h.formatListenersAndTargetServers(project, token.token)
117117
if err == nil {
118118
lbListeners = append(lbListeners, lls...)
119119
lbTargetSevers = append(lbTargetSevers, ltss...)
@@ -124,9 +124,9 @@ func (h *HuaWei) getLBs() (
124124
return
125125
}
126126

127-
func (h *HuaWei) formatListenersAndTargetServers(projectName, token string) (lbListeners []model.LBListener, lbTargetSevers []model.LBTargetServer, err error) {
127+
func (h *HuaWei) formatListenersAndTargetServers(project Project, token string) (lbListeners []model.LBListener, lbTargetSevers []model.LBTargetServer, err error) {
128128
jLs, err := h.getRawData(newRawDataGetContext(
129-
fmt.Sprintf("https://vpc.%s.%s/v2.0/lbaas/listeners", projectName, h.config.Domain), token, "listeners", pageQueryMethodMarker,
129+
fmt.Sprintf("https://elb.%s.%s/v2/%s/elb/listeners", project.name, h.config.Domain, project.id), token, "listeners", pageQueryMethodMarker,
130130
))
131131
if err != nil {
132132
return nil, nil, err
@@ -179,7 +179,7 @@ func (h *HuaWei) formatListenersAndTargetServers(projectName, token string) (lbL
179179
poolID, ok := jL.CheckGet("default_pool_id")
180180
if ok && poolID.MustString() != "" {
181181
jTSs, err := h.getRawData(newRawDataGetContext(
182-
fmt.Sprintf("https://vpc.%s.%s/v2.0/lbaas/pools/%s/members", projectName, h.config.Domain, poolID.MustString()), token, "members", pageQueryMethodMarker,
182+
fmt.Sprintf("https://elb.%s.%s/v2/%s/elb/pools/%s/members", project.name, h.config.Domain, project.id, poolID.MustString()), token, "members", pageQueryMethodMarker,
183183
))
184184
if err != nil {
185185
return nil, nil, err

0 commit comments

Comments
 (0)