1 files changed, 14 insertions, 4 deletions
diff --git a/src/main/java/org/onap/dcaegen2/services/sonhms/child/StateOof.java b/src/main/java/org/onap/dcaegen2/services/sonhms/child/StateOof.java
index acfa1a4..8eb5a40 100644
--- a/src/main/java/org/onap/dcaegen2/services/sonhms/child/StateOof.java
+++ b/src/main/java/org/onap/dcaegen2/services/sonhms/child/StateOof.java
@@ -66,10 +66,20 @@ public class StateOof {
 
         Configuration config = Configuration.getInstance();
         int numSolutions = config.getNumSolutions();
-        List<String> optimizers = config.getOptimizers();
-
-        String oofResponse = OofRestClient.queryOof(numSolutions, transactionId.toString(), "create", cellidList,
-                networkId, optimizers, anrInputList);
+        List<String> pciOptimizerList = new ArrayList<>();
+        List<String> pciAnrOptimizerList = new ArrayList<>();
+
+        pciOptimizerList.add(config.getPciOptimizer());
+        pciAnrOptimizerList.add(config.getPciAnrOptimizer());
+        
+        String oofResponse =null;
+        if(!anrInputList.isEmpty()) {
+            oofResponse = OofRestClient.queryOof(numSolutions, transactionId.toString(), "create", cellidList,
+                    networkId, pciAnrOptimizerList, anrInputList);
+        }else {
+            oofResponse = OofRestClient.queryOof(numSolutions, transactionId.toString(), "create", cellidList,
+                    networkId, pciOptimizerList, anrInputList);
+        }
         log.info("Synchronous Response {}", oofResponse);
 
         List<String> childStatus = new ArrayList<>();