burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

Removed cache for credentials on OpenStack platform

Browse Source
This commit is contained in:
Adolfo Gómez García 2018-02-27 06:49:24 +01:00
parent 1e6f806563
commit 98befc7cee
1 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,14 +42,12 @@ import dateutil.parser
import hashlib import hashlib
import six import six
__updated__ = '2018-02-27'
__updated__ = '2017-03-21'
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# Required: Authentication v3 # Required: Authentication v3
# This is a vary basic implementation for what we need from openstack # This is a vary basic implementation for what we need from openstack
# This does not includes (nor it is intention) full API implementation, just the parts we need # This does not includes (nor it is intention) full API implementation, just the parts we need
# Theese are related to auth, compute & network basically # Theese are related to auth, compute & network basically
@ -60,6 +58,7 @@ logger = logging.getLogger(__name__)
# Do not verify SSL conections right now # Do not verify SSL conections right now
VERIFY_SSL = False VERIFY_SSL = False
# Helpers # Helpers
def ensureResponseIsValid(response, errMsg=None): def ensureResponseIsValid(response, errMsg=None):
if response.ok is False: if response.ok is False:
@ -96,6 +95,7 @@ def getRecurringUrlJson(url, headers, key, params=None, errMsg=None, timeout=10)
# Decorators # Decorators
def authRequired(func): def authRequired(func):
def ensurer(obj, *args, **kwargs): def ensurer(obj, *args, **kwargs):
obj.ensureAuthenticated() obj.ensureAuthenticated()
try: try:
@ -104,14 +104,18 @@ def authRequired(func):
logger.error('Got error {} for openstack'.format(e)) logger.error('Got error {} for openstack'.format(e))
obj._cleanCache() # On any request error, force next time auth obj._cleanCache() # On any request error, force next time auth
raise raise
return ensurer return ensurer
def authProjectRequired(func): def authProjectRequired(func):
def ensurer(obj, *args, **kwargs): def ensurer(obj, *args, **kwargs):
if obj._projectId is None: if obj._projectId is None:
raise Exception('Need a project for method {}'.format(func)) raise Exception('Need a project for method {}'.format(func))
obj.ensureAuthenticated() obj.ensureAuthenticated()
return func(obj, *args, **kwargs) return func(obj, *args, **kwargs)
return ensurer return ensurer
@ -193,8 +197,8 @@ class Client(object):
def authPassword(self): def authPassword(self):
# If cached data exists, use it as auth # If cached data exists, use it as auth
if self._getFromCache() is True: # if self._getFromCache() is True:
return # return
data = { data = {
'auth': { 'auth': {
@ -239,20 +243,18 @@ class Client(object):
self._userId = token['user']['id'] self._userId = token['user']['id']
validity = (dateutil.parser.parse(token['expires_at']).replace(tzinfo=None) - dateutil.parser.parse(token['issued_at']).replace(tzinfo=None)).seconds - 60 validity = (dateutil.parser.parse(token['expires_at']).replace(tzinfo=None) - dateutil.parser.parse(token['issued_at']).replace(tzinfo=None)).seconds - 60
logger.debug('The token {} will be valid for {}'.format(self._tokenId, validity)) logger.debug('The token {} will be valid for {}'.format(self._tokenId, validity))
# Now, if endpoints are present (only if tenant was specified), store & cache them # Now, if endpoints are present (only if tenant was specified), store & cache them
if self._projectId is not None: if self._projectId is not None:
self._catalog = token['catalog'] self._catalog = token['catalog']
self._saveToCache(validity) # self._saveToCache(validity)
def ensureAuthenticated(self): def ensureAuthenticated(self):
if self._authenticated is False: if self._authenticated is False:
self.authPassword() self.authPassword()
@authRequired @authRequired
def listProjects(self): def listProjects(self):
return getRecurringUrlJson(self._authUrl + 'v3/users/{user_id}/projects'.format(user_id=self._userId), return getRecurringUrlJson(self._authUrl + 'v3/users/{user_id}/projects'.format(user_id=self._userId),
@ -261,7 +263,6 @@ class Client(object):
errMsg='List Projects', errMsg='List Projects',
timeout=self._timeout) timeout=self._timeout)
@authRequired @authRequired
def listRegions(self): def listRegions(self):
return getRecurringUrlJson(self._authUrl + 'v3/regions/', return getRecurringUrlJson(self._authUrl + 'v3/regions/',
@ -270,7 +271,6 @@ class Client(object):
errMsg='List Regions', errMsg='List Regions',
timeout=self._timeout) timeout=self._timeout)
@authProjectRequired @authProjectRequired
def listServers(self, detail=False, params=None): def listServers(self, detail=False, params=None):
path = '/servers/' + 'detail' if detail is True else '' path = '/servers/' + 'detail' if detail is True else ''
@ -281,7 +281,6 @@ class Client(object):
errMsg='List Vms', errMsg='List Vms',
timeout=self._timeout) timeout=self._timeout)
@authProjectRequired @authProjectRequired
def listImages(self): def listImages(self):
return getRecurringUrlJson(self._getEndpointFor('image') + '/v2/images?status=active', return getRecurringUrlJson(self._getEndpointFor('image') + '/v2/images?status=active',
@ -290,7 +289,6 @@ class Client(object):
errMsg='List Images', errMsg='List Images',
timeout=self._timeout) timeout=self._timeout)
@authProjectRequired @authProjectRequired
def listVolumeTypes(self): def listVolumeTypes(self):
return getRecurringUrlJson(self._getEndpointFor('volumev2') + '/types', return getRecurringUrlJson(self._getEndpointFor('volumev2') + '/types',
@ -299,7 +297,6 @@ class Client(object):
errMsg='List Volume Types', errMsg='List Volume Types',
timeout=self._timeout) timeout=self._timeout)
@authProjectRequired @authProjectRequired
def listVolumes(self): def listVolumes(self):
# self._getEndpointFor('volumev2') + '/volumes' # self._getEndpointFor('volumev2') + '/volumes'
@ -309,7 +306,6 @@ class Client(object):
errMsg='List Volumes', errMsg='List Volumes',
timeout=self._timeout) timeout=self._timeout)
@authProjectRequired @authProjectRequired
def listVolumeSnapshots(self, volumeId=None): def listVolumeSnapshots(self, volumeId=None):
for s in getRecurringUrlJson(self._getEndpointFor('volumev2') + '/snapshots', for s in getRecurringUrlJson(self._getEndpointFor('volumev2') + '/snapshots',
@ -320,7 +316,6 @@ class Client(object):
if volumeId is None or s['volume_id'] == volumeId: if volumeId is None or s['volume_id'] == volumeId:
yield s yield s
@authProjectRequired @authProjectRequired
def listAvailabilityZones(self): def listAvailabilityZones(self):
for az in getRecurringUrlJson(self._getEndpointFor('compute') + '/os-availability-zone', for az in getRecurringUrlJson(self._getEndpointFor('compute') + '/os-availability-zone',
@ -331,7 +326,6 @@ class Client(object):
if az['zoneState']['available'] is True: if az['zoneState']['available'] is True:
yield az['zoneName'] yield az['zoneName']
@authProjectRequired @authProjectRequired
def listFlavors(self): def listFlavors(self):
return getRecurringUrlJson(self._getEndpointFor('compute') + '/flavors', return getRecurringUrlJson(self._getEndpointFor('compute') + '/flavors',
@ -340,7 +334,6 @@ class Client(object):
errMsg='List Flavors', errMsg='List Flavors',
timeout=self._timeout) timeout=self._timeout)
@authProjectRequired @authProjectRequired
def listNetworks(self): def listNetworks(self):
return getRecurringUrlJson(self._getEndpointFor('network') + '/v2.0/networks', return getRecurringUrlJson(self._getEndpointFor('network') + '/v2.0/networks',
@ -372,7 +365,6 @@ class Client(object):
errMsg='List security groups', errMsg='List security groups',
timeout=self._timeout) timeout=self._timeout)
@authProjectRequired @authProjectRequired
def getServer(self, serverId): def getServer(self, serverId):
r = requests.get(self._getEndpointFor('compute') + '/servers/{server_id}'.format(server_id=serverId), r = requests.get(self._getEndpointFor('compute') + '/servers/{server_id}'.format(server_id=serverId),
@ -396,7 +388,6 @@ class Client(object):
return v return v
@authProjectRequired @authProjectRequired
def getSnapshot(self, snapshotId): def getSnapshot(self, snapshotId):
''' '''
@ -414,7 +405,6 @@ class Client(object):
return v return v
@authProjectRequired @authProjectRequired
def updateSnapshot(self, snapshotId, name=None, description=None): def updateSnapshot(self, snapshotId, name=None, description=None):
data = { 'snapshot': {} } data = { 'snapshot': {} }
@ -436,7 +426,6 @@ class Client(object):
return v return v
@authProjectRequired @authProjectRequired
def createVolumeSnapshot(self, volumeId, name, description=None): def createVolumeSnapshot(self, volumeId, name, description=None):
description = 'UDS Snapshot' if description is None else description description = 'UDS Snapshot' if description is None else description
@ -461,7 +450,6 @@ class Client(object):
return r.json()['snapshot'] return r.json()['snapshot']
@authProjectRequired @authProjectRequired
def createVolumeFromSnapshot(self, snapshotId, name, description=None): def createVolumeFromSnapshot(self, snapshotId, name, description=None):
description = 'UDS Volume' if description is None else description description = 'UDS Volume' if description is None else description
@ -520,7 +508,6 @@ class Client(object):
return r.json()['server'] return r.json()['server']
@authProjectRequired @authProjectRequired
def deleteServer(self, serverId): def deleteServer(self, serverId):
r = requests.post(self._getEndpointFor('compute') + '/servers/{server_id}/action'.format(server_id=serverId), r = requests.post(self._getEndpointFor('compute') + '/servers/{server_id}/action'.format(server_id=serverId),
@ -533,7 +520,6 @@ class Client(object):
# This does not returns anything # This does not returns anything
@authProjectRequired @authProjectRequired
def deleteSnapshot(self, snapshotId): def deleteSnapshot(self, snapshotId):
r = requests.delete(self._getEndpointFor('volumev2') + '/snapshots/{snapshot_id}'.format(snapshot_id=snapshotId), r = requests.delete(self._getEndpointFor('volumev2') + '/snapshots/{snapshot_id}'.format(snapshot_id=snapshotId),
@ -545,7 +531,6 @@ class Client(object):
# Does not returns a message body # Does not returns a message body
@authProjectRequired @authProjectRequired
def startServer(self, serverId): def startServer(self, serverId):
r = requests.post(self._getEndpointFor('compute') + '/servers/{server_id}/action'.format(server_id=serverId), r = requests.post(self._getEndpointFor('compute') + '/servers/{server_id}/action'.format(server_id=serverId),
@ -558,7 +543,6 @@ class Client(object):
# This does not returns anything # This does not returns anything
@authProjectRequired @authProjectRequired
def stopServer(self, serverId): def stopServer(self, serverId):
r = requests.post(self._getEndpointFor('compute') + '/servers/{server_id}/action'.format(server_id=serverId), r = requests.post(self._getEndpointFor('compute') + '/servers/{server_id}/action'.format(server_id=serverId),
@ -589,7 +573,6 @@ class Client(object):
ensureResponseIsValid(r, 'Resuming server') ensureResponseIsValid(r, 'Resuming server')
def testConnection(self): def testConnection(self):
# First, ensure requested api is supported # First, ensure requested api is supported
# We need api version 3.2 or greater # We need api version 3.2 or greater