Moti Asayag has uploaded a new change for review. Change subject: Revert "core: Delete oldNetworkName from UpdateNetworkToVds" ......................................................................
Revert "core: Delete oldNetworkName from UpdateNetworkToVds" This reverts commit 96ccaea207fa0da4a1ee9c544117ee2b8993d2f2. Change-Id: I7ea26efae18c8fbeed30966ab26ac64aef526645 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachNetworkToVdsParameters.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java 3 files changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/7574/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachNetworkToVdsParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachNetworkToVdsParameters.java index f1db991..736d9b2 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachNetworkToVdsParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachNetworkToVdsParameters.java @@ -1,8 +1,8 @@ package org.ovirt.engine.core.common.action; -import org.ovirt.engine.core.common.businessentities.Network; import org.ovirt.engine.core.common.businessentities.NetworkBootProtocol; import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; +import org.ovirt.engine.core.common.businessentities.Network; import org.ovirt.engine.core.compat.Guid; public class AttachNetworkToVdsParameters extends VdsActionParameters { @@ -10,6 +10,7 @@ private boolean checkConnectivity; private Network network; + private String oldNetworkName; private VdsNetworkInterface iface; private String address; private String subnet; @@ -43,6 +44,14 @@ network = value; } + public String getOldNetworkName() { + return oldNetworkName; + } + + public void setOldNetworkName(String value) { + oldNetworkName = value; + } + public VdsNetworkInterface getInterface() { return iface; } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java index 14ea20b..5814a10 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java @@ -104,6 +104,7 @@ newNetwork!=null ? newNetwork : oldNetwork , new ArrayList<VdsNetworkInterface>(){{add(inter);}}); + params.setOldNetworkName(oldNetwork!=null ? oldNetwork.getname() : null); if(nic.isSetName() && inter.getBonded() != null && inter.getBonded()){ params.setBondName(nic.getName()); } 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 82b4d79..4b5e60f 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 @@ -1206,6 +1206,10 @@ parameters.setBondingOptions(null); } + if (network != null) + { + parameters.setOldNetworkName(network.getname()); + } parameters.setCheckConnectivity((Boolean) model.getCheckConnectivity().getEntity()); parameters.setBootProtocol(model.getBootProtocol()); @@ -1543,6 +1547,7 @@ UpdateNetworkToVdsParameters parameters = new UpdateNetworkToVdsParameters(host.getId(), net, selectedItems); parameters.setCheckConnectivity((Boolean) model.getCheckConnectivity().getEntity()); + parameters.setOldNetworkName(interfaceWithNetwork.getNetworkName()); Map.Entry<String, EntityModel> bondingOption; if (model.getBondingOptions().getSelectedItem() != null) @@ -1954,7 +1959,9 @@ new UpdateNetworkToVdsParameters(getEntity().getId(), network, new ArrayList<VdsNetworkInterface>(Arrays.asList(new VdsNetworkInterface[] { nic }))); + parameters.setOldNetworkName((nic.getNetworkName() != null ? nic.getNetworkName() : network.getname())); parameters.setCheckConnectivity((Boolean) model.getCheckConnectivity().getEntity()); + actionType = VdcActionType.UpdateNetworkToVdsInterface; } Map.Entry<String, EntityModel> bondingOption; -- To view, visit http://gerrit.ovirt.org/7574 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ea26efae18c8fbeed30966ab26ac64aef526645 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
