@@ -163,7 +163,12 @@ private void addHostMetrics(final List<Item> metricsList, final long dcId, final
163163 final CapacityVO cpuCapacity = capacityDao .findByHostIdType (host .getId (), Capacity .CAPACITY_TYPE_CPU );
164164 final double cpuUsedMhz = hostStats .getCpuUtilization () * host .getCpus () * host .getSpeed () / 100.0 ;
165165
166- if (cpuCapacity != null && cpuCapacity .getCapacityState () == CapacityState .Enabled ) {
166+ if (host .isInMaintenanceStates ()) {
167+ metricsList .add (new ItemHostCpu (zoneName , zoneUuid , host .getName (), host .getUuid (), host .getPrivateIpAddress (), cpuFactor , ALLOCATED , 0L , isDedicated , hostTags ));
168+ metricsList .add (new ItemHostCpu (zoneName , zoneUuid , host .getName (), host .getUuid (), host .getPrivateIpAddress (), cpuFactor , USED , 0L , isDedicated , hostTags ));
169+ metricsList .add (new ItemHostCpu (zoneName , zoneUuid , host .getName (), host .getUuid (), host .getPrivateIpAddress (), cpuFactor , TOTAL , 0L , isDedicated , hostTags ));
170+ }
171+ else if (cpuCapacity != null && cpuCapacity .getCapacityState () == CapacityState .Enabled ) {
167172 metricsList .add (new ItemHostCpu (zoneName , zoneUuid , host .getName (), host .getUuid (), host .getPrivateIpAddress (), cpuFactor , ALLOCATED , cpuCapacity .getUsedCapacity (), isDedicated , hostTags ));
168173 metricsList .add (new ItemHostCpu (zoneName , zoneUuid , host .getName (), host .getUuid (), host .getPrivateIpAddress (), cpuFactor , USED , cpuUsedMhz , isDedicated , hostTags ));
169174 metricsList .add (new ItemHostCpu (zoneName , zoneUuid , host .getName (), host .getUuid (), host .getPrivateIpAddress (), cpuFactor , TOTAL , cpuCapacity .getTotalCapacity (), isDedicated , hostTags ));
@@ -175,7 +180,12 @@ private void addHostMetrics(final List<Item> metricsList, final long dcId, final
175180
176181 final String memoryFactor = String .valueOf (CapacityManager .MemOverprovisioningFactor .valueIn (host .getClusterId ()));
177182 final CapacityVO memCapacity = capacityDao .findByHostIdType (host .getId (), Capacity .CAPACITY_TYPE_MEMORY );
178- if (memCapacity != null && memCapacity .getCapacityState () == CapacityState .Enabled ) {
183+ if (host .isInMaintenanceStates ()) {
184+ metricsList .add (new ItemHostMemory (zoneName , zoneUuid , host .getName (), host .getUuid (), host .getPrivateIpAddress (), memoryFactor , ALLOCATED , 0L , isDedicated , hostTags ));
185+ metricsList .add (new ItemHostMemory (zoneName , zoneUuid , host .getName (), host .getUuid (), host .getPrivateIpAddress (), memoryFactor , USED , 0 , isDedicated , hostTags ));
186+ metricsList .add (new ItemHostMemory (zoneName , zoneUuid , host .getName (), host .getUuid (), host .getPrivateIpAddress (), memoryFactor , TOTAL , 0L , isDedicated , hostTags ));
187+ }
188+ else if (memCapacity != null && memCapacity .getCapacityState () == CapacityState .Enabled ) {
179189 metricsList .add (new ItemHostMemory (zoneName , zoneUuid , host .getName (), host .getUuid (), host .getPrivateIpAddress (), memoryFactor , ALLOCATED , memCapacity .getUsedCapacity (), isDedicated , hostTags ));
180190 metricsList .add (new ItemHostMemory (zoneName , zoneUuid , host .getName (), host .getUuid (), host .getPrivateIpAddress (), memoryFactor , USED , hostStats .getUsedMemory (), isDedicated , hostTags ));
181191 metricsList .add (new ItemHostMemory (zoneName , zoneUuid , host .getName (), host .getUuid (), host .getPrivateIpAddress (), memoryFactor , TOTAL , memCapacity .getTotalCapacity (), isDedicated , hostTags ));
@@ -188,7 +198,11 @@ private void addHostMetrics(final List<Item> metricsList, final long dcId, final
188198 metricsList .add (new ItemHostVM (zoneName , zoneUuid , host .getName (), host .getUuid (), host .getPrivateIpAddress (), vmDao .listByHostId (host .getId ()).size ()));
189199
190200 final CapacityVO coreCapacity = capacityDao .findByHostIdType (host .getId (), Capacity .CAPACITY_TYPE_CPU_CORE );
191- if (coreCapacity != null && coreCapacity .getCapacityState () == CapacityState .Enabled ) {
201+ if (host .isInMaintenanceStates ()) {
202+ metricsList .add (new ItemVMCore (zoneName , zoneUuid , host .getName (), host .getUuid (), host .getPrivateIpAddress (), USED , 0L , isDedicated , hostTags ));
203+ metricsList .add (new ItemVMCore (zoneName , zoneUuid , host .getName (), host .getUuid (), host .getPrivateIpAddress (), TOTAL , 0L , isDedicated , hostTags ));
204+ }
205+ else if (coreCapacity != null && coreCapacity .getCapacityState () == CapacityState .Enabled ) {
192206 metricsList .add (new ItemVMCore (zoneName , zoneUuid , host .getName (), host .getUuid (), host .getPrivateIpAddress (), USED , coreCapacity .getUsedCapacity (), isDedicated , hostTags ));
193207 metricsList .add (new ItemVMCore (zoneName , zoneUuid , host .getName (), host .getUuid (), host .getPrivateIpAddress (), TOTAL , coreCapacity .getTotalCapacity (), isDedicated , hostTags ));
194208 } else {
0 commit comments