11 |
11 |
12 Use stricter check for 'shared' parameter |
12 Use stricter check for 'shared' parameter |
13 |
13 |
14 Change-Id: I36149b42943238dc342f8c6e71c1261f00e01c4a |
14 Change-Id: I36149b42943238dc342f8c6e71c1261f00e01c4a |
15 Closes-bug: #1476680 |
15 Closes-bug: #1476680 |
16 --- |
|
17 lib/puppet/provider/neutron_network/neutron.rb | 2 +- |
|
18 spec/unit/provider/neutron_network/neutron_spec.rb | 28 +++++++++++++++++++++- |
|
19 2 files changed, 28 insertions(+), 2 deletions(-) |
|
20 |
16 |
21 diff --git a/lib/puppet/provider/neutron_network/neutron.rb b/lib/puppet/provider/neutron_network/neutron.rb |
17 --- openstack-neutron-6.1.0/lib/puppet/provider/neutron_network/neutron.rb.orig 2016-04-21 08:24:23.864059475 -0700 |
22 index b1ef753..b13ec00 100644 |
18 +++ openstack-neutron-6.1.0/lib/puppet/provider/neutron_network/neutron.rb 2016-04-21 08:25:01.467129260 -0700 |
23 --- openstack-neutron-6.1.0/lib/puppet/provider/neutron_network/neutron.rb.orig |
19 @@ -1,3 +1,7 @@ |
24 +++ openstack-neutron-6.1.0/lib/puppet/provider/neutron_network/neutron.rb |
20 +####################################################################### |
25 @@ -53,7 +53,7 @@ Puppet::Type.type(:neutron_network).provide( |
21 +# Oracle has modified the originally distributed contents of this file. |
|
22 +####################################################################### |
|
23 + |
|
24 require File.join(File.dirname(__FILE__), '..','..','..', |
|
25 'puppet/provider/neutron') |
|
26 |
|
27 @@ -53,7 +57,7 @@ |
26 def create |
28 def create |
27 network_opts = Array.new |
29 network_opts = Array.new |
28 |
30 |
29 - if @resource[:shared] |
31 - if @resource[:shared] |
30 + if @resource[:shared] =~ /true/i |
32 + if @resource[:shared] =~ /true/i |
31 network_opts << '--shared' |
33 network_opts << '--shared' |
32 end |
34 end |
33 |
35 |
34 diff --git a/spec/unit/provider/neutron_network/neutron_spec.rb b/spec/unit/provider/neutron_network/neutron_spec.rb |
36 --- openstack-neutron-6.1.0/spec/unit/provider/neutron_network/neutron_spec.rb.orig 2016-04-21 08:24:29.372659168 -0700 |
35 index d01a009..b3b939e 100644 |
37 +++ openstack-neutron-6.1.0/spec/unit/provider/neutron_network/neutron_spec.rb 2016-04-21 08:25:06.247381103 -0700 |
36 --- openstack-neutron-6.1.0/spec/unit/provider/neutron_network/neutron_spec.rb.orig |
38 @@ -1,3 +1,7 @@ |
37 +++ openstack-neutron-6.1.0/spec/unit/provider/neutron_network/neutron_spec.rb |
39 +####################################################################### |
38 @@ -31,7 +31,33 @@ describe provider_class do |
40 +# Oracle has modified the originally distributed contents of this file. |
|
41 +####################################################################### |
|
42 + |
|
43 require 'puppet' |
|
44 require 'spec_helper' |
|
45 require 'puppet/provider/neutron_network/neutron' |
|
46 @@ -31,7 +35,33 @@ |
39 |
47 |
40 shared_examples 'neutron_network' do |
48 shared_examples 'neutron_network' do |
41 |
49 |
42 - describe 'when creating a network' do |
50 - describe 'when creating a network' do |
43 + describe 'when creating a non-shared network' do |
51 + describe 'when creating a non-shared network' do |