From bd0275b5dd0cfec4d3baed6e03b267fa3c21e355 Mon Sep 17 00:00:00 2001 From: asarfaty Date: Wed, 26 Feb 2020 11:55:20 +0200 Subject: [PATCH] NSX|P: Fix mdproxy validation MD Proxy validation should be different for the policy mdproxy. This code was missing when cherry picking it from master Change-Id: Idd4cb333321e24958705ea12e2d2847cd14a8b7a --- vmware_nsx/plugins/nsx_p/availability_zones.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/vmware_nsx/plugins/nsx_p/availability_zones.py b/vmware_nsx/plugins/nsx_p/availability_zones.py index 2b19e369c3..2b95489122 100644 --- a/vmware_nsx/plugins/nsx_p/availability_zones.py +++ b/vmware_nsx/plugins/nsx_p/availability_zones.py @@ -253,8 +253,15 @@ class NsxPAvailabilityZone(v3_az.NsxV3AvailabilityZone): dhcp_ec) if self._native_md_proxy_uuid: - md_ec = nsxlib.native_md_proxy.get( - self._native_md_proxy_uuid).get('edge_cluster_id') + # Validate that the edge cluster of the MD proxy (MP or policy one) + # match the configured TZs + if self.use_policy_md: + md_ec_path = nsxpolicy.md_proxy.get( + self._native_md_proxy_uuid).get('edge_cluster_path') + md_ec = p_utils.path_to_id(md_ec_path) + else: + md_ec = nsxlib.native_md_proxy.get( + self._native_md_proxy_uuid).get('edge_cluster_id') if md_ec != tier0_ec_uuid: self._validate_tz(nsxpolicy, nsxlib, 'MD Proxy', self._native_md_proxy_uuid,