aviator 0.0.7 → 0.0.8

data/test/aviator/openstack/identity/{v2 → requests/v2}/admin/get_tenant_by_id_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/identity/v2/admin/get_tenant_by_id' do
+  describe 'aviator/openstack/identity/requests/v2/admin/get_tenant_by_id' 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
 
 
@@ -65,7 +65,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)
 
@@ -90,7 +90,7 @@ class Aviator::Test
 
     validate_attr :url do
       session_data = get_session_data
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == 'identity' }
+      service_spec = session_data[:body][:access][:serviceCatalog].find{|s| s[:type] == 'identity' }
       tenant_id    = 'itdoesnotmatter'
       url          = "#{ service_spec[:endpoints][0][:adminURL] }/tenants/#{ tenant_id }"
 

data/test/aviator/openstack/identity/requests/v2/admin/list_tenants_test.rb

@@ -0,0 +1,131 @@
+require 'test_helper'
+
+class Aviator::Test
+
+  describe 'aviator/openstack/identity/requests/v2/admin/list_tenants' do
+
+    def create_request(session_data = get_session_data, &block)
+      klass.new(session_data, &block)
+    end
+
+
+    def get_session_data
+      session.send :auth_response
+    end
+
+
+    def helper
+      Aviator::Test::RequestHelper
+    end
+
+
+    def klass
+      @klass ||= helper.load_request('openstack', 'identity', 'v2', 'admin', 'list_tenants.rb')
+    end
+
+
+    def session
+      unless @session
+        @session = Aviator::Session.new(
+          :config_file => Environment.path,
+          :environment => 'openstack_admin'
+        )
+        @session.authenticate
+      end
+
+      @session
+    end
+
+
+    validate_attr :anonymous? do
+      klass.anonymous?.must_equal false
+    end
+
+
+    validate_attr :api_version do
+      klass.api_version.must_equal :v2
+    end
+
+
+    validate_attr :body do
+      klass.body?.must_equal false
+      create_request.body?.must_equal false
+    end
+
+
+    validate_attr :endpoint_type do
+      klass.endpoint_type.must_equal :admin
+    end
+
+
+    validate_attr :headers do
+      session_data = get_session_data
+
+      headers = { 'X-Auth-Token' => session_data[:body][:access][:token][:id] }
+
+      request = create_request(session_data)
+
+      request.headers.must_equal headers
+    end
+
+
+    validate_attr :http_method do
+      create_request.http_method.must_equal :get
+    end
+
+
+    validate_attr :url do
+      session_data = get_session_data
+      service_spec = session_data[:body][:access][:serviceCatalog].find{|s| s[:type] == 'identity' }
+      url          = "#{ service_spec[:endpoints][0][:adminURL] }/tenants"
+      request      = klass.new(session_data)
+
+      request.url.must_equal url
+    end
+
+
+    validate_response 'no parameters are provided' do
+      service = session.identity_service
+
+      response = service.request :list_tenants
+
+      response.status.must_equal 200
+      response.body.wont_be_nil
+      response.body[:tenants].length.wont_equal 0
+      response.headers.wont_be_nil
+    end
+
+
+    validate_response 'session is using a default token' do
+      s = Aviator::Session.new(
+          :config_file => Environment.path,
+          :environment => 'openstack_admin'
+        )
+
+      s.authenticate do |creds|
+        creds.username = Environment.openstack_member[:auth_credentials][:username]
+        creds.password = Environment.openstack_member[:auth_credentials][:password]
+      end
+
+      base_url = URI(Environment.openstack_admin[:auth_service][:host_uri])
+
+      api_version = Environment.openstack_admin[:auth_service][:api_version]
+
+      if api_version
+        base_url.path = (api_version == 'v2' ? '/v2.0' : "/#{ api_version }")
+      end
+
+      # base_url should have the form 'https://<domain>:<port>/<api_version>'
+
+      response = s.identity_service.request :list_tenants, :base_url => base_url.to_s
+
+      response.status.must_equal 200
+      response.body.wont_be_nil
+      response.body[:tenants].length.wont_equal 0
+      response.headers.wont_be_nil
+    end
+
+
+  end
+
+end

data/test/aviator/openstack/identity/{v2 → requests/v2}/admin/list_users_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/identity/v2/admin/list_users' do
+  describe 'aviator/openstack/identity/requests/v2/admin/list_users' 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)
 
@@ -76,7 +76,7 @@ class Aviator::Test
 
     validate_attr :url do
       session_data = get_session_data
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == 'identity' }
+      service_spec = session_data[:body][:access][:serviceCatalog].find{|s| s[:type] == 'identity' }
       url          = "#{ service_spec[:endpoints][0][:adminURL] }/users"
       request      = klass.new(session_data)
 

data/test/aviator/openstack/identity/{v2 → requests/v2}/admin/update_tenant_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/identity/v2/admin/update_tenant' do
+  describe 'aviator/openstack/identity/requests/v2/admin/update_tenant' 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
 
 
@@ -62,7 +62,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 { |p| p[:id] = 0 }
 
@@ -94,7 +94,7 @@ class Aviator::Test
       # in case the corresponding cassette is deleted
       tenant_id    = '105b09f0b6500d36168480ad84'
 
-      service_spec = get_session_data[:access][:serviceCatalog].find{|s| s[:type] == 'identity' }
+      service_spec = get_session_data[:body][:access][:serviceCatalog].find{|s| s[:type] == 'identity' }
       url          = "#{ service_spec[:endpoints][0][:adminURL] }/tenants/#{ tenant_id }"
 
       request = create_request do |params|

data/test/aviator/openstack/identity/{v2 → requests/v2}/admin/update_user_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/identity/v2/admin/update_user' do
+  describe 'aviator/openstack/identity/requests/v2/admin/update_user' do
 
     def create_request(session_data = get_session_data, &block)
       block ||= lambda { |p| p[:id] = 0 }
@@ -11,7 +11,7 @@ class Aviator::Test
 
 
     def get_session_data
-      session.send :auth_info
+      session.send :auth_response
     end
 
 
@@ -62,7 +62,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
 
@@ -94,7 +94,7 @@ class Aviator::Test
     validate_attr :url do
       user_id = 'thisdoesntneedtobevalidinthistest'
 
-      service_spec = get_session_data[:access][:serviceCatalog].find { |s| s[:type] == 'identity' }
+      service_spec = get_session_data[:body][:access][:serviceCatalog].find { |s| s[:type] == 'identity' }
       url          = "#{ service_spec[:endpoints][0][:adminURL] }/users/#{ user_id }"
 
       request = create_request do |params|

data/test/aviator/openstack/identity/{v2 → requests/v2}/public/create_token_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/identity/v2/public/create_token' do
+  describe 'aviator/openstack/identity/requests/v2/public/create_token' do
 
     def create_request
       klass.new(helper.admin_bootstrap_session_data) do |params|

data/test/aviator/openstack/identity/{v2 → requests/v2}/public/list_tenants_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/identity/v2/public/list_tenants' do
+  describe 'aviator/openstack/identity/requests/v2/public/list_tenants' 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)
 
@@ -76,7 +76,7 @@ class Aviator::Test
 
     validate_attr :url do
       session_data = get_session_data
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == 'identity' }
+      service_spec = session_data[:body][:access][:serviceCatalog].find{|s| s[:type] == 'identity' }
       url          = "#{ service_spec[:endpoints][0][:publicURL] }/tenants"
       request      = klass.new(session_data)
 

data/test/aviator/openstack/identity/{v2 → requests/v2}/public/root_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/identity/v2/public/root' do
+  describe 'aviator/openstack/identity/requests/v2/public/root' do
 
     def create_request(session_data = get_session_data)
       klass.new(session_data)
@@ -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
-      headers = { 'X-Auth-Token' => get_session_data[:access][:token][:id] }
+      headers = { 'X-Auth-Token' => get_session_data[:body][:access][:token][:id] }
 
       request = create_request
 
@@ -85,7 +85,7 @@ class Aviator::Test
 
 
     validate_attr :url do
-      service_spec = get_session_data[:access][:serviceCatalog].find{|s| s[:type] == 'identity' }
+      service_spec = get_session_data[:body][:access][:serviceCatalog].find{|s| s[:type] == 'identity' }
       uri          = URI(service_spec[:endpoints][0][:publicURL])
       url          = "#{ uri.scheme }://#{ uri.host }:#{ uri.port.to_s }/v2.0/"
 

data/test/aviator/openstack/identity/requests/v3/public/create_token_test.rb

@@ -0,0 +1,188 @@
+require 'test_helper'
+
+class Aviator::Test
+
+  describe 'aviator/openstack/identity/requests/v3/public/create_token' do
+
+    def create_request(&block)
+      block ||= lambda do |params|
+        params[:username] = Environment.openstack_admin[:auth_credentials][:username]
+        params[:password] = Environment.openstack_admin[:auth_credentials][:password]
+      end
+
+      klass.new(helper.admin_bootstrap_session_data, &block)
+    end
+
+
+    def helper
+      Aviator::Test::RequestHelper
+    end
+
+
+    def klass
+      @klass ||= helper.load_request('openstack', 'identity', 'v3', 'public', 'create_token.rb')
+    end
+
+
+    validate_attr :anonymous? do
+      klass.anonymous?.must_equal true
+    end
+
+
+    validate_attr :api_version do
+      klass.api_version.must_equal :v3
+    end
+
+
+    validate_attr :body do
+      p = {
+        :auth => {
+          :identity => {
+            :methods =>['password'],
+            :password => {
+              :user => {
+                :name => Environment.openstack_admin[:auth_credentials][:username],
+                :password => Environment.openstack_admin[:auth_credentials][:password]
+              }
+            }
+          }
+        }
+      }
+
+      create_request.body.must_equal p
+    end
+
+
+    validate_attr :endpoint_type do
+      klass.endpoint_type.must_equal :public
+    end
+
+
+    validate_attr :headers do
+      create_request.headers?.must_equal true
+    end
+
+
+    validate_attr :http_method do
+      create_request.http_method.must_equal :post
+    end
+
+
+    validate_attr :optional_params do
+      klass.optional_params.must_equal [
+        :domainId,
+        :domainName,
+        :password,
+        :tenantId,
+        :tenantName,
+        :tokenId,
+        :userId,
+        :username
+      ]
+    end
+
+
+    validate_attr :required_params do
+      klass.required_params.must_equal []
+    end
+
+
+    validate_attr :url do
+      session_data = helper.admin_bootstrap_session_data
+      url = "#{ session_data[:auth_service][:host_uri] }/v3/auth/tokens"
+
+      create_request.url.must_equal url
+    end
+
+
+    validate_attr :url, 'when the host uri contains the api version' do
+      host_uri = 'http://x.y.z:5000/v3'
+
+      request = klass.new({ :auth_service => { :host_uri => host_uri } }) do |params|
+        params[:username] = Environment.openstack_admin[:auth_credentials][:username]
+        params[:password] = Environment.openstack_admin[:auth_credentials][:password]
+      end
+
+      request.url.must_equal "#{ host_uri }/auth/tokens"
+    end
+
+
+    validate_attr :param_aliases do
+      aliases = {
+        :domain_id   => :domainId,
+        :domain_name => :domainName,
+        :token_id    => :tokenId,
+        :tenant_name => :tenantName,
+        :tenant_id   => :tenantId,
+        :user_id     => :userId
+      }
+
+      klass.param_aliases.must_equal aliases
+    end
+
+
+    validate_response 'parameters are invalid' do
+      service = Aviator::Service.new(
+        :provider => 'openstack',
+        :service  => 'identity',
+        :default_session_data => RequestHelper.admin_bootstrap_session_data(:v3)
+      )
+
+      response = service.request :create_token do |params|
+        params[:username] = 'somebogususer'
+        params[:password] = 'doesitreallymatter?'
+        params[:domain_id] = "default"
+      end
+
+      response.status.must_equal 401
+      response.body.wont_be_nil
+      response.headers.wont_be_nil
+    end
+
+
+    validate_response 'parameters are valid' do
+      service = Aviator::Service.new(
+        :provider => 'openstack',
+        :service  => 'identity',
+        :default_session_data => RequestHelper.admin_bootstrap_session_data(:v3)
+      )
+
+      response = service.request :create_token do |params|
+        params[:username]  = Environment.openstack_admin[:auth_credentials][:username]
+        params[:password]  = Environment.openstack_admin[:auth_credentials][:password]
+        params[:domain_id] = "default"
+      end
+
+      response.status.must_equal 201
+      response.body.wont_be_nil
+      response.headers.wont_be_nil
+    end
+
+
+    validate_response 'provided with a token' do
+      service = Aviator::Service.new(
+        :provider => 'openstack',
+        :service  => 'identity',
+        :default_session_data => RequestHelper.admin_bootstrap_session_data(:v3)
+      )
+
+      response = service.request :create_token do |params|
+        params[:username]  = Environment.openstack_admin[:auth_credentials][:username]
+        params[:password]  = Environment.openstack_admin[:auth_credentials][:password]
+        params[:domain_id] = "default"
+      end
+
+      token = response.headers["x-subject-token"]
+
+      response = service.request :create_token do |params|
+        params[:token_id] = token
+      end
+
+      response.status.must_equal 201
+      response.body.wont_be_nil
+      response.headers.wont_be_nil
+    end
+
+  end
+
+end

data/test/aviator/openstack/image/{v1 → requests/v1}/public/list_public_images_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/image/v1/public/list_public_images' do
+  describe 'aviator/openstack/image/requests/v1/public/list_public_images' do
 
     def create_request(session_data = get_session_data, &block)
       klass.new(session_data, &block)
@@ -23,7 +23,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
 

data/test/aviator/openstack/image/{v1 → requests/v1}/public/root_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/image/v1/public/root' do
+  describe 'aviator/openstack/image/requests/v1/public/root' do
 
     def create_request(session_data = get_session_data)
       klass.new(session_data)
@@ -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
-      headers = { 'X-Auth-Token' => get_session_data[:access][:token][:id] }
+      headers = { 'X-Auth-Token' => get_session_data[:body][:access][:token][:id] }
 
       request = create_request
 
@@ -85,7 +85,7 @@ class Aviator::Test
 
 
     validate_attr :url do
-      service_spec = get_session_data[:access][:serviceCatalog].find{|s| s[:type] == 'image' }
+      service_spec = get_session_data[:body][:access][:serviceCatalog].find{|s| s[:type] == 'image' }
       uri          = URI(service_spec[:endpoints][0][:publicURL])
       url          = "#{ uri.scheme }://#{ uri.host }:#{ uri.port.to_s }/v1/"
 

data/test/aviator/openstack/metering/{v1 → requests/v1}/admin/list_projects_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Aviator::Test
 
-  describe 'aviator/openstack/metering/v1/admin/projects' do
+  describe 'aviator/openstack/metering/requests/v1/admin/projects' do
 
     def create_request(session_data = get_session_data)
       klass.new(session_data)
@@ -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
-      headers = { 'X-Auth-Token' => get_session_data[:access][:token][:id] }
+      headers = { 'X-Auth-Token' => get_session_data[:body][:access][:token][:id] }
 
       request = create_request
 
@@ -85,7 +85,7 @@ class Aviator::Test
 
 
     validate_attr :url do
-      service_spec = get_session_data[:access][:serviceCatalog].find{|s| s[:type] == 'metering' }
+      service_spec = get_session_data[:body][:access][:serviceCatalog].find{|s| s[:type] == 'metering' }
       uri          = URI(service_spec[:endpoints][0][:adminURL])
       url          = "#{ uri.scheme }://#{ uri.host }:#{ uri.port.to_s }/v1/projects"