From 7363faa6243e3428d20a3be1800df9aa641ed3ba Mon Sep 17 00:00:00 2001 From: "denilson.l65" Date: Tue, 24 Aug 2021 11:08:00 +0000 Subject: DCAE SliceAnalysis MS - Cps Integration Issue-ID: DCAEGEN2-2885 Signed-off-by: denilson.l65 Change-Id: Iea7a675e5dc2f182dda14f0ccf14f2864a5991e5 --- .../slice/analysis/ms/configdb/CpsService.java | 76 ++++++++++++++++++++-- .../slice/analysis/ms/service/ConsumerThread.java | 13 +++- 2 files changed, 84 insertions(+), 5 deletions(-) (limited to 'components/slice-analysis-ms/src/main') diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/configdb/CpsService.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/configdb/CpsService.java index f0c27e19..389a75d9 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/configdb/CpsService.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/configdb/CpsService.java @@ -22,12 +22,18 @@ package org.onap.slice.analysis.ms.configdb; import java.util.List; import java.util.Map; +import java.util.HashMap; +import java.util.ArrayList; +import org.json.JSONArray; +import org.json.JSONObject; import org.onap.slice.analysis.ms.models.Configuration; import org.onap.slice.analysis.ms.restclients.CpsRestClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.core.ParameterizedTypeReference; import org.springframework.stereotype.Service; /** @@ -48,22 +54,84 @@ public class CpsService implements CpsInterface { * Fetches the current configuration of RIC from CPS */ public Map> fetchCurrentConfigurationOfRIC(String snssai) { - return null; + Map> responseMap = new HashMap>(); + String reqUrl = cpsBaseUrl +"/get-nearrtric-config"; + log.info("fetching current configuration of RIC from Cps: {s-NSSAI: "+snssai+"}"); + String requestBody = "{\"inputParameters\": {\"sNssai\":"+JSONObject.quote(snssai)+"}}"; + try { + String response = restclient.sendPostRequest(reqUrl,requestBody, new ParameterizedTypeReference() {}).getBody(); + JSONArray sliceArray = new JSONArray(response); + for (int i=0;i map = new HashMap(); + JSONArray configDataArray = sNSSAIList.getJSONObject(k).getJSONArray("configData"); + for(int l=0;l fetchNetworkFunctionsOfSnssai(String snssai) { - return null; + List responseList=new ArrayList<>(); + String reqUrl=cpsBaseUrl+"/get-gnbdufunction-by-snssai"; + log.info("fetching network functions of snssai from Cps: {s-NSSAI: "+snssai+"}"); + String requestBody = "{\"inputParameters\": {\"sNssai\":"+JSONObject.quote(snssai)+"}}"; + try { + String response=restclient.sendPostRequest(reqUrl,requestBody,new ParameterizedTypeReference() {}).getBody(); + JSONArray networkFunctionJsonArry = new JSONArray(response); + for (int i=0;i> fetchRICsOfSnssai(String snssai) { - return null; + Map> responseMap=new HashMap<>(); + String reqUrl=cpsBaseUrl + "/get-nrcelldu-by-snssai"; + log.info("fetching RIC of s-NSSAI from Cps: {s-NSSAI: "+snssai+"}"); + String requestBody = "{\"inputParameters\": {\"sNssai\":"+JSONObject.quote(snssai)+"}}"; + try { + String response=restclient.sendPostRequest(reqUrl,requestBody,new ParameterizedTypeReference() {}).getBody(); + JSONArray sliceArray = new JSONArray(response); + for (int i=0;i cellslist=new ArrayList<>(); + for(int k=0;k