diff options
Diffstat (limited to 'src')
3 files changed, 28 insertions, 4 deletions
diff --git a/src/main/java/org/onap/dcaegen2/services/sonhms/MainThreadComponent.java b/src/main/java/org/onap/dcaegen2/services/sonhms/MainThreadComponent.java index e809b45..608e95b 100644 --- a/src/main/java/org/onap/dcaegen2/services/sonhms/MainThreadComponent.java +++ b/src/main/java/org/onap/dcaegen2/services/sonhms/MainThreadComponent.java @@ -82,7 +82,7 @@ public class MainThreadComponent { Long difference = fixedPciCreatedAt.getTime() - lastInvokedOofTimeStamp.getTime(); Configuration configuration = Configuration.getInstance(); - if (difference > configuration.getPolicyFixedPciTimeInterval()) { + if (Math.abs(difference) > configuration.getPolicyFixedPciTimeInterval()) { log.info("Creating new child thread for sending fixedPciCells"); List<Graph> cluster = new ArrayList<>(); BlockingQueue<List<String>> childStatusQueue = new LinkedBlockingQueue<>(); diff --git a/src/main/java/org/onap/dcaegen2/services/sonhms/child/ChildThread.java b/src/main/java/org/onap/dcaegen2/services/sonhms/child/ChildThread.java index 1e740a9..fd2de30 100644 --- a/src/main/java/org/onap/dcaegen2/services/sonhms/child/ChildThread.java +++ b/src/main/java/org/onap/dcaegen2/services/sonhms/child/ChildThread.java @@ -25,6 +25,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import fj.data.Either; +import org.json.JSONObject; import java.io.IOException; import java.sql.Timestamp; @@ -80,6 +81,7 @@ public class ChildThread implements Runnable { HoMetricsComponent hoMetricsComponent; private static final Logger log = org.slf4j.LoggerFactory.getLogger(ChildThread.class); private static Timestamp startTime; + private static String networkId; /** @@ -169,7 +171,14 @@ public class ChildThread implements Runnable { new PolicyDmaapClient(new DmaapUtils(), Configuration.getInstance()), new HoMetricsComponent()); try { - String networkId = cluster.getNetworkId(); + networkId = cluster.getNetworkId(); + if (cluster.getCellPciNeighbourMap().isEmpty()) { + FixedPciCellsRepository fixedPciCellsRepository = BeanUtil.getBean(FixedPciCellsRepository.class); + List<String> fixedPciCells = fixedPciCellsRepository.getFixedPciCells(); + String cellId = fixedPciCells.get(0); + JSONObject cellData = SdnrRestClient.getCellData(cellId); + networkId = cellData.getJSONObject("Cell").getString("networkId"); + } Boolean done = false; @@ -526,4 +535,4 @@ public class ChildThread implements Runnable { } return Either.right(404); } -}
\ No newline at end of file +} diff --git a/src/main/java/org/onap/dcaegen2/services/sonhms/restclient/SdnrRestClient.java b/src/main/java/org/onap/dcaegen2/services/sonhms/restclient/SdnrRestClient.java index 2478f82..a390bbe 100644 --- a/src/main/java/org/onap/dcaegen2/services/sonhms/restclient/SdnrRestClient.java +++ b/src/main/java/org/onap/dcaegen2/services/sonhms/restclient/SdnrRestClient.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * son-handler * ================================================================================ - * Copyright (C) 2019 Wipro Limited. + * Copyright (C) 2019-2020 Wipro Limited. * ============================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -106,6 +106,21 @@ public class SdnrRestClient { } /** + * Method to get CellData name from SDNR. + * + * @throws ConfigDbNotFoundException + * when request to configDB fails + */ + public static JSONObject getCellData(String cellId) throws ConfigDbNotFoundException { + Configuration configuration = Configuration.getInstance(); + String requestUrl = configuration.getConfigDbService() + "/api/sdnc-config-db/v3/getCell" + "/" + cellId; + String response = sendRequest(requestUrl); + JSONObject responseObject = new JSONObject(response); + return responseObject; + } + + + /** * Method to send request. */ private static String sendRequest(String url) throws ConfigDbNotFoundException { |