Merge "add codes for exception"

diff --git a/lcm/docker/build_image.sh b/lcm/docker/build_image.sh
index fd15c98..8f104cf 100755 (executable)
--- a/lcm/docker/build_image.sh
+++ b/lcm/docker/build_image.sh
@@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.3.2"
+VERSION="1.3.3"
 PROJECT="vfc"
 IMAGE="vnflcm"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"

diff --git a/lcm/pom.xml b/lcm/pom.xml
index 2f7fc6a..91a6b89 100644 (file)
--- a/lcm/pom.xml
+++ b/lcm/pom.xml
@@ -18,12 +18,12 @@
     <parent>
         <groupId>org.onap.vfc.gvnfm.vnflcm</groupId>
         <artifactId>vfc-gvnfm-vnflcm</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.vfc.gvnfm.vnflcm.lcm</groupId>
     <artifactId>vfc-gvnfm-vnflcm-lcm</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>vfc-gvnfm-vnflcm-lcm</name>
     <properties>

diff --git a/lcm/run.sh b/lcm/run.sh
index 54edcb5..295db79 100755 (executable)
--- a/lcm/run.sh
+++ b/lcm/run.sh
@@ -17,12 +17,11 @@ if [ ! -x  $logDir  ]; then
        mkdir -p $logDir
 fi
 
-# nohup python manage.py runserver 0.0.0.0:8801 > /dev/null &
+nohup python manage.py runserver 0.0.0.0:8801 > /dev/null &
 # nohup uwsgi --http :8801 -t 120 --module lcm.wsgi --master --processes 4 &
 
-if [ "${SSL_ENABLED}" = "true" ]; then
-    nohup uwsgi --https :8801,lcm/pub/ssl/cert/foobar.crt,lcm/pub/ssl/cert/foobar.key, -t 120 --enable-threads --module lcm.wsgi --master --processes 4 &
-else
-    nohup uwsgi --http :8801 -t 120 --enable-threads --module lcm.wsgi --master --processes 4 &
-fi
-
+# if [ "${SSL_ENABLED}" = "true" ]; then
+#     nohup uwsgi --https :8801,lcm/pub/ssl/cert/foobar.crt,lcm/pub/ssl/cert/foobar.key, -t 120 --enable-threads --module lcm.wsgi --master --processes 4 &
+# else
+#     nohup uwsgi --http :8801 -t 120 --enable-threads --module lcm.wsgi --master --processes 4 &
+# fi

diff --git a/lcm/stop.sh b/lcm/stop.sh
index ecea10e..004fb0b 100755 (executable)
--- a/lcm/stop.sh
+++ b/lcm/stop.sh
@@ -13,5 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# ps auxww | grep 'manage.py runserver 0.0.0.0:8801' | awk '{print $1}' | xargs kill -9
-ps auxww |grep 'uwsgi --http' |awk '{print $1}' |xargs kill -9
\ No newline at end of file
+ps auxww | grep 'manage.py runserver 0.0.0.0:8801' | awk '{print $1}' | xargs kill -9
+# ps auxww |grep 'uwsgi --http' |awk '{print $1}' |xargs kill -9
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index 627c281..2b470b9 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.vfc.gvnfm.vnflcm</groupId>
     <artifactId>vfc-gvnfm-vnflcm</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>vfc-gvnfm-vnflcm</name>
     <description>vfc gvnfm vnflcm</description>

diff --git a/version.properties b/version.properties
index bf02e8d..f9bc3a2 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -19,7 +19,7 @@
 
 major=1
 minor=3
-patch=2
+patch=3
 
 base_version=${major}.${minor}.${patch}