From fff70fce14ebe7dec3a4d52b7b90cee4414d0562 Mon Sep 17 00:00:00 2001
From: Pavel Aharoni <pa0916@att.com>
Date: Tue, 6 Jun 2017 11:48:14 +0300
Subject: [PATCH] [SDC-24] sdnc problems

Change-Id: I990126b83b11ae23090bb22bf0a5d46adf71a61a
Signed-off-by: Pavel Aharoni <pa0916@att.com>
---
 .../src/main/java/org/openecomp/test/SimpleCallback.java     | 12 +++++++++++-
 .../sdc/tosca/parser/impl/SdcToscaParserFactory.java         |  8 +++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/sdc-distribution-ci/src/main/java/org/openecomp/test/SimpleCallback.java b/sdc-distribution-ci/src/main/java/org/openecomp/test/SimpleCallback.java
index c5cce09..98df4d0 100644
--- a/sdc-distribution-ci/src/main/java/org/openecomp/test/SimpleCallback.java
+++ b/sdc-distribution-ci/src/main/java/org/openecomp/test/SimpleCallback.java
@@ -277,6 +277,8 @@ public class SimpleCallback implements INotificationCallback {
 			
 			try {
 				List<IArtifactInfo> serviceArtifacts = data.getServiceArtifacts();
+				List<IResourceInstance> resourcesArtifacts = data.getResources();
+				
 				JSONArray jsonData = new JSONArray(new String(payload));
 				boolean artifactIsFound = true;
 				for (int index = 0 ; index < jsonData.length(); index++)  {
@@ -285,8 +287,16 @@ public class SimpleCallback implements INotificationCallback {
 					JSONArray artifacts = (JSONArray) jsonObject.get("artifacts");
 					for (int i = 0 ; i < artifacts.length(); i++) {
 						String artifact = artifacts.getString(i).toString();
+						
 						Optional<IArtifactInfo> serviceArtifactFound = serviceArtifacts.stream().filter(x -> x.getArtifactUUID().equals(artifact)).findFirst();
-						if (!serviceArtifactFound.isPresent()) {
+						
+						boolean isResourceFound = false;
+						for (int j = 0 ; j < resourcesArtifacts.size(); j++) {
+							Optional<IArtifactInfo> resourceArtifactFound = resourcesArtifacts.get(j).getArtifacts().stream().filter(x -> x.getArtifactUUID().equals(artifact)).findFirst();
+							isResourceFound = resourceArtifactFound.isPresent() || isResourceFound;
+						}
+						
+						if (!serviceArtifactFound.isPresent() && !isResourceFound) {
 							artifactIsFound = false;
 							System.out.println("################ Artifact: " + artifact + " NOT FOUND in Notification Data ################");
 						}
diff --git a/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcToscaParserFactory.java b/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcToscaParserFactory.java
index 2ddde1f..a3b2391 100644
--- a/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcToscaParserFactory.java
+++ b/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcToscaParserFactory.java
@@ -41,7 +41,13 @@ public class SdcToscaParserFactory {
      *
      * @param csarPath - the absolute path to CSAR file.
      * @return ISdcCsarHelper object.
-     * @throws SdcToscaParserException - in case the path or CSAR are invalid.
+     * @throws SdcToscaParserException - in case the path or CSAR are invalid.<br>
+     * Possible codes of SdcToscaParserException:<br>
+     * TP0001 - CSAR file not found.<br>
+     * TP0002 - CSAR file bad format. Check the log for details.<br>
+     * TP0003 - CSAR version is unsupported by the parser.<br>
+     * TP0004 - Unexpected general error.<br>
+     * 
      */
     public ISdcCsarHelper getSdcCsarHelper(String csarPath) throws SdcToscaParserException {
         synchronized (SdcToscaParserFactory.class) {
-- 
2.16.6