diff options
| author |   dengyh <dengyuanhong@chinamobile.com> | 2020-06-23 14:43:00 +0800 |
|---|---|---|
| committer | Yuanhong Deng <dengyuanhong@chinamobile.com> | 2020-06-28 04:26:39 +0000 |
| commit | dc6d989132a5db3077de6937158386aacd46400c (patch) | |
| tree | 4f29f0b6d29e71852aff2105f0f016f98de1f635 | |
| parent | 649ddb83743de05ca5df0626de700ac24635fae7 (diff) | |
Implementation of HTTPS support for VFC-vnflcm project interface
Change-Id: I8d4442657f3083e8449b94987324a630cf2d05a8
Issue-ID: VFC-1676
Signed-off-by: dengyh <dengyuanhong@chinamobile.com>
| -rwxr-xr-x | lcm/docker/instance_config.sh | 4 | ||||
| -rw-r--r-- | lcm/lcm/pub/config/config.py | 6 | ||||
| -rw-r--r-- | lcm/requirements.txt | 2 | ||||
| -rwxr-xr-x | lcm/run.sh | 12 | ||||
| -rwxr-xr-x | lcm/stop.sh | 10 |
5 files changed, 25 insertions, 9 deletions
diff --git a/lcm/docker/instance_config.sh b/lcm/docker/instance_config.sh index 18dbd6b8..0d2cd6c1 100755 --- a/lcm/docker/instance_config.sh +++ b/lcm/docker/instance_config.sh @@ -24,6 +24,10 @@ if [ $REG_TO_MSB_WHEN_START ]; then sed -i "s|REG_TO_MSB_WHEN_START = .*|REG_TO_MSB_WHEN_START = '$REG_TO_MSB_WHEN_START'|" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py fi +if [ $SSL_ENABLED ]; then + sed -i "s|SSL_ENABLED = .*|SSL_ENABLED = '$SSL_ENABLED'|" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py +fi + sed -i "s/127.0.0.1:80/$MSB_IP:$MSB_PORT/" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py # Configure MYSQL diff --git a/lcm/lcm/pub/config/config.py b/lcm/lcm/pub/config/config.py index b14a9e86..41f0eedd 100644 --- a/lcm/lcm/pub/config/config.py +++ b/lcm/lcm/pub/config/config.py @@ -42,10 +42,16 @@ AAI_PASSWD = "AAI" # [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": "vnflcm", "version": "v1", + "enable_ssl": enable_ssl, "url": "/api/vnflcm/v1", "protocol": "REST", "visualRange": "1", diff --git a/lcm/requirements.txt b/lcm/requirements.txt index fc44fc1c..1ab0c53b 100644 --- a/lcm/requirements.txt +++ b/lcm/requirements.txt @@ -29,4 +29,4 @@ swagger-spec-validator>=2.1.0 onappylog==1.0.9 # uwsgi for parallel processing -# uwsgi +uwsgi @@ -17,11 +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 004fb0bc..0d03d056 100755 --- a/lcm/stop.sh +++ b/lcm/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: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 + +if [ "${SSL_ENABLED}" = "true" ]; then + ps auxww |grep 'uwsgi --https :8801' |awk '{print $1}' |xargs kill -9 +else + ps auxww |grep 'uwsgi --http :8801' |awk '{print $1}' |xargs kill -9 +fi
\ No newline at end of file |