[Engine-patches] Change in ovirt-engine[master]: engine: Simplify host network statistics processing

[masayag]

Moti Asayag has uploaded a new change for review.

Change subject: engine: Simplify host network statistics processing
......................................................................

engine: Simplify host network statistics processing

Change-Id: Icd3f435bb280ab0118e45c5f44e06046c93f7062
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStatsVDSCommand.java
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
2 files changed, 5 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/01/24601/1

diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStatsVDSCommand.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStatsVDSCommand.java
index cc492b6..d2f74a6 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStatsVDSCommand.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStatsVDSCommand.java
@@ -26,9 +26,7 @@
         if (getVds().getInterfaces().isEmpty()) {
             List<VdsNetworkInterface> interfaces = 
DbFacade.getInstance().getInterfaceDao().getAllInterfacesForVds(
                     getVds().getId());
-            for (VdsNetworkInterface iface : interfaces) {
-                getVds().getInterfaces().add(iface);
-            }
+            getVds().getInterfaces().addAll(interfaces);
         }
         VdsBrokerObjectsBuilder.updateVDSStatisticsData(getVds(), 
infoReturn.mInfo);
         VdsBrokerObjectsBuilder.checkTimeDrift(getVds(), infoReturn.mInfo);
diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
index 8852f4f..5b7f03f 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
@@ -552,19 +552,13 @@
         vds.setUsageMemPercent(AssignIntValue(xmlRpcStruct, 
VdsProperties.mem_usage));
 
         // ------------- vds network statistics ---------------------
-        Map<String, Object> interfaces = (Map<String, Object>) xmlRpcStruct
-                .get(VdsProperties.NETWORK);
+        Map<String, Object> interfaces = (Map<String, Object>) 
xmlRpcStruct.get(VdsProperties.NETWORK);
         if (interfaces != null) {
             int networkUsage = 0;
+            Map<String, VdsNetworkInterface> nicsByName = 
Entities.entitiesByName(vds.getInterfaces());
             for (Entry<String, Object> entry : interfaces.entrySet()) {
-                VdsNetworkInterface iface = null;
-                for (VdsNetworkInterface tempInterface : vds.getInterfaces()) {
-                    if (tempInterface.getName().equals(entry.getKey())) {
-                        iface = tempInterface;
-                        break;
-                    }
-                }
-                if (iface != null) {
+                if (nicsByName.containsKey(entry.getKey())) {
+                    VdsNetworkInterface iface = nicsByName.get(entry.getKey());
                     iface.setVdsId(vds.getId());
                     Map<String, Object> dict = (Map<String, Object>) 
entry.getValue();
                     Double rx_rate = AssignDoubleValue(dict, 
VdsProperties.rx_rate);


-- 
To view, visit http://gerrit.ovirt.org/24601
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd3f435bb280ab0118e45c5f44e06046c93f7062
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches