Eliraz Levi has uploaded a new change for review. Change subject: webadmin: adding sync column to subtab net host ......................................................................
webadmin: adding sync column to subtab net host adding sync column inidcating host sync status Change-Id: I4dd5d3a1e799d8ec0c8f8cea2d4ff7257d0234c2 Bug-Url: https://bugzilla.redhat.com/1037612 Signed-off-by: Eliraz Levi <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java 2 files changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/35697/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index 5a4629f..db402c9 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -1278,6 +1278,9 @@ @DefaultStringValue("Data Center") String networkPopupDataCenterLabel(); + @DefaultStringValue("Sync") + String hostSyncColumn(); + // Quota Storage @DefaultStringValue("Name") String nameQuotaStorage(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java index e50f9c5..a59e234 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java @@ -7,6 +7,7 @@ import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.comparators.LexoNumericComparator; +import org.ovirt.engine.core.common.businessentities.network.InterfaceStatus; import org.ovirt.engine.core.common.businessentities.network.NetworkView; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; import org.ovirt.engine.core.common.utils.PairQueryable; @@ -90,6 +91,26 @@ } private final HostStatusColumn<PairQueryable<VdsNetworkInterface, VDS>> hostStatus = new HostStatusColumn<PairQueryable<VdsNetworkInterface, VDS>>(); + + + WebAdminImageResourceColumn<PairQueryable<VdsNetworkInterface, VDS>> hostSyncStatus = new WebAdminImageResourceColumn<PairQueryable<VdsNetworkInterface, VDS>>(){ + + @Override + public ImageResource getValue(PairQueryable<VdsNetworkInterface, VDS> object) { + if (object.getFirst() != null){ + //TODO elevi set icons + if (object.getFirst().getNetworkImplementationDetails().isInSync()){ + return InterfaceStatusImage.getResource(InterfaceStatus.UP); + } + else { + return InterfaceStatusImage.getResource(InterfaceStatus.DOWN); + } + + } + return null; + } + }; + private final TextColumnWithTooltip<PairQueryable<VdsNetworkInterface, VDS>> nameColumn = new TextColumnWithTooltip<PairQueryable<VdsNetworkInterface, VDS>>() { @Override @@ -201,6 +222,7 @@ boolean attached = viewRadioGroup.getSelectedValue() == NetworkHostFilter.attached; getTable().ensureColumnPresent(hostStatus, constants.empty(), true, "30px"); //$NON-NLS-1$ + getTable().ensureColumnPresent(hostSyncStatus, constants.hostSyncColumn(), true, "30px"); //$NON-NLS-1$ getTable().ensureColumnPresent(nameColumn, constants.nameHost(), true, "200px"); //$NON-NLS-1$ getTable().ensureColumnPresent(clusterColumn, constants.clusterHost(), true, "200px"); //$NON-NLS-1$ getTable().ensureColumnPresent(dcColumn, constants.dcHost(), true, "200px"); //$NON-NLS-1$ @@ -237,6 +259,22 @@ private void initSorting() { hostStatus.makeSortable(); nameColumn.makeSortable(); + hostSyncStatus.makeSortable((new Comparator<PairQueryable<VdsNetworkInterface, VDS>>() { + + @Override + public int compare(PairQueryable<VdsNetworkInterface, VDS> o1, PairQueryable<VdsNetworkInterface, VDS> o2) { + boolean syncStatus1 = (o1.getFirst() == null) ? null : o1.getFirst().getNetworkImplementationDetails().isInSync(); + boolean syncStatus2 = (o2.getFirst() == null) ? null : o2.getFirst().getNetworkImplementationDetails().isInSync(); + if (syncStatus1 && !syncStatus2){ + return 1; + } + else if (syncStatus2 && ! syncStatus1){ + return -1; + } + + return 0; + } + })); clusterColumn.makeSortable(); dcColumn.makeSortable(); nicStatusColumn.makeSortable(new SimpleStatusColumnComparator<PairQueryable<VdsNetworkInterface, VDS>>(nicStatusColumn)); -- To view, visit http://gerrit.ovirt.org/35697 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4dd5d3a1e799d8ec0c8f8cea2d4ff7257d0234c2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eliraz Levi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
