Moti Asayag has uploaded a new change for review. Change subject: Revert "core: Cannot replace management network nic (#840888)" ......................................................................
Revert "core: Cannot replace management network nic (#840888)" This reverts commit e8590ce0e5a37df793873c7b0f9a51eb990d48d2. Change-Id: I3c15d815c4963dab9c58800a884734b3d1236ccd Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateNetworkToVdsInterfaceCommand.java 1 file changed, 8 insertions(+), 38 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/75/7575/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateNetworkToVdsInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateNetworkToVdsInterfaceCommand.java index 27cb297..5f37926 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateNetworkToVdsInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateNetworkToVdsInterfaceCommand.java @@ -149,13 +149,6 @@ } } - /** - * The method verifies the input for one of two scenario types: - * <ul> - * <li>Updating an interface details: update boot protocol or replace attached network (for non management network)</li> - * <li>Updating management network details: update boot protocol or replace interface</li> - * </ul> - */ @Override protected boolean canDoAction() { String ifaceGateway = null; @@ -177,20 +170,11 @@ ifaceGateway = updatedIface.getGateway(); } - boolean managementNetworkUpdated = - StringUtils.equals(getParameters().getNetwork().getname(), NetworkUtils.getEngineNetwork()); - // obtain the network name from the host interface and check that the old network name is not null oldNetworkName = StringUtils.isEmpty(updatedIface.getNetworkName()) ? null : updatedIface.getNetworkName(); - if (oldNetworkName == null) { - if (managementNetworkUpdated) { - // the command will update the interface of a management network - oldNetworkName = NetworkUtils.getEngineNetwork(); - } else { - addCanDoActionMessage(VdcBllMessages.NETWROK_OLD_NETWORK_NOT_SPECIFIED); - return false; - } + addCanDoActionMessage(VdcBllMessages.NETWROK_OLD_NETWORK_NOT_SPECIFIED); + return false; } VDS vds = getVdsDAO().get(getParameters().getVdsId()); @@ -211,13 +195,15 @@ } } - if (managementNetworkUpdateDenied(managementNetworkUpdated)) { + if (StringUtils.equals(oldNetworkName, NetworkUtils.getEngineNetwork()) + && !StringUtils.equals(getParameters().getNetwork().getname(), NetworkUtils.getEngineNetwork())) { getReturnValue().getCanDoActionMessages() .add(VdcBllMessages.NETWORK_DEFAULT_UPDATE_NAME_INVALID.toString()); return false; } - if (!managementNetworkUpdated && StringUtils.isNotEmpty(getParameters().getGateway())) { + if (!NetworkUtils.getEngineNetwork().equals(getParameters().getNetwork().getname()) + && StringUtils.isNotEmpty(getParameters().getGateway())) { if (!getParameters().getGateway().equals(ifaceGateway)) { addCanDoActionMessage(VdcBllMessages.NETWORK_ATTACH_ILLEGAL_GATEWAY); return false; @@ -228,10 +214,10 @@ } } - // check connectivity + // check conectivity getParameters().setCheckConnectivity(getParameters().getCheckConnectivity()); if (getParameters().getCheckConnectivity()) { - if (!managementNetworkUpdated) { + if (!StringUtils.equals(getParameters().getNetwork().getname(), NetworkUtils.getEngineNetwork())) { addCanDoActionMessage(VdcBllMessages.NETWORK_CHECK_CONNECTIVITY); return false; } @@ -262,22 +248,6 @@ } return true; - } - - /** - * Checks if it is allowed to modify the management network. The following use-cases should be blocked: - * <ul> - * <li>The old network is management network, the new network is non-management network.</li> - * <li>The old network isn't management network, but the new network is a management network.</li> - * </ul> - * - * @param managementNetworkUpdated - * if the target network is a management network - * @return true if updating management network is supported, else false. - */ - private boolean managementNetworkUpdateDenied(boolean managementNetworkUpdated) { - return (oldNetworkName.equals(NetworkUtils.getEngineNetwork()) && !managementNetworkUpdated || - !oldNetworkName.equals(NetworkUtils.getEngineNetwork()) && managementNetworkUpdated); } @Override -- To view, visit http://gerrit.ovirt.org/7575 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c15d815c4963dab9c58800a884734b3d1236ccd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
