Topology tree: enrich vfModules data from other versions of same model

[vid.git] / vid-app-common / src / main / java / org / onap / vid / services / AAIServiceTree.java

diff --git a/vid-app-common/src/main/java/org/onap/vid/services/AAIServiceTree.java b/vid-app-common/src/main/java/org/onap/vid/services/AAIServiceTree.java
index 579fd09..5bfcc5f 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/services/AAIServiceTree.java
+++ b/vid-app-common/src/main/java/org/onap/vid/services/AAIServiceTree.java
@@ -32,8 +32,6 @@ import java.util.stream.Stream;
 import javax.inject.Inject;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.vid.aai.util.AAITreeConverter;
-import org.onap.vid.asdc.AsdcCatalogException;
-import org.onap.vid.exceptions.GenericUncheckedException;
 import org.onap.vid.model.ServiceModel;
 import org.onap.vid.model.aaiTree.AAITreeNode;
 import org.onap.vid.model.aaiTree.NodeType;
@@ -122,11 +120,13 @@ public class AAIServiceTree {
         //Populate nodes with model-name & model-version (from aai)
         aaiTreeNodesEnricher.enrichNodesWithModelVersionAndModelName(nodesAccumulator);
 
-        final ServiceModel serviceModel = getServiceModel(aaiTree.getModelVersionId());
+        final ServiceModel serviceModel = sdcService.getServiceModelOrThrow(aaiTree.getModelVersionId());
 
         //Populate nodes with model-customization-name (from sdc model)
         aaiTreeNodesEnricher.enrichNodesWithModelCustomizationName(nodesAccumulator, serviceModel);
 
+        aaiTreeNodesEnricher.enrichVfModulesWithModelCustomizationNameFromOtherVersions(nodesAccumulator, aaiTree.getModelInvariantId());
+
         return aaiTreeConverter.convertTreeToUIModel(aaiTree, globalCustomerId, serviceType, getInstantiationType(serviceModel), getInstanceRole(serviceModel), getInstanceType(serviceModel));
     }
 
@@ -163,18 +163,6 @@ public class AAIServiceTree {
         }
     }
 
-    private ServiceModel getServiceModel(String modelVersionId) {
-        try {
-            final ServiceModel serviceModel = sdcService.getService(modelVersionId);
-            if (serviceModel == null) {
-                throw new GenericUncheckedException("Model version '" + modelVersionId + "' not found");
-            }
-            return serviceModel;
-        } catch (AsdcCatalogException e) {
-            throw new GenericUncheckedException("Exception while loading model version '" + modelVersionId + "'", e);
-        }
-    }
-
     public static class AaiRelationship {
 
         public final String type;