From 244357258e25b726fdbcab9a81c768d5c506a488 Mon Sep 17 00:00:00 2001 From: tengqm Date: Sat, 21 Mar 2015 07:54:57 +0800 Subject: [PATCH] Fix initial gate errors Change-Id: I8e7e0a65d658f5356a7e4e8436888d195bb53fe7 --- .gitignore | 2 +- .gitreview | 4 + doc/.gitignore | 2 + doc/Makefile | 119 ++- doc/source/conf.py | 354 ++++++++ doc/source/index.rst | 22 + doc/source/man/senlin.rst | 80 ++ .../locale/python-senlinclient.pot | 815 ++++++++++++++++++ requirements.txt | 6 +- senlinclient/common/exc.py | 1 + senlinclient/tests/__init__.py | 0 senlinclient/tests/test_utils.py | 21 + senlinclient/v1/client.py | 6 +- senlinclient/v1/shell.py | 42 +- test-requirements.txt | 5 +- 15 files changed, 1432 insertions(+), 47 deletions(-) create mode 100644 .gitreview create mode 100644 doc/.gitignore create mode 100644 doc/source/conf.py create mode 100644 doc/source/index.rst create mode 100644 doc/source/man/senlin.rst create mode 100644 python-senlinclient/locale/python-senlinclient.pot create mode 100644 senlinclient/tests/__init__.py create mode 100644 senlinclient/tests/test_utils.py diff --git a/.gitignore b/.gitignore index db4561ea..bbf183e3 100644 --- a/.gitignore +++ b/.gitignore @@ -37,12 +37,12 @@ htmlcov/ .tox/ .coverage .cache +.testrepository nosetests.xml coverage.xml # Translations *.mo -*.pot # Django stuff: *.log diff --git a/.gitreview b/.gitreview new file mode 100644 index 00000000..1dfd15de --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=review.openstack.org +port=29418 +project=stackforge/python-senlinclient.git diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 00000000..8e0be80f --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1,2 @@ +build/ +source/ref/ diff --git a/doc/Makefile b/doc/Makefile index 21990e3b..8fab18b0 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -4,32 +4,50 @@ # You can set these variables from the command line. SPHINXOPTS = SPHINXBUILD = sphinx-build -SPHINXSOURCE = source PAPER = BUILDDIR = build +# User-friendly check for sphinx-build +ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1) +$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/) +endif + # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SPHINXSOURCE) +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source +# the i18n builder cannot share the environment and doctrees with the others +I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source -.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest +.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext help: @echo "Please use \`make ' where is one of" - @echo " html to make standalone HTML files" - @echo " dirhtml to make HTML files named index.html in directories" - @echo " pickle to make pickle files" - @echo " json to make JSON files" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " qthelp to make HTML files and a qthelp project" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" - @echo " changes to make an overview of all changed/added/deprecated items" - @echo " linkcheck to check all external links for integrity" - @echo " doctest to run all doctests embedded in the documentation (if enabled)" + @echo " html to make standalone HTML files" + @echo " dirhtml to make HTML files named index.html in directories" + @echo " singlehtml to make a single large HTML file" + @echo " pickle to make pickle files" + @echo " json to make JSON files" + @echo " htmlhelp to make HTML files and a HTML help project" + @echo " qthelp to make HTML files and a qthelp project" + @echo " devhelp to make HTML files and a Devhelp project" + @echo " epub to make an epub" + @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" + @echo " latexpdf to make LaTeX files and run them through pdflatex" + @echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx" + @echo " text to make text files" + @echo " man to make manual pages" + @echo " texinfo to make Texinfo files" + @echo " info to make Texinfo files and run them through makeinfo" + @echo " gettext to make PO message catalogs" + @echo " changes to make an overview of all changed/added/deprecated items" + @echo " xml to make Docutils-native XML files" + @echo " pseudoxml to make pseudoxml-XML files for display purposes" + @echo " linkcheck to check all external links for integrity" + @echo " doctest to run all doctests embedded in the documentation (if enabled)" clean: - -rm -rf $(BUILDDIR)/* + rm -rf $(BUILDDIR)/* html: $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html @@ -41,6 +59,11 @@ dirhtml: @echo @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." +singlehtml: + $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml + @echo + @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." + pickle: $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle @echo @@ -66,12 +89,66 @@ qthelp: @echo "To view the help file:" @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/python-senlinclient.qhc" +devhelp: + $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp + @echo + @echo "Build finished." + @echo "To view the help file:" + @echo "# mkdir -p $$HOME/.local/share/devhelp/python-senlinclient" + @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/python-senlinclient" + @echo "# devhelp" + +epub: + $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub + @echo + @echo "Build finished. The epub file is in $(BUILDDIR)/epub." + latex: $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex @echo @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." - @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \ - "run these through (pdf)latex." + @echo "Run \`make' in that directory to run these through (pdf)latex" \ + "(use \`make latexpdf' here to do that automatically)." + +latexpdf: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo "Running LaTeX files through pdflatex..." + $(MAKE) -C $(BUILDDIR)/latex all-pdf + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." + +latexpdfja: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo "Running LaTeX files through platex and dvipdfmx..." + $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." + +text: + $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text + @echo + @echo "Build finished. The text files are in $(BUILDDIR)/text." + +man: + $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man + @echo + @echo "Build finished. The manual pages are in $(BUILDDIR)/man." + +texinfo: + $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo + @echo + @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." + @echo "Run \`make' in that directory to run these through makeinfo" \ + "(use \`make info' here to do that automatically)." + +info: + $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo + @echo "Running Texinfo files through makeinfo..." + make -C $(BUILDDIR)/texinfo info + @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." + +gettext: + $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale + @echo + @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." changes: $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes @@ -88,3 +165,13 @@ doctest: $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest @echo "Testing of doctests in the sources finished, look at the " \ "results in $(BUILDDIR)/doctest/output.txt." + +xml: + $(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml + @echo + @echo "Build finished. The XML files are in $(BUILDDIR)/xml." + +pseudoxml: + $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml + @echo + @echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml." diff --git a/doc/source/conf.py b/doc/source/conf.py new file mode 100644 index 00000000..f50f40af --- /dev/null +++ b/doc/source/conf.py @@ -0,0 +1,354 @@ +# -*- coding: utf-8 -*- +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# python-senlinclient documentation build configuration file, created by +# sphinx-quickstart on Sat Mar 21 08:52:42 2015. +# +# This file is execfile()d with the current directory set to its +# containing dir. +# +# Note that not all possible configuration values are present in this +# autogenerated file. +# +# All configuration values have a default; values that are commented out +# serve to show the default. + +import os + +# If extensions (or modules to document with autodoc) are in another directory, +# add these directories to sys.path here. If the directory is relative to the +# documentation root, use os.path.abspath to make it absolute, like shown here. +#sys.path.insert(0, os.path.abspath('.')) + +# -- General configuration ------------------------------------------------ + +# If your documentation needs a minimal Sphinx version, state it here. +#needs_sphinx = '1.0' + +# Add any Sphinx extension module names here, as strings. They can be +# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom +# ones. +extensions = [ + 'sphinx.ext.autodoc', + 'sphinx.ext.doctest', + 'sphinx.ext.intersphinx', + 'sphinx.ext.viewcode', + 'oslosphinx' +] + +# Add any paths that contain templates here, relative to this directory. +templates_path = ['_templates'] + +# The suffix of source filenames. +source_suffix = '.rst' + +# The encoding of source files. +#source_encoding = 'utf-8-sig' + +# The master toctree document. +master_doc = 'index' + +# General information about the project. +project = 'python-senlinclient' +copyright = '2015, OpenStack' + +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the +# built documents. +# +# The short X.Y version. +version = '0.1.0' +# The full version, including alpha/beta/rc tags. +release = '0.1.0' + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +#language = None + +# There are two options for replacing |today|: either, you set today to some +# non-false value, then it is used: +#today = '' +# Else, today_fmt is used as the format for a strftime call. +#today_fmt = '%B %d, %Y' + +# List of patterns, relative to source directory, that match files and +# directories to ignore when looking for source files. +exclude_patterns = [] + +# The reST default role (used for this markup: `text`) to use for all +# documents. +#default_role = None + +# If true, '()' will be appended to :func: etc. cross-reference text. +#add_function_parentheses = True + +# If true, the current module name will be prepended to all description +# unit titles (such as .. function::). +#add_module_names = True + +# If true, sectionauthor and moduleauthor directives will be shown in the +# output. They are ignored by default. +#show_authors = False + +# The name of the Pygments (syntax highlighting) style to use. +pygments_style = 'sphinx' + +# A list of ignored prefixes for module index sorting. +#modindex_common_prefix = [] + +primary_domain = 'py' +nitpicky = False + +# If true, keep warnings as "system message" paragraphs in the built documents. +#keep_warnings = False + + +# -- Options for HTML output ---------------------------------------------- + +# The theme to use for HTML and HTML Help pages. See the documentation for +# a list of builtin themes. +html_theme = 'default' + +# Theme options are theme-specific and customize the look and feel of a theme +# further. For a list of options available for each theme, see the +# documentation. +#html_theme_options = {} + +# Add any paths that contain custom themes here, relative to this directory. +#html_theme_path = [] + +# The name for this set of Sphinx documents. If None, it defaults to +# " v documentation". +#html_title = None + +# A shorter title for the navigation bar. Default is the same as html_title. +#html_short_title = None + +# The name of an image file (relative to this directory) to place at the top +# of the sidebar. +#html_logo = None + +# The name of an image file (within the static path) to use as favicon of the +# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 +# pixels large. +#html_favicon = None + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ['_static'] + +# Add any extra paths that contain custom files (such as robots.txt or +# .htaccess) here, relative to this directory. These files are copied +# directly to the root of the documentation. +#html_extra_path = [] + +# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, +# using the given strftime format. +#html_last_updated_fmt = '%b %d, %Y' +git_cmd = "git log --pretty=format:'%ad, commit %h' --date=local -n1" +html_last_updated_fmt = os.popen(git_cmd).read() + +# If true, SmartyPants will be used to convert quotes and dashes to +# typographically correct entities. +#html_use_smartypants = True + +# Custom sidebar templates, maps document names to template names. +#html_sidebars = {} + +# Additional templates that should be rendered to pages, maps page names to +# template names. +#html_additional_pages = {} + +# If false, no module index is generated. +#html_domain_indices = True + +# If false, no index is generated. +#html_use_index = True + +# If true, the index is split into individual pages for each letter. +#html_split_index = False + +# If true, links to the reST sources are added to the pages. +#html_show_sourcelink = True + +# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. +#html_show_sphinx = True + +# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. +#html_show_copyright = True + +# If true, an OpenSearch description file will be output, and all pages will +# contain a tag referring to it. The value of this option must be the +# base URL from which the finished HTML is served. +#html_use_opensearch = '' + +# This is the file name suffix for HTML files (e.g. ".xhtml"). +#html_file_suffix = None + +# Output file base name for HTML help builder. +htmlhelp_basename = 'python-senlinclientdoc' + + +# -- Options for LaTeX output --------------------------------------------- + +latex_elements = { + # The paper size ('letterpaper' or 'a4paper'). + # 'papersize': 'letterpaper', + + # The font size ('10pt', '11pt' or '12pt'). + # 'pointsize': '10pt', + + # Additional stuff for the LaTeX preamble. + # 'preamble': '', +} + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, +# author, documentclass [howto, manual, or own class]). +latex_documents = [ + ('index', 'python-senlinclient.tex', + 'python-senlinclient Documentation', + 'OpenStack Foundation', 'manual'), +] + +# The name of an image file (relative to this directory) to place at the top of +# the title page. +#latex_logo = None + +# For "manual" documents, if this is true, then toplevel headings are parts, +# not chapters. +#latex_use_parts = False + +# If true, show page references after internal links. +#latex_show_pagerefs = False + +# If true, show URL addresses after external links. +#latex_show_urls = False + +# Documents to append as an appendix to all manuals. +#latex_appendices = [] + +# If false, no module index is generated. +#latex_domain_indices = True + + +# -- Options for manual page output --------------------------------------- + +# One entry per manual page. List of tuples +# (source start file, name, description, authors, manual section). +man_pages = [ + ('man/senlin', 'senlin', + u'Command line reference for Senlin', + [u'Senlin Developers'], 1) +] + +# If true, show URL addresses after external links. +#man_show_urls = False + + +# -- Options for Texinfo output ------------------------------------------- + +# Grouping the document tree into Texinfo files. List of tuples +# (source start file, target name, title, author, +# dir menu entry, description, category) +texinfo_documents = [ + ('index', 'Senlin', 'Senlin Documentation', u'Senlin Developers', + 'Senlin', 'One line description of project.', 'Miscellaneous'), +] + +# Documents to append as an appendix to all manuals. +#texinfo_appendices = [] + +# If false, no module index is generated. +#texinfo_domain_indices = True + +# How to display URL addresses: 'footnote', 'no', or 'inline'. +#texinfo_show_urls = 'footnote' + +# If true, do not generate a @detailmenu in the "Top" node's menu. +#texinfo_no_detailmenu = False + + +# -- Options for Epub output ---------------------------------------------- + +# Bibliographic Dublin Core info. +epub_title = 'python-senlinclient' +epub_author = 'Senlin Developers' +epub_publisher = 'OpenStack Foundation' +epub_copyright = '2015, OpenStack' + +# The basename for the epub file. It defaults to the project name. +#epub_basename = 'python-senlinclient' + +# The HTML theme for the epub output. Since the default themes are not +# optimized for small screen space, using the same theme for HTML and epub +# output is usually not wise. +# This defaults to 'epub', a theme designed to save visual space. +#epub_theme = 'epub' + +# The language of the text. It defaults to the language option +# or en if the language is not set. +#epub_language = '' + +# The scheme of the identifier. Typical schemes are ISBN or URL. +#epub_scheme = '' + +# The unique identifier of the text. This can be a ISBN number +# or the project homepage. +#epub_identifier = '' + +# A unique identification for the text. +#epub_uid = '' + +# A tuple containing the cover image and cover page html template filenames. +#epub_cover = () + +# A sequence of (type, uri, title) tuples for the guide element of content.opf. +#epub_guide = () + +# HTML files that should be inserted before the pages created by sphinx. +# The format is a list of tuples containing the path and title. +#epub_pre_files = [] + +# HTML files shat should be inserted after the pages created by sphinx. +# The format is a list of tuples containing the path and title. +#epub_post_files = [] + +# A list of files that should not be packed into the epub file. +epub_exclude_files = ['search.html'] + +# The depth of the table of contents in toc.ncx. +#epub_tocdepth = 3 + +# Allow duplicate toc entries. +#epub_tocdup = True + +# Choose between 'default' and 'includehidden'. +#epub_tocscope = 'default' + +# Fix unsupported image types using the PIL. +#epub_fix_images = False + +# Scale large images. +#epub_max_image_width = 0 + +# How to display URL addresses: 'footnote', 'no', or 'inline'. +#epub_show_urls = 'inline' + +# If false, no index is generated. +#epub_use_index = True + + +# Example configuration for intersphinx: refer to the Python standard library. +intersphinx_mapping = {'http://docs.python.org/': None} diff --git a/doc/source/index.rst b/doc/source/index.rst new file mode 100644 index 00000000..1558c90a --- /dev/null +++ b/doc/source/index.rst @@ -0,0 +1,22 @@ +.. python-senlinclient documentation master file, created by + sphinx-quickstart on Sat Mar 21 08:52:42 2015. + You can adapt this file completely to your liking, but it should at least + contain the root `toctree` directive. + +Welcome to python-senlinclient's documentation! +=============================================== + +Contents: + +.. toctree:: + :maxdepth: 2 + + + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`modindex` +* :ref:`search` + diff --git a/doc/source/man/senlin.rst b/doc/source/man/senlin.rst new file mode 100644 index 00000000..ca515c62 --- /dev/null +++ b/doc/source/man/senlin.rst @@ -0,0 +1,80 @@ +====== +senlin +====== + +.. program:: senlin + +SYNOPSIS +======== + + `senlin` [options] [command-options] + + `senlin help` + + `senlin help` + + +DESCRIPTION +=========== + +`senlin` is a command line client for controlling OpenStack Senlin. + +Before the `senlin` command is issued, ensure the environment contains +the necessary variables so that the CLI can pass user credentials to +the server. +See `Getting Credentials for a CLI` section of `OpenStack CLI Guide` +for more info. + + +OPTIONS +======= + +To get a list of available commands and options run:: + + senlin help + +To get usage and options of a command run:: + + senlin help + + +EXAMPLES +======== + +Get information about profile-create command:: + + senlin help profile-create + +List available profiles:: + + senlin profile-list + +List available clusters:: + + senlin cluster-list + +Create a profile:: + + senlin profile-create -t os.heat.stack -s profile.spec myprofile + +View profile information:: + + senlin profile-show myprofile + +Create a cluster:: + + senlin cluster-create -p myprofile -n 2 mycluster + +List events:: + + senlin event-list + +Delete a cluster:: + + senlin cluster-delete mycluster + +BUGS +==== + +Senlin client is hosted in Launchpad so you can view current bugs +at https://bugs.launchpad.net/python-senlinclient/. diff --git a/python-senlinclient/locale/python-senlinclient.pot b/python-senlinclient/locale/python-senlinclient.pot new file mode 100644 index 00000000..d474dd51 --- /dev/null +++ b/python-senlinclient/locale/python-senlinclient.pot @@ -0,0 +1,815 @@ +# Translations template for python-senlinclient. +# Copyright (C) 2015 ORGANIZATION +# This file is distributed under the same license as the python-senlinclient +# project. +# FIRST AUTHOR , 2015. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: python-senlinclient 0.0.1.dev172\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2015-03-21 17:47+0800\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 1.3\n" + +#: senlinclient/cliargs.py:24 +msgid "Authentication plugin, default to env[OS_AUTH_PLUGIN]" +msgstr "" + +#: senlinclient/cliargs.py:29 +msgid "Defaults to env[OS_AUTH_URL]" +msgstr "" + +#: senlinclient/cliargs.py:34 +msgid "Defaults to env[OS_PROJECT_ID]." +msgstr "" + +#: senlinclient/cliargs.py:39 +msgid "Defaults to env[OS_PROJECT_NAME]." +msgstr "" + +#: senlinclient/cliargs.py:44 +msgid "Domain ID for scope of authorization, defaults to env[OS_DOMAIN_ID]." +msgstr "" + +#: senlinclient/cliargs.py:50 +msgid "Domain name for scope of authorization, defaults to env[OS_DOMAIN_NAME]." +msgstr "" + +#: senlinclient/cliargs.py:57 +msgid "" +"Project domain ID for scope of authorization, defaults to " +"env[OS_PROJECT_DOMAIN_ID]." +msgstr "" + +#: senlinclient/cliargs.py:64 +msgid "" +"Project domain name for scope of authorization, defaults to " +"env[OS_PROJECT_DOMAIN_NAME]." +msgstr "" + +#: senlinclient/cliargs.py:71 +msgid "" +"User domain ID for scope of authorization, defaults to " +"env[OS_USER_DOMAIN_ID]." +msgstr "" + +#: senlinclient/cliargs.py:78 +msgid "" +"User domain name for scope of authorization, defaults to " +"env[OS_USER_DOMAIN_NAME]." +msgstr "" + +#: senlinclient/cliargs.py:84 +msgid "Defaults to env[OS_USERNAME]." +msgstr "" + +#: senlinclient/cliargs.py:89 +msgid "Defaults to env[OS_USER_ID]." +msgstr "" + +#: senlinclient/cliargs.py:94 +msgid "Defaults to env[OS_PASSWORD]" +msgstr "" + +#: senlinclient/cliargs.py:99 +msgid "Defaults to env[OS_TRUST_ID]" +msgstr "" + +#: senlinclient/cliargs.py:106 +msgid "" +"Path of CA TLS certificate(s) used to verify the remote server's " +"certificate. Without this option senlin looks for the default system CA " +"certificates." +msgstr "" + +#: senlinclient/cliargs.py:113 +msgid "Verify server certificate (default)" +msgstr "" + +#: senlinclient/cliargs.py:117 +msgid "" +"Explicitly allow senlinclient to perform \"insecure SSL\" (HTTPS) " +"requests. The server's certificate will not be verified against any " +"certificate authorities. This option should be used with caution." +msgstr "" + +#: senlinclient/cliargs.py:125 +msgid "" +"A string token to bootstrap the Keystone database, defaults to " +"env[OS_TOKEN]" +msgstr "" + +#: senlinclient/cliargs.py:131 +msgid "Access info, defaults to env[OS_ACCESS_INFO]" +msgstr "" + +#: senlinclient/cliargs.py:138 +msgid "Desired API names, defaults to env[OS_API_NAME]" +msgstr "" + +#: senlinclient/cliargs.py:146 +msgid "Desired API region, defaults to env[OS_API_REGION]" +msgstr "" + +#: senlinclient/cliargs.py:153 +msgid "Desired API versions, defaults to env[OS_API_VERSION]" +msgstr "" + +#: senlinclient/cliargs.py:160 +msgid "Desired API visibility, defaults to env[OS_API_VISIBILITY]" +msgstr "" + +#: senlinclient/cliargs.py:182 +msgid "Shows the client version and exits." +msgstr "" + +#: senlinclient/cliargs.py:187 +msgid "Defaults to env[SENLINCLIENT_DEBUG]." +msgstr "" + +#: senlinclient/cliargs.py:191 +msgid "Print more verbose output." +msgstr "" + +#: senlinclient/cliargs.py:195 +msgid "" +"Number of seconds to wait for an API response, defaults to system socket " +"timeout" +msgstr "" + +#: senlinclient/cliargs.py:201 +msgid "Version number for Senlin API to use, Default to \"1\"." +msgstr "" + +#: senlinclient/shell.py:105 +msgid "" +"HMAC key to use for encrypting context data for performance profiling of " +"operation. This key should be the value of HMAC key configured in " +"osprofiler middleware in senlin, it is specified in the paste deploy " +"configuration (/etc/senlin/api-paste.ini). Without the key, profiling " +"will not be triggered even if osprofiler is enabled on server side." +msgstr "" + +#: senlinclient/shell.py:134 +msgid "Display help for ." +msgstr "" + +#: senlinclient/shell.py:151 +msgid "You must provide an auth url via --os-auth-url (or env[OS_AUTH_URL])" +msgstr "" + +#: senlinclient/shell.py:157 +msgid "You must provide a user name, a user_id or a token for authentication" +msgstr "" + +#: senlinclient/shell.py:163 +msgid "" +"Both user name and user ID are specified, Senin will use user ID for " +"authentication" +msgstr "" + +#: senlinclient/shell.py:165 senlinclient/shell.py:198 +#, python-format +msgid "WARNING: %s" +msgstr "" + +#: senlinclient/shell.py:169 +msgid "" +"Either user domain ID (--user-domain-id / env[OS_USER_DOMAIN_ID]) or user" +" domain name (--user-domain-name / env[OS_USER_DOMAIN_NAME must be " +"specified, because user name may not be unique." +msgstr "" + +#: senlinclient/shell.py:178 +#, python-format +msgid "You must provide a password for user %s" +msgstr "" + +#: senlinclient/shell.py:185 +msgid "" +"Either project ID or project name must be specified, or else Senlin " +"cannot know which project to use." +msgstr "" + +#: senlinclient/shell.py:189 +msgid "" +"Neither project ID nor project name is specified. Senlin will use user's " +"default project which may result in authentication error." +msgstr "" + +#: senlinclient/shell.py:192 +#, python-format +msgid "WARINING: %s" +msgstr "" + +#: senlinclient/shell.py:196 +msgid "" +"Both project name and project ID are specified, Senin will use project ID" +" for authentication" +msgstr "" + +#: senlinclient/shell.py:203 +msgid "" +"Either project domain ID (--project-domain-id / " +"env[OS_PROJECT_DOMAIN_ID]) orr project domain name (--project-domain-name" +" / env[OS_PROJECT_DOMAIN_NAME must be specified, because project name may" +" not be unique." +msgstr "" + +#: senlinclient/shell.py:240 +msgid "Type \"senlin help \" for help on a specific command." +msgstr "" + +#: senlinclient/shell.py:293 +#, python-format +msgid "Trace ID: %s" +msgstr "" + +#: senlinclient/shell.py:294 +#, python-format +msgid "" +"To display trace use next command:\n" +"osprofiler trace show --html %s " +msgstr "" + +#: senlinclient/shell.py:305 +msgid "... terminating senlin client" +msgstr "" + +#: senlinclient/common/exc.py:50 +msgid "Key \"error\" not exists" +msgstr "" + +#: senlinclient/common/exc.py:64 +#, python-format +msgid "" +"ERROR: %(message)s\n" +"%(traceback)s" +msgstr "" + +#: senlinclient/common/exc.py:68 +#, python-format +msgid "ERROR(%(code)s): %(message)s" +msgstr "" + +#: senlinclient/common/exc.py:248 +#, python-format +msgid "Unknown exception: %s" +msgstr "" + +#: senlinclient/common/exc.py:254 +#, python-format +msgid "Malformed exception record, missing field \"%s\"" +msgstr "" + +#: senlinclient/common/exc.py:255 +#, python-format +msgid "Original error record: %s" +msgstr "" + +#: senlinclient/common/utils.py:126 +#, python-format +msgid "Malformed parameter(%s). Use the key=value format." +msgstr "" + +#: senlinclient/common/utils.py:144 +#, python-format +msgid "The specified file is not a valid YAML file: %s" +msgstr "" + +#: senlinclient/common/utils.py:154 +msgid "No template found in the given spec file" +msgstr "" + +#: senlinclient/common/utils.py:182 +#, python-format +msgid "The format(%s) is unsupported." +msgstr "" + +#: senlinclient/openstack/common/cliutils.py:40 +#, python-format +msgid "Missing arguments: %s" +msgstr "" + +#: senlinclient/openstack/common/cliutils.py:158 +#, python-format +msgid "" +"Field labels list %(labels)s has different number of elements than fields" +" list %(fields)s" +msgstr "" + +#: senlinclient/v1/shell.py:45 +msgid "Profile type to get the details for." +msgstr "" + +#: senlinclient/v1/shell.py:53 +#, python-format +msgid "Profile Type not found: %s" +msgstr "" + +#: senlinclient/v1/shell.py:59 +msgid "Profile type to generate a template for." +msgstr "" + +#: senlinclient/v1/shell.py:61 senlinclient/v1/shell.py:257 +#, python-format +msgid "The template output format, one of: %s." +msgstr "" + +#: senlinclient/v1/shell.py:70 +#, python-format +msgid "Profile Type %s not found." +msgstr "" + +#: senlinclient/v1/shell.py:84 +msgid "Include soft-deleted profiles if any." +msgstr "" + +#: senlinclient/v1/shell.py:86 +msgid "Limit the number of profiles returned." +msgstr "" + +#: senlinclient/v1/shell.py:88 +msgid "Only return profiles that appear after the given ID." +msgstr "" + +#: senlinclient/v1/shell.py:90 senlinclient/v1/shell.py:286 +#: senlinclient/v1/shell.py:428 senlinclient/v1/shell.py:568 +#: senlinclient/v1/shell.py:868 senlinclient/v1/shell.py:1122 +msgid "Print full IDs in list." +msgstr "" + +#: senlinclient/v1/shell.py:117 senlinclient/v1/shell.py:200 +#, python-format +msgid "Profile not found: %s" +msgstr "" + +#: senlinclient/v1/shell.py:133 +msgid "Profile type used for this profile." +msgstr "" + +#: senlinclient/v1/shell.py:135 +msgid "The spec file used to create the profile." +msgstr "" + +#: senlinclient/v1/shell.py:137 senlinclient/v1/shell.py:174 +msgid "A string format permission for this profile." +msgstr "" + +#: senlinclient/v1/shell.py:139 senlinclient/v1/shell.py:176 +msgid "" +"Tag values to be attached to the profile. This can be specified multiple " +"times, or once with tags separated by a semicolon." +msgstr "" + +#: senlinclient/v1/shell.py:144 +msgid "Name of the profile to create." +msgstr "" + +#: senlinclient/v1/shell.py:163 +msgid "Name or ID of profile to show." +msgstr "" + +#: senlinclient/v1/shell.py:170 +msgid "The new name for the profile." +msgstr "" + +#: senlinclient/v1/shell.py:172 +msgid "The new spec file for the profile." +msgstr "" + +#: senlinclient/v1/shell.py:181 +msgid "Name or ID of the profile to update." +msgstr "" + +#: senlinclient/v1/shell.py:208 +msgid "Delete the profile completely from database." +msgstr "" + +#: senlinclient/v1/shell.py:210 +msgid "Name or ID of profile(s) to delete." +msgstr "" + +#: senlinclient/v1/shell.py:226 +msgid "Failed to delete any of the specified profile(s)." +msgstr "" + +#: senlinclient/v1/shell.py:241 +msgid "Policy type to get the details for." +msgstr "" + +#: senlinclient/v1/shell.py:249 +#, python-format +msgid "Policy Type not found: %s" +msgstr "" + +#: senlinclient/v1/shell.py:255 +msgid "Policy type to generate a template for." +msgstr "" + +#: senlinclient/v1/shell.py:266 +#, python-format +msgid "Policy type %s not found." +msgstr "" + +#: senlinclient/v1/shell.py:280 +msgid "Include soft-deleted policies if any." +msgstr "" + +#: senlinclient/v1/shell.py:282 +msgid "Limit the number of policies returned." +msgstr "" + +#: senlinclient/v1/shell.py:284 +msgid "Only return policies that appear after the given ID." +msgstr "" + +#: senlinclient/v1/shell.py:314 +#, python-format +msgid "Policy not found: %s" +msgstr "" + +#: senlinclient/v1/shell.py:324 +msgid "Policy type used for this policy." +msgstr "" + +#: senlinclient/v1/shell.py:326 +msgid "The spec file used to create the policy." +msgstr "" + +#: senlinclient/v1/shell.py:328 senlinclient/v1/shell.py:358 +msgid "" +"An integer indicating the cooldown seconds once the policy is effected. " +"Default to 0." +msgstr "" + +#: senlinclient/v1/shell.py:331 senlinclient/v1/shell.py:361 +msgid "" +"An integer beteen 0 and 100 representing the enforcement level. Default " +"to 0." +msgstr "" + +#: senlinclient/v1/shell.py:334 +msgid "Name of the policy to create." +msgstr "" + +#: senlinclient/v1/shell.py:351 senlinclient/v1/shell.py:366 +msgid "Name of the policy to be updated." +msgstr "" + +#: senlinclient/v1/shell.py:364 +msgid "New name of the policy to be updated." +msgstr "" + +#: senlinclient/v1/shell.py:383 +msgid "Delete the policy completely from database." +msgstr "" + +#: senlinclient/v1/shell.py:385 +msgid "Name or ID of policy(s) to delete." +msgstr "" + +#: senlinclient/v1/shell.py:401 +msgid "Failed to delete any of the specified policy(s)." +msgstr "" + +#: senlinclient/v1/shell.py:410 +msgid "Include soft-deleted clusters if any." +msgstr "" + +#: senlinclient/v1/shell.py:412 +msgid "Include nested clusters if any." +msgstr "" + +#: senlinclient/v1/shell.py:414 +msgid "" +"Filter parameters to apply on returned clusters. This can be specified " +"multiple times, or once with parameters separated by a semicolon." +msgstr "" + +#: senlinclient/v1/shell.py:419 senlinclient/v1/shell.py:687 +#: senlinclient/v1/shell.py:856 senlinclient/v1/shell.py:1058 +#: senlinclient/v1/shell.py:1112 +msgid "Name of keys used for sorting the returned events." +msgstr "" + +#: senlinclient/v1/shell.py:421 senlinclient/v1/shell.py:689 +#: senlinclient/v1/shell.py:858 senlinclient/v1/shell.py:1060 +#: senlinclient/v1/shell.py:1114 +msgid "Direction for sorting, where DIR can be \"asc\" or \"desc\"." +msgstr "" + +#: senlinclient/v1/shell.py:423 +msgid "Limit the number of clusters returned." +msgstr "" + +#: senlinclient/v1/shell.py:425 +msgid "Only return clusters that appear after the given cluster ID." +msgstr "" + +#: senlinclient/v1/shell.py:459 +#, python-format +msgid "Cluster %s is not found" +msgstr "" + +#: senlinclient/v1/shell.py:469 +msgid "Profile Id used for this cluster." +msgstr "" + +#: senlinclient/v1/shell.py:471 +msgid "Initial size of the cluster. Default to 0." +msgstr "" + +#: senlinclient/v1/shell.py:473 +msgid "ID of the parent cluster, if exists." +msgstr "" + +#: senlinclient/v1/shell.py:475 +msgid "Cluster creation timeout in minutes." +msgstr "" + +#: senlinclient/v1/shell.py:477 senlinclient/v1/shell.py:525 +#: senlinclient/v1/shell.py:935 +msgid "" +"Tag values to be attached to the cluster. This can be specified multiple " +"times, or once with tags separated by a semicolon." +msgstr "" + +#: senlinclient/v1/shell.py:482 +msgid "Name of the cluster to create." +msgstr "" + +#: senlinclient/v1/shell.py:499 +msgid "Name or ID of cluster(s) to delete." +msgstr "" + +#: senlinclient/v1/shell.py:512 +msgid "Failed to delete any of the specified clusters." +msgstr "" + +#: senlinclient/v1/shell.py:519 senlinclient/v1/shell.py:984 +msgid "ID of new profile to use." +msgstr "" + +#: senlinclient/v1/shell.py:521 +msgid "New timeout (in minutes) value for the cluster." +msgstr "" + +#: senlinclient/v1/shell.py:523 +msgid "ID of parent cluster for the cluster." +msgstr "" + +#: senlinclient/v1/shell.py:530 +msgid "New name for the cluster to update." +msgstr "" + +#: senlinclient/v1/shell.py:532 +msgid "Name or ID of cluster to be updated." +msgstr "" + +#: senlinclient/v1/shell.py:550 +msgid "Name or ID of cluster to show." +msgstr "" + +#: senlinclient/v1/shell.py:557 senlinclient/v1/shell.py:849 +#: senlinclient/v1/shell.py:1120 +msgid "Include soft-deleted nodes if any." +msgstr "" + +#: senlinclient/v1/shell.py:559 senlinclient/v1/shell.py:851 +msgid "" +"Filter parameters to apply on returned nodes. This can be specified " +"multiple times, or once with parameters separated by a semicolon." +msgstr "" + +#: senlinclient/v1/shell.py:564 senlinclient/v1/shell.py:860 +#: senlinclient/v1/shell.py:1116 +msgid "Limit the number of nodes returned." +msgstr "" + +#: senlinclient/v1/shell.py:566 senlinclient/v1/shell.py:862 +#: senlinclient/v1/shell.py:1118 +msgid "Only return nodes that appear after the given node ID." +msgstr "" + +#: senlinclient/v1/shell.py:570 +msgid "Name or ID of cluster to nodes from." +msgstr "" + +#: senlinclient/v1/shell.py:590 +msgid "No node matching criteria is found" +msgstr "" + +#: senlinclient/v1/shell.py:606 +msgid "ID of nodes to be added; multiple nodes can be separated with \",\"" +msgstr "" + +#: senlinclient/v1/shell.py:609 senlinclient/v1/shell.py:628 +#: senlinclient/v1/shell.py:646 senlinclient/v1/shell.py:664 +#: senlinclient/v1/shell.py:740 senlinclient/v1/shell.py:762 +#: senlinclient/v1/shell.py:790 senlinclient/v1/shell.py:812 +#: senlinclient/v1/shell.py:829 +msgid "Name or ID of cluster to operate on." +msgstr "" + +#: senlinclient/v1/shell.py:625 +msgid "ID of nodes to be deleted; multiple nodes can be separatedwith \",\"." +msgstr "" + +#: senlinclient/v1/shell.py:644 senlinclient/v1/shell.py:662 +msgid "Number of nodes to be added." +msgstr "" + +#: senlinclient/v1/shell.py:682 +msgid "" +"Filter parameters to apply on returned results. This can be specified " +"multiple times, or once with parameters separated by a semicolon." +msgstr "" + +#: senlinclient/v1/shell.py:691 +msgid "Name or ID of cluster to query on." +msgstr "" + +#: senlinclient/v1/shell.py:711 +msgid "ID or name of the policy to query on." +msgstr "" + +#: senlinclient/v1/shell.py:713 +msgid "ID or name of the cluster to query on." +msgstr "" + +#: senlinclient/v1/shell.py:725 +msgid "ID or name of policy to be attached." +msgstr "" + +#: senlinclient/v1/shell.py:727 senlinclient/v1/shell.py:780 +msgid "" +"An integer specifying the relative priority among all policies attached " +"to a cluster. The lower the value, the higher the priority. Default is " +"50." +msgstr "" + +#: senlinclient/v1/shell.py:731 +msgid "" +"An integer beteen 0 and 100 representing the enforcement level. Default " +"to enforcement level of policy." +msgstr "" + +#: senlinclient/v1/shell.py:734 +msgid "" +"An integer indicating the cooldown seconds once the policy is effected. " +"Default to cooldown of policy." +msgstr "" + +#: senlinclient/v1/shell.py:737 +msgid "Whether the policy should be enabled once attached. Default to enabled." +msgstr "" + +#: senlinclient/v1/shell.py:760 +msgid "ID or name of policy to be detached." +msgstr "" + +#: senlinclient/v1/shell.py:778 +msgid "ID or name of policy to be updated." +msgstr "" + +#: senlinclient/v1/shell.py:784 +msgid "New enforcement level." +msgstr "" + +#: senlinclient/v1/shell.py:786 +msgid "Cooldown interval in seconds." +msgstr "" + +#: senlinclient/v1/shell.py:788 +msgid "Whether the policy should be enabled." +msgstr "" + +#: senlinclient/v1/shell.py:810 +msgid "ID or name of policy to be enabled." +msgstr "" + +#: senlinclient/v1/shell.py:827 +msgid "ID or name of policy to be disabled." +msgstr "" + +#: senlinclient/v1/shell.py:847 +msgid "ID or name of cluster for nodes to list." +msgstr "" + +#: senlinclient/v1/shell.py:864 +msgid "" +"Indicate that this node list should include nodes from all tenants. This " +"option is subject to access policy checking. Default is False." +msgstr "" + +#: senlinclient/v1/shell.py:917 +#, python-format +msgid "Node %s is not found" +msgstr "" + +#: senlinclient/v1/shell.py:929 +msgid "Profile Id used for this node." +msgstr "" + +#: senlinclient/v1/shell.py:931 +msgid "Cluster Id for this node." +msgstr "" + +#: senlinclient/v1/shell.py:933 senlinclient/v1/shell.py:986 +msgid "Role for this node in the specific cluster." +msgstr "" + +#: senlinclient/v1/shell.py:940 +msgid "Name of the node to create." +msgstr "" + +#: senlinclient/v1/shell.py:956 +msgid "Name or ID of the node to show the details for." +msgstr "" + +#: senlinclient/v1/shell.py:963 +msgid "Name or ID of node(s) to delete." +msgstr "" + +#: senlinclient/v1/shell.py:976 +msgid "Failed to delete any of the specified nodes." +msgstr "" + +#: senlinclient/v1/shell.py:982 +msgid "New name for the node." +msgstr "" + +#: senlinclient/v1/shell.py:988 +msgid "" +"Tag values to be attached to the node. This can be specified multiple " +"times, or once with tags separated by a semicolon." +msgstr "" + +#: senlinclient/v1/shell.py:993 +msgid "Name or ID of node to update." +msgstr "" + +#: senlinclient/v1/shell.py:1000 +#, python-format +msgid "Node not found: %s" +msgstr "" + +#: senlinclient/v1/shell.py:1015 +msgid "ID or name of cluster for node to join." +msgstr "" + +#: senlinclient/v1/shell.py:1017 senlinclient/v1/shell.py:1033 +msgid "Name or ID of node to operate on." +msgstr "" + +#: senlinclient/v1/shell.py:1049 +msgid "" +"Filter parameters to apply on returned events. This can be specified " +"multiple times, or once with parameters separated by a semicolon." +msgstr "" + +#: senlinclient/v1/shell.py:1054 +msgid "Limit the number of events returned." +msgstr "" + +#: senlinclient/v1/shell.py:1056 +msgid "Only return events that appear after the given event ID." +msgstr "" + +#: senlinclient/v1/shell.py:1062 +msgid "" +"Whether events from all projects(tenants) should be listed. Default to " +"False. Setting this to True may demand for an admin privilege." +msgstr "" + +#: senlinclient/v1/shell.py:1066 +msgid "Whether deleted events should be listed as well. Default to False." +msgstr "" + +#: senlinclient/v1/shell.py:1091 +msgid "ID of event to display details for." +msgstr "" + +#: senlinclient/v1/shell.py:1107 +msgid "" +"Filter parameters to apply on returned actions. This can be specified " +"multiple times, or once with parameters separated by a semicolon." +msgstr "" + +#: senlinclient/v1/shell.py:1157 +msgid "Name or ID of the action to show the details for." +msgstr "" + +#: senlinclient/v1/shell.py:1164 +#, python-format +msgid "Action %(id)s is not found" +msgstr "" + diff --git a/requirements.txt b/requirements.txt index 6a92af3b..02a5ac68 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,9 +7,9 @@ pbr>=0.6,!=0.7,<1.0 argparse iso8601>=0.1.9 PrettyTable>=0.7,<0.8 -oslo.i18n>=1.3.0 # Apache-2.0 -oslo.serialization>=1.0.0 # Apache-2.0 -oslo.utils>=1.2.0 # Apache-2.0 +oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0 +oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0 +oslo.utils>=1.4.0,<1.5.0 # Apache-2.0 python-openstacksdk>=0.2.1 python-keystoneclient>=0.11.1 python-heatclient>=0.2.11 diff --git a/senlinclient/common/exc.py b/senlinclient/common/exc.py index 2cc69907..3b317521 100644 --- a/senlinclient/common/exc.py +++ b/senlinclient/common/exc.py @@ -227,6 +227,7 @@ _EXCEPTION_MAP = { def parse_exception(exc): '''Parse exception code and yield useful information. + :param details: details of the exception. ''' if isinstance(exc, sdkexc.HttpException): diff --git a/senlinclient/tests/__init__.py b/senlinclient/tests/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/senlinclient/tests/test_utils.py b/senlinclient/tests/test_utils.py new file mode 100644 index 00000000..91d66649 --- /dev/null +++ b/senlinclient/tests/test_utils.py @@ -0,0 +1,21 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +# from senlinclient.common import exc +from senlinclient.common import utils +import testtools + + +class shellTest(testtools.TestCase): + + def test_format_parameter_none(self): + self.assertEqual({}, utils.format_parameters(None)) diff --git a/senlinclient/v1/client.py b/senlinclient/v1/client.py index ca867f4d..5d26fb6c 100644 --- a/senlinclient/v1/client.py +++ b/senlinclient/v1/client.py @@ -28,10 +28,8 @@ class Client(object): return json.loads(options) def transport(self, opts): - '''Create a transport given some options. - E.g. - https://region-a.geo-1.identity.hpcloudsvc.com:35357/ - ''' + '''Create a transport given some options.''' + argument = opts.argument xport = trans.Transport(verify=opts.verify) return xport.get(argument).text diff --git a/senlinclient/v1/shell.py b/senlinclient/v1/shell.py index 16aede58..ec1b3ad3 100644 --- a/senlinclient/v1/shell.py +++ b/senlinclient/v1/shell.py @@ -32,7 +32,7 @@ def do_build_info(sc, args): utils.print_dict(result, formatters=formatters) -#### PROFILE TYPES +# PROFILE TYPES def do_profile_type_list(sc, args): @@ -77,7 +77,7 @@ def do_profile_type_schema(sc, args): print(utils.format_output(schema)) -#### PROFILES +# PROFILES @utils.arg('-d', '--show-deleted', default=False, action="store_true", @@ -137,8 +137,8 @@ def _show_profile(sc, profile_id): help=_('A string format permission for this profile.')) @utils.arg('-g', '--tags', metavar='', help=_('Tag values to be attached to the profile. ' - 'This can be specified multiple times, or once with tags' - 'separated by a semicolon.'), + 'This can be specified multiple times, or once with tags ' + 'separated by a semicolon.'), action='append') @utils.arg('name', metavar='', help=_('Name of the profile to create.')) @@ -174,8 +174,8 @@ def do_profile_show(sc, args): help=_('A string format permission for this profile.')) @utils.arg('-g', '--tags', metavar='', help=_('Tag values to be attached to the profile. ' - 'This can be specified multiple times, or once with tags' - 'separated by a semicolon.'), + 'This can be specified multiple times, or once with tags ' + 'separated by a semicolon.'), action='append') @utils.arg('id', metavar='', help=_('Name or ID of the profile to update.')) @@ -228,7 +228,7 @@ def do_profile_delete(sc, args): print('Profile deleted: %s' % args.id) -#### POLICY TYPES +# POLICY TYPES def do_policy_type_list(sc, args): @@ -273,7 +273,7 @@ def do_policy_type_schema(sc, args): print(utils.format_output(schema)) -#### POLICIES +# POLICIES @utils.arg('-d', '--show-deleted', default=False, action="store_true", @@ -403,7 +403,7 @@ def do_policy_delete(sc, args): print('Policy deleted: %s' % args.id) -#### CLUSTERS +# CLUSTERS @utils.arg('-s', '--show-deleted', default=False, action="store_true", @@ -475,8 +475,8 @@ def _show_cluster(sc, cluster_id): help=_('Cluster creation timeout in minutes.')) @utils.arg('-g', '--tags', metavar='', help=_('Tag values to be attached to the cluster. ' - 'This can be specified multiple times, or once with tags' - 'separated by a semicolon.'), + 'This can be specified multiple times, or once with tags ' + 'separated by a semicolon.'), action='append') @utils.arg('name', metavar='', help=_('Name of the cluster to create.')) @@ -523,8 +523,8 @@ def do_cluster_delete(sc, args): help=_('ID of parent cluster for the cluster.')) @utils.arg('-g', '--tags', metavar='', help=_('Tag values to be attached to the cluster. ' - 'This can be specified multiple times, or once with tags' - 'separated by a semicolon.'), + 'This can be specified multiple times, or once with tags ' + 'separated by a semicolon.'), action='append') @utils.arg('-n', '--name', metavar='', help=_('New name for the cluster to update.')) @@ -840,7 +840,7 @@ def do_cluster_policy_disable(sc, args): print('Request accepted by action %s' % resp['action']) -#### NODES +# NODES @utils.arg('-c', '--cluster', default=None, @@ -933,8 +933,8 @@ def _show_node(sc, node_id): help=_('Role for this node in the specific cluster.')) @utils.arg('-g', '--tags', metavar='', help=_('Tag values to be attached to the cluster. ' - 'This can be specified multiple times, or once with tags' - 'separated by a semicolon.'), + 'This can be specified multiple times, or once with tags ' + 'separated by a semicolon.'), action='append') @utils.arg('name', metavar='', help=_('Name of the node to create.')) @@ -986,14 +986,14 @@ def do_node_delete(sc, args): help=_('Role for this node in the specific cluster.')) @utils.arg('-g', '--tags', metavar='', help=_('Tag values to be attached to the node. ' - 'This can be specified multiple times, or once with tags' - 'separated by a semicolon.'), + 'This can be specified multiple times, or once with tags ' + 'separated by a semicolon.'), action='append') @utils.arg('id', metavar='', help=_('Name or ID of node to update.')) def do_node_update(sc, args): '''Update the node.''' - # Find the node first, we need its UUID + # Find the node first, we need its UUID try: node = sc.get(models.Node, {'id': args.id}) except exc.HTTPNotFound: @@ -1042,7 +1042,7 @@ def do_node_leave(sc, args): _show_node(sc, args.id) -##### EVENTS +# EVENTS @utils.arg('-f', '--filters', metavar='', @@ -1100,7 +1100,7 @@ def do_event_show(sc, args): utils.print_dict(event.to_dict()) -#### ACTIONS +# ACTIONS @utils.arg('-f', '--filters', metavar='', diff --git a/test-requirements.txt b/test-requirements.txt index 53b07582..8cd1227d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,10 +7,11 @@ hacking>=0.8.0,<0.9 coverage>=3.6 discover fixtures>=0.3.14 +requests-mock>=0.6.0 # Apache-2.0 mock>=1.0 mox3>=0.7.0 -oslosphinx>=2.2.0 # Apache-2.0 -oslotest>=1.2.0 # Apache-2.0 +oslosphinx>=2.5.0,<2.6.0 # Apache-2.0 +oslotest>=1.5.1,<1.6.0 # Apache-2.0 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 testrepository>=0.0.18 testscenarios>=0.4