Fixes regression in BGP route reflector functionality. (cloudnativelabs#573)

murali-reddy · web-flow · commit 4d6b7faaf9d9 · 2018-11-15T08:45:56.000+05:30
Use proper conversion so correct cluster ID is passed to GoBGP library
diff --git a/pkg/controllers/routing/bgp_peers.go b/pkg/controllers/routing/bgp_peers.go
@@ -130,11 +130,11 @@ func (nrc *NetworkRoutingController) syncInternalPeers() {
 				n.RouteReflector = config.RouteReflector{
 					Config: config.RouteReflectorConfig{
 						RouteReflectorClient:    true,
-						RouteReflectorClusterId: config.RrClusterIdType(nrc.bgpClusterID),
+						RouteReflectorClusterId: config.RrClusterIdType(fmt.Sprint(nrc.bgpClusterID)),
 					},
 					State: config.RouteReflectorState{
 						RouteReflectorClient:    true,
-						RouteReflectorClusterId: config.RrClusterIdType(nrc.bgpClusterID),
+						RouteReflectorClusterId: config.RrClusterIdType(fmt.Sprint(nrc.bgpClusterID)),
 					},
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -130,11 +130,11 @@ func (nrc *NetworkRoutingController) syncInternalPeers() {`
`130`	`130`	`n.RouteReflector = config.RouteReflector{`
`131`	`131`	`Config: config.RouteReflectorConfig{`
`132`	`132`	`RouteReflectorClient: true,`
`133`		`- RouteReflectorClusterId: config.RrClusterIdType(nrc.bgpClusterID),`
	`133`	`+ RouteReflectorClusterId: config.RrClusterIdType(fmt.Sprint(nrc.bgpClusterID)),`
`134`	`134`	`},`
`135`	`135`	`State: config.RouteReflectorState{`
`136`	`136`	`RouteReflectorClient: true,`
`137`		`- RouteReflectorClusterId: config.RrClusterIdType(nrc.bgpClusterID),`
	`137`	`+ RouteReflectorClusterId: config.RrClusterIdType(fmt.Sprint(nrc.bgpClusterID)),`
`138`	`138`	`},`
`139`	`139`	`}`
`140`	`140`	`}`