Add unit tests and fixes for OVS Agent QoS Extension Driver

Add basic unit tests and fix some of the issues while doing
the tests

blueprint ml2-ovs-qos-with-bwlimiting

Change-Id: I3962dd2c0e1273905781faf3f5c51886dea21cd4

diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/extension_drivers/qos_driver.py b/neutron/plugins/ml2/drivers/openvswitch/agent/extension_drivers/qos_driver.py
index 7fecda792a499da628df0c1efe3459815bf640da..de7da77e88add044792e93ad1f05fadbd45af26f 100644 (file)
--- a/neutron/plugins/ml2/drivers/openvswitch/agent/extension_drivers/qos_driver.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/extension_drivers/qos_driver.py
@@ -28,7 +28,7 @@ class QosOVSAgentDriver(qos_agent.QosAgentDriver):
         super(QosOVSAgentDriver, self).__init__()
         # TODO(QoS) check if we can get this configuration
         #  as constructor arguments
-        self.br_int_name = cfg.CONF.ovs_integration_bridge
+        self.br_int_name = cfg.CONF.OVS.integration_bridge
         self.br_int = None
         self.handlers = {}
 
@@ -53,9 +53,9 @@ class QosOVSAgentDriver(qos_agent.QosAgentDriver):
 
     def _handle_rules(self, action, port, rules):
         for rule in rules:
-            handler = self.handlers.get((action, rule.get_type()))
+            handler = self.handlers.get((action, rule.get('type')))
             if handler is not None:
-                handler(port, rules)
+                handler(port, rule)
 
     def _update_bw_limit_rule(self, port, rule):
         port_name = port.get('name')
@@ -71,6 +71,9 @@ class QosOVSAgentDriver(qos_agent.QosAgentDriver):
                                                  max_kbps,
                                                  max_burst_kbps)
 
-    def _delete_bw_limit_rule(self, port):
+    def _delete_bw_limit_rule(self, port, rule):
         port_name = port.get('name')
-        self.br_int.del_qos_bw_limit_for_port(port_name)
+        current_max_kbps, current_max_burst = (
+            self.br_int.get_qos_bw_limit_for_port(port_name))
+        if current_max_kbps is not None or current_max_burst is not None:
+            self.br_int.del_qos_bw_limit_for_port(port_name)

diff --git a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/extension_drivers/__init__.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/extension_drivers/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/extension_drivers/test_qos_driver.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/extension_drivers/test_qos_driver.py
new file mode 100644 (file)
index 0000000..0d7300b
--- /dev/null
+++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/extension_drivers/test_qos_driver.py
@@ -0,0 +1,88 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import mock
+
+from neutron.extensions import qos
+from neutron.plugins.ml2.drivers.openvswitch.agent.extension_drivers import (
+    qos_driver)
+from neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent import (
+    ovs_test_base)
+
+
+class OVSQoSAgentDriverBwLimitRule(ovs_test_base.OVSAgentConfigTestBase):
+
+    def setUp(self):
+        super(OVSQoSAgentDriverBwLimitRule, self).setUp()
+        self.qos_driver = qos_driver.QosOVSAgentDriver()
+        self.qos_driver.initialize()
+        self.qos_driver.br_int = mock.Mock()
+        self.qos_driver.br_int.get_qos_bw_limit_for_port = mock.Mock(
+            return_value=(1000, 10))
+        self.get = self.qos_driver.br_int.get_qos_bw_limit_for_port
+        self.qos_driver.br_int.del_qos_bw_limit_for_port = mock.Mock()
+        self.delete = self.qos_driver.br_int.del_qos_bw_limit_for_port
+        self.qos_driver.br_int.create_qos_bw_limit_for_port = mock.Mock()
+        self.create = self.qos_driver.br_int.create_qos_bw_limit_for_port
+        self.rule = self._create_bw_limit_rule()
+        self.port = self._create_fake_port()
+
+    def _create_bw_limit_rule(self):
+        return {'type': qos.RULE_TYPE_BANDWIDTH_LIMIT,
+                'max_kbps': '200',
+                'max_burst_kbps': '2'}
+
+    def _create_fake_port(self):
+        return {'name': 'fakeport'}
+
+    def test_create_new_rule(self):
+        self.qos_driver.br_int.get_qos_bw_limit_for_port = mock.Mock(
+            return_value=(None, None))
+        self.qos_driver.create(self.port, [self.rule])
+        # Assert create is the last call
+        self.assertEqual(
+            'create_qos_bw_limit_for_port',
+            self.qos_driver.br_int.method_calls[-1][0])
+        self.assertEqual(0, self.delete.call_count)
+        self.create.assert_called_once_with(
+            self.port['name'], self.rule['max_kbps'],
+            self.rule['max_burst_kbps'])
+
+    def test_create_existing_rules(self):
+        self.qos_driver.create(self.port, [self.rule])
+        self._assert_rule_create_updated()
+
+    def test_update_rules(self):
+        self.qos_driver.update(self.port, [self.rule])
+        self._assert_rule_create_updated()
+
+    def test_delete_rules(self):
+        self.qos_driver.delete(self.port, [self.rule])
+        self.delete.assert_called_once_with(self.port['name'])
+
+    def test_unknown_rule_id(self):
+        self.rule['type'] = 'unknown'
+        self.qos_driver.create(self.port, [self.rule])
+        self.assertEqual(0, self.create.call_count)
+        self.assertEqual(0, self.delete.call_count)
+
+    def _assert_rule_create_updated(self):
+        # Assert create is the last call
+        self.assertEqual(
+            'create_qos_bw_limit_for_port',
+            self.qos_driver.br_int.method_calls[-1][0])
+
+        self.delete.assert_called_once_with(self.port['name'])
+
+        self.create.assert_called_once_with(
+            self.port['name'], self.rule['max_kbps'],
+            self.rule['max_burst_kbps'])