fog 1.10.1 → 1.11.0

data/lib/fog/vsphere/requests/compute/list_virtual_machines.rb

@@ -22,7 +22,10 @@ module Fog
         def list_all_virtual_machines_in_folder(path, datacenter_name)
           folder = get_raw_vmfolder(path, datacenter_name)
 
-          folder.children.grep(RbVmomi::VIM::VirtualMachine).map(&method(:convert_vm_mob_ref_to_attr_hash))
+          vms = folder.children.grep(RbVmomi::VIM::VirtualMachine)
+          # remove all template based virtual machines
+          vms.delete_if { |v| v.config.nil? or v.config.template }
+          vms.map(&method(:convert_vm_mob_ref_to_attr_hash))
         end
 
         def list_all_virtual_machines(options = { })
@@ -35,12 +38,12 @@ module Fog
               :recursive  => true
             }).view
           end.flatten
-          # remove all template based virtual machines
-          vms.delete_if { |v| v.config.template }
 
-          vms.map do |vm_mob|
-            convert_vm_mob_ref_to_attr_hash(vm_mob)
-          end
+          vms = convert_vm_view_to_attr_hash(vms)
+
+          # remove all template based virtual machines
+          vms.delete_if { |v| v['template'] }
+          vms
         end
 
         def get_folder_path(folder, root = nil)

data/lib/fog/vsphere/requests/compute/vm_clone.rb

@@ -18,7 +18,7 @@ module Fog
             raise ArgumentError, "#{required_options.join(', ')} are required" unless options.has_key? param
           end
           # TODO This is ugly and needs to rethink mocks
-          unless ENV['FOG_MOCK']
+          unless Fog.mock?
             raise ArgumentError, "#{options["datacenter"]} Doesn't Exist!" unless get_datacenter(options["datacenter"])
             raise ArgumentError, "#{options["template_path"]} Doesn't Exist!" unless get_virtual_machine(options["template_path"], options["datacenter"])
           end
@@ -29,54 +29,55 @@ module Fog
       class Real
         include Shared
 
-        # Clones a VM from a template or existing machine on your vSphere 
-        # Server.  
+        # Clones a VM from a template or existing machine on your vSphere
+        # Server.
         #
         # ==== Parameters
         # * options<~Hash>:
-        #   * 'datacenter'<~String> - *REQUIRED* Datacenter name your cloning 
+        #   * 'datacenter'<~String> - *REQUIRED* Datacenter name your cloning
         #     in. Make sure this datacenter exists, should if you're using
         #     the clone function in server.rb model.
-        #   * 'template_path'<~String> - *REQUIRED* The path to the machine you 
+        #   * 'template_path'<~String> - *REQUIRED* The path to the machine you
         #     want to clone FROM. Relative to Datacenter (Example:
         #     "FolderNameHere/VMNameHere")
-        #   * 'name'<~String> - *REQUIRED* The VMName of the Destination  
+        #   * 'name'<~String> - *REQUIRED* The VMName of the Destination
         #   * 'dest_folder'<~String> - Destination Folder of where 'name' will
         #     be placed on your cluster. Relative Path to Datacenter E.G.
         #     "FolderPlaceHere/anotherSub Folder/onemore"
-        #   * 'power_on'<~Boolean> - Whether to power on machine after clone. 
+        #   * 'power_on'<~Boolean> - Whether to power on machine after clone.
         #     Defaults to true.
         #   * 'wait'<~Boolean> - Whether the method should wait for the virtual
-        #     machine to finish cloning before returning information from 
+        #     machine to finish cloning before returning information from
         #     vSphere. Broken right now as you cannot return a model of a serer
         #     that isn't finished cloning. Defaults to True
-        #   * 'resource_pool'<~Array> - The resource pool on your datacenter 
+        #   * 'resource_pool'<~Array> - The resource pool on your datacenter
         #     cluster you want to use. Only works with clusters within same
         #     same datacenter as where you're cloning from. Datacenter grabbed
-        #     from template_path option. 
+        #     from template_path option.
         #     Example: ['cluster_name_here','resource_pool_name_here']
         #   * 'datastore'<~String> - The datastore you'd like to use.
         #       (datacenterObj.datastoreFolder.find('name') in API)
         #   * 'transform'<~String> - Not documented - see http://www.vmware.com/support/developer/vc-sdk/visdk41pubs/ApiReference/vim.vm.RelocateSpec.html
+        #   * 'numCPUs'<~Integer> - the number of Virtual CPUs of the Destination VM
+        #   * 'memoryMB'<~Integer> - the size of memory of the Destination VM in MB
         #   * customization_spec<~Hash>: Options are marked as required if you
         #     use this customization_spec. Static IP Settings not configured.
         #     This only support cloning and setting DHCP on the first interface
-        #     * 'domain'<~String> - *REQUIRED* This is put into 
+        #     * 'domain'<~String> - *REQUIRED* This is put into
         #       /etc/resolve.conf (we hope)
-        #     * 'hostname'<~String> - Hostname of the Guest Os - default is 
+        #     * 'hostname'<~String> - Hostname of the Guest Os - default is
         #       options['name']
-        #     * 'hw_utc_clock'<~Boolean> - *REQUIRED* Is hardware clock UTC? 
+        #     * 'hw_utc_clock'<~Boolean> - *REQUIRED* Is hardware clock UTC?
         #       Default true
-        #     * 'time_zone'<~String> - *REQUIRED* Only valid linux options 
+        #     * 'time_zone'<~String> - *REQUIRED* Only valid linux options
         #       are valid - example: 'America/Denver'
-        #
         def vm_clone(options = {})
           # Option handling
           options = vm_clone_check_options(options)
 
           # Added for people still using options['path']
           template_path = options['path'] || options['template_path']
-          
+
           # Default wait enabled
           options['wait'] = true
 
@@ -107,16 +108,17 @@ module Fog
           # If the vm given did return a valid resource pool, default to using it for the clone.
           # Even if specific pools aren't implemented in this environment, we will still get back
           # at least the cluster or host we can pass on to the clone task
-          # This catches if resource_pool option is set but comes back nil and if resourcePool is 
-          # already set. 
+          # This catches if resource_pool option is set but comes back nil and if resourcePool is
+          # already set.
           resource_pool ||= vm_mob_ref.resourcePool.nil? ? esx_host.parent.resourcePool : vm_mob_ref.resourcePool
-                    
+
           # Options['datastore']<~String>
           # Grab the datastore object if option is set
           datastore_obj = get_raw_datastore(options['datastore'], options['datacenter']) if options.has_key?('datastore')
           # confirm nil if nil or option is not set
           datastore_obj ||= nil
-          
+          virtual_machine_config_spec = RbVmomi::VIM::VirtualMachineConfigSpec()
+
           # Options['network']
           # Build up the config spec
           if ( options.has_key?('network_label') )
@@ -137,10 +139,13 @@ module Fog
             device_spec = RbVmomi::VIM::VirtualDeviceConfigSpec(
               :operation => config_spec_operation,
               :device => device)
-            virtual_machine_config_spec = RbVmomi::VIM::VirtualMachineConfigSpec(
-              :deviceChange => [device_spec])
+            virtual_machine_config_spec.deviceChange = [device_spec]
           end
-          
+          # Options['numCPUs'] or Options['memoryMB']
+          # Build up the specification for Hardware, for more details see ____________
+          # https://github.com/rlane/rbvmomi/blob/master/test/test_serialization.rb
+          virtual_machine_config_spec.numCPUs = options['numCPUs'] if  ( options.has_key?('numCPUs') )
+          virtual_machine_config_spec.memoryMB = options['memoryMB'] if ( options.has_key?('memoryMB') )
           # Options['customization_spec']
           # Build up all the crappy tiered objects like the perl method
           # Collect your variables ifset (writing at 11pm revist me)
@@ -186,7 +191,16 @@ module Fog
               :nicSettingMap => cust_adapter_mapping)
           end
           customization_spec ||= nil
-          
+
+          # FIXME: pad this out with the rest of the useful things in VirtualMachineConfigSpec
+          # http://www.vmware.com/support/developer/vc-sdk/visdk41pubs/ApiReference/vim.vm.ConfigSpec.html
+          if options.has_key?('memoryMB') || options.has_key?('numCPUs')
+            virtual_machine_config_spec = {
+              :memoryMB => options['memoryMB'],
+              :numCPUs  => options['numCPUs']
+            }
+          end
+
           relocation_spec=nil
           if ( options['linked_clone'] )
             # cribbed heavily from the rbvmomi clone_vm.rb
@@ -221,7 +235,7 @@ module Fog
                                                                       :pool => resource_pool,
                                                                       :diskMoveType => :moveChildMostDiskBacking)
           else
-            relocation_spec = RbVmomi::VIM.VirtualMachineRelocateSpec(:datastore => datastore_obj, 
+            relocation_spec = RbVmomi::VIM.VirtualMachineRelocateSpec(:datastore => datastore_obj,
                                                                       :pool => resource_pool,
                                                                       :transform => options['transform'] || 'sparse')
           end
@@ -231,7 +245,7 @@ module Fog
                                                             :customization => customization_spec,
                                                             :powerOn  => options.has_key?('power_on') ? options['power_on'] : true,
                                                             :template => false)
-          
+
           # Perform the actual Clone Task
           task = vm_mob_ref.CloneVM_Task(:folder => dest_folder,
                                          :name => options['name'],
@@ -260,7 +274,7 @@ module Fog
               nil
             end
           end
-          
+
           # Return hash
           {
             'vm_ref'        => new_vm ? new_vm._ref : nil,

data/lib/fog/xenserver/CHANGELOG.md

@@ -1,4 +1,4 @@
-# 1.11.0 2013/04/04
+# 1.10.1 2013/04/04
 
 * It's now possible to manage XS/XCP VLANs and Networks
 

data/lib/fog/xenserver/models/compute/network.rb

@@ -59,7 +59,7 @@ module Fog
         #     net = service.networks.create :name => 'foonet',
         #                                   :description => 'test network'
         #
-        # @returns [Boolean]
+        # @return [Boolean]
         #
         def save
           requires :name
@@ -77,7 +77,7 @@ module Fog
         #     net = service.networks.find { |net| net.name == 'foonet' }
         #     net.destroy
         #
-        # @returns [Boolean]
+        # @return [Boolean]
         #
         def destroy
           requires :reference

data/lib/tasks/changelog_task.rb

@@ -14,7 +14,6 @@ module Fog
           changelog << ('=' * changelog[0].length)
           changelog << ''
 
-          require 'multi_json'
           github_repo_data = Fog::JSON.decode(Excon.get('https://api.github.com/repos/fog/fog').body)
           data = github_repo_data.reject {|key, value| !['forks', 'open_issues', 'watchers'].include?(key)}
           github_collaborator_data = Fog::JSON.decode(Excon.get('https://api.github.com/repos/fog/fog/collaborators').body)
@@ -61,9 +60,11 @@ module Fog
               'geemus',
               'Henry Addison',
               'Kevin Menard',
+              'Kyle Rames',
               'Lincoln Stoll',
               'Luqman Amjad',
               'Michael Zeng',
+              'Nat Welch',
               'Nick Osborn',
               'nightshade427',
               'Patrick Debois',

data/tests/aws/models/storage/directory_tests.rb

@@ -1,7 +1,43 @@
 Shindo.tests("Storage[:aws] | directory", ["aws"]) do
 
   directory_attributes = {
-    :key => 'fogdirectorytests'
+    :key => uniq_id('fogdirectorytests')
+  }
+
+  model_tests(Fog::Storage[:aws].directories, directory_attributes, Fog.mocking?) do
+    tests("#public_url").returns(nil) do
+      @instance.public_url
+    end
+
+    @instance.acl = 'public-read'
+    @instance.save
+
+    tests("#public_url").returns(true) do
+      if @instance.public_url =~ %r[\Ahttps://fogdirectorytests-[\da-f]+\.s3\.amazonaws\.com/\z]
+        true
+      else
+        @instance.public_url
+      end
+    end
+  end
+
+  directory_attributes = {
+    :key => uniq_id('different-region'),
+    :location => 'eu-west-1',
+  }
+
+  model_tests(Fog::Storage[:aws].directories, directory_attributes, Fog.mocking?) do
+    tests("#location").returns('eu-west-1') do
+      @instance.location
+    end
+
+    tests("#location").returns('eu-west-1') do
+      Fog::Storage[:aws].directories.get(@instance.identity).location
+    end
+  end
+
+  directory_attributes = {
+    :key => uniq_id('fogdirectorytests')
   }
 
   model_tests(Fog::Storage[:aws].directories, directory_attributes, Fog.mocking?) do
@@ -13,7 +49,7 @@ Shindo.tests("Storage[:aws] | directory", ["aws"]) do
 
       tests("#versioning=(true) sets versioning to 'Enabled'").returns('Enabled') do
         @instance.versioning = true
-        @instance.connection.get_bucket_versioning(@instance.key).body['VersioningConfiguration']['Status']
+        @instance.service.get_bucket_versioning(@instance.key).body['VersioningConfiguration']['Status']
       end
 
       tests("#versioning=(false)").succeeds do
@@ -22,7 +58,7 @@ Shindo.tests("Storage[:aws] | directory", ["aws"]) do
 
       tests("#versioning=(false) sets versioning to 'Suspended'").returns('Suspended') do
         @instance.versioning = false
-        @instance.connection.get_bucket_versioning(@instance.key).body['VersioningConfiguration']['Status']
+        @instance.service.get_bucket_versioning(@instance.key).body['VersioningConfiguration']['Status']
       end
     end
 
@@ -36,12 +72,12 @@ Shindo.tests("Storage[:aws] | directory", ["aws"]) do
       end
 
       tests("#versioning? true if enabled").returns(true) do
-        @instance.connection.put_bucket_versioning(@instance.key, 'Enabled')
+        @instance.service.put_bucket_versioning(@instance.key, 'Enabled')
         @instance.versioning?
       end
 
       tests("#versioning? false if suspended").returns(false) do
-        @instance.connection.put_bucket_versioning(@instance.key, 'Suspended')
+        @instance.service.put_bucket_versioning(@instance.key, 'Suspended')
         @instance.versioning?
       end
     end

data/tests/aws/models/storage/file_tests.rb

@@ -9,8 +9,7 @@ Shindo.tests("Storage[:aws] | file", ["aws"]) do
   }
 
   directory_attributes = {
-    # Add a random suffix to prevent collision
-    :key => "fogfilestests-#{rand(65536)}"
+    :key => uniq_id("fogfilestests")
   }
 
   @directory = Fog::Storage[:aws].directories.create(directory_attributes)

data/tests/aws/models/storage/files_tests.rb

@@ -7,7 +7,7 @@ Shindo.tests("Storage[:aws] | files", ["aws"]) do
   }
 
   directory_attributes = {
-      :key => 'fogfilestests'
+      :key => uniq_id('fogfilestests')
   }
 
   @directory = Fog::Storage[:aws].directories.create(directory_attributes)
@@ -16,9 +16,9 @@ Shindo.tests("Storage[:aws] | files", ["aws"]) do
   model_tests(@directory.files, file_attributes, Fog.mocking?) do
 
     v1 = @instance.version
-    v2 = @directory.connection.put_object(@directory.key, @instance.key, 'version 2 content').headers['x-amz-version-id']
-    v3 = @directory.connection.delete_object(@directory.key, @instance.key).headers['x-amz-version-id']
-    v4 = @directory.connection.put_object(@directory.key, @instance.key, 'version 3 content').headers['x-amz-version-id']
+    v2 = @directory.service.put_object(@directory.key, @instance.key, 'version 2 content').headers['x-amz-version-id']
+    v3 = @directory.service.delete_object(@directory.key, @instance.key).headers['x-amz-version-id']
+    v4 = @directory.service.put_object(@directory.key, @instance.key, 'version 3 content').headers['x-amz-version-id']
 
     tests("#get") do
       tests("#get without version fetches the latest version").returns(v4) do
@@ -30,6 +30,7 @@ Shindo.tests("Storage[:aws] | files", ["aws"]) do
       end
 
       tests("#get with a deleted version returns nil").returns(nil) do
+        pending # getting 405 Method Not Allowed
         @directory.files.get(@instance.key, 'versionId' => v3)
       end
     end
@@ -44,6 +45,7 @@ Shindo.tests("Storage[:aws] | files", ["aws"]) do
       end
 
       tests("#head with a deleted version returns nil").returns(nil) do
+        pending # getting 405 Method Not Allowed
         @directory.files.head(@instance.key, 'versionId' => v3)
       end
     end

data/tests/aws/models/storage/url_tests.rb

@@ -14,15 +14,17 @@ Shindo.tests('AWS | url', ["aws"]) do
   @file = @storage.directories.new(:key => 'fognonbucket').files.new(:key => 'test.txt')
 
   if Fog.mock?
-    signature = Fog::Storage::AWS.new.signature(nil)
+    signature = Fog::Storage::AWS.new.signature(nil, nil)
   else
     signature = 'tajHIhKHAdFYsigmzybCpaq8N0Q%3D'
   end
 
-  tests('#url w/ response-cache-control').returns(
-    "https://fognonbucket.s3.amazonaws.com/test.txt?response-cache-control=No-cache&AWSAccessKeyId=123&Signature=#{signature}&Expires=1356998400"
-  ) do
-    @file.url(@expires, :query => { 'response-cache-control' => 'No-cache' })
+  if RUBY_VERSION > '1.8.7' # ruby 1.8.x doesn't provide hash ordering
+    tests('#url w/ response-cache-control').returns(
+      "https://fognonbucket.s3.amazonaws.com/test.txt?response-cache-control=No-cache&AWSAccessKeyId=123&Signature=#{signature}&Expires=1356998400"
+    ) do
+      @file.url(@expires, :query => { 'response-cache-control' => 'No-cache' })
+    end
   end
 
 end

data/tests/aws/models/storage/version_tests.rb

@@ -7,7 +7,7 @@ Shindo.tests("Storage[:aws] | version", ["aws"]) do
   }
 
   directory_attributes = {
-      :key => 'fogfilestests'
+      :key => uniq_id('fogfilestests')
   }
 
   @directory = Fog::Storage[:aws].directories.create(directory_attributes)
@@ -16,7 +16,7 @@ Shindo.tests("Storage[:aws] | version", ["aws"]) do
   model_tests(@directory.files, file_attributes, Fog.mocking?) do
 
     @version_instance = @instance.versions.first
-    @directory.connection.put_object(@directory.key, @instance.key, 'second version content')
+    @directory.service.put_object(@directory.key, @instance.key, 'second version content')
 
     tests("#file") do
       tests("#file should return the object associated with the version").returns(@version_instance.version) do

data/tests/aws/models/storage/versions_tests.rb

@@ -7,24 +7,24 @@ Shindo.tests("Storage[:aws] | versions", ["aws"]) do
   }
 
   directory_attributes = {
-      :key => 'fogfilestests'
+      :key => uniq_id('fogfilestests')
   }
 
   model_tests(Fog::Storage[:aws].directories, directory_attributes, Fog.mocking?) do
     @instance.versioning = true
 
     versions = []
-    versions << @instance.connection.put_object(@instance.key, 'one', 'abcde').headers['x-amz-version-id']
+    versions << @instance.service.put_object(@instance.key, 'one', 'abcde').headers['x-amz-version-id']
 
     puts versions.first
 
-    versions << @instance.connection.put_object(@instance.key, 'one', '32423').headers['x-amz-version-id']
-    versions << @instance.connection.delete_object(@instance.key, 'one').headers['x-amz-version-id']
+    versions << @instance.service.put_object(@instance.key, 'one', '32423').headers['x-amz-version-id']
+    versions << @instance.service.delete_object(@instance.key, 'one').headers['x-amz-version-id']
     versions.reverse!
 
     puts versions.first
 
-    versions << @instance.connection.put_object(@instance.key, 'two', 'aoeu').headers['x-amz-version-id']
+    versions << @instance.service.put_object(@instance.key, 'two', 'aoeu').headers['x-amz-version-id']
 
     tests('#versions') do
       tests('#versions.size includes versions (including DeleteMarkers) for all keys').returns(4) do

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

@@ -6,10 +6,11 @@ Shindo.tests('AWS::IAM | user requests', ['aws']) do
 
     @user_format = {
       'User' => {
-        'Arn'       => String,
-        'Path'      => String,
-        'UserId'    => String,
-        'UserName'  => String
+        'Arn'        => String,
+        'Path'       => String,
+        'UserId'     => String,
+        'UserName'   => String,
+        'CreateDate' => Time
       },
       'RequestId' => String
     }
@@ -20,10 +21,11 @@ Shindo.tests('AWS::IAM | user requests', ['aws']) do
 
     @users_format = {
       'Users' => [{
-        'Arn'       => String,
-        'Path'      => String,
-        'UserId'    => String,
-        'UserName'  => String
+        'Arn'        => String,
+        'Path'       => String,
+        'UserId'     => String,
+        'UserName'   => String,
+        'CreateDate' => Time
       }],
       'IsTruncated' => Fog::Boolean,
       'RequestId'   => String