From 736583fd9f5d166f0c7b0ed9d8556d332cf2bd5b Mon Sep 17 00:00:00 2001
From: Aaron Lee <aaron.lee@rackspace.com>
Date: Tue, 13 Dec 2011 14:43:51 -0600
Subject: Make sure the rxtx_cap is used to set qos info

Change-Id: Id06d12a24756ce865e3b7e1b79185dddbdb71582
---
 nova/virt/xenapi/vif.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/xenapi/vif.py b/nova/virt/xenapi/vif.py
index 2f25efeb2..e3d7b9a7d 100644
--- a/nova/virt/xenapi/vif.py
+++ b/nova/virt/xenapi/vif.py
@@ -41,7 +41,6 @@ class XenAPIBridgeDriver(VIFDriver):
         else:
             network_ref = NetworkHelper.find_network_with_bridge(
                                         xenapi_session, network['bridge'])
-        rxtx_cap = network_mapping.pop('rxtx_cap')
         vif_rec = {}
         vif_rec['device'] = str(device)
         vif_rec['network'] = network_ref
@@ -49,9 +48,13 @@ class XenAPIBridgeDriver(VIFDriver):
         vif_rec['MAC'] = network_mapping['mac']
         vif_rec['MTU'] = '1500'
         vif_rec['other_config'] = {}
-        vif_rec['qos_algorithm_type'] = "ratelimit" if rxtx_cap else ''
-        vif_rec['qos_algorithm_params'] = \
-                {"kbps": str(rxtx_cap * 1024)} if rxtx_cap else {}
+        if "rxtx_cap" in network_mapping:
+            vif_rec['qos_algorithm_type'] = "ratelimit"
+            vif_rec['qos_algorithm_params'] = \
+                {"kbps": str(network_mapping['rxtx_cap'] * 1024)}
+        else:
+            vif_rec['qos_algorithm_type'] = ""
+            vif_rec['qos_algorithm_params'] = {}
         return vif_rec
 
     def ensure_vlan_bridge(self, xenapi_session, network):
-- 
cgit