solusvm 1.2.1 → 1.3.0

data/test/solusvm/test_client.rb

@@ -3,12 +3,11 @@ require 'test_helper'
 class TestClient < Test::Unit::TestCase
 
   def setup
-    setup_solusvm
-    @client = Solusvm::Client.new
+    @client = Solusvm::Client.new(solusvm_params)
   end
 
   def test_create
-    options = {:username => 'vps123', :password=> '123456', :email=> 'email@address.com', :firstname => 'phill', :lastname => 'smith'}
+    options = {username: 'vps123', password: '123456', email: 'email@address.com', firstname: 'phill', lastname: 'smith'}
     VCR.use_cassette "client/create" do
       @client.create(options)
     end
@@ -28,14 +27,14 @@ class TestClient < Test::Unit::TestCase
     end
     assert_equal 'Empty username field', @client.statusmsg
   end
-  
+
   def test_exists
     VCR.use_cassette "client/exists" do
       assert @client.exists?("vps123")
     end
-    assert_equal 'Client exists', @client.statusmsg    
+    assert_equal 'Client exists', @client.statusmsg
   end
-  
+
   def test_change_password
     VCR.use_cassette "client/change_password" do
       assert @client.change_password("vps123","123456")
@@ -74,13 +73,13 @@ class TestClient < Test::Unit::TestCase
   end
 
   def test_list
-    Solusvm.config("api_id1", api_login[:key], :url => 'http://www.example.com/api')
+    @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"]
@@ -94,16 +93,16 @@ class TestClient < Test::Unit::TestCase
   end
 
   def test_list_empty
-    Solusvm.config("api_id2", api_login[:key], :url => 'http://www.example.com/api')
+    @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
   end
 
   def test_list_fail
-    Solusvm.config("api_id3", api_login[:key], :url => 'http://www.example.com/api')
-    VCR.use_cassette "client/list" do    
+    @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
   end
-end
+end

data/test/solusvm/test_general.rb

@@ -2,8 +2,7 @@ require 'test_helper'
 
 class TestGeneral < Test::Unit::TestCase
   def setup
-    setup_solusvm
-    @general = Solusvm::General.new
+    @general = Solusvm::General.new(solusvm_params)
   end
 
   def test_templates
@@ -54,4 +53,4 @@ class TestGeneral < Test::Unit::TestCase
   def test_isos_with_invalid_type
     assert !@general.isos('whatever')
   end
-end
+end

data/test/solusvm/test_hash.rb

@@ -2,9 +2,9 @@ require 'test_helper'
 
 class TestHash < Test::Unit::TestCase
   def test_reverse_merge
-    defaults = { :a => "x", :b => "y", :c => 10 }.freeze
-    options  = { :a => 1, :b => 2 }
-    expected = { :a => 1, :b => 2, :c => 10 }
+    defaults = { a: "x", b: "y", c: 10 }.freeze
+    options  = { a: 1, b: 2 }
+    expected = { a: 1, b: 2, c: 10 }
 
     # Should merge defaults into options, creating a new hash.
     assert_equal expected, options.reverse_merge(defaults)
@@ -17,7 +17,7 @@ class TestHash < Test::Unit::TestCase
   end
 
   def test_to_query
-    defaults = { :a => "x", :b => "y", :c => 10 }
+    defaults = { a: "x", b: "y", c: 10 }
     expected = "a=x&b=y&c=10".split('&').sort
     actual = defaults.to_query.split('&').sort
 

data/test/solusvm/test_node.rb

@@ -2,8 +2,7 @@ require 'test_helper'
 
 class TestNode < Test::Unit::TestCase
   def setup
-    setup_solusvm
-    @nodes = Solusvm::Node.new
+    @nodes = Solusvm::Node.new(solusvm_params)
   end
 
   def test_list
@@ -22,6 +21,12 @@ class TestNode < Test::Unit::TestCase
     assert !@nodes.list('whatever')
   end
 
+  def test_list_groups
+    VCR.use_cassette "node/list_groups" do
+      assert_equal ['--none--', 'nodegroup1', 'nodegroup2', 'nodegroup3'], @nodes.list_groups
+    end
+  end
+
   def test_statistics
     VCR.use_cassette "node/statistics" do
       @nodes.statistics(1)
@@ -45,14 +50,14 @@ class TestNode < Test::Unit::TestCase
   end
 
   def test_list_all_ips_available
-    Solusvm.config("api_id1", api_login[:key], :url => 'http://www.example.com/api')
+    @nodes = Solusvm::Node.new(solusvm_params.merge(api_id: "api_id1", url: 'http://www.example.com/api'))
     VCR.use_cassette "node/available_ips" do
       assert_equal %w(123.123.123.123 124.124.124.124 125.125.125.125).sort, @nodes.available_ips(1).sort
     end
   end
 
   def test_list_all_ips_not_available
-    Solusvm.config("api_id2", api_login[:key], :url => 'http://www.example.com/api')
+    @nodes = Solusvm::Node.new(solusvm_params.merge(api_id: "api_id2", url: 'http://www.example.com/api'))
     VCR.use_cassette "node/available_ips" do
       assert @nodes.available_ips(1).empty?
     end
@@ -69,7 +74,7 @@ class TestNode < Test::Unit::TestCase
   end
 
   def test_virtualservers
-    Solusvm.config("api_id1", api_login[:key], :url => 'http://www.example.com/api')
+    @nodes = Solusvm::Node.new(solusvm_params.merge(api_id: "api_id1", url: 'http://www.example.com/api'))
     VCR.use_cassette "node/virtualservers" do
       @nodes.virtualservers(1)
     end
@@ -90,14 +95,14 @@ class TestNode < Test::Unit::TestCase
   end
 
   def test_virtualservers_empty
-    Solusvm.config("api_id2", api_login[:key], :url => 'http://www.example.com/api')
+    @nodes = Solusvm::Node.new(solusvm_params.merge(api_id: "api_id2", url: 'http://www.example.com/api'))
     VCR.use_cassette "node/virtualservers" do
       assert @nodes.virtualservers(1).empty?
     end
   end
 
   def test_virtualservers_fail
-    Solusvm.config("api_id3", api_login[:key], :url => 'http://www.example.com/api')
+    @nodes = Solusvm::Node.new(solusvm_params.merge(api_id: "api_id3", url: 'http://www.example.com/api'))
     VCR.use_cassette "node/virtualservers" do
       assert_nil @nodes.virtualservers(1)
     end

data/test/solusvm/test_reseller.rb

@@ -3,17 +3,16 @@ require 'test_helper'
 class TestReseller < Test::Unit::TestCase
 
   def setup
-    setup_solusvm
-    @reseller = Solusvm::Reseller.new
+    @reseller = Solusvm::Reseller.new(solusvm_params)
   end
 
   def test_create
-    options = {:username => 'reseller123', :password=> '123456', :email=> 'reseller3@email.com', :firstname => 'Phill', :lastname => 'Smith'}
-    
+    options = {username: 'reseller123', password: '123456', email: 'reseller3@email.com', firstname: 'Phill', lastname: 'Smith'}
+
     VCR.use_cassette "reseller/create" do
-      @reseller.create(options) 
+      @reseller.create(options)
     end
-    
+
     params = @reseller.returned_parameters
 
     assert params
@@ -32,13 +31,13 @@ class TestReseller < Test::Unit::TestCase
   end
 
   def test_change_resources
-    options = {:maxvps => 10}
+    options = {maxvps: 10}
     VCR.use_cassette "reseller/change_resources" do
       @reseller.change_resources("vps123", options)
     end
-    
+
     params = @reseller.returned_parameters
-    
+
     assert params
     assert "10", params['maxvps']
   end
@@ -53,9 +52,9 @@ class TestReseller < Test::Unit::TestCase
     VCR.use_cassette "reseller/info" do
       @reseller.info("vps123")
     end
-    
+
     params = @reseller.returned_parameters
-    
+
     assert params
     assert_equal "reseller123", params['username']
     assert_equal "Phill", params['firstname']
@@ -71,14 +70,14 @@ class TestReseller < Test::Unit::TestCase
   end
 
   def test_list
-    Solusvm.config("api_id1", api_login[:key], :url => 'http://www.example.com/api')
+    @reseller = Solusvm::Reseller.new(solusvm_params.merge(api_id: 'api_id1', url: 'http://www.example.com/api'))
     VCR.use_cassette "reseller/list" do
       assert_equal %w(username1 username2 username3), @reseller.list
     end
   end
 
   def test_list_empty
-    Solusvm.config("api_id2", api_login[:key], :url => 'http://www.example.com/api')
+    @reseller = Solusvm::Reseller.new(solusvm_params.merge(api_id: 'api_id2', url: 'http://www.example.com/api'))
     VCR.use_cassette "reseller/list" do
       assert !@reseller.list
     end
@@ -90,4 +89,4 @@ class TestReseller < Test::Unit::TestCase
     end
   end
 
-end
+end

data/test/solusvm/test_server.rb

@@ -2,13 +2,12 @@ require 'test_helper'
 
 class TestServer < Test::Unit::TestCase
   def setup
-    setup_solusvm
-    @server = Solusvm::Server.new
+    @server = Solusvm::Server.new(solusvm_params)
   end
 
   def test_create
-    options = {:hostname => 'server.hostname.com', :type => 'xen', :username => 'bob', :password => '123456',
-               :node => 'node1', :plan => 'plan1', :template => 'mytpl', :ips => 1}
+    options = {hostname: 'server.hostname.com', type: 'xen', username: 'bob', password: '123456',
+               node: 'node1', plan: 'plan1', template: 'mytpl', ips: 1}
     hostname = options.delete(:hostname)
     password = options.delete(:password)
     VCR.use_cassette "server/create" do
@@ -37,7 +36,7 @@ class TestServer < Test::Unit::TestCase
     end
     assert_equal 'Virtual server is being rebuilt', @server.statusmsg
   end
-  
+
   def test_boot
     VCR.use_cassette "server/boot" do
       assert @server.boot(1)
@@ -133,7 +132,16 @@ class TestServer < Test::Unit::TestCase
   end
 
   def test_add_ip
-    #flunk "This is broken on the SolusVM API Level"
+    VCR.use_cassette "server/add_ip" do
+      assert_equal '123.123.123.123', @server.add_ip(1)
+    end
+    assert_equal 'Ip address added', @server.statusmsg
+  end
+
+  def test_del_ip
+    VCR.use_cassette "server/del_ip" do
+      assert @server.del_ip(1, '123.123.123.123')
+    end
   end
 
   def test_change_plan
@@ -221,7 +229,7 @@ class TestServer < Test::Unit::TestCase
     assert_equal 'theconsolepassword', info['consolepassword']
     assert_equal 'theconsoleusername', info['consoleusername']
   end
-  
+
   def test_info_all
     VCR.use_cassette "server/info_all" do
       @server.info_all(1)
@@ -236,7 +244,7 @@ class TestServer < Test::Unit::TestCase
     assert_equal "236223201280,103640707072,132582494208,44", info["hdd"]
     assert_equal "/graphs/9/214/214-8f7daef90bc75037489af4217af674a67df545ba05c8a6bcd5341d5894f2f905bf23976f52c0104415c1694135d51f204ddfd7b11bbe87c195a5de4a-86400.png", info["trafficgraph"]
     assert_equal "/graphs/9/214/214-load-8f7daef90bc75037489af4217af674a67df545ba05c8a6bcd5341d5894f2f905bf23976f52c0104415c1694135d51f204ddfd7b11bbe87c195a5de4a-86400.png", info["loadgraph"]
-    assert_equal "/graphs/9/214/214-mem-8f7daef90bc75037489af4217af674a67df545ba05c8a6bcd5341d5894f2f905bf23976f52c0104415c1694135d51f204ddfd7b11bbe87c195a5de4a-86400.png", info["memorygraph"]    
+    assert_equal "/graphs/9/214/214-mem-8f7daef90bc75037489af4217af674a67df545ba05c8a6bcd5341d5894f2f905bf23976f52c0104415c1694135d51f204ddfd7b11bbe87c195a5de4a-86400.png", info["memorygraph"]
   end
 
   def test_mountiso
@@ -250,4 +258,4 @@ class TestServer < Test::Unit::TestCase
       assert @server.unmountiso(1)
     end
   end
-end
+end

data/test/test_helper.rb

@@ -15,7 +15,7 @@ VCR.configure do |c|
     path2, params2 = request2.uri.split('?')
     path1 == path2 && Set.new(params1.to_s.split('&')) == Set.new(params2.to_s.split('&'))
   end
-  c.default_cassette_options = { :record => :none, :match_requests_on => [:method, :uri_with_unordered_params] }
+  c.default_cassette_options = { record: :none, match_requests_on: [:method, :uri_with_unordered_params] }
 end
 
 # Use TURN if available
@@ -35,15 +35,19 @@ class Test::Unit::TestCase
   end
 
   def api_login
-    {:id => 'api_id', :key => 'api_key'}
+    {id: 'api_id', key: 'api_key'}
   end
 
-  def setup_solusvm
-    Solusvm.config(api_login[:id], api_login[:key], :url => 'http://www.example.com/api')
+  def solusvm_params
+    {
+      api_id:  api_login[:id],
+      api_key: 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"]
+    arguments = ["--api-login", "api_id", "--api-key", "api_key", "--api-url", "http://www.example.com/api"]
     options + arguments
   end
 

data/test/vcr_cassettes/base/successful.yml

@@ -42,4 +42,27 @@ http_interactions:
         <statusmsg>error message</statusmsg>
     http_version: "1.1"
   recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
-recorded_with: VCR 2.0.0
+- request: 
+    method: get
+    uri: http://www.example.com/api?action=testnostatus&vserverid=1&id=api_id&key=api_key
+    body: 
+      encoding: UTF-8
+      string: ""
+    headers: {}
+  response: 
+    status: 
+      code: 200
+      message: OK
+    body: 
+      encoding: UTF-8
+      string: <mainipaddress>123.123.123.123</mainipaddress>
+        <extraipaddress>122.122.122.122,111.111.111.111</extraipaddress>
+        <rootpassword>123456</rootpassword>
+        <vserverid>100</vserverid>
+        <consoleuser>console-123</consoleuser>
+        <consolepassword>123456</consolepassword>
+        <hostname>server.hostname.com</hostname>
+        <virtid>vm101|101</virtid>
+    http_version: "1.1"
+  recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
+recorded_with: VCR 2.0.0

data/test/vcr_cassettes/base/successful_instance_config.yml

@@ -0,0 +1,28 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: http://www.test.com/api?action=testconfig&vserverid=1&id=instance_id&key=instance_key
+    body: 
+      encoding: UTF-8
+      string: ""
+    headers: {}
+  response: 
+    status: 
+      code: 200
+      message: OK
+    body: 
+      encoding: UTF-8
+      string: <status>success</status>
+        <statusmsg>Virtual server created</statusmsg>
+        <mainipaddress>123.123.123.123</mainipaddress>
+        <extraipaddress>122.122.122.122,111.111.111.111</extraipaddress>
+        <rootpassword>123456</rootpassword>
+        <vserverid>100</vserverid>
+        <consoleuser>console-123</consoleuser>
+        <consolepassword>123456</consolepassword>
+        <hostname>server.hostname.com</hostname>
+        <virtid>vm101|101</virtid>
+    http_version: "1.1"
+  recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
+recorded_with: VCR 2.0.0

data/test/vcr_cassettes/node/list_groups.yml

@@ -0,0 +1,20 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://www.example.com/api?action=listnodegroups&id=api_id&key=api_key
+    body:
+      encoding: UTF-8
+      string: ""
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    body:
+      encoding: UTF-8
+      string: <status>success</status>
+        <statusmsg></statusmsg>
+        <nodegroups>0|--none--,1|nodegroup1,2|nodegroup2,3|nodegroup3</nodegroups>
+    http_version: "1.1"
+  recorded_at: Tue, 01 Nov 2011 04:58:44 GMT

data/test/vcr_cassettes/server/add_ip.yml

@@ -0,0 +1,15 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://www.example.com/api?action=vserver-addip&vserverid=1&id=api_id&key=api_key
+    body: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    body: <status>success</status><statusmsg>Ip address added</statusmsg><ipaddress>123.123.123.123</ipaddress>
+    http_version: '1.1'
+  recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
+recorded_with: VCR 2.0.0

data/test/vcr_cassettes/server/del_ip.yml

@@ -0,0 +1,15 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://www.example.com/api?action=vserver-delip&vserverid=1&ipaddr=123.123.123.123&id=api_id&key=api_key
+    body: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    body: <status>success</status><statusmsg>Ip address deleted</statusmsg>
+    http_version: '1.1'
+  recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
+recorded_with: VCR 2.0.0