From 1048ac671adf84aedfd3e579109dec1675c9050b Mon Sep 17 00:00:00 2001
From: Kelsey Tripp <kelsey.tripp@nebula.com>
Date: Mon, 20 Aug 2012 12:31:54 -0700
Subject: [PATCH] Removes instance UUID from floating ip table Fixes launchpad
 bug #1039090

Change-Id: Ia47423b4289373a867d70f02c75becd4882e25c4
---
 .../nova/access_and_security/floating_ips/tables.py        | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/horizon/dashboards/nova/access_and_security/floating_ips/tables.py b/horizon/dashboards/nova/access_and_security/floating_ips/tables.py
index 5a0280908..e032e0045 100644
--- a/horizon/dashboards/nova/access_and_security/floating_ips/tables.py
+++ b/horizon/dashboards/nova/access_and_security/floating_ips/tables.py
@@ -95,12 +95,7 @@ class DisassociateIP(tables.Action):
 
 
 def get_instance_info(instance):
-    info_string = _("%(INSTANCE_NAME)s (%(INSTANCE_ID)s)")
-    if instance.instance_id and instance.instance_name:
-        vals = {'INSTANCE_NAME': instance.instance_name,
-                'INSTANCE_ID': instance.instance_id}
-        return info_string % vals
-    return None
+    return getattr(instance, "instance_name", None)
 
 
 def get_instance_link(datum):