Add option to provide specific ip for add_ip

lib/solusvm/cli/server_cli.rb

@@ -56,9 +56,9 @@ def change_hostname(vserverid, newhostname)
       output api.change_hostname(vserverid, newhostname)
     end
 
-    desc "addip VSERVERID", "Adds an ip to the server"
-    def addip(vserverid)
-      output api.add_ip(vserverid)
+    desc "addip VSERVERID [ip]", "Adds an ip to the server"
+    def addip(vserverid, ip = nil)
+      output api.add_ip(vserverid, ip)
     end
 
     desc "boot VSERVERID", "Boots up a server"

lib/solusvm/server.rb

@@ -170,10 +170,11 @@ def status(vid)
     # Public: Adds an IP address for a specific server.
     #
     # vid - The virtual server ID in SolusVM
+    # ip  - Specific IPv4 address to add (optional)
     #
     # Returns the IP as a String.
-    def add_ip(vid)
-      perform_request(action: 'vserver-addip', vserverid: vid)
+    def add_ip(vid, ip = nil)
+      perform_request(action: 'vserver-addip', vserverid: vid, ipv4addr: ip)
       returned_parameters['ipaddress']
     end
 

test/cli/test_server_cli.rb

@@ -97,11 +97,11 @@ def test_should_delegate_server_change_hostname_to_server
   def test_should_delegate_server_add_ip_to_server
     SolusVM::Server.stubs(:new).with(@solusvm_params).returns(mock do
       expects(:successful?).returns(true)
-      expects(:add_ip).with("thevserverid").returns("theresult")
+      expects(:add_ip).with("thevserverid", "ipv4addr").returns("theresult")
     end)
 
     out = capture_stdout do
-      SolusVM::CLI.start(cli_expand_base_arguments(["server", "addip", "thevserverid"]))
+      SolusVM::CLI.start(cli_expand_base_arguments(["server", "addip", "thevserverid", "ipv4addr"]))
     end
     assert_match "theresult", out.string
   end

test/solusvm/test_server.rb

@@ -146,6 +146,13 @@ def test_add_ip
     assert @server.successful?
   end
 
+  def test_add_specific_ip
+    stub_response 'server/add-ip'
+
+    assert_equal '123.123.123.123', @server.add_ip(1, '123.123.123.123')
+    assert @server.successful?
+  end
+
   def test_del_ip
     stub_response 'server/del-ip'