diff --git a/lib/fog/aws/models/elasticache/cluster.rb b/lib/fog/aws/models/elasticache/cluster.rb index 488393ca1..ef617261f 100644 --- a/lib/fog/aws/models/elasticache/cluster.rb +++ b/lib/fog/aws/models/elasticache/cluster.rb @@ -35,7 +35,7 @@ module Fog def destroy requires :id - connection.delete_cache_cluster(id) + service.delete_cache_cluster(id) true end @@ -45,7 +45,7 @@ module Fog parameter_group ||= Hash.new notification_config ||= Hash.new - connection.create_cache_cluster( + service.create_cache_cluster( id, { :node_type => node_type, :security_group_names => security_groups, diff --git a/lib/fog/aws/models/elasticache/clusters.rb b/lib/fog/aws/models/elasticache/clusters.rb index e99b93b99..0ef7490fe 100644 --- a/lib/fog/aws/models/elasticache/clusters.rb +++ b/lib/fog/aws/models/elasticache/clusters.rb @@ -10,7 +10,7 @@ module Fog def all load( - connection.describe_cache_clusters( + service.describe_cache_clusters( nil, :show_node_info => true ).body['CacheClusters'] ) @@ -18,7 +18,7 @@ module Fog def get(identity, show_node_info = true) new( - connection.describe_cache_clusters( + service.describe_cache_clusters( identity, :show_node_info => show_node_info ).body['CacheClusters'].first ) diff --git a/lib/fog/aws/models/elasticache/parameter_group.rb b/lib/fog/aws/models/elasticache/parameter_group.rb index 67054d702..93c44a3c5 100644 --- a/lib/fog/aws/models/elasticache/parameter_group.rb +++ b/lib/fog/aws/models/elasticache/parameter_group.rb @@ -12,13 +12,13 @@ module Fog def destroy requires :id - connection.delete_cache_parameter_group(id) + service.delete_cache_parameter_group(id) true end def save requires :id - connection.create_cache_parameter_group( + service.create_cache_parameter_group( id, description = id, family = 'memcached1.4' diff --git a/lib/fog/aws/models/elasticache/parameter_groups.rb b/lib/fog/aws/models/elasticache/parameter_groups.rb index 2eceef459..3b9848cb7 100644 --- a/lib/fog/aws/models/elasticache/parameter_groups.rb +++ b/lib/fog/aws/models/elasticache/parameter_groups.rb @@ -10,13 +10,13 @@ module Fog def all load( - connection.describe_cache_parameter_groups.body['CacheParameterGroups'] + service.describe_cache_parameter_groups.body['CacheParameterGroups'] ) end def get(identity) new( - connection.describe_cache_parameter_groups( + service.describe_cache_parameter_groups( identity ).body['CacheParameterGroups'].first ) diff --git a/lib/fog/aws/models/elasticache/security_group.rb b/lib/fog/aws/models/elasticache/security_group.rb index 306f95624..d216625f4 100644 --- a/lib/fog/aws/models/elasticache/security_group.rb +++ b/lib/fog/aws/models/elasticache/security_group.rb @@ -17,20 +17,20 @@ module Fog def destroy requires :id - connection.delete_cache_security_group(id) + service.delete_cache_security_group(id) true end def save requires :id requires :description - connection.create_cache_security_group(id, description) + service.create_cache_security_group(id, description) end def authorize_ec2_group(group_name, group_owner_id=owner_id) requires :id requires :owner_id if group_owner_id.nil? - data = connection.authorize_cache_security_group_ingress( + data = service.authorize_cache_security_group_ingress( id, group_name, group_owner_id ) merge_attributes(data.body['CacheSecurityGroup']) @@ -39,7 +39,7 @@ module Fog def revoke_ec2_group(group_name, group_owner_id=owner_id) requires :id requires :owner_id if group_owner_id.nil? - data = connection.revoke_cache_security_group_ingress( + data = service.revoke_cache_security_group_ingress( id, group_name, group_owner_id ) merge_attributes(data.body['CacheSecurityGroup']) diff --git a/lib/fog/aws/models/elasticache/security_groups.rb b/lib/fog/aws/models/elasticache/security_groups.rb index 2578ff67b..6a76db55c 100644 --- a/lib/fog/aws/models/elasticache/security_groups.rb +++ b/lib/fog/aws/models/elasticache/security_groups.rb @@ -10,13 +10,13 @@ module Fog def all load( - connection.describe_cache_security_groups.body['CacheSecurityGroups'] + service.describe_cache_security_groups.body['CacheSecurityGroups'] ) end def get(identity) new( - connection.describe_cache_security_groups( + service.describe_cache_security_groups( identity ).body['CacheSecurityGroups'].first )