Daniel Erez has posted comments on this change.
Change subject: core,rest,ui: VirtIO-SCSI enabled flag
......................................................................
Patch Set 4:
(7 comments)
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
Line 114: * @param disks
Line 115: * @return
Line 116: */
Line 117: public static <T extends Disk> boolean checkPciAndIdeLimit(int
monitorsNumber, List<VmNic> interfaces,
Line 118: List<T> disks, Boolean virtioScsiEnabled,
ArrayList<String> messages) {
I'm using a Boolean since I want the flag to be defaulted to true when using
cluster level >= 3.3 (e.g. when using from rest...)
Line 119: boolean result = true;
Line 120: // this adds: monitors + 2 * (interfaces with type rtl_pv) +
(all other
Line 121: // interfaces) + (all disks that are not IDE)
Line 122: int pciInUse = monitorsNumber;
....................................................
File
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
Line 402: return vmTemplate;
Line 403: }
Line 404:
Line 405: private VDSGroup createVdsGroup() {
Line 406: if (vdsGroup == null) {
used it for consistency - the previous method 'createVmTemplate()' uses it...
remove it as well?
Line 407: vdsGroup = new VDSGroup();
Line 408: vdsGroup.setcompatibility_version(Version.v3_3);
Line 409: }
Line 410: return vdsGroup;
....................................................
File
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
Line 1484: public void setBalloonEnabled(boolean isBallonEnabled) {
Line 1485: balloonEnabled = isBallonEnabled;
Line 1486: }
Line 1487:
Line 1488: public Boolean isVirtioScsiEnabled() {
same
Line 1489: return vmStatic.isVirtioScsiEnabled();
Line 1490: }
Line 1491:
Line 1492: public void setVirtioScsiEnabled(Boolean virtioScsiEnabled) {
....................................................
File
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
Line 147: @EditableField
Line 148: private boolean allowConsoleReconnect;
Line 149:
Line 150: @EditableField
Line 151: private Boolean virtioScsiEnabled;
same
Line 152:
Line 153: /**
Line 154: * if this field is null then value should be taken from cluster
Line 155: */
....................................................
File
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java
Line 235: }
Line 236:
Line 237: @Override
Line 238: protected void buildVmDrives() {
Line 239: boolean containsVirtioScsiDisk = vm.isVirtioScsiEnabled();
it shouldn't happen since we initialize it to false/true in AddVmCommand. But
you're right, I'll add a safety net...
Line 240: List<Disk> disks = getSortedDisks();
Line 241: for (Disk disk : disks) {
Line 242: Map<String, Object> struct = new HashMap<String,
Object>();
Line 243: // get vm device for this disk from DB
....................................................
File
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java
Line 1105: boolean isDisksAvailable =
object.getIsDisksAvailable();
Line 1106:
changeApplicationLevelVisibility(disksAllocationPanel, isDisksAvailable);
Line 1107:
Line 1108:
changeApplicationLevelVisibility(storageAllocationPanel,
isProvisioningAvailable || isDisksAvailable ||
Line 1109: (Boolean)
object.getIsVirtioScsiEnabled().getIsAvailable());
getIsVirtioScsiEnabled() is an EntityModel in the UI - so irrelevant...
Line 1110: }
Line 1111: });
Line 1112:
Line 1113:
object.getUsbPolicy().getPropertyChangedEvent().addListener(new
IEventListener() {
Line 1194:
changeApplicationLevelVisibility(disksAllocationPanel, isDisksAvailable);
Line 1195:
Line 1196: boolean isProvisioningAvailable =
vm.getProvisioning().getIsAvailable();
Line 1197:
changeApplicationLevelVisibility(storageAllocationPanel, isProvisioningAvailable
Line 1198: || isDisksAvailable || (Boolean)
vm.getIsVirtioScsiEnabled().getIsAvailable());
same
Line 1199:
Line 1200: if (isDisksAvailable) {
Line 1201: // Update warning message by disks status
Line 1202:
updateDisksWarningByImageStatus(vm.getDisks(), ImageStatus.ILLEGAL);
--
To view, visit http://gerrit.ovirt.org/18638
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ice06fda5946b5961cfe9c819b0b368525b1f4b58
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <de...@redhat.com>
Gerrit-Reviewer: Allon Mureinik <amure...@redhat.com>
Gerrit-Reviewer: Daniel Erez <de...@redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofren...@redhat.com>
Gerrit-Reviewer: Tal Nisan <tni...@redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
