Register API to MSB via HTTPS

Change-Id: Ib87aa43a1991b3b7ba3a8874a1b59c442cddd127
Issue-ID: MODELING-291
Signed-off-by: dyh <dengyuanhong@chinamobile.com>

diff --git a/catalog/pub/utils/restcall.py b/catalog/pub/utils/restcall.py
index 8f03259..1499f8f 100644 (file)
--- a/catalog/pub/utils/restcall.py
+++ b/catalog/pub/utils/restcall.py
@@ -84,13 +84,13 @@ def call_req(base_url, user, passwd, auth_type, resource, method, content='', ad
 
 
 def req_by_msb(resource, method, content=''):
-    base_url = "http://%s:%s/" % (MSB_SERVICE_IP, MSB_SERVICE_PORT)
+    base_url = "https://%s:%s/" % (MSB_SERVICE_IP, MSB_SERVICE_PORT)
     return call_req(base_url, "", "", rest_no_auth, resource, method, content)
 
 
 def upload_by_msb(resource, method, file_data={}):
     headers = {'Content-Type': 'application/octet-stream'}
-    full_url = "http://%s:%s/%s" % (MSB_SERVICE_IP, MSB_SERVICE_PORT, resource)
+    full_url = "https://%s:%s/%s" % (MSB_SERVICE_IP, MSB_SERVICE_PORT, resource)
     http = httplib2.Http()
     resp, resp_content = http.request(full_url, method=method.upper(), body=file_data, headers=headers)
     resp_status, resp_body = resp['status'], resp_content.decode('UTF-8')

diff --git a/catalog/urls.py b/catalog/urls.py
index 76c972b..466fed6 100644 (file)
--- a/catalog/urls.py
+++ b/catalog/urls.py
@@ -16,7 +16,7 @@ from django.conf.urls import include, url
 from django.contrib import admin
 
 from catalog.pub.config.config import REG_TO_MSB_WHEN_START, REG_TO_MSB_REG_URL, REG_TO_MSB_REG_PARAM, \
-    MSB_SVC_CALALOG_URL, MSB_SVC_NSD_URL, MSB_SVC_VNFPKGM_URL
+    MSB_SVC_CALALOG_URL, MSB_SVC_NSD_URL, MSB_SVC_VNFPKGM_URL, MSB_SVC_PARSER_URL
 
 urlpatterns = [
     url(r'^api/catalog/v1/admin', admin.site.urls),
@@ -30,8 +30,10 @@ urlpatterns = [
 if REG_TO_MSB_WHEN_START:
     import json
     from catalog.pub.utils.restcall import req_by_msb
+
     req_by_msb(MSB_SVC_CALALOG_URL, "DELETE")
     req_by_msb(MSB_SVC_NSD_URL, "DELETE")
     req_by_msb(MSB_SVC_VNFPKGM_URL, "DELETE")
+    req_by_msb(MSB_SVC_PARSER_URL, "DELETE")
     for reg_param in REG_TO_MSB_REG_PARAM:
         req_by_msb(REG_TO_MSB_REG_URL, "POST", json.JSONEncoder().encode(reg_param))