aviator 0.0.7 → 0.0.8

data/test/aviator/openstack/common/requests/v0/public/base_test.rb

@@ -0,0 +1,172 @@
+require 'test_helper'
+
+class Aviator::Test
+
+  describe 'aviator/openstack/common/requests/v0/public/base' do
+
+    def create_request(session_data=get_session_data, &block)
+      klass.new(session_data)
+    end
+
+
+    def get_session_data(keystone_api_version=:v2)
+      session(keystone_api_version).send :auth_response
+    end
+
+
+    def helper
+      Aviator::Test::RequestHelper
+    end
+
+
+    def klass
+      @klass ||= helper.load_request('openstack', 'common', 'v0', 'public', 'base.rb')
+    end
+
+
+    def session(api_version=:v2)
+      unless @session
+        config = Environment.openstack_admin.dup
+        config[:auth_service][:api_version] = api_version.to_sym
+
+        @session = Aviator::Session.new(
+          :config => config
+        )
+        if api_version == :v2
+          @session.authenticate
+        elsif api_version == :v3
+          @session.authenticate do |params|
+            params[:username]  = Environment.openstack_admin[:auth_credentials][:username]
+            params[:password]  = Environment.openstack_admin[:auth_credentials][:password]
+            params[:domain_id] = "default"
+          end
+        else
+          raise "Unsupported Keystone API version #{ api_version }"
+        end
+      end
+
+      @session
+    end
+
+
+    validate_attr :anonymous? do
+      klass.anonymous?.must_equal false
+    end
+
+
+    validate_attr :api_version do
+      klass.api_version.must_equal :v0
+    end
+
+
+    validate_attr :endpoint_type do
+      klass.endpoint_type.must_equal :public
+    end
+
+
+    describe '#headers' do
+
+      it 'must know to extract token from a Keystone v2 auth info' do
+        session_data = get_session_data(:v2)
+        headers = { 'X-Auth-Token' => session_data[:body][:access][:token][:id] }
+
+        request = create_request(session_data)
+
+        request.headers.must_equal headers
+      end
+
+
+      it 'must know to extract token from a Keystone v3 auth info' do
+        session_data = get_session_data(:v3)
+        headers = { 'X-Auth-Token' => session_data[:headers]['x-subject-token'] }
+
+        request = create_request(session_data)
+
+        request.headers.must_equal headers
+      end
+
+    end
+
+
+    describe '::base_url' do
+
+      it 'must know how to extract the base url from a Keystone v2 session data' do
+        session_data  = get_session_data(:v2)
+        service       = :compute
+        api_version   = :v2
+        endpoint_type = :admin
+        service_info  = session_data[:body][:access][:serviceCatalog].select{ |s| s[:type] == service.to_s }
+        endpoints     = service_info.find{ |s| s.keys.include? "endpoints" }['endpoints']
+        expected_url  = endpoints[0]["#{ endpoint_type }URL"]
+
+        base_request  = klass
+        child_request = Class.new(base_request) do
+                          meta :service,       service
+                          meta :api_version,   api_version
+                          meta :endpoint_type, endpoint_type
+                        end
+
+        request = child_request.new(session_data)
+
+        request.send(:base_url).must_equal expected_url
+      end
+
+      it 'must know how to extract the base url from a Keystone v3 session data' do
+        session_data  = get_session_data(:v3)
+        service       = :compute
+        api_version   = :v3
+        endpoint_type = :public
+        service_info  = session_data[:body][:token][:catalog].select{ |s| s[:type] == "#{ service }#{ api_version }" }
+        endpoints     = service_info.find{ |s| s.keys.include? "endpoints" }['endpoints']
+        expected_url  = endpoints.find{ |s| s['interface'] == endpoint_type.to_s }['url']
+
+        base_request  = klass
+        child_request = Class.new(base_request) do
+                          meta :service,       service
+                          meta :api_version,   api_version
+                          meta :endpoint_type, endpoint_type
+                        end
+
+        request = child_request.new(session_data)
+
+        request.send(:base_url).must_equal expected_url
+      end
+
+      it 'must throw a MissingServiceEndpointError when the service\'s endpoint can\'t be found' do
+        default_session_data = Hashish.new({ :body => JSON.parse('{"access": {"token": {"issued_at": "2013-09-25T20:21:55.453783",
+                  "expires": "2013-09-26T02:21:55Z", "id": "2f6bdec6cd0f49b4a60ede0cd4bf2c0d"},
+                  "serviceCatalog": [], "user": {"username": "bogus",
+                  "roles_links": [], "id": "447527294dae4a1788d36beb0db99c00", "roles": [],
+                  "name": "bogus"}, "metadata": {"is_admin": 0, "roles":
+                  []}}}')})
+
+        request = klass.new(default_session_data)
+
+        the_method = lambda { request.send(:base_url) }
+
+        the_method.must_raise Aviator::Service::MissingServiceEndpointError
+      end
+
+
+      it 'must use the base_url value if provided.' do
+        default_session_data = Hashish.new({ :body => JSON.parse('{"access": {"token": {"issued_at": "2013-09-25T20:21:55.453783",
+                  "expires": "2013-09-26T02:21:55Z", "id": "2f6bdec6cd0f49b4a60ede0cd4bf2c0d"},
+                  "serviceCatalog": [], "user": {"username": "bogus",
+                  "roles_links": [], "id": "447527294dae4a1788d36beb0db99c00", "roles": [],
+                  "name": "bogus"}, "metadata": {"is_admin": 0, "roles":
+                  []}}}')})
+
+        base_url = 'http://sample'
+
+        default_session_data.merge!({ :base_url => base_url })
+
+        request = klass.new(default_session_data)
+
+        request.send(:base_url).must_equal base_url
+      end
+
+    end
+
+  end
+
+end

data/test/aviator/openstack/compute/{v2 → requests/v2}/admin/confirm_server_resize_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/compute/v2/admin/confirm_server_resize' do
+  describe 'aviator/openstack/compute/requests/v2/admin/confirm_server_resize' do
 
     def create_request(session_data = get_session_data)
       klass.new(session_data) do |params|
@@ -12,7 +12,7 @@ class Aviator::Test
 
 
     def get_session_data
-      session.send :auth_info
+      session.send :auth_response
     end
 
 
@@ -48,7 +48,7 @@ class Aviator::Test
                      params[:all_tenants] = true
                    end
 
-        current_tenant = get_session_data[:access][:token][:tenant]
+        current_tenant = get_session_data[:body][:access][:token][:tenant]
 
         resized_servers = response.body[:servers].select do |server|
                            server[:status] == 'VERIFY_RESIZE' && server[:tenant_id] == current_tenant[:id]
@@ -89,7 +89,7 @@ class Aviator::Test
 
 
     validate_attr :headers do
-      headers = { 'X-Auth-Token' => get_session_data[:access][:token][:id] }
+      headers = { 'X-Auth-Token' => get_session_data[:body][:access][:token][:id] }
 
       request = create_request
 
@@ -108,7 +108,7 @@ class Aviator::Test
 
 
     validate_attr :url do
-      service_spec = get_session_data[:access][:serviceCatalog].find{|s| s[:type] == 'compute' }
+      service_spec = get_session_data[:body][:access][:serviceCatalog].find{|s| s[:type] == 'compute' }
       url          = "#{ service_spec[:endpoints][0][:publicURL] }/servers/#{ server[:id] }/action"
 
       request = create_request do |params|

data/test/aviator/openstack/compute/{v2 → requests/v2}/admin/create_network_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/compute/v2/admin/create_network' do
+  describe 'aviator/openstack/compute/requests/v2/admin/create_network' do
 
     def create_request(session_data = get_session_data, &block)
       block ||= lambda do |p|
@@ -15,7 +15,7 @@ class Aviator::Test
 
 
     def get_session_data
-      session.send :auth_info
+      session.send :auth_response
     end
 
 
@@ -88,10 +88,9 @@ class Aviator::Test
 
 
     validate_attr :headers do
-      headers = { 'X-Auth-Token' => get_session_data[:access][:token][:id] }
+      headers = { 'X-Auth-Token' => get_session_data[:body][:access][:token][:id] }
 
       request = create_request
-
       request.headers.must_equal headers
     end
 
@@ -124,7 +123,7 @@ class Aviator::Test
 
 
     validate_attr :url do
-      service_spec = get_session_data[:access][:serviceCatalog].find{ |s| s[:type] == 'compute' }
+      service_spec = get_session_data[:body][:access][:serviceCatalog].find{ |s| s[:type] == 'compute' }
       url          = "#{ service_spec[:endpoints][0][:adminURL] }/os-networks"
 
       request = create_request

data/test/aviator/openstack/compute/{v2 → requests/v2}/admin/get_host_details_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/compute/v2/admin/get_host_details' do
+  describe 'aviator/openstack/compute/requests/v2/admin/get_host_details' do
 
     def create_request(session_data = get_session_data, &block)
       block ||= lambda do |params|
@@ -14,7 +14,7 @@ class Aviator::Test
     
     
     def get_session_data
-      session.send :auth_info
+      session.send :auth_response
     end
 
 
@@ -73,7 +73,7 @@ class Aviator::Test
     validate_attr :headers do
       session_data = get_session_data
 
-      headers = { 'X-Auth-Token' => session_data[:access][:token][:id] }
+      headers = { 'X-Auth-Token' => session_data[:body][:access][:token][:id] }
 
       create_request(session_data).headers.must_equal headers
     end
@@ -91,7 +91,7 @@ class Aviator::Test
 
     validate_attr :url do
       session_data = get_session_data
-      service_spec = session_data[:access][:serviceCatalog].find { |s| s[:type] == 'compute' }
+      service_spec = session_data[:body][:access][:serviceCatalog].find { |s| s[:type] == 'compute' }
       url          = "#{ service_spec[:endpoints][0][:adminURL] }/os-hosts/#{ host_name }"
 
       request = klass.new(session_data) do |p|

data/test/aviator/openstack/compute/{v2 → requests/v2}/admin/list_hosts_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/compute/v2/admin/list_hosts' do
+  describe 'aviator/openstack/compute/requests/v2/admin/list_hosts' do
 
     def create_request(session_data = get_session_data, &block)
       klass.new(session_data, &block)
@@ -10,7 +10,7 @@ class Aviator::Test
     
     
     def get_session_data
-      session.send :auth_info
+      session.send :auth_response
     end
 
 
@@ -61,7 +61,7 @@ class Aviator::Test
     validate_attr :headers do
       session_data = get_session_data
 
-      headers = { 'X-Auth-Token' => session_data[:access][:token][:id] }
+      headers = { 'X-Auth-Token' => session_data[:body][:access][:token][:id] }
 
       request = create_request(session_data)
 
@@ -81,7 +81,7 @@ class Aviator::Test
 
     validate_attr :url do
       session_data = get_session_data
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == 'compute' }
+      service_spec = session_data[:body][:access][:serviceCatalog].find{|s| s[:type] == 'compute' }
       url          = "#{ service_spec[:endpoints][0][:adminURL] }/os-hosts"
       request      = klass.new(session_data)
 

data/test/aviator/openstack/compute/{v2 → requests/v2}/admin/lock_server_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/compute/v2/admin/lock_server' do
+  describe 'aviator/openstack/compute/requests/v2/admin/lock_server' do
 
     def create_request(session_data = get_session_data, &block)
       block ||= lambda { |params| params[:id] = 0 }
@@ -11,7 +11,7 @@ class Aviator::Test
 
 
     def get_session_data
-      session.send :auth_info
+      session.send :auth_response
     end
 
 
@@ -63,7 +63,7 @@ class Aviator::Test
 
 
     validate_attr :headers do
-      headers = { 'X-Auth-Token' => get_session_data[:access][:token][:id] }
+      headers = { 'X-Auth-Token' => get_session_data[:body][:access][:token][:id] }
 
       request = create_request
 
@@ -82,7 +82,7 @@ class Aviator::Test
 
 
     validate_attr :url do
-      service_spec = get_session_data[:access][:serviceCatalog].find{ |s| s[:type] == 'compute' }
+      service_spec = get_session_data[:body][:access][:serviceCatalog].find{ |s| s[:type] == 'compute' }
       server_id    = 'sampleId'
       url          = "#{ service_spec[:endpoints][0][:adminURL] }/servers/#{ server_id }/action"
 

data/test/aviator/openstack/compute/{v2 → requests/v2}/admin/migrate_server_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/compute/v2/admin/migrate_server' do
+  describe 'aviator/openstack/compute/requests/v2/admin/migrate_server' do
 
     def create_request(session_data = get_session_data, &block)
       block ||= lambda { |params| params[:id] = 0 }
@@ -11,7 +11,7 @@ class Aviator::Test
 
 
     def get_session_data
-      session.send :auth_info
+      session.send :auth_response
     end
 
 
@@ -63,7 +63,7 @@ class Aviator::Test
 
 
     validate_attr :headers do
-      headers = { 'X-Auth-Token' => get_session_data[:access][:token][:id] }
+      headers = { 'X-Auth-Token' => get_session_data[:body][:access][:token][:id] }
 
       request = create_request
 
@@ -82,7 +82,7 @@ class Aviator::Test
 
 
     validate_attr :url do
-      service_spec = get_session_data[:access][:serviceCatalog].find{ |s| s[:type] == 'compute' }
+      service_spec = get_session_data[:body][:access][:serviceCatalog].find{ |s| s[:type] == 'compute' }
       server_id    = 'sampleId'
       url          = "#{ service_spec[:endpoints][0][:adminURL] }/servers/#{ server_id }/action"
 

data/test/aviator/openstack/compute/{v2 → requests/v2}/admin/reset_server_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/compute/v2/admin/reset_server' do
+  describe 'aviator/openstack/compute/requests/v2/admin/reset_server' do
 
     def create_request(session_data = get_session_data, &block)
       block ||= lambda do |params|
@@ -15,7 +15,7 @@ class Aviator::Test
 
 
     def get_session_data
-      session.send :auth_info
+      session.send :auth_response
     end
 
 
@@ -76,7 +76,7 @@ class Aviator::Test
 
 
     validate_attr :headers do
-      headers = { 'X-Auth-Token' => get_session_data[:access][:token][:id] }
+      headers = { 'X-Auth-Token' => get_session_data[:body][:access][:token][:id] }
 
       request = create_request
 
@@ -95,7 +95,7 @@ class Aviator::Test
 
 
     validate_attr :url do
-      service_spec = get_session_data[:access][:serviceCatalog].find{ |s| s[:type] == 'compute' }
+      service_spec = get_session_data[:body][:access][:serviceCatalog].find{ |s| s[:type] == 'compute' }
       server_id    = 'sampleId'
       url          = "#{ service_spec[:endpoints][0][:adminURL] }/servers/#{ server_id }/action"
 

data/test/aviator/openstack/compute/{v2 → requests/v2}/admin/resize_server_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/compute/v2/admin/resize_server' do
+  describe 'aviator/openstack/compute/requests/v2/admin/resize_server' do
 
     def create_request(session_data = get_session_data)
       klass.new(session_data) do |params|
@@ -14,7 +14,7 @@ class Aviator::Test
 
 
     def get_session_data
-      session.send :auth_info
+      session.send :auth_response
     end
 
 
@@ -49,7 +49,7 @@ class Aviator::Test
                      params[:all_tenants] = true
                    end
 
-        current_tenant = get_session_data[:access][:token][:tenant]
+        current_tenant = get_session_data[:body][:access][:token][:tenant]
         active_servers = response.body[:servers].select do |server| 
                            server[:status] == 'ACTIVE' && server[:tenant_id] == current_tenant[:id]
                          end
@@ -97,7 +97,7 @@ class Aviator::Test
 
 
     validate_attr :headers do
-      headers = { 'X-Auth-Token' => get_session_data[:access][:token][:id] }
+      headers = { 'X-Auth-Token' => get_session_data[:body][:access][:token][:id] }
 
       request = create_request
 
@@ -129,7 +129,7 @@ class Aviator::Test
 
 
     validate_attr :url do
-      service_spec = get_session_data[:access][:serviceCatalog].find{|s| s[:type] == 'compute' }
+      service_spec = get_session_data[:body][:access][:serviceCatalog].find{|s| s[:type] == 'compute' }
       url          = "#{ service_spec[:endpoints][0][:publicURL] }/servers/#{ server[:id] }/action"
 
       request = create_request do |params|

data/test/aviator/openstack/compute/{v2 → requests/v2}/admin/revert_server_resize_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/compute/v2/admin/revert_server_resize' do
+  describe 'aviator/openstack/compute/requests/v2/admin/revert_server_resize' do
 
     def create_request(session_data = get_session_data)
       klass.new(session_data) do |params|
@@ -12,7 +12,7 @@ class Aviator::Test
 
 
     def get_session_data
-      session.send :auth_info
+      session.send :auth_response
     end
 
 
@@ -48,7 +48,7 @@ class Aviator::Test
                      params[:all_tenants] = true
                    end
 
-        current_tenant = get_session_data[:access][:token][:tenant]
+        current_tenant = get_session_data[:body][:access][:token][:tenant]
 
         resized_servers = response.body[:servers].select do |server|
                            server[:status] == 'VERIFY_RESIZE' && server[:tenant_id] == current_tenant[:id]
@@ -89,7 +89,7 @@ class Aviator::Test
 
 
     validate_attr :headers do
-      headers = { 'X-Auth-Token' => get_session_data[:access][:token][:id] }
+      headers = { 'X-Auth-Token' => get_session_data[:body][:access][:token][:id] }
 
       request = create_request
 
@@ -108,7 +108,7 @@ class Aviator::Test
 
 
     validate_attr :url do
-      service_spec = get_session_data[:access][:serviceCatalog].find{|s| s[:type] == 'compute' }
+      service_spec = get_session_data[:body][:access][:serviceCatalog].find{|s| s[:type] == 'compute' }
       url          = "#{ service_spec[:endpoints][0][:adminURL] }/servers/#{ server[:id] }/action"
 
       request = create_request do |params|

data/test/aviator/openstack/compute/{v2 → requests/v2}/admin/unlock_server_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/compute/v2/admin/unlock_server' do
+  describe 'aviator/openstack/compute/requests/v2/admin/unlock_server' do
 
     def create_request(session_data = get_session_data, &bunlock)
       bunlock ||= lambda { |params| params[:id] = 0 }
@@ -11,7 +11,7 @@ class Aviator::Test
 
 
     def get_session_data
-      session.send :auth_info
+      session.send :auth_response
     end
 
 
@@ -63,7 +63,7 @@ class Aviator::Test
 
 
     validate_attr :headers do
-      headers = { 'X-Auth-Token' => get_session_data[:access][:token][:id] }
+      headers = { 'X-Auth-Token' => get_session_data[:body][:access][:token][:id] }
 
       request = create_request
 
@@ -82,7 +82,7 @@ class Aviator::Test
 
 
     validate_attr :url do
-      service_spec = get_session_data[:access][:serviceCatalog].find{ |s| s[:type] == 'compute' }
+      service_spec = get_session_data[:body][:access][:serviceCatalog].find{ |s| s[:type] == 'compute' }
       server_id    = 'sampleId'
       url          = "#{ service_spec[:endpoints][0][:adminURL] }/servers/#{ server_id }/action"
 

data/test/aviator/openstack/compute/{v2 → requests/v2}/public/change_admin_password_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/compute/v2/public/change_admin_password' do
+  describe 'aviator/openstack/compute/requests/v2/public/change_admin_password' do
 
     def create_request(session_data = get_session_data, &block)
       block ||= lambda do |params|
@@ -15,7 +15,7 @@ class Aviator::Test
 
 
     def get_session_data
-      session.send :auth_info
+      session.send :auth_response
     end
 
 
@@ -67,7 +67,7 @@ class Aviator::Test
     
     
     validate_attr :headers do
-      headers = { 'X-Auth-Token' => get_session_data[:access][:token][:id] }
+      headers = { 'X-Auth-Token' => get_session_data[:body][:access][:token][:id] }
     
       request = create_request
     
@@ -103,7 +103,7 @@ class Aviator::Test
         
     
     validate_attr :url do
-      service_spec = get_session_data[:access][:serviceCatalog].find{|s| s[:type] == 'compute' }
+      service_spec = get_session_data[:body][:access][:serviceCatalog].find{|s| s[:type] == 'compute' }
       server_id    = '105b09f0b6500d36168480ad84'
       url          = "#{ service_spec[:endpoints][0][:publicURL] }/servers/#{ server_id }/action"
         

data/test/aviator/openstack/compute/{v2 → requests/v2}/public/create_image_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/compute/v2/public/create_image' do
+  describe 'aviator/openstack/compute/requests/v2/public/create_image' do
 
     def create_request(session_data = get_session_data, &block)
       block ||= lambda do |params|
@@ -15,7 +15,7 @@ class Aviator::Test
 
 
     def get_session_data
-      session.send :auth_info
+      session.send :auth_response
     end
 
 
@@ -67,7 +67,7 @@ class Aviator::Test
 
 
     validate_attr :headers do
-      headers = { 'X-Auth-Token' => get_session_data[:access][:token][:id] }
+      headers = { 'X-Auth-Token' => get_session_data[:body][:access][:token][:id] }
 
       request = create_request
 
@@ -96,7 +96,7 @@ class Aviator::Test
     
     
     validate_attr :url do
-      service_spec = get_session_data[:access][:serviceCatalog].find{|s| s[:type] == 'compute' }
+      service_spec = get_session_data[:body][:access][:serviceCatalog].find{|s| s[:type] == 'compute' }
       server_id    = '105b09f0b6500d36168480ad84'
       url          = "#{ service_spec[:endpoints][0][:publicURL] }/servers/#{ server_id }/action"
     

data/test/aviator/openstack/compute/{v2 → requests/v2}/public/create_server_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/compute/v2/public/create_server' do
+  describe 'aviator/openstack/compute/requests/v2/public/create_server' do
 
     def create_request(session_data = get_session_data)
       image_id  = session.compute_service.request(:list_images).body[:images].first[:id]
@@ -17,7 +17,7 @@ class Aviator::Test
 
 
     def get_session_data
-      session.send :auth_info
+      session.send :auth_response
     end
 
 
@@ -69,7 +69,7 @@ class Aviator::Test
 
 
     validate_attr :headers do
-      headers = { 'X-Auth-Token' => get_session_data[:access][:token][:id] }
+      headers = { 'X-Auth-Token' => get_session_data[:body][:access][:token][:id] }
 
       request = create_request
 
@@ -104,7 +104,7 @@ class Aviator::Test
 
 
     validate_attr :url do
-      service_spec = get_session_data[:access][:serviceCatalog].find{|s| s[:type] == 'compute' }
+      service_spec = get_session_data[:body][:access][:serviceCatalog].find{|s| s[:type] == 'compute' }
       url          = "#{ service_spec[:endpoints][0][:publicURL] }/servers"
 
       image_id  = session.compute_service.request(:list_images).body[:images].first[:id]