Arik Hadas has uploaded a new change for review. Change subject: core: improve query for vms from external provider ......................................................................
core: improve query for vms from external provider Improvements: 1. Get network interface type 2. Filter cd-roms Change-Id: I3e232c8a8a106f2c095887da80a39f2c43409dad Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java 1 file changed, 19 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/38053/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 9292f05..4b629da 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 @@ -61,13 +61,14 @@ import org.ovirt.engine.core.common.businessentities.network.InterfaceStatus; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.NetworkBootProtocol; -import org.ovirt.engine.core.common.businessentities.network.Nic; import org.ovirt.engine.core.common.businessentities.network.NetworkInterface; import org.ovirt.engine.core.common.businessentities.network.NetworkStatistics; +import org.ovirt.engine.core.common.businessentities.network.Nic; import org.ovirt.engine.core.common.businessentities.network.VdsInterfaceType; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkStatistics; import org.ovirt.engine.core.common.businessentities.network.Vlan; +import org.ovirt.engine.core.common.businessentities.network.VmInterfaceType; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; @@ -139,9 +140,12 @@ vmStatic.setNumOfSockets((int) xmlRpcStruct.get(VdsProperties.num_of_cpus)); if (xmlRpcStruct.containsKey(VdsProperties.vm_disks)) { - for (Object diskMap : (Object[]) xmlRpcStruct.get(VdsProperties.vm_disks)) { - DiskImage image = buildDiskImageFromExternalProvider((Map<String, Object>)diskMap); - vmStatic.getImages().add(image); + for (Object disk : (Object[]) xmlRpcStruct.get(VdsProperties.vm_disks)) { + Map<String, Object> diskMap = (Map<String, Object>) disk; + if (VdsProperties.Disk.equals(diskMap.get(VdsProperties.type))) { + DiskImage image = buildDiskImageFromExternalProvider(diskMap); + vmStatic.getImages().add(image); + } } } @@ -169,6 +173,17 @@ nic.setMacAddress((String) map.get(VdsProperties.MAC_ADDR)); nic.setName((String) map.get(VdsProperties.BRIDGE)); + nic.setType(VmInterfaceType.pv.getValue()); + if (map.containsKey(VdsProperties.Model)) { + String model = (String) map.get(VdsProperties.Model); + for (VmInterfaceType type : VmInterfaceType.values()) { + if (model.equals(type.getInternalName())) { + nic.setType(type.getValue()); + break; + } + } + } + return nic; } -- To view, visit http://gerrit.ovirt.org/38053 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e232c8a8a106f2c095887da80a39f2c43409dad Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
