Merge "Add a new parameter in testbed file to make OVS keepalive time…

…r configurable." into R2.20
Juniper · Jul 12, 2015 · 9fb1ffd · 9fb1ffd
2 parents 27e6b46 + 25c1ab7
commit 9fb1ffd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/fabfile/tasks/provision.py b/fabfile/tasks/provision.py
@@ -1822,6 +1822,11 @@ def add_tor_agent_by_index(index, node_info, restart=True):
         if tor_agent_name == None or not tor_agent_name:
             tor_agent_name = agent_name
 
+        # Default value for tor-agent ovsdb keepalive timer in millisec
+        tor_agent_ovs_ka = '10000'
+        if 'tor_agent_ovs_ka' in toragent_dict[host_string][i]:
+            tor_agent_ovs_ka = toragent_dict[host_string][i]['tor_agent_ovs_ka']
+
         cmd = "setup-vnc-tor-agent"
         cmd += " --self_ip %s" % tor_agent_control_ip
         cmd += " --agent_name %s" % tor_agent_name
@@ -1831,6 +1836,7 @@ def add_tor_agent_by_index(index, node_info, restart=True):
         cmd += " --tor_ovs_port %s" % toragent_dict[host_string][i]['tor_ovs_port']
         cmd += " --tsn_ip %s" % toragent_dict[host_string][i]['tor_tsn_ip']
         cmd += " --tor_ovs_protocol %s" % toragent_dict[host_string][i]['tor_ovs_protocol']
+        cmd += " --tor_agent_ovs_ka %s" % tor_agent_ovs_ka
         # HA arguments
         internal_vip = get_openstack_internal_vip()
         if internal_vip:

diff --git a/fabfile/testbeds/testbed_multibox_example.py b/fabfile/testbeds/testbed_multibox_example.py
@@ -390,6 +390,7 @@
 # tor_vendor_name: Vendor type for TOR switch
 # tor_product_name: Product name of TOR switch. This is an optional field.
 # tor_agent_http_server_port: HTTP server port. Same will be used by tor agent for introspect
+# tor_agent_ovs_ka: Tor Agent OVSDB keepalive timer in milli seconds 
 #
 #env.tor_agent = {host10:[{
 #                    'tor_ip':'10.204.217.39',
@@ -405,6 +406,7 @@
 #                    'tor_vendor_name':'Juniper',
 #                    'tor_product_name':'QFX5100',
 #                    'tor_agent_http_server_port': '9010',
+#                    'tor_agent_ovs_ka': '10000',
 #                       }]
 #                }
 #######################################

diff --git a/fabfile/testbeds/testbed_singlebox_example.py b/fabfile/testbeds/testbed_singlebox_example.py
@@ -303,8 +303,9 @@
 # tor_ovs_port: Port number to be used by ovs
 # tor_ovs_protocol: Connection protocol to be used by ovs. Currently only TCP
 # tor_tsn_ip: TSN node ip
+# tor_agent_ovs_ka: Tor Agent OVSDB keepalive timer in milli seconds 
 #env.tor_agent =
-#{host3:[{'tor_ip':'10.204.217.39','tor_agent_id':'1','tor_agent_name':'nodexx-1', 'tor_ovs_port':'9999','tor_ovs_protocol':'tcp','tor_tsn_ip':'10.204.221.35'}]}
+#{host3:[{'tor_ip':'10.204.217.39','tor_agent_id':'1','tor_agent_name':'nodexx-1', 'tor_ovs_port':'9999','tor_ovs_protocol':'tcp','tor_tsn_ip':'10.204.221.35', 'tor_agent_ovs_ka':'10000'}]}
 
 # OPTIONAL DPDK CONFIGURATION
 # ===========================