x/puppet-midonet
Code Issues Proposed changes

Add keystone real authentication

Browse Source 
Previous code didn't get the keystone token first to authenticate to
API endpoints.

Change-Id: Ib9909e1f668981ba05c0b3ea20a8a37ee930dc0e
This commit is contained in:
Jaume Devesa 2015-07-21 16:14:13 +02:00
parent 7b8975ef59
commit e58177f3c6
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/puppet/provider/midonet_host_registry/midonet_api_caller.rb
View File

@ -114,9 +114,18 @@ Puppet::Type.type(:midonet_host_registry).provide(:midonet_api_caller) do
'Timeout::Error',
],
})
builder.use(Faraday::Request::BasicAuthentication, resource[:username], resource[:password])
builder.request(:basic_auth, resource[:username], resource[:password])
builder.adapter(:net_http)
end
@connection.headers['X-Auth-Token'] = call_get_token()
end
def call_get_token()
res = @connection.get do |req|
req.url "/midonet-api/login"
end
return JSON.parse(res.body)['key']
end
def call_get_tunnelzone()

8
spec/unit/puppet/provider/midonet_host_registry/midonet_api_caller_spec.rb
View File

@ -50,6 +50,7 @@ describe Puppet::Type.type(:midonet_host_registry).provider(:midonet_api_caller)
allow(provider).to receive(:call_delete_tunnelzone_host)
allow(provider).to receive(:call_get_tunnelzone_hosts).and_return([])
allow(provider).to receive(:call_delete_tunnelzone)
allow(provider).to receive(:call_get_token).and_return('thisisafaketoken')
end
it 'registers the host successfully' do
@ -96,6 +97,7 @@ describe Puppet::Type.type(:midonet_host_registry).provider(:midonet_api_caller)
allow(provider).to receive(:call_create_tunnelzone).and_return(tzones)
allow(provider).to receive(:call_get_host).and_return(hosts)
allow(provider).to receive(:call_create_tunnelzone_host)
allow(provider).to receive(:call_get_token).and_return('thisisafaketoken')
expect(provider).to receive(:call_create_tunnelzone).once
expect(provider.exists?).to eq false
@ -138,6 +140,7 @@ describe Puppet::Type.type(:midonet_host_registry).provider(:midonet_api_caller)
allow(provider).to receive(:call_delete_tunnelzone_host)
allow(provider).to receive(:call_get_tunnelzone_host).and_return(host_to_unregister)
allow(provider).to receive(:call_get_tunnelzone_hosts).and_return(host_left_in_tunnelzone)
allow(provider).to receive(:call_get_token).and_return('thisisafaketoken')
# Set the behaviour expectations
expect(provider).to receive(:call_delete_tunnelzone_host).with(tzones[0]['id'], host_to_unregister[0]['id'])
@ -162,6 +165,7 @@ describe Puppet::Type.type(:midonet_host_registry).provider(:midonet_api_caller)
# Preparing the rest responses
allow(provider).to receive(:call_get_tunnelzone).and_return(tzones)
allow(provider).to receive(:call_get_host).and_return([])
allow(provider).to receive(:call_get_token).and_return('thisisafaketoken')
expect {
provider.create
}.to raise_error(RuntimeError)
@ -180,6 +184,7 @@ describe Puppet::Type.type(:midonet_host_registry).provider(:midonet_api_caller)
}
it 'should raise an exception' do
allow(provider).to receive(:call_get_tunnelzone).and_return(tzones)
allow(provider).to receive(:call_get_token).and_return('thisisafaketoken')
expect {
provider.create
}.to raise_error(RuntimeError)
@ -189,6 +194,7 @@ describe Puppet::Type.type(:midonet_host_registry).provider(:midonet_api_caller)
describe 'try to unregister a host that belongs to a tunnelzone that does not exist' do
it 'should not fail' do
allow(provider).to receive(:call_get_tunnelzone).and_return([])
allow(provider).to receive(:call_get_token).and_return('thisisafaketoken')
expect(provider).not_to receive(:call_delete_tunnelzone_host)
provider.destroy
end
@ -207,6 +213,7 @@ describe Puppet::Type.type(:midonet_host_registry).provider(:midonet_api_caller)
it 'should not fail' do
allow(provider).to receive(:call_get_tunnelzone).and_return(tzones)
allow(provider).to receive(:call_get_host).and_return([])
allow(provider).to receive(:call_get_token).and_return('thisisafaketoken')
expect(provider).not_to receive(:call_delete_tunnelzone_host)
@ -236,6 +243,7 @@ describe Puppet::Type.type(:midonet_host_registry).provider(:midonet_api_caller)
allow(provider).to receive(:call_get_tunnelzone).and_return(tzones)
allow(provider).to receive(:call_get_host).and_return(hosts)
allow(provider).to receive(:call_get_tunnelzone_host).and_return([])
allow(provider).to receive(:call_get_token).and_return('thisisafaketoken')
expect(provider).to receive(:call_get_tunnelzone).once
expect(provider).to receive(:call_get_host).once