Commit f310e835 authored by Antoine Millet's avatar Antoine Millet
Browse files

New object representation.

parent 581b45ae

ccserver/handlers.py

+11 −16
Original line number Diff line number Diff line
@@ -24,22 +24,23 @@ class Reporter(object): 
    '''



    def __init__(self):

        self._reports = {}

        self._reports = []



    def get_dict(self):

        return self._reports.copy().items()

        return {'objects': self._reports,

                'tagorder': ['id', 'status', 'message']}



    def success(self, oid, message, output=None):

        report = [('id', oid), ('status', 'success'), ('message', message)]

        self._reports[oid] = (output, report)

        self._reports.append({'id': oid, 'status': 'success',

                              'message': message, 'output': output})

        

    def warn(self, oid, message, output=None):

        report = [('id', oid), ('status', 'warn'), ('message', message)]

        self._reports[oid] = (output, report)

        self._reports.append({'id': oid, 'status': 'warn',

                              'message': message, 'output': output})



    def error(self, oid, message, output=None):

        report = [('id', oid), ('status', 'error'), ('message', message)]

        self._reports[oid] = (output, report)

        self._reports.append({'id': oid, 'status': 'error',

                              'message': message, 'output': output})





class CCHandler(RpcHandler):
@@ -187,14 +188,8 @@ class CliHandler(OnlineCCHandler): 


        self._check(conn, 'list', query)

        logging.debug('Executed list function with query %s', query)

        objects_cli = []

        for obj in self._server.list(query):

            oid = obj['id']

            del obj['id']

            obj = obj.items()

            obj.insert(0, ('id', oid))

            objects_cli.append(obj)

        return objects_cli

        objects = self._server.list(query)

        return {'objects': objects, 'order': ['id']}



    def _vm_action(self, query, method, *args, **kwargs):

        vms = self._server.list(query, show=set(('r', 'h')))