From 81b5676559e45c2e575d1be9a4406871df948f02 Mon Sep 17 00:00:00 2001 From: qiwang <1364512070@qq.com> Date: Mon, 1 Apr 2024 12:25:51 +0800 Subject: [PATCH] feat:modify listserver interface Former-commit-id: 6e81bf49976c4aaa87228857c7e7c21f980d4c25 --- api/desc/core/pcm-core.api | 4 ++++ api/desc/vm/pcm-vm.api | 21 ++++++++++++--------- api/internal/types/types.go | 25 ++++++++++++++++--------- go.mod | 8 ++++---- go.sum | 8 ++++++++ 5 files changed, 44 insertions(+), 22 deletions(-) diff --git a/api/desc/core/pcm-core.api b/api/desc/core/pcm-core.api index 07987124..c3a938c0 100644 --- a/api/desc/core/pcm-core.api +++ b/api/desc/core/pcm-core.api @@ -157,7 +157,11 @@ type ( Block_device_mapping_v2Commit { uuid string `json:"uuid,optional"` } + commitVmTaskResp { + VmTask []VmTask `json:"vmTask" copier:"VmTask"` + } + VmTask{ Id string `json:"id" copier:"Id"` Links []VmLinks `json:"links" copier:"Links"` OSDCFDiskConfig string `json:"OS_DCF_diskConfig" copier:"OSDCFDiskConfig"` diff --git a/api/desc/vm/pcm-vm.api b/api/desc/vm/pcm-vm.api index 9822af39..b632439e 100644 --- a/api/desc/vm/pcm-vm.api +++ b/api/desc/vm/pcm-vm.api @@ -122,15 +122,18 @@ type ( ServersDetailed { //created string `json:"created" copier:"created"` - id string `json:"id" copier:"id"` - key_name string `json:"key_name" copier:"key_name"` - locked bool `json:"locked" copier:"locked"` - name string `json:"name" copier:"name"` - progress uint32 `json:"progress" copier:"progress"` - status string `json:"status" copier:"status"` - tenant_id string `json:"tenant_id" copier:"tenant_id"` - updated string `json:"updated" copier:"updated"` - user_id string `json:"user_id" copier:"user_id"` + Id string `json:"Id" copier:"Id"` + Name string `json:"Name" copier:"Name"` + OSTaskState uint32 `json:"OSTaskState" copier:"OSTaskState"` + Status string `json:"Status" copier:"Status"` + VmState string `json:"VmState" copier:"VmState"` + OS_EXT_SRV_ATTR_Instance_Name string `json:"OS_EXT_SRV_ATTR_Instance_Name" copier:"OS_EXT_SRV_ATTR_Instance_Name"` + Created string `json:"Created" copier:"Created"` + HostId string `json:"HostId" copier:"HostId"` + Ip string `json:"Ip" copier:"Ip"` + Image string `json:"Image" copier:"Image"` + Updated string `json:"Updated" copier:"Updated"` + Flavor string `json:"Flavor" copier:"Flavor"` } ) diff --git a/api/internal/types/types.go b/api/internal/types/types.go index 88271634..d691b37c 100644 --- a/api/internal/types/types.go +++ b/api/internal/types/types.go @@ -147,6 +147,10 @@ type Block_device_mapping_v2Commit struct { } type CommitVmTaskResp struct { + VmTask []VmTask `json:"vmTask" copier:"VmTask"` +} + +type VmTask struct { Id string `json:"id" copier:"Id"` Links []VmLinks `json:"links" copier:"Links"` OSDCFDiskConfig string `json:"OS_DCF_diskConfig" copier:"OSDCFDiskConfig"` @@ -2707,15 +2711,18 @@ type ListServersDetailedResp struct { } type ServersDetailed struct { - Id string `json:"id" copier:"id"` - Key_name string `json:"key_name" copier:"key_name"` - Locked bool `json:"locked" copier:"locked"` - Name string `json:"name" copier:"name"` - Progress uint32 `json:"progress" copier:"progress"` - Status string `json:"status" copier:"status"` - Tenant_id string `json:"tenant_id" copier:"tenant_id"` - Updated string `json:"updated" copier:"updated"` - User_id string `json:"user_id" copier:"user_id"` + Id string `json:"Id" copier:"Id"` + Name string `json:"Name" copier:"Name"` + OSTaskState uint32 `json:"OSTaskState" copier:"OSTaskState"` + Status string `json:"Status" copier:"Status"` + VmState string `json:"VmState" copier:"VmState"` + OS_EXT_SRV_ATTR_Instance_Name string `json:"OS_EXT_SRV_ATTR_Instance_Name" copier:"OS_EXT_SRV_ATTR_Instance_Name"` + Created string `json:"Created" copier:"Created"` + HostId string `json:"HostId" copier:"HostId"` + Ip string `json:"Ip" copier:"Ip"` + Image string `json:"Image" copier:"Image"` + Updated string `json:"Updated" copier:"Updated"` + Flavor string `json:"Flavor" copier:"Flavor"` } type GetServersDetailedByIdReq struct { diff --git a/go.mod b/go.mod index d50b93a2..50582b8b 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/rs/zerolog v1.28.0 github.com/zeromicro/go-zero v1.6.3 gitlink.org.cn/JointCloud/pcm-kubernetes v0.0.0-20240301071143-347480abff2c - gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240328020739-cbdd8f5b226b + gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240401022404-2f1425735f0d gitlink.org.cn/JointCloud/pcm-slurm v0.0.0-20240301080743-8b94bbaf57f5 gitlink.org.cn/jcce-pcm/pcm-ac v0.0.0-20240301085553-f6ad88fa357a gitlink.org.cn/jcce-pcm/pcm-participant-ceph v0.0.0-20230904090036-24fc730ec87d @@ -136,9 +136,9 @@ require ( github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/xhit/go-str2duration/v2 v2.1.0 // indirect github.com/xlab/treeprint v1.2.0 // indirect - go.etcd.io/etcd/api/v3 v3.5.12 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect - go.etcd.io/etcd/client/v3 v3.5.12 // indirect + go.etcd.io/etcd/api/v3 v3.5.13 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.5.13 // indirect + go.etcd.io/etcd/client/v3 v3.5.13 // indirect go.mongodb.org/mongo-driver v1.13.1 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect diff --git a/go.sum b/go.sum index 948fc031..419d417e 100644 --- a/go.sum +++ b/go.sum @@ -1105,6 +1105,8 @@ gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240327072142-008a85e3c315 h1:km gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240327072142-008a85e3c315/go.mod h1:i2rrbMQ+Fve345BY9Heh4MUqVTAimZQElQhzzRee5B8= gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240328020739-cbdd8f5b226b h1:suRANMHQPhKKmgdJOZcbFYDJ0NUQkUGgVvMKxw75BQI= gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240328020739-cbdd8f5b226b/go.mod h1:i2rrbMQ+Fve345BY9Heh4MUqVTAimZQElQhzzRee5B8= +gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240401022404-2f1425735f0d h1:ZX/Kg8eKdaAfDsTd+Y+TrJsUvxp/DpbWUp+Ij4CtR+s= +gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240401022404-2f1425735f0d/go.mod h1:i2rrbMQ+Fve345BY9Heh4MUqVTAimZQElQhzzRee5B8= gitlink.org.cn/JointCloud/pcm-slurm v0.0.0-20240301080743-8b94bbaf57f5 h1:+/5vnzkJBfMRnya1NrhOzlroUtRa5ePiYbPKlHLoLV0= gitlink.org.cn/JointCloud/pcm-slurm v0.0.0-20240301080743-8b94bbaf57f5/go.mod h1:97AlUXN13g9UN3+9/DzCHpeoU5sbdyv0IQuTEHNexzQ= gitlink.org.cn/jcce-pcm/pcm-ac v0.0.0-20240301085553-f6ad88fa357a h1:fY1KmyZ6O7wVBvgt2HB+C9e1DncJdk/Wkv8m5Qz7abw= @@ -1118,12 +1120,18 @@ gitlink.org.cn/jcce-pcm/pcm-participant-octopus v0.0.0-20240222124813-e275cfa342 go.etcd.io/etcd/api/v3 v3.5.7/go.mod h1:9qew1gCdDDLu+VwmeG+iFpL+QlpHTo7iubavdVDgCAA= go.etcd.io/etcd/api/v3 v3.5.12 h1:W4sw5ZoU2Juc9gBWuLk5U6fHfNVyY1WC5g9uiXZio/c= go.etcd.io/etcd/api/v3 v3.5.12/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4= +go.etcd.io/etcd/api/v3 v3.5.13 h1:8WXU2/NBge6AUF1K1gOexB6e07NgsN1hXK0rSTtgSp4= +go.etcd.io/etcd/api/v3 v3.5.13/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c= go.etcd.io/etcd/client/pkg/v3 v3.5.7/go.mod h1:o0Abi1MK86iad3YrWhgUsbGx1pmTS+hrORWc2CamuhY= go.etcd.io/etcd/client/pkg/v3 v3.5.12 h1:EYDL6pWwyOsylrQyLp2w+HkQ46ATiOvoEdMarindU2A= go.etcd.io/etcd/client/pkg/v3 v3.5.12/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4= +go.etcd.io/etcd/client/pkg/v3 v3.5.13 h1:RVZSAnWWWiI5IrYAXjQorajncORbS0zI48LQlE2kQWg= +go.etcd.io/etcd/client/pkg/v3 v3.5.13/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= go.etcd.io/etcd/client/v3 v3.5.7/go.mod h1:sOWmj9DZUMyAngS7QQwCyAXXAL6WhgTOPLNS/NabQgw= go.etcd.io/etcd/client/v3 v3.5.12 h1:v5lCPXn1pf1Uu3M4laUE2hp/geOTc5uPcYYsNe1lDxg= go.etcd.io/etcd/client/v3 v3.5.12/go.mod h1:tSbBCakoWmmddL+BKVAJHa9km+O/E+bumDe9mSbPiqw= +go.etcd.io/etcd/client/v3 v3.5.13 h1:o0fHTNJLeO0MyVbc7I3fsCf6nrOqn5d+diSarKnB2js= +go.etcd.io/etcd/client/v3 v3.5.13/go.mod h1:cqiAeY8b5DEEcpxvgWKsbLIWNM/8Wy2xJSDMtioMcoI= go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= go.mongodb.org/mongo-driver v1.13.1 h1:YIc7HTYsKndGK4RFzJ3covLz1byri52x0IoMB0Pt/vk= go.mongodb.org/mongo-driver v1.13.1/go.mod h1:wcDf1JBCXy2mOW0bWHwO/IOYqdca1MPCwDtFu/Z9+eo=