openstack/octavia
Code Issues Proposed changes

Merge "fix haproxy_count to display the number of running processes" into stable/xena

Browse Source
This commit is contained in:
Zuul 2023-10-11 13:01:17 +00:00 committed by Gerrit Code Review
commit 37e798e05a
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
octavia/amphorae/backends/agent/api_server/amphora_info.py
View File

@ -45,6 +45,7 @@ class AmphoraInfo(object):
return webob.Response(json=body)
def compile_amphora_details(self, extend_lvs_driver=None):
haproxy_loadbalancer_list = sorted(util.get_loadbalancers())
haproxy_listener_list = sorted(util.get_listeners())
extend_body = {}
lvs_listener_list = []
@ -67,7 +68,7 @@ class AmphoraInfo(object):
'networks': self._get_networks(),
'active': True,
'haproxy_count':
self._count_haproxy_processes(haproxy_listener_list),
self._count_haproxy_processes(haproxy_loadbalancer_list),
'cpu': {
'total': cpu['total'],
'user': cpu['user'],

7
octavia/tests/unit/amphorae/backends/agent/api_server/test_amphora_info.py
View File

@ -38,6 +38,7 @@ class TestAmphoraInfo(base.TestCase):
FAKE_LISTENER_ID_3 = uuidutils.generate_uuid()
FAKE_LISTENER_ID_4 = uuidutils.generate_uuid()
LB_ID_1 = uuidutils.generate_uuid()
LB_ID_2 = uuidutils.generate_uuid()
def setUp(self):
super().setUp()
@ -112,6 +113,8 @@ class TestAmphoraInfo(base.TestCase):
@mock.patch('octavia.amphorae.backends.agent.api_server.util.'
'get_listeners', return_value=[FAKE_LISTENER_ID_1,
FAKE_LISTENER_ID_2])
@mock.patch('octavia.amphorae.backends.agent.api_server.util.'
'get_loadbalancers', return_value=[LB_ID_1, LB_ID_2])
@mock.patch('octavia.amphorae.backends.agent.api_server.'
'amphora_info.AmphoraInfo._get_meminfo')
@mock.patch('octavia.amphorae.backends.agent.api_server.'
@ -128,7 +131,8 @@ class TestAmphoraInfo(base.TestCase):
@mock.patch('socket.gethostname', return_value='FAKE_HOST')
def test_compile_amphora_details(self, mhostname, m_count, m_pkg_version,
m_load, m_get_nets, m_os, m_cpu,
mget_mem, mget_listener):
mget_mem, mget_loadbalancers,
mget_listeners):
mget_mem.return_value = {'SwapCached': 0, 'Buffers': 344792,
'MemTotal': 21692784, 'Cached': 4271856,
'Slab': 534384, 'MemFree': 12685624,
@ -180,6 +184,7 @@ class TestAmphoraInfo(base.TestCase):
u'topology_status': u'OK'}
actual = self.amp_info.compile_amphora_details()
self.assertEqual(expected_dict, actual.json)
m_count.assert_called_once_with(sorted(mget_loadbalancers()))
api_server.VERSION = original_version
@mock.patch('octavia.amphorae.backends.agent.api_server.util.'

5
releasenotes/notes/fix-amphora-haproxy-count-b1b1df43a7150926.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fix amphora haproxy_count to return the number of
haproxy processes that are running.