gapinc-fog 1.12.1.2.1 → 1.14.0

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

@@ -109,6 +109,12 @@ module Fog
       # Tenant
       request :set_tenant
 
+      # Quota
+      request :get_quotas
+      request :get_quota
+      request :update_quota
+      request :delete_quota
+
       class Mock
         def self.data
           @data ||= Hash.new do |hash, key|
@@ -122,6 +128,23 @@ module Fog
               :lb_members => {},
               :lb_health_monitors => {},
               :lb_vips => {},
+              :quota => {
+                "subnet" => 10,
+                "router" => 10,
+                "port" => 50,
+                "network" => 10,
+                "floatingip" => 50
+              },
+              :quotas => [
+                {
+                  "subnet" => 10,
+                  "network" => 10,
+                  "floatingip" => 50,
+                  "tenant_id" => Fog::Mock.random_hex(8),
+                  "router" => 10,
+                  "port" => 30
+                }
+              ],
             }
           end
         end
@@ -176,7 +199,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_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/get_host_details.rb

@@ -16,12 +16,13 @@ module Fog
       class Mock
 
         def get_host_details(host)
+
           response = Excon::Response.new
           response.status = 200
           response.body = { "host" => [
               { "resource" => {
                   "project" => "(total)",
-                  "memory_mb" => 64428,
+                  "memory_mb" => 64427,
                   "host" => "cn28.la-1-3.morphcloud.net",
                   "cpu" => 12,
                   "disk_gb" => 1608

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

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

@@ -0,0 +1,32 @@
+module Fog
+  module Metering
+    class OpenStack
+      class Real
+
+        def list_resources(options = {})
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => 'resources'
+          )
+        end
+
+      end
+
+      class Mock
+
+        def list_resources(options = {})
+          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/network/delete_quota.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+
+        def delete_quota(tenant_id)
+          request(
+            :expects  => 204,
+            :method   => 'DELETE',
+            :path     => "/quotas/#{tenant_id}"
+          )
+        end
+
+      end
+
+      class Mock
+        def delete_quota(tenant_id)
+          response = Excon::Response.new
+          response.status = 204
+          response
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/requests/network/get_quota.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+
+        def get_quota(tenant_id)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "/quotas/#{tenant_id}"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def get_quota(tenant_id)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'quota' => (self.data[:quota_updated] or self.data[:quota])
+          }
+          response
+        end
+
+      end
+
+    end
+  end
+end