Lior Vernia has uploaded a new change for review.

Change subject: webadmin: Clear QoS when detaching network
......................................................................

webadmin: Clear QoS when detaching network

Similarly to the previous fix for custom properties, QoS settings on a
host's network interface are also cleared when a network is detached.

Change-Id: Ife17c3fae94fe936aab87a4012b7133c943faf2d
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, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/30498/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 afc71f7..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;
     }
 
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 42d8fa0..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
@@ -131,6 +131,8 @@
         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);
 
@@ -140,6 +142,8 @@
             nicEntity.setAddress(null);
             nicEntity.setSubnet(null);
             nicEntity.setGateway(null);
+            nicEntity.setQosOverridden(false);
+            nicEntity.setQos(null);
             nicEntity.setCustomProperties(null);
             nicEntity.setNetworkImplementationDetails(null);
         }


-- 
To view, visit http://gerrit.ovirt.org/30498
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife17c3fae94fe936aab87a4012b7133c943faf2d
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

Reply via email to