Remove Keystone V2 acceptance tests
The Keystone V2 API has been fully removed (although, the auth. API under V2 still exists). The acceptance tests tries to make requests to the V2 API which are failing (404). This patch removes the V2 tests. Change-Id: I30d45e8e85d602dc9ff9eb50512e07d353f79e39
This commit is contained in:
parent
6ace27188f
commit
9f7ff42632
|
@ -91,38 +91,6 @@ describe 'keystone server running with Apache/WSGI as Identity Provider' do
|
|||
it { is_expected.to have_entry('1 * * * * keystone-manage token_flush >>/var/log/keystone/keystone-tokenflush.log 2>&1').with_user('keystone') }
|
||||
end
|
||||
|
||||
shared_examples_for 'keystone user/tenant/service/role/endpoint resources using v2 API' do |auth_creds|
|
||||
it 'should find users in the default domain' do
|
||||
shell("openstack #{auth_creds} --os-auth-url http://127.0.0.1:5000/v2.0 --os-identity-api-version 2 user list") do |r|
|
||||
expect(r.stdout).to match(/admin/)
|
||||
expect(r.stderr).to be_empty
|
||||
end
|
||||
end
|
||||
it 'should find tenants in the default domain' do
|
||||
shell("openstack #{auth_creds} --os-auth-url http://127.0.0.1:5000/v2.0 --os-identity-api-version 2 project list") do |r|
|
||||
expect(r.stdout).to match(/openstack/)
|
||||
expect(r.stderr).to be_empty
|
||||
end
|
||||
end
|
||||
it 'should find beaker service' do
|
||||
shell("openstack #{auth_creds} --os-auth-url http://127.0.0.1:5000/v2.0 --os-identity-api-version 2 service list") do |r|
|
||||
expect(r.stdout).to match(/beaker/)
|
||||
expect(r.stderr).to be_empty
|
||||
end
|
||||
end
|
||||
it 'should find admin role' do
|
||||
shell("openstack #{auth_creds} --os-auth-url http://127.0.0.1:5000/v2.0 --os-identity-api-version 2 role list") do |r|
|
||||
expect(r.stdout).to match(/admin/)
|
||||
expect(r.stderr).to be_empty
|
||||
end
|
||||
end
|
||||
it 'should find beaker endpoints' do
|
||||
shell("openstack #{auth_creds} --os-auth-url http://127.0.0.1:5000/v2.0 --os-identity-api-version 2 endpoint list --long") do |r|
|
||||
expect(r.stdout).to match(/1234/)
|
||||
expect(r.stderr).to be_empty
|
||||
end
|
||||
end
|
||||
end
|
||||
shared_examples_for 'keystone user/tenant/service/role/endpoint resources using v3 API' do |auth_creds|
|
||||
it 'should find beaker user' do
|
||||
shell("openstack #{auth_creds} --os-auth-url http://127.0.0.1:5000/v3 --os-identity-api-version 3 user list") do |r|
|
||||
|
@ -155,14 +123,6 @@ describe 'keystone server running with Apache/WSGI as Identity Provider' do
|
|||
end
|
||||
end
|
||||
end
|
||||
describe 'with v2 admin with v2 credentials' do
|
||||
include_examples 'keystone user/tenant/service/role/endpoint resources using v2 API',
|
||||
'--os-username admin --os-password a_big_secret --os-project-name openstack'
|
||||
end
|
||||
describe 'with v2 service with v2 credentials' do
|
||||
include_examples 'keystone user/tenant/service/role/endpoint resources using v2 API',
|
||||
'--os-username beaker-ci --os-password secret --os-project-name services'
|
||||
end
|
||||
describe 'with v2 admin with v3 credentials' do
|
||||
include_examples 'keystone user/tenant/service/role/endpoint resources using v3 API',
|
||||
'--os-username admin --os-password a_big_secret --os-project-name openstack --os-user-domain-name Default --os-project-domain-name Default'
|
||||
|
|
|
@ -89,38 +89,6 @@ describe 'keystone server running with Apache/WSGI as Service Provider with Shib
|
|||
it { is_expected.to have_entry('1 * * * * keystone-manage token_flush >>/var/log/keystone/keystone-tokenflush.log 2>&1').with_user('keystone') }
|
||||
end
|
||||
|
||||
shared_examples_for 'keystone user/tenant/service/role/endpoint resources using v2 API' do |auth_creds|
|
||||
it 'should find users in the default domain' do
|
||||
shell("openstack #{auth_creds} --os-auth-url http://127.0.0.1:5000/v2.0 --os-identity-api-version 2 user list") do |r|
|
||||
expect(r.stdout).to match(/admin/)
|
||||
expect(r.stderr).to be_empty
|
||||
end
|
||||
end
|
||||
it 'should find tenants in the default domain' do
|
||||
shell("openstack #{auth_creds} --os-auth-url http://127.0.0.1:5000/v2.0 --os-identity-api-version 2 project list") do |r|
|
||||
expect(r.stdout).to match(/openstack/)
|
||||
expect(r.stderr).to be_empty
|
||||
end
|
||||
end
|
||||
it 'should find beaker service' do
|
||||
shell("openstack #{auth_creds} --os-auth-url http://127.0.0.1:5000/v2.0 --os-identity-api-version 2 service list") do |r|
|
||||
expect(r.stdout).to match(/beaker/)
|
||||
expect(r.stderr).to be_empty
|
||||
end
|
||||
end
|
||||
it 'should find admin role' do
|
||||
shell("openstack #{auth_creds} --os-auth-url http://127.0.0.1:5000/v2.0 --os-identity-api-version 2 role list") do |r|
|
||||
expect(r.stdout).to match(/admin/)
|
||||
expect(r.stderr).to be_empty
|
||||
end
|
||||
end
|
||||
it 'should find beaker endpoints' do
|
||||
shell("openstack #{auth_creds} --os-auth-url http://127.0.0.1:5000/v2.0 --os-identity-api-version 2 endpoint list --long") do |r|
|
||||
expect(r.stdout).to match(/1234/)
|
||||
expect(r.stderr).to be_empty
|
||||
end
|
||||
end
|
||||
end
|
||||
shared_examples_for 'keystone user/tenant/service/role/endpoint resources using v3 API' do |auth_creds|
|
||||
it 'should find beaker user' do
|
||||
shell("openstack #{auth_creds} --os-auth-url http://127.0.0.1:5000/v3 --os-identity-api-version 3 user list") do |r|
|
||||
|
@ -153,14 +121,6 @@ describe 'keystone server running with Apache/WSGI as Service Provider with Shib
|
|||
end
|
||||
end
|
||||
end
|
||||
describe 'with v2 admin with v2 credentials' do
|
||||
include_examples 'keystone user/tenant/service/role/endpoint resources using v2 API',
|
||||
'--os-username admin --os-password a_big_secret --os-project-name openstack'
|
||||
end
|
||||
describe 'with v2 service with v2 credentials' do
|
||||
include_examples 'keystone user/tenant/service/role/endpoint resources using v2 API',
|
||||
'--os-username beaker-ci --os-password secret --os-project-name services'
|
||||
end
|
||||
describe 'with v2 admin with v3 credentials' do
|
||||
include_examples 'keystone user/tenant/service/role/endpoint resources using v3 API',
|
||||
'--os-username admin --os-password a_big_secret --os-project-name openstack --os-user-domain-name Default --os-project-domain-name Default'
|
||||
|
|
|
@ -85,38 +85,6 @@ describe 'keystone server running with Apache/WSGI with resources' do
|
|||
it { is_expected.to have_entry('1 * * * * keystone-manage token_flush >>/var/log/keystone/keystone-tokenflush.log 2>&1').with_user('keystone') }
|
||||
end
|
||||
|
||||
shared_examples_for 'keystone user/tenant/service/role/endpoint resources using v2 API' do |auth_creds|
|
||||
it 'should find users in the default domain' do
|
||||
shell("openstack #{auth_creds} --os-auth-url http://127.0.0.1:5000/v2.0 --os-identity-api-version 2 user list") do |r|
|
||||
expect(r.stdout).to match(/admin/)
|
||||
expect(r.stderr).to be_empty
|
||||
end
|
||||
end
|
||||
it 'should find tenants in the default domain' do
|
||||
shell("openstack #{auth_creds} --os-auth-url http://127.0.0.1:5000/v2.0 --os-identity-api-version 2 project list") do |r|
|
||||
expect(r.stdout).to match(/openstack/)
|
||||
expect(r.stderr).to be_empty
|
||||
end
|
||||
end
|
||||
it 'should find beaker service' do
|
||||
shell("openstack #{auth_creds} --os-auth-url http://127.0.0.1:5000/v2.0 --os-identity-api-version 2 service list") do |r|
|
||||
expect(r.stdout).to match(/beaker/)
|
||||
expect(r.stderr).to be_empty
|
||||
end
|
||||
end
|
||||
it 'should find admin role' do
|
||||
shell("openstack #{auth_creds} --os-auth-url http://127.0.0.1:5000/v2.0 --os-identity-api-version 2 role list") do |r|
|
||||
expect(r.stdout).to match(/admin/)
|
||||
expect(r.stderr).to be_empty
|
||||
end
|
||||
end
|
||||
it 'should find beaker endpoints' do
|
||||
shell("openstack #{auth_creds} --os-auth-url http://127.0.0.1:5000/v2.0 --os-identity-api-version 2 endpoint list --long") do |r|
|
||||
expect(r.stdout).to match(/1234/)
|
||||
expect(r.stderr).to be_empty
|
||||
end
|
||||
end
|
||||
end
|
||||
shared_examples_for 'keystone user/tenant/service/role/endpoint resources using v3 API' do |auth_creds|
|
||||
it 'should find beaker user' do
|
||||
shell("openstack #{auth_creds} --os-auth-url http://127.0.0.1:5000/v3 --os-identity-api-version 3 user list") do |r|
|
||||
|
@ -149,14 +117,6 @@ describe 'keystone server running with Apache/WSGI with resources' do
|
|||
end
|
||||
end
|
||||
end
|
||||
describe 'with v2 admin with v2 credentials' do
|
||||
include_examples 'keystone user/tenant/service/role/endpoint resources using v2 API',
|
||||
'--os-username admin --os-password a_big_secret --os-project-name openstack'
|
||||
end
|
||||
describe 'with v2 service with v2 credentials' do
|
||||
include_examples 'keystone user/tenant/service/role/endpoint resources using v2 API',
|
||||
'--os-username beaker-ci --os-password secret --os-project-name services'
|
||||
end
|
||||
describe 'with v2 admin with v3 credentials' do
|
||||
include_examples 'keystone user/tenant/service/role/endpoint resources using v3 API',
|
||||
'--os-username admin --os-password a_big_secret --os-project-name openstack --os-user-domain-name Default --os-project-domain-name Default'
|
||||
|
|
Loading…
Reference in New Issue