From d44e975583cd9e6c7ed3a44babe9df92f4a40038 Mon Sep 17 00:00:00 2001 From: Seokho Son Date: Thu, 12 Oct 2023 17:04:35 +0900 Subject: [PATCH] Fix SW Global NLB provisioning error --- src/api/rest/server/mcis/remoteCommand.go | 2 +- src/core/mcir/vnet.go | 18 ++++++++++++------ src/core/mcis/remoteCommand.go | 23 ++++++++++++----------- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/api/rest/server/mcis/remoteCommand.go b/src/api/rest/server/mcis/remoteCommand.go index 8245f37f1..2d9df1b1a 100644 --- a/src/api/rest/server/mcis/remoteCommand.go +++ b/src/api/rest/server/mcis/remoteCommand.go @@ -113,7 +113,7 @@ func RestSetBastionNodes(c echo.Context) error { // @Param nsId path string true "Namespace ID" default(ns01) // @Param mcisId path string true "MCIS ID" default(mcis01) // @Param targetVmId path string true "Target VM ID" default(vm01) -// @Success 200 {object} mcis.BastionInfo +// @Success 200 {object} []mcir.BastionNode // @Failure 404 {object} common.SimpleMsg // @Failure 500 {object} common.SimpleMsg // @Router /ns/{nsId}/mcis/{mcisId}/vm/{targetVmId}/bastion [get] diff --git a/src/core/mcir/vnet.go b/src/core/mcir/vnet.go index 77dc036b5..1f53e35e4 100644 --- a/src/core/mcir/vnet.go +++ b/src/core/mcir/vnet.go @@ -135,12 +135,18 @@ func TbSubnetReqStructLevelValidation(sl validator.StructLevel) { // TbSubnetInfo is a struct that represents TB subnet object. type TbSubnetInfo struct { // Tumblebug - Id string - Name string `validate:"required"` - IPv4_CIDR string `validate:"required"` - BastionNodeIds []string - KeyValueList []common.KeyValue - Description string + Id string + Name string `validate:"required"` + IPv4_CIDR string `validate:"required"` + BastionNodes []BastionNode + KeyValueList []common.KeyValue + Description string +} + +// BastionNode is a struct that represents TB BastionNode object. +type BastionNode struct { + McisId string `json:"mcisId"` + VmId string `json:"vmId"` } // CreateVNet accepts vNet creation request, creates and returns an TB vNet object diff --git a/src/core/mcis/remoteCommand.go b/src/core/mcis/remoteCommand.go index d3d77572f..e961fc39a 100644 --- a/src/core/mcis/remoteCommand.go +++ b/src/core/mcis/remoteCommand.go @@ -177,10 +177,10 @@ func RunRemoteCommand(nsId string, mcisId string, vmId string, givenUserName str common.CBLog.Error(err) return map[int]string{}, map[int]string{}, err } - bastionNode := bastionNodes.VmId[0] + bastionNode := bastionNodes[0] // use public IP of the bastion VM - bastionIp, _, bastionSshPort := GetVmIp(nsId, mcisId, bastionNode) - bastionUserName, bastionSshKey, err := VerifySshUserName(nsId, mcisId, bastionNode, bastionIp, bastionSshPort, givenUserName) + bastionIp, _, bastionSshPort := GetVmIp(nsId, bastionNode.McisId, bastionNode.VmId) + bastionUserName, bastionSshKey, err := VerifySshUserName(nsId, bastionNode.McisId, bastionNode.VmId, bastionIp, bastionSshPort, givenUserName) bastionEndpoint := fmt.Sprintf("%s:%s", bastionIp, bastionSshPort) bastionSshInfo := sshInfo{ @@ -536,7 +536,7 @@ func SetBastionNodes(nsId string, mcisId string, targetVmId string, bastionVmId common.CBLog.Error(err) return "", err } - if len(currentBastion.VmId) > 0 && bastionVmId == "" { + if len(currentBastion) > 0 && bastionVmId == "" { return "", fmt.Errorf("bastion node already exists for VM (ID: %s) in MCIS (ID: %s) under namespace (ID: %s)", targetVmId, mcisId, nsId) } @@ -576,16 +576,17 @@ func SetBastionNodes(nsId string, mcisId string, targetVmId string, bastionVmId } } } else { - for _, existingId := range subnetInfo.BastionNodeIds { - if existingId == bastionVmId { + for _, existingId := range subnetInfo.BastionNodes { + if existingId.VmId == bastionVmId { return fmt.Sprintf("Bastion (ID: %s) already exists in subnet (ID: %s) in VNet (ID: %s).", bastionVmId, subnetInfo.Id, vmObj.VNetId), nil } } } + bastionCandidate := mcir.BastionNode{McisId: mcisId, VmId: bastionVmId} // Append bastionVmId only if it doesn't already exist. - subnetInfo.BastionNodeIds = append(subnetInfo.BastionNodeIds, bastionVmId) + subnetInfo.BastionNodes = append(subnetInfo.BastionNodes, bastionCandidate) tempVNetInfo.SubnetInfoList[i] = subnetInfo mcir.UpdateResourceObject(nsId, common.StrVNet, tempVNetInfo) @@ -598,8 +599,8 @@ func SetBastionNodes(nsId string, mcisId string, targetVmId string, bastionVmId } // GetBastionNodes func retrieves bastion nodes for a given VM -func GetBastionNodes(nsId string, mcisId string, targetVmId string) (BastionInfo, error) { - returnValue := BastionInfo{} +func GetBastionNodes(nsId string, mcisId string, targetVmId string) ([]mcir.BastionNode, error) { + returnValue := []mcir.BastionNode{} // Fetch VM object based on nsId, mcisId, and targetVmId vmObj, err := GetVmObject(nsId, mcisId, targetVmId) if err != nil { @@ -624,10 +625,10 @@ func GetBastionNodes(nsId string, mcisId string, targetVmId string) (BastionInfo // Find the subnet corresponding to the VM and return the BastionNodeIds for _, subnetInfo := range tempVNetInfo.SubnetInfoList { if subnetInfo.Id == vmObj.SubnetId { - if subnetInfo.BastionNodeIds == nil { + if subnetInfo.BastionNodes == nil { return returnValue, nil } - returnValue.VmId = subnetInfo.BastionNodeIds + returnValue = subnetInfo.BastionNodes return returnValue, nil } }