From 3ec71c0b73eda99d3ed3ddcddbb9d5619415b6fd Mon Sep 17 00:00:00 2001 From: "waqas.ikram" Date: Wed, 15 Jan 2020 12:04:13 +0000 Subject: Updating etsi catalog endpoint param name Change-Id: I445fd4572dc5a876fdeee66ae393a1215fce54d0 Issue-ID: SO-2415 Signed-off-by: waqas.ikram --- .../extclients/etsicatalog/EtsiCatalogUrlProvider.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org') diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/etsicatalog/EtsiCatalogUrlProvider.java b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/etsicatalog/EtsiCatalogUrlProvider.java index 051f60a9c9..8382212d51 100644 --- a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/etsicatalog/EtsiCatalogUrlProvider.java +++ b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/etsicatalog/EtsiCatalogUrlProvider.java @@ -35,12 +35,8 @@ public class EtsiCatalogUrlProvider { private static final Logger logger = getLogger(EtsiCatalogUrlProvider.class); - @Value("${msb.endpoint:#{\"http://msb_iag.onap:80\"}}") - private String msbEndpoint; - @Value("${msb.catalogServiceUrl:#{null}}") - private String catalogServiceUrl; - @Value("${msb.vnfpkgmServiceUrl:#{\"/api/vnfpkgm/v1\"}}") - private String vnfpkgmServiceUrl; + @Value("${etsi-catalog-manager.vnfpkgm.endpoint}") + private String etsiCatalogManagerEndpoint; public EtsiCatalogUrlProvider() {} @@ -51,7 +47,7 @@ public class EtsiCatalogUrlProvider { * @return the URL for the GET operation */ public String getVnfPackageContentUrl(final String vnfPkgId) { - final String url = msbEndpoint + vnfpkgmServiceUrl + "/vnf_packages/" + vnfPkgId + "/package_content"; + final String url = etsiCatalogManagerEndpoint + "/vnf_packages/" + vnfPkgId + "/package_content"; logger.info("getEtsiCatalogVnfPackageContentUrl: {}", url); return url; } @@ -62,7 +58,7 @@ public class EtsiCatalogUrlProvider { * @return the URL for the GET operation */ public String getVnfPackagesUrl() { - final String url = msbEndpoint + vnfpkgmServiceUrl + "/vnf_packages"; + final String url = etsiCatalogManagerEndpoint + "/vnf_packages"; logger.info("getEtsiCatalogVnfPackagesEndpoint: {}", url); return url; } @@ -74,7 +70,7 @@ public class EtsiCatalogUrlProvider { * @return the URL for the GET operation */ public String getVnfPackageUrl(final String vnfPkgId) { - final String url = msbEndpoint + vnfpkgmServiceUrl + "/vnf_packages/" + vnfPkgId; + final String url = etsiCatalogManagerEndpoint + "/vnf_packages/" + vnfPkgId; logger.info("getEtsiCatalogVnfPackageEndpoint: {}", url); return url; } @@ -87,7 +83,7 @@ public class EtsiCatalogUrlProvider { * @return the URL for the GET operation */ public String getVnfPackageArtifactUrl(final String vnfPkgId, final String artifactPath) { - final String url = msbEndpoint + vnfpkgmServiceUrl + "/vnf_packages/" + vnfPkgId + "/artifacts/" + artifactPath; + final String url = etsiCatalogManagerEndpoint + "/vnf_packages/" + vnfPkgId + "/artifacts/" + artifactPath; logger.info("getVnfPackageArtifactUrl: {}", url); return url; } @@ -99,7 +95,7 @@ public class EtsiCatalogUrlProvider { * @return the URL for the GET operation */ public String getVnfPackageVnfdUrl(final String vnfPkgId) { - final String url = msbEndpoint + vnfpkgmServiceUrl + "/vnf_packages/" + vnfPkgId + "/vnfd"; + final String url = etsiCatalogManagerEndpoint + "/vnf_packages/" + vnfPkgId + "/vnfd"; logger.info("getEtsiCatalogVnfPackageVnfd: {}", url); return url; } -- cgit 1.2.3-korg