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-12 11:32:55 +08:00
parent cb796ef650
commit 69e51d8055
9 changed files with 1997 additions and 2910 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/logic/pauseserverlogic.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 *PauseServerLogic) PauseServer(in *openstack.PauseServerReq) (*openstack
}
payload := strings.NewReader(string(reqByte))
openstackUrl := l.svcCtx.Config.OpenstackComputeUrl
statusCode, body, err := tool.HttpClientWithScreen(tool.PUT, openstackUrl+"/servers/"+in.ServerId+"/action", payload)
token := common.GetToken()
statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.POST, openstackUrl+"/servers/"+in.ServerId+"/action", payload, token)
if err != nil {
return nil, err
}

4
internal/logic/rebootserverlogic.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 *RebootServerLogic) RebootServer(in *openstack.RebootServerReq) (*openst
}
payload := strings.NewReader(string(reqByte))
openstackUrl := l.svcCtx.Config.OpenstackComputeUrl
statusCode, body, err := tool.HttpClientWithScreen(tool.PUT, openstackUrl+"/servers/"+in.ServerId+"/action", payload)
token := common.GetToken()
statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.POST, openstackUrl+"/servers/"+in.ServerId+"/action", payload, token)
if err != nil {
return nil, err
}

4
internal/logic/startserverlogic.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 *StartServerLogic) StartServer(in *openstack.StartServerReq) (*openstack
}
payload := strings.NewReader(string(reqByte))
openstackUrl := l.svcCtx.Config.OpenstackComputeUrl
statusCode, body, err := tool.HttpClientWithScreen(tool.PUT, openstackUrl+"/servers/"+in.ServerId+"/action", payload)
token := common.GetToken()
statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.POST, openstackUrl+"/servers/"+in.ServerId+"/action", payload, token)
if err != nil {
return nil, err
}

4
internal/logic/stopserverlogic.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 *StopServerLogic) StopServer(in *openstack.StopServerReq) (*openstack.St
}
payload := strings.NewReader(string(reqByte))
openstackUrl := l.svcCtx.Config.OpenstackComputeUrl
statusCode, body, err := tool.HttpClientWithScreen(tool.PUT, openstackUrl+"/servers/"+in.ServerId+"/action", payload)
token := common.GetToken()
statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.POST, openstackUrl+"/servers/"+in.ServerId+"/action", payload, token)
if err != nil {
return nil, err
}

4
internal/server/openstackserver.go
View File

@ -198,12 +198,12 @@ func (s *OpenstackServer) ListVolumeTypes(ctx context.Context, in *openstack.Lis
return l.ListVolumeTypes(in)
}
func (s *OpenstackServer) CreateVolumeTypes(ctx context.Context, in *openstack.CreateTypeReq) (*openstack.CreateTypeResp, error) {
func (s *OpenstackServer) CreateVolumeTypes(ctx context.Context, in *openstack.CreateVolumeTypeReq) (*openstack.CreateVolumeTypeResp, error) {
l := logic.NewCreateVolumeTypesLogic(ctx, s.svcCtx)
return l.CreateVolumeTypes(in)
}
func (s *OpenstackServer) DeleteVolumeTypes(ctx context.Context, in *openstack.DeleteTypeReq) (*openstack.DeleteTypeResp, error) {
func (s *OpenstackServer) DeleteVolumeTypes(ctx context.Context, in *openstack.DeleteVolumeTypeReq) (*openstack.DeleteVolumeTypeResp, error) {
l := logic.NewDeleteVolumeTypesLogic(ctx, s.svcCtx)
return l.DeleteVolumeTypes(in)
}

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

File diff suppressed because it is too large Load Diff

28
openstack/pcm-openstack_grpc.pb.go
View File

@ -101,8 +101,8 @@ type OpenstackClient interface {
DeleteVolume(ctx context.Context, in *DeleteVolumeReq, opts ...grpc.CallOption) (*DeleteVolumeResp, error)
UpdateVolume(ctx context.Context, in *UpdateVolumeReq, opts ...grpc.CallOption) (*UpdateVolumeResp, error)
ListVolumeTypes(ctx context.Context, in *ListVolumeTypesReq, opts ...grpc.CallOption) (*ListVolumeTypesResp, error)
CreateVolumeTypes(ctx context.Context, in *CreateTypeReq, opts ...grpc.CallOption) (*CreateTypeResp, error)
DeleteVolumeTypes(ctx context.Context, in *DeleteTypeReq, opts ...grpc.CallOption) (*DeleteTypeResp, error)
CreateVolumeTypes(ctx context.Context, in *CreateVolumeTypeReq, opts ...grpc.CallOption) (*CreateVolumeTypeResp, error)
DeleteVolumeTypes(ctx context.Context, in *DeleteVolumeTypeReq, opts ...grpc.CallOption) (*DeleteVolumeTypeResp, error)
}
type openstackClient struct {
@ -419,8 +419,8 @@ func (c *openstackClient) ListVolumeTypes(ctx context.Context, in *ListVolumeTyp
return out, nil
}
func (c *openstackClient) CreateVolumeTypes(ctx context.Context, in *CreateTypeReq, opts ...grpc.CallOption) (*CreateTypeResp, error) {
out := new(CreateTypeResp)
func (c *openstackClient) CreateVolumeTypes(ctx context.Context, in *CreateVolumeTypeReq, opts ...grpc.CallOption) (*CreateVolumeTypeResp, error) {
out := new(CreateVolumeTypeResp)
err := c.cc.Invoke(ctx, Openstack_CreateVolumeTypes_FullMethodName, in, out, opts...)
if err != nil {
return nil, err
@ -428,8 +428,8 @@ func (c *openstackClient) CreateVolumeTypes(ctx context.Context, in *CreateTypeR
return out, nil
}
func (c *openstackClient) DeleteVolumeTypes(ctx context.Context, in *DeleteTypeReq, opts ...grpc.CallOption) (*DeleteTypeResp, error) {
out := new(DeleteTypeResp)
func (c *openstackClient) DeleteVolumeTypes(ctx context.Context, in *DeleteVolumeTypeReq, opts ...grpc.CallOption) (*DeleteVolumeTypeResp, error) {
out := new(DeleteVolumeTypeResp)
err := c.cc.Invoke(ctx, Openstack_DeleteVolumeTypes_FullMethodName, in, out, opts...)
if err != nil {
return nil, err
@ -481,8 +481,8 @@ type OpenstackServer interface {
DeleteVolume(context.Context, *DeleteVolumeReq) (*DeleteVolumeResp, error)
UpdateVolume(context.Context, *UpdateVolumeReq) (*UpdateVolumeResp, error)
ListVolumeTypes(context.Context, *ListVolumeTypesReq) (*ListVolumeTypesResp, error)
CreateVolumeTypes(context.Context, *CreateTypeReq) (*CreateTypeResp, error)
DeleteVolumeTypes(context.Context, *DeleteTypeReq) (*DeleteTypeResp, error)
CreateVolumeTypes(context.Context, *CreateVolumeTypeReq) (*CreateVolumeTypeResp, error)
DeleteVolumeTypes(context.Context, *DeleteVolumeTypeReq) (*DeleteVolumeTypeResp, error)
mustEmbedUnimplementedOpenstackServer()
}
@ -592,10 +592,10 @@ func (UnimplementedOpenstackServer) UpdateVolume(context.Context, *UpdateVolumeR
func (UnimplementedOpenstackServer) ListVolumeTypes(context.Context, *ListVolumeTypesReq) (*ListVolumeTypesResp, error) {
return nil, status.Errorf(codes.Unimplemented, "method ListVolumeTypes not implemented")
}
func (UnimplementedOpenstackServer) CreateVolumeTypes(context.Context, *CreateTypeReq) (*CreateTypeResp, error) {
func (UnimplementedOpenstackServer) CreateVolumeTypes(context.Context, *CreateVolumeTypeReq) (*CreateVolumeTypeResp, error) {
return nil, status.Errorf(codes.Unimplemented, "method CreateVolumeTypes not implemented")
}
func (UnimplementedOpenstackServer) DeleteVolumeTypes(context.Context, *DeleteTypeReq) (*DeleteTypeResp, error) {
func (UnimplementedOpenstackServer) DeleteVolumeTypes(context.Context, *DeleteVolumeTypeReq) (*DeleteVolumeTypeResp, error) {
return nil, status.Errorf(codes.Unimplemented, "method DeleteVolumeTypes not implemented")
}
func (UnimplementedOpenstackServer) mustEmbedUnimplementedOpenstackServer() {}
@ -1224,7 +1224,7 @@ func _Openstack_ListVolumeTypes_Handler(srv interface{}, ctx context.Context, de
}
func _Openstack_CreateVolumeTypes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(CreateTypeReq)
in := new(CreateVolumeTypeReq)
if err := dec(in); err != nil {
return nil, err
}
@ -1236,13 +1236,13 @@ func _Openstack_CreateVolumeTypes_Handler(srv interface{}, ctx context.Context,
FullMethod: Openstack_CreateVolumeTypes_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(OpenstackServer).CreateVolumeTypes(ctx, req.(*CreateTypeReq))
return srv.(OpenstackServer).CreateVolumeTypes(ctx, req.(*CreateVolumeTypeReq))
}
return interceptor(ctx, in, info, handler)
}
func _Openstack_DeleteVolumeTypes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(DeleteTypeReq)
in := new(DeleteVolumeTypeReq)
if err := dec(in); err != nil {
return nil, err
}
@ -1254,7 +1254,7 @@ func _Openstack_DeleteVolumeTypes_Handler(srv interface{}, ctx context.Context,
FullMethod: Openstack_DeleteVolumeTypes_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(OpenstackServer).DeleteVolumeTypes(ctx, req.(*DeleteTypeReq))
return srv.(OpenstackServer).DeleteVolumeTypes(ctx, req.(*DeleteVolumeTypeReq))
}
return interceptor(ctx, in, info, handler)
}

24
openstackclient/openstack.go
View File

@ -57,12 +57,6 @@ type (
CreateServerResp_Server = openstack.CreateServerResp_Server
CreateSubnetReq = openstack.CreateSubnetReq
CreateSubnetResp = openstack.CreateSubnetResp
CreateTypeReq = openstack.CreateTypeReq
CreateTypeReq_ExtraSpecs = openstack.CreateTypeReq_ExtraSpecs
CreateTypeReq_VolumeType = openstack.CreateTypeReq_VolumeType
CreateTypeResp = openstack.CreateTypeResp
CreateTypeResp_ExtraSpecs = openstack.CreateTypeResp_ExtraSpecs
CreateTypeResp_VolumeType = openstack.CreateTypeResp_VolumeType
CreateVolumeReq = openstack.CreateVolumeReq
CreateVolumeReq_Metadata = openstack.CreateVolumeReq_Metadata
CreateVolumeReq_Volume = openstack.CreateVolumeReq_Volume
@ -71,6 +65,12 @@ type (
CreateVolumeResp_Links = openstack.CreateVolumeResp_Links
CreateVolumeResp_Metadata = openstack.CreateVolumeResp_Metadata
CreateVolumeResp_Volume = openstack.CreateVolumeResp_Volume
CreateVolumeTypeReq = openstack.CreateVolumeTypeReq
CreateVolumeTypeReq_ExtraSpecs = openstack.CreateVolumeTypeReq_ExtraSpecs
CreateVolumeTypeReq_VolumeType = openstack.CreateVolumeTypeReq_VolumeType
CreateVolumeTypeResp = openstack.CreateVolumeTypeResp
CreateVolumeTypeResp_ExtraSpecs = openstack.CreateVolumeTypeResp_ExtraSpecs
CreateVolumeTypeResp_VolumeType = openstack.CreateVolumeTypeResp_VolumeType
DeleteImageReq = openstack.DeleteImageReq
DeleteImageResp = openstack.DeleteImageResp
DeleteNetworkReq = openstack.DeleteNetworkReq
@ -79,10 +79,10 @@ type (
DeleteNodeResp = openstack.DeleteNodeResp
DeleteServerReq = openstack.DeleteServerReq
DeleteServerResp = openstack.DeleteServerResp
DeleteTypeReq = openstack.DeleteTypeReq
DeleteTypeResp = openstack.DeleteTypeResp
DeleteVolumeReq = openstack.DeleteVolumeReq
DeleteVolumeResp = openstack.DeleteVolumeResp
DeleteVolumeTypeReq = openstack.DeleteVolumeTypeReq
DeleteVolumeTypeResp = openstack.DeleteVolumeTypeResp
GetComputeLimitsReq = openstack.GetComputeLimitsReq
GetComputeLimitsResp = openstack.GetComputeLimitsResp
GetComputeLimitsResp_Absolute = openstack.GetComputeLimitsResp_Absolute
@ -258,8 +258,8 @@ type (
DeleteVolume(ctx context.Context, in *DeleteVolumeReq, opts ...grpc.CallOption) (*DeleteVolumeResp, error)
UpdateVolume(ctx context.Context, in *UpdateVolumeReq, opts ...grpc.CallOption) (*UpdateVolumeResp, error)
ListVolumeTypes(ctx context.Context, in *ListVolumeTypesReq, opts ...grpc.CallOption) (*ListVolumeTypesResp, error)
CreateVolumeTypes(ctx context.Context, in *CreateTypeReq, opts ...grpc.CallOption) (*CreateTypeResp, error)
DeleteVolumeTypes(ctx context.Context, in *DeleteTypeReq, opts ...grpc.CallOption) (*DeleteTypeResp, error)
CreateVolumeTypes(ctx context.Context, in *CreateVolumeTypeReq, opts ...grpc.CallOption) (*CreateVolumeTypeResp, error)
DeleteVolumeTypes(ctx context.Context, in *DeleteVolumeTypeReq, opts ...grpc.CallOption) (*DeleteVolumeTypeResp, error)
}
defaultOpenstack struct {
@ -449,12 +449,12 @@ func (m *defaultOpenstack) ListVolumeTypes(ctx context.Context, in *ListVolumeTy
return client.ListVolumeTypes(ctx, in, opts...)
}
func (m *defaultOpenstack) CreateVolumeTypes(ctx context.Context, in *CreateTypeReq, opts ...grpc.CallOption) (*CreateTypeResp, error) {
func (m *defaultOpenstack) CreateVolumeTypes(ctx context.Context, in *CreateVolumeTypeReq, opts ...grpc.CallOption) (*CreateVolumeTypeResp, error) {
client := openstack.NewOpenstackClient(m.cli.Conn())
return client.CreateVolumeTypes(ctx, in, opts...)
}
func (m *defaultOpenstack) DeleteVolumeTypes(ctx context.Context, in *DeleteTypeReq, opts ...grpc.CallOption) (*DeleteTypeResp, error) {
func (m *defaultOpenstack) DeleteVolumeTypes(ctx context.Context, in *DeleteVolumeTypeReq, opts ...grpc.CallOption) (*DeleteVolumeTypeResp, error) {
client := openstack.NewOpenstackClient(m.cli.Conn())
return client.DeleteVolumeTypes(ctx, in, opts...)
}

43
pb/pcm-openstack.proto
View File

@ -401,7 +401,7 @@ message DeleteServerResp{
//Req
message GetServersDetailedByIdReq{
string server_id = 1;
string server_id = 1; // @gotags: copier:"ServerId"
}
@ -778,7 +778,7 @@ message Segment{
message ShowNetworkDetailsResp{
Network network = 1; //一个网络对象
bool admin_state_up = 2; //网络的管理状态，是向上（true）还是向下（false）
/* bool admin_state_up = 2; //网络的管理状态，是向上（true）还是向下（false）
repeated string availability_zone_hints = 3; //网络的可用性区域候选者
repeated string availability_zones = 4; //网络的可用性区域
string created_at = 5; //创建资源的时间
@ -806,7 +806,7 @@ message ShowNetworkDetailsResp{
bool vlan_transparent = 27; //指示网络的VLAN透明模式，为VLAN透明（true）或非VLAN透明（false）
string description = 28; //人类可读的资源描述
bool is_default = 29; //网络是否为默认池
repeated string tags = 30; //资源上的标记列表
repeated string tags = 30; //资源上的标记列表*/
string msg =31; // @gotags: copier:"Msg"
int32 code =32; // @gotags: copier:"Code"
string error_msg =33;// @gotags: copier:"ErrorMsg"
@ -817,7 +817,7 @@ message ShowNetworkDetailsResp{
/******************Update network Start*************************/
message UpdateNetworkReq{
string network_id = 1;
Network network = 2;
/* Network network = 2;
bool admin_state_up = 3;
string dns_domain = 4;
int64 mtu = 5;
@ -831,12 +831,15 @@ message UpdateNetworkReq{
repeated Segment segments = 13;
bool shared = 14;
string description = 15;
bool is_default = 16;
bool is_default = 16;*/
}
message UpdateNetworkResp{
Network network = 1;
bool admin_state_up = 2;
string msg =30; // @gotags: copier:"Msg"
int32 code =31; // @gotags: copier:"Code"
string error_msg =32;// @gotags: copier:"ErrorMsg"
/*bool admin_state_up = 2;
repeated string availability_zone_hints = 3;
repeated string availability_zones = 4;
string created_at = 5;
@ -863,10 +866,8 @@ message UpdateNetworkResp{
string updated_at = 26;
string description = 27;
bool is_default = 28;
repeated string tags = 29;
string msg =30; // @gotags: copier:"Msg"
int32 code =31; // @gotags: copier:"Code"
string error_msg =32;// @gotags: copier:"ErrorMsg"
repeated string tags = 29;*/
}
/******************Update network End*************************/
@ -1069,7 +1070,7 @@ message Allocation_pools {
/******************Bulk create networks Start*************************/
message BulkCreateNetworksReq{
repeated Network networks = 1;
bool admin_state_up = 2;
/* bool admin_state_up = 2;
string dns_domain = 3;
int64 mtu = 4;
string name = 5;
@ -1085,7 +1086,7 @@ message BulkCreateNetworksReq{
string tenant_id = 15;
bool vlan_transparent = 16;
string description = 17;
repeated string availability_zone_hints = 18;
repeated string availability_zone_hints = 18;*/
}
message BulkCreateNetworksResp{
@ -1221,9 +1222,9 @@ message CreateNodeReq {
message Network_data{
}
int32 code = 35; // @gotags: copier:"Code"
/* int32 code = 35; // @gotags: copier:"Code"
string msg = 36; // @gotags: copier:"Msg"
string error_msg =37;// @gotags: copier:"ErrorMsg"
string error_msg =37;// @gotags: copier:"ErrorMsg"*/
}
message CreateNodeResp {
@ -1847,7 +1848,7 @@ message UpdateVolumeReq{
Volume volume = 3;
}
message UpdateVolumeResp{
message UpdateVolumeResp{
message Links {
string href = 1;
string rel = 2;
@ -1933,7 +1934,7 @@ message ListVolumeTypesResp{
string msg = 3; // @gotags: copier:"Msg"
string error_msg =4;// @gotags: copier:"ErrorMsg"
}
message CreateTypeReq{
message CreateVolumeTypeReq{
message Extra_specs {
string capabilities = 1;
}
@ -1948,7 +1949,7 @@ message CreateTypeReq{
Volume_type volume_type = 2;
}
message CreateTypeResp{
message CreateVolumeTypeResp{
message Extra_specs {
string capabilities = 1; // @gotags: copier:"Capabilities"
}
@ -1967,12 +1968,12 @@ message CreateTypeResp{
string msg = 3; // @gotags: copier:"Msg"
string error_msg =4;// @gotags: copier:"ErrorMsg"
}
message DeleteTypeReq{
message DeleteVolumeTypeReq{
string project_id =1;
string volume_type_id =2;
}
message DeleteTypeResp{
message DeleteVolumeTypeResp{
int32 code = 1; // @gotags: copier:"Code"
string msg = 2; // @gotags: copier:"Msg"
string error_msg =3;// @gotags: copier:"ErrorMsg"
@ -2028,7 +2029,7 @@ service Openstack {
rpc DeleteVolume(DeleteVolumeReq) returns (DeleteVolumeResp);
rpc UpdateVolume(UpdateVolumeReq) returns (UpdateVolumeResp);
rpc ListVolumeTypes(ListVolumeTypesReq) returns (ListVolumeTypesResp);
rpc CreateVolumeTypes(CreateTypeReq) returns (CreateTypeResp);
rpc DeleteVolumeTypes(DeleteTypeReq) returns (DeleteTypeResp);
rpc CreateVolumeTypes(CreateVolumeTypeReq) returns (CreateVolumeTypeResp);
rpc DeleteVolumeTypes(DeleteVolumeTypeReq) returns (DeleteVolumeTypeResp);
}