X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=mod%2Fbpgenerator%2Fonap%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fblueprintgenerator%2Fservice%2Fcommon%2FResourceConfigService.java;h=d9bc7b5e3b5f628af50adfbe60300a25403476b5;hb=72c2d38329865afa6692454b4fb90ab6f8a70638;hp=7b033721a750fe9040a9519fe890092a2147ecb1;hpb=3f0bbed7e1b96d1982d55e26c27169885aa3067c;p=dcaegen2%2Fplatform.git

diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ResourceConfigService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ResourceConfigService.java
index 7b03372..d9bc7b5 100644
--- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ResourceConfigService.java
+++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ResourceConfigService.java
@@ -4,6 +4,7 @@
  *  *  org.onap.dcae
  *  *  ================================================================================
  *  *  Copyright (c) 2020  AT&T Intellectual Property. All rights reserved.
+ *  *  Copyright (c) 2021 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.
@@ -28,35 +29,47 @@ import org.onap.blueprintgenerator.model.common.GetInput;
 import org.onap.blueprintgenerator.model.common.ResourceConfig;
 import org.onap.blueprintgenerator.service.base.BlueprintHelperService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.TreeMap;
 
 /**
  * @author : Ravi Mantena
- * @date 10/16/2020
- * Application: ONAP - Blueprint Generator
- * Common ONAP Service used by ONAP and DMAAP Blueprint to add ResourceConfig
+ * @date 10/16/2020 Application: ONAP - Blueprint Generator Common ONAP Service to add
+ * ResourceConfig
  */
-
-
 @Service("onapResourceConfigService")
 public class ResourceConfigService {
 
     @Autowired
     private BlueprintHelperService blueprintHelperService;
 
-    //Method to create Resouce Config for properties
-    public Map<String,Object> createResourceConfig(Map<String, LinkedHashMap<String, Object>> inputs, String name){
-        Map<String,Object> response = new HashMap<>();
+    @Value("${resources.cpuLimit}")
+    private String defaultCpuLimit;
+
+    @Value("${resources.memoryLimit}")
+    private String defaultMemoryLimit;
+
+    /**
+     * Creates Resouce Config for properties
+     *
+     * @param inputs Inputs
+     * @param name Name
+     * @return
+     */
+    public Map<String, Object> createResourceConfig(
+        Map<String, Map<String, Object>> inputs, String name) {
+        Map<String, Object> response = new HashMap<>();
         ResourceConfig resourceConfig = new ResourceConfig();
 
-        LinkedHashMap<String, Object> memoryLimit = blueprintHelperService.createStringInput(Constants.MEMORY_LIMIT_128Mi);
+        Map<String, Object> memoryLimit =
+            blueprintHelperService.createStringInput(defaultMemoryLimit);
 
-        LinkedHashMap<String, Object> cpuLimit  = blueprintHelperService.createStringInput( Constants.CPU_LIMIT_250m);
+        Map<String, Object> cpuLimit =
+            blueprintHelperService.createStringInput(defaultCpuLimit);
 
         name = blueprintHelperService.getNamePrefix(name);
 
@@ -94,5 +107,4 @@ public class ResourceConfigService {
         response.put("inputs", inputs);
         return response;
     }
-
 }