SDC alignment SOL004 2.6.1

Updating TOSCA.meta metadata Created-by key to Created-By
Issue-ID: SDC-2402

Change-Id: Ice17dac288d745292bdd8d296bd1ae3eedbff223
Signed-off-by: bilal.iqbal <bilal.iqbal@est.tech>

diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/csar/validation/SOL004MetaDirectoryValidatorTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/csar/validation/SOL004MetaDirectoryValidatorTest.java
index 0973dca..06b4a02 100644 (file)
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/csar/validation/SOL004MetaDirectoryValidatorTest.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/csar/validation/SOL004MetaDirectoryValidatorTest.java
@@ -69,7 +69,7 @@ public class SOL004MetaDirectoryValidatorTest {
         metaFile =
                 "TOSCA-Meta-File-Version: 1.0\n"+
                 "CSAR-Version: 1.1\n"+
-                "Created-by: Vendor\n"+
+                "Created-By: Vendor\n"+
                 TOSCA_META_ENTRY_DEFINITIONS + SEPARATOR_MF_ATTRIBUTE + "Definitions/MainServiceTemplate.yaml\n"+
                 TOSCA_META_ETSI_ENTRY_MANIFEST + SEPARATOR_MF_ATTRIBUTE + "Definitions/MainServiceTemplate.mf\n"+
                 TOSCA_META_ETSI_ENTRY_CHANGE_LOG + SEPARATOR_MF_ATTRIBUTE + "Artifacts/changeLog.text\n";
@@ -144,7 +144,7 @@ public class SOL004MetaDirectoryValidatorTest {
         final String metaFile =
                 "TOSCA-Meta-File-Version: " + Integer.MAX_VALUE +
                 "\nCSAR-Version: " + Integer.MAX_VALUE  +
-                "\nCreated-by: Bilal Iqbal\n" +
+                "\nCreated-By: Bilal Iqbal\n" +
                 TOSCA_META_ENTRY_DEFINITIONS+ SEPARATOR_MF_ATTRIBUTE + "Definitions/MainServiceTemplate.yaml\n" +
                 TOSCA_META_ETSI_ENTRY_MANIFEST + SEPARATOR_MF_ATTRIBUTE + "Definitions/MainServiceTemplate.mf\n"+
                 TOSCA_META_ETSI_ENTRY_CHANGE_LOG + SEPARATOR_MF_ATTRIBUTE + "Artifacts/changeLog.text";
@@ -425,7 +425,7 @@ public class SOL004MetaDirectoryValidatorTest {
         metaFile =
                 "TOSCA-Meta-File-Version: 1.0\n"+
                 "CSAR-Version: 1.1\n"+
-                "Created-by: Vendor\n"+
+                "Created-By: Vendor\n"+
                 TOSCA_META_ENTRY_DEFINITIONS + SEPARATOR_MF_ATTRIBUTE + "Definitions/MainServiceTemplate.yaml\n"+
                 TOSCA_META_ETSI_ENTRY_MANIFEST + SEPARATOR_MF_ATTRIBUTE +"Definitions/MainServiceTemplate2.mf\n"+
                 TOSCA_META_ETSI_ENTRY_CHANGE_LOG + SEPARATOR_MF_ATTRIBUTE +"Artifacts/changeLog.text\n";
@@ -457,7 +457,7 @@ public class SOL004MetaDirectoryValidatorTest {
         metaFile =
                 "TOSCA-Meta-File-Version: 1.0\n"+
                 "CSAR-Version: 1.1\n"+
-                "Created-by: Vendor\n"+
+                "Created-By: Vendor\n"+
                 "Entry-Definitions: Definitions/MainServiceTemplate.yaml\n"+
                 TOSCA_META_ETSI_ENTRY_MANIFEST + SEPARATOR_MF_ATTRIBUTE +  "Definitions/MainServiceTemplate.txt\n"+
                 TOSCA_META_ETSI_ENTRY_CHANGE_LOG + SEPARATOR_MF_ATTRIBUTE + "Artifacts/changeLog.text\n";

diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/csar/validation/ValidatorFactoryTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/csar/validation/ValidatorFactoryTest.java
index 02868c9..d9fca4d 100644 (file)
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/csar/validation/ValidatorFactoryTest.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/csar/validation/ValidatorFactoryTest.java
@@ -47,7 +47,7 @@ public class ValidatorFactoryTest {
         metaFile =
                 "TOSCA-Meta-File-Version: 1.0\n" +
                 "CSAR-Version: 1.1\n" +
-                "Created-by: Bilal Iqbal\n";
+                "Created-By: Bilal Iqbal\n";
     }
 
     @Test(expected = IOException.class)

diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/validation.files/metafile/metaFileWithMultipleBlocks.meta b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/validation.files/metafile/metaFileWithMultipleBlocks.meta
index ce2a10a..505ba43 100644 (file)
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/validation.files/metafile/metaFileWithMultipleBlocks.meta
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/validation.files/metafile/metaFileWithMultipleBlocks.meta
@@ -1,6 +1,6 @@
 TOSCA-Meta-File-Version: 1.0
 CSAR-Version: 1.1
-Created-by: Bilal Iqbal
+Created-By: Bilal Iqbal
 Entry-Definitions: Definitions/MainServiceTemplate.yml
 ETSI-Entry-Manifest: Definitions/MainServiceTemplate.mf
 ETSI-Entry-Change-Log: Definitions/changeLog.text

diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/validation.files/metafile/nonSOL004WithMetaDirectoryCompliantMetaFile.meta b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/validation.files/metafile/nonSOL004WithMetaDirectoryCompliantMetaFile.meta
index eea0795..18ddf5e 100644 (file)
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/validation.files/metafile/nonSOL004WithMetaDirectoryCompliantMetaFile.meta
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/validation.files/metafile/nonSOL004WithMetaDirectoryCompliantMetaFile.meta
@@ -1,4 +1,4 @@
 TOSCA-Meta-File-Version: 1.0
 CSAR-Version: 1.1
-Created-by: Bilal Iqbal
+Created-By: Bilal Iqbal
 Entry-Definitions: Definitions/MainServiceTemplate.yaml

diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/impl/ToscaSolConverterVnfTest.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/impl/ToscaSolConverterVnfTest.java
index bfc1fa9..532573b 100644 (file)
--- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/impl/ToscaSolConverterVnfTest.java
+++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/impl/ToscaSolConverterVnfTest.java
@@ -54,7 +54,7 @@ public class ToscaSolConverterVnfTest {
         fileContentHandler.addFile("TOSCA-Metadata/TOSCA.meta",
                 ("TOSCA-Meta-File-Version: 1.0\n " +
                 "CSAR-Version: 1.1\n" +
-                "Created-by: Ericsson\n" +
+                "Created-By: Ericsson\n" +
                 "Entry-Definitions: Definitions/Main.yaml\n" +
                 "Entry-Manifest: Main.mf\n" +
                 "Entry-Change-Log: Artifacts/ChangeLog.txt")
@@ -87,7 +87,7 @@ public class ToscaSolConverterVnfTest {
         fileContentHandler.addFile("TOSCA-Metadata/TOSCA.meta",
                 ("TOSCA-Meta-File-Version: 1.0\n " +
                         "CSAR-Version: 1.1\n" +
-                        "Created-by: Ericsson\n" +
+                        "Created-By: Ericsson\n" +
                         "Entry-Definitions: Definitions/Main.yaml\n" +
                         "Entry-Manifest: Main.mf\n" +
                         "Entry-Change-Log: Artifacts/ChangeLog.txt")

diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/CSARConstants.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/CSARConstants.java
index 123bdda..06e2de1 100644 (file)
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/CSARConstants.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/CSARConstants.java
@@ -31,7 +31,7 @@ public class CSARConstants {
     public static final String TOSCA_META_PATH_FILE_NAME="TOSCA-Metadata/TOSCA.meta";
     public static final String TOSCA_META_FILE_VERSION_ENTRY = "TOSCA-Meta-File-Version";
     public static final String TOSCA_META_CSAR_VERSION_ENTRY = "CSAR-Version";
-    public static final String TOSCA_META_CREATED_BY_ENTRY = "Created-by";
+    public static final String TOSCA_META_CREATED_BY_ENTRY = "Created-By";
     public static final String TOSCA_META_ENTRY_DEFINITIONS="Entry-Definitions";
     public static final String TOSCA_META_ETSI_ENTRY_MANIFEST ="ETSI-Entry-Manifest";
     public static final String TOSCA_META_ETSI_ENTRY_CHANGE_LOG ="ETSI-Entry-Change-Log";

diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-pnf-1.0.1-SNAPSHOT.csar b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-pnf-1.0.1-SNAPSHOT.csar
index f1315f5..e5e492e 100644 (file)
Binary files a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-pnf-1.0.1-SNAPSHOT.csar and b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-pnf-1.0.1-SNAPSHOT.csar differ

diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-1.0.1-SNAPSHOT.zip b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-1.0.1-SNAPSHOT.zip
index d6fa185..b0dfb2d 100644 (file)
Binary files a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-1.0.1-SNAPSHOT.zip and b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-1.0.1-SNAPSHOT.zip differ

diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-cms-includes-cert-1.0.1-SNAPSHOT.zip b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-cms-includes-cert-1.0.1-SNAPSHOT.zip
index 85365a6..1c80c5f 100644 (file)
Binary files a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-cms-includes-cert-1.0.1-SNAPSHOT.zip and b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-cms-includes-cert-1.0.1-SNAPSHOT.zip differ