Merge "fixes for passing policy"

3 files changed, 9 insertions, 4 deletions

diff --git a/cmso-service/etc/config/cmso.properties b/cmso-service/etc/config/cmso.properties
index d4a78e8..e9bec86 100644
--- a/cmso-service/etc/config/cmso.properties
+++ b/cmso-service/etc/config/cmso.properties
@@ -52,9 +52,9 @@ spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.Ph
 spring.jpa.hibernate.id.new_generator_mappings=false

 hibernate.id.new_generator_mappings=false

 

-logging.level.org.hibernate.SQL=TRACE

+logging.level.org.hibernate.SQL=WARN

 

-logging.level.org.hibernate=TRACE

+logging.level.org.hibernate=WARN

 

 #

 cmso.aaf.enabled=false

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/optimizer/CmsoOptimizerClient.java b/cmso-service/src/main/java/org/onap/optf/cmso/optimizer/CmsoOptimizerClient.java
index ff27937..4fd0164 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/optimizer/CmsoOptimizerClient.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/optimizer/CmsoOptimizerClient.java
@@ -181,8 +181,12 @@ public class CmsoOptimizerClient {
                         // Scheduled with optimizer
                         break;
                     case 200:
-                        debug.debug("Successfully completed optimization: " + schedule.getScheduleId());
-                        // Scheduled with optimizer
+                        String optimizerResponseString = response.readEntity(String.class);
+                        ObjectMapper om = new ObjectMapper();
+                        OptimizerResponse optimizerResponse =
+                                        om.readValue(optimizerResponseString, OptimizerResponse.class);
+                        debug.debug("Successfully retrieved optimization: " + schedule.getScheduleId());
+                        optimizerHandler.handleOptimizerResponse(optimizerResponse, schedule);
                         break;
                     case 400: {
                         schedule.setOptimizerDateTimeMillis(System.currentTimeMillis());
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/CmsoServiceImpl.java b/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/CmsoServiceImpl.java
index 4fccf7e..9b3785a 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/CmsoServiceImpl.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/CmsoServiceImpl.java
@@ -233,6 +233,7 @@ public class CmsoServiceImpl extends CommonServiceImpl implements CmsoService {
         List<PolicyInfo> policies = new ArrayList<>();
         PolicyInfo policyInfo = new PolicyInfo();
         policyInfo.setPolicyName(sinfo.getPolicyId());
+        policies.add(policyInfo);
         sd.setPolicies(policies);
 
         List<VnfDetailsMessage> details = sinfo.getVnfDetails();