aviator 0.0.6 → 0.0.7

data/lib/aviator/core/session.rb

@@ -7,22 +7,28 @@ module Aviator
         super("Authentication failed. The server returned #{ last_auth_body }")
       end
     end
-    
-    
+
+
     class EnvironmentNotDefinedError < ArgumentError
       def initialize(path, env)
         super("The environment '#{ env }' is not defined in #{ path }.")
       end
     end
 
+    class InitializationError < StandardError
+      def initialize
+        super("The session could not find :session_dump, :config_file, and " \
+              ":config in the constructor arguments provided")
+      end
+    end
 
     class InvalidConfigFilePathError < ArgumentError
       def initialize(path)
         super("The config file at #{ path } does not exist!")
       end
     end
-    
-    
+
+
     class NotAuthenticatedError < StandardError
       def initialize
         super("Session is not authenticated. Please authenticate before proceeding.")
@@ -38,21 +44,21 @@ module Aviator
 
 
     def initialize(opts={})
-      config_path  = opts[:config_file]
-      environment  = opts[:environment]
-      session_dump = opts[:session_dump]
-      
-      if session_dump
-        initialize_with_dump(session_dump)
+      if opts.has_key? :session_dump
+        initialize_with_dump(opts[:session_dump])
+      elsif opts.has_key? :config_file
+        initialize_with_config(opts[:config_file], opts[:environment])
+      elsif opts.has_key? :config
+        initialize_with_hash(opts[:config])
       else
-        initialize_with_config(config_path, environment)
+        raise InitializationError.new
       end
-      
+
       @log_file = opts[:log_file]
     end
-    
-    
-    def authenticate(&block)      
+
+
+    def authenticate(&block)
       block ||= lambda do |params|
         environment[:auth_credentials].each do |key, value|
           params[key] = value
@@ -60,7 +66,7 @@ module Aviator
       end
 
       response = auth_service.request environment[:auth_service][:request].to_sym, &block
-      
+
       if response.status == 200
         @auth_info = response.body
         update_services_session_data
@@ -73,69 +79,71 @@ module Aviator
     def authenticated?
       !auth_info.nil?
     end
-    
-    
+
+
     def dump
       JSON.generate({
-        environment: environment,
-        auth_info:   auth_info
+        :environment => environment,
+        :auth_info   => auth_info
       })
     end
-    
-    
+
+
     def load(session_dump)
       initialize_with_dump(session_dump)
       update_services_session_data
       self
     end
-    
-    
+
+
     def method_missing(name, *args, &block)
       service_name_parts = name.to_s.match(/^(\w+)_service$/)
-      
+
       if service_name_parts
         get_service_obj(service_name_parts[1])
       else
         super name, *args, &block
       end
     end
-    
-    
+
+
     def self.load(session_dump, opts={})
       opts[:session_dump] = session_dump
-      
+
       new(opts)
     end
-    
-    
+
+
     def validate
       raise NotAuthenticatedError.new unless authenticated?
       raise ValidatorNotDefinedError.new unless environment[:auth_service][:validator]
-      
-      response = auth_service.request environment[:auth_service][:validator].to_sym, session_data: auth_info
-      
+
+      auth_with_bootstrap = auth_info.merge({ :auth_service => environment[:auth_service] })
+
+      response = auth_service.request environment[:auth_service][:validator].to_sym, :session_data => auth_with_bootstrap
+
       response.status == 200 || response.status == 203
     end
-    
-    
+
+
     private
 
 
     def auth_info
       @auth_info
     end
-    
-    
+
+
     def auth_service
       @auth_service ||= Service.new(
-        provider: environment[:provider],
-        service:  environment[:auth_service][:name],
-        default_session_data: { auth_service: environment[:auth_service] },
-        log_file: log_file
+        :provider => environment[:provider],
+        :service  => environment[:auth_service][:name],
+        :default_session_data => { :auth_service => environment[:auth_service] },
+        :log_file => log_file
       )
     end
-    
-        
+
+
     def environment
       @environment
     end
@@ -143,16 +151,16 @@ module Aviator
 
     def get_service_obj(service_name)
       raise NotAuthenticatedError.new unless self.authenticated?
-      
+
       @services ||= {}
-      
+
       @services[service_name] ||= Service.new(
-        provider: environment[:provider],
-        service:  service_name,
-        default_session_data: auth_info,
-        log_file: log_file
+        :provider => environment[:provider],
+        :service  => service_name,
+        :default_session_data => auth_info,
+        :log_file => log_file
       )
-      
+
       @services[service_name]
     end
 
@@ -160,35 +168,37 @@ module Aviator
     def initialize_with_config(config_path, environment)
       raise InvalidConfigFilePathError.new(config_path) unless Pathname.new(config_path).file?
 
-      config = YAML.load_file(config_path).with_indifferent_access
-
+      config = Hashish.new(YAML.load_file(config_path))
 
       raise EnvironmentNotDefinedError.new(config_path, environment) unless config[environment]
 
       @environment = config[environment]
     end
-    
-    
+
+
     def initialize_with_dump(session_dump)
-      session_info = JSON.parse(session_dump).with_indifferent_access
+      session_info = Hashish.new(JSON.parse(session_dump))
       @environment = session_info[:environment]
       @auth_info   = session_info[:auth_info]
     end
-        
-    
+
+    def initialize_with_hash(hash_obj)
+      @environment = Hashish.new(hash_obj)
+    end
+
     def log_file
       @log_file
     end
-    
-    
+
+
     def update_services_session_data
       return unless @services
-      
+
       @services.each do |name, obj|
         obj.default_session_data = auth_info
       end
     end
-      
+
   end
 
 end

data/lib/aviator/core.rb

@@ -1,12 +1,14 @@
 require 'yaml'
 require 'json'
 require 'active_support/inflector'
-require 'active_support/core_ext/hash/indifferent_access'
 require 'faraday'
 
 require "aviator/version"
+require "aviator/compatibility"
+require "aviator/hashish"
 require "aviator/core/request"
 require "aviator/core/request_builder"
 require "aviator/core/response"
 require "aviator/core/service"
 require "aviator/core/session"
+require "aviator/core/logger"

data/lib/aviator/hashish.rb

@@ -0,0 +1,111 @@
+# Hash-ish!
+#
+# This class is implemented using composition rather than inheritance so
+# that we have control over what operations it exposes to peers.
+class Hashish
+  include Enumerable
+
+  def initialize(hash={})
+    @hash = hash
+    hashishify_values
+  end
+
+  def ==(other_obj)
+    other_obj.class == self.class &&
+    other_obj.hash == self.hash
+  end
+
+  def [](key)
+    @hash[normalize(key)]
+  end
+
+  def []=(key, value)
+    @hash[normalize(key)] = value
+  end
+
+  def each(&block)
+    @hash.each(&block)
+  end
+
+  def empty?
+    @hash.empty?
+  end
+
+  def has_key?(name)
+    @hash.has_key? normalize(name)
+  end
+
+  def hash
+    @hash
+  end
+
+  def keys
+    @hash.keys
+  end
+
+  def length
+    @hash.length
+  end
+
+  def merge(other_hash)
+    Hashish.new(@hash.merge(other_hash))
+  end
+
+  def merge!(other_hash)
+    @hash.merge! other_hash
+    self
+  end
+
+  def to_json(obj)
+    @hash.to_json(obj)
+  end
+
+  def to_s
+    str = "{"
+    @hash.each do |key, value|
+      if value.kind_of? String
+        value = "'#{value}'"
+      elsif value.nil?
+        value = "nil"
+      elsif value.kind_of? Array
+        value = "[#{value.join(", ")}]"
+      end
+
+      str += " #{key}: #{value},"
+    end
+
+    str = str[0...-1] + " }"
+    str
+  end
+
+  private
+
+  # Hashishify all the things!
+  def hashishify_values
+    @hash.each do |key, value|
+      if @hash[key].kind_of? Hash
+        @hash[key] = Hashish.new(value)
+      elsif @hash[key].kind_of? Array
+        @hash[key].each_index do |index|
+          element = @hash[key][index]
+          if element.kind_of? Hash
+            @hash[key][index] = Hashish.new(element)
+          end
+        end
+      end
+    end
+  end
+
+  def normalize(key)
+    if @hash.has_key? key
+      key
+    elsif key.is_a? String
+      key.to_sym
+    elsif key.is_a? Symbol
+      key.to_s
+    else
+      key
+    end
+  end
+
+end

data/lib/aviator/openstack/common/v2/admin/base.rb

@@ -1,6 +1,6 @@
 module Aviator
 
-  define_request :base, inherit: [:openstack, :common, :v2, :public, :base] do
+  define_request :base, :inherit => [:openstack, :common, :v2, :public, :base] do
 
     meta :endpoint_type, :admin
 

data/lib/aviator/openstack/common/v2/public/base.rb

@@ -20,10 +20,14 @@ module Aviator
     def base_url
       if session_data[:base_url]
         session_data[:base_url]
-      else
-        service_spec = session_data[:access][:serviceCatalog].find { |s| s[:type] == service.to_s }
-        raise Aviator::Service::MissingServiceEndpointError.new(service.to_s, self.class) unless service_spec
+      elsif service_spec = session_data[:access][:serviceCatalog].find { |s| s[:type] == service.to_s }
         service_spec[:endpoints][0]["#{ endpoint_type }URL".to_sym]
+      elsif session_data[:auth_service] && session_data[:auth_service][:host_uri] && session_data[:auth_service][:api_version]
+        "#{ session_data[:auth_service][:host_uri] }/v2.0"
+      elsif session_data[:auth_service] && session_data[:auth_service][:host_uri]
+        session_data[:auth_service][:host_uri]
+      else
+        raise Aviator::Service::MissingServiceEndpointError.new(service.to_s, self.class)
       end
     end
 

data/lib/aviator/openstack/compute/v2/admin/confirm_server_resize.rb

@@ -1,18 +1,18 @@
 module Aviator
 
-  define_request :confirm_server_resize, inherit: [:openstack, :common, :v2, :admin, :base] do
+  define_request :confirm_server_resize, :inherit => [:openstack, :common, :v2, :admin, :base] do
 
     meta :service, :compute
 
     link 'documentation',
          'http://docs.openstack.org/api/openstack-compute/2/content/Confirm_Resized_Server-d1e3868.html'
 
-    param :id, required: true
+    param :id, :required => true
 
 
     def body
       {
-        confirmResize: nil
+        :confirmResize => nil
       }
     end
 

data/lib/aviator/openstack/compute/v2/admin/create_network.rb

@@ -1,6 +1,6 @@
 module Aviator
 
-  define_request :create_network, inherit: [:openstack, :common, :v2, :admin, :base] do
+  define_request :create_network, :inherit => [:openstack, :common, :v2, :admin, :base] do
 
     meta :service, :compute
 
@@ -8,24 +8,24 @@ module Aviator
          'http://api.openstack.org/api-ref-compute.html#ext-os-networks'
 
 
-    param :label,             required: true
-    param :bridge,            required: false
-    param :bridge_interface,  required: false
-    param :cidr,              required: false
-    param :cidr_v6,           required: false
-    param :dns1,              required: false
-    param :dns2,              required: false
-    param :gateway,           required: false
-    param :gateway_v6,        required: false
-    param :multi_host,        required: false
-    param :project_id,        required: false
-    param :vlan,              required: false
+    param :label,             :required => true
+    param :bridge,            :required => false
+    param :bridge_interface,  :required => false
+    param :cidr,              :required => false
+    param :cidr_v6,           :required => false
+    param :dns1,              :required => false
+    param :dns2,              :required => false
+    param :gateway,           :required => false
+    param :gateway_v6,        :required => false
+    param :multi_host,        :required => false
+    param :project_id,        :required => false
+    param :vlan,              :required => false
 
 
     def body
       p = {
-        network: {
-          label: params[:label]
+        :network => {
+          :label => params[:label]
         }
       }
 

data/lib/aviator/openstack/compute/v2/admin/get_host_details.rb

@@ -1,13 +1,13 @@
 module Aviator
 
-  define_request :get_host_details, inherit: [:openstack, :common, :v2, :admin, :base] do
+  define_request :get_host_details, :inherit => [:openstack, :common, :v2, :admin, :base] do
 
     meta :service, :compute
 
     link 'documentation',
       'http://api.openstack.org/api-ref.html#ext-os-hosts'
 
-    param :host_name, required: true
+    param :host_name, :required => true
 
 
     def headers

data/lib/aviator/openstack/compute/v2/admin/list_hosts.rb

@@ -1,6 +1,6 @@
 module Aviator
 
-  define_request :list_hosts, inherit: [:openstack, :common, :v2, :admin, :base] do
+  define_request :list_hosts, :inherit => [:openstack, :common, :v2, :admin, :base] do
 
     meta :service, :compute
 
@@ -10,8 +10,8 @@ module Aviator
     link 'documentation bug',
          'https://bugs.launchpad.net/nova/+bug/1224763'
 
-    param :service, required: false
-    param :zone,    required: false
+    param :service, :required => false
+    param :zone,    :required => false
 
 
     def headers

data/lib/aviator/openstack/compute/v2/admin/lock_server.rb

@@ -1,17 +1,17 @@
 module Aviator
 
-  define_request :lock_server, inherit: [:openstack, :common, :v2, :admin, :base] do
+  define_request :lock_server, :inherit => [:openstack, :common, :v2, :admin, :base] do
 
     meta :service, :compute
 
     link 'documentation',
          'http://docs.openstack.org/api/openstack-compute/2/content/POST_lock_v2__tenant_id__servers__server_id__action_ext-os-admin-actions.html'
 
-    param :id, required: true
+    param :id, :required => true
 
 
     def body
-      { lock: nil }
+      { :lock => nil }
     end
 
 

data/lib/aviator/openstack/compute/v2/admin/migrate_server.rb

@@ -1,17 +1,17 @@
 module Aviator
 
-  define_request :migrate_server, inherit: [:openstack, :common, :v2, :admin, :base] do
+  define_request :migrate_server, :inherit => [:openstack, :common, :v2, :admin, :base] do
 
     meta :service, :compute
 
     link 'documentation',
          'http://docs.openstack.org/api/openstack-compute/2/content/POST_migrate_v2__tenant_id__servers__server_id__action_ext-os-admin-actions.html'
 
-    param :id,   required: true
+    param :id,   :required => true
 
 
     def body
-      { migrate: nil }
+      { :migrate => nil }
     end
 
 

data/lib/aviator/openstack/compute/v2/admin/reset_server.rb

@@ -1,14 +1,14 @@
 module Aviator
 
-  define_request :reset_server, inherit: [:openstack, :common, :v2, :admin, :base] do
+  define_request :reset_server, :inherit => [:openstack, :common, :v2, :admin, :base] do
 
     meta :service, :compute
 
     link 'documentation',
          'http://docs.openstack.org/api/openstack-compute/2/content/POST_os-resetState_v2__tenant_id__servers__server_id__action_ext-os-admin-actions.html'
 
-    param :id,    required: true
-    param :state, required: true
+    param :id,    :required => true
+    param :state, :required => true
 
 
     def body

data/lib/aviator/openstack/compute/v2/admin/resize_server.rb

@@ -1,22 +1,22 @@
 module Aviator
 
-  define_request :resize_server, inherit: [:openstack, :common, :v2, :admin, :base] do
+  define_request :resize_server, :inherit => [:openstack, :common, :v2, :admin, :base] do
 
     meta :service, :compute
 
     link 'documentation',
          'http://docs.openstack.org/api/openstack-compute/2/content/Resize_Server-d1e3707.html'
 
-    param :id,        required: true
-    param :name,      required: true
-    param :flavorRef, required: true, alias: :flavor_ref
+    param :id,        :required => true
+    param :name,      :required => true
+    param :flavorRef, :required => true, :alias => :flavor_ref
 
 
     def body
       {
-        resize: {
-          name:      params[:name],
-          flavorRef: params[:flavorRef]
+        :resize => {
+          :name      => params[:name],
+          :flavorRef => params[:flavorRef]
         }
       }
     end

data/lib/aviator/openstack/compute/v2/admin/revert_server_resize.rb

@@ -10,12 +10,12 @@ module Aviator
     link 'documentation',
          'http://docs.openstack.org/api/openstack-compute/2/content/Revert_Resized_Server-d1e4024.html'
 
-    param :id, required: true
+    param :id, :required => true
 
 
     def body
       {
-        revertResize: nil
+        :revertResize => nil
       }
     end
 

data/lib/aviator/openstack/compute/v2/admin/unlock_server.rb

@@ -1,17 +1,17 @@
 module Aviator
 
-  define_request :unlock_server, inherit: [:openstack, :common, :v2, :admin, :base] do
+  define_request :unlock_server, :inherit => [:openstack, :common, :v2, :admin, :base] do
 
     meta :service, :compute
 
     link 'documentation',
          'http://docs.openstack.org/api/openstack-compute/2/content/POST_unlock_v2__tenant_id__servers__server_id__action_ext-os-admin-actions.html'
 
-    param :id, required: true
+    param :id, :required => true
 
 
     def body
-      { unlock: nil }
+      { :unlock => nil }
     end
 
 

data/lib/aviator/openstack/compute/v2/public/change_admin_password.rb

@@ -1,6 +1,6 @@
 module Aviator
 
-  define_request :change_admin_password, inherit: [:openstack, :common, :v2, :public, :base] do
+  define_request :change_admin_password, :inherit => [:openstack, :common, :v2, :public, :base] do
 
     meta :service, :compute
 
@@ -10,14 +10,14 @@ module Aviator
     link 'additional spec',
          'https://answers.launchpad.net/nova/+question/228462'
 
-    param :adminPass, required: true, alias: :admin_pass
-    param :id,        required: true
+    param :adminPass, :required => true, :alias => :admin_pass
+    param :id,        :required => true
 
 
     def body
       p = {
-        changePassword: {
-          adminPass: params[:adminPass]
+        :changePassword => {
+          :adminPass => params[:adminPass]
         }
       }