Lior Vernia has uploaded a new change for review. Change subject: core,webadmin: Add QoS column to Networks main tab ......................................................................
core,webadmin: Add QoS column to Networks main tab It could be helpful for users to see which QoS is configured on a network. Change-Id: I9b9ef4f3ccd38a6806ebbaf1e3970a2b823e916d Bug-Url: https://bugzilla.redhat.com/1180891 Signed-off-by: Lior Vernia <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkView.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkViewDaoDbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkViewDaoTest.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkConditionFieldAutoCompleter.java 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/MainTabNetworkView.java M packaging/dbscripts/create_views.sql 7 files changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/52/37452/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkView.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkView.java index 98fb08b..4896140 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkView.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkView.java @@ -10,6 +10,7 @@ private String dataCenterName; private Version compatibilityVersion; + private String qosName; private String providerName; public String getDataCenterName() { @@ -28,6 +29,14 @@ this.compatibilityVersion = compatibilityVersion; } + public String getQosName() { + return qosName; + } + + public void setQosName(String qosName) { + this.qosName = qosName; + } + public String getProviderName() { return providerName; } @@ -42,6 +51,7 @@ int result = super.hashCode(); result = prime * result + ((getCompatibilityVersion() == null) ? 0 : getCompatibilityVersion().hashCode()); result = prime * result + ((getDataCenterName() == null) ? 0 : getDataCenterName().hashCode()); + result = prime * result + ((getQosName() == null) ? 0 : getQosName().hashCode()); result = prime * result + ((getProviderName() == null) ? 0 : getProviderName().hashCode()); return result; } @@ -72,6 +82,9 @@ } else if (!getDataCenterName().equals(other.getDataCenterName())) { return false; } + if (Objects.equals(getQosName(), other.getQosName())) { + return false; + } if (Objects.equals(getProviderName(), other.getProviderName())) { return false; } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkViewDaoDbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkViewDaoDbFacadeImpl.java index 9a2db45..006c10c 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkViewDaoDbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkViewDaoDbFacadeImpl.java @@ -32,6 +32,7 @@ NetworkView entity = super.mapRow(rs, rowNum); entity.setStoragePoolName(rs.getString("storage_pool_name")); entity.setCompatibilityVersion(new Version(rs.getString("compatibility_version"))); + entity.setQosName(rs.getString("qos_name")); entity.setProviderName(rs.getString("provider_name")); return entity; } diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkViewDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkViewDaoTest.java index 5dcfc06..f25f9e0 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkViewDaoTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkViewDaoTest.java @@ -31,6 +31,7 @@ assertFalse(result.isEmpty()); assertEquals(FixturesTool.NETWORK_ENGINE, result.get(0).getId()); + assertNotNull(result.get(0).getQosName()); } /** diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkConditionFieldAutoCompleter.java index d5e8f99..81fb8a8 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkConditionFieldAutoCompleter.java @@ -11,6 +11,7 @@ public static final String VM_NETWORK = "VMNETWORK"; public static final String DATA_CENTER = "DATACENTER"; public static final String LABEL = "LABEL"; + public static final String QOS_NAME = "QOS_NAME"; public static final String PROVIDER_NAME = "PROVIDER_NAME"; public NetworkConditionFieldAutoCompleter() { @@ -24,6 +25,7 @@ mVerbs.add(VM_NETWORK); mVerbs.add(DATA_CENTER); mVerbs.add(LABEL); + mVerbs.add(QOS_NAME); mVerbs.add(PROVIDER_NAME); // Building the autoCompletion dict. @@ -39,6 +41,7 @@ getTypeDictionary().put(VM_NETWORK, Boolean.class); getTypeDictionary().put(DATA_CENTER, String.class); getTypeDictionary().put(LABEL, String.class); + getTypeDictionary().put(QOS_NAME, String.class); getTypeDictionary().put(PROVIDER_NAME, String.class); // building the ColumnName dict. @@ -51,6 +54,7 @@ columnNameDict.put(VM_NETWORK, "vm_network"); columnNameDict.put(DATA_CENTER, "storage_pool_name"); columnNameDict.put(LABEL, "label"); + columnNameDict.put(QOS_NAME, "qos_name"); columnNameDict.put(PROVIDER_NAME, "provider_name"); // Building the validation dict. 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 57cbb27..03a213d 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 @@ -2048,6 +2048,9 @@ @DefaultStringValue("VLAN tag") String vlanNetwork(); + @DefaultStringValue("QoS Name") + String qosNetwork(); + @DefaultStringValue("Provider") String providerNetwork(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java index 9fa7958..d0ca3a6 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java @@ -157,6 +157,15 @@ labelColumn.makeSortable(NetworkConditionFieldAutoCompleter.LABEL); getTable().addColumn(labelColumn, constants.networkLabelNetworksTab(), "200px"); //$NON-NLS-1$ + TextColumnWithTooltip<NetworkView> qosColumn = new TextColumnWithTooltip<NetworkView>() { + @Override + public String getValue(NetworkView object) { + return object.getQosName() == null ? "-" : object.getQosName(); //$NON-NLS-1$ + } + }; + qosColumn.makeSortable(NetworkConditionFieldAutoCompleter.QOS_NAME); + getTable().addColumn(qosColumn, constants.qosNetwork(), "200px"); //$NON-NLS-1$ + providerColumn = new LinkColumnWithTooltip<NetworkView>() { @Override public String getValue(NetworkView object) { diff --git a/packaging/dbscripts/create_views.sql b/packaging/dbscripts/create_views.sql index 3311f6d..88fffe7 100644 --- a/packaging/dbscripts/create_views.sql +++ b/packaging/dbscripts/create_views.sql @@ -1315,9 +1315,11 @@ network.label AS label, storage_pool.name AS storage_pool_name, storage_pool.compatibility_version AS compatibility_version, + qos.name AS qos_name, providers.name AS provider_name FROM network INNER JOIN storage_pool ON network.storage_pool_id = storage_pool.id +LEFT JOIN qos ON network.qos_id = qos.id LEFT JOIN providers ON network.provider_network_provider_id = providers.id; -- To view, visit http://gerrit.ovirt.org/37452 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b9ef4f3ccd38a6806ebbaf1e3970a2b823e916d 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
