From a472f40284a862079edbef78cb5a5bd055edbb63 Mon Sep 17 00:00:00 2001 From: vasraz Date: Thu, 21 Apr 2022 11:29:43 +0100 Subject: [PATCH] Update sdc-tosca to 1.7.0 version Change-Id: I20efc080f2411ceadca5972c8e892b0f85e320c1 Signed-off-by: Vasyl Razinkov Issue-ID: SDC-3978 --- integration-tests/pom.xml | 2 +- .../sdc/frontend/ci/tests/execute/sanity/ToscaValidationTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index ece5dc7ee0..6bf1fdbf4f 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -55,7 +55,7 @@ limitations under the License. 1.3.1 - 1.6.6 + 1.7.0 diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ToscaValidationTest.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ToscaValidationTest.java index 55d90decb5..81f8006411 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ToscaValidationTest.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ToscaValidationTest.java @@ -425,7 +425,7 @@ public class ToscaValidationTest extends SetupCDTest { reportStartTestPrint("validateServiceNodeTemplateMetadataUsingParser", vnfFile); Map generateServiceNodeTemplateMetadataToExpectedObject = generateServiceNodeTemplateMetadataToExpectedObject(resourceReqDetails, resource, componentInstanceDefinition); List serviceNodeTemplates = fdntCsarHelper.getServiceNodeTemplates(); - Metadata serviceNodeTemplateMetadata = serviceNodeTemplates.get(0).getMetaData(); + Metadata serviceNodeTemplateMetadata = serviceNodeTemplates.get(0).getMetadata(); Either> serviceNodeTemplateToscaMetadataValidatorAgainstParser = ToscaValidation.serviceToscaMetadataValidatorAgainstParser(generateServiceNodeTemplateMetadataToExpectedObject, serviceNodeTemplateMetadata); if (serviceNodeTemplateToscaMetadataValidatorAgainstParser.isRight()) { status.add(false); @@ -498,7 +498,7 @@ public class ToscaValidationTest extends SetupCDTest { public List validateServiceModuleMetadataUsingParser(ISdcCsarHelper fdntCsarHelper, Map expectedToscaServiceGroupsDefinitionObject, String vnfFile, List status) { reportStartTestPrint("validateServiceModuleMetadataUsingParser", vnfFile); - String customizationUUID = fdntCsarHelper.getServiceNodeTemplates().get(0).getMetaData().getValue("customizationUUID"); + String customizationUUID = fdntCsarHelper.getServiceNodeTemplates().get(0).getMetadata().getValue("customizationUUID"); List actualGroups = fdntCsarHelper.getVfModulesByVf(customizationUUID); Either> toscaServiceModuleMetadataValidator = ToscaValidation.serviceToscaGroupMetadataValidatorUsingParser(expectedToscaServiceGroupsDefinitionObject, actualGroups); if (toscaServiceModuleMetadataValidator.isRight()) { @@ -509,7 +509,7 @@ public class ToscaValidationTest extends SetupCDTest { public List validateServiceModulePropertyUsingParser(ISdcCsarHelper fdntCsarHelper, Map expectedToscaServiceGroupsDefinitionObject, String vnfFile, List status) { reportStartTestPrint("validateServiceModuleMetadataUsingParser", vnfFile); - String customizationUUID = fdntCsarHelper.getServiceNodeTemplates().get(0).getMetaData().getValue("customizationUUID"); + String customizationUUID = fdntCsarHelper.getServiceNodeTemplates().get(0).getMetadata().getValue("customizationUUID"); List actualGroups = fdntCsarHelper.getVfModulesByVf(customizationUUID); Either> toscaServiceModuleMetadataValidator = ToscaValidation.serviceToscaGroupPropertyValidatorUsingParser(expectedToscaServiceGroupsDefinitionObject, actualGroups); if (toscaServiceModuleMetadataValidator.isRight()) { -- 2.16.6