From 6f3f9d29bf98f9d94c4e2bc53d39f327a77a4558 Mon Sep 17 00:00:00 2001 From: Benton Roberts Date: Mon, 19 Sep 2011 09:02:40 -0400 Subject: [PATCH] [aws|elasticache] show cluster node details by default in model --- lib/fog/aws/models/elasticache/clusters.rb | 6 ++++-- lib/fog/aws/parsers/elasticache/cache_cluster_parser.rb | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/fog/aws/models/elasticache/clusters.rb b/lib/fog/aws/models/elasticache/clusters.rb index 8cb548abe..e99b93b99 100644 --- a/lib/fog/aws/models/elasticache/clusters.rb +++ b/lib/fog/aws/models/elasticache/clusters.rb @@ -10,11 +10,13 @@ module Fog def all load( - connection.describe_cache_clusters.body['CacheClusters'] + connection.describe_cache_clusters( + nil, :show_node_info => true + ).body['CacheClusters'] ) end - def get(identity, show_node_info = false) + def get(identity, show_node_info = true) new( connection.describe_cache_clusters( identity, :show_node_info => show_node_info diff --git a/lib/fog/aws/parsers/elasticache/cache_cluster_parser.rb b/lib/fog/aws/parsers/elasticache/cache_cluster_parser.rb index e23e390f8..f25fe2c72 100644 --- a/lib/fog/aws/parsers/elasticache/cache_cluster_parser.rb +++ b/lib/fog/aws/parsers/elasticache/cache_cluster_parser.rb @@ -45,8 +45,8 @@ module Fog when 'CacheNode' @cache_cluster["#{name}s"] << @cache_node unless @cache_node.empty? when 'CacheNodeCreateTime', 'CacheNodeId', 'CacheNodeStatus', - 'Endpoint', 'ParameterGroupStatus' - @cache_node[name] = value.strip + 'Address', 'ParameterGroupStatus', 'Port' + @cache_node[name] = value ? value.strip : name when 'CacheNodeIdsToReboots', 'CacheParameterGroupName', 'ParameterApplyStatus' @cache_cluster['CacheParameterGroup'][name] = value else