feat: add tests for SkipDefaultRoutes handling in network container requests

Author: mugeshsp

cns/NetworkContainerContract_test.go

@@ -240,3 +240,40 @@ func TestPostNetworkContainersRequest_Validate(t *testing.T) {
 		})
 	}
 }
+
+func TestCreateNetworkContainerRequest_SkipDefaultRoutes(t *testing.T) {
+	tests := []struct {
+		name     string
+		req      CreateNetworkContainerRequest
+		expected bool
+	}{
+		{
+			name: "SkipDefaultRoutesTrue",
+			req: CreateNetworkContainerRequest{
+				NetworkContainerid: "f47ac10b-58cc-0372-8567-0e02b2c3d479",
+				SkipDefaultRoutes:  true,
+			},
+			expected: true,
+		},
+		{
+			name: "SkipDefaultRoutesFalse",
+			req: CreateNetworkContainerRequest{
+				NetworkContainerid: "f47ac10b-58cc-0372-8567-0e02b2c3d479",
+				SkipDefaultRoutes:  false,
+			},
+			expected: false,
+		},
+		{
+			name: "SkipDefaultRoutesIgnored",
+			req: CreateNetworkContainerRequest{
+				NetworkContainerid: "f47ac10b-58cc-0372-8567-0e02b2c3d479",
+			},
+			expected: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			assert.Equal(t, tt.expected, tt.req.SkipDefaultRoutes, "SkipDefaultRoutes value should match expected")
+		})
+	}
+}

network/transparent_vlan_endpointclient_linux.go

@@ -649,11 +649,11 @@ func (client *TransparentVlanEndpointClient) addDefaultRoutes(linkToName string,
 }
 
 // Helper that creates routing rules for the current NS which direct packets
-// to the virtual gateway ip on linkToName device interface
-// Route 1: 169.254.2.1 dev <linkToName>
-// Route 2: default via 169.254.2.1 dev <linkToName>
+// to the subnet gateway ip on linkToName device interface
+// Route 1: <gatewayIP> dev <linkToName>
+// Route 2: <subnetCIDR> via <gatewayIP> dev <linkToName>
 func (client *TransparentVlanEndpointClient) addCustomRoutes(linkToName string, gatewayIP net.IP, subnetCIDR net.IPNet, table int) error {
-	// Add route for virtualgwip (ip route add <gatewayIP> dev <linkToName>)
+	// Add route for subnetgwIP (ip route add <gatewayIP> dev <linkToName>)
 	gWIP, gwNet, _ := net.ParseCIDR(gatewayIP.String() + "/32")
 	routeInfo := RouteInfo{
 		Dst:   *gwNet,

network/transparent_vlan_endpointclient_linux_test.go

@@ -867,6 +867,74 @@ func TestTransparentVlanConfigureContainerInterfacesAndRoutes(t *testing.T) {
 			wantErr:    true,
 			wantErrMsg: "failed container ns add default routes: addRoutes failed: " + netio.ErrMockNetIOFail.Error() + ":B1veth0",
 		},
+		{
+			name: "Configure interface and routes good path with SkipDefaultRoutes set to true for container",
+			client: &TransparentVlanEndpointClient{
+				primaryHostIfName: "eth0",
+				vlanIfName:        "eth0.1",
+				vnetVethName:      "A1veth0",
+				containerVethName: "B1veth0",
+				vnetNSName:        "az_ns_1",
+				vnetMac:           vnetMac,
+				netlink:           netlink.NewMockNetlink(false, ""),
+				plClient:          platform.NewMockExecClient(false),
+				netUtilsClient:    networkutils.NewNetworkUtils(nl, plc),
+				netioshim:         netio.NewMockNetIO(false, 0),
+			},
+			epInfo: &EndpointInfo{
+				SkipDefaultRoutes: true,
+				IPAddresses: []net.IPNet{
+					{
+						IP:   net.ParseIP("192.168.0.4"),
+						Mask: net.CIDRMask(subnetv4Mask, ipv4Bits),
+					},
+				},
+				Subnets: []SubnetInfo{
+					{
+						Gateway: net.ParseIP("192.168.0.1"),
+						Prefix: net.IPNet{
+							IP:   net.ParseIP("192.168.0.0"),
+							Mask: net.CIDRMask(subnetv4Mask, ipv4Bits),
+						},
+					},
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "Configure interface and routes good path with SkipDefaultRoutes set to false for container",
+			client: &TransparentVlanEndpointClient{
+				primaryHostIfName: "eth0",
+				vlanIfName:        "eth0.1",
+				vnetVethName:      "A1veth0",
+				containerVethName: "B1veth0",
+				vnetNSName:        "az_ns_1",
+				vnetMac:           vnetMac,
+				netlink:           netlink.NewMockNetlink(false, ""),
+				plClient:          platform.NewMockExecClient(false),
+				netUtilsClient:    networkutils.NewNetworkUtils(nl, plc),
+				netioshim:         netio.NewMockNetIO(false, 0),
+			},
+			epInfo: &EndpointInfo{
+				SkipDefaultRoutes: true,
+				IPAddresses: []net.IPNet{
+					{
+						IP:   net.ParseIP("192.168.0.4"),
+						Mask: net.CIDRMask(subnetv4Mask, ipv4Bits),
+					},
+				},
+				Subnets: []SubnetInfo{
+					{
+						Gateway: net.ParseIP("192.168.0.1"),
+						Prefix: net.IPNet{
+							IP:   net.ParseIP("192.168.0.0"),
+							Mask: net.CIDRMask(subnetv4Mask, ipv4Bits),
+						},
+					},
+				},
+			},
+			wantErr: false,
+		},
 	}
 
 	for _, tt := range tests {
@@ -1008,3 +1076,7 @@ func TestRunWithRetries(t *testing.T) {
 		})
 	}
 }
+
+func TestAddCustomRoutes(t *testing.T) {
+
+}