diff --git a/spec/acceptance/keystone_federation_identity_provider_spec.rb b/spec/acceptance/keystone_federation_identity_provider_spec.rb index 3b182b5f8..c2936770e 100644 --- a/spec/acceptance/keystone_federation_identity_provider_spec.rb +++ b/spec/acceptance/keystone_federation_identity_provider_spec.rb @@ -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' diff --git a/spec/acceptance/keystone_federation_shibboleth_spec.rb b/spec/acceptance/keystone_federation_shibboleth_spec.rb index 7898d80e2..05f9fa50a 100644 --- a/spec/acceptance/keystone_federation_shibboleth_spec.rb +++ b/spec/acceptance/keystone_federation_shibboleth_spec.rb @@ -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' diff --git a/spec/acceptance/keystone_wsgi_apache_spec.rb b/spec/acceptance/keystone_wsgi_apache_spec.rb index 0d9ca04fd..007f9afb4 100644 --- a/spec/acceptance/keystone_wsgi_apache_spec.rb +++ b/spec/acceptance/keystone_wsgi_apache_spec.rb @@ -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'