Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial codes to register existing CSP VM #1046

Merged
merged 1 commit into from
Mar 24, 2022
Merged

Initial codes to register existing CSP VM #1046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/api/grpc/server/mcis/control.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func (s *MCISService) CreateMcis(ctx context.Context, req *pb.TbMcisCreateReques
return nil, gc.ConvGrpcStatusErr(err, "", "MCISService.CreateMcis()")
}

result, err := mcis.CreateMcis(req.NsId, &mcisObj)
result, err := mcis.CreateMcis(req.NsId, &mcisObj, "create")
if err != nil {
return nil, gc.ConvGrpcStatusErr(err, "", "MCISService.CreateMcis()")
}
Expand Down
37 changes: 36 additions & 1 deletion src/api/rest/server/mcis/provisioning.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,42 @@ func RestPostMcis(c echo.Context) error {
return err
}

result, err := mcis.CreateMcis(nsId, req)
option := "create"
result, err := mcis.CreateMcis(nsId, req, option)
if err != nil {
mapA := map[string]string{"message": err.Error()}
return c.JSON(http.StatusInternalServerError, &mapA)
}

//fmt.Printf("%+v\n", *result)
common.PrintJsonPretty(*result)

return c.JSON(http.StatusCreated, result)
}

// RestPostRegisterCSPNativeVM godoc
// @Summary Register existing VM in a CSP to Cloud-Barista MCIS
// @Description Register existing VM in a CSP to Cloud-Barista MCIS
// @Tags [Infra service] MCIS Provisioning management
// @Accept json
// @Produce json
// @Param nsId path string true "Namespace ID" default(ns01)
// @Param mcisReq body TbMcisReq true "Details for an MCIS object with existing CSP VM ID"
// @Success 200 {object} TbMcisInfo
// @Failure 404 {object} common.SimpleMsg
// @Failure 500 {object} common.SimpleMsg
// @Router /ns/{nsId}/registerCspVm [post]
func RestPostRegisterCSPNativeVM(c echo.Context) error {

nsId := c.Param("nsId")

req := &mcis.TbMcisReq{}
if err := c.Bind(req); err != nil {
return err
}

option := "register"
result, err := mcis.CreateMcis(nsId, req, option)
if err != nil {
mapA := map[string]string{"message": err.Error()}
return c.JSON(http.StatusInternalServerError, &mapA)
Expand Down
2 changes: 2 additions & 0 deletions src/api/rest/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ func RunServer(port string) {

//MCIS Management
g.POST("/:nsId/mcis", rest_mcis.RestPostMcis)
g.POST("/:nsId/registerCspVm", rest_mcis.RestPostRegisterCSPNativeVM)

g.POST("/:nsId/mcisDynamic", rest_mcis.RestPostMcisDynamic)
g.GET("/:nsId/mcis/:mcisId", rest_mcis.RestGetMcis)
g.GET("/:nsId/mcis", rest_mcis.RestGetAllMcis)
Expand Down
162 changes: 99 additions & 63 deletions src/core/mcis/provisioning.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,9 @@ type TbVmReq struct {
// VM name or VM group name if is (not empty) && (> 0). If it is a group, actual VM name will be generated with -N postfix.
Name string `json:"name" validate:"required" example:"vm01"`

// CSP managed ID or Name (required for option=register)
IdByCSP string `json:"idByCsp,omitempty" example:"i-014fa6ede6ada0b2c"`

// if vmGroupSize is (not empty) && (> 0), VM group will be gernetad. VMs will be created accordingly.
VmGroupSize string `json:"vmGroupSize" example:"3" default:""`

Expand Down Expand Up @@ -234,6 +237,7 @@ type SpiderVMInfo struct { // Spider
SubnetName string
SecurityGroupNames []string
KeyPairName string
CSPid string // VM ID given by CSP (required for registering VM)

// Fields for both request and response
VMSpecName string // instance type or flavour, etc... ex) t2.micro or f1.micro
Expand Down Expand Up @@ -282,8 +286,9 @@ type TbVmGroupInfo struct {

// TbVmInfo is struct to define a server instance object
type TbVmInfo struct {
Id string `json:"id"`
Name string `json:"name"`
Id string `json:"id"`
Name string `json:"name"`
IdByCSP string `json:"idByCSP"` // CSP managed ID or Name

// defined if the VM is in a group
VmGroupId string `json:"vmGroupId"`
Expand Down Expand Up @@ -448,7 +453,8 @@ func CorePostMcisVm(nsId string, mcisId string, vmInfoData *TbVmInfo) (*TbVmInfo
var wg sync.WaitGroup
wg.Add(1)

go AddVmToMcis(&wg, nsId, mcisId, vmInfoData)
option := "create"
go AddVmToMcis(&wg, nsId, mcisId, vmInfoData, option)

wg.Wait()

Expand Down Expand Up @@ -637,7 +643,8 @@ func CreateMcisGroupVm(nsId string, mcisId string, vmRequest *TbVmReq) (*TbMcisI
vmInfoData.VmUserPassword = vmRequest.VmUserPassword

wg.Add(1)
go AddVmToMcis(&wg, nsId, mcisId, &vmInfoData)
// option != register
go AddVmToMcis(&wg, nsId, mcisId, &vmInfoData, "")

}

Expand Down Expand Up @@ -691,8 +698,8 @@ func CreateMcisGroupVm(nsId string, mcisId string, vmRequest *TbVmReq) (*TbMcisI

}

// CreateMcis is func to create MCIS obeject and deploy requested VMs
func CreateMcis(nsId string, req *TbMcisReq) (*TbMcisInfo, error) {
// CreateMcis is func to create MCIS obeject and deploy requested VMs (register CSP native VM with option=register)
func CreateMcis(nsId string, req *TbMcisReq, option string) (*TbMcisInfo, error) {

err := common.CheckString(nsId)
if err != nil {
Expand Down Expand Up @@ -731,10 +738,15 @@ func CreateMcis(nsId string, req *TbMcisReq) (*TbMcisInfo, error) {
return nil, err
}

check, _ := CheckMcis(nsId, req.Name)
if check {
err := fmt.Errorf("The mcis " + req.Name + " already exists.")
return nil, err
// skip mcis id checking for option=register
if option != "register" {
check, _ := CheckMcis(nsId, req.Name)
if check {
err := fmt.Errorf("The mcis " + req.Name + " already exists.")
return nil, err
}
} else {
req.SystemLabel = "Registered from CSP resource"
}

targetAction := ActionCreate
Expand Down Expand Up @@ -870,11 +882,13 @@ func CreateMcis(nsId string, req *TbMcisReq) (*TbMcisInfo, error) {

vmInfoData.Label = k.Label

vmInfoData.IdByCSP = k.IdByCSP

// Avoid concurrent requests to CSP.
time.Sleep(time.Duration(i) * time.Second)

wg.Add(1)
go AddVmToMcis(&wg, nsId, mcisId, &vmInfoData)
go AddVmToMcis(&wg, nsId, mcisId, &vmInfoData, option)
//AddVmToMcis(nsId, req.Id, vmInfoData)

}
Expand Down Expand Up @@ -911,7 +925,7 @@ func CreateMcis(nsId string, req *TbMcisReq) (*TbMcisInfo, error) {
mcisTmp.InstallMonAgent = req.InstallMonAgent
UpdateMcisInfo(nsId, mcisTmp)

if req.InstallMonAgent != "no" {
if req.InstallMonAgent != "no" || option != "register" {

check := CheckDragonflyEndpoint()
if check != nil {
Expand Down Expand Up @@ -1054,12 +1068,13 @@ func CreateMcisDynamic(nsId string, req *TbMcisDynamicReq) (*TbMcisInfo, error)

common.PrintJsonPretty(mcisReq)

// Run create MCIS with the generated MCIS request
return CreateMcis(nsId, &mcisReq)
// Run create MCIS with the generated MCIS request (option != register)
option := "create"
return CreateMcis(nsId, &mcisReq, option)
}

// AddVmToMcis is func to add VM to MCIS
func AddVmToMcis(wg *sync.WaitGroup, nsId string, mcisId string, vmInfoData *TbVmInfo) error {
func AddVmToMcis(wg *sync.WaitGroup, nsId string, mcisId string, vmInfoData *TbVmInfo, option string) error {
fmt.Printf("\n[AddVmToMcis]\n")
//goroutin
defer wg.Done()
Expand Down Expand Up @@ -1107,7 +1122,7 @@ func AddVmToMcis(wg *sync.WaitGroup, nsId string, mcisId string, vmInfoData *TbV
//common.PrintJsonPretty(vmInfoData)

//instanceIds, publicIPs := CreateVm(&vmInfoData)
err = CreateVm(nsId, mcisId, vmInfoData)
err = CreateVm(nsId, mcisId, vmInfoData, option)

fmt.Printf("\n[AddVmToMcis After request vmInfoData]\n")
//common.PrintJsonPretty(vmInfoData)
Expand Down Expand Up @@ -1151,8 +1166,8 @@ func AddVmToMcis(wg *sync.WaitGroup, nsId string, mcisId string, vmInfoData *TbV

}

// CreateVm is func to create VM
func CreateVm(nsId string, mcisId string, vmInfoData *TbVmInfo) error {
// CreateVm is func to create VM (option = "register" for register existing VM)
func CreateVm(nsId string, mcisId string, vmInfoData *TbVmInfo, option string) error {

fmt.Printf("\n\n[CreateVm(vmInfoData *TbVmInfo)]\n\n")

Expand Down Expand Up @@ -1193,6 +1208,16 @@ func CreateVm(nsId string, mcisId string, vmInfoData *TbVmInfo) error {

}

// in case of registering existing CSP VM
if option == "register" {
// IdByCSP is required
if vmInfoData.IdByCSP == "" {
err := fmt.Errorf("vmInfoData.IdByCSP is empty (required for register VM)")
common.CBLog.Error(err)
return err
}
}

var tempSpiderVMInfo SpiderVMInfo

// Fill VM creation reqest (request to cb-spider)
Expand All @@ -1207,57 +1232,62 @@ func CreateVm(nsId string, mcisId string, vmInfoData *TbVmInfo) error {

commonNs := "common"

tempReq.ReqInfo.ImageName, err = common.GetCspResourceId(nsId, common.StrImage, vmInfoData.ImageId)
if tempReq.ReqInfo.ImageName == "" || err != nil {
common.CBLog.Error(err)
// If cannot find the resource, use common resource
tempReq.ReqInfo.ImageName, err = common.GetCspResourceId(commonNs, common.StrImage, vmInfoData.ImageId)
if option == "register" {
tempReq.ReqInfo.CSPid = vmInfoData.IdByCSP

} else {
tempReq.ReqInfo.ImageName, err = common.GetCspResourceId(nsId, common.StrImage, vmInfoData.ImageId)
if tempReq.ReqInfo.ImageName == "" || err != nil {
common.CBLog.Error(err)
// If cannot find the resource, use common resource
tempReq.ReqInfo.ImageName, err = common.GetCspResourceId(commonNs, common.StrImage, vmInfoData.ImageId)
if tempReq.ReqInfo.ImageName == "" || err != nil {
common.CBLog.Error(err)
return err
}
}

tempReq.ReqInfo.VMSpecName, err = common.GetCspResourceId(nsId, common.StrSpec, vmInfoData.SpecId)
if tempReq.ReqInfo.VMSpecName == "" || err != nil {
common.CBLog.Error(err)
// If cannot find the resource, use common resource
tempReq.ReqInfo.VMSpecName, err = common.GetCspResourceId(commonNs, common.StrSpec, vmInfoData.SpecId)
if tempReq.ReqInfo.ImageName == "" || err != nil {
common.CBLog.Error(err)
return err
}
}

tempReq.ReqInfo.VPCName, err = common.GetCspResourceId(nsId, common.StrVNet, vmInfoData.VNetId)
if tempReq.ReqInfo.VPCName == "" {
common.CBLog.Error(err)
return err
}
}

tempReq.ReqInfo.VMSpecName, err = common.GetCspResourceId(nsId, common.StrSpec, vmInfoData.SpecId)
if tempReq.ReqInfo.VMSpecName == "" || err != nil {
common.CBLog.Error(err)
// If cannot find the resource, use common resource
tempReq.ReqInfo.VMSpecName, err = common.GetCspResourceId(commonNs, common.StrSpec, vmInfoData.SpecId)
if tempReq.ReqInfo.ImageName == "" || err != nil {
// TODO: needs to be enhnaced to use GetCspResourceId (GetCspResourceId needs to be updated as well)
tempReq.ReqInfo.SubnetName = vmInfoData.SubnetId //common.GetCspResourceId(nsId, common.StrVNet, vmInfoData.SubnetId)
if tempReq.ReqInfo.SubnetName == "" {
common.CBLog.Error(err)
return err
}
}

tempReq.ReqInfo.VPCName, err = common.GetCspResourceId(nsId, common.StrVNet, vmInfoData.VNetId)
if tempReq.ReqInfo.VPCName == "" {
common.CBLog.Error(err)
return err
}
var SecurityGroupIdsTmp []string
for _, v := range vmInfoData.SecurityGroupIds {
CspSgId := v //common.GetCspResourceId(nsId, common.StrSecurityGroup, v)
if CspSgId == "" {
common.CBLog.Error(err)
return err
}

// TODO: needs to be enhnaced to use GetCspResourceId (GetCspResourceId needs to be updated as well)
tempReq.ReqInfo.SubnetName = vmInfoData.SubnetId //common.GetCspResourceId(nsId, common.StrVNet, vmInfoData.SubnetId)
if tempReq.ReqInfo.SubnetName == "" {
common.CBLog.Error(err)
return err
}
SecurityGroupIdsTmp = append(SecurityGroupIdsTmp, CspSgId)
}
tempReq.ReqInfo.SecurityGroupNames = SecurityGroupIdsTmp

var SecurityGroupIdsTmp []string
for _, v := range vmInfoData.SecurityGroupIds {
CspSgId := v //common.GetCspResourceId(nsId, common.StrSecurityGroup, v)
if CspSgId == "" {
tempReq.ReqInfo.KeyPairName, err = common.GetCspResourceId(nsId, common.StrSSHKey, vmInfoData.SshKeyId)
if tempReq.ReqInfo.KeyPairName == "" {
common.CBLog.Error(err)
return err
}

SecurityGroupIdsTmp = append(SecurityGroupIdsTmp, CspSgId)
}
tempReq.ReqInfo.SecurityGroupNames = SecurityGroupIdsTmp

tempReq.ReqInfo.KeyPairName, err = common.GetCspResourceId(nsId, common.StrSSHKey, vmInfoData.SshKeyId)
if tempReq.ReqInfo.KeyPairName == "" {
common.CBLog.Error(err)
return err
}

tempReq.ReqInfo.VMUserId = vmInfoData.VmUserAccount
Expand All @@ -1276,6 +1306,10 @@ func CreateVm(nsId string, mcisId string, vmInfoData *TbVmInfo) error {

url := common.SpiderRestUrl + "/vm"
method := "POST"
if option == "register" {
url = common.SpiderRestUrl + "/regvm"
method = "POST"
}

fmt.Println("\n[Calling SPIDER]START")
fmt.Println("url: " + url + " method: " + method)
Expand Down Expand Up @@ -1395,15 +1429,17 @@ func CreateVm(nsId string, mcisId string, vmInfoData *TbVmInfo) error {
//configTmp, _ := common.GetConnConfig(vmInfoData.ConnectionName)
//vmInfoData.Location = GetCloudLocation(strings.ToLower(configTmp.ProviderName), strings.ToLower(tempSpiderVMInfo.Region.Region))

vmKey := common.GenMcisKey(nsId, mcisId, vmInfoData.Id)
//mcir.UpdateAssociatedObjectList(nsId, common.StrSSHKey, vmInfoData.SshKeyId, common.StrAdd, vmKey)
mcir.UpdateAssociatedObjectList(nsId, common.StrImage, vmInfoData.ImageId, common.StrAdd, vmKey)
mcir.UpdateAssociatedObjectList(nsId, common.StrSpec, vmInfoData.SpecId, common.StrAdd, vmKey)
mcir.UpdateAssociatedObjectList(nsId, common.StrSSHKey, vmInfoData.SshKeyId, common.StrAdd, vmKey)
mcir.UpdateAssociatedObjectList(nsId, common.StrVNet, vmInfoData.VNetId, common.StrAdd, vmKey)
if option != "register" {
vmKey := common.GenMcisKey(nsId, mcisId, vmInfoData.Id)
//mcir.UpdateAssociatedObjectList(nsId, common.StrSSHKey, vmInfoData.SshKeyId, common.StrAdd, vmKey)
mcir.UpdateAssociatedObjectList(nsId, common.StrImage, vmInfoData.ImageId, common.StrAdd, vmKey)
mcir.UpdateAssociatedObjectList(nsId, common.StrSpec, vmInfoData.SpecId, common.StrAdd, vmKey)
mcir.UpdateAssociatedObjectList(nsId, common.StrSSHKey, vmInfoData.SshKeyId, common.StrAdd, vmKey)
mcir.UpdateAssociatedObjectList(nsId, common.StrVNet, vmInfoData.VNetId, common.StrAdd, vmKey)

for _, v2 := range vmInfoData.SecurityGroupIds {
mcir.UpdateAssociatedObjectList(nsId, common.StrSecurityGroup, v2, common.StrAdd, vmKey)
for _, v2 := range vmInfoData.SecurityGroupIds {
mcir.UpdateAssociatedObjectList(nsId, common.StrSecurityGroup, v2, common.StrAdd, vmKey)
}
}

UpdateVmInfo(nsId, mcisId, *vmInfoData)
Expand Down