x/vmware-nsx
Code Issues Proposed changes

Merge "NSX|V AZ validation message"

Browse Source
This commit is contained in:
Jenkins 2017-06-04 12:07:34 +00:00 committed by Gerrit Code Review
commit e8b2397926
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vmware_nsx/plugins/nsx_v/availability_zones.py
View File

@ -214,8 +214,10 @@ class NsxVAvailabilityZones(common_az.ConfiguredAvailabilityZones):
""" """
resources = set() resources = set()
for az in self.list_availability_zones_objects(): for az in self.list_availability_zones_objects():
resources.add(az.resource_pool) if az.resource_pool:
resources.add(az.datastore_id) resources.add(az.resource_pool)
if az.datastore_id:
resources.add(az.datastore_id)
if az.ha_datastore_id: if az.ha_datastore_id:
resources.add(az.ha_datastore_id) resources.add(az.ha_datastore_id)

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

@ -4312,7 +4312,7 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
# Add the availability zones resources # Add the availability zones resources
az_resources = self._availability_zones_data.get_inventory() az_resources = self._availability_zones_data.get_inventory()
for res in az_resources: for res in az_resources:
inventory.append((res, 'availability_zones')) inventory.append((res, 'availability_zone ' + res))
if cfg.CONF.nsxv.use_nsx_policies: if cfg.CONF.nsxv.use_nsx_policies:
# if use_nsx_policies=True, the default policy must be defined # if use_nsx_policies=True, the default policy must be defined