solusvm 0.10.1 → 1.0.0.beta

data/test/fixtures/reseller_change_resources_success.txt

@@ -0,0 +1,16 @@
+<status>success</status>
+<statusmsg>Successfully modified reseller resources</statusmsg>
+<maxvps>10</maxvps>
+<maxdisk>21474836480</maxdisk>
+<maxmem>10737418240</maxmem>
+<maxusers>20</maxusers>
+<maxipv4>4</maxipv4>
+<maxipv6>6</maxipv6>
+<maxburst>10738466816</maxburst>
+<maxbw>107374182400</maxbw>
+<nodegroupids>14,11,9</nodegroupids>
+<mediagroupids>14,11,9</mediagroupids>
+<xenpv>1</xenpv>
+<xenhvm>1</xenhvm>
+<kvm>1</kvm>
+<openvz>1</openvz> 

data/test/fixtures/reseller_create_success.txt

@@ -0,0 +1,23 @@
+<status>success</status>
+<statusmsg>Successfully added reseller</statusmsg>
+<username>reseller123</username>
+<password>123456</password>
+<email>reseller3@email.com</email>
+<firstname>Phill</firstname>
+<lastname>Smith</lastname>
+<company>FastServers</company>
+<usernameprefix>vpsuser</usernameprefix>
+<maxvps>10</maxvps>
+<maxdisk>21474836480</maxdisk>
+<maxmem>10737418240</maxmem>
+<maxusers>20</maxusers>
+<maxipv4>4</maxipv4>
+<maxipv6>6</maxipv6>
+<maxburst>10738466816</maxburst>
+<maxbw>107374182400</maxbw>
+<nodegroupids>14,11,9</nodegroupids>
+<mediagroupids>14,11,9</mediagroupids>
+<xenpv>1</xenpv>
+<xenhvm>1</xenhvm>
+<kvm>1</kvm>
+<openvz>1</openvz>          

data/test/fixtures/reseller_delete_success.txt

@@ -0,0 +1,2 @@
+<status>success</status>
+<statusmsg>Reseller deleted</statusmsg>

data/test/fixtures/reseller_info_success.txt

@@ -0,0 +1,23 @@
+<status>success</status>
+<statusmsg>Successfully added reseller</statusmsg>
+<username>reseller123</username>
+<password>123456</password>
+<email>reseller3@email.com</email>
+<firstname>Phill</firstname>
+<lastname>Smith</lastname>
+<company>FastServers</company>
+<usernameprefix>vpsuser</usernameprefix>
+<maxvps>10</maxvps>
+<maxdisk>21474836480</maxdisk>
+<maxmem>10737418240</maxmem>
+<maxusers>20</maxusers>
+<maxipv4>4</maxipv4>
+<maxipv6>6</maxipv6>
+<maxburst>10738466816</maxburst>
+<maxbw>107374182400</maxbw>
+<nodegroupids>14,11,9</nodegroupids>
+<mediagroupids>14,11,9</mediagroupids>
+<xenpv>1</xenpv>
+<xenhvm>1</xenhvm>
+<kvm>1</kvm>
+<openvz>1</openvz>  

data/test/fixtures/reseller_list_success.txt

@@ -0,0 +1,3 @@
+<status>success</status>
+<statusmsg></statusmsg>
+<usernames>username1,username2,username3</usernames>

data/test/fixtures/server_bootorder_success.txt

@@ -0,0 +1,2 @@
+<status>success</status>
+<statusmsg>Boot order changed</statusmsg>

data/test/fixtures/server_change_consolepass_success.txt

@@ -0,0 +1,3 @@
+<status>success</status>
+<statusmsg>Virtual server console password changed</statusmsg> 
+<consolepassword></consolepassword> 

data/test/fixtures/server_change_owner_success.txt

@@ -0,0 +1,2 @@
+<status>success</status>
+<statusmsg>Successfully changed owner</statusmsg>

data/test/fixtures/server_change_vncpass_success.txt

@@ -0,0 +1,3 @@
+<status>success</status>
+<statusmsg>Virtual server vnc password changed</statusmsg> 
+<vncpassword></vncpassword>

data/test/fixtures/server_console_success.txt

@@ -0,0 +1,7 @@
+<status>success</status>
+<statusmsg></statusmsg> 
+<type>thetype</type>
+<consoleip>theconsoleip</consoleip>
+<consoleport>theconsoleport</consoleport>
+<consolepassword>theconsolepassword</consolepassword>
+<consoleusername>theconsoleusername</consoleusername>

data/test/fixtures/server_hostname_success.txt

@@ -0,0 +1,3 @@
+<status>success</status>
+<statusmsg>Virtual server hostname changed</statusmsg>
+<hostname>hostname</hostname>

data/test/fixtures/server_mountiso_success.txt

@@ -0,0 +1,2 @@
+<status>success</status>
+<statusmsg>ISO mounted</statusmsg>

data/test/fixtures/server_network_disable_success.txt

@@ -0,0 +1,2 @@
+<status>success</status>
+<statusmsg>Virtual server network disabled</statusmsg>

data/test/fixtures/server_network_enable_success.txt

@@ -0,0 +1,2 @@
+<status>success</status>
+<statusmsg>Virtual server network enabled</statusmsg>                       

data/test/fixtures/server_pae_success.txt

@@ -0,0 +1,2 @@
+<status>success</status>
+<statusmsg>Enabled|Disabled</statusmsg>

data/test/fixtures/server_rootpassword_success.txt

@@ -0,0 +1,3 @@
+<status>success</status>
+<statusmsg>Virtual server root password changed</statusmsg>
+<rootpassword>rootpassword</rootpassword>

data/test/fixtures/server_status_success.txt

@@ -0,0 +1,2 @@
+<status>success</status>
+<statusmsg>online</statusmsg>

data/test/fixtures/server_tun_disable_success.txt

@@ -0,0 +1,2 @@
+<status>success</status>
+<statusmsg>Disabled</statusmsg>

data/test/fixtures/server_tun_enable_success.txt

@@ -0,0 +1,2 @@
+<status>success</status>
+<statusmsg>Enabled</statusmsg>

data/test/fixtures/server_unmountiso_success.txt

@@ -0,0 +1,2 @@
+<status>success</status>
+<statusmsg>ISO unmounted</statusmsg>

data/test/fixtures/server_vnc_success.txt

@@ -0,0 +1,6 @@
+<status>success</status>
+<statusmsg></statusmsg> 
+<type>thetype</type>
+<vncip>thevncip</vncip>
+<vncport>thevncport</vncport>
+<vncpassword>thevncpassword</vncpassword>

data/test/helper.rb

@@ -8,6 +8,7 @@ end
 
 require 'solusvm'
 require 'fake_web'
+require 'mocha'
 
 class Test::Unit::TestCase
   def load_response(name)
@@ -26,4 +27,9 @@ class Test::Unit::TestCase
     Solusvm.config(api_login[:id], api_login[:key], :url => 'http://www.example.com/api')
   end
 
+  def cli_expand_base_arguments(options)
+    arguments = ["--api-login", "thelogin", "--api-key", "thekey", "--api-url", "theurl"]
+    options + arguments
+  end
+
 end

data/test/test_cli.rb

@@ -0,0 +1,17 @@
+require 'helper'
+require 'solusvm/cli'
+
+class TestCli < Test::Unit::TestCase
+
+  def setup
+    # 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)
+  end
+
+  def test_should_print_version
+    $stdout.expects(:puts).with(Solusvm::VERSION)
+    Solusvm::Cli.start(cli_expand_base_arguments(["version"]))
+  end
+
+end

data/test/test_client.rb

@@ -12,9 +12,9 @@ class TestClient < Test::Unit::TestCase
   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'))
-    assert @client.create(options)
 
-    params = @client.returned_parameters
+    params = @client.create(options)
+    assert params
     assert_equal options[:username], params['username']
     assert_equal options[:firstname], params['firstname']
     assert_equal options[:lastname], params['lastname']
@@ -37,18 +37,62 @@ class TestClient < Test::Unit::TestCase
   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'))
-    FakeWeb.register_uri(:get, "#{base_uri}&action=client-updatepassword&username=vps13&password=thecake", :body => load_response('client_change_password_error'))    
+    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'))
-    FakeWeb.register_uri(:get, "#{base_uri}&action=client-authenticate&username=u&password=notp", :body => load_response('client_authenticate_error'))
     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

@@ -8,72 +8,48 @@ class TestGeneral < Test::Unit::TestCase
     @general = Solusvm::General.new
   end
 
-  def test_nodes
-    FakeWeb.register_uri(:get, "#{base_uri}&action=listnodes&type=xen", :body => load_response('general_nodes_success'))
-    actual_nodes = @general.nodes('xen')
-    expected_nodes = %w(node1 node2 node3 node4)
-    assert_equal expected_nodes, actual_nodes
+  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_nodes_error
-    FakeWeb.register_uri(:get, "#{base_uri}&action=listnodes&type=whatever", :body => load_response('error'))
+  def test_templates_error
+    FakeWeb.register_uri(:get, "#{base_uri}&action=listtemplates&type=whatever", :body => load_response('error'))
     begin
-      @general.nodes('whatever')
+      @general.templates('whatever')
       flunk "Shouldn't get here"
     rescue Solusvm::SolusvmError => e
       assert e.message.match /Invalid Virtual Server type/
     end
   end
 
-  def test_templates
-    FakeWeb.register_uri(:get, "#{base_uri}&action=listtemplates&type=xen", :body => load_response('general_templates_success'))
-    actual_templates = @general.templates('xen')
-    expected_templates = %w(template1 template2 template3)
-    assert_equal expected_templates, actual_templates
+  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_template_error
-    FakeWeb.register_uri(:get, "#{base_uri}&action=listtemplates&type=whatever", :body => load_response('error'))
+  def test_plans_error
+    FakeWeb.register_uri(:get, "#{base_uri}&action=listplans&type=whatever", :body => load_response('error'))
     begin
-      @general.templates('whatever')
+      @general.plans('whatever')
       flunk "Shouldn't get here"
     rescue Solusvm::SolusvmError => e
       assert e.message.match /Invalid Virtual Server type/
     end
   end
 
-  def test_node_statistics
-    FakeWeb.register_uri(:get, "#{base_uri}&action=node-statistics&nodeid=1", :body => load_response('general_node_statistics_success'))
-    node_statistics = @general.node_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']
+  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_list_all_ips_available
-    FakeWeb.register_uri(:get, "#{base_uri}&action=node-iplist&nodeid=1", :body => load_response('general_node_list_all_ips_available'))
-    avaialble_ips = @general.node_available_ips(1)
-
-    expected_ips = %w(123.123.123.123 124.124.124.124 125.125.125.125).sort
-    assert !avaialble_ips.empty?
-    assert_equal expected_ips, avaialble_ips.sort 
-  end
-
-  def test_list_all_ips_not_available
-    FakeWeb.register_uri(:get, "#{base_uri}&action=node-iplist&nodeid=1", :body => load_response('general_node_list_all_ips_not_available'))
-    avaialble_ips = @general.node_available_ips(1)
-
-    assert avaialble_ips.empty?
+  def test_isos_error
+    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
+end

data/test/test_node.rb

@@ -0,0 +1,107 @@
+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('general_nodes_success'))
+    assert_equal %w(node1 node2 node3 node4), @nodes.list('xen')
+  end
+
+  def test_nodes_error
+    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('general_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('general_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('general_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('general_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('general_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('general_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('general_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

@@ -0,0 +1,75 @@
+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_delete
+    FakeWeb.register_uri(:get, "#{base_uri}&action=reseller-delete&username=vps123", :body => load_response('reseller_delete_success'))    
+    assert @reseller.delete("vps123")
+  end
+
+end