continue implementation

Author: bernardodemarco

plugins/iac/nimble/src/main/java/org/apache/cloudstack/service/NimbleManagerImpl.java

@@ -21,12 +21,11 @@
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.persistence.iactemplatesprofile.IacTemplatesProfile;
 import org.apache.cloudstack.persistence.iactemplatesprofile.IacTemplatesProfileDao;
+import org.apache.cloudstack.tosca.model.ToscaNodeType;
+import org.apache.cloudstack.tosca.parser.ToscaParser;
 
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
@@ -36,12 +35,15 @@
 import java.util.stream.Collectors;
 
 public class NimbleManagerImpl extends ManagerBase implements NimbleService {
+    @Inject
+    private ToscaParser toscaParser;
+
     @Inject
     private IacTemplatesProfileDao iacTemplatesProfileDao;
 
     private ExecutorService nimbleExecutorPool;
 
-    private List<IacTemplatesProfile> toscaProfile;
+    private Map<String, ToscaNodeType> toscaProfile;
 
     @Override
     public void listIacResourceTypes() {
@@ -55,29 +57,17 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
         int nimbleServicePoolSize = NimbleService.NimbleServicePoolSize.value();
         logger.debug("Configuring NIMBLE's fixed thread pool with [{}] threads.", nimbleServicePoolSize);
         nimbleExecutorPool = Executors.newFixedThreadPool(nimbleServicePoolSize);
-
-        loadToscaProfile();
-
+        toscaProfile = loadToscaProfile();
         return true;
     }
 
-    protected List<String> loadToscaProfile() {
+    protected Map<String, ToscaNodeType> loadToscaProfile() {
         logger.info("Loading NIMBLE's TOSCA profile.");
         List<IacTemplatesProfile> profileElements = iacTemplatesProfileDao.listAll();
 
-        return profileElements.stream().map(element -> {
-            String elementContent = getElementDefinition(element.getElementContentFilePath());
-            return elementContent;
-        }).collect(Collectors.toList());
-    }
-
-    protected String getElementDefinition(String elementContentFilePath) {
-        Path path = Paths.get(String.format("%s%s", NIMBLE_CONFIG_PATH, elementContentFilePath));
-        try {
-            return Files.readString(path);
-        } catch (IOException e) {
-            return null;
-        }
+        return profileElements.stream()
+                .map(element -> toscaParser.parseNodeType(Paths.get(String.format("%s/%s", NIMBLE_PROFILE_FOLDER_PATH, element.getElementContentFilePath()))))
+                .collect(Collectors.toMap(ToscaNodeType::getName, nodeType -> nodeType));
     }
 
     @Override

plugins/iac/nimble/src/main/java/org/apache/cloudstack/service/NimbleService.java

@@ -21,7 +21,7 @@
 import org.apache.cloudstack.framework.config.Configurable;
 
 public interface NimbleService extends PluggableService, Configurable {
-    String NIMBLE_CONFIG_PATH = "/usr/share/cloudstack-management/nimble/";
+    String NIMBLE_PROFILE_FOLDER_PATH = "/usr/share/cloudstack-management/nimble/profile";
 
     ConfigKey<Boolean> NimbleServiceEnabled = new ConfigKey<>("Advanced", Boolean.class,
             "nimble.service.enabled", "false",

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

@@ -4,4 +4,9 @@ public class ToscaAttributeDefinition extends ToscaFieldDefinition {
     public ToscaAttributeDefinition(String name, String description, ToscaPrimitiveType type) {
         super(name, description, type);
     }
+
+    @Override
+    public String toString() {
+        return String.format("%s: %s", this.getClass().getName(), super.toString());
+    }
 }

plugins/iac/nimble/src/main/java/org/apache/cloudstack/tosca/loader/ToscaYamlLoader.java

@@ -1,5 +1,7 @@
 package org.apache.cloudstack.tosca.model;
 
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
+
 public abstract class ToscaFieldDefinition {
     private String name;
     private String description;
@@ -22,4 +24,9 @@ public String getDescription() {
     public ToscaPrimitiveType getType() {
         return type;
     }
+
+    @Override
+    public String toString() {
+        return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "name", "description", "type");
+    }
 }

plugins/iac/nimble/src/main/java/org/apache/cloudstack/tosca/loader/YamlUtils.java

@@ -1,5 +1,7 @@
 package org.apache.cloudstack.tosca.model;
 
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
+
 import java.util.Map;
 
 public class ToscaNodeType {
@@ -24,4 +26,9 @@ public Map<String, ToscaPropertyDefinition> getProperties() {
     public Map<String, ToscaAttributeDefinition> getAttributes() {
         return attributes;
     }
+
+    @Override
+    public String toString() {
+        return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "name", "properties", "attributes");
+    }
 }

plugins/iac/nimble/src/main/java/org/apache/cloudstack/tosca/model/ToscaAttributeDefinition.java

@@ -17,4 +17,9 @@ public boolean isRequired() {
     public Object getValidation() {
         return validation;
     }
+
+    @Override
+    public String toString() {
+        return String.format("%s: %s", this.getClass().getName(), super.toString());
+    }
 }

plugins/iac/nimble/src/main/java/org/apache/cloudstack/tosca/model/ToscaFieldDefinition.java

@@ -0,0 +1,89 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.tosca.parser;
+
+import org.apache.cloudstack.tosca.model.ToscaAttributeDefinition;
+import org.apache.cloudstack.tosca.model.ToscaFieldDefinition;
+import org.apache.cloudstack.tosca.model.ToscaNodeType;
+import org.apache.cloudstack.tosca.model.ToscaPrimitiveType;
+import org.apache.cloudstack.tosca.model.ToscaPropertyDefinition;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.EnumUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+public class ToscaParser {
+    private Logger logger = LogManager.getLogger(ToscaParser.class);
+
+    enum FieldDefinitionType {
+        ATTRIBUTE, PROPERTY
+    }
+
+    private static final String NODE_TYPES_KEY = "node_types";
+    private static final String NODE_TYPES_PROPERTIES_KEY = "properties";
+    private static final String NODE_TYPES_ATTRIBUTES_KEY = "attributes";
+
+    @SuppressWarnings("unchecked")
+    public ToscaNodeType parseNodeType(Path path) {
+        Object rawYaml = ToscaYamlHelper.loadYaml(path);
+        Map<String, Object> yamlRoot = ToscaYamlHelper.asMap(rawYaml);
+        logger.debug("Trying to extract only one node type from the [{}] file, since it is expected for each node type to be declared separately.", path);
+        Optional<Map.Entry<String, Object>> nodeTypeRaw = ToscaYamlHelper.asMap(yamlRoot.get(NODE_TYPES_KEY)).entrySet().stream().findFirst();
+        if (nodeTypeRaw.isEmpty()) {
+            logger.error("No node types are declared in [{}].", path);
+            return null;
+        }
+        String nodeTypeName = nodeTypeRaw.get().getKey();
+        logger.debug("Parsing the following node type: [{}].", nodeTypeName);
+        Map<String, Object> nodeTypeBody = ToscaYamlHelper.asMap(nodeTypeRaw.get().getValue());
+        Map<String, ToscaPropertyDefinition> propertyDefinitions = (Map<String, ToscaPropertyDefinition>) parseFieldDefinition(nodeTypeBody.get(NODE_TYPES_PROPERTIES_KEY), FieldDefinitionType.PROPERTY);
+        Map<String, ToscaAttributeDefinition> attributeDefinitions = (Map<String, ToscaAttributeDefinition>) parseFieldDefinition(nodeTypeBody.get(NODE_TYPES_ATTRIBUTES_KEY), FieldDefinitionType.ATTRIBUTE);
+        ToscaNodeType nodeType = new ToscaNodeType(nodeTypeName, propertyDefinitions, attributeDefinitions);
+        logger.info("Successfully parsed the following node type: [{}].", nodeType::toString);
+        return nodeType;
+    }
+
+    private Map<String, ? extends ToscaFieldDefinition> parseFieldDefinition(Object rawFields, FieldDefinitionType fieldDefinitionType) {
+        Map<String, Object> fields = ToscaYamlHelper.asMap(rawFields);
+        logger.debug("Parsing the following {}: [{}].",
+                () -> fieldDefinitionType == FieldDefinitionType.ATTRIBUTE ? "attributes" : "properties", fields::keySet);
+
+        return fields.entrySet().stream().map((field) -> {
+            String fieldName = field.getKey();
+            Map<String, Object> fieldBody = ToscaYamlHelper.asMap(field.getValue());
+            ToscaPrimitiveType fieldType = EnumUtils.getEnumIgnoreCase(ToscaPrimitiveType.class, ToscaYamlHelper.asString(fieldBody.get("type")));
+            String propertyDescription = ToscaYamlHelper.asString(fieldBody.get("description"));
+
+            if (fieldDefinitionType == FieldDefinitionType.PROPERTY) {
+                ToscaAttributeDefinition attributeDefinition = new ToscaAttributeDefinition(fieldName, propertyDescription, fieldType);
+                logger.debug("Successfully parsed the following property: [{}].", attributeDefinition::toString);
+                return attributeDefinition;
+            }
+
+            boolean required = BooleanUtils.toBoolean(ToscaYamlHelper.asString(fieldBody.get("required")));
+            Object validation = fieldBody.get("validation");
+            ToscaPropertyDefinition propertyDefinition = new ToscaPropertyDefinition(fieldName, propertyDescription, fieldType, required, validation);;
+            logger.debug("Successfully parsed the following property: [{}].", propertyDefinition::toString);
+            return propertyDefinition;
+        }).collect(Collectors.toMap(ToscaFieldDefinition::getName, (field) -> field));
+    }
+}