Merge "Add logic to handle old and new sdk constructor"
This commit is contained in:
commit
45260c41de
@ -14,7 +14,10 @@
|
||||
import logging
|
||||
|
||||
from openstack import connection
|
||||
try:
|
||||
from openstack import profile
|
||||
except ImportError:
|
||||
profile = None
|
||||
from osc_lib import utils
|
||||
|
||||
from openstackclient.i18n import _
|
||||
@ -33,6 +36,12 @@ API_VERSIONS = {
|
||||
|
||||
def make_client(instance):
|
||||
"""Returns a network proxy"""
|
||||
if profile is None:
|
||||
# New SDK
|
||||
conn = connection.Connection(
|
||||
cloud_config=instance._cli_options,
|
||||
session=instance.session)
|
||||
else:
|
||||
prof = profile.Profile()
|
||||
prof.set_region(API_NAME, instance.region_name)
|
||||
prof.set_version(API_NAME, instance._api_version[API_NAME])
|
||||
|
Loading…
x
Reference in New Issue
Block a user