From 67fd6c328eabe423ead90e953735a1c0f7516992 Mon Sep 17 00:00:00 2001 From: Michael Sprauer Date: Wed, 2 Apr 2014 17:10:00 +0200 Subject: [PATCH] info is now called json --- lib/fog/fogdocker/requests/compute/container_action.rb | 2 +- lib/fog/fogdocker/requests/compute/container_all.rb | 2 +- lib/fog/fogdocker/requests/compute/container_commit.rb | 2 +- lib/fog/fogdocker/requests/compute/container_create.rb | 2 +- lib/fog/fogdocker/requests/compute/container_get.rb | 2 +- lib/fog/fogdocker/requests/compute/image_all.rb | 2 +- lib/fog/fogdocker/requests/compute/image_create.rb | 2 +- lib/fog/fogdocker/requests/compute/image_get.rb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/fog/fogdocker/requests/compute/container_action.rb b/lib/fog/fogdocker/requests/compute/container_action.rb index 5dfcb06fa..a0c0637d2 100644 --- a/lib/fog/fogdocker/requests/compute/container_action.rb +++ b/lib/fog/fogdocker/requests/compute/container_action.rb @@ -7,7 +7,7 @@ module Fog raise ArgumentError, "instance id is a required parameter" unless options.has_key? :id raise ArgumentError, "action is a required parameter" unless options.has_key? :action container = Docker::Container.get(options[:id]) - downcase_hash_keys container.send(options[:action]).info + downcase_hash_keys container.send(options[:action]).json end end diff --git a/lib/fog/fogdocker/requests/compute/container_all.rb b/lib/fog/fogdocker/requests/compute/container_all.rb index 108604397..4440d99dc 100644 --- a/lib/fog/fogdocker/requests/compute/container_all.rb +++ b/lib/fog/fogdocker/requests/compute/container_all.rb @@ -10,7 +10,7 @@ module Fog # size – true or false, Show the containers sizes def container_all(filters = {}) Docker::Container.all(filters.merge(:all => true)).map do |container| - downcase_hash_keys(container.info) + downcase_hash_keys(container.json) end end diff --git a/lib/fog/fogdocker/requests/compute/container_commit.rb b/lib/fog/fogdocker/requests/compute/container_commit.rb index d33e0388e..495a055ae 100644 --- a/lib/fog/fogdocker/requests/compute/container_commit.rb +++ b/lib/fog/fogdocker/requests/compute/container_commit.rb @@ -5,7 +5,7 @@ module Fog def container_commit(options) raise ArgumentError, "instance id is a required parameter" unless options.has_key? :id container = Docker::Container.get(options[:id]) - downcase_hash_keys container.commit(camelize_hash_keys(options)).info + downcase_hash_keys container.commit(camelize_hash_keys(options)).json end end diff --git a/lib/fog/fogdocker/requests/compute/container_create.rb b/lib/fog/fogdocker/requests/compute/container_create.rb index 16f41fc5a..c8a78f13f 100644 --- a/lib/fog/fogdocker/requests/compute/container_create.rb +++ b/lib/fog/fogdocker/requests/compute/container_create.rb @@ -27,7 +27,7 @@ module Fog #} class Real def container_create(attrs) - downcase_hash_keys Docker::Container.create(camelize_hash_keys(attrs)).info + downcase_hash_keys Docker::Container.create(camelize_hash_keys(attrs)).json end end diff --git a/lib/fog/fogdocker/requests/compute/container_get.rb b/lib/fog/fogdocker/requests/compute/container_get.rb index 408023696..e5f25c0cc 100644 --- a/lib/fog/fogdocker/requests/compute/container_get.rb +++ b/lib/fog/fogdocker/requests/compute/container_get.rb @@ -3,7 +3,7 @@ module Fog class Fogdocker class Real def container_get(id) - downcase_hash_keys Docker::Container.get(id).info + downcase_hash_keys Docker::Container.get(id).json end end diff --git a/lib/fog/fogdocker/requests/compute/image_all.rb b/lib/fog/fogdocker/requests/compute/image_all.rb index 3036712eb..b00d1ef4c 100644 --- a/lib/fog/fogdocker/requests/compute/image_all.rb +++ b/lib/fog/fogdocker/requests/compute/image_all.rb @@ -4,7 +4,7 @@ module Fog class Real def image_all(filters = {}) Docker::Image.all.map do |image| - downcase_hash_keys(image.info) + downcase_hash_keys(image.json) end end end diff --git a/lib/fog/fogdocker/requests/compute/image_create.rb b/lib/fog/fogdocker/requests/compute/image_create.rb index 91ab72f07..8c7a7a1c5 100644 --- a/lib/fog/fogdocker/requests/compute/image_create.rb +++ b/lib/fog/fogdocker/requests/compute/image_create.rb @@ -4,7 +4,7 @@ module Fog class Real def image_create(attrs) - downcase_hash_keys Docker::Image.create(attrs).info + downcase_hash_keys Docker::Image.create(attrs).json end end diff --git a/lib/fog/fogdocker/requests/compute/image_get.rb b/lib/fog/fogdocker/requests/compute/image_get.rb index 623d97a32..fde3fe856 100644 --- a/lib/fog/fogdocker/requests/compute/image_get.rb +++ b/lib/fog/fogdocker/requests/compute/image_get.rb @@ -3,7 +3,7 @@ module Fog class Fogdocker class Real def image_get(id) - downcase_hash_keys Docker::Image.get(id).info + downcase_hash_keys Docker::Image.get(id).json end end