From 9ea567cbcf18eef0aa44c47831d3ecd8e5b8ce04 Mon Sep 17 00:00:00 2001
From: Blake Gentry <blakesgentry@gmail.com>
Date: Mon, 30 May 2011 15:08:58 -0700
Subject: [PATCH] [aws|elb] Rearrange DescribeLoadBalancersResult contents to
 alphabetical order to match the official AWS docs and make it easier to
 update the list.

---
 lib/fog/aws/models/elb/load_balancer.rb       |  6 +++---
 .../requests/elb/describe_load_balancers.rb   | 20 +++++++++----------
 tests/aws/requests/elb/helper.rb              | 12 +++++------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/fog/aws/models/elb/load_balancer.rb b/lib/fog/aws/models/elb/load_balancer.rb
index c36c38c98..f0820806b 100644
--- a/lib/fog/aws/models/elb/load_balancer.rb
+++ b/lib/fog/aws/models/elb/load_balancer.rb
@@ -6,10 +6,10 @@ module Fog
       class LoadBalancer < Fog::Model
 
         identity  :id,                    :aliases => 'LoadBalancerName'
-        attribute :created_at,            :aliases => 'CreatedTime'
-        attribute :health_check,          :aliases => 'HealthCheck'
-        attribute :dns_name,              :aliases => 'DNSName'
         attribute :availability_zones,    :aliases => 'AvailabilityZones'
+        attribute :created_at,            :aliases => 'CreatedTime'
+        attribute :dns_name,              :aliases => 'DNSName'
+        attribute :health_check,          :aliases => 'HealthCheck'
         attribute :instances,             :aliases => 'Instances'
 
         def initialize(attributes={})
diff --git a/lib/fog/aws/requests/elb/describe_load_balancers.rb b/lib/fog/aws/requests/elb/describe_load_balancers.rb
index ed3f49414..1560611c6 100644
--- a/lib/fog/aws/requests/elb/describe_load_balancers.rb
+++ b/lib/fog/aws/requests/elb/describe_load_balancers.rb
@@ -17,26 +17,26 @@ module Fog
         #       * 'RequestId'<~String> - Id of request
         #     * 'DescribeLoadBalancersResult'<~Hash>:
         #       * 'LoadBalancerDescriptions'<~Array>
-        #         * 'LoadBalancerName'<~String> - name of load balancer
-        #         * 'DNSName'<~String> - external DNS name of load balancer
+        #         * 'AvailabilityZones'<~Array> - list of availability zones covered by this load balancer
         #         * 'CreatedTime'<~Time> - time load balancer was created
-        #         * 'ListenerDescriptions'<~Array>
-        #           * 'PolicyNames'<~Array> - list of policies enabled
-        #           * 'Listener'<~Hash>:
-        #             * 'InstancePort'<~Integer> - port on instance that requests are sent to
-        #             * 'Protocol'<~String> - transport protocol used for routing in [TCP, HTTP]
-        #             * 'LoadBalancerPort'<~Integer> - port that load balancer listens on for requests
+        #         * 'DNSName'<~String> - external DNS name of load balancer
         #         * 'HealthCheck'<~Hash>:
         #           * 'HealthyThreshold'<~Integer> - number of consecutive health probe successes required before moving the instance to the Healthy state
         #           * 'Timeout'<~Integer> - number of seconds after which no response means a failed health probe
         #           * 'Interval'<~Integer> - interval (in seconds) between health checks of an individual instance
         #           * 'UnhealthyThreshold'<~Integer> - number of consecutive health probe failures that move the instance to the unhealthy state
         #           * 'Target'<~String> - string describing protocol type, port and URL to check
+        #         * 'Instances'<~Array> - list of instances that the load balancer balances between
+        #         * 'ListenerDescriptions'<~Array>
+        #           * 'PolicyNames'<~Array> - list of policies enabled
+        #           * 'Listener'<~Hash>:
+        #             * 'InstancePort'<~Integer> - port on instance that requests are sent to
+        #             * 'Protocol'<~String> - transport protocol used for routing in [TCP, HTTP]
+        #             * 'LoadBalancerPort'<~Integer> - port that load balancer listens on for requests
+        #         * 'LoadBalancerName'<~String> - name of load balancer
         #         * 'Policies'<~Hash>:
         #           * 'LBCookieStickinessPolicies'<~Array> - list of Load Balancer Generated Cookie Stickiness policies for the LoadBalancer
         #           * 'AppCookieStickinessPolicies'<~Array> - list of Application Generated Cookie Stickiness policies for the LoadBalancer
-        #         * 'AvailabilityZones'<~Array> - list of availability zones covered by this load balancer
-        #         * 'Instances'<~Array> - list of instances that the load balancer balances between
         def describe_load_balancers(lb_name = [])
           params = AWS.indexed_param('LoadBalancerNames.member', [*lb_name])
           request({
diff --git a/tests/aws/requests/elb/helper.rb b/tests/aws/requests/elb/helper.rb
index 6c24c4cab..ee5a944fa 100644
--- a/tests/aws/requests/elb/helper.rb
+++ b/tests/aws/requests/elb/helper.rb
@@ -7,14 +7,14 @@ class AWS
       }
 
       LOAD_BALANCER = {
-        "CreatedTime" => Time,
-        "ListenerDescriptions" => Array,
-        "HealthCheck" => {"HealthyThreshold" => Integer, "Timeout" => Integer, "UnhealthyThreshold" => Integer, "Interval" => Integer, "Target" => String},
-        "Policies" => {"LBCookieStickinessPolicies" => Array, "AppCookieStickinessPolicies" => Array},
         "AvailabilityZones" => Array,
+        "CreatedTime" => Time,
         "DNSName" => String,
-        "LoadBalancerName"=> String,
-        "Instances"=> Array
+        "HealthCheck" => {"HealthyThreshold" => Integer, "Timeout" => Integer, "UnhealthyThreshold" => Integer, "Interval" => Integer, "Target" => String},
+        "Instances" => Array,
+        "ListenerDescriptions" => Array,
+        "LoadBalancerName" => String,
+        "Policies" => {"LBCookieStickinessPolicies" => Array, "AppCookieStickinessPolicies" => Array},
       }
 
       CREATE_LOAD_BALANCER = BASIC.merge({