1 files changed, 61 insertions, 2 deletions

diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR01123.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR01123.java
index 5afc1d9..8b17e25 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR01123.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR01123.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2017 Huawei Technologies Co., Ltd.
+ * Modified 2020 Nokia.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +21,15 @@ import org.onap.cli.fw.schema.OnapCommandSchema;
 import org.onap.cvc.csar.CSARArchive;
 import org.onap.cvc.csar.CSARArchive.CSARErrorEntryMissing;
 import org.onap.cvc.csar.cc.VTPValidateCSARBase;
+import org.onap.cvc.csar.parser.SourcesParser;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @OnapCommandSchema(schema = "vtp-validate-csar-r01123.yaml")
 public class VTPValidateCSARR01123 extends VTPValidateCSARBase {
@@ -27,17 +37,66 @@ public class VTPValidateCSARR01123 extends VTPValidateCSARBase {
     public static class CSARErrorEntryVNFProviderDetailsNotFound extends CSARErrorEntryMissing {
         public CSARErrorEntryVNFProviderDetailsNotFound() {
             super("VNF Vendor details",
-                    CSARArchive.TOSCA_METADATA + " or " + CSARArchive.TOSCA_METADATA_TOSCA_META_ENTRY_DEFINITIONS + " file");
+                CSARArchive.TOSCA_METADATA + " or " + CSARArchive.TOSCA_METADATA_TOSCA_META_ENTRY_DEFINITIONS + " file");
+            this.setCode("0x1000");
+        }
+    }
+
+    public static class CSARErrorNotAllFilesLocatedInCSARWhereListedInManifest extends CSARErrorEntryMissing {
+        CSARErrorNotAllFilesLocatedInCSARWhereListedInManifest(List<String> fileInCsarThatAreNotLocatedInManifest) {
+            super("Source",
+                CSARArchive.TOSCA_METADATA);
             this.setCode("0x1000");
+            this.message = "files: "
+                + String.join(", ", fileInCsarThatAreNotLocatedInManifest)
+                + " are located in CSAR, but are not located in Manifest as Source";
         }
     }
 
     @Override
     protected void validateCSAR(CSARArchive csar) throws Exception {
         if (csar.getVendorName() == null ||
-                csar.getVersion() == null) {
+            csar.getVersion() == null) {
             errors.add(new CSARErrorEntryVNFProviderDetailsNotFound());
         }
+
+        Path rootFolder = csar.getWorkspace().getRootFolder()
+            .orElseThrow(() -> new IOException("Couldn't find CSAR root catalog"));
+        List<String> filesInCsar = getAllFilesInDirectory(rootFolder);
+        List<String> sourcesInManifest = getAllFilesFromManifestSources(csar.getManifest());
+
+        if (filesInCsar.size() != sourcesInManifest.size() || !sourcesInManifest.containsAll(filesInCsar)) {
+            filesInCsar.removeAll(sourcesInManifest);
+            errors.add(new VTPValidateCSARR01123.CSARErrorNotAllFilesLocatedInCSARWhereListedInManifest(filesInCsar));
+        }
+    }
+
+    private List<String> getAllFilesFromManifestSources(CSARArchive.Manifest manifest) {
+        return manifest.getSources()
+            .stream()
+            .map(SourcesParser.Source::getValue)
+            .filter(filterOutManifestFile())
+            .collect(Collectors.toList());
+    }
+
+    private List<String> getAllFilesInDirectory(Path rootPath) throws IOException {
+        try (Stream<Path> paths = Files.walk(rootPath, Integer.MAX_VALUE)) {
+            return paths
+                .filter(filterOutDirectories())
+                .map(rootPath::relativize)
+                .map(String::valueOf)
+                .filter(filterOutManifestFile())
+                .collect(Collectors.toList());
+        }
+    }
+
+    private Predicate<Path> filterOutDirectories() {
+        return path -> !Files.isDirectory(path);
+    }
+
+
+    private Predicate<String> filterOutManifestFile() {
+        return path -> !path.endsWith(".mf");
     }
 
     @Override