Fix DBAAS configuration and increment mc-core container tag

Signed-off-by: vlad shkapenyuk <vshkap@research.att.com>
Change-Id: Ibf76a5db12fa4909543db9dd57e35346fb1aa4ac

diff --git a/mc-core/Dockerfile b/mc-core/Dockerfile
index 8073475..2bec298 100644 (file)
--- a/mc-core/Dockerfile
+++ b/mc-core/Dockerfile
@@ -70,29 +70,31 @@ RUN python generate_runall.py
 
 
 # now install the binaries and libraries into smaller docker image
-FROM nexus3.o-ran-sc.org:10004/o-ran-sc/ric-app-mc-listener:1.3.2
+FROM nexus3.o-ran-sc.org:10004/o-ran-sc/ric-app-mc-listener:1.3.3
 
 ARG STAGE_DIR
 
 COPY --from=project-build ${STAGE_DIR}/gs-lite/demo/queries /mc/gs-lite/demo/queries
 COPY --from=project-build ${STAGE_DIR}/gs-lite/bin /mc/gs-lite/bin
 COPY --from=project-build ${STAGE_DIR}/data_gen /mc/data_gen
-COPY --from=project-build ${STAGE_DIR}/mc_deployment.json /mc/
 COPY --from=project-build ${STAGE_DIR}/extract_params.py /mc/
 COPY --from=project-build /usr/local/lib/libproto* /usr/local/lib/
 COPY --from=project-build /usr/local/lib/libsdl* /usr/local/lib/
 
+WORKDIR /opt/ric/config
+COPY --from=project-build ${STAGE_DIR}/mc_deployment.json /opt/ric/config
+
 COPY container_start.sh /playpen/bin/
 
 RUN apt-get update && \
-    apt-get install -y curl python python-pip libboost-all-dev libhiredis-dev && \
-# redis-tools && \
+    apt-get install -y curl python python-pip libboost-all-dev libhiredis-dev \
+ redis-tools && \
     apt-get clean
 
 RUN ldconfig
 RUN pip install protobuf
 
-ENV XAPP_DESCRIPTOR_PATH /mc/mc_deployment.json
+ENV XAPP_DESCRIPTOR_PATH /opt/ric/config/mc_deployment.json
 WORKDIR /playpen
 ENV GSLITE_ROOT /mc/gs-lite
 

diff --git a/mc-core/container-tag.yaml b/mc-core/container-tag.yaml
index 1add03f..e8d0e42 100644 (file)
--- a/mc-core/container-tag.yaml
+++ b/mc-core/container-tag.yaml
@@ -1,4 +1,4 @@
 ---
-tag: '3.0.1'
+tag: '1.0.2'
 
 # this is used by the CI jobs to tag the image it builds

diff --git a/mc-core/mc/mc_deployment.json b/mc-core/mc/mc_deployment.json
index 2ea02f1..635fdd5 100644 (file)
--- a/mc-core/mc/mc_deployment.json
+++ b/mc-core/mc/mc_deployment.json
@@ -30,11 +30,9 @@
                }
        },
        "parameters": {
-               "ves_collector_address":"envy15:8888",
+               "ves_collector_address":"xapp-sandbox2.research.att.com:8888",
                "measurement_interval": 10000,
                "simulator_mode": "true",
-               "debug_mode": "true",
-               "__DBAAS_SERVICE_HOST__": "tuska",
-               "__DBAAS_SERVICE_PORT__": 6379
+               "debug_mode": "true"
        }
 }

diff --git a/mc-core/mc/queries/generate_runall.py b/mc-core/mc/queries/generate_runall.py
index 51e13d2..2d55a30 100644 (file)
--- a/mc-core/mc/queries/generate_runall.py
+++ b/mc-core/mc/queries/generate_runall.py
@@ -69,8 +69,8 @@ DEBUG_MODE=`python /mc/extract_params.py $XAPP_DESCRIPTOR_PATH debug_mode`
 
 WINDOW=`python /mc/extract_params.py $XAPP_DESCRIPTOR_PATH measurement_interval`
 
-export DBAAS_SERVICE_HOST=`python /mc/extract_params.py $XAPP_DESCRIPTOR_PATH __DBAAS_SERVICE_HOST__`
-export DBAAS_SERVICE_PORT=`python /mc/extract_params.py $XAPP_DESCRIPTOR_PATH __DBAAS_SERVICE_PORT__`
+# export DBAAS_SERVICE_HOST=`python /mc/extract_params.py $XAPP_DESCRIPTOR_PATH __DBAAS_SERVICE_HOST__`
+# export DBAAS_SERVICE_PORT=`python /mc/extract_params.py $XAPP_DESCRIPTOR_PATH __DBAAS_SERVICE_PORT__`
 
 if [ "$SIMULATOR_MODE" = "true" ]
 then
@@ -90,8 +90,8 @@ VES_NAME=`echo $VES_COLLECTOR | awk 'BEGIN{FS=":"} {print $1}'`
 VES_PORT=`echo $VES_COLLECTOR | awk 'BEGIN{FS=":"} {print $2}'`
 VES_IP=`getent ahosts $VES_NAME | awk '{ print $1; exit }'`
 
-echo "Clearing MC NIB namespace"
-/mc/gs-lite/bin/mc_clear
+echo "Clearing MC NIB namespace" >&2
+/mc/gs-lite/bin/mc_clear >&2
 
 echo "Storing MC NIB schemas" >&2
 /mc/gs-lite/bin/mc_store_schema >&2