aviator 0.0.7 → 0.0.8

data/lib/aviator/openstack/compute/{v2 → requests/v2}/admin/revert_server_resize.rb

@@ -24,7 +24,7 @@ module Aviator
       h = {}
 
       unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
+        h['X-Auth-Token'] = session_data[:body][:access][:token][:id]
       end
 
       h
@@ -37,7 +37,7 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == service.to_s }
+      service_spec = session_data[:body][:access][:serviceCatalog].find{|s| s[:type] == service.to_s }
       "#{ service_spec[:endpoints][0][:adminURL] }/servers/#{ params[:id] }/action"
     end
 

data/lib/aviator/openstack/identity/{v2 → requests/v2}/admin/create_user.rb

@@ -43,7 +43,7 @@ module Aviator
       h = {}
 
       unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
+        h['X-Auth-Token'] = session_data[:body][:access][:token][:id]
       end
 
       h
@@ -56,7 +56,7 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == 'identity' }
+      service_spec = session_data[:body][:access][:serviceCatalog].find{|s| s[:type] == 'identity' }
       "#{ service_spec[:endpoints][0][:adminURL] }/users"
     end
 

data/lib/aviator/openstack/identity/{v2 → requests/v2}/admin/delete_user.rb

@@ -17,7 +17,7 @@ module Aviator
       h = {}
 
       unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
+        h['X-Auth-Token'] = session_data[:body][:access][:token][:id]
       end
 
       h
@@ -30,7 +30,7 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == service.to_s }
+      service_spec = session_data[:body][:access][:serviceCatalog].find{|s| s[:type] == service.to_s }
       "#{ service_spec[:endpoints][0][:adminURL] }/users/#{ params[:id]}"
     end
 

data/lib/aviator/openstack/identity/{v2 → requests/v2}/admin/list_users.rb

@@ -15,7 +15,7 @@ module Aviator
       h = {}
 
       unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
+        h['X-Auth-Token'] = session_data[:body][:access][:token][:id]
       end
 
       h
@@ -28,7 +28,7 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == 'identity' }
+      service_spec = session_data[:body][:access][:serviceCatalog].find{|s| s[:type] == 'identity' }
       "#{ service_spec[:endpoints][0][:adminURL] }/users"
     end
 

data/lib/aviator/openstack/identity/{v2 → requests/v2}/admin/update_tenant.rb

@@ -21,7 +21,7 @@ module Aviator
       }
 
       [:name, :enabled, :description].each do |key|
-        p[:tenant][key] = params[key] if params[key]
+        p[:tenant][key] = params[key] unless params[key].nil?
       end
 
       p

data/lib/aviator/openstack/identity/{v2 → requests/v2}/admin/update_user.rb

@@ -39,7 +39,7 @@ module Aviator
       h = {}
 
       unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
+        h['X-Auth-Token'] = session_data[:body][:access][:token][:id]
       end
 
       h
@@ -52,7 +52,7 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find { |s| s[:type] == service.to_s }
+      service_spec = session_data[:body][:access][:serviceCatalog].find { |s| s[:type] == service.to_s }
       "#{ service_spec[:endpoints][0][:adminURL] }/users/#{ params[:id] }"
     end
 

data/lib/aviator/openstack/identity/requests/v3/public/create_token.rb

@@ -0,0 +1,126 @@
+# Original work by Stephen Paul Suarez
+# https://github.com/musashi-dev/aviator/blob/develop/lib/aviator/openstack/identity/v3/public/create_token.rb
+
+module Aviator
+
+  define_request :create_token, :inherit => [:openstack, :common, :v3, :public, :base] do
+
+    meta :anonymous,   true
+    meta :service,     :identity
+    meta :api_version, :v3
+
+    link 'documentation',
+         'http://api.openstack.org/api-ref-identity-v3.html#Token_Calls'
+
+    param :domainId,   :required => false, :alias => :domain_id
+    param :domainName, :required => false, :alias => :domain_name
+    param :password,   :required => false
+    param :tenantId,   :required => false, :alias => :tenant_id
+    param :tenantName, :required => false, :alias => :tenant_name
+    param :tokenId,    :required => false, :alias => :token_id
+    param :userId,     :required => false, :alias => :user_id
+    param :username,   :required => false
+
+
+    def body
+      params[:token_id] ? token_auth_body : password_auth_body
+    end
+
+
+    def http_method
+      :post
+    end
+
+
+    def url
+      url  = session_data[:auth_service][:host_uri]
+      url += '/v3' if (URI(url).path =~ /^\/?\w+/).nil?
+      url += "/auth/tokens"
+    end
+
+
+    private
+
+    # Removes nil elements from hash
+    # Adapted from http://stackoverflow.com/a/14773555/402145
+    def compact_hash(hash, opts = {})
+      opts[:recurse] ||= true
+      hash.inject({}) do |new_hash, (k,v)|
+        if !v.nil?
+          new_hash[k] = opts[:recurse] && v.kind_of?(Hash) ? compact_hash(v, opts) : v
+        end
+        new_hash
+      end
+    end
+
+
+    def domain_hash
+      compact_hash({
+        :id   => params[:domain_id],
+        :name => params[:domain_name]
+      })
+    end
+
+
+    def password_auth_body
+      p = {
+        :auth => {
+          :identity => {
+            :methods  => ['password'],
+            :password => {
+              :user => compact_hash({
+                         :id       => params[:user_id],
+                         :name     => params[:username],
+                         :password => params[:password]
+                       })
+            }
+          }
+        }
+      }
+
+      if params[:domain_name] || params[:domain_id]
+        p[:auth][:identity][:password][:user][:domain] = domain_hash
+      end
+
+      if params[:tenant_name] || params[:tenant_id] || params[:domain_name] || params[:domain_id]
+        p[:auth][:scope] = scope_hash
+      end
+      p
+    end
+
+
+    def scope_hash
+      p = {}
+
+      if params[:tenant_name] || params[:tenant_id]
+        p[:project] = compact_hash({
+                        :id   => params[:tenant_id],
+                        :name => params[:tenant_name]
+                      })
+        p[:project][:domain] = domain_hash if params[:domain_name] || params[:domain_id]
+
+      elsif params[:domain_name] || params[:domain_id]
+        p[:domain] = domain_hash
+      end
+
+      p
+    end
+
+
+    def token_auth_body
+      p = {
+        :auth => {
+          :identity => {
+            :methods => ['token'],
+            :token   => { :id => params[:token_id] }
+          }
+        }
+      }
+      p[:auth][:scope] = scope_hash if params[:tenant_name] || params[:tenant_id]
+      p
+    end
+
+
+  end
+
+end

data/lib/aviator/openstack/provider.rb

@@ -0,0 +1,131 @@
+module Aviator
+module Openstack
+
+  module Provider
+
+    class MultipleServiceApisError < StandardError
+      def initialize(service, entries, request_name)
+        types = entries.map{|e| e[:type] }.join("\n - ")
+        msg = <<EOF
+Multiple entries for the #{ service } service were found in the api catalog:
+
+ - #{ types }
+
+I'm unable to guess which one it is you want to use. To fix this problem, you'll need to
+do one of two things:
+
+  1) Indicate in the config file the api version you want to use:
+
+      production:
+        provider: openstack
+        ...
+        #{ service }_service:
+          api_version: v2
+
+  2) Indicate the api version when you call the request:
+
+      session.#{ service }_service.request :#{ request_name }, :api_version => :v2 { ... }
+
+If you combine the two methods, method #2 will override method #1
+
+EOF
+        super(msg)
+      end
+    end
+
+    class << self
+
+      def find_request(service, name, session_data, options)
+        service = service.to_s
+        endpoint_type = options[:endpoint_type]
+        endpoint_types = if endpoint_type
+                           [endpoint_type.to_s.camelize]
+                         else
+                           ['Public', 'Admin']
+                         end
+
+        namespace = Aviator.const_get('Openstack') \
+                           .const_get(service.camelize) \
+                           .const_get('Requests')
+
+        if options[:api_version]
+          m = options[:api_version].to_s.match(/(v\d+)\.?\d*/)
+          version = m[1].to_s.camelize unless m.nil?
+        end
+
+        version ||= infer_version(session_data, name, service)
+
+        unless version.nil?
+          version = version.to_s.camelize
+        end
+
+        return nil unless version && namespace.const_defined?(version)
+
+        namespace = namespace.const_get(version, name)
+
+        endpoint_types.each do |endpoint_type|
+          name = name.to_s.camelize
+
+          next unless namespace.const_defined?(endpoint_type)
+          next unless namespace.const_get(endpoint_type).const_defined?(name)
+
+          return namespace.const_get(endpoint_type).const_get(name)
+        end
+
+        nil
+      end
+
+
+      def root_dir
+        Pathname.new(__FILE__).join('..').expand_path
+      end
+
+
+      def request_file_paths(service)
+          Dir.glob(Pathname.new(__FILE__).join(
+            '..',
+             service.to_s,
+            'requests',
+            '**',
+            '*.rb'
+            ).expand_path
+          )
+      end
+
+
+      private
+
+      def infer_version(session_data, request_name, service)
+        if session_data.has_key?(:auth_service) && session_data[:auth_service][:api_version]
+        session_data[:auth_service][:api_version].to_sym
+
+        elsif session_data.has_key?(:auth_service) && session_data[:auth_service][:host_uri]
+          m = session_data[:auth_service][:host_uri].match(/(v\d+)\.?\d*/)
+          return m[1].to_sym unless m.nil?
+
+        elsif session_data.has_key? :base_url
+          m = session_data[:base_url].match(/(v\d+)\.?\d*/)
+          return m[1].to_sym unless m.nil?
+
+        elsif session_data.has_key?(:body) && session_data[:body].has_key?(:access)
+          service_specs = session_data[:body][:access][:serviceCatalog].select{|s| s[:type].match("#{ service }(v\d+)?") }
+          raise MultipleServiceApisError.new(service, service_specs, request_name) unless service_specs.length <= 1
+          raise Aviator::Service::MissingServiceEndpointError.new(service.to_s, request_name) unless service_specs.length > 0
+          version = service_specs[0][:endpoints][0][:publicURL].match(/(v\d+)\.?\d*/)
+          version ? version[1].to_sym : :v1
+
+        elsif session_data.has_key?(:headers) && session_data[:headers].has_key?("x-subject-token")
+          service_specs = session_data[:body][:token][:catalog].select{|s| s[:type].match("#{ service }(v\d+)?") }
+          raise MultipleServiceApisError.new(service, service_specs, request_name) unless service_specs.length <= 1
+          raise Aviator::Service::MissingServiceEndpointError.new(service.to_s, request_name) unless service_specs.length > 0
+          version = service_specs[0][:endpoints][0][:url].match(/(v\d+)\.?\d*/)
+          version ? version[1].to_sym : :v1
+        end
+      end
+
+    end # class << self
+
+  end # module Provider
+
+end # module Openstack
+end # module Aviator

data/lib/aviator/version.rb

@@ -1,3 +1,3 @@
 module Aviator
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/aviator.rb

@@ -4,3 +4,4 @@ lib_path = File.dirname(__FILE__)
 $LOAD_PATH.unshift(lib_path) unless $LOAD_PATH.include? lib_path
 
 require 'aviator/core'
+require "aviator/openstack/provider"

data/test/aviator/core/cli/describer_test.rb

@@ -10,7 +10,7 @@ class Aviator::Test
       base_ept  = :public
 
       unless @base
-        request_path = [provider_name, service_name, base_ver, base_ept, base_name]
+        request_path = [provider_name, service_name, :requests, base_ver, base_ept, base_name]
 
         @base = request_path.inject(Aviator) do |namespace, sym|
           const_name = sym.to_s.camelize

data/test/aviator/core/request_builder_test.rb

@@ -24,17 +24,17 @@ class Aviator::Test
           meta :api_version,   api_ver
           meta :endpoint_type, ep_type
         end
-        
-        [provider, service, api_ver, ep_type, _name_].inject(builder) do |namespace, sym|
+
+        [provider, service, :requests, api_ver, ep_type, _name_].inject(builder) do |namespace, sym|
           const_name = sym.to_s.camelize
-          
+
           namespace.const_defined?(const_name, false).must_equal true
-          
+
           namespace.const_get(const_name, false)
         end
       end
-      
-      
+
+
       it 'does not get confused when a similar name is defined up in the namespace hierarchy' do
         provider = :aws
         service  = :amazing
@@ -49,7 +49,7 @@ class Aviator::Test
           meta :endpoint_type, ep_type
         end
 
-        [provider, service, api_ver, ep_type, _name_].inject(builder) do |namespace, sym|
+        [provider, service, :requests, api_ver, ep_type, _name_].inject(builder) do |namespace, sym|
           const_name = sym.to_s.camelize
 
           namespace.const_defined?(const_name, false).must_equal true,
@@ -89,6 +89,7 @@ class Aviator::Test
         child_req_hierarchy = [
           base[:provider],
           base[:service],
+          :requests,
           base[:api_ver],
           base[:ep_type],
           :child_request
@@ -163,11 +164,11 @@ class Aviator::Test
 
         builder.define_request child_arr.last, :inherit => base_arr do; end
 
-        base_klass = base_arr.inject(builder) do |namespace, sym|
+        base_klass = base_arr.insert(2, :requests).inject(builder) do |namespace, sym|
           namespace.const_get(sym.to_s.camelize, false)
         end
 
-        child_klass = child_arr.inject(builder) do |namespace, sym|
+        child_klass = child_arr.insert(2, :requests).inject(builder) do |namespace, sym|
           namespace.const_get(sym.to_s.camelize, false)
         end
 
@@ -176,7 +177,7 @@ class Aviator::Test
       end
 
     end
-    
+
   end
-  
+
 end