Differentiate between admin and member session
We will use the admin session for the all_tenants test.
This commit is contained in:
@@ -5,26 +5,39 @@ class Aviator::Test
|
|||||||
describe 'aviator/openstack/volume/v1/public/list_volumes' do
|
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)
|
def create_request(session_data = get_session_data, &block)
|
||||||
klass.new(session_data, &block)
|
klass.new(session_data, &block)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
def session
|
def member_session
|
||||||
unless @session
|
unless @member_session
|
||||||
@session = Aviator::Session.new(
|
@member_session = Aviator::Session.new(
|
||||||
config_file: Environment.path,
|
config_file: Environment.path,
|
||||||
environment: 'openstack_member'
|
environment: 'openstack_member'
|
||||||
)
|
)
|
||||||
@session.authenticate
|
@member_session.authenticate
|
||||||
end
|
end
|
||||||
|
|
||||||
@session
|
@member_session
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
def get_session_data
|
def get_session_data
|
||||||
session.send :auth_info
|
member_session.send :auth_info
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
@@ -33,19 +46,6 @@ class Aviator::Test
|
|||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
def session
|
|
||||||
unless @session
|
|
||||||
@session = Aviator::Session.new(
|
|
||||||
config_file: Environment.path,
|
|
||||||
environment: 'openstack_member'
|
|
||||||
)
|
|
||||||
@session.authenticate
|
|
||||||
end
|
|
||||||
|
|
||||||
@session
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
def helper
|
def helper
|
||||||
Aviator::Test::RequestHelper
|
Aviator::Test::RequestHelper
|
||||||
end
|
end
|
||||||
@@ -57,7 +57,7 @@ class Aviator::Test
|
|||||||
|
|
||||||
|
|
||||||
def create_volume
|
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_name] = 'Aviator Volume Test Name'
|
||||||
params[:display_description] = 'Aviator Volume Test Description'
|
params[:display_description] = 'Aviator Volume Test Description'
|
||||||
params[:size] = '1'
|
params[:size] = '1'
|
||||||
@@ -124,7 +124,7 @@ class Aviator::Test
|
|||||||
validate_response 'no parameters are provided' do
|
validate_response 'no parameters are provided' do
|
||||||
create_volume
|
create_volume
|
||||||
|
|
||||||
response = session.volume_service.request :list_volumes
|
response = member_session.volume_service.request :list_volumes
|
||||||
|
|
||||||
response.status.must_equal 200
|
response.status.must_equal 200
|
||||||
response.body.wont_be_nil
|
response.body.wont_be_nil
|
||||||
@@ -136,7 +136,7 @@ class Aviator::Test
|
|||||||
validate_response 'parameters are valid' do
|
validate_response 'parameters are valid' do
|
||||||
create_volume
|
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[:details] = true
|
||||||
params[:display_name] = 'Aviator Volume Test Name'
|
params[:display_name] = 'Aviator Volume Test Name'
|
||||||
end
|
end
|
||||||
@@ -150,7 +150,7 @@ class Aviator::Test
|
|||||||
|
|
||||||
|
|
||||||
validate_response 'parameters are invalid' do
|
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"
|
params[:display_name] = "derpderp"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user