From 954feb1f6f4cbf6fd219ee0c76a557ba9a9c5826 Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Tue, 4 Oct 2016 09:05:31 -0700 Subject: [PATCH] NSX|V: add missing contexts Commit fe72c1bd0c98bc5c403e867a4c284f8e66a4d10d changed the API. This adds missing contexts. Change-Id: I941647dbaa5857a9ef654f0bc4ace5b74c8a85e4 --- vmware_nsx/plugins/nsx_v/vshield/edge_utils.py | 3 ++- vmware_nsx/shell/admin/plugins/nsxv/resources/routers.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/vmware_nsx/plugins/nsx_v/vshield/edge_utils.py b/vmware_nsx/plugins/nsx_v/vshield/edge_utils.py index d86071c8b6..623668109e 100644 --- a/vmware_nsx/plugins/nsx_v/vshield/edge_utils.py +++ b/vmware_nsx/plugins/nsx_v/vshield/edge_utils.py @@ -729,7 +729,8 @@ class EdgeManager(object): # if there are still metadata ports on this edge - delete them now metadata_proxy_handler = self.plugin.metadata_proxy_handler if metadata_proxy_handler: - metadata_proxy_handler.cleanup_router_edge(router_id, warn=True) + metadata_proxy_handler.cleanup_router_edge(context, router_id, + warn=True) self._free_edge_appliance(context, router_id) diff --git a/vmware_nsx/shell/admin/plugins/nsxv/resources/routers.py b/vmware_nsx/shell/admin/plugins/nsxv/resources/routers.py index cded6e1bc5..49d99fca76 100644 --- a/vmware_nsx/shell/admin/plugins/nsxv/resources/routers.py +++ b/vmware_nsx/shell/admin/plugins/nsxv/resources/routers.py @@ -111,7 +111,8 @@ def nsx_recreate_router_edge(resource, event, trigger, **kwargs): router_id = router['id'] # clean up other objects related to this router if plugin.metadata_proxy_handler: - plugin.metadata_proxy_handler.cleanup_router_edge(router_id) + plugin.metadata_proxy_handler.cleanup_router_edge( + context, router_id) # attach the router to a new edge appliance_size = router.get(routersize.ROUTER_SIZE)