saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix extension loading in novaclient

Browse source 
This should fix #28017
This commit is contained in:
Daniel Wallace 2016-01-19 13:55:39 -06:00
parent dfb9dec84f
commit 4aa6faaf48
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
salt/utils/openstack/nova.py
View file

@ -25,8 +25,7 @@ try:
import novaclient.base
HAS_NOVA = True
except ImportError:
class OpenStackComputeShell(object):
'''mock class for errors'''
pass
# pylint: enable=import-error
# Import salt libs
@ -191,10 +190,12 @@ def sanatize_novaclient(kwargs):
# Function alias to not shadow built-ins
class SaltNova(OpenStackComputeShell):
class SaltNova(object):
'''
Class for all novaclient functions
'''
extensions = []
def __init__(
self,
username,
@ -209,9 +210,11 @@ class SaltNova(OpenStackComputeShell):
Set up nova credentials
'''
self.kwargs = kwargs.copy()
if not novaclient.base.Manager._hooks_map:
self.extensions = getattr(self, '_discover_extensions', client.discover_extensions)('1.1')
if not self.extensions:
if hasattr(OpenStackComputeShell, '_discover_extensions'):
self.extensions = OpenStackComputeShell()._discover_extensions('2.0')
else:
self.extensions = client.discover_extensions('2.0')
for extension in self.extensions:
extension.run_hooks('__pre_parse_args__')
self.kwargs['extensions'] = self.extensions
@ -296,7 +299,7 @@ class SaltNova(OpenStackComputeShell):
if not isinstance(value, novaclient.base.Manager):
continue
if value.__class__.__name__ == attr:
setattr(connection, key, getattr(connection, extension.name))
setattr(connection, key, extension.manager_class(connection))
def get_catalog(self):
'''