renaming folder to match go executable

Renaming folder from smsquorum to quorumclient
Added quorumclient build as part of the makefile
Will upload another patch in ci-management that
will call the new parent makefile

Issue-ID: AAF-213
Change-Id: Ib85ac6b9dc454fc1447cf2221a555d7a7552efa5
Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>

diff --git a/sms-service/bin/build_quorum_image.sh b/sms-service/bin/build_quorum_image.sh
index c154764..16bb378 100755 (executable)
--- a/sms-service/bin/build_quorum_image.sh
+++ b/sms-service/bin/build_quorum_image.sh
@@ -8,7 +8,7 @@ BUILD_ARGS="--no-cache"
 ORG="onap"
 VERSION="1.1.0"
 PROJECT="aaf"
-IMAGE="smsquorum"
+IMAGE="smsquorumclient"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
 IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
 TIMESTAMP=$(date +"%Y%m%dT%H%M%S")
@@ -21,7 +21,7 @@ if [ $HTTPS_PROXY ]; then
 fi
 #Need to create makefile
 function generate_binary {
-    pushd ../src/smsquorum
+    pushd ../src/quorumclient
     make build
     popd
     cp ../target/quorumclient .

diff --git a/sms-service/bin/quorumdockerfile b/sms-service/bin/quorumdockerfile
index 2e1a191..08a6606 100644 (file)
--- a/sms-service/bin/quorumdockerfile
+++ b/sms-service/bin/quorumdockerfile
@@ -1,9 +1,9 @@
 FROM alpine:3.7
 
-LABEL name="aaf-sms"
+LABEL name="aaf-sms-quorumclient"
 LABEL version=1.0.0
 LABEL maintainer="Girish Havaldar <hg0071052@techmahindra.com>"
 
-ADD quorumclient /smsquorum/bin/quorumclient
-RUN chmod +x /smsquorum/bin/quorumclient
-ENTRYPOINT ["/smsquorum/bin/quorumclient"]
+ADD quorumclient /quorumclient/bin/quorumclient
+RUN chmod +x /quorumclient/bin/quorumclient
+ENTRYPOINT ["/quorumclient/bin/quorumclient"]

diff --git a/sms-service/src/Makefile b/sms-service/src/Makefile
index 4091a3e..6569ec1 100644 (file)
--- a/sms-service/src/Makefile
+++ b/sms-service/src/Makefile
@@ -1,5 +1,7 @@
 build:
        $(MAKE) -C sms build
+       $(MAKE) -C quorumclient build
 
 deploy:
-       $(MAKE) -C sms deploy
\ No newline at end of file
+       $(MAKE) -C sms deploy
+       $(MAKE) -C quorumclient deploy
\ No newline at end of file

diff --git a/sms-service/src/smsquorum/Makefile b/sms-service/src/quorumclient/Makefile
similarity index 83%
rename from sms-service/src/smsquorum/Makefile
rename to sms-service/src/quorumclient/Makefile
index 4ffeeae..720be29 100644 (file)
--- a/sms-service/src/smsquorum/Makefile
+++ b/sms-service/src/quorumclient/Makefile
@@ -1,4 +1,4 @@
-GOPATH := $(shell realpath "$(PWD)/../../")\r
+GOPATH := $(shell realpath "$(CURDIR)/../../")\r
 BINARY := quorumclient\r
 PLATFORM := linux\r
 \r

diff --git a/sms-service/src/smsquorum/config.json b/sms-service/src/quorumclient/config.json
similarity index 100%
rename from sms-service/src/smsquorum/config.json
rename to sms-service/src/quorumclient/config.json

diff --git a/sms-service/src/smsquorum/quorumclient.go b/sms-service/src/quorumclient/quorumclient.go
similarity index 100%
rename from sms-service/src/smsquorum/quorumclient.go
rename to sms-service/src/quorumclient/quorumclient.go

diff --git a/sms-service/src/sms/Gopkg.lock b/sms-service/src/sms/Gopkg.lock
index b856a81..a1f61dc 100644 (file)
--- a/sms-service/src/sms/Gopkg.lock
+++ b/sms-service/src/sms/Gopkg.lock
@@ -69,7 +69,7 @@
     "json/scanner",
     "json/token"
   ]
-  revision = "f40e974e75af4e271d97ce0fc917af5898ae7bda"
+  revision = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"
 
 [[projects]]
   name = "github.com/hashicorp/vault"
@@ -119,7 +119,7 @@
     "openpgp/packet",
     "openpgp/s2k"
   ]
-  revision = "88942b9c40a4c9d203b82b3731787b672d6e809b"
+  revision = "b2aa35443fbc700ab74c586ae79b81c171851023"
 
 [[projects]]
   branch = "master"
@@ -130,7 +130,7 @@
     "idna",
     "lex/httplex"
   ]
-  revision = "6078986fec03a1dcc236c34816c71b0e05018fda"
+  revision = "b3c676e531a6dc479fa1b35ac961c13f5e2b4d2e"
 
 [[projects]]
   name = "golang.org/x/text"