diff --git a/src/cloud/ec2/lib/EC2QueryServer.rb b/src/cloud/ec2/lib/EC2QueryServer.rb
index dc9234d5c8..9e0a7bfde6 100644
--- a/src/cloud/ec2/lib/EC2QueryServer.rb
+++ b/src/cloud/ec2/lib/EC2QueryServer.rb
@@ -59,6 +59,18 @@ class EC2QueryServer < CloudServer
'unkn' => :terminated
}
+ EC2_IMAGE_STATES={
+ "INIT" => "pending",
+ "READY" => "available",
+ "USED" => "available",
+ "DISABLED" => nil,
+ "LOCKED" => "pending",
+ "ERROR" => "failed",
+ "CLONE" => "available",
+ "DELETE" => nil,
+ "USED_PERS" => "available"
+ }
+
###########################################################################
def initialize(client, oneadmin_client, config, logger)
@@ -251,6 +263,10 @@ class EC2QueryServer < CloudServer
#{ec2_state[:name]}"
end
+ def render_image_state(image)
+ EC2_IMAGE_STATES[image.state_str]
+ end
+
def render_launch_time(vm)
return "#{Time.at(vm["STIME"].to_i).xmlschema}"
end
diff --git a/src/cloud/ec2/lib/views/describe_images.erb b/src/cloud/ec2/lib/views/describe_images.erb
index fff015f68a..a38c99861d 100644
--- a/src/cloud/ec2/lib/views/describe_images.erb
+++ b/src/cloud/ec2/lib/views/describe_images.erb
@@ -1,26 +1,20 @@
-
-
- <% impool.each do |im| %>
- -
- ami-<%= sprintf('%08i', im.id) %>
- <%= im['SOURCE'].split('/').last %>
- <% if im['STATE'] == '3' || im['STATE'] == '5' %>
- failed
- <% elsif im['STATE'] == '1' || im['STATE'] == '2' %>
- available
- <% elsif im['STATE'] == '4'%>
- pending
- <% end %>
- <%= im['UNAME'] %>
- <% if im['PUBLIC'] == '0' %>
- false
- <% elsif im['PUBLIC'] == '1' %>
- true
- <% end %>
- i386
- machine
-
- <% end %>
-
+
+
+ <% impool.each do |im| %>
+ <% if state_image = render_image_state(im) %>
+ -
+ ami-<%= sprintf('%08i', im.id) %>
+ <%= im['SOURCE'].split('/').last %>
+ <%= state_image %>
+ <%= im['UNAME'] %>
+ <%= im.public? ? "true" : "false" %>
+ i386
+ machine
+
+ <% else
+ next
+ end
+ end %>
+