X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Fclient%2FDcaeDispatcherServices.java;h=1ea4c4b93995c81cfe8fa4a96219f9be399c167b;hb=5c37ec59dcc9f4dbb6baa3434ba5986d86ff7152;hp=9226604a1261cfe4a27b556ead58220ebd1ebd6b;hpb=56e71d901f858fd960d72d0e71d06d4de5953900;p=clamp.git diff --git a/src/main/java/org/onap/clamp/clds/client/DcaeDispatcherServices.java b/src/main/java/org/onap/clamp/clds/client/DcaeDispatcherServices.java index 9226604a..1ea4c4b9 100644 --- a/src/main/java/org/onap/clamp/clds/client/DcaeDispatcherServices.java +++ b/src/main/java/org/onap/clamp/clds/client/DcaeDispatcherServices.java @@ -18,22 +18,25 @@ * limitations under the License. * ============LICENSE_END============================================ * =================================================================== - * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * */ package org.onap.clamp.clds.client; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import com.fasterxml.jackson.databind.node.ObjectNode; +import com.google.gson.JsonObject; +import java.io.IOException; import java.util.Date; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; +import org.json.simple.parser.ParseException; import org.onap.clamp.clds.config.ClampProperties; import org.onap.clamp.clds.exception.dcae.DcaeDeploymentException; import org.onap.clamp.clds.util.LoggingUtils; +import org.onap.clamp.util.HttpConnectionManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -46,54 +49,48 @@ public class DcaeDispatcherServices { protected static final EELFLogger logger = EELFManager.getInstance().getLogger(DcaeDispatcherServices.class); protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger(); - @Autowired - private ClampProperties refProp; + private final ClampProperties refProp; + private final HttpConnectionManager dcaeHttpConnectionManager; private static final String STATUS_URL_LOG = "Status URL extracted: "; private static final String DCAE_URL_PREFIX = "/dcae-deployments/"; private static final String DCAE_URL_PROPERTY_NAME = "dcae.dispatcher.url"; - private static final String DCAE_REQUEST_FAILED_LOG = "RequestFailed - responseStr="; public static final String DCAE_REQUESTID_PROPERTY_NAME = "dcae.header.requestId"; private static final String DCAE_LINK_FIELD = "links"; private static final String DCAE_STATUS_FIELD = "status"; + @Autowired + public DcaeDispatcherServices(ClampProperties refProp, HttpConnectionManager dcaeHttpConnectionManager) { + this.refProp = refProp; + this.dcaeHttpConnectionManager = dcaeHttpConnectionManager; + } + /** - * Delete the deployment on DCAE. - * - * @param deploymentId - * The deployment ID - * @return Return the URL Status + * Get the Operation Status from a specified URL with retry. + * @param operationStatusUrl + * The URL of the DCAE + * @return The status + * @throws InterruptedException Exception during the retry */ - public String deleteDeployment(String deploymentId) { - Date startTime = new Date(); - LoggingUtils.setTargetContext("DCAE", "deleteDeployment"); - try { - String url = refProp.getStringValue(DCAE_URL_PROPERTY_NAME) + DCAE_URL_PREFIX + deploymentId; - String responseStr = DcaeHttpConnectionManager.doDcaeHttpQuery(url, "DELETE", null, null); - JSONParser parser = new JSONParser(); - Object obj0 = parser.parse(responseStr); - JSONObject jsonObj = (JSONObject) obj0; - JSONObject linksObj = (JSONObject) jsonObj.get(DCAE_LINK_FIELD); - String statusUrl = (String) linksObj.get(DCAE_STATUS_FIELD); - logger.info(STATUS_URL_LOG + statusUrl); - LoggingUtils.setResponseContext("0", "Delete deployments success", this.getClass().getName()); - return statusUrl; - } catch (Exception e) { - // Log StatusCode during exception in metrics log - LoggingUtils.setResponseContext("900", "Delete deployments failed", this.getClass().getName()); - LoggingUtils.setErrorContext("900", "Delete deployments error"); - logger.error("Exception occurred during Delete Deployment Operation with DCAE", e); - throw new DcaeDeploymentException("Exception occurred during Delete Deployment Operation with DCAE", e); - } finally { - LoggingUtils.setTimeContext(startTime, new Date()); - metricsLogger.info("deleteDeployment complete"); + public String getOperationStatusWithRetry(String operationStatusUrl) throws InterruptedException { + String operationStatus = ""; + for (int i = 0; i < Integer.valueOf(refProp.getStringValue("dcae.dispatcher.retry.limit")); i++) { + logger.info("Trying to get Operation status on DCAE for url:" + operationStatusUrl); + operationStatus = getOperationStatus(operationStatusUrl); + logger.info("Current Status is:" + operationStatus); + if (!"processing".equalsIgnoreCase(operationStatus)) { + return operationStatus; + } else { + Thread.sleep(Integer.valueOf(refProp.getStringValue("dcae.dispatcher.retry.interval"))); + } } + logger.warn("Number of attempts on DCAE is over, stopping the getOperationStatus method"); + return operationStatus; } /** * Get the Operation Status from a specified URL. - * * @param statusUrl - * The URL provided by a previous DCAE Query + * The URL provided by a previous DCAE Query * @return The status */ public String getOperationStatus(String statusUrl) { @@ -102,17 +99,16 @@ public class DcaeDispatcherServices { Date startTime = new Date(); LoggingUtils.setTargetContext("DCAE", "getOperationStatus"); try { - String responseStr = DcaeHttpConnectionManager.doDcaeHttpQuery(statusUrl, "GET", null, null); - JSONParser parser = new JSONParser(); - Object obj0 = parser.parse(responseStr); - JSONObject jsonObj = (JSONObject) obj0; + String responseStr = dcaeHttpConnectionManager.doHttpRequest(statusUrl, "GET", null, + null, "DCAE", null, + null); + JSONObject jsonObj = parseResponse(responseStr); String operationType = (String) jsonObj.get("operationType"); - String status = (String) jsonObj.get("status"); + String status = (String) jsonObj.get(DCAE_STATUS_FIELD); logger.info("Operation Type - " + operationType + ", Status " + status); LoggingUtils.setResponseContext("0", "Get operation status success", this.getClass().getName()); opStatus = status; } catch (Exception e) { - // Log StatusCode during exception in metrics log LoggingUtils.setResponseContext("900", "Get operation status failed", this.getClass().getName()); LoggingUtils.setErrorContext("900", "Get operation status error"); logger.error("Exception occurred during getOperationStatus Operation with DCAE", e); @@ -123,58 +119,33 @@ public class DcaeDispatcherServices { return opStatus; } - /** - * This method send a getDeployments operation to DCAE. - */ - public void getDeployments() { - Date startTime = new Date(); - LoggingUtils.setTargetContext("DCAE", "getDeployments"); - try { - String url = refProp.getStringValue(DCAE_URL_PROPERTY_NAME) + DCAE_URL_PREFIX; - DcaeHttpConnectionManager.doDcaeHttpQuery(url, "GET", null, null); - LoggingUtils.setResponseContext("0", "Get deployments success", this.getClass().getName()); - } catch (Exception e) { - // Log StatusCode during exception in metrics log - LoggingUtils.setResponseContext("900", "Get deployments failed", this.getClass().getName()); - LoggingUtils.setErrorContext("900", "Get deployments error"); - logger.error("Exception occurred during getDeployments Operation with DCAE", e); - throw new DcaeDeploymentException("Exception occurred during getDeployments Operation with DCAE", e); - } finally { - LoggingUtils.setTimeContext(startTime, new Date()); - metricsLogger.info("getDeployments complete"); - } - } - /** * Returns status URL for createNewDeployment operation. - * * @param deploymentId - * The deployment ID + * The deployment ID * @param serviceTypeId - * Service type ID + * Service type ID + * @param blueprintInputJson + * The value for each blueprint parameters in a flat JSON * @return The status URL */ - public String createNewDeployment(String deploymentId, String serviceTypeId) { + public String createNewDeployment(String deploymentId, String serviceTypeId, JsonObject blueprintInputJson) { Date startTime = new Date(); LoggingUtils.setTargetContext("DCAE", "createNewDeployment"); try { - ObjectNode rootNode = (ObjectNode) refProp.getJsonTemplate("dcae.deployment.template"); - rootNode.put("serviceTypeId", serviceTypeId); - String apiBodyString = rootNode.toString(); + JsonObject rootObject = refProp.getJsonTemplate("dcae.deployment.template").getAsJsonObject(); + rootObject.addProperty("serviceTypeId", serviceTypeId); + if (blueprintInputJson != null) { + rootObject.add("inputs", blueprintInputJson); + } + String apiBodyString = rootObject.toString(); logger.info("Dcae api Body String - " + apiBodyString); String url = refProp.getStringValue(DCAE_URL_PROPERTY_NAME) + DCAE_URL_PREFIX + deploymentId; - String responseStr = DcaeHttpConnectionManager.doDcaeHttpQuery(url, "PUT", apiBodyString, - "application/json"); - JSONParser parser = new JSONParser(); - Object obj0 = parser.parse(responseStr); - JSONObject jsonObj = (JSONObject) obj0; - JSONObject linksObj = (JSONObject) jsonObj.get(DCAE_LINK_FIELD); - String statusUrl = (String) linksObj.get(DCAE_STATUS_FIELD); - logger.info(STATUS_URL_LOG + statusUrl); + String statusUrl = getDcaeResponse(url, "PUT", apiBodyString, "application/json", DCAE_LINK_FIELD, + DCAE_STATUS_FIELD); LoggingUtils.setResponseContext("0", "Create new deployment failed", this.getClass().getName()); return statusUrl; } catch (Exception e) { - // Log StatusCode during exception in metrics log LoggingUtils.setResponseContext("900", "Create new deployment failed", this.getClass().getName()); LoggingUtils.setErrorContext("900", "Create new deployment error"); logger.error("Exception occurred during createNewDeployment Operation with DCAE", e); @@ -185,13 +156,13 @@ public class DcaeDispatcherServices { } } - /** + /*** * Returns status URL for deleteExistingDeployment operation. - * + * * @param deploymentId - * The deployment ID + * The deployment ID * @param serviceTypeId - * The service Type ID + * The service Type ID * @return The status URL */ public String deleteExistingDeployment(String deploymentId, String serviceTypeId) { @@ -201,26 +172,46 @@ public class DcaeDispatcherServices { String apiBodyString = "{\"serviceTypeId\": \"" + serviceTypeId + "\"}"; logger.info("Dcae api Body String - " + apiBodyString); String url = refProp.getStringValue(DCAE_URL_PROPERTY_NAME) + DCAE_URL_PREFIX + deploymentId; - String responseStr = DcaeHttpConnectionManager.doDcaeHttpQuery(url, "DELETE", apiBodyString, - "application/json"); - JSONParser parser = new JSONParser(); - Object obj0 = parser.parse(responseStr); - JSONObject jsonObj = (JSONObject) obj0; - JSONObject linksObj = (JSONObject) jsonObj.get(DCAE_LINK_FIELD); - String statusUrl = (String) linksObj.get(DCAE_STATUS_FIELD); - logger.info(STATUS_URL_LOG + statusUrl); + String statusUrl = getDcaeResponse(url, "DELETE", apiBodyString, "application/json", DCAE_LINK_FIELD, + DCAE_STATUS_FIELD); LoggingUtils.setResponseContext("0", "Delete existing deployment success", this.getClass().getName()); return statusUrl; + } catch (Exception e) { - // Log StatusCode during exception in metrics log LoggingUtils.setResponseContext("900", "Delete existing deployment failed", this.getClass().getName()); LoggingUtils.setErrorContext("900", "Delete existing deployment error"); logger.error("Exception occurred during deleteExistingDeployment Operation with DCAE", e); throw new DcaeDeploymentException("Exception occurred during deleteExistingDeployment Operation with DCAE", - e); + e); } finally { LoggingUtils.setTimeContext(startTime, new Date()); metricsLogger.info("deleteExistingDeployment complete"); } } + + private String getDcaeResponse(String url, String requestMethod, String payload, String contentType, String node, + String nodeAttr) throws IOException, ParseException { + Date startTime = new Date(); + try { + String responseStr = dcaeHttpConnectionManager.doHttpRequest(url, requestMethod, payload, contentType, "DCAE", null, null); + JSONObject jsonObj = parseResponse(responseStr); + JSONObject linksObj = (JSONObject) jsonObj.get(node); + String statusUrl = (String) linksObj.get(nodeAttr); + logger.info(STATUS_URL_LOG + statusUrl); + return statusUrl; + } catch (IOException | ParseException e) { + logger.error("Exception occurred getting response from DCAE", e); + throw e; + } finally { + LoggingUtils.setTimeContext(startTime, new Date()); + metricsLogger.info("getDcaeResponse complete"); + } + } + + private JSONObject parseResponse(String responseStr) throws ParseException { + JSONParser parser = new JSONParser(); + Object obj0 = parser.parse(responseStr); + JSONObject jsonObj = (JSONObject) obj0; + return jsonObj; + } } \ No newline at end of file