X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpackages%2Fbiz%2Fvnf_package.py;h=e202674021bbdae916f983a74e4fa6ebcd58159f;hb=246df561b466d1202a40ece1c133a4bf70ab958f;hp=1073879348eb1bd7c9c7f899d1a7a85147917eb7;hpb=ec917b25163dc63a6177cbe9ad68b345649cd8e9;p=modeling%2Fetsicatalog.git diff --git a/catalog/packages/biz/vnf_package.py b/catalog/packages/biz/vnf_package.py index 1073879..e202674 100644 --- a/catalog/packages/biz/vnf_package.py +++ b/catalog/packages/biz/vnf_package.py @@ -15,7 +15,6 @@ import json import logging import os - import threading import traceback import urllib @@ -25,7 +24,7 @@ import zipfile from catalog.packages import const from catalog.packages.biz.common import parse_file_range, read, save from catalog.packages.biz.notificationsutil import PkgNotifications -from catalog.pub.config.config import CATALOG_ROOT_PATH, MSB_SERVICE_IP, MSB_SERVICE_PORT +from catalog.pub.config.config import CATALOG_ROOT_PATH, MSB_BASE_URL from catalog.pub.database.models import VnfPackageModel, NSPackageModel from catalog.pub.exceptions import CatalogException, ResourceNotFoundException from catalog.pub.utils import fileutil, toscaparser @@ -280,10 +279,7 @@ def fill_artifacts_data(vnf_pkg_id): def fill_links(pkg_id, is_onboarded=False): - self_href = "http://%s:%s/api/vnfpkgm/v1/vnf_packages/%s" % ( - MSB_SERVICE_IP, - MSB_SERVICE_PORT, - pkg_id) + self_href = "%s/api/vnfpkgm/v1/vnf_packages/%s" % (MSB_BASE_URL, pkg_id) links = { "self": {"href": self_href}, "vnfd": {"href": "%s/%s" % (self_href, "vnfd")},