do not show backends without any routes

Author: tifayuki

haproxy/haproxycfg.py

@@ -268,12 +268,13 @@ def _config_backend_sections(self):
         for service_alias in services_aliases:
             backend = BackendHelper.get_backend_section(details, routes, vhosts, service_alias, self.routes_added)
 
-            if not service_alias:
-                if self.require_default_route:
-                    cfg["backend default_service"] = backend
-            else:
-                if get_service_attribute(details, "virtual_host", service_alias):
-                    cfg["backend SERVICE_%s" % service_alias] = backend
+            if BackendHelper.check_backend_has_routes(backend):
+                if not service_alias:
+                    if self.require_default_route:
+                        cfg["backend default_service"] = backend
                 else:
-                    cfg["backend default_service"] = backend
+                    if get_service_attribute(details, "virtual_host", service_alias):
+                        cfg["backend SERVICE_%s" % service_alias] = backend
+                    else:
+                        cfg["backend default_service"] = backend
         return cfg

haproxy/helper/backend_helper.py

@@ -156,3 +156,10 @@ def get_basic_auth_setting(basic_auth):
         setting.append("acl need_auth http_auth(haproxy_userlist)")
         setting.append("http-request auth realm haproxy_basic_auth if !need_auth")
     return setting
+
+
+def check_backend_has_routes(backend):
+    for b in backend:
+        if b.startswith("server"):
+            return True
+    return False

tests/unit/helper/test_backend_helper.py

@@ -191,3 +191,9 @@ def test_get_basic_auth_setting(self):
             ["acl need_auth http_auth(haproxy_userlist)", "http-request auth realm haproxy_basic_auth if !need_auth"],
             get_basic_auth_setting('something'))
         self.assertEqual([], get_basic_auth_setting(""))
+
+    def test_check_backend_has_routes(self):
+        self.assertTrue(check_backend_has_routes(["mode http",
+                                                  "balance source",
+                                                  "server HELLO_1 10.7.0.4:80 check inter 2000 rise 2 fall 3"]))
+        self.assertFalse(check_backend_has_routes(["mode http", "balance source"]))

tests/unit/helper/test_tcp_helper.py

@@ -118,7 +118,6 @@ def test_get_tcp_balance(self):
         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"]},

tests/unit/test_parser.py

@@ -284,4 +284,4 @@ def test_parse(self):
         self.assertEqual(["opt1", "opt2", "opt3"], env.details["HELLO"]["option"])
 
         env.parse("HELLO_2_ENV_EXTRA_SETTINGS", "settings")
-        self.assertEqual("settings", env.details["HELLO"]["extra_settings"])
+        self.assertEqual("settings", env.details["HELLO"]["extra_settings"])

tests/unit/test_utils.py

@@ -20,6 +20,7 @@ def setUp(self):
 
     @mock.patch("haproxy.utils.dockercloud.Utils.fetch_by_resource_uri")
     def test_fetch_remote_object(self, mock_fetch_by_resource_uri):
+        self.assertIsNone(fetch_remote_obj(""))
         mock_fetch_by_resource_uri.return_value = self.container
         self.assertEqual(self.container, fetch_remote_obj("uri"))