diff options
author | 2022-05-11 13:47:15 +0000 | |
---|---|---|
committer | 2022-05-11 13:52:05 +0000 | |
commit | 3834528bd0ad36892e98acd49550ceb20cea7dec (patch) | |
tree | c530c9a8db57797fe5b320f4ac8e44b6dcdb8313 /components | |
parent | 374a349e10e60076b6279605029c555f3578ca96 (diff) |
[SLICEANALYSIS] Fix bug in fetching PM data from DES1.1.3-slice-analysis-ms
Issue-ID: DCAEGEN2-3156
Signed-off-by: Niranjana <niranjana.y60@wipro.com>
Change-Id: I0ffa262b15701958c50312c7549e09ce94bb9617
Diffstat (limited to 'components')
5 files changed, 9 insertions, 6 deletions
diff --git a/components/slice-analysis-ms/ChangeLog.md b/components/slice-analysis-ms/ChangeLog.md index c95884bb..13209eda 100644 --- a/components/slice-analysis-ms/ChangeLog.md +++ b/components/slice-analysis-ms/ChangeLog.md @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [1.1.3] - 2022/05/11 + - [DCAEGEN2-3156](https://jira.onap.org/browse/DCAEGEN2-3156) - Fix bug in fetching PM data from DES + ## [1.1.2] - 2022/05/01 - [DCAEGEN2-3145](https://jira.onap.org/browse/DCAEGEN2-3145) - Filter RAN related service instances in AAI diff --git a/components/slice-analysis-ms/pom.xml b/components/slice-analysis-ms/pom.xml index afcc6f60..21c62aab 100644 --- a/components/slice-analysis-ms/pom.xml +++ b/components/slice-analysis-ms/pom.xml @@ -34,7 +34,7 @@ </parent> <groupId>org.onap.dcaegen2.services.components</groupId> <artifactId>slice-analysis-ms</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.1.3-SNAPSHOT</version> <name>dcaegen2-services-slice-analysis-ms</name> <description>Network slice PM analyser</description> <packaging>jar</packaging> diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/SliceUtilization.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/SliceUtilization.java index 1d53892c..a9d30ce7 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/SliceUtilization.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/SliceUtilization.java @@ -181,9 +181,9 @@ public class SliceUtilization { numOfPRBData += measValuesArray.length(); for (int j = 0; j < measValuesArray.length(); j++) { dlPRBUsed += - measValuesArray.getJSONArray(j).getJSONArray(2).getJSONArray(dlThptIndex).getInt(1); + measValuesArray.getJSONArray(j).getJSONArray(1).getJSONArray(dlThptIndex).getInt(1); ulPRBUsed += - measValuesArray.getJSONArray(j).getJSONArray(2).getJSONArray(ulThptIndex).getInt(1); + measValuesArray.getJSONArray(j).getJSONArray(1).getJSONArray(ulThptIndex).getInt(1); } } } diff --git a/components/slice-analysis-ms/src/test/resources/pm_data.json b/components/slice-analysis-ms/src/test/resources/pm_data.json index 4642e813..0f711160 100644 --- a/components/slice-analysis-ms/src/test/resources/pm_data.json +++ b/components/slice-analysis-ms/src/test/resources/pm_data.json @@ -1,11 +1,11 @@ { "result":[ { - "measValuesList":"[[\"11220\",\"false\",[[1.0,\"75\"],[2.0,\"84\"]]],[\"11221\",\"false\",[[1.0,\"76\"],[2.0,\"85\"]]],[\"11222\",\"false\",[[1.0,\"90\"],[2.0,\"95\"]]]]", + "measValuesList":"[[\"false\",[[1.0,\"75\"],[2.0,\"84\"]],\"11220\"],[\"false\",[[1.0,\"76\"],[2.0,\"85\"]],\"11221\"],[\"false\",[[1.0,\"90\"],[2.0,\"95\"]],\"11222\",]]", "sMeasTypesList":"[\"SM.PrbUsedDl.01-06E442\",\"SM.PrbUsedUl.01-06E442\"]" }, { - "measValuesList":"[[\"11225\",\"false\",[[1.0,\"175\"],[2.0,\"184\"]]],[\"11224\",\"false\",[[1.0,\"176\"],[2.0,\"185\"]]],[\"11222\",\"false\",[[1.0,\"105\"],[2.0,\"100\"]]]]", + "measValuesList":"[[\"false\",[[1.0,\"175\"],[2.0,\"184\"]],\"11225\"],[\"false\",[[1.0,\"176\"],[2.0,\"185\"]],\"11224\"],[\"false\",[[1.0,\"105\"],[2.0,\"100\"]],\"11222\"]]", "sMeasTypesList":"[\"SM.PrbUsedDl.01-06E442\",\"SM.PrbUsedUl.01-06E442\"]" } ], diff --git a/components/slice-analysis-ms/version.properties b/components/slice-analysis-ms/version.properties index 299692b9..5844fb14 100644 --- a/components/slice-analysis-ms/version.properties +++ b/components/slice-analysis-ms/version.properties @@ -21,7 +21,7 @@ ############################################################################### major=1 minor=1 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT |