fog-openstack 0.1.1 → 0.1.2

data/Rakefile

@@ -1,7 +1,11 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rubocop/rake_task'
+
+RuboCop::RakeTask.new
 
 task :default => :test
 
+desc 'Run fog-openstack unit tests'
 mock = ENV['FOG_MOCK'] || 'true'
 task :test do
   sh("export FOG_MOCK=#{mock} && bundle exec shindont")

data/fog-openstack.gemspec

@@ -19,15 +19,16 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake',    '~> 10.0'
-  spec.add_development_dependency 'shindo',  '~> 0.3'
-  spec.add_development_dependency 'rubyzip', '~> 0.9.9'
-  spec.add_development_dependency "mime-types"
-  spec.add_development_dependency "mime-types-data"
-
   spec.add_dependency 'fog-core',  '>= 1.35'
   spec.add_dependency 'fog-json',  '>= 1.0'
   spec.add_dependency 'fog-xml',   '>= 0.1'
   spec.add_dependency 'ipaddress', '>= 0.8'
+
+  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency "mime-types"
+  spec.add_development_dependency "mime-types-data"
+  spec.add_development_dependency 'rake',    '~> 10.0'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubyzip', '~> 0.9.9'
+  spec.add_development_dependency 'shindo',  '~> 0.3'
 end

data/gemfiles/Gemfile-1.9

@@ -0,0 +1,16 @@
+source "https://rubygems.org"
+
+gem "coveralls", require: false
+
+group :development, :test do
+  gem "fog-core",        ">= 1.35"
+  gem "fog-json",        ">= 1.0"
+  gem "fog-xml",         ">= 0.1"
+  gem "ipaddress",       ">= 0.8"
+  gem "bundler",         "~> 1.6"
+  gem "mime-types",      "2.6.2"
+  gem "rake",            "~> 10.0"
+  gem "rubocop"
+  gem "rubyzip",         "~> 0.9.9"
+  gem "shindo",          "~> 0.3"
+end

data/lib/fog/openstack.rb

@@ -6,6 +6,22 @@ require 'fog/openstack/core'
 require 'fog/openstack/common'
 require 'fog/openstack/errors'
 
+require 'fog/openstack/compute'
+require 'fog/openstack/identity_v2'
+require 'fog/openstack/identity_v3'
+require 'fog/openstack/image'
+require 'fog/openstack/image_v1'
+require 'fog/openstack/image_v2'
+require 'fog/openstack/metering'
+require 'fog/openstack/network'
+require 'fog/openstack/orchestration'
+require 'fog/openstack/storage'
+require 'fog/openstack/volume'
+require 'fog/openstack/volume_v1'
+require 'fog/openstack/volume_v2'
+require 'fog/openstack/baremetal'
+require 'fog/openstack/planning'
+
 module Fog
   module OpenStack
     extend Fog::Provider
@@ -284,11 +300,12 @@ module Fog
     end
 
     def self.retrieve_tokens_v2(options, connection_options = {})
-      api_key     = options[:openstack_api_key].to_s
-      username    = options[:openstack_username].to_s
-      tenant_name = options[:openstack_tenant].to_s
-      auth_token  = options[:openstack_auth_token] || options[:unscoped_token]
-      uri         = options[:openstack_auth_uri]
+      api_key           = options[:openstack_api_key].to_s
+      username          = options[:openstack_username].to_s
+      tenant_name       = options[:openstack_tenant].to_s
+      auth_token        = options[:openstack_auth_token] || options[:unscoped_token]
+      uri               = options[:openstack_auth_uri]
+      omit_default_port = options[:openstack_auth_omit_default_port]
 
       identity_v2_connection = Fog::Core::Connection.new(uri.to_s, false, connection_options)
       request_body = {:auth => Hash.new}
@@ -305,32 +322,36 @@ module Fog
       end
       request_body[:auth][:tenantName] = tenant_name if tenant_name
 
-      response = identity_v2_connection.request({
-        :expects  => [200, 204],
-        :headers  => {'Content-Type' => 'application/json'},
-        :body     => Fog::JSON.encode(request_body),
-        :method   => 'POST',
-        :path     => (uri.path and not uri.path.empty?) ? uri.path : 'v2.0'
-      })
+      request = {
+        :expects => [200, 204],
+        :headers => {'Content-Type' => 'application/json'},
+        :body    => Fog::JSON.encode(request_body),
+        :method  => 'POST',
+        :path    => (uri.path and not uri.path.empty?) ? uri.path : 'v2.0'
+      }
+      request[:omit_default_port] = omit_default_port unless omit_default_port.nil?
+
+      response = identity_v2_connection.request(request)
 
       Fog::JSON.decode(response.body)
     end
 
     def self.retrieve_tokens_v3(options, connection_options = {})
 
-      api_key      = options[:openstack_api_key].to_s
-      username     = options[:openstack_username].to_s
-      userid       = options[:openstack_userid]
-      domain_id    = options[:openstack_domain_id]
-      domain_name  = options[:openstack_domain_name]
-      project_domain = options[:openstack_project_domain]
+      api_key           = options[:openstack_api_key].to_s
+      username          = options[:openstack_username].to_s
+      userid            = options[:openstack_userid]
+      domain_id         = options[:openstack_domain_id]
+      domain_name       = options[:openstack_domain_name]
+      project_domain    = options[:openstack_project_domain]
       project_domain_id = options[:openstack_project_domain_id]
-      user_domain  = options[:openstack_user_domain]
-      user_domain_id  = options[:openstack_user_domain_id]
-      project_name = options[:openstack_project_name]
-      project_id   = options[:openstack_project_id]
-      auth_token   = options[:openstack_auth_token] || options[:unscoped_token]
-      uri          = options[:openstack_auth_uri]
+      user_domain       = options[:openstack_user_domain]
+      user_domain_id    = options[:openstack_user_domain_id]
+      project_name      = options[:openstack_project_name]
+      project_id        = options[:openstack_project_id]
+      auth_token        = options[:openstack_auth_token] || options[:unscoped_token]
+      uri               = options[:openstack_auth_uri]
+      omit_default_port = options[:openstack_auth_omit_default_port]
 
       connection = Fog::Core::Connection.new(uri.to_s, false, connection_options)
       request_body = {:auth => {}}
@@ -389,12 +410,16 @@ module Fog
       response, expires = @@token_cache[{body: request_body, path: path}]
 
       unless response && expires > Time.now
-        response = connection.request({   :expects => [201],
-                                          :headers => {'Content-Type' => 'application/json'},
-                                          :body    => Fog::JSON.encode(request_body),
-                                          :method  => 'POST',
-                                          :path    => path
-                                      })
+        request = {
+          :expects => [201],
+          :headers => {'Content-Type' => 'application/json'},
+          :body    => Fog::JSON.encode(request_body),
+          :method  => 'POST',
+          :path    => path
+        }
+        request[:omit_default_port] = omit_default_port unless omit_default_port.nil?
+
+        response = connection.request(request)
         @@token_cache[{body: request_body, path: path}] = response, Time.now + 30 # 30-second TTL, enough for most requests
       end
 

data/lib/fog/openstack/docs/metering.md

@@ -0,0 +1,29 @@
+# OpenStack Metering (Ceilometer)
+
+This document explains how to get started using OpenStack Metering (Ceilometer) with Fog. It assumes you have read the [Getting Started with Fog and the OpenStack](getting_started.md) document.
+
+Fog uses the [OpenStack Metering API](http://docs.openstack.org/developer/ceilometer/webapi/v2.html).
+
+## Metering Service
+
+Get a handle on the Metering service:
+
+```ruby
+service = Fog::Metering::OpenStack.new({
+  :openstack_auth_url  => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v2.0/tokens', # OpenStack Keystone endpoint
+  :openstack_username  => OPEN_STACK_USER,                                  # Your OpenStack Username
+  :openstack_tenant    => OPEN_STACK_TENANT,                                # Your tenant id
+  :openstack_api_key   => OPEN_STACK_PASSWORD,                              # Your OpenStack Password
+  :connection_options  => {}                                                # Optional
+})
+```
+
+## Events
+
+* `service.events`: Return a list of events.
+* `service.events.find_by_id(<message_id>)`: Return the event matching message_id, or nil if no such event exists.
+
+## Resources
+
+* `service.resources`: Return a list of resources.
+* `service.resources.find_by_id(<resource_id>)`: Return the resource matching resource_id, or nil if no such resource exists.

data/lib/fog/openstack/metering.rb

@@ -20,12 +20,17 @@ module Fog
       model       :resource
       collection  :resources
 
+      model       :event
+      collection  :events
+
       request_path 'fog/openstack/requests/metering'
 
       # Metering
+      request :get_event
       request :get_resource
       request :get_samples
       request :get_statistics
+      request :list_events
       request :list_meters
       request :list_resources
 
@@ -126,7 +131,7 @@ module Fog
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound
-              Fog::Compute::OpenStack::NotFound.slurp(error)
+              Fog::Metering::OpenStack::NotFound.slurp(error)
             else
               error
             end

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

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Metering
+    class OpenStack
+      class Event < Fog::OpenStack::Model
+        identity :message_id
+
+        attribute :event_type
+        attribute :generated
+        attribute :raw
+        attribute :traits
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/metering/event'
+
+module Fog
+  module Metering
+    class OpenStack
+      class Events < Fog::OpenStack::Collection
+        model Fog::Metering::OpenStack::Event
+
+        def all(detailed=true)
+          load_response(service.list_events)
+        end
+
+        def find_by_id(message_id)
+          event = service.get_event(message_id).body
+          new(event)
+        rescue Fog::Metering::OpenStack::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/network/floating_ip.rb

@@ -21,7 +21,7 @@ module Fog
           requires :floating_network_id
           merge_attributes(service.create_floating_ip(self.floating_network_id,
 
-                                                      self.attributes).body['floatingip'])
+                                                    self.attributes).body['floatingip'])
           self
         end
 
@@ -34,29 +34,6 @@ module Fog
           service.delete_floating_ip(self.id)
           true
         end
-
-        def associate(port_id, fixed_ip_address = nil)
-          requires :id
-          options = if !fixed_ip_address.nil?
-                      { 'fixed_ip_address': fixed_ip_address }
-                    else
-                      {}
-                    end
-          merge_attributes(service.associate_floating_ip(self.id,
-                                                         port_id,
-                                                         options).body['floatingip'])
-        end
-
-        def disassociate(fixed_ip_address = nil)
-          requires :id
-          options = if !fixed_ip_address.nil?
-                      { 'fixed_ip_address': fixed_ip_address }
-                    else
-                      {}
-                    end
-          merge_attributes(service.disassociate_floating_ip(self.id,
-                                                            options).body['floatingip'])
-        end
       end
     end
   end

data/lib/fog/openstack/models/network/ike_policies.rb

@@ -0,0 +1,32 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/network/ike_policy'
+
+module Fog
+  module Network
+    class OpenStack
+      class IkePolicies < Fog::OpenStack::Collection
+        attribute :filters
+
+        model Fog::Network::OpenStack::IkePolicy
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        def all(filters_arg = filters)
+          filters = filters_arg
+          load_response(service.list_ike_policies(filters), 'ikepolicies')
+        end
+
+        def get(ike_policy_id)
+          if ike_policy = service.get_ike_policy(ike_policy_id).body['ikepolicy']
+            new(ike_policy)
+          end
+        rescue Fog::Network::OpenStack::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/network/ike_policy.rb

@@ -0,0 +1,43 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Network
+    class OpenStack
+      class IkePolicy < Fog::OpenStack::Model
+        identity :id
+
+        attribute :name
+        attribute :description
+        attribute :status
+        attribute :admin_state_up
+        attribute :tenant_id
+        attribute :auth_algorithm
+        attribute :encryption_algorithm
+        attribute :pfs
+        attribute :phase1_negotiation_mode
+        attribute :lifetime
+        attribute :ike_version
+
+        def create
+          requires :name, :auth_algorithm, :encryption_algorithm, :ike_version,
+                   :lifetime, :pfs, :phase1_negotiation_mode
+          merge_attributes(service.create_ike_policy(attributes).body['ikepolicy'])
+          self
+        end
+
+        def update
+          requires :id, :name, :auth_algorithm, :encryption_algorithm, :ike_version,
+                   :lifetime, :pfs, :phase1_negotiation_mode
+          merge_attributes(service.update_ike_policy(id, attributes).body['ikepolicy'])
+          self
+        end
+
+        def destroy
+          requires :id
+          service.delete_ike_policy(id)
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/network/ipsec_policies.rb

@@ -0,0 +1,32 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/network/ipsec_policy'
+
+module Fog
+  module Network
+    class OpenStack
+      class IpsecPolicies < Fog::OpenStack::Collection
+        attribute :filters
+
+        model Fog::Network::OpenStack::IpsecPolicy
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        def all(filters_arg = filters)
+          filters = filters_arg
+          load_response(service.list_ipsec_policies(filters), 'ipsecpolicies')
+        end
+
+        def get(ipsec_policy_id)
+          if ipsec_policy = service.get_ipsec_policy(ipsec_policy_id).body['ipsecpolicy']
+            new(ipsec_policy)
+          end
+        rescue Fog::Network::OpenStack::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/network/ipsec_policy.rb

@@ -0,0 +1,45 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Network
+    class OpenStack
+      class IpsecPolicy < Fog::OpenStack::Model
+        identity :id
+
+        attribute :name
+        attribute :description
+        attribute :status
+        attribute :admin_state_up
+        attribute :tenant_id
+        attribute :auth_algorithm
+        attribute :encryption_algorithm
+        attribute :pfs
+        attribute :transform_protocol
+        attribute :encapsulation_mode
+        attribute :lifetime
+
+        def create
+          requires :name, :auth_algorithm, :encryption_algorithm,
+                   :lifetime, :pfs, :transform_protocol,
+                   :encapsulation_mode
+          merge_attributes(service.create_ipsec_policy(attributes).body['ipsecpolicy'])
+          self
+        end
+
+        def update
+          requires :id, :name, :auth_algorithm, :encryption_algorithm,
+                   :lifetime, :pfs, :transform_protocol,
+                   :encapsulation_mode
+          merge_attributes(service.update_ipsec_policy(id, attributes).body['ipsecpolicy'])
+          self
+        end
+
+        def destroy
+          requires :id
+          service.delete_ipsec_policy(id)
+          true
+        end
+      end
+    end
+  end
+end