From 19bf10b87dc399cbbb95219fcf5bf1865c29efa0 Mon Sep 17 00:00:00 2001
From: Kyle Rames <kyle.rames@rackspace.com>
Date: Thu, 24 Jan 2013 13:28:47 -0600
Subject: [PATCH] [rackspace|compute] fixing connection deprecation warnings
---
lib/fog/rackspace/models/compute_v2/image.rb | 4 ++--
lib/fog/rackspace/models/compute_v2/metadata.rb | 9 +++++----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/lib/fog/rackspace/models/compute_v2/image.rb b/lib/fog/rackspace/models/compute_v2/image.rb
index 72085e2ab..1a6257ecb 100644
--- a/lib/fog/rackspace/models/compute_v2/image.rb
+++ b/lib/fog/rackspace/models/compute_v2/image.rb
@@ -27,7 +27,7 @@ module Fog
ignore_attributes :metadata
def initialize(attributes={})
- @connection = attributes[:connection]
+ @service = attributes[:service]
super
end
@@ -35,7 +35,7 @@ module Fog
raise "Please save image before accessing metadata" unless identity
@metadata ||= begin
Fog::Compute::RackspaceV2::Metadata.new({
- :connection => connection,
+ :service => service,
:parent => self
})
end
diff --git a/lib/fog/rackspace/models/compute_v2/metadata.rb b/lib/fog/rackspace/models/compute_v2/metadata.rb
index 731bdd254..39f0dd50f 100644
--- a/lib/fog/rackspace/models/compute_v2/metadata.rb
+++ b/lib/fog/rackspace/models/compute_v2/metadata.rb
@@ -16,13 +16,14 @@ module Fog
def all
requires :parent
- data = connection.list_metadata(collection_name, parent.id).body['metadata']
+ return unless parent.identity
+ data = service.list_metadata(collection_name, parent.id).body['metadata']
from_hash(data)
end
def get(key)
requires :parent
- data = connection.get_metadata_item(collection_name, parent.id, key).body["meta"]
+ data = service.get_metadata_item(collection_name, parent.id, key).body["meta"]
datum = data.first
new(:key => datum[0], :value => datum[1])
rescue Fog::Compute::RackspaceV2::NotFound
@@ -43,14 +44,14 @@ module Fog
if datum
data.value = value
else
- self << Fog::Compute::RackspaceV2::Metadatum.new(:key => key, :value => value, :connection => connection, :parent => parent)
+ self << Fog::Compute::RackspaceV2::Metadatum.new(:key => key, :value => value, :service => service, :parent => parent)
end
value
end
def save
requires :parent
- connection.set_metadata(collection_name, parent.id, to_hash)
+ service.set_metadata(collection_name, parent.id, to_hash)
end
def new(attributes = {})