Implementation of HTTPS support for VFC-vnfres project interface

Change-Id: I79aaf45cb613d8c1093275455dca41012039a51a
Issue-ID: VFC-1676
Signed-off-by: dengyh <dengyuanhong@chinamobile.com>

diff --git a/res/docker/instance_config.sh b/res/docker/instance_config.sh
index c770a2b..3cac097 100755 (executable)
--- a/res/docker/instance_config.sh
+++ b/res/docker/instance_config.sh
@@ -24,6 +24,10 @@ if [ $SERVICE_IP ]; then
     sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" vfc/gvnfm/vnfres/res/res/pub/config/config.py
 fi
 
+if [ $SSL_ENABLED ]; then
+    sed -i "s|SSL_ENABLED = .*|SSL_ENABLED = '$SSL_ENABLED'|"  vfc/gvnfm/vnfres/res/res/pub/config/config.py
+fi
+
 # Configure MYSQL
 MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
 MYSQL_PORT=`echo $MYSQL_ADDR | cut -d: -f 2`

diff --git a/res/res/pub/config/config.py b/res/res/pub/config/config.py
index d314ef8..c7da90a 100644 (file)
--- a/res/res/pub/config/config.py
+++ b/res/res/pub/config/config.py
@@ -37,10 +37,16 @@ FORWARDED_FOR_FIELDS = ["HTTP_X_FORWARDED_FOR", "HTTP_X_FORWARDED_HOST",
 
 # [register]
 REG_TO_MSB_WHEN_START = True
+SSL_ENABLED = "true"
 REG_TO_MSB_REG_URL = "/api/microservices/v1/services"
+if SSL_ENABLED == "true":
+    enable_ssl = "true"
+else:
+    enable_ssl = "false"
 REG_TO_MSB_REG_PARAM = {
     "serviceName": "vnfres",
     "version": "v1",
+    "enable_ssl": enable_ssl,
     "url": "/api/vnfres/v1",
     "protocol": "REST",
     "visualRange": "1",

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

diff --git a/res/stop.sh b/res/stop.sh
index 9bc0a3e..bc2f88e 100755 (executable)
--- a/res/stop.sh
+++ b/res/stop.sh
@@ -13,5 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ps auxww | grep 'manage.py runserver 0.0.0.0:8802' | awk '{print $1}' | xargs kill -9
+# ps auxww | grep 'manage.py runserver 0.0.0.0:8802' | awk '{print $1}' | xargs kill -9
 # ps auxww |grep 'uwsgi --http' |awk '{print $1}' |xargs kill -9
+
+if [ "${SSL_ENABLED}" = "true" ]; then
+    ps auxww |grep 'uwsgi --https :8802' |awk '{print $1}' |xargs kill -9
+else
+    ps auxww |grep 'uwsgi --http :8802' |awk '{print $1}' |xargs kill -9
+fi
\ No newline at end of file