aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordyh <dengyuanhong@chinamobile.com>2020-02-11 17:24:21 +0800
committerdyh <dengyuanhong@chinamobile.com>2020-02-11 17:31:02 +0800
commit14eb438e920a9905e7254bf3aeb6bc4cc423e6b3 (patch)
treebcbb806faa3a83a891854fb3e13e20d4ce903a9d
parent40f1c48b6ea2036a277dc0b32b806216285fba7c (diff)
Call SDC APIs via https
Change-Id: Idd3f34fa409d6df05c2594a2192a66d670be79d2 Issue-ID: MODELING-310 Signed-off-by: dyh <dengyuanhong@chinamobile.com>
-rw-r--r--catalog/pub/config/config.py2
-rw-r--r--catalog/pub/msapi/sdc.py2
-rw-r--r--catalog/settings.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/catalog/pub/config/config.py b/catalog/pub/config/config.py
index 4ca1d5d..3b8a59e 100644
--- a/catalog/pub/config/config.py
+++ b/catalog/pub/config/config.py
@@ -91,7 +91,7 @@ CATALOG_ROOT_PATH = None
CATALOG_URL_PATH = None
# [sdc config]
-SDC_BASE_URL = "http://msb-iag/api"
+SDC_BASE_URL = "https://msb-iag/api"
SDC_USER = "aai"
SDC_PASSWD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
diff --git a/catalog/pub/msapi/sdc.py b/catalog/pub/msapi/sdc.py
index 4b50aab..86930f0 100644
--- a/catalog/pub/msapi/sdc.py
+++ b/catalog/pub/msapi/sdc.py
@@ -30,7 +30,7 @@ DISTRIBUTED = "DISTRIBUTED"
def call_sdc(resource, method, content=''):
additional_headers = {
- 'X-ECOMP-InstanceID': 'VFC',
+ 'X-ECOMP-InstanceID': 'Modeling',
}
return restcall.call_req(base_url=SDC_BASE_URL,
user=SDC_USER,
diff --git a/catalog/settings.py b/catalog/settings.py
index c291c65..0068dac 100644
--- a/catalog/settings.py
+++ b/catalog/settings.py
@@ -140,7 +140,7 @@ STATICFILES_DIRS = [
pub_config.CATALOG_ROOT_PATH = os.path.join(STATICFILES_DIRS[0], "catalog")
pub_config.CATALOG_URL_PATH = "static/catalog"
-pub_config.SDC_BASE_URL = "http://%s:%s/api" % (pub_config.MSB_SERVICE_IP, pub_config.MSB_SERVICE_PORT)
+pub_config.SDC_BASE_URL = "https://%s:%s/api" % (pub_config.MSB_SERVICE_IP, pub_config.MSB_SERVICE_PORT)
if platform.system() == 'Windows' or 'test' in sys.argv:
LOGGING = {