Update sdc-tosca to 1.7.0 version

Change-Id: I20efc080f2411ceadca5972c8e892b0f85e320c1
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3978

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index ece5dc7..6bf1fdb 100644 (file)
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -55,7 +55,7 @@ limitations under the License.
         <it.helm-validator.version>1.3.1</it.helm-validator.version>
 
         <!-- parser-->
-        <sdc-tosca-parser.version>1.6.6</sdc-tosca-parser.version>
+        <sdc-tosca-parser.version>1.7.0</sdc-tosca-parser.version>
     </properties>
 
     <dependencies>

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 55d90de..81f8006 100644 (file)
--- 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<String, String> generateServiceNodeTemplateMetadataToExpectedObject = generateServiceNodeTemplateMetadataToExpectedObject(resourceReqDetails, resource, componentInstanceDefinition);
             List<NodeTemplate> serviceNodeTemplates = fdntCsarHelper.getServiceNodeTemplates();
-            Metadata serviceNodeTemplateMetadata = serviceNodeTemplates.get(0).getMetaData();
+            Metadata serviceNodeTemplateMetadata = serviceNodeTemplates.get(0).getMetadata();
             Either<Boolean, Map<String, Object>> serviceNodeTemplateToscaMetadataValidatorAgainstParser = ToscaValidation.serviceToscaMetadataValidatorAgainstParser(generateServiceNodeTemplateMetadataToExpectedObject, serviceNodeTemplateMetadata);
             if (serviceNodeTemplateToscaMetadataValidatorAgainstParser.isRight()) {
                 status.add(false);
@@ -498,7 +498,7 @@ public class ToscaValidationTest extends SetupCDTest {
 
     public List<Boolean> validateServiceModuleMetadataUsingParser(ISdcCsarHelper fdntCsarHelper, Map<String, ToscaGroupsTopologyTemplateDefinition> expectedToscaServiceGroupsDefinitionObject, String vnfFile, List<Boolean> status) {
         reportStartTestPrint("validateServiceModuleMetadataUsingParser", vnfFile);
-        String customizationUUID = fdntCsarHelper.getServiceNodeTemplates().get(0).getMetaData().getValue("customizationUUID");
+        String customizationUUID = fdntCsarHelper.getServiceNodeTemplates().get(0).getMetadata().getValue("customizationUUID");
         List<Group> actualGroups = fdntCsarHelper.getVfModulesByVf(customizationUUID);
         Either<Boolean, Map<String, Object>> toscaServiceModuleMetadataValidator = ToscaValidation.serviceToscaGroupMetadataValidatorUsingParser(expectedToscaServiceGroupsDefinitionObject, actualGroups);
         if (toscaServiceModuleMetadataValidator.isRight()) {
@@ -509,7 +509,7 @@ public class ToscaValidationTest extends SetupCDTest {
 
     public List<Boolean> validateServiceModulePropertyUsingParser(ISdcCsarHelper fdntCsarHelper, Map<String, ToscaGroupsTopologyTemplateDefinition> expectedToscaServiceGroupsDefinitionObject, String vnfFile, List<Boolean> status) {
         reportStartTestPrint("validateServiceModuleMetadataUsingParser", vnfFile);
-        String customizationUUID = fdntCsarHelper.getServiceNodeTemplates().get(0).getMetaData().getValue("customizationUUID");
+        String customizationUUID = fdntCsarHelper.getServiceNodeTemplates().get(0).getMetadata().getValue("customizationUUID");
         List<Group> actualGroups = fdntCsarHelper.getVfModulesByVf(customizationUUID);
         Either<Boolean, Map<String, Object>> toscaServiceModuleMetadataValidator = ToscaValidation.serviceToscaGroupPropertyValidatorUsingParser(expectedToscaServiceGroupsDefinitionObject, actualGroups);
         if (toscaServiceModuleMetadataValidator.isRight()) {