add application defined balance clause to the tcp section

Author: tifayuki

haproxy/haproxycfg.py

@@ -226,13 +226,15 @@ def get_tcp_section(self, details, services_aliases, tcp_port):
         bind_string = get_bind_string(enable_ssl, port_num, self.ssl_bind_string, EXTRA_BIND_SETTINGS)
         tcp_routes, self.routes_added = TcpHelper.get_tcp_routes(details, self.specs.get_routes(), tcp_port, port_num)
         services = TcpHelper.get_service_aliases_given_tcp_port(details, services_aliases, tcp_port)
+        balance = TcpHelper.get_tcp_balance(details)
         options = TcpHelper.get_tcp_options(details, services)
         extra_settings = TcpHelper.get_tcp_extra_settings(details, services)
         tcp_section.append("bind :%s" % bind_string.strip())
         tcp_section.append("mode tcp")
-        tcp_section.extend(tcp_routes)
+        tcp_section.extend(balance)
         tcp_section.extend(options)
         tcp_section.extend(extra_settings)
+        tcp_section.extend(tcp_routes)
         return tcp_section, port_num
 
     def _config_frontend_sections(self):

haproxy/helper/tcp_helper.py

@@ -58,6 +58,14 @@ def get_service_aliases_given_tcp_port(details, service_aliases, tcp_port):
     return services
 
 
+def get_tcp_balance(details):
+    balance = get_service_attribute(details, 'balance')
+    if balance:
+        return ["balance %s" % balance]
+    else:
+        return []
+
+
 def get_tcp_options(details, services):
     option_list = []
     for service in services:

tests/unit/helper/test_tcp_helper.py

@@ -110,6 +110,15 @@ def test_get_service_aliases_given_tcp_port(self):
         self.assertEqual([], get_service_aliases_given_tcp_port({}, ['HELLO', 'WORLD'], '33'))
         self.assertEqual([], get_service_aliases_given_tcp_port({}, [], '33'))
 
+    def test_get_tcp_balance(self):
+        details = {'HW': {'balance': "a"},
+                   'HELLO': {'balance': "b"},
+                   'WORLD': {'balance': ""}}
+        self.assertEqual([], get_tcp_balance({}))
+        self.assertEqual([], get_tcp_balance({'WORLD': {'balance': ""}}))
+        self.assertTrue(get_tcp_balance(details) in [["balance a"], ["balance b"], []])
+
+
     def test_get_tcp_options(self):
         details = {'HW': {'option': ["opt1", 'opt2']},
                    'HELLO': {'option': ["opt3", "opt1"]},