Update VPP routing node config file path

Change-Id: I5e5eebe0ca9ea11e1b151aa1b5f6055862f11fda
Signed-off-by: Feng Pan <fpan@redhat.com>

diff --git a/README.markdown b/README.markdown
index 9facbb501d25e17d204a8094293da99c839c7746..651bb47bbb68e9f65f7629a583f6e34decefe0d1 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -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: `''`
 

diff --git a/manifests/config.pp b/manifests/config.pp
index 921965d645571db4f1b91b8cd2c30497920c84aa..0f1fb5c10e31cb72eff5742fd3bac5aa065c2157 100644 (file)
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -95,14 +95,14 @@ class opendaylight::config {
 
   #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=.*$',
     }

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index cd3b618716c4c17ae72c2a0922cc7ca2a254dbca..e6bf0944fda1988a53c47be3042033bca96a6ec3 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -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=.*$',
       )