From 13d55a76d4835f1a436862c7fc0e0af577f26ba5 Mon Sep 17 00:00:00 2001 From: Sayaji Date: Fri, 20 Jun 2014 13:52:30 -0700 Subject: [PATCH] Changing the poll_duration parameter type to int The poll_duration parameter is defined as a Str in config.py but while using in code, it is converted to int. So just changing the type in the config file, so no conversion is required when used Change-Id: I1d10b4641e3ca8e464258857b27c450a43ad2e87 Closes-Bug:#1332283 --- etc/neutron/plugins/cisco/cisco_plugins.ini | 2 +- neutron/plugins/cisco/common/config.py | 2 +- neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/neutron/plugins/cisco/cisco_plugins.ini b/etc/neutron/plugins/cisco/cisco_plugins.ini index e065e73a4..d191976ef 100644 --- a/etc/neutron/plugins/cisco/cisco_plugins.ini +++ b/etc/neutron/plugins/cisco/cisco_plugins.ini @@ -127,7 +127,7 @@ # default_network_profile = # Example: default_network_profile = network_pool -# (StrOpt) Time in seconds for which the plugin polls the VSM for updates in +# (IntOpt) Time in seconds for which the plugin polls the VSM for updates in # policy profiles. # # poll_duration = diff --git a/neutron/plugins/cisco/common/config.py b/neutron/plugins/cisco/common/config.py index a4a1196a8..255a42d99 100644 --- a/neutron/plugins/cisco/common/config.py +++ b/neutron/plugins/cisco/common/config.py @@ -78,7 +78,7 @@ cisco_n1k_opts = [ help=_("N1K default policy profile")), cfg.StrOpt('network_node_policy_profile', default='dhcp_pp', help=_("N1K policy profile for network node")), - cfg.StrOpt('poll_duration', default='10', + cfg.IntOpt('poll_duration', default=10, help=_("N1K Policy profile polling duration in seconds")), ] diff --git a/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py b/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py index 83defcf7c..2af13a9c3 100644 --- a/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py +++ b/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py @@ -160,7 +160,7 @@ class N1kvNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2, """Start a green thread to pull policy profiles from VSM.""" while True: self._populate_policy_profiles() - eventlet.sleep(int(c_conf.CISCO_N1K.poll_duration)) + eventlet.sleep(c_conf.CISCO_N1K.poll_duration) def _populate_policy_profiles(self): """ -- 2.45.2