solusvm 1.0.0.beta3 → 1.1.0.beta1

data/test/test_base.rb

@@ -1,115 +0,0 @@
-require 'helper'
-
-class TestBase < Test::Unit::TestCase
-
-  def setup
-    FakeWeb.allow_net_connect = false
-    FakeWeb.clean_registry
-    setup_solusvm
-    @base = Solusvm::Base.new
-  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
-  end
-
-  def test_parse_response
-    FakeWeb.register_uri(:get, "#{base_uri}&action=test&vserverid=1", :body => load_response('server_create_success'))
-    assert_nil @base.returned_parameters
-    @base.perform_request(:action => 'test', :vserverid => 1)
-    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']
-  end
-
-  def test_successful
-    FakeWeb.register_uri(:get, "#{base_uri}&action=testsuccess&vserverid=1", :body => load_response('server_create_success'))
-    FakeWeb.register_uri(:get, "#{base_uri}&action=testfail&vserverid=1", :body => load_response('error'))
-
-    @base.perform_request(:action => 'testsuccess', :vserverid => 1)
-    assert @base.successful?
-
-    assert ! @base.perform_request(:action => 'testfail', :vserverid => 1)
-    assert_equal "error message", @base.statusmsg
-  end
-
-  def test_api_login
-    assert_equal api_login, @base.api_login
-  end
-
-  def test_statusmsg
-    FakeWeb.register_uri(:get, "#{base_uri}&action=testsuccess&vserverid=1", :body => load_response('server_create_success'))
-    @base.perform_request(:action => 'testsuccess', :vserverid => 1)
-    assert_equal 'Virtual server created', @base.statusmsg
-  end
-
-  def test_validate_server_type
-    Solusvm::Base::VALID_SERVER_TYPES.each do |type|
-      assert_nothing_raised do
-        @base.validate_server_type!(type)
-      end
-    end
-
-    begin
-      @base.validate_server_type!('bob')
-      flunk "Shouldn't get here"
-    rescue Solusvm::SolusvmError => e
-      assert_equal 'Invalid Virtual Server type: bob', e.message
-    end
-  end
-
-  def test_unautorized_ip
-    FakeWeb.register_uri(:get, "#{base_uri}&action=unauthorized", :body => load_response('base_unauthorized_ip'))
-    message = ""
-    begin
-      @base.perform_request(:action => 'unauthorized')
-    rescue Exception => e
-      message = e
-    end
-    assert_equal "This IP is not authorized to use the API", message.to_s
-  end
-
-  def test_invalid_key_or_id
-    FakeWeb.register_uri(:get, "#{base_uri}&action=badkey", :body => load_response('base_bad_key'))
-    message = ""
-    begin
-      @base.perform_request(:action => 'badkey')
-    rescue Exception => e
-      message = e
-    end
-    assert_equal "Invalid ID or key", message.to_s
-  end
-
-  def test_node_does_not_exist
-    FakeWeb.register_uri(:get, "#{base_uri}&action=nodeexist", :body => load_response('base_node_does_not_exist'))
-    message = ""
-    begin
-      @base.perform_request(:action => 'nodeexist')
-    rescue Exception => e
-      message = e
-    end
-    assert_equal "Node does not exist", message.to_s
-  end
-
-  def test_invalid_http_status
-    FakeWeb.register_uri(:get, "#{base_uri}&action=httperror", :body => "", :status => ["404", "Not Found"])
-    message = ""
-    begin
-      @base.perform_request(:action => 'httperror')
-    rescue Solusvm::SolusvmError => e
-      message = e
-    end
-    assert_equal "Bad HTTP Status: 404", message.to_s
-  end
-end

data/test/test_client.rb

@@ -1,98 +0,0 @@
-require 'helper'
-
-class TestClient < Test::Unit::TestCase
-
-  def setup
-    setup_solusvm
-    FakeWeb.allow_net_connect = false
-    FakeWeb.clean_registry
-    @client = Solusvm::Client.new
-  end
-
-  def test_create
-    options = {:username => 'vps123', :password=> '123456', :email=> 'email@address.com', :firstname => 'phill', :lastname => 'smith'}
-    FakeWeb.register_uri(:get, "#{base_uri}&action=client-create&#{options.to_query}", :body => load_response('client_create_success'))
-
-    params = @client.create(options)
-    assert params
-    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']
-  end
-
-  def test_create_fail
-    FakeWeb.register_uri(:get, "#{base_uri}&action=client-create", :body => load_response('client_create_error'))
-    assert ! @client.create
-    assert_equal 'Empty username field', @client.statusmsg
-  end
-  
-  def test_exists
-    FakeWeb.register_uri(:get, "#{base_uri}&action=client-checkexists&username=vps123", :body => load_response('client_exists_success'))
-    assert @client.exists?("vps123")
-    assert_equal 'Client exists', @client.statusmsg    
-  end
-  
-  def test_change_password
-    FakeWeb.register_uri(:get, "#{base_uri}&action=client-updatepassword&username=vps123&password=123456", :body => load_response('client_change_password_success'))    
-    assert @client.change_password("vps123","123456")
-  end
-
-  def test_change_password_fail
-    FakeWeb.register_uri(:get, "#{base_uri}&action=client-updatepassword&username=vps13&password=thecake", :body => load_response('client_change_password_error'))
-    assert !@client.change_password("vps13","thecake")
-  end
-
-  def test_authenticate
-    FakeWeb.register_uri(:get, "#{base_uri}&action=client-authenticate&username=u&password=p", :body => load_response('client_authenticate_success'))
-    assert @client.authenticate('u', 'p')
-  end
-
-  def test_authenticate_fail
-    FakeWeb.register_uri(:get, "#{base_uri}&action=client-authenticate&username=u&password=notp", :body => load_response('client_authenticate_error'))
-    assert ! @client.authenticate('u', 'notp')
-    assert_equal 'invalid username or password', @client.statusmsg
-  end
-
-  def test_delete
-    FakeWeb.register_uri(:get, "#{base_uri}&action=client-delete&username=vps123", :body => load_response('client_delete_success'))
-    assert @client.delete("vps123")
-  end
-
-  def test_delete_fail
-    FakeWeb.register_uri(:get, "#{base_uri}&action=client-delete&username=vps123", :body => load_response('error'))
-    assert !@client.delete("vps123")
-  end
-
-  def test_list
-    FakeWeb.register_uri(:get, "#{base_uri}&action=client-list", :body => load_response('client_list_success'))
-
-    clients = @client.list
-    assert_equal 1, clients.size
-
-    client = clients.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"]
-  end
-
-  def test_list_empty
-    FakeWeb.register_uri(:get, "#{base_uri}&action=client-list", :body => load_response('client_list_success_empty'))
-    assert @client.list.empty?
-  end
-
-  def test_list_fail
-    FakeWeb.register_uri(:get, "#{base_uri}&action=client-list", :body => load_response('error'))
-    assert_nil @client.list
-  end
-end

data/test/test_general.rb

@@ -1,70 +0,0 @@
-require 'helper'
-
-class TestGeneral < Test::Unit::TestCase
-  def setup
-    FakeWeb.allow_net_connect = false
-    FakeWeb.clean_registry
-    setup_solusvm
-    @general = Solusvm::General.new
-  end
-
-  def test_templates
-    FakeWeb.register_uri(:get, "#{base_uri}&action=listtemplates&type=xen", :body => load_response('general_templates_success'))
-    assert_equal %w(template1 template2 template3), @general.templates('xen')
-  end
-
-  def test_templates_empty
-    FakeWeb.register_uri(:get, "#{base_uri}&action=listtemplates&type=xen", :body => load_response('error'))
-    assert !@general.templates('xen')
-  end
-
-  def test_templates_with_invalid_type
-    FakeWeb.register_uri(:get, "#{base_uri}&action=listtemplates&type=whatever", :body => load_response('error'))
-    begin
-      @general.templates('whatever')
-      flunk "Shouldn't get here"
-    rescue Solusvm::SolusvmError => e
-      assert e.message.match /Invalid Virtual Server type/
-    end
-  end
-
-  def test_plans
-    FakeWeb.register_uri(:get, "#{base_uri}&action=listplans&type=xen", :body => load_response('general_plans_success'))
-    assert_equal %w(plan1 plan2 plan3 plan4), @general.plans('xen')
-  end
-
-  def test_plans_empty
-    FakeWeb.register_uri(:get, "#{base_uri}&action=listplans&type=xen", :body => load_response('error'))
-    assert !@general.plans('xen')
-  end
-
-  def test_plans_with_invalid_type
-    FakeWeb.register_uri(:get, "#{base_uri}&action=listplans&type=whatever", :body => load_response('error'))
-    begin
-      @general.plans('whatever')
-      flunk "Shouldn't get here"
-    rescue Solusvm::SolusvmError => e
-      assert e.message.match /Invalid Virtual Server type/
-    end
-  end
-
-  def test_isos
-    FakeWeb.register_uri(:get, "#{base_uri}&action=listiso&type=xen", :body => load_response('general_isos_success'))
-    assert_equal %w(iso1 iso2 iso3), @general.isos('xen')
-  end
-
-  def test_isos_empty
-    FakeWeb.register_uri(:get, "#{base_uri}&action=listiso&type=xen", :body => load_response('error'))
-    assert !@general.isos('xen')
-  end
-
-  def test_isos_with_invalid_type
-    FakeWeb.register_uri(:get, "#{base_uri}&action=listiso&type=whatever", :body => load_response('error'))
-    begin
-      @general.isos('whatever')
-      flunk "Shouldn't get here"
-    rescue Solusvm::SolusvmError => e
-      assert e.message.match /Invalid Virtual Server type/
-    end
-  end
-end

data/test/test_node.rb

@@ -1,112 +0,0 @@
-require 'helper'
-
-class TestNode < Test::Unit::TestCase
-  def setup
-    FakeWeb.allow_net_connect = false
-    FakeWeb.clean_registry
-    setup_solusvm
-    @nodes = Solusvm::Node.new
-  end
-
-  def test_list
-    FakeWeb.register_uri(:get, "#{base_uri}&action=listnodes&type=xen", :body => load_response('nodes_list_success'))
-    assert_equal %w(node1 node2 node3 node4), @nodes.list('xen')
-  end
-
-  def test_list_empty
-    FakeWeb.register_uri(:get, "#{base_uri}&action=listnodes&type=xen", :body => load_response('error'))
-    assert !@nodes.list('xen')
-  end
-
-  def test_nodes_with_invalid_type
-    FakeWeb.register_uri(:get, "#{base_uri}&action=listnodes&type=whatever", :body => load_response('error'))
-    begin
-      @nodes.list('whatever')
-      flunk "Shouldn't get here"
-    rescue Solusvm::SolusvmError => e
-      assert e.message.match /Invalid Virtual Server type/
-    end
-  end
-
-  def test_statistics
-    FakeWeb.register_uri(:get, "#{base_uri}&action=node-statistics&nodeid=1", :body => load_response('node_statistics_success'))
-    node_statistics = @nodes.statistics(1)
-    
-    assert_equal '1000', node_statistics['freedisk']
-    assert_equal '22', node_statistics['sshport']
-    assert_equal 'city', node_statistics['city']
-    assert_equal 'name', node_statistics['name']
-    assert_equal '0', node_statistics['freeips']
-    assert_equal 'country', node_statistics['country']
-    assert_equal 'x86_64', node_statistics['arch']
-    assert_equal '1', node_statistics['id']
-    assert_equal '10', node_statistics['freememory']
-    assert_equal '2', node_statistics['virtualservers']
-    assert_equal '127.0.0.1', node_statistics['ip']
-    assert_equal 'hostname.com', node_statistics['hostname']
-    assert_equal 'success', node_statistics['status']
-  end
-
-  def test_list_all_ips_available
-    FakeWeb.register_uri(:get, "#{base_uri}&action=node-iplist&nodeid=1", :body => load_response('node_list_all_ips_available'))
-    assert_equal %w(123.123.123.123 124.124.124.124 125.125.125.125).sort, @nodes.available_ips(1).sort 
-  end
-
-  def test_list_all_ips_not_available
-    FakeWeb.register_uri(:get, "#{base_uri}&action=node-iplist&nodeid=1", :body => load_response('node_list_all_ips_not_available'))
-    assert @nodes.available_ips(1).empty?
-  end
-
-  def test_ids
-    FakeWeb.register_uri(:get, "#{base_uri}&action=node-idlist&type=xen", :body => load_response('nodes_ids_success'))
-    assert_equal %w(nodeid1 nodeid2 nodeid3 nodeid4), @nodes.ids('xen')
-  end
-
-  def test_nodes_ids_error
-    FakeWeb.register_uri(:get, "#{base_uri}&action=node-idlist&type=whatever", :body => load_response('error'))
-    begin
-      @nodes.ids('whatever')
-      flunk "Shouldn't get here"
-    rescue Solusvm::SolusvmError => e
-      assert e.message.match /Invalid Virtual Server type/
-    end
-  end
-
-  def test_virtualservers
-    FakeWeb.register_uri(:get, "#{base_uri}&action=node-virtualservers&nodeid=1", :body => load_response('node_virtualservers_success'))
-
-    servers = @nodes.virtualservers(1)
-    assert_equal 1, servers.size
-
-    server = servers.first
-    assert_equal "theid", server["vserverid"]
-    assert_equal "thexid", server["ctid-xid"]
-    assert_equal "theclientid", server["clientid"]
-    assert_equal "theip", server["ipaddress"]
-    assert_equal "thehostname", server["hostname"]
-    assert_equal "thetemplate", server["template"]
-    assert_equal "thediskspace", server["hdd"]
-    assert_equal "thememory", server["memory"]
-    assert_equal "theswap", server["swap-burst"]
-    assert_equal "thetype", server["type"]
-    assert_equal "themac", server["mac"]
-  end
-
-  def test_virtualservers_empty
-    FakeWeb.register_uri(:get, "#{base_uri}&action=node-virtualservers&nodeid=1", :body => load_response('node_virtualservers_success_empty'))
-    assert @nodes.virtualservers(1).empty?
-  end
-
-  def test_virtualservers_fail
-    FakeWeb.register_uri(:get, "#{base_uri}&action=node-virtualservers&nodeid=1", :body => load_response('error'))
-    assert_nil @nodes.virtualservers(1)
-  end
-
-  def test_xenresources
-    FakeWeb.register_uri(:get, "#{base_uri}&action=node-xenresources&nodeid=1", :body => load_response('node_xenresources_success'))
-    node_resources = @nodes.xenresources(1)
-    
-    assert_equal 'thefreememory', node_resources['freememory']
-    assert_equal 'thefreehdd', node_resources['freehdd']
-  end
-end

data/test/test_reseller.rb

@@ -1,80 +0,0 @@
-require 'helper'
-
-class TestReseller < Test::Unit::TestCase
-
-  def setup
-    setup_solusvm
-    FakeWeb.allow_net_connect = false
-    FakeWeb.clean_registry
-    @reseller = Solusvm::Reseller.new
-  end
-
-  def test_create
-    options = {:username => 'reseller123', :password=> '123456', :email=> 'reseller3@email.com', :firstname => 'Phill', :lastname => 'Smith'}
-    FakeWeb.register_uri(:get, "#{base_uri}&action=reseller-create&#{options.to_query}", :body => load_response('reseller_create_success'))
-
-    params = @reseller.create(options) 
-
-    assert params
-    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']
-  end
-
-  def test_create_fail
-    FakeWeb.register_uri(:get, "#{base_uri}&action=reseller-create", :body => load_response('error'))
-    assert ! @reseller.create
-    assert_equal 'error message', @reseller.statusmsg
-  end
-
-  def test_change_resources
-    options = {:maxvps => 10}
-    FakeWeb.register_uri(:get, "#{base_uri}&action=reseller-modifyresources&username=vps123&#{options.to_query}", :body => load_response('reseller_change_resources_success'))    
-    
-    params = @reseller.change_resources("vps123", options)
-    
-    assert params
-    assert "10", params['maxvps']
-  end
-
-  def test_change_resources_fail
-    FakeWeb.register_uri(:get, "#{base_uri}&action=reseller-modifyresources&username=vps13", :body => load_response('error'))
-    assert !@reseller.change_resources("vps13")
-  end
-
-  def test_info
-    FakeWeb.register_uri(:get, "#{base_uri}&action=reseller-info&username=vps123", :body => load_response('reseller_info_success'))    
-    
-    params = @reseller.info("vps123")
-    
-    assert params
-    assert_equal "reseller123", params['username']
-    assert_equal "Phill", params['firstname']
-    assert_equal "Smith", params['lastname']
-    assert_equal "123456", params['password']
-    assert_equal "reseller3@email.com", params['email']
-  end
-
-  def test_info_fail
-    FakeWeb.register_uri(:get, "#{base_uri}&action=reseller-info&username=vps13", :body => load_response('error'))
-    assert !@reseller.info("vps13")
-  end
-
-  def test_list
-    FakeWeb.register_uri(:get, "#{base_uri}&action=reseller-list", :body => load_response('reseller_list_success'))
-    assert_equal %w(username1 username2 username3), @reseller.list
-  end
-
-  def test_list_empty
-    FakeWeb.register_uri(:get, "#{base_uri}&action=reseller-list", :body => load_response('error'))
-    assert !@reseller.list
-  end
-
-  def test_delete
-    FakeWeb.register_uri(:get, "#{base_uri}&action=reseller-delete&username=vps123", :body => load_response('reseller_delete_success'))    
-    assert @reseller.delete("vps123")
-  end
-
-end