Merge pull request #553 from abhinandanpb/bgp_upgrade

Adapting to new gobgp

Author: shaleman

Godeps/Godeps.json

@@ -61,7 +61,7 @@ func NewOvsSwitch(bridgeName, netType, localIP string, fwdMode string,
 	var err error
 	var datapath string
 	var ofnetPort, ctrlrPort uint16
-
+	log.Infof("Received request to create new ovs switch bridge:%s, localIP:%s, fwdMode:%s", bridgeName, localIP, fwdMode)
 	sw := new(OvsSwitch)
 	sw.bridgeName = bridgeName
 	sw.netType = netType

drivers/ovsSwitch.go

@@ -40,7 +40,7 @@ func (s *systemtestSuite) testBasicStartRemoveContainer(c *C, encap string) {
 
 		if s.fwdMode == "routing" && encap == "vlan" {
 			var err error
-			_, err = s.CheckBgpRouteDistribution(c, containers)
+			err = s.CheckBgpRouteDistribution(c, containers)
 			c.Assert(err, IsNil)
 		}
 
@@ -77,7 +77,7 @@ func (s *systemtestSuite) testBasicStartStopContainer(c *C, encap string) {
 	c.Assert(err, IsNil)
 	if s.fwdMode == "routing" && encap == "vlan" {
 		var err error
-		_, err = s.CheckBgpRouteDistribution(c, containers)
+		err = s.CheckBgpRouteDistribution(c, containers)
 		c.Assert(err, IsNil)
 	}
 
@@ -103,7 +103,7 @@ func (s *systemtestSuite) testBasicStartStopContainer(c *C, encap string) {
 
 		if s.fwdMode == "routing" && encap == "vlan" {
 			var err error
-			_, err = s.CheckBgpRouteDistribution(c, containers)
+			err = s.CheckBgpRouteDistribution(c, containers)
 			c.Assert(err, IsNil)
 		}
 
@@ -175,7 +175,7 @@ func (s *systemtestSuite) testBasicSvcDiscovery(c *C, encap string) {
 		containers := append(containers1, containers2...)
 		if s.fwdMode == "routing" && encap == "vlan" {
 			var err error
-			_, err = s.CheckBgpRouteDistribution(c, containers)
+			err = s.CheckBgpRouteDistribution(c, containers)
 			c.Assert(err, IsNil)
 		}
 		if s.fwdMode == "routing" && encap == "vlan" {