diff --git a/bin/bastion.py b/bin/bastion.py index dcbedf7..223a005 100755 --- a/bin/bastion.py +++ b/bin/bastion.py @@ -29,6 +29,7 @@ from Bastion.Condo import * from Bastion.Actions import * from Bastion.Model import ARK +from Bastion.CARP import SUCCESS, FAILURE, CRASH, SUCCEEDED, FAILED, CRASHED import Bastion.Vaults.HPSS import Bastion.Vaults.BFD @@ -43,35 +44,6 @@ a. differential if drift < policy b. anchor (full) if drift >= policy """ -def CARP(code, msg, doc, obj = None, **kwargs): - answer = { - 'reply': { - 'status': code, - 'message': msg - }, - 'context': {}, - 'report': doc, - 'data': obj - } - - if 'context' in kwargs: - for k, v in kwargs['context'].items(): - answer['context'][k] = v - - return answer - - -def SUCCESS(doc, obj = None, **kwargs): - return CARP('200', 'Ok', doc, obj, **kwargs) - - -def FAILED(doc, obj = None, **kwargs): - return CARP('400', 'Bad Request', doc, obj, **kwargs) - - -def CRASHED(doc, obj = None, **kwargs): - return CARP('500', 'Internal Application Error (crash!)', doc, obj, **kwargs) - class App: CONF_SEARCH_ORDER = [