summaryrefslogtreecommitdiffstats
path: root/csarvalidation/src
diff options
context:
space:
mode:
authorGao Weitao <victor.gao@huawei.com>2018-11-16 09:46:15 +0000
committerGerrit Code Review <gerrit@onap.org>2018-11-16 09:46:15 +0000
commit5b9774296857eb7a1382d50443dc67f8db81393a (patch)
tree3be9b30db7dfb79872ff2afba3204d0452148609 /csarvalidation/src
parentb063bc7a731316423cb009f2dddb21d9c7cdb8bc (diff)
parente5c35edbc621e151b088307dd019f1b2dce60d07 (diff)
Merge "CVP validation check"3.0.0-ONAPcasablanca
Diffstat (limited to 'csarvalidation/src')
-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 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 @@ 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) {