solusvm 1.4.0 → 2.0.0.beta1

data/test/sham_rack_stubs/server/mountiso.json

@@ -0,0 +1,4 @@
+{
+  "status": "success",
+  "statusmsg": "ISO mounted"
+}

data/test/sham_rack_stubs/server/network-disable.json

@@ -0,0 +1,4 @@
+{
+  "status": "success",
+  "statusmsg": "Virtual server network disabled"
+}

data/test/sham_rack_stubs/server/network-enable.json

@@ -0,0 +1,4 @@
+{
+  "status": "success",
+  "statusmsg": "Virtual server network enabled"
+}

data/test/sham_rack_stubs/server/pae-disable.json

@@ -0,0 +1,4 @@
+{
+  "status": "success",
+  "statusmsg": "Disabled"
+}

data/test/sham_rack_stubs/server/pae-enable.json

@@ -0,0 +1,4 @@
+{
+  "status": "success",
+  "statusmsg": "Enabled"
+}

data/test/sham_rack_stubs/server/reboot.json

@@ -0,0 +1,4 @@
+{
+  "status": "success",
+  "statusmsg": "Virtual server rebooted"
+}

data/test/sham_rack_stubs/server/rebuild.json

@@ -0,0 +1,4 @@
+{
+  "status": "success",
+  "statusmsg": "Virtual server is being rebuilt"
+}

data/test/sham_rack_stubs/server/resume.json

@@ -0,0 +1,4 @@
+{
+  "status": "success",
+  "statusmsg": "Virtual server unsuspended"
+}

data/test/sham_rack_stubs/server/shutdown.json

@@ -0,0 +1,4 @@
+{
+  "status": "success",
+  "statusmsg": "Virtual server shutdown"
+}

data/test/sham_rack_stubs/server/status.json

@@ -0,0 +1,4 @@
+{
+  "status": "success",
+  "statusmsg": "online"
+}

data/test/sham_rack_stubs/server/suspend.json

@@ -0,0 +1,4 @@
+{
+  "status": "success",
+  "statusmsg": "Virtual server suspended"
+}

data/test/sham_rack_stubs/server/terminate.json

@@ -0,0 +1,4 @@
+{
+  "status": "success",
+  "statusmsg": "Virtual server terminated"
+}

data/test/sham_rack_stubs/server/tun-disable.json

@@ -0,0 +1,4 @@
+{
+  "status": "success",
+  "statusmsg": "Disabled"
+}

data/test/sham_rack_stubs/server/tun-enable.json

@@ -0,0 +1,4 @@
+{
+  "status": "success",
+  "statusmsg": "Enabled"
+}

data/test/sham_rack_stubs/server/unmountiso.json

@@ -0,0 +1,4 @@
+{
+  "status": "success",
+  "statusmsg": "ISO unmounted"
+}

data/test/sham_rack_stubs/server/vnc.json

@@ -0,0 +1,8 @@
+{
+  "status": "success",
+  "statusmsg": "",
+  "type": "kvm|hvm",
+  "vncip": "ip of hos",
+  "vncport": "vncport",
+  "vncpassword": "vnc password"
+}

data/test/solusvm/test_base.rb

@@ -1,53 +1,37 @@
 require 'test_helper'
 
 class TestBase < Test::Unit::TestCase
-
   def setup
-    @base = Solusvm::Base.new(solusvm_params)
+    @base = SolusVM::Base.new(solusvm_params)
   end
 
   def test_valid_server_types
-    assert_equal 3, Solusvm::Base::VALID_SERVER_TYPES.size
-    assert_equal ['openvz', 'xen', 'xen hvm'].sort, Solusvm::Base::VALID_SERVER_TYPES.sort
+    assert_equal 3, SolusVM::Base::VALID_SERVER_TYPES.size
+    assert_equal ['openvz', 'xen', 'xen hvm'].sort, SolusVM::Base::VALID_SERVER_TYPES.sort
   end
 
   def test_parse_response
     assert_nil @base.returned_parameters
-    VCR.use_cassette "base/parse_response" do
-      @base.perform_request(action: 'test', vserverid: 1)
-    end
-    params = @base.returned_parameters
-
-    assert_equal 10, params.size
-    assert_equal '123.123.123.123', params['mainipaddress']
-    assert_equal 'console-123', params['consoleuser']
-    assert_equal '100', params['vserverid']
-    assert_equal 'Virtual server created', params['statusmsg']
-    assert_equal 'vm101|101', params['virtid']
-    assert_equal '123456', params['consolepassword']
-    assert_equal '122.122.122.122,111.111.111.111', params['extraipaddress']
-    assert_equal 'server.hostname.com', params['hostname']
-    assert_equal '123456', params['rootpassword']
-    assert_equal 'success', params['status']
+
+    stub_response 'base/parse-response'
+
+    assert @base.perform_request(action: 'test', vserverid: 1)
+
+    res = @base.returned_parameters
+    assert res.is_a? Hash
+    assert_not_empty res
   end
 
   def test_successful
-    VCR.use_cassette "base/successful" do
-      @base.perform_request(action: 'testsuccess', vserverid: 1)
-      assert @base.successful?
+    stub_response 'base/parse-response'
 
-      @base.perform_request(action: 'testfail', vserverid: 1)
-      assert_equal "error message", @base.statusmsg
+    @base.perform_request(action: 'testsuccess', vserverid: 1)
+    assert @base.successful?
 
-      @base.perform_request(action: 'testnostatus', vserverid: 1)
-      assert @base.successful?
-    end
+    stub_response 'generic/error'
 
-    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
+    @base.perform_request(action: 'testsuccess', vserverid: 1)
+    assert !@base.successful?
   end
 
   def test_api_login
@@ -55,14 +39,14 @@ class TestBase < Test::Unit::TestCase
   end
 
   def test_statusmsg
-    VCR.use_cassette "base/statusmsg" do
-      @base.perform_request(action: 'testsuccess', vserverid: 1)
-    end
-    assert_equal 'Virtual server created', @base.statusmsg
+    stub_response 'base/parse-response'
+
+    assert @base.perform_request(action: 'testsuccess')
+    assert_equal 'The status message', @base.statusmsg
   end
 
   def test_validate_server_type
-    Solusvm::Base::VALID_SERVER_TYPES.each do |type|
+    SolusVM::Base::VALID_SERVER_TYPES.each do |type|
       assert @base.validate_server_type(type) { true }
     end
 
@@ -72,38 +56,32 @@ class TestBase < Test::Unit::TestCase
   end
 
   def test_unautorized_ip
-    VCR.use_cassette "base/unauthorized_ip" do
-      @base.perform_request(action: 'unauthorized')
+    setup_sham_rack { "Invalid ipaddress" }
 
-      assert !@base.successful?
-      assert_equal "This IP is not authorized to use the API", @base.statusmsg
+    assert_raise SolusVM::AuthenticationError do
+      assert !@base.perform_request(action: 'unauthorized')
     end
   end
 
   def test_invalid_key_or_id
-    VCR.use_cassette "base/invalid_key" do
-      @base.perform_request(action: 'badkey')
+    setup_sham_rack { "Invalid id or key" }
 
-      assert !@base.successful?
-      assert_equal "Invalid ID or key", @base.statusmsg
+    assert_raise SolusVM::AuthenticationError do
+      assert !@base.perform_request(action: 'badkey')
     end
   end
 
   def test_node_does_not_exist
-    VCR.use_cassette "base/nonexistent_node" do
-      @base.perform_request(action: 'nodeexist')
+    setup_sham_rack { "Node not found" }
 
-      assert !@base.successful?
-      assert_equal "Node does not exist", @base.statusmsg
-    end
+    assert !@base.perform_request(action: 'nodeexist')
+    assert_equal "Node does not exist", @base.statusmsg
   end
 
   def test_invalid_http_status
-    VCR.use_cassette "base/invalid_status" do
-      @base.perform_request(action: 'httperror')
+    setup_sham_rack { status 404 }
 
-      assert !@base.successful?
-      assert_equal "Bad HTTP Status: 404", @base.statusmsg
-    end
+    assert !@base.perform_request(action: 'httperror')
+    assert_equal "Bad HTTP Status: 404", @base.statusmsg
   end
 end

data/test/solusvm/test_cli.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'solusvm/cli'
 
-class TestCli < Test::Unit::TestCase
+class TestCLI < Test::Unit::TestCase
 
   def setup
     # Prevents mocha from stubbing non existent methods so that we now if the CLI is failing because
@@ -10,8 +10,8 @@ class TestCli < Test::Unit::TestCase
   end
 
   def test_should_print_version
-    $stdout.expects(:puts).with(Solusvm::VERSION)
-    Solusvm::Cli.start %W(version)
+    $stdout.expects(:puts).with(SolusVM::VERSION)
+    SolusVM::CLI.start %W(version)
   end
 
 end

data/test/solusvm/test_client.rb

@@ -1,108 +1,98 @@
 require 'test_helper'
 
 class TestClient < Test::Unit::TestCase
-
   def setup
-    @client = Solusvm::Client.new(solusvm_params)
+    @client = SolusVM::Client.new(solusvm_params)
   end
 
   def test_create
-    options = {username: 'vps123', password: '123456', email: 'email@address.com', firstname: 'phill', lastname: 'smith'}
-    VCR.use_cassette "client/create" do
-      @client.create(options)
-    end
-    params = @client.returned_parameters
-    assert_equal options[:username], params['username']
-    assert_equal options[:firstname], params['firstname']
-    assert_equal options[:lastname], params['lastname']
-    assert_equal options[:password], params['password']
-    assert_equal options[:email], params['email']
-    assert_equal 'Successfully added client', params['statusmsg']
-    assert_equal 'success', params['status']
+    stub_response 'client/create'
+
+    options = {
+      username:  'vps123',
+      password:  '123456',
+      email:     'email@address.com',
+      firstname: 'phill',
+      lastname:  'smith'
+    }
+
+    assert @client.create(options).is_a? Hash
+    assert @client.successful?
   end
 
   def test_create_fail
-    VCR.use_cassette "client/create" do
-      assert ! @client.create
-    end
-    assert_equal 'Empty username field', @client.statusmsg
+    stub_response 'generic/error'
+
+    assert !@client.create
   end
 
   def test_exists
-    VCR.use_cassette "client/exists" do
-      assert @client.exists?("vps123")
-    end
-    assert_equal 'Client exists', @client.statusmsg
+    stub_response 'client/exists'
+
+    assert @client.exists?("vps123")
+    assert @client.successful?
   end
 
   def test_change_password
-    VCR.use_cassette "client/change_password" do
-      assert @client.change_password("vps123","123456")
-    end
+    stub_response 'client/change-password'
+
+    assert @client.change_password("vps123","123456")
+    assert @client.successful?
   end
 
   def test_change_password_fail
-    VCR.use_cassette "client/change_password" do
-      assert ! @client.change_password("vps13","thecake")
-    end
+    stub_response 'generic/error'
+
+    assert !@client.change_password("vps13","thecake")
   end
 
   def test_authenticate
-    VCR.use_cassette "client/authenticate" do
-      assert @client.authenticate('u', 'p')
-    end
+    stub_response 'client/authenticate'
+
+    assert @client.authenticate('u', 'p')
+    assert @client.successful?
   end
 
   def test_authenticate_fail
-    VCR.use_cassette "client/authenticate" do
-      assert ! @client.authenticate('u', 'notp')
-    end
-    assert_equal 'invalid username or password', @client.statusmsg
+    stub_response 'generic/error'
+
+    assert !@client.authenticate('u', 'notp')
   end
 
   def test_delete
-    VCR.use_cassette "client/delete" do
-      assert @client.delete("vps123")
-    end
+    stub_response 'client/delete'
+
+    assert @client.delete("vps123")
+    assert @client.successful?
   end
 
   def test_delete_fail
-    VCR.use_cassette "client/delete" do
-      assert !@client.delete("novps")
-    end
+    stub_response 'generic/error'
+
+    assert !@client.delete("novps")
   end
 
   def test_list
-    @client = Solusvm::Client.new(api_id: "api_id1", api_key: api_login[:key], url: 'http://www.example.com/api')
-    VCR.use_cassette "client/list" do
-      @client.list
-    end
-
-    client = @client.returned_parameters["clients"]["client"].first
-
-    assert_equal "1", client["id"]
-    assert_equal "vps123", client["username"]
-    assert_equal "vps123@email.com", client["email"]
-    assert_equal "phill", client["firstname"]
-    assert_equal "smith", client["lastname"]
-    assert_equal "VPS Co", client["company"]
-    assert_equal "Client", client["level"]
-    assert_equal "Active", client["status"]
-    assert_equal "2009-01-01", client["created"]
-    assert_equal "2010-04-23", client["lastlogin"]
+    stub_response 'client/list'
+
+    list = @client.list
+
+    assert list.is_a? Array
+    assert_not_empty list
   end
 
   def test_list_empty
-    @client = Solusvm::Client.new(api_id: "api_id2", api_key: api_login[:key], url: 'http://www.example.com/api')
-    VCR.use_cassette "client/list" do
-      assert @client.list.empty?
-    end
+    stub_response 'client/list-empty'
+
+    list = @client.list
+
+    assert list.is_a? Array
+    assert_empty @client.list
   end
 
   def test_list_fail
-    @client = Solusvm::Client.new(api_id: "api_id3", api_key: api_login[:key], url: 'http://www.example.com/api')
-    VCR.use_cassette "client/list" do
-      assert_nil @client.list
-    end
+    stub_response 'generic/error'
+
+    assert_nil @client.list
   end
 end

data/test/solusvm/test_general.rb

@@ -2,20 +2,25 @@ require 'test_helper'
 
 class TestGeneral < Test::Unit::TestCase
   def setup
-    @general = Solusvm::General.new(solusvm_params)
+    @general = SolusVM::General.new(solusvm_params)
   end
 
   def test_templates
-    VCR.use_cassette "general/templates" do
-      assert_equal %w(template1 template2 template3), @general.templates('xen')
-    end
+    stub_response 'general/templates'
+
+    list = @general.templates('xen')
+
+    assert list.is_a? Array
+    assert_not_empty list
+    assert @general.successful?
   end
 
   # TODO: Refactor so that the lib is not validating server types
   def test_templates_empty
-    VCR.use_cassette "general/templates" do
-      assert !@general.templates('openvz')
-    end
+    stub_response 'general/templates-empty'
+
+    assert !@general.templates('xen')
+    assert @general.successful?
   end
 
   def test_templates_with_invalid_type
@@ -23,15 +28,20 @@ class TestGeneral < Test::Unit::TestCase
   end
 
   def test_plans
-    VCR.use_cassette "general/plans" do
-      assert_equal %w(plan1 plan2 plan3 plan4), @general.plans('xen')
-    end
+    stub_response 'general/plans'
+
+    list = @general.plans('xen')
+
+    assert list.is_a? Array
+    assert_not_empty list
+    assert @general.successful?
   end
 
   def test_plans_empty
-    VCR.use_cassette "general/plans" do
-      assert !@general.plans('openvz')
-    end
+    stub_response 'general/plans-empty'
+
+    assert !@general.plans('xen')
+    assert @general.successful?
   end
 
   def test_plans_with_invalid_type
@@ -39,15 +49,20 @@ class TestGeneral < Test::Unit::TestCase
   end
 
   def test_isos
-    VCR.use_cassette "general/isos" do
-      assert_equal %w(iso1 iso2 iso3), @general.isos('xen')
-    end
+    stub_response 'general/isos'
+
+    list = @general.isos('xen')
+
+    assert list.is_a? Array
+    assert_not_empty list
+    assert @general.successful?
   end
 
   def test_isos_empty
-    VCR.use_cassette "general/isos" do
-      assert !@general.isos('openvz')
-    end
+    stub_response 'general/isos-empty'
+
+    assert !@general.isos('xen')
+    assert @general.successful?
   end
 
   def test_isos_with_invalid_type