fog 1.3.1 → 1.4.0

data/tests/aws/requests/iam/user_policy_tests.rb

@@ -20,6 +20,16 @@ Shindo.tests('AWS::IAM | user policy requests', ['aws']) do
       Fog::AWS[:iam].list_user_policies('fog_user_policy_tests').body
     end
 
+    @user_policy_format = {
+      'UserName' => String,
+      'PolicyName' => String,
+      'PolicyDocument' => Hash,
+    }
+
+    tests("#get_user_policy('fog_user_policy_tests', 'fog_policy'").formats(@user_policy_format) do
+      Fog::AWS[:iam].get_user_policy('fog_policy', 'fog_user_policy_tests').body['Policy']
+    end
+
     tests("#delete_user_policy('fog_user_policy_tests', 'fog_policy')").formats(AWS::IAM::Formats::BASIC) do
       Fog::AWS[:iam].delete_user_policy('fog_user_policy_tests', 'fog_policy').body
     end

data/tests/aws/requests/iam/user_tests.rb

@@ -33,6 +33,10 @@ Shindo.tests('AWS::IAM | user requests', ['aws']) do
       Fog::AWS[:iam].list_users.body
     end
 
+    tests("#get_user").formats(@user_format) do
+      Fog::AWS[:iam].get_user('fog_user').body
+    end
+
     tests("#add_user_to_group('fog_user_tests', 'fog_user')").formats(AWS::IAM::Formats::BASIC) do
       Fog::AWS[:iam].add_user_to_group('fog_user_tests', 'fog_user').body
     end

data/tests/aws/requests/sns/subscription_tests.rb

@@ -7,7 +7,7 @@ Shindo.tests('AWS::SES | topic lifecycle tests', ['aws', 'sns']) do
     Fog::AWS[:sqs].set_queue_attributes(
       @queue_url,
       'Policy',
-      MultiJson.encode({
+      Fog::JSON.encode({
         'Id' => @topic_arn,
         'Statement' => {
           'Action'    => 'sqs:SendMessage',
@@ -64,7 +64,7 @@ Shindo.tests('AWS::SES | topic lifecycle tests', ['aws', 'sns']) do
       Fog.wait_for do
         message = Fog::AWS[:sqs].receive_message(@queue_url).body['Message'].first
       end
-      MultiJson.decode(message['Body'])['Message']
+      Fog::JSON.decode(message['Body'])['Message']
     end
 
     tests("#unsubscribe('#{@subscription_arn}')").formats(AWS::SNS::Formats::BASIC) do

data/tests/aws/requests/storage/object_tests.rb

@@ -83,6 +83,11 @@ Shindo.tests('AWS::Storage | object requests', ['aws']) do
     tests("#delete_object('#{@directory.identity}', 'fog_object')").succeeds do
       Fog::Storage[:aws].delete_object(@directory.identity, 'fog_object')
     end
+    
+    tests("#get_object_http_url('#{@directory.identity}', 'fog_object', expiration timestamp)").returns(true) do
+      object_url = Fog::Storage[:aws].get_object_http_url(@directory.identity, 'fog_object', (Time.now + 60))
+      (object_url =~ /http:\/\/#{Regexp.quote(@directory.identity)}\.s3\.amazonaws\.com\/fog_object/) != nil
+    end
 
   end
 

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

@@ -7,6 +7,7 @@ module Fog
       module Interface; end
       module LoadBalancer; end
       module Server; end
+      module ServerGroup; end
       module Zone; end
     end
   end
@@ -30,6 +31,9 @@ NilClass.send :include, Fog::Brightbox::Nullable::LoadBalancer
 Hash.send :include, Fog::Brightbox::Nullable::Server
 NilClass.send :include, Fog::Brightbox::Nullable::Server
 
+Hash.send :include, Fog::Brightbox::Nullable::ServerGroup
+NilClass.send :include, Fog::Brightbox::Nullable::ServerGroup
+
 Hash.send :include, Fog::Brightbox::Nullable::Zone
 NilClass.send :include, Fog::Brightbox::Nullable::Zone
 
@@ -61,6 +65,11 @@ class Brightbox
     end
     module Formats
       module Struct
+        CIP_PORT_TRANSLATOR = {
+          "protocol" => String,
+          "incoming" => Integer,
+          "outgoing" => Integer
+        }
         LB_LISTENER = {
           "in"              => Integer,
           "out"             => Integer,
@@ -100,6 +109,7 @@ class Brightbox
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
+          "name"            => Fog::Nullable::String,
           "public_ip"       => String,
           "status"          => String,
           "reverse_dns"     => String
@@ -168,6 +178,7 @@ class Brightbox
           "name"            => String,
           "status"          => String,
           "hostname"        => String,
+          "fqdn"            => String,
           "created_at"      => String,
           "started_at"      => Fog::Nullable::String,
           "deleted_at"      => Fog::Nullable::String,
@@ -228,13 +239,16 @@ class Brightbox
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
+          "name"            => Fog::Nullable::String,
           "public_ip"       => String,
           "status"          => String,
           "reverse_dns"     => String,
+          "port_translators" => [Brightbox::Compute::Formats::Struct::CIP_PORT_TRANSLATOR],
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
           "interface"       => Fog::Brightbox::Nullable::Interface,
           "load_balancer"   => Fog::Brightbox::Nullable::LoadBalancer,
-          "server"          => Fog::Brightbox::Nullable::Server
+          "server"          => Fog::Brightbox::Nullable::Server,
+          "server_group"     => Fog::Brightbox::Nullable::ServerGroup
         }
 
         FIREWALL_POLICY = {
@@ -306,6 +320,7 @@ class Brightbox
           "name"            => String,
           "status"          => String,
           "hostname"        => String,
+          "fqdn"            => String,
           "created_at"      => String,
           "started_at"      => Fog::Nullable::String,
           "deleted_at"      => Fog::Nullable::String,
@@ -423,13 +438,16 @@ class Brightbox
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
+          "name"            => Fog::Nullable::String,
           "public_ip"       => String,
           "status"          => String,
           "reverse_dns"     => String,
+          "port_translators" => [Brightbox::Compute::Formats::Struct::CIP_PORT_TRANSLATOR],
           "account"         => Fog::Brightbox::Nullable::Account,
           "interface"       => Fog::Brightbox::Nullable::Interface,
           "load_balancer"   => Fog::Brightbox::Nullable::LoadBalancer,
-          "server"          => Fog::Brightbox::Nullable::Server
+          "server"          => Fog::Brightbox::Nullable::Server,
+          "server_group"    => Fog::Brightbox::Nullable::ServerGroup
         }
 
         FIREWALL_POLICY = {
@@ -476,7 +494,8 @@ class Brightbox
           "disk_size"       => Integer,
           "min_ram"         => Fog::Nullable::Integer,
           "ancestor"        => Fog::Brightbox::Nullable::Image,
-          "username"        => Fog::Nullable::String
+          "username"        => Fog::Nullable::String,
+          "licence_name"    => Fog::Nullable::String
         }
 
         INTERFACE = {
@@ -512,6 +531,7 @@ class Brightbox
           "name"            => String,
           "status"          => String,
           "hostname"        => String,
+          "fqdn"            => String,
           "created_at"      => String,
           "started_at"      => Fog::Nullable::String,
           "deleted_at"      => Fog::Nullable::String,

data/tests/cloudstack/requests/virtual_machine_tests.rb

@@ -4,35 +4,35 @@ Shindo.tests('Fog::Compute[:cloudstack] | virtual machine requests', ['cloudstac
     'listvirtualmachinesresponse'  => {
       'count' => Integer,
       'virtualmachine' => [
-        'id' => Integer,
+        'id' => String,
         'name' => String,
         'displayname' => String,
         'account' => String,
-        'domainid' => Integer,
+        'domainid' => String,
         'domain' => String,
         'created' => String,
         'state' => String,
         'haenable' => Fog::Boolean,
-        'zoneid' => Integer,
+        'zoneid' => String,
         'zonename' => String,
         'hostid' => Fog::Nullable::String,
         'hostname' => Fog::Nullable::String,
-        'templateid' => Integer,
+        'templateid' => String,
         'templatename' => String,
         'templatedisplaytext' => String,
         'passwordenabled' => Fog::Boolean,
-        'serviceofferingid' => Integer,
+        'serviceofferingid' => String,
         'serviceofferingname' => String,
         'cpunumber' => Integer,
         'cpuspeed' => Integer,
         'networkkbsread' => Fog::Nullable::Integer,
         'memory' => Integer,
         'cpuused' => Fog::Nullable::String,
-        'guestosid' => Integer,
+        'guestosid' => String,
         'networkkbswrite' => Fog::Nullable::Integer,
         'rootdeviceid' => Integer,
         'rootdevicetype' => String,
-        'hypervisor' => String,
+        'hypervisor' => Fog::Nullable::String,
         'group' => Fog::Nullable::String,
         'groupid' => Fog::Nullable::Integer,
         'isoname' => Fog::Nullable::String,
@@ -43,8 +43,8 @@ Shindo.tests('Fog::Compute[:cloudstack] | virtual machine requests', ['cloudstac
            'description' => Fog::Nullable::String
         ],
         'nic' => [
-          'id' => Integer,
-          'networkid' => Integer,
+          'id' => String,
+          'networkid' => String,
           'netmask' => String,
           'gateway' => String,
           'ipaddress' => String,
@@ -68,4 +68,4 @@ Shindo.tests('Fog::Compute[:cloudstack] | virtual machine requests', ['cloudstac
 
   end
 
-end
+end

data/tests/compute/helper.rb

@@ -15,13 +15,49 @@ def compute_providers
     },
     :brightbox  => {
       :server_attributes => {
-        :image_id => 'img-4gqhs' # Ubuntu Lucid 10.04 server (i686)
+        :image_id => 'img-wwgbb' # Ubuntu Lucid 10.04 server (i686)
       },
       :mocked => false
     },
+    :openstack => {
+      :mocked => true,
+      :server_attributes => {
+        :flavor_ref => 2,
+        :image_ref  => "0e09fbd6-43c5-448a-83e9-0d3d05f9747e",
+        :name       => "fog_#{Time.now.to_i}"
+      }
+    },
+    :cloudstack => {
+      :provider_attributes => {
+        :cloudstack_host => 'http://host.foo'
+      },
+      :server_attributes => {}.tap do |hash|
+        [:zone_id, :network_ids, :image_id, :flavor_id].each do |k|
+          hash[k]= Fog.credentials[:cloudstack] && Fog.credentials[:cloudstack][k]
+        end
+      end,
+      :volume_attributes => {:name => "somevolume"}.tap do |hash|
+        [:zone_id, :disk_offering_id].each do |k|
+          hash[k]= Fog.credentials[:cloudstack] && Fog.credentials[:cloudstack][k]
+        end
+      end,
+      :mocked => true
+    },
     :glesys   => {
+      :server_attributes => {
+        :rootpassword  => "secret_password_#{Time.now.to_i}",
+        :hostname      => "fog.example#{Time.now.to_i}.com"
+      },
       :mocked => false
     },
+    :hp       => {
+      :server_attributes => {
+        :flavor_id => 100,
+        :image_id  => 1242,
+        :name      => "fog_#{Time.now.to_i}"
+      },
+      :mocked => true
+    },
     :ibm => {
       :server_attributes => {},
       :mocked => true
@@ -39,13 +75,6 @@ def compute_providers
       },
       :mocked => true
     },
-    :slicehost  => {
-      :server_attributes => {
-        :image_id => 49, # image 49 = Ubuntu 10.04 LTS (lucid)
-        :name     => "fog_#{Time.now.to_i}"
-      },
-      :mocked => false
-    },
     :voxel      => {
       :server_attributes => {
         :name => "fog.#{Time.now.to_i}",

data/tests/compute/models/flavors_tests.rb

@@ -2,7 +2,7 @@ for provider, config in compute_providers
 
   next if [:glesys, :voxel, :ibm].include?(provider)
 
-  Shindo.tests("Fog::Compute[:#{provider}] | flavors", [provider]) do
+  Shindo.tests("Fog::Compute[:#{provider}] | flavors", [provider.to_s]) do
 
     flavors_tests(Fog::Compute[provider], (config[:flavors_attributes] || {}), config[:mocked])
 

data/tests/compute/models/server_tests.rb

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

data/tests/compute/models/servers_tests.rb

@@ -1,6 +1,7 @@
+
 for provider, config in compute_providers
 
-  Shindo.tests("Fog::Compute[:#{provider}] | servers", [provider]) do
+  Shindo.tests("Fog::Compute[:#{provider}] | servers", [provider.to_s]) do
 
     servers_tests(Fog::Compute[provider], (config[:server_attributes] || {}), config[:mocked])
 

data/tests/dns/helper.rb

@@ -27,9 +27,6 @@ def dns_providers
         :email => 'fog@example.com'
       }
     },
-    :slicehost    => {
-      :mocked => false
-    },
     :zerigo       => {
       :mocked => false
     },

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

@@ -113,11 +113,16 @@ class Glesys
               'max'   => Fog::Nullable::Integer,
               'unit'  => Fog::Nullable::String
             },
-            'cpu'       => [],
+            'cpu'       => {
+              'usage' => Fog::Nullable::Integer,
+              'max'   => Fog::Nullable::Integer,
+              'unit'  => Fog::Nullable::String
+            },
             'uptime'    => {
               'current' => Fog::Nullable::Integer,
               'unit'    => String
-            }
+            },
+            'warnings'  => []
           },
           'status' => {
             'timestamp' => String,

data/tests/helper.rb

@@ -12,9 +12,17 @@ def array_differences(array_a, array_b)
 end
 
 # check to see which credentials are available and add others to the skipped tags list
-all_providers = ['aws', 'bluebox', 'brightbox', 'dnsimple', 'dnsmadeeasy', 'dynect', 'ecloud', 'glesys', 'gogrid', 'google', 'ibm', 'joyent', 'linode', 'local', 'ninefold', 'baremetalcloud', 'openstack', 'ovirt', 'rackspace', 'slicehost', 'stormondemand', 'voxel', 'vsphere', 'zerigo']
+all_providers = ['aws', 'bluebox', 'brightbox', 'cloudstack', 'dnsimple', 'dnsmadeeasy', 'dynect', 'ecloud', 'glesys', 'gogrid', 'google', 'hp', 'linode', 'local', 'ninefold', 'newservers', 'openstack', 'rackspace', 'stormondemand', 'voxel', 'xenserver', 'zerigo']
 available_providers = Fog.available_providers.map {|provider| provider.downcase}
 for provider in (all_providers - available_providers)
   Formatador.display_line("[yellow]Skipping tests for [bold]#{provider}[/] [yellow]due to lacking credentials (add some to '~/.fog' to run them)[/]")
   Thread.current[:tags] << ('-' << provider)
 end
+
+# mark libvirt tests pending if not setup
+begin
+  require('ruby-libvirt')
+rescue LoadError
+  Formatador.display_line("[yellow]Skipping tests for [bold]libvirt[/] [yellow]due to missing `ruby-libvirt` gem.[/]")
+  Thread.current[:tags] << '-libvirt'
+end

data/tests/helpers/mock_helper.rb

@@ -15,6 +15,7 @@ if Fog.mock?
     :bluebox_customer_id              => 'bluebox_customer_id',
     :brightbox_client_id              => 'brightbox_client_id',
     :brightbox_secret                 => 'brightbox_secret',
+    :cloudstack_host                  => 'http://cloudstack.example.org',
     :clodo_api_key                    => 'clodo_api_key',
     :clodo_username                   => 'clodo_username',
     :dnsimple_email                   => 'dnsimple_email',
@@ -30,6 +31,9 @@ if Fog.mock?
     :go_grid_shared_secret            => 'go_grid_shared_secret',
     :google_storage_access_key_id     => 'google_storage_access_key_id',
     :google_storage_secret_access_key => 'google_storage_secret_access_key',
+    :hp_account_id                    => 'hp_account_id',
+    :hp_secret_key                    => 'hp_secret_key',
+    :hp_tenant_id                     => 'hp_tenant_id',
     :ibm_username                     => 'ibm_username',
     :ibm_password                     => 'ibm_password',
     :joyent_username                  => "joyentuser",
@@ -47,13 +51,13 @@ if Fog.mock?
     :openstack_api_key                => 'openstack_api_key',
     :openstack_username               => 'openstack_username',
     :openstack_tenant                 => 'openstack_tenant',
-    :openstack_auth_url               => 'openstack_auth_url',
+    :openstack_auth_url               => 'http://openstack:35357/v2.0/tokens',
     :ovirt_url                        => 'http://ovirt:8080/api',
     :ovirt_username                   => 'admin@internal',
     :ovirt_password                   => '123123',
+    :libvirt_uri                      => 'qemu://libvirt/system',
     :rackspace_api_key                => 'rackspace_api_key',
     :rackspace_username               => 'rackspace_username',
-    :slicehost_password               => 'slicehost_password',
     :storm_on_demand_username         => 'storm_on_demand_username',
     :storm_on_demand_password         => 'storm_on_demand_password',
     :vcloud_host                      => 'vcloud_host',
@@ -69,6 +73,9 @@ if Fog.mock?
     :vsphere_server                   => 'virtualcenter.lan',
     :vsphere_username                 => 'apiuser',
     :vsphere_password                 => 'apipassword',
-    :vsphere_expected_pubkey_hash     => 'abcdef1234567890'
-  }
+    :vsphere_expected_pubkey_hash     => 'abcdef1234567890',
+    :libvirt_uri                      => 'qemu:///system',
+    :libvirt_username                 => 'root',
+    :libvirt_password                 => 'password'
+  }.merge(Fog.credentials)
 end

data/tests/helpers/succeeds_helper.rb

@@ -3,10 +3,9 @@ module Shindo
 
     def succeeds
       test('succeeds') do
-        instance_eval(&Proc.new)
-        true
+        !!instance_eval(&Proc.new)
       end
     end
 
   end
-end
+end

data/tests/hp/models/compute/address_tests.rb

@@ -0,0 +1,18 @@
+Shindo.tests("Fog::Compute[:hp] | address", [:hp]) do
+
+  @base_image_id = ENV["BASE_IMAGE_ID"] || 1242
+
+  model_tests(Fog::Compute[:hp].addresses, {}, true) do
+
+    @server = Fog::Compute[:hp].servers.create(:name => "fogservertests", :flavor_id => 100, :image_id => @base_image_id)
+    @server.wait_for { ready? }
+
+    tests('#server=').succeeds do
+      @instance.server = @server
+    end
+
+    @server.destroy
+
+  end
+
+end

data/tests/hp/models/compute/addresses_tests.rb

@@ -0,0 +1,5 @@
+Shindo.tests("Fog::Compute[:hp] | addresses", [:hp]) do
+
+  collection_tests(Fog::Compute[:hp].addresses, {}, true)
+
+end