X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Fclient%2FSdcCatalogServices.java;h=e3d10c756c619cb48cad0720b12f023f0c22a73a;hb=2b15edd224cc6dcff90e170959102eb1a1bb1a50;hp=5b9c5d36d18e4a471260a08519d1061849e39a20;hpb=c486f37c45d1afb516be0dd77bf9af03cb5251fd;p=clamp.git

diff --git a/src/main/java/org/onap/clamp/clds/client/SdcCatalogServices.java b/src/main/java/org/onap/clamp/clds/client/SdcCatalogServices.java
index 5b9c5d36..e3d10c75 100644
--- a/src/main/java/org/onap/clamp/clds/client/SdcCatalogServices.java
+++ b/src/main/java/org/onap/clamp/clds/client/SdcCatalogServices.java
@@ -779,7 +779,9 @@ public class SdcCatalogServices {
      * @return
      */
     public String getCldsServicesOrResourcesBasedOnURL(String url, boolean alarmConditions) {
+        Date startTime = new Date();
         try {
+            LoggingUtils.setTargetContext("SDC", "getCldsServicesOrResourcesBasedOnURL");
             String urlReworked = removeUnwantedBracesFromString(url);
             URL urlObj = new URL(urlReworked);
 
@@ -792,7 +794,7 @@ public class SdcCatalogServices {
             conn.setRequestMethod("GET");
 
             int responseCode = conn.getResponseCode();
-            logger.info("responseCode=" + responseCode);
+            logger.info("Sdc resource url - " + urlReworked + " , responseCode=" + responseCode);
             StringBuilder response;
             try (BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream()))) {
                 response = new StringBuilder();
@@ -806,10 +808,16 @@ public class SdcCatalogServices {
                     }
                 }
             }
+            LoggingUtils.setResponseContext("0", "Get sdc resources success", this.getClass().getName());
             return response.toString();
         } catch (IOException e) {
+            LoggingUtils.setResponseContext("900", "Get sdc resources failed", this.getClass().getName());
+            LoggingUtils.setErrorContext("900", "Get sdc resources error");
             logger.error("Exception occurred during query to SDC", e);
             return "";
+        } finally {
+            LoggingUtils.setTimeContext(startTime, new Date());
+            metricsLogger.info("getCldsServicesOrResourcesBasedOnURL completed");
         }
 
     }
@@ -1069,14 +1077,22 @@ public class SdcCatalogServices {
         }
     }
 
+    /**
+     * Method to create vfc and kpi nodes inside vf node
+     * 
+     * @param mapper
+     * @param cldsVfDataList
+     * @return
+     */
     private ObjectNode createVfcObjectNodeByVfUuid(ObjectMapper mapper, List<CldsVfData> cldsVfDataList) {
         ObjectNode vfUuidObjectNode = mapper.createObjectNode();
 
         if (cldsVfDataList != null && !cldsVfDataList.isEmpty()) {
             for (CldsVfData currCldsVfData : cldsVfDataList) {
                 if (currCldsVfData != null) {
-                    ObjectNode vfcObjectNode = mapper.createObjectNode();
+                    ObjectNode vfObjectNode = mapper.createObjectNode();
                     ObjectNode vfcUuidNode = mapper.createObjectNode();
+                    ObjectNode kpiObjectNode = mapper.createObjectNode();
                     if (currCldsVfData.getCldsVfcs() != null && !currCldsVfData.getCldsVfcs().isEmpty()) {
                         for (CldsVfcData currCldsVfcData : currCldsVfData.getCldsVfcs()) {
                             vfcUuidNode.put(currCldsVfcData.getVfcInvariantResourceUUID(),
@@ -1085,8 +1101,17 @@ public class SdcCatalogServices {
                     } else {
                         vfcUuidNode.put("", "");
                     }
-                    vfcObjectNode.putPOJO("vfc", vfcUuidNode);
-                    vfUuidObjectNode.putPOJO(currCldsVfData.getVfInvariantResourceUUID(), vfcObjectNode);
+                    if (currCldsVfData.getCldsKPIList() != null && !currCldsVfData.getCldsKPIList().isEmpty()) {
+                        for (CldsVfKPIData currCldsVfKPIData : currCldsVfData.getCldsKPIList()) {
+                            kpiObjectNode.put(currCldsVfKPIData.getThresholdValue(),
+                                    currCldsVfKPIData.getThresholdValue());
+                        }
+                    } else {
+                        kpiObjectNode.put("", "");
+                    }
+                    vfObjectNode.putPOJO("vfc", vfcUuidNode);
+                    vfObjectNode.putPOJO("kpi", kpiObjectNode);
+                    vfUuidObjectNode.putPOJO(currCldsVfData.getVfInvariantResourceUUID(), vfObjectNode);
                 }
             }
         } else {