diff -pruN 0.14.0-3/debian/changelog 1.0.0-0ubuntu1/debian/changelog --- 0.14.0-3/debian/changelog 2016-04-09 17:31:24.000000000 +0000 +++ 1.0.0-0ubuntu1/debian/changelog 2017-01-24 20:49:16.000000000 +0000 @@ -1,3 +1,12 @@ +python-tempest-lib (1.0.0-0ubuntu1) zesty; urgency=medium + + * d/gbp.conf: Update gbp configuration file. + * d/control: Update Vcs-* links and maintainers. + * New upstream release. + * d/control: Align (Build-)Depends with upstream. + + -- Corey Bryant Tue, 24 Jan 2017 15:49:16 -0500 + python-tempest-lib (0.14.0-3) unstable; urgency=medium [ Ondřej Nový ] diff -pruN 0.14.0-3/debian/control 1.0.0-0ubuntu1/debian/control --- 0.14.0-3/debian/control 2016-04-09 17:31:24.000000000 +0000 +++ 1.0.0-0ubuntu1/debian/control 2017-01-24 20:49:16.000000000 +0000 @@ -1,7 +1,8 @@ Source: python-tempest-lib Section: python Priority: optional -Maintainer: PKG OpenStack +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: PKG OpenStack Uploaders: Thomas Goirand , Corey Bryant , Build-Depends: debhelper (>= 9), @@ -27,7 +28,7 @@ Build-Depends-Indep: python-babel, python-oslo.log (>= 2.0.0), python-oslosphinx (>= 2.5.0), python-oslotest (>= 1:1.10.0), - python-paramiko (>= 1.13.0), + python-paramiko (>= 1.16.0), python-six (>= 1.9.0), python-testresources, python-testscenarios, @@ -42,7 +43,7 @@ Build-Depends-Indep: python-babel, python3-os-testr (>= 0.4.2), python3-oslo.log (>= 2.0.0), python3-oslotest (>= 1:1.10.0), - python3-paramiko (>= 1.13.0), + python3-paramiko (>= 1.16.0), python3-six (>= 1.9.0), python3-subunit, python3-testscenarios, @@ -50,8 +51,8 @@ Build-Depends-Indep: python-babel, subunit, testrepository, Standards-Version: 3.9.8 -Vcs-Browser: https://git.openstack.org/cgit/openstack/deb-python-tempest-lib?h=debian%2Fnewton -Vcs-Git: https://git.openstack.org/openstack/deb-python-tempest-lib -b debian/newton +Vcs-Browser: https://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/python-tempest-lib +Vcs-Git: git://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/python-tempest-lib Homepage: http://www.openstack.org/ Package: python-tempest-lib diff -pruN 0.14.0-3/debian/gbp.conf 1.0.0-0ubuntu1/debian/gbp.conf --- 0.14.0-3/debian/gbp.conf 2016-04-09 17:31:24.000000000 +0000 +++ 1.0.0-0ubuntu1/debian/gbp.conf 2017-01-24 20:49:16.000000000 +0000 @@ -1,9 +1,7 @@ [DEFAULT] -upstream-branch = master -debian-branch = debian/newton +debian-branch = master upstream-tag = %(version)s -compression = xz +pristine-tar = True [buildpackage] -export-dir = ../build-area/ - +export-dir = ../build-area diff -pruN 0.14.0-3/.gitignore 1.0.0-0ubuntu1/.gitignore --- 0.14.0-3/.gitignore 2016-02-05 04:46:45.000000000 +0000 +++ 1.0.0-0ubuntu1/.gitignore 2016-02-26 15:30:34.000000000 +0000 @@ -43,6 +43,7 @@ output/*/index.html # Sphinx doc/build +releasenotes/build # pbr generates these AUTHORS diff -pruN 0.14.0-3/README.rst 1.0.0-0ubuntu1/README.rst --- 0.14.0-3/README.rst 2016-02-05 04:46:45.000000000 +0000 +++ 1.0.0-0ubuntu1/README.rst 2016-02-26 15:30:34.000000000 +0000 @@ -12,6 +12,12 @@ OpenStack Functional Testing Library tempest-lib is a library of common functionality that was originally in tempest (or similar in scope to tempest) +**As of the 1.0.0 release tempest-lib as a separate repository and project is +deprecated. The library now exists as part of the tempest project, all future +development will occur there. To use the library for future releases update +your imports from tempest_lib to tempest.lib, and add tempest>=10 to your +project requirements** + Features -------- diff -pruN 0.14.0-3/releasenotes/notes/tempest-lib-deprecation-3ec1ece17a8db9c5.yaml 1.0.0-0ubuntu1/releasenotes/notes/tempest-lib-deprecation-3ec1ece17a8db9c5.yaml --- 0.14.0-3/releasenotes/notes/tempest-lib-deprecation-3ec1ece17a8db9c5.yaml 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.0-0ubuntu1/releasenotes/notes/tempest-lib-deprecation-3ec1ece17a8db9c5.yaml 2016-02-26 15:30:34.000000000 +0000 @@ -0,0 +1,13 @@ +--- +prelude: > + Starting with tempest-lib 1.0.0 the tempest-lib development has moved + back into the tempest repository. After this release to get future + code updates to tempest-lib code you need change your requirements + to require tempest instead of tempest-lib and update your tepmest_lib + imports to use tempest.lib instead. +deprecations: + - Tempest-lib itself is deprecated. Development of the tempest library + interface will occur in tempest in the future. +critical: + - The 1.0.0 release is the last planned release for tempes-lib. All future + development for the library interface will occur in tempest in the future. diff -pruN 0.14.0-3/releasenotes/source/conf.py 1.0.0-0ubuntu1/releasenotes/source/conf.py --- 0.14.0-3/releasenotes/source/conf.py 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.0-0ubuntu1/releasenotes/source/conf.py 2016-02-26 15:30:34.000000000 +0000 @@ -0,0 +1,261 @@ +# -*- coding: utf-8 -*- +# +# tempest-lib Release Notes documentation build configuration file, created by +# sphinx-quickstart on Thu Nov 5 11:50:32 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. + +# 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 = [ + 'oslosphinx', + 'reno.sphinxext', +] + +# 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 = u'tempest-lib Release Notes' +copyright = u'2016, tempest-lib Developers' + +# 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. +# +from pbr import version + +# The full version, including alpha/beta/rc tags. +release = version.VersionInfo('tempest_lib').version_string_with_vcs() +# The short X.Y version. +version = version.VersionInfo('tempest_lib').canonical_version_string() + + +# 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 = [] + +# 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' + +# 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 = 'tempest-libReleaseNotesdoc' + + +# -- 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', 'tempest-libReleaseNotes.tex', u'tempest-lib Release Notes ' + 'Documentation', u'tempest-lib Developers', '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 = [ + ('index', 'novareleasenotes', u'tempest-lib Release Notes Documentation', + [u'tempest-lib 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', 'tempest-libReleaseNotes', u'tempest-lib Release Notes Documentation', + u'tempest-lib developers', 'tempest-libReleaseNotes', '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 diff -pruN 0.14.0-3/releasenotes/source/index.rst 1.0.0-0ubuntu1/releasenotes/source/index.rst --- 0.14.0-3/releasenotes/source/index.rst 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.0-0ubuntu1/releasenotes/source/index.rst 2016-02-26 15:30:34.000000000 +0000 @@ -0,0 +1,17 @@ +Welcome to tempest-lib Release Notes documentation! +=================================================== + +Contents +======== + +.. toctree:: + :maxdepth: 2 + + unreleased + + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`search` diff -pruN 0.14.0-3/releasenotes/source/unreleased.rst 1.0.0-0ubuntu1/releasenotes/source/unreleased.rst --- 0.14.0-3/releasenotes/source/unreleased.rst 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.0-0ubuntu1/releasenotes/source/unreleased.rst 2016-02-26 15:30:34.000000000 +0000 @@ -0,0 +1,5 @@ +============================ +Current Series Release Notes +============================ + +.. release-notes:: diff -pruN 0.14.0-3/requirements.txt 1.0.0-0ubuntu1/requirements.txt --- 0.14.0-3/requirements.txt 2016-02-05 04:46:45.000000000 +0000 +++ 1.0.0-0ubuntu1/requirements.txt 2016-02-26 15:30:34.000000000 +0000 @@ -7,7 +7,7 @@ fixtures>=1.3.1 # Apache-2.0/BSD iso8601>=0.1.9 # MIT jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT httplib2>=0.7.5 # MIT -paramiko>=1.13.0 # LGPL +paramiko>=1.16.0 # LGPL six>=1.9.0 # MIT oslo.log>=1.14.0 # Apache-2.0 os-testr>=0.4.1 # Apache-2.0 diff -pruN 0.14.0-3/tempest_lib/api_schema/response/compute/v2_1/servers.py 1.0.0-0ubuntu1/tempest_lib/api_schema/response/compute/v2_1/servers.py --- 0.14.0-3/tempest_lib/api_schema/response/compute/v2_1/servers.py 2016-02-05 04:46:45.000000000 +0000 +++ 1.0.0-0ubuntu1/tempest_lib/api_schema/response/compute/v2_1/servers.py 2016-02-26 15:30:34.000000000 +0000 @@ -547,3 +547,7 @@ server_actions_delete_password = { server_actions_confirm_resize = copy.deepcopy( server_actions_delete_password) + +update_attached_volume = { + 'status_code': [202] +} diff -pruN 0.14.0-3/tempest_lib/__init__.py 1.0.0-0ubuntu1/tempest_lib/__init__.py --- 0.14.0-3/tempest_lib/__init__.py 2016-02-05 04:46:45.000000000 +0000 +++ 1.0.0-0ubuntu1/tempest_lib/__init__.py 2016-02-26 15:30:34.000000000 +0000 @@ -12,8 +12,19 @@ # License for the specific language governing permissions and limitations # under the License. -import pbr.version +import warnings +import pbr.version __version__ = pbr.version.VersionInfo( 'tempest_lib').version_string() + +# Emit a warning for tempest-lib deprecation. We want the warning to +# be displayed only once. +warnings.simplefilter('once', category=DeprecationWarning) +warnings.warn( + 'tempest-lib is deprecated for future bug-fixes and code changes in favor ' + 'of tempest. Please change your imports from tempest_lib to tempest.lib', + DeprecationWarning) +# And back to normal! +warnings.resetwarnings() diff -pruN 0.14.0-3/tempest_lib/services/compute/servers_client.py 1.0.0-0ubuntu1/tempest_lib/services/compute/servers_client.py --- 0.14.0-3/tempest_lib/services/compute/servers_client.py 2016-02-05 04:46:45.000000000 +0000 +++ 1.0.0-0ubuntu1/tempest_lib/services/compute/servers_client.py 2016-02-26 15:30:34.000000000 +0000 @@ -312,6 +312,15 @@ class ServersClient(rest_client.RestClie self.validate_response(schema.attach_volume, resp, body) return rest_client.ResponseBody(resp, body) + def update_attached_volume(self, server_id, attachment_id, **kwargs): + """Swaps a volume attached to an instance for another volume""" + post_body = json.dumps({'volumeAttachment': kwargs}) + resp, body = self.put('servers/%s/os-volume_attachments/%s' % + (server_id, attachment_id), + post_body) + self.validate_response(schema.update_attached_volume, resp, body) + return rest_client.ResponseBody(resp, body) + def detach_volume(self, server_id, volume_id): # noqa """Detaches a volume from a server instance.""" resp, body = self.delete('servers/%s/os-volume_attachments/%s' % diff -pruN 0.14.0-3/tempest_lib/services/identity/v3/token_client.py 1.0.0-0ubuntu1/tempest_lib/services/identity/v3/token_client.py --- 0.14.0-3/tempest_lib/services/identity/v3/token_client.py 2016-02-05 04:46:45.000000000 +0000 +++ 1.0.0-0ubuntu1/tempest_lib/services/identity/v3/token_client.py 2016-02-26 15:30:34.000000000 +0000 @@ -105,10 +105,10 @@ class V3TokenClient(rest_client.RestClie elif project_name: _project['name'] = project_name - if project_domain_id is not None: - _project['domain'] = {'id': project_domain_id} - elif project_domain_name is not None: - _project['domain'] = {'name': project_domain_name} + if project_domain_id is not None: + _project['domain'] = {'id': project_domain_id} + elif project_domain_name is not None: + _project['domain'] = {'name': project_domain_name} creds['auth']['scope'] = dict(project=_project) elif domain_id: diff -pruN 0.14.0-3/tempest_lib/tests/cli/test_execute.py 1.0.0-0ubuntu1/tempest_lib/tests/cli/test_execute.py --- 0.14.0-3/tempest_lib/tests/cli/test_execute.py 2016-02-05 04:46:45.000000000 +0000 +++ 1.0.0-0ubuntu1/tempest_lib/tests/cli/test_execute.py 2016-02-26 15:30:34.000000000 +0000 @@ -13,6 +13,7 @@ from tempest_lib.cli import base as cli_base +from tempest_lib import exceptions from tempest_lib.tests import base @@ -29,3 +30,8 @@ class TestExecute(base.TestCase): fail_ok=True) self.assertIsInstance(result, str) self.assertIn("--foobar", result) + + def test_execute_failure_raise_exception(self): + self.assertRaises(exceptions.CommandFailed, cli_base.execute, + "/bin/ls", action="tempest_lib", flags="--foobar", + merge_stderr=True) diff -pruN 0.14.0-3/tempest_lib/tests/services/compute/test_servers_client.py 1.0.0-0ubuntu1/tempest_lib/tests/services/compute/test_servers_client.py --- 0.14.0-3/tempest_lib/tests/services/compute/test_servers_client.py 2016-02-05 04:46:45.000000000 +0000 +++ 1.0.0-0ubuntu1/tempest_lib/tests/services/compute/test_servers_client.py 2016-02-26 15:30:34.000000000 +0000 @@ -564,6 +564,17 @@ class TestServersClient(base.BaseCompute server_id=self.server_id ) + def test_update_attached_volume(self): + self.check_service_client_function( + self.client.update_attached_volume, + 'tempest_lib.common.rest_client.RestClient.put', + {}, + status=202, + server_id=self.server_id, + attachment_id='fake-attachment-id', + volumeId='fake-volume-id' + ) + def test_detach_volume_with_str_body(self): self._test_detach_volume_server() diff -pruN 0.14.0-3/tempest_lib/tests/services/identity/v3/test_token_client.py 1.0.0-0ubuntu1/tempest_lib/tests/services/identity/v3/test_token_client.py --- 0.14.0-3/tempest_lib/tests/services/identity/v3/test_token_client.py 2016-02-05 04:46:45.000000000 +0000 +++ 1.0.0-0ubuntu1/tempest_lib/tests/services/identity/v3/test_token_client.py 2016-02-26 15:30:34.000000000 +0000 @@ -57,6 +57,44 @@ class TestTokenClientV2(base.TestCase): post_mock.mock.assert_called_once_with('fake_url/auth/tokens', body=req_dict) + def test_auth_with_project_id_and_domain_id(self): + token_client_v3 = token_client.V3TokenClient('fake_url') + post_mock = self.useFixture(mockpatch.PatchObject( + token_client_v3, 'post', return_value=self.fake_201_http.request( + 'fake_url', body={'access': {'token': 'fake_token'}}))) + resp = token_client_v3.auth( + username='fake_user', password='fake_pass', + project_id='fcac2a055a294e4c82d0a9c21c620eb4', + user_domain_id='14f4a9a99973404d8c20ba1d2af163ff', + project_domain_id='291f63ae9ac54ee292ca09e5f72d9676') + self.assertIsInstance(resp, rest_client.ResponseBody) + req_dict = json.dumps({ + 'auth': { + 'identity': { + 'methods': ['password'], + 'password': { + 'user': { + 'name': 'fake_user', + 'password': 'fake_pass', + 'domain': { + 'id': '14f4a9a99973404d8c20ba1d2af163ff' + } + } + } + }, + 'scope': { + 'project': { + 'id': 'fcac2a055a294e4c82d0a9c21c620eb4', + 'domain': { + 'id': '291f63ae9ac54ee292ca09e5f72d9676' + } + } + } + } + }, sort_keys=True) + post_mock.mock.assert_called_once_with('fake_url/auth/tokens', + body=req_dict) + def test_auth_with_tenant(self): token_client_v2 = token_client.V3TokenClient('fake_url') post_mock = self.useFixture(mockpatch.PatchObject( diff -pruN 0.14.0-3/test-requirements.txt 1.0.0-0ubuntu1/test-requirements.txt --- 0.14.0-3/test-requirements.txt 2016-02-05 04:46:45.000000000 +0000 +++ 1.0.0-0ubuntu1/test-requirements.txt 2016-02-26 15:30:34.000000000 +0000 @@ -15,3 +15,4 @@ testscenarios>=0.4 # Apache-2.0/BSD testtools>=1.4.0 # MIT mock>=1.2 # BSD ddt>=1.0.1 # MIT +reno>=0.1.1 # Apache2 diff -pruN 0.14.0-3/tox.ini 1.0.0-0ubuntu1/tox.ini --- 0.14.0-3/tox.ini 2016-02-05 04:46:45.000000000 +0000 +++ 1.0.0-0ubuntu1/tox.ini 2016-02-26 15:30:34.000000000 +0000 @@ -33,4 +33,7 @@ commands = python setup.py build_sphinx show-source = True ignore = E125,E123,E129 builtins = _ -exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build +exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,releasenotes + +[testenv:releasenotes] +commands = sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html