diff --git a/vmware_nsx/plugins/common/plugin.py b/vmware_nsx/plugins/common/plugin.py index 59e2ec329f..9aa3e15393 100644 --- a/vmware_nsx/plugins/common/plugin.py +++ b/vmware_nsx/plugins/common/plugin.py @@ -570,6 +570,11 @@ class NsxPluginBase(db_base_plugin_v2.NeutronDbPluginV2, self._assert_on_vpn_port_change(original_port) self._assert_on_lb_port_fixed_ip_change(port_data, orig_dev_owner) + def _get_dhcp_port_name(self, net_name, net_id): + return utils.get_name_and_uuid('%s-%s' % ('dhcp', + net_name or 'network'), + net_id) + def _build_port_name(self, context, port_data): device_owner = port_data.get('device_owner') device_id = port_data.get('device_id') diff --git a/vmware_nsx/plugins/nsx_v3/plugin.py b/vmware_nsx/plugins/nsx_v3/plugin.py index 7ff2b33044..e79e80ee18 100644 --- a/vmware_nsx/plugins/nsx_v3/plugin.py +++ b/vmware_nsx/plugins/nsx_v3/plugin.py @@ -2239,11 +2239,6 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin, [db_utils.resource_fields(network, fields) for network in networks]) - def _get_dhcp_port_name(self, net_name, net_id): - return utils.get_name_and_uuid('%s-%s' % ('dhcp', - net_name or 'network'), - net_id) - def _get_qos_profile_id(self, context, policy_id): switch_profile_id = nsx_db.get_switch_profile_by_qos_policy( context.session, policy_id)