summaryrefslogtreecommitdiffstats
path: root/csarvalidation
diff options
context:
space:
mode:
authorAvinashS <avinash.s@huawei.com>2017-10-26 18:05:19 +0530
committerAvinashS <avinash.s@huawei.com>2017-10-26 18:05:19 +0530
commitada0d9333251c26daf4869a3b33407658430ab18 (patch)
treece608b506f42ac51302132005f5054aabc15b44c /csarvalidation
parentd6f2d611538a5379e340aab26a51a0782555ceec (diff)
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 <avinash.s@huawei.com>
Diffstat (limited to 'csarvalidation')
-rw-r--r--csarvalidation/src/main/java/org/onap/validation/csar/CsarValidator.java2
-rw-r--r--csarvalidation/src/main/resources/schema/TOSCA.meta2
-rw-r--r--csarvalidation/src/test/resources/VoLTE.csarbin53674 -> 53676 bytes
-rw-r--r--csarvalidation/src/test/resources/enterprise2DC.csarbin32098 -> 32101 bytes
-rw-r--r--csarvalidation/src/test/resources/sample2.csarbin4600 -> 4622 bytes
-rw-r--r--csarvalidation/src/test/resources/vEPC_NS.csarbin149128 -> 149108 bytes
-rw-r--r--csarvalidation/src/test/resources/vIMS_NS.csarbin111654 -> 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<String, HashMap<String, String>> csar = new HashMap<String, HashMap<String, String>>();
- 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
--- a/csarvalidation/src/test/resources/VoLTE.csar
+++ b/csarvalidation/src/test/resources/VoLTE.csar
Binary files differ
diff --git a/csarvalidation/src/test/resources/enterprise2DC.csar b/csarvalidation/src/test/resources/enterprise2DC.csar
index 29e08c1..89ca244 100644
--- a/csarvalidation/src/test/resources/enterprise2DC.csar
+++ b/csarvalidation/src/test/resources/enterprise2DC.csar
Binary files differ
diff --git a/csarvalidation/src/test/resources/sample2.csar b/csarvalidation/src/test/resources/sample2.csar
index 3d89ab6..0960b20 100644
--- a/csarvalidation/src/test/resources/sample2.csar
+++ b/csarvalidation/src/test/resources/sample2.csar
Binary files differ
diff --git a/csarvalidation/src/test/resources/vEPC_NS.csar b/csarvalidation/src/test/resources/vEPC_NS.csar
index 67ab75a..d817f35 100644
--- a/csarvalidation/src/test/resources/vEPC_NS.csar
+++ b/csarvalidation/src/test/resources/vEPC_NS.csar
Binary files differ
diff --git a/csarvalidation/src/test/resources/vIMS_NS.csar b/csarvalidation/src/test/resources/vIMS_NS.csar
index efab9f8..536e626 100644
--- a/csarvalidation/src/test/resources/vIMS_NS.csar
+++ b/csarvalidation/src/test/resources/vIMS_NS.csar
Binary files differ