Fix pool statistics for LBaaS Haproxy driver

Total connections was mapped to none of the counters
of haproxy. Active connections was mapped to active request
counter(qcur)) of haproxy which in low load situations
always remains zero.

Patch maps connections API counters to haproxy session counters
and fixes unit test accordingly.

Change-Id: I0ef4f76a75340232eb11a9b95453769ecd89d13a
Closes-Bug: #1319361

diff --git a/neutron/services/loadbalancer/drivers/haproxy/cfg.py b/neutron/services/loadbalancer/drivers/haproxy/cfg.py
index d740cb6c02911f08f3ee8c288a781a6fa3ed6432..815334f816baad0982363cb76973b342264ed4eb 100644 (file)
--- a/neutron/services/loadbalancer/drivers/haproxy/cfg.py
+++ b/neutron/services/loadbalancer/drivers/haproxy/cfg.py
@@ -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',

diff --git a/neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_namespace_driver.py b/neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_namespace_driver.py
index f3c3b39727574ea591815ef7d510187bbd52744e..450727bc246dd3158ac483d504ebb41519995fed 100644 (file)
--- a/neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_namespace_driver.py
+++ b/neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_namespace_driver.py
@@ -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',