commit 5b9774296857eb7a1382d50443dc67f8db81393a
author Gao Weitao <victor.gao@huawei.com> Fri Nov 16 09:46:15 2018 +0000
committer Gerrit Code Review <gerrit@onap.org> Fri Nov 16 09:46:15 2018 +0000
tree 3be9b30db7dfb79872ff2afba3204d0452148609
parent b063bc7a731316423cb009f2dddb21d9c7cdb8bc
parent e5c35edbc621e151b088307dd019f1b2dce60d07

Merge "CVP validation check"

csarvalidation/src/main/java/org/onap/validation/csar/CsarValidator.java

diff --git a/csarvalidation/src/main/java/org/onap/validation/csar/CsarValidator.java b/csarvalidation/src/main/java/org/onap/validation/csar/CsarValidator.java
index d27aa5a..ced4158 100644
--- a/csarvalidation/src/main/java/org/onap/validation/csar/CsarValidator.java
+++ b/csarvalidation/src/main/java/org/onap/validation/csar/CsarValidator.java
@@ -220,25 +220,20 @@
         }
 
         try {
-            if(cfile.contains(System.getProperty("file.separator") + CommonConstants.TOSCA_METADATA
-                    + System.getProperty("file.separator") + CommonConstants.TOSCA_META)) {
-                MAINSERV_MANIFEST = checkAndGetMRF(cfile, "Entry-Manifest");
-                if(MAINSERV_MANIFEST == null) {
-                    MAINSERV_MANIFEST = CommonConstants.MAINSERV_MANIFEST;
-                }
-
-                MAINSERV_TEMPLATE = checkAndGetMRF(cfile, "Entry-Definitions");
-                if(MAINSERV_TEMPLATE == null) {
-                    MAINSERV_TEMPLATE = CommonConstants.MAINSERV_TEMPLATE;
-                }
-
-                return CommonConstants.SUCCESS_STR;
+            MAINSERV_MANIFEST = checkAndGetMRF(cfile, "Entry-Manifest");
+            if(MAINSERV_MANIFEST == null) {
+                MAINSERV_MANIFEST = CommonConstants.MAINSERV_MANIFEST;
             }
+
+            MAINSERV_TEMPLATE = checkAndGetMRF(cfile, "Entry-Definitions");
+            if(MAINSERV_TEMPLATE == null) {
+                MAINSERV_TEMPLATE = CommonConstants.MAINSERV_TEMPLATE;
+            }
+
+            return CommonConstants.SUCCESS_STR;
         } catch(Exception e) {
             return ("PARSE_ERROR" + ":" + "TOSCA metadata not parsed properly! " + ErrorCodes.PARSE_ERROR + e);
         }
-
-        return "Tosca.meta file does not exist";
     }
 
     private static String checkAndGetMRF(String mrfFile, String attribute) {