diff --git a/lib/fog/rackspace/databases.rb b/lib/fog/rackspace/databases.rb index f3e0165f1..a462cfeb4 100644 --- a/lib/fog/rackspace/databases.rb +++ b/lib/fog/rackspace/databases.rb @@ -23,10 +23,10 @@ module Fog collection :users request_path 'fog/rackspace/requests/databases' - request :list_flavors_details + request :list_flavors request :get_flavor - request :list_instances_details + request :list_instances request :get_instance request :create_instance request :delete_instance diff --git a/lib/fog/rackspace/models/databases/flavors.rb b/lib/fog/rackspace/models/databases/flavors.rb index 296aa7764..6f2a61409 100644 --- a/lib/fog/rackspace/models/databases/flavors.rb +++ b/lib/fog/rackspace/models/databases/flavors.rb @@ -9,7 +9,7 @@ module Fog model Fog::Rackspace::Databases::Flavor def all - data = connection.list_flavors_details.body['flavors'] + data = connection.list_flavors.body['flavors'] load(data) end diff --git a/lib/fog/rackspace/models/databases/instances.rb b/lib/fog/rackspace/models/databases/instances.rb index 5024a3e04..f146b91d3 100644 --- a/lib/fog/rackspace/models/databases/instances.rb +++ b/lib/fog/rackspace/models/databases/instances.rb @@ -9,7 +9,7 @@ module Fog model Fog::Rackspace::Databases::Instance def all - data = connection.list_instances_details.body['instances'] + data = connection.list_instances.body['instances'] load(data) end diff --git a/lib/fog/rackspace/requests/databases/list_flavors_details.rb b/lib/fog/rackspace/requests/databases/list_flavors.rb similarity index 72% rename from lib/fog/rackspace/requests/databases/list_flavors_details.rb rename to lib/fog/rackspace/requests/databases/list_flavors.rb index ff37e15a0..0c29c52e5 100644 --- a/lib/fog/rackspace/requests/databases/list_flavors_details.rb +++ b/lib/fog/rackspace/requests/databases/list_flavors.rb @@ -2,11 +2,11 @@ module Fog module Rackspace class Databases class Real - def list_flavors_details() + def list_flavors() request( :expects => 200, :method => 'GET', - :path => 'flavors/detail' + :path => 'flavors' ) end end diff --git a/lib/fog/rackspace/requests/databases/list_instances_details.rb b/lib/fog/rackspace/requests/databases/list_instances.rb similarity index 71% rename from lib/fog/rackspace/requests/databases/list_instances_details.rb rename to lib/fog/rackspace/requests/databases/list_instances.rb index 260f61688..b9ffc22a1 100644 --- a/lib/fog/rackspace/requests/databases/list_instances_details.rb +++ b/lib/fog/rackspace/requests/databases/list_instances.rb @@ -2,11 +2,11 @@ module Fog module Rackspace class Databases class Real - def list_instances_details() + def list_instances() request( :expects => 200, :method => 'GET', - :path => 'instances/detail' + :path => 'instances' ) end end