Merge lp:~lamont/maas/bug-1567249-1.9 into lp:maas/1.9

[LaMont Jones]

Complain intelligently if the rack controller is running an old version (1.7) of maas (missing_packages was introduced in revno 4343)

Complain intelligently if the rack controller is running an old version (1.7) of maas (missing_packages was introduced in revno 4343)

A 1.7 cluster controller would successfully connect to a 1.9 region controller, and the first that anyone would have any issues was when they went to look at a node (not cluster/rack controller..) and got a KeyError traceback. Detecting this error and giving the admin a hint of why they're seeing this strange thing keeps then from diving down the rabbit hole.

With a 2.0 region controller, the 1.7 (and 1.9) cluster/rack controllers fail to connect at all, so it becomes clear that "there's an issue with cluster controller $FOO" rather quickly, and the obvious investigative actions lead to the right problem being found.

[Blake Rouse (blake-rouse)]

Looks good, but no test?

The description also makes since and why this is not needed in 2.0+.

review: Needs Fixing

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~lamont/maas/bug-1567249-1.9 into lp:maas/1.9 failed. Below is the output from the failed tests.

Hit http://security.ubuntu.com trusty-security InRelease
Ign http://prodstack-zone-1.clouds.archive.ubuntu.com trusty InRelease
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports InRelease
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/restricted Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/multiverse Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/restricted amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/multiverse amd64 Packages
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils fire...

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2016-06-30 17:36:38 +0000
+++ docs/changelog.rst	2016-07-11 16:38:15 +0000
@@ -19,6 +19,8 @@
 
 LP: #1597460    [1.9] MAAS 1.9 should only download filetypes from a SimpleStream is can process
 
+LP: #1567249    [1.9] If rack and region have different versions, the error is uninformative and confusing.
+
 1.9.3
 =====
 

=== modified file 'src/maasserver/clusterrpc/power_parameters.py'
--- src/maasserver/clusterrpc/power_parameters.py	2015-10-19 04:54:14 +0000
+++ src/maasserver/clusterrpc/power_parameters.py	2016-07-11 16:38:15 +0000
@@ -40,6 +40,7 @@
 from jsonschema import validate
 from maasserver.clusterrpc.utils import call_clusters
 from maasserver.config_forms import DictCharField
+from maasserver.exceptions import ClusterUnavailable
 from maasserver.fields import MACAddressFormField
 from maasserver.utils.forms import compose_invalid_choice_text
 from provisioningserver.power.schema import (
@@ -199,7 +200,20 @@
             name = power_type['name']
             fields = power_type['fields']
             description = power_type['description']
-            missing_packages = power_type['missing_packages']
+            try:
+                missing_packages = power_type['missing_packages']
+            except KeyError:
+                msg = (
+                    """Bad response from cluster controller.  This likely """
+                    """means that it is running an earlier version of MAAS.""")
+                if nodegroups is not None:
+                    if len(nodegroups) == 1:
+                        msg += " Controller: "
+                    else:
+                        msg += " Controllers: "
+                    msg += ", ".join([ctl.name for ctl in nodegroups])
+                    msg += "."
+                raise ClusterUnavailable(msg)
             add_power_type_parameters(
                 name, description, fields, missing_packages, merged_types)
     return sorted(merged_types, key=itemgetter("description"))

=== modified file 'src/maasserver/clusterrpc/tests/test_power_parameters.py'
--- src/maasserver/clusterrpc/tests/test_power_parameters.py	2015-10-01 22:48:50 +0000
+++ src/maasserver/clusterrpc/tests/test_power_parameters.py	2016-07-11 16:38:15 +0000
@@ -27,6 +27,7 @@
     POWER_TYPE_PARAMETER_FIELD_SCHEMA,
 )
 from maasserver.config_forms import DictCharField
+from maasserver.exceptions import ClusterUnavailable
 from maasserver.fields import MACAddressFormField
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
@@ -322,3 +323,20 @@
         self.assertThat(
             mocked, MockCalledOnceWith(
                 sentinel.nodegroup, sentinel.ignore_errors))
+
+    def test_get_power_types_detects_missing_missing_packages_key(self):
+        mocked = self.patch(power_parameters, "call_clusters")
+        mocked.return_value = [{
+            'power_types': [
+                {'name': "virsh", 'fields': "foo", 'description': "desc"},
+                {'name': "other", 'fields': "bar", 'description': "meh"},
+            ],
+        }]
+        e = self.assertRaises(
+            ClusterUnavailable,
+            power_parameters.get_all_power_types_from_clusters
+        )
+        self.assertEqual(
+            """Bad response from cluster controller.  This likely """
+            """means that it is running an earlier version of MAAS.""",
+            e.message)