populate pod CID in network routing controler to simulate reading from node spec once at begining (#844)

Author: murali-reddy

pkg/controllers/routing/network_routes_controller_test.go

@@ -1,7 +1,6 @@
 package routing
 
 import (
-	"errors"
 	"net"
 	"os"
 	"reflect"
@@ -1003,6 +1002,7 @@ func Test_advertisePodRoute(t *testing.T) {
 			"add bgp path for pod cidr using NODE_NAME",
 			&NetworkRoutingController{
 				bgpServer: gobgp.NewBgpServer(),
+				podCidr:   "172.20.0.0/24",
 			},
 			"node-1",
 			&v1core.Node{
@@ -1023,6 +1023,7 @@ func Test_advertisePodRoute(t *testing.T) {
 			&NetworkRoutingController{
 				bgpServer:        gobgp.NewBgpServer(),
 				hostnameOverride: "node-1",
+				podCidr:          "172.20.0.0/24",
 			},
 			"",
 			&v1core.Node{
@@ -1038,40 +1039,43 @@ func Test_advertisePodRoute(t *testing.T) {
 			},
 			nil,
 		},
-		{
-			"add bgp path for pod cidr without NODE_NAME or hostname override",
-			&NetworkRoutingController{
-				bgpServer: gobgp.NewBgpServer(),
-			},
-			"",
-			&v1core.Node{
-				ObjectMeta: metav1.ObjectMeta{
-					Name: "node-1",
-				},
-				Spec: v1core.NodeSpec{
-					PodCIDR: "172.20.0.0/24",
+		/* disabling tests for now, as node POD cidr is read just once at the starting of the program
+		   Tests needs to be adopted to catch the errors when NetworkRoutingController starts
+			{
+				"add bgp path for pod cidr without NODE_NAME or hostname override",
+				&NetworkRoutingController{
+					bgpServer: gobgp.NewBgpServer(),
+				},
+				"",
+				&v1core.Node{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "node-1",
+					},
+					Spec: v1core.NodeSpec{
+						PodCIDR: "172.20.0.0/24",
+					},
 				},
+				map[string]bool{},
+				errors.New("Failed to get pod CIDR allocated for the node due to: Failed to identify the node by NODE_NAME, hostname or --hostname-override"),
 			},
-			map[string]bool{},
-			errors.New("Failed to get pod CIDR allocated for the node due to: Failed to identify the node by NODE_NAME, hostname or --hostname-override"),
-		},
-		{
-			"node does not have pod cidr set",
-			&NetworkRoutingController{
-				bgpServer: gobgp.NewBgpServer(),
-			},
-			"node-1",
-			&v1core.Node{
-				ObjectMeta: metav1.ObjectMeta{
-					Name: "node-1",
+			{
+				"node does not have pod cidr set",
+				&NetworkRoutingController{
+					bgpServer: gobgp.NewBgpServer(),
 				},
-				Spec: v1core.NodeSpec{
-					PodCIDR: "",
+				"node-1",
+				&v1core.Node{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "node-1",
+					},
+					Spec: v1core.NodeSpec{
+						PodCIDR: "",
+					},
 				},
+				map[string]bool{},
+				errors.New("node.Spec.PodCIDR not set for node: node-1"),
 			},
-			map[string]bool{},
-			errors.New("node.Spec.PodCIDR not set for node: node-1"),
-		},
+		*/
 	}
 
 	for _, testcase := range testcases {
@@ -1508,6 +1512,7 @@ func Test_AddPolicies(t *testing.T) {
 				bgpServer:         gobgp.NewBgpServer(),
 				activeNodes:       make(map[string]bool),
 				nodeAsnNumber:     100,
+				podCidr:           "172.20.0.0/24",
 			},
 			[]*v1core.Node{
 				{
@@ -1637,6 +1642,7 @@ func Test_AddPolicies(t *testing.T) {
 				bgpEnableInternal: true,
 				bgpServer:         gobgp.NewBgpServer(),
 				activeNodes:       make(map[string]bool),
+				podCidr:           "172.20.0.0/24",
 				globalPeerRouters: []*config.Neighbor{
 					{
 						Config: config.NeighborConfig{NeighborAddress: "10.10.0.1"},
@@ -1801,6 +1807,7 @@ func Test_AddPolicies(t *testing.T) {
 				bgpEnableInternal: false,
 				bgpServer:         gobgp.NewBgpServer(),
 				activeNodes:       make(map[string]bool),
+				podCidr:           "172.20.0.0/24",
 				globalPeerRouters: []*config.Neighbor{
 					{
 						Config: config.NeighborConfig{NeighborAddress: "10.10.0.1"},
@@ -1952,6 +1959,7 @@ func Test_AddPolicies(t *testing.T) {
 				pathPrependAS:     "65100",
 				bgpServer:         gobgp.NewBgpServer(),
 				activeNodes:       make(map[string]bool),
+				podCidr:           "172.20.0.0/24",
 				globalPeerRouters: []*config.Neighbor{
 					{
 						Config: config.NeighborConfig{NeighborAddress: "10.10.0.1"},
@@ -2124,6 +2132,7 @@ func Test_AddPolicies(t *testing.T) {
 				pathPrependAS:     "65100",
 				bgpServer:         gobgp.NewBgpServer(),
 				activeNodes:       make(map[string]bool),
+				podCidr:           "172.20.0.0/24",
 				globalPeerRouters: []*config.Neighbor{
 					{
 						Config: config.NeighborConfig{NeighborAddress: "10.10.0.1"},