aviator 0.0.6 → 0.0.7

data/test/aviator/openstack/identity/v2/admin/get_tenant_by_id_test.rb

@@ -0,0 +1,122 @@
+require 'test_helper'
+
+class Aviator::Test
+
+  describe 'aviator/openstack/identity/v2/admin/get_tenant_by_id' do
+
+    def create_request(session_data = get_session_data, &block)
+      block ||= lambda do |params|
+                  params[:id] = 'this_doesnt_matter_with_this_test'
+                end
+
+      klass.new(session_data, &block)
+    end
+
+
+    def get_session_data
+      session.send :auth_info
+    end
+
+
+    def helper
+      Aviator::Test::RequestHelper
+    end
+
+
+    def klass
+      @klass ||= helper.load_request('openstack', 'identity', 'v2', 'admin', 'get_tenant_by_id.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[: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 :optional_params do
+      klass.optional_params.must_equal []
+    end
+
+
+    validate_attr :required_params do
+      klass.required_params.must_equal [:id]
+    end
+
+
+    validate_attr :url do
+      session_data = get_session_data
+      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == 'identity' }
+      tenant_id    = 'itdoesnotmatter'
+      url          = "#{ service_spec[:endpoints][0][:adminURL] }/tenants/#{ tenant_id }"
+
+      request = create_request do |p|
+        p[:id] = tenant_id
+      end
+
+      request.url.must_equal url
+    end
+
+
+    validate_response 'a valid tenant id is provided' do
+      service = session.identity_service
+      tenant  = session.identity_service.request(:list_tenants).body[:tenants].first
+
+      response = service.request :get_tenant_by_id do |p|
+        p[:id] = tenant[:id]
+      end
+
+      response.status.must_equal 200
+      response.body.wont_be_nil
+      response.body[:tenant][:id].must_equal tenant[:id]
+      response.headers.wont_be_nil
+    end
+
+
+  end
+
+end

data/test/aviator/openstack/identity/v2/admin/list_users_test.rb

@@ -27,8 +27,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-          config_file: Environment.path,
-          environment: 'openstack_admin'
+          :config_file => Environment.path,
+          :environment => 'openstack_admin'
         )
         @session.authenticate
       end

data/test/aviator/openstack/identity/v2/admin/update_tenant_test.rb

@@ -27,8 +27,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-          config_file: Environment.path,
-          environment: 'openstack_admin'
+          :config_file => Environment.path,
+          :environment => 'openstack_admin'
         )
         @session.authenticate
       end

data/test/aviator/openstack/identity/v2/admin/update_user_test.rb

@@ -28,8 +28,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-          config_file: Environment.path,
-          environment: 'openstack_admin'
+          :config_file => Environment.path,
+          :environment => 'openstack_admin'
         )
         @session.authenticate
       end
@@ -107,7 +107,7 @@ class Aviator::Test
 
     validate_attr :param_aliases do
       aliases = {
-        tenant_id: :tenantId
+        :tenant_id => :tenantId
       }
 
       klass.param_aliases.must_equal aliases

data/test/aviator/openstack/identity/v2/public/create_token_test.rb

@@ -34,10 +34,10 @@ class Aviator::Test
 
     validate_attr :body do
       p = {
-        auth: {
-          passwordCredentials: {
-            username: Environment.openstack_admin[:auth_credentials][:username],
-            password: Environment.openstack_admin[:auth_credentials][:password]
+        :auth => {
+          :passwordCredentials => {
+            :username => Environment.openstack_admin[:auth_credentials][:username],
+            :password => Environment.openstack_admin[:auth_credentials][:password]
           }
         }
       }
@@ -83,7 +83,7 @@ class Aviator::Test
     validate_attr :url, 'when the host uri contains the api version' do
       host_uri = 'http://x.y.z:5000/v2.0'
 
-      request = klass.new({ auth_service: { host_uri: host_uri } }) do |params|
+      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
@@ -94,9 +94,9 @@ class Aviator::Test
 
     validate_attr :param_aliases do
       aliases = {
-        token_id:    :tokenId,
-        tenant_name: :tenantName,
-        tenant_id:   :tenantId
+        :token_id    => :tokenId,
+        :tenant_name => :tenantName,
+        :tenant_id   => :tenantId
       }
 
       klass.param_aliases.must_equal aliases
@@ -105,9 +105,9 @@ class Aviator::Test
 
     validate_response 'parameters are invalid' do
       service = Aviator::Service.new(
-        provider: 'openstack',
-        service:  'identity',
-        default_session_data: RequestHelper.admin_bootstrap_session_data
+        :provider => 'openstack',
+        :service  => 'identity',
+        :default_session_data => RequestHelper.admin_bootstrap_session_data
       )
 
       response = service.request :create_token do |params|
@@ -123,9 +123,9 @@ class Aviator::Test
 
     validate_response 'parameters are valid' do
       service = Aviator::Service.new(
-        provider: 'openstack',
-        service:  'identity',
-        default_session_data: RequestHelper.admin_bootstrap_session_data
+        :provider => 'openstack',
+        :service  => 'identity',
+        :default_session_data => RequestHelper.admin_bootstrap_session_data
       )
 
       response = service.request :create_token do |params|
@@ -141,9 +141,9 @@ class Aviator::Test
 
     validate_response 'provided with a token' do
       service = Aviator::Service.new(
-        provider: 'openstack',
-        service:  'identity',
-        default_session_data: RequestHelper.admin_bootstrap_session_data
+        :provider => 'openstack',
+        :service  => 'identity',
+        :default_session_data => RequestHelper.admin_bootstrap_session_data
       )
 
       response = service.request :create_token do |params|
@@ -155,7 +155,8 @@ class Aviator::Test
 
       response = service.request :create_token do |params|
         params[:tokenId]    = token
-        params[:tenantName] = Environment.openstack_admin[:auth_credentials][:tenantName]
+        params[:tenantName] = Environment.openstack_admin[:auth_credentials][:tenantName] ||
+                              Environment.openstack_admin[:auth_credentials][:tenant_name]
       end
 
       response.status.must_equal 200

data/test/aviator/openstack/identity/v2/public/list_tenants_test.rb

@@ -27,8 +27,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-          config_file: Environment.path,
-          environment: 'openstack_admin'
+          :config_file => Environment.path,
+          :environment => 'openstack_admin'
         )
         @session.authenticate
       end
@@ -98,8 +98,8 @@ class Aviator::Test
 
     validate_response 'session is using a default token' do
       s = Aviator::Session.new(
-          config_file: Environment.path,
-          environment: 'openstack_admin'
+          :config_file => Environment.path,
+          :environment => 'openstack_admin'
         )
 
       s.authenticate do |creds|
@@ -117,7 +117,7 @@ class Aviator::Test
 
       # 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 = s.identity_service.request :list_tenants, :base_url => base_url.to_s
       
       response.status.must_equal 200
       response.body.wont_be_nil

data/test/aviator/openstack/identity/v2/public/root_test.rb

@@ -27,8 +27,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_member'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_member'
                    )
         @session.authenticate
       end

data/test/aviator/openstack/image/v1/public/list_public_images_test.rb

@@ -0,0 +1,145 @@
+require 'test_helper'
+
+class Aviator::Test
+
+  describe 'aviator/openstack/image/v1/public/list_public_images' do
+
+    def create_request(session_data = get_session_data, &block)
+      klass.new(session_data, &block)
+    end
+
+
+    def session
+      unless @session
+        @session = Aviator::Session.new(
+                     :config_file => Environment.path,
+                     :environment => 'openstack_member'
+                   )
+        @session.authenticate
+      end
+
+      @session
+    end
+
+
+    def get_session_data
+      session.send :auth_info
+    end
+
+
+    def helper
+      Aviator::Test::RequestHelper
+    end
+
+    def session
+      unless @session
+        @session = Aviator::Session.new(
+                     :config_file => Environment.path,
+                     :environment => 'openstack_member'
+                   )
+        @session.authenticate
+      end
+
+      @session
+    end
+
+
+    def helper
+      Aviator::Test::RequestHelper
+    end
+
+
+    def klass
+      @klass ||= helper.load_request('openstack', 'image', 'v1', 'public', 'list_public_images.rb')
+    end
+
+
+    validate_attr :anonymous? do
+      klass.anonymous?.must_equal false
+    end
+
+
+    validate_attr :api_version do
+      klass.api_version.must_equal :v1
+    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 :public
+    end
+
+
+    validate_attr :headers do
+      headers = { 'X-Auth-Token' => get_session_data[:access][:token][:id] }
+
+      request = create_request
+
+      request.headers.must_equal headers
+    end
+
+
+    validate_attr :optional_params do
+      klass.optional_params.must_equal [
+        :name,
+        :container_format,
+        :disk_format,
+        :status,
+        :size_min,
+        :size_max,
+        :sort_key,
+        :sort_dir
+      ]
+    end
+
+
+    validate_attr :required_params do
+      klass.required_params.must_equal []
+    end
+
+
+    validate_attr :http_method do
+      create_request.http_method.must_equal :get
+    end
+
+
+    validate_response 'no parameters are provided' do
+      response = session.image_service.request :list_public_images
+
+      response.status.must_equal 200
+      response.body.wont_be_nil
+      response.body[:images].length.wont_equal 0
+      response.headers.wont_be_nil
+    end
+
+
+    validate_response 'filtering with matches' do
+      response = session.image_service.request :list_public_images do |p|
+        p[:name] = '64Bit Ubuntu 12.04'
+      end
+
+      response.status.must_equal 200
+      response.body.wont_be_nil
+      response.body[:images].length.must_equal 1
+      response.headers.wont_be_nil
+    end
+
+
+    validate_response 'filtering with no matches' do
+      response = session.image_service.request :list_public_images do |p|
+        p[:name] = 'does-not-match-any-image'
+      end
+
+      response.status.must_equal 200
+      response.body.wont_be_nil
+      response.body[:images].length.must_equal 0
+      response.headers.wont_be_nil
+    end
+
+  end
+end

data/test/aviator/openstack/image/v1/public/root_test.rb

@@ -27,8 +27,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_member'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_member'
                    )
         @session.authenticate
       end

data/test/aviator/openstack/metering/v1/admin/list_projects_test.rb

@@ -27,8 +27,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_member'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_member'
                    )
         @session.authenticate
       end

data/test/aviator/openstack/volume/v1/public/create_volume_test.rb

@@ -33,8 +33,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_member'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_member'
                    )
         @session.authenticate
       end

data/test/aviator/openstack/volume/v1/public/delete_volume_test.rb

@@ -30,8 +30,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_member'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_member'
                    )
         @session.authenticate
       end

data/test/aviator/openstack/volume/v1/public/get_volume_test.rb

@@ -15,8 +15,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_member'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_member'
                    )
         @session.authenticate
       end

data/test/aviator/openstack/volume/v1/public/list_volume_types_test.rb

@@ -25,8 +25,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_member'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_member'
                    )
         @session.authenticate
       end

data/test/aviator/openstack/volume/v1/public/list_volumes_test.rb

@@ -4,26 +4,40 @@ class Aviator::Test
 
   describe 'aviator/openstack/volume/v1/public/list_volumes' do
 
+
+    def admin_session
+      unless @admin_session
+        @admin_session = Aviator::Session.new(
+                     :config_file => Environment.path,
+                     :environment => 'openstack_admin'
+                   )
+        @admin_session.authenticate
+      end
+
+      @admin_session
+    end
+
+
     def create_request(session_data = get_session_data, &block)
       klass.new(session_data, &block)
     end
 
 
-    def session
-      unless @session
-        @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_member'
+    def member_session
+      unless @member_session
+        @member_session = Aviator::Session.new(
+                     :config_file => Environment.path,
+                     :environment => 'openstack_member'
                    )
-        @session.authenticate
+        @member_session.authenticate
       end
 
-      @session
+      @member_session
     end
 
 
     def get_session_data
-      session.send :auth_info
+      member_session.send :auth_info
     end
 
 
@@ -31,18 +45,6 @@ class Aviator::Test
       Aviator::Test::RequestHelper
     end
 
-    def session
-      unless @session
-        @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_member'
-                   )
-        @session.authenticate
-      end
-
-      @session
-    end
-
 
     def helper
       Aviator::Test::RequestHelper
@@ -53,14 +55,16 @@ class Aviator::Test
       @klass ||= helper.load_request('openstack', 'volume', 'v1', 'public', 'list_volumes.rb')
     end
 
+
     def create_volume
-      session.volume_service.request :create_volume do |params|
+      member_session.volume_service.request :create_volume do |params|
         params[:display_name]         = 'Aviator Volume Test Name'
         params[:display_description]  = 'Aviator Volume Test Description'
         params[:size]                 = '1'
       end
     end
 
+
     validate_attr :anonymous? do
       klass.anonymous?.must_equal false
     end
@@ -90,8 +94,10 @@ class Aviator::Test
       request.headers.must_equal headers
     end
 
+
     validate_attr :optional_params do
       klass.optional_params.must_equal [
+        :all_tenants,
         :details,
         :status,
         :availability_zone,
@@ -114,10 +120,24 @@ class Aviator::Test
       create_request.http_method.must_equal :get
     end
 
+
+    validate_response 'all_tenants param is true' do
+      # Manually create the volumes in more than one tenant for now
+      
+      control_response = admin_session.volume_service.request :list_volumes
+      
+      all_tenants_response = admin_session.volume_service.request :list_volumes do |params|
+        params[:all_tenants] = true
+      end
+      
+      all_tenants_response.body[:volumes].length.must_be :>, control_response.body[:volumes].length
+    end
+
+
     validate_response 'no parameters are provided' do
       create_volume
 
-      response = session.volume_service.request :list_volumes
+      response = member_session.volume_service.request :list_volumes
 
       response.status.must_equal 200
       response.body.wont_be_nil
@@ -125,10 +145,11 @@ class Aviator::Test
       response.headers.wont_be_nil
     end
 
+
     validate_response 'parameters are valid' do
       create_volume
 
-      response = session.volume_service.request :list_volumes do |params|
+      response = member_session.volume_service.request :list_volumes do |params|
         params[:details]      = true
         params[:display_name] = 'Aviator Volume Test Name'
       end
@@ -140,8 +161,9 @@ class Aviator::Test
       response.headers.wont_be_nil
     end
 
+
     validate_response 'parameters are invalid' do
-      response = session.volume_service.request :list_volumes do |params|
+      response = member_session.volume_service.request :list_volumes do |params|
         params[:display_name] = "derpderp"
       end
 
@@ -150,5 +172,8 @@ class Aviator::Test
       response.body[:volumes].length.must_equal 0
       response.headers.wont_be_nil
     end
+
+
   end
+
 end

data/test/aviator/openstack/volume/v1/public/root_test.rb

@@ -27,8 +27,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_member'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_member'
                    )
         @session.authenticate
       end

data/test/aviator/openstack/volume/v1/public/update_volume_test.rb

@@ -28,8 +28,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_member'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_member'
                    )
         @session.authenticate
       end