Martin Peřina has posted comments on this change. Change subject: core: Adds custom properties to VmNetworkInterface ......................................................................
Patch Set 12: (4 inline comments) .................................................... File backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkInterface.java Line 30: /** Line 31: * Device custom properties Line 32: */ Line 33: private String customProperties; Line 34: There was a comment in patch set 1 one from Yair and Moti, that this is a redundancy and we should include link to VmDevice instance here Line 35: /** Line 36: * Link State of the Nic. <BR> Line 37: * <code>true</code> if UP and <code>false</code> if DOWN. Line 38: */ .................................................... File backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugNicVDSCommand.java Line 61: } Line 62: Line 63: if (FeatureSupported.deviceCustomProperties(getParameters().getVm().getVdsGroupCompatibilityVersion())) { Line 64: map.put(VdsProperties.Custom, vmDevice.getCustomProperties()); Line 65: } I've been told, that we should send a Map to VDSM and not a String. If true, the call should be changed to map.put(VdsProperties.Custom, DevicePropertiesUtils.getInstance.convertProperties(version, vmDevice.getType(), vmDevice.getCustomProperties())); Line 66: Line 67: VmInfoBuilder.addNetworkFiltersToNic(map, getParameters().getVm().getVdsGroupCompatibilityVersion()); Line 68: return map; Line 69: } .................................................... File backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/UpdateVmInterfaceVDSCommand.java Line 34: ? Collections.singletonList(nic.getNetworkName()) : Collections.<String> emptyList()); Line 35: Line 36: if (FeatureSupported.deviceCustomProperties(getParameters().getVm().getVdsGroupCompatibilityVersion())) { Line 37: deviceStruct.put(VdsProperties.Custom, getParameters().getVmDevice().getCustomProperties()); Line 38: } Here also should be: deviceStruct.put(VdsProperties.Custom, DevicePropertiesUtils.getInstance.convertProperties(version, vmDevice.getType(), vmDevice.getCustomProperties())); Line 39: Line 40: return deviceStruct; Line 41: } Line 42: .................................................... File backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java Line 487: } Line 488: Line 489: if (FeatureSupported.deviceCustomProperties(clusterVersion)) { Line 490: struct.put(VdsProperties.Custom, vmDevice.getCustomProperties()); Line 491: } Here also should be: struct.put(VdsProperties.Custom, DevicePropertiesUtils.getInstance.convertProperties(version, vmDevice.getType(), vmDevice.getCustomProperties())); Line 492: Line 493: addNetworkFiltersToNic(struct, clusterVersion); Line 494: } Line 495: -- To view, visit http://gerrit.ovirt.org/14815 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I218db49043ddf0524178f6ff903e605bc0fe661a Gerrit-PatchSet: 12 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <mper...@redhat.com> Gerrit-Reviewer: Allon Mureinik <amure...@redhat.com> Gerrit-Reviewer: Alona Kaplan <alkap...@redhat.com> Gerrit-Reviewer: Martin Peřina <mper...@redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skriva...@redhat.com> Gerrit-Reviewer: Mike Kolesnik <mkole...@redhat.com> Gerrit-Reviewer: Moti Asayag <masa...@redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzasl...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches