solusvm 1.0.0.beta3 → 1.1.0.beta1

data/test/cli/test_server_cli.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'test_helper'
 require 'solusvm/cli'
 
 class TestServerCli < Test::Unit::TestCase
@@ -11,7 +11,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_status_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:status).with("thevserverid").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:status).with("thevserverid").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "status", "thevserverid"]))
@@ -19,7 +22,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_change_plan_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:change_plan).with("thevserverid", "thenewplan").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:change_plan).with("thevserverid", "thenewplan").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "change-plan", "thevserverid", "thenewplan"]))
@@ -27,7 +33,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_change_owner_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:change_owner).with("thevserverid", "thenewowner").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:change_owner).with("thevserverid", "thenewowner").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "change-owner", "thevserverid", "thenewowner"]))
@@ -35,7 +44,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_change_consolepass_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:change_consolepass).with("thevserverid", "thenewpass").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:change_consolepass).with("thevserverid", "thenewpass").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "change-consolepass", "thevserverid", "thenewpass"]))
@@ -43,7 +55,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_change_vncpass_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:change_vncpass).with("thevserverid", "thenewpass").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:change_vncpass).with("thevserverid", "thenewpass").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "change-vncpass", "thevserverid", "thenewpass"]))
@@ -51,7 +66,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_change_rootpass_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:change_rootpassword).with("thevserverid", "thenewpass").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:change_rootpassword).with("thevserverid", "thenewpass").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "change-rootpass", "thevserverid", "thenewpass"]))
@@ -59,7 +77,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_change_bootorder_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:change_bootorder).with("thevserverid", "theneworder").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:change_bootorder).with("thevserverid", "theneworder").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "change-bootorder", "thevserverid", "theneworder"]))
@@ -67,7 +88,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_change_hostname_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:change_hostname).with("thevserverid", "thenewhostname").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:change_hostname).with("thevserverid", "thenewhostname").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "change-hostname", "thevserverid", "thenewhostname"]))
@@ -75,7 +99,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_add_ip_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:add_ip).with("thevserverid").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:add_ip).with("thevserverid").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "addip", "thevserverid"]))
@@ -83,7 +110,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_boot_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:boot).with("thevserverid").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:boot).with("thevserverid").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "boot", "thevserverid"]))
@@ -91,7 +121,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_reboot_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:reboot).with("thevserverid").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:reboot).with("thevserverid").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "reboot", "thevserverid"]))
@@ -99,7 +132,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_shutdown_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:shutdown).with("thevserverid").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:shutdown).with("thevserverid").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "shutdown", "thevserverid"]))
@@ -107,7 +143,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_suspend_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:suspend).with("thevserverid").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:suspend).with("thevserverid").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "suspend", "thevserverid"]))
@@ -115,7 +154,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_resume_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:resume).with("thevserverid").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:resume).with("thevserverid").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "resume", "thevserverid"]))
@@ -123,7 +165,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_check_exists_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:check_exists).with("thevserverid").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:exists?).with("thevserverid").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "check-exists", "thevserverid"]))
@@ -131,7 +176,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_terminate_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:terminate).with("thevserverid").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:terminate).with("thevserverid").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "terminate", "thevserverid"]))
@@ -139,8 +187,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_rebuild_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:rebuild).with(
-      "thevserverid", :template => "thetemplate").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:rebuild).with("thevserverid", :template => "thetemplate").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "rebuild", "thevserverid", "--template", "thetemplate"]))
@@ -148,7 +198,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_tun_switcher_on_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:tun_enable).with("thevserverid").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:tun_enable).with("thevserverid").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "tun-switcher", "thevserverid", "on"]))
@@ -156,7 +209,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_tun_switcher_off_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:tun_disable).with("thevserverid").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:tun_disable).with("thevserverid").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "tun-switcher", "thevserverid", "off"]))
@@ -164,7 +220,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_network_switcher_on_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:network_enable).with("thevserverid").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:network_enable).with("thevserverid").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "network-switcher", "thevserverid", "on"]))
@@ -172,7 +231,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_network_switcher_off_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:network_disable).with("thevserverid").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:network_disable).with("thevserverid").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "network-switcher", "thevserverid", "off"]))
@@ -180,7 +242,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_pae_switcher_on_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:pae_enable).with("thevserverid").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:pae_enable).with("thevserverid").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "pae-switcher", "thevserverid", "on"]))
@@ -188,7 +253,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_pae_switcher_off_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:pae_disable).with("thevserverid").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:pae_disable).with("thevserverid").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "pae-switcher", "thevserverid", "off"]))
@@ -196,7 +264,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_info_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:info).with("thevserverid").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:info).with("thevserverid").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "info", "thevserverid"]))
@@ -204,7 +275,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_vnc_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:vnc).with("thevserverid").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:vnc).with("thevserverid").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "vnc", "thevserverid"]))
@@ -212,7 +286,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_console_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:console).with("thevserverid").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:console).with("thevserverid").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "console", "thevserverid"]))
@@ -220,7 +297,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_info_all_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:info_all).with("thevserverid").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:info_all).with("thevserverid").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "info-all", "thevserverid"]))
@@ -228,7 +308,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_mountiso_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:mountiso).with("thevserverid", "theiso").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:mountiso).with("thevserverid", "theiso").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "mountiso", "thevserverid", "theiso"]))
@@ -236,7 +319,10 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_unmountiso_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:unmountiso).with("thevserverid").returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:unmountiso).with("thevserverid").returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments(["server", "unmountiso", "thevserverid"]))
@@ -244,17 +330,20 @@ class TestServerCli < Test::Unit::TestCase
 
   def test_should_delegate_server_create_to_server
     Solusvm.expects(:config).with("thelogin", "thekey", { :url => "theurl" })
-    Solusvm::Server.stubs(:new => mock{ expects(:create).with(
-      "thehostname", "thepassword", 
-      :plan => "theplan", :ips => "theips", :type => "thekind", 
-      :username => "theusername", :template => "thetemplate", :node => "thenode"
-    ).returns("theresult") })
+    Solusvm::Server.stubs(:new => mock do
+      expects(:successful?).returns(true)
+      expects(:create).with(
+        "thehostname", "thepassword",
+        :plan => "theplan", :ips => "theips", :type => "thekind",
+        :username => "theusername", :template => "thetemplate", :node => "thenode"
+      ).returns("theresult")
+    end)
 
     $stdout.expects(:puts).with("theresult")
     Solusvm::Cli.start(cli_expand_base_arguments([
-      "server", "create", 
-      "thehostname", 
-      "thepassword", 
+      "server", "create",
+      "thehostname",
+      "thepassword",
       "--plan", "theplan",
       "--ips", "theips",
       "--kind", "thekind",

data/test/solusvm/test_base.rb

@@ -0,0 +1,103 @@
+require 'test_helper'
+
+class TestBase < Test::Unit::TestCase
+
+  def setup
+    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
+    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']
+  end
+
+  def test_successful
+    VCR.use_cassette "base/successful" do
+      @base.perform_request(:action => 'testsuccess', :vserverid => 1)
+      assert @base.successful?
+
+      @base.perform_request(:action => 'testfail', :vserverid => 1)
+      assert_equal "error message", @base.statusmsg
+    end
+  end
+
+  def test_api_login
+    assert_equal api_login, @base.api_login
+  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
+  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
+    VCR.use_cassette "base/unauthorized_ip" do
+      assert_raise RuntimeError do
+        @base.perform_request(:action => 'unauthorized')
+      end
+    end
+  end
+
+  def test_invalid_key_or_id
+    VCR.use_cassette "base/invalid_key" do
+      assert_raise RuntimeError do
+        @base.perform_request(:action => 'badkey')
+      end
+    end
+  end
+
+  def test_node_does_not_exist
+    VCR.use_cassette "base/nonexistent_node" do
+      assert_raise RuntimeError do
+        @base.perform_request(:action => 'nodeexist')
+      end
+    end
+  end
+
+  def test_invalid_http_status
+    VCR.use_cassette "base/invalid_status" do
+      assert_raise Solusvm::SolusvmError do
+        @base.perform_request(:action => 'httperror')
+      end
+    end
+    
+  end
+end