Option 1 - vnf only

Change-Id: I281dddab930328f24b9267aa6afc6ae08fd9ed01
Issue-ID: VNFSDK-396
Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/parser/CmsParser.java b/csarvalidation/src/main/java/org/onap/cvc/csar/parser/CmsParser.java
index b1bf4b4..aa0fb48 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/parser/CmsParser.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/parser/CmsParser.java
@@ -48,9 +48,7 @@ public class CmsParser {
 
         for (String line : lines) {
             ManifestLine manifestLine = ManifestLine.of(line);
-            if (cmsSectionParsing && (manifestLine.startsWith(METADATA_SECTION_TAG_SECTION)
-                    || manifestLine.startsWith(NON_MANO_ARTIFACT_SETS_TAG_SECTION)
-                    || manifestLine.startsWith(SOURCE_TAG_SECTION))) {
+            if (cmsSectionParsing && isContainSepecialTag(manifestLine)) {
                 isSpecialTagReached = true;
             } else if (!isSpecialTagReached && line.contains(BEGIN_CMS_SECTION)) {
                 cmsSectionParsing = true;
@@ -75,6 +73,12 @@ public class CmsParser {
         return constructResponse(buf, errors, cmsSectionParsing, endCmsMarkerReached);
     }
 
+    private boolean isContainSepecialTag(ManifestLine manifestLine) {
+        return manifestLine.startsWith(METADATA_SECTION_TAG_SECTION)
+                || manifestLine.startsWith(NON_MANO_ARTIFACT_SETS_TAG_SECTION)
+                || manifestLine.startsWith(SOURCE_TAG_SECTION);
+    }
+
     private Pair<String, List<CSARArchive.CSARError>> constructResponse(StringBuilder buf, List<CSARArchive.CSARError> errors, boolean cmsSectionParsing, boolean endCmsMarkerReached) {
         if(endCmsMarkerReached) {
             return Pair.of(buf.toString(), errors);