From: ying.yunlong <ying.yunlong@zte.com.cn>
Date: Tue, 12 Dec 2017 06:42:57 +0000 (+0800)
Subject: Fix vfc-catalog download url.
X-Git-Tag: v1.1.0~90
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e6880855006b5c707b170bba0de5ff237f672cf3;p=vfc%2Fnfvo%2Fcatalog.git

Fix vfc-catalog download url.

Change-Id: I6f50a8dde6586c4f5f5dc2953a10756d441ba409
Issue-ID: VFC-601
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
---

diff --git a/catalog/packages/nf_package.py b/catalog/packages/nf_package.py
index 289a12e4..a5ca10b9 100644
--- a/catalog/packages/nf_package.py
+++ b/catalog/packages/nf_package.py
@@ -19,7 +19,7 @@ import sys
 import threading
 import traceback
 
-from catalog.pub.config.config import CATALOG_ROOT_PATH, CATALOG_URL_PATH
+from catalog.pub.config.config import CATALOG_ROOT_PATH, CATALOG_URL_PATH, MSB_SERVICE_IP
 from catalog.pub.config.config import REG_TO_MSB_REG_PARAM
 from catalog.pub.database.models import VnfPackageModel
 from catalog.pub.exceptions import CatalogException
@@ -228,7 +228,7 @@ class NfPackage(object):
             pkg_info["csarName"] = nf_pkg[0].vnfPackageUri
             pkg_info["vnfdModel"] = nf_pkg[0].vnfdModel
             pkg_info["downloadUrl"] = "http://%s:%s/%s/%s/%s" % (
-                REG_TO_MSB_REG_PARAM["nodes"][0]["ip"],
+                MSB_SERVICE_IP,
                 REG_TO_MSB_REG_PARAM["nodes"][0]["port"],
                 CATALOG_URL_PATH,
                 csar_id,
diff --git a/catalog/packages/ns_package.py b/catalog/packages/ns_package.py
index 7a37291a..c29e549f 100644
--- a/catalog/packages/ns_package.py
+++ b/catalog/packages/ns_package.py
@@ -18,7 +18,7 @@ import os
 import sys
 import traceback
 
-from catalog.pub.config.config import CATALOG_ROOT_PATH, CATALOG_URL_PATH
+from catalog.pub.config.config import CATALOG_ROOT_PATH, CATALOG_URL_PATH, MSB_SERVICE_IP
 from catalog.pub.config.config import REG_TO_MSB_REG_PARAM
 from catalog.pub.database.models import NSPackageModel, VnfPackageModel
 from catalog.pub.exceptions import CatalogException
@@ -180,7 +180,7 @@ class NsPackage(object):
             package_info["csarName"] = csars[0].nsPackageUri
             package_info["nsdModel"] = csars[0].nsdModel
             package_info["downloadUrl"] = "http://%s:%s/%s/%s/%s" % (
-                REG_TO_MSB_REG_PARAM["nodes"][0]["ip"],
+                MSB_SERVICE_IP,
                 REG_TO_MSB_REG_PARAM["nodes"][0]["port"],
                 CATALOG_URL_PATH,
                 csar_id,