Alona Kaplan has uploaded a new change for review. Change subject: webadmin: Execute wasn't called after creating SaveNetworkConfigAction ......................................................................
webadmin: Execute wasn't called after creating SaveNetworkConfigAction - It is not enough to create new instance of SaveNetworkConfigAction, in order to excecute the action, execute method should be called. - SaveNetworkConfigAction, should get the Host through the ctor. Change-Id: I580638cf8319876459a9bcdf5e9faa93c8b4ae5f Signed-off-by: Alona Kaplan <[email protected]> --- 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/SaveNetworkConfigAction.java 3 files changed, 187 insertions(+), 179 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/9081/1 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 d0e62b8..2f3546b 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 @@ -1015,83 +1015,89 @@ final StringBuilder tmpDefaultInterfaceName = new StringBuilder(); - AsyncDataProvider.GetInterfaceOptionsForEditNetwork(new AsyncQuery(this, new INewAsyncCallback() { + AsyncDataProvider.GetInterfaceOptionsForEditNetwork(new AsyncQuery(this, new INewAsyncCallback() { - @Override - public void OnSuccess(Object model, Object returnValue) { - ArrayList<VdsNetworkInterface> interfaces = (ArrayList<VdsNetworkInterface>) returnValue; + @Override + public void OnSuccess(Object model, Object returnValue) { + ArrayList<VdsNetworkInterface> interfaces = (ArrayList<VdsNetworkInterface>) returnValue; - String defaultInterfaceName = tmpDefaultInterfaceName.toString(); - managementModel.getInterface().setItems(interfaces); - managementModel.getInterface() - .setSelectedItem(Linq.FindInterfaceByName(Linq.VdsNetworkInterfaceListToBase(interfaces), - defaultInterfaceName)); - if (item.getBonded() != null && item.getBonded().equals(true)) + String defaultInterfaceName = tmpDefaultInterfaceName.toString(); + managementModel.getInterface().setItems(interfaces); + managementModel.getInterface() + .setSelectedItem(Linq.FindInterfaceByName(Linq.VdsNetworkInterfaceListToBase(interfaces), + defaultInterfaceName)); + if (item.getBonded() != null && item.getBonded().equals(true)) + { + managementModel.getInterface().setTitle(ConstantsManager.getInstance() + .getConstants() + .interfaceListTitle()); + managementModel.getInterface() + .getSelectedItemChangedEvent() + .addListener(hostInterfaceListModel); + } + managementModel.getCheckConnectivity().setIsAvailable(true); + managementModel.getCheckConnectivity().setIsChangable(true); + managementModel.getCheckConnectivity().setEntity(item.getIsManagement()); // currently, always + // should be + // true + + managementModel.getBondingOptions().setIsAvailable(false); + if (item.getBonded() != null && item.getBonded().equals(true)) + { + managementModel.getBondingOptions().setIsAvailable(true); + Map.Entry<String, EntityModel> defaultItem = null; + RefObject<Map.Entry<String, EntityModel>> tempRef_defaultItem = + new RefObject<Map.Entry<String, EntityModel>>(defaultItem); + ArrayList<Map.Entry<String, EntityModel>> list = + DataProvider.GetBondingOptionList(tempRef_defaultItem); + defaultItem = tempRef_defaultItem.argvalue; + Map.Entry<String, EntityModel> selectBondingOpt = + new KeyValuePairCompat<String, EntityModel>(); + boolean containsSelectBondingOpt = false; + managementModel.getBondingOptions().setItems(list); + for (int i = 0; i < list.size(); i++) + { + if (StringHelper.stringsEqual(list.get(i).getKey(), item.getBondOptions())) { - managementModel.getInterface().setTitle(ConstantsManager.getInstance() - .getConstants() - .interfaceListTitle()); - managementModel.getInterface().getSelectedItemChangedEvent().addListener(hostInterfaceListModel); + selectBondingOpt = list.get(i); + containsSelectBondingOpt = true; + break; } - managementModel.getCheckConnectivity().setIsAvailable(true); - managementModel.getCheckConnectivity().setIsChangable(true); - managementModel.getCheckConnectivity().setEntity(item.getIsManagement()); // currently, always should be - // true - - managementModel.getBondingOptions().setIsAvailable(false); - if (item.getBonded() != null && item.getBonded().equals(true)) - { - managementModel.getBondingOptions().setIsAvailable(true); - Map.Entry<String, EntityModel> defaultItem = null; - RefObject<Map.Entry<String, EntityModel>> tempRef_defaultItem = - new RefObject<Map.Entry<String, EntityModel>>(defaultItem); - ArrayList<Map.Entry<String, EntityModel>> list = - DataProvider.GetBondingOptionList(tempRef_defaultItem); - defaultItem = tempRef_defaultItem.argvalue; - Map.Entry<String, EntityModel> selectBondingOpt = - new KeyValuePairCompat<String, EntityModel>(); - boolean containsSelectBondingOpt = false; - managementModel.getBondingOptions().setItems(list); - for (int i = 0; i < list.size(); i++) - { - if (StringHelper.stringsEqual(list.get(i).getKey(), item.getBondOptions())) - { - selectBondingOpt = list.get(i); - containsSelectBondingOpt = true; - break; - } - } - if (containsSelectBondingOpt == false) - { - if (StringHelper.stringsEqual(item.getBondOptions(), DataProvider.GetDefaultBondingOption())) - { - selectBondingOpt = defaultItem; - } - else - { - selectBondingOpt = list.get(list.size() - 1); - EntityModel entityModel = selectBondingOpt.getValue(); - entityModel.setEntity(item.getBondOptions()); - } - } - managementModel.getBondingOptions().setSelectedItem(selectBondingOpt); - } - - UICommand tempVar = new UICommand("OnEditManagementNetworkConfirmation", hostInterfaceListModel); //$NON-NLS-1$ - tempVar.setTitle(ConstantsManager.getInstance().getConstants().ok()); - tempVar.setIsDefault(true); - managementModel.getCommands().add(tempVar); - UICommand tempVar2 = new UICommand("Cancel", hostInterfaceListModel); //$NON-NLS-1$ - tempVar2.setTitle(ConstantsManager.getInstance().getConstants().cancel()); - tempVar2.setIsCancel(true); - managementModel.getCommands().add(tempVar2); - } - }) ,getOriginalItems(), - item, - networkToEdit, - getEntity().getId(), - tmpDefaultInterfaceName); + if (containsSelectBondingOpt == false) + { + if (StringHelper.stringsEqual(item.getBondOptions(), + DataProvider.GetDefaultBondingOption())) + { + selectBondingOpt = defaultItem; + } + else + { + selectBondingOpt = list.get(list.size() - 1); + EntityModel entityModel = selectBondingOpt.getValue(); + entityModel.setEntity(item.getBondOptions()); + } + } + managementModel.getBondingOptions().setSelectedItem(selectBondingOpt); + } + + UICommand tempVar = + new UICommand("OnEditManagementNetworkConfirmation", hostInterfaceListModel); //$NON-NLS-1$ + tempVar.setTitle(ConstantsManager.getInstance().getConstants().ok()); + tempVar.setIsDefault(true); + managementModel.getCommands().add(tempVar); + UICommand tempVar2 = new UICommand("Cancel", hostInterfaceListModel); //$NON-NLS-1$ + tempVar2.setTitle(ConstantsManager.getInstance().getConstants().cancel()); + tempVar2.setIsCancel(true); + managementModel.getCommands().add(tempVar2); + + } + }), + getOriginalItems(), + item, + networkToEdit, + getEntity().getId(), + tmpDefaultInterfaceName); } }; @@ -1183,7 +1189,7 @@ UpdateNetworkToVdsParameters parameters = new UpdateNetworkToVdsParameters(getEntity().getId(), network, - new ArrayList<VdsNetworkInterface>(Arrays.asList(new VdsNetworkInterface[] {nic}))); + new ArrayList<VdsNetworkInterface>(Arrays.asList(new VdsNetworkInterface[] { nic }))); Map.Entry<String, EntityModel> bondingOption; if (model.getBondingOptions().getSelectedItem() != null) @@ -1240,7 +1246,8 @@ ((HostManagementNetworkModel) hostInterfaceListModel.getcurrentModel()).getCommitChanges(); if ((Boolean) commitChanges.getEntity()) { - new SaveNetworkConfigAction(HostInterfaceListModel.this, hostInterfaceListModel.getcurrentModel()); + new SaveNetworkConfigAction(HostInterfaceListModel.this, + hostInterfaceListModel.getcurrentModel(), getEntity()).execute(); } else { @@ -1602,7 +1609,8 @@ ((HostBondInterfaceModel) hostInterfaceListModel.getcurrentModel()).getCommitChanges(); if ((Boolean) commitChanges.getEntity()) { - new SaveNetworkConfigAction(HostInterfaceListModel.this, hostInterfaceListModel.getcurrentModel()).execute(); + new SaveNetworkConfigAction(HostInterfaceListModel.this, + hostInterfaceListModel.getcurrentModel(), getEntity()).execute(); } else { @@ -1685,7 +1693,8 @@ ((HostBondInterfaceModel) hostInterfaceListModel.getcurrentModel()).getCommitChanges(); if ((Boolean) commitChanges.getEntity()) { - new SaveNetworkConfigAction(HostInterfaceListModel.this, hostInterfaceListModel.getcurrentModel()); + new SaveNetworkConfigAction(HostInterfaceListModel.this, + hostInterfaceListModel.getcurrentModel(), getEntity()).execute(); } else { @@ -1763,7 +1772,8 @@ @Override public void Executed(FrontendActionAsyncResult result) { - HostInterfaceListModel hostInterfaceListModel = (HostInterfaceListModel) result.getState(); + HostInterfaceListModel hostInterfaceListModel = + (HostInterfaceListModel) result.getState(); VdcReturnValueBase returnValueBase = result.getReturnValue(); if (returnValueBase != null && returnValueBase.getSucceeded()) { @@ -1771,7 +1781,9 @@ ((HostInterfaceModel) hostInterfaceListModel.getcurrentModel()).getCommitChanges(); if ((Boolean) commitChanges.getEntity()) { - new SaveNetworkConfigAction(HostInterfaceListModel.this, getcurrentModel()); + new SaveNetworkConfigAction(HostInterfaceListModel.this, + getcurrentModel(), + getEntity()).execute(); } else { @@ -1882,7 +1894,8 @@ ((HostInterfaceModel) hostInterfaceListModel.getcurrentModel()).getCommitChanges(); if ((Boolean) commitChanges.getEntity()) { - new SaveNetworkConfigAction(HostInterfaceListModel.this, getcurrentModel()); + new SaveNetworkConfigAction(HostInterfaceListModel.this, + getcurrentModel(), getEntity()).execute(); } else { @@ -2012,7 +2025,8 @@ ((HostInterfaceModel) hostInterfaceListModel.getcurrentModel()).getCommitChanges(); if ((Boolean) commitChanges.getEntity()) { - new SaveNetworkConfigAction(HostInterfaceListModel.this, hostInterfaceListModel.getcurrentModel()); + new SaveNetworkConfigAction(HostInterfaceListModel.this, + hostInterfaceListModel.getcurrentModel(), getEntity()).execute(); } else { @@ -2032,7 +2046,7 @@ } } - public void SaveNetworkConfig(){ + public void SaveNetworkConfig() { if (getWindow() != null) { return; @@ -2054,7 +2068,7 @@ model.getCommands().add(tempVar2); } - public void OnSaveNetworkConfig(){ + public void OnSaveNetworkConfig() { ConfirmationModel model = (ConfirmationModel) getWindow(); if (model.getProgress() != null) @@ -2064,7 +2078,7 @@ model.StartProgress(null); setcurrentModel(model); - new SaveNetworkConfigAction(this, model); + new SaveNetworkConfigAction(this, model, getEntity()).execute(); } public void OnConfirmManagementDetach() @@ -2102,7 +2116,8 @@ @Override public void Executed(FrontendActionAsyncResult result) { - HostInterfaceListModel hostInterfaceListModel = (HostInterfaceListModel) result.getState(); + HostInterfaceListModel hostInterfaceListModel = + (HostInterfaceListModel) result.getState(); VdcReturnValueBase returnValueBase = result.getReturnValue(); if (returnValueBase != null && returnValueBase.getSucceeded()) { @@ -2110,7 +2125,8 @@ ((HostInterfaceModel) hostInterfaceListModel.getcurrentModel()).getCommitChanges(); if ((Boolean) commitChanges.getEntity()) { - new SaveNetworkConfigAction(HostInterfaceListModel.this, hostInterfaceListModel.getcurrentModel()); + new SaveNetworkConfigAction(HostInterfaceListModel.this, + hostInterfaceListModel.getcurrentModel(), getEntity()).execute(); } else { @@ -2214,7 +2230,8 @@ && host.getstatus() != VDSStatus.NonResponsive && selectedItems.size() == 1 && selectedItem != null && selectedItem.getIsManagement()); - // Setup Networks is only available on 3.1 Clusters, all the other commands (except save network configuration) available only on less than 3.1 Clusters + // Setup Networks is only available on 3.1 Clusters, all the other commands (except save network configuration) + // available only on less than 3.1 Clusters if (host != null) { Version v31 = new Version(3, 1); boolean isLessThan31 = host.getvds_group_compatibility_version().compareTo(v31) < 0; @@ -2226,7 +2243,7 @@ getEditCommand().setIsAvailable(isLessThan31); getBondCommand().setIsAvailable(isLessThan31); getDetachCommand().setIsAvailable(isLessThan31); - getEditManagementNetworkCommand().setIsAvailable(isLessThan31) ; + getEditManagementNetworkCommand().setIsAvailable(isLessThan31); setSelectionAvailable(isLessThan31); } 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 b1acab8..c0c401c 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 @@ -10,7 +10,6 @@ import org.ovirt.engine.core.common.action.SetupNetworksParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; -import org.ovirt.engine.core.common.action.VdsActionParameters; import org.ovirt.engine.core.common.businessentities.Network; import org.ovirt.engine.core.common.businessentities.NetworkBootProtocol; import org.ovirt.engine.core.common.businessentities.VDS; @@ -169,15 +168,15 @@ NetworkInterfaceModel nic2 = null; LogicalNetworkModel network2 = null; - if (op1Type != null && op1Type.equals(NIC)){ + if (op1Type != null && op1Type.equals(NIC)) { nic1 = nicMap.get(op1Key); - }else if (op1Type != null && op1Type.equals(NETWORK)){ + } else if (op1Type != null && op1Type.equals(NETWORK)) { network1 = networkMap.get(op1Key); } - if (op2Type != null && op2Type.equals(NIC)){ + if (op2Type != null && op2Type.equals(NIC)) { nic2 = nicMap.get(op2Key); - }else if (op2Type != null && op2Type.equals(NETWORK)){ + } else if (op2Type != null && op2Type.equals(NETWORK)) { network2 = networkMap.get(op2Key); } @@ -239,10 +238,12 @@ /***************** * Bond Dialog *****************/ - final VdsNetworkInterface entity = ((NetworkInterfaceModel)item).getEntity(); + final VdsNetworkInterface entity = ((NetworkInterfaceModel) item).getEntity(); editPopup = new HostBondInterfaceModel(true); final HostBondInterfaceModel bondDialogModel = (HostBondInterfaceModel) editPopup; - bondDialogModel.setTitle(ConstantsManager.getInstance().getMessages().editBondInterfaceTitle(entity.getName())); + bondDialogModel.setTitle(ConstantsManager.getInstance() + .getMessages() + .editBondInterfaceTitle(entity.getName())); bondDialogModel.getNetwork().setIsAvailable(false); bondDialogModel.getCheckConnectivity().setIsAvailable(false); bondDialogModel.getAddress().setIsAvailable(false); @@ -252,7 +253,7 @@ // bond name bondDialogModel.getBond().setIsChangable(false); - List<VdsNetworkInterface> bondName = Arrays.asList(entity); + List<VdsNetworkInterface> bondName = Arrays.asList(entity); bondDialogModel.getBond().setItems(bondName); bondDialogModel.getBond().setSelectedItem(entity); @@ -289,9 +290,11 @@ sourceListModel.setConfirmWindow(null); } }; - } else if (item instanceof LogicalNetworkModel){ - final LogicalNetworkModel logicalNetwork = (LogicalNetworkModel)item; - final VdsNetworkInterface entity = logicalNetwork.hasVlan() ? logicalNetwork.getVlanNic().getEntity() : logicalNetwork.getAttachedToNic().getEntity(); + } else if (item instanceof LogicalNetworkModel) { + final LogicalNetworkModel logicalNetwork = (LogicalNetworkModel) item; + final VdsNetworkInterface entity = + logicalNetwork.hasVlan() ? logicalNetwork.getVlanNic().getEntity() + : logicalNetwork.getAttachedToNic().getEntity(); if (logicalNetwork.isManagement()) { /***************** @@ -311,7 +314,8 @@ mgmntDialogModel.setBootProtocol(entity.getBootProtocol()); mgmntDialogModel.getIsToSync().setIsChangable(!logicalNetwork.isInSync()); - mgmntDialogModel.getIsToSync().setEntity(HostSetupNetworksModel.this.networksToSync.contains(logicalNetwork.getName())); + mgmntDialogModel.getIsToSync() + .setEntity(HostSetupNetworksModel.this.networksToSync.contains(logicalNetwork.getName())); // OK Target okTarget = new BaseCommandTarget() { @@ -325,22 +329,24 @@ entity.setSubnet((String) mgmntDialogModel.getSubnet().getEntity()); entity.setGateway((String) mgmntDialogModel.getGateway().getEntity()); - if ((Boolean) mgmntDialogModel.getIsToSync().getEntity()){ + if ((Boolean) mgmntDialogModel.getIsToSync().getEntity()) { HostSetupNetworksModel.this.networksToSync.add(logicalNetwork.getName()); - }else{ + } else { HostSetupNetworksModel.this.networksToSync.remove(logicalNetwork.getName()); } sourceListModel.setConfirmWindow(null); } }; - }else{ + } else { /***************** * Network Dialog *****************/ editPopup = new HostInterfaceModel(true); final HostInterfaceModel networkDialogModel = (HostInterfaceModel) editPopup; - networkDialogModel.setTitle(ConstantsManager.getInstance().getMessages().editNetworkTitle(logicalNetwork.getName())); + networkDialogModel.setTitle(ConstantsManager.getInstance() + .getMessages() + .editNetworkTitle(logicalNetwork.getName())); networkDialogModel.setOriginalNetParams(netToBeforeSyncParams.get(logicalNetwork.getName())); networkDialogModel.getAddress().setEntity(entity.getAddress()); networkDialogModel.getSubnet().setEntity(entity.getSubnet()); @@ -353,7 +359,8 @@ networkDialogModel.setBootProtocol(entity.getBootProtocol()); networkDialogModel.getIsToSync().setIsChangable(!logicalNetwork.isInSync()); - networkDialogModel.getIsToSync().setEntity(HostSetupNetworksModel.this.networksToSync.contains(logicalNetwork.getName())); + networkDialogModel.getIsToSync() + .setEntity(HostSetupNetworksModel.this.networksToSync.contains(logicalNetwork.getName())); // OK Target okTarget = new BaseCommandTarget() { @@ -366,9 +373,9 @@ entity.setAddress((String) networkDialogModel.getAddress().getEntity()); entity.setSubnet((String) networkDialogModel.getSubnet().getEntity()); - if ((Boolean) networkDialogModel.getIsToSync().getEntity()){ + if ((Boolean) networkDialogModel.getIsToSync().getEntity()) { HostSetupNetworksModel.this.networksToSync.add(logicalNetwork.getName()); - }else{ + } else { HostSetupNetworksModel.this.networksToSync.remove(logicalNetwork.getName()); } @@ -385,11 +392,11 @@ // cancel command UICommand cancelCommand = new UICommand("Cancel", new BaseCommandTarget() { //$NON-NLS-1$ - @Override - public void ExecuteCommand(UICommand command) { - sourceListModel.setConfirmWindow(null); - } - }); + @Override + public void ExecuteCommand(UICommand command) { + sourceListModel.setConfirmWindow(null); + } + }); cancelCommand.setTitle(ConstantsManager.getInstance().getConstants().cancel()); cancelCommand.setIsCancel(true); @@ -402,11 +409,11 @@ Model popupWindow; UICommand cancelCommand = new UICommand("Cancel", new BaseCommandTarget() { //$NON-NLS-1$ - @Override - public void ExecuteCommand(UICommand command) { - sourceListModel.setConfirmWindow(null); - } - }); + @Override + public void ExecuteCommand(UICommand command) { + sourceListModel.setConfirmWindow(null); + } + }); cancelCommand.setTitle(ConstantsManager.getInstance().getConstants().cancel()); cancelCommand.setIsCancel(true); @@ -434,28 +441,30 @@ bondPopup.getBond().setItems(freeBonds); bondPopup.getCommands().add(new UICommand("OK", new BaseCommandTarget() { //$NON-NLS-1$ - @Override - public void ExecuteCommand(UICommand command) { - sourceListModel.setConfirmWindow(null); - VdsNetworkInterface bond = (VdsNetworkInterface) bondPopup.getBond().getSelectedItem(); - setBondOptions(bond, bondPopup); - NetworkInterfaceModel nic1 = (NetworkInterfaceModel) networkCommand.getOp1(); - NetworkInterfaceModel nic2 = (NetworkInterfaceModel) networkCommand.getOp2(); - List<LogicalNetworkModel> networks = nic1.getItems().size() != 0 ? new ArrayList<LogicalNetworkModel>(nic1.getItems()) : new ArrayList<LogicalNetworkModel>(nic2.getItems()); - networkCommand.Execute(bond); - redraw(); - - // Attach the previous networks - for (NetworkInterfaceModel nic : getNics()){ - if (nic.getName().equals(bond.getName())){ - NetworkOperation.attachNetworks(nic, networks, allNics); + @Override + public void ExecuteCommand(UICommand command) { + sourceListModel.setConfirmWindow(null); + VdsNetworkInterface bond = (VdsNetworkInterface) bondPopup.getBond().getSelectedItem(); + setBondOptions(bond, bondPopup); + NetworkInterfaceModel nic1 = (NetworkInterfaceModel) networkCommand.getOp1(); + NetworkInterfaceModel nic2 = (NetworkInterfaceModel) networkCommand.getOp2(); + List<LogicalNetworkModel> networks = + nic1.getItems().size() != 0 ? new ArrayList<LogicalNetworkModel>(nic1.getItems()) + : new ArrayList<LogicalNetworkModel>(nic2.getItems()); + networkCommand.Execute(bond); redraw(); - return; - } - } - } - })); + // Attach the previous networks + for (NetworkInterfaceModel nic : getNics()) { + if (nic.getName().equals(bond.getName())) { + NetworkOperation.attachNetworks(nic, networks, allNics); + redraw(); + return; + } + } + + } + })); popupWindow = bondPopup; } else { @@ -583,8 +592,9 @@ if (networkModel == null) { networkModel = createUnmanagedNetworkModel(networkName, nic); - }else{ - // The real vlanId, isBridged and mtu configured on the host can be not synced with the values configured in the networks table (dc networks). + } else { + // The real vlanId, isBridged and mtu configured on the host can be not synced with the values + // configured in the networks table (dc networks). // The real values configured on the host should be displayed. networkModel.getEntity().setvlan_id(nic.getVlanId()); networkModel.getEntity().setMtu(nic.getMtu()); @@ -618,7 +628,7 @@ nicToNetwork.put(ifName, bridgedNetworks); } - if (!networkModel.isInSync() && networkModel.isManaged()){ + if (!networkModel.isInSync() && networkModel.isManaged()) { netToBeforeSyncParams.put(networkName, new NetworkParameters(nic)); } } @@ -723,11 +733,12 @@ AsyncDataProvider.GetClusterNetworkList(asyncQuery, vds.getvds_group_id()); } - private void initDcNetworkParams(){ - for (Network network : allNetworks){ + private void initDcNetworkParams() { + for (Network network : allNetworks) { netTodcParams.put(network.getname(), new DcNetworkParams(network)); } } + private void setBondOptions(VdsNetworkInterface entity, HostBondInterfaceModel bondDialogModel) { KeyValuePairCompat<String, EntityModel> BondPair = (KeyValuePairCompat<String, EntityModel>) bondDialogModel.getBondingOptions() @@ -763,7 +774,9 @@ // check if management network is attached LogicalNetworkModel mgmtNetwork = networkMap.get(HostInterfaceListModel.ENGINE_NETWORK_NAME); if (!mgmtNetwork.isAttached()) { - okCommand.getExecuteProhibitionReasons().add(ConstantsManager.getInstance().getConstants().mgmtNotAttachedToolTip()); + okCommand.getExecuteProhibitionReasons().add(ConstantsManager.getInstance() + .getConstants() + .mgmtNotAttachedToolTip()); okCommand.setIsExecutionAllowed(false); } else { okCommand.setIsExecutionAllowed(true); @@ -784,13 +797,14 @@ public void onSetupNetworks() { // Determines the connectivity timeout in seconds - AsyncDataProvider.GetNetworkConnectivityCheckTimeoutInSeconds(new AsyncQuery(sourceListModel, new INewAsyncCallback() { - @Override - public void OnSuccess(Object target, Object returnValue) { - getConnectivityTimeout().setEntity(returnValue); - postOnSetupNetworks(); - } - })); + AsyncDataProvider.GetNetworkConnectivityCheckTimeoutInSeconds(new AsyncQuery(sourceListModel, + new INewAsyncCallback() { + @Override + public void OnSuccess(Object target, Object returnValue) { + getConnectivityTimeout().setEntity(returnValue); + postOnSetupNetworks(); + } + })); } public void postOnSetupNetworks() { @@ -811,10 +825,10 @@ VdcReturnValueBase returnValueBase = result.getReturnValue(); if (returnValueBase != null && returnValueBase.getSucceeded()) { - EntityModel commitChanges =model.getCommitChanges(); + EntityModel commitChanges = model.getCommitChanges(); if ((Boolean) commitChanges.getEntity()) { - new SaveNetworkConfigAction(sourceListModel, model); + new SaveNetworkConfigAction(sourceListModel, model, (VDS) getEntity()).execute(); } else { @@ -831,30 +845,6 @@ }); } - private void SaveNetworkConfigInternalAction() - { - Frontend.RunAction(VdcActionType.CommitNetworkChanges, new VdsActionParameters(((VDS) getEntity()).getId()), - new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { - - VdcReturnValueBase returnValueBase = result.getReturnValue(); - if (returnValueBase != null && returnValueBase.getSucceeded()) - { - HostInterfaceListModel interfaceListModel = (HostInterfaceListModel) result.getState(); - if (interfaceListModel.getcurrentModel() != null) - { - interfaceListModel.getcurrentModel().StopProgress(); - interfaceListModel.Cancel(); - interfaceListModel.Search(); - } - } - - } - }, this); - } - - @Override public void ExecuteCommand(UICommand command) { @@ -867,7 +857,6 @@ { cancel(); } - } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/SaveNetworkConfigAction.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/SaveNetworkConfigAction.java index 7f427eb..5aab460 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/SaveNetworkConfigAction.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/SaveNetworkConfigAction.java @@ -14,15 +14,17 @@ private final SearchableListModel listModel; private final Model windowModel; + private final VDS host; - public SaveNetworkConfigAction(SearchableListModel listModel, Model windowModel ) + public SaveNetworkConfigAction(SearchableListModel listModel, Model windowModel, VDS host) { this.listModel = listModel; this.windowModel = windowModel; + this.host = host; } - public void execute(){ - Frontend.RunAction(VdcActionType.CommitNetworkChanges, new VdsActionParameters(((VDS)(listModel.getEntity())).getId()), + public void execute() { + Frontend.RunAction(VdcActionType.CommitNetworkChanges, new VdsActionParameters(host.getId()), new IFrontendActionAsyncCallback() { @Override public void Executed(FrontendActionAsyncResult result) { -- To view, visit http://gerrit.ovirt.org/9081 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I580638cf8319876459a9bcdf5e9faa93c8b4ae5f 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
