Hello community, here is the log from the commit of package python-oslo.vmware for openSUSE:Factory checked in at 2020-02-18 10:41:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oslo.vmware (Old) and /work/SRC/openSUSE:Factory/.python-oslo.vmware.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.vmware" Tue Feb 18 10:41:53 2020 rev:15 rq:774925 version:2.34.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-oslo.vmware/python-oslo.vmware.changes 2019-05-03 22:42:57.987309665 +0200 +++ /work/SRC/openSUSE:Factory/.python-oslo.vmware.new.26092/python-oslo.vmware.changes 2020-02-18 10:42:08.305156660 +0100 @@ -1,0 +2,23 @@ +Wed Oct 9 12:30:36 UTC 2019 - [email protected] + +- update to version 2.34.1 + - Add local bindep.txt + - Dropping the py35 testing + - Add nosec to skip bandit check + - OpenDev Migration Patch + - Replace git.openstack.org URLs with opendev.org URLs + - Sync Sphinx requirement + - Set locale to english + - When looping call fails do not log the exception trace + - Change python3.5 job to python3.7 job on Stein+ + - Add Python 3 Train unit tests + - Fix invalid escape sequence warning + - Ensure that log message with non-ascii code does not raise exception + - SDRS recommendation for create VM + - Update master for stable/stein + - Return None if no suitable datastore is found + - Follow the new PTI for document build + - Fix doc build error under Python 3 + - Update NFC lease progress + +------------------------------------------------------------------- Old: ---- oslo.vmware-2.32.2.tar.gz New: ---- oslo.vmware-2.34.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oslo.vmware.spec ++++++ --- /var/tmp/diff_new_pack.QwtIin/_old 2020-02-18 10:42:10.533161206 +0100 +++ /var/tmp/diff_new_pack.QwtIin/_new 2020-02-18 10:42:10.533161206 +0100 @@ -17,15 +17,14 @@ Name: python-oslo.vmware -Version: 2.32.2 +Version: 2.34.1 Release: 0 Summary: Oslo VMware library for OpenStack projects License: Apache-2.0 Group: Development/Languages/Python URL: https://launchpad.net/oslo.vmware -Source0: https://files.pythonhosted.org/packages/source/o/oslo.vmware/oslo.vmware-2.32.2.tar.gz +Source0: https://files.pythonhosted.org/packages/source/o/oslo.vmware/oslo.vmware-2.34.1.tar.gz BuildRequires: openstack-macros -BuildRequires: python-devel BuildRequires: python2-Babel BuildRequires: python2-ddt BuildRequires: python2-eventlet >= 0.18.2 @@ -48,7 +47,6 @@ BuildRequires: python2-urllib3 >= 1.21.1 BuildRequires: python3-Babel BuildRequires: python3-ddt -BuildRequires: python3-devel BuildRequires: python3-eventlet >= 0.18.2 BuildRequires: python3-fixtures BuildRequires: python3-lxml >= 3.4.1 @@ -97,22 +95,22 @@ %package -n python-oslo.vmware-doc Summary: Documentation for OpenStack common VMware library Group: Development/Languages/Python -BuildRequires: python-Sphinx -BuildRequires: python-openstackdocstheme -Requires: %{name} = %{version} +BuildRequires: python3-Sphinx +BuildRequires: python3-openstackdocstheme +BuildRequires: python3-sphinxcontrib-apidoc %description -n python-oslo.vmware-doc Documentation for OpenStack common VMware library. %prep -%autosetup -p1 -n oslo.vmware-2.32.2 +%autosetup -p1 -n oslo.vmware-2.34.1 %py_req_cleanup %build %python_build # generate html docs -%{__python2} setup.py build_sphinx +PBR_VERSION=%{version} %sphinx_build -b html doc/source doc/build/html # remove the sphinx-build leftovers rm -rf doc/build/html/.{doctrees,buildinfo} @@ -125,8 +123,8 @@ %files %{python_files} %doc README.rst %license LICENSE -%{python2_sitelib}/oslo_vmware -%{python2_sitelib}/*.egg-info +%{python_sitelib}/oslo_vmware +%{python_sitelib}/*.egg-info %files -n python-oslo.vmware-doc %doc doc/build/html ++++++ _service ++++++ --- /var/tmp/diff_new_pack.QwtIin/_old 2020-02-18 10:42:10.557161255 +0100 +++ /var/tmp/diff_new_pack.QwtIin/_new 2020-02-18 10:42:10.557161255 +0100 @@ -1,8 +1,8 @@ <services> <service mode="disabled" name="renderspec"> - <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/stein/openstack/oslo.vmware/oslo.vmware.spec.j2</param> + <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/train/openstack/oslo.vmware/oslo.vmware.spec.j2</param> <param name="output-name">python-oslo.vmware.spec</param> - <param name="requirements">https://raw.githubusercontent.com/openstack/oslo.vmware/stable/stein/requirements.txt</param> + <param name="requirements">https://raw.githubusercontent.com/openstack/oslo.vmware/stable/train/requirements.txt</param> <param name="changelog-email">[email protected]</param> <param name="changelog-provider">gh,openstack,oslo.vmware</param> </service> ++++++ oslo.vmware-2.32.2.tar.gz -> oslo.vmware-2.34.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/.zuul.yaml new/oslo.vmware-2.34.1/.zuul.yaml --- old/oslo.vmware-2.32.2/.zuul.yaml 2019-02-28 19:02:46.000000000 +0100 +++ new/oslo.vmware-2.34.1/.zuul.yaml 2019-09-04 16:25:00.000000000 +0200 @@ -5,8 +5,6 @@ - lib-forward-testing-python3 - openstack-lower-constraints-jobs - openstack-python-jobs - - openstack-python35-jobs - - openstack-python36-jobs - - openstack-python37-jobs + - openstack-python3-train-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/AUTHORS new/oslo.vmware-2.34.1/AUTHORS --- old/oslo.vmware-2.32.2/AUTHORS 2019-02-28 19:05:12.000000000 +0100 +++ new/oslo.vmware-2.34.1/AUTHORS 2019-09-04 16:26:02.000000000 +0200 @@ -18,6 +18,7 @@ Eric Brown <[email protected]> Flavio Percoco <[email protected]> Gary Kotton <[email protected]> +Ghanshyam Mann <[email protected]> Giridhar Jayavelu <[email protected]> Haifeng.Yan <[email protected]> James Carey <[email protected]> @@ -41,6 +42,8 @@ Ryan Hsu <[email protected]> Sabari Kumar Murugesan <[email protected]> Saju <[email protected]> +Sean McGinnis <[email protected]> +Stephen Finucane <[email protected]> Steve Martinelli <[email protected]> Swapnil Kulkarni (coolsvap) <[email protected]> Tony Breeds <[email protected]> @@ -55,6 +58,7 @@ avnish <[email protected]> howardlee <[email protected]> int32bit <[email protected]> +jacky06 <[email protected]> loooosy <[email protected]> melissaml <[email protected]> qingszhao <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/CONTRIBUTING.rst new/oslo.vmware-2.34.1/CONTRIBUTING.rst --- old/oslo.vmware-2.32.2/CONTRIBUTING.rst 2019-02-28 19:02:46.000000000 +0100 +++ new/oslo.vmware-2.34.1/CONTRIBUTING.rst 2019-09-04 16:25:00.000000000 +0200 @@ -1,6 +1,6 @@ -============= +============ Contributing -============= +============ If you would like to contribute to the development of OpenStack, you must follow the steps in this page: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/ChangeLog new/oslo.vmware-2.34.1/ChangeLog --- old/oslo.vmware-2.32.2/ChangeLog 2019-02-28 19:05:12.000000000 +0100 +++ new/oslo.vmware-2.34.1/ChangeLog 2019-09-04 16:26:02.000000000 +0200 @@ -1,10 +1,40 @@ CHANGES ======= +2.34.1 +------ + +* Follow the new PTI for document build +* Add Python 3 Train unit tests +* Add local bindep.txt +* Sync Sphinx requirement + +2.34.0 +------ + +* Dropping the py35 testing +* Ensure that log message with non-ascii code does not raise exception +* Set locale to english +* Update NFC lease progress +* Add nosec to skip bandit check +* Replace git.openstack.org URLs with opendev.org URLs + +2.33.0 +------ + +* OpenDev Migration Patch +* When looping call fails do not log the exception trace +* Fix invalid escape sequence warning +* Fix doc build error under Python 3 +* Update master for stable/stein +* Return None if no suitable datastore is found +* SDRS recommendation for create VM + 2.32.2 ------ * add python 3.7 unit test job +* Change python3.5 job to python3.7 job on Stein+ * Use template for lower-constraints * Change openstack-dev to openstack-discuss * delete useless indent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/PKG-INFO new/oslo.vmware-2.34.1/PKG-INFO --- old/oslo.vmware-2.32.2/PKG-INFO 2019-02-28 19:05:12.000000000 +0100 +++ new/oslo.vmware-2.34.1/PKG-INFO 2019-09-04 16:26:02.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: oslo.vmware -Version: 2.32.2 +Version: 2.34.1 Summary: Oslo VMware library Home-page: https://docs.openstack.org/oslo.vmware/latest/ Author: OpenStack @@ -15,9 +15,9 @@ .. Change things from this point on - =================================================== - oslo.vmware --- VMware support code for OpenStack - =================================================== + ================================================= + oslo.vmware --- VMware support code for OpenStack + ================================================= .. image:: https://img.shields.io/pypi/v/oslo.vmware.svg :target: https://pypi.org/project/oslo.vmware/ @@ -32,7 +32,7 @@ * License: Apache License, Version 2.0 * Documentation: https://docs.openstack.org/oslo.vmware/latest/ - * Source: https://git.openstack.org/cgit/openstack/oslo.vmware + * Source: https://opendev.org/openstack/oslo.vmware * Bugs: https://bugs.launchpad.net/oslo.vmware * Release notes: https://docs.openstack.org/releasenotes/oslo.vmware/ @@ -47,4 +47,5 @@ Classifier: Programming Language :: Python :: 2 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/README.rst new/oslo.vmware-2.34.1/README.rst --- old/oslo.vmware-2.32.2/README.rst 2019-02-28 19:02:46.000000000 +0100 +++ new/oslo.vmware-2.34.1/README.rst 2019-09-04 16:25:00.000000000 +0200 @@ -7,9 +7,9 @@ .. Change things from this point on -=================================================== - oslo.vmware --- VMware support code for OpenStack -=================================================== +================================================= +oslo.vmware --- VMware support code for OpenStack +================================================= .. image:: https://img.shields.io/pypi/v/oslo.vmware.svg :target: https://pypi.org/project/oslo.vmware/ @@ -24,6 +24,6 @@ * License: Apache License, Version 2.0 * Documentation: https://docs.openstack.org/oslo.vmware/latest/ -* Source: https://git.openstack.org/cgit/openstack/oslo.vmware +* Source: https://opendev.org/openstack/oslo.vmware * Bugs: https://bugs.launchpad.net/oslo.vmware * Release notes: https://docs.openstack.org/releasenotes/oslo.vmware/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/bindep.txt new/oslo.vmware-2.34.1/bindep.txt --- old/oslo.vmware-2.32.2/bindep.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.vmware-2.34.1/bindep.txt 2019-09-04 16:25:00.000000000 +0200 @@ -0,0 +1,14 @@ +# This is a cross-platform list tracking distribution packages needed for install and tests; +# see https://docs.openstack.org/infra/bindep/ for additional information. + +build-essential [platform:dpkg test] +gcc [platform:rpm test] +libxml2-dev [platform:dpkg test] +libxslt1-dev [platform:dpkg test] +libxslt-devel [platform:rpm test] +python-dev [platform:dpkg test] +python-devel [platform:rpm test] +python3-dev [platform:dpkg test] +python3-devel [platform:rpm test] +libpcre3-dev [platform:dpkg test] +pcre-devel [platform:rpm test] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/doc/requirements.txt new/oslo.vmware-2.34.1/doc/requirements.txt --- old/oslo.vmware-2.32.2/doc/requirements.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.vmware-2.34.1/doc/requirements.txt 2019-09-04 16:25:00.000000000 +0200 @@ -0,0 +1,10 @@ +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. +# These are needed for docs generation +openstackdocstheme>=1.20.0 # Apache-2.0 +sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD +reno>=2.5.0 # Apache-2.0 +fixtures>=3.0.0 # Apache-2.0/BSD +sphinxcontrib-apidoc>=0.2.0 # BSD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/doc/source/conf.py new/oslo.vmware-2.34.1/doc/source/conf.py --- old/oslo.vmware-2.32.2/doc/source/conf.py 2019-02-28 19:02:46.000000000 +0100 +++ new/oslo.vmware-2.34.1/doc/source/conf.py 2019-09-04 16:25:00.000000000 +0200 @@ -11,20 +11,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os -import sys -import fileinput -import fnmatch - -sys.path.insert(0, os.path.abspath('../..')) # -- General configuration ---------------------------------------------------- # 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.intersphinx', - 'openstackdocstheme' + 'sphinxcontrib.apidoc', + 'openstackdocstheme', ] # openstackdocstheme options @@ -32,31 +26,6 @@ bug_project = 'oslo.vmware' bug_tag = '' -# autodoc generation is a bit aggressive and a nuisance when doing heavy -# text edit cycles. -# execute "export SPHINX_DEBUG=1" in your terminal to disable - -# A list of glob-style patterns that should be excluded when looking for source -# files. -exclude_patterns = [ - 'api/tests.*', # avoid of docs generation from tests - 'api/oslo.vmware._*', # skip private modules -] - -# Prune the excluded patterns from the autoindex -PATH = 'api/autoindex.rst' -if os.path.isfile(PATH) and os.access(PATH, os.R_OK): - for line in fileinput.input(PATH, inplace=True): - found = False - for pattern in exclude_patterns: - if fnmatch.fnmatch(line, '*' + pattern[4:]): - found = True - if not found: - print line, - -# The suffix of source filenames. -source_suffix = '.rst' - # The master toctree document. master_doc = 'index' @@ -74,29 +43,16 @@ # The name of the Pygments (syntax highlighting) style to use. pygments_style = 'sphinx' + # -- Options for HTML output -------------------------------------------------- -# The theme to use for HTML and HTML Help pages. Major themes that come with -# Sphinx are currently 'default' and 'sphinxdoc'. -# html_theme_path = ["."] -# html_theme = '_theme' -# html_static_path = ['static'] html_theme = 'openstackdocs' -html_last_updated_fmt = '%Y-%m-%d %H:%M' -# Output file base name for HTML help builder. -htmlhelp_basename = '%sdoc' % project +# -- sphinxcontrib.apidoc configuration -------------------------------------- -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, author, documentclass -# [howto/manual]). -latex_documents = [ - ('index', - '%s.tex' % project, - u'%s Documentation' % project, - u'OpenStack Foundation', 'manual'), +apidoc_module_dir = '../../oslo_vmware' +apidoc_output_dir = 'reference/api' +apidoc_excluded_paths = [ + 'tests', ] - -# Example configuration for intersphinx: refer to the Python standard library. -#intersphinx_mapping = {'http://docs.python.org/': None} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/doc/source/reference/index.rst new/oslo.vmware-2.34.1/doc/source/reference/index.rst --- old/oslo.vmware-2.32.2/doc/source/reference/index.rst 2019-02-28 19:02:46.000000000 +0100 +++ new/oslo.vmware-2.34.1/doc/source/reference/index.rst 2019-09-04 16:25:00.000000000 +0200 @@ -6,4 +6,4 @@ :maxdepth: 1 :glob: - api/autoindex + api/modules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/lower-constraints.txt new/oslo.vmware-2.34.1/lower-constraints.txt --- old/oslo.vmware-2.32.2/lower-constraints.txt 2019-02-28 19:02:46.000000000 +0100 +++ new/oslo.vmware-2.34.1/lower-constraints.txt 2019-09-04 16:25:00.000000000 +0200 @@ -26,7 +26,7 @@ monotonic==0.6 netaddr==0.7.18 netifaces==0.10.4 -openstackdocstheme==1.18.1 +openstackdocstheme==1.20.0 oslo.concurrency==3.26.0 oslo.config==5.2.0 oslo.context==2.19.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/oslo.vmware.egg-info/PKG-INFO new/oslo.vmware-2.34.1/oslo.vmware.egg-info/PKG-INFO --- old/oslo.vmware-2.32.2/oslo.vmware.egg-info/PKG-INFO 2019-02-28 19:05:12.000000000 +0100 +++ new/oslo.vmware-2.34.1/oslo.vmware.egg-info/PKG-INFO 2019-09-04 16:26:02.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: oslo.vmware -Version: 2.32.2 +Version: 2.34.1 Summary: Oslo VMware library Home-page: https://docs.openstack.org/oslo.vmware/latest/ Author: OpenStack @@ -15,9 +15,9 @@ .. Change things from this point on - =================================================== - oslo.vmware --- VMware support code for OpenStack - =================================================== + ================================================= + oslo.vmware --- VMware support code for OpenStack + ================================================= .. image:: https://img.shields.io/pypi/v/oslo.vmware.svg :target: https://pypi.org/project/oslo.vmware/ @@ -32,7 +32,7 @@ * License: Apache License, Version 2.0 * Documentation: https://docs.openstack.org/oslo.vmware/latest/ - * Source: https://git.openstack.org/cgit/openstack/oslo.vmware + * Source: https://opendev.org/openstack/oslo.vmware * Bugs: https://bugs.launchpad.net/oslo.vmware * Release notes: https://docs.openstack.org/releasenotes/oslo.vmware/ @@ -47,4 +47,5 @@ Classifier: Programming Language :: Python :: 2 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/oslo.vmware.egg-info/SOURCES.txt new/oslo.vmware-2.34.1/oslo.vmware.egg-info/SOURCES.txt --- old/oslo.vmware-2.32.2/oslo.vmware.egg-info/SOURCES.txt 2019-02-28 19:05:12.000000000 +0100 +++ new/oslo.vmware-2.34.1/oslo.vmware.egg-info/SOURCES.txt 2019-09-04 16:26:02.000000000 +0200 @@ -9,6 +9,7 @@ LICENSE README.rst babel.cfg +bindep.txt lower-constraints.txt pylintrc requirements.txt @@ -16,6 +17,7 @@ setup.py test-requirements.txt tox.ini +doc/requirements.txt doc/source/conf.py doc/source/index.rst doc/source/contributor/index.rst @@ -105,6 +107,7 @@ releasenotes/source/pike.rst releasenotes/source/queens.rst releasenotes/source/rocky.rst +releasenotes/source/stein.rst releasenotes/source/unreleased.rst releasenotes/source/_static/.placeholder releasenotes/source/_templates/.placeholder diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/oslo.vmware.egg-info/pbr.json new/oslo.vmware-2.34.1/oslo.vmware.egg-info/pbr.json --- old/oslo.vmware-2.32.2/oslo.vmware.egg-info/pbr.json 2019-02-28 19:05:12.000000000 +0100 +++ new/oslo.vmware-2.34.1/oslo.vmware.egg-info/pbr.json 2019-09-04 16:26:02.000000000 +0200 @@ -1 +1 @@ -{"git_version": "69f36d5", "is_release": true} \ No newline at end of file +{"git_version": "c592465", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/oslo_vmware/api.py new/oslo.vmware-2.34.1/oslo_vmware/api.py --- old/oslo.vmware-2.32.2/oslo_vmware/api.py 2019-02-28 19:02:46.000000000 +0100 +++ new/oslo.vmware-2.34.1/oslo_vmware/api.py 2019-09-04 16:25:00.000000000 +0200 @@ -243,7 +243,8 @@ LOG.debug("Logging into host: %s.", self._host) session = self.vim.Login(session_manager, userName=self._server_username, - password=self._server_password) + password=self._server_password, + locale='en') self._session_id = session.key # We need to save the username in the session since we may need it # later to check active session. The SessionIsActive method requires diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/oslo_vmware/common/loopingcall.py new/oslo.vmware-2.34.1/oslo_vmware/common/loopingcall.py --- old/oslo.vmware-2.32.2/oslo_vmware/common/loopingcall.py 2019-02-28 19:02:46.000000000 +0100 +++ new/oslo.vmware-2.34.1/oslo_vmware/common/loopingcall.py 2019-09-04 16:25:00.000000000 +0200 @@ -86,7 +86,6 @@ self.stop() done.send(e.retvalue) except Exception: - LOG.exception('in fixed duration looping call') done.send_exception(*sys.exc_info()) return else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/oslo_vmware/image_transfer.py new/oslo.vmware-2.34.1/oslo_vmware/image_transfer.py --- old/oslo.vmware-2.32.2/oslo_vmware/image_transfer.py 2019-02-28 19:02:46.000000000 +0100 +++ new/oslo.vmware-2.34.1/oslo_vmware/image_transfer.py 2019-09-04 16:25:00.000000000 +0200 @@ -286,7 +286,13 @@ kwargs.get('vm'), kwargs.get('vmdk_file_path'), file_size) - _start_transfer(read_handle, write_handle, timeout_secs) + + updater = loopingcall.FixedIntervalLoopingCall(read_handle.update_progress) + try: + updater.start(interval=NFC_LEASE_UPDATE_PERIOD) + _start_transfer(read_handle, write_handle, timeout_secs) + finally: + updater.stop() LOG.debug("Downloaded virtual disk: %s.", vmdk_file_path) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/oslo_vmware/objects/datastore.py new/oslo.vmware-2.34.1/oslo_vmware/objects/datastore.py --- old/oslo.vmware-2.32.2/oslo_vmware/objects/datastore.py 2019-02-28 19:02:46.000000000 +0100 +++ new/oslo.vmware-2.34.1/oslo_vmware/objects/datastore.py 2019-09-04 16:25:00.000000000 +0200 @@ -55,6 +55,18 @@ type=props.get("summary.type")) +def get_recommended_datastore(session, sp_spec): + spr = session.invoke_api( + session.vim, + "RecommendDatastores", + session.vim.service_content.storageResourceManager, + storageSpec=sp_spec) + if not hasattr(spr, 'recommendations'): + LOG.error("Unable to find suitable datastore") + return + return spr.recommendations[0].key + + def get_recommended_datastore_clone(session, dsc_ref, clone_spec, @@ -75,12 +87,24 @@ clone_name=name, res_pool_ref=resource_pool, host_ref=host_ref) - spr = session.invoke_api( - session.vim, - "RecommendDatastores", - session.vim.service_content.storageResourceManager, - storageSpec=sp_spec) - return spr.recommendations[0].key + return get_recommended_datastore(session, sp_spec) + + +def get_recommended_datastore_create(session, + dsc_ref, + config_spec, + resource_pool, + folder, + host_ref=None): + """Returns SDRS recommendation key for creating a VM.""" + sp_spec = vim_util.storage_placement_spec(session.vim.client.factory, + dsc_ref, + 'create', + config_spec=config_spec, + folder=folder, + res_pool_ref=resource_pool, + host_ref=host_ref) + return get_recommended_datastore(session, sp_spec) def get_dsc_ref_and_name(session, dsc_val): @@ -89,7 +113,7 @@ :param ds_val: datastore cluster name or datastore cluster moid :return: tuple of dastastore cluster moref and datastore cluster name """ - if re.match("group-p\d+", dsc_val): + if re.match(r"group-p\d+", dsc_val): # the configured value is moid dsc_ref = vim_util.get_moref(dsc_val, 'StoragePod') try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/oslo_vmware/tests/test_api.py new/oslo.vmware-2.34.1/oslo_vmware/tests/test_api.py --- old/oslo.vmware-2.32.2/oslo_vmware/tests/test_api.py 2019-02-28 19:02:46.000000000 +0100 +++ new/oslo.vmware-2.34.1/oslo_vmware/tests/test_api.py 2019-09-04 16:25:00.000000000 +0200 @@ -103,7 +103,7 @@ SERVER_IP = '10.1.2.3' PORT = 443 USERNAME = 'admin' - PASSWORD = 'password' + PASSWORD = 'password' # nosec POOL_SIZE = 15 def setUp(self): @@ -173,7 +173,7 @@ session_manager = vim_obj.service_content.sessionManager vim_obj.Login.assert_called_once_with( session_manager, userName=VMwareAPISessionTest.USERNAME, - password=VMwareAPISessionTest.PASSWORD) + password=VMwareAPISessionTest.PASSWORD, locale='en') self.assertFalse(vim_obj.TerminateSession.called) self.assertEqual(session.key, api_session._session_id) pbm.set_soap_cookie.assert_called_once_with(cookie) @@ -197,7 +197,7 @@ userName=VMwareAPISessionTest.USERNAME) vim_obj.Login.assert_called_once_with( session_manager, userName=VMwareAPISessionTest.USERNAME, - password=VMwareAPISessionTest.PASSWORD) + password=VMwareAPISessionTest.PASSWORD, locale='en') self.assertEqual(new_session_key, api_session._session_id) def test_create_session_with_existing_active_session(self): @@ -257,7 +257,7 @@ session_manager = vim_obj.service_content.sessionManager vim_obj.Login.assert_called_once_with( session_manager, userName=VMwareAPISessionTest.USERNAME, - password=VMwareAPISessionTest.PASSWORD) + password=VMwareAPISessionTest.PASSWORD, locale='en') api_session.logout() vim_obj.Logout.assert_called_once_with( session_manager) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/oslo_vmware/tests/test_image_transfer.py new/oslo.vmware-2.34.1/oslo_vmware/tests/test_image_transfer.py --- old/oslo.vmware-2.32.2/oslo_vmware/tests/test_image_transfer.py 2019-02-28 19:02:46.000000000 +0100 +++ new/oslo.vmware-2.34.1/oslo_vmware/tests/test_image_transfer.py 2019-09-04 16:25:00.000000000 +0200 @@ -315,12 +315,16 @@ @mock.patch.object(image_transfer, '_start_transfer') @mock.patch('oslo_vmware.rw_handles.VmdkReadHandle') + @mock.patch('oslo_vmware.common.loopingcall.FixedIntervalLoopingCall') def test_copy_stream_optimized_disk( - self, vmdk_read_handle, start_transfer): + self, loopingcall, vmdk_read_handle, start_transfer): - read_handle = mock.sentinel.read_handle + read_handle = mock.Mock() vmdk_read_handle.return_value = read_handle + updater = mock.Mock() + loopingcall.return_value = updater + context = mock.sentinel.context timeout = mock.sentinel.timeout write_handle = mock.Mock(name='/cinder/images/tmpAbcd.vmdk') @@ -338,8 +342,12 @@ vmdk_read_handle.assert_called_once_with( session, host, port, vm, vmdk_file_path, vmdk_size) + loopingcall.assert_called_once_with(read_handle.update_progress) + updater.start.assert_called_once_with( + interval=image_transfer.NFC_LEASE_UPDATE_PERIOD) start_transfer.assert_called_once_with(read_handle, write_handle, timeout) + updater.stop.assert_called_once_with() @mock.patch('oslo_vmware.rw_handles.VmdkReadHandle') @mock.patch.object(image_transfer, '_start_transfer') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/releasenotes/source/index.rst new/oslo.vmware-2.34.1/releasenotes/source/index.rst --- old/oslo.vmware-2.32.2/releasenotes/source/index.rst 2019-02-28 19:02:46.000000000 +0100 +++ new/oslo.vmware-2.34.1/releasenotes/source/index.rst 2019-09-04 16:25:00.000000000 +0200 @@ -6,6 +6,7 @@ :maxdepth: 1 unreleased + stein rocky queens pike diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/releasenotes/source/stein.rst new/oslo.vmware-2.34.1/releasenotes/source/stein.rst --- old/oslo.vmware-2.32.2/releasenotes/source/stein.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.vmware-2.34.1/releasenotes/source/stein.rst 2019-09-04 16:25:00.000000000 +0200 @@ -0,0 +1,6 @@ +=================================== + Stein Series Release Notes +=================================== + +.. release-notes:: + :branch: stable/stein diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/setup.cfg new/oslo.vmware-2.34.1/setup.cfg --- old/oslo.vmware-2.32.2/setup.cfg 2019-02-28 19:05:12.000000000 +0100 +++ new/oslo.vmware-2.34.1/setup.cfg 2019-09-04 16:26:02.000000000 +0200 @@ -16,21 +16,13 @@ Programming Language :: Python :: 2 Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 [files] packages = oslo_vmware -[build_sphinx] -source-dir = doc/source -build-dir = doc/build -all_files = 1 -warning-is-error = 1 - -[upload_sphinx] -upload-dir = doc/build/html - [compile_catalog] directory = oslo_vmware/locale domain = oslo_vmware @@ -45,13 +37,6 @@ mapping_file = babel.cfg output_file = oslo_vmware/locale/oslo_vmware.pot -[pbr] -autodoc_index_modules = 1 -autodoc_exclude_modules = - oslo_vmware._i18n - oslo_vmware.tests.* -api_doc_dir = reference/api - [wheel] universal = 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/test-requirements.txt new/oslo.vmware-2.34.1/test-requirements.txt --- old/oslo.vmware-2.32.2/test-requirements.txt 2019-02-28 19:02:46.000000000 +0100 +++ new/oslo.vmware-2.34.1/test-requirements.txt 2019-09-04 16:25:00.000000000 +0200 @@ -14,12 +14,6 @@ # [testenv:cover] # deps = {[testenv]deps} coverage coverage!=4.4,>=4.0 # Apache-2.0 - -# this is required for the docs build jobs -openstackdocstheme>=1.18.1 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD -reno>=2.5.0 # Apache-2.0 - bandit>=1.1.0 # Apache-2.0 ddt>=1.0.1 # MIT oslo.context>=2.19.2 # Apache-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-2.32.2/tox.ini new/oslo.vmware-2.34.1/tox.ini --- old/oslo.vmware-2.32.2/tox.ini 2019-02-28 19:02:46.000000000 +0100 +++ new/oslo.vmware-2.34.1/tox.ini 2019-09-04 16:25:00.000000000 +0200 @@ -1,13 +1,13 @@ [tox] minversion = 2.0 -envlist = py35,py27,pep8 +envlist = py27,py37,pep8 [testenv] install_command = pip install {opts} {packages} -whitelist_externals = find - rm +whitelist_externals = + find deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt commands = stestr run --slowest {posargs} @@ -19,22 +19,20 @@ # Run security linter bandit -r oslo_vmware -[testenv:pylint] -basepython = python3 -deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} - -r{toxinidir}/test-requirements.txt - -r{toxinidir}/requirements.txt - pylint>=1.3.0 -commands = pylint oslo - [testenv:bandit] basepython = python3 commands = bandit -r oslo_vmware [testenv:docs] basepython = python3 -commands = python setup.py build_sphinx +whitelist_externals = + rm +deps = + {[testenv]deps} + -r{toxinidir}/doc/requirements.txt +commands = + rm -rf doc/build doc/source/reference/api + sphinx-build -W -b html doc/source doc/build/html [testenv:cover] basepython = python3 @@ -54,14 +52,28 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,__init__.py [hacking] -import_exceptions = oslo_vmware.tests.base - tests.base +import_exceptions = + oslo_vmware.tests.base + tests.base local-check-factory = oslo_vmware.hacking.checks.factory [testenv:releasenotes] basepython = python3 +deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + -r{toxinidir}/doc/requirements.txt commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html +[testenv:bindep] +basepython = python3 +# Do not install any requirements. We want this to be fast and work even if +# system dependencies are missing, since it's used to tell you what system +# dependencies are missing! This also means that bindep must be installed +# separately, outside of the requirements files, and develop mode disabled +# explicitly to avoid unnecessarily installing the checked-out repo too. +deps = bindep +commands = bindep test + [testenv:lower-constraints] basepython = python3 deps =
