openstack/puppet-neutron
Code Issues Proposed changes

Refactor boolean handling

Browse Source 
Use sym rather than True/False string to make all value conversions
consistent with the other modules.

Change-Id: I86b3f5f106c3627e1a13dd81f856567798c643cc
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-10-03 22:54:13 +09:00
parent 5e332a2cc5
commit 80cc12c7f9
12 changed files with 110 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/puppet/provider/neutron_network/openstack.rb
View File

@@ -36,12 +36,12 @@ Puppet::Type.type(:neutron_network).provide(
:ensure => :present,
:name => attrs[:name],
:id => attrs[:id],
:admin_state_up => network[:admin_state_up],
:admin_state_up => network[:admin_state_up].downcase.chomp == 'true'? :true : :false,
:provider_network_type => network[:provider_network_type],
:provider_physical_network => network[:provider_physical_network],
:provider_segmentation_id => network[:provider_segmentation_id],
:router_external => network[:router_external],
:shared => network[:shared],
:router_external => network[:router_external].downcase.chomp == 'true'? :true : :false,
:shared => network[:shared].downcase.chomp == 'true'? :true : :false,
:project_id => network[:project_id],
:availability_zone_hint => parse_availability_zone_hint(network[:availability_zone_hints]),
:mtu => network[:mtu],
@@ -71,11 +71,11 @@ Puppet::Type.type(:neutron_network).provide(
opts = [@resource[:name]]
if @resource[:shared] =~ /true/i
if @resource[:shared] == :true
opts << '--share'
end
if @resource[:admin_state_up] == 'False'
if @resource[:admin_state_up] == :false
opts << '--disable'
end
@@ -100,7 +100,7 @@ Puppet::Type.type(:neutron_network).provide(
"--provider-segment=#{@resource[:provider_segmentation_id]}"
end
if @resource[:router_external] == 'True'
if @resource[:router_external] == :true
opts << '--external'
end
@@ -119,12 +119,12 @@ Puppet::Type.type(:neutron_network).provide(
:ensure => :present,
:name => network[:name],
:id => network[:id],
:admin_state_up => network[:admin_state_up],
:admin_state_up => network[:admin_state_up].downcase.chomp == 'true'? :true : :false,
:provider_network_type => network[:provider_network_type],
:provider_physical_network => network[:provider_physical_network],
:provider_segmentation_id => network[:provider_segmentation_id],
:router_external => network[:router_external],
:shared => network[:shared],
:router_external => network[:router_external].downcase.chomp == 'true'? :true : :false,
:shared => network[:shared].downcase.chomp == 'true'? :true : :false,
:project_id => network[:project_id],
:availability_zone_hint => self.class.parse_availability_zone_hint(network[:availability_zone_hints]),
:mtu => network[:mtu],
@@ -136,7 +136,7 @@ Puppet::Type.type(:neutron_network).provide(
opts = [@resource[:name]]
if @property_flush.has_key?(:admin_state_up)
if @property_flush[:admin_state_up] == 'False'
if @property_flush[:admin_state_up] == :false
opts << '--disable'
else
opts << '--enable'
@@ -144,7 +144,7 @@ Puppet::Type.type(:neutron_network).provide(
end
if @property_flush.has_key?(:shared)
if @property_flush[:shared] == 'False'
if @property_flush[:shared] == :false
opts << '--no-share'
else
opts << '--share'
@@ -152,7 +152,7 @@ Puppet::Type.type(:neutron_network).provide(
end
if @property_flush.has_key?(:router_external)
if @property_flush[:router_external] == 'False'
if @property_flush[:router_external] == :false
opts << '--internal'
else
opts << '--external'

24
lib/puppet/provider/neutron_port/openstack.rb
View File

@@ -41,7 +41,7 @@ Puppet::Type.type(:neutron_port).provide(
:project_id => port[:project_id],
:network_id => port[:network_id],
:network_name => get_network_name(port[:network_id]),
:admin_state_up => port[:admin_state_up],
:admin_state_up => port[:admin_state_up].downcase.chomp == 'true'? :true : :false,
:subnet_id => parse_subnet_id(port[:fixed_ips]),
:subnet_name => get_subnet_name(parse_subnet_id(port[:fixed_ips])),
:ip_address => parse_ip_address(port[:fixed_ips]),
@@ -79,7 +79,7 @@ Puppet::Type.type(:neutron_port).provide(
opts << "--network=#{@resource[:network_id]}"
end
if @resource[:admin_state_up] == 'False'
if @resource[:admin_state_up] == :false
opts << '--disable'
end
@@ -120,7 +120,7 @@ Puppet::Type.type(:neutron_port).provide(
:project_id => port[:project_id],
:network_id => port[:network_id],
:network_name => self.class.get_network_name(port[:network_id]),
:admin_state_up => port[:admin_state_up],
:admin_state_up => port[:admin_state_up].downcase.chomp == 'true'? :true : :false,
:subnet_id => self.class.parse_subnet_id(port[:fixed_ips]),
:subnet_name => self.class.get_subnet_name(self.class.parse_subnet_id(port[:fixed_ips])),
:ip_address => self.class.parse_ip_address(port[:fixed_ips]),
@@ -134,29 +134,13 @@ Puppet::Type.type(:neutron_port).provide(
opts = [@resource[:name]]
if @property_flush.has_key?(:admin_state_up)
if @property_flush[:admin_state_up] == 'False'
if @property_flush[:admin_state_up] == :false
opts << '--disable'
else
opts << '--enable'
end
end
if @property_flush.has_key?(:shared)
if @property_flush[:shared] == 'False'
opts << '--no-share'
else
opts << '--share'
end
end
if @property_flush.has_key?(:router_external)
if @property_flush[:router_external] == 'False'
opts << '--internal'
else
opts << '--external'
end
end
if @property_flush.has_key?(:availability_zone_hint)
opts << "--availability-zone-hint=#{@property_flush[:availability_zone_hint]}"
end

24
lib/puppet/provider/neutron_router/openstack.rb
View File

@@ -36,11 +36,11 @@ Puppet::Type.type(:neutron_router).provide(
:ensure => :present,
:name => attrs[:name],
:id => attrs[:id],
:admin_state_up => router[:admin_state_up],
:admin_state_up => router[:admin_state_up].downcase.chomp == 'true'? :true : :false,
:external_gateway_info => router[:external_gateway_info],
:status => router[:status],
:distributed => router[:distributed],
:ha => router[:ha],
:distributed => router[:distributed].downcase.chomp == 'true'? :true : :false,
:ha => router[:ha].downcase.chomp == 'true'? :true : :false,
:project_id => router[:project_id],
:availability_zone_hint => parse_availability_zone_hint(router[:availability_zone_hints])
)
@@ -69,7 +69,7 @@ Puppet::Type.type(:neutron_router).provide(
opts = [@resource[:name]]
if @resource[:admin_state_up] == 'False'
if @resource[:admin_state_up] == :false
opts << '--disable'
end
@@ -80,7 +80,7 @@ Puppet::Type.type(:neutron_router).provide(
end
if @resource[:distributed]
if @resource[:distributed] == 'False'
if @resource[:distributed] == :false
opts << '--centralized'
else
opts << '--distributed'
@@ -88,7 +88,7 @@ Puppet::Type.type(:neutron_router).provide(
end
if @resource[:ha]
if @resource[:ha] == 'False'
if @resource[:ha] == :false
opts << '--no-ha'
else
opts << '--ha'
@@ -118,11 +118,11 @@ Puppet::Type.type(:neutron_router).provide(
:ensure => :present,
:name => router[:name],
:id => router[:id],
:admin_state_up => router[:admin_state_up],
:admin_state_up => router[:admin_state_up].downcase.chomp == 'true'? :true : :false,
:external_gateway_info => router[:external_gateway_info],
:status => router[:status],
:distributed => router[:distributed],
:ha => router[:ha],
:distributed => router[:distributed].downcase.chomp == 'true'? :true : :false,
:ha => router[:ha].downcase.chomp == 'true'? :true : :false,
:project_id => router[:project_id],
:availability_zone_hint => self.class.parse_availability_zone_hint(router[:availability_zone_hints])
}
@@ -134,7 +134,7 @@ Puppet::Type.type(:neutron_router).provide(
clear_opts = [@resource[:name]]
if @property_flush.has_key?(:admin_state_up)
if @property_flush[:admin_state_up] == 'False'
if @property_flush[:admin_state_up] == :false
opts << '--disable'
else
opts << '--enable'
@@ -142,7 +142,7 @@ Puppet::Type.type(:neutron_router).provide(
end
if @property_flush.has_key?(:distributed)
if @property_flush[:distributed] == 'False'
if @property_flush[:distributed] == :false
opts << '--centralized'
else
opts << '--distributed'
@@ -164,7 +164,7 @@ Puppet::Type.type(:neutron_router).provide(
end
if @property_flush.has_key?(:ha)
if @property_flush[:ha] == 'False'
if @property_flush[:ha] == :false
opts << '--no-ha'
else
opts << '--ha'

8
lib/puppet/provider/neutron_subnet/openstack.rb
View File

@@ -44,7 +44,7 @@ Puppet::Type.type(:neutron_subnet).provide(
:allocation_pools => parse_allocation_pool(subnet[:allocation_pools]),
:host_routes => parse_host_routes(subnet[:host_routes]),
:dns_nameservers => parse_dns_nameservers(subnet[:dns_nameservers]),
:enable_dhcp => subnet[:enable_dhcp],
:enable_dhcp => subnet[:enable_dhcp].downcase.chomp == 'true'? :true : :false,
:network_id => subnet[:network_id],
:network_name => get_network_name(subnet[:network_id]),
:project_id => subnet[:project_id],
@@ -123,7 +123,7 @@ Puppet::Type.type(:neutron_subnet).provide(
end
end
if @resource[:enable_dhcp] == 'False'
if @resource[:enable_dhcp] == :false
opts << "--no-dhcp"
else
opts << "--dhcp"
@@ -174,7 +174,7 @@ Puppet::Type.type(:neutron_subnet).provide(
:allocation_pools => self.class.parse_allocation_pool(subnet[:allocation_pools]),
:host_routes => self.class.parse_host_routes(subnet[:host_routes]),
:dns_nameservers => self.class.parse_dns_nameservers(subnet[:dns_nameservers]),
:enable_dhcp => subnet[:enable_dhcp],
:enable_dhcp => subnet[:enable_dhcp].downcase.chomp == 'true'? :true : :false,
:network_id => subnet[:network_id],
:network_name => self.class.get_network_name(subnet[:network_id]),
:project_id => subnet[:project_id],
@@ -195,7 +195,7 @@ Puppet::Type.type(:neutron_subnet).provide(
end
if @property_flush.has_key?(:enable_dhcp)
if @property_flush[:enable_dhcp] == 'False'
if @property_flush[:enable_dhcp] == :false
opts << '--no-dhcp'
else
opts << '--dhcp'

18
lib/puppet/type/neutron_network.rb
View File

@@ -16,19 +16,19 @@ Puppet::Type.newtype(:neutron_network) do
newproperty(:admin_state_up) do
desc 'The administrative status of the network'
newvalues(/(t|T)rue/, /(f|F)alse/)
defaultto 'True'
newvalues(/(t|T)rue/, /(f|F)alse/, true, false)
defaultto(true)
munge do |v|
v.to_s.capitalize
v.to_s.downcase.to_sym
end
end
newproperty(:shared) do
desc 'Whether this network should be shared across all tenants or not'
newvalues(/(t|T)rue/, /(f|F)alse/)
defaultto 'False'
newvalues(/(t|T)rue/, /(f|F)alse/, true, false)
defaultto(false)
munge do |v|
v.to_s.capitalize
v.to_s.downcase.to_sym
end
end
@@ -62,10 +62,10 @@ Puppet::Type.newtype(:neutron_network) do
newproperty(:router_external) do
desc 'Whether this router will route traffic to an external network'
newvalues(/(t|T)rue/, /(f|F)alse/)
defaultto 'False'
newvalues(/(t|T)rue/, /(f|F)alse/, true, false)
defaultto(false)
munge do |v|
v.to_s.capitalize
v.to_s.downcase.to_sym
end
end

4
lib/puppet/type/neutron_port.rb
View File

@@ -21,9 +21,9 @@ Puppet::Type.newtype(:neutron_port) do
newproperty(:admin_state_up) do
desc 'The administrative status of the router'
newvalues(/(t|T)rue/, /(f|F)alse/)
newvalues(/(t|T)rue/, /(f|F)alse/, true, false)
munge do |v|
v.to_s.capitalize
v.to_s.downcase.to_sym
end
end

12
lib/puppet/type/neutron_router.rb
View File

@@ -16,9 +16,9 @@ Puppet::Type.newtype(:neutron_router) do
newproperty(:admin_state_up) do
desc 'The administrative status of the router'
newvalues(/(t|T)rue/, /(f|F)alse/)
newvalues(/(t|T)rue/, /(f|F)alse/, true, false)
munge do |v|
v.to_s.capitalize
v.to_s.downcase.to_sym
end
end
@@ -78,17 +78,17 @@ Puppet::Type.newtype(:neutron_router) do
newproperty(:distributed) do
desc 'Is router distributed or not, default depends on DVR state.'
newvalues(/(t|T)rue/, /(f|F)alse/)
newvalues(/(t|T)rue/, /(f|F)alse/, true, false)
munge do |v|
v.to_s.capitalize
v.to_s.downcase.to_sym
end
end
newproperty(:ha) do
desc 'Is router of HA type or not, default depends on L3 HA state.'
newvalues(/(t|T)rue/, /(f|F)alse/)
newvalues(/(t|T)rue/, /(f|F)alse/, true, false)
munge do |v|
v.to_s.capitalize
v.to_s.downcase.to_sym
end
end

4
lib/puppet/type/neutron_subnet.rb
View File

@@ -52,9 +52,9 @@ Puppet::Type.newtype(:neutron_subnet) do
newproperty(:enable_dhcp) do
desc 'Whether DHCP is enabled for this subnet or not.'
newvalues(/(t|T)rue/, /(f|F)alse/)
newvalues(/(t|T)rue/, /(f|F)alse/, true, false)
munge do |v|
v.to_s.capitalize
v.to_s.downcase.to_sym
end
end

42
spec/unit/provider/neutron_network/openstack_spec.rb
View File

@@ -52,10 +52,10 @@ shared="False"
mtu="1500"')
provider.create
expect(provider.exists?).to be_truthy
expect(provider.admin_state_up).to eq('True')
expect(provider.admin_state_up).to eq(:true)
expect(provider.project_id).to eq('60f9544eb94c42a6b7e8e98c2be981b1')
expect(provider.router_external).to eq('False')
expect(provider.shared).to eq('False')
expect(provider.router_external).to eq(:false)
expect(provider.shared).to eq(:false)
expect(provider.mtu).to eq('1500')
end
end
@@ -65,7 +65,7 @@ mtu="1500"')
{
:name => net_name,
:ensure => 'present',
:admin_state_up => 'False',
:admin_state_up => :false,
}
end
@@ -82,7 +82,7 @@ shared="False"
mtu="1500"')
provider.create
expect(provider.exists?).to be_truthy
expect(provider.admin_state_up).to eq('False')
expect(provider.admin_state_up).to eq(:false)
end
end
@@ -91,7 +91,7 @@ mtu="1500"')
{
:name => net_name,
:ensure => 'present',
:shared => 'True',
:shared => :true,
}
end
@@ -108,7 +108,7 @@ shared="True"
mtu="1500"')
provider.create
expect(provider.exists?).to be_truthy
expect(provider.shared).to eq('True')
expect(provider.shared).to eq(:true)
end
end
@@ -177,7 +177,7 @@ mtu="1500"')
{
:name => net_name,
:ensure => 'present',
:router_external => 'True',
:router_external => :true,
}
end
@@ -194,7 +194,7 @@ shared="False"
mtu="1500"')
provider.create
expect(provider.exists?).to be_truthy
expect(provider.router_external).to eq('True')
expect(provider.router_external).to eq(:true)
end
end
@@ -238,12 +238,12 @@ mtu="9000"')
it 'updates network' do
expect(provider_class).to receive(:openstack)
.with('network', 'set', ['net1', '--disable'])
provider.admin_state_up = 'False'
provider.admin_state_up = :false
provider.flush
expect(provider_class).to receive(:openstack)
.with('network', 'set', ['net1', '--enable'])
provider.admin_state_up = 'True'
provider.admin_state_up = :true
provider.flush
end
end
@@ -252,12 +252,12 @@ mtu="9000"')
it 'updates network' do
expect(provider_class).to receive(:openstack)
.with('network', 'set', ['net1', '--share'])
provider.shared = 'True'
provider.shared = :true
provider.flush
expect(provider_class).to receive(:openstack)
.with('network', 'set', ['net1', '--no-share'])
provider.shared = 'False'
provider.shared = :false
provider.flush
end
end
@@ -266,12 +266,12 @@ mtu="9000"')
it 'updates network' do
expect(provider_class).to receive(:openstack)
.with('network', 'set', ['net1', '--external'])
provider.router_external = 'True'
provider.router_external = :true
provider.flush
expect(provider_class).to receive(:openstack)
.with('network', 'set', ['net1', '--internal'])
provider.router_external = 'False'
provider.router_external = :false
provider.flush
end
end
@@ -320,18 +320,18 @@ mtu="9000"')
expect(instances[0].id).to eq('076520cc-b783-4cf5-a4a9-4cb5a5e93a9b')
expect(instances[0].name).to eq('net1')
expect(instances[0].admin_state_up).to eq('True')
expect(instances[0].router_external).to eq('False')
expect(instances[0].admin_state_up).to eq(:true)
expect(instances[0].router_external).to eq(:false)
expect(instances[0].project_id).to eq('60f9544eb94c42a6b7e8e98c2be981b1')
expect(instances[0].shared).to eq('False')
expect(instances[0].shared).to eq(:false)
expect(instances[0].mtu).to eq('1500')
expect(instances[1].id).to eq('34e8f42b-89db-4a5b-92db-76ca7073414d')
expect(instances[1].name).to eq('net2')
expect(instances[1].admin_state_up).to eq('False')
expect(instances[1].admin_state_up).to eq(:false)
expect(instances[1].project_id).to eq('60f9544eb94c42a6b7e8e98c2be981b1')
expect(instances[1].router_external).to eq('True')
expect(instances[1].shared).to eq('True')
expect(instances[1].router_external).to eq(:true)
expect(instances[1].shared).to eq(:true)
expect(instances[1].mtu).to eq('9000')
end
end

16
spec/unit/provider/neutron_port/openstack_spec.rb
View File

@@ -70,7 +70,7 @@ name="net1"')
name="subnet1"')
provider.create
expect(provider.exists?).to be_truthy
expect(provider.admin_state_up).to eq('True')
expect(provider.admin_state_up).to eq(:true)
expect(provider.ip_address).to eq('10.0.0.2')
expect(provider.network_name).to eq('net1')
expect(provider.subnet_id).to eq('dd5e0ef1-2c88-4b0b-ba08-7df65be87963')
@@ -84,7 +84,7 @@ name="subnet1"')
:ensure => 'present',
:name => port_name,
:network_name => 'net1',
:admin_state_up => 'False',
:admin_state_up => :false,
}
end
@@ -118,7 +118,7 @@ name="net1"')
name="subnet1"')
provider.create
expect(provider.exists?).to be_truthy
expect(provider.admin_state_up).to eq('False')
expect(provider.admin_state_up).to eq(:false)
expect(provider.ip_address).to eq('10.0.0.2')
expect(provider.network_name).to eq('net1')
expect(provider.subnet_id).to eq('dd5e0ef1-2c88-4b0b-ba08-7df65be87963')
@@ -167,7 +167,7 @@ name="net1"')
name="subnet1"')
provider.create
expect(provider.exists?).to be_truthy
expect(provider.admin_state_up).to eq('True')
expect(provider.admin_state_up).to eq(:true)
expect(provider.ip_address).to eq('10.0.0.2')
expect(provider.network_name).to eq('net1')
expect(provider.subnet_id).to eq('dd5e0ef1-2c88-4b0b-ba08-7df65be87963')
@@ -240,12 +240,12 @@ name="subnet1"')
it 'updates port' do
expect(provider_class).to receive(:openstack)
.with('port', 'set', ['port1', '--disable'])
provider.admin_state_up = 'False'
provider.admin_state_up = :false
provider.flush
expect(provider_class).to receive(:openstack)
.with('port', 'set', ['port1', '--enable'])
provider.admin_state_up = 'True'
provider.admin_state_up = :true
provider.flush
end
end
@@ -316,7 +316,7 @@ status="DOWN"')
expect(instances[0].subnet_id).to eq('dd5e0ef1-2c88-4b0b-ba08-7df65be87963')
expect(instances[0].subnet_name).to eq('subnet1')
expect(instances[0].status).to eq('ACTIVE')
expect(instances[0].admin_state_up).to eq('True')
expect(instances[0].admin_state_up).to eq(:true)
expect(instances[0].project_id).to eq('60f9544eb94c42a6b7e8e98c2be981b1')
expect(instances[1].id).to eq('c880affb-b15e-4632-b5e7-3adba6e3ab35')
@@ -326,7 +326,7 @@ status="DOWN"')
expect(instances[1].subnet_id).to eq('0da7a631-0f8f-4e51-8b1c-7a29d0d4f7b5')
expect(instances[1].subnet_name).to eq('subnet2')
expect(instances[1].status).to eq('DOWN')
expect(instances[1].admin_state_up).to eq('False')
expect(instances[1].admin_state_up).to eq(:false)
expect(instances[0].project_id).to eq('60f9544eb94c42a6b7e8e98c2be981b1')
end
end

50
spec/unit/provider/neutron_router/openstack_spec.rb
View File

@@ -54,9 +54,9 @@ project_id="60f9544eb94c42a6b7e8e98c2be981b1"
status="ACTIVE"')
provider.create
expect(provider.exists?).to be_truthy
expect(provider.admin_state_up).to eq('True')
expect(provider.ha).to eq('True')
expect(provider.distributed).to eq('False')
expect(provider.admin_state_up).to eq(:true)
expect(provider.ha).to eq(:true)
expect(provider.distributed).to eq(:false)
expect(provider.status).to eq('ACTIVE')
end
end
@@ -66,7 +66,7 @@ status="ACTIVE"')
{
:name => router_name,
:ensure => 'present',
:admin_state_up => 'False',
:admin_state_up => :false,
}
end
it 'creates router' do
@@ -84,7 +84,7 @@ project_id="60f9544eb94c42a6b7e8e98c2be981b1"
status="ACTIVE"')
provider.create
expect(provider.exists?).to be_truthy
expect(provider.admin_state_up).to eq('False')
expect(provider.admin_state_up).to eq(:false)
end
end
@@ -93,7 +93,7 @@ status="ACTIVE"')
{
:name => router_name,
:ensure => 'present',
:distributed => 'False',
:distributed => :false,
}
end
it 'creates router' do
@@ -111,7 +111,7 @@ project_id="60f9544eb94c42a6b7e8e98c2be981b1"
status="ACTIVE"')
provider.create
expect(provider.exists?).to be_truthy
expect(provider.distributed).to eq('False')
expect(provider.distributed).to eq(:false)
end
end
@@ -120,7 +120,7 @@ status="ACTIVE"')
{
:name => router_name,
:ensure => 'present',
:distributed => 'True',
:distributed => :true,
}
end
it 'creates router' do
@@ -138,7 +138,7 @@ project_id="60f9544eb94c42a6b7e8e98c2be981b1"
status="ACTIVE"')
provider.create
expect(provider.exists?).to be_truthy
expect(provider.distributed).to eq('True')
expect(provider.distributed).to eq(:true)
end
end
@@ -147,7 +147,7 @@ status="ACTIVE"')
{
:name => router_name,
:ensure => 'present',
:ha => 'True',
:ha => :true,
}
end
it 'creates router' do
@@ -165,7 +165,7 @@ project_id="60f9544eb94c42a6b7e8e98c2be981b1"
status="ACTIVE"')
provider.create
expect(provider.exists?).to be_truthy
expect(provider.ha).to eq('True')
expect(provider.ha).to eq(:true)
end
end
@@ -174,7 +174,7 @@ status="ACTIVE"')
{
:name => router_name,
:ensure => 'present',
:ha => 'False',
:ha => :false,
}
end
it 'creates router' do
@@ -192,7 +192,7 @@ project_id="60f9544eb94c42a6b7e8e98c2be981b1"
status="ACTIVE"')
provider.create
expect(provider.exists?).to be_truthy
expect(provider.ha).to eq('False')
expect(provider.ha).to eq(:false)
end
end
@@ -251,11 +251,11 @@ status="ACTIVE"')
it 'updates router' do
expect(provider_class).to receive(:openstack)
.with('router', 'set', ['router1', '--disable'])
provider.admin_state_up = 'False'
provider.admin_state_up = :false
provider.flush
expect(provider_class).to receive(:openstack)
.with('router', 'set', ['router1', '--enable'])
provider.admin_state_up = 'True'
provider.admin_state_up = :true
provider.flush
end
end
@@ -263,11 +263,11 @@ status="ACTIVE"')
it 'updates router' do
expect(provider_class).to receive(:openstack)
.with('router', 'set', ['router1', '--distributed'])
provider.distributed = 'True'
provider.distributed = :true
provider.flush
expect(provider_class).to receive(:openstack)
.with('router', 'set', ['router1', '--centralized'])
provider.distributed = 'False'
provider.distributed = :false
provider.flush
end
end
@@ -275,11 +275,11 @@ status="ACTIVE"')
it 'updates router' do
expect(provider_class).to receive(:openstack)
.with('router', 'set', ['router1', '--ha'])
provider.ha = 'True'
provider.ha = :true
provider.flush
expect(provider_class).to receive(:openstack)
.with('router', 'set', ['router1', '--no-ha'])
provider.ha = 'False'
provider.ha = :false
provider.flush
end
end
@@ -333,16 +333,16 @@ status="DOWN"')
expect(instances[0].id).to eq('d73f453a-77ca-4843-977a-3af0fda8dfcb')
expect(instances[0].name).to eq('router1')
expect(instances[0].admin_state_up).to eq('True')
expect(instances[0].ha).to eq('True')
expect(instances[0].distributed).to eq('False')
expect(instances[0].admin_state_up).to eq(:true)
expect(instances[0].ha).to eq(:true)
expect(instances[0].distributed).to eq(:false)
expect(instances[0].status).to eq('ACTIVE')
expect(instances[1].id).to eq('c3e93a5b-45ee-4029-b3a3-3331cb3e3f2a')
expect(instances[1].name).to eq('router2')
expect(instances[1].admin_state_up).to eq('False')
expect(instances[1].ha).to eq('False')
expect(instances[1].distributed).to eq('True')
expect(instances[1].admin_state_up).to eq(:false)
expect(instances[1].ha).to eq(:false)
expect(instances[1].distributed).to eq(:true)
expect(instances[1].status).to eq('DOWN')
end
end

10
spec/unit/provider/neutron_subnet/openstack_spec.rb
View File

@@ -81,7 +81,7 @@ name="net1"')
:cidr => '10.0.0.0/24',
:ip_version => '4',
:gateway_ip => '10.0.0.1',
:enable_dhcp => 'False',
:enable_dhcp => :false,
:allocation_pools => 'start=10.0.0.2,end=10.0.0.10',
:dns_nameservers => '8.8.8.8',
:host_routes => 'destination=10.0.1.0/24,nexthop=10.0.0.1',
@@ -202,12 +202,12 @@ name="net1"')
it 'updates subnet' do
expect(provider_class).to receive(:openstack)
.with('subnet', 'set', ['subnet1', '--no-dhcp'])
provider.enable_dhcp = 'False'
provider.enable_dhcp = :false
provider.flush
expect(provider_class).to receive(:openstack)
.with('subnet', 'set', ['subnet1', '--dhcp'])
provider.enable_dhcp = 'True'
provider.enable_dhcp = :true
provider.flush
end
end
@@ -294,7 +294,7 @@ project_id="60f9544eb94c42a6b7e8e98c2be981b1"')
expect(instances[0].gateway_ip).to eq('10.0.0.1')
expect(instances[0].dns_nameservers).to eq(['10.0.0.2', '10.0.0.3'])
expect(instances[0].allocation_pools).to eq(['start=10.0.0.10,end=10.0.0.20','start=10.0.0.30,end=10.0.0.40'])
expect(instances[0].enable_dhcp).to eq('True')
expect(instances[0].enable_dhcp).to eq(:true)
expect(instances[0].project_id).to eq('60f9544eb94c42a6b7e8e98c2be981b1')
expect(instances[1].id).to eq('0da7a631-0f8f-4e51-8b1c-7a29d0d4f7b5')
@@ -306,7 +306,7 @@ project_id="60f9544eb94c42a6b7e8e98c2be981b1"')
expect(instances[1].cidr).to eq('10.0.1.0/24')
expect(instances[1].dns_nameservers).to eq([])
expect(instances[1].allocation_pools).to eq(['start=10.0.1.2,end=10.0.1.254'])
expect(instances[1].enable_dhcp).to eq('False')
expect(instances[1].enable_dhcp).to eq(:false)
expect(instances[1].project_id).to eq('60f9544eb94c42a6b7e8e98c2be981b1')
end
end