From e58e011a89ae5c8ada209a82d9b0f3ad1b0ca58f Mon Sep 17 00:00:00 2001
From: Bogumil Zebek <bogumil.zebek@nokia.com>
Date: Tue, 26 Mar 2019 14:19:31 +0100
Subject: PNF TC R146092

Change-Id: I27c881a8673957dde346fae393fffa6e946c2cd4
Issue-ID: VNFSDK-388
Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>
---
 .../java/org/onap/cvc/csar/PnfCSARArchive.java     | 37 +++++++++++++++++-----
 1 file changed, 29 insertions(+), 8 deletions(-)

(limited to 'csarvalidation/src/main/java/org/onap/cvc/csar/PnfCSARArchive.java')

diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/PnfCSARArchive.java b/csarvalidation/src/main/java/org/onap/cvc/csar/PnfCSARArchive.java
index 9dc966b..b51faf8 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/PnfCSARArchive.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/PnfCSARArchive.java
@@ -1,12 +1,12 @@
 /**
  * Copyright 2019 Nokia
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,11 +18,17 @@ package org.onap.cvc.csar;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
 public class PnfCSARArchive extends CSARArchive {
 
+    public PnfCSARArchive(){
+        super(new PnfManifest());
+    }
+
     @Override
     void parseManifest() throws IOException {
 
@@ -32,26 +38,41 @@ public class PnfCSARArchive extends CSARArchive {
         }
 
         PnfManifestParser pnfManifestParser = PnfManifestParser.getInstance(
-                this.getManifestMfFile().getAbsolutePath()
+                this.getManifestMfFile()
         );
 
         Pair<Manifest.Metadata, List<CSARError>> metadataData = pnfManifestParser.fetchMetadata();
+        Pair<List<String>, List<CSARError>> sourcesSectionData = pnfManifestParser.fetchSourcesSection();
         Pair<Map<String, Map<String, List<String>>>, List<CSARError>> nonManoArtifactsData = pnfManifestParser.fetchNonManoArtifacts();
 
-        Manifest manifest = this.getManifest();
+        PnfManifest manifest = (PnfManifest) this.getManifest();
         manifest.setMetadata(metadataData.getKey());
+        manifest.setSources(sourcesSectionData.getKey());
         manifest.setNonMano(nonManoArtifactsData.getKey());
         this.getErrors().addAll(metadataData.getValue());
         this.getErrors().addAll(nonManoArtifactsData.getValue());
+        this.getErrors().addAll(sourcesSectionData.getValue());
     }
 
     @Override
-    String getEntryManifestParamName(){
+    String getEntryManifestParamName() {
         return "ETSI-Entry-Manifest";
     }
 
     @Override
-    String getEntryChangeLogParamName(){
+    String getEntryChangeLogParamName() {
         return "ETSI-Entry-Change-Log";
     }
+
+    public static class PnfManifest extends Manifest {
+        private List<String> sources = new ArrayList<>();
+
+        public List<String> getSources() {
+            return Collections.unmodifiableList(sources);
+        }
+
+        public void setSources(List<String> sources) {
+            this.sources.addAll(sources);
+        }
+    }
 }
-- 
cgit 1.2.3-korg