X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=1fa3ad7c3c5f36cc4324baf211acf34e292e9275;hb=e406a34d5547107533e65ddfbb2074e96d77b4b3;hp=942ccc2ea7c8501c15ebbd23392af8b52fc80838;hpb=534c88222636f2197d8d7811b3ea0ef58909636a;p=ric-plt%2Fsubmgr.git

diff --git a/Dockerfile b/Dockerfile
index 942ccc2..1fa3ad7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,18 +20,21 @@
 #	Abstract:	Builds a container to compile Subscription Manager's code
 #	Date:		28 May 2019
 #
-FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:1-u18.04-nng1.1.1 as submgrbuild
+FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:3-u18.04-nng as submgrbuild
+
+RUN apt update && apt install -y iputils-ping net-tools curl tcpdump gdb
 
 WORKDIR /tmp
 
+ARG RMRVERSION=1.13.1
 # Install RMr shared library
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_1.9.0_amd64.deb/download.deb && dpkg -i rmr_1.9.0_amd64.deb && rm -rf rmr_1.9.0_amd64.deb
+RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
 # Install RMr development header files
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_1.9.0_amd64.deb/download.deb && dpkg -i rmr-dev_1.9.0_amd64.deb && rm -rf rmr-dev_1.9.0_amd64.deb
+RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
 
 # "PULLING LOG and COMPILING LOG"
-RUN git clone "https://gerrit.o-ran-sc.org/r/com/log" /opt/log && cd /opt/log && \
- ./autogen.sh && ./configure && make install && ldconfig
+#RUN git clone "https://gerrit.o-ran-sc.org/r/com/log" /opt/log && cd /opt/log && \
+# ./autogen.sh && ./configure && make install && ldconfig
 
 # "Installing Swagger"
 RUN cd /usr/local/go/bin \
@@ -41,16 +44,52 @@ RUN cd /usr/local/go/bin \
 
 
 WORKDIR /opt/submgr
-COPY e2ap e2ap
 
-# "COMPILING E2AP Wrapper"
-RUN cd e2ap && \
-    gcc -c -fPIC -Iheaders/ lib/*.c wrapper.c && \
-    gcc *.o -shared -o libwrapper.so && \
-    cp libwrapper.so /usr/local/lib/ && \
-    cp wrapper.h headers/*.h /usr/local/include/ && \
+RUN mkdir pkg
+
+#
+#
+#
+ENV CFLAGS="-DASN_DISABLE_OER_SUPPORT"
+ENV CGO_CFLAGS="-DASN_DISABLE_OER_SUPPORT"
+
+COPY 3rdparty 3rdparty
+RUN cd 3rdparty/libe2ap && \
+    gcc -c ${CFLAGS} -I. -fPIC *.c  && \
+    gcc *.o -shared -o libe2ap.so && \
+    cp libe2ap.so /usr/local/lib/ && \
+    cp *.h /usr/local/include/ && \
+    ldconfig
+
+COPY e2ap e2ap
+RUN cd e2ap/libe2ap_wrapper && \
+    gcc -c ${CFLAGS} -fPIC *.c  && \
+    gcc *.o -shared -o libe2ap_wrapper.so && \
+    cp libe2ap_wrapper.so /usr/local/lib/ && \
+    cp *.h /usr/local/include/ && \
     ldconfig
 
+# unittest
+RUN cd e2ap && /usr/local/go/bin/go test -v ./pkg/conv
+RUN cd e2ap && /usr/local/go/bin/go test -v ./pkg/e2ap_wrapper
+
+# test formating (not important)
+RUN cd e2ap && test -z "$(/usr/local/go/bin/gofmt -l pkg/conv/*.go)"
+RUN cd e2ap && test -z "$(/usr/local/go/bin/gofmt -l pkg/e2ap_wrapper/*.go)"
+RUN cd e2ap && test -z "$(/usr/local/go/bin/gofmt -l pkg/e2ap/*.go)"
+RUN cd e2ap && test -z "$(/usr/local/go/bin/gofmt -l pkg/e2ap/e2ap_tests/*.go)"
+
+#
+#
+#
+COPY go.mod go.mod
+COPY go.sum go.sum
+
+RUN /usr/local/go/bin/go mod download
+
+#
+#
+#
 COPY api api
 
 # "Getting and generating routing managers api client"
@@ -58,29 +97,36 @@ RUN git clone "https://gerrit.o-ran-sc.org/r/ric-plt/rtmgr" \
     && cp rtmgr/api/routing_manager.yaml api/ \
     && rm -rf rtmgr
 
-RUN mkdir pkg
-
-COPY go.mod go.mod
-
 RUN mkdir -p /root/go && \
     /usr/local/go/bin/swagger generate client -f api/routing_manager.yaml -t pkg/ -m rtmgr_models -c rtmgr_client
 
-
-RUN /usr/local/go/bin/go mod tidy
+#
+#
+#
 COPY pkg pkg
 COPY cmd cmd
 
+RUN mkdir -p /opt/bin && \
+    /usr/local/go/bin/go build -o /opt/bin/submgr cmd/submgr.go && \
+    mkdir -p /opt/build/container/usr/local
 
-RUN git clone -b v0.0.8 "https://gerrit.o-ran-sc.org/r/ric-plt/xapp-frame" /tmp/xapp-frame
-COPY tmp/rmr.go /tmp/xapp-frame/pkg/xapp/rmr.go
 
-RUN /usr/local/go/bin/go mod edit -replace "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame"="/tmp/xapp-frame"
+RUN /usr/local/go/bin/go mod tidy
 
-# "COMPILING Subscription manager"
-RUN mkdir -p /opt/bin && \
-  /usr/local/go/bin/go build -o /opt/bin/submgr cmd/submgr.go && \
-     mkdir -p /opt/build/container/usr/local
+# unittest
+COPY test/config-file.json test/config-file.json
+ENV CFG_FILE=/opt/submgr/test/config-file.json
+
+RUN /usr/local/go/bin/go test -test.coverprofile /tmp/submgr_cover.out -count=1 -v ./pkg/control
+
+RUN /usr/local/go/bin/go tool cover -html=/tmp/submgr_cover.out -o /tmp/submgr_cover.html
 
+# test formating (not important)
+RUN test -z "$(/usr/local/go/bin/gofmt -l pkg/control/*.go)"
+
+#
+#
+#
 FROM ubuntu:18.04
 
 RUN apt update && apt install -y iputils-ping net-tools curl tcpdump