diff --git a/lib/fog/rackspace/models/servers/servers.rb b/lib/fog/rackspace/models/servers/servers.rb index 73b003679..d9e304cc4 100644 --- a/lib/fog/rackspace/models/servers/servers.rb +++ b/lib/fog/rackspace/models/servers/servers.rb @@ -9,7 +9,7 @@ module Fog class Servers < Fog::Collection def all - data = connection.get_servers_details.body + data = connection.list_servers_details.body servers = Fog::Rackspace::Servers::Servers.new({ :connection => connection }) diff --git a/lib/fog/rackspace/requests/servers/create_image.rb b/lib/fog/rackspace/requests/servers/create_image.rb index 5dcd01ad3..d549ddd16 100644 --- a/lib/fog/rackspace/requests/servers/create_image.rb +++ b/lib/fog/rackspace/requests/servers/create_image.rb @@ -13,7 +13,7 @@ unless Fog.mocking? def create_image(server_id, options = {}) data = { 'image' => { - "serverId" => server_id + 'serverId' => server_id } } if options['name'] diff --git a/lib/fog/rackspace/requests/servers/get_flavors.rb b/lib/fog/rackspace/requests/servers/list_flavors.rb similarity index 93% rename from lib/fog/rackspace/requests/servers/get_flavors.rb rename to lib/fog/rackspace/requests/servers/list_flavors.rb index 2a7cf5b0f..98a365265 100644 --- a/lib/fog/rackspace/requests/servers/get_flavors.rb +++ b/lib/fog/rackspace/requests/servers/list_flavors.rb @@ -13,7 +13,7 @@ unless Fog.mocking? # * 'name'<~String> - Name of the flavor # * 'ram'<~Integer> - Amount of ram for the flavor # * 'disk'<~Integer> - Amount of diskspace for the flavor - def get_flavors + def list_flavors request( :expects => 200, :method => 'GET', @@ -31,7 +31,7 @@ else module Rackspace class Servers - def get_flavors + def list_flavors end end diff --git a/lib/fog/rackspace/requests/servers/get_images.rb b/lib/fog/rackspace/requests/servers/list_images.rb similarity index 94% rename from lib/fog/rackspace/requests/servers/get_images.rb rename to lib/fog/rackspace/requests/servers/list_images.rb index c5445f2a4..de898d023 100644 --- a/lib/fog/rackspace/requests/servers/get_images.rb +++ b/lib/fog/rackspace/requests/servers/list_images.rb @@ -14,7 +14,7 @@ unless Fog.mocking? # * 'updated'<~String> - Last update timestamp for image # * 'created'<~String> - Creation timestamp for image # * 'status'<~String> - Status of image - def get_images + def list_images request( :expects => 200, :method => 'GET', @@ -32,7 +32,7 @@ else module Rackspace class Servers - def get_images + def list_images end end diff --git a/lib/fog/rackspace/requests/servers/get_servers.rb b/lib/fog/rackspace/requests/servers/list_servers.rb similarity index 92% rename from lib/fog/rackspace/requests/servers/get_servers.rb rename to lib/fog/rackspace/requests/servers/list_servers.rb index baf000ed5..66df55f65 100644 --- a/lib/fog/rackspace/requests/servers/get_servers.rb +++ b/lib/fog/rackspace/requests/servers/list_servers.rb @@ -12,7 +12,7 @@ unless Fog.mocking? # * 'servers'<~Array>: # * 'id'<~Integer> - Id of server # * 'name<~String> - Name of server - def get_servers + def list_servers request( :expects => 200, :method => 'GET', @@ -30,7 +30,7 @@ else module Rackspace class Servers - def get_servers + def list_servers end end diff --git a/lib/fog/rackspace/requests/servers/get_servers_details.rb b/lib/fog/rackspace/requests/servers/list_servers_details.rb similarity index 94% rename from lib/fog/rackspace/requests/servers/get_servers_details.rb rename to lib/fog/rackspace/requests/servers/list_servers_details.rb index f8bbc22c5..dfc7b6ec2 100644 --- a/lib/fog/rackspace/requests/servers/get_servers_details.rb +++ b/lib/fog/rackspace/requests/servers/list_servers_details.rb @@ -21,7 +21,7 @@ unless Fog.mocking? # * 'public'<~Array> - public address strings # * 'private'<~Array> - private address strings # * 'metadata'<~Hash> - metadata - def get_servers_details + def list_servers_details request( :expects => [200, 203], :method => 'GET', @@ -39,7 +39,7 @@ else module Rackspace class Servers - def get_servers_details + def list_servers_details end end diff --git a/lib/fog/rackspace/servers.rb b/lib/fog/rackspace/servers.rb index 1801a7af6..536f50c9a 100644 --- a/lib/fog/rackspace/servers.rb +++ b/lib/fog/rackspace/servers.rb @@ -10,11 +10,11 @@ module Fog load "fog/rackspace/requests/servers/create_server.rb" load "fog/rackspace/requests/servers/delete_image.rb" load "fog/rackspace/requests/servers/delete_server.rb" - load "fog/rackspace/requests/servers/get_flavors.rb" - load "fog/rackspace/requests/servers/get_images.rb" load "fog/rackspace/requests/servers/get_server_details.rb" - load "fog/rackspace/requests/servers/get_servers.rb" - load "fog/rackspace/requests/servers/get_servers_details.rb" + load "fog/rackspace/requests/servers/list_flavors.rb" + load "fog/rackspace/requests/servers/list_images.rb" + load "fog/rackspace/requests/servers/list_servers.rb" + load "fog/rackspace/requests/servers/list_servers_details.rb" end def initialize(options={}) diff --git a/spec/rackspace/requests/servers/create_server_spec.rb b/spec/rackspace/requests/servers/create_server_spec.rb index d10531038..44da7c540 100644 --- a/spec/rackspace/requests/servers/create_server_spec.rb +++ b/spec/rackspace/requests/servers/create_server_spec.rb @@ -10,7 +10,7 @@ describe 'Rackspace::Servers.create_server' do p data while true do sleep(1) - details = servers.get_servers_details.body + details = servers.list_servers_details.body p details['servers'].first['progress'] break if details['servers'].first['status'] == 'ACTIVE' end diff --git a/spec/rackspace/requests/servers/get_images_spec.rb b/spec/rackspace/requests/servers/list_flavors_spec.rb similarity index 64% rename from spec/rackspace/requests/servers/get_images_spec.rb rename to spec/rackspace/requests/servers/list_flavors_spec.rb index b74ad6620..3674bb48b 100644 --- a/spec/rackspace/requests/servers/get_images_spec.rb +++ b/spec/rackspace/requests/servers/list_flavors_spec.rb @@ -1,10 +1,10 @@ require File.dirname(__FILE__) + '/../../../spec_helper' -describe 'Rackspace::Servers.get_images' do +describe 'Rackspace::Servers.list_flavors' do describe 'success' do it "should return proper attributes" do - p servers.get_images + p servers.list_flavors end end diff --git a/spec/rackspace/requests/servers/get_flavors_spec.rb b/spec/rackspace/requests/servers/list_images_spec.rb similarity index 65% rename from spec/rackspace/requests/servers/get_flavors_spec.rb rename to spec/rackspace/requests/servers/list_images_spec.rb index 8cafb7ae2..653d3aec6 100644 --- a/spec/rackspace/requests/servers/get_flavors_spec.rb +++ b/spec/rackspace/requests/servers/list_images_spec.rb @@ -1,10 +1,10 @@ require File.dirname(__FILE__) + '/../../../spec_helper' -describe 'Rackspace::Servers.get_flavors' do +describe 'Rackspace::Servers.list_images' do describe 'success' do it "should return proper attributes" do - p servers.get_flavors + p servers.list_images end end diff --git a/spec/rackspace/requests/servers/get_servers_details_spec.rb b/spec/rackspace/requests/servers/list_servers_details_spec.rb similarity index 60% rename from spec/rackspace/requests/servers/get_servers_details_spec.rb rename to spec/rackspace/requests/servers/list_servers_details_spec.rb index cd427326f..a4dcc6f5f 100644 --- a/spec/rackspace/requests/servers/get_servers_details_spec.rb +++ b/spec/rackspace/requests/servers/list_servers_details_spec.rb @@ -1,10 +1,10 @@ require File.dirname(__FILE__) + '/../../../spec_helper' -describe 'Rackspace::Servers.get_servers_details' do +describe 'Rackspace::Servers.list_servers_details' do describe 'success' do it "should return proper attributes" do - p servers.get_servers_details + p servers.list_servers_details end end diff --git a/spec/rackspace/requests/servers/get_servers_spec.rb b/spec/rackspace/requests/servers/list_servers_spec.rb similarity index 64% rename from spec/rackspace/requests/servers/get_servers_spec.rb rename to spec/rackspace/requests/servers/list_servers_spec.rb index f2d84823c..a5bf1449b 100644 --- a/spec/rackspace/requests/servers/get_servers_spec.rb +++ b/spec/rackspace/requests/servers/list_servers_spec.rb @@ -1,10 +1,10 @@ require File.dirname(__FILE__) + '/../../../spec_helper' -describe 'Rackspace::Servers.get_servers' do +describe 'Rackspace::Servers.list_servers' do describe 'success' do it "should return proper attributes" do - p servers.get_servers + p servers.list_servers end end