summaryrefslogtreecommitdiffstats
path: root/csarvalidation/src/main/java/org/onap
diff options
context:
space:
mode:
authorKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2018-11-16 13:57:29 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2018-11-16 13:57:29 +0530
commite5c35edbc621e151b088307dd019f1b2dce60d07 (patch)
treea574886e8551cfd26ec6b7f53d81d3e65f75fa03 /csarvalidation/src/main/java/org/onap
parente92812c83f58046b6975e4a6008a88a1d99f1a1c (diff)
CVP validation check
Consider Meta folder as incase sensitive Issue-ID: VNFSDK-334 Change-Id: Ic431d173e6a5c19a6407d20544ecbdbe29c6b410 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Diffstat (limited to 'csarvalidation/src/main/java/org/onap')
-rw-r--r--csarvalidation/src/main/java/org/onap/validation/csar/CsarValidator.java23
1 files changed, 9 insertions, 14 deletions
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 88cd0e0..abeb5a9 100644
--- a/csarvalidation/src/main/java/org/onap/validation/csar/CsarValidator.java
+++ b/csarvalidation/src/main/java/org/onap/validation/csar/CsarValidator.java
@@ -214,25 +214,20 @@ public class CsarValidator {
}
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;
- }
+ MAINSERV_MANIFEST = checkAndGetMRF(cfile, "Entry-Manifest");
+ if(MAINSERV_MANIFEST == null) {
+ MAINSERV_MANIFEST = CommonConstants.MAINSERV_MANIFEST;
+ }
- return CommonConstants.SUCCESS_STR;
+ 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) {