Hello community,
here is the log from the commit of package python-magnumclient for
openSUSE:Factory checked in at 2019-05-03 22:41:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-magnumclient (Old)
and /work/SRC/openSUSE:Factory/.python-magnumclient.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-magnumclient"
Fri May 3 22:41:07 2019 rev:6 rq:692834 version:2.12.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-magnumclient/python-magnumclient.changes
2018-09-07 15:37:49.866637475 +0200
+++
/work/SRC/openSUSE:Factory/.python-magnumclient.new.5148/python-magnumclient.changes
2019-05-03 22:41:09.291080823 +0200
@@ -1,0 +2,18 @@
+Mon Apr 8 12:22:35 UTC 2019 - [email protected]
+
+- update to version 2.12.0
+ - Add Python 3.6 classifier to setup.cfg
+ - Fix py37 compatibility
+ - Trivial: Update pypi url to new url
+ - [k8s] Add embed certs to config
+ - osc: Don't pass parameters with null value
+ - Use oslo_serialization instead of the json module directly
+ - switch documentation job to new PTI
+ - Fix crash on Service catalog empty 403 response
+ - add python 3.6 unit test job
+ - Use template for lower-constraints
+ - import zuul job settings from project-config
+ - Keystone auth support
+ - Add release notes for magnum client
+
+-------------------------------------------------------------------
Old:
----
python-magnumclient-2.10.0.tar.gz
New:
----
python-magnumclient-2.12.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-magnumclient.spec ++++++
--- /var/tmp/diff_new_pack.h3uw2S/_old 2019-05-03 22:41:09.719081724 +0200
+++ /var/tmp/diff_new_pack.h3uw2S/_new 2019-05-03 22:41:09.719081724 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-magnumclient
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,20 +12,19 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: python-magnumclient
-Version: 2.10.0
+Version: 2.12.0
Release: 0
Summary: Python API and CLI for OpenStack Magnum
License: Apache-2.0
Group: Development/Languages/Python
URL: https://launchpad.net/python-magnumclient
-Source0:
https://files.pythonhosted.org/packages/source/p/python-magnumclient/python-magnumclient-2.10.0.tar.gz
+Source0:
https://files.pythonhosted.org/packages/source/p/python-magnumclient/python-magnumclient-2.12.0.tar.gz
BuildRequires: openstack-macros
-BuildRequires: python-devel
BuildRequires: python2-PrettyTable >= 0.7.2
BuildRequires: python2-cryptography >= 2.1
BuildRequires: python2-decorator >= 3.4.0
@@ -49,7 +48,6 @@
BuildRequires: python3-PrettyTable >= 0.7.2
BuildRequires: python3-cryptography >= 2.1
BuildRequires: python3-decorator >= 3.4.0
-BuildRequires: python3-devel
BuildRequires: python3-fixtures
BuildRequires: python3-keystoneauth1 >= 3.4.0
BuildRequires: python3-mock
@@ -108,17 +106,16 @@
This package contains the documentation.
%prep
-%autosetup -p1 -n python-magnumclient-2.10.0
+%autosetup -p1 -n python-magnumclient-2.12.0
%py_req_cleanup
-sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
%build
%{python_build}
# Build HTML docs and man page
-PBR_VERSION=2.10.0 sphinx-build -b html doc/source doc/build/html
-PBR_VERSION=2.10.0 sphinx-build -b man doc/source doc/build/man
-rm -rf html/.{doctrees,buildinfo}
+PBR_VERSION=2.12.0 sphinx-build -b html doc/source doc/build/html
+PBR_VERSION=2.12.0 sphinx-build -b man doc/source doc/build/man
+rm -r doc/build/html/.{doctrees,buildinfo}
%install
%{python_install}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.h3uw2S/_old 2019-05-03 22:41:09.739081766 +0200
+++ /var/tmp/diff_new_pack.h3uw2S/_new 2019-05-03 22:41:09.739081766 +0200
@@ -1,8 +1,8 @@
<services>
<service mode="disabled" name="renderspec">
- <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/rocky/openstack/python-magnumclient/python-magnumclient.spec.j2</param>
+ <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/stein/openstack/python-magnumclient/python-magnumclient.spec.j2</param>
<param name="output-name">python-magnumclient.spec</param>
- <param
name="requirements">https://raw.githubusercontent.com/openstack/python-magnumclient/stable/rocky/requirements.txt</param>
+ <param
name="requirements">https://raw.githubusercontent.com/openstack/python-magnumclient/stable/stein/requirements.txt</param>
<param name="changelog-email">[email protected]</param>
<param name="changelog-provider">gh,openstack,python-magnumclient</param>
</service>
++++++ python-magnumclient-2.10.0.tar.gz -> python-magnumclient-2.12.0.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-magnumclient-2.10.0/.zuul.yaml
new/python-magnumclient-2.12.0/.zuul.yaml
--- old/python-magnumclient-2.10.0/.zuul.yaml 2018-08-06 23:13:07.000000000
+0200
+++ new/python-magnumclient-2.12.0/.zuul.yaml 2019-03-06 17:45:56.000000000
+0100
@@ -1,7 +1,16 @@
- project:
+ templates:
+ - check-requirements
+ - openstack-lower-constraints-jobs
+ - openstack-python-jobs
+ - openstack-python35-jobs
+ - openstack-python36-jobs
+ - publish-openstack-docs-pti
check:
jobs:
- - openstack-tox-lower-constraints
+ - build-openstack-releasenotes
+ - openstack-tox-cover:
+ voting: false
gate:
jobs:
- - openstack-tox-lower-constraints
+ - build-openstack-releasenotes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-magnumclient-2.10.0/AUTHORS
new/python-magnumclient-2.12.0/AUTHORS
--- old/python-magnumclient-2.10.0/AUTHORS 2018-08-06 23:16:07.000000000
+0200
+++ new/python-magnumclient-2.12.0/AUTHORS 2019-03-06 17:47:59.000000000
+0100
@@ -9,6 +9,7 @@
Andrew Melton <[email protected]>
Anh Tran <[email protected]>
Bharath Thiruveedula <[email protected]>
+Boris Pilka <[email protected]>
Cedric Brandily <[email protected]>
Christoph Jansen <[email protected]>
Clenimar Filemon <[email protected]>
@@ -22,11 +23,14 @@
Davanum Srinivas <[email protected]>
Davanum Srinivas <[email protected]>
David Liu <[email protected]>
+David Rabel <[email protected]>
Doug Hellmann <[email protected]>
Eli Qiao <[email protected]>
Eric Brown <[email protected]>
+Erik Olof Gunnar Andersson <[email protected]>
Fang Fenghua <[email protected]>
Fang fenghua <[email protected]>
+Feilong Wang <[email protected]>
Feng Shengqin <[email protected]>
Flavio Percoco <[email protected]>
Haiwei Xu <[email protected]>
@@ -60,6 +64,7 @@
Manjeet Singh Bhatia <[email protected]>
Mark Goddard <[email protected]>
Michael Lekkas <[email protected]>
+Michal Arbet <[email protected]>
Mike Fedosin <[email protected]>
Monty Taylor <[email protected]>
Motohiro OTSUKA <[email protected]>
@@ -84,6 +89,7 @@
Tom Cammann <[email protected]>
Tom Cammann <[email protected]>
Tovin Seven <[email protected]>
+Vieri <[email protected]>
Vijendar Komalla <[email protected]>
Vikas Choudhary <[email protected]>
Vilobh Meshram <[email protected]>
@@ -95,7 +101,6 @@
Yang Hongyang <[email protected]>
Yolanda Robla <[email protected]>
Zhenguo Niu <[email protected]>
-Zuul <[email protected]>
chenaidong1 <[email protected]>
chenlx <[email protected]>
coldmoment <[email protected]>
@@ -111,6 +116,7 @@
npraveen35 <[email protected]>
pawnesh.kumar <[email protected]>
phelanm <[email protected]>
+qingszhao <[email protected]>
rajat29 <[email protected]>
ricolin <[email protected]>
ricolin <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-magnumclient-2.10.0/ChangeLog
new/python-magnumclient-2.12.0/ChangeLog
--- old/python-magnumclient-2.10.0/ChangeLog 2018-08-06 23:16:07.000000000
+0200
+++ new/python-magnumclient-2.12.0/ChangeLog 2019-03-06 17:47:59.000000000
+0100
@@ -1,10 +1,32 @@
CHANGES
=======
+2.12.0
+------
+
+* Keystone auth support
+* Fix py37 compatibility
+* Use oslo\_serialization instead of the json module directly
+* Use template for lower-constraints
+* Add Python 3.6 classifier to setup.cfg
+* add python 3.6 unit test job
+* Trivial: Update pypi url to new url
+
+2.11.0
+------
+
+* Fix crash on Service catalog empty 403 response
+* add python 3.6 unit test job
+* switch documentation job to new PTI
+* import zuul job settings from project-config
+* Add release notes for magnum client
+* [k8s] Add embed certs to config
+
2.10.0
------
* Switch to stestr
+* osc: Don't pass parameters with null value
* fix tox python3 overrides
* Fix entrypoints for quotas
* Follow the new PTI for document build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-magnumclient-2.10.0/PKG-INFO
new/python-magnumclient-2.12.0/PKG-INFO
--- old/python-magnumclient-2.10.0/PKG-INFO 2018-08-06 23:16:07.000000000
+0200
+++ new/python-magnumclient-2.12.0/PKG-INFO 2019-03-06 17:48:00.000000000
+0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: python-magnumclient
-Version: 2.10.0
+Version: 2.12.0
Summary: Client library for Magnum API
Home-page: https://docs.openstack.org/python-magnumclient/latest/
Author: OpenStack
@@ -19,11 +19,11 @@
=================================
.. image:: https://img.shields.io/pypi/v/python-magnumclient.svg
- :target: https://pypi.python.org/pypi/python-magnumclient/
+ :target: https://pypi.org/project/python-magnumclient/
:alt: Latest Version
.. image:: https://img.shields.io/pypi/dm/python-magnumclient.svg
- :target: https://pypi.python.org/pypi/python-magnumclient/
+ :target: https://pypi.org/project/python-magnumclient/
:alt: Downloads
This is a client library for Magnum built on the Magnum API. It
@@ -41,7 +41,7 @@
* `Bugs`_ - issue tracking
* `Source`_
- .. _PyPi: https://pypi.python.org/pypi/python-magnumclient
+ .. _PyPi: https://pypi.org/project/python-magnumclient
.. _Online Documentation:
https://docs.openstack.org/python-magnumclient/latest/
.. _Launchpad project: https://launchpad.net/python-magnumclient
.. _Bugs: https://bugs.launchpad.net/python-magnumclient
@@ -59,3 +59,4 @@
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-magnumclient-2.10.0/README.rst
new/python-magnumclient-2.12.0/README.rst
--- old/python-magnumclient-2.10.0/README.rst 2018-08-06 23:13:07.000000000
+0200
+++ new/python-magnumclient-2.12.0/README.rst 2019-03-06 17:45:56.000000000
+0100
@@ -11,11 +11,11 @@
=================================
.. image:: https://img.shields.io/pypi/v/python-magnumclient.svg
- :target: https://pypi.python.org/pypi/python-magnumclient/
+ :target: https://pypi.org/project/python-magnumclient/
:alt: Latest Version
.. image:: https://img.shields.io/pypi/dm/python-magnumclient.svg
- :target: https://pypi.python.org/pypi/python-magnumclient/
+ :target: https://pypi.org/project/python-magnumclient/
:alt: Downloads
This is a client library for Magnum built on the Magnum API. It
@@ -33,7 +33,7 @@
* `Bugs`_ - issue tracking
* `Source`_
-.. _PyPi: https://pypi.python.org/pypi/python-magnumclient
+.. _PyPi: https://pypi.org/project/python-magnumclient
.. _Online Documentation:
https://docs.openstack.org/python-magnumclient/latest/
.. _Launchpad project: https://launchpad.net/python-magnumclient
.. _Bugs: https://bugs.launchpad.net/python-magnumclient
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-magnumclient-2.10.0/doc/requirements.txt
new/python-magnumclient-2.12.0/doc/requirements.txt
--- old/python-magnumclient-2.10.0/doc/requirements.txt 2018-08-06
23:13:07.000000000 +0200
+++ new/python-magnumclient-2.12.0/doc/requirements.txt 2019-03-06
17:45:56.000000000 +0100
@@ -1,2 +1,3 @@
sphinx!=1.6.6,>=1.6.2 # BSD
openstackdocstheme>=1.18.1 # Apache-2.0
+reno>=2.5.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-2.10.0/magnumclient/common/httpclient.py
new/python-magnumclient-2.12.0/magnumclient/common/httpclient.py
--- old/python-magnumclient-2.10.0/magnumclient/common/httpclient.py
2018-08-06 23:13:07.000000000 +0200
+++ new/python-magnumclient-2.12.0/magnumclient/common/httpclient.py
2019-03-06 17:45:56.000000000 +0100
@@ -16,13 +16,13 @@
# under the License.
import copy
-import json
import logging
import os
import socket
import ssl
from keystoneauth1 import adapter
+from oslo_serialization import jsonutils
from oslo_utils import importutils
import six
import six.moves.urllib.parse as urlparse
@@ -39,30 +39,40 @@
DEFAULT_API_VERSION = 'latest'
-def _extract_error_json(body):
- """Return error_message from the HTTP response body."""
+def _extract_error_json_text(body_json):
error_json = {}
- try:
- body_json = json.loads(body)
- if 'error_message' in body_json:
- raw_msg = body_json['error_message']
- error_json = json.loads(raw_msg)
- elif 'error' in body_json:
- error_body = body_json['error']
- error_json = {'faultstring': error_body['title'],
- 'debuginfo': error_body['message']}
- else:
- error_body = body_json['errors'][0]
- error_json = {'faultstring': error_body['title']}
- if 'detail' in error_body:
- error_json['debuginfo'] = error_body['detail']
- elif 'description' in error_body:
- error_json['debuginfo'] = error_body['description']
+ if 'error_message' in body_json:
+ raw_msg = body_json['error_message']
+ error_json = jsonutils.loads(raw_msg)
+ elif 'error' in body_json:
+ error_body = body_json['error']
+ error_json = {'faultstring': error_body['title'],
+ 'debuginfo': error_body['message']}
+ else:
+ error_body = body_json['errors'][0]
+ error_json = {'faultstring': error_body['title']}
+ if 'detail' in error_body:
+ error_json['debuginfo'] = error_body['detail']
+ elif 'description' in error_body:
+ error_json['debuginfo'] = error_body['description']
+ return error_json
- except ValueError:
- return {}
- return error_json
+def _extract_error_json(body, resp):
+ """Return error_message from the HTTP response body."""
+ content_type = resp.headers.get("Content-Type", "")
+ if content_type.startswith("application/json"):
+ try:
+ body_json = resp.json()
+ return _extract_error_json_text(body_json)
+ except ValueError:
+ return {}
+ else:
+ try:
+ body_json = jsonutils.loads(body)
+ return _extract_error_json_text(body_json)
+ except ValueError:
+ return {}
class HTTPClient(object):
@@ -200,7 +210,7 @@
if 400 <= resp.status < 600:
LOG.warning("Request returned failure status.")
- error_json = _extract_error_json(body_str)
+ error_json = _extract_error_json(body_str, resp)
raise exceptions.from_response(
resp, error_json.get('faultstring'),
error_json.get('debuginfo'), method, url)
@@ -218,7 +228,7 @@
kwargs['headers'].setdefault('Accept', 'application/json')
if 'body' in kwargs:
- kwargs['body'] = json.dumps(kwargs['body'])
+ kwargs['body'] = jsonutils.dumps(kwargs['body'])
resp, body_iter = self._http_request(url, method, **kwargs)
content_type = resp.getheader('content-type', None)
@@ -229,7 +239,7 @@
if 'application/json' in content_type:
body = ''.join([chunk for chunk in body_iter])
try:
- body = json.loads(body)
+ body = jsonutils.loads(body)
except ValueError:
LOG.error('Could not decode response body as JSON')
else:
@@ -346,7 +356,7 @@
raise_exc=False, **kwargs)
if 400 <= resp.status_code < 600:
- error_json = _extract_error_json(resp.content)
+ error_json = _extract_error_json(resp.content, resp)
raise exceptions.from_response(
resp, error_json.get('faultstring'),
error_json.get('debuginfo'), method, url)
@@ -363,7 +373,7 @@
kwargs['headers'].setdefault('Content-Type', 'application/json')
kwargs['headers'].setdefault('Accept', 'application/json')
if 'body' in kwargs:
- kwargs['data'] = json.dumps(kwargs.pop('body'))
+ kwargs['data'] = jsonutils.dumps(kwargs.pop('body'))
resp = self._http_request(url, method, **kwargs)
body = resp.content
@@ -396,7 +406,10 @@
def __iter__(self):
while True:
- yield self.next()
+ try:
+ yield self.next()
+ except StopIteration:
+ return
def __bool__(self):
return hasattr(self, 'items')
@@ -408,7 +421,7 @@
if chunk:
return chunk
else:
- raise StopIteration()
+ raise StopIteration
def _construct_http_client(*args, **kwargs):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-2.10.0/magnumclient/common/utils.py
new/python-magnumclient-2.12.0/magnumclient/common/utils.py
--- old/python-magnumclient-2.10.0/magnumclient/common/utils.py 2018-08-06
23:13:07.000000000 +0200
+++ new/python-magnumclient-2.12.0/magnumclient/common/utils.py 2019-03-06
17:46:00.000000000 +0100
@@ -15,7 +15,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-import json
+import base64
import os
from cryptography.hazmat.backends import default_backend
@@ -24,6 +24,7 @@
from cryptography.hazmat.primitives import serialization
from cryptography import x509
from cryptography.x509.oid import NameOID
+from oslo_serialization import jsonutils
from magnumclient import exceptions as exc
from magnumclient.i18n import _
@@ -63,7 +64,7 @@
raise exc.CommandError(_('Attributes must be a list of '
'PATH=VALUE not "%s"') % string)
try:
- value = json.loads(value)
+ value = jsonutils.loads(value)
except ValueError:
pass
@@ -99,7 +100,7 @@
if 'mesos_slave_executor_env_file' in labels:
environment_variables_data = handle_json_from_file(
labels['mesos_slave_executor_env_file'])
- labels['mesos_slave_executor_env_variables'] = json.dumps(
+ labels['mesos_slave_executor_env_variables'] = jsonutils.dumps(
environment_variables_data)
return labels
@@ -145,7 +146,7 @@
try:
with open(json_arg, 'r') as f:
json_arg = f.read().strip()
- json_arg = json.loads(json_arg)
+ json_arg = jsonutils.loads(json_arg)
except IOError as e:
err = _("Cannot get JSON from file '%(file)s'. "
"Error: %(err)s") % {'err': e, 'file': json_arg}
@@ -158,21 +159,23 @@
return json_arg
-def config_cluster(cluster, cluster_template, cfg_dir, force=False):
+def config_cluster(cluster, cluster_template, cfg_dir, force=False,
+ certs=None, use_keystone=False):
"""Return and write configuration for the given cluster."""
if cluster_template.coe == 'kubernetes':
- return _config_cluster_kubernetes(cluster, cluster_template,
- cfg_dir, force)
+ return _config_cluster_kubernetes(cluster, cluster_template, cfg_dir,
+ force, certs, use_keystone)
elif (cluster_template.coe == 'swarm'
or cluster_template.coe == 'swarm-mode'):
- return _config_cluster_swarm(cluster, cluster_template, cfg_dir, force)
+ return _config_cluster_swarm(cluster, cluster_template, cfg_dir,
+ force, certs)
-def _config_cluster_kubernetes(cluster, cluster_template,
- cfg_dir, force=False):
+def _config_cluster_kubernetes(cluster, cluster_template, cfg_dir,
+ force=False, certs=None, use_keystone=False):
"""Return and write configuration for the given kubernetes cluster."""
cfg_file = "%s/config" % cfg_dir
- if cluster_template.tls_disabled:
+ if cluster_template.tls_disabled or certs is None:
cfg = ("apiVersion: v1\n"
"clusters:\n"
"- cluster:\n"
@@ -190,28 +193,64 @@
"- name: %(name)s'\n"
% {'name': cluster.name, 'api_address': cluster.api_address})
else:
- cfg = ("apiVersion: v1\n"
- "clusters:\n"
- "- cluster:\n"
- " certificate-authority: %(cfg_dir)s/ca.pem\n"
- " server: %(api_address)s\n"
- " name: %(name)s\n"
- "contexts:\n"
- "- context:\n"
- " cluster: %(name)s\n"
- " user: admin\n"
- " name: default\n"
- "current-context: default\n"
- "kind: Config\n"
- "preferences: {}\n"
- "users:\n"
- "- name: admin\n"
- " user:\n"
- " client-certificate: %(cfg_dir)s/cert.pem\n"
- " client-key: %(cfg_dir)s/key.pem\n"
- % {'name': cluster.name,
- 'api_address': cluster.api_address,
- 'cfg_dir': cfg_dir})
+ if not use_keystone:
+ cfg = ("apiVersion: v1\n"
+ "clusters:\n"
+ "- cluster:\n"
+ " certificate-authority-data: %(ca)s\n"
+ " server: %(api_address)s\n"
+ " name: %(name)s\n"
+ "contexts:\n"
+ "- context:\n"
+ " cluster: %(name)s\n"
+ " user: admin\n"
+ " name: default\n"
+ "current-context: default\n"
+ "kind: Config\n"
+ "preferences: {}\n"
+ "users:\n"
+ "- name: admin\n"
+ " user:\n"
+ " client-certificate-data: %(cert)s\n"
+ " client-key-data: %(key)s\n"
+ % {'name': cluster.name,
+ 'api_address': cluster.api_address,
+ 'key': base64.b64encode(certs['key']),
+ 'cert': base64.b64encode(certs['cert']),
+ 'ca': base64.b64encode(certs['ca'])})
+ else:
+ cfg = ("apiVersion: v1\n"
+ "clusters:\n"
+ "- cluster:\n"
+ " certificate-authority-data: %(ca)s\n"
+ " server: %(api_address)s\n"
+ " name: %(name)s\n"
+ "contexts:\n"
+ "- context:\n"
+ " cluster: %(name)s\n"
+ " user: openstackuser\n"
+ " name: openstackuser@kubernetes\n"
+ "current-context: openstackuser@kubernetes\n"
+ "kind: Config\n"
+ "preferences: {}\n"
+ "users:\n"
+ "- name: openstackuser\n"
+ " user:\n"
+ " exec:\n"
+ " command: /bin/bash\n"
+ " apiVersion: client.authentication.k8s.io/v1alpha1\n"
+ " args:\n"
+ " - -c\n"
+ " - >\n"
+ " if [ -z ${OS_TOKEN} ]; then\n"
+ " echo 'Error: Missing OpenStack credential from
environment variable $OS_TOKEN' > /dev/stderr\n" # noqa
+ " exit 1\n"
+ " else\n"
+ " echo '{ \"apiVersion\":
\"client.authentication.k8s.io/v1alpha1\", \"kind\": \"ExecCredential\",
\"status\": { \"token\": \"'\"${OS_TOKEN}\"'\"}}'\n" # noqa
+ " fi\n"
+ % {'name': cluster.name,
+ 'api_address': cluster.api_address,
+ 'ca': base64.b64encode(certs['ca'])})
if os.path.exists(cfg_file) and not force:
raise exc.CommandError("File %s exists, aborting." % cfg_file)
@@ -225,7 +264,8 @@
return "export KUBECONFIG=%s\n" % cfg_file
-def _config_cluster_swarm(cluster, cluster_template, cfg_dir, force=False):
+def _config_cluster_swarm(cluster, cluster_template, cfg_dir,
+ force=False, certs=None):
"""Return and write configuration for the given swarm cluster."""
tls = "" if cluster_template.tls_disabled else True
if 'csh' in os.environ['SHELL']:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-2.10.0/magnumclient/osc/v1/clusters.py
new/python-magnumclient-2.12.0/magnumclient/osc/v1/clusters.py
--- old/python-magnumclient-2.10.0/magnumclient/osc/v1/clusters.py
2018-08-06 23:13:07.000000000 +0200
+++ new/python-magnumclient-2.12.0/magnumclient/osc/v1/clusters.py
2019-03-06 17:45:56.000000000 +0100
@@ -124,18 +124,24 @@
'cluster_template_id': parsed_args.cluster_template,
'create_timeout': parsed_args.timeout,
'discovery_url': parsed_args.discovery_url,
- 'docker_volume_size': parsed_args.docker_volume_size,
'keypair': parsed_args.keypair,
'master_count': parsed_args.master_count,
'name': parsed_args.name,
'node_count': parsed_args.node_count,
- 'master_flavor_id': parsed_args.master_flavor,
- 'flavor_id': parsed_args.flavor,
}
if parsed_args.labels is not None:
args['labels'] = magnum_utils.handle_labels(parsed_args.labels)
+ if parsed_args.docker_volume_size is not None:
+ args['docker_volume_size'] = parsed_args.docker_volume_size
+
+ if parsed_args.master_flavor is not None:
+ args['master_flavor_id'] = parsed_args.master_flavor
+
+ if parsed_args.flavor is not None:
+ args['flavor_id'] = parsed_args.flavor
+
cluster = mag_client.clusters.create(**args)
print("Request to create cluster %s accepted"
% cluster.uuid)
@@ -293,6 +299,24 @@
dest='force',
default=False,
help=_('Overwrite files if existing.'))
+ parser.add_argument(
+ '--output-certs',
+ action='store_true',
+ dest='output_certs',
+ default=False,
+ help=_('Output certificates in separate files.'))
+ parser.add_argument(
+ '--use-certificate',
+ action='store_true',
+ dest='use_certificate',
+ default=True,
+ help=_('Use certificate in config files.'))
+ parser.add_argument(
+ '--use-keystone',
+ action='store_true',
+ dest='use_keystone',
+ default=False,
+ help=_('Use Keystone token in config files.'))
return parser
@@ -303,6 +327,11 @@
the corresponding COE configured to access the cluster.
"""
+ if parsed_args.use_keystone:
+ parsed_args.use_certificate = False
+ if not parsed_args.use_certificate:
+ parsed_args.use_keystone = True
+
self.log.debug("take_action(%s)", parsed_args)
mag_client = self.app.client_manager.container_infra
@@ -319,21 +348,22 @@
'cluster_uuid': cluster.uuid,
}
+ tls = None
if not cluster_template.tls_disabled:
tls = magnum_utils.generate_csr_and_key()
tls['ca'] = mag_client.certificates.get(**opts).pem
opts['csr'] = tls['csr']
tls['cert'] = mag_client.certificates.create(**opts).pem
- for k in ('key', 'cert', 'ca'):
- fname = "%s/%s.pem" % (parsed_args.dir, k)
- if os.path.exists(fname) and not parsed_args.force:
- raise Exception("File %s exists, aborting." % fname)
- else:
- f = open(fname, "w")
- f.write(tls[k])
- f.close()
-
- print(magnum_utils.config_cluster(cluster,
- cluster_template,
- parsed_args.dir,
- force=parsed_args.force))
+ if parsed_args.output_certs:
+ for k in ('key', 'cert', 'ca'):
+ fname = "%s/%s.pem" % (parsed_args.dir, k)
+ if os.path.exists(fname) and not parsed_args.force:
+ raise Exception("File %s exists, aborting." % fname)
+ else:
+ with open(fname, "w") as f:
+ f.write(tls[k])
+
+ print(magnum_utils.config_cluster(
+ cluster, cluster_template, parsed_args.dir,
+ force=parsed_args.force, certs=tls,
+ use_keystone=parsed_args.use_keystone))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-2.10.0/magnumclient/tests/osc/unit/osc_fakes.py
new/python-magnumclient-2.12.0/magnumclient/tests/osc/unit/osc_fakes.py
--- old/python-magnumclient-2.10.0/magnumclient/tests/osc/unit/osc_fakes.py
2018-08-06 23:13:07.000000000 +0200
+++ new/python-magnumclient-2.12.0/magnumclient/tests/osc/unit/osc_fakes.py
2019-03-06 17:45:56.000000000 +0100
@@ -13,13 +13,12 @@
# under the License.
#
-import json
import mock
+from oslo_serialization import jsonutils
import sys
from keystoneauth1 import fixture
import requests
-import six
AUTH_TOKEN = "foobar"
AUTH_URL = "http://0.0.0.0"
@@ -239,9 +238,7 @@
self.status_code = status_code
self.headers.update(headers)
- self._content = json.dumps(data)
- if not isinstance(self._content, six.binary_type):
- self._content = self._content.encode()
+ self._content = jsonutils.dump_as_bytes(data)
class FakeModel(dict):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-2.10.0/magnumclient/tests/osc/unit/v1/test_clusters.py
new/python-magnumclient-2.12.0/magnumclient/tests/osc/unit/v1/test_clusters.py
---
old/python-magnumclient-2.10.0/magnumclient/tests/osc/unit/v1/test_clusters.py
2018-08-06 23:13:07.000000000 +0200
+++
new/python-magnumclient-2.12.0/magnumclient/tests/osc/unit/v1/test_clusters.py
2019-03-06 17:46:00.000000000 +0100
@@ -52,13 +52,10 @@
'cluster_template_id': 'fake-ct',
'create_timeout': 60,
'discovery_url': None,
- 'docker_volume_size': None,
- 'flavor_id': None,
'keypair': None,
'master_count': 1,
'name': 'fake-cluster-1',
'node_count': 1,
- 'master_flavor_id': None,
}
self.clusters_mock.create = mock.Mock()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-2.10.0/magnumclient/tests/test_httpclient.py
new/python-magnumclient-2.12.0/magnumclient/tests/test_httpclient.py
--- old/python-magnumclient-2.10.0/magnumclient/tests/test_httpclient.py
2018-08-06 23:13:07.000000000 +0200
+++ new/python-magnumclient-2.12.0/magnumclient/tests/test_httpclient.py
2019-03-06 17:45:56.000000000 +0100
@@ -13,9 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
-import json
-
import mock
+from oslo_serialization import jsonutils
import six
import socket
@@ -37,7 +36,7 @@
'faultstring': faultstring,
'debuginfo': debuginfo
}
- raw_error_body = json.dumps(error_body)
+ raw_error_body = jsonutils.dumps(error_body)
body = {'error_message': raw_error_body}
elif err_type == ERROR_DICT:
body = {'error': {'title': faultstring, 'message': debuginfo}}
@@ -47,7 +46,7 @@
elif err_type == ERROR_LIST_WITH_DESC:
main_body = {'title': faultstring, 'description': debuginfo}
body = {'errors': [main_body]}
- raw_body = json.dumps(body)
+ raw_body = jsonutils.dumps(body)
return raw_body
@@ -347,7 +346,7 @@
resp, body = client.json_request('GET', '/v1/resources')
self.assertEqual(resp, fake_resp)
- self.assertEqual(json.dumps(body), err)
+ self.assertEqual(jsonutils.dumps(body), err)
def test_raw_request(self):
fake_resp = utils.FakeResponse(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-2.10.0/magnumclient/tests/test_utils.py
new/python-magnumclient-2.12.0/magnumclient/tests/test_utils.py
--- old/python-magnumclient-2.10.0/magnumclient/tests/test_utils.py
2018-08-06 23:13:07.000000000 +0200
+++ new/python-magnumclient-2.12.0/magnumclient/tests/test_utils.py
2019-03-06 17:45:56.000000000 +0100
@@ -17,7 +17,7 @@
import collections
import mock
-from oslo_serialization import jsonutils as json
+from oslo_serialization import jsonutils
import six
import six.moves.builtins as __builtin__
import tempfile
@@ -261,7 +261,7 @@
f.flush()
steps = utils.handle_json_from_file(f.name)
- self.assertEqual(json.loads(contents), steps)
+ self.assertEqual(jsonutils.loads(contents), steps)
@mock.patch.object(__builtin__, 'open', autospec=True)
def test_handle_json_from_file_open_fail(self, mock_open):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-2.10.0/magnumclient/tests/utils.py
new/python-magnumclient-2.12.0/magnumclient/tests/utils.py
--- old/python-magnumclient-2.10.0/magnumclient/tests/utils.py 2018-08-06
23:13:07.000000000 +0200
+++ new/python-magnumclient-2.12.0/magnumclient/tests/utils.py 2019-03-06
17:45:56.000000000 +0100
@@ -16,6 +16,7 @@
import copy
import datetime
import os
+from oslo_serialization import jsonutils
import sys
import fixtures
@@ -179,6 +180,12 @@
self.content = content
self.status_code = status_code
+ def json(self):
+ if self.content is not None:
+ return jsonutils.loads(self.content)
+ else:
+ return {}
+
class FakeSession(object):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-2.10.0/python_magnumclient.egg-info/PKG-INFO
new/python-magnumclient-2.12.0/python_magnumclient.egg-info/PKG-INFO
--- old/python-magnumclient-2.10.0/python_magnumclient.egg-info/PKG-INFO
2018-08-06 23:16:07.000000000 +0200
+++ new/python-magnumclient-2.12.0/python_magnumclient.egg-info/PKG-INFO
2019-03-06 17:48:00.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: python-magnumclient
-Version: 2.10.0
+Version: 2.12.0
Summary: Client library for Magnum API
Home-page: https://docs.openstack.org/python-magnumclient/latest/
Author: OpenStack
@@ -19,11 +19,11 @@
=================================
.. image:: https://img.shields.io/pypi/v/python-magnumclient.svg
- :target: https://pypi.python.org/pypi/python-magnumclient/
+ :target: https://pypi.org/project/python-magnumclient/
:alt: Latest Version
.. image:: https://img.shields.io/pypi/dm/python-magnumclient.svg
- :target: https://pypi.python.org/pypi/python-magnumclient/
+ :target: https://pypi.org/project/python-magnumclient/
:alt: Downloads
This is a client library for Magnum built on the Magnum API. It
@@ -41,7 +41,7 @@
* `Bugs`_ - issue tracking
* `Source`_
- .. _PyPi: https://pypi.python.org/pypi/python-magnumclient
+ .. _PyPi: https://pypi.org/project/python-magnumclient
.. _Online Documentation:
https://docs.openstack.org/python-magnumclient/latest/
.. _Launchpad project: https://launchpad.net/python-magnumclient
.. _Bugs: https://bugs.launchpad.net/python-magnumclient
@@ -59,3 +59,4 @@
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-2.10.0/python_magnumclient.egg-info/SOURCES.txt
new/python-magnumclient-2.12.0/python_magnumclient.egg-info/SOURCES.txt
--- old/python-magnumclient-2.10.0/python_magnumclient.egg-info/SOURCES.txt
2018-08-06 23:16:07.000000000 +0200
+++ new/python-magnumclient-2.12.0/python_magnumclient.egg-info/SOURCES.txt
2019-03-06 17:48:00.000000000 +0100
@@ -115,5 +115,9 @@
python_magnumclient.egg-info/top_level.txt
releasenotes/notes/partial_osc_implementation_for_certificate-4597c20b59c152e1.yaml
releasenotes/notes/partial_osc_implementation_for_quotas-33f44c0496d721f8.yaml
+releasenotes/source/conf.py
+releasenotes/source/index.rst
+releasenotes/source/rocky.rst
+releasenotes/source/unreleased.rst
tools/cover.sh
tools/magnum.bash_completion
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-2.10.0/python_magnumclient.egg-info/pbr.json
new/python-magnumclient-2.12.0/python_magnumclient.egg-info/pbr.json
--- old/python-magnumclient-2.10.0/python_magnumclient.egg-info/pbr.json
2018-08-06 23:16:07.000000000 +0200
+++ new/python-magnumclient-2.12.0/python_magnumclient.egg-info/pbr.json
2019-03-06 17:48:00.000000000 +0100
@@ -1 +1 @@
-{"git_version": "3e728f9", "is_release": true}
\ No newline at end of file
+{"git_version": "37e602d", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-2.10.0/releasenotes/source/conf.py
new/python-magnumclient-2.12.0/releasenotes/source/conf.py
--- old/python-magnumclient-2.10.0/releasenotes/source/conf.py 1970-01-01
01:00:00.000000000 +0100
+++ new/python-magnumclient-2.12.0/releasenotes/source/conf.py 2019-03-06
17:45:56.000000000 +0100
@@ -0,0 +1,276 @@
+# 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.
+
+# Magnum-Client documentation build configuration file, created by
+# sphinx-quickstart on Tue Dec 20 11:53:00 2016.
+#
+# 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 = [
+ 'openstackdocstheme',
+ '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'MagnumClientReleaseNotes'
+copyright = u'2016, OpenStack Foundation'
+
+# Release notes are version independent.
+# The short X.Y version.
+version = ''
+# The full version, including alpha/beta/rc tags.
+release = ''
+
+# 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 = 'openstackdocs'
+
+# 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
+# "<project> v<release> 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 <link> 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 = 'MagnumClientReleaseNotesdoc'
+
+
+# -- Options for LaTeX output ---------------------------------------------
+
+# The item in 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': '',
+latex_elements = {}
+
+# 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', 'MagnumClientReleaseNotes.tex',
+ u'MagnumClient ReleaseNotes Documentation',
+ u'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 = [
+ ('index', 'MagnumClientReleaseNotes',
+ u'MagnumClient ReleaseNotes Documentation',
+ [u'OpenStack Foundation'], 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', 'MagnumClientReleaseNotes',
+ u'MagnumClient ReleaseNotes Documentation',
+ u'OpenStack Foundation', 'MagnumClientReleaseNotes',
+ '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 Internationalization output ------------------------------
+locale_dirs = ['locale/']
+
+# -- Options for openstackdocstheme -------------------------------------------
+repository_name = 'openstack/python-magnumclient'
+bug_project = 'python-magnumclient'
+bug_tag = ''
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-2.10.0/releasenotes/source/index.rst
new/python-magnumclient-2.12.0/releasenotes/source/index.rst
--- old/python-magnumclient-2.10.0/releasenotes/source/index.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/python-magnumclient-2.12.0/releasenotes/source/index.rst
2019-03-06 17:45:56.000000000 +0100
@@ -0,0 +1,33 @@
+============================
+ Magnum Client Release Notes
+============================
+
+.. toctree::
+ :maxdepth: 1
+
+ unreleased
+ rocky
+
+OpenStack Releases
+------------------
+
+The MagnumClient release that was current when the corresponding
+OpenStack release was made is shown below:
+
+================= ====================
+OpenStack Release MagnumClient Release
+================= ====================
+Rocky 2.10.0
+================= ====================
+
+Further details for historical OpenStack releases are found at the
+`OpenStack Releases`_ page.
+
+.. _`OpenStack Releases`: https://releases.openstack.org/
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-2.10.0/releasenotes/source/rocky.rst
new/python-magnumclient-2.12.0/releasenotes/source/rocky.rst
--- old/python-magnumclient-2.10.0/releasenotes/source/rocky.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/python-magnumclient-2.12.0/releasenotes/source/rocky.rst
2019-03-06 17:45:56.000000000 +0100
@@ -0,0 +1,6 @@
+===================================
+ Rocky Series Release Notes
+===================================
+
+.. release-notes::
+ :branch: stable/rocky
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-2.10.0/releasenotes/source/unreleased.rst
new/python-magnumclient-2.12.0/releasenotes/source/unreleased.rst
--- old/python-magnumclient-2.10.0/releasenotes/source/unreleased.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/python-magnumclient-2.12.0/releasenotes/source/unreleased.rst
2019-03-06 17:45:56.000000000 +0100
@@ -0,0 +1,5 @@
+=====================
+Current Release Notes
+=====================
+
+.. release-notes::
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-magnumclient-2.10.0/setup.cfg
new/python-magnumclient-2.12.0/setup.cfg
--- old/python-magnumclient-2.10.0/setup.cfg 2018-08-06 23:16:07.000000000
+0200
+++ new/python-magnumclient-2.12.0/setup.cfg 2019-03-06 17:48:00.000000000
+0100
@@ -17,6 +17,7 @@
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
Programming Language :: Python :: 3.5
+ Programming Language :: Python :: 3.6
[files]
packages =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-magnumclient-2.10.0/tox.ini
new/python-magnumclient-2.12.0/tox.ini
--- old/python-magnumclient-2.10.0/tox.ini 2018-08-06 23:13:17.000000000
+0200
+++ new/python-magnumclient-2.12.0/tox.ini 2019-03-06 17:45:56.000000000
+0100
@@ -1,6 +1,6 @@
[tox]
minversion = 1.6
-envlist = py35,py27,pypy,pep8
+envlist = py36,py35,py27,pypy,pep8
skipsdist = True
[testenv]
@@ -83,3 +83,10 @@
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
+
+[testenv:releasenotes]
+basepython = python3
+deps = -r{toxinidir}/doc/requirements.txt
+commands =
+ rm -rf releasenotes/build
+ sphinx-build -a -E -W -d releasenotes/build/doctrees -b html
releasenotes/source releasenotes/build/html