Alona Kaplan has uploaded a new change for review. Change subject: webadmin: add network Label to Network->add Network popup ......................................................................
webadmin: add network Label to Network->add Network popup If a provider is selected the user will be able to edit the network label field. Change-Id: I24bfc3c2e693b94de57651caddb8ffecebaa7a1a Signed-off-by: Alona Kaplan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.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/popup/AbstractNetworkPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/NewClusterNetworkPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/NewDataCenterNetworkPopupView.java 7 files changed, 31 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/16044/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java index 33fefbc..f238f2d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java @@ -16,6 +16,7 @@ super(network, sourceListModel); getDataCenters().setIsChangable(false); getExternalProviders().setIsChangable(false); + getNetworkLabel().setIsAvailable(false); init(); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java index d8d7d97..4d96d01 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java @@ -28,6 +28,7 @@ private EntityModel privateName; private EntityModel privateDescription; private ListModel externalProviders; + private EntityModel networkLabel; private EntityModel privateVLanTag; private EntityModel privateIsStpEnabled; private EntityModel privateHasVLanTag; @@ -68,6 +69,8 @@ onExternalProviderChanged(); } }); + + setNetworkLabel(new EntityModel()); EntityModel stpEnabled = new EntityModel(); stpEnabled.setEntity(false); @@ -139,6 +142,14 @@ public void setExternalProviders(ListModel externalProviders) { this.externalProviders = externalProviders; + } + + public EntityModel getNetworkLabel() { + return networkLabel; + } + + public void setNetworkLabel(EntityModel networkLabel) { + this.networkLabel = networkLabel; } public EntityModel getVLanTag() @@ -347,6 +358,7 @@ network.setName((String) getName().getEntity()); network.setStp((Boolean) getIsStpEnabled().getEntity()); network.setDescription((String) getDescription().getEntity()); + network.setLabel((String) getNetworkLabel().getEntity()); network.setVmNetwork((Boolean) getIsVmNetwork().getEntity()); network.setMtu(0); @@ -422,9 +434,14 @@ getIsVmNetwork().setEntity(true); getIsVmNetwork().setIsChangable(false); + + getNetworkLabel().setIsChangable(true); } else { getHasMtu().setIsChangable(true); getIsVmNetwork().setIsChangable(true); + + getNetworkLabel().setEntity(null); + getNetworkLabel().setIsChangable(false); } } 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 0c8e014..fc2c309 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 @@ -163,6 +163,9 @@ @DefaultStringValue("External Provider") String externalProviderLabel(); + @DefaultStringValue("NetworkLabel") + String networkLabel(); + @DefaultStringValue("Comment") String commentLabel(); @@ -629,7 +632,8 @@ @DefaultStringValue("CPU Threads") String clusterPopupCpuThreadsPanelTitle(); - @DefaultStringValue("Allow guests to use host threads as virtual CPU cores, utilizing AMD Clustered MultiThreading or Intel" + + @DefaultStringValue("Allow guests to use host threads as virtual CPU cores, utilizing AMD Clustered MultiThreading or Intel" + + " Hyper-Threading technology on the virtualization host. Enabling this option may be useful for less" + " CPU-intensive workloads, or to run guests with CPU configurations that would otherwise be restricted.") String clusterPopupCpuThreadsInfo(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java index 1b52ee8..36ce2d0 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java @@ -113,6 +113,10 @@ @Path(value = "publicUse.entity") public final EntityModelCheckBoxEditor publicUseEditor; + @UiField + @Path(value = "networkLabel.entity") + public EntityModelTextBoxEditor networkLabel; + @Inject public AbstractNetworkPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, ApplicationTemplates templates) { @@ -147,6 +151,7 @@ nameEditor.setLabel(constants.nameLabel()); descriptionEditor.setLabel(constants.descriptionLabel()); externalProviderEditor.setLabel(constants.externalProviderLabel()); + networkLabel.setLabel(constants.networkLabel()); isVmNetworkEditor.setLabel(constants.vmNetworkLabel()); vlanTagging.setLabel(constants.enableVlanTagLabel()); hasMtuEditor.setLabel(constants.overrideMtuLabel()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml index 62b6a4c..bfaa436 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml @@ -58,6 +58,7 @@ <e:EntityModelTextBoxEditor ui:field="nameEditor" /> <e:EntityModelTextBoxEditor ui:field="descriptionEditor" /> <e:ListModelListBoxEditor ui:field="externalProviderEditor"/> + <e:EntityModelTextBoxEditor ui:field="networkLabel" /> <g:HorizontalPanel> <e:EntityModelCheckBoxEditor ui:field="vlanTagging"/> <e:EntityModelTextBoxOnlyEditor ui:field="vlanTag" /> diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/NewClusterNetworkPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/NewClusterNetworkPopupView.java index 8bade6d..1237ff2 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/NewClusterNetworkPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/NewClusterNetworkPopupView.java @@ -36,6 +36,7 @@ messageLabel.setVisible(true); dataCenterEditor.setVisible(false); externalProviderEditor.setVisible(false); + networkLabel.setVisible(false); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/NewDataCenterNetworkPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/NewDataCenterNetworkPopupView.java index ed2ed2d..f40a2b9 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/NewDataCenterNetworkPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/NewDataCenterNetworkPopupView.java @@ -23,5 +23,6 @@ super.updateVisibility(); dataCenterEditor.setVisible(false); externalProviderEditor.setVisible(false); + networkLabel.setVisible(false); } } -- To view, visit http://gerrit.ovirt.org/16044 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24bfc3c2e693b94de57651caddb8ffecebaa7a1a 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
