Browse Source

Merge "Update OVN LB Algorithm to SOURCE_IP_PORT"

tags/7.0.0.0rc1
Zuul 9 months ago
committed by Gerrit Code Review
parent
commit
80eb3a229d
8 changed files with 17 additions and 15 deletions
  1. +2
    -2
      doc/source/admin/loadbalancer.rst
  2. +3
    -2
      doc/source/contributor/design/loadbalancer.rst
  3. +1
    -1
      lower-constraints.txt
  4. +1
    -1
      networking_ovn/octavia/ovn_driver.py
  5. +5
    -4
      networking_ovn/tests/functional/octavia/test_ovn_driver.py
  6. +3
    -3
      networking_ovn/tests/unit/octavia/test_ovn_driver.py
  7. +1
    -1
      requirements.txt
  8. +1
    -1
      test-requirements.txt

+ 2
- 2
doc/source/admin/loadbalancer.rst View File

@@ -145,7 +145,7 @@ OVN updates the Listener information in the Load Balancer table::
Next, a Pool is associated with the Listener::

$ openstack loadbalancer pool create --protocol TCP --lb-algorithm /
ROUND_ROBIN --listener 21e77cde-854f-4c3e-bd8c-9536ae0443bc
SOURCE_IP_PORT --listener 21e77cde-854f-4c3e-bd8c-9536ae0443bc
+---------------------+--------------------------------------+
| Field | Value |
+---------------------+--------------------------------------+
@@ -154,7 +154,7 @@ Next, a Pool is associated with the Listener::
| description | |
| healthmonitor_id | |
| id | 898be8a2-5185-4f3b-8658-a56457f595a9 |
| lb_algorithm | ROUND_ROBIN |
| lb_algorithm | SOURCE_IP_PORT |
| listeners | 21e77cde-854f-4c3e-bd8c-9536ae0443bc |
| loadbalancers | 94e7c431-912b-496c-a247-d52875d44ac7 |
| members | |


+ 3
- 2
doc/source/contributor/design/loadbalancer.rst View File

@@ -182,7 +182,7 @@ executed and what changes in the Load_Balancer Northbound DB table.
2. Create a pool::

$ openstack loadbalancer pool create --name p1 --loadbalancer lb1
--protocol TCP --lb-algorithm ROUND_ROBIN
--protocol TCP --lb-algorithm SOURCE_IP_PORT

$ ovn-nbctl list load_balancer
_uuid : 9dd65bae-2501-43f2-b34e-38a9cb7e4251
@@ -282,7 +282,8 @@ Following actions are not supported by OVN Driver:

- Creating HealthMonitors

- Currently only one algorithm is supported for pool management (Round Robin)
- Currently only one algorithm is supported for pool management
(Source IP Port)

- Creating Listeners and Pools with different protocols. They should be of the
same protocol type.


+ 1
- 1
lower-constraints.txt View File

@@ -57,7 +57,7 @@ netaddr==0.7.18
netifaces==0.10.4
neutron==13.0.0.0b2
neutron-lib==1.28.0
octavia-lib==1.1.1
octavia-lib==1.3.1
openstackdocstheme==1.20.0
openstacksdk==0.11.2
os-client-config==1.28.0


+ 1
- 1
networking_ovn/octavia/ovn_driver.py View File

@@ -80,7 +80,7 @@ LB_EXT_IDS_VIP_PORT_ID_KEY = 'neutron:vip_port_id'

OVN_NATIVE_LB_PROTOCOLS = [constants.PROTOCOL_TCP,
constants.PROTOCOL_UDP, ]
OVN_NATIVE_LB_ALGORITHMS = [constants.LB_ALGORITHM_ROUND_ROBIN, ]
OVN_NATIVE_LB_ALGORITHMS = [constants.LB_ALGORITHM_SOURCE_IP_PORT, ]
EXCEPTION_MSG = "Exception occurred during %s"
OVN_EVENT_LOCK_NAME = "neutron_ovn_octavia_event_lock"



+ 5
- 4
networking_ovn/tests/functional/octavia/test_ovn_driver.py View File

@@ -110,10 +110,11 @@ class TestOctaviaOvnProviderDriver(base.TestOVNFunctionalBase):
lb.admin_state_up = admin_state_up
return lb

def _create_pool_model(self, loadbalancer_id, pool_name,
protocol=o_constants.PROTOCOL_TCP,
lb_algorithm=o_constants.LB_ALGORITHM_ROUND_ROBIN,
admin_state_up=True, listener_id=None):
def _create_pool_model(
self, loadbalancer_id, pool_name,
protocol=o_constants.PROTOCOL_TCP,
lb_algorithm=o_constants.LB_ALGORITHM_SOURCE_IP_PORT,
admin_state_up=True, listener_id=None):
m_pool = octavia_data_model.Pool()
if protocol:
m_pool.protocol = protocol


+ 3
- 3
networking_ovn/tests/unit/octavia/test_ovn_driver.py View File

@@ -176,7 +176,7 @@ class TestOvnProviderDriver(TestOvnOctaviaBase):
admin_state_up=False,
description='pool',
name='Peter',
lb_algorithm=constants.LB_ALGORITHM_ROUND_ROBIN,
lb_algorithm=constants.LB_ALGORITHM_SOURCE_IP_PORT,
loadbalancer_id=self.loadbalancer_id,
listener_id=self.listener_id,
members=[self.ref_member],
@@ -187,7 +187,7 @@ class TestOvnProviderDriver(TestOvnOctaviaBase):
admin_state_up=True,
description='pool',
name='Peter',
lb_algorithm=constants.LB_ALGORITHM_ROUND_ROBIN,
lb_algorithm=constants.LB_ALGORITHM_SOURCE_IP_PORT,
loadbalancer_id=self.loadbalancer_id,
listener_id=self.listener_id,
members=[self.ref_member],
@@ -197,7 +197,7 @@ class TestOvnProviderDriver(TestOvnOctaviaBase):
self.ref_http_pool = data_models.Pool(
admin_state_up=True,
description='pool',
lb_algorithm=constants.LB_ALGORITHM_ROUND_ROBIN,
lb_algorithm=constants.LB_ALGORITHM_SOURCE_IP_PORT,
loadbalancer_id=self.loadbalancer_id,
listener_id=self.listener_id,
members=[self.ref_member],


+ 1
- 1
requirements.txt View File

@@ -15,7 +15,7 @@ tenacity>=4.4.0 # Apache-2.0
Babel!=2.4.0,>=2.3.4 # BSD
six>=1.10.0 # MIT
neutron>=13.0.0.0b2 # Apache-2.0
octavia-lib>=1.1.1 # Apache-2.0
octavia-lib>=1.3.1 # Apache-2.0
tooz>=1.58.0 # Apache-2.0
requests>=2.14.2 # Apache-2.0



+ 1
- 1
test-requirements.txt View File

@@ -14,7 +14,7 @@ astroid==1.6.5;python_version<"3.0" # LGPLv2.1
astroid==2.1.0;python_version>="3.0" # LGPLv2.1
pylint==1.9.3;python_version<'3.0' # GPLv2
pylint==2.3.0;python_version>='3.0' # GPLv2
octavia-lib>=1.1.1 # Apache-2.0
octavia-lib>=1.3.1 # Apache-2.0
testresources>=2.0.0 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD
WebTest>=2.0.27 # MIT


Loading…
Cancel
Save