Alona Kaplan has uploaded a new change for review. Change subject: webadmin: adding labels column to Network->Hosts sub-tab ......................................................................
webadmin: adding labels column to Network->Hosts sub-tab Adding a column that shows all the lables on the nic (comma separated). Change-Id: I610703df29dcae7ace390e0ebb109475fb202263 Signed-off-by: Alona Kaplan <[email protected]> Bug-Url: https://bugzilla.redhat.com/1063797 --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java 2 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/24992/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java index 8832c68..9db6753 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java @@ -1344,6 +1344,9 @@ @DefaultStringValue("Network Device Tx") String txNetworkHost(); + @DefaultStringValue("Lables") + String labelsNetworkHost(); + // Network VM @DefaultStringValue("vNIC Status") String vnicStatusNetworkVM(); 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 b0b5aa9..cced28c 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 @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.webadmin.section.main.view.tab.network; import java.util.Arrays; +import java.util.Set; import javax.inject.Inject; @@ -8,6 +9,7 @@ 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; +import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.ui.common.uicommon.model.SearchableDetailModelProvider; import org.ovirt.engine.ui.common.view.ViewRadioGroup; import org.ovirt.engine.ui.common.widget.table.column.RxTxRateColumn; @@ -157,6 +159,15 @@ } }; + TextColumnWithTooltip<PairQueryable<VdsNetworkInterface, VDS>> labelsColumn = + new TextColumnWithTooltip<PairQueryable<VdsNetworkInterface, VDS>>() { + @Override + public String getValue(PairQueryable<VdsNetworkInterface, VDS> object) { + Set<String> lablesList = object.getFirst().getLabels(); + return StringHelper.join(", ", lablesList != null ? lablesList.toArray() : null); //$NON-NLS-1$ + } + }; + private void handleRadioButtonClick(ClickEvent event) { getDetailModel().setViewFilterType((viewRadioGroup.getSelectedValue())); @@ -168,6 +179,7 @@ getTable().ensureColumnPresent(dcColumn, constants.dcHost(), true, "200px"); //$NON-NLS-1$ getTable().ensureColumnPresent(nicStatusColumn, constants.statusNetworkHost(), attached, "140px"); //$NON-NLS-1$ getTable().ensureColumnPresent(nicColumn, constants.nicNetworkHost(), attached, "200px"); //$NON-NLS-1$ + getTable().ensureColumnPresent(labelsColumn, constants.labelsNetworkHost(), true, "200px"); //$NON-NLS-1$ getTable().ensureColumnPresent(speedColumn, constants.speedNetworkHost(), attached, "200px"); //$NON-NLS-1$ getTable().ensureColumnPresent(nicRxColumn, templates.sub(constants.rxNetworkHost(), constants.mbps()).asString(), -- To view, visit http://gerrit.ovirt.org/24992 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I610703df29dcae7ace390e0ebb109475fb202263 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
