From 76e476c4d922306f702c341d7fb1ca735a956343 Mon Sep 17 00:00:00 2001
From: Wesley Beary <wbeary@engineyard.com>
Date: Sun, 19 Jul 2009 21:46:45 -0700
Subject: [PATCH] fixes for describe_instances, unfortunately sax is choking

---
 lib/fog/aws/parsers/ec2/describe_instances.rb | 30 +++++++++++--------
 spec/aws/ec2/describe_instances_spec.rb       | 13 +++++++-
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/lib/fog/aws/parsers/ec2/describe_instances.rb b/lib/fog/aws/parsers/ec2/describe_instances.rb
index 9f69c48eb..1c7423109 100644
--- a/lib/fog/aws/parsers/ec2/describe_instances.rb
+++ b/lib/fog/aws/parsers/ec2/describe_instances.rb
@@ -6,19 +6,15 @@ module Fog
         class DescribeInstances < Fog::Parsers::Base
 
           def reset
-            @instance = { :instance_state => {}, :placement => [], :product_code_set => [] }
+            @instance = { :instance_state => {}, :monitoring => {}, :placement => [], :product_codes => [] }
             @reservation = { :group_set => [], :instances_set => [] }
             @response = { :reservation_set => [] }
           end
 
           def start_element(name, attrs = [])
-            if name == 'groupSet'
+            if name == 'groupSet' || name == 'productCodes'
               @in_subset = true
-            end
-            if name == 'productCodeSet'
-              @in_subset = true
-            end
-            if name == 'instanceSet'
+            elsif name == 'instancesSet'
               @in_instances_set = true
             end
             @value = ''
@@ -32,7 +28,7 @@ module Fog
               @instance[:placement] << @value
             when 'code'
               @instance[:instance_state][:code] = @value
-            when 'dnsNmae'
+            when 'dnsName'
               @instance[:dns_name] = @value
             when 'groupId'
               @reservation[:group_set] << @value
@@ -49,10 +45,10 @@ module Fog
             when 'item'
               if @in_instances_set
                 @reservation[:instances_set] << @instance
-                @instance = { :instance_state => {}, :placement => [], :product_code_set => [] }
+                @instance = { :instance_state => {}, :monitoring => {}, :placement => [], :product_codes => [] }
               elsif !@in_subset
                 @response[:reservation_set] << @reservation
-                @reservation = { :group_set => [], :instance_set => [] }
+                @reservation = { :group_set => [], :instances_set => [] }
               end
             when 'kernelId'
               @instance[:kernel_id] = @value
@@ -64,6 +60,10 @@ module Fog
               @instance[:instance_state][:name] = @value
             when 'ownerId'
               @reservation[:owner_id] = @value
+            when 'ramdiskId'
+              @instance[:ramdisk_id] = @value
+            when 'reason'
+              @instance[:reason] = @value
             when 'requestId'
               @response[:request_id] = @value
             when 'reservationId'
@@ -71,11 +71,17 @@ module Fog
             when 'privateDnsName'
               @instance[:private_dns_name] = @value
             when 'productCode'
-              @instance[:product_code_set] << @value
-            when 'productCodeSet'
+              @instance[:product_codes] << @value
+            when 'productCodes'
               @in_subset = false
             when 'ramdiskId'
               @instance[:ramdisk_id] = @value
+            when 'state'
+              if @value == 'true'
+                @instance[:monitoring][:state] = true
+              else
+                @instance[:monitoring][:state] = false
+              end
             end
           end
 
diff --git a/spec/aws/ec2/describe_instances_spec.rb b/spec/aws/ec2/describe_instances_spec.rb
index 6e9ef174e..4fdb1a0cf 100644
--- a/spec/aws/ec2/describe_instances_spec.rb
+++ b/spec/aws/ec2/describe_instances_spec.rb
@@ -2,10 +2,21 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe 'EC2.describe_instances' do
 
+  before(:all) do
+    run_instances = ec2.run_instances('ami-5ee70037', 1, 1).body
+    @instance_id = run_instances[:instances_set].first[:instance_id]
+    @reservation_id = run_instances[:reservation_id]
+  end
+
+  after(:all) do
+    ec2.terminate_instances([@instance_id])
+  end
+
   it "should return proper attributes with no params" do
-    pending
     actual = ec2.describe_instances
     p actual
+    # reservation = actual.body[:reservation_set].select {|reservation| reservation[:reservation_id] == @reservation_id}
+    # instance = reservation[:instances_set].select {|instance| instance[:instance_id] == @instance_id}
   end
   
   it "should return proper attributes with params"