zhouqunjie
/
pcm-openstack
forked from jcce-pcm/pcm-openstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fix:提交openstack代码

This commit is contained in:
qiwang 2023-10-19 16:43:21 +08:00
parent d2e46b766c
commit 4a8fb067ea
7 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/logic/pauseserverlogic.go
View File

@ -53,5 +53,5 @@ func (l *PauseServerLogic) PauseServer(in *openstack.PauseServerReq) (*openstack
resp.Code = 400
resp.Msg = "Failure"
}
return &openstack.PauseServerResp{}, nil
return &resp, nil
}

2
internal/logic/rebootserverlogic.go
View File

@ -53,5 +53,5 @@ func (l *RebootServerLogic) RebootServer(in *openstack.RebootServerReq) (*openst
resp.Code = 400
resp.Msg = "Failure"
}
return &openstack.RebootServerResp{}, nil
return &resp, nil
}

2
internal/logic/startserverlogic.go
View File

@ -53,5 +53,5 @@ func (l *StartServerLogic) StartServer(in *openstack.StartServerReq) (*openstack
resp.Code = 400
resp.Msg = "Failure"
}
return &openstack.StartServerResp{}, nil
return &resp, nil
}

2
internal/logic/stopserverlogic.go
View File

@ -53,5 +53,5 @@ func (l *StopServerLogic) StopServer(in *openstack.StopServerReq) (*openstack.St
resp.Code = 400
resp.Msg = "Failure"
}
return &openstack.StopServerResp{}, nil
return &resp, nil
}

6
internal/logic/updatenetworklogic.go
View File

@ -3,6 +3,7 @@ package logic
import (
"context"
"fmt"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/internal/common"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/tool"
@ -35,7 +36,8 @@ func (l *UpdateNetworkLogic) UpdateNetwork(in *openstack.UpdateNetworkReq) (*ope
}
payload := strings.NewReader(string(reqByte))
openstackUrl := l.svcCtx.Config.OpenstackNetworkUrl
statusCode, body, err := tool.HttpClientWithScreen(tool.PUT, openstackUrl+"/v2.0/networks"+in.NetworkId, payload)
token := common.GetToken()
statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.PUT, openstackUrl+"/servers/"+in.NetworkId+"/action", payload, token)
if err != nil {
return nil, err
}
@ -51,5 +53,5 @@ func (l *UpdateNetworkLogic) UpdateNetwork(in *openstack.UpdateNetworkReq) (*ope
resp.Code = 400
resp.Msg = "Failure"
}
return &openstack.UpdateNetworkResp{}, nil
return &resp, nil
}

6
internal/logic/updateserverlogic.go
View File

@ -3,6 +3,7 @@ package logic
import (
"context"
"fmt"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/internal/common"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/tool"
@ -35,7 +36,8 @@ func (l *UpdateServerLogic) UpdateServer(in *openstack.UpdateServerReq) (*openst
}
payload := strings.NewReader(string(reqByte))
openstackUrl := l.svcCtx.Config.OpenstackComputeUrl
statusCode, body, err := tool.HttpClientWithScreen(tool.PUT, openstackUrl+"/servers/"+in.ServerId, payload)
token := common.GetToken()
statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.PUT, openstackUrl+"/servers/"+in.ServerId, payload, token)
if err != nil {
return nil, err
}
@ -51,5 +53,5 @@ func (l *UpdateServerLogic) UpdateServer(in *openstack.UpdateServerReq) (*openst
resp.Code = 400
resp.Msg = "Failure"
}
return &openstack.UpdateServerResp{}, nil
return &resp, nil
}

6
internal/logic/updatevolumelogic.go
View File

@ -3,6 +3,7 @@ package logic
import (
"context"
"fmt"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/internal/common"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/internal/svc"
"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
"gitlink.org.cn/jcce-pcm/utils/tool"
@ -35,7 +36,8 @@ func (l *UpdateVolumeLogic) UpdateVolume(in *openstack.UpdateVolumeReq) (*openst
}
payload := strings.NewReader(string(reqByte))
openstackUrl := l.svcCtx.Config.OpenstackNetworkUrl
statusCode, body, err := tool.HttpClientWithScreen(tool.PUT, openstackUrl+"/v3/"+in.ProjectId+"types"+in.VolumeTypeId, payload)
token := common.GetToken()
statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.PUT, openstackUrl+"/v3/"+in.ProjectId+"types"+in.VolumeTypeId, payload, token)
if err != nil {
return nil, err
}
@ -51,5 +53,5 @@ func (l *UpdateVolumeLogic) UpdateVolume(in *openstack.UpdateVolumeReq) (*openst
resp.Code = 400
resp.Msg = "Failure"
}
return &openstack.UpdateVolumeResp{}, nil
return &resp, nil
}