Makefile, Vagrantfile: refactor of build system

.gitignore

@@ -28,3 +28,7 @@ _testmain.go
 
 # vagrant
 .vagrant
+
+bin/*
+
+resolv.conf

Makefile

@@ -3,8 +3,8 @@
 
 # find all verifiable packages.
 # XXX: explore a better way that doesn't need multiple 'find'
-PKGS := `find . -mindepth 1 -maxdepth 1 -type d -name '*' | grep -vE '/\..*$\|Godeps|examples|docs|scripts|mgmtfn|systemtests'`
-PKGS += `find . -mindepth 2 -maxdepth 2 -type d -name '*'| grep -vE '/\..*$\|Godeps|examples|docs|scripts'`
+PKGS := `find . -mindepth 1 -maxdepth 1 -type d -name '*' | grep -vE '/\..*$\|Godeps|examples|docs|scripts|mgmtfn|systemtests|bin'`
+PKGS += `find . -mindepth 2 -maxdepth 2 -type d -name '*'| grep -vE '/\..*$\|Godeps|examples|docs|scripts|bin'`
 TO_BUILD := ./netplugin/ ./netmaster/ ./netdcli/ ./mgmtfn/k8contivnet/ ./mgmtfn/dockcontivnet/
 HOST_GOBIN := `if [ -n "$$(go env GOBIN)" ]; then go env GOBIN; else dirname $$(which go); fi`
 HOST_GOROOT := `go env GOROOT`
@@ -34,20 +34,35 @@ deps:
 checks:
 	./scripts/checks "$(PKGS)"
 
-build: deps checks
+host-build:
+	sudo /bin/bash -c 'source /etc/profile.d/envvar.sh; make run-build'
+
+run-build: deps checks clean
 	godep go install -v $(TO_BUILD)
 
+build: start
+	vagrant ssh netplugin-node1 -c 'sudo -i bash -lc "source /etc/profile.d/envvar.sh && cd /opt/golang/src/github.com/contiv/netplugin && make run-build"'
+	make stop
+
 clean: deps
 	rm -rf Godeps/_workspace/pkg
 	godep go clean -i -v ./...
 
+update:
+	vagrant box update
+
 # setting CONTIV_NODES=<number> while calling 'make demo' can be used to bring
 # up a cluster of <number> nodes. By default <number> = 1
-demo: build
-	CONTIV_HOST_GOBIN=$(HOST_GOBIN) CONTIV_HOST_GOROOT=$(HOST_GOROOT) vagrant up
+start: update
+	CONTIV_NODE_OS=${CONTIV_NODE_OS} vagrant up
+
+demo-centos:
+	CONTIV_NODE_OS=centos make demo
+
+stop:
+	CONTIV_NODES=$${CONTIV_NODES:-2} vagrant destroy -f
 
-clean-demo:
-	vagrant destroy -f
+demo: stop start
 
 start-dockerdemo:
 	scripts/dockerhost/start-dockerhosts
@@ -58,38 +73,41 @@ clean-dockerdemo:
 ssh:
 	@vagrant ssh netplugin-node1 || echo 'Please run "make demo"'
 
-unit-test: build
-	CONTIV_HOST_GOPATH=$(GOPATH) CONTIV_HOST_GOBIN=$(HOST_GOBIN) \
-					   CONTIV_HOST_GOROOT=$(HOST_GOROOT) ./scripts/unittests -vagrant
+unit-test: stop clean build
+	./scripts/unittests -vagrant
 
-unit-test-centos: build
-	CONTIV_NODE_OS=centos CONTIV_HOST_GOPATH=$(GOPATH) CONTIV_HOST_GOBIN=$(HOST_GOBIN) \
-					   CONTIV_HOST_GOROOT=$(HOST_GOROOT) ./scripts/unittests -vagrant
+unit-test-centos: stop clean
+	CONTIV_NODE_OS=centos make build
+	CONTIV_NODE_OS=centos ./scripts/unittests -vagrant
 
 # setting CONTIV_SOE=1 while calling 'make system-test' will stop the test
 # on first failure and leave setup in that state. This can be useful for debugging
 # as part of development.
-system-test: build
-	CONTIV_HOST_GOROOT=$(HOST_GOROOT) CONTIV_HOST_GOBIN=$(HOST_GOBIN) CONTIV_HOST_GOPATH=$(GOPATH) godep go test --timeout 30m -run "sanity" \
+system-test: system-test-singlehost system-test-multihost
+
+# the `make stop` here and below are necessary because build leaves around a VM (intentionally)
+system-test-singlehost: stop clean build
+	make stop
+	godep go test -v --timeout 30m -run "sanity" \
 					   github.com/contiv/netplugin/systemtests/singlehost 
-	CONTIV_HOST_GOROOT=$(HOST_GOROOT) CONTIV_HOST_GOBIN=$(HOST_GOBIN) CONTIV_HOST_GOPATH=$(GOPATH) godep go test --timeout 80m -run "sanity" \
-					   github.com/contiv/netplugin/systemtests/twohosts
 
-system-test-centos: build
-	CONTIV_NODE_OS=centos CONTIV_HOST_GOPATH=$(GOPATH) godep go test --timeout 30m -run "sanity" \
-					   github.com/contiv/netplugin/systemtests/singlehost
-	CONTIV_NODE_OS=centos CONTIV_HOST_GOPATH=$(GOPATH) godep go test --timeout 90m -run "sanity" \
+system-test-multihost: stop clean
+	make build stop
+	godep go test -v --timeout 80m -run "sanity" \
 					   github.com/contiv/netplugin/systemtests/twohosts
 
+system-test-centos: stop clean
+	CONTIV_NODE_OS=centos make build stop system-test-singlehost system-test-multihost
+
 centos-tests: unit-test-centos system-test-centos
 
 # setting CONTIV_SOE=1 while calling 'make regress-test' will stop the test
 # on first failure and leave setup in that state. This can be useful for debugging
 # as part of development.
 regress-test: build
-	CONTIV_HOST_GOPATH=$(GOPATH) godep go test -run "regress" \
+	godep go test -run "regress" \
 					   github.com/contiv/netplugin/systemtests/singlehost
-	CONTIV_HOST_GOPATH=$(GOPATH) godep go test --timeout 60m -run "regress" \
+	godep go test --timeout 60m -run "regress" \
 					   github.com/contiv/netplugin/systemtests/twohosts
 
 # Setting CONTIV_TESTBED=DIND uses docker in docker as the testbed instead of vagrant VMs.

README.md

@@ -20,6 +20,8 @@ Please do not use this code in production, until code goes through more testing
 
 ###Building and Testing
 
+**Note:** Vagrant 1.7.4 and VirtualBox 5.0+ are required to build and test netplugin.
+
 - Build:
 
   `make build`

Vagrantfile

@@ -1,90 +1,59 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+require 'fileutils'
+
 netplugin_synced_gopath="/opt/golang"
-host_gobin_path="/opt/go/bin"
-host_goroot_path="/opt/go/root"
+FileUtils.cp "/etc/resolv.conf", Dir.pwd
 
 provision_common = <<SCRIPT
 ## setup the environment file. Export the env-vars passed as args to 'vagrant up'
 echo Args passed: [[ $@ ]]
+
+echo -n "$1" > /etc/hostname
+hostname -F /etc/hostname
+
+/sbin/ip addr add "$3/24" dev eth1
+/sbin/ip link set eth1 up
+/sbin/ip link set eth2 up
+
 echo 'export GOPATH=#{netplugin_synced_gopath}' > /etc/profile.d/envvar.sh
 echo 'export GOBIN=$GOPATH/bin' >> /etc/profile.d/envvar.sh
 echo 'export GOSRC=$GOPATH/src' >> /etc/profile.d/envvar.sh
-echo 'export GOROOT=#{host_goroot_path}' >> /etc/profile.d/envvar.sh
-echo 'export PATH=$PATH:#{host_goroot_path}/bin:#{host_gobin_path}:$GOBIN' >> /etc/profile.d/envvar.sh
-if [ $# -gt 0 ]; then
-    echo "export $@" >> /etc/profile.d/envvar.sh
-fi
+echo 'export PATH=$PATH:/usr/local/go/bin:$GOBIN' >> /etc/profile.d/envvar.sh
+echo "export http_proxy='$4'" >> /etc/profile.d/envvar.sh
+echo "export https_proxy='$5'" >> /etc/profile.d/envvar.sh
+echo "export no_proxy=192.168.0.0/16,localhost,127.0.0.0/8" >> /etc/profile.d/envvar.sh
 
 source /etc/profile.d/envvar.sh
 
-## set the mounted host filesystems to be read-only.Just a safety check
-## to prevent inadvertent modifications from vm.
-(mount -o remount,ro,exec,norelatime /vagrant) || exit 1
-if [ -e #{host_gobin_path} ]; then
-    (mount -o remount,ro,exec,norelatime #{host_gobin_path}) || exit 1
-fi
-if [ -e #{host_goroot_path} ]; then
-    (mount -o remount,ro,exec,norelatime #{host_goroot_path}) || exit 1
-fi
-if [ -e #{netplugin_synced_gopath} ]; then
-    (mount -o remount,ro,exec,norelatime #{netplugin_synced_gopath}) || exit 1
-fi
+mv /etc/resolv.conf /etc/resolv.conf.bak
+cp #{netplugin_synced_gopath}/src/github.com/contiv/netplugin/resolv.conf /etc/resolv.conf
 
-### install basic packages
-#(apt-get update -qq > /dev/null && apt-get install -y vim curl python-software-properties git > /dev/null) || exit 1
-#
-### install Go 1.4
-#(cd /usr/local/ && \
-#curl -L https://storage.googleapis.com/golang/go1.4.linux-amd64.tar.gz -o go1.4.linux-amd64.tar.gz && \
-#tar -xzf go1.4.linux-amd64.tar.gz) || exit 1
-#
-### install etcd
-#(cd /tmp && \
-#curl -L  https://github.com/coreos/etcd/releases/download/v2.0.0/etcd-v2.0.0-linux-amd64.tar.gz -o etcd-v2.0.0-linux-amd64.tar.gz && \
-#tar -xzf etcd-v2.0.0-linux-amd64.tar.gz && \
-#mv /tmp/etcd-v2.0.0-linux-amd64/etcd /usr/bin/ && \
-#mv /tmp/etcd-v2.0.0-linux-amd64/etcdctl /usr/bin/ ) || exit 1
-#
-### install and start docker
-#(curl -sSL https://get.docker.com/ubuntu/ | sh > /dev/null) || exit 1
-#
-## pass the env-var args to docker and restart the service. This helps passing
-## stuff like http-proxy etc
-if [ $# -gt 0 ]; then
-    (echo "export $@" >> /etc/default/docker) || exit 1
+mkdir /etc/systemd/system/docker.service.d
+echo "[Service]" | sudo tee -a /etc/systemd/system/docker.service.d/http-proxy.conf
+echo "Environment=\\\"no_proxy=192.168.0.0/16,localhost,127.0.0.0/8\\\" \\\"http_proxy=$http_proxy\\\" \\\"https_proxy=$https_proxy\\\"" | sudo tee -a /etc/systemd/system/docker.service.d/http-proxy.conf
+sudo systemctl daemon-reload
+sudo systemctl stop docker
+sudo systemctl start docker
+
+if [ $# -gt 5 ]; then
+    shift; shift; shift; shift; shift
+    echo "export $@" >> /etc/profile.d/envvar.sh
 fi
-(service docker restart) || exit 1
 
-## install openvswitch and enable ovsdb-server to listen for incoming requests
-#(apt-get install -y openvswitch-switch > /dev/null) || exit 1
-## Install OVS 2.3.1
-# (wget -nv -O ovs-common.deb https://cisco.box.com/shared/static/v1dvgoboo5zgqrtn6tu27vxeqtdo2bdl.deb &&
-#  wget -nv -O ovs-switch.deb https://cisco.box.com/shared/static/ymbuwvt2qprs4tquextw75b82hyaxwon.deb) || exit 1
-# (dpkg -i ovs-common.deb &&
-#  dpkg -i ovs-switch.deb) || exit 1
+(service docker restart) || exit 1
 
 (ovs-vsctl set-manager tcp:127.0.0.1:6640 && \
  ovs-vsctl set-manager ptcp:6640) || exit 1
-
-### install consul
-#(apt-get install -y unzip && cd /tmp && \
-# wget https://dl.bintray.com/mitchellh/consul/0.5.2_linux_amd64.zip && \
-# unzip 0.5.2_linux_amd64.zip && \
-# mv /tmp/consul /usr/bin) || exit 1
-
-# add vagrant user to docker group
-(usermod -a -G docker vagrant)
-
 SCRIPT
 
 VAGRANTFILE_API_VERSION = "2"
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     if ENV['CONTIV_NODE_OS'] && ENV['CONTIV_NODE_OS'] == "centos" then
-        config.vm.box = "contiv/centos"
+        config.vm.box = "contiv/centos71-netplugin"
     else
-      config.vm.box = "contiv/ubuntu-v4"
+        config.vm.box = "contiv/ubuntu1504-netplugin"
     end
     num_nodes = 1
     if ENV['CONTIV_NODES'] && ENV['CONTIV_NODES'] != "" then
@@ -93,12 +62,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     base_ip = "192.168.2."
     node_ips = num_nodes.times.collect { |n| base_ip + "#{n+10}" }
     node_names = num_nodes.times.collect { |n| "netplugin-node#{n+1}" }
+    node_peers = []
+
     num_nodes.times do |n|
         node_name = node_names[n]
         node_addr = node_ips[n]
-        node_peers = ""
-        node_ips.length.times { |i| node_peers += "#{node_names[i]}=http://#{node_ips[i]}:2380 "}
-        node_peers = node_peers.strip().gsub(' ', ',')
+        node_peers += ["#{node_name}=http://#{node_addr}:2380,#{node_name}=http://#{node_addr}:7001"]
         consul_join_flag = if n > 0 then "-join #{node_ips[0]}" else "" end
         consul_bootstrap_flag = "-bootstrap-expect=3"
         if num_nodes < 3 then
@@ -109,11 +78,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
             end
         end
         config.vm.define node_name do |node|
-            node.vm.hostname = node_name
+            # node.vm.hostname = node_name
             # create an interface for etcd cluster
-            node.vm.network :private_network, ip: node_addr, virtualbox__intnet: "true"
+            node.vm.network :private_network, ip: node_addr, virtualbox__intnet: "true", auto_config: false
             # create an interface for bridged network
-            node.vm.network :private_network, ip: "0.0.0.0", virtualbox__intnet: "true"
+            node.vm.network :private_network, ip: "0.0.0.0", virtualbox__intnet: "true", auto_config: false
             node.vm.provider "virtualbox" do |v|
                 # make all nics 'virtio' to take benefit of builtin vlan tag
                 # support, which otherwise needs to be enabled in Intel drivers,
@@ -125,45 +94,25 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
                 v.customize ['modifyvm', :id, '--nicpromisc3', 'allow-all']
             end
             # mount the host directories
-            node.vm.synced_folder ".", "/vagrant"
-            # godep modifies the host's GOPATH env variable, CONTIV_HOST_GOPATH
-            # contains the unmodified path passed from the Makefile, use that
-            # when it is defined.
-            if ENV['CONTIV_HOST_GOPATH'] != nil
-                node.vm.synced_folder ENV['CONTIV_HOST_GOPATH'], netplugin_synced_gopath
-            else
-                node.vm.synced_folder ENV['GOPATH'], netplugin_synced_gopath
-            end
-            if ENV['CONTIV_HOST_GOBIN'] != nil
-                node.vm.synced_folder ENV['CONTIV_HOST_GOBIN'], host_gobin_path
-            end
-            if ENV['CONTIV_HOST_GOROOT'] != nil
-                node.vm.synced_folder ENV['CONTIV_HOST_GOROOT'], host_goroot_path
-            end
+            node.vm.synced_folder ".", "/opt/golang/src/github.com/contiv/netplugin"
+            node.vm.synced_folder File.join(File.dirname(__FILE__), "bin"), File.join(netplugin_synced_gopath, "bin")
+
             node.vm.provision "shell" do |s|
                 s.inline = provision_common
-                s.args = ENV['CONTIV_ENV']
+                s.args = [node_name, ENV["CONTIV_NODE_OS"] || "", node_addr, ENV["http_proxy"] || "", ENV["https_proxy"] || "", *ENV['CONTIV_ENV']]
             end
 provision_node = <<SCRIPT
 ## start etcd with generated config
-(echo etcd -name #{node_name} -data-dir /opt/etcd \
- -listen-client-urls http://0.0.0.0:2379,http://0.0.0.0:4001 \
- -advertise-client-urls http://#{node_addr}:2379,http://#{node_addr}:4001 \
- -initial-advertise-peer-urls http://#{node_addr}:2380 \
- -listen-peer-urls http://#{node_addr}:2380 \
- -initial-cluster #{node_peers} \
- -initial-cluster-state new)
-(nohup etcd -name #{node_name} -data-dir /opt/etcd \
- -listen-client-urls http://0.0.0.0:2379,http://0.0.0.0:4001 \
- -advertise-client-urls http://#{node_addr}:2379,http://#{node_addr}:4001 \
- -initial-advertise-peer-urls http://#{node_addr}:2380 \
- -listen-peer-urls http://#{node_addr}:2380 \
- -initial-cluster #{node_peers} \
- -initial-cluster-state new 0<&- &>/tmp/etcd.log &) || exit 1
+set -x
+(nohup etcd --name #{node_name} --data-dir /tmp/etcd \
+ --listen-client-urls http://0.0.0.0:2379,http://0.0.0.0:4001 \
+ --advertise-client-urls http://#{node_addr}:2379,http://#{node_addr}:4001 \
+ --initial-advertise-peer-urls http://#{node_addr}:2380,http://#{node_addr}:7001 \
+ --listen-peer-urls http://#{node_addr}:2380 \
+ --initial-cluster #{node_peers.join(",")} --initial-cluster-state new \
+  0<&- &>/tmp/etcd.log &) || exit 1
 
 ## start consul
-(echo && echo consul agent -server #{consul_join_flag} #{consul_bootstrap_flag} \
- -bind=#{node_addr} -data-dir /opt/consul)
 (nohup consul agent -server #{consul_join_flag} #{consul_bootstrap_flag} \
  -bind=#{node_addr} -data-dir /opt/consul 0<&- &>/tmp/consul.log &) || exit 1
 SCRIPT

netutils/netutils.go

@@ -211,40 +211,6 @@ func ParseTagRanges(ranges string, tagType string) ([]TagRange, error) {
 	return tagRanges, nil
 }
 
-// GetLocalIP obtains the first IP on a local interface on the host.
-func GetLocalIP() (string, error) {
-	var addrs []netlink.Addr
-	localIPAddr := ""
-
-	for idx := 0; idx < 3; idx++ {
-		linkName := "eth" + strconv.Itoa(idx)
-		link, err := netlink.LinkByName(linkName)
-		if err != nil {
-			if strings.Contains(err.Error(), "Link not found") {
-				continue
-			}
-			return "", err
-		}
-		addrs, err = netlink.AddrList(link, netlink.FAMILY_V4)
-		if err != nil {
-			if strings.Contains(err.Error(), "Link not found") {
-				continue
-			}
-			return "", err
-		}
-		if len(addrs) > 0 {
-			localIPAddr = addrs[0].IP.String()
-		}
-	}
-
-	err := core.Errorf("local ip not found")
-	if localIPAddr != "" {
-		err = nil
-	}
-
-	return localIPAddr, err
-}
-
 // ParseCIDR parses a CIDR string into a gateway IP and length.
 func ParseCIDR(cidrStr string) (string, uint, error) {
 	strs := strings.Split(cidrStr, "/")

netutils/netutils_test.go

@@ -196,10 +196,3 @@ func TestGetSubnetNumber(t *testing.T) {
 		}
 	}
 }
-
-func TestGetLocalIP(t *testing.T) {
-	ipAddr, err := GetLocalIP()
-	if ipAddr == "" {
-		t.Fatalf("error obtaining local IP of the host '%s' \n", err)
-	}
-}

scripts/unittests

@@ -36,7 +36,7 @@ done
 
 # running on host
 if ${run_in_vagrant}; then
-    (CONTIV_NODES=1 vagrant up)
+    (CONTIV_NODE_OS="${CONTIV_NODE_OS}" CONTIV_NODES=1 vagrant up)
     ret=$?
     if [ ${ret} -ne 0 ]; then
         (CONTIV_NODES=1 vagrant destroy -f)