src, docker: Change pkg import path of DMA

Different repository from OPNFV repository was temporary used
as our own go package paths of DMA.
Since the DMA code was merged in OPNFV Barometer,
we change the import path to the Barometer repository
and we simplify Dockerfile.

Change-Id: I49aba163d3bd93a9edb48ce10bd4f69a43c2e28a
Signed-off-by: Toshiaki Takahashi <takahashi.tsc@ncos.nec.co.jp>

diff --git a/docker/barometer-dma/Dockerfile b/docker/barometer-dma/Dockerfile
index afe7c3f..afd68c3 100644 (file)
--- a/docker/barometer-dma/Dockerfile
+++ b/docker/barometer-dma/Dockerfile
@@ -8,15 +8,13 @@ RUN yum update -y &&\
     yum install -y golang
 
 # set environment variables
-# need to change when we move to barometer
 ENV DOCKER y
-ENV repos_dir /root/go/src/github.com/distributed-monitoring/agent
+ENV repos_dir /root/go/src/github.com/opnfv
 
-# copy repo code and 
-# COPY . ${repos_dir}
+# get repo code and build
 WORKDIR ${repos_dir}
-RUN git clone https://gerrit.opnfv.org/gerrit/barometer && \
-    mv barometer/src/dma/* ./
+RUN git clone https://gerrit.opnfv.org/gerrit/barometer
+WORKDIR ${repos_dir}/barometer/src/dma
 RUN go build ./cmd/server && \
     go build ./cmd/threshold && \
     go build ./cmd/infofetch

diff --git a/src/dma/cmd/infofetch/daemon.go b/src/dma/cmd/infofetch/daemon.go
index d4ff94f..3bb51bc 100644 (file)
--- a/src/dma/cmd/infofetch/daemon.go
+++ b/src/dma/cmd/infofetch/daemon.go
@@ -19,9 +19,9 @@ package main
 import (
        "context"
        "github.com/BurntSushi/toml"
-       "github.com/distributed-monitoring/agent/pkg/common"
        "github.com/go-redis/redis"
        libvirt "github.com/libvirt/libvirt-go"
+       "github.com/opnfv/barometer/src/dma/pkg/common"
        "log"
        "sync"
 )

diff --git a/src/dma/cmd/threshold/transmit.go b/src/dma/cmd/threshold/transmit.go
index 8cac2a8..8c60cc1 100644 (file)
--- a/src/dma/cmd/threshold/transmit.go
+++ b/src/dma/cmd/threshold/transmit.go
@@ -19,8 +19,8 @@ package main
 import (
        "bytes"
        "fmt"
-       "github.com/distributed-monitoring/agent/pkg/common"
        "github.com/go-redis/redis"
+       "github.com/opnfv/barometer/src/dma/pkg/common"
        "strconv"
        "strings"
        "time"