diff --git a/src/api/grpc/server/mcis/monitor.go b/src/api/grpc/server/mcis/monitor.go index e43659e53..65d12afe2 100644 --- a/src/api/grpc/server/mcis/monitor.go +++ b/src/api/grpc/server/mcis/monitor.go @@ -7,6 +7,7 @@ import ( "github.com/cloud-barista/cb-tumblebug/src/api/grpc/logger" pb "github.com/cloud-barista/cb-tumblebug/src/api/grpc/protobuf/cbtumblebug" + common "github.com/cloud-barista/cb-tumblebug/src/core/common" "github.com/cloud-barista/cb-tumblebug/src/core/mcis" ) @@ -29,8 +30,8 @@ func (s *MCISService) InstallMonitorAgentToMcis(ctx context.Context, req *pb.Mci return nil, gc.ConvGrpcStatusErr(err, "", "MCISService.InstallMonitorAgentToMcis()") } - mcisTmpSystemLabel := mcis.DefaultSystemLabel - content, err := mcis.InstallMonitorAgentToMcis(req.NsId, req.McisId, mcisTmpSystemLabel, &mcisObj) + // mcisTmpSystemLabel := mcis.DefaultSystemLabel + content, err := mcis.InstallMonitorAgentToMcis(req.NsId, req.McisId, common.StrVM, &mcisObj) if err != nil { return nil, gc.ConvGrpcStatusErr(err, "", "MCISService.InstallMonitorAgentToMcis()") } diff --git a/src/api/rest/server/mcis/monitoring.go b/src/api/rest/server/mcis/monitoring.go index 871088027..8baa1a36a 100644 --- a/src/api/rest/server/mcis/monitoring.go +++ b/src/api/rest/server/mcis/monitoring.go @@ -45,8 +45,8 @@ func RestPostInstallMonitorAgentToMcis(c echo.Context) error { return err } - mcisTmpSystemLabel := mcis.DefaultSystemLabel - content, err := mcis.InstallMonitorAgentToMcis(nsId, mcisId, mcisTmpSystemLabel, req) + // mcisTmpSystemLabel := mcis.DefaultSystemLabel + content, err := mcis.InstallMonitorAgentToMcis(nsId, mcisId, common.StrVM, req) if err != nil { common.CBLog.Error(err) return err diff --git a/src/core/mcis/monitoring.go b/src/core/mcis/monitoring.go index 3d93346ff..841efec83 100644 --- a/src/core/mcis/monitoring.go +++ b/src/core/mcis/monitoring.go @@ -192,7 +192,7 @@ func CallMonitoringAsync(wg *sync.WaitGroup, nsID string, mcisID string, mcisSer UpdateVmInfo(nsID, mcisID, vmInfoTmp) if mcisServiceType == "" { - mcisServiceType = "default" + mcisServiceType = common.StrVM } url := common.DragonflyRestUrl + cmd diff --git a/src/core/mcis/provisioning.go b/src/core/mcis/provisioning.go index 6b8b0fe8b..c4fe9b756 100644 --- a/src/core/mcis/provisioning.go +++ b/src/core/mcis/provisioning.go @@ -589,7 +589,7 @@ func CorePostMcisVm(nsId string, mcisId string, vmInfoData *TbVmInfo) (*TbVmInfo reqToMon.UserName = "cb-user" // this MCIS user name is temporal code. Need to improve. fmt.Printf("\n[InstallMonitorAgentToMcis]\n\n") - content, err := InstallMonitorAgentToMcis(nsId, mcisId, mcisTmp.SystemLabel, reqToMon) + content, err := InstallMonitorAgentToMcis(nsId, mcisId, common.StrVM, reqToMon) if err != nil { common.CBLog.Error(err) //mcisTmp.InstallMonAgent = "no" @@ -854,7 +854,7 @@ func CreateMcisGroupVm(nsId string, mcisId string, vmRequest *TbVmReq, newSubGro reqToMon.UserName = "cb-user" // this MCIS user name is temporal code. Need to improve. fmt.Printf("\n[InstallMonitorAgentToMcis]\n\n") - content, err := InstallMonitorAgentToMcis(nsId, mcisId, mcisTmp.SystemLabel, reqToMon) + content, err := InstallMonitorAgentToMcis(nsId, mcisId, common.StrVM, reqToMon) if err != nil { common.CBLog.Error(err) //mcisTmp.InstallMonAgent = "no" @@ -1112,7 +1112,7 @@ func CreateMcis(nsId string, req *TbMcisReq, option string) (*TbMcisInfo, error) time.Sleep(60 * time.Second) fmt.Printf("\n[InstallMonitorAgentToMcis]\n\n") - content, err := InstallMonitorAgentToMcis(nsId, mcisId, mcisTmp.SystemLabel, reqToMon) + content, err := InstallMonitorAgentToMcis(nsId, mcisId, common.StrVM, reqToMon) if err != nil { common.CBLog.Error(err) //mcisTmp.InstallMonAgent = "no"