handling restore

Author: abhi

netmaster/master/api.go

@@ -363,6 +363,8 @@ func ServiceProviderUpdateHandler(w http.ResponseWriter, r *http.Request, vars m
 			provider.Labels[k] = v
 			epCfg.Labels[k] = v
 		}
+		//maintain the containerId in endpointstat for recovery
+		epCfg.ContainerID = svcProvUpdReq.ContainerID
 
 		err = epCfg.Write()
 		if err != nil {

netmaster/master/servicelb.go

@@ -22,6 +22,7 @@ import (
 	"github.com/contiv/netplugin/netmaster/mastercfg"
 	"github.com/contiv/netplugin/utils"
 	"reflect"
+	"strings"
 )
 
 //CreateServiceLB adds to the etcd state
@@ -225,4 +226,28 @@ func RestoreServiceProviderLBDb() {
 			}
 		}
 	}
+	//Recover from endpoint state as well .
+	epCfgState := mastercfg.CfgEndpointState{}
+	epCfgState.StateDriver = stateDriver
+	epCfgs, err := epCfgState.ReadAll()
+	if err == nil {
+		for _, epCfg := range epCfgs {
+			ep := epCfg.(*mastercfg.CfgEndpointState)
+			if ep.Labels != 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)
+
+				for k, v := range ep.Labels {
+					providerInfo.Labels[k] = v
+				}
+				providerDBId := providerInfo.ContainerID
+				mastercfg.ProviderDb[providerDBId] = providerInfo
+
+			}
+		}
+	}
 }

netmaster/mastercfg/endpointstate.go

@@ -37,6 +37,7 @@ type CfgEndpointState struct {
 	IntfName        string            `json:"intfName"`
 	VtepIP          string            `json:"vtepIP"`
 	Labels          map[string]string `json:"labels"`
+	ContainerID     string            `json:"containerId"`
 }
 
 // Write the state.