From 5768c4d7d6263bff7c4e77d760daccd474bc3572 Mon Sep 17 00:00:00 2001 From: subhash kumar singh Date: Mon, 12 Mar 2018 13:09:26 +0000 Subject: Fix urls for collecting CSAR info Fix url for collecting CSAR info from catalogdb. Change-Id: Ib887e7b733610ac3dfb5388a56c11ad5d477c321 Issue-ID: SO-453 Signed-off-by: subhash kumar singh --- .../openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java index 33f64c81b9..78eb2f662d 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java @@ -44,7 +44,7 @@ import java.util.Optional; public class ResourceRequestBuilder { public static String CUSTOMIZATION_UUID = "customizationUUID"; - public static String SERVICE_URL_TOSCA_CSAR = "http://localhost:3099/serviceToscaCsar?serviceModelUuid="; + public static String SERVICE_URL_TOSCA_CSAR = "http://localhost:8080/ecomp/mso/catalog/v3/serviceToscaCsar?serviceModelUuid="; private static MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.RA); @@ -114,13 +114,13 @@ public class ResourceRequestBuilder { private static String getCsarFromUuid(String uuid) throws Exception { ResteasyClient client = new ResteasyClientBuilder().build(); - ResteasyWebTarget target = client.target(SERVICE_URL_TOSCA_CSAR + uuid + "\""); + ResteasyWebTarget target = client.target(SERVICE_URL_TOSCA_CSAR + uuid); Response response = target.request().get(); String value = response.readEntity(String.class); HashMap map = new Gson().fromJson(value, new TypeToken>(){}.getType()); - File csarFile = new File(System.getProperty("mso.config.path") + "ASDC/" + map.get("NAME")); + File csarFile = new File(System.getProperty("mso.config.path") + "ASDC/" + map.get("name")); if (!csarFile.exists()) { throw new Exception("csar file does not exist."); -- cgit 1.2.3-korg