From ada0d9333251c26daf4869a3b33407658430ab18 Mon Sep 17 00:00:00 2001 From: AvinashS Date: Thu, 26 Oct 2017 18:05:19 +0530 Subject: Validate against as per defined attribute name TOSCA.meta: Should be TOSCA-Meta-File-Version instead of TOSCA-Meta-Version Change-Id: I6d8d84bcc8a48436fbb044091ea1db1b7f8a2240 Issue-Id: VNFSDK-118 Signed-off-by: AvinashS --- .../org/onap/validation/csar/CsarValidator.java | 2 +- .../src/main/resources/schema/TOSCA.meta | 2 +- csarvalidation/src/test/resources/VoLTE.csar | Bin 53674 -> 53676 bytes .../src/test/resources/enterprise2DC.csar | Bin 32098 -> 32101 bytes csarvalidation/src/test/resources/sample2.csar | Bin 4600 -> 4622 bytes csarvalidation/src/test/resources/vEPC_NS.csar | Bin 149128 -> 149108 bytes csarvalidation/src/test/resources/vIMS_NS.csar | Bin 111654 -> 111637 bytes 7 files changed, 2 insertions(+), 2 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 9df9e82..0d7306f 100644 --- a/csarvalidation/src/main/java/org/onap/validation/csar/CsarValidator.java +++ b/csarvalidation/src/main/java/org/onap/validation/csar/CsarValidator.java @@ -40,7 +40,7 @@ public class CsarValidator { // Map of packageId and CSAR files private static HashMap> csar = new HashMap>(); - private static String MAINSERV_TEMPLATE; + private static String MAINSERV_TEMPLATE = CommonConstants.MAINSERV_TEMPLATE; private static String MAINSERV_MANIFEST; /** diff --git a/csarvalidation/src/main/resources/schema/TOSCA.meta b/csarvalidation/src/main/resources/schema/TOSCA.meta index 4b8de65..f5514a2 100644 --- a/csarvalidation/src/main/resources/schema/TOSCA.meta +++ b/csarvalidation/src/main/resources/schema/TOSCA.meta @@ -1,3 +1,3 @@ -TOSCA-Meta-Version: Double +TOSCA-Meta-File-Version: Double CSAR-Version: Double Entry-Definitions: { get_input: myinput } \ No newline at end of file diff --git a/csarvalidation/src/test/resources/VoLTE.csar b/csarvalidation/src/test/resources/VoLTE.csar index 9e7b737..ddd857c 100644 Binary files a/csarvalidation/src/test/resources/VoLTE.csar and b/csarvalidation/src/test/resources/VoLTE.csar differ diff --git a/csarvalidation/src/test/resources/enterprise2DC.csar b/csarvalidation/src/test/resources/enterprise2DC.csar index 29e08c1..89ca244 100644 Binary files a/csarvalidation/src/test/resources/enterprise2DC.csar and b/csarvalidation/src/test/resources/enterprise2DC.csar differ diff --git a/csarvalidation/src/test/resources/sample2.csar b/csarvalidation/src/test/resources/sample2.csar index 3d89ab6..0960b20 100644 Binary files a/csarvalidation/src/test/resources/sample2.csar and b/csarvalidation/src/test/resources/sample2.csar differ diff --git a/csarvalidation/src/test/resources/vEPC_NS.csar b/csarvalidation/src/test/resources/vEPC_NS.csar index 67ab75a..d817f35 100644 Binary files a/csarvalidation/src/test/resources/vEPC_NS.csar and b/csarvalidation/src/test/resources/vEPC_NS.csar differ diff --git a/csarvalidation/src/test/resources/vIMS_NS.csar b/csarvalidation/src/test/resources/vIMS_NS.csar index efab9f8..536e626 100644 Binary files a/csarvalidation/src/test/resources/vIMS_NS.csar and b/csarvalidation/src/test/resources/vIMS_NS.csar differ -- cgit 1.2.3-korg