profitbricks 0.9.9 → 1.0.0

data/spec/profitbricks/firewall_spec.rb

@@ -2,47 +2,53 @@ require 'spec_helper'
 require 'json'
 
 describe Profitbricks::Firewall do
-  include Savon::Spec::Macros
+  include Savon::SpecHelper
+
+  before(:all) { savon.mock!   }
+  after(:all)  { savon.unmock! }
+
   let(:dc) { DataCenter.new(JSON.parse(File.open('spec/fixtures/get_data_center/firewall.json').read)["get_data_center_response"]["return"])}
 
   it "should add new rules to a firewall of a load balancer" do
-    savon.expects(:add_firewall_rules_to_load_balancer).returns(:success)
+    savon.expects(:add_firewall_rules_to_load_balancer).with(message: {load_balancer_id: dc.load_balancers.first.id, request: [{port_range_start: 80, port_range_end: 80, protocol: 'TCP'}]}).returns(f :add_firewall_rules_to_load_balancer, :success)
+    savon.expects(:get_firewall).with(message: {firewall_id: 'aa5e5270-1e6d-6e3a-ba7b-0b1f2d9e2425'}).returns(f :get_firewall, :success)
     fw = dc.load_balancers.first.firewall
     rule = FirewallRule.new(:port_range_start => 80, :port_range_end => 80, :protocol => 'TCP')
     fw.add_rules([rule]).should == true
   end
 
   it "should add new rules to a firewall of a nic" do
-    savon.expects(:add_firewall_rules_to_nic).returns(:success)
+    savon.expects(:add_firewall_rules_to_nic).with(message: {nic_id: dc.servers.first.nics.first.id, request: [{port_range_start: 80, port_range_end: 80, protocol: 'TCP'}]}).returns(f :add_firewall_rules_to_nic, :success)
+    savon.expects(:get_firewall).with(message: {firewall_id: '33f4e0a5-41d9-eb57-81d1-24854ed89834'}).returns(f :get_firewall, :success)
     fw = dc.servers.first.nics.first.firewall
     rule = FirewallRule.new(:port_range_start => 80, :port_range_end => 80, :protocol => 'TCP')
     fw.add_rules([rule]).should == true
   end
   
   it "should activate a firewall" do
-    savon.expects(:get_firewall).returns(:success)
-    savon.expects(:activate_firewalls).returns(:success)
+    savon.expects(:get_firewall).with(message: {firewall_id: '33f4e0a5-41d9-eb57-81d1-24854ed89834'}).returns(f :get_firewall, :success)
+    savon.expects(:activate_firewalls).with(message: {firewall_ids: '33f4e0a5-41d9-eb57-81d1-24854ed89834'}).returns(f :activate_firewalls, :success)
     fw = Firewall.find(:id => "33f4e0a5-41d9-eb57-81d1-24854ed89834")
     fw.activate.should == true
   end
 
   it "should deactivate a firewall" do
-    savon.expects(:get_firewall).returns(:success)
-    savon.expects(:deactivate_firewalls).returns(:success)
+    savon.expects(:get_firewall).with(message: {firewall_id: '33f4e0a5-41d9-eb57-81d1-24854ed89834'}).returns(f :get_firewall, :success)
+    savon.expects(:deactivate_firewalls).with(message: {firewall_ids: '33f4e0a5-41d9-eb57-81d1-24854ed89834'}).returns(f :deactivate_firewalls, :success)
     fw = Firewall.find(:id => "33f4e0a5-41d9-eb57-81d1-24854ed89834")
     fw.deactivate.should == true
   end
 
   it "should delete a firewall" do
-    savon.expects(:get_firewall).returns(:success)
-    savon.expects(:delete_firewalls).returns(:success)
+    savon.expects(:get_firewall).with(message: {firewall_id: '33f4e0a5-41d9-eb57-81d1-24854ed89834'}).returns(f :get_firewall, :success)
+    savon.expects(:delete_firewalls).with(message: {firewall_ids: '33f4e0a5-41d9-eb57-81d1-24854ed89834'}).returns(f :delete_firewalls, :success)
     fw = Firewall.find(:id => "33f4e0a5-41d9-eb57-81d1-24854ed89834")
     fw.delete.should == true
   end
 
   it "should delete a firewall rule" do
-    savon.expects(:get_firewall).returns(:success)
-    savon.expects(:remove_firewall_rules).returns(:success)
+    savon.expects(:get_firewall).with(message: {firewall_id: '33f4e0a5-41d9-eb57-81d1-24854ed89834'}).returns(f :get_firewall, :success)
+    savon.expects(:remove_firewall_rules).with(message: {firewall_rule_ids: '77e8e8bd-5b72-b657-e97b-c010937cefdf'}).returns(f :remove_firewall_rules, :success)
     fw = Firewall.find(:id => "33f4e0a5-41d9-eb57-81d1-24854ed89834")
     fw.rules.first.delete.should == true
   end

data/spec/profitbricks/image_spec.rb

@@ -1,22 +1,25 @@
 require 'spec_helper'
 
 describe Profitbricks::Image do
-  include Savon::Spec::Macros
+  include Savon::SpecHelper
+
+  before(:all) { savon.mock!   }
+  after(:all)  { savon.unmock! }
 
   it "should find all images" do
-    savon.expects(:get_all_images).returns(:success)
+    savon.expects(:get_all_images).with(message: {}).returns(f :get_all_images, :success)
     Image.all.count.should == 7
   end
 
   it "should find an image by name" do 
-  	savon.expects(:get_all_images).returns(:success)
+  	savon.expects(:get_all_images).with(message: {}).returns(f :get_all_images, :success)
   	image = Image.find(:name => "Windows8-ConsumerPreview-64bit-English.iso")
     image.os_type.should == "UNKNOWN"
   end
 
   it "should update the os_type" do
-    savon.expects(:get_all_images).returns(:success)
-    savon.expects(:set_image_os_type).returns(:success)
+    savon.expects(:get_all_images).with(message: {}).returns(f :get_all_images, :success)
+    savon.expects(:set_image_os_type).with(message: {image_id: '5f58656e-66c3-11e1-8c6f-0025901dfe2a', os_type: 'WINDOWS'}).returns(f :set_image_os_type, :success)
     image = Image.find(:name => "Windows8-ConsumerPreview-64bit-English.iso")
     image.set_os_type("WINDOWS").os_type.should == "WINDOWS"
   end

data/spec/profitbricks/ip_block_spec.rb

@@ -1,24 +1,27 @@
 require 'spec_helper'
 
 describe Profitbricks::IpBlock do
-  include Savon::Spec::Macros
+  include Savon::SpecHelper
+
+  before(:all) { savon.mock!   }
+  after(:all)  { savon.unmock! }
 
   it "should reserve a block" do
-    savon.expects(:reserve_public_ip_block).returns(:success)
+    savon.expects(:reserve_public_ip_block).with(message: {block_size: 2}).returns(f :reserve_public_ip_block, :success)
     block = IpBlock.reserve(2)
     block.ips.count.should == 2
   end
 
   it "should list all available blocks" do
-    savon.expects(:get_all_public_ip_blocks).returns(:success)
+    savon.expects(:get_all_public_ip_blocks).with(message: {}).returns(f :get_all_public_ip_blocks, :success)
     blocks = IpBlock.all()
     blocks.count.should == 1
     blocks.first.ips.count.should == 2
   end
 
   it "should release a block properly" do 
-    savon.expects(:get_all_public_ip_blocks).returns(:success)
-    savon.expects(:release_public_ip_block).returns(:success)
+    savon.expects(:get_all_public_ip_blocks).with(message: {}).returns(f :get_all_public_ip_blocks, :success)
+    savon.expects(:release_public_ip_block).with(message: {block_id: '167bc48c-4f80-4870-b5db-13d7d762e1cd'}).returns(f :release_public_ip_block, :success)
     blocks = IpBlock.all()
     blocks.first.release.should == true
   end

data/spec/profitbricks/load_balancer_spec.rb

@@ -1,12 +1,17 @@
 require 'spec_helper'
 
 describe Profitbricks::LoadBalancer do
-  include Savon::Spec::Macros
+  include Savon::SpecHelper
+
+  before(:all) { savon.mock!   }
+  after(:all)  { savon.unmock! }
+
   let(:servers) { [Server.new(:id => "206d10f2-035f-4ef2-8d24-3022653e9706")]}
 
   it "create a new LoadBalancer" do
-    savon.expects(:create_load_balancer).returns(:success)
-    savon.expects(:get_load_balancer).returns(:success)
+    create_msg = {arg0: {data_center_id: "1111", name: "Test", server_ids: servers.collect(&:id), algorithm: 'ROUND_ROBIN'}}
+    savon.expects(:create_load_balancer).with(message: create_msg).returns(f :create_load_balancer, :success)
+    savon.expects(:get_load_balancer).with(message: {load_balancer_id: '5dadd2b2-3405-4ec5-a450-0df497bebab0'}).returns(f :get_load_balancer, :success)
     lb = LoadBalancer.create(:data_center_id => "1111", :name => "Test", :servers => servers, :algorithm => 'ROUND_ROBIN')
     lb.name.should == "Test"
     lb.lan_id.should == 0
@@ -14,9 +19,9 @@ describe Profitbricks::LoadBalancer do
   end
 
   it "should update an existing LoadBalancer" do
-    savon.expects(:get_load_balancer).returns(:success)
-    savon.expects(:update_load_balancer).returns(:success)
-    savon.expects(:get_load_balancer).returns(:success)
+    savon.expects(:get_load_balancer).with(message: {load_balancer_id: '5dadd2b2-3405-4ec5-a450-0df497bebab0'}).returns(f :get_load_balancer, :success)
+    savon.expects(:update_load_balancer).with(message: {arg0: {load_balancer_id: '3e3cb642-4d50-4371-980a-65959b2fa428', load_balancer_name: 'Wee'}}).returns(f :update_load_balancer, :success)
+    savon.expects(:get_load_balancer).with(message: {load_balancer_id: '3e3cb642-4d50-4371-980a-65959b2fa428'}).returns(f :get_load_balancer, :success)
     lb = LoadBalancer.find(:id => "5dadd2b2-3405-4ec5-a450-0df497bebab0")
     lb.update(:name => "Wee").should == true
     # FIXME seems to be a bug in the API
@@ -24,36 +29,38 @@ describe Profitbricks::LoadBalancer do
   end
 
   it "should be deleted" do
-    savon.expects(:get_load_balancer).returns(:success)
-    savon.expects(:delete_load_balancer).returns(:success)
+    savon.expects(:get_load_balancer).with(message: {load_balancer_id: '5dadd2b2-3405-4ec5-a450-0df497bebab0'}).returns(f :get_load_balancer, :success)
+    savon.expects(:delete_load_balancer).with(message: {load_balancer_id: '3e3cb642-4d50-4371-980a-65959b2fa428'}).returns(f :delete_load_balancer, :success)
     lb = LoadBalancer.find(:id => "5dadd2b2-3405-4ec5-a450-0df497bebab0")
     lb.delete.should == true
   end
 
   it "should register a server" do
-    savon.expects(:get_load_balancer).returns(:success)
-    savon.expects(:register_servers_on_load_balancer).returns(:success)
+    savon.expects(:get_load_balancer).with(message: {load_balancer_id: '5dadd2b2-3405-4ec5-a450-0df497bebab0'}).returns(f :get_load_balancer, :success)
+    savon.expects(:register_servers_on_load_balancer).with(message: id_with_servers).returns(f :register_servers_on_load_balancer, :success)
+    savon.expects(:get_load_balancer).with(message: {load_balancer_id: '3e3cb642-4d50-4371-980a-65959b2fa428'}).returns(f :get_load_balancer, :success)
     lb = LoadBalancer.find(:id => "5dadd2b2-3405-4ec5-a450-0df497bebab0")
     lb.register_servers(servers).should == true
   end
   
   it "should deregister a server" do
-    savon.expects(:get_load_balancer).returns(:success)
-    savon.expects(:deregister_servers_on_load_balancer).returns(:success)
+    savon.expects(:get_load_balancer).with(message: {load_balancer_id: '5dadd2b2-3405-4ec5-a450-0df497bebab0'}).returns(f :get_load_balancer, :success)
+    savon.expects(:deregister_servers_on_load_balancer).with(message: id_with_servers).returns(f :deregister_servers_on_load_balancer, :success)
     lb = LoadBalancer.find(:id => "5dadd2b2-3405-4ec5-a450-0df497bebab0")
     lb.deregister_servers(servers).should == true
   end
 
+  let(:id_with_servers) { {load_balancer_id: '3e3cb642-4d50-4371-980a-65959b2fa428', server_ids: servers.collect(&:id)} }
   it "should activate a server" do
-    savon.expects(:get_load_balancer).returns(:success)
-    savon.expects(:activate_load_balancing_on_servers).returns(:success)
+    savon.expects(:get_load_balancer).with(message: {load_balancer_id: '5dadd2b2-3405-4ec5-a450-0df497bebab0'}).returns(f :get_load_balancer, :success)
+    savon.expects(:activate_load_balancing_on_servers).with(message: id_with_servers).returns(f :activate_load_balancing_on_servers, :success)
     lb = LoadBalancer.find(:id => "5dadd2b2-3405-4ec5-a450-0df497bebab0")
     lb.activate_servers(servers).should == true
   end
 
   it "should deactivate a server" do
-    savon.expects(:get_load_balancer).returns(:success)
-    savon.expects(:deactivate_load_balancing_on_servers).returns(:success)
+    savon.expects(:get_load_balancer).with(message: {load_balancer_id: '5dadd2b2-3405-4ec5-a450-0df497bebab0'}).returns(f :get_load_balancer, :success)
+    savon.expects(:deactivate_load_balancing_on_servers).with(message: id_with_servers).returns(f :deactivate_load_balancing_on_servers, :success)
     lb = LoadBalancer.find(:id => "5dadd2b2-3405-4ec5-a450-0df497bebab0")
     lb.deactivate_servers(servers).should == true
   end

data/spec/profitbricks/model_spec.rb

@@ -11,6 +11,10 @@ module Profitbricks
   class ModelBelongsToTest < Profitbricks::Model
    belongs_to :model_has_many_test
   end
+
+  class ModelBelongsToWithClassNameTest < Profitbricks::Model
+   belongs_to :undefined_model, :class_name => :model_test
+  end
 end
 
 describe Profitbricks::Model do
@@ -43,6 +47,12 @@ describe Profitbricks::Model do
     mt.model_has_many_test.name.should == 'One'
   end
   
+  it "should create a belongs_to association with class_name correclty" do
+    mt = Profitbricks::ModelBelongsToWithClassNameTest.new( :undefined_model => {:name => 'One'} )
+    mt.undefined_model.class.should == Profitbricks::ModelTest
+    mt.undefined_model.name.should == 'One'
+  end
+
   it "should raise an LoadError exception" do
     lambda {
       module Profitbricks
@@ -52,17 +62,4 @@ describe Profitbricks::Model do
       end
     }.should raise_error(LoadError)
   end
-  describe "get_xml_and_update_attributes" do
-    it "should execute update_attributes correclty" do
-      mt = Profitbricks::ModelTest.new({:name => 'Test', :camel_case => 'works'})
-      xml = mt.get_xml_and_update_attributes({:name => 'Test2', :camel_case => 'fails?'}, [:name, :camel_case])
-      xml.should == "<camelCase>fails?</camelCase><modelTestName>Test2</modelTestName>"
-      mt.name.should == 'Test2'
-      mt.camel_case.should == 'fails?'
-    end
-    it "should work as class method" do
-      xml = Profitbricks::ModelTest.get_xml_and_update_attributes({:name => 'Test2', :camel_case => 'fails?'}, [:name, :camel_case])
-      xml.should == "<camelCase>fails?</camelCase><modelTestName>Test2</modelTestName>"
-    end
-  end
 end

data/spec/profitbricks/nic_spec.rb

@@ -1,11 +1,14 @@
 require 'spec_helper'
 
 describe Profitbricks::Nic do
-  include Savon::Spec::Macros
+  include Savon::SpecHelper
+
+  before(:all) { savon.mock!   }
+  after(:all)  { savon.unmock! }
 
   it "create a new Nic" do
-    savon.expects(:create_nic).returns(:success)
-    savon.expects(:get_nic).returns(:success)
+    savon.expects(:create_nic).with(message: {arg0: {lan_id: 1, ip: '192.168.0.11', nic_name: 'Internal', server_id: '4cb6550f-3777-4818-8f4c-51233162a980'}}).returns(f :create_nic, :success)
+    savon.expects(:get_nic).with(message: {nic_id: 'cba8af39-b5de-477b-9795-2f02ea9cf04f'}).returns(f :get_nic, :success)
     nic = Nic.create(:lan_id => 1, :ip => "192.168.0.11", :name => "Internal", :server_id => "4cb6550f-3777-4818-8f4c-51233162a980")
     nic.name.should == "Internal"
     nic.lan_id.should == 1
@@ -13,30 +16,30 @@ describe Profitbricks::Nic do
   end
 
   it "should update an existing Nic" do
-    savon.expects(:get_nic).returns(:success)
-    savon.expects(:update_nic).returns(:success)
+    savon.expects(:get_nic).with(message: {nic_id: 'cba8af39-b5de-477b-9795-2f02ea9cf04f'}).returns(f :get_nic, :success)
+    savon.expects(:update_nic).with(message: {arg0: {nic_id: 'cba8af39-b5de-477b-9795-2f02ea9cf04f', nic_name: 'External'}}).returns(f :update_nic, :success)
     nic = Nic.find(:id => "cba8af39-b5de-477b-9795-2f02ea9cf04f")
     nic.update(:name => "External").should == true
     nic.name.should == "External"
   end
 
   it "should set the internet access" do
-    savon.expects(:get_nic).returns(:success)
-    savon.expects(:set_internet_access).returns(:success)
+    savon.expects(:get_nic).with(message: {nic_id: 'cba8af39-b5de-477b-9795-2f02ea9cf04f'}).returns(f :get_nic, :success)
+    savon.expects(:set_internet_access).with(message: {data_center_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602', lan_id: 1, internet_access: true}).returns(f :set_internet_access, :success)
     nic = Nic.find(:id => "cba8af39-b5de-477b-9795-2f02ea9cf04f")
     (nic.set_internet_access = true).should == true
   end
 
   it "should be deleted" do
-    savon.expects(:get_nic).returns(:success)
-    savon.expects(:delete_nic).returns(:success)
+    savon.expects(:get_nic).with(message: {nic_id: 'cba8af39-b5de-477b-9795-2f02ea9cf04f'}).returns(f :get_nic, :success)
+    savon.expects(:delete_nic).with(message: {nic_id: 'cba8af39-b5de-477b-9795-2f02ea9cf04f'}).returns(f :delete_nic, :success)
     nic = Nic.find(:id => "cba8af39-b5de-477b-9795-2f02ea9cf04f")
     nic.delete.should == true
   end
 
   it "should add an ip" do
-    savon.expects(:get_nic).returns(:success)
-    savon.expects(:add_public_ip_to_nic).returns(:success)
+    savon.expects(:get_nic).with(message: {nic_id: 'cba8af39-b5de-477b-9795-2f02ea9cf04f'}).returns(f :get_nic, :success)
+    savon.expects(:add_public_ip_to_nic).with(message: {nic_id: 'cba8af39-b5de-477b-9795-2f02ea9cf04f', ip: '46.16.74.13'}).returns(f :add_public_ip_to_nic, :success)
     nic = Nic.find(:id => "cba8af39-b5de-477b-9795-2f02ea9cf04f")
     nic.add_ip("46.16.74.13")
     nic.ips.count.should == 2
@@ -46,8 +49,8 @@ describe Profitbricks::Nic do
   end
   
   it "should remove an ip" do
-    savon.expects(:get_nic).returns(:success)
-    savon.expects(:remove_public_ip_from_nic).returns(:success)
+    savon.expects(:get_nic).with(message: {nic_id: 'cba8af39-b5de-477b-9795-2f02ea9cf04f'}).returns(f :get_nic, :success)
+    savon.expects(:remove_public_ip_from_nic).with(message: {nic_id: 'cba8af39-b5de-477b-9795-2f02ea9cf04f', ip: '46.16.74.13'}).returns(f :remove_public_ip_from_nic, :success)
     nic = Nic.find(:id => "cba8af39-b5de-477b-9795-2f02ea9cf04f")
     nic.remove_ip("46.16.74.13")
     nic.ips.count.should == 1

data/spec/profitbricks/server_spec.rb

@@ -1,8 +1,11 @@
 require 'spec_helper'
 
 describe Profitbricks::Server do
-  include Savon::Spec::Macros
+  include Savon::SpecHelper
 
+  before(:all) { savon.mock!   }
+  after(:all)  { savon.unmock! }
+  
   describe "enforcing required arguments" do 
     describe "on create" do
       it "should require :cores and :ram" do
@@ -39,8 +42,8 @@ describe Profitbricks::Server do
     end
     describe "on update" do
       before(:each) do
-        savon.expects(:create_server).returns(:minimal)
-        savon.expects(:get_server).returns(:after_create)
+        savon.expects(:create_server).with(message: {arg0: {ram: 256, cores: 1}}).returns(f :create_server, :minimal)
+        savon.expects(:get_server).with(message: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f'}).returns(f :get_server, :after_create)
         @server = Server.create(:ram => 256, :cores => 1)
       end
 
@@ -74,32 +77,135 @@ describe Profitbricks::Server do
 
 
   it "should create a new server with minimal arguments" do
-    savon.expects(:create_server).returns(:minimal)
-    savon.expects(:get_server).returns(:after_create)
+    savon.expects(:create_server).with(message: {arg0: {ram: 256, cores: 1, server_name: 'Test Server', data_center_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}}).returns(f :create_server, :minimal)
+    savon.expects(:get_server).with(message: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f'}).returns(f :get_server, :after_create)
     s = Server.create(:cores => 1, :ram => 256, :name => 'Test Server', :data_center_id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
     s.cores.should == 1
     s.ram.should == 256
     s.name.should == 'Test Server'
     s.data_center_id.should == "b3eebede-5c78-417c-b1bc-ff5de01a0602"
   end
+
   it "should reboot on request" do
-    savon.expects(:get_server).returns(:after_create)
-    savon.expects(:reboot_server).returns(:success)
+    savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :after_create)
+    savon.expects(:reboot_server).with(message: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f'}).returns(f :reboot_server, :success)
     s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
     s.reboot.should == true
   end
 
+  it "should reset on request" do
+    savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :after_create)
+    savon.expects(:reset_server).with(message: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f'}).returns(f :reset_server, :success)
+    s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
+    s.reset.should == true
+  end
+
+  it "should start on request" do
+    savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :after_create)
+    savon.expects(:start_server).with(message: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f'}).returns(f :start_server, :success)
+    s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
+    s.start.should == true
+  end
+
+  it "should power off on request" do
+    savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :after_create)
+    savon.expects(:power_off_server).with(message: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f'}).returns(f :power_off_server, :success)
+    s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
+    s.power_off.should == true
+  end
+
+  it "should shutdown on request" do
+    savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :after_create)
+    savon.expects(:shutdown_server).with(message: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f'}).returns(f :shutdown_server, :success)
+    s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
+    s.shutdown.should == true
+  end
+
+  it "should check if its running" do
+    savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :after_create)
+    savon.expects(:get_server).with(message: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f'}).returns(f :get_server, :after_create)
+    s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
+    s.running?.should == false
+  end
+
+  it "should wait until it is running" do
+    savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :after_create)
+    s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
+    s.should_receive(:running?).and_return(false,true)
+    s.wait_for_running
+  end
+
+  it "should return false on provisioned?" do
+    savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :after_create)
+    s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
+    savon.expects(:get_server).with(message: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f'}).returns(f :get_server, :after_create)
+    s.provisioned?.should == false
+  end
+  
+  it "should return true on provisioned?" do
+    savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :after_create)
+    s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
+    savon.expects(:get_server).with(message: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f'}).returns(f :get_server, :connected_storage)
+    s.provisioned?.should == true
+  end
+
+  it "should wait for provisioning to finish" do
+    savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :after_create)
+    s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
+    s.should_receive(:provisioned?).and_return(false,true)
+    s.wait_for_provisioning
+  end
+
+  it "should call Nic.create correctly via the create_nic helper" do
+    savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :after_create)
+    s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
+    Nic.should_receive(:create).with(:server_id => "b7a5f3d1-324a-4490-aa8e-56cdec436e3f")
+    s.create_nic({})
+  end
+
   it "should be deleted" do
-    savon.expects(:get_server).returns(:after_create)
-    savon.expects(:delete_server).returns(:success)
+    savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :after_create)
+    savon.expects(:delete_server).with(message: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f'}).returns(f :delete_server, :success)
     s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
     s.delete.should == true
   end
 
+  it "should return all Servers" do
+    savon.expects(:get_all_data_centers).with(message: {}).returns(f :get_all_data_centers, :test_datacenter)
+    savon.expects(:get_data_center).with(message: {data_center_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_data_center, :two_servers_with_storage)
+    #DataCenter.should_receive(:all).and_return
+    servers = Server.all
+    servers.class.should == Array
+    servers.length.should == 2
+    servers.first.class.should == Server
+  end
+
+  it "should return all connected_storages via the storages helper" do
+    savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :connected_storage)
+    s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
+    s.connected_storages.class.should == Array
+    s.connected_storages.length.should == 1
+    s.connected_storages.first.class.should == Storage
+  end
+
+  describe "nic helper methods" do
+    it "should return all public ip adresses" do
+      savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :two_nics)
+      s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
+      s.public_ips.should == ["46.16.73.167"]
+    end
+
+    it "should return all private ip adresses" do
+      savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :two_nics)
+      s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
+      s.private_ips.should == ["10.14.38.11"]
+    end
+  end
+
   describe "updating" do
     it "should update basic attributes correctly" do 
-      savon.expects(:get_server).returns(:after_create)
-      savon.expects(:update_server).returns(:basic)
+      savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :after_create)
+      savon.expects(:update_server).with(message: {arg0: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f', server_name: 'Power of two', os_type: 'WINDOWS', cores: 2, ram: 512}}).returns(f :update_server, :basic)
       s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
       s.update(:cores => 2, :ram => 512, :name => "Power of two", :os_type => 'WINDOWS')
       s.cores.should == 2