Lior Vernia has uploaded a new change for review. Change subject: webadmin: Reset properties when detaching network ......................................................................
webadmin: Reset properties when detaching network Previously the underlying network interface entity's properties were not properly reset when a network was detached, regarding recently-added properties (QoS, custom properties). This is now fixed. Change-Id: I37f3f1bc0cc3d5353c43d628fa3b24420728236c Bug-Url: https://bugzilla.redhat.com/1119019 Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/NetworkParameters.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/LogicalNetworkModel.java 2 files changed, 14 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/30496/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/NetworkParameters.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/NetworkParameters.java index 114d844..4cd89a5 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/NetworkParameters.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/NetworkParameters.java @@ -59,7 +59,7 @@ return qosOverridden; } - private void setQosOverridden(boolean qosOverridden) { + public void setQosOverridden(boolean qosOverridden) { this.qosOverridden = qosOverridden; } @@ -67,7 +67,7 @@ return qos; } - private void setQos(NetworkQoS qos) { + public void setQos(NetworkQoS qos) { this.qos = qos; } @@ -75,7 +75,7 @@ return customProperties; } - private void setCustomProperties(Map<String, String> customProperties) { + public void setCustomProperties(Map<String, String> customProperties) { this.customProperties = customProperties; } 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 6af4a54..d985e26 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 @@ -126,18 +126,14 @@ VdsNetworkInterface nicEntity = attachingNic.getEntity(); NetworkParameters netParams = new NetworkParameters(); - if (!hasVlan()) { - netParams.setBootProtocol(nicEntity.getBootProtocol()); - netParams.setAddress(nicEntity.getAddress()); - netParams.setSubnet(nicEntity.getSubnet()); - netParams.setGateway(nicEntity.getGateway()); - } else { - netParams.setBootProtocol(vlanNicModel.getEntity().getBootProtocol()); - netParams.setAddress(vlanNicModel.getEntity().getAddress()); - netParams.setSubnet(vlanNicModel.getEntity().getSubnet()); - netParams.setGateway(vlanNicModel.getEntity().getGateway()); - } - + VdsNetworkInterface detachedDevice = hasVlan() ? vlanNicModel.getEntity() : nicEntity; + netParams.setBootProtocol(detachedDevice.getBootProtocol()); + netParams.setAddress(detachedDevice.getAddress()); + netParams.setSubnet(detachedDevice.getSubnet()); + netParams.setGateway(detachedDevice.getGateway()); + netParams.setQosOverridden(detachedDevice.isQosOverridden()); + netParams.setQos(detachedDevice.getQos()); + netParams.setCustomProperties(detachedDevice.getCustomProperties()); getSetupModel().getNetworkToLastDetachParams().put(getName(), netParams); if (!hasVlan()) { @@ -146,6 +142,9 @@ nicEntity.setAddress(null); nicEntity.setSubnet(null); nicEntity.setGateway(null); + nicEntity.setQosOverridden(false); + nicEntity.setQos(null); + nicEntity.setCustomProperties(null); nicEntity.setNetworkImplementationDetails(null); } setVlanNicModel(null); -- To view, visit http://gerrit.ovirt.org/30496 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I37f3f1bc0cc3d5353c43d628fa3b24420728236c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
