Fix unit tests
Remove dup in attributes Incorrect service resource name reference iproute package in wrong spec White space cleanup Change-Id: I269012e141bee21d1122dec300ba2a80b3d31780
This commit is contained in:
parent
94596e7aa4
commit
56c95b6ce3
|
@ -1134,7 +1134,6 @@ when 'suse'
|
|||
'neutron_openvswitch_packages' => ['openvswitch-switch'],
|
||||
'neutron_openvswitch_agent_packages' => ['openstack-neutron-openvswitch-agent'],
|
||||
'neutron_linuxbridge_agent_packages' => ['openstack-neutron-linuxbridge-agent'],
|
||||
'neutron_metadata_agent_packages' => ['openstack-neutron-metadata-agent'],
|
||||
'neutron_server_packages' => [],
|
||||
'neutron_dhcp_agent_service' => 'openstack-neutron-dhcp-agent',
|
||||
'neutron_l3_agent_service' => 'openstack-neutron-l3-agent',
|
||||
|
|
|
@ -156,7 +156,7 @@ db_user = node['openstack']['db']['network']['username']
|
|||
db_pass = get_password 'db', 'neutron'
|
||||
sql_connection = db_uri('network', db_user, db_pass)
|
||||
if node['openstack']['endpoints']['db']['enabled_slave']
|
||||
slave_connection = db_uri('network', db_user, db_pass, true)
|
||||
slave_connection = db_uri('network', db_user, db_pass, true)
|
||||
end
|
||||
|
||||
network_api_bind = endpoint 'network-api-bind'
|
||||
|
@ -274,7 +274,7 @@ end
|
|||
case main_plugin
|
||||
when 'bigswitch'
|
||||
|
||||
template_file = '/etc/neutron/plugins/bigswitch/restproxy.ini'
|
||||
template_file = '/etc/neutron/plugins/bigswitch/restproxy.ini'
|
||||
|
||||
template template_file do
|
||||
source 'plugins/bigswitch/restproxy.ini.erb'
|
||||
|
|
|
@ -251,7 +251,7 @@ describe 'openstack-network' do
|
|||
firewall_driver: 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
|
||||
|
||||
context 'OpenFlow Controller settings' do
|
||||
{ host: '127.0.0.1', port: '8888', driver: 'trema', enable_packet_filter: 'true' }.each do |attr, value|
|
||||
{ host: '127.0.0.1', port: '8888', driver: 'trema', enable_packet_filter: 'true' }.each do |attr, value|
|
||||
it "sets the default #{attr} ofc value" do
|
||||
expect(chef_run).to render_file(file.name).with_content(/^#{attr} = #{value}$/)
|
||||
end
|
||||
|
|
|
@ -56,14 +56,6 @@ describe 'openstack-network::openvswitch' do
|
|||
expect(chef_run).to upgrade_package 'neutron-plugin-openvswitch-agent'
|
||||
end
|
||||
|
||||
it 'creates the /etc/neutron/plugins/openvswitch agent directory' do
|
||||
expect(chef_run).to create_directory('/etc/neutron/plugins/openvswitch').with(
|
||||
owner: 'neutron',
|
||||
group: 'neutron',
|
||||
mode: 0700
|
||||
)
|
||||
end
|
||||
|
||||
it 'sets the openvswitch service to start on boot' do
|
||||
expect(chef_run).to enable_service 'neutron-plugin-openvswitch-agent'
|
||||
end
|
||||
|
|
|
@ -18,10 +18,6 @@ describe 'openstack-network::server' do
|
|||
expect(chef_run).to_not upgrade_package 'openstack-neutron'
|
||||
end
|
||||
|
||||
it 'installs the iproute packages' do
|
||||
expect(chef_run).to upgrade_package 'iproute'
|
||||
end
|
||||
|
||||
it 'upgrades openstack-neutron packages' do
|
||||
expect(chef_run).to upgrade_package 'openstack-neutron'
|
||||
end
|
||||
|
|
|
@ -23,7 +23,8 @@ describe 'openstack-network::server' do
|
|||
end
|
||||
|
||||
it 'enables openstack-neutron service' do
|
||||
expect(chef_run).to enable_service 'openstack-neutron'
|
||||
expect(chef_run).to enable_service('neutron-server').with(
|
||||
service_name: 'openstack-neutron')
|
||||
end
|
||||
|
||||
it 'does not upgrade openvswitch package' do
|
||||
|
|
|
@ -42,7 +42,8 @@ describe 'openstack-network::server' do
|
|||
it 'allows overriding service names' do
|
||||
node.set['openstack']['network']['platform']['neutron_server_service'] = 'my-neutron-server'
|
||||
|
||||
expect(chef_run).to enable_service 'my-neutron-server'
|
||||
expect(chef_run).to enable_service('neutron-server').with(
|
||||
service_name: 'my-neutron-server')
|
||||
end
|
||||
|
||||
it 'allows overriding package options' do
|
||||
|
|
Loading…
Reference in New Issue