gobgp inspect

bgp inspect fix

fixing bgp inspect

Author: abhi

Godeps/Godeps.json

@@ -91,11 +91,6 @@ systemctl start openvswitch
  ovs-vsctl set-manager ptcp:6640) || exit 1
 SCRIPT
 
-provision_gobgp = <<SCRIPT
-#Get gobgp binary
-wget https://cisco.box.com/shared/static/5leqlo84kjh0thty91ouotilm4ish3nz -q -O #{gopath_folder}/bin/gobgp && chmod +x #{gopath_folder}/bin/gobgp
-SCRIPT
-
 provision_bird = <<SCRIPT
 ## setup the environment file. Export the env-vars passed as args to 'vagrant up'
 echo Args passed: [[ $@ ]]
@@ -233,11 +228,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
                 s.inline = provision_common_once
                 s.args = [node_name, node_addr, cluster_ip_nodes, ENV["http_proxy"] || "", ENV["https_proxy"] || "", ENV["USE_RELEASE"] || "", ENV["CONTIV_CLUSTER_STORE"] || "etcd://localhost:2379", ENV["CONTIV_DOCKER_VERSION"] || "", ENV['CONTIV_NODE_OS'] || "", *ENV['CONTIV_ENV']]
             end
-            if ENV['CONTIV_L3'] then
-                node.vm.provision "shell" do |s|
-                    s.inline = provision_gobgp
-                end
-            end
             node.vm.provision "shell", run: "always" do |s|
                 s.inline = provision_common_always
                 s.args = [node_name, node_addr]

Vagrantfile

@@ -18,9 +18,6 @@ package objApi
 import (
 	"errors"
 	"fmt"
-	"strconv"
-	"strings"
-
 	"github.com/contiv/contivmodel"
 	"github.com/contiv/netplugin/core"
 	"github.com/contiv/netplugin/netmaster/gstate"
@@ -30,14 +27,16 @@ import (
 	"github.com/contiv/netplugin/utils"
 	"github.com/contiv/netplugin/utils/netutils"
 	"github.com/contiv/objdb/modeldb"
+	"strconv"
+	"strings"
 
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/gorilla/mux"
-	api "github.com/osrg/gobgp/api"
+	bgpconf "github.com/osrg/gobgp/config"
 )
 
 // APIController stores the api controller state
@@ -47,8 +46,8 @@ type APIController struct {
 
 // BgpInspect is bgp inspect struct
 type BgpInspect struct {
-	Peer *api.Peer
-	Rib  *api.Table
+	Peers []*bgpconf.Neighbor
+	Dsts  []string
 }
 
 var apiCtrler *APIController
@@ -1560,7 +1559,6 @@ func (ac *APIController) BgpUpdate(oldbgpCfg *contivModel.Bgp, NewbgpCfg *contiv
 
 //BgpGetOper inspects the oper state of bgp object
 func (ac *APIController) BgpGetOper(bgp *contivModel.BgpInspect) error {
-	log.Infof("Received BgpInspect: %+v", bgp)
 	var obj *BgpInspect
 	var host string
 
@@ -1607,12 +1605,18 @@ func (ac *APIController) BgpGetOper(bgp *contivModel.BgpInspect) error {
 	if err := json.Unmarshal(response, &obj); err != nil {
 		return err
 	}
+	//Assuming bgp peer state will be only for one neighbor
+	if obj.Peers != nil {
+		nConf := obj.Peers[0]
+		bgp.Oper.NeighborStatus = string(nConf.State.SessionState)
+		bgp.Oper.AdminStatus = nConf.State.AdminState
+	}
 
-	bgp.Oper.NeighborStatus = obj.Peer.Info.BgpState
-	bgp.Oper.AdminStatus = obj.Peer.Info.AdminState
-	bgp.Oper.NumRoutes = len(obj.Rib.Destinations)
-	for _, v := range obj.Rib.Destinations {
-		bgp.Oper.Routes = append(bgp.Oper.Routes, v.Prefix)
+	if obj.Dsts != nil {
+		for _, dst := range obj.Dsts {
+			bgp.Oper.Routes = append(bgp.Oper.Routes, dst)
+		}
+		bgp.Oper.NumRoutes = len(bgp.Oper.Routes)
 	}
 
 	return nil
@@ -1802,3 +1806,17 @@ func validatePorts(ports []string) bool {
 	}
 	return true
 }
+
+/*
+func getIp(prefix string) string {
+	length := len(prefix)
+	var p string
+	for i := 0; i+8 < len; i = i + 8 {
+		temp := prefix[i : i+8]
+		s := strconv.ParseInt(temp, 2, 8)
+
+		p = string(s) + "."
+	}
+
+}
+*/

netmaster/objApi/apiController.go

@@ -824,7 +824,7 @@ func (s *systemtestSuite) SetupBgp(c *C, misConfig bool) {
 	var neighborIP, routerIP, hostname string
 	for num := 0; num < len(s.nodes); num++ {
 		hostname = fmt.Sprintf("netplugin-node%d", num+1)
-		fmt.Println("Adding bgp host to", hostname)
+		logrus.Infof("Adding bgp host to %s", hostname)
 		netNum := (num + 1) % 3
 		if netNum == 0 {
 			routerIP = "80.1.1.2/24"
@@ -863,52 +863,67 @@ func (s *systemtestSuite) TearDownBgp(c *C) {
 	}
 }
 
-func (s *systemtestSuite) CheckBgpConnection(c *C) error {
+func (s *systemtestSuite) CheckBgpConnection(c *C) {
 
-	count := 0
-	for i := 0; i < 100; i++ {
-		if count == len(s.nodes) {
-			return nil
-		}
-		count = 0
-		time.Sleep(3 * time.Second)
-		for _, node := range s.nodes {
-			out, _ := node.tbnode.RunCommandWithOutput("/opt/gopath/bin/gobgp neighbor")
-			fmt.Println(out)
-			if strings.Contains(out, "Establ") {
-				count++
+	endChan := make(chan error)
+	for _, n := range s.nodes {
+		go func(n node) {
+			for i := 0; i < 100; i++ {
+				time.Sleep(3 * time.Second)
+				bgp, err := s.cli.BgpInspect(n.Name())
+				if err != nil {
+					continue
+				}
+				if strings.Contains(bgp.Oper.NeighborStatus, "established") {
+					logrus.Infof("Bgp Connection on Node:%s established", n.Name())
+					endChan <- nil
+					return
+				}
 			}
-		}
+			endChan <- errors.New("bgp connection failed")
+		}(*n)
+	}
+
+	for range s.nodes {
+		c.Assert(<-endChan, IsNil)
 	}
-	return errors.New("BGP connection not established")
 }
 
-func (s *systemtestSuite) CheckBgpNoConnection(c *C) error {
+func (s *systemtestSuite) CheckBgpNoConnection(c *C) {
 
-	count := 0
-	for i := 0; i < 100; i++ {
-		if count == len(s.nodes) {
-			return nil
-		}
-		count = 0
-		time.Sleep(3 * time.Second)
-		for _, node := range s.nodes {
-			out, _ := node.tbnode.RunCommandWithOutput("/opt/gopath/bin/gobgp neighbor")
-			fmt.Println(out)
-			if !strings.Contains(out, "Establ") {
-				count++
+	endChan := make(chan error)
+	for _, n := range s.nodes {
+		go func(n node) {
+			for i := 0; i < 100; i++ {
+				time.Sleep(3 * time.Second)
+				bgp, err := s.cli.BgpInspect(n.Name())
+				if err != nil {
+					continue
+				}
+				if !strings.Contains(bgp.Oper.NeighborStatus, "established") {
+					logrus.Infof("Bgp Connection on Node:%s established", n.Name())
+					endChan <- nil
+					return
+				}
 			}
-		}
+			endChan <- errors.New("bgp connection failed")
+		}(*n)
+	}
+
+	for range s.nodes {
+		c.Assert(<-endChan, IsNil)
 	}
-	return errors.New("BGP connection persists")
 }
 
 func (s *systemtestSuite) CheckBgpConnectionForaNode(c *C, node remotessh.TestbedNode) error {
 	for i := 0; i < 100; i++ {
 		time.Sleep(3 * time.Second)
-		out, _ := node.RunCommandWithOutput("/opt/gopath/bin/gobgp neighbor")
-		fmt.Println(out)
-		if strings.Contains(out, "Establ") {
+		bgp, err := s.cli.BgpInspect(node.GetName())
+		if err != nil {
+			continue
+		}
+		if strings.Contains(bgp.Oper.NeighborStatus, "established") {
+			logrus.Infof("Bgp Connection on Node:%s established", node.GetName())
 			return nil
 		}
 	}
@@ -918,9 +933,12 @@ func (s *systemtestSuite) CheckBgpConnectionForaNode(c *C, node remotessh.Testbe
 func (s *systemtestSuite) CheckBgpNoConnectionForaNode(c *C, node remotessh.TestbedNode) error {
 	for i := 0; i < 100; i++ {
 		time.Sleep(3 * time.Second)
-		out, _ := node.RunCommandWithOutput("/opt/gopath/bin/gobgp neighbor")
-		fmt.Println(out)
-		if !strings.Contains(out, "Establ") {
+		bgp, err := s.cli.BgpInspect(node.GetName())
+		if err != nil {
+			continue
+		}
+		if !strings.Contains(bgp.Oper.NeighborStatus, "established") {
+			logrus.Infof("Bgp Connection on Node:%s Disconnected", node.GetName())
 			return nil
 		}
 	}
@@ -932,16 +950,25 @@ func (s *systemtestSuite) CheckBgpRouteDistribution(c *C, containers []*containe
 	for _, n := range s.nodes {
 		go func(n *node, containers []*container) {
 			logrus.Infof("Checking Bgp container route distribution on node %s", n.Name())
+			remoteRoutes := 0
+			for _, cont := range containers {
+				if cont.node != n {
+					remoteRoutes++
+				}
+			}
 			for i := 0; i < 120; i++ {
 				time.Sleep(1 * time.Second)
 				contCount := 0
-				for _, cont := range containers {
-					out, _ := n.tbnode.RunCommandWithOutput("/opt/gopath/bin/gobgp global rib")
-					if strings.Contains(out, cont.eth0.ip) {
-						contCount++
+				bgp, err := s.cli.BgpInspect(n.Name())
+				if err == nil {
+					routes := strings.Join(bgp.Oper.Routes, ",")
+					for _, cont := range containers {
+						if strings.Contains(routes, cont.eth0.ip) {
+							contCount++
+						}
 					}
 				}
-				if contCount == len(containers) {
+				if contCount == remoteRoutes {
 					endChan <- nil
 					logrus.Infof("Done checking container route distribution on node %s", n.Name())
 					return
@@ -968,12 +995,14 @@ func (s *systemtestSuite) CheckBgpRouteDistributionIPList(c *C, ips []string) ([
 		for _, ip := range ips {
 			nodeCount = 0
 			for _, node := range s.nodes {
-				out, _ := node.tbnode.RunCommandWithOutput("/opt/gopath/bin/gobgp global rib")
-				fmt.Println(out)
-				if strings.Contains(out, ip) {
-					nodeCount++
-				} else {
-					break
+				bgp, err := s.cli.BgpInspect(node.Name())
+				if err == nil {
+					routes := strings.Join(bgp.Oper.Routes, ",")
+					if !strings.Contains(routes, ip) {
+						nodeCount++
+					} else {
+						break
+					}
 				}
 			}
 			if nodeCount == len(s.nodes) {