x/vmware-nsx
Code Issues Proposed changes

Merge "[Admin-Util] Add error handling to nsxv update_switch admin utility"

Browse Source
This commit is contained in:
Jenkins 2016-04-20 17:44:48 +00:00 committed by Gerrit Code Review
commit cc204e0c55
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vmware_nsx/shell/admin/plugins/nsxv/resources/networks.py
View File

@ -14,12 +14,13 @@
import logging import logging
from oslo_serialization import jsonutils
import xml.etree.ElementTree as et import xml.etree.ElementTree as et
from vmware_nsx._i18n import _LE, _LI from vmware_nsx._i18n import _LE, _LI
from vmware_nsx.plugins.nsx_v.vshield.common import exceptions
from vmware_nsx.shell.admin.plugins.common import constants from vmware_nsx.shell.admin.plugins.common import constants
from vmware_nsx.shell.admin.plugins.common import formatters from vmware_nsx.shell.admin.plugins.common import formatters
from vmware_nsx.shell.admin.plugins.common import utils as admin_utils from vmware_nsx.shell.admin.plugins.common import utils as admin_utils
from vmware_nsx.shell.admin.plugins.nsxv.resources import utils as utils from vmware_nsx.shell.admin.plugins.nsxv.resources import utils as utils
from vmware_nsx.shell import nsxadmin as shell from vmware_nsx.shell import nsxadmin as shell
@ -66,7 +67,11 @@ def nsx_update_switch(resource, event, trigger, **kwargs):
LOG.error(_LE("Need to specify dvs-id. " LOG.error(_LE("Need to specify dvs-id. "
"Add --property dvs-id=<dvs-id>")) "Add --property dvs-id=<dvs-id>"))
return return
try:
h, switch = nsxv.get_vdn_switch(dvs_id) h, switch = nsxv.get_vdn_switch(dvs_id)
except exceptions.ResourceNotFound:
LOG.error(_LE("DVS %s not found"), dvs_id)
return
policy = properties.get('teamingpolicy') policy = properties.get('teamingpolicy')
if policy: if policy:
if switch['teamingPolicy'] == policy: if switch['teamingPolicy'] == policy:
@ -75,7 +80,17 @@ def nsx_update_switch(resource, event, trigger, **kwargs):
LOG.info(_LI("Updating NSXv switch %(dvs)s teaming policy to " LOG.info(_LI("Updating NSXv switch %(dvs)s teaming policy to "
"%(policy)s"), {'dvs': dvs_id, 'policy': policy}) "%(policy)s"), {'dvs': dvs_id, 'policy': policy})
switch['teamingPolicy'] = policy switch['teamingPolicy'] = policy
try:
switch = nsxv.update_vdn_switch(switch) switch = nsxv.update_vdn_switch(switch)
except exceptions.VcnsApiException as e:
desc = jsonutils.loads(e.response)
details = desc.get('details')
if details.startswith("No enum constant"):
LOG.error(_LE("Unknown teaming policy %s"), policy)
else:
LOG.error(_LE("Unexpected error occurred: %s"), details)
return
LOG.info(_LI("Switch value after update: %s"), switch) LOG.info(_LI("Switch value after update: %s"), switch)
else: else:
LOG.error(_LE("No teaming policy set. " LOG.error(_LE("No teaming policy set. "