Merge pull request #829 from Pengpengwanga/ui

Filter enery consumption by since time
vmware · May 14, 2021 · 2ad3686 · 2ad3686
2 parents 683c654 + 14c6f64
commit 2ad3686
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/flowgate-api/src/main/java/com/vmware/flowgate/service/AssetService.java b/flowgate-api/src/main/java/com/vmware/flowgate/service/AssetService.java
@@ -1810,9 +1810,12 @@ private String getValueUnitName(Map<String, String> formulaKeyAndValueUnitNameMa
     */
    public List<ValueUnit> filterServerEnergyConsumption(List<ValueUnit> valueUnits, long startTime){
       if(valueUnits == null || valueUnits.isEmpty()) {
-         return null;
+         return valueUnits;
       }
       filterServerEnergyConsumptionBySinceTime(valueUnits, startTime);
+      if(valueUnits.isEmpty()) {
+         return valueUnits;
+      }
       Collections.sort(valueUnits, new CompareValueUnit());
       Map<Integer, Map<Long, List<ValueUnit>>> maxValueMap = new HashMap<>();
       Map<Long, List<ValueUnit>> maxvalue = new HashMap<>();

diff --git a/flowgate-api/src/test/java/com/vmware/flowgate/util/FilterServerEnergyConsumptionTest.java b/flowgate-api/src/test/java/com/vmware/flowgate/util/FilterServerEnergyConsumptionTest.java
@@ -133,6 +133,22 @@ public void testFilterServerEnergyConsumption3() {
       TestCase.assertEquals(40.0 ,results.get(0).getValueNum());
    }
 
+   @Test
+   public void testFilterServerEnergyConsumption4() {
+      long time = System.currentTimeMillis();
+      //Sample value of Openmanage SERVER_ENERGY_CONSUMPTION metric
+      ValueUnit valueUnit = new ValueUnit();
+      valueUnit.setTime(time);
+      valueUnit.setKey(MetricName.SERVER_ENERGY_CONSUMPTION);
+      valueUnit.setExtraidentifier(String.valueOf(1302663085000l));
+      valueUnit.setUnit(MetricUnit.kWh.name());
+      valueUnit.setValueNum(65633);
+      List<ValueUnit> valueUnits = new ArrayList<ValueUnit>();
+      valueUnits.add(valueUnit);
+      List<ValueUnit> results =  assetService.filterServerEnergyConsumption(valueUnits, time);
+      TestCase.assertEquals(0, results.size());
+   }
+
    List<ValueUnit> getValueUnitsFromVC(long time, int duration){
       List<ValueUnit> valueUnits = new ArrayList<>();
       ValueUnit valueUnit;