Merge lp:~therve/landscape-client/cloud-ip-addresses into lp:~landscape/landscape-client/trunk

[Thomas Herve]

The branch reports 2 new infos from the metadata. IIRC it should be OK with old servers, and the fields are marked optionals for old clients.

[Alberto Donato (ack)]

Looks good to me, +1!

review: Approve

[Free Ekanayaka (free.ekanayaka)]

Cool, +1!

I guess we'll need a server-side branch too, to make use of the new meta-data?

[Free Ekanayaka (free.ekanayaka)]

review: Approve

=== modified file 'landscape/broker/registration.py'
--- landscape/broker/registration.py	2011-11-11 12:30:53 +0000
+++ landscape/broker/registration.py	2012-01-20 15:22:36 +0000
@@ -149,7 +149,9 @@
                 "/meta-data/public-hostname",
                 "/meta-data/ami-launch-index",
                 "/meta-data/kernel-id",
-                "/meta-data/ami-id"]
+                "/meta-data/ami-id",
+                "/meta-data/local-ipv4",
+                "/meta-data/public-ipv4"]
             # We're not using a DeferredList here because we want to keep the
             # number of connections to the backend minimal. See lp:567515.
             for path in paths:
@@ -165,7 +167,8 @@
                 """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, ramdisk_key) = ec2_data
+                 kernel_key, ami_key, local_ip,
+                 public_ip, ramdisk_key) = ec2_data
                 self._ec2_data = {
                     "instance_key": instance_key,
                     "reservation_key": reservation_key,
@@ -174,7 +177,9 @@
                     "launch_index": launch_index,
                     "kernel_key": kernel_key,
                     "ramdisk_key": ramdisk_key,
-                    "image_key": ami_key}
+                    "image_key": ami_key,
+                    "public_ipv4": public_ip,
+                    "local_ipv4": local_ip}
                 for k, v in self._ec2_data.items():
                     if v is None and k == "ramdisk_key":
                         continue

=== modified file 'landscape/broker/tests/test_registration.py'
--- landscape/broker/tests/test_registration.py	2011-11-29 15:11:35 +0000
+++ landscape/broker/tests/test_registration.py	2012-01-20 15:22:36 +0000
@@ -502,7 +502,8 @@
         self, user_data=None, instance_key="key1", launch_index=0,
         local_hostname="ooga.local", public_hostname="ooga.amazon.com",
         reservation_key=u"res1", ramdisk_key=u"ram1", kernel_key=u"kernel1",
-        image_key=u"image1", ssl_ca_certificate=None):
+        image_key=u"image1", local_ip="10.0.0.1", public_ip="10.0.0.2",
+        ssl_ca_certificate=None):
         if user_data is None:
             user_data = self.get_user_data(
                 ssl_ca_certificate=ssl_ca_certificate)
@@ -520,6 +521,8 @@
             ("/meta-data/kernel-id", kernel_key),
             ("/meta-data/ramdisk-id", ramdisk_key),
             ("/meta-data/ami-id", image_key),
+            ("/meta-data/local-ipv4", local_ip),
+            ("/meta-data/public-ipv4", public_ip),
             ]:
             self.query_results[api_base + url_suffix] = value
 
@@ -553,6 +556,8 @@
                        image_key=u"image1",
                        account_name=None,
                        registration_password=None,
+                       local_ipv4=u"10.0.0.1",
+                       public_ipv4=u"10.0.0.2",
                        tags=None)
 
         # The get_vm_info() needs to be deffered to the else.  If vm-info is

=== modified file 'landscape/message_schemas.py'
--- landscape/message_schemas.py	2012-01-18 12:37:53 +0000
+++ landscape/message_schemas.py	2012-01-20 15:22:36 +0000
@@ -168,8 +168,10 @@
      "launch_index": Int(),
      "image_key": Unicode(),
      "tags": Any(utf8, Constant(None)),
-     "vm-info": String()},
-     optional=["tags", "vm-info"])
+     "vm-info": String(),
+     "public_ipv4": Unicode(),
+     "local_ipv4": Unicode()},
+     optional=["tags", "vm-info", "public_ipv4", "local_ipv4"])
 
 TEMPERATURE = Message("temperature", {
     "thermal-zone": utf8,