From e9bed7798cd99277f069e1fa91f1a766f631671d Mon Sep 17 00:00:00 2001 From: asarfaty Date: Tue, 15 Dec 2020 10:51:20 +0200 Subject: [PATCH] NSX|P: Fix subnet dhcp update Subnet data was missing the subnet ID causing errors when trying to enable dhcp on a subnet attached to a router. Change-Id: Ie8ad846fb50adae571fc70a349fa980dbf9ac2e9 --- vmware_nsx/plugins/nsx_p/plugin.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vmware_nsx/plugins/nsx_p/plugin.py b/vmware_nsx/plugins/nsx_p/plugin.py index 8d9e6a8a5a..ef1715697f 100644 --- a/vmware_nsx/plugins/nsx_p/plugin.py +++ b/vmware_nsx/plugins/nsx_p/plugin.py @@ -1543,9 +1543,10 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base): {'net': net_id, 'ver': ip_version}) LOG.error(msg) raise n_exc.InvalidInput(error_message=msg) - + updated_data = orig_subnet + updated_data.update(subnet_data) self._validate_segment_subnets_num( - context, net_id, subnet_data) + context, net_id, updated_data) updated_subnet = super(NsxPolicyPlugin, self).update_subnet( context, subnet_id, subnet)