openstack/puppet-openstacklib
Code Issues Proposed changes

Merge "Remove CredentialsV2_0"

Browse Source
This commit is contained in:
Zuul
2019-06-14 00:12:24 +00:00
committed by Gerrit Code Review
parent a6f0119868 7ffbfbf0f1
commit c901308aa4
3 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/puppet/provider/openstack/credentials.rb
View File

@@ -58,9 +58,6 @@ class Puppet::Provider::Openstack::Credentials
end end
end end
class Puppet::Provider::Openstack::CredentialsV2_0 < Puppet::Provider::Openstack::Credentials
end
class Puppet::Provider::Openstack::CredentialsV3 < Puppet::Provider::Openstack::Credentials class Puppet::Provider::Openstack::CredentialsV3 < Puppet::Provider::Openstack::Credentials
KEYS = [ KEYS = [

34
spec/unit/provider/openstack/auth_spec.rb
View File

@@ -40,7 +40,7 @@ describe Puppet::Provider::Openstack::Auth do
describe '#set_credentials' do describe '#set_credentials' do
it 'adds keys to the object' do it 'adds keys to the object' do
credentials = Puppet::Provider::Openstack::CredentialsV2_0.new credentials = Puppet::Provider::Openstack::CredentialsV3.new
set = { 'OS_USERNAME' => 'user', set = { 'OS_USERNAME' => 'user',
'OS_PASSWORD' => 'secret', 'OS_PASSWORD' => 'secret',
'OS_PROJECT_NAME' => 'tenant', 'OS_PROJECT_NAME' => 'tenant',
@@ -151,7 +151,7 @@ describe Puppet::Provider::Openstack::Auth do
before(:each) do before(:each) do
class Puppet::Provider::Openstack::AuthTester class Puppet::Provider::Openstack::AuthTester
@credentials = Puppet::Provider::Openstack::CredentialsV2_0.new @credentials = Puppet::Provider::Openstack::CredentialsV3.new
end end
end end
@@ -159,7 +159,7 @@ describe Puppet::Provider::Openstack::Auth do
context 'with no valid credentials' do context 'with no valid credentials' do
it 'fails to authenticate' do it 'fails to authenticate' do
expect { klass.request('project', 'list', ['--long']) }.to raise_error(Puppet::Error::OpenstackAuthInputError, "Insufficient credentials to authenticate") expect { klass.request('project', 'list', ['--long']) }.to raise_error(Puppet::Error::OpenstackAuthInputError, "Insufficient credentials to authenticate")
expect(klass.instance_variable_get(:@credentials).to_env).to eq({}) expect(klass.instance_variable_get(:@credentials).to_env).to eq({'OS_IDENTITY_API_VERSION' => '3'})
end end
end end
@@ -179,10 +179,11 @@ describe Puppet::Provider::Openstack::Auth do
response = klass.request('project', 'list', ['--long']) response = klass.request('project', 'list', ['--long'])
expect(response.first[:description]).to eq("Test tenant") expect(response.first[:description]).to eq("Test tenant")
expect(klass.instance_variable_get(:@credentials).to_env).to eq({ expect(klass.instance_variable_get(:@credentials).to_env).to eq({
'OS_USERNAME' => 'test', 'OS_USERNAME' => 'test',
'OS_PASSWORD' => 'abc123', 'OS_PASSWORD' => 'abc123',
'OS_PROJECT_NAME' => 'test', 'OS_PROJECT_NAME' => 'test',
'OS_AUTH_URL' => 'http://127.0.0.1:5000' 'OS_AUTH_URL' => 'http://127.0.0.1:5000',
'OS_IDENTITY_API_VERSION' => '3'
}) })
end end
end end
@@ -201,8 +202,9 @@ describe Puppet::Provider::Openstack::Auth do
response = klass.request('project', 'list', ['--long']) response = klass.request('project', 'list', ['--long'])
expect(response.first[:description]).to eq("Test tenant") expect(response.first[:description]).to eq("Test tenant")
expect(klass.instance_variable_get(:@credentials).to_env).to eq({ expect(klass.instance_variable_get(:@credentials).to_env).to eq({
'OS_TOKEN' => 'test', 'OS_IDENTITY_API_VERSION' => '3',
'OS_URL' => 'http://127.0.0.1:5000', 'OS_TOKEN' => 'test',
'OS_URL' => 'http://127.0.0.1:5000',
}) })
end end
end end
@@ -224,10 +226,11 @@ describe Puppet::Provider::Openstack::Auth do
response = provider.class.request('project', 'list', ['--long']) response = provider.class.request('project', 'list', ['--long'])
expect(response.first[:description]).to eq("Test tenant") expect(response.first[:description]).to eq("Test tenant")
expect(klass.instance_variable_get(:@credentials).to_env).to eq({ expect(klass.instance_variable_get(:@credentials).to_env).to eq({
'OS_USERNAME' => 'test', 'OS_USERNAME' => 'test',
'OS_PASSWORD' => 'abc123', 'OS_PASSWORD' => 'abc123',
'OS_PROJECT_NAME' => 'test', 'OS_PROJECT_NAME' => 'test',
'OS_AUTH_URL' => 'http://127.0.0.1:5000' 'OS_AUTH_URL' => 'http://127.0.0.1:5000',
'OS_IDENTITY_API_VERSION' => '3'
}) })
end end
end end
@@ -248,8 +251,9 @@ describe Puppet::Provider::Openstack::Auth do
response = klass.request('project', 'list', ['--long']) response = klass.request('project', 'list', ['--long'])
expect(response.first[:description]).to eq("Test tenant") expect(response.first[:description]).to eq("Test tenant")
expect(klass.instance_variable_get(:@credentials).to_env).to eq({ expect(klass.instance_variable_get(:@credentials).to_env).to eq({
'OS_TOKEN' => 'test', 'OS_IDENTITY_API_VERSION' => '3',
'OS_URL' => 'abc123', 'OS_TOKEN' => 'test',
'OS_URL' => 'abc123',
}) })
end end
end end

6
spec/unit/provider/openstack/credentials_spec.rb
View File

@@ -7,7 +7,7 @@ require 'puppet/provider/openstack/credentials'
describe Puppet::Provider::Openstack::Credentials do describe Puppet::Provider::Openstack::Credentials do
let(:creds) do let(:creds) do
creds = Puppet::Provider::Openstack::CredentialsV2_0.new creds = Puppet::Provider::Openstack::CredentialsV3.new
end end
describe "#set with valid value" do describe "#set with valid value" do
@@ -75,8 +75,8 @@ describe Puppet::Provider::Openstack::Credentials do
end end
describe '#version' do describe '#version' do
it 'is version 2' do it 'is version 3' do
expect(creds.version).to eq('2.0') expect(creds.version).to eq('3')
end end
end end