openstack/watcher
Code Issues Proposed changes

Fix unit test failed

Browse Source 
ironic removed 'os_endpoint_type' and instead with 'interface'

Change-Id: Ifa21645e19b8311de35cb9b0b8f39371b8713a2f
This commit is contained in:
licanwei 2019-09-21 08:54:11 +08:00
parent cca74f4698
commit 519ca2c9fb
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lower-constraints.txt
View File

@ -113,7 +113,7 @@ python-cinderclient==3.5.0
python-dateutil==2.7.0 python-dateutil==2.7.0
python-editor==1.0.3 python-editor==1.0.3
python-glanceclient==2.9.1 python-glanceclient==2.9.1
python-ironicclient==2.3.0 python-ironicclient==2.5.0
python-keystoneclient==3.15.0 python-keystoneclient==3.15.0
python-mimeparse==1.6.0 python-mimeparse==1.6.0
python-monascaclient==1.12.0 python-monascaclient==1.12.0

2
requirements.txt
View File

@ -39,7 +39,7 @@ python-monascaclient>=1.12.0 # Apache-2.0
python-neutronclient>=6.7.0 # Apache-2.0 python-neutronclient>=6.7.0 # Apache-2.0
python-novaclient>=14.1.0 # Apache-2.0 python-novaclient>=14.1.0 # Apache-2.0
python-openstackclient>=3.14.0 # Apache-2.0 python-openstackclient>=3.14.0 # Apache-2.0
python-ironicclient>=2.3.0 # Apache-2.0 python-ironicclient>=2.5.0 # Apache-2.0
six>=1.11.0 # MIT six>=1.11.0 # MIT
SQLAlchemy>=1.2.5 # MIT SQLAlchemy>=1.2.5 # MIT
stevedore>=1.28.0 # Apache-2.0 stevedore>=1.28.0 # Apache-2.0

2
watcher/common/clients.py
View File

@ -260,7 +260,7 @@ class OpenStackClients(object):
endpoint_type = self._get_client_option('ironic', 'endpoint_type') endpoint_type = self._get_client_option('ironic', 'endpoint_type')
ironic_region_name = self._get_client_option('ironic', 'region_name') ironic_region_name = self._get_client_option('ironic', 'region_name')
self._ironic = irclient.get_client(ironicclient_version, self._ironic = irclient.get_client(ironicclient_version,
os_endpoint_type=endpoint_type, interface=endpoint_type,
region_name=ironic_region_name, region_name=ironic_region_name,
session=self.session) session=self.session)
return self._ironic return self._ironic

2
watcher/tests/common/test_clients.py
View File

@ -437,7 +437,7 @@ class TestClients(base.TestCase):
osc = clients.OpenStackClients() osc = clients.OpenStackClients()
osc._ironic = None osc._ironic = None
osc.ironic() osc.ironic()
mock_session.get_endpoint.assert_called_once_with( mock_session.get_endpoint.assert_called_with(
interface='publicURL', interface='publicURL',
region_name=None, region_name=None,
service_type='baremetal') service_type='baremetal')