loxicmd get lb to show monitor flag

loxilb-io · May 15, 2023 · 76fce6e · 76fce6e
1 parent 66961c9
commit 76fce6e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/cmd/get/get_loadbalancer.go b/cmd/get/get_loadbalancer.go
@@ -93,6 +93,17 @@ func NumToMode(mode int) string {
 	return ret
 }
 
+func BoolToMon(mon bool) string {
+	var ret string
+	switch mon {
+	case false:
+		ret = "Off"
+	case true:
+		ret = "On"
+	}
+	return ret
+}
+
 func PrintGetLbResult(resp *http.Response, o api.RESTOptions) {
 	lbresp := api.LbRuleModGet{}
 	var data [][]string
@@ -121,17 +132,28 @@ func PrintGetLbResult(resp *http.Response, o api.RESTOptions) {
 	for _, lbrule := range lbresp.LbRules {
 		if o.PrintOption == "wide" {
 			table.SetHeader(LOADBALANCER_WIDE_TITLE)
-			for i, eps := range lbrule.Endpoints {
-				if i == 0 {
-					data = append(data, []string{lbrule.Service.ExternalIP, fmt.Sprintf("%d", lbrule.Service.Port), lbrule.Service.Protocol, fmt.Sprintf("%d", lbrule.Service.Block), NumToSelect(int(lbrule.Service.Sel)), NumToMode(int(lbrule.Service.Mode)),
-						eps.EndpointIP, fmt.Sprintf("%d", eps.TargetPort), fmt.Sprintf("%d", eps.Weight), eps.State})
-				} else {
-					data = append(data, []string{"", "", "", "", "", "", eps.EndpointIP, fmt.Sprintf("%d", eps.TargetPort), fmt.Sprintf("%d", eps.Weight), eps.State})
+			if lbrule.Service.Monitor {
+				for i, eps := range lbrule.Endpoints {
+					if i == 0 {
+						data = append(data, []string{lbrule.Service.ExternalIP, fmt.Sprintf("%d", lbrule.Service.Port), lbrule.Service.Protocol, fmt.Sprintf("%d", lbrule.Service.Block), NumToSelect(int(lbrule.Service.Sel)), NumToMode(int(lbrule.Service.Mode)),
+							eps.EndpointIP, fmt.Sprintf("%d", eps.TargetPort), fmt.Sprintf("%d", eps.Weight), eps.State})
+					} else {
+						data = append(data, []string{"", "", "", "", "", "", eps.EndpointIP, fmt.Sprintf("%d", eps.TargetPort), fmt.Sprintf("%d", eps.Weight), eps.State})
+					}
+				}
+			} else {
+				for i, eps := range lbrule.Endpoints {
+					if i == 0 {
+						data = append(data, []string{lbrule.Service.ExternalIP, fmt.Sprintf("%d", lbrule.Service.Port), lbrule.Service.Protocol, fmt.Sprintf("%d", lbrule.Service.Block), NumToSelect(int(lbrule.Service.Sel)), NumToMode(int(lbrule.Service.Mode)),
+							eps.EndpointIP, fmt.Sprintf("%d", eps.TargetPort), fmt.Sprintf("%d", eps.Weight), "-"})
+					} else {
+						data = append(data, []string{"", "", "", "", "", "", eps.EndpointIP, fmt.Sprintf("%d", eps.TargetPort), fmt.Sprintf("%d", eps.Weight), "-"})
+					}
 				}
 			}
 		} else {
 			table.SetHeader(LOADBALANCER_TITLE)
-			data = append(data, []string{lbrule.Service.ExternalIP, fmt.Sprintf("%d", lbrule.Service.Port), lbrule.Service.Protocol, fmt.Sprintf("%d", lbrule.Service.Block), NumToSelect(int(lbrule.Service.Sel)), NumToMode(int(lbrule.Service.Mode)), fmt.Sprintf("%d", len(lbrule.Endpoints))})
+			data = append(data, []string{lbrule.Service.ExternalIP, fmt.Sprintf("%d", lbrule.Service.Port), lbrule.Service.Protocol, fmt.Sprintf("%d", lbrule.Service.Block), NumToSelect(int(lbrule.Service.Sel)), NumToMode(int(lbrule.Service.Mode)), fmt.Sprintf("%d", len(lbrule.Endpoints)), BoolToMon(lbrule.Service.Monitor)})
 		}
 	}
 

diff --git a/cmd/get/type.go b/cmd/get/type.go
@@ -17,7 +17,7 @@ package get
 
 var (
 	CONNTRACK_TITLE         = []string{"destination IP", "source IP", "destination Port", "source Port", "protocol", "state", "act", "packets", "bytes"}
-	LOADBALANCER_TITLE      = []string{"External IP", "Port", "Protocol", "Block", "Select", "Mode", "# of Endpoints"}
+	LOADBALANCER_TITLE      = []string{"External IP", "Port", "Protocol", "Block", "Select", "Mode", "# of Endpoints", "Monitor"}
 	LOADBALANCER_WIDE_TITLE = []string{"External IP", "Port", "Protocol", "block", "Select", "Mode", "Endpoint IP", "Target Port", "Weight", "State"}
 	SESSION_TITLE           = []string{"ident", "session IP"}
 	SESSION_WIDE_TITLE      = []string{"ident", "session IP", "access Network Tunnel", "core Network Tunnel"}