finish handling getinput function calls

Author: bernardodemarco

plugins/iac/nimble/src/main/java/org/apache/cloudstack/tosca/orchestrator/ToscaOrchestrator.java

@@ -126,14 +126,14 @@ protected void resolveServiceTemplateInputs(ToscaServiceTemplate serviceTemplate
 
         serviceTemplate.getUnresolvedPropertiesByGetInput().forEach((nodeTemplate, unresolvedProperties) -> {
             unresolvedProperties.forEach(property -> {
-                handleGetInputFunctionCall(nodeTemplate, property, serviceTemplate, inputs);
+                handleGetInputFunctionCalls(nodeTemplate, property, serviceTemplate, inputs);
             });
         });
     }
 
-    private void handleGetInputFunctionCall(String nodeTemplateName, ToscaProperty property, ToscaServiceTemplate serviceTemplate, Map<String, String> inputs) {
+    private void handleGetInputFunctionCalls(String nodeTemplateName, ToscaProperty property, ToscaServiceTemplate serviceTemplate, Map<String, String> inputs) {
         String propertyName = property.getDefinition().getName();
-        logger.debug("Resolving the [{}] function call triggered by the [{}] property of the [{}] node template.", ToscaConstants.GET_INPUT_FUNCTION, propertyName, nodeTemplateName);
+        logger.debug("Resolving the [{}] function calls triggered by the [{}] property of the [{}] node template.", ToscaConstants.GET_INPUT_FUNCTION, propertyName, nodeTemplateName);
 
         Object evaluatedValue = getPropertyEvaluatedValue(property.getRawValue(), serviceTemplate, nodeTemplateName, inputs);
         ToscaFunction.ToscaBooleanFunction propertyValidationFunction = property.getDefinition().getValidation();

plugins/iac/nimble/src/main/java/org/apache/cloudstack/tosca/parser/ToscaServiceTemplateParser.java

@@ -286,10 +286,6 @@ private Pair<Map<String, Set<ToscaGetterFunctionCallContext>>, Boolean> getAllTo
     }
 
     private void getAllToscaFunctionCallsRecursive(ToscaProperty property, Object propertyBody, ToscaTypeDefinition type, Pair<Map<String, Set<ToscaGetterFunctionCallContext>>, Boolean> functionCalls, ToscaServiceTemplateParsingContext context) {
-        if (!functionCalls.second()) {
-            return;
-        }
-
         if (propertyBody instanceof List) {
             ToscaTypeDefinition entrySchema = ObjectUtils.defaultIfNull(type.getEntrySchema(), type);
             ToscaYamlHelper.asList(propertyBody).forEach(value -> getAllToscaFunctionCallsRecursive(property, value, entrySchema, functionCalls, context));

plugins/iac/nimble/src/test/java/org/apache/cloudstack/tosca/orchestrator/ToscaOrchestratorTest.java

@@ -135,6 +135,31 @@ public void resolveServiceTemplateInputsTestThrowExceptionWhenInputIsNotDefinedA
         toscaOrchestratorSpy.resolveServiceTemplateInputs(serviceTemplate, Map.of());
     }
 
+    @Test
+    public void resolveServiceTemplateInputsTestCorrectlyResolveAllGetInputFunctionCallsInsideOfCollections() {
+        String serviceTemplateYaml = "{service_template: {inputs: {first-ip: {type: string}, second-ip: {type: string}, first-detail: {type: string}, second-detail: {type: string}}, node_templates: {instance: {type: Vm, properties: {type: SSVM, vcpus: 2, ip-addresses: [{$get_input: first-ip}, {$get_input: second-ip}], offering-details: {detail1: {$get_input: first-detail}, detail2: {$get_input: second-detail}}, name-value-mapping: [{name: {$get_input: first-detail}, value: {$get_input: first-ip}}, {name: {$get_input: second-detail}, value: {$get_input: second-ip}}]}}}}}";
+        ToscaServiceTemplate serviceTemplate = toscaParser.parseServiceTemplate(serviceTemplateYaml, ToscaFixtures.getToscaProfileForTests(), null);
+
+        toscaOrchestratorSpy.resolveServiceTemplateInputs(serviceTemplate, Map.of("first-ip", "10.0.0.1", "second-ip", "10.0.0.2", "first-detail", "1st detail", "second-detail", "2nd detail"));
+
+        List<?> instanceIpAddresses = ToscaYamlHelper.asList(serviceTemplate.getNodeTemplates().get("instance").getProperty("ip-addresses").getEvaluatedValue());
+        Assert.assertEquals(2, instanceIpAddresses.size());
+        Assert.assertEquals("10.0.0.1", instanceIpAddresses.get(0));
+        Assert.assertEquals("10.0.0.2", instanceIpAddresses.get(1));
+
+        Map<String, Object> offeringDetails = ToscaYamlHelper.asMap(serviceTemplate.getNodeTemplates().get("instance").getProperty("offering-details").getEvaluatedValue());
+        Assert.assertEquals(2, offeringDetails.size());
+        Assert.assertEquals("1st detail", offeringDetails.get("detail1"));
+        Assert.assertEquals("2nd detail", offeringDetails.get("detail2"));
+
+        List<?> nameValueMappings = ToscaYamlHelper.asList(serviceTemplate.getNodeTemplates().get("instance").getProperty("name-value-mapping").getEvaluatedValue());
+        Assert.assertEquals(2, nameValueMappings.size());
+        Assert.assertEquals("1st detail", ToscaYamlHelper.asMap(nameValueMappings.get(0)).get("name"));
+        Assert.assertEquals("10.0.0.1", ToscaYamlHelper.asMap(nameValueMappings.get(0)).get("value"));
+        Assert.assertEquals("2nd detail", ToscaYamlHelper.asMap(nameValueMappings.get(1)).get("name"));
+        Assert.assertEquals("10.0.0.2", ToscaYamlHelper.asMap(nameValueMappings.get(1)).get("value"));
+    }
+
     @Test
     public void populateNodeTemplateAttributesTestSuccessfullyPopulateNodeAttributes() {
         String serviceTemplateYaml = "{service_template: {node_templates: {instance: {type: Vm, properties: {type: VR, ssh-key-pair-name: {$get_property: [pair, name]}, vcpus: 2, ip-addresses: [10.0.0.1, 10.0.0.2]}}, other-instance: {type: Vm, properties: {type: SSVM, ssh-key-pair-name: {$get_attribute: [pair, uuid]}, vcpus: 1, ip-addresses: [10.0.0.1]}}, pair: {type: SshPair, properties: {name: Pair, public-key: Public Key}}}}}";
@@ -174,7 +199,7 @@ public void executeGetAttributeAndGetPropertyFunctionCallsTestSuccessfullyExecut
 
     @Test
     public void executeGetAttributeAndGetPropertyFunctionCallsTestSuccessfullyExecuteFunctionCallsContainedInsideOfCollections() {
-        String serviceTemplateYaml = "{service_template: {node_templates: {instance: {type: Vm, properties: {type: VR, vcpus: 2, ip-addresses: [{$get_property: [other-instance, type]}, {$get_attribute: [other-instance, uuid]}]}}, other-instance: {type: Vm, properties: {type: {$get_property: [pair, name]}, vcpus: 1, offering-details: {detail1: {$get_attribute: [pair, uuid]}, detail2: {$get_property: [pair, public-key]}}}}, pair: {type: SshPair, properties: {name: SSVM, public-key: Public Key}}}}}";
+        String serviceTemplateYaml = "{service_template: {node_templates: {instance: {type: Vm, properties: {type: VR, vcpus: 2, name-value-mapping: [{name: {$get_property: [pair, name]}, value: {$get_attribute: [pair, uuid]}}, {name: {$get_property: [other-instance, type]}, value: {$get_attribute: [other-instance, uuid]}}], ip-addresses: [{$get_property: [other-instance, type]}, {$get_attribute: [other-instance, uuid]}]}}, other-instance: {type: Vm, properties: {type: {$get_property: [pair, name]}, vcpus: 1, offering-details: {detail1: {$get_attribute: [pair, uuid]}, detail2: {$get_property: [pair, public-key]}}}}, pair: {type: SshPair, properties: {name: SSVM, public-key: Public Key}}}}}";
         ToscaServiceTemplate serviceTemplate = toscaParser.parseServiceTemplate(serviceTemplateYaml, ToscaFixtures.getToscaProfileForTests(), null);
         serviceTemplate.getNodeTemplates().get("other-instance").addAttribute("uuid", "otherinstanceuuid");
         serviceTemplate.getNodeTemplates().get("pair").addAttribute("uuid", "pairuuid");
@@ -186,7 +211,15 @@ public void executeGetAttributeAndGetPropertyFunctionCallsTestSuccessfullyExecut
         Assert.assertEquals(serviceTemplate.getNodeTemplates().get("pair").getProperty("public-key").getEvaluatedValue(), offeringDetails.get("detail2"));
 
         toscaOrchestratorSpy.executeGetAttributeAndGetPropertyFunctionCalls(serviceTemplate.getNodeTemplates().get("instance"), serviceTemplate);
+        List<?> nameValueMappings = ToscaYamlHelper.asList(serviceTemplate.getNodeTemplates().get("instance").getProperty("name-value-mapping").getEvaluatedValue());
+        Assert.assertEquals(2, nameValueMappings.size());
+        Assert.assertEquals(serviceTemplate.getNodeTemplates().get("pair").getProperty("name").getEvaluatedValue(), ToscaYamlHelper.asMap(nameValueMappings.get(0)).get("name"));
+        Assert.assertEquals(serviceTemplate.getNodeTemplates().get("pair").getAttribute("uuid"), ToscaYamlHelper.asMap(nameValueMappings.get(0)).get("value"));
+        Assert.assertEquals(serviceTemplate.getNodeTemplates().get("other-instance").getProperty("type").getEvaluatedValue(), ToscaYamlHelper.asMap(nameValueMappings.get(1)).get("name"));
+        Assert.assertEquals(serviceTemplate.getNodeTemplates().get("other-instance").getAttribute("uuid"), ToscaYamlHelper.asMap(nameValueMappings.get(1)).get("value"));
+
         List<?> instanceIpAddresses = ToscaYamlHelper.asList(serviceTemplate.getNodeTemplates().get("instance").getProperty("ip-addresses").getEvaluatedValue());
+        Assert.assertEquals(2, offeringDetails.size());
         Assert.assertEquals(serviceTemplate.getNodeTemplates().get("other-instance").getProperty("type").getEvaluatedValue(), instanceIpAddresses.get(0));
         Assert.assertEquals(serviceTemplate.getNodeTemplates().get("other-instance").getAttribute("uuid"), instanceIpAddresses.get(1));
     }