changes

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>

Author: abhi

provider/cni/server/add_workload.go

@@ -15,7 +15,7 @@ import (
 	"github.com/docker/libnetwork/provider/cni/cniapi"
 )
 
-func addWorkload(w http.ResponseWriter, r *http.Request, c cni.CNIService, vars map[string]string) (_ interface{}, retErr error) {
+func addWorkload(w http.ResponseWriter, r *http.Request, c cni.Service, vars map[string]string) (_ interface{}, retErr error) {
 	cniInfo := cniapi.CniInfo{}
 	var result current.Result
 

provider/cni/server/cni_server.go

@@ -68,6 +68,7 @@ func (c *CniService) Init(serverCloseChan chan struct{}) error {
 	return nil
 }
 
+// SetupWorkload sets up the network for the workload
 func (c *CniService) SetupWorkload(cniInfo cniapi.CniInfo) (
 	ep client.EndpointInfo,
 	retErr error,
@@ -116,6 +117,7 @@ func (c *CniService) SetupWorkload(cniInfo cniapi.CniInfo) (
 	return ep, nil
 }
 
+// TearDownWorkload tears the networking of the workload
 func (c *CniService) TearDownWorkload(cniInfo cniapi.CniInfo) error {
 	cniMetadata, err := c.getMetadataFromStore(cniInfo)
 	if err != nil {
@@ -154,7 +156,7 @@ func (c *CniService) putMetadataToStore(cniInfo cniapi.CniInfo,
 		ContainerID: cniInfo.ContainerID,
 		SandboxID:   sbID,
 		EndpointID:  epID,
-		SandboxMeta: CopySandboxMetadata(sbConfig, cniInfo.NetNS),
+		SandboxMeta: copySandboxMetadata(sbConfig, cniInfo.NetNS),
 	}
 	store := c.getstore()
 	if store == nil {
@@ -274,7 +276,7 @@ func createNetwork(netConf cniapi.NetworkConf) error {
 	log.Infof("Creating network %+v \n", netConf)
 	driverOpts := make(map[string]string)
 	driverOpts["hostaccess"] = ""
-	nc := client.NetworkCreate{Name: netConf.Name, ID: netConf.Name, NetworkType: GetNetworkType(netConf.Name),
+	nc := client.NetworkCreate{Name: netConf.Name, ID: netConf.Name, NetworkType: getNetworkType(netConf.Name),
 		DriverOpts: driverOpts}
 	if ipam := netConf.IPAM; ipam != nil {
 		cfg := client.IPAMConf{}

provider/cni/server/cni_utils.go

@@ -14,12 +14,12 @@ import (
 
 type httpAPIFunc func(w http.ResponseWriter,
 	r *http.Request,
-	c cni.CNIService,
+	c cni.Service,
 	vars map[string]string,
 ) (interface{}, error)
 
 // MakeHTTPHandler is a simple Wrapper for http handlers
-func MakeHTTPHandler(c cni.CNIService, handlerFunc httpAPIFunc) http.HandlerFunc {
+func MakeHTTPHandler(c cni.Service, handlerFunc httpAPIFunc) http.HandlerFunc {
 	// Create a closure and return an anonymous function
 	return func(w http.ResponseWriter, r *http.Request) {
 		// Call the handler
@@ -58,7 +58,7 @@ func writeJSON(w http.ResponseWriter, code int, v interface{}) error {
 }
 
 // CopySandboxMetadata creates a sandbox metadata
-func CopySandboxMetadata(sbConfig client.SandboxCreate, externalKey string) api.SandboxMetadata {
+func copySandboxMetadata(sbConfig client.SandboxCreate, externalKey string) api.SandboxMetadata {
 	var meta api.SandboxMetadata
 	meta.ContainerID = sbConfig.ContainerID
 	meta.HostName = sbConfig.HostName
@@ -75,7 +75,7 @@ func CopySandboxMetadata(sbConfig client.SandboxCreate, externalKey string) api.
 	return meta
 }
 
-func GetNetworkType(networkType string) string {
+func getNetworkType(networkType string) string {
 	switch networkType {
 	case "dnet-overlay-net":
 		return "overlay"

provider/cni/server/del_workload.go

@@ -12,7 +12,7 @@ import (
 	"github.com/docker/libnetwork/provider/cni/cniapi"
 )
 
-func deleteWorkload(w http.ResponseWriter, r *http.Request, c cni.CNIService, vars map[string]string) (interface{}, error) {
+func deleteWorkload(w http.ResponseWriter, r *http.Request, c cni.Service, vars map[string]string) (interface{}, error) {
 	//TODO: need to explore force cleanup and test for parallel delete workloads
 	cniInfo := cniapi.CniInfo{}
 

provider/cni/service.go

@@ -5,8 +5,8 @@ import (
 	"github.com/docker/libnetwork/provider/cni/cniapi"
 )
 
-// CNIService interface for Cni service implementations
-type CNIService interface {
+// Service interface for Cni service implementations
+type Service interface {
 	// Init initializes the cni server
 	Init(serverCloseChan chan struct{}) error
 	// SetupWorkload setups the CNI workload networking