* ============LICENSE_START=======================================================\r
* ONAP CLAMP\r
* ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights\r
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights\r
* reserved.\r
* ================================================================================\r
* Licensed under the Apache License, Version 2.0 (the "License");\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
* ============LICENSE_END============================================\r
+ * Modifications copyright (c) 2018 Nokia\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.core.JsonProcessingException;\r
\r
import java.io.IOException;\r
-import java.security.GeneralSecurityException;\r
import java.util.Date;\r
import java.util.List;\r
\r
import org.json.simple.JSONObject;\r
import org.json.simple.parser.JSONParser;\r
import org.json.simple.parser.ParseException;\r
+import org.onap.clamp.clds.config.ClampProperties;\r
import org.onap.clamp.clds.dao.CldsDao;\r
import org.onap.clamp.clds.model.CldsEvent;\r
import org.onap.clamp.clds.model.CldsModel;\r
import org.onap.clamp.clds.model.DcaeEvent;\r
-import org.onap.clamp.clds.model.prop.Global;\r
-import org.onap.clamp.clds.model.prop.ModelProperties;\r
-import org.onap.clamp.clds.model.refprop.RefProp;\r
+import org.onap.clamp.clds.model.dcae.DcaeInventoryResponse;\r
+import org.onap.clamp.clds.model.properties.Global;\r
+import org.onap.clamp.clds.model.properties.ModelProperties;\r
+import org.onap.clamp.clds.util.JsonUtils;\r
import org.onap.clamp.clds.util.LoggingUtils;\r
+import org.onap.clamp.util.HttpConnectionManager;\r
import org.springframework.beans.factory.annotation.Autowired;\r
+import org.springframework.stereotype.Component;\r
\r
/**\r
- * \r
* This class implements the communication with DCAE for the service inventory.\r
- *\r
- * \r
- * \r
*/\r
+@Component\r
public class DcaeInventoryServices {\r
- protected static final EELFLogger logger = EELFManager.getInstance().getLogger(DcaeInventoryServices.class);\r
- protected static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();\r
+\r
+ protected static final EELFLogger logger = EELFManager.getInstance().getLogger(DcaeInventoryServices.class);\r
+ protected static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();\r
protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger();\r
+ public static final String DCAE_INVENTORY_URL = "dcae.inventory.url";\r
+ public static final String DCAE_INVENTORY_RETRY_INTERVAL = "dcae.intentory.retry.interval";\r
+ public static final String DCAE_INVENTORY_RETRY_LIMIT = "dcae.intentory.retry.limit";\r
+ private final ClampProperties refProp;\r
+ private final CldsDao cldsDao;\r
+ private final HttpConnectionManager httpConnectionManager;\r
+\r
+ /**\r
+ * Constructor.\r
+ */\r
@Autowired\r
- private RefProp refProp;\r
- @Autowired\r
- private CldsDao cldsDao;\r
+ public DcaeInventoryServices(ClampProperties refProp, CldsDao cldsDao,\r
+ HttpConnectionManager httpConnectionManager) {\r
+ this.refProp = refProp;\r
+ this.cldsDao = cldsDao;\r
+ this.httpConnectionManager = httpConnectionManager;\r
+ }\r
\r
/**\r
- * \r
* Set the event inventory.\r
- * \r
+ *\r
* @param cldsModel\r
- * The CldsModel\r
+ * The CldsModel\r
* @param userId\r
- * The user ID\r
- * @throws GeneralSecurityException\r
- * In case of issue when decryting the DCAE password\r
+ * The user ID\r
* @throws ParseException\r
- * In case of DCAE Json parse exception\r
+ * In case of DCAE Json parse exception\r
*/\r
- public void setEventInventory(CldsModel cldsModel, String userId) throws GeneralSecurityException, ParseException {\r
+ public void setEventInventory(CldsModel cldsModel, String userId) throws InterruptedException {\r
String artifactName = cldsModel.getControlName();\r
DcaeEvent dcaeEvent = new DcaeEvent();\r
- String isDcaeInfoAvailable = null;\r
+ DcaeInventoryResponse dcaeResponse = null;\r
Date startTime = new Date();\r
LoggingUtils.setTargetContext("DCAE", "setEventInventory");\r
if (artifactName != null) {\r
artifactName = artifactName + ".yml";\r
}\r
try {\r
- /*\r
- * \r
- * Below are the properties required for calling the dcae inventory\r
- * \r
- * url call\r
- * \r
- */\r
- ModelProperties prop = new ModelProperties(cldsModel.getName(), cldsModel.getControlName(), null, false,\r
- "{}", cldsModel.getPropText());\r
+ // Below are the properties required for calling the dcae inventory\r
+ ModelProperties prop = new ModelProperties(cldsModel.getName(), cldsModel.getControlName(), null,\r
+ false, "{}", cldsModel.getPropText());\r
Global global = prop.getGlobal();\r
String invariantServiceUuid = global.getService();\r
List<String> resourceUuidList = global.getResourceVf();\r
if (resourceUuidList != null && !resourceUuidList.isEmpty()) {\r
resourceUuid = resourceUuidList.get(0);\r
}\r
- /* Invemtory service url is called in this method */\r
- isDcaeInfoAvailable = getDcaeInformation(artifactName, invariantServiceUuid, resourceUuid);\r
+ /* Inventory service url is called in this method */\r
+ dcaeResponse = getDcaeInformation(artifactName, invariantServiceUuid, resourceUuid);\r
/* set dcae events */\r
dcaeEvent.setArtifactName(artifactName);\r
dcaeEvent.setEvent(DcaeEvent.EVENT_DISTRIBUTION);\r
- } catch (JsonProcessingException e) {\r
+ LoggingUtils.setResponseContext("0", "Set inventory success", this.getClass().getName());\r
+ } catch (ParseException e) {\r
+ LoggingUtils.setResponseContext("900", "Set inventory failed", this.getClass().getName());\r
+ LoggingUtils.setErrorContext("900", "Set inventory error");\r
logger.error("Error during JSON decoding", e);\r
} catch (IOException ex) {\r
+ LoggingUtils.setResponseContext("900", "Set inventory failed", this.getClass().getName());\r
+ LoggingUtils.setErrorContext("900", "Set inventory error");\r
logger.error("Error during DCAE communication", ex);\r
} finally {\r
LoggingUtils.setTimeContext(startTime, new Date());\r
metricsLogger.info("setEventInventory complete");\r
}\r
- /* Null whether the DCAE has items lenght or not */\r
- if (isDcaeInfoAvailable != null) {\r
- /* Inserting Event in to DB */\r
- logger.info(isDcaeInfoAvailable);\r
- JSONParser parser = new JSONParser();\r
- Object obj0 = parser.parse(isDcaeInfoAvailable);\r
- JSONObject jsonObj = (JSONObject) obj0;\r
+ this.analyzeAndSaveDcaeResponse(dcaeResponse, cldsModel, dcaeEvent, userId);\r
+ }\r
+\r
+ private void analyzeAndSaveDcaeResponse(DcaeInventoryResponse dcaeResponse, CldsModel cldsModel,\r
+ DcaeEvent dcaeEvent, String userId) {\r
+ if (dcaeResponse != null) {\r
+ logger.info("Dcae Response for query on inventory: " + dcaeResponse);\r
String oldTypeId = cldsModel.getTypeId();\r
- String newTypeId = "";\r
- if (jsonObj.get("typeId") != null) {\r
- newTypeId = jsonObj.get("typeId").toString();\r
- cldsModel.setTypeId(jsonObj.get("typeId").toString());\r
+ if (dcaeResponse.getTypeId() != null) {\r
+ cldsModel.setTypeId(dcaeResponse.getTypeId());\r
}\r
- // cldsModel.setTypeName(cldsModel.getControlName().toString()+".yml");\r
- if (jsonObj.get("typeName") != null) {\r
- cldsModel.setTypeName(jsonObj.get("typeName").toString());\r
+ if (dcaeResponse.getTypeName() != null) {\r
+ cldsModel.setTypeName(dcaeResponse.getTypeName());\r
}\r
- if (oldTypeId == null || !oldTypeId.equalsIgnoreCase(newTypeId)) {\r
+ if (oldTypeId == null || !cldsModel.getEvent().getActionCd().equalsIgnoreCase(CldsEvent.ACTION_DISTRIBUTE)\r
+ || cldsModel.getEvent().getActionCd().equalsIgnoreCase(CldsEvent.ACTION_SUBMITDCAE)) {\r
CldsEvent.insEvent(cldsDao, dcaeEvent.getControlName(), userId, dcaeEvent.getCldsActionCd(),\r
- CldsEvent.ACTION_STATE_RECEIVED, null);\r
+ CldsEvent.ACTION_STATE_RECEIVED, null);\r
}\r
cldsModel.save(cldsDao, userId);\r
} else {\r
}\r
}\r
\r
+ private int getTotalCountFromDcaeInventoryResponse(String responseStr) throws ParseException {\r
+ JSONParser parser = new JSONParser();\r
+ Object obj0 = parser.parse(responseStr);\r
+ JSONObject jsonObj = (JSONObject) obj0;\r
+ Long totalCount = (Long) jsonObj.get("totalCount");\r
+ return totalCount.intValue();\r
+ }\r
+\r
+ private DcaeInventoryResponse getItemsFromDcaeInventoryResponse(String responseStr) throws ParseException {\r
+ JSONParser parser = new JSONParser();\r
+ Object obj0 = parser.parse(responseStr);\r
+ JSONObject jsonObj = (JSONObject) obj0;\r
+ JSONArray itemsArray = (JSONArray) jsonObj.get("items");\r
+ JSONObject dcaeServiceType0 = (JSONObject) itemsArray.get(0);\r
+ return JsonUtils.GSON.fromJson(dcaeServiceType0.toString(), DcaeInventoryResponse.class);\r
+ }\r
+\r
/**\r
* DO a query to DCAE to get some Information.\r
- * \r
+ *\r
* @param artifactName\r
- * The artifact Name\r
+ * The artifact Name\r
* @param serviceUuid\r
- * The service UUID\r
+ * The service UUID\r
* @param resourceUuid\r
- * The resource UUID\r
- * @return The DCAE inventory for the artifact\r
+ * The resource UUID\r
+ * @return The DCAE inventory for the artifact in DcaeInventoryResponse\r
* @throws IOException\r
+ * In case of issues with the stream\r
* @throws ParseException\r
- * \r
+ * In case of issues with the Json parsing\r
*/\r
- public String getDcaeInformation(String artifactName, String serviceUuid, String resourceUuid)\r
- throws IOException, ParseException {\r
- Date startTime = new Date();\r
+ public DcaeInventoryResponse getDcaeInformation(String artifactName, String serviceUuid, String resourceUuid)\r
+ throws IOException, ParseException, InterruptedException {\r
LoggingUtils.setTargetContext("DCAE", "getDcaeInformation");\r
String queryString = "?asdcResourceId=" + resourceUuid + "&asdcServiceId=" + serviceUuid + "&typeName="\r
- + artifactName;\r
- String fullUrl = refProp.getStringValue("DCAE_INVENTORY_URL") + "/dcae-service-types" + queryString;\r
+ + artifactName;\r
+ String fullUrl = refProp.getStringValue(DCAE_INVENTORY_URL) + "/dcae-service-types" + queryString;\r
logger.info("Dcae Inventory Service full url - " + fullUrl);\r
- String daceInventoryResponse = null;\r
- String responseStr = DcaeHttpConnectionManager.doDcaeHttpQuery(fullUrl, "GET", null, null);\r
- JSONParser parser = new JSONParser();\r
- Object obj0 = parser.parse(responseStr);\r
- JSONObject jsonObj = (JSONObject) obj0;\r
- Long totalCount = (Long) jsonObj.get("totalCount");\r
- int numServices = totalCount.intValue();\r
- if (numServices == 0) {\r
- daceInventoryResponse = null;\r
- } else if (numServices > 0) {\r
- JSONArray itemsArray = (JSONArray) jsonObj.get("items");\r
- JSONObject dcaeServiceType0 = (JSONObject) itemsArray.get(0);\r
- daceInventoryResponse = dcaeServiceType0.toString();\r
- logger.info(daceInventoryResponse);\r
- }\r
+ DcaeInventoryResponse response = queryDcaeInventory(fullUrl);\r
+ LoggingUtils.setResponseContext("0", "Get Dcae Information success", this.getClass().getName());\r
+ Date startTime = new Date();\r
LoggingUtils.setTimeContext(startTime, new Date());\r
- metricsLogger.info("getDcaeInformation complete: number services returned=" + numServices);\r
- return daceInventoryResponse;\r
+ return response;\r
+ }\r
+\r
+ private DcaeInventoryResponse queryDcaeInventory(String fullUrl)\r
+ throws IOException, InterruptedException, ParseException {\r
+ int retryInterval = 0;\r
+ int retryLimit = 1;\r
+ if (refProp.getStringValue(DCAE_INVENTORY_RETRY_LIMIT) != null) {\r
+ retryLimit = Integer.valueOf(refProp.getStringValue(DCAE_INVENTORY_RETRY_LIMIT));\r
+ }\r
+ if (refProp.getStringValue(DCAE_INVENTORY_RETRY_INTERVAL) != null) {\r
+ retryInterval = Integer.valueOf(refProp.getStringValue(DCAE_INVENTORY_RETRY_INTERVAL));\r
+ }\r
+ for (int i = 0; i < retryLimit; i++) {\r
+ metricsLogger.info("Attempt n°" + i + " to contact DCAE inventory");\r
+ String response = httpConnectionManager.doHttpRequest(fullUrl, "GET", null, null, "DCAE", null, null);\r
+ int totalCount = getTotalCountFromDcaeInventoryResponse(response);\r
+ metricsLogger.info("getDcaeInformation complete: totalCount returned=" + totalCount);\r
+ if (totalCount > 0) {\r
+ logger.info("getDcaeInformation, answer from DCAE inventory:" + response);\r
+ return getItemsFromDcaeInventoryResponse(response);\r
+ }\r
+ logger.info(\r
+ "Dcae inventory totalCount returned is 0, so waiting " + retryInterval + "ms before retrying ...");\r
+ // wait for a while and try to connect to DCAE again\r
+ Thread.sleep(retryInterval);\r
+ }\r
+ logger.warn("Dcae inventory totalCount returned is still 0, after " + retryLimit + " attempts, returning NULL");\r
+ return null;\r
}\r
}\r