shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-22 13:34:04 +03:00
Code Issues Releases Wiki Activity

Changed names on openstack for older releases

Browse Source
This commit is contained in:
Adolfo Gómez García 2018-10-15 10:47:23 +02:00
parent 73be005f6a
commit 95e99670ee
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/uds/services/OpenStack/Provider.py
View File

@ -44,7 +44,7 @@ from . import openStack
import logging
__updated__ = '2018-09-18'
__updated__ = '2018-10-15'
logger = logging.getLogger(__name__)
@ -97,8 +97,8 @@ class Provider(ServiceProvider):
# If we don't indicate an order, the output order of fields will be
# "random"
host = gui.TextField(length=64, label=_('Host'), order=1, tooltip=_('OpenStack Host'), required=True)
port = gui.NumericField(length=5, label=_('Port'), defvalue='5000', order=2, tooltip=_('OpenStack Port'), required=True)
newVersion = gui.CheckBoxField(label=_('Newer Openstack'), order=3, tooltip=_('Check this if your openstack is newer than OCATA'))
port = gui.NumericField(length=5, label=_('Port'), defvalue='5000', order=2, tooltip=_('5000 for older releases, 80/443 (ssl) for releases newer than OCATA'), required=True)
legacyVersion = gui.CheckBoxField(label=_('Legacy openstack'), order=3, tooltip=_('Set to "yes" if your Openstack release is OCATA or older'), defvalue=gui.TRUE)
ssl = gui.CheckBoxField(label=_('Use SSL'), order=4, tooltip=_('If checked, the connection will be forced to be ssl (will not work if server is not providing ssl)'))
access = gui.ChoiceField(label=_('Access interface'), order=5, tooltip=_('Access interface to be used'), values=INTERFACE_VALUES, defvalue='public')
@ -130,7 +130,7 @@ class Provider(ServiceProvider):
def api(self, projectId=None, region=None):
return openStack.Client(self.host.value, self.port.value,
self.domain.value, self.username.value, self.password.value,
newVersion=self.newVersion.isTrue(),
legacyVersion=self.legacyVersion.isTrue(),
useSSL=self.ssl.isTrue(),
projectId=projectId,
region=region,

8
server/src/uds/services/OpenStack/openStack/UDSOpenStackClient.py
View File

@ -39,7 +39,7 @@ import json
import dateutil.parser
import six
__updated__ = '2018-09-18'
__updated__ = '2018-10-15'
logger = logging.getLogger(__name__)
@ -117,8 +117,8 @@ class Client(object):
PRIVATE = 'private'
INTERNAL = 'url'
# NewVersion is True for versions >= Ocata
def __init__(self, host, port, domain, username, password, newVersion=False, useSSL=False, projectId=None, region=None, access=None):
# Legacyversion is True for versions <= Ocata
def __init__(self, host, port, domain, username, password, legacyVersion=True, useSSL=False, projectId=None, region=None, access=None):
self._authenticated = False
self._tokenId = None
self._catalog = None
@ -132,7 +132,7 @@ class Client(object):
self._region = region
self._timeout = 10
self._authUrl = 'http{}://{}:{}/{}'.format('s' if useSSL else '', host, port, 'identity/' if newVersion else '')
self._authUrl = 'http{}://{}:{}/{}'.format('s' if useSSL else '', host, port, 'identity/' if not legacyVersion else '')
def _getEndpointFor(self, type_): # If no region is indicatad, first endpoint is returned
for i in self._catalog: