Change-Id: I445fd4572dc5a876fdeee66ae393a1215fce54d0
Issue-ID: SO-2415
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
private static final Logger logger = getLogger(EtsiCatalogUrlProvider.class);
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() {}
public EtsiCatalogUrlProvider() {}
* @return the URL for the GET operation
*/
public String getVnfPackageContentUrl(final String vnfPkgId) {
* @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;
}
logger.info("getEtsiCatalogVnfPackageContentUrl: {}", url);
return url;
}
* @return the URL for the GET operation
*/
public String getVnfPackagesUrl() {
* @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;
}
logger.info("getEtsiCatalogVnfPackagesEndpoint: {}", url);
return url;
}
* @return the URL for the GET operation
*/
public String getVnfPackageUrl(final String vnfPkgId) {
* @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;
}
logger.info("getEtsiCatalogVnfPackageEndpoint: {}", url);
return url;
}
* @return the URL for the GET operation
*/
public String getVnfPackageArtifactUrl(final String vnfPkgId, final String artifactPath) {
* @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;
}
logger.info("getVnfPackageArtifactUrl: {}", url);
return url;
}
* @return the URL for the GET operation
*/
public String getVnfPackageVnfdUrl(final String vnfPkgId) {
* @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;
}
logger.info("getEtsiCatalogVnfPackageVnfd: {}", url);
return url;
}
private static final String VNF_PACKAGE_ID = "myVnfPackageId";
private static final String ARTIFACT_PATH = "myArtifactPath";
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 = "";
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 = "";
@Autowired
@Qualifier(CONFIGURABLE_REST_TEMPLATE)
private RestTemplate testRestTemplate;
@Autowired
@Qualifier(CONFIGURABLE_REST_TEMPLATE)
private RestTemplate testRestTemplate;
- private MockRestServiceServer mockRestServer;
@Autowired
private Sol003SubscriptionManagementController controller;
@Before
public void setUp() throws Exception {
@Autowired
private Sol003SubscriptionManagementController controller;
@Before
public void setUp() throws Exception {
- mockRestServer = MockRestServiceServer.bindTo(testRestTemplate).build();
+ MockRestServiceServer.bindTo(testRestTemplate).build();
prometheus:
enabled: true # Whether exporting of metrics to Prometheus is enabled.
step: 1m # Step size (i.e. reporting frequency) to use.
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