From 88838bb538f34912e81a5dd8e54b565fd76d73e2 Mon Sep 17 00:00:00 2001 From: TangBin Date: Fri, 4 Sep 2020 15:54:01 +0800 Subject: [PATCH] pex register add optional column mac_access --- pkg/apigateway/handler/misc.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/apigateway/handler/misc.go b/pkg/apigateway/handler/misc.go index f64d0565d6..67391ce98b 100644 --- a/pkg/apigateway/handler/misc.go +++ b/pkg/apigateway/handler/misc.go @@ -53,6 +53,7 @@ const ( HOST_IPMI_USERNAME_OPTIONAL = "IPMI用户名" HOST_IPMI_PASSWORD_OPTIONAL = "IPMI密码" HOST_MNG_IP_ADDR_OPTIONAL = "管理口IP地址" + HOST_MNG_MAC_ADDR_OPTIONAL = "管理口MAC地址" ) const ( @@ -63,7 +64,7 @@ const ( var ( BatchHostRegisterTemplate = []string{HOST_MAC, HOST_NAME, HOST_IPMI_ADDR_OPTIONAL, HOST_IPMI_USERNAME_OPTIONAL, HOST_IPMI_PASSWORD_OPTIONAL} BatchHostISORegisterTemplate = []string{HOST_NAME, HOST_IPMI_ADDR, HOST_IPMI_USERNAME, HOST_IPMI_PASSWORD, HOST_MNG_IP_ADDR} - BatchHostPXERegisterTemplate = []string{HOST_NAME, HOST_IPMI_ADDR, HOST_IPMI_USERNAME, HOST_IPMI_PASSWORD, HOST_MNG_IP_ADDR_OPTIONAL} + BatchHostPXERegisterTemplate = []string{HOST_NAME, HOST_IPMI_ADDR, HOST_IPMI_USERNAME, HOST_IPMI_PASSWORD, HOST_MNG_MAC_ADDR_OPTIONAL, HOST_MNG_IP_ADDR_OPTIONAL} ) func FetchSession(ctx context.Context, r *http.Request, apiVersion string) *mcclient.ClientSession { @@ -207,7 +208,7 @@ func (mh *MiscHandler) DoBatchHostRegister(ctx context.Context, w http.ResponseW i2 := -1 for i, title := range rows[0] { switch title { - case HOST_MAC: + case HOST_MAC, HOST_MNG_MAC_ADDR_OPTIONAL: paramKeys = append(paramKeys, "access_mac") case HOST_NAME: paramKeys = append(paramKeys, "name")