convert ip bytes to string, fix test

Signed-off-by: Kuromesi <blackfacepan@163.com>

Author: Kuromesi

pkg/nets/nets.go

@@ -72,6 +72,26 @@ func CopyIpByteFromSlice(dst *[16]byte, src []byte) {
 	copy(dst[:], src)
 }
 
+// IpString converts ip bytes to string, for IpV4, it checks
+// whether the last 12 bytes are all zeros.
+// TODO: this may conflict with IpV6 addresses with the same pattern,
+// we should find a better way to indicate the ipv4 address.
+func IpString(ip [16]byte) string {
+	if isZeros(ip[5:]) {
+		return net.IP(ip[:4]).String()
+	}
+	return net.IP(ip[:]).String()
+}
+
+func isZeros(p []byte) bool {
+	for i := 0; i < len(p); i++ {
+		if p[i] != 0 {
+			return false
+		}
+	}
+	return true
+}
+
 func checkIPVersion() (ipv4, ipv6 bool) {
 	addrs, err := net.InterfaceAddrs()
 	if err != nil {

pkg/nets/nets_test.go

@@ -136,3 +136,21 @@ func TestConvertPortToLittleEndian(t *testing.T) {
 		}
 	}
 }
+
+func TestIpString(t *testing.T) {
+	tests := []struct {
+		ip       [16]byte
+		expected string
+	}{
+		{[16]byte{192, 168, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, "192.168.0.1"},
+		{[16]byte{192, 168, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, "c0a8:1::1"},
+		{[16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, "0.0.0.0"},
+	}
+
+	for _, test := range tests {
+		actual := IpString(test.ip)
+		if actual != test.expected {
+			t.Errorf("IpString(%v) = %v; expected %v", test.ip, actual, test.expected)
+		}
+	}
+}

pkg/status/api.go

@@ -207,16 +207,16 @@ type BpfServiceValue struct {
 	LbPolicy      string              `json:"lbPolicy"`
 	ServicePort   prettyArray[uint32] `json:"servicePort,omitempty"`
 	TargetPort    prettyArray[uint32] `json:"targetPort,omitempty"`
-	WaypointAddr  prettyArray[byte]   `json:"waypointAddr,omitempty"`
+	WaypointAddr  string              `json:"waypointAddr,omitempty"`
 	WaypointPort  uint32              `json:"waypointPort,omitempty"`
 }
 
 type BpfBackendValue struct {
-	Ip           prettyArray[byte] `json:"ip"`
-	ServiceCount uint32            `json:"serviceCount"`
-	Services     []string          `json:"services"`
-	WaypointAddr prettyArray[byte] `json:"waypointAddr,omitempty"`
-	WaypointPort uint32            `json:"waypointPort,omitempty"`
+	Ip           string   `json:"ip"`
+	ServiceCount uint32   `json:"serviceCount"`
+	Services     []string `json:"services"`
+	WaypointAddr string   `json:"waypointAddr,omitempty"`
+	WaypointPort uint32   `json:"waypointPort,omitempty"`
 }
 
 type BpfFrontendValue struct {
@@ -267,14 +267,12 @@ func (wd WorkloadBpfDump) WithBackends(backends []bpfcache.BackendValue) Workloa
 		for _, b := range backend.Ip {
 			ip = append(ip, b)
 		}
-		waypointAddr := []byte{}
+		waypointAddr := ""
 		if backend.WaypointAddr != [16]byte{} {
-			for _, b := range backend.WaypointAddr {
-				waypointAddr = append(waypointAddr, b)
-			}
+			waypointAddr = nets.IpString(backend.WaypointAddr)
 		}
 		bac := BpfBackendValue{
-			Ip:           ip,
+			Ip:           nets.IpString(backend.Ip),
 			ServiceCount: backend.ServiceCount,
 			WaypointAddr: waypointAddr,
 			WaypointPort: nets.ConvertPortToLittleEndian(backend.WaypointPort),
@@ -285,7 +283,7 @@ func (wd WorkloadBpfDump) WithBackends(backends []bpfcache.BackendValue) Workloa
 			if svc == "" {
 				continue
 			}
-			services = append(services, wd.hashName.NumToStr(s))
+			services = append(services, svc)
 		}
 		bac.Services = services
 		converted = append(converted, bac)
@@ -319,11 +317,9 @@ func (wd WorkloadBpfDump) WithFrontends(frontends []bpfcache.FrontendValue) Work
 func (wd WorkloadBpfDump) WithServices(services []bpfcache.ServiceValue) WorkloadBpfDump {
 	converted := make([]BpfServiceValue, 0, len(services))
 	for _, s := range services {
-		waypointAddr := []byte{}
+		waypointAddr := ""
 		if s.WaypointAddr != [16]byte{} {
-			for _, b := range s.WaypointAddr {
-				waypointAddr = append(waypointAddr, b)
-			}
+			waypointAddr = nets.IpString(s.WaypointAddr)
 		}
 		svc := BpfServiceValue{
 			EndpointCount: []uint32{},

pkg/status/testdata/workload_configdump.json

@@ -1,5 +1,5 @@
 {
-    "Workloads": [
+    "workloads": [
         {
             "uid": "cluster0//Pod/ns/name",
             "addresses": [
@@ -27,7 +27,7 @@
             ]
         }
     ],
-    "Services": [
+    "services": [
         {
             "name": "svc",
             "namespace": "ns",
@@ -51,7 +51,7 @@
             }
         }
     ],
-    "Policies": [
+    "policies": [
         {
             "name": "policy",
             "namespace": "ns",