Add a CSAR validator for model ETSI SOL001 2.5.1

Change-Id: I8e67b46f95bb45e0dd91d29eef6be7a0a8d645be
Issue-ID: SDC-3686
Signed-off-by: andre.schmid <andre.schmid@est.tech>

5 files changed, 113 insertions, 38 deletions

diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/OnboardingToscaMetadata.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/OnboardingToscaMetadata.java
index bc104335f5..fda50f52cd 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/OnboardingToscaMetadata.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/OnboardingToscaMetadata.java
@@ -21,7 +21,7 @@ package org.openecomp.sdc.tosca.csar;
 
 import static org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder.getErrorWithParameters;
 import static org.openecomp.sdc.tosca.csar.ManifestTokenType.ATTRIBUTE_VALUE_SEPARATOR;
-import static org.openecomp.sdc.tosca.csar.ToscaMetaEntry.ENTRY_DEFINITIONS;
+import static org.openecomp.sdc.tosca.csar.ToscaMetaEntryVersion261.ENTRY_DEFINITIONS;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/ToscaMetaEntry.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/ToscaMetaEntry.java
index 9219c77bea..c3cdf02e67 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/ToscaMetaEntry.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/ToscaMetaEntry.java
@@ -1,12 +1,14 @@
 /*
- *(===========LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation
- * (===============================================================================
+ * -
+ *  ============LICENSE_START=======================================================
+ *  Copyright (C) 2021 Nordix Foundation.
+ *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
  *  You may obtain a copy of the License at
  *
- *        http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,37 +16,12 @@
  *  limitations under the License.
  *
  *  SPDX-License-Identifier: Apache-2.0
- * (===========LICENSE_END=========================================================
+ *  ============LICENSE_END=========================================================
  */
-package org.openecomp.sdc.tosca.csar;
-
-import java.util.Arrays;
-import java.util.Optional;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
 
-/**
- * Represents entry keys in a TOSCA.meta file.
- */
-@AllArgsConstructor
-@Getter
-public enum ToscaMetaEntry {
-    // @formatter:off
-    TOSCA_META_FILE_VERSION_ENTRY("TOSCA-Meta-File-Version"),
-    CSAR_VERSION_ENTRY("CSAR-Version"),
-    CREATED_BY_ENTRY("Created-By"),
-    ENTRY_DEFINITIONS("Entry-Definitions"),
-    ETSI_ENTRY_MANIFEST("ETSI-Entry-Manifest"),
-    ETSI_ENTRY_CHANGE_LOG("ETSI-Entry-Change-Log"),
-    ETSI_ENTRY_TESTS("ETSI-Entry-Tests"),
-    ETSI_ENTRY_LICENSES("ETSI-Entry-Licenses"),
-    ETSI_ENTRY_CERTIFICATE("ETSI-Entry-Certificate"),
-    OTHER_DEFINITIONS("Other-Definitions");
-    // @formatter:on
+package org.openecomp.sdc.tosca.csar;
 
-    private final String name;
+public interface ToscaMetaEntry {
 
-    public static Optional<ToscaMetaEntry> parse(final String name) {
-        return Arrays.stream(values()).filter(toscaMetaEntry -> toscaMetaEntry.getName().equals(name)).findFirst();
-    }
+    String getName();
 }
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/ToscaMetaEntryVersion251.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/ToscaMetaEntryVersion251.java
new file mode 100644
index 0000000000..7dcb6acfc7
--- /dev/null
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/ToscaMetaEntryVersion251.java
@@ -0,0 +1,50 @@
+/*
+ * -
+ *  ============LICENSE_START=======================================================
+ *  Copyright (C) 2021 Nordix Foundation.
+ *  ================================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *  ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.tosca.csar;
+
+import java.util.Arrays;
+import java.util.Optional;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * Represents entry keys in a TOSCA.meta file.
+ */
+@AllArgsConstructor
+@Getter
+public enum ToscaMetaEntryVersion251 implements ToscaMetaEntry {
+    TOSCA_META_FILE_VERSION_ENTRY("TOSCA-Meta-File-Version"),
+    CSAR_VERSION_ENTRY("CSAR-Version"),
+    CREATED_BY_ENTRY("Created-By"),
+    ENTRY_DEFINITIONS("Entry-Definitions"),
+    ENTRY_MANIFEST("Entry-Manifest"),
+    ENTRY_CHANGE_LOG("Entry-Change-Log"),
+    ENTRY_TESTS("Entry-Tests"),
+    ENTRY_LICENSES("Entry-Licenses"),
+    ENTRY_CERTIFICATE("Entry-Certificate");
+
+    private final String name;
+
+    public static Optional<ToscaMetaEntryVersion251> parse(final String name) {
+        return Arrays.stream(values()).filter(toscaMetaEntry -> toscaMetaEntry.getName().equals(name)).findFirst();
+    }
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/ToscaMetaEntryVersion261.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/ToscaMetaEntryVersion261.java
new file mode 100644
index 0000000000..3d9f98396e
--- /dev/null
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/ToscaMetaEntryVersion261.java
@@ -0,0 +1,48 @@
+/*
+ *(===========LICENSE_START=======================================================
+ *  Copyright (C) 2019 Nordix Foundation
+ * (===============================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ * (===========LICENSE_END=========================================================
+ */
+package org.openecomp.sdc.tosca.csar;
+
+import java.util.Arrays;
+import java.util.Optional;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * Represents entry keys in a TOSCA.meta file.
+ */
+@AllArgsConstructor
+@Getter
+public enum ToscaMetaEntryVersion261 implements ToscaMetaEntry {
+    TOSCA_META_FILE_VERSION_ENTRY("TOSCA-Meta-File-Version"),
+    CSAR_VERSION_ENTRY("CSAR-Version"),
+    CREATED_BY_ENTRY("Created-By"),
+    ENTRY_DEFINITIONS("Entry-Definitions"),
+    ETSI_ENTRY_MANIFEST("ETSI-Entry-Manifest"),
+    ETSI_ENTRY_CHANGE_LOG("ETSI-Entry-Change-Log"),
+    ETSI_ENTRY_TESTS("ETSI-Entry-Tests"),
+    ETSI_ENTRY_LICENSES("ETSI-Entry-Licenses"),
+    ETSI_ENTRY_CERTIFICATE("ETSI-Entry-Certificate"),
+    OTHER_DEFINITIONS("Other-Definitions");
+
+    private final String name;
+
+    public static Optional<ToscaMetaEntryVersion261> parse(final String name) {
+        return Arrays.stream(values()).filter(toscaMetaEntry -> toscaMetaEntry.getName().equals(name)).findFirst();
+    }
+}
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImpl.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImpl.java
index 90047aa6df..d0df54b105 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImpl.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImpl.java
@@ -15,10 +15,10 @@
  */
 package org.openecomp.sdc.tosca.services.impl;
 
-import static org.openecomp.sdc.tosca.csar.ToscaMetaEntry.CREATED_BY_ENTRY;
-import static org.openecomp.sdc.tosca.csar.ToscaMetaEntry.CSAR_VERSION_ENTRY;
-import static org.openecomp.sdc.tosca.csar.ToscaMetaEntry.ENTRY_DEFINITIONS;
-import static org.openecomp.sdc.tosca.csar.ToscaMetaEntry.TOSCA_META_FILE_VERSION_ENTRY;
+import static org.openecomp.sdc.tosca.csar.ToscaMetaEntryVersion261.CREATED_BY_ENTRY;
+import static org.openecomp.sdc.tosca.csar.ToscaMetaEntryVersion261.CSAR_VERSION_ENTRY;
+import static org.openecomp.sdc.tosca.csar.ToscaMetaEntryVersion261.ENTRY_DEFINITIONS;
+import static org.openecomp.sdc.tosca.csar.ToscaMetaEntryVersion261.TOSCA_META_FILE_VERSION_ENTRY;
 
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;