epif_cleanup: remove UpdateContainerId API out of plugin interface

Author: Vipin Jain

core/core.go

@@ -85,7 +85,6 @@ type EndpointDriver interface {
 	CreateEndpoint(id string) error
 	DeleteEndpoint(value string) error
 	MakeEndpointAddress() (*Address, error)
-	UpdateContainerId(id string, contId string) error
 }
 
 type StateDriver interface {

drivers/ovsdriver.go

@@ -776,25 +776,6 @@ func (d *OvsDriver) DeleteEndpoint(value string) (err error) {
 	return nil
 }
 
-func (d *OvsDriver) UpdateContainerId(id string, contId string) error {
-	var err error
-
-	operEpState := OvsOperEndpointState{StateDriver: d.stateDriver}
-	err = operEpState.Read(id)
-	if err != nil {
-		return err
-	}
-	operEpState.ContId = contId
-	err = operEpState.Write()
-	if err != nil {
-		return err
-	}
-
-	log.Printf("updating ep %s with container id %s, contName was %s \n",
-		id, contId, operEpState.ContName)
-	return nil
-}
-
 func (d *OvsDriver) MakeEndpointAddress() (*core.Address, error) {
 	return nil, &core.Error{Desc: "Not supported"}
 }

drivers/ovsendpointstate.go

@@ -86,7 +86,6 @@ type OvsOperEndpointState struct {
 	Id          string           `json:"id"`
 	NetId       string           `json:"netId"`
 	ContName    string           `json:"contName"`
-	ContId      string           `json:"contId"`
 	IpAddress   string           `json:"ipAddress"`
 	PortName    string           `json:"portName"`
 	HomingHost  string           `json:"homingHost"`

netd.go

@@ -343,11 +343,6 @@ func processEpEvent(netPlugin *plugin.NetPlugin, crt *crt.Crt,
 		}
 		contId := crt.ContainerIf.GetContainerId(contEpContext.NewContName)
 		if contId != "" {
-			err = netPlugin.UpdateContainerId(epId, contId)
-			if err != nil {
-				log.Printf("Cont id update err '%s' to ep '%s' - contid %s\n",
-					contEpContext.NewContName, epId, contId)
-			}
 		}
 	}
 

plugin/netplugin.go

@@ -189,10 +189,6 @@ func (p *NetPlugin) DeleteEndpoint(value string) error {
 	return p.EndpointDriver.DeleteEndpoint(value)
 }
 
-func (p *NetPlugin) UpdateContainerId(id string, contId string) error {
-	return p.EndpointDriver.UpdateContainerId(id, contId)
-}
-
 func (p *NetPlugin) FetchEndpoint(id string) (core.State, error) {
 	return nil, &core.Error{Desc: "Not implemented"}
 }