Merge lp:~andreserl/maas/lp1604169 into lp:~maas-committers/maas/trunk

[Andres Rodriguez]

Ensure maasserver is available before allowing maas cli to run with extra commands, otherwise don't show maasserver related commands

[Gavin Panella (allenap)]

Looks good. One suggestion to tidy it up a bit, but only a suggestion.

review: Approve

=== modified file 'src/maascli/cli.py'
--- src/maascli/cli.py	2016-06-13 15:48:16 +0000
+++ src/maascli/cli.py	2016-07-20 12:43:06 +0000
@@ -9,6 +9,7 @@
 
 from functools import partial
 import os
+import pkgutil
 import sys
 from textwrap import fill
 
@@ -187,7 +188,7 @@
 
     # Setup and the allowed django commands into the maascli.
     management = get_django_management()
-    if management is not None:
+    if management is not None and is_maasserver_available():
         os.environ.setdefault("DJANGO_SETTINGS_MODULE", "maas.settings")
         sys.path.append('/usr/share/maas')
         load_regiond_commands(management, parser)
@@ -204,6 +205,11 @@
         return management
 
 
+def is_maasserver_available():
+    """Ensure that 'maasserver' module is available."""
+    return pkgutil.find_loader("maasserver") is not None
+
+
 def run_regiond_command(management, parser):
     """Called to run the regiond command.
 
 
=== modified file 'src/maascli/tests/test_cli.py'
--- src/maascli/tests/test_cli.py	2016-07-13 11:22:20 +0000
+++ src/maascli/tests/test_cli.py	2016-07-20 12:43:06 +0000
@@ -43,15 +43,32 @@
             cli.cmd_login)
 
     def test_doesnt_call_load_regiond_commands_if_no_management(self):
-        self.patch(cli, "get_django_management").return_value = None
-        mock_load_regiond_commands = self.patch(cli, "load_regiond_commands")
-        parser = ArgumentParser()
-        cli.register_cli_commands(parser)
-        self.assertThat(mock_load_regiond_commands, MockNotCalled())
-
-    def test_calls_load_regiond_commands_when_management(self):
-        self.patch(
-            cli, "get_django_management").return_value = sentinel.management
+        self.patch(
+            cli, "get_django_management").return_value = None
+        self.patch(
+            cli,
+            "is_maasserver_available").return_value = sentinel.pkg_util
+        mock_load_regiond_commands = self.patch(cli, "load_regiond_commands")
+        parser = ArgumentParser()
+        cli.register_cli_commands(parser)
+        self.assertThat(mock_load_regiond_commands, MockNotCalled())
+
+    def test_doesnt_call_load_regiond_commands_if_no_maasserver(self):
+        self.patch(
+            cli, "get_django_management").return_value = sentinel.management
+        self.patch(
+            cli, "is_maasserver_available").return_value = None
+        mock_load_regiond_commands = self.patch(cli, "load_regiond_commands")
+        parser = ArgumentParser()
+        cli.register_cli_commands(parser)
+        self.assertThat(mock_load_regiond_commands, MockNotCalled())
+
+    def test_calls_load_regiond_commands_when_management_and_maasserver(self):
+        self.patch(
+            cli, "get_django_management").return_value = sentinel.management
+        self.patch(
+            cli,
+            "is_maasserver_available").return_value = sentinel.pkg_util
         mock_load_regiond_commands = self.patch(cli, "load_regiond_commands")
         parser = ArgumentParser()
         cli.register_cli_commands(parser)