fog 1.17.0 → 1.18.0

data/lib/fog/rackspace/requests/compute_v2/delete_image.rb

@@ -10,7 +10,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Delete_Image-d1e4957.html        
+        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Delete_Image-d1e4957.html
         def delete_image(image_id)
           request(
             :expects  => 204,

data/lib/fog/rackspace/requests/compute_v2/list_metadata.rb

@@ -13,7 +13,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Metadata-d1e5089.html       
+        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Metadata-d1e5089.html
         def list_metadata(collection, obj_id)
           request(
             :expects => [200, 203],

data/lib/fog/rackspace/requests/compute_v2/list_servers.rb

@@ -36,7 +36,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Servers-d1e2078.html       
+        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Servers-d1e2078.html
         def list_servers
           request(
             :expects => [200, 203, 300],

data/lib/fog/rackspace/requests/compute_v2/resize_server.rb

@@ -11,7 +11,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @note All resizes are automatically confirmed after 24 hours if you do not explicitly confirm or revert the resize.                
+        # @note All resizes are automatically confirmed after 24 hours if you do not explicitly confirm or revert the resize.
         # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Revert_Resized_Server-d1e4024.html
         #
         # * Status Transition:

data/lib/fog/rackspace/requests/compute_v2/set_metadata.rb

@@ -14,7 +14,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Create_or_Replace_Metadata-d1e5358.html      
+        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Create_or_Replace_Metadata-d1e5358.html
         def set_metadata(collection, obj_id, metadata = {})
           request(
             :expects => [200, 203],

data/lib/fog/rackspace/requests/compute_v2/set_metadata_item.rb

@@ -15,7 +15,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Create_or_Update_a_Metadata_Item-d1e5633.html       
+        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Create_or_Update_a_Metadata_Item-d1e5633.html
         def set_metadata_item(collection, obj_id, key, value)
           request(
             :expects => 200,

data/lib/fog/rackspace/requests/compute_v2/update_metadata.rb

@@ -14,7 +14,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Update_Metadata-d1e5208.html              
+        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Update_Metadata-d1e5208.html
         def update_metadata(collection, obj_id, metadata = {})
           request(
             :expects => [200, 203],

data/lib/fog/rackspace/requests/monitoring/get_monitoring_zone.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class Monitoring
+      class Real
+        def get_monitoring_zone by_id
+          request(
+            :expects  => [200],
+            :method   => 'GET',
+            :path     => "monitoring_zones/#{by_id}"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/monitoring/list_monitoring_zones.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class Monitoring
+      class Real
+        def list_monitoring_zones
+          request(
+            :expects  => [200],
+            :method   => 'GET',
+            :path     => "monitoring_zones"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/storage/get_object_http_url.rb

@@ -0,0 +1,30 @@
+module Fog
+  module Storage
+    class Rackspace
+
+      class Real
+
+        # Get an expiring object http url from Cloud Files
+        #
+        # ==== Parameters
+        # * container<~String> - Name of container containing object
+        # * object<~String> - Name of object to get expiring url for
+        # * expires<~Time> - An expiry time for this url
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~String> - url for object
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        # ==== See Also
+        # http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_TempURL-d1a444.html
+        def get_object_http_url(container, object, expires, options = {})
+          get_object_https_url(container, object, expires, options.merge(:scheme => 'http'))
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/rackspace/requests/storage/get_object_https_url.rb

@@ -34,7 +34,8 @@ module Fog
           hmac = Fog::HMAC.new('sha1', @rackspace_temp_url_key)
           sig  = sig_to_hex(hmac.sign(string_to_sign))
 
-          "https://#{@uri.host}#{object_path_escaped}?temp_url_sig=#{sig}&temp_url_expires=#{expires}"
+          scheme = options[:scheme] ? options[:scheme] : @uri.scheme
+          "#{scheme}://#{@uri.host}#{object_path_escaped}?temp_url_sig=#{sig}&temp_url_expires=#{expires}"
         end
 
         private

data/lib/fog/rackspace/storage.rb

@@ -31,6 +31,7 @@ module Fog
       request :get_containers
       request :get_object
       request :get_object_https_url
+      request :get_object_http_url
       request :head_container
       request :head_containers
       request :head_object

data/lib/fog/vcloud_director/generators/compute/edge_gateway_service_configuration.rb

@@ -28,7 +28,7 @@ module Fog
               lb_config[:Pool].each do |pool|
                 xml.Pool {
                   xml.Name pool[:Name]
-
+                  xml.Description pool[:Description] if pool.key?(:Description)
                   pool[:ServicePort].each do |service_port|
                     xml.ServicePort {
                       xml.IsEnabled service_port[:IsEnabled]
@@ -38,6 +38,7 @@ module Fog
                       xml.HealthCheckPort service_port[:HealthCheckPort]
                       xml.HealthCheck {
                         xml.Mode service_port[:HealthCheck][:Mode]
+                        xml.Uri service_port[:HealthCheck][:Uri]
                         xml.HealthThreshold service_port[:HealthCheck][:HealthThreshold]
                         xml.UnhealthThreshold service_port[:HealthCheck][:UnhealthThreshold]
                         xml.Interval service_port[:HealthCheck][:Interval]
@@ -128,21 +129,22 @@ module Fog
                   xml.Id rule[:Id]
                   xml.IsEnabled rule[:IsEnabled] if rule.key?(:IsEnabled)
                   xml.MatchOnTranslate rule[:MatchOnTranslate] if rule.key?(:MatchOnTranslate)
-                  xml.Description rule[:Description]
-                  xml.Policy rule[:Policy]
+                  xml.Description rule[:Description] if rule.key?(:Description)
+                  xml.Policy rule[:Policy] if rule.key?(:Policy)
 
                   xml.Protocols {
-                    rule[:Protocols].each do |protocol, is_enabled|
-                      xml.send(protocol.to_s.capitalize, is_enabled)
+                    rule[:Protocols].each do |key, value|
+                      xml.send(key.to_s.capitalize, value)
                     end
                   }
-                  xml.IcmpSubType "any" if (rule[:Protocols].include?(:Icmp)  && rule[:Protocols][:Icmp] == true )
-                  xml.Port rule[:Port] == "Any" ? "-1" : rule[:Port]
+                  xml.IcmpSubType rule[:IcmpSubType] if rule.key?(:IcmpSubType)
+                  xml.Port rule[:Port] if rule.key?(:Port)
                   xml.DestinationPortRange rule[:DestinationPortRange]
                   xml.DestinationIp rule[:DestinationIp]
-                  xml.SourcePort rule[:SourcePort] == "Any" ? "-1" : rule[:SourcePort]
+                  xml.SourcePort rule[:SourcePort] if rule.key?(:SourcePort)
                   xml.SourcePortRange rule[:SourcePortRange]
                   xml.SourceIp rule[:SourceIp]
+                  xml.Direction rule[:Direction] if rule.key?(:Direction) #Firewall rule direction is allowed only in backward compatibility mode.
                   xml.EnableLogging rule[:EnableLogging] if rule.key?(:EnableLogging)
                 }
 

data/lib/fog/vcloud_director/requests/compute/get_edge_gateway.rb

@@ -21,6 +21,8 @@ module Fog
               :path => "admin/edgeGateway/#{id}"
           )
 
+          ensure_list! response.body[:Configuration], :GatewayInterfaces, :GatewayInterface
+
           edge_gateway_service_configuration = response.body[:Configuration][:EdgeGatewayServiceConfiguration]
 
           ensure_list! edge_gateway_service_configuration[:FirewallService], :FirewallRule if edge_gateway_service_configuration[:FirewallService]

data/lib/fog/vcloud_director/requests/compute/get_task.rb

@@ -75,13 +75,22 @@ module Fog
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/GET-Task.html
         # @since vCloud API version 0.9
         def get_task(id)
-          request(
+          response = request(
             :expects    => 200,
             :idempotent => true,
             :method     => 'GET',
             :parser     => Fog::ToHashDocument.new,
             :path       => "task/#{id}"
           )
+
+          # vCloud Director bug: Owner may be absent for some tasks, fix
+          # targeted for 5.1.3 (due out at the beginning Q1 2014).
+          #
+          # We'd prefer that Owner is always present; if nothing else, this
+          # let's the tests pass.
+          response.body[:Owner] ||= {:href => '', :name => nil, :type => nil}
+
+          response
         end
       end
 

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.17.0'
+  VERSION = '1.18.0'
 end

data/lib/fog/vsphere/compute.rb

@@ -64,6 +64,7 @@ module Fog
       request :create_vm
       request :list_vm_interfaces
       request :modify_vm_interface
+      request :modify_vm_volume
       request :list_vm_volumes
       request :get_virtual_machine
       request :vm_reconfig_hardware

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

@@ -201,9 +201,9 @@ module Fog
         end
 
         def volumes
-          attributes[:volumes] ||= id.nil? ? [] : service.volumes( :vm => self )
+          attributes[:volumes] ||= id.nil? ? [] : service.volumes(:server => self)
         end
-        
+
         def customvalues
           attributes[:customvalues] ||= id.nil? ? [] : service.customvalues( :vm => self )
         end

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

@@ -10,11 +10,18 @@ module Fog
         attribute :mode
         attribute :size
         attribute :thin
+        attribute :eager_zero
         attribute :name
         attribute :filename
         attribute :size_gb
+        attribute :key
+        attribute :unit_number
+        attribute :server_id
 
         def initialize(attributes={} )
+          # Assign server first to prevent race condition with persisted?
+          self.server_id = attributes.delete(:server_id)
+
           super defaults.merge(attributes)
         end
 
@@ -30,13 +37,61 @@ module Fog
           name
         end
 
-         private
+        def destroy
+          requires :server_id, :key, :unit_number
+
+          service.destroy_vm_volume(self)
+          true
+        end
+
+        def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+          requires :server_id, :size, :datastore
+
+          if unit_number.nil?
+            used_unit_numbers = server.volumes.collect { |volume| volume.unit_number }
+            max_unit_number = used_unit_numbers.max
+
+            if max_unit_number > server.volumes.size
+              # If the max ID exceeds the number of volumes, there must be a hole in the range. Find a hole and use it.
+              self.unit_number = max_unit_number.times.to_a.find { |i| used_unit_numbers.exclude?(i) }
+            else
+              self.unit_number = max_unit_number + 1
+            end
+          else
+            if server.volumes.any? { |volume| volume.unit_number == self.unit_number && volume.id != self.id }
+              raise "A volume already exists with that unit_number, so we can't save the new volume"
+            end
+          end
+
+          data = service.add_vm_volume(self)
+
+          if data['task_state'] == 'success'
+            # We have to query vSphere to get the volume attributes since the task handle doesn't include that info.
+            created = server.volumes.all.find { |volume| volume.unit_number == self.unit_number }
+
+            self.id = created.id
+            self.key = created.key
+            self.filename = created.filename
+
+            true
+          else
+            false
+          end
+        end
+
+        def server
+          requires :server_id
+          service.servers.get(server_id)
+        end
+
+        private
 
         def defaults
           {
-            :thin=>true,
-            :name=>"Hard disk",
-            :mode=>"persistent"
+            :thin => true,
+            :name => "Hard disk",
+            :mode => "persistent"
           }
         end
       end

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

@@ -7,26 +7,41 @@ module Fog
 
       class Volumes < Fog::Collection
 
-        model Fog::Compute::Vsphere::Volume
+        attribute :server
 
-        attr_accessor :vm
+        model Fog::Compute::Vsphere::Volume
 
         def all(filters = {})
-          requires :vm
-          case vm
+          requires :server
+
+          case server
             when Fog::Compute::Vsphere::Server
-              load service.list_vm_volumes(vm.id)
+              load service.list_vm_volumes(server.id)
             when Fog::Compute::Vsphere::Template
-              load service.list_template_volumes(vm.id)
+              load service.list_template_volumes(server.id)
             else
               raise 'volumes should have vm or template'
-          end
+            end
+
+          self.each { |volume| volume.server_id = server.id }
+          self
         end
 
         def get(id)
           new service.get_volume(id)
         end
 
+        def new(attributes = {})
+          if server
+            # Default to the root volume datastore if one is not configured.
+            datastore = ! attributes.has_key?(:datastore) && self.any? ? self.first.datastore : nil
+
+            super({ :server_id => server.id, :datastore => datastore }.merge!(attributes))
+          else
+            super
+          end
+        end
+
      end
     end
   end

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

@@ -92,11 +92,11 @@ module Fog
         end
 
         def create_disk disk, index = 0, operation = :add, controller_key = 1000
-          {
+          payload = {
             :operation     => operation,
-            :fileOperation => :create,
+            :fileOperation => operation == :add ? :create : :destroy,
             :device        => RbVmomi::VIM.VirtualDisk(
-              :key           => index,
+              :key           => disk.key || index,
               :backing       => RbVmomi::VIM.VirtualDiskFlatVer2BackingInfo(
                 :fileName        => "[#{disk.datastore}]",
                 :diskMode        => disk.mode.to_sym,
@@ -107,6 +107,12 @@ module Fog
               :capacityInKB  => disk.size
             )
           }
+
+          if operation == :add && disk.thin == false && disk.eager_zero
+            payload[:device][:backing][:eagerlyScrub] = disk.eager_zero
+          end
+
+          payload
         end
 
         def extra_config attributes

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

@@ -36,7 +36,9 @@ module Fog
               :filename => vol.backing.fileName,
               :datastore => (vol.backing.datastore.name rescue(nil)),
               :size => vol.capacityInKB,
-              :name => vol.deviceInfo.label
+              :name => vol.deviceInfo.label,
+              :key => vol.key,
+              :unit_number => vol.unitNumber
             }
           end
         end

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

@@ -0,0 +1,26 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+
+        def add_vm_volume(volume)
+          vm_reconfig_hardware('instance_uuid' => volume.server_id, 'hardware_spec' => {'deviceChange'=>[create_disk(volume, volume.unit_number, :add)]})
+        end
+
+        def destroy_vm_volume(volume)
+          vm_reconfig_hardware('instance_uuid' => volume.server_id, 'hardware_spec' => {'deviceChange'=>[create_disk(volume, volume.unit_number, :remove)]})
+        end
+      end
+
+      class Mock
+        def add_vm_volume(volume)
+          true
+        end
+
+        def destroy_vm_volume(volume)
+          true
+        end
+      end
+    end
+  end
+end