-
+
<%= render :partial => 'account' %>
diff --git a/contrib/runner_scripts/cleanup_servers.rb b/contrib/runner_scripts/cleanup_servers.rb
index d50d62c..93159bf 100644
--- a/contrib/runner_scripts/cleanup_servers.rb
+++ b/contrib/runner_scripts/cleanup_servers.rb
@@ -8,22 +8,21 @@
Account.find(:all, :conditions => ["cloud_servers_username IS NOT NULL AND cloud_servers_username != '' and cloud_servers_api_key IS NOT NULL and cloud_servers_api_key != ''"], :group => "cloud_servers_api_key").each do |acct|
begin
- cs_conn=CloudServersUtil.new(acct.cloud_servers_username, acct.cloud_servers_api_key)
- cs_conn.all_servers do |cs|
+ conn = acct.get_connection
+ conn.all_servers do |server|
- exp=Regexp.new("^#{CS_NAME_PREFIX}")
- if cs[:name] =~ exp then
+ exp = Regexp.new("^#{CS_NAME_PREFIX}")
+ if server[:name] =~ exp then
- server=Server.find(:first, :conditions => ["cloud_server_id_number = ? AND historical = 0", cs[:id]])
+ server = Server.find(:first, :conditions => ["cloud_server_id_number = ? AND historical = 0", server[:id]])
if server.nil? then
begin
- puts "Account: #{acct.cloud_servers_username}, Deleting cloud server ID: #{cs[:id]} #{cs[:name]}"
+ puts "Account: #{acct.cloud_servers_username}, Deleting cloud server ID: #{server[:id]} #{server[:name]}"
Timeout::timeout(30) do
- cs_server=cs_conn.find_server(cs[:id])
- cs_server.update(:name => "deleted_#{cs[:id]}")
- cs_server.delete!
+ conn.update_server(server[:id], {:name => "deleted_#{server[:id]}"})
+ conn.delete_server(server[:id])
end
rescue
end
diff --git a/db/migrate/028_update_accounts2.rb b/db/migrate/028_update_accounts2.rb
new file mode 100644
index 0000000..8809b5a
--- /dev/null
+++ b/db/migrate/028_update_accounts2.rb
@@ -0,0 +1,17 @@
+class UpdateAccounts2 < ActiveRecord::Migration
+
+ def self.up
+ add_column :accounts, :connection_type, :string, :default => "rackspace"
+ add_column :accounts, :auth_url, :string, :default => ""
+ rename_column :accounts, :cloud_servers_username, :username
+ rename_column :accounts, :cloud_servers_api_key, :api_key
+ end
+
+ def self.down
+ remove_column :accounts, :connection_type
+ remove_column :accounts, :auth_url
+ rename_column :accounts, :username, :cloud_servers_username
+ rename_column :accounts, :api_key, :cloud_servers_api_key
+ end
+
+end
diff --git a/db/migrate/029_update_servers5.rb b/db/migrate/029_update_servers5.rb
new file mode 100644
index 0000000..e1a343a
--- /dev/null
+++ b/db/migrate/029_update_servers5.rb
@@ -0,0 +1,15 @@
+class UpdateServers5 < ActiveRecord::Migration
+
+ def self.up
+ change_column :servers, :cloud_server_id_number, :string
+ change_column :servers, :image_id, :string
+ change_column :servers, :flavor_id, :string
+ end
+
+ def self.down
+ change_column :servers, :cloud_server_id_number, :integer
+ change_column :servers, :image_id, :integer
+ change_column :servers, :flavor_id, :integer
+ end
+
+end
diff --git a/db/schema.rb b/db/schema.rb
index b80f389..303c1ff 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,14 +11,16 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 27) do
+ActiveRecord::Schema.define(:version => 29) do
create_table "accounts", :force => true do |t|
- t.string "cloud_servers_username"
- t.string "cloud_servers_api_key"
+ t.string "username"
+ t.string "api_key"
t.datetime "created_at"
t.datetime "updated_at"
t.integer "user_id"
+ t.string "connection_type", :default => "rackspace"
+ t.string "auth_url", :default => ""
end
add_index "accounts", ["user_id"], :name => "index_accounts_on_user_id"
@@ -85,9 +87,9 @@
t.string "description", :null => false
t.string "external_ip_addr"
t.string "internal_ip_addr"
- t.integer "cloud_server_id_number"
- t.integer "flavor_id", :null => false
- t.integer "image_id", :null => false
+ t.string "cloud_server_id_number"
+ t.string "flavor_id", :null => false
+ t.string "image_id", :null => false
t.integer "server_group_id", :null => false
t.boolean "openvpn_server", :default => false, :null => false
t.string "status", :default => "Pending", :null => false
diff --git a/lib/cloud_servers_util.rb b/lib/cloud_servers_util.rb
deleted file mode 100644
index 639f7f3..0000000
--- a/lib/cloud_servers_util.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-require 'rubygems'
-require 'cloudservers'
-
-# wrapper around all Cloud Server API calls
-class CloudServersUtil
-
- @cs_conn=nil
-
- def initialize(username, api_key)
- @cs_conn = CloudServers::Connection.new(:username => username, :api_key => api_key, :retry_auth => true)
- end
-
- # Create a cloud server instance with root ssh access
- # This function requires that a $HOME/.ssh/id_rsa.pub key
- # exist for the process running this web application
- def create_cloud_server(name, image_id, flavor_id, personalities={})
-
- @cs_conn.create_server(
- :name => name,
- :imageId => image_id,
- :flavorId => flavor_id,
- :personality => personalities)
-
- end
-
- def find_server(id)
- @cs_conn.server(id)
- end
-
- def destroy_server(id)
- server=@cs_conn.server(id)
- server.delete!
- end
-
- def reboot_server(id)
- server=@cs_conn.server(id)
- server.reboot!
- end
-
- def all_servers
-
- if block_given? then
- @cs_conn.servers.each do |server|
- yield server
- end
- else
- @cs_conn.servers
- end
-
- end
-
- def all_images
-
- if block_given? then
- @cs_conn.images.each do |image|
- yield image
- end
- else
- @cs_conn.images
- end
-
- end
-
- def account_limits
- @cs_conn.limits
- end
-
-end
diff --git a/lib/openstack_connection.rb b/lib/openstack_connection.rb
new file mode 100644
index 0000000..81e2c2e
--- /dev/null
+++ b/lib/openstack_connection.rb
@@ -0,0 +1,91 @@
+require 'rubygems'
+require 'openstack/compute'
+
+# wrapper around all OpenStack Compute API calls
+class OpenstackConnection
+
+ @os_conn=nil
+
+ def initialize(username, api_key, auth_url)
+ @os_conn = OpenStack::Compute::Connection.new(:username => username, :api_key => api_key, :auth_url => auth_url, :retry_auth => true)
+ end
+
+ #return an array containing the server id and admin password
+ def create_server(name, image_ref, flavor_ref, personalities={})
+ server = @os_conn.create_server(
+ :name => name,
+ :imageRef => image_ref,
+ :flavorRef => flavor_ref,
+ :personality => personalities)
+ [server.id, server.adminPass]
+ end
+
+ # returns a hash containing detailed server info
+ def get_server(id)
+ server = @os_conn.server(id)
+ server_data = {
+ :id => server.id,
+ :progress => server.progress,
+ :status => server.status
+ }
+ begin
+ if server.addresses.size > 0 and server.addresses[:public] and server.addresses[:private] then
+
+ pubs = server.addresses[:public].reject {|addr| addr.version != 4}
+ privs = server.addresses[:private].reject {|addr| addr.version != 4}
+
+ server_data.store(:public_ip, pubs[0].address)
+ server_data.store(:private_ip, privs[0].address)
+ end
+ rescue Exception => e
+ #puts "Failed to get address info: " + e.message
+ end
+ server_data
+ end
+
+ def update_server(id, data)
+ server = @os_conn.server(id)
+ server.update(data)
+ end
+
+ def destroy_server(id)
+ server = @os_conn.server(id)
+ server.delete!
+ end
+
+ def reboot_server(id)
+ server = @os_conn.server(id)
+ server.reboot!
+ end
+
+ # returns an array of :id, :name hashes
+ def all_servers
+
+ if block_given? then
+ @os_conn.servers.each do |server|
+ yield server
+ end
+ else
+ @os_conn.servers
+ end
+
+ end
+
+ # returns an array of :id, :name hashes
+ def all_images
+
+ if block_given? then
+ @os_conn.images.each do |image|
+ yield image
+ end
+ else
+ @os_conn.images
+ end
+
+ end
+
+ def account_limits
+ @os_conn.limits
+ end
+
+end
diff --git a/lib/rackspace_connection.rb b/lib/rackspace_connection.rb
new file mode 100644
index 0000000..3a88c38
--- /dev/null
+++ b/lib/rackspace_connection.rb
@@ -0,0 +1,84 @@
+require 'rubygems'
+require 'cloudservers'
+
+# wrapper around all Rackspace Cloud Servers API calls
+class RackspaceConnection
+
+ @cs_conn=nil
+
+ def initialize(username, api_key, auth_url)
+ if auth_url.blank? then
+ @cs_conn = CloudServers::Connection.new(:username => username, :api_key => api_key, :retry_auth => true)
+ else
+ @cs_conn = CloudServers::Connection.new(:username => username, :api_key => api_key, :retry_auth => true, :auth_url => auth_url)
+ end
+ end
+
+ #return an array containing the server id and admin password
+ def create_server(name, image_id, flavor_id, personalities={})
+ server = @cs_conn.create_server(
+ :name => name,
+ :imageId => image_id.to_i,
+ :flavorId => flavor_id.to_i,
+ :personality => personalities)
+ [server.id, server.adminPass]
+ end
+
+ # returns a hash containing detailed server info
+ def get_server(id)
+ server = @cs_conn.server(id.to_i)
+ {
+ :id => server.id,
+ :progress => server.progress,
+ :status => server.status,
+ :public_ip => server.addresses[:public][0],
+ :private_ip => server.addresses[:private][0]
+ }
+ end
+
+ def update_server(id, data)
+ server = @cs_conn.server(id.to_i)
+ server.update(data)
+ end
+
+ def destroy_server(id)
+ server = @cs_conn.server(id.to_i)
+ server.delete!
+ end
+
+ def reboot_server(id)
+ server = @cs_conn.server(id.to_i)
+ server.reboot!
+ end
+
+ # returns an array of :id, :name hashes
+ def all_servers
+
+ if block_given? then
+ @cs_conn.servers.each do |server|
+ yield server
+ end
+ else
+ @cs_conn.servers
+ end
+
+ end
+
+ # returns an array of :id, :name hashes
+ def all_images
+
+ if block_given? then
+ @cs_conn.images.each do |image|
+ yield image
+ end
+ else
+ @cs_conn.images
+ end
+
+ end
+
+ def account_limits
+ @cs_conn.limits
+ end
+
+end
diff --git a/script/about b/script/about
deleted file mode 100755
index 1eeb6eb..0000000
--- a/script/about
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../config/boot', __FILE__)
-$LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info"
-require 'commands/about'
diff --git a/script/console b/script/console
deleted file mode 100755
index 235a1f2..0000000
--- a/script/console
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../config/boot', __FILE__)
-require 'commands/console'
diff --git a/script/dbconsole b/script/dbconsole
deleted file mode 100755
index 83c8436..0000000
--- a/script/dbconsole
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../config/boot', __FILE__)
-require 'commands/dbconsole'
diff --git a/script/destroy b/script/destroy
deleted file mode 100755
index 88d295f..0000000
--- a/script/destroy
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../config/boot', __FILE__)
-require 'commands/destroy'
diff --git a/script/generate b/script/generate
deleted file mode 100755
index 62a8a4c..0000000
--- a/script/generate
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../config/boot', __FILE__)
-require 'commands/generate'
diff --git a/script/performance/benchmarker b/script/performance/benchmarker
deleted file mode 100755
index 3bff809..0000000
--- a/script/performance/benchmarker
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../../config/boot', __FILE__)
-require 'commands/performance/benchmarker'
diff --git a/script/performance/profiler b/script/performance/profiler
deleted file mode 100755
index 0764057..0000000
--- a/script/performance/profiler
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../../config/boot', __FILE__)
-require 'commands/performance/profiler'
diff --git a/script/plugin b/script/plugin
deleted file mode 100755
index b82201f..0000000
--- a/script/plugin
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../config/boot', __FILE__)
-require 'commands/plugin'
diff --git a/script/runner b/script/runner
deleted file mode 100755
index be4c5d4..0000000
--- a/script/runner
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../config/boot', __FILE__)
-require 'commands/runner'
diff --git a/script/server b/script/server
deleted file mode 100755
index b9fcb71..0000000
--- a/script/server
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../config/boot', __FILE__)
-require 'commands/server'
diff --git a/test/fixtures/accounts.yml b/test/fixtures/accounts.yml
index 92d9487..6bd0f46 100644
--- a/test/fixtures/accounts.yml
+++ b/test/fixtures/accounts.yml
@@ -1,16 +1,19 @@
# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
admin_account:
- cloud_servers_username: blahblah
- cloud_servers_api_key: ABABABABABA
+ username: blahblah
+ api_key: ABABABABABA
user: admin
+ connection_type: rackspace
bob_account:
- cloud_servers_username: blahblah
- cloud_servers_api_key: ABABABABABA
+ username: blahblah
+ api_key: ABABABABABA
user: bob
+ connection_type: rackspace
jim_account:
- cloud_servers_username: blahblah
- cloud_servers_api_key: ABABABABABA
+ username: blahblah
+ api_key: ABABABABABA
user: jim
+ connection_type: rackspace
diff --git a/test/functional/accounts_controller_test.rb b/test/functional/accounts_controller_test.rb
index b3cff40..981ad39 100644
--- a/test/functional/accounts_controller_test.rb
+++ b/test/functional/accounts_controller_test.rb
@@ -10,26 +10,26 @@ class AccountsControllerTest < ActionController::TestCase
test "should create account" do
login_as(:bob)
assert_difference('Account.count') do
- post :create, :account => {:cloud_servers_username => "blah", :cloud_servers_api_key => "ABABABABABAB"}, :format => :json
+ post :create, :account => {:username => "blah", :api_key => "ABABABABABAB"}, :format => :json
end
assert_response :success
end
test "admin update account" do
login_as(:admin)
- put :update, :id => accounts(:jim_account).to_param, :account => {:cloud_servers_username => "blah", :cloud_servers_api_key => "ABABABABABAB"}
+ put :update, :id => accounts(:jim_account).to_param, :account => {:username => "blah", :api_key => "ABABABABABAB"}
assert_redirected_to account_path(assigns(:account))
end
test "user update account" do
login_as(:jim)
- put :update, :id => accounts(:jim_account).to_param, :account => {:cloud_servers_username => "blah", :cloud_servers_api_key => "ABABABABABAB"}
+ put :update, :id => accounts(:jim_account).to_param, :account => {:username => "blah", :api_key => "ABABABABABAB"}
assert_redirected_to account_path(assigns(:account))
end
test "user should not update another users account" do
login_as(:bob)
- put :update, :id => accounts(:jim_account).to_param, :account => {:cloud_servers_username => "blah", :cloud_servers_api_key => "ABABABABABAB"}
+ put :update, :id => accounts(:jim_account).to_param, :account => {:username => "blah", :api_key => "ABABABABABAB"}
assert_response 401
end
diff --git a/test/functional/server_groups_controller_test.rb b/test/functional/server_groups_controller_test.rb
index 31a912d..e2669cc 100644
--- a/test/functional/server_groups_controller_test.rb
+++ b/test/functional/server_groups_controller_test.rb
@@ -35,7 +35,7 @@ class ServerGroupsControllerTest < ActionController::TestCase
end
=end
- test "should create server_group with server" do
+ test "should create server_group with server and client" do
http_basic_authorize
assert_difference('Client.count') do
assert_difference('Server.count') do
@@ -48,13 +48,30 @@ class ServerGroupsControllerTest < ActionController::TestCase
end
+ test "should create server_group with image uuid" do
+
+ image_id = '11b2a5bf-590c-4dd4-931f-a65751a4db0e'
+
+ http_basic_authorize
+ assert_difference('Client.count') do
+ assert_difference('Server.count') do
+ assert_difference('ServerGroup.count') do
+ post :create, :server_group => { :name => "test1", :owner_name => "dan.prince", :domain_name => "test.rsapps.net", :description => "test1", :vpn_network => "172.19.0.0", :vpn_subnet => "255.255.128.0", :servers_attributes => {"0" => { :name => "test1", :description => "test description", :flavor_id => "2", :image_id => image_id }}, :client_attributes => {"0" => {:name => "test2", :description => "blah blah"}} }
+ end
+ end
+ end
+ assert_response :success
+
+ assert_equal 1, Server.count(:conditions => ["image_id = ?", image_id])
+
+ end
+
test "should create server_group" do
http_basic_authorize
assert_difference('ServerGroup.count') do
post :create, :server_group => { :name => "test1", :owner_name => "dan.prince", :domain_name => "test.rsapps.net", :description => "test1", :vpn_network => "172.19.0.0", :vpn_subnet => "255.255.128.0" }
end
assert_response :success
- #assert_redirected_to server_group_path(assigns(:server_group))
end
@@ -92,6 +109,34 @@ class ServerGroupsControllerTest < ActionController::TestCase
end
+ test "should create server_group via XML request with image uuid" do
+
+ image_id = '22b2a5bf-590c-4dd4-931f-a65751a4db0c'
+
+ http_basic_authorize
+ assert_difference('SshPublicKey.count') do
+ assert_difference('Client.count') do
+ assert_difference('Server.count') do
+ assert_difference('ServerGroup.count') do
+
+ @request.env['RAW_POST_DATA'] = get_xml_request(image_id)
+
+ @request.accept = 'text/xml'
+ response=post :create
+ @request.env.delete('RAW_POST_DATA')
+
+ end
+ end
+ end
+ end
+
+ assert_response :success
+
+ server=Server.find(:first, :conditions => ["image_id = ?", image_id])
+ assert_equal server.id, AsyncExec.jobs[CreateCloudServer][0]
+
+ end
+
test "should not create server_group w/ Windows VPN server via XML request" do
http_basic_authorize
@@ -281,8 +326,8 @@ def get_xml_request(image_id)
test1
test1
- 1
- #{image_id}
+ 1
+ #{image_id}
true
#{Base64.encode64("echo hello > /tmp/test.txt")}
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index 575f271..73e6dc2 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -32,18 +32,18 @@ class UsersControllerTest < ActionController::TestCase
test "should create user with account" do
assert_difference('User.count') do
- post :create, :user => {:username => "test1", :first_name => "Mr.", :last_name => "Big", :password => "test123", :account_attributes => {:cloud_servers_username => 'blah123', :cloud_servers_api_key => 'AABBCCDD'} }
+ post :create, :user => {:username => "test1", :first_name => "Mr.", :last_name => "Big", :password => "test123", :account_attributes => {:username => 'blah123', :api_key => 'AABBCCDD'} }
end
user=User.find(:first, :conditions => ["username = ?", "test1"])
- assert_equal "blah123", user.account.cloud_servers_username, "Cloud Servers username was not set."
- assert_equal "AABBCCDD", user.account.cloud_servers_api_key, "Cloud Servers api key was not set."
+ assert_equal "blah123", user.account.username, "Cloud Servers username was not set."
+ assert_equal "AABBCCDD", user.account.api_key, "Cloud Servers api key was not set."
assert_redirected_to user_path(assigns(:user))
end
test "should not create user with invalid account" do
assert_no_difference('User.count') do
ENV['CLOUD_SERVERS_UTIL_INIT_MOCK_FAIL']="true"
- post :create, :user => {:username => "test1", :first_name => "Mr.", :last_name => "Big", :password => "test123", :account_attributes => {:cloud_servers_username => 'blah123', :cloud_servers_api_key => 'AABBCCDD'} }
+ post :create, :user => {:username => "test1", :first_name => "Mr.", :last_name => "Big", :password => "test123", :account_attributes => {:username => 'blah123', :api_key => 'AABBCCDD'} }
end
end
diff --git a/test/mocks/test/cloud_servers_util.rb b/test/mocks/test/cloud_servers_util.rb
deleted file mode 100644
index d7124ca..0000000
--- a/test/mocks/test/cloud_servers_util.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-class CloudServersUtil
-
- class TestCloudServer
- attr_accessor :name, :imageId, :flavorId, :hostId, :status, :progress, :addresses, :metadata, :personality, :adminPass
- end
-
- def initialize(username, api_key)
- if ENV['CLOUD_SERVERS_UTIL_INIT_MOCK_FAIL'] then
- ENV.delete('CLOUD_SERVERS_UTIL_INIT_MOCK_FAIL')
- raise "Invalid account specified"
- else
- return true
- end
- end
-
- def create_cloud_server(name, image_id, flavor_id, personalities={})
- server=TestCloudServer.new
- server.name = name
- server.imageId = image_id
- server.flavorId = flavor_id
- server.progress = 100
- return server
- end
-
- def find_server(id)
- server=TestCloudServer.new
- server.name = name
- server.imageId = image_id
- server.flavorId = flavor_id
- return server
- end
-
- def destroy_server(id)
- return true
- end
-
- def reboot_server(id)
- return true
- end
-
- def all_servers
- return []
- end
-
- def account_limits
- return %{{"absolute":{"maxIPGroups":25,"maxIPGroupMembers":25,"maxTotalRAMSize":51200},"rate":[{"remaining":10,"URI":"*","unit":"MINUTE","resetTime":1287082645,"value":10,"regex":".*","verb":"PUT"},{"remaining":3,"URI":"*changes-since*","unit":"MINUTE","resetTime":1287082645,"value":3,"regex":"changes-since","verb":"GET"},{"remaining":600,"URI":"*","unit":"MINUTE","resetTime":1287082645,"value":600,"regex":".*","verb":"DELETE"},{"remaining":58,"URI":"/servers*","unit":"HOUR","resetTime":1287083964,"value":60,"regex":"^/servers","verb":"POST"}]}
-}
- end
-
-end
diff --git a/test/mocks/test/rackspace_connection.rb b/test/mocks/test/rackspace_connection.rb
new file mode 100644
index 0000000..826cdc5
--- /dev/null
+++ b/test/mocks/test/rackspace_connection.rb
@@ -0,0 +1,61 @@
+class RackspaceConnection
+
+ class TestCloudServer
+ attr_accessor :id, :name, :imageId, :flavorId, :hostId, :status, :progress, :addresses, :metadata, :personality, :adminPass
+ end
+
+ def initialize(username, api_key, auth_url)
+ if ENV['CLOUD_SERVERS_UTIL_INIT_MOCK_FAIL'] then
+ ENV.delete('CLOUD_SERVERS_UTIL_INIT_MOCK_FAIL')
+ raise "Invalid account specified"
+ else
+ return true
+ end
+ end
+
+ def create_cloud_server(name, image_id, flavor_id, personalities={})
+ server=TestCloudServer.new
+ server.name = name
+ server.imageId = image_id
+ server.flavorId = flavor_id
+ server.progress = 100
+ return server.id
+ end
+
+ def server_details(id)
+ server=TestCloudServer.new
+ server.name = name
+ server.imageId = image_id
+ server.flavorId = flavor_id
+ return {
+ :id => server.id,
+ :progress => server.progress,
+ :status => server.status,
+ :public_ip => server.addresses[:public][0],
+ :private_ip => server.addresses[:public][0],
+ :admin_password => server.adminPass
+ }
+ end
+
+ def destroy_server(id)
+ return true
+ end
+
+ def reboot_server(id)
+ return true
+ end
+
+ def all_servers
+ return []
+ end
+
+ def all_images
+ return []
+ end
+
+ def account_limits
+ return %{{"absolute":{"maxIPGroups":25,"maxIPGroupMembers":25,"maxTotalRAMSize":51200},"rate":[{"remaining":10,"URI":"*","unit":"MINUTE","resetTime":1287082645,"value":10,"regex":".*","verb":"PUT"},{"remaining":3,"URI":"*changes-since*","unit":"MINUTE","resetTime":1287082645,"value":3,"regex":"changes-since","verb":"GET"},{"remaining":600,"URI":"*","unit":"MINUTE","resetTime":1287082645,"value":600,"regex":".*","verb":"DELETE"},{"remaining":58,"URI":"/servers*","unit":"HOUR","resetTime":1287083964,"value":60,"regex":"^/servers","verb":"POST"}]}
+}
+ end
+
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 7ee7dc5..b98a3ba 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -2,7 +2,7 @@
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
require File.expand_path(File.dirname(__FILE__) + "/mocks/test/async_exec")
-require File.expand_path(File.dirname(__FILE__) + "/mocks/test/cloud_servers_util")
+require File.expand_path(File.dirname(__FILE__) + "/mocks/test/rackspace_connection")
class ActiveSupport::TestCase
# Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
diff --git a/test/unit/account_test.rb b/test/unit/account_test.rb
index ab0e68f..ec0d56e 100644
--- a/test/unit/account_test.rb
+++ b/test/unit/account_test.rb
@@ -16,8 +16,8 @@ class AccountTest < ActiveSupport::TestCase
test "create account" do
account=Account.new(
- :cloud_servers_username => "blah",
- :cloud_servers_api_key => "ABABABABABAB"
+ :username => "blah",
+ :api_key => "ABABABABABAB"
)
assert account.valid?, "Account should be valid."
assert account.save, "Account should have been saved."
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index c46fa5d..5971261 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -11,7 +11,7 @@ class ServerTest < ActiveSupport::TestCase
:first_name => "Mr.",
:last_name => "Big",
:password => "test123",
- :account_attributes => {:cloud_servers_username => "test", :cloud_servers_api_key => "AABBCCDD"}
+ :account_attributes => {:username => "test", :api_key => "AABBCCDD"}
)
assert user.valid?, "User should be valid."
assert user.save, "User should have been saved."
@@ -26,7 +26,7 @@ class ServerTest < ActiveSupport::TestCase
:first_name => "Mr.",
:last_name => "Big",
:password => "test123",
- :account_attributes => {:cloud_servers_username => "test", :cloud_servers_api_key => "AABBCCDD"}
+ :account_attributes => {:username => "test", :api_key => "AABBCCDD"}
)
assert_equal false, user.valid?, "User should not be valid."
@@ -39,7 +39,7 @@ class ServerTest < ActiveSupport::TestCase
:first_name => "Mr.",
:last_name => "Big",
:password => "test123",
- :account_attributes => {:cloud_servers_username => "test", :cloud_servers_api_key => "AABBCCDD"}
+ :account_attributes => {:username => "test", :api_key => "AABBCCDD"}
)
assert_equal false, user.valid?, "User should not be valid."
assert_equal false, user.save, "User should not save."
@@ -53,7 +53,7 @@ class ServerTest < ActiveSupport::TestCase
:first_name => "Mr.",
:last_name => "Big",
:password => "test123",
- :account_attributes => {:cloud_servers_username => "test", :cloud_servers_api_key => "AABBCCDD"}
+ :account_attributes => {:username => "test", :api_key => "AABBCCDD"}
)
assert_equal false, user.valid?, "User should not be valid."
assert_equal false, user.save, "User should not save."
@@ -67,7 +67,7 @@ class ServerTest < ActiveSupport::TestCase
:first_name => "Test",
:last_name => "SshKey",
:password => "test123",
- :account_attributes => {:cloud_servers_username => "test", :cloud_servers_api_key => "AABBCCDD"}
+ :account_attributes => {:username => "test", :api_key => "AABBCCDD"}
)
assert_equal true, user.save, "User should save."