From 1427c83397e98388c5c67b1a54cf1504fc60d913 Mon Sep 17 00:00:00 2001 From: Michal Kelner Mishali <mkelnermishal@vmware.com> Date: Thu, 8 Mar 2018 10:36:29 +0200 Subject: [PATCH] AdminUtil: using nsxlib func for orphan dhcp rm Removing abuse and using get_by_attachement function in nsxlib, in order to get the API url. Change-Id: I68786ca57275d3d1e358b1b877947188823013c2 Signed-off-by: Michal Kelner Mishali <mkelnermishal@vmware.com> --- .../shell/admin/plugins/nsxv3/resources/dhcp_servers.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/vmware_nsx/shell/admin/plugins/nsxv3/resources/dhcp_servers.py b/vmware_nsx/shell/admin/plugins/nsxv3/resources/dhcp_servers.py index 598a52312c..5a6a3cec01 100644 --- a/vmware_nsx/shell/admin/plugins/nsxv3/resources/dhcp_servers.py +++ b/vmware_nsx/shell/admin/plugins/nsxv3/resources/dhcp_servers.py @@ -140,11 +140,8 @@ def nsx_clean_orphaned_dhcp_servers(resource, event, trigger, **kwargs): for server in orphaned_servers: try: - # TODO(asarfaty): should add this as api to nsxlib instead of - # abusing it - resource = ('?attachment_type=DHCP_SERVICE&attachment_id=%s' % - server['id']) - response = nsxlib.logical_port.get(resource) + response = nsxlib.logical_port.get_by_attachment('DHCP_SERVICE', + server['id']) if response and response['result_count'] > 0: nsxlib.logical_port.delete(response['results'][0]['id']) nsxlib.dhcp_server.delete(server['id'])