1 files changed, 35 insertions, 9 deletions

diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/MLMessageProcessor.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/MLMessageProcessor.java
index 84ff3715..b67d3507 100644
--- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/MLMessageProcessor.java
+++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/MLMessageProcessor.java
@@ -2,7 +2,7 @@
  *  ============LICENSE_START=======================================================
  *  slice-analysis-ms
  *  ================================================================================
- *   Copyright (C) 2020 Wipro Limited.
+ *   Copyright (C) 2020-2021 Wipro Limited.
  *   ==============================================================================
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
@@ -23,9 +23,13 @@ package org.onap.slice.analysis.ms.service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
+import org.onap.slice.analysis.ms.configdb.AaiInterface;
+import org.onap.slice.analysis.ms.configdb.CpsInterface;
 import org.onap.slice.analysis.ms.configdb.IConfigDbService;
 import org.onap.slice.analysis.ms.models.CUModel;
+import org.onap.slice.analysis.ms.models.Configuration;
 import org.onap.slice.analysis.ms.models.MLOutputModel;
 import org.onap.slice.analysis.ms.models.policy.AdditionalProperties;
 import org.slf4j.Logger;
@@ -41,28 +45,50 @@ import org.springframework.stereotype.Component;
 @Scope("prototype")
 public class MLMessageProcessor {
 	private static Logger log = LoggerFactory.getLogger(MLMessageProcessor.class);
-	
+
 	@Autowired
 	private IConfigDbService configDbService;
-	
+
 	@Autowired
 	private PolicyService policyService;
-	
+
+	@Autowired
+	private AaiInterface aaiInterface;
+
+	@Autowired
+	private CpsInterface cpsInterface;
+
 	public void processMLMsg(MLOutputModel mlOutputMsg) {
+		Boolean isConfigDbEnabled = (Objects.isNull(Configuration.getInstance().getConfigDbEnabled())) ? true
+				: Configuration.getInstance().getConfigDbEnabled();
+		Map<String, List<String>> ricToCellMapping = null;
+		Map<String, String> serviceDetails = null;
 		String snssai = mlOutputMsg.getSnssai();
 		List<CUModel> cuData = mlOutputMsg.getData();
-		Map<String, List<String>>  ricToCellMapping = configDbService.fetchRICsOfSnssai(snssai);
-		log.debug("RIC to cell mapping of S-NSSAI {} is {}",snssai,ricToCellMapping);
-		for(CUModel cuModel: cuData) {
+		if (isConfigDbEnabled) {
+			ricToCellMapping = configDbService.fetchRICsOfSnssai(snssai);
+		} else {
+			ricToCellMapping = cpsInterface.fetchRICsOfSnssai(snssai);
+		}
+		log.debug("RIC to cell mapping of S-NSSAI {} is {}", snssai, ricToCellMapping);
+		for (CUModel cuModel : cuData) {
 			String cellId = String.valueOf(cuModel.getCellCUList().get(0).getCellLocalId());
 			ricToCellMapping.forEach((ricId, cells) -> {
-				if(cells.contains(cellId)) {
+				if (cells.contains(cellId)) {
 					cuModel.setNearRTRICId(ricId);
 				}
 			});
 		}
 		AdditionalProperties<MLOutputModel> addProps = new AdditionalProperties<>();
 		addProps.setResourceConfig(mlOutputMsg);
-		policyService.sendOnsetMessageToPolicy(snssai, addProps, configDbService.fetchServiceDetails(snssai));	
+
+		if (isConfigDbEnabled) {
+			serviceDetails = configDbService.fetchServiceDetails(snssai);
+		} else {
+			serviceDetails = aaiInterface.fetchServiceDetails(snssai);
+
+		}
+		policyService.sendOnsetMessageToPolicy(snssai, addProps, serviceDetails);
 	}
 }
+