fog 1.12.1 → 1.13.0

data/lib/fog/openstack/models/compute/metadata.rb

@@ -18,7 +18,7 @@ module Fog
           requires :parent
           metadata = service.list_metadata(collection_name, @parent.id).body['metadata']
           metas = []
-          metadata.each_pair {|k,v| metas << {"key" => k, "value" => v} }
+          metadata.each_pair {|k,v| metas << {"key" => k, "value" => v} } unless metadata.nil?
           load(metas)
         end
 

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

@@ -41,6 +41,7 @@ module Fog
 
         attr_reader :password
         attr_writer :image_ref, :flavor_ref, :nics, :os_scheduler_hints
+        attr_accessor :block_device_mapping
 
 
         def initialize(attributes={})
@@ -52,6 +53,7 @@ module Fog
           self.max_count = attributes.delete(:max_count)
           self.nics = attributes.delete(:nics)
           self.os_scheduler_hints = attributes.delete(:os_scheduler_hints)
+          self.block_device_mapping = attributes.delete(:block_device_mapping)
 
           super
         end
@@ -267,10 +269,10 @@ module Fog
           true
         end
 
-        # TODO: Implement /os-volumes-boot support with 'block_device_mapping'
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
-          requires :flavor_ref, :image_ref, :name
+          requires :flavor_ref, :name
+          requires_one :image_ref, :block_device_mapping
           options = {
             'personality' => personality,
             'accessIPv4' => accessIPv4,
@@ -283,6 +285,7 @@ module Fog
             'max_count'   => @max_count,
             'nics' => @nics,
             'os:scheduler_hints' => @os_scheduler_hints,
+            'block_device_mapping' => @block_device_mapping
           }
           options['metadata'] = metadata.to_hash unless @metadata.nil?
           options = options.reject {|key, value| value.nil?}

data/lib/fog/openstack/models/image/images.rb

@@ -16,7 +16,7 @@ module Fog
         end
 
         def find_by_id(id)
-          self.find {|image| image.id == id}
+          all.find {|image| image.id == id}
         end
         alias_method :get, :find_by_id
 

data/lib/fog/openstack/models/metering/resource.rb

@@ -0,0 +1,24 @@
+require 'fog/core/model'
+
+module Fog
+  module Metering
+    class OpenStack
+
+      class Resource < Fog::Model
+
+        identity :resource_id
+
+        attribute :project_id
+        attribute :user_id
+        attribute :metadata
+
+        def initialize(attributes)
+          prepare_service_value(attributes)
+          super
+        end
+
+      end
+    end
+  end
+end
+

data/lib/fog/openstack/models/metering/resources.rb

@@ -0,0 +1,25 @@
+require 'fog/core/collection'
+require 'fog/openstack/models/metering/resource'
+
+module Fog
+  module Metering
+    class OpenStack
+
+      class Resources < Fog::Collection
+        model Fog::Metering::OpenStack::Resource
+
+        def all(detailed=true)
+          load(service.list_resources.body)
+        end
+
+        def find_by_id(resource_id)
+          resource = service.get_resource(resource_id).body
+          new(resource)
+        rescue Fog::Metering::OpenStack::NotFound
+          nil
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/models/volume/volume.rb

@@ -12,11 +12,13 @@ module Fog
         attribute :display_description, :aliases => 'displayDescription'
         attribute :status
         attribute :size
-        attribute :type,                :aliases => 'volumeType'
+        attribute :volume_type,         :aliases => ['volumeType', 'type']
         attribute :snapshot_id,         :aliases => 'snapshotId'
+        attribute :imageRef,            :aliases => 'image_id'
         attribute :availability_zone,   :aliases => 'availabilityZone'
         attribute :created_at,          :aliases => 'createdAt'
         attribute :attachments
+        attribute :source_volid
 
 
         def initialize(attributes)

data/lib/fog/openstack/models/volume/volumes.rb

@@ -12,13 +12,14 @@ module Fog
           load(service.list_volumes(detailed).body['volumes'])
         end
 
-        def find_by_id(volume_id)
+        def get(volume_id)
           if volume = service.get_volume_details(volume_id).body['volume']
             new(volume)
           end
         rescue Fog::Volume::OpenStack::NotFound
           nil
         end
+        alias_method :find_by_id, :get
       end
 
     end

data/lib/fog/openstack/network.rb

@@ -176,7 +176,7 @@ module Fog
           @openstack_must_reauthenticate  = false
           @openstack_service_type         = options[:openstack_service_type] || ['network']
           @openstack_service_name         = options[:openstack_service_name]
-          @openstack_endpoint_type        = options[:openstack_endpoint_type] || 'adminURL'
+          @openstack_endpoint_type        = options[:openstack_endpoint_type] || 'publicURL'
           @openstack_region               = options[:openstack_region]
 
           @connection_options = options[:connection_options] || {}

data/lib/fog/openstack/requests/compute/create_flavor.rb

@@ -12,7 +12,7 @@ module Fog
         def create_flavor(attributes)
           # Get last flavor id
           flavor_ids = Array.new
-          flavors = list_flavors_detail.body['flavors']
+          flavors = list_flavors_detail.body['flavors'] + list_flavors_detail(:is_public => false).body['flavors']
           flavors.each do |flavor|
             flavor_ids << flavor['id'].to_i
           end

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

@@ -56,11 +56,29 @@ module Fog
             data['os:scheduler_hints'] = options['os:scheduler_hints']
           end
 
+          if options['block_device_mapping']
+            data['server']['block_device_mapping'] =
+            [options['block_device_mapping']].flatten.map do |mapping|
+              {
+                'volume_size' => mapping[:volume_size],
+                'volume_id' => mapping[:volume_id],
+                'delete_on_termination' => mapping[:delete_on_termination],
+                'device_name' => mapping[:device_name]
+              }
+            end
+          end
+
+          path = if data['server']['block_device_mapping']
+                   'os-volumes_boot.json'
+                 else
+                   'servers.json'
+                 end
+
           request(
             :body     => Fog::JSON.encode(data),
             :expects  => [200, 202],
             :method   => 'POST',
-            :path     => 'servers.json'
+            :path     => path
           )
         end
 

data/lib/fog/openstack/requests/compute/detach_volume.rb

@@ -17,7 +17,8 @@ module Fog
 
         def detach_volume(server_id, attachment_id)
           response = Excon::Response.new
-          if self.data[:volumes][attachment_id]['attachments'].reject! { |attachment| attachment['serverId'] == server_id }
+          if self.data[:volumes][attachment_id] &&
+             self.data[:volumes][attachment_id]['attachments'].reject! { |attachment| attachment['serverId'] == server_id }
             response.status = 202
             response
           else

data/lib/fog/openstack/requests/compute/list_flavors_detail.rb

@@ -3,11 +3,12 @@ module Fog
     class OpenStack
       class Real
 
-        def list_flavors_detail
+        def list_flavors_detail(options = {})
           request(
             :expects  => [200, 203],
             :method   => 'GET',
-            :path     => 'flavors/detail.json'
+            :path     => 'flavors/detail.json',
+            :query    => options
           )
         end
 
@@ -15,7 +16,7 @@ module Fog
 
       class Mock
 
-        def list_flavors_detail
+        def list_flavors_detail(options = {})
           response = Excon::Response.new
           response.status = 200
           response.body = {

data/lib/fog/openstack/requests/compute/list_security_groups.rb

@@ -23,7 +23,7 @@ module Fog
 
           groups = if server_id then
                      server_group_names =
-                       self.data[:server_security_group_map][server_id]
+                       Array(self.data[:server_security_group_map][server_id])
 
                      server_group_names.map do |name|
                        security_groups.find do |sg|

data/lib/fog/openstack/requests/identity/create_tenant.rb

@@ -19,9 +19,9 @@ module Fog
           response.body = {
             'tenant' => {
               'id' => "df9a815161eba9b76cc748fd5c5af73e",
-              'description' => attributes['description'] || 'normal tenant',
+              'description' => attributes[:description] || 'normal tenant',
               'enabled' => true,
-              'name' => attributes['name'] || 'default'
+              'name' => attributes[:name] || 'default'
             }
           }
           response

data/lib/fog/openstack/requests/metering/get_resource.rb

@@ -0,0 +1,32 @@
+module Fog
+  module Metering
+    class OpenStack
+      class Real
+
+        def get_resource(resource_id)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "resources/#{resource_id}"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def get_resource(resource_id)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'resource_id'=>'glance',
+            'project_id'=>'d646b40dea6347dfb8caee2da1484c56',
+            'user_id'=>'1d5fd9eda19142289a60ed9330b5d284',
+            'metadata'=>{}}
+          response
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/requests/metering/get_samples.rb

@@ -0,0 +1,55 @@
+module Fog
+  module Metering
+    class OpenStack
+      class Real
+
+        def get_samples(meter_id, options=[])
+
+          data = {
+            'q' => Array.new
+          }
+
+          options.each do |opt|
+            filter = {}
+
+            ['field', 'op', 'value'].each do |key|
+              filter[key] = opt[key] if opt[key]
+            end
+
+            data['q'] << filter unless filter.empty?
+          end
+
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "meters/#{meter_id}"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def get_samples(meter_id)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = [{
+            'counter_name'=>'image.size',
+            'user_id'=>'1d5fd9eda19142289a60ed9330b5d284',
+            'resource_id'=>'glance',
+            'timestamp'=>'2013-04-03T23:44:21',
+            'resource_metadata'=>{},
+            'source'=>'artificial',
+            'counter_unit'=>'bytes',
+            'counter_volume'=>10.0,
+            'project_id'=>'d646b40dea6347dfb8caee2da1484c56',
+            'message_id'=>'14e4a902-9cf3-11e2-a054-003048f5eafc',
+            'counter_type'=>'gauge'}]
+          response
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/requests/metering/get_statistics.rb

@@ -0,0 +1,56 @@
+module Fog
+  module Metering
+    class OpenStack
+      class Real
+
+        def get_statistics(meter_id, options={})
+
+          data = {
+            'period' => options['period'],
+            'q'      => Array.new
+          }
+
+          options['q'].each do |opt|
+            filter = {}
+
+            ['field', 'op', 'value'].each do |key|
+              filter[key] = opt[key] if opt[key]
+            end
+
+            data['q'] << filter unless filter.empty?
+          end if options['q'].is_a? Array
+
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "meters/#{meter_id}/statistics"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def get_statistics(meter_id, options={})
+          response = Excon::Response.new
+          response.status = 200
+          response.body = [{
+            'count'=>143,
+            'duration_start'=>'2013-04-03T23:44:21',
+            'min'=>10.0,
+            'max'=>10.0,
+            'duration_end'=>'2013-04-04T23:24:21',
+            'period'=>0,
+            'period_end'=>'2013-04-04T23:24:21',
+            'duration'=>85200.0,
+            'period_start'=>'2013-04-03T23:44:21',
+            'avg'=>10.0,
+            'sum'=>1430.0}]
+          response
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/requests/metering/list_meters.rb

@@ -0,0 +1,50 @@
+module Fog
+  module Metering
+    class OpenStack
+      class Real
+
+        def list_meters(options=[])
+
+          data = {
+            'q' => Array.new
+          }
+
+          options.each do |opt|
+            filter = {}
+
+            ['field', 'op', 'value'].each do |key|
+              filter[key] = opt[key] if opt[key]
+            end
+
+            data['q'] << filter unless filter.empty?
+          end
+
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => 'meters'
+          )
+        end
+
+      end
+
+      class Mock
+
+        def list_meters(options={})
+          response = Excon::Response.new
+          response.status = 200
+          response.body = [{
+            'user_id'=>'1d5fd9eda19142289a60ed9330b5d284',
+            'name'=>'image.size',
+            'resource_id'=>'glance',
+            'project_id'=>'d646b40dea6347dfb8caee2da1484c56',
+            'type'=>'gauge',
+            'unit'=>'bytes'}]
+          response
+        end
+      end
+
+    end
+  end
+end