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/models/blueprint/ResourceConfig.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/models/blueprint/ResourceConfig.java')
-rw-r--r-- | mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/ResourceConfig.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/ResourceConfig.java b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/ResourceConfig.java index f1a9a17..13aa0d0 100644 --- a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/ResourceConfig.java +++ b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/ResourceConfig.java @@ -1,7 +1,8 @@ -/**============LICENSE_START======================================================= +/*============LICENSE_START======================================================= org.onap.dcae ================================================================================ Copyright (c) 2019 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. @@ -23,8 +24,6 @@ package org.onap.blueprintgenerator.models.blueprint; import java.util.LinkedHashMap; import java.util.TreeMap; -import com.fasterxml.jackson.annotation.JsonInclude; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -91,11 +90,11 @@ public class ResourceConfig { TreeMap<String, GetInput> lim = new TreeMap<String, GetInput>(); GetInput cpu = new GetInput(); - cpu.setGet_input(name + "cpu_limit"); + cpu.setBpInputName(name + "cpu_limit"); lim.put("cpu", cpu); GetInput memL = new GetInput(); - memL.setGet_input(name + "memory_limit"); + memL.setBpInputName(name + "memory_limit"); lim.put("memory", memL); retInputs.put(name + "cpu_limit", m); @@ -107,11 +106,11 @@ public class ResourceConfig { TreeMap<String, GetInput> req = new TreeMap<String, GetInput>(); GetInput cpuR = new GetInput(); - cpuR.setGet_input(name + "cpu_request"); + cpuR.setBpInputName(name + "cpu_request"); req.put("cpu", cpuR); GetInput memR = new GetInput(); - memR.setGet_input(name + "memory_request"); + memR.setBpInputName(name + "memory_request"); req.put("memory", memR); retInputs.put(name + "cpu_request", m); |