Skip to content

Update VPP routing node config file path #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update VPP routing node config file path #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ Valid options: `transparent`, `learn`, `stateless`
##### `vpp_routing_node`

Specifies the routing node for VPP deployment. A non-empty string will create config file
org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg with routing-node set.
org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg with routing-node set.

Default: `''`

Expand Down
6 changes: 3 additions & 3 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,14 @@

#configure VPP routing node
if ! empty($::opendaylight::vpp_routing_node) {
file { 'org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg':
file { 'org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg':
ensure => file,
path => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg',
path => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg',
owner => 'odl',
group => 'odl',
}
file_line { 'routing-node':
path => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg',
path => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg',
line => "routing-node=${::opendaylight::vpp_routing_node}",
match => '^routing-node=.*$',
}
Expand Down
8 changes: 4 additions & 4 deletions spec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,23 +338,23 @@ def vpp_routing_node_tests(options = {})
routing_node = options.fetch(:routing_node, '')

if routing_node.empty?
it { should_not contain_file('org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg') }
it { should_not contain_file('org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg') }
it { should_not contain_file_line('routing-node') }
else
# Confirm properties of Karaf config file
# NB: These hashes don't work with Ruby 1.8.7, but we
# don't support 1.8.7 so that's okay. See issue #36.
it {
should contain_file('org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg').with(
should contain_file('org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg').with(
'ensure' => 'file',
'path' => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg',
'path' => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg',
'owner' => 'odl',
'group' => 'odl',
)
}
it {
should contain_file_line('routing-node').with(
'path' => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg',
'path' => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg',
'line' => "routing-node=#{routing_node}",
'match' => '^routing-node=.*$',
)
Expand Down