From d750fc41d250eb41c25cd39a85cbbdd45bda57ec Mon Sep 17 00:00:00 2001
From: Andy Chong <andycjw@gmail.com>
Date: Tue, 27 Mar 2012 11:03:35 +0800
Subject: [PATCH] show proper error message in VNC tab if instance not ready

 * fix bug 965555

Change-Id: I01dd86d0131637851eb14740bb52b7ac0347e3f1
---
 .../dashboards/nova/instances_and_volumes/instances/tabs.py  | 2 +-
 .../nova/instances_and_volumes/instances/_detail_vnc.html    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/horizon/dashboards/nova/instances_and_volumes/instances/tabs.py b/horizon/dashboards/nova/instances_and_volumes/instances/tabs.py
index 5cc707dca..5c33fed78 100644
--- a/horizon/dashboards/nova/instances_and_volumes/instances/tabs.py
+++ b/horizon/dashboards/nova/instances_and_volumes/instances/tabs.py
@@ -66,7 +66,7 @@ class VNCTab(tabs.Tab):
             exceptions.handle(request,
                               _('Unable to get VNC console for '
                                 'instance "%s".') % instance.id)
-        return {'vnc_url': vnc_url}
+        return {'vnc_url': vnc_url, 'instance_id': instance.id}
 
 
 class InstanceDetailTabs(tabs.TabGroup):
diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_vnc.html b/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_vnc.html
index c91609a7b..75431a8d5 100644
--- a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_vnc.html
+++ b/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_vnc.html
@@ -1,5 +1,10 @@
 {% load i18n %}
 
 <h3>{% trans "Instance VNC Console" %}</h3>
+{% if vnc_url %}
 <p class='alert alert-info'>{% blocktrans %}If VNC console is not responding to keyboard input: click the grey status bar below.{% endblocktrans %}</p>
 <iframe src="{{ vnc_url }}" width="720" height="430"></iframe>
+{% else %}
+<p class='alert alert-error'>{% blocktrans %}VNC console is currently unavailabe. Please try again later.{% endblocktrans %}
+<a class='btn btn-mini' href="{% url horizon:nova:instances_and_volumes:instances:detail instance_id %}">{% trans "Reload" %}</a></p>
+{% endif %}
\ No newline at end of file