fog-openstack 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 266dcbc5dc6dbde51beb0aeb2e2b8caacb3a9a68
-  data.tar.gz: a1b4dadc45afb05a56967d2d22c93bba19206ca1
+  metadata.gz: 31a9071364facb7a54109c5a95e7c9b712c6f78a
+  data.tar.gz: 81f2374694077b420e017aad70ad1c52268c01ec
 SHA512:
-  metadata.gz: 2cb29370444ea727a5ddcb831bd43247110015485ce100451ec3cfb98a819b94f89ef819cd54b4c152f34a0b9aec511428601ccc3a3b473c77ff6fa44c7c4322
-  data.tar.gz: 6905cd3f139d98cbb958b37401737f977af61a0b6deac8519aedc8c73f4ea84566f8e1dc2e486572cbe47b10be01fa4cc4db770f3caa416b9ad13a530843dfe5
+  metadata.gz: 6c2f0405c2e7356ebd64426c7e4878a7526504180eb3bf5bfffb1556df985228688c74f6b9f93a253bc4eacd5441238dc2ff1d72c22d944938bc6720f79d5c94
+  data.tar.gz: 41c0cc5fbd768ba1fffb0729609fe1504daed6a746a3c6d9b744f90693443fe3c599eab228438a0e56e613883c070e1d89fa38200895d2d6ecb13379dac71283

data/.gitignore

@@ -7,4 +7,6 @@
 /pkg/
 /spec/reports/
 /tmp/
-gemfiles/Gemfile-1.9.lock
+gemfiles/Gemfile-1.9.lock
+.DS_Store
+.idea/

data/Rakefile

@@ -6,26 +6,36 @@ RuboCop::RakeTask.new
 
 task :default => :test
 
-desc 'Run fog-openstack unit tests'
+# To be removed once after Minitest migration
+desc 'Run fog-openstack unit tests with Shindo'
 task :test do
   mock = ENV['FOG_MOCK'] || 'true'
   sh("export FOG_MOCK=#{mock} && bundle exec shindont")
 end
 
-# The following is transition period until all shindo tests in /tests have been
-# migrated over minitest /test
-desc "Run fog-openstack unit tests for /test"
-Rake::TestTask.new do |t|
-  t.name = 'minitest'
-  t.libs.push [ "lib", "test" ]
-  t.test_files = FileList['test/openstack/*.rb']
-  t.verbose = true
+desc 'Run fog-openstack unit tests with Minitest'
+task :minitest do
+  mock = ENV['FOG_MOCK'] || 'true'
+  sh("export FOG_MOCK=#{mock} && bundle exec rake tests:unit")
 end
 
-desc "Run fog-openstack unit tests for /spec"
-Rake::TestTask.new do |t|
-  t.name = 'spec'
-  t.libs.push [ "lib", "spec" ]
-  t.pattern = 'spec/**/*_spec.rb'
-  t.verbose = true
+desc 'Run fog-openstack spec/ tests (VCR)'
+task :spec => "tests:spec"
+
+namespace :tests do
+  desc "Run fog-openstack test/"
+  Rake::TestTask.new do |t|
+    t.name = 'unit'
+    t.libs.push [ "lib", "test" ]
+    t.test_files = FileList['test/**/*.rb']
+    t.verbose = true
+  end
+
+  desc "Run fog-openstack spec/"
+  Rake::TestTask.new do |t|
+    t.name = 'spec'
+    t.libs.push [ "lib", "spec" ]
+    t.pattern = 'spec/**/*_spec.rb'
+    t.verbose = true
+  end
 end

data/fog-openstack.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'fog-core',  '>= 1.39'
+  spec.add_dependency 'fog-core',  '>= 1.40'
   spec.add_dependency 'fog-json',  '>= 1.0'
   spec.add_dependency 'ipaddress', '>= 0.8'
 

data/lib/fog/openstack.rb

@@ -15,6 +15,7 @@ require 'fog/openstack/storage'
 require 'fog/openstack/volume_v1'
 require 'fog/openstack/volume_v2'
 require 'fog/openstack/planning'
+require 'fog/openstack/monitoring'
 
 module Fog
   module Compute
@@ -57,6 +58,10 @@ module Fog
     autoload :OpenStack, File.expand_path('../openstack/introspection', __FILE__)
   end
 
+  module Monitoring
+    autoload :OpenStack, File.expand_path('../fog/openstack/monitoring', __FILE__)
+  end
+
   module OpenStack
     extend Fog::Provider
 
@@ -72,6 +77,7 @@ module Fog
     service(:baremetal,     'Baremetal')
     service(:planning,      'Planning')
     service(:introspection, 'Introspection')
+    service(:monitoring,    'Monitoring')
 
     @@token_cache = {}
 

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

@@ -29,17 +29,18 @@ module Fog
         end
 
         def update
+          requires :id
           merge_attributes(service.update_aggregate(self.id, self.attributes).body['aggregate'])
           self
         end
 
         def add_host(host_uuid)
-          requires :id,
+          requires :id
           service.add_aggregate_host(self.id, host_uuid)
         end
 
         def remove_host(host_uuid)
-          requires :id,
+          requires :id
           service.remove_aggregate_host(self.id, host_uuid)
         end
 

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

@@ -0,0 +1,48 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Monitoring
+    class OpenStack
+      class Alarm < Fog::OpenStack::Model
+        identity :id
+
+        attribute :name
+        attribute :links
+        attribute :link
+        attribute :alarm_definition
+        attribute :metrics
+        attribute :state
+        attribute :lifecycle_state
+        attribute :state_updated_timestamp
+        attribute :updated_timestamp
+        attribute :created_timestamp
+
+        def update(attr = nil)
+          requires :id
+          merge_attributes(
+            service.update_alarm(id, attr || attributes).body
+          )
+          self
+        end
+
+        def patch(attr = nil)
+          requires :id
+          merge_attributes(
+            service.patch_alarm(id, attr || attributes).body
+          )
+          self
+        end
+
+        def destroy
+          requires :id
+          service.delete_alarm(id)
+          true
+        end
+
+        def to_s
+          name
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Monitoring
+    class OpenStack
+      class AlarmCount < Fog::OpenStack::Model
+        attribute :links
+        attribute :columns
+        attribute :counts
+
+        def to_s
+          name
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/monitoring/alarm_count'
+
+module Fog
+  module Monitoring
+    class OpenStack
+      class AlarmCounts < Fog::OpenStack::Collection
+        model Fog::Monitoring::OpenStack::AlarmCount
+
+        def get(options = {})
+          load_response(service.get_alarm_counts(options))
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Monitoring
+    class OpenStack
+      class AlarmDefinition < Fog::OpenStack::Model
+        identity :id
+
+        attribute :links
+        attribute :name
+        attribute :description
+        attribute :expression
+        attribute :expression_data
+        attribute :match_by
+        attribute :severity
+        attribute :actions_enabled
+        attribute :alarm_actions
+        attribute :ok_actions
+        attribute :undetermined_actions
+
+        def create
+          requires :name, :expression
+          merge_attributes(
+            service.create_alarm_definition(attributes).body
+          )
+          self
+        end
+
+        def update(attr = nil)
+          requires :name, :expression
+          merge_attributes(
+            service.update_alarm_definition(id, attr || attributes).body
+          )
+        end
+
+        def patch(attr = nil)
+          requires :id
+          merge_attributes(
+            service.patch_alarm_definition(id, attr || attributes).body
+          )
+          self
+        end
+
+        def destroy
+          requires :id
+          service.delete_alarm_definition(id)
+          true
+        end
+
+        def to_s
+          name
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/monitoring/alarm_definition'
+
+module Fog
+  module Monitoring
+    class OpenStack
+      class AlarmDefinitions < Fog::OpenStack::Collection
+        model Fog::Monitoring::OpenStack::AlarmDefinition
+
+        def create(attributes)
+          super(attributes)
+        end
+
+        def update(attributes)
+          super(attributes)
+        end
+
+        def patch(attributes)
+          super(attributes)
+        end
+
+        def all(options = {})
+          load_response(service.list_alarm_definitions(options), 'elements')
+        end
+
+        def find_by_id(id)
+          cached_alarm_definition = detect { |alarm_definition| alarm_definition.id == id }
+          return cached_alarm_definition if cached_alarm_definition
+          alarm_definition_hash = service.get_alarm_definition(id).body
+          Fog::Monitoring::OpenStack::AlarmDefinition.new(
+            alarm_definition_hash.merge(:service => service)
+          )
+        end
+
+        def destroy(id)
+          alarm_definition = find_by_id(id)
+          alarm_definition.destroy
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Monitoring
+    class OpenStack
+      class AlarmState < Fog::OpenStack::Model
+        identity :id
+
+        attribute :alarm_id
+        attribute :metrics
+        attribute :old_state
+        attribute :new_state
+        attribute :reason
+        attribute :reason_data
+        attribute :timestamp
+        attribute :sub_alarms
+
+        def patch(options)
+          requires :id
+          merge_attributes(
+            service.list_alarm_state_history_for_specific_alarm(id, options)
+          )
+          self
+        end
+
+        def to_s
+          name
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/monitoring/alarm_state'
+
+module Fog
+  module Monitoring
+    class OpenStack
+      class AlarmStates < Fog::OpenStack::Collection
+        model Fog::Monitoring::OpenStack::AlarmState
+
+        def all(options = {})
+          load_response(service.list_alarm_state_history_for_all_alarms(options), 'elements')
+        end
+
+        def list_alarm_state_history(id, options = {})
+          load_response(service.list_alarm_state_history_for_specific_alarm(id, options), 'elements')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/monitoring/alarm'
+
+module Fog
+  module Monitoring
+    class OpenStack
+      class Alarms < Fog::OpenStack::Collection
+        model Fog::Monitoring::OpenStack::Alarm
+
+        def all(options = {})
+          load_response(service.list_alarms(options), 'elements')
+        end
+
+        def find_by_id(id)
+          cached_alarm = detect { |alarm| alarm.id == id }
+          return cached_alarm if cached_alarm
+          alarm_hash = service.get_alarm(id).body
+          Fog::Identity::OpenStack::Alarm.new(
+            alarm_hash.merge(:service => service)
+          )
+        end
+
+        def destroy(id)
+          alarm = find_by_id(id)
+          alarm.destroy
+        end
+      end
+    end
+  end
+end