fog 1.22.1 → 1.23.0

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.22.1'
+  VERSION = '1.23.0'
 end

data/lib/fog/vsphere/compute.rb

@@ -109,6 +109,7 @@ module Fog
           :corespersocket   => 'config.hardware.numCoresPerSocket',
           :overall_status => 'overallStatus',
           :guest_id => 'config.guestId',
+          :hardware_version => 'config.version',
         }
 
         def convert_vm_view_to_attr_hash(vms)
@@ -153,7 +154,6 @@ module Fog
             attrs['mac_addresses'] = Proc.new {vm_mob_ref.macs rescue nil}
             # Rescue nil to catch testing while vm_mob_ref isn't reaL??
             attrs['path'] = "/"+attrs['parent'].path.map(&:last).join('/') rescue nil
-            attrs['relative_path'] = (attrs['path'].split('/').reject {|e| e.empty?} - ["Datacenters", attrs['datacenter'], "vm"]).join("/") rescue nil
           end
         end
         # returns the parent object based on a type

data/lib/fog/vsphere/models/compute/interfaces.rb

@@ -7,10 +7,10 @@ module Fog
       class Interfaces < Fog::Collection
         model Fog::Compute::Vsphere::Interface
 
-        attribute :server
+        attribute :server_id
 
         def all(filters = {})
-          requires :server
+          requires :server_id
 
           case server
             when Fog::Compute::Vsphere::Server
@@ -26,7 +26,7 @@ module Fog
         end
 
         def get(id)
-          requires :server
+          requires :server_id
 
           case server
             when Fog::Compute::Vsphere::Server
@@ -46,13 +46,22 @@ module Fog
         end
 
         def new(attributes = {})
-          if server
-            super({ :server_id => server.id  }.merge(attributes))
+          if server_id
+            super({ :server_id => server_id  }.merge(attributes))
           else
             super
           end
         end
-     end
+
+        def server
+          return nil if server_id.nil?
+          service.servers.get(server_id)
+        end
+
+        def server=(new_server)
+          server_id = new_server.id
+        end
+      end
     end
   end
 end

data/lib/fog/vsphere/models/compute/server.rb

@@ -32,7 +32,6 @@ module Fog
         attribute :connection_state
         attribute :mo_ref
         attribute :path
-        attribute :relative_path
         attribute :memory_mb
         attribute :cpus
         attribute :corespersocket
@@ -45,6 +44,7 @@ module Fog
         attribute :resource_pool
         attribute :instance_uuid # move this --> id
         attribute :guest_id
+        attribute :hardware_version
         attribute :scsi_controller # this is the first scsi controller. Right now no more of them can be used.
 
         def initialize(attributes={} )
@@ -121,7 +121,7 @@ module Fog
         #   * See more options in vm_clone request/compute/vm_clone.rb
         #
         def clone(options = {})
-          requires :name, :datacenter, :relative_path
+          requires :name, :datacenter, :path
 
           # Convert symbols to strings
           req_options = options.reduce({}) { |hsh, (k,v)| hsh[k.to_s] = v; hsh }
@@ -182,7 +182,7 @@ module Fog
         end
 
         def interfaces
-          attributes[:interfaces] ||= id.nil? ? [] : service.interfaces( :server => self )
+          attributes[:interfaces] ||= id.nil? ? [] : service.interfaces( :server_id => self.id )
         end
 
         def interface_ready? attrs
@@ -207,7 +207,7 @@ module Fog
         end
 
         def volumes
-          attributes[:volumes] ||= id.nil? ? [] : service.volumes(:server => self)
+          attributes[:volumes] ||= id.nil? ? [] : service.volumes(:server_id => self.id)
         end
 
         def customvalues
@@ -246,6 +246,12 @@ module Fog
           super
         end
 
+        def relative_path
+          requires :path, :datacenter
+
+          (path.split('/').reject {|e| e.empty?} - ["Datacenters", datacenter, "vm"]).join("/")
+        end
+
         private
 
         def defaults

data/lib/fog/vsphere/models/compute/volumes.rb

@@ -5,12 +5,12 @@ module Fog
   module Compute
     class Vsphere
       class Volumes < Fog::Collection
-        attribute :server
+        attribute :server_id
 
         model Fog::Compute::Vsphere::Volume
 
         def all(filters = {})
-          requires :server
+          requires :server_id
 
           case server
             when Fog::Compute::Vsphere::Server
@@ -30,16 +30,25 @@ module Fog
         end
 
         def new(attributes = {})
-          if server
+          if server_id
             # Default to the root volume datastore if one is not configured.
             datastore = ! attributes.key?(:datastore) && self.any? ? self.first.datastore : nil
 
-            super({ :server_id => server.id, :datastore => datastore }.merge!(attributes))
+            super({ :server_id => server_id, :datastore => datastore }.merge!(attributes))
           else
             super
           end
         end
-     end
+
+        def server
+          return nil if server_id.nil?
+          service.servers.get(server_id)
+        end
+
+        def server=(new_server)
+          server_id = new_server.id
+        end
+      end
     end
   end
 end

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

@@ -8,6 +8,7 @@ module Fog
           vm_cfg        = {
             :name         => attributes[:name],
             :guestId      => attributes[:guest_id],
+            :version      => attributes[:hardware_version],
             :files        => { :vmPathName => vm_path_name(attributes) },
             :numCPUs      => attributes[:cpus],
             :numCoresPerSocket => attributes[:corespersocket],

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

@@ -74,9 +74,6 @@ module Fog
           # Added for people still using options['path']
           template_path = options['path'] || options['template_path']
 
-          # Default wait enabled
-          options['wait'] = true
-
           # Options['template_path']<~String>
           # Added for people still using options['path']
           template_path = options['path'] || options['template_path']
@@ -244,7 +241,7 @@ module Fog
           # to set 'wait' => true if your app wants to wait.  Otherwise, you're
           # going to have to reload the server model over and over which
           # generates a lot of time consuming API calls to vmware.
-          if options['wait'] then
+          if options.fetch('wait', true) then
             # REVISIT: It would be awesome to call a block passed to this
             # request to notify the application how far along in the process we
             # are.  I'm thinking of updating a progress bar, etc...
@@ -253,7 +250,7 @@ module Fog
             tries = 0
             new_vm = begin
               # Try and find the new VM (folder.find is quite efficient)
-              folder.find(options['name'], RbVmomi::VIM::VirtualMachine) or raise Fog::Vsphere::Errors::NotFound
+              dest_folder.find(options['name'], RbVmomi::VIM::VirtualMachine) or raise Fog::Vsphere::Errors::NotFound
             rescue Fog::Vsphere::Errors::NotFound
               tries += 1
               if tries <= 10 then

data/lib/fog/xenserver/requests/compute/create_server.rb

@@ -55,8 +55,7 @@ module Fog
             :actions_after_shutdown =>  'Destroy',
             :actions_after_reboot =>    'Restart',
             :actions_after_crash =>     'Restart',
-            :platform =>                { 'nx' => false, 'acpi' => true, 'apic' => 'true', 'pae' => true, 'viridian' => true},
-            :platform =>                {},
+            :platform =>                { :'nx' => 'true', :'acpi' => 'true', :'apic' => 'true', :'pae' => 'true', :'viridian' => 'true' },
             :other_config =>            {},
             :pool_name =>               '',
             :PV_bootloader =>           'pygrub', #pvgrub, eliloader

data/lib/fog/xml.rb

@@ -1,28 +1,4 @@
 require "nokogiri"
 require "fog/core/parser"
 require "fog/xml/sax_parser_connection"
-
-module Fog
-  # @note Extracting XML components out of core is a work in progress.
-  #
-  # The {XML} module includes functionality that is common between APIs using
-  # XML to send and receive data.
-  #
-  # The intent is to provide common code for provider APIs using XML but not
-  # require it for those using JSON.
-  #
-  # @todo Add +require "fog/xml"+ and/or +include Fog::XML+ to providers using
-  #   its services
-  #
-  module XML
-    class Connection < Fog::XML::SAXParserConnection
-      def request(params, &block)
-        if (parser = params.delete(:parser))
-          super(parser, params)
-        else
-          original_request(params)
-        end
-      end
-    end
-  end
-end
+require "fog/xml/connection"

data/lib/fog/xml/connection.rb

@@ -1,6 +1,17 @@
 module Fog
+  # @note Extracting XML components out of core is a work in progress.
+  #
+  # The {XML} module includes functionality that is common between APIs using
+  # XML to send and receive data.
+  #
+  # The intent is to provide common code for provider APIs using XML but not
+  # require it for those using JSON.
+  #
+  # @todo Add +require "fog/xml"+ and/or +include Fog::XML+ to providers using
+  #   its services
+  #
   module XML
-    class Connection < SAXParserConnection
+    class Connection < Fog::XML::SAXParserConnection
       def request(params, &block)
         if (parser = params.delete(:parser))
           super(parser, params)

data/lib/fog/zerigo/requests/dns/list_hosts.rb

@@ -2,12 +2,16 @@ module Fog
   module DNS
     class Zerigo
       class Real
-        require 'fog/zerigo/parsers/dns/list_hosts'
+        require "fog/zerigo/parsers/dns/list_hosts"
 
         # Get list of all DNS zones hosted on Slicehost (for this account)
         #
         # ==== Parameters
         # * zone_id<~Integer> - the zone ID of the zone from which to get the host records for
+        # * 'options'<~Hash> - optional parameters
+        #   * 'page' <~Integer>
+        #   * 'per_page' <~Integer>
+        #   * 'fqdn' <~String>
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
@@ -24,10 +28,11 @@ module Fog
         #       * 'updated-at'<~String>
         #       * 'zone-id'<~String>
         # * 'status'<~Integer> - 200 indicates success
-        def list_hosts(zone_id)
+        def list_hosts(zone_id, options={})
           request(
+            :query    => options,
             :expects  => 200,
-            :method   => 'GET',
+            :method   => "GET",
             :parser   => Fog::Parsers::DNS::Zerigo::ListHosts.new,
             :path     => "/api/1.1/zones/#{zone_id}/hosts.xml"
           )
@@ -35,16 +40,27 @@ module Fog
       end
 
       class Mock # :nodoc:all
-        def list_hosts(zone_id)
+        def list_hosts(zone_id, options={})
           zone = find_by_zone_id(zone_id)
 
           response = Excon::Response.new
 
           if zone
-            response.status = 200
-            response.body = {
-              'hosts' => zone['hosts']
-            }
+            if options.empty?
+              response.status = 200
+              response.body = {
+                "hosts" => zone["hosts"]
+              }
+            else
+              hosts = zone["hosts"]
+              hosts = hosts.select {|h| h["fqdn"] == options["fqdn"]} if options["fqdn"]
+              hosts = options["per_page"] ? hosts.each_slice(options["per_page"] - 1).to_a : hosts.each_slice(100).to_a
+              hosts = options["page"] ? hosts[options["page"]] : hosts[0]
+              response.status = 200
+              response.body = {
+                "hosts" => hosts
+              }
+            end
           else
             response.status = 404
           end

data/tests/aws/models/compute/network_acls_tests.rb

@@ -3,5 +3,18 @@ Shindo.tests("Fog::Compute[:aws] | network_acls", ['aws']) do
 
   collection_tests(Fog::Compute[:aws].network_acls, { :vpc_id => @vpc.id }, true)
 
+  tests('tags') do
+    test_tags = {'foo' => 'bar'}
+    @acl = Fog::Compute[:aws].network_acls.create(:vpc_id => @vpc.id, :tags => test_tags)
+
+    tests('@acl.tags').returns(test_tags) do
+      @acl.reload.tags
+    end
+
+    unless Fog.mocking?
+      Fog::Compute[:aws].tags.all('resource-id' => @acl.identity).each {|tag| tag.destroy}
+    end
+  end
+
   @vpc.destroy
 end

data/tests/aws/models/compute/security_group_tests.rb

@@ -8,6 +8,9 @@ Shindo.tests("Fog::Compute[:aws] | security_group", ['aws']) do
     @other_group = Fog::Compute[:aws].security_groups.create(:name => 'fog other group', :description => 'another fog group')
     @other_group.reload
 
+    @other_user_id = Fog::AWS::Mock.owner_id
+    @other_users_group_id = Fog::AWS::Mock.security_group_id
+
     test("authorize access by another security group") do
       @group.authorize_group_and_owner(@other_group.name)
       @group.reload
@@ -35,7 +38,8 @@ Shindo.tests("Fog::Compute[:aws] | security_group", ['aws']) do
     group_forms = [
       "#{@other_group.owner_id}:#{@other_group.group_id}", # deprecated form
       @other_group.group_id,
-      {@other_group.owner_id => @other_group.group_id}
+      {@other_group.owner_id => @other_group.group_id},
+      {@other_user_id => @other_users_group_id}
     ]
 
     group_forms.each do |group_arg|

data/tests/aws/models/compute/vpcs_tests.rb

@@ -2,4 +2,18 @@ Shindo.tests("Fog::Compute[:aws] | vpcs", ['aws']) do
 
   collection_tests(Fog::Compute[:aws].vpcs, {:cidr_block => '10.0.10.0/28'}, true)
 
+  tests('tags') do
+    test_tags = {'foo' => 'bar'}
+    @vpc = Fog::Compute[:aws].vpcs.create(:cidr_block => '1.2.3.4/24', :tags => test_tags)
+
+    tests('@vpc.tags').returns(test_tags) do
+      @vpc.reload.tags
+    end
+
+    unless Fog.mocking?
+      Fog::Compute[:aws].tags.all('resource-id' => @vpc.id).each {|tag| tag.destroy}
+    end
+
+    @vpc.destroy
+  end
 end

data/tests/aws/requests/compute/instance_tests.rb

@@ -28,6 +28,7 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
     'privateDnsName'      => NilClass,
     'productCodes'        => Array,
     'reason'              => Fog::Nullable::String,
+    'rootDeviceName'      => Fog::Nullable::String,
     'rootDeviceType'      => String,
     'sourceDestCheck'     => Fog::Nullable::Boolean,
     'subnetId'            => Fog::Nullable::String,
@@ -175,7 +176,7 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
     key = Fog::Compute[:aws].key_pairs.create(:name => key_name)
 
     tests("#run_instances").formats(@run_instances_format) do
-      data = Fog::Compute[:aws].run_instances(@ami, 1, 1, 'InstanceType' => 't1.micro', 'KeyName' => key_name).body
+      data = Fog::Compute[:aws].run_instances(@ami, 1, 1, 'InstanceType' => 't1.micro', 'KeyName' => key_name, 'BlockDeviceMapping' => [{"DeviceName" => "/dev/sdp1", "VirtualName" => nil, "Ebs.VolumeSize" => 15}]).body
       @instance_id = data['instancesSet'].first['instanceId']
       data
     end

data/tests/aws/requests/compute/network_acl_tests.rb

@@ -77,12 +77,36 @@ Shindo.tests('Fog::Compute[:aws] | network acl requests', ['aws']) do
       Fog::Compute[:aws].replace_network_acl_association(@assoc_id, default_acl['networkAclId']).body
     end
 
+    # Create another network acl to test tag filters
+    test_tags = {'foo' => 'bar'}
+    @another_acl = Fog::Compute[:aws].network_acls.create :vpc_id => @vpc.id, :tags => test_tags
+    tests("#describe_network_acls('tag-key' => 'foo')").formats(@network_acls_format) do
+      body = Fog::Compute[:aws].describe_network_acls('tag-key' => 'foo').body
+      tests("returns 1 acl").returns(1) { body['networkAclSet'].size }
+      body
+    end
+
+    tests("#describe_network_acls('tag-value' => 'bar')").formats(@network_acls_format) do
+      body = Fog::Compute[:aws].describe_network_acls('tag-value' => 'bar').body
+      tests("returns 1 acl").returns(1) { body['networkAclSet'].size }
+      body
+    end
+
+    tests("#describe_network_acls('tag:foo' => 'bar')").formats(@network_acls_format) do
+      body = Fog::Compute[:aws].describe_network_acls('tag:foo' => 'bar').body
+      tests("returns 1 acl").returns(1) { body['networkAclSet'].size }
+      body
+    end
+
     tests('#delete_network_acl').formats(AWS::Compute::Formats::BASIC) do
       Fog::Compute[:aws].delete_network_acl(@network_acl['networkAclId']).body
     end
 
     # Clean up
+    Fog::Compute[:aws].delete_tags(@another_acl.identity, test_tags)
+    @another_acl.destroy
     @subnet.destroy
     @vpc.destroy
+    Fog::Compute::AWS::Mock.reset if Fog.mocking?
   end
 end

data/tests/aws/requests/compute/subnet_tests.rb

@@ -20,6 +20,11 @@ Shindo.tests('Fog::Compute[:aws] | subnet requests', ['aws']) do
     'requestId' => String
   }
 
+  @modify_subnet_format = {
+    'requestId' => String,
+    'return' => Fog::Boolean
+  }
+  
   @vpc_network = '10.0.10.0/24'
   @vpc=Fog::Compute[:aws].vpcs.create('cidr_block' => @vpc_network)
   @vpc_id = @vpc.id
@@ -34,6 +39,10 @@ Shindo.tests('Fog::Compute[:aws] | subnet requests', ['aws']) do
       data
     end
 
+    tests("modify_subnet('#{@subnet_id}'").formats(@modify_subnet_format) do
+      Fog::Compute[:aws].modify_subnet_attribute(@subnet_id, 'MapPublicIpOnLaunch' => true).body
+    end
+
     @vpc2=Fog::Compute[:aws].vpcs.create('cidr_block' => @vpc_network)
     @vpc2_id = @vpc2.id