mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
rename rackspace stuff for consistency with docs
This commit is contained in:
parent
ace3c4ac58
commit
f14658e0ba
12 changed files with 23 additions and 23 deletions
|
@ -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
|
||||
})
|
||||
|
|
|
@ -13,7 +13,7 @@ unless Fog.mocking?
|
|||
def create_image(server_id, options = {})
|
||||
data = {
|
||||
'image' => {
|
||||
"serverId" => server_id
|
||||
'serverId' => server_id
|
||||
}
|
||||
}
|
||||
if options['name']
|
||||
|
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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={})
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
Loading…
Add table
Reference in a new issue