Merge "Do not specify vnic index while setting DGW"

This commit is contained in:
Jenkins 2016-01-19 18:14:28 +00:00 committed by Gerrit Code Review
commit e1121a5b73

View File

@ -856,7 +856,6 @@ class EdgeApplianceDriver(object):
# for speedup # for speedup
return task_constants.TaskStatus.ABORT return task_constants.TaskStatus.ABORT
gateway = task.userdata['gateway'] gateway = task.userdata['gateway']
gateway_vnic_index = task.userdata['gateway_vnic_index']
routes = task.userdata['routes'] routes = task.userdata['routes']
LOG.debug("VCNS: start updating routes for %s", edge_id) LOG.debug("VCNS: start updating routes for %s", edge_id)
static_routes = [] static_routes = []
@ -883,8 +882,7 @@ class EdgeApplianceDriver(object):
if gateway: if gateway:
request["defaultRoute"] = { request["defaultRoute"] = {
"description": "default-gateway", "description": "default-gateway",
"gatewayAddress": gateway, "gatewayAddress": gateway
"vnic": gateway_vnic_index
} }
try: try:
self.vcns.update_routes(edge_id, request) self.vcns.update_routes(edge_id, request)