Merge pull request #606 from jojimt/podname

Populate pod name into endpoint state

Author: jojimt

mgmtfn/k8splugin/driver.go

@@ -45,6 +45,7 @@ type epSpec struct {
 	Network    string `json:"network,omitempty"`
 	Group      string `json:"group,omitempty"`
 	EndpointID string `json:"endpointid,omitempty"`
+	Name       string `json:"name,omitempty"`
 }
 
 // epAttr contains the assigned attributes of the created ep
@@ -128,10 +129,11 @@ func createEP(req *epSpec) (*epAttr, error) {
 
 	// Build endpoint request
 	mreq := master.CreateEndpointRequest{
-		TenantName:  req.Tenant,
-		NetworkName: req.Network,
-		ServiceName: req.Group,
-		EndpointID:  req.EndpointID,
+		TenantName:   req.Tenant,
+		NetworkName:  req.Network,
+		ServiceName:  req.Group,
+		EndpointID:   req.EndpointID,
+		EPCommonName: req.Name,
 		ConfigEP: intent.ConfigEP{
 			Container:   req.EndpointID,
 			Host:        pluginHost,
@@ -360,6 +362,7 @@ func getEPSpec(pInfo *cniapi.CNIPodAttr) (*epSpec, error) {
 	resp.Network = netw
 	resp.Group = epg
 	resp.EndpointID = pInfo.InfraContainerID
+	resp.Name = pInfo.Name
 
 	return &resp, nil
 }

netmaster/master/api.go

@@ -51,11 +51,12 @@ type AddressReleaseRequest struct {
 
 // CreateEndpointRequest has the endpoint create request from netplugin
 type CreateEndpointRequest struct {
-	TenantName  string          // tenant name
-	NetworkName string          // network name
-	ServiceName string          // service name
-	EndpointID  string          // Unique identifier for the endpoint
-	ConfigEP    intent.ConfigEP // Endpoint configuration
+	TenantName   string          // tenant name
+	NetworkName  string          // network name
+	ServiceName  string          // service name
+	EndpointID   string          // Unique identifier for the endpoint
+	EPCommonName string          // Common name for the endpoint
+	ConfigEP     intent.ConfigEP // Endpoint configuration
 }
 
 // CreateEndpointResponse has the endpoint create response from netmaster
@@ -74,14 +75,14 @@ type DeleteEndpointRequest struct {
 
 //UpdateEndpointRequest has the update endpoint request from netplugin
 type UpdateEndpointRequest struct {
-	IPAddress     string            // provider IP
-	ContainerID   string            // container id
-	Labels        map[string]string // lables
-	Tenant        string
-	Network       string
-	Event         string
-	EndpointID    string
-	ContainerName string
+	IPAddress    string            // provider IP
+	ContainerID  string            // container id
+	Labels       map[string]string // lables
+	Tenant       string
+	Network      string
+	Event        string
+	EndpointID   string
+	EPCommonName string // Common name for the endpoint
 }
 
 //UpdateEndpointResponse is service provider update request from netplugin
@@ -268,7 +269,7 @@ func CreateEndpointHandler(w http.ResponseWriter, r *http.Request, vars map[stri
 	}
 
 	// Create the endpoint
-	epCfg, err := CreateEndpoint(stateDriver, nwCfg, &epReq.ConfigEP)
+	epCfg, err := CreateEndpoint(stateDriver, nwCfg, &epReq)
 	if err != nil {
 		log.Errorf("CreateEndpoint failure for ep: %v. Err: %v", epReq.ConfigEP, err)
 		return nil, err
@@ -401,7 +402,7 @@ func UpdateEndpointHandler(w http.ResponseWriter, r *http.Request, vars map[stri
 		provider.EpIDKey = epCfg.ID
 		//maintain the containerId in endpointstat for recovery
 		epCfg.ContainerID = epUpdReq.ContainerID
-		epCfg.ContainerName = epUpdReq.ContainerName
+		epCfg.EPCommonName = epUpdReq.EPCommonName
 
 		err = epCfg.Write()
 		if err != nil {

netmaster/master/endpoint.go

@@ -98,8 +98,9 @@ func freeAddrOnErr(nwCfg *mastercfg.CfgNetworkState, ipAddress string, pErr *err
 
 // CreateEndpoint creates an endpoint
 func CreateEndpoint(stateDriver core.StateDriver, nwCfg *mastercfg.CfgNetworkState,
-	ep *intent.ConfigEP) (*mastercfg.CfgEndpointState, error) {
+	epReq *CreateEndpointRequest) (*mastercfg.CfgEndpointState, error) {
 
+	ep := &epReq.ConfigEP
 	epCfg := &mastercfg.CfgEndpointState{}
 	epCfg.StateDriver = stateDriver
 	epCfg.ID = getEpName(nwCfg.ID, ep)
@@ -113,6 +114,7 @@ func CreateEndpoint(stateDriver core.StateDriver, nwCfg *mastercfg.CfgNetworkSta
 	epCfg.EndpointID = ep.Container
 	epCfg.HomingHost = ep.Host
 	epCfg.ServiceName = ep.ServiceName
+	epCfg.EPCommonName = epReq.EPCommonName
 
 	// Allocate addresses
 	err = allocSetEpAddress(ep, epCfg, nwCfg)
@@ -187,7 +189,9 @@ func CreateEndpoints(stateDriver core.StateDriver, tenant *intent.ConfigTenant)
 		}
 
 		for _, ep := range network.Endpoints {
-			_, err = CreateEndpoint(stateDriver, nwCfg, &ep)
+			epReq := CreateEndpointRequest{}
+			epReq.ConfigEP = ep
+			_, err = CreateEndpoint(stateDriver, nwCfg, &epReq)
 			if err != nil {
 				log.Errorf("Error creating endpoint %+v. Err: %v", ep, err)
 				return err

netmaster/mastercfg/endpointstate.go

@@ -39,7 +39,7 @@ type CfgEndpointState struct {
 	VtepIP           string            `json:"vtepIP"`
 	Labels           map[string]string `json:"labels"`
 	ContainerID      string            `json:"containerId"`
-	ContainerName    string            `json:"containerName"`
+	EPCommonName     string            `json:"epCommonName"`
 }
 
 // Write the state.

netmaster/objApi/apiController.go

@@ -414,7 +414,7 @@ func (ac *APIController) EndpointGetOper(endpoint *contivModel.EndpointInspect)
 			ep := epCfg.(*mastercfg.CfgEndpointState)
 			if strings.Contains(ep.EndpointID, endpoint.Oper.Key) ||
 				strings.Contains(ep.ContainerID, endpoint.Oper.Key) ||
-				strings.Contains(ep.ContainerName, endpoint.Oper.Key) {
+				strings.Contains(ep.EPCommonName, endpoint.Oper.Key) {
 
 				endpoint.Oper.Network = ep.NetID
 				endpoint.Oper.EndpointID = ep.EndpointID
@@ -428,7 +428,7 @@ func (ac *APIController) EndpointGetOper(endpoint *contivModel.EndpointInspect)
 				endpoint.Oper.VtepIP = ep.VtepIP
 				endpoint.Oper.Labels = fmt.Sprintf("%s", ep.Labels)
 				endpoint.Oper.ContainerID = ep.ContainerID
-				endpoint.Oper.ContainerName = ep.ContainerName
+				endpoint.Oper.ContainerName = ep.EPCommonName
 
 				return nil
 			}
@@ -852,7 +852,7 @@ func (ac *APIController) EndpointGroupGetOper(endpointGroup *contivModel.Endpoin
 				epOper.VtepIP = ep.VtepIP
 				epOper.Labels = fmt.Sprintf("%s", ep.Labels)
 				epOper.ContainerID = ep.ContainerID
-				epOper.ContainerName = ep.ContainerName
+				epOper.ContainerName = ep.EPCommonName
 				endpointGroup.Oper.Endpoints = append(endpointGroup.Oper.Endpoints, epOper)
 			}
 		}
@@ -1021,7 +1021,7 @@ func (ac *APIController) NetworkGetOper(network *contivModel.NetworkInspect) err
 				epOper.VtepIP = ep.VtepIP
 				epOper.Labels = fmt.Sprintf("%s", ep.Labels)
 				epOper.ContainerID = ep.ContainerID
-				epOper.ContainerName = ep.ContainerName
+				epOper.ContainerName = ep.EPCommonName
 				network.Oper.Endpoints = append(network.Oper.Endpoints, epOper)
 			}
 		}
@@ -1254,7 +1254,7 @@ func (ac *APIController) PolicyGetOper(policy *contivModel.PolicyInspect) error
 					epOper.VtepIP = ep.VtepIP
 					epOper.Labels = fmt.Sprintf("%s", ep.Labels)
 					epOper.ContainerID = ep.ContainerID
-					epOper.ContainerName = ep.ContainerName
+					epOper.ContainerName = ep.EPCommonName
 					policy.Oper.Endpoints = append(policy.Oper.Endpoints, epOper)
 				}
 			}
@@ -1597,7 +1597,7 @@ func getTenantNetworks(tenant *contivModel.TenantInspect) error {
 						epOper.VtepIP = ep.VtepIP
 						epOper.Labels = fmt.Sprintf("%s", ep.Labels)
 						epOper.ContainerID = ep.ContainerID
-						epOper.ContainerName = ep.ContainerName
+						epOper.ContainerName = ep.EPCommonName
 						netOper.Endpoints = append(netOper.Endpoints, epOper)
 					}
 				}
@@ -1660,7 +1660,7 @@ func getTenantEPGs(tenant *contivModel.TenantInspect) error {
 						epOper.VtepIP = ep.VtepIP
 						epOper.Labels = fmt.Sprintf("%s", ep.Labels)
 						epOper.ContainerID = ep.ContainerID
-						epOper.ContainerName = ep.ContainerName
+						epOper.ContainerName = ep.EPCommonName
 						epgOper.Endpoints = append(epgOper.Endpoints, epOper)
 					}
 				}
@@ -2081,7 +2081,7 @@ func (ac *APIController) ServiceLBGetOper(serviceLB *contivModel.ServiceLBInspec
 		epOper.VtepIP = epCfg.VtepIP
 		epOper.Labels = fmt.Sprintf("%s", epCfg.Labels)
 		epOper.ContainerID = epCfg.ContainerID
-		epOper.ContainerName = epCfg.ContainerName
+		epOper.ContainerName = epCfg.EPCommonName
 		serviceLB.Oper.Providers = append(serviceLB.Oper.Providers, epOper)
 		count++
 		epCfg = nil

netmaster/objApi/objapi_test.go

@@ -1963,7 +1963,7 @@ func triggerProviderUpdate(t *testing.T, providerIP, network, containerID, endpo
 	endpointUpdReq.Event = event
 	endpointUpdReq.Labels = make(map[string]string)
 	endpointUpdReq.EndpointID = endpointID
-	endpointUpdReq.ContainerName = containerName
+	endpointUpdReq.EPCommonName = containerName
 
 	for _, v := range labels {
 		key := strings.Split(v, "=")[0]

netplugin/agent/docker_event.go

@@ -66,7 +66,7 @@ func handleDockerEvents(event *dockerclient.Event, ec chan error, args ...interf
 				endpointUpdReq.Network = networkName
 				endpointUpdReq.Event = "start"
 				endpointUpdReq.EndpointID = endpoint
-				endpointUpdReq.ContainerName = containerInfo.Name
+				endpointUpdReq.EPCommonName = containerInfo.Name
 				endpointUpdReq.Labels = make(map[string]string)
 
 				for k, v := range labelMap {