Skip to content

Commit

Permalink
add specs
Browse files Browse the repository at this point in the history
Signed-off-by: S.Cavallo <[email protected]>
  • Loading branch information
smcavallo committed Dec 9, 2018
1 parent 90921dd commit 9bdc837
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 6 deletions.
25 changes: 19 additions & 6 deletions libraries/docker_container.rb
Original file line number Diff line number Diff line change
Expand Up @@ -422,13 +422,26 @@ def to_snake_case(name)
restart_maximum_retry_count container.info['HostConfig']['RestartPolicy']['MaximumRetryCount']
volumes_binds container.info['HostConfig']['Binds']
ro_rootfs container.info['HostConfig']['ReadonlyRootfs']
if container.info['NetworkSettings'] &&
container.info['NetworkSettings']['Networks'] &&
container.info['NetworkSettings']['Networks'][network_mode] &&
container.info['NetworkSettings']['Networks'][network_mode]['IPAMConfig'] &&
container.info['NetworkSettings']['Networks'][network_mode]['IPAMConfig']['IPv4Address']
ip_address ip_address_from_container_networks(container) unless ip_address_from_container_networks(container).nil?
end

ip_address container.info['NetworkSettings']['Networks'][network_mode]['IPAMConfig']['IPv4Address']
# Gets the ip address from the existing container
# current docker api of 1.16 does not have ['NetworkSettings']['Networks']
# For docker > 1.21 - use ['NetworkSettings']['Networks']
#
# @param container [Docker::Container] A container object
# @returns [String] An ip_address
def ip_address_from_container_networks(container)
# We use the first value in 'Networks'
# We can't assume it will be 'bridged'
# It might also not match the new_resource value
if container.info['NetworkSettings'] &&
container.info['NetworkSettings']['Networks'] &&
container.info['NetworkSettings']['Networks'].values[0] &&
container.info['NetworkSettings']['Networks'].values[0]['IPAMConfig'] &&
container.info['NetworkSettings']['Networks'].values[0]['IPAMConfig']['IPv4Address']
# Return the ip address listed
container.info['NetworkSettings']['Networks'].values[0]['IPAMConfig']['IPv4Address']
end
end

Expand Down
55 changes: 55 additions & 0 deletions spec/libraries/container_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Load all the libraries
require 'chef'
require 'docker'
Dir['libraries/*.rb'].each { |f| require File.expand_path(f) }

describe DockerCookbook::DockerContainer do
let(:resource) { DockerCookbook::DockerContainer.new('hello_world') }

it 'has a default action of [:run]' do
expect(resource.action).to eql([:run])
end

describe 'gets ip_address_from_container_networks' do
let(:options) { { 'id' => rand(10_000).to_s } }
subject do
Docker::Container.send(:new, Docker.connection, options)
end
# https://docs.docker.com/engine/api/version-history/#v121-api-changes
context 'when docker API < 1.21' do
let(:ip_address) { '10.0.0.1' }
let(:options) do
{
'id' => rand(10_000).to_s,
'IPAddress' => ip_address
}
end
it 'gets ip_address as nil' do
actual = resource.ip_address_from_container_networks(subject)
expect { resource.ip_address_from_container_networks(subject) }.not_to raise_error
expect(actual).to eq(nil)
end
end
context 'when docker API > 1.21' do
let(:ip_address) { '10.0.0.1' }
let(:options) do
{
'id' => rand(10_000).to_s,
'NetworkSettings' => {
'Networks' => {
'bridge' => {
'IPAMConfig' => {
'IPv4Address' => ip_address
}
}
}
}
}
end
it 'gets ip_address' do
actual = resource.ip_address_from_container_networks(subject)
expect(actual).to eq(ip_address)
end
end
end
end

0 comments on commit 9bdc837

Please sign in to comment.