x
/
vmware-nsx
Code Issues Proposed changes

NSXv: Check router-type before router-size 

Move router-type validation check before router-size.
This way if default router-type is set to exclusive; and no router-type
is specified while router-create; the creation doesn't fail with
"Type: unspecified" error.

Change-Id: I1256b5e144211fb80252ca989a594192990d4f0e
This commit is contained in:
Amey Bhide 2015-10-06 16:16:15 -07:00 committed by Kobi Samoray
parent 5f5c8a6456
commit 4f43e93439
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vmware_nsx/plugins/nsx_v/plugin.py
View File

@ -1393,14 +1393,14 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
# for a exclusive non-distributed router; else raise a BadRequest
# exception.
r = router['router']
if r.get(ROUTER_SIZE) != attr.ATTR_NOT_SPECIFIED:
if attr.is_attr_set(r.get(ROUTER_SIZE)):
if r.get('router_type') == nsxv_constants.SHARED:
msg = _("Cannot specify router-size for shared router")
raise n_exc.BadRequest(resource="router", msg=msg)
elif r.get('distributed') is True:
msg = _("Cannot specify router-size for distributed router")
raise n_exc.BadRequest(resource="router", msg=msg)
elif r.get(ROUTER_SIZE) == attr.ATTR_NOT_SPECIFIED:
else:
if r.get('router_type') == nsxv_constants.EXCLUSIVE:
appliance_size = cfg.CONF.nsxv.exclusive_router_appliance_size
if appliance_size not in VALID_EDGE_SIZES:
@ -1414,9 +1414,9 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
r[ROUTER_SIZE] = appliance_size
def create_router(self, context, router, allow_metadata=True):
self._validate_router_size(router)
r = router['router']
self._decide_router_type(context, r)
self._validate_router_size(router)
# First extract the gateway info in case of updating
# gateway before edge is deployed.
# TODO(berlin): admin_state_up and routes update