bgp inspect and test case fixes

godep update

Author: abhi

Godeps/Godeps.json

@@ -51,8 +51,9 @@ type OvsDriverOperState struct {
 	core.CommonState
 
 	// used to allocate port names. XXX: should it be user controlled?
-	CurrPortNum int                `json:"currPortNum"`
-	LocalEpInfo map[string]*EpInfo `json:"LocalEpInfo"` // info about local endpoints
+	CurrPortNum      int                `json:"currPortNum"`
+	LocalEpInfo      map[string]*EpInfo `json:"LocalEpInfo"` // info about local endpoints
+	localEpInfoMutex sync.Mutex
 }
 
 // Write the state
@@ -422,11 +423,13 @@ func (d *OvsDriver) CreateEndpoint(id string) error {
 	}
 
 	// save local endpoint info
+	d.oper.localEpInfoMutex.Lock()
 	d.oper.LocalEpInfo[id] = &EpInfo{
 		Ovsportname: ovsPortName,
 		EpgKey:      epgKey,
 		BridgeType:  pktTagType,
 	}
+	d.oper.localEpInfoMutex.Unlock()
 	err = d.oper.Write()
 	if err != nil {
 		return err
@@ -478,6 +481,8 @@ func (d *OvsDriver) UpdateEndpointGroup(id string) error {
 			epgBandwidth = netutils.ConvertBandwidth(cfgEpGroup.Bandwidth)
 		}
 
+		d.oper.localEpInfoMutex.Lock()
+		defer d.oper.localEpInfoMutex.Unlock()
 		for _, epInfo := range d.oper.LocalEpInfo {
 			if epInfo.EpgKey == id {
 				log.Debugf("Applying bandwidth: %s on: %s ", cfgEpGroup.Bandwidth, epInfo.Ovsportname)
@@ -533,7 +538,10 @@ func (d *OvsDriver) DeleteEndpoint(id string) error {
 	if err != nil {
 		log.Errorf("Error deleting endpoint: %+v. Err: %v", epOper, err)
 	}
+
+	d.oper.localEpInfoMutex.Lock()
 	delete(d.oper.LocalEpInfo, id)
+	d.oper.localEpInfoMutex.Unlock()
 
 	return nil
 }

drivers/ovsdriver.go

@@ -18,6 +18,9 @@ package objApi
 import (
 	"errors"
 	"fmt"
+	"strconv"
+	"strings"
+
 	"github.com/contiv/contivmodel"
 	"github.com/contiv/netplugin/core"
 	"github.com/contiv/netplugin/netmaster/gstate"
@@ -27,8 +30,6 @@ import (
 	"github.com/contiv/netplugin/utils"
 	"github.com/contiv/netplugin/utils/netutils"
 	"github.com/contiv/objdb/modeldb"
-	"strconv"
-	"strings"
 
 	"encoding/json"
 	"io/ioutil"
@@ -1806,17 +1807,3 @@ 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

@@ -196,7 +196,6 @@ func (s *systemtestSuite) TestBgpTriggerPeerAddDelete(c *C) {
 		c.Assert(s.pingTest(allcontainers), IsNil)
 
 		s.TearDownBgp(c)
-		s.CheckBgpNoConnection(c)
 	}
 }
 
@@ -638,7 +637,7 @@ func (s *systemtestSuite) TestBgpMultiTrigger(c *C) {
 			}
 		}
 		c.Assert(nodeToStop.startNetplugin("-vlan-if=eth2"), IsNil)
-		time.Sleep(15 * time.Second)
+		time.Sleep(120 * time.Second)
 		nodeToStop.tbnode.RunCommandWithOutput("sudo ip link set inb01 up")
 		s.CheckBgpConnectionForaNode(c, nodeToStop.tbnode)
 
@@ -985,7 +984,7 @@ func (s *systemtestSuite) CheckBgpRouteDistribution(c *C, containers []*containe
 	return nil
 }
 
-func (s *systemtestSuite) CheckBgpRouteDistributionIPList(c *C, ips []string) ([]string, error) {
+func (s *systemtestSuite) CheckBgpRouteDistributionIPList(c *C, ips []string) error {
 	ipList := []string{}
 	nodeCount := 0
 	for i := 0; i < 120; i++ {
@@ -1009,10 +1008,10 @@ func (s *systemtestSuite) CheckBgpRouteDistributionIPList(c *C, ips []string) ([
 				ipList = append(ipList, ip)
 			}
 			if len(ipList) == len(ips) {
-				return ipList, nil
+				return nil
 			}
 		}
 		time.Sleep(1 * time.Second)
 	}
-	return ipList, errors.New("Bgp Route distribution not complete")
+	return errors.New("Bgp Route distribution not complete")
 }

test/systemtests/bgp_test.go

@@ -59,22 +59,20 @@ func (s *systemtestSuite) testInfraNetworkAddDelete(c *C, encap string) {
 			netNames = append(netNames, network.NetworkName)
 		}
 
-		node1 := s.nodes[0]
-
-		for networkNum := 0; networkNum < numInfraNw; networkNum++ {
-			// From first node, ping every node on this network
-			for nodeNum := 1; nodeNum <= len(s.nodes); nodeNum++ {
-				logrus.Infof("Running ping test for network %q node %d", netNames[networkNum], nodeNum)
-				ipaddr := fmt.Sprintf("10.1.%d.%d", networkNum, nodeNum)
-				if s.fwdMode == "routing" && encap == "vlan" {
-					_, err := s.CheckBgpRouteDistributionIPList(c, []string{ipaddr})
-					c.Assert(err, IsNil)
+		for _, node := range s.nodes {
+			for networkNum := 0; networkNum < numInfraNw; networkNum++ {
+				// From first node, ping every node on this network
+				for nodeNum := 1; nodeNum <= len(s.nodes); nodeNum++ {
+					logrus.Infof("Running ping test for network %q node %d", netNames[networkNum], nodeNum)
+					ipaddr := fmt.Sprintf("10.1.%d.%d", networkNum, nodeNum)
+					if s.fwdMode == "routing" && encap == "vlan" {
+						err := s.verifyIPs([]string{ipaddr})
+						c.Assert(err, IsNil)
+					}
+					c.Assert(node.checkPing(ipaddr), IsNil)
 				}
-				c.Assert(node1.checkPing(ipaddr), IsNil)
-
 			}
 		}
-
 		for _, netName := range netNames {
 			c.Assert(s.cli.NetworkDelete("default", netName), IsNil)
 		}
@@ -403,7 +401,7 @@ func (s *systemtestSuite) TestNetworkAddDeleteTenantFwdModeChangeVXLAN(c *C) {
 
 func (s *systemtestSuite) TestNetworkAddDeleteTenantFwdModeChangeVLAN(c *C) {
 
-        c.Skip("Skipping this tests temporarily")
+	c.Skip("Skipping this tests temporarily")
 
 	if s.fwdMode != "routing" {
 		return

test/systemtests/network_test.go

@@ -967,3 +967,33 @@ func (s *systemtestSuite) verifyEPs(containers []*container) error {
 	logrus.Info("Debug output:\n %s", dbgOut)
 	return err
 }
+
+func (s *systemtestSuite) verifyIPs(ipaddrs []string) error {
+	var err error
+
+	err = nil
+	dbgOut := ""
+	for try := 0; try < 20; try++ {
+		for _, n := range s.nodes {
+
+			if n.Name() == "k8master" {
+				continue
+			}
+
+			dbgOut, err = n.verifyEPs(ipaddrs)
+			if err != nil {
+				break
+			}
+
+			if err == nil {
+				logrus.Info("IPs %v verified on node %s", ipaddrs, n.Name())
+				return nil
+			}
+		}
+		time.Sleep(1 * time.Second)
+	}
+
+	logrus.Errorf("Failed to verify EP after 20 sec %v ", err)
+	logrus.Info("Debug output:\n %s", dbgOut)
+	return err
+}