Merge "Add config for visibility of cisco-policy-profile"

diff --cc etc/neutron/plugins/cisco/cisco_plugins.ini
index fdcc8b3668110820c7e59968ee33652f2c16f77b,0b5a9bf2fb3ca81aa7601290bb2e5ed40a3ed73d..1bfb46dc8218dbbbb8031ee4f36586e6a676e9dd
--- 1/etc/neutron/plugins/cisco/cisco_plugins.ini
--- 2/etc/neutron/plugins/cisco/cisco_plugins.ini
+++ b/etc/neutron/plugins/cisco/cisco_plugins.ini
@@@ -126,11 -129,18 +126,17 @@@
  
  # (IntOpt) Time in seconds for which the plugin polls the VSM for updates in
  # policy profiles.
 -#
 -# poll_duration =
 -# Example: poll_duration = 180
 +# Default value: 60
 +# poll_duration = 60
  
+ # (BoolOpt) Specify whether tenants are restricted from accessing all the
+ # policy profiles.
+ # Default value: False, indicating all tenants can access all policy profiles.
+ #
+ # restrict_policy_profiles = False
+ 
  # (IntOpt) Number of threads to use to make HTTP requests to the VSM.
 -#
 +# Default value: 4
  # http_pool_size = 4
  
  # (IntOpt) Timeout duration in seconds for the http request

diff --cc neutron/plugins/cisco/common/config.py
index c95ce3614e1f0029c1f1aa44e970256d21a22988,4211400e6680814470cd8107c42a876dfa20b25c..1e844e5df88ee7be5e4cb3225e303bfd21d1a654
--- 1/neutron/plugins/cisco/common/config.py
--- 2/neutron/plugins/cisco/common/config.py
+++ b/neutron/plugins/cisco/common/config.py
@@@ -76,8 -76,11 +76,11 @@@ 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.IntOpt('poll_duration', default=10,
 +    cfg.IntOpt('poll_duration', default=60,
                 help=_("N1K Policy profile polling duration in seconds")),
+     cfg.BoolOpt('restrict_policy_profiles', default=False,
+                help=_("Restrict the visibility of policy profiles to the "
+                       "tenants")),
      cfg.IntOpt('http_pool_size', default=4,
                 help=_("Number of threads to use to make HTTP requests")),
      cfg.IntOpt('http_timeout', default=15,

diff --cc neutron/plugins/cisco/db/n1kv_db_v2.py
Simple merge

diff --cc neutron/tests/unit/cisco/n1kv/test_n1kv_plugin.py
Simple merge