Change-Id: I450596eb4c88e9cedb2ae705431973d1ca7e3a43
Issue-ID: MODELING-159
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
</includes>
</fileSet>
</fileSets>
</includes>
</fileSet>
</fileSets>
- <baseDirectory>modeling/toscaparsers/genericparser</baseDirectory>
+ <baseDirectory>modeling/genericparser</baseDirectory>
USER onap
WORKDIR /service
USER onap
WORKDIR /service
-ENTRYPOINT modeling/toscaparsers/genericparser/docker/docker-entrypoint.sh
+ENTRYPOINT modeling/genericparser/docker/docker-entrypoint.sh
done
# Configure service based on docker environment variables
done
# Configure service based on docker environment variables
-modeling/toscaparsers/genericparser/docker/instance_config.sh
+modeling/genericparser/docker/instance_config.sh
# microservice-specific one-time initialization
# microservice-specific one-time initialization
-modeling/toscaparsers/genericparser/docker/instance_init.sh
+modeling/genericparser/docker/instance_init.sh
date > init.log
# Start the microservice
date > init.log
# Start the microservice
-modeling/toscaparsers/genericparser/docker/instance_run.sh
+modeling/genericparser/docker/instance_run.sh
# get binary zip from nexus - vfc-nfvo-genericparser
# get binary zip from nexus - vfc-nfvo-genericparser
- wget -q -O modeling-genericparser.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.modeling.toscaparsers.genericparser&a=modeling-toscaparsers-genericparserr&v=LATEST&e=zip' && \
+ wget -q -O modeling-genericparser.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.modeling.genericparser&a=modeling-genericparserr&v=LATEST&e=zip' && \
unzip modeling-genericparser.zip && \
rm -rf modeling-genericparser.zip && \
pip install --upgrade setuptools pip && \
unzip modeling-genericparser.zip && \
rm -rf modeling-genericparser.zip && \
pip install --upgrade setuptools pip && \
- pip install --no-cache-dir --pre -r /service/modeling/toscaparsers/genericparser/requirements.txt
+ pip install --no-cache-dir --pre -r /service/modeling/genericparser/requirements.txt
# modeling/genericparser
if [ $MSB_IP ]; then
# modeling/genericparser
if [ $MSB_IP ]; then
- sed -i "s|MSB_SERVICE_IP.*|MSB_SERVICE_IP = '$MSB_IP'|" modeling/toscaparsers/genericparser/genericparser/pub/config/config.py
+ sed -i "s|MSB_SERVICE_IP.*|MSB_SERVICE_IP = '$MSB_IP'|" modeling/genericparser/genericparser/pub/config/config.py
fi
if [ $MSB_PORT ]; then
fi
if [ $MSB_PORT ]; then
- sed -i "s|MSB_SERVICE_PORT.*|MSB_SERVICE_PORT = '$MSB_PORT'|" modeling/toscaparsers/genericparser/genericparser/pub/config/config.py
+ sed -i "s|MSB_SERVICE_PORT.*|MSB_SERVICE_PORT = '$MSB_PORT'|" modeling/genericparser/genericparser/pub/config/config.py
fi
if [ $SERVICE_IP ]; then
fi
if [ $SERVICE_IP ]; then
- sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" modeling/toscaparsers/genericparser/genericparser/pub/config/config.py
+ sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" modeling/genericparser/genericparser/pub/config/config.py
fi
MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
fi
MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
-sed -i "s|DB_IP.*|DB_IP = '$MYSQL_IP'|" modeling/toscaparsers/genericparser/genericparser/pub/config/config.py
-sed -i "s|DB_PORT.*|DB_PORT = $MYSQL_PORT|" modeling/toscaparsers/genericparser/genericparser/pub/config/config.py
-sed -i "s|REDIS_HOST.*|REDIS_HOST = '$REDIS_IP'|"modeling/toscaparsers/genericparser/genericparser/pub/config/config.py
+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
-cat modeling/toscaparsers/genericparser/genericparser/pub/config/config.py
+cat modeling/genericparser/genericparser/pub/config/config.py
function create_database {
function create_database {
- cd /service/modeling/toscaparsers/genericparser/resources/bin
+ cd /service/modeling/genericparser/resources/bin
bash initDB.sh $MYSQL_ROOT_USER $MYSQL_ROOT_PASSWORD $MYSQL_PORT $MYSQL_IP
}
function migrate_database {
bash initDB.sh $MYSQL_ROOT_USER $MYSQL_ROOT_PASSWORD $MYSQL_PORT $MYSQL_IP
}
function migrate_database {
- cd /service/modeling/toscaparsers/genericparser
+ cd /service/modeling/genericparser
python manage.py migrate
}
python manage.py migrate
}
-cd /service/modeling/toscaparsers/genericparser
+cd /service/modeling/genericparser
<version>1.2.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>1.2.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.onap.modeling.toscaparsers.genericparser</groupId>
- <artifactId>modeling-toscaparsers-genericparser</artifactId>
+ <groupId>org.onap.modeling.genericparser</groupId>
+ <artifactId>modeling-genericparser</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>modeling-toscaparsers-genericparser</name>
- <description>modeling toscaparsers genericparser</description>
+ <name>modeling-genericparser</name>
+ <description>modeling genericparser</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonar.sources>.</sonar.sources>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonar.sources>.</sonar.sources>