fix:Add virtual machine interfaces

Former-commit-id: 42d9e804096fd76324642a8311f5f08416ea271c
This commit is contained in:
qiwang 2024-03-08 17:19:02 +08:00
parent d0aca6fff6
commit 71568bc063
3 changed files with 88 additions and 70 deletions

View File

@ -400,39 +400,39 @@ service pcm {
@doc "取消暂停虚拟机"
@handler UnpauseServerHandler
post /vm/UnpauseServer (UnpauseServerReq) returns (UnpauseServerResp)
post /vm/unpauseServer (UnpauseServerReq) returns (UnpauseServerResp)
@doc "调整大小"
@handler ResizeServerHandler
post /vm/ResizeServer (ResizeServerReq) returns (ResizeServerResp)
post /vm/resizeServer (ResizeServerReq) returns (ResizeServerResp)
@doc "迁移"
@handler MigrateServerHandler
post /vm/MigrateServer (MigrateServerReq) returns (MigrateServerResp)
post /vm/migrateServer (MigrateServerReq) returns (MigrateServerResp)
@doc "搁置"
@handler ShelveServerHandler
post /vm/ShelveServer (ShelveServerReq) returns (ShelveServerResp)
post /vm/shelveServer (ShelveServerReq) returns (ShelveServerResp)
@doc "设置密码"
@handler ChangeAdministrativePasswordHandler
post /vm/ChangeAdministrativePassword (ChangeAdministrativePasswordReq) returns (ChangeAdministrativePasswordResp)
post /vm/changeAdministrativePassword (ChangeAdministrativePasswordReq) returns (ChangeAdministrativePasswordResp)
@doc "救援"
@handler RescueServerHandler
post /vm/RescueServer (RescueServerReq) returns (RescueServerResp)
post /vm/rescueServer (RescueServerReq) returns (RescueServerResp)
@doc "取消救援"
@handler UnRescueHandler
post /vm/UnRescueServer (UnRescueServerReq) returns (UnRescueServerResp)
post /vm/unRescueServer (UnRescueServerReq) returns (UnRescueServerResp)
@doc "中止"
@handler SuspendServerHandler
post /vm/SuspendServer (SuspendServerReq) returns (SuspendServerResp)
post /vm/suspendServer (SuspendServerReq) returns (SuspendServerResp)
@doc "将安全组添加到服务器"
@handler AddSecurityGroupToServerHandler
post /vm/AddSecurityGroupToServer (AddSecurityGroupToServerReq) returns (AddSecurityGroupToServerResp)
post /vm/addSecurityGroupToServer (AddSecurityGroupToServerReq) returns (AddSecurityGroupToServerResp)
@doc "从服务器中删除安全"
@handler removeSecurityGroupHandler
@ -440,11 +440,11 @@ service pcm {
@doc "创建规格"
@handler CreateFlavorHandler
post /vm/CreateFlavor (CreateFlavorReq) returns (CreateFlavorResp)
post /vm/createFlavor (CreateFlavorReq) returns (CreateFlavorResp)
@doc "创建规格"
@handler DeleteFlavorHandler
post /vm/DeleteFlavor (DeleteFlavorReq) returns (DeleteFlavorResp)
post /vm/deleteFlavor (DeleteFlavorReq) returns (DeleteFlavorResp)
@doc "查询镜像列表"
@handler ListImagesHandler
@ -568,7 +568,7 @@ service pcm {
@doc "查询浮动ip列表"
@handler ListFloatingIPsHandler
get /vm/ListFloatingIPs (ListFloatingIPsReq) returns (ListFloatingIPsResp)
get /vm/listFloatingIPs (ListFloatingIPsReq) returns (ListFloatingIPsResp)
@doc "删除浮动ip"
@handler DeleteFloatingIPHandler
@ -584,91 +584,91 @@ service pcm {
@doc "创建防火墙"
@handler CreateFirewallGroupHandler
post /vm/CreateFirewallGroup (CreateFirewallGroupReq) returns (CreateFirewallGroupResp)
post /vm/createFirewallGroup (CreateFirewallGroupReq) returns (CreateFirewallGroupResp)
@doc "查询防火墙列表"
@handler ListFirewallGroupsHandler
get /vm/ListFirewallGroups (ListFirewallGroupsReq) returns (ListFirewallGroupsResp)
get /vm/listFirewallGroups (ListFirewallGroupsReq) returns (ListFirewallGroupsResp)
@doc "删除防火墙"
@handler DeleteFirewallGroupHandler
delete /vm/DeleteFirewallGroup (DeleteFirewallGroupReq) returns (DeleteFirewallGroupResp)
delete /vm/deleteFirewallGroup (DeleteFirewallGroupReq) returns (DeleteFirewallGroupResp)
@doc "修改防火墙"
@handler UpdateFirewallGroupHandler
put /vm/UpdateFirewallGroup (UpdateFirewallGroupReq) returns (UpdateFirewallGroupResp)
put /vm/updateFirewallGroup (UpdateFirewallGroupReq) returns (UpdateFirewallGroupResp)
@doc "查询防火墙详情"
@handler ShowFirewallGroupDetailsHandler
get /vm/ShowFirewallGroupDetails (ShowFirewallGroupDetailsReq) returns (ShowFirewallGroupDetailsResp)
get /vm/showFirewallGroupDetails (ShowFirewallGroupDetailsReq) returns (ShowFirewallGroupDetailsResp)
@doc "创建防火墙策略"
@handler CreateFirewallPolicyHandler
post /vm/CreateFirewallPolicy (CreateFirewallPolicyReq) returns (CreateFirewallPolicyResp)
post /vm/createFirewallPolicy (CreateFirewallPolicyReq) returns (CreateFirewallPolicyResp)
@doc "查询防火墙策略列表"
@handler ListFirewallPoliciesHandler
get /vm/ListFirewallPolicies (ListFirewallPoliciesReq) returns (ListFirewallPoliciesResp)
get /vm/listFirewallPolicies (ListFirewallPoliciesReq) returns (ListFirewallPoliciesResp)
@doc "删除防火墙策略"
@handler DeleteFirewallPolicyHandler
delete /vm/DeleteFirewallPolicy (DeleteFirewallPolicyReq) returns (DeleteFirewallPolicyResp)
delete /vm/deleteFirewallPolicy (DeleteFirewallPolicyReq) returns (DeleteFirewallPolicyResp)
@doc "查询防火墙策略详情"
@handler ShowFirewallRuleDetailsHandler
get /vm/ShowFirewallRuleDetails (ShowFirewallRuleDetailsReq) returns (ShowFirewallRuleDetailsResp)
get /vm/showFirewallRuleDetails (ShowFirewallRuleDetailsReq) returns (ShowFirewallRuleDetailsResp)
@doc "查询防火墙策略详情"
@handler ShowFirewallPolicyDetailsHandler
get /vm/ShowFirewallPolicyDetails (ShowFirewallPolicyDetailsReq) returns (ShowFirewallPolicyDetailsResp)
get /vm/showFirewallPolicyDetails (ShowFirewallPolicyDetailsReq) returns (ShowFirewallPolicyDetailsResp)
@doc "创建防火墙策略"
@handler CreateFirewallRuleHandler
post /vm/CreateFirewallRule (CreateFirewallRuleReq) returns (CreateFirewallRuleResp)
post /vm/createFirewallRule (CreateFirewallRuleReq) returns (CreateFirewallRuleResp)
@doc "查询防火墙策略列表"
@handler ListFirewallRulesHandler
get /vm/ListFirewallRules (ListFirewallRulesReq) returns (ListFirewallRulesResp)
get /vm/listFirewallRules (ListFirewallRulesReq) returns (ListFirewallRulesResp)
@doc "删除防火墙策略"
@handler DeleteFirewallRuleHandler
delete /vm/DeleteFirewallRule (DeleteFirewallRuleReq) returns (DeleteFirewallRuleResp)
delete /vm/deleteFirewallRule (DeleteFirewallRuleReq) returns (DeleteFirewallRuleResp)
@doc "创建安全组"
@handler CreateSecurityGroupHandler
post /vm/CreateSecurityGroup (CreateSecurityGroupReq) returns (CreateSecurityGroupResp)
post /vm/createSecurityGroup (CreateSecurityGroupReq) returns (CreateSecurityGroupResp)
@doc "查询安全组列表"
@handler ListSecurityGroupsHandler
get /vm/ListSecurityGroups (ListSecurityGroupsReq) returns (ListSecurityGroupsResp)
get /vm/listSecurityGroups (ListSecurityGroupsReq) returns (ListSecurityGroupsResp)
@doc "删除安全组"
@handler DeleteSecurityGroupHandler
delete /vm/DeleteSecurityGroup (DeleteSecurityGroupReq) returns (DeleteSecurityGroupResp)
delete /vm/deleteSecurityGroup (DeleteSecurityGroupReq) returns (DeleteSecurityGroupResp)
@doc "修改安全组"
@handler UpdateSecurityGroupHandler
put /vm/UpdateSecurityGroup (UpdateSecurityGroupReq) returns (UpdateSecurityGroupResp)
put /vm/updateSecurityGroup (UpdateSecurityGroupReq) returns (UpdateSecurityGroupResp)
@doc "查询安全组详情"
@handler ShowSecurityGroupHandler
get /vm/ShowSecurityGroup (ShowSecurityGroupReq) returns (ShowSecurityGroupResp)
get /vm/showSecurityGroup (ShowSecurityGroupReq) returns (ShowSecurityGroupResp)
@doc "创建安全组规则"
@handler CreateSecurityGroupRuleHandler
post /vm/CreateSecurityGroupRule (CreateSecurityGroupRuleReq) returns (CreateSecurityGroupRuleResp)
post /vm/createSecurityGroupRule (CreateSecurityGroupRuleReq) returns (CreateSecurityGroupRuleResp)
@doc "查询安全组规则列表"
@handler ListSecurityGroupRulesHandler
get /vm/ListSecurityGroupRules (ListSecurityGroupRulesReq) returns (ListSecurityGroupRulesResp)
get /vm/listSecurityGroupRules (ListSecurityGroupRulesReq) returns (ListSecurityGroupRulesResp)
@doc "删除安全组规则"
@handler DeleteSecurityGroupRuleHandler
delete /vm/DeleteSecurityGroupRule (DeleteSecurityGroupRuleReq) returns (DeleteSecurityGroupRuleResp)
delete /vm/deleteSecurityGroupRule (DeleteSecurityGroupRuleReq) returns (DeleteSecurityGroupRuleResp)
@doc "查询安全组规则详情"
@handler ShowSecurityGroupRuleHandler
get /vm/ShowSecurityGroupRule (ShowSecurityGroupRuleReq) returns (ShowSecurityGroupRuleResp)
get /vm/showSecurityGroupRule (ShowSecurityGroupRuleReq) returns (ShowSecurityGroupRuleResp)
@doc "查询卷详情列表"
@handler ListVolumesDetailHandler

View File

@ -471,47 +471,47 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
},
{
Method: http.MethodPost,
Path: "/vm/UnpauseServer",
Path: "/vm/unpauseServer",
Handler: vm.UnpauseServerHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/ResizeServer",
Path: "/vm/resizeServer",
Handler: vm.ResizeServerHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/MigrateServer",
Path: "/vm/migrateServer",
Handler: vm.MigrateServerHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/ShelveServer",
Path: "/vm/shelveServer",
Handler: vm.ShelveServerHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/ChangeAdministrativePassword",
Path: "/vm/changeAdministrativePassword",
Handler: vm.ChangeAdministrativePasswordHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/RescueServer",
Path: "/vm/rescueServer",
Handler: vm.RescueServerHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/UnRescueServer",
Path: "/vm/unRescueServer",
Handler: vm.UnRescueHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/SuspendServer",
Path: "/vm/suspendServer",
Handler: vm.SuspendServerHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/AddSecurityGroupToServer",
Path: "/vm/addSecurityGroupToServer",
Handler: vm.AddSecurityGroupToServerHandler(serverCtx),
},
{
@ -521,12 +521,12 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
},
{
Method: http.MethodPost,
Path: "/vm/CreateFlavor",
Path: "/vm/createFlavor",
Handler: vm.CreateFlavorHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/DeleteFlavor",
Path: "/vm/deleteFlavor",
Handler: vm.DeleteFlavorHandler(serverCtx),
},
{
@ -681,7 +681,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
},
{
Method: http.MethodGet,
Path: "/vm/ListFloatingIPs",
Path: "/vm/listFloatingIPs",
Handler: vm.ListFloatingIPsHandler(serverCtx),
},
{
@ -701,112 +701,112 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
},
{
Method: http.MethodPost,
Path: "/vm/CreateFirewallGroup",
Path: "/vm/createFirewallGroup",
Handler: vm.CreateFirewallGroupHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/vm/ListFirewallGroups",
Path: "/vm/listFirewallGroups",
Handler: vm.ListFirewallGroupsHandler(serverCtx),
},
{
Method: http.MethodDelete,
Path: "/vm/DeleteFirewallGroup",
Path: "/vm/deleteFirewallGroup",
Handler: vm.DeleteFirewallGroupHandler(serverCtx),
},
{
Method: http.MethodPut,
Path: "/vm/UpdateFirewallGroup",
Path: "/vm/updateFirewallGroup",
Handler: vm.UpdateFirewallGroupHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/vm/ShowFirewallGroupDetails",
Path: "/vm/showFirewallGroupDetails",
Handler: vm.ShowFirewallGroupDetailsHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/CreateFirewallPolicy",
Path: "/vm/createFirewallPolicy",
Handler: vm.CreateFirewallPolicyHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/vm/ListFirewallPolicies",
Path: "/vm/listFirewallPolicies",
Handler: vm.ListFirewallPoliciesHandler(serverCtx),
},
{
Method: http.MethodDelete,
Path: "/vm/DeleteFirewallPolicy",
Path: "/vm/deleteFirewallPolicy",
Handler: vm.DeleteFirewallPolicyHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/vm/ShowFirewallRuleDetails",
Path: "/vm/showFirewallRuleDetails",
Handler: vm.ShowFirewallRuleDetailsHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/vm/ShowFirewallPolicyDetails",
Path: "/vm/showFirewallPolicyDetails",
Handler: vm.ShowFirewallPolicyDetailsHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/CreateFirewallRule",
Path: "/vm/createFirewallRule",
Handler: vm.CreateFirewallRuleHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/vm/ListFirewallRules",
Path: "/vm/listFirewallRules",
Handler: vm.ListFirewallRulesHandler(serverCtx),
},
{
Method: http.MethodDelete,
Path: "/vm/DeleteFirewallRule",
Path: "/vm/deleteFirewallRule",
Handler: vm.DeleteFirewallRuleHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/CreateSecurityGroup",
Path: "/vm/createSecurityGroup",
Handler: vm.CreateSecurityGroupHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/vm/ListSecurityGroups",
Path: "/vm/listSecurityGroups",
Handler: vm.ListSecurityGroupsHandler(serverCtx),
},
{
Method: http.MethodDelete,
Path: "/vm/DeleteSecurityGroup",
Path: "/vm/deleteSecurityGroup",
Handler: vm.DeleteSecurityGroupHandler(serverCtx),
},
{
Method: http.MethodPut,
Path: "/vm/UpdateSecurityGroup",
Path: "/vm/updateSecurityGroup",
Handler: vm.UpdateSecurityGroupHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/vm/ShowSecurityGroup",
Path: "/vm/showSecurityGroup",
Handler: vm.ShowSecurityGroupHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/vm/CreateSecurityGroupRule",
Path: "/vm/createSecurityGroupRule",
Handler: vm.CreateSecurityGroupRuleHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/vm/ListSecurityGroupRules",
Path: "/vm/listSecurityGroupRules",
Handler: vm.ListSecurityGroupRulesHandler(serverCtx),
},
{
Method: http.MethodDelete,
Path: "/vm/DeleteSecurityGroupRule",
Path: "/vm/deleteSecurityGroupRule",
Handler: vm.DeleteSecurityGroupRuleHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/vm/ShowSecurityGroupRule",
Path: "/vm/showSecurityGroupRule",
Handler: vm.ShowSecurityGroupRuleHandler(serverCtx),
},
{

View File

@ -16,6 +16,13 @@ package vm
import (
"context"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
"gitlink.org.cn/JointCloud/pcm-coordinator/pkg/helper/xerr"
"gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result"
"gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils"
"gitlink.org.cn/JointCloud/pcm-openstack/openstack"
"k8s.io/apimachinery/pkg/util/json"
"gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc"
"gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types"
@ -39,6 +46,17 @@ func NewShowNodeDetailsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *S
func (l *ShowNodeDetailsLogic) ShowNodeDetails(req *types.ShowNodeDetailsReq) (resp *types.ShowNodeDetailsResp, err error) {
// todo: add your logic here and delete this line
return
ShowNodeDetailsReq := &openstack.ShowNodeDetailsReq{}
err = copier.CopyWithOption(ShowNodeDetailsReq, req, copier.Option{Converters: utils.Converters})
ShowNodeDetailsResp, err := l.svcCtx.OpenstackRpc.ShowNodeDetails(l.ctx, ShowNodeDetailsReq)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrMsg("c端创建失败"), "c端创建失败 : %v ,req:%+v", err, req)
}
marshal, err := json.Marshal(&ShowNodeDetailsResp)
if err != nil {
return nil, result.NewDefaultError(err.Error())
}
json.Unmarshal(marshal, &resp)
err = copier.CopyWithOption(&resp, &ShowNodeDetailsResp, copier.Option{Converters: utils.Converters})
return resp, err
}