Hello community,

here is the log from the commit of package python-keystoneauth1 for 
openSUSE:Factory checked in at 2018-09-26 14:22:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-keystoneauth1 (Old)
 and      /work/SRC/openSUSE:Factory/.python-keystoneauth1.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-keystoneauth1"

Wed Sep 26 14:22:57 2018 rev:9 rq:634904 version:3.10.0

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/python-keystoneauth1/python-keystoneauth1.changes    
    2018-09-07 15:37:38.618649564 +0200
+++ 
/work/SRC/openSUSE:Factory/.python-keystoneauth1.new/python-keystoneauth1.changes
   2018-09-26 14:23:00.209961742 +0200
@@ -1,0 +2,6 @@
+Tue Sep 11 07:53:09 UTC 2018 - [email protected]
+
+- update to version 3.10.0
+  - Add netloc and version check for version discovery
+
+-------------------------------------------------------------------

Old:
----
  keystoneauth1-3.9.0.tar.gz

New:
----
  keystoneauth1-3.10.0.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-keystoneauth1.spec ++++++
--- /var/tmp/diff_new_pack.lbw1Yg/_old  2018-09-26 14:23:00.801960800 +0200
+++ /var/tmp/diff_new_pack.lbw1Yg/_new  2018-09-26 14:23:00.805960794 +0200
@@ -18,7 +18,7 @@
 
 %global sname keystoneauth1
 Name:           python-keystoneauth1
-Version:        3.9.0
+Version:        3.10.0
 Release:        0
 Summary:        OpenStack authenticating tools
 License:        Apache-2.0
@@ -42,6 +42,7 @@
 BuildRequires:  python2-reno
 BuildRequires:  python2-requests-kerberos
 BuildRequires:  python2-requests-mock
+BuildRequires:  python2-stestr
 BuildRequires:  python2-testresources
 BuildRequires:  python2-testtools
 BuildRequires:  python3-PyYAML
@@ -60,6 +61,7 @@
 BuildRequires:  python3-reno
 BuildRequires:  python3-requests-kerberos
 BuildRequires:  python3-requests-mock
+BuildRequires:  python3-stestr
 BuildRequires:  python3-testresources
 BuildRequires:  python3-testtools
 Requires:       python-PyYAML
@@ -111,9 +113,7 @@
 
 %check
 rm -v keystoneauth1/tests/unit/test_hacking_checks.py
-%{python_expand rm -rf .testrepository
-ostestr
-}
+%python_exec -m stestr.cli run
 
 %files %{python_files}
 %license LICENSE

++++++ keystoneauth1-3.9.0.tar.gz -> keystoneauth1-3.10.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/keystoneauth1-3.9.0/ChangeLog 
new/keystoneauth1-3.10.0/ChangeLog
--- old/keystoneauth1-3.9.0/ChangeLog   2018-06-20 16:01:46.000000000 +0200
+++ new/keystoneauth1-3.10.0/ChangeLog  2018-07-19 23:43:48.000000000 +0200
@@ -1,6 +1,11 @@
 CHANGES
 =======
 
+3.10.0
+------
+
+* Add netloc and version check for version discovery
+
 3.9.0
 -----
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/keystoneauth1-3.9.0/PKG-INFO 
new/keystoneauth1-3.10.0/PKG-INFO
--- old/keystoneauth1-3.9.0/PKG-INFO    2018-06-20 16:01:49.000000000 +0200
+++ new/keystoneauth1-3.10.0/PKG-INFO   2018-07-19 23:43:50.000000000 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: keystoneauth1
-Version: 3.9.0
+Version: 3.10.0
 Summary: Authentication Library for OpenStack Identity
 Home-page: https://docs.openstack.org/keystoneauth/latest/
 Author: OpenStack
@@ -54,8 +54,8 @@
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.5
-Provides-Extra: test
-Provides-Extra: oauth1
-Provides-Extra: kerberos
 Provides-Extra: saml2
 Provides-Extra: betamax
+Provides-Extra: oauth1
+Provides-Extra: kerberos
+Provides-Extra: test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/keystoneauth1-3.9.0/RELEASENOTES.rst 
new/keystoneauth1-3.10.0/RELEASENOTES.rst
--- old/keystoneauth1-3.9.0/RELEASENOTES.rst    2018-06-20 16:01:49.000000000 
+0200
+++ new/keystoneauth1-3.10.0/RELEASENOTES.rst   2018-07-19 23:43:50.000000000 
+0200
@@ -2,6 +2,21 @@
 keystoneauth1
 =============
 
+.. _keystoneauth1_3.10.0:
+
+3.10.0
+======
+
+.. _keystoneauth1_3.10.0_Bug Fixes:
+
+Bug Fixes
+---------
+
+.. releasenotes/notes/bug-1733052-1b4af3b3fe1b05bb.yaml @ 
b'323f4e4bc4710d42e493eb56e40ba139a84d67b3'
+
+- [`bug 1733052 <https://bugs.launchpad.net/keystoneauth/+bug/1733052>`_] Now 
the version discovery mechanism only fetches the version info from server side 
if the versioned url has been overrode. So that the request url's path won't be 
changed completely.
+
+
 .. _keystoneauth1_3.8.0:
 
 3.8.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/keystoneauth1-3.9.0/keystoneauth1/discover.py 
new/keystoneauth1-3.10.0/keystoneauth1/discover.py
--- old/keystoneauth1-3.9.0/keystoneauth1/discover.py   2018-06-20 
15:59:40.000000000 +0200
+++ new/keystoneauth1-3.10.0/keystoneauth1/discover.py  2018-07-19 
23:41:52.000000000 +0200
@@ -417,10 +417,28 @@
     parsed_version_url = urllib.parse.urlparse(url)
     parsed_discovery_url = urllib.parse.urlparse(discovery_url)
 
+    # The services can override the version_url with some config options.(for
+    # example, In Keystone, Cinder and Glance, the option is "public_endpoint",
+    # and "compute_link_prefix", "network_link_prefix" in Nova and Neutron.
+    # In this case, it's hard to distinguish which part in version_url is
+    # useful for discovery_url , so here we just get the version from
+    # version_url and then add it into the discovery_url if needed.
+    path = parsed_version_url.path
+    if parsed_discovery_url.netloc != parsed_version_url.netloc:
+        version = version_url.rstrip('/').split('/')[-1]
+        url_path = parsed_discovery_url.path.rstrip('/')
+        if not url_path.endswith(version):
+            path = url_path + '/' + version
+            if version_url.endswith('/'):
+                # add '/' back to keep backward compatibility.
+                path = path + '/'
+        else:
+            path = parsed_discovery_url.path
+
     return urllib.parse.ParseResult(
         parsed_discovery_url.scheme,
         parsed_discovery_url.netloc,
-        parsed_version_url.path,
+        path,
         parsed_version_url.params,
         parsed_version_url.query,
         parsed_version_url.fragment).geturl()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/keystoneauth1-3.9.0/keystoneauth1/tests/unit/identity/test_identity_common.py
 
new/keystoneauth1-3.10.0/keystoneauth1/tests/unit/identity/test_identity_common.py
--- 
old/keystoneauth1-3.9.0/keystoneauth1/tests/unit/identity/test_identity_common.py
   2018-06-20 15:59:40.000000000 +0200
+++ 
new/keystoneauth1-3.10.0/keystoneauth1/tests/unit/identity/test_identity_common.py
  2018-07-19 23:41:52.000000000 +0200
@@ -329,7 +329,7 @@
         sb = session.Session()
         discovery_cache = {}
 
-        expected_url = urllib.parse.urljoin(self.TEST_COMPUTE_ADMIN, '/v2.0')
+        expected_url = self.TEST_COMPUTE_ADMIN + '/v2.0'
         for sess in (sa, sb):
 
             disc = discover.get_discovery(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/keystoneauth1-3.9.0/keystoneauth1/tests/unit/test_discovery.py 
new/keystoneauth1-3.10.0/keystoneauth1/tests/unit/test_discovery.py
--- old/keystoneauth1-3.9.0/keystoneauth1/tests/unit/test_discovery.py  
2018-06-20 15:59:40.000000000 +0200
+++ new/keystoneauth1-3.10.0/keystoneauth1/tests/unit/test_discovery.py 
2018-07-19 23:41:52.000000000 +0200
@@ -491,6 +491,40 @@
 
             self.assertTrue(mock.called_once)
 
+    def test_version_data_override_version_url(self):
+        # if the request url is versioned already, just return it.
+        self.requests_mock.get(
+            V3_URL, status_code=200,
+            json={'version': fixture.V3Discovery('http://override/identity/v3')
+                  }
+        )
+
+        disc = discover.Discover(self.session, V3_URL)
+        version_data = disc.version_data()
+
+        for v in version_data:
+            self.assertEqual(v['version'], (3, 0))
+            self.assertEqual(v['status'], discover.Status.CURRENT)
+            self.assertEqual(v['raw_status'], 'stable')
+            self.assertEqual(v['url'], V3_URL)
+
+        # if the request url is not versioned, just add version info to it.(
+        # do not changed the url's netloc or path)
+        self.requests_mock.get(
+            BASE_URL, status_code=200,
+            json={'version': fixture.V3Discovery('http://override/identity/v3')
+                  }
+        )
+
+        disc = discover.Discover(self.session, BASE_URL)
+        version_data = disc.version_data()
+
+        for v in version_data:
+            self.assertEqual(v['version'], (3, 0))
+            self.assertEqual(v['status'], discover.Status.CURRENT)
+            self.assertEqual(v['raw_status'], 'stable')
+            self.assertEqual(v['url'], V3_URL)
+
     def test_version_data_unknown(self):
         discovery_fixture = fixture.V3Discovery(V3_URL)
         discovery_fixture.status = 'hungry'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/keystoneauth1-3.9.0/keystoneauth1.egg-info/PKG-INFO 
new/keystoneauth1-3.10.0/keystoneauth1.egg-info/PKG-INFO
--- old/keystoneauth1-3.9.0/keystoneauth1.egg-info/PKG-INFO     2018-06-20 
16:01:47.000000000 +0200
+++ new/keystoneauth1-3.10.0/keystoneauth1.egg-info/PKG-INFO    2018-07-19 
23:43:48.000000000 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: keystoneauth1
-Version: 3.9.0
+Version: 3.10.0
 Summary: Authentication Library for OpenStack Identity
 Home-page: https://docs.openstack.org/keystoneauth/latest/
 Author: OpenStack
@@ -54,8 +54,8 @@
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.5
-Provides-Extra: test
-Provides-Extra: oauth1
-Provides-Extra: kerberos
 Provides-Extra: saml2
 Provides-Extra: betamax
+Provides-Extra: oauth1
+Provides-Extra: kerberos
+Provides-Extra: test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/keystoneauth1-3.9.0/keystoneauth1.egg-info/SOURCES.txt 
new/keystoneauth1-3.10.0/keystoneauth1.egg-info/SOURCES.txt
--- old/keystoneauth1-3.9.0/keystoneauth1.egg-info/SOURCES.txt  2018-06-20 
16:01:47.000000000 +0200
+++ new/keystoneauth1-3.10.0/keystoneauth1.egg-info/SOURCES.txt 2018-07-19 
23:43:49.000000000 +0200
@@ -212,6 +212,7 @@
 releasenotes/notes/bug-1616105-cc8b85eb056e99e2.yaml
 releasenotes/notes/bug-1654847-acdf9543158329ec.yaml
 
releasenotes/notes/bug-1689424-set-adfspassword-endpointreference-f186d84a54007b09.yaml
+releasenotes/notes/bug-1733052-1b4af3b3fe1b05bb.yaml
 releasenotes/notes/bug-1766235wq-0de60d0f996c6bfb.yaml
 releasenotes/notes/collect-timing-85f007f0d86c8b26.yaml
 releasenotes/notes/expose-endpoint-status-6195a6b76d8a8de8.yaml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/keystoneauth1-3.9.0/keystoneauth1.egg-info/pbr.json 
new/keystoneauth1-3.10.0/keystoneauth1.egg-info/pbr.json
--- old/keystoneauth1-3.9.0/keystoneauth1.egg-info/pbr.json     2018-06-20 
16:01:47.000000000 +0200
+++ new/keystoneauth1-3.10.0/keystoneauth1.egg-info/pbr.json    2018-07-19 
23:43:49.000000000 +0200
@@ -1 +1 @@
-{"git_version": "ebe781a", "is_release": true}
\ No newline at end of file
+{"git_version": "323f4e4", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/keystoneauth1-3.9.0/releasenotes/notes/bug-1733052-1b4af3b3fe1b05bb.yaml 
new/keystoneauth1-3.10.0/releasenotes/notes/bug-1733052-1b4af3b3fe1b05bb.yaml
--- 
old/keystoneauth1-3.9.0/releasenotes/notes/bug-1733052-1b4af3b3fe1b05bb.yaml    
    1970-01-01 01:00:00.000000000 +0100
+++ 
new/keystoneauth1-3.10.0/releasenotes/notes/bug-1733052-1b4af3b3fe1b05bb.yaml   
    2018-07-19 23:41:52.000000000 +0200
@@ -0,0 +1,7 @@
+---
+fixes:
+  - >
+    [`bug 1733052 <https://bugs.launchpad.net/keystoneauth/+bug/1733052>`_]
+    Now the version discovery mechanism only fetches the version info from
+    server side if the versioned url has been overrode. So that the request
+    url's path won't be changed completely.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/keystoneauth1-3.9.0/releasenotes/notes/reno.cache 
new/keystoneauth1-3.10.0/releasenotes/notes/reno.cache
--- old/keystoneauth1-3.9.0/releasenotes/notes/reno.cache       2018-06-20 
16:01:49.000000000 +0200
+++ new/keystoneauth1-3.10.0/releasenotes/notes/reno.cache      2018-07-19 
23:43:50.000000000 +0200
@@ -1,5 +1,12 @@
 ---
 file-contents:
+  releasenotes/notes/bug-1733052-1b4af3b3fe1b05bb.yaml:
+    fixes: ['[`bug 1733052 
<https://bugs.launchpad.net/keystoneauth/+bug/1733052>`_]
+        Now the version discovery mechanism only fetches the version info from 
server
+        side if the versioned url has been overrode. So that the request 
url''s path
+        won''t be changed completely.
+
+        ']
   releasenotes/notes/bug-1766235wq-0de60d0f996c6bfb.yaml:
     fixes: ['[`bug 1766235 
<https://bugs.launchpad.net/keystoneauth/+bug/1766235>`_]
 
@@ -63,6 +70,11 @@
         ']
 notes:
 - files:
+  - - releasenotes/notes/bug-1733052-1b4af3b3fe1b05bb.yaml
+    - !!binary |
+      MzIzZjRlNGJjNDcxMGQ0MmU0OTNlYjU2ZTQwYmExMzlhODRkNjdiMw==
+  version: 3.10.0
+- files:
   - - releasenotes/notes/status-code-retries-75052a43efa4edb2.yaml
     - !!binary |
       M2MyY2Y0NGUxY2NjNzc3NGMxMzE2ZDA3ZTM3NWM0ZWQ5MTEzODQyYg==


Reply via email to