devad
/
pcm-openstack
forked from JointCloud/pcm-openstack
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:提交openstack代码

This commit is contained in:
qiwang 2023-10-19 10:12:41 +08:00
parent 57fd38592a
commit f85f3bf7b0
5 changed files with 1814 additions and 1823 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/logic/shownetworkdetailslogic.go
View File

@ -3,13 +3,12 @@ package logic
import (
"context"
"fmt"
"github.com/zeromicro/go-zero/core/logx"
"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"
"k8s.io/apimachinery/pkg/util/json"
"strings"
"github.com/zeromicro/go-zero/core/logx"
)
type ShowNetworkDetailsLogic struct {
@ -31,7 +30,8 @@ func (l *ShowNetworkDetailsLogic) ShowNetworkDetails(in *openstack.ShowNetworkDe
// todo: add your logic here and delete this line
var resp openstack.ShowNetworkDetailsResp
openstackUrl := l.svcCtx.Config.OpenstackNetworkUrl
statusCode, body, err := tool.HttpClientWithScreen(tool.GET, openstackUrl+"/v2.0/networks/"+in.NetworkId, strings.NewReader(``))
token := common.GetToken()
statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.GET, openstackUrl+"/v2.0/networks/"+in.NetworkId, nil, token)
if err != nil {
return nil, err
}
@ -47,5 +47,5 @@ func (l *ShowNetworkDetailsLogic) ShowNetworkDetails(in *openstack.ShowNetworkDe
resp.Code = 400
resp.Msg = "Failure"
}
return &openstack.ShowNetworkDetailsResp{}, nil
return &resp, nil
}

2
internal/logic/shownodedetailslogic.go
View File

@ -46,5 +46,5 @@ func (l *ShowNodeDetailsLogic) ShowNodeDetails(in *openstack.ShowNodeDetailsReq)
resp.Code = 400
resp.Msg = "Failure"
}
return &openstack.ShowNodeDetailsResp{}, nil
return &resp, nil
}

3617
openstack/pcm-openstack.pb.go
View File

File diff suppressed because it is too large Load Diff

2
openstackclient/openstack.go
View File

@ -133,7 +133,7 @@ type (
ListServersDetailedResp_Metadata = openstack.ListServersDetailedResp_Metadata
ListServersDetailedResp_Private = openstack.ListServersDetailedResp_Private
ListServersDetailedResp_SecurityGroups = openstack.ListServersDetailedResp_SecurityGroups
ListServersDetailedResp_Servers = openstack.ListServersDetailedResp_Servers
ListServersDetailedResp_ServersDetailed = openstack.ListServersDetailedResp_ServersDetailed
ListServersReq = openstack.ListServersReq
ListServersResp = openstack.ListServersResp
ListServersResp_Links = openstack.ListServersResp_Links

6
pb/pcm-openstack.proto
View File

@ -206,7 +206,7 @@ message ListServersDetailedResp {
string name = 1;
}
message Servers {
message ServersDetailed {
string TaskState = 1 [json_name="OS-EXT-STS:task_state,omitempty"];
string VmState = 15[json_name="OS-EXT-STS:vm_state,omitempty"];
string OS_EXT_SRV_ATTR_Instance_Name = 6 [json_name="OS-EXT-SRV-ATTR:instance_name"];
@ -255,7 +255,7 @@ message ListServersDetailedResp {
string user_id = 43;
}
repeated Servers servers = 1; // @gotags: copier:"ServersDetailed"
repeated ServersDetailed servers = 1; // @gotags: copier:"ServersDetailed"
int32 code = 2; // @gotags: copier:"Code"
string msg = 3; // @gotags: copier:"Msg"
string error_msg =4;// @gotags: copier:"ErrorMsg"
@ -739,7 +739,7 @@ message ListFlavorsDetailResp{
/******************Show network details Start*************************/
message ShowNetworkDetailsReq{
string network_id = 1; //网络ID
string fields = 2; //可选，希望服务器返回的字段
// string fields = 2; //可选，希望服务器返回的字段
}
message Network{