fog 0.3.34 → 0.4.0

data/tests/aws/requests/simpledb/domain_tests.rb

@@ -0,0 +1,51 @@
+Shindo.tests('AWS::SimpleDB | domain requests', ['aws']) do
+
+  @domain_metadata_format = AWS::SimpleDB::Formats::BASIC.merge({
+    'AttributeNameCount'        => Integer,
+    'AttributeNamesSizeBytes'   => Integer,
+    'AttributeValueCount'       => Integer,
+    'AttributeValuesSizeBytes'  => Integer,
+    'ItemCount'                 => Integer,
+    'ItemNamesSizeBytes'        => Integer,
+    'Timestamp'                 => Time
+  })
+
+  @domain_name = "fog_domain_#{Time.now.to_f.to_s.gsub('.','')}"
+
+  tests('success') do
+
+    tests("#create_domain(#{@domain_name})").formats(AWS::SimpleDB::Formats::BASIC) do
+      AWS[:sdb].create_domain(@domain_name).body
+    end
+
+    tests("#create_domain(#{@domain_name})").succeeds do
+      AWS[:sdb].create_domain(@domain_name)
+    end
+
+    tests("#domain_metadata(#{@domain_name})").formats(@domain_metadata_format) do
+      AWS[:sdb].domain_metadata(@domain_name).body
+    end
+
+    tests("#list_domains").formats(AWS::SimpleDB::Formats::BASIC.merge('Domains' => [String])) do
+      AWS[:sdb].list_domains.body
+    end
+
+    tests("#delete_domain(#{@domain_name})").formats(AWS::SimpleDB::Formats::BASIC) do
+      AWS[:sdb].delete_domain(@domain_name).body
+    end
+
+    tests("#delete_domain(#{@domain_name})").succeeds do
+      AWS[:sdb].delete_domain(@domain_name)
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("#domain_metadata('notadomain')").raises(Excon::Errors::BadRequest) do
+      AWS[:sdb].domain_metadata('notadomain')
+    end
+
+  end
+
+end

data/tests/aws/requests/simpledb/helper.rb

@@ -0,0 +1,16 @@
+class AWS
+
+  module SimpleDB
+
+    module Formats
+
+      BASIC = {
+        'BoxUsage'  => Float,
+        'RequestId' => String
+      }
+
+    end
+
+  end
+
+end

data/tests/compute/helper.rb

@@ -0,0 +1,36 @@
+def compute_providers
+  {
+    AWS       => {
+      :server_attributes => {
+        :image_id => 'ami-1a837773' # image ami-1a837773 = Ubuntu
+      },
+      :mocked => true
+    },
+    Bluebox   => {
+      :server_attributes => {
+        :image_id => 'a00baa8f-b5d0-4815-8238-b471c4c4bf72' # Ubuntu 9.10 64bit
+      },
+      :mocked => false
+    },
+    Brightbox => {
+      :server_attributes => {
+        :image_id => 'img-9vxqi' # image img-9vxqi = Ubuntu Maverick 10.10 server
+      },
+      :mocked => false
+    },
+    Rackspace => {
+      :server_attributes => {
+        :image_id => 49, # image 49 = Ubuntu 10.04 LTS (lucid)
+        :name     => "fog_#{Time.now.to_i}"
+      },
+      :mocked => true
+    },
+    Slicehost => {
+      :server_attributes => {
+        :image_id => 49, # image 49 = Ubuntu 10.04 LTS (lucid)
+        :name     => "fog_#{Time.now.to_i}"
+      },
+      :mocked => false
+    }
+  }
+end

data/tests/compute/models/flavors_tests.rb

@@ -0,0 +1,9 @@
+for provider, config in compute_providers
+
+  Shindo.tests("#{provider}::Compute | flavors", [provider.to_s.downcase]) do
+
+    flavors_tests(provider[:compute], (config[:flavors_attributes] || {}), config[:mocked])
+
+  end
+
+end

data/tests/compute/models/server_tests.rb

@@ -0,0 +1,9 @@
+for provider, config in compute_providers
+
+  Shindo.tests("#{provider}::Compute | server", [provider.to_s.downcase]) do
+
+    server_tests(provider[:compute], (config[:server_attributes] || {}), config[:mocked])
+
+  end
+
+end

data/tests/compute/models/servers_tests.rb

@@ -0,0 +1,9 @@
+for provider, config in compute_providers
+
+  Shindo.tests("#{provider}::Compute | servers", [provider.to_s.downcase]) do
+
+    servers_tests(provider[:compute], (config[:server_attributes] || {}), config[:mocked])
+
+  end
+
+end

data/tests/{aws → compute/requests/aws}/helper.rb

@@ -13,18 +13,6 @@ class AWS
 
   end
 
-  module IAM
-
-    module Formats
-
-      BASIC = {
-        'RequestId' => String
-      }
-
-    end
-
-  end
-
 end
 
 unless defined?(GENTOO_AMI)

data/tests/{brightbox/requests/compute → compute/requests/brightbox}/cloud_ip_tests.rb

@@ -2,16 +2,20 @@ Shindo.tests('Brightbox::Compute | cloud ip requests', ['brightbox']) do
 
   tests('success') do
 
-    tests("#create_cloud_ip()").formats(Brightbox::Compute::Formats::Full::CLOUD_IP) do
+    unless Fog.mocking?
+      @server = Brightbox[:compute].servers.create(compute_providers[Brightbox][:server_attributes])
+    end
+
+    tests("#create_cloud_ip").formats(Brightbox::Compute::Formats::Full::CLOUD_IP) do
       pending if Fog.mocking?
-      data = Brightbox[:compute].create_cloud_ip()
+      data = Brightbox[:compute].create_cloud_ip
       @cloud_ip_id = data["id"]
       data
     end
 
-    tests("#list_cloud_ips()").formats(Brightbox::Compute::Formats::Collection::CLOUD_IPS) do
+    tests("#list_cloud_ips").formats(Brightbox::Compute::Formats::Collection::CLOUD_IPS) do
       pending if Fog.mocking?
-      Brightbox[:compute].list_cloud_ips()
+      Brightbox[:compute].list_cloud_ips
     end
 
     tests("#get_cloud_ip('#{@cloud_ip_id}')").formats(Brightbox::Compute::Formats::Full::CLOUD_IP) do
@@ -20,9 +24,8 @@ Shindo.tests('Brightbox::Compute | cloud ip requests', ['brightbox']) do
     end
 
     unless Fog.mocking?
-      server = Brightbox[:compute].servers.first
-      interface_id = server.interfaces.first["id"]
-      map_options = {:interface => interface_id}
+      @server.wait_for { ready? }
+      map_options = {:interface => @server.interfaces.first["id"]}
     end
 
     tests("#map_cloud_ip('#{@cloud_ip_id}', #{map_options.inspect})").formats(Brightbox::Compute::Formats::Full::CLOUD_IP) do
@@ -44,6 +47,10 @@ Shindo.tests('Brightbox::Compute | cloud ip requests', ['brightbox']) do
       Brightbox[:compute].destroy_cloud_ip(@cloud_ip_id)
     end
 
+    unless Fog.mocking?
+      @server.destroy
+    end
+
   end
 
   tests('failure') do
@@ -60,4 +67,5 @@ Shindo.tests('Brightbox::Compute | cloud ip requests', ['brightbox']) do
 
   end
 
+
 end

data/tests/{brightbox → compute/requests/brightbox}/helper.rb

@@ -1,19 +1,16 @@
 module Fog
   module Brightbox
     module Nullable
-      module String; end
       module Account; end
       module Image; end
       module Interface; end
+      module LoadBalancer; end
       module Server; end
       module Zone; end
     end
   end
 end
 
-String.send :include, Fog::Brightbox::Nullable::String
-NilClass.send :include, Fog::Brightbox::Nullable::String
-
 Hash.send :include, Fog::Brightbox::Nullable::Account
 NilClass.send :include, Fog::Brightbox::Nullable::Account
 
@@ -23,6 +20,9 @@ NilClass.send :include, Fog::Brightbox::Nullable::Image
 Hash.send :include, Fog::Brightbox::Nullable::Interface
 NilClass.send :include, Fog::Brightbox::Nullable::Interface
 
+Hash.send :include, Fog::Brightbox::Nullable::LoadBalancer
+NilClass.send :include, Fog::Brightbox::Nullable::LoadBalancer
+
 Hash.send :include, Fog::Brightbox::Nullable::Server
 NilClass.send :include, Fog::Brightbox::Nullable::Server
 
@@ -36,6 +36,23 @@ class Brightbox
       IMAGE_IDENTIFER = "img-9vxqi"
     end
     module Formats
+      module Struct
+        LB_LISTENER = {
+          "in"              => Integer,
+          "out"             => Integer,
+          "protocol"        => String
+        }
+        LB_HEALTHCHECK = {
+          "type"            => String,
+          "request"         => String,
+          "port"            => Integer,
+          "interval"        => Integer,
+          "timeout"         => Integer,
+          "threshold_up"    => Integer,
+          "threshold_down"  => Integer
+        }
+      end
+
       module Nested
         ACCOUNT = {
           "name"            => String,
@@ -94,8 +111,8 @@ class Brightbox
           "status"          => String,
           "hostname"        => String,
           "created_at"      => String,
-          "started_at"      => Fog::Brightbox::Nullable::String,
-          "deleted_at"      => Fog::Brightbox::Nullable::String
+          "started_at"      => Fog::Nullable::String,
+          "deleted_at"      => Fog::Nullable::String
         }
 
         SERVER_TYPE = {
@@ -124,7 +141,7 @@ class Brightbox
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
-          "handle"          => Fog::Brightbox::Nullable::String
+          "handle"          => Fog::Nullable::String
         }
       end
 
@@ -147,7 +164,8 @@ class Brightbox
           "reverse_dns"     => String,
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
           "interface"       => Fog::Brightbox::Nullable::Interface,
-          "server"          => Fog::Brightbox::Nullable::String
+          "load_balancer"   => Fog::Brightbox::Nullable::LoadBalancer,
+          "server"          => Fog::Nullable::String
         }
 
         IMAGE = {
@@ -170,6 +188,16 @@ class Brightbox
           "ancestor"        => Fog::Brightbox::Nullable::Image
         }
 
+        LOAD_BALANCER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String
+        }
+
         SERVER = {
           "id"              => String,
           "resource_type"   => String,
@@ -178,8 +206,8 @@ class Brightbox
           "status"          => String,
           "hostname"        => String,
           "created_at"      => String,
-          "started_at"      => Fog::Brightbox::Nullable::String,
-          "deleted_at"      => Fog::Brightbox::Nullable::String,
+          "started_at"      => Fog::Nullable::String,
+          "deleted_at"      => Fog::Nullable::String,
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
           "server_type"     => Brightbox::Compute::Formats::Nested::SERVER_TYPE,
           "cloud_ips"       => [Brightbox::Compute::Formats::Nested::CLOUD_IP],
@@ -193,7 +221,7 @@ class Brightbox
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
-          "handle"          => Fog::Brightbox::Nullable::String,
+          "handle"          => Fog::Nullable::String,
           "name"            => String,
           "status"          => String,
           "cores"           => Integer,
@@ -216,7 +244,7 @@ class Brightbox
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
-          "handle"          => Fog::Brightbox::Nullable::String
+          "handle"          => Fog::Nullable::String
         }
       end
 
@@ -234,7 +262,7 @@ class Brightbox
           "postcode"        => String,
           "country_code"    => String,
           "country_name"    => String,
-          "vat_registration_number" => Fog::Brightbox::Nullable::String,
+          "vat_registration_number" => Fog::Nullable::String,
           "telephone_number" => String,
           "telephone_verified" => Fog::Boolean,
           "created_at"      => String,
@@ -243,7 +271,7 @@ class Brightbox
           "limits_cloudips" => Integer,
           "library_ftp_host" => String,
           "library_ftp_user" => String,
-          "library_ftp_password" => Fog::Brightbox::Nullable::String,
+          "library_ftp_password" => Fog::Nullable::String,
           "owner"           => Brightbox::Compute::Formats::Nested::USER,
           "users"           => [Brightbox::Compute::Formats::Nested::USER],
           "clients"         => [Brightbox::Compute::Formats::Nested::API_CLIENT],
@@ -258,7 +286,7 @@ class Brightbox
           "url"             => String,
           "name"            => String,
           "description"     => String,
-          "secret"          => Fog::Brightbox::Nullable::String,
+          "secret"          => Fog::Nullable::String,
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
         }
 
@@ -269,8 +297,9 @@ class Brightbox
           "public_ip"       => String,
           "status"          => String,
           "reverse_dns"     => String,
-          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
+          "account"         => Fog::Brightbox::Nullable::Account,
           "interface"       => Fog::Brightbox::Nullable::Interface,
+          "load_balancer"   => Fog::Brightbox::Nullable::LoadBalancer,
           "server"          => Fog::Brightbox::Nullable::Server
         }
 
@@ -303,6 +332,21 @@ class Brightbox
           "server"          => Brightbox::Compute::Formats::Nested::SERVER
         }
 
+        LOAD_BALANCER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "status"          => String,
+          "listeners"       => [Brightbox::Compute::Formats::Struct::LB_LISTENER],
+          "policy"          => String,
+          "healthcheck"     => Brightbox::Compute::Formats::Struct::LB_HEALTHCHECK,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
+          "nodes"           => [Brightbox::Compute::Formats::Nested::SERVER]
+        }
+
         SERVER = {
           "id"              => String,
           "resource_type"   => String,
@@ -311,9 +355,9 @@ class Brightbox
           "status"          => String,
           "hostname"        => String,
           "created_at"      => String,
-          "started_at"      => Fog::Brightbox::Nullable::String,
-          "deleted_at"      => Fog::Brightbox::Nullable::String,
-          "user_data"       => Fog::Brightbox::Nullable::String,
+          "started_at"      => Fog::Nullable::String,
+          "deleted_at"      => Fog::Nullable::String,
+          "user_data"       => Fog::Nullable::String,
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
           "server_type"     => Brightbox::Compute::Formats::Nested::SERVER_TYPE,
           "cloud_ips"       => [Brightbox::Compute::Formats::Nested::CLOUD_IP],
@@ -327,7 +371,7 @@ class Brightbox
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
-          "handle"          => Fog::Brightbox::Nullable::String,
+          "handle"          => Fog::Nullable::String,
           "name"            => String,
           "status"          => String,
           "cores"           => Integer,
@@ -344,21 +388,23 @@ class Brightbox
           "email_verified"  => Fog::Boolean,
           "accounts"        => [Brightbox::Compute::Formats::Nested::ACCOUNT],
           "default_account" => Fog::Brightbox::Nullable::Account,
-          "ssh_key"         => Fog::Brightbox::Nullable::String
+          "ssh_key"         => Fog::Nullable::String
         }
 
         ZONE = {
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
-          "handle"          => Fog::Brightbox::Nullable::String
+          "handle"          => Fog::Nullable::String
         }
+
       end
 
       module Collection
         API_CLIENTS = [Brightbox::Compute::Formats::Collected::API_CLIENT]
         CLOUD_IPS = [Brightbox::Compute::Formats::Collected::CLOUD_IP]
         IMAGES = [Brightbox::Compute::Formats::Collected::IMAGE]
+        LOAD_BALANCERS = [Brightbox::Compute::Formats::Collected::LOAD_BALANCER]
         SERVERS = [Brightbox::Compute::Formats::Collected::SERVER]
         SERVER_TYPES = [Brightbox::Compute::Formats::Collected::SERVER_TYPE]
         USERS = [Brightbox::Compute::Formats::Collected::USER]