1 files changed, 10 insertions, 10 deletions

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 614efd4f4..891244c7c 100644
--- 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
@@ -31,11 +31,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class SubscriptionModelLoader extends AbstractModelLoader {
 
-    private static final String SUBSCRIPTION_MODEL_FILENAME = "subscription.yang";
-    private static final String SUBSCRIPTION_DATASPACE_NAME = "NCMP-Admin";
-    private static final String SUBSCRIPTION_ANCHOR_NAME = "AVC-Subscriptions";
-    private static final String SUBSCRIPTION_SCHEMASET_NAME = "subscriptions";
-    private static final String SUBSCRIPTION_REGISTRY_DATANODE_NAME = "subscription-registry";
+    private static final String MODEL_FILENAME = "subscription.yang";
+    private static final String DATASPACE_NAME = "NCMP-Admin";
+    private static final String ANCHOR_NAME = "AVC-Subscriptions";
+    private static final String SCHEMASET_NAME = "subscriptions";
+    private static final String REGISTRY_DATANODE_NAME = "subscription-registry";
 
     public SubscriptionModelLoader(final CpsAdminService cpsAdminService,
                                    final CpsModuleService cpsModuleService,
@@ -49,18 +49,18 @@ public class SubscriptionModelLoader extends AbstractModelLoader {
     @Override
     public void onboardOrUpgradeModel() {
         if (subscriptionModelLoaderEnabled) {
-            waitUntilDataspaceIsAvailable(SUBSCRIPTION_DATASPACE_NAME);
+            waitUntilDataspaceIsAvailable(DATASPACE_NAME);
             onboardSubscriptionModel();
+            log.info("Subscription Model onboarded successfully");
         } else {
             log.info("Subscription Model Loader is disabled");
         }
     }
 
     private void onboardSubscriptionModel() {
-        createSchemaSet(SUBSCRIPTION_DATASPACE_NAME, SUBSCRIPTION_SCHEMASET_NAME, SUBSCRIPTION_MODEL_FILENAME);
-        createAnchor(SUBSCRIPTION_DATASPACE_NAME, SUBSCRIPTION_SCHEMASET_NAME, SUBSCRIPTION_ANCHOR_NAME);
-        createTopLevelDataNode(SUBSCRIPTION_DATASPACE_NAME, SUBSCRIPTION_ANCHOR_NAME,
-            SUBSCRIPTION_REGISTRY_DATANODE_NAME);
+        createSchemaSet(DATASPACE_NAME, SCHEMASET_NAME, MODEL_FILENAME);
+        createAnchor(DATASPACE_NAME, SCHEMASET_NAME, ANCHOR_NAME);
+        createTopLevelDataNode(DATASPACE_NAME, ANCHOR_NAME, REGISTRY_DATANODE_NAME);
     }
 
 }