Fix 'shared' parameter check in neutron_network provider
Use stricter check for 'shared' parameter Change-Id: I36149b42943238dc342f8c6e71c1261f00e01c4a Closes-bug: #1476680
This commit is contained in:
parent
774470c8bb
commit
f4a0f2aa66
@ -53,7 +53,7 @@ Puppet::Type.type(:neutron_network).provide(
|
|||||||
def create
|
def create
|
||||||
network_opts = Array.new
|
network_opts = Array.new
|
||||||
|
|
||||||
if @resource[:shared]
|
if @resource[:shared] =~ /true/i
|
||||||
network_opts << '--shared'
|
network_opts << '--shared'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -31,7 +31,33 @@ describe provider_class do
|
|||||||
|
|
||||||
shared_examples 'neutron_network' do
|
shared_examples 'neutron_network' do
|
||||||
|
|
||||||
describe 'when creating a network' do
|
describe 'when creating a non-shared network' do
|
||||||
|
|
||||||
|
it 'should call net-create with appropriate command line options' do
|
||||||
|
provider.class.stubs(:get_tenant_id).returns(net_attrs[:tenant_id])
|
||||||
|
|
||||||
|
output = 'Created a new network:
|
||||||
|
admin_state_up="True"
|
||||||
|
id="d9ac3494-20ea-406c-a4ba-145923dfadc9"
|
||||||
|
name="net1"
|
||||||
|
shared="False"
|
||||||
|
status="ACTIVE"
|
||||||
|
subnets=""
|
||||||
|
tenant_id="60f9544eb94c42a6b7e8e98c2be981b1"'
|
||||||
|
|
||||||
|
provider.expects(:auth_neutron).with('net-create',
|
||||||
|
'--format=shell', ["--tenant_id=#{net_attrs[:tenant_id]}"],
|
||||||
|
net_name).returns(output)
|
||||||
|
|
||||||
|
provider.create
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'when creating a shared network' do
|
||||||
|
|
||||||
|
let :local_attrs do
|
||||||
|
attrs = net_attrs.merge({:shared => 'True'})
|
||||||
|
end
|
||||||
|
|
||||||
it 'should call net-create with appropriate command line options' do
|
it 'should call net-create with appropriate command line options' do
|
||||||
provider.class.stubs(:get_tenant_id).returns(net_attrs[:tenant_id])
|
provider.class.stubs(:get_tenant_id).returns(net_attrs[:tenant_id])
|
||||||
|
Loading…
Reference in New Issue
Block a user