fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

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

@@ -36,9 +36,16 @@ Shindo.tests('Fog::Compute[:brightbox] | account requests', ['brightbox']) do
       formats(Brightbox::Compute::Formats::Full::ACCOUNT, false) { result }
     end
 
-    tests("#reset_ftp_password_account") do
+    tests("#reset_ftp_password_scoped_account") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].reset_ftp_password_account
+      result = Fog::Compute[:brightbox].reset_ftp_password_scoped_account
+      formats(Brightbox::Compute::Formats::Full::ACCOUNT, false) { result }
+      test("new ftp password is visible") { ! result["library_ftp_password"].nil?  }
+    end
+
+    tests("#reset_ftp_password_account(#{@scoped_account_identifier})") do
+      pending if Fog.mocking?
+      result = Fog::Compute[:brightbox].reset_ftp_password_account(@scoped_account_identifier)
       formats(Brightbox::Compute::Formats::Full::ACCOUNT, false) { result }
       test("new ftp password is visible") { ! result["library_ftp_password"].nil?  }
     end

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

@@ -0,0 +1,33 @@
+Shindo.tests('Fog::Compute[:brightbox] | firewall policy requests', ['brightbox']) do
+
+  tests('success') do
+    pending if Fog.mocking?
+
+    create_options = {
+      :name => "Fog test policy A"
+    }
+
+    tests("#create_firewall_policy(#{create_options.inspect})") do
+      result = Fog::Compute[:brightbox].create_firewall_policy(create_options)
+      @firewall_policy_id = result["id"]
+      formats(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, false) { result }
+    end
+
+    tests("#list_firewall_policies()") do
+      formats(Brightbox::Compute::Formats::Collection::FIREWALL_POLICIES, false) do
+        Fog::Compute[:brightbox].list_firewall_policies
+      end
+    end
+
+    tests("#get_firewall_policy('#{@firewall_policy_id}')") do
+      formats(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, false) do
+        Fog::Compute[:brightbox].get_firewall_policy(@firewall_policy_id)
+      end
+    end
+
+    tests("#destroy_firewall_policy('#{@firewall_policy_id}')") do
+      result = Fog::Compute[:brightbox].destroy_firewall_policy(@firewall_policy_id)
+      formats(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, false) { result }
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+Shindo.tests('Fog::Compute[:brightbox] | firewall rule requests', ['brightbox']) do
+
+  tests('success') do
+    pending if Fog.mocking?
+
+    unless Fog.mocking?
+      policy = Fog::Compute[:brightbox].firewall_policies.create
+    end
+
+    create_options = {
+      :firewall_policy => policy.id,
+      :destination => "127.0.0.1"
+    }
+
+    tests("#create_firewall_rule(#{create_options.inspect})") do
+      result = Fog::Compute[:brightbox].create_firewall_rule(create_options)
+      @firewall_rule_id = result["id"]
+      formats(Brightbox::Compute::Formats::Full::FIREWALL_RULE, false) { result }
+    end
+
+    tests("#get_firewall_rule('#{@firewall_rule_id}')") do
+      formats(Brightbox::Compute::Formats::Full::FIREWALL_RULE, false) do
+        Fog::Compute[:brightbox].get_firewall_rule(@firewall_rule_id)
+      end
+    end
+
+    update_options = {:source => nil, :destination => "127.0.0.1"}
+    tests("#update_firewall_rule('#{@firewall_rule_id}', #{update_options.inspect})") do
+      formats(Brightbox::Compute::Formats::Full::FIREWALL_RULE, false) do
+        Fog::Compute[:brightbox].update_firewall_rule(@firewall_rule_id, update_options)
+      end
+    end
+
+    tests("#destroy_firewall_rule('#{@firewall_rule_id}')") do
+      result = Fog::Compute[:brightbox].destroy_firewall_rule(@firewall_rule_id)
+      formats(Brightbox::Compute::Formats::Full::FIREWALL_RULE, false) { result }
+    end
+
+    unless Fog.mocking?
+      policy.destroy
+    end
+  end
+end

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

@@ -133,7 +133,7 @@ class Brightbox
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
-          "name"            => String,
+          "name"            => Fog::Nullable::String,
           "default"         => Fog::Boolean,
           "created_at"      => String,
           "description"     => Fog::Nullable::String
@@ -143,11 +143,12 @@ class Brightbox
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
+          "created_at"      => String,
           "source"          => Fog::Nullable::String,
           "source_port"     => Fog::Nullable::String,
           "destination"     => Fog::Nullable::String,
           "destination_port" => Fog::Nullable::String,
-          "protocol"        => String,
+          "protocol"        => Fog::Nullable::String,
           "icmp_type_name"  => Fog::Nullable::String,
           "description"     => Fog::Nullable::String
         }
@@ -307,25 +308,12 @@ class Brightbox
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
-          "name"            => String,
+          "name"            => Fog::Nullable::String,
           "description"     => Fog::Nullable::String,
           "default"         => Fog::Boolean,
-          "server_group"    => Brightbox::Compute::Formats::Nested::SERVER_GROUP,
-          "rules"  => [Brightbox::Compute::Formats::Nested::FIREWALL_RULE]
-        }
-
-        FIREWALL_RULE = {
-          "id"              => String,
-          "resource_type"   => String,
-          "url"             => String,
-          "source"          => String,
-          "source_port"     => String,
-          "destination"     => String,
-          "destination_port" => String,
-          "protocol"        => String,
-          "icmp_type_name"  => String,
-          "description"     => Fog::Nullable::String,
-          "firewall_policy" => Brightbox::Compute::Formats::Nested::FIREWALL_POLICY
+          "created_at"      => String,
+          "server_group"    => Fog::Brightbox::Nullable::ServerGroup,
+          "rules"           => [Brightbox::Compute::Formats::Nested::FIREWALL_RULE]
         }
 
         IMAGE = {
@@ -514,26 +502,42 @@ class Brightbox
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
-          "name"            => String,
+          "name"            => Fog::Nullable::String,
           "description"     => Fog::Nullable::String,
           "default"         => Fog::Boolean,
-          "server_group"    => Brightbox::Compute::Formats::Nested::SERVER_GROUP,
-          "rules"  => [Brightbox::Compute::Formats::Nested::FIREWALL_RULE]
+          "created_at"      => String,
+          "server_group"    => Fog::Brightbox::Nullable::ServerGroup,
+          "rules"           => [Brightbox::Compute::Formats::Nested::FIREWALL_RULE]
         }
 
         FIREWALL_RULE = {
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
-          "source"          => String,
-          "source_port"     => String,
-          "destination"     => String,
-          "destination_port" => String,
-          "protocol"        => String,
-          "icmp_type_name"  => String,
-          "description"     => Fog::Nullable::String
+          "created_at"      => String,
+          "source"          => Fog::Nullable::String,
+          "source_port"     => Fog::Nullable::String,
+          "destination"     => Fog::Nullable::String,
+          "destination_port" => Fog::Nullable::String,
+          "protocol"        => Fog::Nullable::String,
+          "icmp_type_name"  => Fog::Nullable::String,
+          "description"     => Fog::Nullable::String,
+          "firewall_policy" => Brightbox::Compute::Formats::Nested::FIREWALL_POLICY
         }
 
+        #FIREWALL_RULE = {
+          #"id"              => String,
+          #"resource_type"   => String,
+          #"url"             => String,
+          #"source"          => String,
+          #"source_port"     => String,
+          #"destination"     => String,
+          #"destination_port" => String,
+          #"protocol"        => String,
+          #"icmp_type_name"  => String,
+          #"description"     => Fog::Nullable::String
+        #}
+
         IMAGE = {
           "name"            => String,
           "created_at"      => String,
@@ -666,7 +670,6 @@ class Brightbox
         CLOUD_IPS = [Brightbox::Compute::Formats::Collected::CLOUD_IP]
         IMAGES = [Brightbox::Compute::Formats::Collected::IMAGE]
         FIREWALL_POLICIES = [Brightbox::Compute::Formats::Collected::FIREWALL_POLICY]
-        FIREWALL_RULES = [Brightbox::Compute::Formats::Collected::FIREWALL_RULE]
         LOAD_BALANCERS = [Brightbox::Compute::Formats::Collected::LOAD_BALANCER]
         SERVERS = [Brightbox::Compute::Formats::Collected::SERVER]
         SERVER_GROUPS = [Brightbox::Compute::Formats::Collected::SERVER_GROUP]

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

@@ -1,30 +1,44 @@
 Shindo.tests('Fog::Compute[:brightbox] | interface requests', ['brightbox']) do
 
+  @test_service = Fog::Compute[:brightbox]
+
   tests('success') do
 
     unless Fog.mocking?
-      server = Fog::Compute[:brightbox].servers.first
+      server = @test_service.servers.first
+
+      # If no server is available, create one just for the test
+      unless server
+        @test_server = Brightbox::Compute::TestSupport.get_test_server
+        server = @test_server
+      end
+
       @interface_id = server.interfaces.first["id"]
     end
 
     tests("#get_interface('#{@interface_id}')") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].get_interface(@interface_id)
+      result = @test_service.get_interface(@interface_id)
       formats(Brightbox::Compute::Formats::Full::INTERFACE, false) { result }
     end
 
+    unless Fog.mocking?
+      # If we created a server just for this test, clean it up
+      @test_server.destroy if @test_server
+    end
+
   end
 
   tests('failure') do
 
     tests("#get_interface('int-00000')").raises(Excon::Errors::NotFound) do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].get_interface('int-00000')
+      @test_service.get_interface('int-00000')
     end
 
     tests("#get_interface()").raises(ArgumentError) do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].get_interface()
+      @test_service.get_interface()
     end
   end
 

data/tests/compute/helper.rb

@@ -19,13 +19,26 @@ def compute_providers
       },
       :mocked => false
     },
-    :openstack => {
-      :mocked => true,
+    :ecloud => {
       :server_attributes => {
-        :flavor_ref => 2,
-        :image_ref  => "0e09fbd6-43c5-448a-83e9-0d3d05f9747e",
-        :name       => "fog_#{Time.now.to_i}"
-      }
+        :name                 => "eugene",
+        :row                  => "eugene1",
+        :group                => "eugene-104",
+        :catalog_network_name => "bridged",
+        :description          => "blarg",
+        :operating_system => {
+          :name =>  "Red Hat Enterprise Linux 5 (64-bit)",
+          :href => "/cloudapi/ecloud/operatingsystems/rhel5_64guest/computepools/963",
+        },
+      }.tap do |hash|
+        [:template_href, :network_uri, :environment_name].each do |k|
+          key = "ecloud_#{k}".to_sym
+          if Fog.credentials[key]
+            hash[k]= Fog.credentials[key]
+          end
+        end
+      end,
+      :mocked => true,
     },
     :cloudstack => {
       :provider_attributes => {
@@ -81,7 +94,16 @@ def compute_providers
     :ninefold   => {
       :mocked => false
     },
+    :openstack => {
+      :mocked => true,
+      :server_attributes => {
+        :flavor_ref => 2,
+        :image_ref  => "0e09fbd6-43c5-448a-83e9-0d3d05f9747e",
+        :name       => "fog_#{Time.now.to_i}"
+      }
+    },
     :rackspace  => {
+      :provider_attributes => { :version => :v1 }, 
       :server_attributes => {
         :image_id => 49, # image 49 = Ubuntu 10.04 LTS (lucid)
         :name     => "fog_#{Time.now.to_i}"

data/tests/compute/models/flavors_tests.rb

@@ -1,10 +1,12 @@
 for provider, config in compute_providers
 
-  next if [:glesys, :voxel, :ibm].include?(provider)
+  next if [:glesys, :voxel, :ibm, :ecloud].include?(provider)
 
   Shindo.tests("Fog::Compute[:#{provider}] | flavors", [provider.to_s]) do
 
-    flavors_tests(Fog::Compute[provider], (config[:flavors_attributes] || {}), config[:mocked])
+    provider_attributes = config[:provider_attributes] || {}
+    provider_attributes.merge!(:provider => provider)
+    flavors_tests(Fog::Compute.new(provider_attributes), (config[:flavors_attributes] || {}), config[:mocked])
 
   end
 

data/tests/compute/models/server_tests.rb

@@ -1,8 +1,12 @@
 for provider, config in compute_providers
 
+  next if [:ecloud].include?(provider)
+
   Shindo.tests("Fog::Compute[:#{provider}] | server", [provider.to_s]) do
 
-    server_tests(Fog::Compute[provider], (config[:server_attributes] || {}), config[:mocked]) do
+    provider_attributes = config[:provider_attributes] || {}
+    provider_attributes.merge!(:provider => provider)
+    server_tests(Fog::Compute.new(provider_attributes), (config[:server_attributes] || {}), config[:mocked]) do
 
       if Fog.mocking? && !config[:mocked]
         pending

data/tests/compute/models/servers_tests.rb

@@ -1,9 +1,12 @@
-
 for provider, config in compute_providers
 
+  next if [:ecloud].include?(provider)
+
   Shindo.tests("Fog::Compute[:#{provider}] | servers", [provider.to_s]) do
 
-    servers_tests(Fog::Compute[provider], (config[:server_attributes] || {}), config[:mocked])
+    provider_attributes = config[:provider_attributes] || {}
+    provider_attributes.merge!(:provider => provider)
+    servers_tests(Fog::Compute.new(provider_attributes), (config[:server_attributes] || {}), config[:mocked])
 
   end
 

data/tests/core/wait_for_tests.rb

@@ -0,0 +1,13 @@
+Shindo.tests('Fog#wait_for', 'core') do
+  tests("success") do
+    tests('Fog#wait_for').formats(:duration => Integer) do
+      Fog.wait_for(1) { true }
+    end
+  end
+  
+  tests("failure") do
+    tests('Fog#wait_for').raises(Fog::Errors::TimeoutError) do
+      Fog.wait_for(2) { false }
+    end
+  end
+end

data/tests/dns/models/record_tests.rb

@@ -7,12 +7,24 @@ for provider, config in dns_providers
 
   Shindo.tests("Fog::DNS[:#{provider}] | record", [provider.to_s]) do
 
-    record_attributes = {
-      :name   => 'www.' + domain_name,
+    a_record_attributes = {
+      :name   => 'a.' + domain_name,
       :type   => 'A',
       :value  => '1.2.3.4'
     }.merge!(config[:record_attributes] || {})
 
+    aaaa_record_attributes = {
+      :name   => 'aaaa.' + domain_name,
+      :type   => 'AAAA',
+      :value  => '2001:0db8:0000:0000:0000:ff00:0042:8329'
+    }.merge!(config[:record_attributes] || {})
+
+    cname_record_attributes = {
+      :name   => 'cname.' + domain_name,
+      :type   => 'CNAME',
+      :value  => 'real.' + domain_name
+    }.merge!(config[:record_attributes] || {})
+
     if !Fog.mocking? || config[:mocked]
       zone_attributes = {
         :domain => domain_name
@@ -20,7 +32,9 @@ for provider, config in dns_providers
 
       @zone = Fog::DNS[provider].zones.create(zone_attributes)
 
-      model_tests(@zone.records, record_attributes, config[:mocked])
+      model_tests(@zone.records, a_record_attributes, config[:mocked])
+      model_tests(@zone.records, aaaa_record_attributes, config[:mocked])
+      model_tests(@zone.records, cname_record_attributes, config[:mocked])
 
       @zone.destroy
     end

data/tests/ecloud/compute/models/admin_organization_tests.rb

@@ -0,0 +1,16 @@
+provider, config = :ecloud, compute_providers[:ecloud]
+
+Shindo.tests("Fog::Compute[:#{provider}] | admin_organizations", [provider.to_s]) do
+  connection = Fog::Compute[provider]
+  @organization = connection.organizations.first
+  @admin_organization = @organization.admin
+
+  tests('#get').succeeds do
+    fetched_admin_organization = connection.get_admin_organization(@admin_organization.href)
+    returns(true) { !fetched_admin_organization.nil? }
+  end
+
+  tests('#ssh_keys').succeeds do
+    returns(true, "a list of SshKeys") { @admin_organization.ssh_keys.is_a?(Fog::Compute::Ecloud::SshKeys) }
+  end
+end

data/tests/ecloud/compute/models/compute_pool_tests.rb

@@ -0,0 +1,17 @@
+provider, config = :ecloud, compute_providers[:ecloud]
+
+Shindo.tests("Fog::Compute[:#{provider}] | compute_pools", [provider.to_s]) do
+  connection = Fog::Compute[provider]
+  @organization = connection.organizations.first
+  @environment = @organization.environments.first
+
+  tests('#all').succeeds do
+    returns(false) { @environment.compute_pools.all.empty? }
+  end
+
+  tests('#get').succeeds do
+    compute_pool = @environment.compute_pools.all.first
+    fetched_compute_pool = connection.compute_pools.get(compute_pool.href)
+    returns(true) { !fetched_compute_pool.nil? }
+  end
+end