Merge pull request #1269 from seokho-son/main

Show access info of Global-NLB

scripts/usecases/weavescope/startServer.sh

@@ -5,8 +5,7 @@ echo "[Start Weave Scope Cluster Monitoring]"
 
 SECONDS=0
 
-PublicIPs=${1}
-PrivateIPs=${2}
+PublicIPs=$@
 
 echo "Installing Weavescope to MCIS..."
 
@@ -19,7 +18,7 @@ FILE="/usr/local/bin/scope"
 
 echo "Installing prerequisite"
 sudo apt-get update > /dev/null
-sudo apt install docker.io -y
+sudo apt install docker.io -y > /dev/null
 
 PID=$(ps -ef | grep scope | awk '{print $2}')
 
@@ -30,7 +29,7 @@ fi
 
 echo "Launching Weavescope"
 
-sudo scope launch $PublicIPs $PrivateIPs
+sudo scope launch $PublicIPs
 
 echo "Done! elapsed time: $SECONDS"
 
@@ -40,4 +39,4 @@ PID=$(ps -ef | grep scope | awk '{print $2}')
 
 
 echo "[Start Scope: complete] PID=$PID"
-echo "$IP:4040/#!/state/{\"contrastMode\":true,\"topologyId\":\"containers-by-hostname\"}"
+echo "$IP:4040"

src/api/rest/docs/docs.go

@@ -8693,6 +8693,9 @@ const docTemplate = `{
                 "mcisId": {
                     "type": "string"
                 },
+                "mcisNlbListener": {
+                    "$ref": "#/definitions/mcis.McisAccessInfo"
+                },
                 "mcisSubGroupAccessInfo": {
                     "type": "array",
                     "items": {

src/api/rest/docs/swagger.json

@@ -8685,6 +8685,9 @@
                 "mcisId": {
                     "type": "string"
                 },
+                "mcisNlbListener": {
+                    "$ref": "#/definitions/mcis.McisAccessInfo"
+                },
                 "mcisSubGroupAccessInfo": {
                     "type": "array",
                     "items": {

src/api/rest/docs/swagger.yaml

@@ -1179,6 +1179,8 @@ definitions:
     properties:
       mcisId:
         type: string
+      mcisNlbListener:
+        $ref: '#/definitions/mcis.McisAccessInfo'
       mcisSubGroupAccessInfo:
         items:
           $ref: '#/definitions/mcis.McisSubGroupAccessInfo'

src/core/mcis/manageInfo.go

@@ -348,11 +348,18 @@ func GetMcisAccessInfo(nsId string, mcisId string, option string) (*McisAccessIn
 	}
 
 	output.McisId = mcisId
+
+	mcNlbAccess, err := GetMcNlbAccess(nsId, mcisId)
+	if err == nil {
+		output.McisNlbListener = mcNlbAccess
+	}
+
 	subGroupList, err := ListSubGroupId(nsId, mcisId)
 	if err != nil {
 		common.CBLog.Error(err)
 		return temp, err
 	}
+	// TODO: make in parallel
 	for _, groupId := range subGroupList {
 		subGroupAccessInfo := McisSubGroupAccessInfo{}
 		subGroupAccessInfo.SubGroupId = groupId

src/core/mcis/nlb.go

@@ -30,6 +30,8 @@ import (
 	"github.com/go-resty/resty/v2"
 )
 
+const nlbPostfix = "-nlb"
+
 // 2022-07-15 https://github.com/cloud-barista/cb-spider/blob/master/cloud-control-manager/cloud-driver/interfaces/resources/NLBHandler.go
 
 // SpiderNLBReqInfoWrapper is a wrapper struct to create JSON body of 'Create NLB request'
@@ -288,7 +290,6 @@ func CreateMcSwNlb(nsId string, mcisId string, req *TbNLBReq, option string) (Tb
 		return emptyObj, err
 	}
 
-	nlbPostfix := "-nlb"
 	nlbMcisId := mcisId + nlbPostfix
 
 	// create a special MCIS for (SW)NLB
@@ -780,6 +781,12 @@ func GetNLB(nsId string, mcisId string, resourceId string) (TbNLBInfo, error) {
 	return res, err
 }
 
+// GetMcNlbAccess returns the requested TB G-NLB access info (currenly MCIS)
+func GetMcNlbAccess(nsId string, mcisId string) (*McisAccessInfo, error) {
+	nlbMcisId := mcisId + nlbPostfix
+	return GetMcisAccessInfo(nsId, nlbMcisId, "")
+}
+
 // CheckNLB returns the existence of the TB NLB object in bool form.
 func CheckNLB(nsId string, mcisId string, resourceId string) (bool, error) {
 

src/core/mcis/provisioning.go

@@ -414,6 +414,7 @@ type TbVmInfo struct {
 // McisAccessInfo is struct to retrieve overall access information of a MCIS
 type McisAccessInfo struct {
 	McisId                 string
+	McisNlbListener        *McisAccessInfo `json:"mcisNlbListener,omitempty"`
 	McisSubGroupAccessInfo []McisSubGroupAccessInfo
 }