fog 1.1.1 → 1.1.2

data/tests/brightbox/requests/compute/server_type_tests.rb

@@ -2,16 +2,17 @@ Shindo.tests('Fog::Compute[:brightbox] | server type requests', ['brightbox']) d
 
   tests('success') do
 
-    tests("#list_server_types").formats(Brightbox::Compute::Formats::Collection::SERVER_TYPES) do
+    tests("#list_server_types") do
       pending if Fog.mocking?
-      data = Fog::Compute[:brightbox].list_server_types
-      @server_type_id = data.first["id"]
-      data
+      result = Fog::Compute[:brightbox].list_server_types
+      @server_type_id = result.first["id"]
+      formats(Brightbox::Compute::Formats::Collection::SERVER_TYPES) { result }
     end
 
-    tests("#get_server_type('#{@server_type_id}')").formats(Brightbox::Compute::Formats::Full::SERVER_TYPE) do
+    tests("#get_server_type('#{@server_type_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].get_server_type(@server_type_id)
+      result = Fog::Compute[:brightbox].get_server_type(@server_type_id)
+      formats(Brightbox::Compute::Formats::Full::SERVER_TYPE) { result }
     end
 
   end

data/tests/brightbox/requests/compute/user_tests.rb

@@ -2,29 +2,24 @@ Shindo.tests('Fog::Compute[:brightbox] | user requests', ['brightbox']) do
 
   tests('success') do
 
-    tests("#list_users").formats(Brightbox::Compute::Formats::Collection::USERS) do
+    tests("#list_users") do
       pending if Fog.mocking?
-      data = Fog::Compute[:brightbox].list_users
-      @user_id = data.first["id"]
-      data
+      result = Fog::Compute[:brightbox].list_users
+      @user_id = result.first["id"]
+      formats(Brightbox::Compute::Formats::Collection::USERS) { result }
     end
 
-    tests("#get_user('#{@user_id}')").formats(Brightbox::Compute::Formats::Full::USER) do
+    tests("#get_user('#{@user_id}')") do
       pending if Fog.mocking?
-      data = Fog::Compute[:brightbox].get_user(@user_id)
-      @original_name = data["name"]
-      data
+      result = Fog::Compute[:brightbox].get_user(@user_id)
+      formats(Brightbox::Compute::Formats::Full::USER) { result }
     end
 
-    update_options = { :name => "Fog@#{Time.now.iso8601}" }
-
-    tests("#update_user('#{@user_id}', #{update_options.inspect})").formats(Brightbox::Compute::Formats::Full::USER) do
+    update_options = { :name => "Example User" }
+    tests("#update_user('#{@user_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].update_user(@user_id, update_options)
-    end
-
-    unless Fog.mocking?
-      Fog::Compute[:brightbox].update_user(@user_id, :name => @original_name)
+      result = Fog::Compute[:brightbox].update_user(@user_id, update_options)
+      formats(Brightbox::Compute::Formats::Full::USER) { result }
     end
 
   end

data/tests/brightbox/requests/compute/zone_tests.rb

@@ -2,16 +2,17 @@ Shindo.tests('Fog::Compute[:brightbox] | zone requests', ['brightbox']) do
 
   tests('success') do
 
-    tests("#list_zones").formats(Brightbox::Compute::Formats::Collection::ZONES) do
+    tests("#list_zones") do
       pending if Fog.mocking?
-      data = Fog::Compute[:brightbox].list_zones
-      @zone_id = data.first["id"]
-      data
+      result = Fog::Compute[:brightbox].list_zones
+      @zone_id = result.first["id"]
+      formats(Brightbox::Compute::Formats::Collection::ZONES) { result }
     end
 
-    tests("#get_zone('#{@zone_id}')").formats(Brightbox::Compute::Formats::Full::ZONE) do
+    tests("#get_zone('#{@zone_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].get_zone(@zone_id)
+      result = Fog::Compute[:brightbox].get_zone(@zone_id)
+      formats(Brightbox::Compute::Formats::Full::ZONE) { result }
     end
 
   end

data/tests/clodo/requests/compute/image_tests.rb

@@ -0,0 +1,36 @@
+Shindo.tests('Fog::Compute[:clodo] | image requests', ['clodo']) do
+
+###  Fog.mock!
+
+  clodo = Fog::Compute[:clodo]
+
+  @image_format = {
+    'id' => String,
+    'name' => String,
+    'status' => String,
+    'vps_type' => String
+  }
+
+  @image_details_format = {
+    'os_type' => String,
+    'os_bits' => String,
+    'os_hvm' => String,
+    '_attr' => @image_format
+  }
+
+  tests("success") do
+    tests("- list_images").formats([@image_format]) do
+      clodo.list_images.body['images']
+    end
+
+    tests("- list_images_detail").formats([@image_details_format]) do
+      clodo.list_images_detail.body['images']
+    end
+  end
+
+  tests("failure") do
+    tests("- get_image_details(541)").returns(nil) do
+      clodo.images.get(541)
+    end
+  end
+end

data/tests/clodo/requests/compute/server_tests.rb

@@ -0,0 +1,152 @@
+Shindo.tests('Fog::Compute[:clodo] | server requests', ['clodo']) do
+
+  @ip_format = {
+    'primary_ip'  => Fog::Boolean,
+    'isp'         => Fog::Boolean,
+    'ip'          => String
+  }
+
+  @server_format = {
+    'addresses' => {
+      'public'  => [@ip_format]
+    },
+    'id'        => String,
+    'imageId'   => String,
+    'name'      => String,
+    'type'      => String,
+    'status'    => String
+  }
+
+  @server_details_format = @server_format.merge({
+                                                  'id' => Integer,
+                                                  'vps_createdate' => String,
+                                                  'vps_hdd_max' => String,
+                                                  'vps_traff' => NilClass,
+                                                  'vps_mem_1h_max' => String,
+                                                  'vps_mem_load' => String,
+                                                  'vps_user_pass' => String,
+                                                  'vps_vnc_pass' => String,
+                                                  'vps_adddate' => String,
+                                                  'vps_os_title' => String,
+                                                  'vps_update' => String,
+                                                  'vps_mem_1h_min' => String,
+                                                  'vps_mem_1h_avg' => NilClass,
+                                                  'vps_memory_max' => String,
+                                                  'vps_os_version' => String,
+                                                  'vps_cpu_1h_max' => String,
+                                                  'vps_hdd_load' => String,
+                                                  'vps_disk_load' => String,
+                                                  'vps_os_type' => String,
+                                                  'vps_memory' => String,
+                                                  'vps_cpu_load' => String,
+                                                  'vps_update_days' => String,
+                                                  'vps_os_bits' => String,
+                                                  'vps_vnc' => String,
+                                                  'vps_cpu_max' => String,
+                                                  'vps_cpu_1h_min' => String,
+                                                  'vps_cpu_1h_avg' => NilClass,
+                                                  'vps_root_pass' => String
+  })
+
+  @server_create_format = {
+    'name'      => String,
+    'adminPass' => String,
+    'imageId'   => String,
+    'id'        => Integer
+  }
+
+#  Fog.mock!
+
+  clodo = Fog::Compute[:clodo]
+
+  tests('success') do
+    tests('- create_server(541)').formats(@server_create_format) do
+      data = clodo.create_server(541,{:vps_type => 'ScaleServer'}).body['server']
+      @server_id = data['id']
+      data
+    end
+
+    tests('- list_servers(ready)').formats([@server_format]) do
+      clodo.list_servers.body['servers'].reject {|s| !['is_running', 'is_disabled'].include?(s['status']) }
+    end
+
+    tests('- list_servers(not ready)').formats([@server_format.merge({'addresses'=>{'public'=>NilClass}})]) do
+      clodo.list_servers.body['servers'].reject {|s| !['is_request'].include?(s['status']) }
+    end
+
+    clodo.servers.get(@server_id).wait_for { ready? || state == 'is_error' } unless Fog.mocking?
+
+    tests("- add_ip_address(#{@server_id})").succeeds do
+      clodo.add_ip_address(@server_id)
+    end
+
+    # tests("- get_server_details(#{@server_id})").formats(@server_details_format) do
+    #   data = clodo.get_server_details(@server_id).body['server']
+    #   @additional_ip = data['addresses']['public'].select {|a| !a['primary_ip'] }.first
+    #   data
+    # end
+
+    tests("- reboot_server(#{@server_id})").succeeds do
+      clodo.reboot_server(@server_id, :hard)
+    end
+
+    clodo.servers.get(@server_id).wait_for { ready? || state == 'is_error' } unless Fog.mocking?
+
+    # tests("- delete_ip_address(#{@server_id}, #{@additional_ip['ip']})").success do
+    #   clodo.delete_ip_address(@server_id, @additional_ip['ip'])
+    # end
+    
+    tests("- stop_server(#{@server_id})").succeeds do
+      clodo.stop_server(@server_id)
+    end
+
+    unless Fog.mocking?
+      clodo.servers.get(@server_id).wait_for { state == 'is_disabled' || state == 'is_error' }
+    end
+
+    tests("- start_server(#{@server_id})").succeeds do
+      clodo.start_server(@server_id)
+    end
+
+    clodo.servers.get(@server_id).wait_for { ready? || state == 'is_error' } unless Fog.mocking?
+
+    tests("- delete_server(#{@server_id})").succeeds do
+      clodo.delete_server(@server_id)
+    end
+  end
+
+  tests('failure') do
+    tests('- create_server(0)').raises(Excon::Errors::BadRequest) do
+      data = clodo.create_server(0,{:vps_type => 'ScaleServer'}).body['server']
+      @server_id = data['id']
+      data
+    end
+
+    tests("- reboot_server(0)").raises(Excon::Errors::BadRequest) do
+      clodo.reboot_server(0, :hard)
+    end
+
+    tests("- stop_server(0)").raises(Excon::Errors::BadRequest) do
+      clodo.stop_server(0)
+    end
+
+    tests("- start_server(0)").raises(Excon::Errors::BadRequest) do
+      clodo.start_server(0)
+    end
+
+    ## delete_server(0) in actual API, works not as it must,
+    ## so I do not include this test in tests sequence.
+    # tests("- delete_server(0)").raises(Fog::Compute::Clodo::NotFound) do
+    #   clodo.delete_server(0)
+    # end
+    #
+    # tests("- delete_ip_address(0, 6.6.6.6)").raises(Fog::Compute::Clodo::NotFound) do
+    #   clodo.delete_ip_address(0, "6.6.6.6")
+    # end
+
+    tests("- delete_ip_address(#{@server_id}, 6.6.6.6)").raises(Excon::Errors::BadRequest) do
+      clodo.delete_ip_address(@server_id, "6.6.6.6")
+    end
+
+  end
+end

data/tests/compute/helper.rb

@@ -13,7 +13,7 @@ def compute_providers
     },
     :brightbox  => {
       :server_attributes => {
-        :image_id => 'img-2ab98' # Ubuntu Lucid 10.04 server (i686)
+        :image_id => 'img-4gqhs' # Ubuntu Lucid 10.04 server (i686)
       },
       :mocked => false
     },

data/tests/core/credential_tests.rb

@@ -18,12 +18,12 @@ Shindo.tests do
   tests('credential') do
     returns(:default, "is :default") { Fog.credential }
 
-    returns("foo", "can be set directly") do
+    returns(:foo, "can be set directly") do
       Fog.credential = "foo"
       Fog.credential
     end
 
-    returns("bar", "can be set with environment variable") do
+    returns(:bar, "can be set with environment variable") do
       ENV["FOG_CREDENTIAL"] = "bar"
       Fog.credential
     end

data/tests/glesys/requests/compute/helper.rb

@@ -4,10 +4,14 @@ class Glesys
       module Servers
 
         LIST = {
-          'arguments' => [],
+          'debug' => {
+            'input' => []
+          },
           'servers' => [{
             'serverid' => String,
-            'hostname' => String
+            'hostname' => String,
+            'datacenter' => String,
+            'platform' => String,
           }],
           'status' => {
             'code' => String,
@@ -16,17 +20,19 @@ class Glesys
         }
 
         CREATE = {
-          'arguments' => {
-            "rootpw"        => String, 
-            "disksize"      => String, 
-            "memorysize"    => String, 
-            "datacenter"    => String, 
-            "cpucores"      => String,
-            "transfer"      => String,
-            "template"      => String,
-            "description"   => String,
-            "hostname"      => String,
-            "platform"      => String
+          'debug' => {
+            'input' => {
+              "rootpw"        => String,
+              "disksize"      => String,
+              "memorysize"    => String,
+              "datacenter"    => String,
+              "cpucores"      => String,
+              "transfer"      => String,
+              "template"      => String,
+              "description"   => String,
+              "hostname"      => String,
+              "platform"      => String
+            }
           },
           'server' => {
             'serverid' => String,
@@ -44,9 +50,11 @@ class Glesys
         }
 
         DESTROY = {
-          'arguments' => {
-            'serverid' => String,
-            'keepip'   => String,
+          'debug' => {
+            'input' => {
+              'serverid' => String,
+              'keepip'   => String,
+            }
           },
           'status' => {
             'code' => String,
@@ -55,61 +63,68 @@ class Glesys
         }
 
         DETAILS = {
-          'arguments' =>  {
-            'serverid'  =>  String
-          }, 
+          'debug' => {
+            'input' =>  {
+              'serverid'  =>  String
+            }
+          },
           'server' => {
             'managedhosting'  => String,
             'cost'            => {
               'amount'      =>  Float,
-              'timeperiod'  => String, 
+              'timeperiod'  => String,
               'currency'    => String
             }, 
-            'datacenter'  => String, 
+            'serverid'    => String,
+            'datacenter'  => String,
             'memory'      => String,
-            'cpucores'    => String, 
-            'transfer'    => String, 
-            'template'    => String, 
+            'cpucores'    => String,
+            'transfer'    => String,
+            'template'    => String,
             'iplist'      =>  [{
-              'cost'    => String, 
-              'version' => String, 
+              'cost'    => String,
+              'version' => String,
               'ip'      => String
             }], 
             'description' => String,
-            'hostname'    => String, 
-            'disk'        => String, 
+            'hostname'    => String,
+            'disk'        => String,
             'platform'    => String
-          }, 
+          },
           'status' => {
-            'code' => String, 
+            'code' => String,
             'text' => String
           }
         }
 
         STATUS = {
-          'arguments' => {
-            'serverid' => String
-          }, 
+          'debug' => {
+            'input' => {
+              'serverid' => String
+            }
+          },
           'server' => {
-            'memory'    => String, 
+            'memory'    => String,
             'bandwidth' => {
-              'last30days'  => Integer, 
+              'last30days'  => Integer,
               'today'       => Integer,
               'max'         => String
-            }, 
-            'cpu'     => String, 
-            'disk'    => String, 
+            },
+            'cpu'     => String,
+            'disk'    => String,
             'state'   => String
-          }, 
-          'status' => { 
+          },
+          'status' => {
             'code' => String,
             'text' => String
           }
        }
-        
+
         START = {
-          'arguments' => {
-            'serverid' => String
+          'debug' => {
+            'input' => {
+              'serverid' => String
+            }
           },
           'status' => {
             'code' => String,
@@ -118,9 +133,11 @@ class Glesys
         }
 
         STOP = {
-          'arguments' => {
-            'serverid'  => String,
-            'type'      => String
+          'debug' => {
+            'input' => {
+              'serverid'  => String,
+              'type'      => String
+            }
           },
           'status' => {
             'code' => String,
@@ -130,9 +147,11 @@ class Glesys
 
       end
       module Ips
-    
+
         IPLIST = {
-          'arguments' => [],
+          'debug' => {
+            'input' => []
+          },
           'iplist' => [{
             'price' => {
               'amount' => String,
@@ -144,18 +163,21 @@ class Glesys
             'platform' => String,
             'ip'       => String,
             'version'  => String,
+            'PTR'      => String,
           }],
           'status' => {
             'code' => String,
             'text' => String
           }
         }
-    
+
         IPLIST_ALL = {
-          'arguments' => {
-            'datacenter'  => String,
-            'ipversion'   => String,
-            'platform'    => String
+          'debug' => {
+            'input' => {
+              'datacenter'  => String,
+              'ipversion'   => String,
+              'platform'    => String
+            }
           },
           'iplist' => [],
           'status' => {
@@ -170,12 +192,13 @@ class Glesys
         }
 
         IPLIST_CATCH_RELEASE = {
-          'arguments' => {
-            'ipaddress' => String, 
-            'ipversion'=> String,
-          }, 
+          'debug' => {
+            'input' => {
+              'ipaddress' => String,
+            }
+          },
           'status' => {
-            'code' => String, 
+            'code' => String,
             'text' => String
           }
         }
@@ -184,20 +207,22 @@ class Glesys
       module Templates
 
         LIST = {
-          'arguments' => [],
-          'templates' =>  { 
+          'debug' => {
+            'input' => []
+          },
+          'templates' =>  {
             'Xen' => [{
               'name'          => String,
-              'os'            => String, 
-              'min_mem_size'  => String, 
-              'min_disk_size' => String, 
+              'os'            => String,
+              'min_mem_size'  => String,
+              'min_disk_size' => String,
               'platform'      => String
             }],
             'OpenVZ' => [{
               'name'          => String,
-              'os'            => String, 
-              'min_mem_size'  => String, 
-              'min_disk_size' => String, 
+              'os'            => String,
+              'min_mem_size'  => String,
+              'min_disk_size' => String,
               'platform'      => String
             }]
           },