diff options
author | dhebeha <dhebeha.mj71@wipro.com> | 2020-10-13 21:24:08 +0530 |
---|---|---|
committer | dhebeha <dhebeha.mj71@wipro.com> | 2020-10-27 13:15:37 +0530 |
commit | fadaccdb8396a178134ef95982e96ed8a5cddc26 (patch) | |
tree | d81b7d33dbc373d0656f969e24783aba2aaeae33 /components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/PmEventProcessor.java | |
parent | 9170fe0e3aad7a336b0f0d08e63b9de127a9f9de (diff) |
Fix Issues
- Fix certificate issue for authenticated topic
- Fix consumer thread issue
Issue-ID: DCAEGEN2-2485
Signed-off-by: dhebeha <dhebeha.mj71@wipro.com>
Change-Id: I91fe9b1b86579da7142955ac7adaa25ac4bc22e9
Diffstat (limited to 'components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/PmEventProcessor.java')
-rw-r--r-- | components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/PmEventProcessor.java | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/PmEventProcessor.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/PmEventProcessor.java index 99c24c8a..51a04660 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/PmEventProcessor.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/PmEventProcessor.java @@ -31,6 +31,8 @@ import org.onap.slice.analysis.ms.models.pmnotification.Event; import org.onap.slice.analysis.ms.models.pmnotification.MeasInfoList; import org.onap.slice.analysis.ms.models.pmnotification.MeasResult; import org.onap.slice.analysis.ms.models.pmnotification.MeasValuesList; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; @@ -41,7 +43,7 @@ import org.springframework.stereotype.Component; @Scope("prototype") public class PmEventProcessor implements IPmEventProcessor{ protected Map<String, List<MeasurementObject>> instanceMap = new HashMap<>(); - + private static Logger log = LoggerFactory.getLogger(PmEventProcessor.class); /** * Process the PM event @@ -53,6 +55,7 @@ public class PmEventProcessor implements IPmEventProcessor{ List<MeasValuesList> subCounterMeasurements = measurement.getMeasValuesList(); subCounterMeasurements.forEach(subCounterMeasurement -> processMeasurementObjectData(collectedSubCounters, subCounterMeasurement)); }); + log.info("Processed Event: {}", instanceMap); return instanceMap; } @@ -65,26 +68,28 @@ public class PmEventProcessor implements IPmEventProcessor{ measResultList.forEach(measResult -> { String pmName = collectedSubCounters.get(measResult.getP()-1); Integer pmValue = Integer.valueOf(measResult.getsValue()); - Map<String,String> pmMapping = getMapKey(pmName); - String snssai = pmMapping.get("snssai"); - String pm = pmMapping.get("pm"); - Map<String, Integer> pmData = new HashMap<>(); - pmData.put(pm, pmValue); - if (instanceMap.containsKey(snssai)) { - int index = instanceMap.get(snssai).indexOf(new MeasurementObject(measObjId)); - if (index == -1) { - instanceMap.get(snssai).add(new MeasurementObject(measObjId,pmData)); + if(pmName.contains("PrbUsedUl") || pmName.contains("PrbUsedDl")) { + Map<String,String> pmMapping = getMapKey(pmName); + String snssai = pmMapping.get("snssai"); + String pm = pmMapping.get("pm"); + Map<String, Integer> pmData = new HashMap<>(); + pmData.put(pm, pmValue); + if (instanceMap.containsKey(snssai)) { + int index = MeasurementObject.findIndex(measObjId, instanceMap.get(snssai)); + if (index == -1) { + instanceMap.get(snssai).add(new MeasurementObject(measObjId,pmData)); + } + else { + instanceMap.get(snssai).get(index).getPmData().put(pm, pmValue); + } } else { - instanceMap.get(snssai).get(index).getPmData().put(pmName, pmValue); - } - } - else { - List<MeasurementObject> l = new LinkedList<>(); - l.add(new MeasurementObject(measObjId,pmData)); - instanceMap.put(snssai, l); + List<MeasurementObject> l = new LinkedList<>(); + l.add(new MeasurementObject(measObjId,pmData)); + instanceMap.put(snssai, l); + } } - }); + }); } /** @@ -92,14 +97,10 @@ public class PmEventProcessor implements IPmEventProcessor{ */ public Map<String, String> getMapKey(String pmName) { String [] pmNameArr = pmName.split("\\."); - String snssai = ""; String pm = pmNameArr[1]; Map<String, String> result = new HashMap<>(); result.put("pm", pm); - if ((pm.equalsIgnoreCase("PrbUsedDl")) || (pm.equalsIgnoreCase("PrbUsedUl"))){ - snssai = pmNameArr[2]; - } - result.put("snssai", snssai); + result.put("snssai", pmNameArr[2]); return result; } }
\ No newline at end of file |