Add vpp_routing_node parameter

This patch add vpp_routing_node parameter. It specifies the node that
should be used for routing in VPP deployments. The Opendaylight patch
introducing this parameter is at https://git.opendaylight.org/gerrit/#/c/51250

Change-Id: I6cce522766ba3a14070dff17e61b7351d44766a5
Signed-off-by: Feng Pan <fpan@redhat.com>
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/README.markdown b/README.markdown
index 27e76fa0826077bb72a099d30e29f25a538ffa6e..c0d3508dadd075ed5f4043c4f1edc86a29bc051e 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -379,6 +379,15 @@ Default: `stateful`
 
 Valid options: `transparent`, `learn`, `statless`
 
+##### `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.
+
+Default: `''`
+
+Valid options: A valid host name to a VPP node handling routing.
+
 ## Limitations
 
 - Tested on Fedora 22, 23, CentOS 7 and Ubuntu 14.04.

diff --git a/manifests/config.pp b/manifests/config.pp
index 4e6ddd697a0128b94701387c6d0b87ba4eda7cdf..e8706845f1d2eb2cb56a324ef949e1d451a86b2e 100644 (file)
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -93,4 +93,19 @@ class opendaylight::config {
       content => template('opendaylight/netvirt-aclservice-config.xml.erb'),
     }
   }
+
+  #configure VPP routing node
+  if ! empty($::opendaylight::vpp_routing_node) {
+    file { 'org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg':
+      ensure => file,
+      path   => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg',
+      owner  => 'odl',
+      group  => 'odl',
+    }
+    file_line { 'routing-node':
+      path  => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg',
+      line  => "routing-node=${::opendaylight::vpp_routing_node}",
+      match => '^routing-node=.*$',
+    }
+  }
 }

diff --git a/manifests/init.pp b/manifests/init.pp
index d8d4df864f51639ad67f6a418eef70bfaa9da7c9..0aef0f92d86b57ccfe60beed7a5fff537b811d4e 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -34,6 +34,8 @@
 #   Index of ha_node_ips for this node.
 # [*security_group_mode*]
 #   Sets the mode to use for security groups (stateful, learn, stateless, transparent)
+# [*vpp_routing_node*]
+#   Sets routing node for VPP deployments. Defaults to ''.
 #
 class opendaylight (
   $default_features    = $::opendaylight::params::default_features,
@@ -49,6 +51,7 @@ class opendaylight (
   $ha_node_ips         = $::opendaylight::params::ha_node_ips,
   $ha_node_index       = $::opendaylight::params::ha_node_index,
   $security_group_mode = $::opendaylight::params::security_group_mode,
+  $vpp_routing_node    = $::opendaylight::params::vpp_routing_node,
 ) inherits ::opendaylight::params {
 
   # Validate OS family

diff --git a/manifests/params.pp b/manifests/params.pp
index ce680c906b0fdba0fc9685ddbc72caa242d53fc5..51d0d2fc99040c343dd04358525a8fb3e91c04bf 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -21,4 +21,5 @@ class opendaylight::params {
   $ha_node_ips = []
   $ha_node_index = 0
   $security_group_mode = 'stateful'
+  $vpp_routing_node = ''
 }

diff --git a/spec/classes/opendaylight_spec.rb b/spec/classes/opendaylight_spec.rb
index 73f9eddc05b873b5dd43c2aae01f353d23297e6e..9b99032d3df34f96f5688a8763097a8f6a132c2e 100644 (file)
--- a/spec/classes/opendaylight_spec.rb
+++ b/spec/classes/opendaylight_spec.rb
@@ -741,4 +741,52 @@ describe 'opendaylight' do
       enable_sg_tests('transparent', '7.2.1511')
     end
   end
+
+  # VPP routing node config tests
+  describe 'VPP routing node tests' do
+    # Non-OS-type tests assume CentOS 7
+    #   See issue #43 for reasoning:
+    #   https://github.com/dfarrell07/puppet-opendaylight/issues/43#issue-57343159
+    osfamily = 'RedHat'
+    operatingsystem = 'CentOS'
+    operatingsystemmajrelease = '7'
+    context 'using default - no routing node' do
+      let(:facts) {{
+        :osfamily => osfamily,
+        :operatingsystem => operatingsystem,
+        :operatingsystemmajrelease => operatingsystemmajrelease,
+      }}
+
+      let(:params) {{ }}
+
+      # Run shared tests applicable to all supported OSs
+      # Note that this function is defined in spec_helper
+      generic_tests
+
+      # Run test that specialize in checking routing-node config
+      # Note that this function is defined in spec_helper
+      vpp_routing_node_tests
+    end
+
+    context 'using node name for routing node' do
+      let(:facts) {{
+        :osfamily => osfamily,
+        :operatingsystem => operatingsystem,
+        :operatingsystemmajrelease => operatingsystemmajrelease,
+      }}
+
+      let(:params) {{
+        :vpp_routing_node => 'test-node-1',
+      }}
+
+      # Run shared tests applicable to all supported OSs
+      # Note that this function is defined in spec_helper
+      generic_tests
+
+      # Run test that specialize in checking routing-node config
+      # Note that this function is defined in spec_helper
+      vpp_routing_node_tests(routing_node: 'test-node-1')
+    end
+  end
+
 end

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index acae82c86a4ad148a8655bf55d8090c85a1d69a9..ce67018c0c6348f582eb6960491e48cabc87c042 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -439,3 +439,35 @@ def enable_sg_tests(sg_mode='stateful', os_release)
     }
   end
 end
+
+# Shared tests that specialize in testing VPP routing node config
+def vpp_routing_node_tests(options = {})
+  # Extract params
+  # NB: This default list should be the same as the one in opendaylight::params
+  # TODO: Remove this possible source of bugs^^
+  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_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(
+        'ensure'      => 'file',
+        'path'        => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg',
+        'owner'   => 'odl',
+        'group'   => 'odl',
+      )
+    }
+    it {
+      should contain_file_line('routing-node').with(
+        'path'  => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg',
+        'line'  => "routing-node=#{routing_node}",
+        'match' => '^routing-node=.*$',
+      )
+    }
+  end
+end