Hello community,
here is the log from the commit of package python-glanceclient for
openSUSE:Factory checked in at 2018-01-24 15:31:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-glanceclient (Old)
and /work/SRC/openSUSE:Factory/.python-glanceclient.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-glanceclient"
Wed Jan 24 15:31:19 2018 rev:24 rq:568547 version:2.9.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-glanceclient/python-glanceclient.changes
2017-08-28 15:32:54.875906687 +0200
+++
/work/SRC/openSUSE:Factory/.python-glanceclient.new/python-glanceclient.changes
2018-01-24 15:31:26.219745142 +0100
@@ -1,0 +2,18 @@
+Thu Jan 18 08:53:53 UTC 2018 - cloud-de...@suse.de
+
+- update to version 2.9.0
+ - Update Image service property keys doc
+ - Revise functional testing README file
+ - Update reno for stable/pike
+ - Remove Babel as a runtime requirement
+ - image-create-via-import fails with ValueError
+ - Restore functional testing under ssl
+ - stage call fails with TypeError
+ - Add domain info to functional test clients
+ - Migrate dsvm functional test jobs to project repo
+ - Compare against 'RequestIdProxy.wrapped'
+ - Update Image service property keys docs
+ - Updated from global requirements
+ - Fix image-import call
+
+-------------------------------------------------------------------
Old:
----
python-glanceclient-2.8.0.tar.gz
New:
----
python-glanceclient-2.9.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-glanceclient.spec ++++++
--- /var/tmp/diff_new_pack.XkNlCU/_old 2018-01-24 15:31:27.291695008 +0100
+++ /var/tmp/diff_new_pack.XkNlCU/_new 2018-01-24 15:31:27.295694822 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-glanceclient
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,54 +18,78 @@
%global sname python-glanceclient
Name: python-glanceclient
-Version: 2.8.0
+Version: 2.9.0
Release: 0
Summary: Python API and CLI for OpenStack Glance
License: Apache-2.0
Group: Development/Languages/Python
Url: https://launchpad.net/%{sname}
-Source0:
https://pypi.io/packages/source/p/%{sname}/%{sname}-%{version}.tar.gz
+Source0:
https://files.pythonhosted.org/packages/source/p/%{sname}/%{sname}-%{version}.tar.gz
BuildRequires: openstack-macros
-BuildRequires: python-PrettyTable >= 0.7.1
BuildRequires: python-devel
-BuildRequires: python-fixtures >= 3.0.0
-BuildRequires: python-keystoneclient >= 3.8.0
-BuildRequires: python-mock >= 2.0
-BuildRequires: python-os-client-config >= 1.27.0
-BuildRequires: python-oslo.utils >= 3.20.0
-BuildRequires: python-pbr >= 2.0.0
-BuildRequires: python-pyOpenSSL >= 0.14
-BuildRequires: python-reno >= 1.8.0
-BuildRequires: python-requests-mock >= 1.1
-BuildRequires: python-testrepository >= 0.0.18
-BuildRequires: python-testscenarios >= 0.4
-BuildRequires: python-testtools >= 1.4.0
-BuildRequires: python-warlock >= 1.0.1
+BuildRequires: python2-PrettyTable >= 0.7.1
+BuildRequires: python2-fixtures >= 3.0.0
+BuildRequires: python2-keystoneclient >= 3.8.0
+BuildRequires: python2-mock >= 2.0.0
+BuildRequires: python2-os-client-config >= 1.28.0
+BuildRequires: python2-oslo.utils >= 3.31.0
+BuildRequires: python2-pbr >= 2.0.0
+BuildRequires: python2-pyOpenSSL >= 16.2.0
+BuildRequires: python2-reno >= 2.5.0
+BuildRequires: python2-requests-mock >= 1.1.0
+BuildRequires: python2-testrepository >= 0.0.18
+BuildRequires: python2-testscenarios >= 0.4
+BuildRequires: python2-testtools >= 2.2.0
+BuildRequires: python2-warlock >= 1.2.0
+BuildRequires: python3-PrettyTable >= 0.7.1
+BuildRequires: python3-devel
+BuildRequires: python3-fixtures >= 3.0.0
+BuildRequires: python3-keystoneclient >= 3.8.0
+BuildRequires: python3-mock >= 2.0.0
+BuildRequires: python3-os-client-config >= 1.28.0
+BuildRequires: python3-oslo.utils >= 3.31.0
+BuildRequires: python3-pbr >= 2.0.0
+BuildRequires: python3-pyOpenSSL >= 16.2.0
+BuildRequires: python3-reno >= 2.5.0
+BuildRequires: python3-requests-mock >= 1.1.0
+BuildRequires: python3-testrepository >= 0.0.18
+BuildRequires: python3-testscenarios >= 0.4
+BuildRequires: python3-testtools >= 2.2.0
+BuildRequires: python3-warlock >= 1.2.0
Requires: python-Babel >= 2.3.4
Requires: python-PrettyTable >= 0.7.1
-Requires: python-keystoneauth1 >= 2.21.0
-Requires: python-oslo.i18n >= 2.1.0
-Requires: python-oslo.utils >= 3.20.0
+Requires: python-keystoneauth1 >= 3.2.0
+Requires: python-oslo.i18n >= 3.15.3
+Requires: python-oslo.utils >= 3.31.0
Requires: python-pbr >= 2.0.0
-Requires: python-pyOpenSSL >= 0.14
+Requires: python-pyOpenSSL >= 16.2.0
Requires: python-requests >= 2.14.2
-Requires: python-six >= 1.9.0
-Requires: python-warlock >= 1.0.1
+Requires: python-six >= 1.10.0
+Requires: python-warlock >= 1.2.0
Requires: python-wrapt >= 1.7.0
BuildArch: noarch
+%if 0%{?suse_version}
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
+%else
+# on RDO, update-alternatives is in chkconfig
+Requires(post): chkconfig
+Requires(postun): chkconfig
+%endif
+%python_subpackages
%description
This is a client for the OpenStack Glance API. There's a Python API (the
glanceclient module), and a command-line script (glance). Each implements
100% of the OpenStack Glance API.
-%package doc
+%package -n python-glanceclient-doc
Summary: Documentation for OpenStack Glance API Client
-Group: Documentation
+Group: Documentation/HTML
BuildRequires: python-Sphinx
-BuildRequires: python-openstackdocstheme >= 1.11.0
+BuildRequires: python-openstackdocstheme >= 1.17.0
-%description doc
+%description -n python-glanceclient-doc
This is a client for the OpenStack Glance API. There's a Python API (the
glanceclient module), and a command-line script (glance). Each implements
100% of the OpenStack Glance API.
@@ -77,7 +101,7 @@
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
%build
-%py2_build
+%python_build
# generate html docs
%{__python2} setup.py build_sphinx --builder=html,man
@@ -85,27 +109,37 @@
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
-%py2_install
+%python_install
#man pages
install -p -D -m 644 doc/build/man/glance.1
%{buildroot}%{_mandir}/man1/glance.1
+%python_clone -a %{buildroot}%{_bindir}/glance
+%python_clone -a %{buildroot}%{_mandir}/man1/glance.1
+
+%post
+%{python_install_alternative glance glance.1}
+
+%postun
+%python_uninstall_alternative glance
%check
%if 0%{?rhel} || 0%{?fedora}
# disable tests until rdo updated to requests > 2.14
true
%else
-%{__python2} setup.py testr
+%{python_expand rm -rf .testrepository
+$python setup.py testr
+}
%endif
-%files
+%files %{python_files}
%license LICENSE
%doc README.rst ChangeLog
-%{_bindir}/glance
-%{python2_sitelib}/glanceclient
-%{python2_sitelib}/*.egg-info
-%{_mandir}/man1/glance.1.gz
+%python_alternative %{_bindir}/glance
+%python_alternative %{_mandir}/man1/glance.1
+%{python_sitelib}/glanceclient
+%{python_sitelib}/*.egg-info
-%files doc
+%files -n python-glanceclient-doc
%license LICENSE
%doc doc/build/html
++++++ _service ++++++
--- /var/tmp/diff_new_pack.XkNlCU/_old 2018-01-24 15:31:27.327693325 +0100
+++ /var/tmp/diff_new_pack.XkNlCU/_new 2018-01-24 15:31:27.327693325 +0100
@@ -1,8 +1,8 @@
<services>
<service mode="disabled" name="renderspec">
- <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/openstack/python-glanceclient/python-glanceclient.spec.j2</param>
+ <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/master/openstack/python-glanceclient/python-glanceclient.spec.j2</param>
<param name="output-name">python-glanceclient.spec</param>
- <param
name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/global-requirements.txt</param>
+ <param
name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/master/requirements.txt</param>
<param name="changelog-email">cloud-de...@suse.de</param>
<param name="changelog-provider">gh,openstack,python-glanceclient</param>
</service>
++++++ python-glanceclient-2.8.0.tar.gz -> python-glanceclient-2.9.0.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-glanceclient-2.8.0/.zuul.yaml
new/python-glanceclient-2.9.0/.zuul.yaml
--- old/python-glanceclient-2.8.0/.zuul.yaml 1970-01-01 01:00:00.000000000
+0100
+++ new/python-glanceclient-2.9.0/.zuul.yaml 2018-01-03 17:00:32.000000000
+0100
@@ -0,0 +1,48 @@
+- job:
+ name: glanceclient-dsvm-functional
+ parent: devstack-tox-functional
+ description: |
+ devstack-based functional tests for glanceclient
+ required-projects:
+ - openstack/python-glanceclient
+ timeout: 4200
+ vars:
+ devstack_localrc:
+ # TODO(rosmaita): remove when glanceclient tests no longer
+ # use the Images v1 API
+ GLANCE_V1_ENABLED: True
+ LIBS_FROM_GIT: python-glanceclient
+ devstack_services:
+ # turn off ceilometer
+ ceilometer-acentral: false
+ ceilometer-acompute: false
+ ceilometer-alarm-evaluator: false
+ ceilometer-alarm-notifier: false
+ ceilometer-anotification: false
+ ceilometer-api: false
+ ceilometer-collector: false
+ # turn on swift
+ s-account: true
+ s-container: true
+ s-object: true
+ s-proxy: true
+ # Hardcode glanceclient path so the job can be run on glance patches
+ zuul_work_dir: src/git.openstack.org/openstack/python-glanceclient
+
+- job:
+ name: glanceclient-dsvm-functional-identity-v3-only
+ parent: glanceclient-dsvm-functional
+ vars:
+ devstack_localrc:
+ ENABLE_IDENTITY_V2: False
+
+- project:
+ name: openstack/python-glanceclient
+ check:
+ jobs:
+ - glanceclient-dsvm-functional
+ - glanceclient-dsvm-functional-identity-v3-only:
+ voting: false
+ gate:
+ jobs:
+ - glanceclient-dsvm-functional
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-glanceclient-2.8.0/AUTHORS
new/python-glanceclient-2.9.0/AUTHORS
--- old/python-glanceclient-2.8.0/AUTHORS 2017-07-28 03:55:22.000000000
+0200
+++ new/python-glanceclient-2.9.0/AUTHORS 2018-01-03 17:03:55.000000000
+0100
@@ -201,6 +201,7 @@
Zhi Yan Liu <zhiy...@cn.ibm.com>
ZhiQiang Fan <aji.zq...@gmail.com>
Zhiqiang Fan <aji.zq...@gmail.com>
+Zuul <z...@review.openstack.org>
amalaba <princessba...@gmail.com>
bhagyashris <bhagyashri.shew...@nttdata.com>
ckonstanski <ckonstan...@pippiandcarlos.com>
@@ -233,6 +234,7 @@
wangxiyuan <wangxiy...@huawei.com>
wangzhenyu <wan...@fiberhome.com>
yangds <dongsheng.y...@easystack.cn>
+yatin <yka...@redhat.com>
yatin karel <yatin.ka...@nectechnologies.in>
zheng yin <yin.zh...@easystack.cn>
zhengyao1 <zheng.y...@zte.com.cn>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-glanceclient-2.8.0/ChangeLog
new/python-glanceclient-2.9.0/ChangeLog
--- old/python-glanceclient-2.8.0/ChangeLog 2017-07-28 03:55:22.000000000
+0200
+++ new/python-glanceclient-2.9.0/ChangeLog 2018-01-03 17:03:55.000000000
+0100
@@ -1,6 +1,28 @@
CHANGES
=======
+2.9.0
+-----
+
+* Compare against 'RequestIdProxy.wrapped'
+* Update Image service property keys doc
+* Update Image service property keys docs
+* Updated from global requirements
+* Revise functional testing README file
+* Restore functional testing under ssl
+* Migrate dsvm functional test jobs to project repo
+* Add domain info to functional test clients
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Remove Babel as a runtime requirement
+* image-create-via-import fails with ValueError
+* Fix image-import call
+* Updated from global requirements
+* stage call fails with TypeError
+* Update reno for stable/pike
+* Updated from global requirements
+
2.8.0
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-glanceclient-2.8.0/PKG-INFO
new/python-glanceclient-2.9.0/PKG-INFO
--- old/python-glanceclient-2.8.0/PKG-INFO 2017-07-28 03:55:22.000000000
+0200
+++ new/python-glanceclient-2.9.0/PKG-INFO 2018-01-03 17:03:56.000000000
+0100
@@ -1,11 +1,12 @@
Metadata-Version: 1.1
Name: python-glanceclient
-Version: 2.8.0
+Version: 2.9.0
Summary: OpenStack Image API Client Library
Home-page: https://docs.openstack.org/python-glanceclient/latest/
Author: OpenStack
Author-email: openstack-...@lists.openstack.org
License: Apache License, Version 2.0
+Description-Content-Type: UNKNOWN
Description: ========================
Team and repository tags
========================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-glanceclient-2.8.0/doc/source/cli/property-keys.rst
new/python-glanceclient-2.9.0/doc/source/cli/property-keys.rst
--- old/python-glanceclient-2.8.0/doc/source/cli/property-keys.rst
2017-07-28 03:53:28.000000000 +0200
+++ new/python-glanceclient-2.9.0/doc/source/cli/property-keys.rst
2018-01-03 17:00:44.000000000 +0100
@@ -200,6 +200,13 @@
- Specifies the type of disk controller to attach disk devices to.
- One of ``scsi``, ``virtio``, ``uml``, ``xen``, ``ide``, or ``usb``.
* - libvirt API driver
+ - ``hw_pointer_model``
+ - Input devices that allow interaction with a graphical framebuffer,
+ for example to provide a graphic tablet for absolute cursor movement.
+ Currently only supported by the KVM/QEMU hypervisor configuration
+ and VNC or SPICE consoles must be enabled.
+ - ``usbtablet``
+ * - libvirt API driver
- ``hw_rng_model``
- Adds a random-number generator device to the image's instances. The
cloud administrator can enable and control device behavior by
@@ -314,6 +321,14 @@
allows for flexibility in setting/overriding the default behavior as
needed.
- ``true`` or ``false``
+ * - libvirt API driver
+ - ``img_hide_hypervisor_id``
+ - Some hypervisors add a signature to their guests. While the presence
+ of the signature can enable some paravirtualization features on the
+ guest, it can also have the effect of preventing some drivers from
+ loading. Hiding the signature by setting this property to ``true``
+ may allow such drivers to load and work.
+ - ``true`` or ``false``
* - VMware API driver
- ``vmware_adaptertype``
- The virtual SCSI or IDE controller used by the hypervisor.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-glanceclient-2.8.0/glanceclient/tests/functional/README.rst
new/python-glanceclient-2.9.0/glanceclient/tests/functional/README.rst
--- old/python-glanceclient-2.8.0/glanceclient/tests/functional/README.rst
2017-07-28 03:53:28.000000000 +0200
+++ new/python-glanceclient-2.9.0/glanceclient/tests/functional/README.rst
2018-01-03 17:00:32.000000000 +0100
@@ -27,10 +27,13 @@
The functional tests require:
-1) A working Glance/Keystone installation (eg devstack)
+1) A working Glance/Keystone installation (for example, devstack)
2) A yaml file containing valid credentials
-If you are using devstack a yaml file will have been created for you.
+If you are using devstack, a yaml file will have been created for you
+with the name /etc/openstack/clouds.yaml. The test code knows where
+to find it, so if you're using devstack, you don't need to do anything
+else.
If you are not using devstack you should create a yaml file
with the following format:
@@ -39,15 +42,21 @@
devstack-admin:
auth:
auth_url: http://10.0.0.1:35357/v2.0
-
password: example
-
+ project_domain_id: default
project_name: admin
-
+ user_domain_id: default
username: admin
-
identity_api_version: '2.0'
-
region_name: RegionOne
-and copy it to ~/.config/openstack/clouds.yaml
+The tests will look for a file named 'clouds.yaml' in the
+following locations (in this order, first found wins):
+
+* current directory
+* ~/.config/openstack
+* /etc/openstack
+
+You may also set the environment variable OS_CLIENT_CONFIG_FILE
+to the absolute pathname of a file and that location will be
+inserted at the front of the search list.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-glanceclient-2.8.0/glanceclient/tests/functional/base.py
new/python-glanceclient-2.9.0/glanceclient/tests/functional/base.py
--- old/python-glanceclient-2.8.0/glanceclient/tests/functional/base.py
2017-07-28 03:53:28.000000000 +0200
+++ new/python-glanceclient-2.9.0/glanceclient/tests/functional/base.py
2018-01-03 17:00:32.000000000 +0100
@@ -56,6 +56,8 @@
username=self.creds['username'],
password=self.creds['password'],
tenant_name=self.creds['project_name'],
+ user_domain_id=self.creds['user_domain_id'],
+ project_domain_id=self.creds['project_domain_id'],
uri=self.creds['auth_url'],
cli_dir=cli_dir)
@@ -68,7 +70,9 @@
auth_url=self.creds["auth_url"],
username=self.creds["username"],
password=self.creds["password"],
- project_name=self.creds["project_name"])
+ project_name=self.creds["project_name"],
+ user_domain_id=self.creds["user_domain_id"],
+ project_domain_id=self.creds["project_domain_id"])
keystoneclient = self.Keystone(**ks_creds)
return self.Glance(keystoneclient)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-glanceclient-2.8.0/glanceclient/tests/functional/hooks/post_test_hook.sh
new/python-glanceclient-2.9.0/glanceclient/tests/functional/hooks/post_test_hook.sh
---
old/python-glanceclient-2.8.0/glanceclient/tests/functional/hooks/post_test_hook.sh
2017-07-28 03:53:28.000000000 +0200
+++
new/python-glanceclient-2.9.0/glanceclient/tests/functional/hooks/post_test_hook.sh
1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-#!/bin/bash -xe
-
-# 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.
-
-# This script is executed inside post_test_hook function in devstack gate.
-
-function generate_testr_results {
- if [ -f .testrepository/0 ]; then
- sudo .tox/functional/bin/testr last --subunit >
$WORKSPACE/testrepository.subunit
- sudo mv $WORKSPACE/testrepository.subunit
$BASE/logs/testrepository.subunit
- sudo /usr/os-testr-env/bin/subunit2html
$BASE/logs/testrepository.subunit $BASE/logs/testr_results.html
- sudo gzip -9 $BASE/logs/testrepository.subunit
- sudo gzip -9 $BASE/logs/testr_results.html
- sudo chown jenkins:jenkins $BASE/logs/testrepository.subunit.gz
$BASE/logs/testr_results.html.gz
- sudo chmod a+r $BASE/logs/testrepository.subunit.gz
$BASE/logs/testr_results.html.gz
- fi
-}
-
-export GLANCECLIENT_DIR="$BASE/new/python-glanceclient"
-
-sudo chown -R jenkins:stack $GLANCECLIENT_DIR
-
-# Go to the glanceclient dir
-cd $GLANCECLIENT_DIR
-
-# Run tests
-echo "Running glanceclient functional test suite"
-set +e
-# Preserve env for OS_ credentials
-sudo -E -H -u jenkins tox -efunctional
-EXIT_CODE=$?
-set -e
-
-# Collect and parse result
-generate_testr_results
-exit $EXIT_CODE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-glanceclient-2.8.0/glanceclient/tests/unit/v2/test_shell_v2.py
new/python-glanceclient-2.9.0/glanceclient/tests/unit/v2/test_shell_v2.py
--- old/python-glanceclient-2.8.0/glanceclient/tests/unit/v2/test_shell_v2.py
2017-07-28 03:53:28.000000000 +0200
+++ new/python-glanceclient-2.9.0/glanceclient/tests/unit/v2/test_shell_v2.py
2018-01-03 17:00:44.000000000 +0100
@@ -581,11 +581,10 @@
args = self._make_args(
{'id': 'IMG-01', 'file': 'test', 'progress': True})
- with mock.patch.object(self.gc.images, 'data') as mocked_data:
- def _data():
- for c in 'abcedf':
- yield c
- mocked_data.return_value = utils.IterableWithLength(_data(), 5)
+ with mock.patch.object(self.gc.images, 'data') as mocked_data, \
+ mock.patch.object(utils, '_extract_request_id'):
+ mocked_data.return_value = utils.RequestIdProxy(
+ [c for c in 'abcdef'])
test_shell.do_image_download(self.gc, args)
mocked_data.assert_called_once_with('IMG-01')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-glanceclient-2.8.0/glanceclient/v2/images.py
new/python-glanceclient-2.9.0/glanceclient/v2/images.py
--- old/python-glanceclient-2.8.0/glanceclient/v2/images.py 2017-07-28
03:53:28.000000000 +0200
+++ new/python-glanceclient-2.9.0/glanceclient/v2/images.py 2018-01-03
17:00:32.000000000 +0100
@@ -240,22 +240,24 @@
return body, resp
@utils.add_req_id_to_object()
- def stage(self, image_id, image_data):
+ def stage(self, image_id, image_data, image_size=None):
"""Upload the data to image staging.
:param image_id: ID of the image to upload data for.
:param image_data: File-like object supplying the data to upload.
+ :param image_size: Unused - present for backwards compatibility
"""
url = '/v2/images/%s/stage' % image_id
- return self.upload(image_id,
- image_data,
- u_url=url)
+ resp, body = self.upload(image_id,
+ image_data,
+ u_url=url)
+ return body, resp
@utils.add_req_id_to_object()
def image_import(self, image_id, method='glance-direct'):
"""Import Image via method."""
url = '/v2/images/%s/import' % image_id
- data = {'import_method': method}
+ data = {'method': {'name': method}}
resp, body = self.http_client.post(url, data=data)
return body, resp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-glanceclient-2.8.0/glanceclient/v2/shell.py
new/python-glanceclient-2.9.0/glanceclient/v2/shell.py
--- old/python-glanceclient-2.8.0/glanceclient/v2/shell.py 2017-07-28
03:53:28.000000000 +0200
+++ new/python-glanceclient-2.9.0/glanceclient/v2/shell.py 2018-01-03
17:00:44.000000000 +0100
@@ -102,6 +102,9 @@
'passed to the client via stdin.'))
@utils.arg('--progress', action='store_true', default=False,
help=_('Show upload progress bar.'))
+@utils.arg('--import-method', metavar='<METHOD>', default='glance-direct',
+ help=_('Import method used for Image Import workflow. '
+ 'Valid values can be retrieved with import-info command.'))
@utils.on_data_require_fields(DATA_FIELDS)
def do_image_create_via_import(gc, args):
"""EXPERIMENTAL: Create a new image via image import."""
@@ -126,7 +129,7 @@
'glance-direct' not in import_methods.get('value')):
utils.exit("No suitable import method available for direct upload, "
"please use image-create instead.")
- image, resp = gc.images.create(**fields)
+ image = gc.images.create(**fields)
try:
if utils.get_data_file(args) is not None:
args.id = image['id']
@@ -350,7 +353,7 @@
msg = "Unable to download image '%s'. (%s)" % (args.id, e)
utils.exit(msg)
- if body is None:
+ if body.wrapped is None:
msg = ('Image %s has no data.' % args.id)
utils.exit(msg)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-glanceclient-2.8.0/python_glanceclient.egg-info/PKG-INFO
new/python-glanceclient-2.9.0/python_glanceclient.egg-info/PKG-INFO
--- old/python-glanceclient-2.8.0/python_glanceclient.egg-info/PKG-INFO
2017-07-28 03:55:22.000000000 +0200
+++ new/python-glanceclient-2.9.0/python_glanceclient.egg-info/PKG-INFO
2018-01-03 17:03:55.000000000 +0100
@@ -1,11 +1,12 @@
Metadata-Version: 1.1
Name: python-glanceclient
-Version: 2.8.0
+Version: 2.9.0
Summary: OpenStack Image API Client Library
Home-page: https://docs.openstack.org/python-glanceclient/latest/
Author: OpenStack
Author-email: openstack-...@lists.openstack.org
License: Apache License, Version 2.0
+Description-Content-Type: UNKNOWN
Description: ========================
Team and repository tags
========================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-glanceclient-2.8.0/python_glanceclient.egg-info/SOURCES.txt
new/python-glanceclient-2.9.0/python_glanceclient.egg-info/SOURCES.txt
--- old/python-glanceclient-2.8.0/python_glanceclient.egg-info/SOURCES.txt
2017-07-28 03:55:22.000000000 +0200
+++ new/python-glanceclient-2.9.0/python_glanceclient.egg-info/SOURCES.txt
2018-01-03 17:03:56.000000000 +0100
@@ -1,6 +1,7 @@
.coveragerc
.mailmap
.testr.conf
+.zuul.yaml
AUTHORS
CONTRIBUTING.rst
ChangeLog
@@ -40,7 +41,6 @@
glanceclient/tests/functional/base.py
glanceclient/tests/functional/test_http_headers.py
glanceclient/tests/functional/test_readonly_glance.py
-glanceclient/tests/functional/hooks/post_test_hook.sh
glanceclient/tests/unit/__init__.py
glanceclient/tests/unit/test_base.py
glanceclient/tests/unit/test_client.py
@@ -120,9 +120,11 @@
releasenotes/source/mitaka.rst
releasenotes/source/newton.rst
releasenotes/source/ocata.rst
+releasenotes/source/pike.rst
releasenotes/source/unreleased.rst
releasenotes/source/_static/.placeholder
releasenotes/source/_templates/.placeholder
+tools/fix_ca_bundle.sh
tools/glance.bash_completion
tools/tox_install.sh
tools/with_venv.sh
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-glanceclient-2.8.0/python_glanceclient.egg-info/pbr.json
new/python-glanceclient-2.9.0/python_glanceclient.egg-info/pbr.json
--- old/python-glanceclient-2.8.0/python_glanceclient.egg-info/pbr.json
2017-07-28 03:55:22.000000000 +0200
+++ new/python-glanceclient-2.9.0/python_glanceclient.egg-info/pbr.json
2018-01-03 17:03:55.000000000 +0100
@@ -1 +1 @@
-{"git_version": "52eb529", "is_release": true}
\ No newline at end of file
+{"git_version": "cf62e16", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-glanceclient-2.8.0/python_glanceclient.egg-info/requires.txt
new/python-glanceclient-2.9.0/python_glanceclient.egg-info/requires.txt
--- old/python-glanceclient-2.8.0/python_glanceclient.egg-info/requires.txt
2017-07-28 03:55:22.000000000 +0200
+++ new/python-glanceclient-2.9.0/python_glanceclient.egg-info/requires.txt
2018-01-03 17:03:55.000000000 +0100
@@ -1,11 +1,10 @@
pbr!=2.1.0,>=2.0.0
-Babel!=2.4.0,>=2.3.4
PrettyTable<0.8,>=0.7.1
-keystoneauth1>=3.0.1
+keystoneauth1>=3.3.0
requests>=2.14.2
-warlock!=1.3.0,<2,>=1.0.1
-six>=1.9.0
-oslo.utils>=3.20.0
-oslo.i18n!=3.15.2,>=2.1.0
+warlock!=1.3.0,<2,>=1.2.0
+six>=1.10.0
+oslo.utils>=3.33.0
+oslo.i18n>=3.15.3
wrapt>=1.7.0
-pyOpenSSL>=0.14
+pyOpenSSL>=16.2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-glanceclient-2.8.0/releasenotes/source/index.rst
new/python-glanceclient-2.9.0/releasenotes/source/index.rst
--- old/python-glanceclient-2.8.0/releasenotes/source/index.rst 2017-07-28
03:53:28.000000000 +0200
+++ new/python-glanceclient-2.9.0/releasenotes/source/index.rst 2018-01-03
17:00:32.000000000 +0100
@@ -6,6 +6,7 @@
:maxdepth: 1
unreleased
+ pike
ocata
newton
mitaka
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-glanceclient-2.8.0/releasenotes/source/pike.rst
new/python-glanceclient-2.9.0/releasenotes/source/pike.rst
--- old/python-glanceclient-2.8.0/releasenotes/source/pike.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/python-glanceclient-2.9.0/releasenotes/source/pike.rst 2018-01-03
17:00:32.000000000 +0100
@@ -0,0 +1,6 @@
+===================================
+ Pike Series Release Notes
+===================================
+
+.. release-notes::
+ :branch: stable/pike
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-glanceclient-2.8.0/requirements.txt
new/python-glanceclient-2.9.0/requirements.txt
--- old/python-glanceclient-2.8.0/requirements.txt 2017-07-28
03:53:28.000000000 +0200
+++ new/python-glanceclient-2.9.0/requirements.txt 2018-01-03
17:00:32.000000000 +0100
@@ -2,13 +2,12 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
pbr!=2.1.0,>=2.0.0 # Apache-2.0
-Babel!=2.4.0,>=2.3.4 # BSD
PrettyTable<0.8,>=0.7.1 # BSD
-keystoneauth1>=3.0.1 # Apache-2.0
+keystoneauth1>=3.3.0 # Apache-2.0
requests>=2.14.2 # Apache-2.0
-warlock!=1.3.0,<2,>=1.0.1 # Apache-2.0
-six>=1.9.0 # MIT
-oslo.utils>=3.20.0 # Apache-2.0
-oslo.i18n!=3.15.2,>=2.1.0 # Apache-2.0
+warlock!=1.3.0,<2,>=1.2.0 # Apache-2.0
+six>=1.10.0 # MIT
+oslo.utils>=3.33.0 # Apache-2.0
+oslo.i18n>=3.15.3 # Apache-2.0
wrapt>=1.7.0 # BSD License
-pyOpenSSL>=0.14 # Apache-2.0
+pyOpenSSL>=16.2.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-glanceclient-2.8.0/test-requirements.txt
new/python-glanceclient-2.9.0/test-requirements.txt
--- old/python-glanceclient-2.8.0/test-requirements.txt 2017-07-28
03:53:28.000000000 +0200
+++ new/python-glanceclient-2.9.0/test-requirements.txt 2018-01-03
17:00:32.000000000 +0100
@@ -4,15 +4,15 @@
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
-mock>=2.0 # BSD
-ordereddict # MIT
+mock>=2.0.0 # BSD
+ordereddict>=1.1 # MIT
os-client-config>=1.28.0 # Apache-2.0
-openstackdocstheme>=1.11.0 # Apache-2.0
-reno!=2.3.1,>=1.8.0 # Apache-2.0
+openstackdocstheme>=1.17.0 # Apache-2.0
+reno>=2.5.0 # Apache-2.0
sphinx>=1.6.2 # BSD
testrepository>=0.0.18 # Apache-2.0/BSD
-testtools>=1.4.0 # MIT
+testtools>=2.2.0 # MIT
testscenarios>=0.4 # Apache-2.0/BSD
fixtures>=3.0.0 # Apache-2.0/BSD
-requests-mock>=1.1 # Apache-2.0
-tempest>=16.1.0 # Apache-2.0
+requests-mock>=1.1.0 # Apache-2.0
+tempest>=17.1.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-glanceclient-2.8.0/tools/fix_ca_bundle.sh
new/python-glanceclient-2.9.0/tools/fix_ca_bundle.sh
--- old/python-glanceclient-2.8.0/tools/fix_ca_bundle.sh 1970-01-01
01:00:00.000000000 +0100
+++ new/python-glanceclient-2.9.0/tools/fix_ca_bundle.sh 2018-01-03
17:00:32.000000000 +0100
@@ -0,0 +1,37 @@
+# When the functional tests are run in a devstack environment, we
+# need to make sure that the python-requests module installed by
+# tox in the test environment can find the distro-specific CA store
+# where the devstack certs have been installed.
+#
+# assumptions:
+# - devstack is running
+# - the devstack tls-proxy service is running
+#
+# This code based on a function in devstack lib/tls
+function set_ca_bundle {
+ local python_cmd='.tox/functional/bin/python'
+ local capath=$($python_cmd -c $'try:\n from requests import certs\n print
(certs.where())\nexcept ImportError: pass')
+ # of course, each distro keeps the CA store in a different location
+ local fedora_CA='/etc/pki/tls/certs/ca-bundle.crt'
+ local ubuntu_CA='/etc/ssl/certs/ca-certificates.crt'
+ local suse_CA='/etc/ssl/ca-bundle.pem'
+
+ # the distro CA is rooted in /etc, so if ours isn't, we need to
+ # change it
+ if [[ ! $capath == "" && ! $capath =~ ^/etc/.* && ! -L $capath ]]; then
+ if [[ -e $fedora_CA ]]; then
+ rm -f $capath
+ ln -s $fedora_CA $capath
+ elif [[ -e $ubuntu_CA ]]; then
+ rm -f $capath
+ ln -s $ubuntu_CA $capath
+ elif [[ -e $suse_CA ]]; then
+ rm -f $capath
+ ln -s $suse_CA $capath
+ else
+ echo "can't set CA bundle, expect tests to fail"
+ fi
+ fi
+}
+
+set_ca_bundle
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-glanceclient-2.8.0/tox.ini
new/python-glanceclient-2.9.0/tox.ini
--- old/python-glanceclient-2.8.0/tox.ini 2017-07-28 03:53:28.000000000
+0200
+++ new/python-glanceclient-2.9.0/tox.ini 2018-01-03 17:00:32.000000000
+0100
@@ -30,6 +30,11 @@
# for information on running the functional tests.
setenv =
OS_TEST_PATH = ./glanceclient/tests/functional
+whitelist_externals =
+ bash
+commands =
+ bash tools/fix_ca_bundle.sh
+ python setup.py testr --testr-args='{posargs}'
[testenv:cover]
commands = python setup.py testr --coverage --testr-args='{posargs}'
