Add configurable http_timeout parameter for Cisco N1K

http_timeout is a constant defined in the code. This
change makes it configurable by providing it as an
option in the config file.

DocImpact

Closes-Bug: #1332290
Change-Id: I429dd9efa43f6a596933359f4627a7761411e621

diff --git a/etc/neutron/plugins/cisco/cisco_plugins.ini b/etc/neutron/plugins/cisco/cisco_plugins.ini
index 13d81f182b57b5e42e1e09c73225c527d25ec6dd..22c11d4ce92e02a86a1826ce173c2b7c01079684 100644 (file)
--- a/etc/neutron/plugins/cisco/cisco_plugins.ini
+++ b/etc/neutron/plugins/cisco/cisco_plugins.ini
@@ -136,3 +136,8 @@
 # (IntOpt) Number of threads to use to make HTTP requests to the VSM.
 #
 # http_pool_size = 4
+
+# (IntOpt) Timeout duration in seconds for the http request
+#
+# http_timeout =
+# Example: http_timeout = 15

diff --git a/neutron/plugins/cisco/common/cisco_constants.py b/neutron/plugins/cisco/common/cisco_constants.py
index 9d8d7d5314ea5d4fb60235a2ef513383ba65857b..b4a9f1408f9e495fa8e6da9c58a6d8ef5c54d757 100644 (file)
--- a/neutron/plugins/cisco/common/cisco_constants.py
+++ b/neutron/plugins/cisco/common/cisco_constants.py
@@ -81,7 +81,6 @@ NETWORK_SUBTYPE_TRUNK_VXLAN = NETWORK_TYPE_OVERLAY
 # Prefix for VM Network name
 VM_NETWORK_NAME_PREFIX = 'vmn_'
 
-DEFAULT_HTTP_TIMEOUT = 15
 SET = 'set'
 INSTANCE = 'instance'
 PROPERTIES = 'properties'

diff --git a/neutron/plugins/cisco/common/config.py b/neutron/plugins/cisco/common/config.py
index 7081d04c72912059ea405dec1a4b2c14059f4a59..bc764474e0d39eb5655d5879f3acb1c8c65e79e5 100644 (file)
--- a/neutron/plugins/cisco/common/config.py
+++ b/neutron/plugins/cisco/common/config.py
@@ -80,6 +80,8 @@ cisco_n1k_opts = [
                help=_("N1K Policy profile polling duration in seconds")),
     cfg.IntOpt('http_pool_size', default=4,
                help=_("Number of threads to use to make HTTP requests")),
+    cfg.IntOpt('http_timeout', default=15,
+               help=_("N1K http timeout duration in seconds")),
 ]
 
 cfg.CONF.register_opts(cisco_opts, "CISCO")

diff --git a/neutron/plugins/cisco/n1kv/n1kv_client.py b/neutron/plugins/cisco/n1kv/n1kv_client.py
index a107f9336c7ebef5e50a76bb70d1d2100287e518..b98d76ba1a48996b91df41f90c0badd8a1aa0e0b 100644 (file)
--- a/neutron/plugins/cisco/n1kv/n1kv_client.py
+++ b/neutron/plugins/cisco/n1kv/n1kv_client.py
@@ -129,7 +129,7 @@ class Client(object):
         self.format = 'json'
         self.hosts = self._get_vsm_hosts()
         self.action_prefix = 'http://%s/api/n1k' % self.hosts[0]
-        self.timeout = c_const.DEFAULT_HTTP_TIMEOUT
+        self.timeout = c_conf.CISCO_N1K.http_timeout
 
     def list_port_profiles(self):
         """