From: Shobana Jothi <shobana.jothi@verizon.com>
Date: Tue, 20 Nov 2018 10:45:52 +0000 (+0530)
Subject: Fix CSAR download url formation
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a94121fffd54b3a9b86cdc0cfd3fdba06a76aa39;p=vfc%2Fnfvo%2Fcatalog.git

Fix CSAR download url formation

Change-Id: I8e3b36c7d0a7736e7b84ba2d47c088a9b9052c89
Issue-ID: VFC-1191
Signed-off-by: Shobana Jothi<shobana.jothi@verizon.com>
(cherry picked from commit 4b5b9a0ee765fcdc4ed41ea522e8b7cdbde28065)
---

diff --git a/catalog/packages/biz/sdc_ns_package.py b/catalog/packages/biz/sdc_ns_package.py
index 4275ae70..64c520d8 100644
--- a/catalog/packages/biz/sdc_ns_package.py
+++ b/catalog/packages/biz/sdc_ns_package.py
@@ -17,7 +17,7 @@ import os
 import sys
 import traceback
 
-from catalog.pub.config.config import CATALOG_ROOT_PATH, CATALOG_URL_PATH, MSB_SERVICE_IP
+from catalog.pub.config.config import CATALOG_ROOT_PATH, CATALOG_URL_PATH
 from catalog.pub.config.config import REG_TO_MSB_REG_PARAM
 from catalog.pub.database.models import NSPackageModel
 from catalog.pub.exceptions import CatalogException
@@ -161,7 +161,7 @@ class NsPackage(object):
             package_info["nsdModel"] = csars[0].nsdModel
             package_info["nsdInvariantId"] = csars[0].invariantId
             package_info["downloadUrl"] = "http://%s:%s/%s/%s/%s" % (
-                MSB_SERVICE_IP,
+                REG_TO_MSB_REG_PARAM[0]["nodes"][0]["ip"],
                 REG_TO_MSB_REG_PARAM[0]["nodes"][0]["port"],
                 CATALOG_URL_PATH,
                 csar_id,
diff --git a/catalog/packages/biz/sdc_vnf_package.py b/catalog/packages/biz/sdc_vnf_package.py
index 73d5a8f0..bcb3ca06 100644
--- a/catalog/packages/biz/sdc_vnf_package.py
+++ b/catalog/packages/biz/sdc_vnf_package.py
@@ -19,7 +19,7 @@ import sys
 import threading
 import traceback
 
-from catalog.pub.config.config import CATALOG_ROOT_PATH, CATALOG_URL_PATH, MSB_SERVICE_IP
+from catalog.pub.config.config import CATALOG_ROOT_PATH, CATALOG_URL_PATH
 from catalog.pub.config.config import REG_TO_MSB_REG_PARAM
 from catalog.pub.database.models import VnfPackageModel
 from catalog.pub.exceptions import CatalogException
@@ -237,7 +237,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" % (
-                MSB_SERVICE_IP,  # REG_TO_MSB_REG_PARAM[0]["nodes"][0]["ip"],
+                REG_TO_MSB_REG_PARAM[0]["nodes"][0]["ip"],
                 REG_TO_MSB_REG_PARAM[0]["nodes"][0]["port"],
                 CATALOG_URL_PATH,
                 csar_id,