From c0c1e53e24081d1599dfaddf2904dfa7add60d9c Mon Sep 17 00:00:00 2001 From: MotoKen Date: Fri, 14 Sep 2012 14:16:39 +0800 Subject: Corrects use of instance_uuid for fixed ip Uses instance_uuid rather than instance_id since commit 66f9e085a. Fixes bug 1050417. Change-Id: I6161c7a6ad9c3891e100daae39fe8ea82bfd8654 --- nova/api/ec2/cloud.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 0574ac262..9e1f5f22b 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1109,8 +1109,8 @@ class CloudController(object): if floating_ip['fixed_ip_id']: fixed_id = floating_ip['fixed_ip_id'] fixed = self.network_api.get_fixed_ip(context, fixed_id) - if fixed['instance_id'] is not None: - ec2_id = ec2utils.id_to_ec2_inst_id(fixed['instance_id']) + if fixed['instance_uuid'] is not None: + ec2_id = ec2utils.id_to_ec2_inst_id(fixed['instance_uuid']) address = {'public_ip': floating_ip['address'], 'instance_id': ec2_id} if context.is_admin: -- cgit