Roy Golan has uploaded a new change for review. Change subject: WIP - libosinfo - GWT use special renderer for OsType dropdwon ......................................................................
WIP - libosinfo - GWT use special renderer for OsType dropdwon Change-Id: Idd94022edc42ecffbe232bb1aa90b454713d603b Signed-off-by: Roy Golan <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.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/LoginModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmItemBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RdpConsoleModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/PoolNameLengthValidation.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/popup/console/ConsolePopupPresenterWidget.java 17 files changed, 150 insertions(+), 122 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/9063/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java index 86e4e1b..0d29683 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java @@ -579,7 +579,7 @@ public String renderNullSafe(Object object) { VmOsType osType = (VmOsType) object; Os os = AsyncDataProvider.getAllOSs().get(osType.getShortId()); - return os.getName(); + return os != null ? os.getName() : ""; } }); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java index 1a5628e..1227611 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java @@ -14,7 +14,6 @@ import org.ovirt.engine.core.common.VdcEventNotificationUtils; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.businessentities.ActionGroup; -import org.ovirt.engine.core.common.businessentities.CpuArch; import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.common.businessentities.Disk; import org.ovirt.engine.core.common.businessentities.DiskImage; @@ -107,9 +106,8 @@ import org.ovirt.engine.core.compat.StringFormat; import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.core.compat.Version; -import org.ovirt.engine.core.libosinfo.Os; -import org.ovirt.engine.core.libosinfo.Os.Resources; import org.ovirt.engine.ui.frontend.Frontend; +import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.ListModel; import org.ovirt.engine.ui.uicommonweb.models.tags.TagModel; @@ -127,9 +125,6 @@ @SuppressWarnings("unused") public final class DataProvider { - public static final String LINUX = "linux"; //$NON-NLS-$1 - public static final String WINDOWS = "windows";//$NON-NLS-$1 - public static final String WINXP = "winxp";//$NON-NLS-$1 public static final int SearchLimit = 9999; public static String GetLocalFSPath() @@ -730,7 +725,7 @@ return new ArrayList<bookmarks>(); } - public static ArrayList<VmInterfaceType> GetNicTypeList(String osId, boolean hasDualmode) + public static ArrayList<VmInterfaceType> GetNicTypeList(VmOsType osType, boolean hasDualmode) { ArrayList<VmInterfaceType> list = new ArrayList<VmInterfaceType>(); for (VmInterfaceType item : EnumCompat.GetValues(VmInterfaceType.class)) @@ -740,10 +735,10 @@ list.remove(VmInterfaceType.rtl8139_pv); // Dual mode NIC should be available only for existing NICs that have // that type already - if (IsWindowsOsType(osId)) + if (AsyncDataProvider.IsWindowsOsType(osType)) { list.remove(VmInterfaceType.e1000); - if (osId.equalsIgnoreCase(WINXP) && hasDualmode) + if (VmOsType.WindowsXP == osType && hasDualmode) { list.add(VmInterfaceType.rtl8139_pv); } @@ -756,7 +751,7 @@ * @param osType * @return currently same answer for all. // FIXME integrate libosinfo. */ - public static VmInterfaceType GetDefaultNicType(String osType) + public static VmInterfaceType GetDefaultNicType(VmOsType osType) { return VmInterfaceType.pv; } @@ -1704,16 +1699,16 @@ })); } - public static ArrayList<DiskInterface> GetDiskInterfaceList(String osId, Version Version) + public static ArrayList<DiskInterface> GetDiskInterfaceList(VmOsType osType, Version Version) { - return osId.equalsIgnoreCase(WINXP) && (Version == null || Version.compareTo(new Version("2.2")) < 0) ? new ArrayList<DiskInterface>(Arrays.asList(new DiskInterface[] { DiskInterface.IDE })) //$NON-NLS-1$ + return osType == VmOsType.WindowsXP && (Version == null || Version.compareTo(new Version("2.2")) < 0) ? new ArrayList<DiskInterface>(Arrays.asList(new DiskInterface[] { DiskInterface.IDE })) //$NON-NLS-1$ : new ArrayList<DiskInterface>(Arrays.asList(new DiskInterface[] { DiskInterface.IDE, DiskInterface.VirtIO })); } - public static DiskInterface GetDefaultDiskInterface(String osId, List<Disk> disks) + public static DiskInterface GetDefaultDiskInterface(VmOsType osType, List<Disk> disks) { - return osId.equalsIgnoreCase(WINXP) ? DiskInterface.IDE : disks != null && disks.size() > 0 ? disks.get(0) + return osType == VmOsType.WindowsXP ? DiskInterface.IDE : disks != null && disks.size() > 0 ? disks.get(0) .getDiskInterface() : DiskInterface.VirtIO; } @@ -2375,9 +2370,6 @@ } // cacheCustomProperties = null; - windowsOsTypes = null; - linuxOsTypes = null; - x64OsTypes = null; hasAdminSystemPermission = null; } @@ -2520,76 +2512,12 @@ // return new HashMap<String, String>(); // } - private static Map<VmOsType, Os> osMap; - private static ArrayList<VmOsType> windowsOsTypes = new ArrayList<VmOsType>(); - private static ArrayList<VmOsType> linuxOsTypes = new ArrayList<VmOsType>(); - private static ArrayList<VmOsType> x64OsTypes = new ArrayList<VmOsType>(); - @SuppressWarnings("unchecked") - public static Map<VmOsType, Os> getAllOSs() { - if (osMap == null) - { - VdcQueryReturnValue ret = Frontend.RunQuery(VdcQueryType.GetOsInfoMap, new VdcQueryParametersBase()); - if (ret.getSucceeded() && ret.getReturnValue() != null) - { - osMap = (Map<VmOsType, Os>) ret.getReturnValue(); - fillOsListTypes(osMap); - } - } - return osMap; - } - private static void fillOsListTypes(Map<VmOsType, Os> osMap) { - for (Os os : osMap.values()) - { - if (WINDOWS.equalsIgnoreCase(os.getFamily())) - { - windowsOsTypes.add(VmOsType.getByShortId(os.getShortId())); - } - else if (LINUX.equalsIgnoreCase(os.getFamily())) - { - linuxOsTypes.add(VmOsType.getByShortId(os.getShortId())); - } - // fill arch type list by finding resources with arch of x84_64 - for (Resources resources : os.getResources()) { - if (CpuArch.X86_64.name().equalsIgnoreCase(resources.getArch())) - { - x64OsTypes.add(VmOsType.getByShortId(os.getShortId())); - } - } - } - } - public static ArrayList<VmOsType> GetWindowsOsTypes() - { - return windowsOsTypes; - } - public static boolean IsWindowsOsType(VmOsType osType) - { - return GetWindowsOsTypes().contains(osType); - } - public static ArrayList<VmOsType> GetLinuxOsTypes() - { - return linuxOsTypes; - } - - public static boolean IsLinuxOsType(VmOsType osType) - { - return GetLinuxOsTypes().contains(osType); - } - - public static ArrayList<VmOsType> Get64bitOsTypes() - { - return x64OsTypes; - } - - public static boolean Is64bitOsType(VmOsType osType) - { - return Get64bitOsTypes().contains(osType.getShortId()); - } private static Boolean hasAdminSystemPermission = null; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java index f38067f..07b4ef9 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java @@ -11,6 +11,7 @@ import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.ActionGroup; +import org.ovirt.engine.core.common.businessentities.CpuArch; import org.ovirt.engine.core.common.businessentities.Disk; import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.DiskImageBase; @@ -30,6 +31,7 @@ import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; import org.ovirt.engine.core.common.businessentities.VmNetworkInterface; +import org.ovirt.engine.core.common.businessentities.VmOsType; import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.VmTemplateStatus; import org.ovirt.engine.core.common.businessentities.VolumeFormat; @@ -101,6 +103,8 @@ import org.ovirt.engine.core.compat.StringFormat; import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.core.compat.Version; +import org.ovirt.engine.core.libosinfo.Os; +import org.ovirt.engine.core.libosinfo.Os.Resources; import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.IAsyncConverter; @@ -112,9 +116,14 @@ import org.ovirt.engine.ui.uicommonweb.models.vms.WANDisableEffects; import org.ovirt.engine.ui.uicommonweb.models.vms.WanColorDepth; import org.ovirt.engine.ui.uicompat.FrontendMultipleQueryAsyncResult; +import org.ovirt.engine.ui.uicompat.FrontendQueryAsyncResult; import org.ovirt.engine.ui.uicompat.IFrontendMultipleQueryAsyncCallback; +import org.ovirt.engine.ui.uicompat.IFrontendQueryAsyncCallback; public final class AsyncDataProvider { + + public static final String LINUX = "linux"; //$NON-NLS-1$ + public static final String WINDOWS = "windows";//$NON-NLS-1$ // dictionary to hold cache of all config values (per version) queried by client, if the request for them succeeded. private static HashMap<KeyValuePairCompat<ConfigurationValues, String>, Object> cachedConfigValues = @@ -2475,4 +2484,90 @@ tempVar.setVersion(version); GetConfigFromCache(tempVar, aQuery); } + + + private static Map<String, Os> osMap; + private static ArrayList<VmOsType> windowsOsTypes = new ArrayList<VmOsType>(); + private static ArrayList<VmOsType> linuxOsTypes = new ArrayList<VmOsType>(); + private static ArrayList<VmOsType> x64OsTypes = new ArrayList<VmOsType>(); + + @SuppressWarnings("unchecked") + public static Map<String, Os> getAllOSs() { + if (osMap == null) + { + Frontend.RunQuery(VdcQueryType.GetOsInfoMap, + new VdcQueryParametersBase(), + new IFrontendQueryAsyncCallback() { + + @Override + public void OnSuccess(FrontendQueryAsyncResult result) { + VdcQueryReturnValue ret = result.getReturnValue(); + if (ret.getSucceeded() && ret.getReturnValue() != null) + { + osMap = (HashMap<String, Os>) ret.getReturnValue(); + fillOsListTypes(osMap); + } + } + + @Override + public void OnFailure(FrontendQueryAsyncResult result) { + } + }); + + } + return osMap; + } + + private static void fillOsListTypes(Map<String, Os> osMap) { + for (Os os : osMap.values()) + { + if (WINDOWS.equalsIgnoreCase(os.getFamily())) + { + windowsOsTypes.add(VmOsType.getByShortId(os.getShortId())); + } + else if (LINUX.equalsIgnoreCase(os.getFamily())) + { + linuxOsTypes.add(VmOsType.getByShortId(os.getShortId())); + } + // fill arch type list by finding resources with arch of x84_64 + for (Resources resources : os.getResources()) { + if (CpuArch.X86_64.name().equalsIgnoreCase(resources.getArch())) + { + x64OsTypes.add(VmOsType.getByShortId(os.getShortId())); + } + } + } + + } + + public static ArrayList<VmOsType> GetWindowsOsTypes() + { + return windowsOsTypes; + } + + public static boolean IsWindowsOsType(VmOsType osType) + { + return GetWindowsOsTypes().contains(osType); + } + + public static ArrayList<VmOsType> GetLinuxOsTypes() + { + return linuxOsTypes; + } + + public static boolean IsLinuxOsType(VmOsType osType) + { + return GetLinuxOsTypes().contains(osType); + } + + public static ArrayList<VmOsType> Get64bitOsTypes() + { + return x64OsTypes; + } + + public static boolean Is64bitOsType(VmOsType osType) + { + return Get64bitOsTypes().contains(osType.getShortId()); + } + } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java index 92ec833..b8d05a8 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java @@ -329,6 +329,10 @@ loginModel.getLoggedInEvent().raise(this, EventArgs.Empty); } })); + + // Cache Os info data + AsyncDataProvider.getAllOSs(); + } public void AutoLogin(VdcUser user) diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java index 06ad760..8419944 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java @@ -1,5 +1,8 @@ package org.ovirt.engine.ui.uicommonweb.models.pools; +import java.util.ArrayList; +import java.util.Iterator; + import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.DisplayType; import org.ovirt.engine.core.common.businessentities.OriginType; @@ -24,14 +27,11 @@ import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; -import org.ovirt.engine.ui.uicommonweb.DataProvider; +import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicompat.ConstantsManager; import org.ovirt.engine.ui.uicompat.EnumTranslator; import org.ovirt.engine.ui.uicompat.Translator; - -import java.util.ArrayList; -import java.util.Iterator; @SuppressWarnings("unused") public class PoolGeneralModel extends EntityModel @@ -471,10 +471,10 @@ translator = EnumTranslator.Create(UsbPolicy.class); poolGeneralModel.setUsbPolicy(translator.get(getvm().getusb_policy())); - setHasDomain(DataProvider.IsWindowsOsType(getvm().getvm_os())); + setHasDomain(AsyncDataProvider.IsWindowsOsType(getvm().getvm_os())); poolGeneralModel.setDomain(getvm().getvm_domain()); - setHasTimeZone(DataProvider.IsWindowsOsType(getvm().getvm_os())); + setHasTimeZone(AsyncDataProvider.IsWindowsOsType(getvm().getvm_os())); poolGeneralModel.setTimeZone(getvm().gettime_zone()); poolGeneralModel.setIsStateless(getvm().getis_stateless()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java index 8766341..c80ed97 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java @@ -298,7 +298,7 @@ String nameMsg; VM vm = (VM) object; VmOsType osType = vm.getvm_os(); - if (DataProvider.IsWindowsOsType(osType)) + if (AsyncDataProvider.IsWindowsOsType(osType)) { nameExpr = "^[0-9a-zA-Z-_]{1," + UnitVmModel.WINDOWS_VM_NAME_MAX_LIMIT + "}$"; //$NON-NLS-1$ //$NON-NLS-2$ nameMsg = diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java index 3912e8e..9b65239 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java @@ -15,6 +15,7 @@ import org.ovirt.engine.core.compat.StringFormat; import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.ui.uicommonweb.DataProvider; +import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicompat.ConstantsManager; import org.ovirt.engine.ui.uicompat.EnumTranslator; @@ -475,10 +476,10 @@ translator = EnumTranslator.Create(OriginType.class); setOrigin(translator.get(template.getorigin())); - setHasDomain(DataProvider.IsWindowsOsType(template.getos())); + setHasDomain(AsyncDataProvider.IsWindowsOsType(template.getos())); setDomain(template.getdomain()); - setHasTimeZone(DataProvider.IsWindowsOsType(template.getos())); + setHasTimeZone(AsyncDataProvider.IsWindowsOsType(template.getos())); setTimeZone(template.gettime_zone()); setHasUsbPolicy(true); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java index c1a8a90..dcda73d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java @@ -22,9 +22,9 @@ import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; -import org.ovirt.engine.ui.uicommonweb.DataProvider; import org.ovirt.engine.ui.uicommonweb.Linq; import org.ovirt.engine.ui.uicommonweb.UICommand; +import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.ListModel; import org.ovirt.engine.ui.uicommonweb.models.Model; @@ -390,7 +390,7 @@ item.getDefaultConsole().setForceVmStatusUp(true); // Update additional console - if (DataProvider.IsWindowsOsType(vm.getvm_os())) + if (AsyncDataProvider.IsWindowsOsType(vm.getvm_os())) { item.setAdditionalConsole(cachedModels.get(2)); item.setHasAdditionalConsole(true); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java index 9b3959c..752c9a8 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java @@ -730,11 +730,11 @@ model.getCustomProperties().setEntity(vm.getCustomProperties()); - model.setIsLinux_Unassign_UnknownOS(DataProvider.IsLinuxOsType(vm.getvm_os()) + model.setIsLinux_Unassign_UnknownOS(AsyncDataProvider.IsLinuxOsType(vm.getvm_os()) || vm.getvm_os() == VmOsType.Unassigned || vm.getvm_os() == VmOsType.Other); model.getIsLinuxOptionsAvailable().setEntity(model.getIsLinux_Unassign_UnknownOS()); - model.setIsWindowsOS(DataProvider.IsWindowsOsType(vm.getvm_os())); + model.setIsWindowsOS(AsyncDataProvider.IsWindowsOsType(vm.getvm_os())); model.getIsVmFirstRun().setEntity(!vm.getis_initialized()); model.getSysPrepDomainName().setSelectedItem(vm.getvm_domain()); @@ -855,7 +855,7 @@ VM selectedVM = (VM) userPortalItemModel.getEntity(); List<String> images = (List<String>) result; - if (DataProvider.IsWindowsOsType(selectedVM.getvm_os())) + if (AsyncDataProvider.IsWindowsOsType(selectedVM.getvm_os())) { // Add a pseudo floppy disk image used for Windows' sysprep. if (!selectedVM.getis_initialized()) @@ -1796,7 +1796,7 @@ item.getDefaultConsole().setForceVmStatusUp(false); // Update additional console - if (DataProvider.IsWindowsOsType(vm.getvm_os())) + if (AsyncDataProvider.IsWindowsOsType(vm.getvm_os())) { item.setAdditionalConsole(cachedModels.get(2)); item.setHasAdditionalConsole(true); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmItemBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmItemBehavior.java index a7a80b1..cd03e6d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmItemBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmItemBehavior.java @@ -21,7 +21,6 @@ import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; -import org.ovirt.engine.ui.uicommonweb.DataProvider; import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.configure.ChangeCDModel; @@ -141,7 +140,7 @@ { VM entity = (VM) getItem().getEntity(); // use sysprep iff the vm is not initialized and vm has Win OS - boolean reinitialize = !entity.getis_initialized() && DataProvider.IsWindowsOsType(entity.getvm_os()); + boolean reinitialize = !entity.getis_initialized() && AsyncDataProvider.IsWindowsOsType(entity.getvm_os()); RunVmParams tempVar = new RunVmParams(entity.getId()); tempVar.setReinitialize(reinitialize); Frontend.RunAction(VdcActionType.RunVm, tempVar); @@ -167,7 +166,7 @@ getItem().getDefaultConsole().setEntity(entity); // Support RDP console for windows VMs. - if (DataProvider.IsWindowsOsType(entity.getvm_os())) + if (AsyncDataProvider.IsWindowsOsType(entity.getvm_os())) { if (getItem().getAdditionalConsole() == null) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RdpConsoleModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RdpConsoleModel.java index c8578eb..4361e70 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RdpConsoleModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RdpConsoleModel.java @@ -4,8 +4,8 @@ import org.ovirt.engine.core.compat.Event; import org.ovirt.engine.core.compat.EventArgs; import org.ovirt.engine.core.compat.EventDefinition; -import org.ovirt.engine.ui.uicommonweb.DataProvider; import org.ovirt.engine.ui.uicommonweb.TypeResolver; +import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicompat.ConstantsManager; @SuppressWarnings("unused") @@ -68,7 +68,7 @@ getConnectCommand().setIsExecutionAllowed(getEntity() != null && (getEntity().getstatus() == VMStatus.Up || getEntity().getstatus() == VMStatus.PoweringDown) - && DataProvider.IsWindowsOsType(getEntity().getvm_os())); + && AsyncDataProvider.IsWindowsOsType(getEntity().getvm_os())); } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java index 675596d..0fbc044 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java @@ -123,7 +123,7 @@ } // If it is not windows or SPICE guest agent is not installed, make sure the WAN options are disabled. - if (!DataProvider.IsWindowsOsType(getEntity().getvm_os()) || getEntity().getSpiceDriverVersion() == null) { + if (!AsyncDataProvider.IsWindowsOsType(getEntity().getvm_os()) || getEntity().getSpiceDriverVersion() == null) { getspice().setIsWanOptionsEnabled(false); } @@ -172,7 +172,7 @@ { // use sysprep iff the vm is not initialized and vm has Win OS boolean reinitialize = - !getEntity().getis_initialized() && DataProvider.IsWindowsOsType(getEntity().getvm_os()); + !getEntity().getis_initialized() && AsyncDataProvider.IsWindowsOsType(getEntity().getvm_os()); RunVmParams tempVar = new RunVmParams(getEntity().getId()); tempVar.setRunAsStateless(getEntity().getis_stateless()); tempVar.setReinitialize(reinitialize); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java index a75ce18..e101ed4 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java @@ -30,7 +30,6 @@ import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; -import org.ovirt.engine.ui.uicommonweb.DataProvider; import org.ovirt.engine.ui.uicommonweb.Linq; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; @@ -1318,7 +1317,7 @@ getUsbPolicy().setIsChangable(true); if (Version.v3_1.compareTo(cluster.getcompatibility_version()) > 0) { - if (DataProvider.IsWindowsOsType(osType)) { + if (AsyncDataProvider.IsWindowsOsType(osType)) { getUsbPolicy().setItems(Arrays.asList( UsbPolicy.DISABLED, UsbPolicy.ENABLED_LEGACY @@ -1331,7 +1330,7 @@ } if (Version.v3_1.compareTo(cluster.getcompatibility_version()) <= 0) { - if (DataProvider.IsLinuxOsType(osType)) { + if (AsyncDataProvider.IsLinuxOsType(osType)) { getUsbPolicy().setItems(Arrays.asList( UsbPolicy.DISABLED, UsbPolicy.ENABLED_NATIVE @@ -1473,8 +1472,8 @@ { VmOsType osType = (VmOsType) getOSType().getSelectedItem(); - setIsWindowsOS(DataProvider.IsWindowsOsType(osType)); - setIsLinux_Unassign_UnknownOS(DataProvider.IsLinuxOsType(osType) || osType == VmOsType.Unassigned + setIsWindowsOS(AsyncDataProvider.IsWindowsOsType(osType)); + setIsLinux_Unassign_UnknownOS(AsyncDataProvider.IsLinuxOsType(osType) || osType == VmOsType.Unassigned || osType == VmOsType.Other); getInitrd_path().setIsChangable(getIsLinux_Unassign_UnknownOS()); @@ -1823,7 +1822,7 @@ } // for VM it depends on the OS type - return new LengthValidation(DataProvider.IsWindowsOsType(osType) ? WINDOWS_VM_NAME_MAX_LIMIT + return new LengthValidation(AsyncDataProvider.IsWindowsOsType(osType) ? WINDOWS_VM_NAME_MAX_LIMIT : NON_WINDOWS_VM_NAME_MAX_LIMIT); } @@ -1847,7 +1846,7 @@ String nameExpr = "^[-\\w\\.]{1,"; //$NON-NLS-1$ String nameMsg; - if (DataProvider.IsWindowsOsType(osType)) + if (AsyncDataProvider.IsWindowsOsType(osType)) { nameExpr += WINDOWS_VM_NAME_MAX_LIMIT; nameMsg = @@ -1879,7 +1878,7 @@ }); boolean is64OsType = - (osType == VmOsType.Other || osType == VmOsType.OtherLinux || DataProvider.Is64bitOsType(osType)); + (osType == VmOsType.Other || osType == VmOsType.OtherLinux || AsyncDataProvider.Is64bitOsType(osType)); int maxMemSize = is64OsType ? get_MaxMemSize64() : get_MaxMemSize32(); ValidateMemorySize(getMemSize(), maxMemSize, _minMemSize); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java index 78cbe25..f63f03a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java @@ -29,6 +29,7 @@ import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; import org.ovirt.engine.ui.uicommonweb.DataProvider; +import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicompat.ConstantsManager; import org.ovirt.engine.ui.uicompat.EnumTranslator; @@ -621,10 +622,10 @@ setCpuInfo(vm.getnum_of_cpus() + " " + "(" + vm.getnum_of_sockets() + " Socket(s), " + vm.getcpu_per_socket() //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + " Core(s) per Socket)"); //$NON-NLS-1$ - setHasDomain(DataProvider.IsWindowsOsType(vm.getvm_os())); + setHasDomain(AsyncDataProvider.IsWindowsOsType(vm.getvm_os())); setDomain(vm.getvm_domain()); - setHasTimeZone(DataProvider.IsWindowsOsType(vm.getvm_os())); + setHasTimeZone(AsyncDataProvider.IsWindowsOsType(vm.getvm_os())); setTimeZone(vm.gettime_zone()); setHasCustomProperties(!StringHelper.stringsEqual(vm.getCustomProperties(), "")); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java index b528f5d..67cbe6c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java @@ -755,7 +755,7 @@ setDefaultConsoleModel(vm.getdisplay_type() == DisplayType.vnc ? cachedModels.get(1) : cachedModels.get(0)); - if (DataProvider.IsWindowsOsType(vm.getvm_os())) + if (AsyncDataProvider.IsWindowsOsType(vm.getvm_os())) { for (ConsoleModel a : cachedModels) { @@ -1255,10 +1255,10 @@ model.setCustomPropertiesKeysList(this.getCustomPropertiesKeysList() .get(vm.getvds_group_compatibility_version())); - model.setIsLinux_Unassign_UnknownOS(DataProvider.IsLinuxOsType(vm.getvm_os()) + model.setIsLinux_Unassign_UnknownOS(AsyncDataProvider.IsLinuxOsType(vm.getvm_os()) || vm.getvm_os() == VmOsType.Unassigned || vm.getvm_os() == VmOsType.Other); model.getIsLinuxOptionsAvailable().setEntity(model.getIsLinux_Unassign_UnknownOS()); - model.setIsWindowsOS(DataProvider.IsWindowsOsType(vm.getvm_os())); + model.setIsWindowsOS(AsyncDataProvider.IsWindowsOsType(vm.getvm_os())); model.getIsVmFirstRun().setEntity(!vm.getis_initialized()); model.getSysPrepDomainName().setSelectedItem(vm.getvm_domain()); @@ -1363,7 +1363,7 @@ { RunOnceModel model = (RunOnceModel) getWindow(); - if (DataProvider.IsWindowsOsType(vm.getvm_os())) + if (AsyncDataProvider.IsWindowsOsType(vm.getvm_os())) { // Add a pseudo floppy disk image used for Windows' sysprep. if (!vm.getis_initialized()) @@ -1992,7 +1992,7 @@ { VM a = (VM) item; // use sysprep iff the vm is not initialized and vm has Win OS - boolean reinitialize = !a.getis_initialized() && DataProvider.IsWindowsOsType(a.getvm_os()); + boolean reinitialize = !a.getis_initialized() && AsyncDataProvider.IsWindowsOsType(a.getvm_os()); RunVmParams tempVar = new RunVmParams(a.getId()); tempVar.setReinitialize(reinitialize); list.add(tempVar); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/PoolNameLengthValidation.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/PoolNameLengthValidation.java index e7bc457..d42790e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/PoolNameLengthValidation.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/PoolNameLengthValidation.java @@ -3,7 +3,7 @@ import java.util.Arrays; import org.ovirt.engine.core.common.businessentities.VmOsType; -import org.ovirt.engine.ui.uicommonweb.DataProvider; +import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.vms.UnitVmModel; public class PoolNameLengthValidation implements IValidation { @@ -49,7 +49,7 @@ } protected int getMaxNameLength() { - return DataProvider.IsWindowsOsType(osType) ? + return AsyncDataProvider.IsWindowsOsType(osType) ? UnitVmModel.WINDOWS_VM_NAME_MAX_LIMIT : UnitVmModel.NON_WINDOWS_VM_NAME_MAX_LIMIT; } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/popup/console/ConsolePopupPresenterWidget.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/popup/console/ConsolePopupPresenterWidget.java index aa8860c..06f110a 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/popup/console/ConsolePopupPresenterWidget.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/popup/console/ConsolePopupPresenterWidget.java @@ -5,6 +5,7 @@ import org.ovirt.engine.core.compat.IEventListener; import org.ovirt.engine.ui.common.presenter.AbstractModelBoundPopupPresenterWidget; import org.ovirt.engine.ui.uicommonweb.UICommand; +import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalConsolePopupModel; import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalItemModel; import org.ovirt.engine.ui.uicommonweb.models.vms.ConsoleModel; @@ -158,7 +159,7 @@ } } - boolean isWindowsVm = asUserPortalItem(model).getOsType().isWindows(); + boolean isWindowsVm = AsyncDataProvider.IsWindowsOsType(asUserPortalItem(model).getOsType()); boolean spiceGuestAgentInstalled = asUserPortalItem(model).getSpiceDriverVersion() != null; wanOptionsAvailable = isWindowsVm && spiceAvailable && spiceGuestAgentInstalled; -- To view, visit http://gerrit.ovirt.org/9063 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd94022edc42ecffbe232bb1aa90b454713d603b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
