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

* REST fix to delete incompleted created service

Browse Source 
* oVirtLinkedServiced added check to memory value (fix)
This commit is contained in:
Adolfo Gómez 2014-08-19 08:57:24 +00:00
parent cf5e25796d
commit 89f887c68c
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/src/uds/REST/methods/services.py
View File

@ -91,11 +91,19 @@ class Services(DetailHandler):
logger.exception('getItems') logger.exception('getItems')
self.invalidItemException() self.invalidItemException()
def deleteIncompleteService(self, service):
if service is not None:
try:
service.delete()
except:
pass
def saveItem(self, parent, item): def saveItem(self, parent, item):
# Extract item db fields # Extract item db fields
# We need this fields for all # We need this fields for all
logger.debug('Saving service {0} / {1}'.format(parent, item)) logger.debug('Saving service {0} / {1}'.format(parent, item))
fields = self.readFieldsFromParams(['name', 'comments', 'data_type']) fields = self.readFieldsFromParams(['name', 'comments', 'data_type'])
service = None
try: try:
if item is None: # Create new if item is None: # Create new
service = parent.services.create(**fields) service = parent.services.create(**fields)
@ -110,10 +118,12 @@ class Services(DetailHandler):
except IntegrityError: # Duplicate key probably except IntegrityError: # Duplicate key probably
raise RequestError(_('Element already exists (duplicate key error)')) raise RequestError(_('Element already exists (duplicate key error)'))
except coreService.ValidationException as e: except coreService.ValidationException as e:
self.deleteIncompleteService(service)
raise RequestError(_('Input error: {0}'.format(unicode(e)))) raise RequestError(_('Input error: {0}'.format(unicode(e))))
except Exception: except Exception as e:
self.deleteIncompleteService(service)
logger.exception('Saving Service') logger.exception('Saving Service')
raise RequestError('incorrect invocation to PUT') raise RequestError('incorrect invocation to PUT: {0}'.format(e))
return self.getItems(parent, service.id) return self.getItems(parent, service.id)

2
server/src/uds/services/OVirt/OVirtLinkedService.py
View File

@ -148,7 +148,7 @@ class OVirtLinkedService(Service):
raise Service.ValidationException(_('The length of basename plus length must not be greater than 15')) raise Service.ValidationException(_('The length of basename plus length must not be greater than 15'))
if self.baseName.value.isdigit(): if self.baseName.value.isdigit():
raise Service.ValidationException(_('The machine name can\'t be only numbers')) raise Service.ValidationException(_('The machine name can\'t be only numbers'))
if int(self.memory.value) < 256: if int(self.memory.value) < 256 or int(self.memoryGuaranteed.value) < 256:
raise Service.ValidationException(_('The minimum allowed memory is 256 Mb')) raise Service.ValidationException(_('The minimum allowed memory is 256 Mb'))
if int(self.memoryGuaranteed.value) > int(self.memory.value): if int(self.memoryGuaranteed.value) > int(self.memory.value):
self.memoryGuaranteed.value = self.memory.value self.memoryGuaranteed.value = self.memory.value