diff options
4 files changed, 13 insertions, 14 deletions
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; } diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/test/java/org/onap/so/adapters/vnfmadapter/rest/Sol003PackageManagementControllerTest.java b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/test/java/org/onap/so/adapters/vnfmadapter/rest/Sol003PackageManagementControllerTest.java index f596b2ecde..c5194cf27e 100644 --- a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/test/java/org/onap/so/adapters/vnfmadapter/rest/Sol003PackageManagementControllerTest.java +++ b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/test/java/org/onap/so/adapters/vnfmadapter/rest/Sol003PackageManagementControllerTest.java @@ -82,7 +82,7 @@ public class Sol003PackageManagementControllerTest { private static final String VNF_PACKAGE_ID = "myVnfPackageId"; private static final String ARTIFACT_PATH = "myArtifactPath"; - private static final String MSB_BASE_URL = "http://msb_iag.onap:80/api/vnfpkgm/v1/vnf_packages"; + private static final String MSB_BASE_URL = "http://msb-iag.onap:80/api/vnfpkgm/v1/vnf_packages"; private static final String VNFPKGM_BASE_URL = PACKAGE_MANAGEMENT_BASE_URL + "/vnf_packages"; private static final String localhostUrl = "http://localhost:"; private static final String GET_VNF_PACKAGES_URL = ""; diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/test/java/org/onap/so/adapters/vnfmadapter/rest/Sol003SubscriptionManagementControllerTest.java b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/test/java/org/onap/so/adapters/vnfmadapter/rest/Sol003SubscriptionManagementControllerTest.java index 8fc27c5943..ed1880035a 100644 --- a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/test/java/org/onap/so/adapters/vnfmadapter/rest/Sol003SubscriptionManagementControllerTest.java +++ b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/test/java/org/onap/so/adapters/vnfmadapter/rest/Sol003SubscriptionManagementControllerTest.java @@ -34,14 +34,13 @@ public class Sol003SubscriptionManagementControllerTest { @Autowired @Qualifier(CONFIGURABLE_REST_TEMPLATE) private RestTemplate testRestTemplate; - private MockRestServiceServer mockRestServer; @Autowired private Sol003SubscriptionManagementController controller; @Before public void setUp() throws Exception { - mockRestServer = MockRestServiceServer.bindTo(testRestTemplate).build(); + MockRestServiceServer.bindTo(testRestTemplate).build(); } @Test diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/test/resources/application.yaml b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/test/resources/application.yaml index 6f5769c6a7..ae66464f29 100644 --- a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/test/resources/application.yaml +++ b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/test/resources/application.yaml @@ -54,3 +54,7 @@ management: prometheus: enabled: true # Whether exporting of metrics to Prometheus is enabled. step: 1m # Step size (i.e. reporting frequency) to use. + +etsi-catalog-manager: + vnfpkgm: + endpoint: http://msb-iag.onap:80/api/vnfpkgm/v1 |