From 9cac009e8e5d7f76d41fd200e828043036e28a61 Mon Sep 17 00:00:00 2001
From: Daniel Molina <danmolin@fdi.ucm.es>
Date: Thu, 9 Feb 2012 18:50:30 +0100
Subject: [PATCH] feature #1124: Improve EC2 describe_instances performance

---
 src/cloud/ec2/lib/EC2QueryServer.rb            | 5 +++--
 src/cloud/ec2/lib/views/describe_instances.erb | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cloud/ec2/lib/EC2QueryServer.rb b/src/cloud/ec2/lib/EC2QueryServer.rb
index cfcac7c538..4e2abd1072 100644
--- a/src/cloud/ec2/lib/EC2QueryServer.rb
+++ b/src/cloud/ec2/lib/EC2QueryServer.rb
@@ -54,8 +54,8 @@ class EC2QueryServer < CloudServer
         'save' => :pending,
         'epil' => :shutdown,
         'shut' => :shutdown,
+        'clea' => :shutdown,
         'fail' => :terminated,
-        'dele' => :terminated,
         'unkn' => :terminated
     }
 
@@ -211,7 +211,8 @@ class EC2QueryServer < CloudServer
     # Helper functions
     ###########################################################################
     def render_state(vm)
-        ec2_state = EC2_STATES[ONE_STATES[vm.status]]
+        one_state = ONE_STATES[vm.status]
+        ec2_state = EC2_STATES[one_state||:pending]
 
         return "<code>#{ec2_state[:code]}</code>
         <name>#{ec2_state[:name]}</name>"
diff --git a/src/cloud/ec2/lib/views/describe_instances.erb b/src/cloud/ec2/lib/views/describe_instances.erb
index e07e4e7179..09fae94ae5 100644
--- a/src/cloud/ec2/lib/views/describe_instances.erb
+++ b/src/cloud/ec2/lib/views/describe_instances.erb
@@ -12,7 +12,6 @@
       </groupSet> 
       <instancesSet> 
         <% vmpool.each do |vm| %>
-        <% vm.info %>
         <item> 
           <instanceId>i-<%= vm.id %></instanceId> 
           <imageId><%= vm['TEMPLATE/IMAGE_ID'] %></imageId>