x/vmware-nsx
Code Issues Proposed changes

Merge "NSXv: Enhance edge deploy failure handle"

Browse Source
This commit is contained in:
Jenkins 2016-04-11 11:24:26 +00:00 committed by Gerrit Code Review
commit 1f219649ea
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -515,10 +515,9 @@ class EdgeManager(object):
plugin_const.PENDING_CREATE,
appliance_size=appliance_size,
edge_type=edge_type)
task = self._deploy_edge(context, lrouter,
appliance_size=appliance_size,
edge_type=edge_type)
task.wait(task_const.TaskState.RESULT)
self._deploy_edge(context, lrouter,
appliance_size=appliance_size,
edge_type=edge_type, async=False)
return
with locking.LockManager.get_lock('nsx-edge-request'):
@ -533,10 +532,9 @@ class EdgeManager(object):
plugin_const.PENDING_CREATE,
appliance_size=appliance_size,
edge_type=edge_type)
task = self._deploy_edge(context, lrouter,
appliance_size=appliance_size,
edge_type=edge_type)
task.wait(task_const.TaskState.RESULT)
self._deploy_edge(context, lrouter,
appliance_size=appliance_size,
edge_type=edge_type, async=False)
else:
LOG.debug("Select edge: %(edge_id)s from pool for %(name)s",
{'edge_id': available_router_binding['edge_id'],
@ -2101,7 +2099,7 @@ class NsxVCallbacks(object):
context.session, router_id,
status=plugin_const.ACTIVE)
else:
LOG.debug("Failed to deploy Edge for router %s", name)
LOG.error(_LE("Failed to deploy Edge for router %s"), name)
if router_db:
router_db['status'] = plugin_const.ERROR
nsxv_db.update_nsxv_router_binding(

2
vmware_nsx/plugins/nsx_v/vshield/vcns.py
View File

@ -137,6 +137,8 @@ class Vcns(object):
uri = URI_PREFIX + "?lockUpdatesOnEdge=true"
return self.do_request(HTTP_POST, uri, decode=False)
@retry_upon_exception(exceptions.ResourceNotFound)
@retry_upon_exception(exceptions.RequestBad)
def deploy_edge(self, request, async=True):
uri = URI_PREFIX
if async: