x/vmware-nsx
Code Issues Proposed changes

Merge "NSX-V| Validate default policy configuration if use_nsx_policies"

Browse Source
This commit is contained in:
Jenkins 2017-01-02 15:00:05 +00:00 committed by Gerrit Code Review
commit 80e805774a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vmware_nsx/plugins/nsx_v/plugin.py
View File

@ -3682,8 +3682,13 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
for res in az_resources:
inventory.append((res, 'availability_zones'))
if cfg.CONF.nsxv.default_policy_id:
inventory.append((cfg.CONF.nsxv.default_policy_id, 'policy'))
if cfg.CONF.nsxv.use_nsx_policies:
# if use_nsx_policies=True, the default policy must be defined
if not cfg.CONF.nsxv.default_policy_id:
error = _("default_policy_id must be defined")
raise nsx_exc.NsxPluginException(err_msg=error)
inventory.append((cfg.CONF.nsxv.default_policy_id,
'default_policy_id'))
for moref, field in inventory:
if moref and not self.nsx_v.vcns.validate_inventory(moref):