Alona Kaplan has uploaded a new change for review.
Change subject: webadmin: adding network, dc and compatability version columns
to profiles
......................................................................
webadmin: adding network, dc and compatability version columns to profiles
This patch adds network name, data center name and compatability version
columns to vnic profiles tables (main tab and network sub tab).
Change-Id: I6507f1fd027c95db894158ba11a9b06fa0bad416
Signed-off-by: Alona Kaplan <alkap...@redhat.com>
---
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/MainTabVnicProfileView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkProfileView.java
3 files changed, 71 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/73/17573/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 2fe4edc7..93f74e4 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
@@ -1104,6 +1104,12 @@
@DefaultStringValue("Name")
String nameVnicProfile();
+ @DefaultStringValue("Data Center")
+ String dcVnicProfile();
+
+ @DefaultStringValue("Compatibility Version")
+ String compatibilityVersionVnicProfile();
+
@DefaultStringValue("Description")
String descriptionVnicProfile();
@@ -1113,7 +1119,7 @@
@DefaultStringValue("Allow all users to use this Profile")
String publicUseVnicProfile();
- @DefaultStringValue("Virtual Machines")
+ @DefaultStringValue("Virtual Machines")
String vnicProfileVmSubTabLabel();
@DefaultStringValue("Templates")
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVnicProfileView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVnicProfileView.java
index b4c05d1..bc3f62b 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVnicProfileView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVnicProfileView.java
@@ -3,6 +3,7 @@
import org.ovirt.engine.core.common.businessentities.network.VnicProfileView;
import org.ovirt.engine.ui.common.idhandler.ElementIdHandler;
import org.ovirt.engine.ui.common.uicommon.model.MainModelProvider;
+import org.ovirt.engine.ui.common.widget.table.column.BooleanColumn;
import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip;
import org.ovirt.engine.ui.uicommonweb.UICommand;
import org.ovirt.engine.ui.uicommonweb.models.profiles.VnicProfileListModel;
@@ -44,8 +45,32 @@
return object.getName();
}
};
-
getTable().addColumn(nameColumn, constants.nameVnicProfile(),
"200px"); //$NON-NLS-1$
+
+ TextColumnWithTooltip<VnicProfileView> networkColumn = new
TextColumnWithTooltip<VnicProfileView>() {
+ @Override
+ public String getValue(VnicProfileView object) {
+ return object.getNetworkName();
+ }
+ };
+ getTable().addColumn(networkColumn, constants.networkVnicProfile(),
"200px"); //$NON-NLS-1$
+
+ TextColumnWithTooltip<VnicProfileView> dcColumn = new
TextColumnWithTooltip<VnicProfileView>() {
+ @Override
+ public String getValue(VnicProfileView object) {
+ return object.getDataCenterName();
+ }
+ };
+ getTable().addColumn(dcColumn, constants.dcVnicProfile(), "200px");
//$NON-NLS-1$
+
+ TextColumnWithTooltip<VnicProfileView> compatibilityVersionColumn =
+ new TextColumnWithTooltip<VnicProfileView>() {
+ @Override
+ public String getValue(VnicProfileView object) {
+ return object.getCompatibilityVersion().toString();
+ }
+ };
+ getTable().addColumn(compatibilityVersionColumn,
constants.compatibilityVersionVnicProfile(), "200px"); //$NON-NLS-1$
TextColumnWithTooltip<VnicProfileView> descriptionColumn = new
TextColumnWithTooltip<VnicProfileView>() {
@Override
@@ -54,7 +79,16 @@
}
};
- getTable().addColumn(descriptionColumn,
constants.descriptionVnicProfile(), "400px"); //$NON-NLS-1$
+ BooleanColumn<VnicProfileView> portMirroringColumn =
+ new
BooleanColumn<VnicProfileView>(constants.portMirroringEnabled()) {
+ @Override
+ public Boolean getRawValue(VnicProfileView object) {
+ return object.isPortMirroring();
+ }
+ };
+ getTable().addColumnWithHtmlHeader(portMirroringColumn,
constants.portMirroringVnicProfile(), "85px"); //$NON-NLS-1$
+
+ getTable().addColumn(descriptionColumn,
constants.descriptionVnicProfile(), "400px"); //$NON-NLS-1$
getTable().addActionButton(new
WebAdminButtonDefinition<VnicProfileView>(constants.newVnicProfile()) {
@Override
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkProfileView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkProfileView.java
index f85f313..afbf62f 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkProfileView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkProfileView.java
@@ -38,14 +38,30 @@
};
getTable().addColumn(nameColumn, constants.nameVnicProfile(),
"400px"); //$NON-NLS-1$
- TextColumnWithTooltip<VnicProfileView> descriptionColumn =
+ TextColumnWithTooltip<VnicProfileView> networkColumn = new
TextColumnWithTooltip<VnicProfileView>() {
+ @Override
+ public String getValue(VnicProfileView object) {
+ return object.getNetworkName();
+ }
+ };
+ getTable().addColumn(networkColumn, constants.networkVnicProfile(),
"200px"); //$NON-NLS-1$
+
+ TextColumnWithTooltip<VnicProfileView> dcColumn = new
TextColumnWithTooltip<VnicProfileView>() {
+ @Override
+ public String getValue(VnicProfileView object) {
+ return object.getDataCenterName();
+ }
+ };
+ getTable().addColumn(dcColumn, constants.dcVnicProfile(), "200px");
//$NON-NLS-1$
+
+ TextColumnWithTooltip<VnicProfileView> compatibilityVersionColumn =
new TextColumnWithTooltip<VnicProfileView>() {
@Override
public String getValue(VnicProfileView object) {
- return object.getDescription();
+ return object.getCompatibilityVersion().toString();
}
};
- getTable().addColumn(descriptionColumn,
constants.descriptionVnicProfile(), "400px"); //$NON-NLS-1$
+ getTable().addColumn(compatibilityVersionColumn,
constants.compatibilityVersionVnicProfile(), "200px"); //$NON-NLS-1$
BooleanColumn<VnicProfileView> portMirroringColumn =
new
BooleanColumn<VnicProfileView>(constants.portMirroringEnabled()) {
@@ -56,6 +72,15 @@
};
getTable().addColumnWithHtmlHeader(portMirroringColumn,
constants.portMirroringVnicProfile(), "85px"); //$NON-NLS-1$
+ TextColumnWithTooltip<VnicProfileView> descriptionColumn =
+ new TextColumnWithTooltip<VnicProfileView>() {
+ @Override
+ public String getValue(VnicProfileView object) {
+ return object.getDescription();
+ }
+ };
+ getTable().addColumn(descriptionColumn,
constants.descriptionVnicProfile(), "400px"); //$NON-NLS-1$
+
getTable().addActionButton(new
WebAdminButtonDefinition<VnicProfileView>(constants.newNetworkProfile()) {
@Override
protected UICommand resolveCommand() {
--
To view, visit http://gerrit.ovirt.org/17573
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6507f1fd027c95db894158ba11a9b06fa0bad416
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alona Kaplan <alkap...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
