solusvm 1.2.1 → 1.3.0

data/test/cli/test_reseller_cli.rb

@@ -10,32 +10,31 @@ class TestResellerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_reseller_create_to_reseller
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Reseller.stubs(:new => mock do
+    Solusvm::Reseller.expects(:new).with(solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:create).with() do |options|
         expected = {
-          :username => "theusername",
-          :password => "thepassword",
-          :email => "theemail",
-          :firstname => "thefirstname",
-          :lastname => "thelastname",
-          :company => "thecompany",
-          :usernameprefix => "theusernameprefix",
-          :maxvps => "themaxvps",
-          :maxusers => "themaxusers",
-          :maxmem => "themaxmem",
-          :maxburst => "themaxburst",
-          :maxdisk => "themaxdisk",
-          :maxbw => "themaxbw",
-          :maxipv4 => "themaxipv4",
-          :maxipv6 => "themaxipv6",
-          :nodegroups => "thenodegroups",
-          :mediagroups => "themediagroups",
-          :openvz => "theopenvz",
-          :xenpv => "thexenpv",
-          :xenhvm => "thexenhvm",
-          :kvm => "thekvm"
+          username: "theusername",
+          password: "thepassword",
+          email: "theemail",
+          firstname: "thefirstname",
+          lastname: "thelastname",
+          company: "thecompany",
+          usernameprefix: "theusernameprefix",
+          maxvps: "themaxvps",
+          maxusers: "themaxusers",
+          maxmem: "themaxmem",
+          maxburst: "themaxburst",
+          maxdisk: "themaxdisk",
+          maxbw: "themaxbw",
+          maxipv4: "themaxipv4",
+          maxipv6: "themaxipv6",
+          nodegroups: "thenodegroups",
+          mediagroups: "themediagroups",
+          openvz: "theopenvz",
+          xenpv: "thexenpv",
+          xenhvm: "thexenhvm",
+          kvm: "thekvm"
         }
 
         expected.all? { |k,v| options[k] == v }
@@ -70,25 +69,24 @@ class TestResellerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_reseller_change_resources_to_reseller
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Reseller.stubs(:new => mock do
+    Solusvm::Reseller.expects(:new).with(solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:change_resources).with() do |options|
         expected = {
-          :maxvps => "themaxvps",
-          :maxusers => "themaxusers",
-          :maxmem => "themaxmem",
-          :maxburst => "themaxburst",
-          :maxdisk => "themaxdisk",
-          :maxbw => "themaxbw",
-          :maxipv4 => "themaxipv4",
-          :maxipv6 => "themaxipv6",
-          :nodegroups => "thenodegroups",
-          :mediagroups => "themediagroups",
-          :openvz => "theopenvz",
-          :xenpv => "thexenpv",
-          :xenhvm => "thexenhvm",
-          :kvm => "thekvm"
+          maxvps: "themaxvps",
+          maxusers: "themaxusers",
+          maxmem: "themaxmem",
+          maxburst: "themaxburst",
+          maxdisk: "themaxdisk",
+          maxbw: "themaxbw",
+          maxipv4: "themaxipv4",
+          maxipv6: "themaxipv6",
+          nodegroups: "thenodegroups",
+          mediagroups: "themediagroups",
+          openvz: "theopenvz",
+          xenpv: "thexenpv",
+          xenhvm: "thexenhvm",
+          kvm: "thekvm"
         }
 
         expected.all? { |k,v| options[k] == v }
@@ -116,8 +114,7 @@ class TestResellerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_reseller_info_to_reseller
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Reseller.stubs(:new => mock do
+    Solusvm::Reseller.expects(:new).with(solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:info).with("theusername").returns("theresult")
     end)
@@ -127,8 +124,7 @@ class TestResellerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_reseller_delete_to_reseller
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Reseller.stubs(:new => mock do
+    Solusvm::Reseller.expects(:new).with(solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:delete).with("theusername").returns("theresult")
     end)
@@ -138,8 +134,7 @@ class TestResellerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_reseller_list_to_reseller
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Reseller.stubs(:new => mock do
+    Solusvm::Reseller.expects(:new).with(solusvm_params).returns(mock do
       expects(:successful?).returns(true)
      expects(:list).returns("theresult")
    end)
@@ -147,4 +142,4 @@ class TestResellerCli < Test::Unit::TestCase
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["reseller", "list"]))
   end
-end
+end

data/test/cli/test_server_cli.rb

@@ -7,11 +7,11 @@ class TestServerCli < Test::Unit::TestCase
     # Prevents mocha from stubbing non existent methods so that we now if the CLI is failing because
     # something was moved around.
     Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    @solusvm_params = { api_id: "api_id", api_key: "api_key", url: "http://www.example.com/api" }
   end
 
   def test_should_delegate_server_status_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.expects(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:status).with("thevserverid").returns("theresult")
     end)
@@ -21,8 +21,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_change_plan_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:change_plan).with("thevserverid", "thenewplan").returns("theresult")
     end)
@@ -32,8 +31,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_change_owner_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:change_owner).with("thevserverid", "thenewowner").returns("theresult")
     end)
@@ -43,8 +41,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_change_consolepass_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:change_consolepass).with("thevserverid", "thenewpass").returns("theresult")
     end)
@@ -54,8 +51,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_change_vncpass_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:change_vncpass).with("thevserverid", "thenewpass").returns("theresult")
     end)
@@ -65,8 +61,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_change_rootpass_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:change_rootpassword).with("thevserverid", "thenewpass").returns("theresult")
     end)
@@ -76,8 +71,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_change_bootorder_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:change_bootorder).with("thevserverid", "theneworder").returns("theresult")
     end)
@@ -87,8 +81,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_change_hostname_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:change_hostname).with("thevserverid", "thenewhostname").returns("theresult")
     end)
@@ -98,8 +91,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_add_ip_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:add_ip).with("thevserverid").returns("theresult")
     end)
@@ -109,8 +101,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_boot_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:boot).with("thevserverid").returns("theresult")
     end)
@@ -120,8 +111,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_reboot_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:reboot).with("thevserverid").returns("theresult")
     end)
@@ -131,8 +121,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_shutdown_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:shutdown).with("thevserverid").returns("theresult")
     end)
@@ -142,8 +131,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_suspend_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:suspend).with("thevserverid").returns("theresult")
     end)
@@ -153,8 +141,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_resume_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:resume).with("thevserverid").returns("theresult")
     end)
@@ -164,8 +151,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_check_exists_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:exists?).with("thevserverid").returns("theresult")
     end)
@@ -175,8 +161,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_terminate_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:terminate).with("thevserverid").returns("theresult")
     end)
@@ -186,10 +171,9 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_rebuild_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
-      expects(:rebuild).with("thevserverid", :template => "thetemplate").returns("theresult")
+      expects(:rebuild).with("thevserverid", template: "thetemplate").returns("theresult")
     end)
 
     $stdout.expects(:puts).with("theresult")
@@ -197,8 +181,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_tun_switcher_on_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:tun_enable).with("thevserverid").returns("theresult")
     end)
@@ -208,8 +191,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_tun_switcher_off_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:tun_disable).with("thevserverid").returns("theresult")
     end)
@@ -219,8 +201,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_network_switcher_on_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:network_enable).with("thevserverid").returns("theresult")
     end)
@@ -230,8 +211,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_network_switcher_off_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:network_disable).with("thevserverid").returns("theresult")
     end)
@@ -241,8 +221,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_pae_switcher_on_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:pae_enable).with("thevserverid").returns("theresult")
     end)
@@ -252,8 +231,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_pae_switcher_off_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:pae_disable).with("thevserverid").returns("theresult")
     end)
@@ -263,8 +241,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_info_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:info).with("thevserverid").returns("theresult")
     end)
@@ -274,8 +251,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_vnc_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:vnc).with("thevserverid").returns("theresult")
     end)
@@ -285,8 +261,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_console_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:console).with("thevserverid").returns("theresult")
     end)
@@ -296,8 +271,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_info_all_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:info_all).with("thevserverid").returns("theresult")
     end)
@@ -307,8 +281,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_mountiso_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:mountiso).with("thevserverid", "theiso").returns("theresult")
     end)
@@ -318,8 +291,7 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_unmountiso_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:unmountiso).with("thevserverid").returns("theresult")
     end)
@@ -329,13 +301,12 @@ class TestServerCli < Test::Unit::TestCase
   end
 
   def test_should_delegate_server_create_to_server
-    Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock do
+    Solusvm::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
       expects(:create).with(
         "thehostname", "thepassword",
-        :plan => "theplan", :ips => "theips", :type => "thekind",
-        :username => "theusername", :template => "thetemplate", :node => "thenode"
+        plan: "theplan", ips: "theips", type: "thekind",
+        username: "theusername", template: "thetemplate", node: "thenode"
       ).returns("theresult")
     end)
 
@@ -352,5 +323,4 @@ class TestServerCli < Test::Unit::TestCase
       "--node", "thenode"
     ]))
   end
-
-end
+end

data/test/solusvm/test_base.rb

@@ -3,8 +3,7 @@ require 'test_helper'
 class TestBase < Test::Unit::TestCase
 
   def setup
-    setup_solusvm
-    @base = Solusvm::Base.new
+    @base = Solusvm::Base.new(solusvm_params)
   end
 
   def test_valid_server_types
@@ -15,7 +14,7 @@ class TestBase < Test::Unit::TestCase
   def test_parse_response
     assert_nil @base.returned_parameters
     VCR.use_cassette "base/parse_response" do
-      @base.perform_request(:action => 'test', :vserverid => 1)
+      @base.perform_request(action: 'test', vserverid: 1)
     end
     params = @base.returned_parameters
 
@@ -34,11 +33,20 @@ class TestBase < Test::Unit::TestCase
 
   def test_successful
     VCR.use_cassette "base/successful" do
-      @base.perform_request(:action => 'testsuccess', :vserverid => 1)
+      @base.perform_request(action: 'testsuccess', vserverid: 1)
       assert @base.successful?
 
-      @base.perform_request(:action => 'testfail', :vserverid => 1)
+      @base.perform_request(action: 'testfail', vserverid: 1)
       assert_equal "error message", @base.statusmsg
+
+      @base.perform_request(action: 'testnostatus', vserverid: 1)
+      assert @base.successful?
+    end
+
+    VCR.use_cassette "base/successful_instance_config" do
+      @base = Solusvm::Base.new(api_key: "instance_key", api_id: "instance_id", url: "http://www.test.com/api" )
+      @base.perform_request(action: 'testconfig', vserverid: 1)
+      assert @base.successful?
     end
   end
 
@@ -48,7 +56,7 @@ class TestBase < Test::Unit::TestCase
 
   def test_statusmsg
     VCR.use_cassette "base/statusmsg" do
-      @base.perform_request(:action => 'testsuccess', :vserverid => 1)
+      @base.perform_request(action: 'testsuccess', vserverid: 1)
     end
     assert_equal 'Virtual server created', @base.statusmsg
   end
@@ -65,7 +73,7 @@ class TestBase < Test::Unit::TestCase
 
   def test_unautorized_ip
     VCR.use_cassette "base/unauthorized_ip" do
-      @base.perform_request(:action => 'unauthorized')
+      @base.perform_request(action: 'unauthorized')
 
       assert !@base.successful?
       assert_equal "This IP is not authorized to use the API", @base.statusmsg
@@ -74,7 +82,7 @@ class TestBase < Test::Unit::TestCase
 
   def test_invalid_key_or_id
     VCR.use_cassette "base/invalid_key" do
-      @base.perform_request(:action => 'badkey')
+      @base.perform_request(action: 'badkey')
 
       assert !@base.successful?
       assert_equal "Invalid ID or key", @base.statusmsg
@@ -83,7 +91,7 @@ class TestBase < Test::Unit::TestCase
 
   def test_node_does_not_exist
     VCR.use_cassette "base/nonexistent_node" do
-      @base.perform_request(:action => 'nodeexist')
+      @base.perform_request(action: 'nodeexist')
 
       assert !@base.successful?
       assert_equal "Node does not exist", @base.statusmsg
@@ -92,7 +100,7 @@ class TestBase < Test::Unit::TestCase
 
   def test_invalid_http_status
     VCR.use_cassette "base/invalid_status" do
-      @base.perform_request(:action => 'httperror')
+      @base.perform_request(action: 'httperror')
 
       assert !@base.successful?
       assert_equal "Bad HTTP Status: 404", @base.statusmsg