fix template parsing problems

Issue-ID: SO-2963

Signed-off-by: zm330 <zhangminyj@chinamobile.com>
Change-Id: I4eac0ddc5909076c4b83a7866b9a14a69e7b32c7

diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCController.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCController.java
index 44ea2a2..02b1df7 100644 (file)
--- a/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCController.java
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCController.java
@@ -978,7 +978,7 @@ public class ASDCController {
                 String artifactContent = null;
                 List<IArtifactInfo> serviceArtifacts = iNotif.getServiceArtifacts();
                 Optional<IArtifactInfo> artifactOpt = serviceArtifacts.stream()
-                        .filter(e -> e.getArtifactType().equalsIgnoreCase("OTHER")).findFirst();
+                        .filter(e -> e.getArtifactType().equalsIgnoreCase("WORKFLOW")).findFirst();
                 if (artifactOpt.isPresent()) {
                     IArtifactInfo artifactInfo = artifactOpt.get();
                     logger.debug("Ready to parse this serviceArtifactUUID:  " + artifactInfo.getArtifactUUID());

diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
index 49fef1d..d57b305 100644 (file)
--- a/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
@@ -2913,15 +2913,19 @@ public class ToscaResourceInstaller {
     }
 
     private void createServiceArtifact(Service service, VfResourceStructure vfResourceStruct, String artifactContent) {
+        if (null == vfResourceStruct) {
+            return;
+        }
         List<ServiceArtifact> serviceArtifactList = new ArrayList<>();
         ServiceArtifact serviceArtifact;
         List<IArtifactInfo> artifactInfoList = vfResourceStruct.getNotification().getServiceArtifacts().stream()
-                .filter(artifact -> artifact.getArtifactType().equalsIgnoreCase("OTHER")).collect(Collectors.toList());
+                .filter(artifact -> artifact.getArtifactType().equalsIgnoreCase("WORKFLOW"))
+                .collect(Collectors.toList());
         for (IArtifactInfo artifactInfo : artifactInfoList) {
             serviceArtifact = new ServiceArtifact();
             serviceArtifact.setArtifactUUID(artifactInfo.getArtifactUUID());
             serviceArtifact.setName(artifactInfo.getArtifactName());
-            serviceArtifact.setType(artifactInfo.getArtifactType());
+            serviceArtifact.setType("OTHER");
             serviceArtifact.setVersion(artifactInfo.getArtifactVersion());
             serviceArtifact.setDescription(artifactInfo.getArtifactDescription());
             serviceArtifact.setChecksum(artifactInfo.getArtifactChecksum());