Merge pull request #508 from opensds/development

Merge development into master branch to prepare for Bali milestone-1

.gitignore

@@ -1,4 +1,5 @@
 /bin
+build/
 *.log
 .DS_Store
 *.retry

.travis.yml

@@ -20,6 +20,9 @@ env:
   - secure: "IhEskTMEAsBNYTQCpDSlvDxIJK5cu1r2V"
 
 before_install:
+  - sudo apt-get update
+  - sudo apt-get install -y build-essential gcc
+  - sudo apt-get install -y librados-dev librbd-dev
   - sudo apt-get install -y lvm2 tgt open-iscsi
 
 matrix:

Gopkg.toml

@@ -0,0 +1,66 @@
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#   name = "github.com/x/y"
+#   version = "2.4.0"
+#
+# [prune]
+#   non-go = false
+#   go-tests = true
+#   unused-packages = true
+
+
+[[constraint]]
+  name = "github.com/LINBIT/godrbdutils"
+  revision = "65b98a0f103a76a594d9862fb6f33c43c2b46123"
+
+[[constraint]]
+  name = "github.com/astaxie/beego"
+  version = "1.9.2"
+
+[[constraint]]
+  name = "github.com/coreos/etcd"
+  version = "3.3.3"
+
+[[constraint]]
+  name = "github.com/go-ini/ini"
+  version = "1.33.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/golang/glog"
+
+[[constraint]]
+  name = "github.com/satori/go.uuid"
+  version = "1.1.0"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.2.1"
+
+[[constraint]]
+  name = "google.golang.org/grpc"
+  version = "1.7.5"
+
+[[constraint]]
+  name = "gopkg.in/yaml.v2"
+  version = "2.0.0"
+
+[prune]
+  go-tests = true
+  unused-packages = true

Makefile

@@ -12,39 +12,63 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-.PHONY: all package build osdsdock osdslet osdsctl docker test protoc clean
+BASE_DIR := $(shell pwd)
+BUILD_DIR := $(BASE_DIR)/build/out
+DIST_DIR := $(BASE_DIR)/build/dist
+VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
+                 git describe --match=$(git rev-parse --short=8 HEAD) \
+		 --always --dirty --abbrev=8)
+BUILD_TGT := opensds-hotpot-$(VERSION)-linux-amd64
 
-all:package build
+all: build
 
-package:
+ubuntu-dev-setup:
 	sudo apt-get update && sudo apt-get install -y \
 	  build-essential gcc librados-dev librbd-dev
 
 build:osdsdock osdslet osdsctl
 
-osdsdock:
-	mkdir -p ./build/out/bin/
-	go build -o ./build/out/bin/osdsdock github.com/opensds/opensds/cmd/osdsdock
+prebuild:
+	mkdir -p $(BUILD_DIR)
 
-osdslet:
-	mkdir -p ./build/out/bin/
-	go build -o ./build/out/bin/osdslet github.com/opensds/opensds/cmd/osdslet
+.PHONY: osdsdock osdslet osdsctl docker test protoc
 
-osdsctl:
-	mkdir -p ./build/out/bin/
-	go build -o ./build/out/bin/osdsctl github.com/opensds/opensds/osdsctl
+osdsdock: prebuild
+	go build -o $(BUILD_DIR)/bin/osdsdock github.com/opensds/opensds/cmd/osdsdock
 
-docker:build
-	cp ./build/out/bin/osdsdock ./cmd/osdsdock
-	cp ./build/out/bin/osdslet ./cmd/osdslet
+osdslet: prebuild
+	go build -o $(BUILD_DIR)/bin/osdslet github.com/opensds/opensds/cmd/osdslet
+
+osdsctl: prebuild
+	go build -o $(BUILD_DIR)/bin/osdsctl github.com/opensds/opensds/osdsctl
+
+docker: build
+	cp $(BUILD_DIR)/bin/osdsdock ./cmd/osdsdock
+	cp $(BUILD_DIR)/bin/osdslet ./cmd/osdslet
 	docker build cmd/osdsdock -t opensdsio/opensds-dock:latest
 	docker build cmd/osdslet -t opensdsio/opensds-controller:latest
 
-test:build
+test: build
 	script/CI/test
 
 protoc:
 	cd pkg/dock/proto && protoc --go_out=plugins=grpc:. dock.proto
 
 clean:
-	rm -rf ./build ./cmd/osdslet/osdslet ./cmd/osdsdock/osdsdock
+	rm -rf $(BUILD_DIR) ./cmd/osdslet/osdslet ./cmd/osdsdock/osdsdock
+
+version:
+	@echo ${VERSION}
+
+.PHONY: dist
+dist: build
+	( \
+	    rm -fr $(DIST_DIR) && mkdir $(DIST_DIR) && \
+	    cd $(DIST_DIR) && \
+	    mkdir $(BUILD_TGT) && \
+	    cp -r $(BUILD_DIR)/bin $(BUILD_TGT)/ && \
+	    cp $(BASE_DIR)/LICENSE $(BUILD_TGT)/ && \
+	    zip -r $(DIST_DIR)/$(BUILD_TGT).zip $(BUILD_TGT) && \
+	    tar zcvf $(DIST_DIR)/$(BUILD_TGT).tar.gz $(BUILD_TGT) && \
+	    tree \
+	)

contrib/connector/fc/fc.go

@@ -19,7 +19,7 @@ import (
 )
 
 const (
-	fcDriver = "fc"
+	fcDriver = "fibre_channel"
 )
 
 type FC struct {