[Engine-patches] Change in ovirt-engine[master]: engine: Deprecate usage of network entries where possible

[lvernia]

Lior Vernia has uploaded a new change for review.

Change subject: engine: Deprecate usage of network entries where possible
......................................................................

engine: Deprecate usage of network entries where possible

Values reported by vdsm in the bridges entry should not be taken from
the networks entry.

Change-Id: I2a46a277912b3a3013c379107f3cd6aa3cb52be9
Signed-off-by: Lior Vernia <lver...@redhat.com>
---
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
1 file changed, 7 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/37081/1

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 9f4817d..9470a4c 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
@@ -1317,9 +1317,12 @@
 
                     boolean bridgedNetwork = isBridgedNetwork(network);
                     HostNetworkQos qos = new 
HostNetworkQosMapper(network).deserialize();
-                    String addr = extractAddress(network);
-                    String subnet = extractSubnet(network);
-                    String gateway = (String) 
network.get(VdsProperties.GLOBAL_GATEWAY);
+
+                    Map<String, Object> effectiveBridge =
+                            (bridgesReported && bridgedNetwork && bridge != 
null) ? bridge : network;
+                    String addr = extractAddress(effectiveBridge);
+                    String subnet = extractSubnet(effectiveBridge);
+                    String gateway = (String) 
effectiveBridge.get(VdsProperties.GLOBAL_GATEWAY);
 
                     List<VdsNetworkInterface> interfaces =
                             findNetworkInterfaces(vdsInterfaces, 
bridgesReported, networkIface,
@@ -1339,7 +1342,7 @@
                         setGatewayIfNecessary(iface, vds, gateway);
 
                         if (bridgedNetwork) {
-                            addBootProtocol(network, vds, iface);
+                            addBootProtocol(effectiveBridge, vds, iface);
                         }
                     }
 


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

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