Merge "Change default use of Model Loader to TRUE"

diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index ccd09c8..bba8f09 100644 (file)
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -194,7 +194,7 @@ ncmp:
             parallelism-level: 10
 
     model-loader:
-        subscription: false
+        subscription: true
         maximum-attempt-count: 20
 
 # Custom Hazelcast Config.

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/SubscriptionModelLoader.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/SubscriptionModelLoader.java
index 659779a..af9ee72 100644 (file)
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/SubscriptionModelLoader.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/SubscriptionModelLoader.java
@@ -58,7 +58,7 @@ public class SubscriptionModelLoader implements ModelLoader {
     @Value("${ncmp.timers.model-loader.retry-time-ms:1000}")
     private long retryTimeMs;
 
-    @Value("${ncmp.model-loader.subscription:false}")
+    @Value("${ncmp.model-loader.subscription:true}")
     private boolean subscriptionModelLoaderEnabled;
 
     /**