updating l3 sanity fix

Author: abhi

netmaster/daemon.go

@@ -256,14 +256,16 @@ func (d *daemon) runLeader() {
 	// Create a new api controller
 	d.apiController = objApi.NewAPIController(router, d.clusterStore)
 
+	//Restore state from clusterStore
+
+	d.restoreCache()
+
 	// Register netmaster service
 	d.registerService()
 
 	// initialize policy manager
 	mastercfg.InitPolicyMgr(d.stateDriver, d.ofnetMaster)
 
-	d.restoreCache()
-
 	// setup HTTP routes
 	d.registerRoutes(router)
 

netmaster/master/api.go

@@ -422,6 +422,9 @@ func ServiceProviderUpdateHandler(w http.ResponseWriter, r *http.Request, vars m
 		}
 
 		provider := mastercfg.ProviderDb[providerDbID]
+		if provider == nil {
+			log.Errorf("Provider not present in Provider DB. Invalid state")
+		}
 		for _, serviceID := range provider.Services {
 			service := mastercfg.ServiceLBDb[serviceID]
 			providerID := getProviderID(provider)

netmaster/master/servicelb.go

@@ -225,6 +225,8 @@ func RestoreServiceProviderLBDb() {
 				mastercfg.ProviderDb[providerDBId] = providerInfo
 			}
 		}
+	} else {
+		log.Errorf("Error reading service load balancer state from cluster store")
 	}
 	//Recover from endpoint state as well .
 	epCfgState := mastercfg.CfgEndpointState{}
@@ -233,21 +235,23 @@ func RestoreServiceProviderLBDb() {
 	if err == nil {
 		for _, epCfg := range epCfgs {
 			ep := epCfg.(*mastercfg.CfgEndpointState)
-			if ep.Labels != nil {
+			providerDBId := ep.ContainerID
+			if ep.Labels != nil && mastercfg.ProviderDb[providerDBId] == nil {
 				//Create provider info and store it in provider db
 				providerInfo := &mastercfg.Provider{}
 				providerInfo.ContainerID = ep.ContainerID
 				providerInfo.Network = strings.Split(ep.NetID, ".")[0]
 				providerInfo.Tenant = strings.Split(ep.NetID, ".")[1]
 				providerInfo.Labels = make(map[string]string)
+				providerInfo.IPAddress = ep.IPAddress
 
 				for k, v := range ep.Labels {
 					providerInfo.Labels[k] = v
 				}
-				providerDBId := providerInfo.ContainerID
 				mastercfg.ProviderDb[providerDBId] = providerInfo
-
 			}
 		}
+	} else {
+		log.Errorf("Error reading endpoint config during restore")
 	}
 }

systemtests/basic_test.go

@@ -38,7 +38,9 @@ func (s *systemtestSuite) testBasicStartRemoveContainer(c *C, encap string) {
 		c.Assert(err, IsNil)
 
 		if s.fwdMode == "routing" && encap == "vlan" {
-			s.CheckBgpRouteDistribution(c, s.vagrant.GetNode("quagga1"), containers)
+			var err error
+			_, err = s.CheckBgpRouteDistribution(c, containers)
+			c.Assert(err, IsNil)
 		}
 
 		c.Assert(s.pingTest(containers), IsNil)
@@ -73,7 +75,9 @@ func (s *systemtestSuite) testBasicStartStopContainer(c *C, encap string) {
 	containers, err := s.runContainers(s.containers, false, "private", nil, nil)
 	c.Assert(err, IsNil)
 	if s.fwdMode == "routing" && encap == "vlan" {
-		s.CheckBgpRouteDistribution(c, s.vagrant.GetNode("quagga1"), containers)
+		var err error
+		_, err = s.CheckBgpRouteDistribution(c, containers)
+		c.Assert(err, IsNil)
 	}
 
 	for i := 0; i < s.iterations; i++ {
@@ -97,7 +101,9 @@ func (s *systemtestSuite) testBasicStartStopContainer(c *C, encap string) {
 		}
 
 		if s.fwdMode == "routing" && encap == "vlan" {
-			s.CheckBgpRouteDistribution(c, s.vagrant.GetNode("quagga1"), containers)
+			var err error
+			_, err = s.CheckBgpRouteDistribution(c, containers)
+			c.Assert(err, IsNil)
 		}
 
 	}
@@ -156,6 +162,11 @@ func (s *systemtestSuite) testBasicSvcDiscovery(c *C, encap string) {
 		c.Assert(err, IsNil)
 
 		containers := append(containers1, containers2...)
+		if s.fwdMode == "routing" && encap == "vlan" {
+			var err error
+			_, err = s.CheckBgpRouteDistribution(c, containers)
+			c.Assert(err, IsNil)
+		}
 		if s.fwdMode == "routing" && encap == "vlan" {
 			time.Sleep(5 * time.Second)
 		}