From 1d3a4406a66348087de545ac3f563d51ea329f20 Mon Sep 17 00:00:00 2001 From: Adit Sarfaty Date: Thu, 1 Jun 2017 10:28:07 +0300 Subject: [PATCH] NSX|V: Validate availability zones dvs-ids Change-Id: I912ed8a072ba4a045a109f84f555df55f883e64e --- vmware_nsx/plugins/nsx_v/availability_zones.py | 3 +++ vmware_nsx/plugins/nsx_v/plugin.py | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/vmware_nsx/plugins/nsx_v/availability_zones.py b/vmware_nsx/plugins/nsx_v/availability_zones.py index 22d3261a34..1b5e81cc26 100644 --- a/vmware_nsx/plugins/nsx_v/availability_zones.py +++ b/vmware_nsx/plugins/nsx_v/availability_zones.py @@ -243,3 +243,6 @@ class NsxVAvailabilityZones(common_az.ConfiguredAvailabilityZones): def get_additional_datacenter(self): return self.get_unique_non_default_param("datacenter_moid") + + def get_additional_dvs_ids(self): + return self.get_unique_non_default_param("dvs_id") diff --git a/vmware_nsx/plugins/nsx_v/plugin.py b/vmware_nsx/plugins/nsx_v/plugin.py index 442415f387..61466b6f10 100644 --- a/vmware_nsx/plugins/nsx_v/plugin.py +++ b/vmware_nsx/plugins/nsx_v/plugin.py @@ -4213,6 +4213,10 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin, raise nsx_exc.NsxResourceNotFound( res_name='dvs_id', res_id=cfg.CONF.nsxv.dvs_id) + for dvs_id in self._availability_zones_data.get_additional_dvs_ids(): + if not self.nsx_v.vcns.validate_dvs(dvs_id): + raise nsx_exc.NsxAZResourceNotFound( + res_name='dvs_id', res_id=dvs_id) # Validate the global & per-AZ validate_datacenter_moid if not self.nsx_v.vcns.validate_datacenter_moid(