update for change to etsicatalog

Change-Id: Idc2a6950960a324964500a8c4701be422de2b782
Issue-ID: MODELING-216
Signed-off-by: dyh <dengyuanhong@chinamobile.com>

7 files changed, 23 insertions, 23 deletions

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 03a9ffb..b76da98 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -15,4 +15,4 @@ EXPOSE 8806
 USER onap
 WORKDIR /service
 
-ENTRYPOINT modeling/genericparser/docker/docker-entrypoint.sh
+ENTRYPOINT modeling/etsicatalog/docker/docker-entrypoint.sh
diff --git a/docker/build_image.sh b/docker/build_image.sh
index c0164fd..98550cd 100755
--- a/docker/build_image.sh
+++ b/docker/build_image.sh
@@ -8,7 +8,7 @@ BUILD_ARGS="--no-cache"
 ORG="onap"
 VERSION="1.0.3"
 PROJECT="modeling"
-IMAGE="genericparser"
+IMAGE="etsicatalog"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
 IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
 TIMESTAMP=$(date +"%Y%m%dT%H%M%S")
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 1e2e16a..8666f69 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -35,12 +35,12 @@ for i in {1..5}; do
 done
 
 # Configure service based on docker environment variables
-modeling/genericparser/docker/instance_config.sh
+modeling/etsicatalog/docker/instance_config.sh
 
 # microservice-specific one-time initialization
-modeling/genericparser/docker/instance_init.sh
+modeling/etsicatalog/docker/instance_init.sh
 
 date > init.log
 
 # Start the microservice
-modeling/genericparser/docker/instance_run.sh
+modeling/etsicatalog/docker/instance_run.sh
diff --git a/docker/docker-env-conf.sh b/docker/docker-env-conf.sh
index 953867e..aa79088 100755
--- a/docker/docker-env-conf.sh
+++ b/docker/docker-env-conf.sh
@@ -6,13 +6,13 @@ install_sf(){
     apk --no-cache add bash curl gcc wget mysql-client openssl-dev
     apk --no-cache add python36-dev libffi-dev musl-dev py3-virtualenv
 
-    # get binary zip from nexus - vfc-nfvo-genericparser
+    # get binary zip from nexus - modeling-etsicatalog
 
-    wget -q -O modeling-genericparser.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.modeling.genericparser&a=modeling-genericparser&e=zip&v=${pkg_version}-SNAPSHOT&e=zip" && \
-    unzip modeling-genericparser.zip && \
-    rm -rf modeling-genericparser.zip && \
+    wget -q -O modeling-etsicatalog.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.modeling.genericparser&a=modeling-genericparser&e=zip&v=${pkg_version}-SNAPSHOT&e=zip" && \
+    unzip modeling-etsicatalog.zip && \
+    rm -rf modeling-etsicatalog.zip && \
     pip install --upgrade setuptools pip  && \
-    pip install --no-cache-dir --pre -r  /service/modeling/genericparser/requirements.txt
+    pip install --no-cache-dir --pre -r  /service/modeling/etsicatalog/requirements.txt
 }
 
 add_user(){
diff --git a/docker/instance_config.sh b/docker/instance_config.sh
index 80a278f..ebc785a 100755
--- a/docker/instance_config.sh
+++ b/docker/instance_config.sh
@@ -2,18 +2,18 @@
 
 MSB_IP=`echo $MSB_ADDR | cut -d: -f 1`
 MSB_PORT=`echo $MSB_ADDR | cut -d: -f 2`
-# modeling/genericparser
+# modeling/etsicatalog
 
 if [ $MSB_IP ]; then
-    sed -i "s|MSB_SERVICE_IP.*|MSB_SERVICE_IP = '$MSB_IP'|"  modeling/genericparser/genericparser/pub/config/config.py
+    sed -i "s|MSB_SERVICE_IP.*|MSB_SERVICE_IP = '$MSB_IP'|"  modeling/etsicatalog/catalog/pub/config/config.py
 fi
 
 if [ $MSB_PORT ]; then
-    sed -i "s|MSB_SERVICE_PORT.*|MSB_SERVICE_PORT = '$MSB_PORT'|" modeling/genericparser/genericparser/pub/config/config.py
+    sed -i "s|MSB_SERVICE_PORT.*|MSB_SERVICE_PORT = '$MSB_PORT'|" modeling/etsicatalog/catalog/pub/config/config.py
 fi
 
 if [ $SERVICE_IP ]; then
-    sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" modeling/genericparser/genericparser/pub/config/config.py
+    sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" modeling/etsicatalog/catalog/pub/config/config.py
 fi
 
 MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
@@ -27,8 +27,8 @@ else
 fi
 
 
-sed -i "s|DB_IP.*|DB_IP = '$MYSQL_IP'|" modeling/genericparser/genericparser/pub/config/config.py
-sed -i "s|DB_PORT.*|DB_PORT = $MYSQL_PORT|" modeling/genericparser/genericparser/pub/config/config.py
-sed -i "s|REDIS_HOST.*|REDIS_HOST = '$REDIS_IP'|"modeling/genericparser/genericparser/pub/config/config.py
+sed -i "s|DB_IP.*|DB_IP = '$MYSQL_IP'|" modeling/etsicatalog/catalog/pub/config/config.py
+sed -i "s|DB_PORT.*|DB_PORT = $MYSQL_PORT|" modeling/etsicatalog/catalog/pub/config/config.py
+sed -i "s|REDIS_HOST.*|REDIS_HOST = '$REDIS_IP'|"modeling/etsicatalog/catalog/pub/config/config.py
 
-cat modeling/genericparser/genericparser/pub/config/config.py
+cat modeling/etsicatalog/catalog/pub/config/config.py
diff --git a/docker/instance_init.sh b/docker/instance_init.sh
index 0c25203..3b6ca8c 100755
--- a/docker/instance_init.sh
+++ b/docker/instance_init.sh
@@ -13,13 +13,13 @@ fi
 
 function create_database {
 
-    cd /service/modeling/genericparser/resources/bin
+    cd /service/modeling/catalog/resources/bin
     bash initDB.sh $MYSQL_ROOT_USER $MYSQL_ROOT_PASSWORD $MYSQL_PORT $MYSQL_IP
 
  }
 
 function migrate_database {
-    cd /service/modeling/genericparser
+    cd /service/modeling/catalog
     python manage.py migrate
 }
 
diff --git a/docker/instance_run.sh b/docker/instance_run.sh
index c451190..ad20163 100755
--- a/docker/instance_run.sh
+++ b/docker/instance_run.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-cd /service/modeling/genericparser
+cd /service/modeling/etsicatalog
 
 ./run.sh
 
-while [ ! -f logs/runtime_genericparser.log ]; do
+while [ ! -f logs/runtime_etsicatalog.log ]; do
     sleep 1
 done
-tail -F logs/runtime_genericparser.log
+tail -F logs/runtime_etsicatalog.log