Add netloc and version check for version discovery
If the url netloc in the catalog and service's response
are not the same, we should choose the catalog's and
add the version info to it if needed.
Conflict and change in test is caused by I93ee971125bc0c7a497e1fb839df38ebd38340e1,
I07a602a05f896d7cc70120bd89424e3c553baf9f and Icf855d7892335b093c1083cd0106946d8911010d
Change-Id: If78d368bd505156a5416bb9cbfaf988204925c79
Closes-bug: #1733052
(cherry picked from commit 323f4e4bc4710d42e493eb56e40ba139a84d67b3)
Reviewed: https:/ /review. openstack. org/584053 /git.openstack. org/cgit/ openstack/ keystoneauth/ commit/ ?id=2cc2b039b79 a6c4a9550b8568a 490d0673d0b545
Committed: https:/
Submitter: Zuul
Branch: stable/queens
commit 2cc2b039b79a6c4 a9550b8568a490d 0673d0b545
Author: Vlad Gusev <email address hidden>
Date: Thu Jul 19 21:00:08 2018 +0300
Add netloc and version check for version discovery
If the url netloc in the catalog and service's response
are not the same, we should choose the catalog's and
add the version info to it if needed.
Conflict and change in test is caused by I93ee971125bc0c 7a497e1fb839df3 8ebd38340e1, 896d7cc70120bd8 9424e3c553baf9f and Icf855d7892335b 093c1083cd01069 46d8911010d
I07a602a05f
Change-Id: If78d368bd50515 6a5416bb9cbfaf9 88204925c79 2e493eb56e40ba1 39a84d67b3)
Closes-bug: #1733052
(cherry picked from commit 323f4e4bc4710d4