Merge pull request #1317 from bharathappali/gpu-support-pr-3

Add accelerator related fields in existing structures

src/main/java/com/autotune/common/data/metrics/AcceleratorMetricResult.java

@@ -0,0 +1,29 @@
+package com.autotune.common.data.metrics;
+
+import com.autotune.common.data.system.info.device.accelerator.AcceleratorDeviceData;
+
+public class AcceleratorMetricResult {
+    private AcceleratorDeviceData acceleratorDeviceData;
+    private MetricResults metricResults;
+
+    public AcceleratorMetricResult(AcceleratorDeviceData acceleratorDeviceData, MetricResults metricResults) {
+        this.acceleratorDeviceData = acceleratorDeviceData;
+        this.metricResults = metricResults;
+    }
+
+    public AcceleratorDeviceData getAcceleratorDeviceData() {
+        return acceleratorDeviceData;
+    }
+
+    public void setAcceleratorDeviceData(AcceleratorDeviceData acceleratorDeviceData) {
+        this.acceleratorDeviceData = acceleratorDeviceData;
+    }
+
+    public MetricResults getMetricResults() {
+        return metricResults;
+    }
+
+    public void setMetricResults(MetricResults metricResults) {
+        this.metricResults = metricResults;
+    }
+}

src/main/java/com/autotune/common/data/result/ContainerData.java

@@ -18,6 +18,7 @@
 import com.autotune.analyzer.recommendations.ContainerRecommendations;
 import com.autotune.analyzer.utils.AnalyzerConstants;
 import com.autotune.common.data.metrics.Metric;
+import com.autotune.common.data.system.info.device.ContainerDeviceList;
 import com.autotune.utils.KruizeConstants;
 import com.google.gson.annotations.SerializedName;
 
@@ -29,6 +30,7 @@ public class ContainerData {
     private String container_name;
     //key is intervalEndTime
     private HashMap<Timestamp, IntervalResults> results;
+    private ContainerDeviceList containerDeviceList;
     @SerializedName(KruizeConstants.JSONKeys.RECOMMENDATIONS)
     private ContainerRecommendations containerRecommendations;
     private HashMap<AnalyzerConstants.MetricName, Metric> metrics;
@@ -85,6 +87,14 @@ public HashMap<AnalyzerConstants.MetricName, Metric> getMetrics() {
     public void setMetrics(HashMap<AnalyzerConstants.MetricName, Metric> metrics) {
         this.metrics = metrics;
     }
+
+    public ContainerDeviceList getContainerDeviceList() {
+        return containerDeviceList;
+    }
+
+    public void setContainerDeviceList(ContainerDeviceList containerDeviceList) {
+        this.containerDeviceList = containerDeviceList;
+    }
     @Override
     public String toString() {
         return "ContainerData{" +

src/main/java/com/autotune/common/data/result/IntervalResults.java

@@ -16,6 +16,7 @@
 package com.autotune.common.data.result;
 
 import com.autotune.analyzer.utils.AnalyzerConstants;
+import com.autotune.common.data.metrics.AcceleratorMetricResult;
 import com.autotune.common.data.metrics.MetricResults;
 import com.google.gson.annotations.SerializedName;
 
@@ -32,6 +33,7 @@
 public class IntervalResults {
     @SerializedName(METRICS)
     HashMap<AnalyzerConstants.MetricName, MetricResults> metricResultsMap;
+    HashMap<AnalyzerConstants.MetricName, AcceleratorMetricResult> acceleratorMetricResultHashMap;
     @SerializedName(INTERVAL_START_TIME)
     private Timestamp intervalStartTime;
     @SerializedName(INTERVAL_END_TIME)
@@ -85,6 +87,14 @@ public void setDurationInMinutes(Double durationInMinutes) {
         this.durationInMinutes = durationInMinutes;
     }
 
+    public HashMap<AnalyzerConstants.MetricName, AcceleratorMetricResult> getAcceleratorMetricResultHashMap() {
+        return acceleratorMetricResultHashMap;
+    }
+
+    public void setAcceleratorMetricResultHashMap(HashMap<AnalyzerConstants.MetricName, AcceleratorMetricResult> acceleratorMetricResultHashMap) {
+        this.acceleratorMetricResultHashMap = acceleratorMetricResultHashMap;
+    }
+
     @Override
     public String toString() {
         return "IntervalResults{" +