floraachy
/
pcm-coordinator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:修改updateserver字段 

Former-commit-id: de14cd03fbdf746698f90644e7373368fb7d81bb
This commit is contained in:
qiwang 2023-10-23 16:42:32 +08:00
parent ae89886da2
commit 2b16ae57a6
6 changed files with 120 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
api/desc/pcm.api
View File

@ -250,44 +250,20 @@ service pcm {
group : vm group : vm
) )
service pcm { service pcm {
/*概览*/
@handler GetComputeLimitsHandler @handler GetComputeLimitsHandler
get /vm/getComputeLimits (GetComputeLimitsReq) returns (GetComputeLimitsResp) get /vm/getComputeLimits (GetComputeLimitsReq) returns (GetComputeLimitsResp)
@handler GetVolumeLimitsHandler @handler GetVolumeLimitsHandler
get /vm/getVolumeLimits (GetVolumeLimitsReq) returns (GetVolumeLimitsResp) get /vm/getVolumeLimits (GetVolumeLimitsReq) returns (GetVolumeLimitsResp)
/*实例*/
@handler ListServerHandler @handler ListServerHandler
get /vm/listServer (ListServersReq) returns (ListServersResp) get /vm/listServer (ListServersReq) returns (ListServersResp)
@handler ListServersDetailedHandler @handler ListServersDetailedHandler
get /vm/listServersDetailed (ListServersDetailedReq) returns (ListServersDetailedResp) get /vm/listServersDetailed (ListServersDetailedReq) returns (ListServersDetailedResp)
@handler DeleteServerHandler @handler DeleteServerHandler
delete /vm/deleteServer (DeleteServerReq) returns (DeleteServerResp) delete /vm/deleteServer (DeleteServerReq) returns (DeleteServerResp)
@handler ListImagesHandler
get /vm/listImages (ListImagesReq) returns (ListImagesResp)
@handler DeleteImageHandler
delete /vm/deleteImage (DeleteImageReq) returns (DeleteImageResp)
@handler ListNetworksHandler
get /vm/listNetworks (ListNetworksReq) returns (ListNetworksResp)
@handler DeleteNetworkHandler
delete /vm/deleteNetwork (DeleteNetworkReq) returns (DeleteNetworkResp)
@handler CreateNetworkHandler
post /vm/createNetwork (CreateNetworkReq) returns (CreateNetworkResp)
@handler CreateSubnetHandler
post /vm/createSubnet (CreateSubnetReq) returns (CreateSubnetResp)
@handler ListVolumesDetailHandler
get /vm/listVolumesDetail (ListVolumesDetailReq) returns (ListVolumesDetailResp)
@handler DeleteVolumeHandler
delete /vm/deleteVolume (DeleteVolumeReq) returns (DeleteVolumeResp)
@handler CreateVolumeHandler
post /vm/createVolume (CreateVolumeReq) returns (CreateVolumeResp)
@handler ListFlavorsDetailHandler
get /vm/listFlavorsDetail (ListFlavorsDetailReq) returns (ListFlavorsDetailResp)
@handler CreateServerHandler @handler CreateServerHandler
post /vm/createServer (CreateServerReq) returns (CreateServerResp) post /vm/createServer (CreateServerReq) returns (CreateServerResp)
@handler ListVolumeTypesHandler
get /vm/listVolumeTypes (ListVolumeTypesReq) returns (ListVolumeTypesResp)
@handler CreateImageHandler
post /vm/createImage (CreateImageReq) returns (CreateImageResp)
@handler UploadImageHandler
put /vm/uploadImage (UploadOsImageReq) returns (UploadOsImageResp)
@handler GetServersDetailedByIdHandler @handler GetServersDetailedByIdHandler
get /vm/getServersDetailedById (GetServersDetailedByIdReq) returns (GetServersDetailedByIdResp) get /vm/getServersDetailedById (GetServersDetailedByIdReq) returns (GetServersDetailedByIdResp)
@handler UpdateServerHandler @handler UpdateServerHandler
@ -300,6 +276,25 @@ service pcm {
post /vm/rebootServer (RebootServerReq) returns (RebootServerResp) post /vm/rebootServer (RebootServerReq) returns (RebootServerResp)
@handler PauseServerHandler @handler PauseServerHandler
post /vm/pauseServer (PauseServerReq) returns (PauseServerResp) post /vm/pauseServer (PauseServerReq) returns (PauseServerResp)
/*镜像*/
@handler ListImagesHandler
get /vm/listImages (ListImagesReq) returns (ListImagesResp)
@handler DeleteImageHandler
delete /vm/deleteImage (DeleteImageReq) returns (DeleteImageResp)
@handler CreateImageHandler
post /vm/createImage (CreateImageReq) returns (CreateImageResp)
@handler UploadImageHandler
put /vm/uploadImage (UploadOsImageReq) returns (UploadOsImageResp)
/*网络*/
@handler ListNetworksHandler
get /vm/listNetworks (ListNetworksReq) returns (ListNetworksResp)
@handler DeleteNetworkHandler
delete /vm/deleteNetwork (DeleteNetworkReq) returns (DeleteNetworkResp)
@handler CreateNetworkHandler
post /vm/createNetwork (CreateNetworkReq) returns (CreateNetworkResp)
@handler CreateSubnetHandler
post /vm/createSubnet (CreateSubnetReq) returns (CreateSubnetResp)
@handler ShowNetworkDetailsHandler @handler ShowNetworkDetailsHandler
get /vm/showNetworkDetails (ShowNetworkDetailsReq) returns (ShowNetworkDetailsResp) get /vm/showNetworkDetails (ShowNetworkDetailsReq) returns (ShowNetworkDetailsResp)
@handler UpdateNetworkHandler @handler UpdateNetworkHandler
@ -307,7 +302,17 @@ service pcm {
@handler BulkCreateNetworksHandler @handler BulkCreateNetworksHandler
post /vm/bulkCreateNetworks (BulkCreateNetworksReq) returns (BulkCreateNetworksResp) post /vm/bulkCreateNetworks (BulkCreateNetworksReq) returns (BulkCreateNetworksResp)
//volumn 卷 /*卷*/
@handler ListVolumesDetailHandler
get /vm/listVolumesDetail (ListVolumesDetailReq) returns (ListVolumesDetailResp)
@handler DeleteVolumeHandler
delete /vm/deleteVolume (DeleteVolumeReq) returns (DeleteVolumeResp)
@handler CreateVolumeHandler
post /vm/createVolume (CreateVolumeReq) returns (CreateVolumeResp)
@handler ListFlavorsDetailHandler
get /vm/listFlavorsDetail (ListFlavorsDetailReq) returns (ListFlavorsDetailResp)
@handler ListVolumeTypesHandler
get /vm/listVolumeTypes (ListVolumeTypesReq) returns (ListVolumeTypesResp)
@handler UpdateVolumeHandler @handler UpdateVolumeHandler
put /vm/updateVolume (UpdateVolumeReq) returns (UpdateVolumeResp) put /vm/updateVolume (UpdateVolumeReq) returns (UpdateVolumeResp)
@handler CreateVolumeTypesHandler @handler CreateVolumeTypesHandler

15
api/desc/vm/pcm-vm.api
View File

@ -220,7 +220,10 @@ type(
type( type(
UpdateServerReq{ UpdateServerReq{
ServerId string `json:"server_id" copier:"ServerId"` ServerId string `form:"server_id" copier:"ServerId"`
ServerUpdate ServerUpdate `json:"server_update" copier:"ServerUpdate"`
}
ServerUpdate{
Server Server `json:"server" copier:"Server"` Server Server `json:"server" copier:"Server"`
} }
UpdateServerResp{ UpdateServerResp{
@ -312,12 +315,12 @@ type (
ErrorMsg string `json:"errorMsg,omitempty"` ErrorMsg string `json:"errorMsg,omitempty"`
} }
Server { Server {
Name string `json:"name" copier:"Name"` Name string `json:"name,optional" copier:"Name"`
FlavorRef string `json:"flavorRef" copier:"FlavorRef"` FlavorRef string `json:"flavorRef,optional" copier:"FlavorRef"`
ImageRef string `json:"imageRef" copier:"ImageRef"` ImageRef string `json:"imageRef,optional" copier:"ImageRef"`
Networks []CreNetwork `json:"networks" copier:"Networks"` Networks []CreNetwork `json:"networks,optional" copier:"Networks"`
//AdminPass string `json:"adminPass" copier:"AdminPass"` //AdminPass string `json:"adminPass" copier:"AdminPass"`
BlockDeviceMappingV2 []Block_device_mapping_v2 `json:"block_device_mapping_v2" copier:"BlockDeviceMappingV2"` BlockDeviceMappingV2 []Block_device_mapping_v2 `json:"block_device_mapping_v2,optional" copier:"BlockDeviceMappingV2"`
} }
CreNetwork { CreNetwork {
Uuid string `json:"uuid" copier:"Uuid"` Uuid string `json:"uuid" copier:"Uuid"`

130
api/internal/handler/routes.go
View File

@ -391,76 +391,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
Path: "/vm/deleteServer", Path: "/vm/deleteServer",
Handler: vm.DeleteServerHandler(serverCtx), Handler: vm.DeleteServerHandler(serverCtx),
}, },
{
Method: http.MethodGet,
Path: "/vm/listImages",
Handler: vm.ListImagesHandler(serverCtx),
},
{
Method: http.MethodDelete,
Path: "/vm/deleteImage",
Handler: vm.DeleteImageHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/vm/listNetworks",
Handler: vm.ListNetworksHandler(serverCtx),
},
{
Method: http.MethodDelete,
Path: "/vm/deleteNetwork",
Handler: vm.DeleteNetworkHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/createNetwork",
Handler: vm.CreateNetworkHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/createSubnet",
Handler: vm.CreateSubnetHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/vm/listVolumesDetail",
Handler: vm.ListVolumesDetailHandler(serverCtx),
},
{
Method: http.MethodDelete,
Path: "/vm/deleteVolume",
Handler: vm.DeleteVolumeHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/createVolume",
Handler: vm.CreateVolumeHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/vm/listFlavorsDetail",
Handler: vm.ListFlavorsDetailHandler(serverCtx),
},
{ {
Method: http.MethodPost, Method: http.MethodPost,
Path: "/vm/createServer", Path: "/vm/createServer",
Handler: vm.CreateServerHandler(serverCtx), Handler: vm.CreateServerHandler(serverCtx),
}, },
{
Method: http.MethodGet,
Path: "/vm/listVolumeTypes",
Handler: vm.ListVolumeTypesHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/createImage",
Handler: vm.CreateImageHandler(serverCtx),
},
{
Method: http.MethodPut,
Path: "/vm/uploadImage",
Handler: vm.UploadImageHandler(serverCtx),
},
{ {
Method: http.MethodGet, Method: http.MethodGet,
Path: "/vm/getServersDetailedById", Path: "/vm/getServersDetailedById",
@ -491,6 +426,46 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
Path: "/vm/pauseServer", Path: "/vm/pauseServer",
Handler: vm.PauseServerHandler(serverCtx), Handler: vm.PauseServerHandler(serverCtx),
}, },
{
Method: http.MethodGet,
Path: "/vm/listImages",
Handler: vm.ListImagesHandler(serverCtx),
},
{
Method: http.MethodDelete,
Path: "/vm/deleteImage",
Handler: vm.DeleteImageHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/createImage",
Handler: vm.CreateImageHandler(serverCtx),
},
{
Method: http.MethodPut,
Path: "/vm/uploadImage",
Handler: vm.UploadImageHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/vm/listNetworks",
Handler: vm.ListNetworksHandler(serverCtx),
},
{
Method: http.MethodDelete,
Path: "/vm/deleteNetwork",
Handler: vm.DeleteNetworkHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/createNetwork",
Handler: vm.CreateNetworkHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/createSubnet",
Handler: vm.CreateSubnetHandler(serverCtx),
},
{ {
Method: http.MethodGet, Method: http.MethodGet,
Path: "/vm/showNetworkDetails", Path: "/vm/showNetworkDetails",
@ -506,6 +481,31 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
Path: "/vm/bulkCreateNetworks", Path: "/vm/bulkCreateNetworks",
Handler: vm.BulkCreateNetworksHandler(serverCtx), Handler: vm.BulkCreateNetworksHandler(serverCtx),
}, },
{
Method: http.MethodGet,
Path: "/vm/listVolumesDetail",
Handler: vm.ListVolumesDetailHandler(serverCtx),
},
{
Method: http.MethodDelete,
Path: "/vm/deleteVolume",
Handler: vm.DeleteVolumeHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/createVolume",
Handler: vm.CreateVolumeHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/vm/listFlavorsDetail",
Handler: vm.ListFlavorsDetailHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/vm/listVolumeTypes",
Handler: vm.ListVolumeTypesHandler(serverCtx),
},
{ {
Method: http.MethodPut, Method: http.MethodPut,
Path: "/vm/updateVolume", Path: "/vm/updateVolume",

18
api/internal/types/types.go
View File

@ -2383,8 +2383,12 @@ type ExtraSpecs struct {
} }
type UpdateServerReq struct { type UpdateServerReq struct {
ServerId string `json:"server_id" copier:"ServerId"` ServerId string `form:"server_id" copier:"ServerId"`
Server Server `json:"server" copier:"Server"` ServerUpdate ServerUpdate `json:"server_update" copier:"ServerUpdate"`
}
type ServerUpdate struct {
Server Server `json:"server" copier:"Server"`
} }
type UpdateServerResp struct { type UpdateServerResp struct {
@ -2476,11 +2480,11 @@ type CreateServerResp struct {
} }
type Server struct { type Server struct {
Name string `json:"name" copier:"Name"` Name string `json:"name,optional" copier:"Name"`
FlavorRef string `json:"flavorRef" copier:"FlavorRef"` FlavorRef string `json:"flavorRef,optional" copier:"FlavorRef"`
ImageRef string `json:"imageRef" copier:"ImageRef"` ImageRef string `json:"imageRef,optional" copier:"ImageRef"`
Networks []CreNetwork `json:"networks" copier:"Networks"` Networks []CreNetwork `json:"networks,optional" copier:"Networks"`
BlockDeviceMappingV2 []Block_device_mapping_v2 `json:"block_device_mapping_v2" copier:"BlockDeviceMappingV2"` BlockDeviceMappingV2 []Block_device_mapping_v2 `json:"block_device_mapping_v2,optional" copier:"BlockDeviceMappingV2"`
} }
type CreNetwork struct { type CreNetwork struct {

2
go.mod
View File

@ -25,7 +25,7 @@ require (
gitlink.org.cn/jcce-pcm/pcm-participant-kubernetes v0.0.0-20230830120334-bf6d99c715ef gitlink.org.cn/jcce-pcm/pcm-participant-kubernetes v0.0.0-20230830120334-bf6d99c715ef
gitlink.org.cn/jcce-pcm/pcm-participant-modelarts v0.0.0-20230719015658-08a29549d86a gitlink.org.cn/jcce-pcm/pcm-participant-modelarts v0.0.0-20230719015658-08a29549d86a
gitlink.org.cn/jcce-pcm/pcm-participant-octopus v0.0.0-20231011071802-c6a7637b74e4 gitlink.org.cn/jcce-pcm/pcm-participant-octopus v0.0.0-20231011071802-c6a7637b74e4
gitlink.org.cn/jcce-pcm/pcm-participant-openstack v0.0.0-20231020021631-1b58377b8276 gitlink.org.cn/jcce-pcm/pcm-participant-openstack v0.0.0-20231023073226-621f06a5f10c
gitlink.org.cn/jcce-pcm/pcm-participant-slurm v0.0.0-20230714030125-a52fa198ddf4 gitlink.org.cn/jcce-pcm/pcm-participant-slurm v0.0.0-20230714030125-a52fa198ddf4
gitlink.org.cn/jcce-pcm/utils v0.0.2 gitlink.org.cn/jcce-pcm/utils v0.0.2
go.opentelemetry.io/otel/trace v1.14.0 go.opentelemetry.io/otel/trace v1.14.0

4
go.sum
View File

@ -1041,8 +1041,8 @@ gitlink.org.cn/jcce-pcm/pcm-participant-modelarts v0.0.0-20230719015658-08a29549
gitlink.org.cn/jcce-pcm/pcm-participant-modelarts v0.0.0-20230719015658-08a29549d86a/go.mod h1:BhOgwM1LC+BD46DjTaQyYQVZs1CikwI5Pl/6qzKUexc= gitlink.org.cn/jcce-pcm/pcm-participant-modelarts v0.0.0-20230719015658-08a29549d86a/go.mod h1:BhOgwM1LC+BD46DjTaQyYQVZs1CikwI5Pl/6qzKUexc=
gitlink.org.cn/jcce-pcm/pcm-participant-octopus v0.0.0-20231011071802-c6a7637b74e4 h1:iv78VZ5+j6/VNkEyD/GSmTJ96rpxzpKDUNknAoXsAmg= gitlink.org.cn/jcce-pcm/pcm-participant-octopus v0.0.0-20231011071802-c6a7637b74e4 h1:iv78VZ5+j6/VNkEyD/GSmTJ96rpxzpKDUNknAoXsAmg=
gitlink.org.cn/jcce-pcm/pcm-participant-octopus v0.0.0-20231011071802-c6a7637b74e4/go.mod h1:uyvpVqG1jHDXX+ubXI0RBwnWXzVykD/mliqGQIDvRoo= gitlink.org.cn/jcce-pcm/pcm-participant-octopus v0.0.0-20231011071802-c6a7637b74e4/go.mod h1:uyvpVqG1jHDXX+ubXI0RBwnWXzVykD/mliqGQIDvRoo=
gitlink.org.cn/jcce-pcm/pcm-participant-openstack v0.0.0-20231020021631-1b58377b8276 h1:bUzvkln6sbPpcGNCnj3iK8/NMCd1iyPjMWLXtxr0Sk0= gitlink.org.cn/jcce-pcm/pcm-participant-openstack v0.0.0-20231023073226-621f06a5f10c h1:1w6KnIUnXYVzr2r/I67HFHH/3SbyjuTznOfwUt7dbHc=
gitlink.org.cn/jcce-pcm/pcm-participant-openstack v0.0.0-20231020021631-1b58377b8276/go.mod h1:zFMf8Rx4jHD9MmFHqVADPa6m9aTQPrAA4om6jjYvJOk= gitlink.org.cn/jcce-pcm/pcm-participant-openstack v0.0.0-20231023073226-621f06a5f10c/go.mod h1:m75SVNfNa1TUBlQtBfR0CeETQ0ez2RIUqlSCn1Mb/js=
gitlink.org.cn/jcce-pcm/pcm-participant-slurm v0.0.0-20230714030125-a52fa198ddf4 h1:r2hBP5G/bbkPpDTPk3ENnQxD82vkoYMSeNHYhNAVRX4= gitlink.org.cn/jcce-pcm/pcm-participant-slurm v0.0.0-20230714030125-a52fa198ddf4 h1:r2hBP5G/bbkPpDTPk3ENnQxD82vkoYMSeNHYhNAVRX4=
gitlink.org.cn/jcce-pcm/pcm-participant-slurm v0.0.0-20230714030125-a52fa198ddf4/go.mod h1:zRdVJiv4r4jgBli2xpYGmV0n6Gmz8fkZ5pJaNK2MbTU= gitlink.org.cn/jcce-pcm/pcm-participant-slurm v0.0.0-20230714030125-a52fa198ddf4/go.mod h1:zRdVJiv4r4jgBli2xpYGmV0n6Gmz8fkZ5pJaNK2MbTU=
gitlink.org.cn/jcce-pcm/utils v0.0.2 h1:Stif8W9C9TOCS2hw4g+OlOywDrsVYNrkiyKfBrWkT0w= gitlink.org.cn/jcce-pcm/utils v0.0.2 h1:Stif8W9C9TOCS2hw4g+OlOywDrsVYNrkiyKfBrWkT0w=