Add of_connect_timeout and of_request_timeout

Adds these two new parameters. [1]

[1] https://github.com/openstack/neutron/blob/master/neutron/conf/plugins/ml2/drivers/ovs_conf.py#L119

Conflicts:
	spec/classes/neutron_agents_ml2_ovs_spec.rb

Change-Id: I0cf45085c6d9f278fffb6f55ea8d2159dd425746
(cherry picked from commit 95f442bd61)

manifests/agents/ml2/ovs.pp

@@ -46,6 +46,15 @@
 #   (Optional) The timeout in seconds for OVSDB commands.
 #   Defaults to $::os_service_default
 #
+# [*of_connect_timeout*]
+#   (Optional) Timeout in seconds to wait for the local switch
+#   connecting to the controller.
+#   Defaults to $::os_service_default
+#
+# [*of_request_timeout*]
+#   (Optional) Timeout in seconds to wait for a single OpenFlow request.
+#   Defaults to $::os_service_default
+#
 # [*of_inactivity_probe*]
 #   (Optional) The inactivity_probe interval in second for the local switch
 #   connnection to the controller. A value of 0 disables inactivity probes.
@@ -183,6 +192,8 @@ class neutron::agents::ml2::ovs (
   $bridge_uplinks             = [],
   $bridge_mappings            = [],
   $ovsdb_timeout              = $::os_service_default,
+  $of_connect_timeout         = $::os_service_default,
+  $of_request_timeout         = $::os_service_default,
   $of_inactivity_probe        = $::os_service_default,
   $integration_bridge         = 'br-int',
   $tunnel_types               = [],
@@ -314,6 +325,8 @@ class neutron::agents::ml2::ovs (
     'agent/minimize_polling':               value => $minimize_polling;
     'agent/tunnel_csum':                    value => $tunnel_csum;
     'ovs/ovsdb_timeout':                    value => $ovsdb_timeout;
+    'ovs/of_connect_timeout':               value => $of_connect_timeout;
+    'ovs/of_request_timeout':               value => $of_request_timeout;
     'ovs/of_inactivity_probe':              value => $of_inactivity_probe;
     'ovs/integration_bridge':               value => $integration_bridge;
     'ovs/datapath_type':                    value => $datapath_type;

releasenotes/notes/add-ovs-of-timeouts-51c5abf0026572a5.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Added new parameters of_connect_timeout and of_request_timeout in the
+    neutron::agents::ml2::ovs class.

spec/classes/neutron_agents_ml2_ovs_spec.rb

@@ -52,6 +52,8 @@ describe 'neutron::agents::ml2::ovs' do
       is_expected.to contain_neutron_agent_ovs('ovs/ovsdb_interface').with_value(['<SERVICE DEFAULT>'])
       is_expected.to contain_neutron_agent_ovs('ovs/of_interface').with_value(['<SERVICE DEFAULT>'])
       is_expected.to contain_neutron_agent_ovs('ovs/ovsdb_timeout').with_value(['<SERVICE DEFAULT>'])
+      is_expected.to contain_neutron_agent_ovs('ovs/of_connect_timeout').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_neutron_agent_ovs('ovs/of_request_timeout').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_neutron_agent_ovs('ovs/of_inactivity_probe').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_neutron_agent_ovs('ovs/integration_bridge').with_value(p[:integration_bridge])
       is_expected.to contain_neutron_agent_ovs('securitygroup/firewall_driver').\
@@ -206,6 +208,21 @@ describe 'neutron::agents::ml2::ovs' do
       end
     end
 
+    context 'when setting of_connect_timeout and of_request_timeout' do
+      before :each do
+        params.merge!( :of_connect_timeout => 30,
+                       :of_request_timeout => 20 )
+      end
+
+      it 'configures of_connect_timeout' do
+        is_expected.to contain_neutron_agent_ovs('ovs/of_connect_timeout').with_value(params[:of_connect_timeout])
+      end
+
+      it 'configures of_request_timeout' do
+        is_expected.to contain_neutron_agent_ovs('ovs/of_request_timeout').with_value(params[:of_request_timeout])
+      end
+    end
+
     context 'when setting of_inactivity_probe' do
       before :each do
         params.merge!( :of_inactivity_probe => 20 )