Merge ~blake-rouse/maas:fix-1721548 into maas:master

[Blake Rouse]

Fixes LP #1721548 - Failure on controller refresh seem to be causing version to not get updated.

Add maas_version to RefreshRackControllerInfo RPC response so the version will be sent over the wire to the region. Before the version was being calculated but it would not be sent over the wire. "maas_version" field is set to optional so older rack controllers that connect to the region do not error because that field will be missing.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b fix-1721548 lp:~blake-rouse/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/441/consoleText

8e83a30... by Blake Rouse on 2017-10-06

Fix tests.

diff --git a/src/provisioningserver/rpc/cluster.py b/src/provisioningserver/rpc/cluster.py
index 907da7a..c5402f6 100644
--- a/src/provisioningserver/rpc/cluster.py
+++ b/src/provisioningserver/rpc/cluster.py
@@ -601,6 +601,7 @@ class RefreshRackControllerInfo(amp.Command):
         (b"osystem", amp.Unicode()),
         (b"distro_series", amp.Unicode()),
         (b"interfaces", StructureAsJSON()),
+        (b"maas_version", amp.Unicode(optional=True)),
     ]
     errors = {
         exceptions.RefreshAlreadyInProgress: (
diff --git a/src/provisioningserver/rpc/tests/test_clusterservice.py b/src/provisioningserver/rpc/tests/test_clusterservice.py
index 56f1436..8553d02 100644
--- a/src/provisioningserver/rpc/tests/test_clusterservice.py
+++ b/src/provisioningserver/rpc/tests/test_clusterservice.py
@@ -2385,12 +2385,14 @@ class TestClusterProtocol_Refresh(
         architecture = factory.make_name('architecture')
         osystem = factory.make_name('osystem')
         distro_series = factory.make_name('distro_series')
+        maas_version = factory.make_name('maas_version')
         self.patch_autospec(clusterservice, 'get_sys_info').return_value = {
             'hostname': hostname,
             'osystem': osystem,
             'distro_series': distro_series,
             'architecture': architecture,
             'interfaces': {},
+            'maas_version': maas_version,
         }
 
         response = yield call_responder(
@@ -2407,6 +2409,7 @@ class TestClusterProtocol_Refresh(
                 'osystem': osystem,
                 'distro_series': distro_series,
                 'architecture': architecture,
+                'maas_version': maas_version,
                 'interfaces': {},
             }, response)