Updated SDC listener and dependent bundles

[appc.git] / appc-sdc-listener / appc-sdc-listener-bundle / src / main / java / org / onap / appc / sdc / artifacts / helper / DependencyModelGenerator.java

diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/onap/appc/sdc/artifacts/helper/DependencyModelGenerator.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/onap/appc/sdc/artifacts/helper/DependencyModelGenerator.java
index 295ee47..62212d7 100644 (file)
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/onap/appc/sdc/artifacts/helper/DependencyModelGenerator.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/onap/appc/sdc/artifacts/helper/DependencyModelGenerator.java
@@ -32,6 +32,7 @@ import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import org.onap.appc.dg.dependencymanager.helper.DependencyModelParser;
+import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModelException;
 import org.onap.appc.dg.objects.Node;
 import org.onap.appc.dg.objects.VnfcDependencyModel;
 import org.onap.appc.domainmodel.Vnfc;
@@ -58,7 +59,13 @@ public class DependencyModelGenerator {
         logger.debug(String.format("Generating dependency model for vnfType : %s , TOSCA: %s ",  vnfType ,tosca));
         String dependencyJson;
         DependencyModelParser dependencyModelParser = new DependencyModelParser();
-        VnfcDependencyModel vnfcDependencyModel = dependencyModelParser.generateDependencyModel(tosca, vnfType);
+        VnfcDependencyModel vnfcDependencyModel = null;
+        try {
+            vnfcDependencyModel = dependencyModelParser.generateDependencyModel(tosca, vnfType);
+        } catch (InvalidDependencyModelException e) {
+            logger.error("Error generating dependency model");
+            throw new APPCException(e.getMessage(),e);
+        }
 
         if (vnfcDependencyModel != null && !vnfcDependencyModel.getDependencies().isEmpty()) {
             logger.debug(String.format("Dependency Model generated : %s ", vnfcDependencyModel.toString()));