diff options
| author |   ying.yunlong <ying.yunlong@zte.com.cn> | 2017-12-12 14:42:57 +0800 |
|---|---|---|
| committer | yunlong ying <ying.yunlong@zte.com.cn> | 2017-12-12 06:52:40 +0000 |
| commit | e6880855006b5c707b170bba0de5ff237f672cf3 (patch) | |
| tree | 829893e982f731ce41ae3058940b529c492ba955 | |
| parent | dbea79bff329512c4fe2597b513d013871f863e4 (diff) | |
Fix vfc-catalog download url.
Change-Id: I6f50a8dde6586c4f5f5dc2953a10756d441ba409
Issue-ID: VFC-601
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
| -rw-r--r-- | catalog/packages/nf_package.py | 4 | ||||
| -rw-r--r-- | catalog/packages/ns_package.py | 4 |
2 files changed, 4 insertions, 4 deletions
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, |