Vinzenz Feenstra has uploaded a new change for review. Change subject: frontend: Adding FQDN column to VmViews ......................................................................
frontend: Adding FQDN column to VmViews The VM Views now also display the FQDN of the Virtual Machine Change-Id: If84c4d2a8c1f11e09f3748477a230d7d3188482b Signed-off-by: Vinzenz Feenstra <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskVmView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostVmView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkVmView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolVmView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/template/SubTabTemplateVmView.java 6 files changed, 57 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/17865/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java index a76b9f8..668aad5 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java @@ -84,6 +84,16 @@ }; getTable().addColumn(ipColumn, constants.ipVm(), "120px"); //$NON-NLS-1$ + TextColumnWithTooltip<VM> fqdnColumn = new TextColumnWithTooltip<VM>() { + @Override + public String getValue(VM object) { + setTitle(object.getVmFQDN()); + return object.getVmFQDN(); + } + + }; + getTable().addColumn(fqdnColumn, constants.fqdn(), "120px"); //$NON-NLS-1$ + TextColumnWithTooltip<VM> clusterColumn = new TextColumnWithTooltip<VM>() { @Override public String getValue(VM object) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskVmView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskVmView.java index 7d66f04..ce912b8 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskVmView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskVmView.java @@ -76,6 +76,15 @@ }; getTable().addColumn(ipColumn, constants.ipVm(), "140px"); //$NON-NLS-1$ + TextColumnWithTooltip<VM> fqdnColumn = new TextColumnWithTooltip<VM>() { + @Override + public String getValue(VM object) { + setTitle(object.getVmFQDN()); + return object.getVmFQDN(); + } + }; + getTable().addColumn(fqdnColumn, constants.fqdn(), "140px"); //$NON-NLS-1$ + PercentColumn<VM> memColumn = new PercentColumn<VM>() { @Override public Integer getProgressValue(VM object) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostVmView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostVmView.java index 54266fb..ea90514 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostVmView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostVmView.java @@ -73,6 +73,15 @@ }; getTable().addColumn(ipColumn, constants.ipVm(), "200px"); //$NON-NLS-1$ + TextColumnWithTooltip<VM> fqdnColumn = new TextColumnWithTooltip<VM>() { + @Override + public String getValue(VM object) { + setTitle(object.getVmFQDN()); + return object.getVmFQDN(); + } + }; + getTable().addColumn(fqdnColumn, constants.fqdn(), "200px"); //$NON-NLS-1$ + PercentColumn<VM> memColumn = new PercentColumn<VM>() { @Override public Integer getProgressValue(VM object) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkVmView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkVmView.java index 5b51f2a..5879ee3 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkVmView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkVmView.java @@ -80,6 +80,8 @@ getTable().ensureColumnPresent(ipColumn, constants.ipVm(), true, "150px"); //$NON-NLS-1$ + getTable().ensureColumnPresent(fqdnColumn, constants.fqdn(), true, "150px"); //$NON-NLS-1$ + getTable().ensureColumnPresent(nicActivateStatusColumn, constants.vnicStatusNetworkVM(), true, "150px"); //$NON-NLS-1$ getTable().ensureColumnPresent(vnicNameColumn, constants.vnicNetworkVM(), true, "150px"); //$NON-NLS-1$ @@ -119,6 +121,15 @@ } }; + private final TextColumnWithTooltip<PairQueryable<VmNetworkInterface, VM>> fqdnColumn = + new TextColumnWithTooltip<PairQueryable<VmNetworkInterface, VM>>() { + @Override + public String getValue(PairQueryable<VmNetworkInterface, VM> object) { + setTitle(object.getSecond().getVmFQDN()); + return object.getSecond().getVmFQDN(); + } + }; + private final NicActivateStatusColumn<PairQueryable<VmNetworkInterface, VM>> nicActivateStatusColumn = new NicActivateStatusColumn<PairQueryable<VmNetworkInterface, VM>>(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolVmView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolVmView.java index 717fbbf..5cc1240 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolVmView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolVmView.java @@ -62,6 +62,15 @@ }; getTable().addColumn(ipColumn, constants.ipVm(), "200px"); //$NON-NLS-1$ + TextColumnWithTooltip<VM> fqdnColumn = new TextColumnWithTooltip<VM>() { + @Override + public String getValue(VM object) { + setTitle(object.getVmFQDN()); + return object.getVmFQDN(); + } + }; + getTable().addColumn(fqdnColumn, constants.fqdn(), "200px"); //$NON-NLS-1$ + TextColumnWithTooltip<VM> statusColumn = new EnumColumn<VM, VMStatus>() { @Override protected VMStatus getRawValue(VM object) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/template/SubTabTemplateVmView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/template/SubTabTemplateVmView.java index f463f0a..5e94627 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/template/SubTabTemplateVmView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/template/SubTabTemplateVmView.java @@ -58,6 +58,15 @@ }; getTable().addColumn(ipColumn, constants.ipVm(), "200px"); //$NON-NLS-1$ + TextColumnWithTooltip<VM> fqdnColumn = new TextColumnWithTooltip<VM>() { + @Override + public String getValue(VM object) { + setTitle(object.getVmFQDN()); + return object.getVmFQDN(); + } + }; + getTable().addColumn(fqdnColumn, constants.fqdn(), "200px"); //$NON-NLS-1$ + TextColumnWithTooltip<VM> statusColumn = new EnumColumn<VM, VMStatus>() { @Override protected VMStatus getRawValue(VM object) { -- To view, visit http://gerrit.ovirt.org/17865 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If84c4d2a8c1f11e09f3748477a230d7d3188482b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
