Merge ""lbaas delete l7 rule" Parameter Passing Error" into stable/stein

neutron_lbaas/services/loadbalancer/plugin.py

@@ -1042,7 +1042,7 @@ class LoadBalancerPluginv2(loadbalancerv2.LoadBalancerPluginBaseV2,
             self._call_driver_operation(context, driver.l7rule.delete,
                                         rule_db)
         else:
-            self.db.delete_l7policy_rule(context, id, l7policy_id)
+            self.db.delete_l7policy_rule(context, id)
 
     def get_l7policy_rules(self, context, l7policy_id,
                            filters=None, fields=None):

neutron_lbaas/tests/unit/services/loadbalancer/test_loadbalancer_plugin.py

@@ -23,6 +23,7 @@ from oslo_utils import uuidutils
 from webob import exc
 
 from neutron_lbaas.extensions import healthmonitor_max_retries_down as hm_down
+from neutron_lbaas.extensions import l7
 from neutron_lbaas.extensions import lb_network_vip
 from neutron_lbaas.extensions import loadbalancerv2
 from neutron_lbaas.extensions import sharedpools
@@ -33,6 +34,27 @@ _uuid = uuidutils.generate_uuid
 _get_path = test_base._get_path
 
 
+class TestL7ExtensionTestCase(base.ExtensionTestCase):
+    fmt = 'json'
+
+    def setUp(self):
+        super(TestL7ExtensionTestCase, self).setUp()
+        self.setup_extension(
+            'neutron_lbaas.extensions.loadbalancerv2.LoadBalancerPluginBaseV2',
+            constants.LOADBALANCERV2, l7.L7, 'lbaas')
+
+    def test_delete_l7policy_rule(self):
+        entity_id = _uuid()
+        res = self.api.delete(
+            test_base._get_path('lbaas/l7policies/l7pid1/rules',
+                                id=entity_id, fmt=self.fmt))
+        delete_entity = getattr(self.plugin.return_value,
+                                "delete_l7policy_rule")
+        delete_entity.assert_called_with(mock.ANY, entity_id,
+                                         l7policy_id='l7pid1')
+        self.assertEqual(res.status_int, exc.HTTPNoContent.code)
+
+
 class TestLoadBalancerExtensionV2TestCase(base.ExtensionTestCase):
     fmt = 'json'
 

releasenotes/notes/correct-delete-l7-rule-parameter-passing-error-e5564d3359168c12.yaml

@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Correct the parameter passing error when using lbaas to delete l7 rule.