adding endpoint labels

Author: abhi

netmaster/master/api.go

@@ -79,6 +79,7 @@ type SvcProvUpdateRequest struct {
 	Tenant      string
 	Network     string
 	Event       string
+	Container   string
 }
 
 //SvcProvUpdateResponse is service provider update request from netplugin
@@ -326,24 +327,55 @@ func ServiceProviderUpdateHandler(w http.ResponseWriter, r *http.Request, vars m
 
 	log.Infof("Recieved ServiceProviderUpdate {%+v}", svcProvUpdReq)
 
+	stateDriver, err := utils.GetStateDriver()
+	if err != nil {
+		return nil, err
+	}
+
 	if svcProvUpdReq.Event == "start" {
 		//Received container start event from netplugin. Check if the Provider
 		//matches any service and perform service provider update if there is a matching
 		//service.
+
+		epCfg := &mastercfg.CfgEndpointState{}
+		epCfg.StateDriver = stateDriver
+		nwID := svcProvUpdReq.Network + "." + svcProvUpdReq.Tenant
+		epCfg.ID = getEpName(nwID, &intent.ConfigEP{Container: svcProvUpdReq.Container})
+
+		err = epCfg.Read(epCfg.ID)
+		if err != nil {
+			return nil, err
+		}
+
 		provider := &mastercfg.Provider{}
 		provider.IPAddress = svcProvUpdReq.IPAddress
 		provider.Tenant = svcProvUpdReq.Tenant
 		provider.Network = svcProvUpdReq.Network
 		provider.ContainerID = svcProvUpdReq.ContainerID
 		provider.Labels = make(map[string]string)
+
+		if epCfg.Labels == nil {
+			//endpoint cfg doesnt have labels
+			epCfg.Labels = make(map[string]string)
+		}
+
 		for k, v := range svcProvUpdReq.Labels {
 			provider.Labels[k] = v
+			epCfg.Labels[k] = v
+		}
+
+		err = epCfg.Write()
+		if err != nil {
+			log.Errorf("error writing ep config. Error: %s", err)
+			return nil, err
 		}
+
 		providerID := getProviderID(provider)
 		providerDbID := getProviderDbID(provider)
 		if providerID == "" || providerDbID == "" {
 			return nil, fmt.Errorf("Invalid ProviderID from providerInfo:{%v}", provider)
 		}
+
 		//update provider db
 		mastercfg.ProviderDb[providerDbID] = provider
 		for serviceID, service := range mastercfg.ServiceLBDb {
@@ -396,10 +428,6 @@ func ServiceProviderUpdateHandler(w http.ResponseWriter, r *http.Request, vars m
 			}
 			delete(service.Providers, providerID)
 
-			stateDriver, err := utils.GetStateDriver()
-			if err != nil {
-				return nil, err
-			}
 			serviceLbState := &mastercfg.CfgServiceLBState{}
 			serviceLbState.StateDriver = stateDriver
 			err = serviceLbState.Read(serviceID)

netmaster/mastercfg/endpointstate.go

@@ -26,16 +26,17 @@ import (
 // vlans with ovs. The state is stored as Json objects.
 type CfgEndpointState struct {
 	core.CommonState
-	NetID           string `json:"netID"`
-	ContName        string `json:"contName"`
-	ServiceName     string `json:"serviceName"`
-	EndpointGroupID int    `json:"endpointGroupId"`
-	AttachUUID      string `json:"attachUUID"`
-	IPAddress       string `json:"ipAddress"`
-	MacAddress      string `json:"macAddress"`
-	HomingHost      string `json:"homingHost"`
-	IntfName        string `json:"intfName"`
-	VtepIP          string `json:"vtepIP"`
+	NetID           string            `json:"netID"`
+	ContName        string            `json:"contName"`
+	ServiceName     string            `json:"serviceName"`
+	EndpointGroupID int               `json:"endpointGroupId"`
+	AttachUUID      string            `json:"attachUUID"`
+	IPAddress       string            `json:"ipAddress"`
+	MacAddress      string            `json:"macAddress"`
+	HomingHost      string            `json:"homingHost"`
+	IntfName        string            `json:"intfName"`
+	VtepIP          string            `json:"vtepIP"`
+	Labels          map[string]string `json:"labels"`
 }
 
 // Write the state.

netplugin/netd.go

@@ -726,11 +726,11 @@ func handleDockerEvents(event *dockerclient.Event, ec chan error, args ...interf
 			return
 		}
 		if event.ID != "" {
-			labelMap := getLabelsFromContainerInspect(event.ID, &containerInfo)
+			labelMap := getLabelsFromContainerInspect(&containerInfo)
 
-			containerTenant := getTenantFromContainerInspect(event.ID, &containerInfo)
-			network, ipAddress := getEpNetworkInfoFromContainerInspect(event.ID, &containerInfo)
-			container:= getContainerFromContainerInspect(event.ID,&containerInfo)
+			containerTenant := getTenantFromContainerInspect(&containerInfo)
+			network, ipAddress := getEpNetworkInfoFromContainerInspect(&containerInfo)
+			container := getContainerFromContainerInspect(&containerInfo)
 			if ipAddress != "" {
 				//Create provider info
 				networkname := strings.Split(network, "/")[0]
@@ -740,7 +740,7 @@ func handleDockerEvents(event *dockerclient.Event, ec chan error, args ...interf
 				providerUpdReq.Network = networkname
 				providerUpdReq.Event = "start"
 				providerUpdReq.Container = container
-				providerUpdReq.Labels = make(map[string]string) 
+				providerUpdReq.Labels = make(map[string]string)
 
 				for k, v := range labelMap {
 					providerUpdReq.Labels[k] = v
@@ -774,15 +774,15 @@ func handleDockerEvents(event *dockerclient.Event, ec chan error, args ...interf
 }
 
 //getLabelsFromContainerInspect returns the labels associated with the container
-func getLabelsFromContainerInspect(containerID string, containerInfo *types.ContainerJSON) map[string]string {
+func getLabelsFromContainerInspect(containerInfo *types.ContainerJSON) map[string]string {
 	if containerInfo != nil && containerInfo.Config != nil {
 		return containerInfo.Config.Labels
 	}
 	return nil
 }
 
 //getTenantFromContainerInspect returns the tenant the container belongs to.
-func getTenantFromContainerInspect(containerID string, containerInfo *types.ContainerJSON) string {
+func getTenantFromContainerInspect(containerInfo *types.ContainerJSON) string {
 	tenant := "default"
 	if containerInfo != nil && containerInfo.NetworkSettings != nil {
 		for network := range containerInfo.NetworkSettings.Networks {
@@ -796,7 +796,7 @@ func getTenantFromContainerInspect(containerID string, containerInfo *types.Cont
 }
 
 /*getEpNetworkInfoFromContainerInspect inspects the network info from containerinfo returned by dockerclient*/
-func getEpNetworkInfoFromContainerInspect(containerID string, containerInfo *types.ContainerJSON) (string, string) {
+func getEpNetworkInfoFromContainerInspect(containerInfo *types.ContainerJSON) (string, string) {
 	var networkName string
 	var IPAddress string
 
@@ -813,12 +813,13 @@ func getEpNetworkInfoFromContainerInspect(containerID string, containerInfo *typ
 	return networkName, IPAddress
 }
 
-func getContainerFromContainerInspect(event.ID,&containerInfo) string {
+func getContainerFromContainerInspect(containerInfo *types.ContainerJSON) string {
+
 	container := ""
 	if containerInfo != nil && containerInfo.NetworkSettings != nil {
-		for _ , endpoint := range containerInfo.NetworkSettings.Networks {
-          container = endpoint.EndpointID
-	  }
+		for _, endpoint := range containerInfo.NetworkSettings.Networks {
+			container = endpoint.EndpointID
+		}
 	}
 	return container