Hello community,
here is the log from the commit of package python-masakariclient for
openSUSE:Factory checked in at 2018-09-07 15:37:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-masakariclient (Old)
and /work/SRC/openSUSE:Factory/.python-masakariclient.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-masakariclient"
Fri Sep 7 15:37:53 2018 rev:4 rq:633079 version:5.2.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-masakariclient/python-masakariclient.changes
2018-03-19 23:34:51.312978732 +0100
+++
/work/SRC/openSUSE:Factory/.python-masakariclient.new/python-masakariclient.changes
2018-09-07 15:37:53.482633589 +0200
@@ -1,0 +2,13 @@
+Sat Sep 1 09:03:19 UTC 2018 - [email protected]
+
+- update to version 5.2.0
+ - fix tox python3 overrides
+ - Update for upcoming openstacksdk changes
+ - Re-factor test cases to reduce code
+ - Avoid tox_install.sh for constraints support
+ - Add support for auto_priority, rh_priority recovery method
+ - Updated from global requirements
+ - add lower-constraints job
+ - Remove masakariclient's proxy class
+
+-------------------------------------------------------------------
Old:
----
python-masakariclient-4.0.0.tar.gz
New:
----
python-masakariclient-5.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-masakariclient.spec ++++++
--- /var/tmp/diff_new_pack.RAvSUX/_old 2018-09-07 15:37:53.866633177 +0200
+++ /var/tmp/diff_new_pack.RAvSUX/_new 2018-09-07 15:37:53.866633177 +0200
@@ -18,34 +18,34 @@
%global sname python-masakariclient
Name: python-masakariclient
-Version: 4.0.0
+Version: 5.2.0
Release: 0
Summary: Python API and CLI for OpenStack Masakari
License: Apache-2.0
Group: Development/Languages/Python
-Url: http://launchpad.net/%{name}
+URL: https://launchpad.net/%{name}
Source0:
https://files.pythonhosted.org/packages/source/p/%{sname}/%{sname}-%{version}.tar.gz
BuildRequires: openstack-macros
-BuildRequires: python-PrettyTable >= 0.7.1
-BuildRequires: python-ddt >= 1.0.1
-BuildRequires: python-nose >= 1.3.7
-BuildRequires: python-openstacksdk >= 0.9.19
+BuildRequires: python-PrettyTable
+BuildRequires: python-ddt
+BuildRequires: python-nose
+BuildRequires: python-openstacksdk >= 0.13.0
BuildRequires: python-osc-lib >= 1.8.0
BuildRequires: python-oslo.serialization >= 2.18.0
-BuildRequires: python-oslo.utils >= 3.33.0
-BuildRequires: python-oslosphinx >= 4.7.0
-BuildRequires: python-oslotest >= 3.2.0
-BuildRequires: python-python-subunit >= 1.0.0
-BuildRequires: python-reno >= 2.5.0
-BuildRequires: python-requests-mock >= 1.1.0
-BuildRequires: python-sphinx >= 1.6.2
-BuildRequires: python-testrepository >= 0.0.18
-BuildRequires: python-testscenarios >= 0.4
-BuildRequires: python-testtools >= 2.2.0
-Requires: python-openstacksdk >= 0.9.19
+BuildRequires: python-oslo.utils
+BuildRequires: python-oslosphinx
+BuildRequires: python-oslotest
+BuildRequires: python-python-subunit
+BuildRequires: python-reno
+BuildRequires: python-requests-mock
+BuildRequires: python-sphinx
+BuildRequires: python-testrepository
+BuildRequires: python-testscenarios
+BuildRequires: python-testtools
+Requires: python-openstacksdk >= 0.13.0
Requires: python-oslo.i18n >= 3.15.3
Requires: python-oslo.serialization >= 2.18.0
-Requires: python-oslo.utils >= 3.33.0
+Requires: python-oslo.utils
Requires: python-pbr >= 2.0.0
BuildArch: noarch
@@ -57,7 +57,7 @@
Summary: Documentation for OpenStack Masakari API client libary
Group: Documentation/HTML
BuildRequires: python-Sphinx
-BuildRequires: python-oslosphinx >= 4.7.0
+BuildRequires: python-oslosphinx
%description doc
Client library for Masakari built on the Masakari API. It provides a Python API
++++++ _service ++++++
--- /var/tmp/diff_new_pack.RAvSUX/_old 2018-09-07 15:37:53.886633155 +0200
+++ /var/tmp/diff_new_pack.RAvSUX/_new 2018-09-07 15:37:53.890633151 +0200
@@ -1,8 +1,8 @@
<services>
<service mode="disabled" name="renderspec">
- <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/queens/openstack/python-masakariclient/python-masakariclient.spec.j2</param>
+ <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/rocky/openstack/python-masakariclient/python-masakariclient.spec.j2</param>
<param name="output-name">python-masakariclient.spec</param>
- <param
name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/queens/requirements.txt</param>
+ <param
name="requirements">https://raw.githubusercontent.com/openstack/python-masakariclient/stable/rocky/requirements.txt</param>
<param name="changelog-email">[email protected]</param>
<param name="changelog-provider">gh,openstack,python-masakariclient</param>
</service>
++++++ python-masakariclient-4.0.0.tar.gz -> python-masakariclient-5.2.0.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-4.0.0/.zuul.yaml
new/python-masakariclient-5.2.0/.zuul.yaml
--- old/python-masakariclient-4.0.0/.zuul.yaml 1970-01-01 01:00:00.000000000
+0100
+++ new/python-masakariclient-5.2.0/.zuul.yaml 2018-07-26 16:06:13.000000000
+0200
@@ -0,0 +1,7 @@
+- project:
+ check:
+ jobs:
+ - openstack-tox-lower-constraints
+ gate:
+ jobs:
+ - openstack-tox-lower-constraints
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-4.0.0/AUTHORS
new/python-masakariclient-5.2.0/AUTHORS
--- old/python-masakariclient-4.0.0/AUTHORS 2017-09-07 17:24:46.000000000
+0200
+++ new/python-masakariclient-5.2.0/AUTHORS 2018-07-26 16:10:35.000000000
+0200
@@ -1,9 +1,13 @@
+Andreas Jaeger <[email protected]>
Dinesh Bhor <[email protected]>
+Doug Hellmann <[email protected]>
Keiji Niwa <[email protected]>
Kengo Takahara <[email protected]>
Kengo Takahara <[email protected]>
+Monty Taylor <[email protected]>
Rikimaru Honjo <[email protected]>
Takahiro Izumi <[email protected]>
+Zuul <[email protected]>
avnish <[email protected]>
dineshbhor <[email protected]>
ericxiett <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-4.0.0/ChangeLog
new/python-masakariclient-5.2.0/ChangeLog
--- old/python-masakariclient-4.0.0/ChangeLog 2017-09-07 17:24:46.000000000
+0200
+++ new/python-masakariclient-5.2.0/ChangeLog 2018-07-26 16:10:35.000000000
+0200
@@ -1,9 +1,25 @@
CHANGES
=======
-4.0.0
+5.2.0
-----
+* fix tox python3 overrides
+* add lower-constraints job
+
+5.1.0
+-----
+
+* Remove masakariclient's proxy class
+* Updated from global requirements
+* Updated from global requirements
+
+5.0.0
+-----
+
+* Update for upcoming openstacksdk changes
+* Updated from global requirements
+* Avoid tox\_install.sh for constraints support
* Add support for auto\_priority, rh\_priority recovery method
* Re-factor test cases to reduce code
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-4.0.0/PKG-INFO
new/python-masakariclient-5.2.0/PKG-INFO
--- old/python-masakariclient-4.0.0/PKG-INFO 2017-09-07 17:24:47.000000000
+0200
+++ new/python-masakariclient-5.2.0/PKG-INFO 2018-07-26 16:10:36.000000000
+0200
@@ -1,12 +1,11 @@
Metadata-Version: 1.1
Name: python-masakariclient
-Version: 4.0.0
+Version: 5.2.0
Summary: masakariclient module and a CLI tool for masakari
Home-page: http://www.openstack.org/
Author: OpenStack
Author-email: [email protected]
License: UNKNOWN
-Description-Content-Type: UNKNOWN
Description: ===============================
python-masakariclient
===============================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-4.0.0/RELEASENOTES.rst
new/python-masakariclient-5.2.0/RELEASENOTES.rst
--- old/python-masakariclient-4.0.0/RELEASENOTES.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/python-masakariclient-5.2.0/RELEASENOTES.rst 2018-07-26
16:10:36.000000000 +0200
@@ -0,0 +1,3 @@
+=====================
+python-masakariclient
+=====================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-4.0.0/lower-constraints.txt
new/python-masakariclient-5.2.0/lower-constraints.txt
--- old/python-masakariclient-4.0.0/lower-constraints.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/python-masakariclient-5.2.0/lower-constraints.txt 2018-07-26
16:06:13.000000000 +0200
@@ -0,0 +1,73 @@
+alabaster==0.7.10
+appdirs==1.3.0
+Babel==2.3.4
+cliff==2.8.0
+cmd2==0.8.0
+coverage==4.0
+ddt==1.0.1
+debtcollector==1.2.0
+decorator==3.4.0
+deprecation==1.0
+docutils==0.11
+dogpile.cache==0.6.2
+dulwich==0.15.0
+extras==1.0.0
+fixtures==3.0.0
+flake8==2.5.5
+future==0.16.0
+hacking==0.12.0
+imagesize==0.7.1
+iso8601==0.1.11
+Jinja2==2.10
+jmespath==0.9.0
+jsonpatch==1.16
+jsonpointer==1.13
+keystoneauth1==3.4.0
+linecache2==1.0.0
+MarkupSafe==1.0
+mccabe==0.2.1
+mock==2.0.0
+monotonic==0.6
+mox3==0.20.0
+msgpack-python==0.4.0
+munch==2.1.0
+netaddr==0.7.18
+netifaces==0.10.4
+openstacksdk==0.13.0
+os-client-config==1.28.0
+os-service-types==1.2.0
+os-testr==1.0.0
+osc-lib==1.8.0
+oslo.i18n==3.15.3
+oslo.serialization==2.18.0
+oslo.utils==3.33.0
+oslosphinx==4.7.0
+oslotest==3.2.0
+pbr==2.0.0
+pep8==1.5.7
+prettytable==0.7.2
+pyflakes==0.8.1
+Pygments==2.2.0
+pyparsing==2.1.0
+pyperclip==1.5.27
+python-mimeparse==1.6.0
+python-subunit==1.0.0
+pytz==2013.6
+PyYAML==3.12
+reno==2.5.0
+requests-mock==1.2.0
+requests==2.14.2
+requestsexceptions==1.2.0
+simplejson==3.5.1
+six==1.10.0
+snowballstemmer==1.2.1
+Sphinx==1.6.2
+sphinxcontrib-websupport==1.0.1
+stestr==1.0.0
+stevedore==1.20.0
+testrepository==0.0.18
+testscenarios==0.4
+testtools==2.2.0
+traceback2==1.4.0
+unittest2==1.1.0
+wrapt==1.7.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-4.0.0/masakariclient/osc/v1/host.py
new/python-masakariclient-5.2.0/masakariclient/osc/v1/host.py
--- old/python-masakariclient-4.0.0/masakariclient/osc/v1/host.py
2017-09-07 17:19:22.000000000 +0200
+++ new/python-masakariclient-5.2.0/masakariclient/osc/v1/host.py
2018-07-26 16:06:13.000000000 +0200
@@ -246,7 +246,7 @@
try:
masakari_client.update_host(
- segment_id=segment_id, host=uuid, **attrs)
+ uuid, segment_id=segment_id, **attrs)
except sdk_exc.NotFoundException:
# Reraise. To unify exceptions with other functions.
LOG.debug(_("Segment host is not found: %s"), parsed_args)
@@ -284,13 +284,14 @@
masakari_client,
parsed_args.host,
segment=segment_id)
- masakari_client.delete_host(segment_id, uuid, False)
+ masakari_client.delete_host(
+ uuid, segment_id=segment_id, ignore_missing=False)
print('Host deleted: %s' % parsed_args.host)
def _show_host(masakari_client, segment_id, uuid):
try:
- host = masakari_client.get_host(segment_id, uuid)
+ host = masakari_client.get_host(uuid, segment_id=segment_id)
except sdk_exc.ResourceNotFound:
raise exceptions.CommandError(_('Segment host is not found: %s'
) % uuid)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-4.0.0/masakariclient/plugin.py
new/python-masakariclient-5.2.0/masakariclient/plugin.py
--- old/python-masakariclient-4.0.0/masakariclient/plugin.py 2017-09-07
17:19:22.000000000 +0200
+++ new/python-masakariclient-5.2.0/masakariclient/plugin.py 2018-07-26
16:06:13.000000000 +0200
@@ -12,39 +12,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import logging
-
from openstack import connection
-from openstack import profile
from osc_lib import utils
-from masakariclient.sdk.ha import ha_service
-
-
-LOG = logging.getLogger(__name__)
DEFAULT_HA_API_VERSION = '1'
API_VERSION_OPTION = 'os_ha_api_version'
API_NAME = 'ha'
-API_VERSIONS = {
- '1': 'masakariclient.client.Client',
-}
def make_client(instance):
"""Returns a ha proxy"""
- prof = profile.Profile()
- prof._add_service(ha_service.HAService(version="v1"))
- prof.set_region(API_NAME, instance.region_name)
- prof.set_version(API_NAME, instance._api_version[API_NAME])
- prof.set_interface(API_NAME, instance.interface)
- conn = connection.Connection(authenticator=instance.session.auth,
- verify=instance.session.verify,
- cert=instance.session.cert,
- profile=prof)
- LOG.debug('Connection: %s', conn)
- LOG.debug('masakari client initialized using OpenStack SDK: %s', conn.ha)
- return conn.ha
+ conn = connection.Connection(session=instance.session)
+ return conn.instance_ha
def build_option_parser(parser):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-4.0.0/masakariclient/sdk/ha/connection.py
new/python-masakariclient-5.2.0/masakariclient/sdk/ha/connection.py
--- old/python-masakariclient-4.0.0/masakariclient/sdk/ha/connection.py
2017-09-07 17:19:22.000000000 +0200
+++ new/python-masakariclient-5.2.0/masakariclient/sdk/ha/connection.py
1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-# Copyright(c) 2016 Nippon Telegraph and Telephone Corporation
-#
-# 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.
-
-import logging
-
-from openstack import connection
-from openstack import profile
-
-from masakariclient.sdk.ha import ha_service
-
-LOG = logging.getLogger(__name__)
-
-
-def create_connection(prof=None, user_agent=None, **kwargs):
- """Create connection to masakari_api."""
-
- if not prof:
- prof = profile.Profile()
-
- prof._add_service(ha_service.HAService(version="v1"))
- interface = kwargs.pop('interface', None)
- region_name = kwargs.pop('region_name', None)
- if interface:
- prof.set_interface('ha', interface)
- if region_name:
- prof.set_region('ha', region_name)
-
- prof.set_api_version('ha', '1')
-
- try:
- conn = connection.Connection(profile=prof,
- user_agent=user_agent,
- **kwargs)
- LOG.debug('Connection: %s', conn)
- LOG.debug('masakari client initialized: %s', conn.ha)
- except Exception as e:
- raise e
-
- return conn
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-4.0.0/masakariclient/sdk/ha/ha_service.py
new/python-masakariclient-5.2.0/masakariclient/sdk/ha/ha_service.py
--- old/python-masakariclient-4.0.0/masakariclient/sdk/ha/ha_service.py
2017-09-07 17:19:22.000000000 +0200
+++ new/python-masakariclient-5.2.0/masakariclient/sdk/ha/ha_service.py
1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-# Copyright(c) 2016 Nippon Telegraph and Telephone Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from openstack import service_filter
-
-
-class HAService(service_filter.ServiceFilter):
- """The HA service."""
-
- valid_versions = [service_filter.ValidVersion('v1')]
-
- def __init__(self, version=None):
- """Create an ha service."""
- super(HAService, self).__init__(service_type='ha',
- version=version)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-4.0.0/masakariclient/sdk/ha/v1/_proxy.py
new/python-masakariclient-5.2.0/masakariclient/sdk/ha/v1/_proxy.py
--- old/python-masakariclient-4.0.0/masakariclient/sdk/ha/v1/_proxy.py
2017-09-07 17:19:22.000000000 +0200
+++ new/python-masakariclient-5.2.0/masakariclient/sdk/ha/v1/_proxy.py
1970-01-01 01:00:00.000000000 +0100
@@ -1,200 +0,0 @@
-# Copyright(c) 2016 Nippon Telegraph and Telephone Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from openstack import proxy2
-from openstack import resource2
-
-from masakariclient.sdk.ha.v1 import host as _host
-from masakariclient.sdk.ha.v1 import notification as _notification
-from masakariclient.sdk.ha.v1 import segment as _segment
-
-
-class Proxy(proxy2.BaseProxy):
- """Proxy class for ha resource handling.
-
- Create method for each action of each API.
- """
-
- def notifications(self, **query):
- """Return a generator of notifications.
-
- :param kwargs \*\*query: Optional query parameters to be sent to
- limit the notifications being returned.
- :returns: A generator of notifications
- """
- return self._list(_notification.Notification, paginated=False, **query)
-
- def get_notification(self, notification):
- """Get a single notification.
-
- :param notification: The value can be the ID of a notification or a
- :class:
- `~masakariclient.sdk.ha.v1
- .notification.Notification` instance.
- :returns: One :class:`~masakariclient.sdk.ha.v1
- .notification.Notification`
- :raises: :class:`~openstack.exceptions.ResourceNotFound`
- when no resource can be found.
- """
- return self._get(_notification.Notification, notification)
-
- def create_notification(self, **attrs):
- """Create a new notification.
-
- :param dict attrs: Keyword arguments which will be used to create
- a :class:
- `masakariclient.sdk.ha.v1
- .notification.Notification`,
- comprised of the propoerties on the Notification
- class.
- :returns: The result of notification creation
- :rtype: :class: `masakariclient.sdk.ha.v1
- .notification.Notification`
- """
- return self._create(_notification.Notification, **attrs)
-
- def segments(self, **query):
- """Return a generator of segments.
-
- :param kwargs \*\*query: Optional query parameters to be sent to
- limit the segments being returned.
- :returns: A generator of segments
- """
- return self._list(_segment.Segment, paginated=False, **query)
-
- def get_segment(self, segment):
- """Get a single segment.
-
- :param segment: The value can be the ID of a segment or a
- :class:
- `~masakariclient.sdk.ha.v1.segment.Segment` instance.
- :returns: One :class:`~masakariclient.sdk.ha.v1.segment.Segment`
- :raises: :class:`~openstack.exceptions.ResourceNotFound`
- when no resource can be found.
- """
- return self._get(_segment.Segment, segment)
-
- def create_segment(self, **attrs):
- """Create a new segment.
-
- :param dict attrs: Keyword arguments which will be used to create
- a :class:
- `masakariclient.sdk.ha.v1.segment.Segment`,
- comprised of the propoerties on the Segment class.
- :returns: The result of segment creation
- :rtype: :class: `masakariclient.sdk.ha.v1.segment.Segment`
- """
- return self._create(_segment.Segment, **attrs)
-
- def update_segment(self, segment, **attrs):
- """Update a segment.
-
- :param segment: The value can be the ID of a segment or a
- :class:
- `~masakariclient.sdk.ha.v1.segment.Segment` instance.
- :param dict attrs: Keyword arguments which will be used to update
- a :class:
- `masakariclient.sdk.ha.v1.segment.Segment`,
- comprised of the propoerties on the Segment class.
- :returns: The updated segment.
- :rtype: :class: `masakariclient.sdk.ha.v1.segment.Segment`
- """
- return self._update(_segment.Segment, segment, **attrs)
-
- def delete_segment(self, segment, ignore_missing=True):
- """Delete a segment.
-
- :param segment:
- The value can be either the ID of a segment or a
- :class:`~masakariclient.sdk.ha.v1.segment.Segment` instance.
- :param bool ignore_missing: When set to ``False``
- :class:`~openstack.exceptions.ResourceNotFound` will be
- raised when the segment does not exist.
- When set to ``True``, no exception will be set when
- attempting to delete a nonexistent segment.
- :returns: ``None``
- """
- return self._delete(_segment.Segment, segment,
- ignore_missing=ignore_missing)
-
- def hosts(self, segment_id, **query):
- """Return a generator of hosts.
-
- :param segment_id: The ID of a failover segment.
- :param kwargs \*\*query: Optional query parameters to be sent to
- limit the hosts being returned.
-
- :returns: A generator of hosts
- """
- return self._list(_host.Host, segment_id=segment_id, paginated=False,
- **query)
-
- def create_host(self, segment_id, **attrs):
- """Create a new host.
-
- :param segment_id: The ID of a failover segment.
- :param dict attrs: Keyword arguments which will be used to create
- a :class: `masakariclient.sdk.ha.v1.host.Host`,
- comprised of the propoerties on the Host class.
-
- :returns: The results of host creation
- """
- return self._create(_host.Host, segment_id=segment_id, **attrs)
-
- def get_host(self, segment_id, host):
- """Get a single host.
-
- :param segment_id: The ID of a failover segment.
- :param host: The value can be the ID of a host or a :class:
- `~masakariclient.sdk.ha.v1.host.Host` instance.
-
- :returns: One :class:`~masakariclient.sdk.ha.v1.host.Host`
- :raises: :class:`~openstack.exceptions.ResourceNotFound`
- when no resource can be found.
- """
- host_id = resource2.Resource._get_id(host)
- return self._get(_host.Host, host_id, segment_id=segment_id)
-
- def update_host(self, segment_id, host, **attrs):
- """Update the host.
-
- :param segment_id: The ID of a failover segment.
- :param host: The value can be the ID of a host or a :class:
- `~masakariclient.sdk.ha.v1.host.Host` instance.
- :param dict attrs: The attributes to update on the host represented.
-
- :returns: The updated host
- """
- host_id = resource2.Resource._get_id(host)
- return self._update(_host.Host, host_id, segment_id=segment_id,
- **attrs)
-
- def delete_host(self, segment_id, host, ignore_missing=True):
- """Delete the host.
-
- :param segment_id: The ID of a failover segment.
- :param host: The value can be the ID of a host or a :class:
- `~masakariclient.sdk.ha.v1.host.Host` instance.
- :param bool ignore_missing: When set to ``False``
- :class:`~openstack.exceptions.ResourceNotFound` will be
- raised when the host does not exist.
- When set to ``True``, no exception will be set when
- attempting to delete a nonexistent host.
-
- :returns: ``None``
-
- """
- host_id = resource2.Resource._get_id(host)
- return self._delete(_host.Host, host_id, segment_id=segment_id,
- ignore_missing=ignore_missing)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-4.0.0/masakariclient/sdk/ha/v1/host.py
new/python-masakariclient-5.2.0/masakariclient/sdk/ha/v1/host.py
--- old/python-masakariclient-4.0.0/masakariclient/sdk/ha/v1/host.py
2017-09-07 17:19:22.000000000 +0200
+++ new/python-masakariclient-5.2.0/masakariclient/sdk/ha/v1/host.py
1970-01-01 01:00:00.000000000 +0100
@@ -1,78 +0,0 @@
-# Copyright(c) 2016 Nippon Telegraph and Telephone Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from openstack import resource2
-
-from masakariclient.sdk.ha import ha_service
-
-
-class Host(resource2.Resource):
- resource_key = "host"
- resources_key = "hosts"
- base_path = "/segments/%(segment_id)s/hosts"
- service = ha_service.HAService()
-
- # capabilities
- # 1] GET /v1/segments/<segment_uuid>/hosts
- # 2] GET /v1/segments/<segment_uuid>/hosts/<host_uuid>
- # 3] POST /v1/segments/<segment_uuid>/hosts
- # 4] PUT /v1/segments/<segment_uuid>/hosts
- # 5] DELETE /v1/segments/<segment_uuid>/hosts
- allow_list = True
- allow_get = True
- allow_create = True
- allow_update = True
- allow_delete = True
-
- # Properties
- # Refer "https://github.com/openstack/masakari/blob/
- # master/masakari/api/openstack/ha/schemas/hosts.py"
- # for properties of host API
-
- #: A ID of representing this host
- id = resource2.URI("id")
- #: A Uuid of representing this host
- uuid = resource2.Body("uuid")
- #: A failover segment ID of this host(in URI)
- segment_id = resource2.URI("segment_id")
- #: A created time of this host
- created_at = resource2.Body("created_at")
- #: A latest updated time of this host
- updated_at = resource2.Body("updated_at")
- #: A name of this host
- name = resource2.Body("name")
- #: A type of this host
- type = resource2.Body("type")
- #: A control attributes of this host
- control_attributes = resource2.Body("control_attributes")
- #: A maintenance status of this host
- on_maintenance = resource2.Body("on_maintenance")
- #: A reservation status of this host
- reserved = resource2.Body("reserved")
- #: A failover segment ID of this host(in Body)
- failover_segment_id = resource2.Body("failover_segment_id")
-
- _query_mapping = resource2.QueryParameters(
- "sort_key", "sort_dir", failover_segment_id="failover_segment_id",
- type="type", on_maintenance="on_maintenance", reserved="reserved")
-
- def update(self, session, prepend_key=False, has_body=True):
- """Update a host."""
- request = self._prepare_request(prepend_key=prepend_key)
- del request.body['id']
- request_body = {"host": request.body}
- res = session.put(request.uri, endpoint_filter=self.service,
- json=request_body, headers=request.headers)
- self._translate_response(res, has_body=has_body)
- return self
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-4.0.0/masakariclient/sdk/ha/v1/notification.py
new/python-masakariclient-5.2.0/masakariclient/sdk/ha/v1/notification.py
--- old/python-masakariclient-4.0.0/masakariclient/sdk/ha/v1/notification.py
2017-09-07 17:19:22.000000000 +0200
+++ new/python-masakariclient-5.2.0/masakariclient/sdk/ha/v1/notification.py
1970-01-01 01:00:00.000000000 +0100
@@ -1,65 +0,0 @@
-# Copyright(c) 2016 Nippon Telegraph and Telephone Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from openstack import resource2
-
-from masakariclient.sdk.ha import ha_service
-
-
-class Notification(resource2.Resource):
- resource_key = "notification"
- resources_key = "notifications"
- base_path = "/notifications"
- service = ha_service.HAService()
-
- # capabilities
- # 1] GET /v1/notifications
- # 2] GET /v1/notifications/<notification_uuid>
- # 3] POST /v1/notifications
- allow_list = True
- allow_get = True
- allow_create = True
- allow_update = False
- allow_delete = False
-
- # Properties
- # Refer "https://github.com/openstack/masakari/tree/
- # master/masakari/api/openstack/ha/schemas/notificaions.py"
- # for properties of notifications API
-
- #: A ID of representing this notification.
- id = resource2.Body("id")
- #: A Uuid of representing this notification.
- notification_uuid = resource2.Body("notification_uuid")
- #: A created time of representing this notification.
- created_at = resource2.Body("created_at")
- #: A latest updated time of representing this notification.
- updated_at = resource2.Body("updated_at")
- #: The type of failure. Valuse values include ''COMPUTE_HOST'',
- #: ''VM'', ''PROCESS''
- type = resource2.Body("type")
- #: The hostname of this notification.
- hostname = resource2.Body("hostname")
- #: The status for this notitication.
- status = resource2.Body("status")
- #: The generated_time for this notitication.
- generated_time = resource2.Body("generated_time")
- #: The payload of this notification.
- payload = resource2.Body("payload")
- #: The source host uuid of this notification.
- source_host_uuid = resource2.Body("source_host_uuid")
-
- _query_mapping = resource2.QueryParameters(
- "sort_key", "sort_dir", source_host_uuid="source_host_uuid",
- type="type", status="status", generated_since="generated-since")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-4.0.0/masakariclient/sdk/ha/v1/segment.py
new/python-masakariclient-5.2.0/masakariclient/sdk/ha/v1/segment.py
--- old/python-masakariclient-4.0.0/masakariclient/sdk/ha/v1/segment.py
2017-09-07 17:19:22.000000000 +0200
+++ new/python-masakariclient-5.2.0/masakariclient/sdk/ha/v1/segment.py
1970-01-01 01:00:00.000000000 +0100
@@ -1,72 +0,0 @@
-# Copyright(c) 2016 Nippon Telegraph and Telephone Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from openstack import resource2
-
-from masakariclient.sdk.ha import ha_service
-
-
-class Segment(resource2.Resource):
- resource_key = "segment"
- resources_key = "segments"
- base_path = "/segments"
- service = ha_service.HAService()
-
- # capabilities
- # 1] GET /v1/segments
- # 2] GET /v1/segments/<segment_uuid>
- # 3] POST /v1/segments
- # 4] PUT /v1/segments/<segment_uuid>
- # 5] DELETE /v1/segments/<segment_uuid>
- allow_list = True
- allow_get = True
- allow_create = True
- allow_update = True
- allow_delete = True
-
- # Properties
- # Refer "https://github.com/openstack/masakari/tree/
- # master/masakari/api/openstack/ha/schemas"
- # for properties of each API
-
- #: A ID of representing this segment.
- id = resource2.Body("id")
- #: A Uuid of representing this segment.
- uuid = resource2.Body("uuid")
- #: A created time of representing this segment.
- created_at = resource2.Body("created_at")
- #: A latest updated time of representing this segment.
- updated_at = resource2.Body("updated_at")
- #: The name of this segment.
- name = resource2.Body("name")
- #: The description of this segment.
- description = resource2.Body("description")
- #: The recovery method of this segment.
- recovery_method = resource2.Body("recovery_method")
- #: The service type of this segment.
- service_type = resource2.Body("service_type")
-
- _query_mapping = resource2.QueryParameters(
- "sort_key", "sort_dir", recovery_method="recovery_method",
- service_type="service_type")
-
- def update(self, session, prepend_key=False, has_body=True):
- """Update a segment."""
- request = self._prepare_request(prepend_key=prepend_key)
- del request.body['id']
- request_body = {"segment": request.body}
- ret = session.put(request.uri, endpoint_filter=self.service,
- json=request_body, headers=request.headers)
- self._translate_response(ret, has_body=has_body)
- return self
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-4.0.0/masakariclient/tests/unit/osc/v1/test_host.py
new/python-masakariclient-5.2.0/masakariclient/tests/unit/osc/v1/test_host.py
---
old/python-masakariclient-4.0.0/masakariclient/tests/unit/osc/v1/test_host.py
2017-09-07 17:19:22.000000000 +0200
+++
new/python-masakariclient-5.2.0/masakariclient/tests/unit/osc/v1/test_host.py
2018-07-26 16:06:13.000000000 +0200
@@ -135,6 +135,8 @@
# show the host specified by uuid
self.show_host.take_action(parsed_args)
+ self.app.client_manager.ha.get_host.assert_called_once_with(
+ HOST_ID, segment_id=SEGMENT_ID)
mock_get_dict_properties.assert_called_once_with(
self.dummy_host.to_dict(), self.columns, formatters={})
@@ -169,6 +171,10 @@
self.app.client_manager.ha.get_host.return_value = self.dummy_host
# show the host specified by uuid
self.update_host.take_action(parsed_args)
+ self.app.client_manager.ha.update_host.assert_called_once_with(
+ HOST_ID, segment_id=SEGMENT_ID, reserved=True)
+ self.app.client_manager.ha.get_host.assert_called_once_with(
+ HOST_ID, segment_id=SEGMENT_ID)
mock_get_dict_properties.assert_called_once_with(
self.dummy_host.to_dict(), self.columns, formatters={})
@@ -202,4 +208,4 @@
self.delete_host.take_action(parsed_args)
self.app.client_manager.ha.delete_host.assert_called_once_with(
- SEGMENT_ID, HOST_ID, False)
+ HOST_ID, segment_id=SEGMENT_ID, ignore_missing=False)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-4.0.0/masakariclient/tests/unit/v1/test_client.py
new/python-masakariclient-5.2.0/masakariclient/tests/unit/v1/test_client.py
--- old/python-masakariclient-4.0.0/masakariclient/tests/unit/v1/test_client.py
2017-09-07 17:19:22.000000000 +0200
+++ new/python-masakariclient-5.2.0/masakariclient/tests/unit/v1/test_client.py
2018-07-26 16:06:13.000000000 +0200
@@ -19,7 +19,10 @@
"""
import mock
-from masakariclient.sdk.ha import connection
+from keystoneauth1.identity.generic import password as ks_password
+from keystoneauth1 import session as ks_session
+from openstack import connection
+
from masakariclient.tests import base
import masakariclient.v1.client as mc
@@ -35,16 +38,42 @@
def setUp(self):
super(TestV1Client, self).setUp()
+ self.auth = mock.Mock()
+ self.session = mock.Mock()
self.conn = mock.Mock()
self.service = mock.Mock()
- self.conn.ha = self.service
-
- def test_client_init(self):
- with mock.patch.object(connection,
- 'create_connection') as mock_connection:
- mock_connection.return_value = self.conn
-
- res = mc.Client()
+ self.conn.instance_ha = self.service
- self.assertEqual(self.conn.ha, res.service)
- mock_connection.assert_called_once_with(prof=None, user_agent=None)
+ @mock.patch.object(connection, 'Connection')
+ @mock.patch.object(ks_session, 'Session')
+ @mock.patch.object(ks_password, 'Password')
+ def test_client_init(self, mock_password, mock_session, mock_connection):
+
+ mock_password.return_value = self.auth
+ mock_session.return_value = self.session
+ mock_connection.return_value = self.conn
+
+ fake_auth_url = 'fake_auth_url'
+ fake_username = 'fake_username'
+ fake_password = 'fake_password'
+ fake_user_domain_id = 'fake_user_domain_id'
+ fake_project_name = 'fake_project_name'
+ fake_project_domain_id = 'fake_project_domain_id'
+
+ res = mc.Client(auth_url=fake_auth_url,
+ username=fake_username,
+ password=fake_password,
+ user_domain_id=fake_user_domain_id,
+ project_name=fake_project_name,
+ project_domain_id=fake_project_domain_id)
+
+ self.assertEqual(self.conn.instance_ha, res.service)
+ mock_password.assert_called_once_with(
+ auth_url=fake_auth_url,
+ username=fake_username,
+ password=fake_password,
+ user_domain_id=fake_user_domain_id,
+ project_name=fake_project_name,
+ project_domain_id=fake_project_domain_id)
+ mock_session.assert_called_once_with(auth=self.auth)
+ mock_connection.assert_called_once_with(session=self.session)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-4.0.0/masakariclient/v1/client.py
new/python-masakariclient-5.2.0/masakariclient/v1/client.py
--- old/python-masakariclient-4.0.0/masakariclient/v1/client.py 2017-09-07
17:19:22.000000000 +0200
+++ new/python-masakariclient-5.2.0/masakariclient/v1/client.py 2018-07-26
16:06:13.000000000 +0200
@@ -12,12 +12,23 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from masakariclient.sdk.ha import connection
+from keystoneauth1.identity.generic import password as ks_password
+from keystoneauth1 import session as ks_session
+from openstack import connection
class Client(object):
- def __init__(self, prof=None, user_agent=None, **kwargs):
- self.con = connection.create_connection(
- prof=prof, user_agent=user_agent, **kwargs)
- self.service = self.con.ha
+ def __init__(self, **kwargs):
+
+ auth = ks_password.Password(
+ auth_url=kwargs.get('auth_url'),
+ username=kwargs.get('username'),
+ password=kwargs.get('password'),
+ user_domain_id=kwargs.get('user_domain_id'),
+ project_name=kwargs.get('project_name'),
+ project_domain_id=kwargs.get('project_domain_id'))
+ session = ks_session.Session(auth=auth)
+
+ self.con = connection.Connection(session=session)
+ self.service = self.con.instance_ha
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-4.0.0/masakariclient/v1/shell.py
new/python-masakariclient-5.2.0/masakariclient/v1/shell.py
--- old/python-masakariclient-4.0.0/masakariclient/v1/shell.py 2017-09-07
17:19:22.000000000 +0200
+++ new/python-masakariclient-5.2.0/masakariclient/v1/shell.py 2018-07-26
16:06:13.000000000 +0200
@@ -196,7 +196,7 @@
service, args.segment_id)
host_id = utils.get_uuid_by_name(
service, args.id, segment=segment_id)
- host = service.get_host(segment_id, host_id)
+ host = service.get_host(host_id, segment_id=segment_id)
utils.print_dict(host.to_dict())
except Exception as e:
print(e)
@@ -268,7 +268,7 @@
'on_maintenance': args.on_maintenance,
}
attrs = utils.remove_unspecified_items(attrs)
- host = service.update_host(segment_id, host_id, **attrs)
+ host = service.update_host(host_id, segment_id=segment_id, **attrs)
utils.print_dict(host.to_dict())
except Exception as e:
print(e)
@@ -285,7 +285,7 @@
service, args.segment_id)
host_id = utils.get_uuid_by_name(
service, args.id, segment=segment_id)
- host = service.delete_host(segment_id, host_id)
+ host = service.delete_host(host_id, segment_id=segment_id)
if host:
utils.print_dict(host.to_dict())
except Exception as e:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-4.0.0/python_masakariclient.egg-info/PKG-INFO
new/python-masakariclient-5.2.0/python_masakariclient.egg-info/PKG-INFO
--- old/python-masakariclient-4.0.0/python_masakariclient.egg-info/PKG-INFO
2017-09-07 17:24:46.000000000 +0200
+++ new/python-masakariclient-5.2.0/python_masakariclient.egg-info/PKG-INFO
2018-07-26 16:10:35.000000000 +0200
@@ -1,12 +1,11 @@
Metadata-Version: 1.1
Name: python-masakariclient
-Version: 4.0.0
+Version: 5.2.0
Summary: masakariclient module and a CLI tool for masakari
Home-page: http://www.openstack.org/
Author: OpenStack
Author-email: [email protected]
License: UNKNOWN
-Description-Content-Type: UNKNOWN
Description: ===============================
python-masakariclient
===============================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-4.0.0/python_masakariclient.egg-info/SOURCES.txt
new/python-masakariclient-5.2.0/python_masakariclient.egg-info/SOURCES.txt
--- old/python-masakariclient-4.0.0/python_masakariclient.egg-info/SOURCES.txt
2017-09-07 17:24:47.000000000 +0200
+++ new/python-masakariclient-5.2.0/python_masakariclient.egg-info/SOURCES.txt
2018-07-26 16:10:36.000000000 +0200
@@ -1,6 +1,7 @@
.coveragerc
.mailmap
.testr.conf
+.zuul.yaml
AUTHORS
CONTRIBUTING.rst
ChangeLog
@@ -8,6 +9,7 @@
LICENSE
README.rst
babel.cfg
+lower-constraints.txt
requirements.txt
setup.cfg
setup.py
@@ -33,15 +35,6 @@
masakariclient/osc/v1/host.py
masakariclient/osc/v1/notification.py
masakariclient/osc/v1/segment.py
-masakariclient/sdk/__init__.py
-masakariclient/sdk/ha/__init__.py
-masakariclient/sdk/ha/connection.py
-masakariclient/sdk/ha/ha_service.py
-masakariclient/sdk/ha/v1/__init__.py
-masakariclient/sdk/ha/v1/_proxy.py
-masakariclient/sdk/ha/v1/host.py
-masakariclient/sdk/ha/v1/notification.py
-masakariclient/sdk/ha/v1/segment.py
masakariclient/tests/__init__.py
masakariclient/tests/base.py
masakariclient/tests/unit/__init__.py
@@ -72,5 +65,4 @@
releasenotes/source/index.rst
releasenotes/source/unreleased.rst
releasenotes/source/_static/.placeholder
-releasenotes/source/_templates/.placeholder
-tools/tox_install.sh
\ No newline at end of file
+releasenotes/source/_templates/.placeholder
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-4.0.0/python_masakariclient.egg-info/pbr.json
new/python-masakariclient-5.2.0/python_masakariclient.egg-info/pbr.json
--- old/python-masakariclient-4.0.0/python_masakariclient.egg-info/pbr.json
2017-09-07 17:24:46.000000000 +0200
+++ new/python-masakariclient-5.2.0/python_masakariclient.egg-info/pbr.json
2018-07-26 16:10:35.000000000 +0200
@@ -1 +1 @@
-{"git_version": "2af4202", "is_release": true}
\ No newline at end of file
+{"git_version": "319bfb3", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-4.0.0/python_masakariclient.egg-info/requires.txt
new/python-masakariclient-5.2.0/python_masakariclient.egg-info/requires.txt
--- old/python-masakariclient-4.0.0/python_masakariclient.egg-info/requires.txt
2017-09-07 17:24:46.000000000 +0200
+++ new/python-masakariclient-5.2.0/python_masakariclient.egg-info/requires.txt
2018-07-26 16:10:35.000000000 +0200
@@ -1,5 +1,5 @@
-openstacksdk>=0.9.13
-osc-lib>=1.2.0
-oslo.i18n>=2.1.0
-oslo.serialization>=1.10.0
-pbr>=1.8
+openstacksdk>=0.13.0
+osc-lib>=1.8.0
+oslo.i18n>=3.15.3
+oslo.serialization!=2.19.1,>=2.18.0
+pbr!=2.1.0,>=2.0.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-4.0.0/releasenotes/notes/reno.cache
new/python-masakariclient-5.2.0/releasenotes/notes/reno.cache
--- old/python-masakariclient-4.0.0/releasenotes/notes/reno.cache
1970-01-01 01:00:00.000000000 +0100
+++ new/python-masakariclient-5.2.0/releasenotes/notes/reno.cache
2018-07-26 16:10:36.000000000 +0200
@@ -0,0 +1,3 @@
+---
+file-contents: {}
+notes: []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-4.0.0/requirements.txt
new/python-masakariclient-5.2.0/requirements.txt
--- old/python-masakariclient-4.0.0/requirements.txt 2017-09-07
17:19:22.000000000 +0200
+++ new/python-masakariclient-5.2.0/requirements.txt 2018-07-26
16:06:13.000000000 +0200
@@ -2,8 +2,8 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-openstacksdk>=0.9.13 # Apache-2.0
-osc-lib>=1.2.0 # Apache-2.0
-oslo.i18n>=2.1.0 # Apache-2.0
-oslo.serialization>=1.10.0 # Apache-2.0
-pbr>=1.8 # Apache-2.0
+openstacksdk>=0.13.0 # Apache-2.0
+osc-lib>=1.8.0 # Apache-2.0
+oslo.i18n>=3.15.3 # Apache-2.0
+oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
+pbr!=2.1.0,>=2.0.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-4.0.0/setup.py
new/python-masakariclient-5.2.0/setup.py
--- old/python-masakariclient-4.0.0/setup.py 2017-09-07 17:19:22.000000000
+0200
+++ new/python-masakariclient-5.2.0/setup.py 2018-07-26 16:06:13.000000000
+0200
@@ -25,5 +25,5 @@
pass
setuptools.setup(
- setup_requires=['pbr>=1.8'],
+ setup_requires=['pbr>=2.0.0'],
pbr=True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-4.0.0/test-requirements.txt
new/python-masakariclient-5.2.0/test-requirements.txt
--- old/python-masakariclient-4.0.0/test-requirements.txt 2017-09-07
17:19:25.000000000 +0200
+++ new/python-masakariclient-5.2.0/test-requirements.txt 2018-07-26
16:06:13.000000000 +0200
@@ -2,19 +2,19 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-hacking>=0.12.0,!=0.13.0,<0.14 # Apache-2.0
+hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
-coverage>=3.6 # Apache-2.0
+coverage!=4.4,>=4.0 # Apache-2.0
ddt>=1.0.1 # MIT
-python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx>=1.2.1,!=1.3b1,<1.4 # BSD
+python-subunit>=1.0.0 # Apache-2.0/BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
oslosphinx>=4.7.0 # Apache-2.0
-oslotest>=1.10.0 # Apache-2.0
-os-testr>=0.8.0 # Apache-2.0
-requests-mock>=1.1 # Apache-2.0
+oslotest>=3.2.0 # Apache-2.0
+os-testr>=1.0.0 # Apache-2.0
+requests-mock>=1.2.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD
-testtools>=1.4.0 # MIT
+testtools>=2.2.0 # MIT
# releasenotes
-reno>=1.8.0 # Apache2
+reno>=2.5.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-4.0.0/tools/tox_install.sh
new/python-masakariclient-5.2.0/tools/tox_install.sh
--- old/python-masakariclient-4.0.0/tools/tox_install.sh 2017-09-07
17:19:22.000000000 +0200
+++ new/python-masakariclient-5.2.0/tools/tox_install.sh 1970-01-01
01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-# Client constraint file contains this client version pin that is in conflict
-# with installing the client from source. We should remove the version pin in
-# the constraints file before applying it for from-source installation.
-
-CONSTRAINTS_FILE=$1
-shift 1
-
-set -e
-
-# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
-# published to logs.openstack.org for easy debugging.
-localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
-
-if [[ $CONSTRAINTS_FILE != http* ]]; then
- CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE
-fi
-# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep
-curl $CONSTRAINTS_FILE --insecure --progress-bar --output $localfile
-
-pip install -c$localfile openstack-requirements
-
-# This is the main purpose of the script: Allow local installation of
-# the current repo. It is listed in constraints file and thus any
-# install will be constrained and we need to unconstrain it.
-edit-constraints $localfile -- $CLIENT_NAME
-
-pip install -c$localfile -U $*
-exit $?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-4.0.0/tox.ini
new/python-masakariclient-5.2.0/tox.ini
--- old/python-masakariclient-4.0.0/tox.ini 2017-09-07 17:19:22.000000000
+0200
+++ new/python-masakariclient-5.2.0/tox.ini 2018-07-26 16:06:13.000000000
+0200
@@ -5,12 +5,10 @@
[testenv]
usedevelop = True
-install_command = {toxinidir}/tools/tox_install.sh
{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
{opts} {packages}
-setenv = VIRTUAL_ENV={envdir}
- BRANCH_NAME=master
- CLIENT_NAME=python-masakariclient
-
-deps = -r{toxinidir}/test-requirements.txt
+install_command = pip install {opts} {packages}
+deps =
+
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+ -r{toxinidir}/test-requirements.txt
whitelist_externals = bash
find
rm
@@ -30,27 +28,34 @@
ostestr '{posargs}'
[testenv:py35]
+basepython = python3
commands =
{[testenv]commands}
ostestr '{posargs}'
[testenv:pep8]
+basepython = python3
commands = flake8 {posargs}
[testenv:venv]
+basepython = python3
commands = {posargs}
[testenv:cover]
+basepython = python3
commands = python setup.py test --coverage --testr-args='{posargs}'
[testenv:docs]
+basepython = python3
commands = python setup.py build_sphinx
[testenv:releasenotes]
+basepython = python3
commands =
sphinx-build -a -E -W -d releasenotes/build/doctrees -b html
releasenotes/source releasenotes/build/html
[testenv:debug]
+basepython = python3
commands = oslo_debug_helper {posargs}
[flake8]
@@ -60,3 +65,10 @@
ignore = E123,E125
builtins = _
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
+
+[testenv:lower-constraints]
+basepython = python3
+deps =
+ -c{toxinidir}/lower-constraints.txt
+ -r{toxinidir}/test-requirements.txt
+ -r{toxinidir}/requirements.txt
