Merge lp:~free.ekanayaka/landscape-charm/no-combo-loader-support into lp:~landscape/landscape-charm/stable

[Free Ekanayaka]

Support both LDS packages with and and without combo-loader.

Support both LDS packages with and and without combo-loader.

Packages with combo-loader are the ones currently released, while packages without the combo-loader are then ones built after:

https://code.launchpad.net/~free.ekanayaka/landscape/consolidate-combo-loader/+merge/248254

lands.

[lp:~free.ekanayaka/landscape-charm/no-combo-loader-support]

219. By Free Ekanayaka on 2015-02-04

Fix combo-loader apache rule

[Geoff Teale (tealeg)]

+1 All looks good.

review: Approve

[Данило Шеган (danilo)]

Looks good. I haven't noticed that this is against the stable charm at first, so I was worried that we'd be dragging compatibility code with us forever, but since we are re-working the charm altogether, nothing to worry about.

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-01-27 04:05:15 +0000
+++ hooks/hooks.py	2015-02-04 12:18:28 +0000
@@ -119,11 +119,21 @@
     haproxy_service = re.sub("\W", "", haproxy_service)
     return haproxy_service
 
+COMBO_LOADER_VHOST_ENTRY = (
+    "    RewriteRule ^/combo http://{{ haproxy_comboloader }}/ [P,L]\n")
+
+NO_COMBO_LOADER_VHOST_ENTRY = (
+    "    RewriteRule "
+    "^/combo(.*) http://{{ haproxy_appserver }}/combo$1 [P,L]\n")
+
 
 def _get_vhost_template(template_filename, haproxy_service_name):
     """Expand the template with the provided haproxy service name."""
     with open("%s/config/%s" % (ROOT, template_filename), "r") as handle:
         contents = handle.read()
+        if not HAS_COMBO_LOADER:
+            contents = contents.replace(
+                COMBO_LOADER_VHOST_ENTRY, NO_COMBO_LOADER_VHOST_ENTRY)
         contents = re.sub(r"{{ haproxy_([^}]+) }}", r"{{ %s_\1 }}" %
                           haproxy_service_name, contents)
     return contents
@@ -654,6 +664,8 @@
         count = service_count
         if re.match(r"^.*:\d+$", service_count):
             (service, count) = service_count.split(":")
+            if service == "combo-loader" and not HAS_COMBO_LOADER:
+                continue
             result[service] = count
     return result
 
@@ -668,6 +680,8 @@
     result = {}
     requested = _get_requested_service_count()
     for service in _get_requested_services():
+        if service == "combo-loader" and not HAS_COMBO_LOADER:
+            continue
         args = [service]
         args.extend(SERVICE_COUNT[service])
         args.append(requested[service])
@@ -752,6 +766,8 @@
     config = juju.config_get()
     if "services" in config:
         for service in config["services"].split():
+            if service == "combo-loader" and not HAS_COMBO_LOADER:
+                continue
             if service not in SERVICE_DEFAULT:
                 juju.juju_log("Invalid Service: %s" % service)
                 raise Exception("Invalid Service: %s" % service)
@@ -857,10 +873,6 @@
     "pingserver": {
         "port": "8070", "httpchk": "HEAD /ping HTTP/1.0"
         },
-    "combo-loader": {
-        "port": "9070",
-        "httpchk": "HEAD /?yui/scrollview/scrollview-min.js HTTP/1.0"
-        },
     "async-frontend": {
         "port": "9090",
         "service_options": ["timeout client 300000",
@@ -869,6 +881,14 @@
     "package-upload": {"port": "9100"},
     "package-search": {"port": "9090"}}
 
+HAS_COMBO_LOADER = os.path.exists("/etc/init.d/landscape-combo-loader")
+if HAS_COMBO_LOADER:
+    SERVICE_PROXY["combo-loader"] = {
+        "port": "9070",
+        "httpchk": "HEAD /?yui/scrollview/scrollview-min.js HTTP/1.0"
+    }
+
+
 # Format is:
 #   [min, auto_max, hard_max]
 #   min = minimum number of daemons to launch
@@ -879,7 +899,6 @@
     "msgserver": [2, 8, 9],
     "pingserver": [1, 4, 9],
     "apiserver": [1, 2, 9],
-    "combo-loader": [1, 1, 1],
     "async-frontend": [1, 1, 1],
     "jobhandler": [1, 1, 1],
     "package-upload": [1, 1, 1],
@@ -887,13 +906,13 @@
     "juju-sync": [1, 1, 1],
     "cron": [1, 1, 1],
     "static": [1, 1, 1]}
-
+if HAS_COMBO_LOADER:
+    SERVICE_COUNT["combo-loader"] = [1, 1, 1]
 
 SERVICE_DEFAULT = {
     "appserver": "RUN_APPSERVER",
     "msgserver": "RUN_MSGSERVER",
     "pingserver": "RUN_PINGSERVER",
-    "combo-loader": "RUN_COMBO_LOADER",
     "async-frontend": "RUN_ASYNC_FRONTEND",
     "apiserver": "RUN_APISERVER",
     "package-upload": "RUN_PACKAGEUPLOADSERVER",
@@ -902,6 +921,8 @@
     "juju-sync": "RUN_JUJU_SYNC",
     "cron": "RUN_CRON",
     "static": None}
+if HAS_COMBO_LOADER:
+    SERVICE_DEFAULT["combo-loader"] = "RUN_COMBO_LOADER"
 
 LANDSCAPE_DEFAULT_FILE = "/etc/default/landscape-server"
 LANDSCAPE_APACHE_SITE = "/etc/apache2/sites-available/landscape.conf"
 
=== modified file 'hooks/test_hooks.py'
--- hooks/test_hooks.py	2015-01-27 04:05:15 +0000
+++ hooks/test_hooks.py	2015-02-04 12:18:28 +0000
@@ -162,6 +162,25 @@
 UPGRADE_SCHEMA="no"
             """)
 
+    def with_combo_loader(self):
+        """Tweak globals so they match a deployment with combo-loader."""
+        self.addCleanup(
+            setattr, hooks, "HAS_COMBO_LOADER", hooks.HAS_COMBO_LOADER)
+        self.addCleanup(
+            setattr, hooks, "SERVICE_PROXY", hooks.SERVICE_PROXY)
+        self.addCleanup(
+            setattr, hooks, "SERVICE_COUNT", hooks.SERVICE_COUNT)
+        self.addCleanup(
+            setattr, hooks, "SERVICE_DEFAULT", hooks.SERVICE_DEFAULT)
+
+        hooks.HAS_COMBO_LOADER = True
+        hooks.SERVICE_PROXY["combo-loader"] = {
+            "port": "9070",
+            "httpchk": "HEAD /?yui/scrollview/scrollview-min.js HTTP/1.0"
+        }
+        hooks.SERVICE_COUNT["combo-loader"] = [1, 1, 1]
+        hooks.SERVICE_DEFAULT["combo-loader"] = "RUN_COMBO_LOADER"
+
 
 class TestHooksService(TestHooks):
 
@@ -1399,7 +1418,7 @@
         """
         hooks.juju.config["service-count"] = "0"
         result = hooks._get_requested_service_count()
-        self.assertEqual(len(result), 12)
+        self.assertEqual(len(result), 11)
         self.assertEqual(result["appserver"], "0")
 
         hooks.juju.config["service-count"] = "foo"
@@ -1425,12 +1444,23 @@
         hooks.juju.config["service-count"] = (
             "juju-sync:-8 cron:XYZ BLAh BLAh:X")
         result = hooks._get_requested_service_count()
-        self.assertEqual(len(result), 12)
+        self.assertEqual(len(result), 11)
         self.assertEqual(result["juju-sync"], "AUTO")
         self.assertEqual(result["cron"], "AUTO")
         self.assertEqual(result["appserver"], "AUTO")
         self.assertNotIn("BLAh", result)
 
+    def test_get_requested_service_with_combo_loader(self):
+        """
+        If the installed landscape-server package has the combo-loader service,
+        that _get_requested_service_count() includes it.
+        """
+        self.with_combo_loader()
+        hooks.juju.config["service-count"] = "1"
+        result = hooks._get_requested_service_count()
+        self.assertEqual(len(result), 12)
+        self.assertEqual(result["combo-loader"], "1")
+
     def test_get_services_dict(self):
         """
         The services dict contains service names as keys
@@ -1454,6 +1484,22 @@
         result = hooks._get_services_dict()
         self.assertEqual(result, {"appserver": 3, "cron": 1})
 
+        # The combo-loader is skipped if not available.
+        hooks.juju.config["services"] = "appserver combo-loader"
+        hooks.juju.config["service-count"] = "AUTO"
+        result = hooks._get_services_dict()
+        self.assertEqual(result, {"appserver": 3})
+
+    def test_get_services_dict_with_combo_loader(self):
+        """
+        The services dict contains the combo-loader if available.
+        """
+        self.with_combo_loader()
+        hooks.juju.config["services"] = "appserver"
+        hooks.juju.config["service-count"] = "2"
+        result = hooks._get_services_dict()
+        self.assertEqual(result, {"appserver": 2})
+
     def test_get_requested_services(self):
         """
         "services" config is parsed into list.  Exceptions are raised for
@@ -1467,6 +1513,11 @@
         result = hooks._get_requested_services()
         self.assertEqual(["appserver", "pingserver", "cron"], result)
 
+        # The combo-loader is skipped if not available
+        hooks.juju.config["services"] = "appserver combo-loader"
+        result = hooks._get_requested_services()
+        self.assertEqual(["appserver"], result)
+
         hooks.juju.config["services"] = "appserver pingserver cron foo"
         self.assertRaises(Exception, hooks._get_requested_services)
 
@@ -1860,9 +1911,28 @@
         """
         notify the vhost-config relation on a separate ID.
         """
-        hooks.notify_vhost_config_relation("haproxy", "foo/0")
-        with open("%s/config/vhostssl.tmpl" % hooks.ROOT, 'r') as f:
-            vhostssl_template = f.read()
+        self.with_combo_loader()
+        hooks.notify_vhost_config_relation("haproxy", "foo/0")
+        with open("%s/config/vhostssl.tmpl" % hooks.ROOT, 'r') as f:
+            vhostssl_template = f.read()
+        with open("%s/config/vhost.tmpl" % hooks.ROOT, 'r') as f:
+            vhost_template = f.read()
+        baseline = yaml.dump(
+            [{"port": "443", "template": base64.b64encode(vhostssl_template)},
+             {"port": "80", "template": base64.b64encode(vhost_template)}])
+        self.assertEqual(
+            (("vhosts", baseline),), hooks.juju._outgoing_relation_data)
+
+    def test_notify_vhost_config_relation_specify_id_no_combo_loader(self):
+        """
+        If there's no combo-loader the relevant vhost entry is skipped.
+        """
+        hooks.notify_vhost_config_relation("haproxy", "foo/0")
+        with open("%s/config/vhostssl.tmpl" % hooks.ROOT, 'r') as f:
+            vhostssl_template = f.read()
+            vhostssl_template = vhostssl_template.replace(
+                hooks.COMBO_LOADER_VHOST_ENTRY,
+                hooks.NO_COMBO_LOADER_VHOST_ENTRY)
         with open("%s/config/vhost.tmpl" % hooks.ROOT, 'r') as f:
             vhost_template = f.read()
         baseline = yaml.dump(
@@ -1876,6 +1946,7 @@
         If the landscape-server package being installed has offline pages
         under the static dir, the legacy templates are used.
         """
+        self.with_combo_loader()
         self.addCleanup(
             setattr, hooks, "HAS_OLD_ERROR_PATH", hooks.HAS_OLD_ERROR_PATH)
         hooks.HAS_OLD_ERROR_PATH = True
@@ -1892,6 +1963,7 @@
 
     def test_notify_vhost_config_relation(self):
         """notify the vhost-config relation on the "current" ID."""
+        self.with_combo_loader()
         hooks.notify_vhost_config_relation("haproxy")
         with open("%s/config/vhostssl.tmpl" % hooks.ROOT, 'r') as f:
             vhostssl_template = f.read()
 
=== modified file 'tests/01-begin.py'
--- tests/01-begin.py	2015-01-19 18:32:57 +0000
+++ tests/01-begin.py	2015-02-04 12:18:28 +0000
@@ -379,8 +379,6 @@
             cls.juju_status, "pingserver")
         cls.async_unit = find_landscape_unit_with_service(
             cls.juju_status, "async-frontend")
-        cls.combo_unit = find_landscape_unit_with_service(
-            cls.juju_status, "combo-loader")
 
     def run_command_on_unit(self, cmd, unit):
         output = check_output(["juju", "ssh", unit, cmd], stderr=PIPE)
@@ -441,18 +439,6 @@
         url = "https://{}/ajax".format(self.frontend)
         check_url(url, good_content)
 
-    def test_combo_unavailable_page(self):
-        """
-        Verify that the frontend shows the unstyled unavailable page for combo.
-        """
-        self.addCleanup(self.start_server, "landscape-combo-loader",
-                        self.combo_unit)
-        self.stop_server("landscape-combo-loader", self.combo_unit)
-        good_content = ["503 Service Unavailable",
-                        "No server is available to handle this request."]
-        url = "http://{}/combo".format(self.frontend)
-        check_url(url, good_content)
-
 
 class LandscapeCronTests(BaseLandscapeTests):