Merge lp:~therve/landscape-client/cloud-missing-kernel into lp:~landscape/landscape-client/trunk

[Thomas Herve]

A fairly simple change, as I simply mirror what have been done with ramdisk. Unfortunately, that change won't work with old server code, but there is no way around it, and the client wouldn't work anyway without the fix.

[Free Ekanayaka (free.ekanayaka)]

+1!

review: Approve

[Alberto Donato (ack)]

good, +1!

review: Approve

=== modified file 'landscape/broker/registration.py'
--- landscape/broker/registration.py	2012-01-20 15:13:23 +0000
+++ landscape/broker/registration.py	2012-01-24 09:11:37 +0000
@@ -148,7 +148,6 @@
                 "/meta-data/local-hostname",
                 "/meta-data/public-hostname",
                 "/meta-data/ami-launch-index",
-                "/meta-data/kernel-id",
                 "/meta-data/ami-id",
                 "/meta-data/local-ipv4",
                 "/meta-data/public-ipv4"]
@@ -162,13 +161,18 @@
                 lambda ignore: self._fetch_async(
                     EC2_API + "/meta-data/ramdisk-id").addErrback(log_failure))
             deferred.addCallback(ec2_data.append)
+            # And same for kernel
+            deferred.addCallback(
+                lambda ignore: self._fetch_async(
+                    EC2_API + "/meta-data/kernel-id").addErrback(log_failure))
+            deferred.addCallback(ec2_data.append)
 
             def record_data(ignore):
                 """Record the instance data returned by the EC2 API."""
                 (raw_user_data, instance_key, reservation_key,
                  local_hostname, public_hostname, launch_index,
-                 kernel_key, ami_key, local_ip,
-                 public_ip, ramdisk_key) = ec2_data
+                 ami_key, local_ip, public_ip, ramdisk_key,
+                 kernel_key) = ec2_data
                 self._ec2_data = {
                     "instance_key": instance_key,
                     "reservation_key": reservation_key,
@@ -181,7 +185,7 @@
                     "public_ipv4": public_ip,
                     "local_ipv4": local_ip}
                 for k, v in self._ec2_data.items():
-                    if v is None and k == "ramdisk_key":
+                    if v is None and k in ("ramdisk_key", "kernel_key"):
                         continue
                     self._ec2_data[k] = v.decode("utf-8")
                 self._ec2_data["launch_index"] = int(

=== modified file 'landscape/broker/tests/test_registration.py'
--- landscape/broker/tests/test_registration.py	2012-01-20 15:13:23 +0000
+++ landscape/broker/tests/test_registration.py	2012-01-24 09:11:37 +0000
@@ -855,6 +855,24 @@
                             [self.get_expected_cloud_message(
                                 ramdisk_key=None)])
 
+    def test_cloud_registration_continues_without_kernel(self):
+        """
+        If the instance doesn't have a kernel (ie, the query for kernel
+        returns a 404), then register-cloud-vm still occurs.
+        """
+        self.log_helper.ignore_errors(HTTPCodeError)
+        self.prepare_query_results(kernel_key=HTTPCodeError(404, "ohno"))
+        self.prepare_cloud_registration()
+
+        self.reactor.fire("run")
+        self.exchanger.exchange()
+        self.assertIn("HTTPCodeError: Server returned HTTP code 404",
+                      self.logfile.getvalue())
+        self.assertEqual(len(self.transport.payloads), 1)
+        self.assertMessages(self.transport.payloads[0]["messages"],
+                            [self.get_expected_cloud_message(
+                                kernel_key=None)])
+
     def test_fall_back_to_normal_registration_when_metadata_fetch_fails(self):
         """
         If fetching metadata fails, but we do have an account name, then we

=== modified file 'landscape/message_schemas.py'
--- landscape/message_schemas.py	2012-01-23 12:10:15 +0000
+++ landscape/message_schemas.py	2012-01-24 09:11:37 +0000
@@ -163,7 +163,7 @@
      "reservation_key": Unicode(),
      "public_hostname": Unicode(),
      "local_hostname": Unicode(),
-     "kernel_key": Unicode(),
+     "kernel_key": Any(Unicode(), Constant(None)),
      "ramdisk_key": Any(Unicode(), Constant(None)),
      "launch_index": Int(),
      "image_key": Unicode(),