openstack
/
charm-octavia
Code Issues Proposed changes

Remove reference to deprecated novaclient.exception 

The ``ConnectionRefused`` exception was removed from
``python-novaclient`` in the following commit:
81ec72ecf8c32b409afedc60e013f9b4c47d5bae

Change-Id: I3c7540e53f6ddbf4dcc9736bae72e27b7d6fdd27
Closes-Bug: #1863071
This commit is contained in:
Frode Nordahl 2020-02-13 10:56:23 +01:00
parent e3def774ad
commit a7c57aa732
No known key found for this signature in database
GPG Key ID: 6A5D59A3BA48373F
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/charm/openstack/api_crud.py
View File

@ -151,7 +151,6 @@ def get_nova_flavor(identity_service):
is_public=False)
except (keystone_exceptions.catalog.EndpointNotFound,
keystone_exceptions.connection.ConnectFailure,
nova_client.exceptions.ConnectionRefused,
nova_client.exceptions.ClientException) as e:
raise APIUnavailable('nova', 'flavors', e)
@ -188,7 +187,6 @@ def create_nova_keypair(identity_service, amp_key_name):
public_key=pubkey_decoded)
except (keystone_exceptions.catalog.EndpointNotFound,
keystone_exceptions.connection.ConnectFailure,
nova_client.exceptions.ConnectionRefused,
nova_client.exceptions.ClientException) as e:
raise APIUnavailable('nova', 'keypairs', e)

1
unit_tests/test_lib_charm_openstack_api_crud.py
View File

@ -114,7 +114,6 @@ class TestAPICrud(test_utils.PatchHelper):
self.keystone_exceptions.catalog.EndpointNotFound = Exception
self.keystone_exceptions.connection.ConnectFailure = Exception
self.nova_client.exceptions.ConnectionRefused = Exception
self.nova_client.exceptions.ClientException = Exception
nova.flavors.list.side_effect = Exception
identity_service = mock.MagicMock()