Added DNS info and ContainerID to endpoint

Author: ofiliz

cni/network/network.go

@@ -82,6 +82,11 @@ func (plugin *netPlugin) Stop() {
 	log.Printf("[cni-net] Plugin stopped.")
 }
 
+// GetEndpointID returns a unique endpoint ID based on the CNI args.
+func (plugin *netPlugin) getEndpointID(args *cniSkel.CmdArgs) string {
+	return args.ContainerID + "-" + args.IfName
+}
+
 //
 // CNI implementation
 // https://github.com/containernetworking/cni/blob/master/SPEC.md
@@ -104,7 +109,7 @@ func (plugin *netPlugin) Add(args *cniSkel.CmdArgs) error {
 	var result cniTypes.Result
 	var resultImpl *cniTypesImpl.Result
 	networkId := nwCfg.Name
-	endpointId := args.ContainerID
+	endpointId := plugin.getEndpointID(args)
 
 	// Check whether the network already exists.
 	nwInfo, err := plugin.nm.GetNetworkInfo(networkId)
@@ -164,9 +169,10 @@ func (plugin *netPlugin) Add(args *cniSkel.CmdArgs) error {
 
 	// Initialize endpoint info.
 	epInfo := &network.EndpointInfo{
-		Id:        endpointId,
-		IfName:    args.IfName,
-		NetNsPath: args.Netns,
+		Id:          endpointId,
+		ContainerID: args.ContainerID,
+		NetNsPath:   args.Netns,
+		IfName:      args.IfName,
 	}
 
 	// Populate addresses and routes.
@@ -178,6 +184,10 @@ func (plugin *netPlugin) Add(args *cniSkel.CmdArgs) error {
 		}
 	}
 
+	// Populate DNS info.
+	epInfo.DNSSuffix = resultImpl.DNS.Domain
+	epInfo.DNSServers = resultImpl.DNS.Nameservers
+
 	// Create the endpoint.
 	log.Printf("[cni-net] Creating endpoint %+v", epInfo)
 	err = plugin.nm.CreateEndpoint(networkId, epInfo)
@@ -214,7 +224,7 @@ func (plugin *netPlugin) Delete(args *cniSkel.CmdArgs) error {
 
 	// Initialize values from network config.
 	networkId := nwCfg.Name
-	endpointId := args.ContainerID
+	endpointId := plugin.getEndpointID(args)
 
 	// Query the network.
 	nwInfo, err := plugin.nm.GetNetworkInfo(networkId)

network/endpoint.go

@@ -24,10 +24,13 @@ type endpoint struct {
 // EndpointInfo contains read-only information about an endpoint.
 type EndpointInfo struct {
 	Id          string
-	IfName      string
+	ContainerID string
 	NetNsPath   string
+	IfName      string
 	IPAddresses []net.IPNet
 	Routes      []RouteInfo
+	DNSSuffix   string
+	DNSServers  []string
 }
 
 // RouteInfo contains information about an IP route.
@@ -121,7 +124,7 @@ func (ep *endpoint) getInfo() *EndpointInfo {
 }
 
 // Attach attaches an endpoint to a sandbox.
-func (ep *endpoint) attach(sandboxKey string, options map[string]interface{}) error {
+func (ep *endpoint) attach(sandboxKey string) error {
 	if ep.SandboxKey != "" {
 		return errEndpointInUse
 	}

network/manager.go

@@ -288,7 +288,7 @@ func (nm *networkManager) AttachEndpoint(networkId string, endpointId string, sa
 		return nil, err
 	}
 
-	err = ep.attach(sandboxKey, nil)
+	err = ep.attach(sandboxKey)
 	if err != nil {
 		return nil, err
 	}