Tomas Jelinek has uploaded a new change for review. Change subject: frontend: Virt-IO-SCSI option is not available in instance images flow ......................................................................
frontend: Virt-IO-SCSI option is not available in instance images flow The problem was that the VM did not exist yet so the device did not exist. Changed to take this value from the actual configuration on the VM dialog instead. Change-Id: Ie11044634fb4c583da6b786dd6e6f90d592669b8 Bug-Url: https://bugzilla.redhat.com/1215389 Signed-off-by: Tomas Jelinek <tjeli...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/InstanceImageLineModel.java 2 files changed, 38 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/40658/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java index 3a93776..ce9fd01 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java @@ -534,20 +534,7 @@ public void onSuccess(Object model, Object returnValue1) { getIsVirtioScsiEnabled().setEntity(Boolean.TRUE.equals(returnValue1)); - AsyncQuery asyncQuery = new AsyncQuery(this, new INewAsyncCallback() { - @Override - public void onSuccess(Object model, Object returnValue2) { - ArrayList<DiskInterface> diskInterfaces = (ArrayList<DiskInterface>) returnValue2; - - if (Boolean.FALSE.equals(getIsVirtioScsiEnabled().getEntity())) { - diskInterfaces.remove(DiskInterface.VirtIO_SCSI); - } - - setInterfaces(diskInterfaces); - } - }); - - AsyncDataProvider.getInstance().getDiskInterfaceList(getVm().getOs(), clusterVersion, asyncQuery); + updateInterfaceList(clusterVersion); } }), getVm().getId()); @@ -556,6 +543,23 @@ } } + public void updateInterfaceList(final Version clusterVersion) { + AsyncQuery asyncQuery = new AsyncQuery(this, new INewAsyncCallback() { + @Override + public void onSuccess(Object model, Object returnValue2) { + ArrayList<DiskInterface> diskInterfaces = (ArrayList<DiskInterface>) returnValue2; + + if (Boolean.FALSE.equals(getIsVirtioScsiEnabled().getEntity())) { + diskInterfaces.remove(DiskInterface.VirtIO_SCSI); + } + + setInterfaces(diskInterfaces); + } + }); + + AsyncDataProvider.getInstance().getDiskInterfaceList(getVm().getOs(), clusterVersion, asyncQuery); + } + private void setInterfaces(ArrayList<DiskInterface> diskInterfaces) { getDiskInterface().setItems(diskInterfaces); setDefaultInterface(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/InstanceImageLineModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/InstanceImageLineModel.java index 96c5a25..3a8f2a1 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/InstanceImageLineModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/InstanceImageLineModel.java @@ -123,6 +123,11 @@ } @Override + public void updateInterface(Version clusterVersion) { + InstanceImageLineModel.this.updateInterface(clusterVersion, this); + } + + @Override protected void updateBootableDiskAvailable() { updateBootableFrom(parentModel.getAllCurrentDisks()); } @@ -177,6 +182,11 @@ fillData(); } + } + + @Override + public void updateInterface(Version clusterVersion) { + InstanceImageLineModel.this.updateInterface(clusterVersion, this); } @Override @@ -255,6 +265,11 @@ ((DiskImage) disk).setActive(true); } } + } + + @Override + public void updateInterface(Version clusterVersion) { + InstanceImageLineModel.this.updateInterface(clusterVersion, this); } @Override @@ -401,4 +416,9 @@ public void deactivate() { active = false; } + + public void updateInterface(Version clusterVersion, AbstractDiskModel model) { + model.getIsVirtioScsiEnabled().setEntity(Boolean.TRUE.equals(parentModel.getUnitVmModel().getIsVirtioScsiEnabled().getEntity())); + model.updateInterfaceList(clusterVersion); + } } -- To view, visit https://gerrit.ovirt.org/40658 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie11044634fb4c583da6b786dd6e6f90d592669b8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
