Merge "Fix pool statistics for LBaaS Haproxy driver"

This commit is contained in:
Jenkins 2014-06-18 13:37:54 +00:00 committed by Gerrit Code Review
commit 7c46a55a9b
2 changed files with 6 additions and 4 deletions

View File

@ -37,10 +37,11 @@ BALANCE_MAP = {
}
STATS_MAP = {
constants.STATS_ACTIVE_CONNECTIONS: 'qcur',
constants.STATS_MAX_CONNECTIONS: 'qmax',
constants.STATS_ACTIVE_CONNECTIONS: 'scur',
constants.STATS_MAX_CONNECTIONS: 'smax',
constants.STATS_CURRENT_SESSIONS: 'scur',
constants.STATS_MAX_SESSIONS: 'smax',
constants.STATS_TOTAL_CONNECTIONS: 'stot',
constants.STATS_TOTAL_SESSIONS: 'stot',
constants.STATS_IN_BYTES: 'bin',
constants.STATS_OUT_BYTES: 'bout',

View File

@ -218,14 +218,15 @@ class TestHaproxyNSDriver(base.BaseTestCase):
socket.recv.return_value = raw_stats
exp_stats = {'connection_errors': '0',
'active_connections': '1',
'active_connections': '3',
'current_sessions': '3',
'bytes_in': '7764',
'max_connections': '2',
'max_connections': '4',
'max_sessions': '4',
'bytes_out': '2365',
'response_errors': '0',
'total_sessions': '10',
'total_connections': '10',
'members': {
'32a6c2a3-420a-44c3-955d-86bd2fc6871e': {
'status': 'ACTIVE',