\r
String resp = getResponse(conn);\r
if (resp != null) {\r
- logger.info(resp.toString());\r
+ logger.info(resp);
// metrics log\r
LoggingUtils.setResponseContext("0", "Get sdc services success", this.getClass().getName());\r
return resp;\r
* @param formattedSdcReq\r
* @return\r
*/\r
- public String uploadArtifactToSdc(ModelProperties prop, String userid, String url, String formatttedSdcReq) {\r
+ public String uploadArtifactToSdc(ModelProperties prop, String userid, String url, String formattedSdcReq) {
// Verify whether it is triggered by Validation Test button from UI\r
if (prop.isTest()) {\r
return "sdc artifact upload not executed for test action";\r
}\r
try {\r
logger.info("userid=" + userid);\r
- String md5Text = SdcReq.calculateMD5ByString(formatttedSdcReq);\r
- byte[] postData = SdcReq.stringToByteArray(formatttedSdcReq);\r
+ String md5Text = SdcReq.calculateMD5ByString(formattedSdcReq);\r
+ byte[] postData = SdcReq.stringToByteArray(formattedSdcReq);\r
int postDataLength = postData.length;\r
HttpURLConnection conn = getSdcHttpUrlConnection(userid, postDataLength, url, md5Text);\r
try (DataOutputStream wr = new DataOutputStream(conn.getOutputStream())) {\r
artifactName = artifactNameNode.textValue();\r
artifactName = artifactName.substring(artifactName.lastIndexOf('.') + 1);\r
}\r
- if (artifactUrlNode != null && artifactName != null && !artifactName.isEmpty()\r
- && artifactName.equalsIgnoreCase("csv")) {\r
+ if (artifactUrlNode != null && "csv".equalsIgnoreCase(artifactName)) {
String responsesFromArtifactUrl = getResponsesFromArtifactUrl(artifactUrlNode.textValue());\r
cldsVfKPIDataList.addAll(parseCsvToGetFieldPath(responsesFromArtifactUrl));\r
logger.info(responsesFromArtifactUrl);\r
* @return\r
*/\r
public String getCldsServicesOrResourcesBasedOnURL(String url, boolean alarmConditions) {\r
+ Date startTime = new Date();\r
try {\r
+ LoggingUtils.setTargetContext("SDC", "getCldsServicesOrResourcesBasedOnURL");\r
String urlReworked = removeUnwantedBracesFromString(url);\r
URL urlObj = new URL(urlReworked);\r
\r
conn.setRequestMethod("GET");\r
\r
int responseCode = conn.getResponseCode();\r
- logger.info("responseCode=" + responseCode);\r
+ logger.info("Sdc resource url - " + urlReworked + " , responseCode=" + responseCode);\r
StringBuilder response;\r
try (BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream()))) {\r
response = new StringBuilder();\r
}\r
}\r
}\r
+ LoggingUtils.setResponseContext("0", "Get sdc resources success", this.getClass().getName());\r
return response.toString();\r
} catch (IOException e) {\r
+ LoggingUtils.setResponseContext("900", "Get sdc resources failed", this.getClass().getName());\r
+ LoggingUtils.setErrorContext("900", "Get sdc resources error");\r
logger.error("Exception occurred during query to SDC", e);\r
return "";\r
+ } finally {\r
+ LoggingUtils.setTimeContext(startTime, new Date());\r
+ metricsLogger.info("getCldsServicesOrResourcesBasedOnURL completed");\r
}\r
\r
}\r
for (CldsAlarmCondition currCldsAlarmCondition : currCldsVfcData.getCldsAlarmConditions()) {\r
alarmCondNode.put(currCldsAlarmCondition.getAlarmConditionKey(),\r
currCldsAlarmCondition.getAlarmConditionKey());\r
- if (currCldsAlarmCondition.getEventName().equalsIgnoreCase("alarmCondition")) {\r
+ if ("alarmCondition".equalsIgnoreCase(currCldsAlarmCondition.getEventName())) {
alarmCondNode.put(currCldsAlarmCondition.getAlarmConditionKey(),\r
currCldsAlarmCondition.getAlarmConditionKey());\r
} else {\r
}\r
}\r
\r
+ /**\r
+ * Method to create vfc and kpi nodes inside vf node\r
+ * \r
+ * @param mapper\r
+ * @param cldsVfDataList\r
+ * @return\r
+ */\r
private ObjectNode createVfcObjectNodeByVfUuid(ObjectMapper mapper, List<CldsVfData> cldsVfDataList) {\r
ObjectNode vfUuidObjectNode = mapper.createObjectNode();\r
\r
if (cldsVfDataList != null && !cldsVfDataList.isEmpty()) {\r
for (CldsVfData currCldsVfData : cldsVfDataList) {\r
if (currCldsVfData != null) {\r
- ObjectNode vfcObjectNode = mapper.createObjectNode();\r
+ ObjectNode vfObjectNode = mapper.createObjectNode();\r
ObjectNode vfcUuidNode = mapper.createObjectNode();\r
+ ObjectNode kpiObjectNode = mapper.createObjectNode();\r
if (currCldsVfData.getCldsVfcs() != null && !currCldsVfData.getCldsVfcs().isEmpty()) {\r
for (CldsVfcData currCldsVfcData : currCldsVfData.getCldsVfcs()) {\r
vfcUuidNode.put(currCldsVfcData.getVfcInvariantResourceUUID(),\r
} else {\r
vfcUuidNode.put("", "");\r
}\r
- vfcObjectNode.putPOJO("vfc", vfcUuidNode);\r
- vfUuidObjectNode.putPOJO(currCldsVfData.getVfInvariantResourceUUID(), vfcObjectNode);\r
+ if (currCldsVfData.getCldsKPIList() != null && !currCldsVfData.getCldsKPIList().isEmpty()) {\r
+ for (CldsVfKPIData currCldsVfKPIData : currCldsVfData.getCldsKPIList()) {\r
+ kpiObjectNode.put(currCldsVfKPIData.getThresholdValue(),\r
+ currCldsVfKPIData.getThresholdValue());\r
+ }\r
+ } else {\r
+ kpiObjectNode.put("", "");\r
+ }\r
+ vfObjectNode.putPOJO("vfc", vfcUuidNode);\r
+ vfObjectNode.putPOJO("kpi", kpiObjectNode);\r
+ vfUuidObjectNode.putPOJO(currCldsVfData.getVfInvariantResourceUUID(), vfObjectNode);\r
}\r
}\r
} else {\r