x/vmware-nsx
Code Issues Proposed changes

NSX-v3| Update router description on backend

Browse Source 
Also avoid updating router gw info if not set, and fix
some indentation problems

Depends-on: Iea946df079e750eadfa0dbcdbe05dcd4282a9cce
Change-Id: I4bfd090b97eb4d528c108a354e128494261b0a67
This commit is contained in:
Adit Sarfaty 2017-01-02 10:18:12 +02:00
parent 1b3a2b406c
commit 33d66232d0
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vmware_nsx/plugins/nsx_v3/plugin.py
View File

@ -2515,8 +2515,8 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
pass pass
self._routerlib.update_advertisement(nsx_router_id, self._routerlib.update_advertisement(nsx_router_id,
advertise_route_nat_flag, advertise_route_nat_flag,
advertise_route_connected_flag) advertise_route_connected_flag)
def create_router(self, context, router): def create_router(self, context, router):
# TODO(berlin): admin_state_up support # TODO(berlin): admin_state_up support
@ -2537,7 +2537,9 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
try: try:
result = self._router_client.create( result = self._router_client.create(
display_name=utils.get_name_and_uuid( display_name=utils.get_name_and_uuid(
router['name'] or 'router', router['id']), tags=tags) router['name'] or 'router', router['id']),
description=router.get('description'),
tags=tags)
except nsx_lib_exc.ManagerError: except nsx_lib_exc.ManagerError:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.error(_LE("Unable to create logical router for " LOG.error(_LE("Unable to create logical router for "
@ -2553,7 +2555,7 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
"router %s"), router['id']) "router %s"), router['id'])
self.delete_router(context, router['id']) self.delete_router(context, router['id'])
if gw_info != const.ATTR_NOT_SPECIFIED: if gw_info and gw_info != const.ATTR_NOT_SPECIFIED:
try: try:
self._update_router_gw_info(context, router['id'], gw_info) self._update_router_gw_info(context, router['id'], gw_info)
except (db_exc.DBError, nsx_lib_exc.ManagerError): except (db_exc.DBError, nsx_lib_exc.ManagerError):
@ -2688,6 +2690,13 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
"Reason: %(e)s"), "Reason: %(e)s"),
{'port_id': nsx_port_id, {'port_id': nsx_port_id,
'e': e}) 'e': e})
if 'description' in router_data:
nsx_router_id = nsx_db.get_nsx_router_id(context.session,
router_id)
self._router_client.update(
nsx_router_id,
description=router_data['description'])
return self._update_router_wrapper(context, router_id, router) return self._update_router_wrapper(context, router_id, router)
except nsx_lib_exc.ResourceNotFound: except nsx_lib_exc.ResourceNotFound:
with context.session.begin(subtransactions=True): with context.session.begin(subtransactions=True):