rename CNI plugin to netcontiv

Signed-off-by: Ranjith <[email protected]>

Author: rchirakk

Makefile

@@ -4,7 +4,7 @@
 SHELL := /bin/bash
 EXCLUDE_DIRS := bin docs Godeps scripts test vagrant vendor
 PKG_DIRS := $(filter-out $(EXCLUDE_DIRS),$(subst /,,$(sort $(dir $(wildcard */)))))
-TO_BUILD := ./netplugin/ ./netmaster/ ./netctl/netctl/ ./mgmtfn/k8splugin/contivk8s/ ./mgmtfn/mesosplugin/contivnet/
+TO_BUILD := ./netplugin/ ./netmaster/ ./netctl/netctl/ ./mgmtfn/k8splugin/contivk8s/ ./mgmtfn/mesosplugin/netcontiv/
 HOST_GOBIN := `if [ -n "$$(go env GOBIN)" ]; then go env GOBIN; else dirname $$(which go); fi`
 HOST_GOROOT := `go env GOROOT`
 NAME := netplugin
@@ -224,7 +224,7 @@ only-tar:
 tar: clean-tar 
 	CONTIV_NODES=1 ${MAKE} build
 	@cat ${GOPATH}/src/github.com/contiv/netplugin/version/version_gen.go | grep versionStr | cut -f 4 -d " " | tr -d \" > $(VERSION_FILE)
-	@tar -jcf $(TAR_FILE) -C $(GOPATH)/src/github.com/contiv/netplugin/bin netplugin netmaster netctl contivk8s contivnet -C $(GOPATH)/src/github.com/contiv/netplugin/scripts contrib/completion/bash/netctl
+	@tar -jcf $(TAR_FILE) -C $(GOPATH)/src/github.com/contiv/netplugin/bin netplugin netmaster netctl contivk8s netcontiv -C $(GOPATH)/src/github.com/contiv/netplugin/scripts contrib/completion/bash/netctl
 
 clean-tar:
 	@rm -f $(TAR_LOC)/*.$(TAR_EXT)

mgmtfn/mesosplugin/contivnet/cniplugin.go renamed to mgmtfn/mesosplugin/netcontiv/cniplugin.go

@@ -32,7 +32,7 @@ import (
 )
 
 const (
-	logfileName = "/var/log/contivnet.log"
+	logfileName = "/var/log/netcontiv.log"
 	logfileSize = 50 * (1 << 20)
 
 	// cni env. variables
@@ -86,7 +86,7 @@ func (cniApp *cniAppInfo) parseEnv() error {
 		case envVarCniNetns:
 			cniApp.cniMesosAttr.CniNetns = envVal
 			nsDir := filepath.Dir(envVal)
-			cniApp.netcfgFile = strings.Join([]string{nsDir, "contiv", "network.conf"}, "/")
+			cniApp.netcfgFile = strings.Join([]string{nsDir, "netcontiv", "network.conf"}, "/")
 			logger.Infof("cni network config file location : %s", cniApp.netcfgFile)
 
 		case envVarCniContainerID:
@@ -266,7 +266,7 @@ func main() {
 	logger.Infof("%s", version.String())
 	logger.Infof("CNI version : %s", cniapi.CniDefaultVersion)
 
-	flagSet := flag.NewFlagSet("contivnet", flag.ExitOnError)
+	flagSet := flag.NewFlagSet("netcontiv", flag.ExitOnError)
 	flagSet.BoolVar(&pluginVersion,
 		"version",
 		false,

mgmtfn/mesosplugin/contivnet/cniplugin_test.go renamed to mgmtfn/mesosplugin/netcontiv/cniplugin_test.go

@@ -27,7 +27,7 @@ test_packages="github.com/contiv/netplugin/drivers \
     github.com/contiv/netplugin/utils \
     github.com/contiv/netplugin/mgmtfn/k8splugin \
     github.com/contiv/netplugin/mgmtfn/k8splugin/contivk8s \
-    github.com/contiv/netplugin/mgmtfn/mesosplugin/contivnet \
+    github.com/contiv/netplugin/mgmtfn/mesosplugin/netcontiv \
     "
 while [ "${#}" -gt 0 ]
 do

scripts/unittests

@@ -212,11 +212,11 @@ mkdir -p /var/lib/mesos/cni/config/
 mkdir -p /var/lib/mesos/cni/logs/
 cat >  /var/lib/mesos/cni/config/contiv.cfg <<EOF
 {
-   "name": "contiv",
-   "type": "contivnet"
+   "name": "netcontiv",
+   "type": "netcontiv"
 }
 EOF
-cp /opt/gopath/bin/contivnet  /var/lib/mesos/cni/plugins/
+cp /opt/gopath/bin/netcontiv  /var/lib/mesos/cni/plugins/
 nohup /usr/sbin/mesos-slave  --ip=$NODEADDR --work_dir=/var/lib/mesos/ \
       --master=$MASTERADDR:5050 --containerizers=mesos --executor_registration_timeout=5mins \
       --network_cni_config_dir=/var/lib/mesos/cni/config/ \

vagrant/mesos-cni/Vagrantfile

@@ -90,7 +90,7 @@ cat > "$JSON_FILE" << JSON_SCRIPT
     }
   },
   "ipAddress": {
-     "networkName": "contiv",
+     "networkName": "netcontiv",
      "labels": {
      }
   }