Merge pull request #1533 from amshinde/my-stable-1.5

Stable 1.5 backport: netmon: Fix bug in how routes are converted
kata-containers · Apr 15, 2019 · dc5736e · dc5736e
2 parents 4599bdb + be664a4
commit dc5736e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/netmon/netmon.go b/netmon/netmon.go
@@ -309,7 +309,7 @@ func convertRoutes(netRoutes []netlink.Route) []vcTypes.Route {
 		dst := ""
 		if netRoute.Dst != nil {
 			if netRoute.Dst.IP.To4() != nil {
-				dst = netRoute.Dst.IP.String()
+				dst = netRoute.Dst.String()
 			} else {
 				netmonLog.WithField("destination", netRoute.Dst.IP.String()).Warn("Not IPv4 format")
 			}

diff --git a/netmon/netmon_test.go b/netmon/netmon_test.go
@@ -213,7 +213,7 @@ func TestConvertRoutes(t *testing.T) {
 
 	expected := []vcTypes.Route{
 		{
-			Dest:    testIPAddress,
+			Dest:    testIPAddressWithMask,
 			Gateway: testIPAddress,
 			Source:  testIPAddress,
 			Scope:   uint32(testScope),