enforcing single uplink in routing mode

Author: abhi

ofnetAgent.go

@@ -872,7 +872,14 @@ func (self *OfnetAgent) UpdateUplink(uplinkName string, portUpds PortUpdates) er
 // RemoveUplink remove an uplink to the switch
 func (self *OfnetAgent) RemoveUplink(uplinkName string) error {
 	// Call the datapath
-	return self.datapath.RemoveUplink(uplinkName)
+	err := self.datapath.RemoveUplink(uplinkName)
+	if err != nil {
+		return err
+	}
+	if self.protopath != nil {
+		self.protopath.SetRouterInfo(nil)
+	}
+	return nil
 }
 
 // AddSvcSpec adds a service spec to proxy
@@ -996,18 +1003,20 @@ func (self *OfnetAgent) AddBgp(routerIP string, As string, neighborAs string, pe
 		log.Errorf("Ofnet is not initialized in routing mode")
 		return errors.New("Ofnet not in routing mode")
 	}
+
 	routerInfo := &OfnetProtoRouterInfo{
 		ProtocolType: "bgp",
 		RouterIP:     routerIP,
 		As:           As,
 	}
+
 	neighborInfo := &OfnetProtoNeighborInfo{
 		ProtocolType: "bgp",
 		NeighborIP:   peer,
 		As:           neighborAs,
 	}
 	rinfo := self.GetRouterInfo()
-	if rinfo != nil {
+	if rinfo != nil && len(rinfo.RouterIP) != 0 {
 		self.DeleteBgp()
 	}
 

ofnetBgp.go

@@ -97,6 +97,10 @@ Bgp serve routine does the following:
 */
 func (self *OfnetBgp) StartProtoServer(routerInfo *OfnetProtoRouterInfo) error {
 
+	if self.uplinkPort == nil {
+		return fmt.Errorf("Unable to start protocol server without uplink")
+	}
+
 	log.Infof("Starting the Bgp Server with %#v", routerInfo)
 
 	//Flush previous external endpoints if any
@@ -344,6 +348,7 @@ func (self *OfnetBgp) GetRouterInfo() *OfnetProtoRouterInfo {
 	if self.routerIP == "" {
 		return nil
 	}
+
 	routerInfo := &OfnetProtoRouterInfo{
 		ProtocolType: "bgp",
 		RouterIP:     self.routerIP,
@@ -596,8 +601,12 @@ func (self *OfnetBgp) InspectProto() (interface{}, error) {
 }
 
 func (self *OfnetBgp) SetRouterInfo(uplink *PortInfo) error {
-	log.Infof("Received Set Router info for %v \n", uplink)
-	if uplink != nil && len(uplink.MbrLinks) == 0 {
+	log.Infof("Received Set Router info for %+v \n", uplink)
+	if uplink == nil {
+		self.uplinkPort = nil
+		return nil
+	}
+	if len(uplink.MbrLinks) == 0 {
 		return fmt.Errorf("L3 routing mode currently requires atleast one uplink interface. Num uplinks active: 0")
 	}
 	uplink.checkLinkStatus()

ofnet_port_test.go

@@ -47,12 +47,6 @@ func TestUplinkPortCreateDelete(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Uplink port deletion failed for vlrouter agent: %+v", err)
 	}
-
-	// Check uplink bonded port creation in vlrouter mode
-	err = addUplink(vlrtrAgents[0], uplinkBondedPort)
-	if err == nil {
-		t.Fatalf("Uplink port creation with multiple interfaces expected to fail for vlrouter agent: %+v", err)
-	}
 }
 
 func TestPortActiveLinksStateChange(t *testing.T) {

ofnet_route_test.go

@@ -344,9 +344,14 @@ func TestOfnetBgpPeerAddDelete(t *testing.T) {
 	routerIP := "50.1.1.1/24"
 	as := "65002"
 	//Add Bgp neighbor and check if it is successful
-
+	uplinkSinglePort := createPort("upPort")
 	for i := 0; i < NUM_VLRTR_AGENT; i++ {
-		err := vlrtrAgents[i].AddBgp(routerIP, as, neighborAs, peer)
+		err := addUplink(vlrtrAgents[0], uplinkSinglePort)
+		if err != nil {
+			t.Fatalf("Uplink port creation failed for vlrouter agent: %+v", err)
+		}
+		time.Sleep(2 * time.Second)
+		err = vlrtrAgents[i].AddBgp(routerIP, as, neighborAs, peer)
 		if err != nil {
 			t.Errorf("Error adding Bgp Neighbor: %v", err)
 			return
@@ -383,6 +388,10 @@ func TestOfnetBgpPeerAddDelete(t *testing.T) {
 			t.Errorf("Neighbor is not deleted: %v", err)
 			return
 		}
+		err = delUplink(vlrtrAgents[0], uplinkSinglePort)
+		if err != nil {
+			t.Fatalf("Uplink port deletion failed for vlrouter agent: %+v", err)
+		}
 	}
 }
 
@@ -393,11 +402,15 @@ func TestOfnetVlrouteAddDelete(t *testing.T) {
 	routerIP := "50.1.1.1/24"
 	as := "65002"
 	//Add Bgp neighbor and check if it is successful
-
+	uplinkSinglePort := createPort("upPort")
 	for i := 0; i < NUM_VLRTR_AGENT; i++ {
-		err := vlrtrAgents[i].AddBgp(routerIP, as, neighborAs, peer)
+		err := addUplink(vlrtrAgents[0], uplinkSinglePort)
+		if err != nil {
+			t.Fatalf("Uplink port creation failed for vlrouter agent: %+v", err)
+		}
+		time.Sleep(2 * time.Second)
+		err = vlrtrAgents[i].AddBgp(routerIP, as, neighborAs, peer)
 		if err != nil {
-			log.Infof("THE ERROR IS %s", err)
 			t.Errorf("Error adding Bgp Neighbor: %v", err)
 			return
 		}
@@ -488,7 +501,11 @@ func TestOfnetVlrouteAddDelete(t *testing.T) {
 			t.Errorf("Still found the flow %s on ovs %s", ipFlowMatch, brName)
 		}
 		// verify IPv6 flow entry exists
-		err = vlrtrAgents[i].DeleteBgp()
+		vlrtrAgents[i].DeleteBgp()
+		err = delUplink(vlrtrAgents[0], uplinkSinglePort)
+		if err != nil {
+			t.Fatalf("Uplink port deletion failed for vlrouter agent: %+v", err)
+		}
 		log.Infof("Verified all flows are deleted")
 	}
 }
@@ -501,9 +518,13 @@ func TestOfnetBgpVlrouteAddDelete(t *testing.T) {
 	routerIP := "50.1.1.2/24"
 	as := "65002"
 	//Add Bgp neighbor and check if it is successful
-
+	uplinkSinglePort := createPort("upPort")
 	for i := 0; i < NUM_VLRTR_AGENT; i++ {
-		err := vlrtrAgents[i].AddBgp(routerIP, as, neighborAs, peer)
+		err := addUplink(vlrtrAgents[0], uplinkSinglePort)
+		if err != nil {
+			t.Fatalf("Uplink port creation failed for vlrouter agent: %+v", err)
+		}
+		err = vlrtrAgents[i].AddBgp(routerIP, as, neighborAs, peer)
 		time.Sleep(5 * time.Second)
 		if err != nil {
 			t.Errorf("Error adding Bgp Neighbor: %v", err)
@@ -556,5 +577,9 @@ func TestOfnetBgpVlrouteAddDelete(t *testing.T) {
 			return
 		}
 		log.Infof("ipflow %s on ovs %s has been deleted from OVS", ipFlowMatch, brName)
+		err = delUplink(vlrtrAgents[0], uplinkSinglePort)
+		if err != nil {
+			t.Fatalf("Uplink port deletion failed for vlrouter agent: %+v", err)
+		}
 	}
 }

vlrouter.go

@@ -1006,7 +1006,7 @@ func (vl *Vlrouter) processArp(pkt protocol.Ethernet, inPort uint32) {
 						if vl.agent.GetRouterInfo() != nil {
 							uplink := vl.agent.GetRouterInfo().UplinkPort
 
-							if uplink != nil && len(uplink.MbrLinks) == 0 {
+							if uplink == nil || len(uplink.MbrLinks) == 0 {
 								log.Errorf("Error getting interface information. Err: No member links present")
 								return
 							}
@@ -1147,12 +1147,12 @@ func (vl *Vlrouter) resolveUnresolvedEPs(MacAddrStr string, portNo uint32) {
 func (vl *Vlrouter) AddUplink(uplinkPort *PortInfo) error {
 	log.Infof("Adding uplink: %+v", uplinkPort)
 
-	if len(uplinkPort.MbrLinks) != 1 {
-		err := fmt.Errorf("Only one uplink interface supported in vlrouter mode. Num uplinks configured: %d", len(uplinkPort.MbrLinks))
-		log.Errorf("Error adding uplink: %+v", err)
+	if len(uplinkPort.MbrLinks) == 0 {
+		err := fmt.Errorf("Atleast one uplink is needed to be configured for routing mode. Num uplinks configured: %d", len(uplinkPort.MbrLinks))
 		return err
 	}
 
+	uplinkPort.MbrLinks = uplinkPort.MbrLinks[:1]
 	linkInfo := uplinkPort.MbrLinks[0]
 	vl.uplinkOfp = linkInfo.OfPort
 	dnsUplinkFlow, err := vl.inputTable.NewFlow(ofctrl.FlowMatch{
@@ -1297,12 +1297,12 @@ func (vl *Vlrouter) sendArpPacketOut(srcIP, dstIP net.IP) {
 	for uplinkObj := range vl.uplinkPortDb.IterBuffered() {
 		uplink := uplinkObj.Val.(*PortInfo)
 		uplinkMemberLink = uplink.getActiveLink()
-		if uplinkMemberLink == nil {
-			log.Debugf("No active interface on uplink. Not sending ARP for IP:%s \n", dstIP.String())
-			return
-		}
 		break
 	}
+	if uplinkMemberLink == nil {
+		log.Debugf("No active interface on uplink. Not sending ARP for IP:%s \n", dstIP.String())
+		return
+	}
 
 	ofPortno := uplinkMemberLink.OfPort
 	intf, _ := net.InterfaceByName(uplinkMemberLink.Name)