From: yangyan <yangyanyj@chinamobile.com>
Date: Fri, 26 Apr 2019 04:13:33 +0000 (+0800)
Subject: update service name
X-Git-Tag: 1.0.0~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=modeling%2Fetsicatalog.git;a=commitdiff_plain;h=63c392e9cca3c6654e8383f49e5136fa86d1c72a

update service name

Change-Id: I564aceafe7c421398d7c67f9983f064fd9ae02d2
Issue-ID: MODELING-156
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
---

diff --git a/LICENSE b/LICENSE
index 1586716..04ca53e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Micro service of nfvo catalog.
+# Micro service of modeling genericparser.
diff --git a/docker/instance_run.sh b/docker/instance_run.sh
index 8fce672..c451190 100755
--- a/docker/instance_run.sh
+++ b/docker/instance_run.sh
@@ -4,7 +4,7 @@ cd /service/modeling/genericparser
 
 ./run.sh
 
-while [ ! -f logs/runtime_catalog.log ]; do
+while [ ! -f logs/runtime_genericparser.log ]; do
     sleep 1
 done
-tail -F logs/runtime_catalog.log
+tail -F logs/runtime_genericparser.log
diff --git a/genericparser/pub/config/config.py b/genericparser/pub/config/config.py
index abecd79..60b4836 100644
--- a/genericparser/pub/config/config.py
+++ b/genericparser/pub/config/config.py
@@ -24,9 +24,9 @@ REDIS_PASSWD = ''
 # [mysql]
 DB_IP = "127.0.0.1"
 DB_PORT = 3306
-DB_NAME = "genericpaser"
-DB_USER = "genericpaser"
-DB_PASSWD = "genericpaser"
+DB_NAME = "genericparser"
+DB_USER = "genericparser"
+DB_PASSWD = "genericparser"
 
 # [MDC]
 SERVICE_NAME = "genericparser"
diff --git a/resources/dbscripts/mysql/modeling-gengricparser-createdb.sql b/resources/dbscripts/mysql/modeling-gengricparser-createdb.sql
index 90d4166..d868899 100644
--- a/resources/dbscripts/mysql/modeling-gengricparser-createdb.sql
+++ b/resources/dbscripts/mysql/modeling-gengricparser-createdb.sql
@@ -17,12 +17,12 @@
 /******************create database and user***************************/
 use mysql;
 
-create database if not exists genericpaser CHARACTER SET utf8;
+create database if not exists genericparser CHARACTER SET utf8;
 
 
-GRANT ALL PRIVILEGES ON genericpaser.* TO 'genericpaser'@'%' IDENTIFIED BY 'genericpaser' WITH GRANT OPTION;
-GRANT ALL PRIVILEGES ON mysql.* TO 'genericpaser'@'%' IDENTIFIED BY 'genericpaser' WITH GRANT OPTION;
+GRANT ALL PRIVILEGES ON genericparser.* TO 'genericparser'@'%' IDENTIFIED BY 'genericparser' WITH GRANT OPTION;
+GRANT ALL PRIVILEGES ON mysql.* TO 'genericparser'@'%' IDENTIFIED BY 'genericparser' WITH GRANT OPTION;
 
-GRANT ALL PRIVILEGES ON genericpaser.* TO 'genericpaser'@'localhost' IDENTIFIED BY 'genericpaser' WITH GRANT OPTION;
-GRANT ALL PRIVILEGES ON mysql.* TO 'genericpaser'@'localhost' IDENTIFIED BY 'genericpaser' WITH GRANT OPTION;
+GRANT ALL PRIVILEGES ON genericparser.* TO 'genericparser'@'localhost' IDENTIFIED BY 'genericparser' WITH GRANT OPTION;
+GRANT ALL PRIVILEGES ON mysql.* TO 'genericparser'@'localhost' IDENTIFIED BY 'genericparser' WITH GRANT OPTION;
 FLUSH PRIVILEGES;
diff --git a/run.sh b/run.sh
index 1b8eb46..d8879e8 100755
--- a/run.sh
+++ b/run.sh
@@ -23,14 +23,14 @@ fi
 
 
 if [ ${SSL_ENABLED} = "true" ]; then
-    nohup uwsgi --https :8806,genericpaser/pub/ssl/cert/foobar.crt,genericpaser/pub/ssl/cert/foobar.key, -t 120 --module genericpaser.wsgi --master --processes 4 &
+    nohup uwsgi --https :8806,genericparser/pub/ssl/cert/foobar.crt,genericparser/pub/ssl/cert/foobar.key, -t 120 --module genericparser.wsgi --master --processes 4 &
 else
-    nohup uwsgi --http :8806 -t 120 --module genericpaser.wsgi --master --processes 4 &
+    nohup uwsgi --http :8806 -t 120 --module genericparser.wsgi --master --processes 4 &
 fi
 
 
-while [ ! -f $logDir/runtime_genericpaser.log ]; do
+while [ ! -f $logDir/runtime_genericparser.log ]; do
     sleep 1
 done
 
-tail -F  $logDir/runtime_genericpaser.log
\ No newline at end of file
+tail -F  $logDir/runtime_genericparser.log
\ No newline at end of file
diff --git a/stop.sh b/stop.sh
index 74a5fd6..a2fa2ae 100755
--- a/stop.sh
+++ b/stop.sh
@@ -14,4 +14,4 @@
 # limitations under the License.
 
 # ps auxww | grep "manage.py runserver 0.0.0.0:8806" | awk '{print $2}' | xargs kill -9
-ps auxww |grep 'uwsgi --http :8806 --module genericpaser.wsgi --master' |awk '{print $2}' |xargs kill -9
+ps auxww |grep 'uwsgi --http :8806 --module genericparser.wsgi --master' |awk '{print $2}' |xargs kill -9