Added api for torm to request an estimation of a tJob using a Cost Model

Author: Manuel Perez Belmonte

api.yaml

@@ -186,9 +186,9 @@ definitions:
   EstimateBody:
     type: object
     properties:
-      testId:
+      tJobDefinition:
         type: string
-      costModelId:
+      tJobCostModel:
         type: string
   FixCost:
     type: object

src/main/java/io/elastest/ece/application/APIController.java

@@ -2,6 +2,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import io.elastest.ece.load.Loader;
 import io.elastest.ece.model.CostModel;
 import io.elastest.ece.model.TJob;
 import io.elastest.ece.persistance.HibernateClient;
@@ -79,6 +80,20 @@ public String getEstimateCostModels(Model model) {
         return "estimate";
     }
 
+    @RequestMapping(value = "/estimate", method = RequestMethod.POST)
+    public String estimateTJob(String tJobDefinition, String tJobCostModel, Model model){
+        Gson gson = new Gson();
+        CostModel costModel = gson.fromJson(tJobCostModel, CostModel.class);
+//        ArrayList<String> components = costModel.getComponents().get(Loader.getSettings().getServicesConstant());
+        ArrayList<String> components = (ArrayList<String>) costModel.getComponents().get("Services");
+        for(String component : components){
+            //TODO: Query ESM for each service Cost Model
+            // CostModel componentCostModel = esmDirver.getServiceCostModel(component);
+            // estimatePost(tJobDefinition, componentCostModel);
+        }
+        return "";
+    }
+
     @RequestMapping(value = "/deletecostmodel", method = RequestMethod.GET)
     public String getDeleteCostModel(Model model) {
         logger.info("Creating test values.");
@@ -166,7 +181,7 @@ public String estimatePost(@RequestParam String testId, @RequestParam String cos
         if (costModelType.equalsIgnoreCase("ONDEMAND")) {
             Map<String, Double> fixCost = costModel.getFix_cost();
             Map<String, Double> varRate = costModel.getVar_rate();
-            Map<String, String> components = costModel.getComponents();
+            Map<String, Object> components = costModel.getComponents();
             Map<String, String> metadata = tJob.getMetadata();
 
             logger.info("Adding all fix costs from the cost model.");

src/main/java/io/elastest/ece/model/CostModel.java

@@ -39,7 +39,7 @@ public class CostModel {
     private Map<String, Double> var_rate;
 
     @ElementCollection(fetch = FetchType.EAGER)
-    private Map<String, String> components;
+    private Map<String, Object> components;
 
     private String description;
 
@@ -52,7 +52,7 @@ public CostModel(String name, String type, Map fix_cost) {
         this.fix_cost = fix_cost;
     }
 
-    public CostModel(String name, String type, Map<String, Double> fix_cost, Map<String, Double> var_rate, Map<String, String> components, String description) {
+    public CostModel(String name, String type, Map<String, Double> fix_cost, Map<String, Double> var_rate, Map<String, Object> components, String description) {
         this.name = name;
         this.type = type;
         this.fix_cost = fix_cost;
@@ -105,11 +105,11 @@ public void setVar_rate(Map<String, Double> var_rate) {
         this.var_rate = var_rate;
     }
 
-    public Map<String, String> getComponents() {
+    public Map<String, Object> getComponents() {
         return components;
     }
 
-    public void setComponents(Map<String, String> components) {
+    public void setComponents(Map<String, Object> components) {
         this.components = components;
     }