Merge "QoS integration - callbacks should support a list of policies"

vmware_nsx/plugins/nsx_v/plugin.py

@@ -3228,8 +3228,8 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
                 error = _("Configured %s not found") % field
                 raise nsx_exc.NsxPluginException(err_msg=error)
 
-    def _handle_qos_notification(self, qos_policy, event_type):
-        qos_utils.handle_qos_notification(qos_policy, event_type, self._dvs)
+    def _handle_qos_notification(self, qos_policys, event_type):
+        qos_utils.handle_qos_notification(qos_policys, event_type, self._dvs)
 
     def get_az_by_hint(self, hint):
         az = self._availability_zones_data.get_availability_zone(hint)

vmware_nsx/services/qos/nsx_v/utils.py

@@ -90,28 +90,34 @@ class NsxVQosRule(object):
         return self
 
 
-def handle_qos_notification(policy_obj, event_type, dvs):
+def handle_qos_notification(policies_list, event_type, dvs):
     # Check if QoS policy rule was created/deleted/updated
     # Only if the policy rule was updated, we need to update the dvs
-    if (event_type == callbacks_events.UPDATED and
-        hasattr(policy_obj, "rules")):
+    if event_type != callbacks_events.UPDATED:
+        return
 
-        # Reload the policy as admin so we will have a context
-        context = n_context.get_admin_context()
-        admin_policy = qos_policy.QosPolicy.get_object(
-            context, id=policy_obj.id)
-        # get all the bound networks of this policy
-        networks = admin_policy.get_bound_networks()
-        qos_rule = NsxVQosRule(context=context,
-                               qos_policy_id=policy_obj.id)
+    for policy_obj in policies_list:
+        if hasattr(policy_obj, "rules"):
+            handle_qos_policy_notification(policy_obj, dvs)
 
-        for net_id in networks:
-            # update the new bw limitations for this network
-            net_morefs = nsx_db.get_nsx_switch_ids(context.session, net_id)
-            for moref in net_morefs:
-                # update the qos restrictions of the network
-                dvs.update_port_groups_config(
-                    net_id,
-                    moref,
-                    dvs.update_port_group_spec_qos,
-                    qos_rule)
+
+def handle_qos_policy_notification(policy_obj, dvs):
+    # Reload the policy as admin so we will have a context
+    context = n_context.get_admin_context()
+    admin_policy = qos_policy.QosPolicy.get_object(
+        context, id=policy_obj.id)
+    # get all the bound networks of this policy
+    networks = admin_policy.get_bound_networks()
+    qos_rule = NsxVQosRule(context=context,
+                           qos_policy_id=policy_obj.id)
+
+    for net_id in networks:
+        # update the new bw limitations for this network
+        net_morefs = nsx_db.get_nsx_switch_ids(context.session, net_id)
+        for moref in net_morefs:
+            # update the qos restrictions of the network
+            dvs.update_port_groups_config(
+                net_id,
+                moref,
+                dvs.update_port_group_spec_qos,
+                qos_rule)

vmware_nsx/services/qos/nsx_v3/utils.py

@@ -32,7 +32,12 @@ LOG = logging.getLogger(__name__)
 MAX_KBPS_MIN_VALUE = 1024
 
 
-def handle_qos_notification(policy_obj, event_type):
+def handle_qos_notification(policies_list, event_type):
+    for policy_obj in policies_list:
+        handle_qos_policy_notification(policy_obj, event_type)
+
+
+def handle_qos_policy_notification(policy_obj, event_type):
     handler = QosNotificationsHandler()
     context = n_context.get_admin_context()
 

vmware_nsx/tests/unit/nsx_v/test_plugin.py

@@ -609,7 +609,7 @@ class TestNetworksV2(test_plugin.TestNetworksV2, NsxVPluginV2TestCase):
                                return_value=fake_policy):
             with mock.patch.object(qos_pol.QosPolicy, "get_bound_networks",
                                    return_value=[net["id"]]):
-                plugin._handle_qos_notification(fake_policy,
+                plugin._handle_qos_notification([fake_policy],
                                                 callbacks_events.UPDATED)
                 # make sure the policy data was read, and the dvs was updated
                 self.assertTrue(fake_init_from_policy.called)

vmware_nsx/tests/unit/services/qos/fake_notifier.py

@@ -22,10 +22,10 @@ class DummyNotificationDriver(
     message_queue.RpcQosServiceNotificationDriver):
 
     def create_policy(self, context, policy):
-        qos_utils.handle_qos_notification(policy, events.CREATED)
+        qos_utils.handle_qos_notification([policy], events.CREATED)
 
     def update_policy(self, context, policy):
-        qos_utils.handle_qos_notification(policy, events.UPDATED)
+        qos_utils.handle_qos_notification([policy], events.UPDATED)
 
     def delete_policy(self, context, policy):
-        qos_utils.handle_qos_notification(policy, events.DELETED)
+        qos_utils.handle_qos_notification([policy], events.DELETED)

vmware_nsx/tests/unit/services/qos/fake_nsxv_notifier.py

@@ -33,7 +33,7 @@ class DummyNsxVNotificationDriver(
         pass
 
     def update_policy(self, context, policy):
-        qos_utils.handle_qos_notification(policy, events.UPDATED, self._dvs)
+        qos_utils.handle_qos_notification([policy], events.UPDATED, self._dvs)
 
     def delete_policy(self, context, policy):
-        qos_utils.handle_qos_notification(policy, events.DELETED, self._dvs)
+        qos_utils.handle_qos_notification([policy], events.DELETED, self._dvs)