openstack
/
octavia
Code Issues Proposed changes

Merge "Fix listener creation with fully-populated API" into stable/yoga

This commit is contained in:
Zuul 2023-02-09 10:54:04 +00:00 committed by Gerrit Code Review
parent 068d281a51 66a62bc201
commit da762a8b4d
5 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
octavia/controller/worker/v1/flows/load_balancer_flows.py
View File

@ -205,9 +205,16 @@ class LoadBalancerFlows(object):
requires=constants.DELTAS, provides=constants.UPDATED_PORTS
)
)
flows.append(
network_tasks.GetAmphoraeNetworkConfigs(
requires=constants.LOADBALANCER_ID,
provides=constants.AMPHORAE_NETWORK_CONFIG
)
)
flows.append(
amphora_driver_tasks.AmphoraePostNetworkPlug(
requires=(constants.LOADBALANCER, constants.UPDATED_PORTS)
requires=(constants.LOADBALANCER, constants.UPDATED_PORTS,
constants.AMPHORAE_NETWORK_CONFIG)
)
)
flows.append(

9
octavia/controller/worker/v2/flows/load_balancer_flows.py
View File

@ -199,9 +199,16 @@ class LoadBalancerFlows(object):
requires=constants.DELTAS, provides=constants.UPDATED_PORTS
)
)
flows.append(
network_tasks.GetAmphoraeNetworkConfigs(
requires=constants.LOADBALANCER_ID,
provides=constants.AMPHORAE_NETWORK_CONFIG
)
)
flows.append(
amphora_driver_tasks.AmphoraePostNetworkPlug(
requires=(constants.LOADBALANCER, constants.UPDATED_PORTS)
requires=(constants.LOADBALANCER, constants.UPDATED_PORTS,
constants.AMPHORAE_NETWORK_CONFIG)
)
)
flows.append(

6
octavia/tests/unit/controller/worker/v1/flows/test_load_balancer_flows.py
View File

@ -185,7 +185,6 @@ class TestLoadBalancerFlows(base.TestCase):
self.assertIn(constants.UPDATE_DICT, create_flow.requires)
self.assertIn(constants.BUILD_TYPE_PRIORITY, create_flow.requires)
self.assertIn(constants.FLAVOR, create_flow.requires)
self.assertIn(constants.AMPHORAE_NETWORK_CONFIG, create_flow.requires)
self.assertIn(constants.AVAILABILITY_ZONE, create_flow.requires)
self.assertIn(constants.SERVER_GROUP_ID, create_flow.requires)
@ -202,9 +201,10 @@ class TestLoadBalancerFlows(base.TestCase):
self.assertIn(constants.AMP_DATA, create_flow.provides)
self.assertIn(constants.SERVER_PEM, create_flow.provides)
self.assertIn(constants.AMPHORA_NETWORK_CONFIG, create_flow.provides)
self.assertIn(constants.AMPHORAE_NETWORK_CONFIG, create_flow.provides)
self.assertEqual(7, len(create_flow.requires))
self.assertEqual(13, len(create_flow.provides))
self.assertEqual(6, len(create_flow.requires))
self.assertEqual(14, len(create_flow.provides))
def test_get_create_load_balancer_flows_active_standby_listeners(
self, mock_get_net_driver):

7
octavia/tests/unit/controller/worker/v2/flows/test_load_balancer_flows.py
View File

@ -212,7 +212,6 @@ class TestLoadBalancerFlows(base.TestCase):
self.assertIn(constants.UPDATE_DICT, create_flow.requires)
self.assertIn(constants.BUILD_TYPE_PRIORITY, create_flow.requires)
self.assertIn(constants.FLAVOR, create_flow.requires)
self.assertIn(constants.AMPHORAE_NETWORK_CONFIG, create_flow.requires)
self.assertIn(constants.AVAILABILITY_ZONE, create_flow.requires)
self.assertIn(constants.SERVER_GROUP_ID, create_flow.requires)
@ -229,10 +228,10 @@ class TestLoadBalancerFlows(base.TestCase):
self.assertIn(constants.UPDATED_PORTS, create_flow.provides)
self.assertIn(constants.SERVER_PEM, create_flow.provides)
self.assertIn(constants.VIP, create_flow.provides)
self.assertIn(constants.AMPHORAE_NETWORK_CONFIG, create_flow.provides)
self.assertEqual(7, len(create_flow.requires))
self.assertEqual(13, len(create_flow.provides),
create_flow.provides)
self.assertEqual(6, len(create_flow.requires))
self.assertEqual(14, len(create_flow.provides))
def test_get_create_load_balancer_flows_active_standby_listeners(
self, mock_get_net_driver):

5
releasenotes/notes/fix-fully-populated-lb-with-listener-92a369ea8d57e8f5.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixed a bug that prevented Octavia from creating listeners with the
fully-populated load balancer API in SINGLE topology mode.