Yevgeny Zaspitsky has uploaded a new change for review. Change subject: webadmin: Update HostSetupNetworks flow to use isManagement ......................................................................
webadmin: Update HostSetupNetworks flow to use isManagement Update Setup Host Networks flow and Host-Networks sub-tab logic to use isManagement indicator rather than DefaultManagementNetwork config value. Change-Id: I3bb6d8149d895a5834c5fb59e357a9acab7cb00d Signed-off-by: Yevgeny Zaspitsky <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/LogicalNetworkModel.java 4 files changed, 16 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/37028/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java index 2d594d9..9080780 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java @@ -493,6 +493,15 @@ return ret; } + public static Network findManagentNetwork(List<Network> networks) { + for (Network network : networks) { + if (isManagementNetwork(network)) { + return network; + } + } + return null; + } + public static Network findNetworkByName(ArrayList<Network> items, String name) { for (Network n : items) diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java index bee0ce8..9ca1920 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java @@ -23,7 +23,6 @@ import org.ovirt.engine.core.common.businessentities.network.Nic; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; import org.ovirt.engine.core.common.businessentities.network.Vlan; -import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -55,10 +54,6 @@ @SuppressWarnings("unused") public class HostInterfaceListModel extends SearchableListModel { - - public static final String ENGINE_NETWORK_NAME = - (String) AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.DefaultManagementNetwork); - private UICommand privateEditCommand; @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java index 5dcbd67..710e40f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java @@ -30,6 +30,7 @@ import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; import org.ovirt.engine.ui.uicommonweb.BaseCommandTarget; +import org.ovirt.engine.ui.uicommonweb.Linq; import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.help.HelpTag; @@ -65,6 +66,8 @@ public class HostSetupNetworksModel extends EntityModel<VDS> { private EntityModel<Boolean> checkConnectivity; + + private Network managentNetwork; public EntityModel<Boolean> getCheckConnectivity() { @@ -565,7 +568,7 @@ initAllModels(true); } - protected void onNicsChanged() { + private void onNicsChanged() { operationFactory = new NetworkOperationFactory(getNetworks(), getNics()); validate(); } @@ -880,6 +883,7 @@ { List<Network> networks = (List<Network>) returnValue; allNetworks = networks; + managentNetwork = Linq.findManagentNetwork(allNetworks); initNetworkModels(); initDcNetworkParams(); @@ -924,7 +928,7 @@ private void validate() { // check if management network is attached - LogicalNetworkModel mgmtNetwork = networkMap.get(HostInterfaceListModel.ENGINE_NETWORK_NAME); + final LogicalNetworkModel mgmtNetwork = networkMap.get(managentNetwork.getName()); if (!mgmtNetwork.isAttached()) { okCommand.getExecuteProhibitionReasons().add(ConstantsManager.getInstance() .getConstants() diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/LogicalNetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/LogicalNetworkModel.java index 49dfcb1..9e4eed9 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/LogicalNetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/LogicalNetworkModel.java @@ -8,7 +8,6 @@ import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface.NetworkImplementationDetails; import org.ovirt.engine.ui.uicommonweb.models.hosts.DcNetworkParams; -import org.ovirt.engine.ui.uicommonweb.models.hosts.HostInterfaceListModel; import org.ovirt.engine.ui.uicommonweb.models.hosts.HostSetupNetworksModel; import org.ovirt.engine.ui.uicommonweb.models.hosts.NetworkParameters; @@ -31,7 +30,7 @@ public LogicalNetworkModel(Network network, HostSetupNetworksModel setupModel) { this(setupModel); setEntity(network); - if (HostInterfaceListModel.ENGINE_NETWORK_NAME.equals(network.getName())) { + if (network.getCluster() != null && network.getCluster().isManagement()) { setManagement(true); } } -- To view, visit http://gerrit.ovirt.org/37028 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3bb6d8149d895a5834c5fb59e357a9acab7cb00d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yevgeny Zaspitsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
