[v3 migration] change net.[]InterfaceAddr to net.InterfaceAddrList

v3/net/net.go

@@ -53,15 +53,21 @@ type InterfaceAddr struct {
 	Addr string `json:"addr"`
 }
 
+// InterfaceAddrList is a list of InterfaceAddr
+type InterfaceAddrList []InterfaceAddr
+
 type InterfaceStat struct {
 	Index        int               `json:"index"`
 	MTU          int               `json:"mtu"`          // maximum transmission unit
 	Name         string            `json:"name"`         // e.g., "en0", "lo0", "eth0.100"
 	HardwareAddr string            `json:"hardwareAddr"` // IEEE MAC-48, EUI-48 and EUI-64 form
 	Flags        []string          `json:"flags"`        // e.g., FlagUp, FlagLoopback, FlagMulticast
-	Addrs        []InterfaceAddr `json:"addrs"`
+	Addrs        InterfaceAddrList `json:"addrs"`
 }
 
+// InterfaceStatList is a list of InterfaceStat
+type InterfaceStatList []InterfaceStat
+
 type FilterStat struct {
 	ConnTrackCount int64 `json:"connTrackCount"`
 	ConnTrackMax   int64 `json:"connTrackMax"`
@@ -182,6 +188,11 @@ func (n InterfaceStat) String() string {
 	return string(s)
 }
 
+func (l InterfaceStatList) String() string {
+	s, _ := json.Marshal(l)
+	return string(s)
+}
+
 func (n InterfaceAddr) String() string {
 	s, _ := json.Marshal(n)
 	return string(s)
@@ -192,16 +203,16 @@ func (n ConntrackStat) String() string {
 	return string(s)
 }
 
-func Interfaces() ([]InterfaceStat, error) {
+func Interfaces() (InterfaceStatList, error) {
 	return InterfacesWithContext(context.Background())
 }
 
-func InterfacesWithContext(ctx context.Context) ([]InterfaceStat, error) {
+func InterfacesWithContext(ctx context.Context) (InterfaceStatList, error) {
 	is, err := net.Interfaces()
 	if err != nil {
 		return nil, err
 	}
-	ret := make([]InterfaceStat, 0, len(is))
+	ret := make(InterfaceStatList, 0, len(is))
 	for _, ifi := range is {
 
 		var flags []string
@@ -230,7 +241,7 @@ func InterfacesWithContext(ctx context.Context) ([]InterfaceStat, error) {
 		}
 		addrs, err := ifi.Addrs()
 		if err == nil {
-			r.Addrs = make([]InterfaceAddr, 0, len(addrs))
+			r.Addrs = make(InterfaceAddrList, 0, len(addrs))
 			for _, addr := range addrs {
 				r.Addrs = append(r.Addrs, InterfaceAddr{
 					Addr: addr.String(),

v3/net/net_test.go

@@ -19,7 +19,7 @@ func TestAddrString(t *testing.T) {
 	v := Addr{IP: "192.168.0.1", Port: 8000}
 
 	s := fmt.Sprintf("%v", v)
-	if s != "{\"ip\":\"192.168.0.1\",\"port\":8000}" {
+	if s != `{"ip":"192.168.0.1","port":8000}` {
 		t.Errorf("Addr string is invalid: %v", v)
 	}
 }
@@ -245,3 +245,25 @@ func TestNetFilterCounters(t *testing.T) {
 	}
 
 }
+
+func TestInterfaceStatString(t *testing.T) {
+	v := InterfaceStat{
+		Index:        0,
+		MTU:          1500,
+		Name:         "eth0",
+		HardwareAddr: "01:23:45:67:89:ab",
+		Flags:        []string{"up", "down"},
+		Addrs:        InterfaceAddrList{{Addr: "1.2.3.4"}, {Addr: "5.6.7.8"}},
+	}
+
+	s := fmt.Sprintf("%v", v)
+	if s != `{"index":0,"mtu":1500,"name":"eth0","hardwareAddr":"01:23:45:67:89:ab","flags":["up","down"],"addrs":[{"addr":"1.2.3.4"},{"addr":"5.6.7.8"}]}` {
+		t.Errorf("InterfaceStat string is invalid: %v", s)
+	}
+
+	list := InterfaceStatList{v, v}
+	s = fmt.Sprintf("%v", list)
+	if s != `[{"index":0,"mtu":1500,"name":"eth0","hardwareAddr":"01:23:45:67:89:ab","flags":["up","down"],"addrs":[{"addr":"1.2.3.4"},{"addr":"5.6.7.8"}]},{"index":0,"mtu":1500,"name":"eth0","hardwareAddr":"01:23:45:67:89:ab","flags":["up","down"],"addrs":[{"addr":"1.2.3.4"},{"addr":"5.6.7.8"}]}]` {
+		t.Errorf("InterfaceStatList string is invalid: %v", s)
+	}
+}