diff options
author | kjaniak <kornel.janiak@nokia.com> | 2020-06-26 12:56:51 +0200 |
---|---|---|
committer | Tomasz Wrobel <tomasz.wrobel@nokia.com> | 2020-08-10 09:18:18 +0200 |
commit | bc2e6287569ed6a848acf31b26097f54934baf9b (patch) | |
tree | 2d974bbd9c74ea586a69c94ceeea3e17e15c085d /mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/core/PgaasNodeBuilder.java | |
parent | e996e07eea9189ffd89418047eb26293ef33e419 (diff) |
Add factories for Ext tls parameters
Code cleanup, renames
Issue-ID: DCAEGEN2-2251
Change-Id: Ibf36780473480210bea1c76d117b28c71831487a
Signed-off-by: kjaniak <kornel.janiak@nokia.com>
Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com>
Diffstat (limited to 'mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/core/PgaasNodeBuilder.java')
-rw-r--r-- | mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/core/PgaasNodeBuilder.java | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/core/PgaasNodeBuilder.java b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/core/PgaasNodeBuilder.java index a22d588..7c3193e 100644 --- a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/core/PgaasNodeBuilder.java +++ b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/core/PgaasNodeBuilder.java @@ -1,7 +1,8 @@ -/**============LICENSE_START======================================================= +/*============LICENSE_START======================================================= org.onap.dcae ================================================================================ Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved. + Copyright (c) 2020 Nokia. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,6 +20,11 @@ */ package org.onap.blueprintgenerator.core; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.TreeMap; import org.onap.blueprintgenerator.exception.DatabasesNotFoundException; import org.onap.blueprintgenerator.models.GetAttribute; import org.onap.blueprintgenerator.models.blueprint.GetInput; @@ -27,7 +33,7 @@ import org.onap.blueprintgenerator.models.blueprint.pgaas.PgaasNode; import org.onap.blueprintgenerator.models.blueprint.pgaas.PgaasNodeProperties; import org.onap.blueprintgenerator.models.componentspec.ComponentSpec; -import java.util.*; +import static org.onap.blueprintgenerator.common.blueprint.BlueprintHelper.createInputValue; public class PgaasNodeBuilder { @@ -39,29 +45,22 @@ public class PgaasNodeBuilder { private static final String DB_RELATIONSHIP_TYPE = "cloudify.relationships.depends_on"; - - public static void addPgaasNodesAndInputs(ComponentSpec cs, TreeMap<String, Node> nodeTemplate, TreeMap<String, LinkedHashMap<String, Object>> inps) { + public static void addPgaasNodesAndInputs(ComponentSpec cs, TreeMap<String, Node> nodeTemplate, + TreeMap<String, LinkedHashMap<String, Object>> inps) { TreeMap<String, String> databases = cs.getAuxilary().getDatabases(); - if(databases == null){ + if (databases == null) { throw new DatabasesNotFoundException("databases section not found in componentspec"); } - for(Map.Entry<String, String> database : databases.entrySet()){ + for (Map.Entry<String, String> database : databases.entrySet()) { addPgaasNode(database, nodeTemplate); addPgaasInputs(database, inps); } } - private static void addPgaasInputs(Map.Entry<String, String> database, TreeMap<String, LinkedHashMap<String, Object>> inps) { - inps.put(database.getKey() + NAME_POSTFIX, getInputValue("string", "db name", "")); - inps.put(database.getKey() + WRITER_FQDN_POSTFIX, getInputValue("string", "db writerfqdn", "")); - } - - private static LinkedHashMap<String, Object> getInputValue(String type, String description, Object defaultValue) { - LinkedHashMap<String, Object> inputValueMap = new LinkedHashMap(); - inputValueMap.put("type", type); - inputValueMap.put("description", description); - inputValueMap.put("default", defaultValue); - return inputValueMap; + private static void addPgaasInputs(Map.Entry<String, String> database, + TreeMap<String, LinkedHashMap<String, Object>> inps) { + inps.put(database.getKey() + NAME_POSTFIX, createInputValue("string", "db name", "")); + inps.put(database.getKey() + WRITER_FQDN_POSTFIX, createInputValue("string", "db writerfqdn", "")); } private static void addPgaasNode(Map.Entry<String, String> database, TreeMap<String, Node> nodeTemplate) { @@ -69,18 +68,18 @@ public class PgaasNodeBuilder { String dbName = database.getKey(); pgaasNode.setType(PGAAS_NODE_TYPE); pgaasNode.setPgaasNodeProperties(buildPgaasNodeProperties(dbName)); - nodeTemplate.put(dbName + PGAAS_NODE_NAME_POSTFIX , pgaasNode); + nodeTemplate.put(dbName + PGAAS_NODE_NAME_POSTFIX, pgaasNode); } private static PgaasNodeProperties buildPgaasNodeProperties(String dbName) { PgaasNodeProperties pgaasNodeProperties = new PgaasNodeProperties(); GetInput nameValue = new GetInput(); - nameValue.setGet_input(dbName + NAME_POSTFIX); + nameValue.setBpInputName(dbName + NAME_POSTFIX); pgaasNodeProperties.setName(nameValue); GetInput writerfqdnValue = new GetInput(); - writerfqdnValue.setGet_input(dbName + WRITER_FQDN_POSTFIX); + writerfqdnValue.setBpInputName(dbName + WRITER_FQDN_POSTFIX); pgaasNodeProperties.setWriterfqdn(writerfqdnValue); pgaasNodeProperties.setUseExisting(USE_EXISTING); @@ -90,7 +89,7 @@ public class PgaasNodeBuilder { public static ArrayList<LinkedHashMap<String, String>> getPgaasNodeRelationships(ComponentSpec cs) { ArrayList<LinkedHashMap<String, String>> relationships = new ArrayList<>(); - for(Map.Entry<String, String> database : cs.getAuxilary().getDatabases().entrySet()){ + for (Map.Entry<String, String> database : cs.getAuxilary().getDatabases().entrySet()) { LinkedHashMap<String, String> relationship = new LinkedHashMap<>(); relationship.put("type", DB_RELATIONSHIP_TYPE); relationship.put("target", database.getKey() + PGAAS_NODE_NAME_POSTFIX); @@ -101,23 +100,23 @@ public class PgaasNodeBuilder { public static LinkedHashMap<String, Object> getEnvVariables(TreeMap<String, String> databases) { LinkedHashMap<String, Object> envVariables = new LinkedHashMap<String, Object>(); - for(Map.Entry<String, String> database : databases.entrySet()){ + for (Map.Entry<String, String> database : databases.entrySet()) { String name = database.getKey().toUpperCase(); envVariables.put("<<", "*envs"); GetInput nameValue = new GetInput(); - nameValue.setGet_input(name.toLowerCase() + NAME_POSTFIX); + nameValue.setBpInputName(name.toLowerCase() + NAME_POSTFIX); envVariables.put(name + "_DB_NAME", nameValue); GetAttribute adminHostValue = buildGetAttributeValue(name.toLowerCase(), "admin", "host"); - envVariables.put( name.toUpperCase() + "_DB_ADMIN_HOST", adminHostValue); + envVariables.put(name.toUpperCase() + "_DB_ADMIN_HOST", adminHostValue); GetAttribute adminUserValue = buildGetAttributeValue(name.toLowerCase(), "admin", "user"); - envVariables.put( name.toUpperCase() + "_DB_ADMIN_USER", adminUserValue); + envVariables.put(name.toUpperCase() + "_DB_ADMIN_USER", adminUserValue); GetAttribute adminPasswordValue = buildGetAttributeValue(name.toLowerCase(), "admin", "password"); - envVariables.put( name.toUpperCase() + "_DB_ADMIN_PASS", adminPasswordValue); + envVariables.put(name.toUpperCase() + "_DB_ADMIN_PASS", adminPasswordValue); } return envVariables; } |