Lior Vernia has uploaded a new change for review. Change subject: webadmin: Added Providers to system tree ......................................................................
webadmin: Added Providers to system tree Added new node under System node called Providers, below which will appear the providers that exist in the engine's database. Change-Id: I89c79d2789b1e6058c77404639f6c8b90f82d2a6 Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeItemType.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/tree/SystemTreeItemCell.java 5 files changed, 70 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/14760/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java index 0ed37f0..7b87c2d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java @@ -591,9 +591,11 @@ networkList.setIsAvailable(model.getType() == SystemTreeItemType.Network || model.getType() == SystemTreeItemType.Networks || model.getType() == SystemTreeItemType.System || model.getType() == SystemTreeItemType.DataCenter - || model.getType() == SystemTreeItemType.Cluster || model.getType() == SystemTreeItemType.Host); + || model.getType() == SystemTreeItemType.Cluster || model.getType() == SystemTreeItemType.Host + || model.getType() == SystemTreeItemType.Provider); - providerList.setIsAvailable(model.getType() == SystemTreeItemType.System); + providerList.setIsAvailable(model.getType() == SystemTreeItemType.System + || model.getType() == SystemTreeItemType.Providers || model.getType() == SystemTreeItemType.Provider); // Select a default item depending on system tree selection. ListModel oldSelectedItem = getSelectedItem(); @@ -670,6 +672,10 @@ case Networks: case Network: setSelectedItem(networkList); + break; + case Providers: + case Provider: + setSelectedItem(providerList); break; default: // webadmin: redirect to default tab in case no tab is selected. @@ -1265,6 +1271,16 @@ } } break; + case Providers: + if (providerList.isSearchStringMatch(source)) { + prefix.argvalue = "Provider:"; //$NON-NLS-1$ + } + break; + case Provider: + if (providerList.isSearchStringMatch(source)) { + prefix.argvalue = "Provider: name = " + model.getTitle(); //$NON-NLS-1$ + } + break; } prefix.argvalue = prefix.argvalue + " "; //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeItemType.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeItemType.java index 81dd11f..8803203 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeItemType.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeItemType.java @@ -19,7 +19,9 @@ Volume, Volumes, Networks, - Network; + Network, + Providers, + Provider; public int getValue() { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java index c26f4eb..b8d03f02 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; +import org.ovirt.engine.core.common.businessentities.Provider; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.StorageDomain; @@ -115,6 +116,16 @@ privateDataCenters = value; } + private List<Provider> privateProviders; + + private List<Provider> getProviders() { + return privateProviders; + } + + private void setProviders(List<Provider> value) { + privateProviders = value; + } + private HashMap<Guid, ArrayList<VDSGroup>> privateClusterMap; public HashMap<Guid, ArrayList<VDSGroup>> getClusterMap() @@ -191,7 +202,7 @@ { super.syncSearch(); - AsyncQuery dcQuery = new AsyncQuery(); + final AsyncQuery dcQuery = new AsyncQuery(); dcQuery.setModel(this); dcQuery.asyncCallback = new INewAsyncCallback() { @Override @@ -336,7 +347,19 @@ AsyncDataProvider.getClusterList(clusterQuery); } }; - AsyncDataProvider.getDataCenterList(dcQuery); + + AsyncQuery providersQuery = new AsyncQuery(); + providersQuery.setModel(this); + providersQuery.asyncCallback = new INewAsyncCallback() { + + @SuppressWarnings("unchecked") + @Override + public void onSuccess(Object model, Object returnValue) { + setProviders((List<Provider>) ((VdcQueryReturnValue) returnValue).getReturnValue()); + AsyncDataProvider.getDataCenterList(dcQuery); + } + }; + Frontend.RunQuery(VdcQueryType.GetAllProviders, new VdcQueryParametersBase(), providersQuery); } @Override @@ -546,6 +569,21 @@ } } } + + // Add Providers node under System + SystemTreeItemModel providersItem = new SystemTreeItemModel(); + providersItem.setType(SystemTreeItemType.Providers); + providersItem.setTitle(ConstantsManager.getInstance().getConstants().externalProvidersTitle()); + systemItem.getChildren().add(providersItem); + + // Populate with providers + for (Provider provider : getProviders()) { + SystemTreeItemModel providerItem = new SystemTreeItemModel(); + providerItem.setType(SystemTreeItemType.Provider); + providerItem.setTitle(provider.getName()); + providersItem.getChildren().add(providerItem); + } + if (!ApplicationModeHelper.getUiMode().equals(ApplicationMode.AllModes)) { ApplicationModeHelper.filterSystemTreeByApplictionMode(systemItem); } diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java index 52d5233..6e6c021 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java @@ -409,6 +409,9 @@ @DefaultStringValue("Networks") String networksTitle(); + @DefaultStringValue("External Providers") + String externalProvidersTitle(); + @DefaultStringValue("Providers") String providersTitle(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/tree/SystemTreeItemCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/tree/SystemTreeItemCell.java index 98f69cb..f739509 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/tree/SystemTreeItemCell.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/tree/SystemTreeItemCell.java @@ -75,6 +75,12 @@ case Networks: imageResource = applicationResources.networksTreeImage(); break; + case Provider: + imageResource = applicationResources.networkTreeImage(); + break; + case Providers: + imageResource = applicationResources.networksTreeImage(); + break; default: imageResource = applicationResources.questionMarkImage(); -- To view, visit http://gerrit.ovirt.org/14760 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I89c79d2789b1e6058c77404639f6c8b90f82d2a6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
