From 15e6936499a9076c6c1232b29ad831d9e4659b5a Mon Sep 17 00:00:00 2001 From: Stephen Balukoff Date: Wed, 24 Aug 2016 17:37:23 -0700 Subject: [PATCH] Fix L7 Policy creation with Octavia driver The L7 Policy create method is sending the listener_id to Octavia as a POST parameter, when the Octavia is not expecting it. This is breaking L7 Policy creation with Octavia. Change-Id: I8fabeee79cfc70da09b50cd2da6ec16f2742d824 Closes-Bug: #1607758 --- neutron_lbaas/drivers/octavia/driver.py | 2 -- neutron_lbaas/tests/unit/drivers/octavia/test_octavia_driver.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/neutron_lbaas/drivers/octavia/driver.py b/neutron_lbaas/drivers/octavia/driver.py index 53636bc4e..dde9c06d2 100644 --- a/neutron_lbaas/drivers/octavia/driver.py +++ b/neutron_lbaas/drivers/octavia/driver.py @@ -510,8 +510,6 @@ class L7PolicyManager(driver_base.BaseL7PolicyManager): args['id'] = l7p.id if not graph: - if l7p.listener_id: - args['listener_id'] = l7p.listener_id return args if (l7p.redirect_pool and l7p.action == diff --git a/neutron_lbaas/tests/unit/drivers/octavia/test_octavia_driver.py b/neutron_lbaas/tests/unit/drivers/octavia/test_octavia_driver.py index 5cceb7462..fdf1f6f32 100644 --- a/neutron_lbaas/tests/unit/drivers/octavia/test_octavia_driver.py +++ b/neutron_lbaas/tests/unit/drivers/octavia/test_octavia_driver.py @@ -73,7 +73,7 @@ class BaseOctaviaDriverTest(test_db_loadbalancerv2.LbaasPluginDbTestCase): hm = data_models.HealthMonitor(id=id, pool=pool) sp = data_models.SessionPersistence(pool_id=pool.id, pool=pool) l7policy = data_models.L7Policy( - id=id, listener=listener, + id=id, listener=listener, listener_id=listener.id, action=constants.L7_POLICY_ACTION_REDIRECT_TO_POOL) l7rule = data_models.L7Rule( id=id, policy=l7policy, type=constants.L7_RULE_TYPE_PATH,