Merge "Fix some typos in docstring and error messages"

This commit is contained in:
Jenkins 2015-08-25 03:21:05 +00:00 committed by Gerrit Code Review
commit 380ff5d666
2 changed files with 6 additions and 6 deletions

View File

@ -316,9 +316,9 @@ def validate_nsxv_config_options():
if (cfg.CONF.nsxv.manager_uri is None or
cfg.CONF.nsxv.user is None or
cfg.CONF.nsxv.password is None):
error = _("manager_uri, user and password must be configured!")
error = _("manager_uri, user, and password must be configured!")
raise nsx_exc.NsxPluginException(err_msg=error)
if cfg.CONF.nsxv.dvs_id is None:
LOG.warning(_LW("dvs_id must be configured to support VLAN's!"))
LOG.warning(_LW("dvs_id must be configured to support VLANs!"))
if cfg.CONF.nsxv.vdn_scope_id is None:
LOG.warning(_LW("vdn_scope_id must be configured to support VXLAN's!"))
LOG.warning(_LW("vdn_scope_id must be configured to support VXLANs!"))

View File

@ -24,11 +24,11 @@ httplib2 = eventlet.import_patched('httplib2')
def _xmldump(obj):
"""Sort of imporved xml creation method.
"""Sort of improved xml creation method.
This converts the dict to xml with following assumptions:
keys starting with _(underscore) are to be used as attributes and not
elements keys starting with @ are to there so that dict can be made.
Keys starting with _(underscore) are to be used as attributes and not
element keys starting with @ so that dict can be made.
The keys are not part of any xml schema.
"""