* limitations under the License.\r
* ============LICENSE_END============================================\r
* ===================================================================\r
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
+ * \r
*/\r
\r
package org.onap.clamp.clds.client;\r
\r
import com.att.eelf.configuration.EELFLogger;\r
import com.att.eelf.configuration.EELFManager;\r
+import com.fasterxml.jackson.databind.JsonNode;\r
import com.fasterxml.jackson.databind.node.ObjectNode;\r
\r
+import java.io.IOException;\r
import java.util.Date;\r
\r
import org.json.simple.JSONObject;\r
import org.json.simple.parser.JSONParser;\r
-import org.onap.clamp.clds.config.CldsReferenceProperties;\r
+import org.json.simple.parser.ParseException;\r
+import org.onap.clamp.clds.config.ClampProperties;\r
import org.onap.clamp.clds.exception.dcae.DcaeDeploymentException;\r
import org.onap.clamp.clds.util.LoggingUtils;\r
import org.springframework.beans.factory.annotation.Autowired;\r
protected static final EELFLogger logger = EELFManager.getInstance().getLogger(DcaeDispatcherServices.class);\r
protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger();\r
@Autowired\r
- private CldsReferenceProperties refProp;\r
+ private ClampProperties refProp;\r
private static final String STATUS_URL_LOG = "Status URL extracted: ";\r
private static final String DCAE_URL_PREFIX = "/dcae-deployments/";\r
private static final String DCAE_URL_PROPERTY_NAME = "dcae.dispatcher.url";\r
- private static final String DCAE_REQUEST_FAILED_LOG = "RequestFailed - responseStr=";\r
public static final String DCAE_REQUESTID_PROPERTY_NAME = "dcae.header.requestId";\r
private static final String DCAE_LINK_FIELD = "links";\r
private static final String DCAE_STATUS_FIELD = "status";\r
LoggingUtils.setTargetContext("DCAE", "deleteDeployment");\r
try {\r
String url = refProp.getStringValue(DCAE_URL_PROPERTY_NAME) + DCAE_URL_PREFIX + deploymentId;\r
- String responseStr = DcaeHttpConnectionManager.doDcaeHttpQuery(url, "DELETE", null, null);\r
- JSONParser parser = new JSONParser();\r
- Object obj0 = parser.parse(responseStr);\r
- JSONObject jsonObj = (JSONObject) obj0;\r
- JSONObject linksObj = (JSONObject) jsonObj.get(DCAE_LINK_FIELD);\r
- String statusUrl = (String) linksObj.get(DCAE_STATUS_FIELD);\r
+ String statusUrl = getDcaeResponse(url, "DELETE", null, null, DCAE_LINK_FIELD, DCAE_STATUS_FIELD);\r
logger.info(STATUS_URL_LOG + statusUrl);\r
LoggingUtils.setResponseContext("0", "Delete deployments success", this.getClass().getName());\r
return statusUrl;\r
} catch (Exception e) {\r
- // Log StatusCode during exception in metrics log\r
LoggingUtils.setResponseContext("900", "Delete deployments failed", this.getClass().getName());\r
LoggingUtils.setErrorContext("900", "Delete deployments error");\r
logger.error("Exception occurred during Delete Deployment Operation with DCAE", e);\r
}\r
}\r
\r
+ public String getOperationStatusWithRetry(String operationStatusUrl) throws InterruptedException {\r
+ String operationStatus = "";\r
+ for (int i = 0; i < Integer.valueOf(refProp.getStringValue("dcae.dispatcher.retry.limit")); i++) {\r
+ logger.info("Trying to get Operation status on DCAE for url:" + operationStatusUrl);\r
+ operationStatus = getOperationStatus(operationStatusUrl);\r
+ logger.info("Current Status is:" + operationStatus);\r
+ if (!"processing".equalsIgnoreCase(operationStatus)) {\r
+ return operationStatus;\r
+ } else {\r
+ Thread.sleep(Integer.valueOf(refProp.getStringValue("dcae.dispatcher.retry.interval")));\r
+ }\r
+ }\r
+ logger.warn("Number of attempts on DCAE is over, stopping the getOperationStatus method");\r
+ return operationStatus;\r
+ }\r
+\r
/**\r
* Get the Operation Status from a specified URL.\r
* \r
LoggingUtils.setTargetContext("DCAE", "getOperationStatus");\r
try {\r
String responseStr = DcaeHttpConnectionManager.doDcaeHttpQuery(statusUrl, "GET", null, null);\r
- JSONParser parser = new JSONParser();\r
- Object obj0 = parser.parse(responseStr);\r
- JSONObject jsonObj = (JSONObject) obj0;\r
+ JSONObject jsonObj = parseResponse(responseStr);\r
String operationType = (String) jsonObj.get("operationType");\r
- String status = (String) jsonObj.get("status");\r
+ String status = (String) jsonObj.get(DCAE_STATUS_FIELD);\r
logger.info("Operation Type - " + operationType + ", Status " + status);\r
LoggingUtils.setResponseContext("0", "Get operation status success", this.getClass().getName());\r
opStatus = status;\r
} catch (Exception e) {\r
- // Log StatusCode during exception in metrics log\r
LoggingUtils.setResponseContext("900", "Get operation status failed", this.getClass().getName());\r
LoggingUtils.setErrorContext("900", "Get operation status error");\r
logger.error("Exception occurred during getOperationStatus Operation with DCAE", e);\r
DcaeHttpConnectionManager.doDcaeHttpQuery(url, "GET", null, null);\r
LoggingUtils.setResponseContext("0", "Get deployments success", this.getClass().getName());\r
} catch (Exception e) {\r
- // Log StatusCode during exception in metrics log\r
LoggingUtils.setResponseContext("900", "Get deployments failed", this.getClass().getName());\r
LoggingUtils.setErrorContext("900", "Get deployments error");\r
logger.error("Exception occurred during getDeployments Operation with DCAE", e);\r
* The deployment ID\r
* @param serviceTypeId\r
* Service type ID\r
+ * @param blueprintInputJson\r
+ * The value for each blueprint parameters in a flat JSON\r
* @return The status URL\r
*/\r
- public String createNewDeployment(String deploymentId, String serviceTypeId) {\r
+ public String createNewDeployment(String deploymentId, String serviceTypeId, JsonNode blueprintInputJson) {\r
Date startTime = new Date();\r
LoggingUtils.setTargetContext("DCAE", "createNewDeployment");\r
try {\r
ObjectNode rootNode = (ObjectNode) refProp.getJsonTemplate("dcae.deployment.template");\r
rootNode.put("serviceTypeId", serviceTypeId);\r
+ if (blueprintInputJson != null) {\r
+ rootNode.set("inputs", blueprintInputJson);\r
+ }\r
String apiBodyString = rootNode.toString();\r
logger.info("Dcae api Body String - " + apiBodyString);\r
String url = refProp.getStringValue(DCAE_URL_PROPERTY_NAME) + DCAE_URL_PREFIX + deploymentId;\r
- String responseStr = DcaeHttpConnectionManager.doDcaeHttpQuery(url, "PUT", apiBodyString,\r
- "application/json");\r
- JSONParser parser = new JSONParser();\r
- Object obj0 = parser.parse(responseStr);\r
- JSONObject jsonObj = (JSONObject) obj0;\r
- JSONObject linksObj = (JSONObject) jsonObj.get(DCAE_LINK_FIELD);\r
- String statusUrl = (String) linksObj.get(DCAE_STATUS_FIELD);\r
- logger.info(STATUS_URL_LOG + statusUrl);\r
+ String statusUrl = getDcaeResponse(url, "PUT", apiBodyString, "application/json", DCAE_LINK_FIELD,\r
+ DCAE_STATUS_FIELD);\r
LoggingUtils.setResponseContext("0", "Create new deployment failed", this.getClass().getName());\r
return statusUrl;\r
} catch (Exception e) {\r
- // Log StatusCode during exception in metrics log\r
LoggingUtils.setResponseContext("900", "Create new deployment failed", this.getClass().getName());\r
LoggingUtils.setErrorContext("900", "Create new deployment error");\r
logger.error("Exception occurred during createNewDeployment Operation with DCAE", e);\r
}\r
}\r
\r
- /**\r
+ /***\r
* Returns status URL for deleteExistingDeployment operation.\r
* \r
* @param deploymentId\r
String apiBodyString = "{\"serviceTypeId\": \"" + serviceTypeId + "\"}";\r
logger.info("Dcae api Body String - " + apiBodyString);\r
String url = refProp.getStringValue(DCAE_URL_PROPERTY_NAME) + DCAE_URL_PREFIX + deploymentId;\r
- String responseStr = DcaeHttpConnectionManager.doDcaeHttpQuery(url, "DELETE", apiBodyString,\r
- "application/json");\r
- JSONParser parser = new JSONParser();\r
- Object obj0 = parser.parse(responseStr);\r
- JSONObject jsonObj = (JSONObject) obj0;\r
- JSONObject linksObj = (JSONObject) jsonObj.get(DCAE_LINK_FIELD);\r
- String statusUrl = (String) linksObj.get(DCAE_STATUS_FIELD);\r
- logger.info(STATUS_URL_LOG + statusUrl);\r
+ String statusUrl = getDcaeResponse(url, "DELETE", apiBodyString, "application/json", DCAE_LINK_FIELD,\r
+ DCAE_STATUS_FIELD);\r
LoggingUtils.setResponseContext("0", "Delete existing deployment success", this.getClass().getName());\r
return statusUrl;\r
+\r
} catch (Exception e) {\r
- // Log StatusCode during exception in metrics log\r
LoggingUtils.setResponseContext("900", "Delete existing deployment failed", this.getClass().getName());\r
LoggingUtils.setErrorContext("900", "Delete existing deployment error");\r
logger.error("Exception occurred during deleteExistingDeployment Operation with DCAE", e);\r
metricsLogger.info("deleteExistingDeployment complete");\r
}\r
}\r
+\r
+ private String getDcaeResponse(String url, String requestMethod, String payload, String contentType, String node,\r
+ String nodeAttr) throws IOException, ParseException {\r
+ Date startTime = new Date();\r
+ try {\r
+ String responseStr = DcaeHttpConnectionManager.doDcaeHttpQuery(url, requestMethod, payload, contentType);\r
+ JSONObject jsonObj = parseResponse(responseStr);\r
+ JSONObject linksObj = (JSONObject) jsonObj.get(node);\r
+ String statusUrl = (String) linksObj.get(nodeAttr);\r
+ logger.info(STATUS_URL_LOG + statusUrl);\r
+ return statusUrl;\r
+ } catch (IOException | ParseException e) {\r
+ logger.error("Exception occurred getting response from DCAE", e);\r
+ throw e;\r
+ } finally {\r
+ LoggingUtils.setTimeContext(startTime, new Date());\r
+ metricsLogger.info("getDcaeResponse complete");\r
+ }\r
+ }\r
+\r
+ private JSONObject parseResponse(String responseStr) throws ParseException {\r
+ JSONParser parser = new JSONParser();\r
+ Object obj0 = parser.parse(responseStr);\r
+ JSONObject jsonObj = (JSONObject) obj0;\r
+ return jsonObj;\r
+ }\r
}
\ No newline at end of file
Code Review / clamp.git / blobdiff