From 90943911394d3672e714d2b743c143a2dd4408cc Mon Sep 17 00:00:00 2001 From: udhay_vz Date: Thu, 20 Sep 2018 15:06:04 +0530 Subject: SOL004 compliant CSAR Manifest file Change-Id: I7f63fb12f413155072a5f35204f2b80ad8b7517b Issue-ID: SDC-1745 Signed-off-by: udhay --- .../impl/orchestration/csar/CSARConstants.java | 2 +- .../vspmanager.csar/invalidFileInRoot.csar | Bin 7335 -> 7331 bytes .../vspmanager.csar/manifest/InvalidTosca1.mf | 10 +++++----- .../vspmanager.csar/manifest/InvalidTosca2.mf | 10 +++++----- .../vspmanager.csar/manifest/InvalidTosca4.mf | 10 +++++----- .../vspmanager.csar/manifest/ValidTosca.mf | 10 +++++----- .../vspmanager.csar/missingMainServiceTemplate.csar | Bin 4013 -> 4009 bytes .../resources/vspmanager.csar/successfulUpload.csar | Bin 5681 -> 5677 bytes .../org/openecomp/sdc/common/errors/Messages.java | 2 +- .../core/utilities/file/resource-Spgw-csar-ZTE.csar | Bin 31639 -> 31467 bytes .../src/test/resources/csar/vCSCF.csar | Bin 8186 -> 8182 bytes .../csar/resource-Spgw-csar-ZTE.csar | Bin 31639 -> 31467 bytes .../files/default/Files/VNFs/Huawei_vHSS.csar | Bin 3100 -> 3153 bytes .../files/default/Files/VNFs/Huawei_vMME.csar | Bin 2563 -> 2580 bytes .../files/default/Files/VNFs/ZteEpcMmeVf.csar | Bin 4790 -> 4806 bytes .../Files/VNFs/resource-ZteEpcMmeVf-csar_fix.csar | Bin 4790 -> 4806 bytes .../files/default/Files/VNFs/vSBC_update_v03.csar | Bin 3485 -> 3501 bytes 17 files changed, 22 insertions(+), 22 deletions(-) diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/csar/CSARConstants.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/csar/CSARConstants.java index 7f6a0e51f8..8bb67988c1 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/csar/CSARConstants.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/csar/CSARConstants.java @@ -30,7 +30,7 @@ public class CSARConstants { of(MAIN_SERVICE_TEMPLATE_MF_FILE_NAME,MAIN_SERVICE_TEMPLATE_YAML_FILE_NAME); public static final String METADATA_MF_ATTRIBUTE = "metadata"; - public static final String SOURCE_MF_ATTRIBUTE = "source"; + public static final String SOURCE_MF_ATTRIBUTE = "Source"; public static final String SEPERATOR_MF_ATTRIBUTE = ":"; private CSARConstants() { diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/invalidFileInRoot.csar b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/invalidFileInRoot.csar index 95adb41d22..2924254892 100644 Binary files a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/invalidFileInRoot.csar and b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/invalidFileInRoot.csar differ diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/manifest/InvalidTosca1.mf b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/manifest/InvalidTosca1.mf index f28014e2d6..ebdec213d3 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/manifest/InvalidTosca1.mf +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/manifest/InvalidTosca1.mf @@ -1,11 +1,11 @@ -source: MainServiceTemplate.yaml +Source: MainServiceTemplate.yaml -source: Definitions/GlobalSubstitutionTypesServiceTemplate.yaml +Source: Definitions/GlobalSubstitutionTypesServiceTemplate.yaml -source: Artifacts/install.sh +Source: Artifacts/install.sh -source: Artifacts/create_stack.sh +Source: Artifacts/create_stack.sh -source: Licenses/license.xml +Source: Licenses/license.xml diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/manifest/InvalidTosca2.mf b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/manifest/InvalidTosca2.mf index 95f7a41d68..057f54867b 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/manifest/InvalidTosca2.mf +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/manifest/InvalidTosca2.mf @@ -2,17 +2,17 @@ metadata: vnf_product_name: Mock vnf_provider_id: ZTE -source: MainServiceTemplate.yaml +Source: MainServiceTemplate.yaml vnf_package_version: 1.0 vnf_release_data_time: 2017.01.01T10:00+03:00 -source: Definitions/GlobalSubstitutionTypesServiceTemplate.yaml +Source: Definitions/GlobalSubstitutionTypesServiceTemplate.yaml -source: Artifacts/install.sh +Source: Artifacts/install.sh -source: Artifacts/create_stack.sh +Source: Artifacts/create_stack.sh -source: Licenses/license.xml +Source: Licenses/license.xml diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/manifest/InvalidTosca4.mf b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/manifest/InvalidTosca4.mf index a563ddd581..d8e291c4a3 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/manifest/InvalidTosca4.mf +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/manifest/InvalidTosca4.mf @@ -1,12 +1,12 @@ metadata: -source: MainServiceTemplate.yaml +Source: MainServiceTemplate.yaml -source: Definitions/GlobalSubstitutionTypesServiceTemplate.yaml +Source: Definitions/GlobalSubstitutionTypesServiceTemplate.yaml -source: Artifacts/install.sh +Source: Artifacts/install.sh -source: Artifacts/create_stack.sh +Source: Artifacts/create_stack.sh -source: Licenses/license.xml +Source: Licenses/license.xml diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/manifest/ValidTosca.mf b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/manifest/ValidTosca.mf index 88c67517ce..b2accb7a1c 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/manifest/ValidTosca.mf +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/manifest/ValidTosca.mf @@ -4,12 +4,12 @@ metadata: vnf_package_version: 1.0 vnf_release_data_time: 2017.01.01T10:00+03:00 -source: MainServiceTemplate.yaml +Source: MainServiceTemplate.yaml -source: Definitions/GlobalSubstitutionTypesServiceTemplate.yaml +Source: Definitions/GlobalSubstitutionTypesServiceTemplate.yaml -source: Artifacts/install.sh +Source: Artifacts/install.sh -source: Artifacts/create_stack.sh +Source: Artifacts/create_stack.sh -source: Licenses/license.xml +Source: Licenses/license.xml diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/missingMainServiceTemplate.csar b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/missingMainServiceTemplate.csar index 86269fef15..39cbc6bf47 100644 Binary files a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/missingMainServiceTemplate.csar and b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/missingMainServiceTemplate.csar differ diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/successfulUpload.csar b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/successfulUpload.csar index 6a203ddbfd..d513b8f732 100644 Binary files a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/successfulUpload.csar and b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/successfulUpload.csar differ diff --git a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/errors/Messages.java b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/errors/Messages.java index 5525f71916..650eb06211 100644 --- a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/errors/Messages.java +++ b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/errors/Messages.java @@ -31,7 +31,7 @@ public enum Messages { CSAR_FILES_NOT_ALLOWED("File : %s , are not allowed."), MANIFEST_INVALID_LINE("Manifest contains invalid line : %s"), MANIFEST_NO_METADATA("Manifest must contain metadata"), - MANIFEST_NO_SOURCES("Manifest must contain source"), + MANIFEST_NO_SOURCES("Manifest must contain Source"), MANIFEST_PARSER_INTERNAL("Invalid manifest file"), FAILED_TO_TRANSLATE_ZIP_FILE("Failed to translate zip file"), ZIP_NOT_EXIST("Zip file doesn't exist"), diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/resources/org/openecomp/core/utilities/file/resource-Spgw-csar-ZTE.csar b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/resources/org/openecomp/core/utilities/file/resource-Spgw-csar-ZTE.csar index 58c3ddd074..56f32b82ce 100644 Binary files a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/resources/org/openecomp/core/utilities/file/resource-Spgw-csar-ZTE.csar and b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/resources/org/openecomp/core/utilities/file/resource-Spgw-csar-ZTE.csar differ diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/resources/csar/vCSCF.csar b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/resources/csar/vCSCF.csar index f1b77554e4..0057cb9798 100644 Binary files a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/resources/csar/vCSCF.csar and b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/resources/csar/vCSCF.csar differ diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/validationService/csar/resource-Spgw-csar-ZTE.csar b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/validationService/csar/resource-Spgw-csar-ZTE.csar index 58c3ddd074..721271046f 100644 Binary files a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/validationService/csar/resource-Spgw-csar-ZTE.csar and b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/validationService/csar/resource-Spgw-csar-ZTE.csar differ diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/Huawei_vHSS.csar b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/Huawei_vHSS.csar index ea5c1283be..316d5690f5 100644 Binary files a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/Huawei_vHSS.csar and b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/Huawei_vHSS.csar differ diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/Huawei_vMME.csar b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/Huawei_vMME.csar index f921f46e06..fe313fff86 100644 Binary files a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/Huawei_vMME.csar and b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/Huawei_vMME.csar differ diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/ZteEpcMmeVf.csar b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/ZteEpcMmeVf.csar index bf0e775102..184c223ec2 100644 Binary files a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/ZteEpcMmeVf.csar and b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/ZteEpcMmeVf.csar differ diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/resource-ZteEpcMmeVf-csar_fix.csar b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/resource-ZteEpcMmeVf-csar_fix.csar index bf0e775102..72d3d0c869 100644 Binary files a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/resource-ZteEpcMmeVf-csar_fix.csar and b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/resource-ZteEpcMmeVf-csar_fix.csar differ diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vSBC_update_v03.csar b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vSBC_update_v03.csar index 7940b3f507..017865055d 100644 Binary files a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vSBC_update_v03.csar and b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vSBC_update_v03.csar differ -- cgit 1.2.3-korg