add whose backends which have no routes

Author: tifayuki

haproxy/haproxycfg.py

@@ -309,13 +309,12 @@ 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 BackendHelper.check_backend_has_routes(backend):
-                if not service_alias:
-                    if self.require_default_route:
-                        cfg["backend default_service"] = backend
+            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
                 else:
-                    if get_service_attribute(details, "virtual_host", service_alias):
-                        cfg["backend SERVICE_%s" % service_alias] = backend
-                    else:
-                        cfg["backend default_service"] = backend
+                    cfg["backend default_service"] = backend
         return cfg

haproxy/helper/backend_helper.py

@@ -155,11 +155,4 @@ def get_basic_auth_setting(basic_auth):
     if 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
+    return setting

tests/unit/helper/test_backend_helper.py

@@ -190,10 +190,4 @@ def test_get_basic_auth_setting(self):
         self.assertEqual(
             ["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"]))
+        self.assertEqual([], get_basic_auth_setting(""))