Alona Kaplan has uploaded a new change for review. Change subject: webadmin: add passthrough property to vnic profile ......................................................................
webadmin: add passthrough property to vnic profile Add 'passthrough' property to vnic profile dialog. Change-Id: I8d5d34b3700301d3557706905fd8b07b48d37018 Signed-off-by: Alona Kaplan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.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/profile/VnicProfilePopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/profile/VnicProfilePopupView.ui.xml 5 files changed, 35 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/35946/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileModel.java index d70786d..2d82ae7 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileModel.java @@ -11,6 +11,7 @@ import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.NetworkQoS; import org.ovirt.engine.core.common.businessentities.network.VnicProfile; +import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.core.common.queries.GetDeviceCustomPropertiesParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -141,7 +142,7 @@ setNetwork(new ListModel<Network>()); setNetworkQoS(new ListModel<NetworkQoS>()); setPortMirroring(new EntityModel<Boolean>()); - setPassthrough(new EntityModel<Boolean>()); + initPassthrough(dcCompatibilityVersion); setCustomPropertySheet(new KeyValueModel()); EntityModel<Boolean> publicUse = new EntityModel<Boolean>(); publicUse.setEntity(true); @@ -168,6 +169,19 @@ initCommands(); } + private void initPassthrough(Version dcCompatibilityVersion) { + setPassthrough(new EntityModel<Boolean>()); + String dcCompVerString = dcCompatibilityVersion.toString(); + boolean isPassthroughSupported = + (Boolean) AsyncDataProvider.getInstance() + .getConfigValuePreConverted(ConfigurationValues.NetworkSriovSupported, + dcCompVerString); + getPassthrough().setChangeProhibitionReason(ConstantsManager.getInstance() + .getMessages() + .passthroughNotSupported(dcCompVerString)); + getPassthrough().setIsChangable(isPassthroughSupported); + } + protected void initCommands() { UICommand okCommand = new UICommand("OnSave", this); //$NON-NLS-1$ okCommand.setTitle(ConstantsManager.getInstance().getConstants().ok()); diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java index cb3329d..a7a2146 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java @@ -403,4 +403,7 @@ @DefaultMessage("Default ({0})") String defaultMtu(int mtu); + + @DefaultMessage("SR-IOV passthrough is not supported for Data Center version {0}") + String passthroughNotSupported(String version); } 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 c7b6a59..25d2bb3 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 @@ -1301,6 +1301,9 @@ @DefaultStringValue("QoS Name") String qosNameVnicProfile(); + @DefaultStringValue("Passthrough") + String passthorughVnicProfile(); + @DefaultStringValue("Port Mirroring") String portMirroringVnicProfile(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/profile/VnicProfilePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/profile/VnicProfilePopupView.java index dc85e20..3e4c561 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/profile/VnicProfilePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/profile/VnicProfilePopupView.java @@ -40,7 +40,7 @@ } protected interface Style extends CssResource { - String portMirroringEditor(); + String checkboxEditor(); String checkBox(); @@ -64,6 +64,11 @@ @Path(value = "networkQoS.selectedItem") @WithElementId("networkQoS") public ListModelListBoxEditor<NetworkQoS> networkQoSEditor; + + @UiField + @Path("passthrough.entity") + @WithElementId("passthrough") + protected EntityModelCheckBoxEditor passthroughEditor; @UiField @Path("portMirroring.entity") @@ -112,6 +117,7 @@ networkEditor.setLabel(constants.networkVnicProfile()); nameEditor.setLabel(constants.nameVnicProfile()); descriptionEditor.setLabel(constants.descriptionVnicProfile()); + passthroughEditor.setLabel(constants.passthorughVnicProfile()); portMirroringEditor.setLabel(constants.portMirroringVnicProfile()); publicUseEditor.setLabel(constants.publicUseVnicProfile()); networkQoSEditor.setLabel(constants.profileQoSInstanceTypeLabel()); @@ -134,7 +140,8 @@ } private void applyStyles() { - portMirroringEditor.addContentWidgetStyleName(style.portMirroringEditor()); + portMirroringEditor.addContentWidgetStyleName(style.checkboxEditor()); + passthroughEditor.addContentWidgetStyleName(style.checkboxEditor()); publicUseEditor.addContentWidgetStyleName(style.publicUseEditor()); publicUseEditor.asCheckBox().addStyleName(style.checkBox()); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/profile/VnicProfilePopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/profile/VnicProfilePopupView.ui.xml index 294d724..ee1f038 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/profile/VnicProfilePopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/profile/VnicProfilePopupView.ui.xml @@ -17,7 +17,7 @@ border-width: 0px !important; } - .portMirroringEditor { + .checkboxEditor { width: 235px; } @@ -34,16 +34,17 @@ </ui:style> - <d:SimpleDialogPanel width="470px" height="320px"> + <d:SimpleDialogPanel width="470px" height="325px"> <d:content> <g:FlowPanel> <e:ListModelListBoxEditor ui:field="networkEditor" /> <ge:StringEntityModelTextBoxEditor ui:field="nameEditor" /> <ge:StringEntityModelTextBoxEditor ui:field="descriptionEditor" /> <e:ListModelListBoxEditor ui:field="networkQoSEditor"/> - <g:SimplePanel width="100%"> + <g:FlowPanel width="100%"> + <ge:EntityModelCheckBoxEditor ui:field="passthroughEditor" /> <ge:EntityModelCheckBoxEditor ui:field="portMirroringEditor" /> - </g:SimplePanel> + </g:FlowPanel> <g:FlowPanel> <k:KeyValueWidget ui:field="customPropertiesSheetEditor"/> </g:FlowPanel> -- To view, visit http://gerrit.ovirt.org/35946 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8d5d34b3700301d3557706905fd8b07b48d37018 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
