x/vmware-nsx
Code Issues Proposed changes

NSX|V: add missing contexts

Browse Source 
Commit fe72c1bd0c changed the API.
This adds missing contexts.

Change-Id: I941647dbaa5857a9ef654f0bc4ace5b74c8a85e4
This commit is contained in:
Gary Kotton 2016-10-04 09:05:31 -07:00
parent ba03d6c9a4
commit 954feb1f6f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vmware_nsx/plugins/nsx_v/vshield/edge_utils.py
View File

@ -729,7 +729,8 @@ class EdgeManager(object):
# if there are still metadata ports on this edge - delete them now # if there are still metadata ports on this edge - delete them now
metadata_proxy_handler = self.plugin.metadata_proxy_handler metadata_proxy_handler = self.plugin.metadata_proxy_handler
if 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) self._free_edge_appliance(context, router_id)

3
vmware_nsx/shell/admin/plugins/nsxv/resources/routers.py
View File

@ -111,7 +111,8 @@ def nsx_recreate_router_edge(resource, event, trigger, **kwargs):
router_id = router['id'] router_id = router['id']
# clean up other objects related to this router # clean up other objects related to this router
if plugin.metadata_proxy_handler: 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 # attach the router to a new edge
appliance_size = router.get(routersize.ROUTER_SIZE) appliance_size = router.get(routersize.ROUTER_SIZE)