fog-openstack 0.1.6 → 0.1.7

data/lib/fog/openstack/models/monitoring/measurement.rb

@@ -0,0 +1,20 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Monitoring
+    class OpenStack
+      class Measurement < Fog::OpenStack::Model
+        identity :id
+
+        attribute :name
+        attribute :dimensions
+        attribute :columns
+        attribute :measurements
+
+        def to_s
+          name
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/monitoring/measurements.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/monitoring/measurement'
+
+module Fog
+  module Monitoring
+    class OpenStack
+      class Measurements < Fog::OpenStack::Collection
+        model Fog::Monitoring::OpenStack::Measurement
+
+        def find(options = {})
+          load_response(service.find_measurements(options), 'elements')
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/monitoring/metric.rb

@@ -0,0 +1,27 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Monitoring
+    class OpenStack
+      class Metric < Fog::OpenStack::Model
+        identity :id
+
+        attribute :name
+        attribute :dimensions
+        attribute :timestamp
+        attribute :value
+        attribute :value_meta
+
+        def to_s
+          name
+        end
+
+        def create
+          requires :name, :timestamp, :value
+          service.create_metric(attributes).body['metric']
+          self
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/monitoring/metrics.rb

@@ -0,0 +1,28 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/monitoring/metric'
+
+module Fog
+  module Monitoring
+    class OpenStack
+      class Metrics < Fog::OpenStack::Collection
+        model Fog::Monitoring::OpenStack::Metric
+
+        def all(options = {})
+          load_response(service.list_metrics(options), 'elements')
+        end
+
+        def list_metric_names(options = {})
+          load_response(service.list_metric_names(options), 'elements')
+        end
+
+        def create(attributes)
+          super(attributes)
+        end
+
+        def create_metric_array(metrics_list = [])
+          service.create_metric_array(metrics_list)
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/monitoring/notification_method.rb

@@ -0,0 +1,40 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Monitoring
+    class OpenStack
+      class NotificationMethod < Fog::OpenStack::Model
+        identity :id
+
+        attribute :name
+        attribute :links
+        attribute :type
+        attribute :address
+
+        def create
+          requires :name, :type, :address
+          merge_attributes(
+            service.create_notification_method(attributes).body
+          )
+        end
+
+        def update(attr = nil)
+          requires :name, :type, :address
+          merge_attributes(
+            service.update_notification_method(id, attr || attributes).body
+          )
+        end
+
+        def destroy
+          requires :id
+          service.delete_notification_method(id)
+          true
+        end
+
+        def to_s
+          name
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/monitoring/notification_methods.rb

@@ -0,0 +1,38 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/monitoring/notification_method'
+
+module Fog
+  module Monitoring
+    class OpenStack
+      class NotificationMethods < Fog::OpenStack::Collection
+        model Fog::Monitoring::OpenStack::NotificationMethod
+
+        def all(options = {})
+          load_response(service.list_notification_methods(options), 'elements')
+        end
+
+        def create(attributes)
+          super(attributes)
+        end
+
+        def patch(attributes)
+          super(attributes)
+        end
+
+        def find_by_id(id)
+          cached_notification_method = detect { |notification_method| notification_method.id == id }
+          return cached_notification_method if cached_notification_method
+          notification_method_hash = service.get_notification_method(id).body
+          Fog::Monitoring::OpenStack::NotificationMethod.new(
+            notification_method_hash.merge(:service => service)
+          )
+        end
+
+        def destroy(id)
+          notification_method = find_by_id(id)
+          notification_method.destroy
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/monitoring/statistic.rb

@@ -0,0 +1,20 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Monitoring
+    class OpenStack
+      class Statistic < Fog::OpenStack::Model
+        identity :id
+
+        attribute :name
+        attribute :dimension
+        attribute :columns
+        attribute :statistics
+
+        def to_s
+          name
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/monitoring/statistics.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/monitoring/statistic'
+
+module Fog
+  module Monitoring
+    class OpenStack
+      class Statistics < Fog::OpenStack::Collection
+        model Fog::Monitoring::OpenStack::Statistic
+
+        def all(options = {})
+          load_response(service.list_statistics(options), 'elements')
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/monitoring.rb

@@ -0,0 +1,116 @@
+
+module Fog
+  module Monitoring
+    class OpenStack < Fog::Service
+      requires   :openstack_auth_url
+      recognizes :openstack_auth_token, :openstack_management_url,
+                 :persistent, :openstack_service_type, :openstack_service_name,
+                 :openstack_tenant, :openstack_tenant_id, :openstack_userid,
+                 :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
+                 :current_user, :current_tenant, :openstack_region,
+                 :openstack_endpoint_type, :openstack_auth_omit_default_port,
+                 :openstack_project_name, :openstack_project_id,
+                 :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
+                 :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,
+                 :openstack_identity_prefix, :openstack_temp_url_key
+
+      model_path 'fog/openstack/models/monitoring'
+      model       :metric
+      collection  :metrics
+      model       :measurement
+      collection  :measurements
+      model       :statistic
+      collection  :statistics
+      model       :notification_method
+      collection  :notification_methods
+      model       :alarm_definition
+      collection  :alarm_definitions
+      model       :alarm
+      collection  :alarms
+      model       :alarm_state
+      collection  :alarm_states
+      model       :alarm_count
+      collection  :alarm_counts
+
+      request_path 'fog/openstack/requests/monitoring'
+      request :create_metric
+      request :create_metric_array
+      request :list_metrics
+      request :list_metric_names
+
+      request :find_measurements
+
+      request :list_statistics
+
+      request :create_notification_method
+      request :get_notification_method
+      request :list_notification_methods
+      request :update_notification_method
+      request :delete_notification_method
+
+      request :create_alarm_definition
+      request :list_alarm_definitions
+      request :patch_alarm_definition
+      request :update_alarm_definition
+      request :get_alarm_definition
+      request :delete_alarm_definition
+
+      request :list_alarms
+      request :get_alarm
+      request :patch_alarm
+      request :update_alarm
+      request :delete_alarm
+      request :get_alarm_counts
+
+      request :list_alarm_state_history_for_specific_alarm
+      request :list_alarm_state_history_for_all_alarms
+
+      class Real
+        include Fog::OpenStack::Core
+
+        def initialize(options = {})
+          initialize_identity options
+
+          @openstack_service_type           = options[:openstack_service_type] || ['monitoring']
+          @openstack_service_name           = options[:openstack_service_name]
+
+          @connection_options               = options[:connection_options] || {}
+
+          authenticate
+          @persistent = options[:persistent] || false
+          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+        end
+
+        def request(params, parse_json = true)
+          begin
+            response = @connection.request(params.merge(:headers => {
+              'Content-Type' => 'application/json',
+              'Accept'       => 'application/json',
+              'X-Auth-Token' => @auth_token
+            }.merge!(params[:headers] || {}),
+                                                        :path    => "#{@path}/#{params[:path]}"))
+          rescue Excon::Errors::Unauthorized => error
+            if error.response.body != 'Bad username or password' # token expiration
+              @openstack_must_reauthenticate = true
+              authenticate
+              retry
+            else # bad credentials
+              raise error
+            end
+          rescue Excon::Errors::HTTPStatusError => error
+            raise case error
+                  when Excon::Errors::NotFound
+                    Fog::Monitoring::OpenStack::NotFound.slurp(error)
+                  else
+                    error
+                  end
+          end
+          if !response.body.empty? && parse_json && response.get_header('Content-Type') =~ %r{application/json}
+            response.body = Fog::JSON.decode(response.body)
+          end
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -29,6 +29,7 @@ module Fog
              'device'   => device
           }
           self.data[:volumes][volume_id]['attachments'] << data
+          self.data[:volumes][volume_id]['status'] = 'in-use'
           response.body = { 'volumeAttachment' => data }
           response
         end

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

@@ -9,7 +9,7 @@ module Fog
             }
           }
 
-          vanilla_options = ["availability_zone"]
+          vanilla_options = [:availability_zone]
 
           vanilla_options.select{|o| options[o]}.each do |key|
             data['aggregate'][key] = options[key]

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

@@ -147,9 +147,9 @@ module Fog
           end
 
           if block_devices = options["block_device_mapping_v2"]
-            block_devices.each { |bd| compute.volumes.get(bd[:uuid]).attach(server_id, bd[:device_name]) }
+            block_devices.each { |bd| volumes.get(bd[:uuid]).attach(server_id, bd[:device_name]) }
           elsif block_device = options["block_device_mapping"]
-            compute.volumes.get(block_device[:volume_id]).attach(server_id, block_device[:device_name])
+            volumes.get(block_device[:volume_id]).attach(server_id, block_device[:device_name])
           end
 
           self.data[:last_modified][:servers][server_id] = Time.now

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

@@ -16,6 +16,7 @@ module Fog
           response = Excon::Response.new
           if self.data[:volumes][attachment_id] &&
              self.data[:volumes][attachment_id]['attachments'].reject! { |attachment| attachment['serverId'] == server_id }
+            data[:volumes][attachment_id]['status'] = 'available'
             response.status = 202
             response
           else

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

@@ -3,7 +3,7 @@ module Fog
     class OpenStack
       class Real
         def update_aggregate(uuid, options = {})
-          vanilla_options = ['name', 'availability_zone']
+          vanilla_options = [:name, :availability_zone]
 
           data = {'aggregate' => {}}
           vanilla_options.select{|o| options[o]}.each do |key|

data/lib/fog/openstack/requests/monitoring/create_alarm_definition.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Monitoring
+    class OpenStack
+      class Real
+        def create_alarm_definition(options)
+          request(
+            :body    => Fog::JSON.encode(options),
+            :expects => [201, 204],
+            :method  => 'POST',
+            :path    => 'alarm-definitions'
+          )
+        end
+      end
+
+      class Mock
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/monitoring/create_metric.rb

@@ -0,0 +1,29 @@
+module Fog
+  module Monitoring
+    class OpenStack
+      class Real
+        def create_metric(options)
+          data = options
+          # data = {
+          #         'name' => name,
+          #         'dimensions' => dimensions,
+          #         'timestamp' => timestamp,
+          #         'value' => value,
+          #         'value_meta' => value_meta
+          # }
+
+          # _create_metric(data)
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => [204],
+            :method  => 'POST',
+            :path    => 'metrics'
+          )
+        end
+      end
+
+      class Mock
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/monitoring/create_metric_array.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Monitoring
+    class OpenStack
+      class Real
+        def create_metric_array(metrics_list)
+          request(
+            :body    => Fog::JSON.encode(metrics_list),
+            :expects => [204],
+            :method  => 'POST',
+            :path    => 'metrics'
+          )
+        end
+      end
+
+      class Mock
+      end
+    end
+  end
+end