Merge lp:~tribaal/landscape-charm/migrate-schema-action into lp:~landscape/landscape-charm/trunk

[Chris Glass]

This branch introduces a minimal "migrate schema" juju action that simply runs the
schema migration script.

In a future branch (tracked by bug #1456953) we will implement a slightly more
secure way of doing so.

This branch introduces a minimal "migrate schema" juju action that simply runs the
schema migration script.

In a future branch (tracked by bug #1456953) we will implement a slightly more
secure way of doing so.

[Alberto Donato (ack)]

+1. Looks good, with a comment inline.

review: Approve

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 285
Branch: lp:~tribaal/landscape-charm/migrate-schema-action
Jenkins: https://ci.lscape.net/job/latch-test/974/

review: Approve (test results)

[lp:~tribaal/landscape-charm/migrate-schema-action]

286. By Chris Glass on 2015-05-20

Adressed review comment.

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 286
Branch: lp:~tribaal/landscape-charm/migrate-schema-action
Jenkins: https://ci.lscape.net/job/latch-test/975/

review: Approve (test results)

[Chris Glass (tribaal)]

all comments should be addressed.

[Free Ekanayaka (free.ekanayaka)]

Looks good, just a few minor comments, +1

review: Approve

[lp:~tribaal/landscape-charm/migrate-schema-action]

287. By Chris Glass on 2015-05-21

Address review comments.

[Chris Glass (tribaal)]

all comments addressed!

[lp:~tribaal/landscape-charm/migrate-schema-action]

288. By Chris Glass on 2015-05-21

Lint.

=== modified file 'actions.yaml'
--- actions.yaml	2015-05-12 12:22:20 +0000
+++ actions.yaml	2015-05-21 07:33:22 +0000
@@ -6,3 +6,6 @@
   description: Upgrade software on the Landscape unit. This action will update
     APT package indexes and upgrade the landscape-server package.
     Unit must already be paused with the 'pause' action.
+migrate-schema:
+  description: Upgrade the landscape schemas on the related databases.
+    Unit must already be paused with the 'pause' action.

=== added file 'actions/migrate-schema'
--- actions/migrate-schema	1970-01-01 00:00:00 +0000
+++ actions/migrate-schema	2015-05-21 07:33:22 +0000
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+import sys
+
+from lib.migrate_schema import MigrateSchemaAction
+
+
+if __name__ == "__main__":
+    action = MigrateSchemaAction()
+    sys.exit(action())

=== modified file 'lib/callbacks/scripts.py'
--- lib/callbacks/scripts.py	2015-05-13 17:57:51 +0000
+++ lib/callbacks/scripts.py	2015-05-21 07:33:22 +0000
@@ -3,9 +3,7 @@
 from charmhelpers.core import hookenv
 from charmhelpers.core.services.base import ManagerCallback
 
-from lib.paths import LSCTL
-
-SCHEMA = "/usr/bin/landscape-schema"
+from lib.paths import LSCTL, SCHEMA_SCRIPT
 
 
 class ScriptCallback(ManagerCallback):
@@ -27,7 +25,7 @@
     This will invoke the schema script with the --bootstrap flag.
     """
     def __call__(self, manager, service_name, event_name):
-        self._run(SCHEMA, ("--bootstrap",))
+        self._run(SCHEMA_SCRIPT, ("--bootstrap",))
 
 
 class LSCtl(ScriptCallback):

=== added file 'lib/migrate_schema.py'
--- lib/migrate_schema.py	1970-01-01 00:00:00 +0000
+++ lib/migrate_schema.py	2015-05-21 07:33:22 +0000
@@ -0,0 +1,17 @@
+import subprocess
+
+from charmhelpers.core import hookenv
+
+from lib.hook import Hook
+from lib.paths import SCHEMA_SCRIPT
+
+
+class MigrateSchemaAction(Hook):
+    """Execute schema upgrade action logic."""
+
+    def __init__(self, hookenv=hookenv, subprocess=subprocess):
+        super(MigrateSchemaAction, self).__init__(hookenv=hookenv)
+        self._subprocess = subprocess
+
+    def _run(self):
+        self._subprocess.check_call([SCHEMA_SCRIPT])

=== modified file 'lib/paths.py'
--- lib/paths.py	2015-05-11 06:56:57 +0000
+++ lib/paths.py	2015-05-21 07:33:22 +0000
@@ -4,8 +4,12 @@
 SERVICE_CONF = "/etc/landscape/service.conf"
 DEFAULT_FILE = "/etc/default/landscape-server"
 SSL_CERT_PATH = "/etc/ssl/certs/landscape_server_ca.crt"
-CONFIG_DIR = "/opt/canonical/landscape/configs/standalone"
-OFFLINE_DIR = "/opt/canonical/landscape/canonical/landscape/offline"
+
+INSTALL_DIR = "/opt/canonical/landscape"
+CONFIG_DIR = INSTALL_DIR + "/configs/standalone"
+OFFLINE_DIR = INSTALL_DIR + "/canonical/landscape/offline"
+SCHEMA_SCRIPT = "/usr/bin/landscape-schema"
+
 LICENSE_FILE = "/etc/landscape/license.txt"
 LSCTL = "/usr/bin/lsctl"
 

=== added file 'lib/tests/test_migrate_schema.py'
--- lib/tests/test_migrate_schema.py	1970-01-01 00:00:00 +0000
+++ lib/tests/test_migrate_schema.py	2015-05-21 07:33:22 +0000
@@ -0,0 +1,20 @@
+from lib.tests.helpers import HookenvTest
+from lib.migrate_schema import MigrateSchemaAction
+from lib.tests.stubs import SubprocessStub
+from lib.paths import SCHEMA_SCRIPT
+
+
+class MigrateSchemaActionTest(HookenvTest):
+
+    def setUp(self):
+        super(MigrateSchemaActionTest, self).setUp()
+        self.subprocess = SubprocessStub()
+        self.action = MigrateSchemaAction(
+            hookenv=self.hookenv, subprocess=self.subprocess)
+
+    def test_run(self):
+        """
+        The MigrateSchemaAction calls the schema script.
+        """
+        self.action()
+        self.assertEqual([([SCHEMA_SCRIPT], {})], self.subprocess.calls)