diff options
Diffstat (limited to 'asdc-controller/src/main/java/org')
3 files changed, 8 insertions, 4 deletions
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 44ea2a25a2..02b1df79dd 100644 --- 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/etsi/pkg/processor/EtsiResourcePackageProcessor.java b/asdc-controller/src/main/java/org/onap/so/asdc/etsi/pkg/processor/EtsiResourcePackageProcessor.java index bb7197b7a4..4205de3cab 100644 --- a/asdc-controller/src/main/java/org/onap/so/asdc/etsi/pkg/processor/EtsiResourcePackageProcessor.java +++ b/asdc-controller/src/main/java/org/onap/so/asdc/etsi/pkg/processor/EtsiResourcePackageProcessor.java @@ -44,7 +44,7 @@ import com.google.common.collect.ImmutableSet; public class EtsiResourcePackageProcessor { private final static Logger LOGGER = LoggerFactory.getLogger(EtsiResourcePackageProcessor.class); - private static final String ONBOARDED_PACKAGE_DIR_PATH = "Artifacts/Deployment/ONBOARDED_PACKAGE"; + private static final String ONBOARDED_PACKAGE_DIR_PATH = "Artifacts/Deployment/ETSI_PACKAGE"; private final SdcResourceProvider sdcResourceProvider; private final EtsiCatalogServiceProvider catalogServiceProvider; private static final int SLEEP_TIME_IN_SECONDS = 5; 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 49fef1d3f0..d57b305902 100644 --- 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()); |