Tomas Jelinek has submitted this change and it was merged. Change subject: webadmin: v2v-improve loading of external vms ...................................................................... webadmin: v2v-improve loading of external vms Improve the loading performance of external VMs from external server for the following sources: VMware, KVM, Xen. This is done by receiving the VMs names only in the 1st phase, i.e. in the 1st import dialog (New VDSM api was added for receiving VMS names only on a seperate patch). And only when choosing the VMS to import and clicking on the "Next" button in order to display full VMs data on the 2nd dialog, then we receive full info (xml+disks) for those choosen VMs only. (changing the existed VDSM api for receiving full VMs data on subset of VMS and not for all VMs existed was added in a seperate patch). The following functional changes were done to support it: 1. Displaying only VMs names in those two lists of 1st dialog. The CPU architecture for each VM which was displayed in brackets was removed. 2. Checking the cpu architecture of the chosen VMS in order to find appropriate cluster is done only after clicking the "Next" button because we don't have this information earlier. In case of a problem with the cpu architecture, a popup message is displayed as before. 3. The VMs status (up/down) is known only after clicking the "Next" button. Therefore in case the user choose VMs in 1st dialog which are discovered to be running or can't be retrieved with their full info, they won't appear on 2nd dialog, BUT a warning message in the appropriate dialog is displayed in such cases and also a message in audit log listing the running VMs is added. So the user will be able to stop/fix those VMs, click "Back" and then "Next" and those missing VMs will appear in the 2nd dialog. 4. Each clicking on the "Next" button "reloads" all VMs data for all chosen VMs and not just for the added new ones. 5. backward compatibility - for handling old proxy hosts: When choosing old proxy host < 4.1 then the flow is the old flow as done before this fix. Meaning that we get all VMs with full data in the 1st dialog. The only changes for old proxy hosts are that no cpu architecture is displayed and also better and new messages and logging in case of running/non-retrieved VMs choosen to be imported. 6. Adding this new patch support for 4.1 and upper versions is configurable via the vdc_options and can be disabled if needed. Bug-Url: https://bugzilla.redhat.com/1294629 Change-Id: Ica95a150c656ad9b860914323b05ba466837be77 Signed-off-by: Sharon Gratch <sgratch@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsFromExternalProviderQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/ProviderProxyFactory.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/vms/AbstractVmProviderProxy.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmsFromExternalProviderQueryParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVmsFromExternalProviderParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java A backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVmsFullInfoFromExternalProviderVDSCommand.java R backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVmsNamesFromExternalProviderVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VMListReturnForXmlRpc.java A backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VMNamesListReturnForXmlRpc.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExternalProviderModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExternalSourceModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java M frontend/webadmin/modules/uicompat/exclude-filters.xml M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants.properties M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIMessages.properties M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.java M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql 32 files changed, 479 insertions(+), 80 deletions(-) Approvals: Tomas Jelinek: Looks good to me, approved Jenkins CI: Passed CI tests Sharon Gratch: Verified Arik Hadas: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/60409 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ica95a150c656ad9b860914323b05ba466837be77 Gerrit-PatchSet: 31 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sharon Gratch <sgratch@redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas@redhat.com> Gerrit-Reviewer: Jakub Niedermertl <jniederm@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Betak <mbetak@redhat.com> Gerrit-Reviewer: Sharon Gratch <sgratch@redhat.com> Gerrit-Reviewer: Tomas Jelinek <tjelinek@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>