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

Updated handlers to use a new feature of the CCServer API instead of editing the query.

parent d95294fe

ccserver/handlers.py

+12 −12
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ class ClientHandler(OnlineCCHandler): 
        return self._server.list(query)



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

        vms = self._server.list(query + '$vm$role')

        vms = self._server.list(query, show=set(('vm', 'role')))

        hypervisors = list(self._server.iter_connected_role('hypervisor'))

        for hv in hypervisors:

            vm_to_start = []
@@ -166,7 +166,7 @@ class ClientHandler(OnlineCCHandler): 
        Define a new password for specified user.

        '''



        objects = self._server.list(query)

        objects = self._server.list(query, show=set(('a',)))

        errs = Reporter()

        with self._server.conf:

            for obj in objects:
@@ -194,7 +194,7 @@ class ClientHandler(OnlineCCHandler): 
        if tag_name in self._server.RESERVED_TAGS:

            raise ReservedTagError('Tag %r is read-only' % tag_name)



        objects = self._server.list(query)

        objects = self._server.list(query, show=set(('a',)))

        errs = Reporter()

        with self._server.conf:

            for obj in objects:
@@ -220,7 +220,7 @@ class ClientHandler(OnlineCCHandler): 
        if tag_name in self._server.RESERVED_TAGS:

            raise ReservedTagError('Tag %r is read-only' % tag_name)



        objects = self._server.list(query)

        objects = self._server.list(query, show=set(('a',)))

        errs = Reporter()

        with self._server.conf:

            for obj in objects:
@@ -241,7 +241,7 @@ class ClientHandler(OnlineCCHandler): 
        '''

        Return all static tags attached to the specified login.

        '''

        objects = self._server.list(query)

        objects = self._server.list(query, show=set(('a',)))

        for obj in objects:

            if 'a' not in obj:

                raise BadObjectError('All objects must have the "a" tag.')
@@ -258,7 +258,7 @@ class ClientHandler(OnlineCCHandler): 
        Delete the account with specified login.

        '''

        

        objects = self._server.list(query)

        objects = self._server.list(query, show=set(('a',)))

        errs = Reporter()

        with self._server.conf:

            for obj in objects:
@@ -280,7 +280,7 @@ class ClientHandler(OnlineCCHandler): 
        Close an account without deleting it.

        '''

        

        objects = self._server.list(query)

        objects = self._server.list(query, show=set(('a',)))

        errs = Reporter()

        with self._server.conf:

            for obj in objects:
@@ -302,7 +302,7 @@ class ClientHandler(OnlineCCHandler): 
        Re-open an closed account.

        '''

        

        objects = self._server.list(query)

        objects = self._server.list(query, show=set(('a',)))

        errs = Reporter()

        with self._server.conf:

            for obj in objects:
@@ -324,7 +324,7 @@ class ClientHandler(OnlineCCHandler): 
        Disconnect all connected accounts selected by query.

        '''



        objects = self._server.list(query)

        objects = self._server.list(query, show=set(('a',)))

        errs = Reporter()

        with self._server.conf:

            for obj in objects:
@@ -347,7 +347,7 @@ class ClientHandler(OnlineCCHandler): 
        Get the rights of an object set.

        '''

        

        objects = self._server.list(query)

        objects = self._server.list(query, show=set(('a',)))

        rules = {}

        for obj in objects:

            if 'a' in obj:
@@ -363,7 +363,7 @@ class ClientHandler(OnlineCCHandler): 
        Add a right rule to the selected objects.

        '''

        

        objects = self._server.list(query)

        objects = self._server.list(query, show=set(('a',)))

        errs = Reporter()

        with self._server.conf:

            for obj in objects:
@@ -386,7 +386,7 @@ class ClientHandler(OnlineCCHandler): 
        Remove a right rule from the selected objects.

        '''

        

        objects = self._server.list(query)

        objects = self._server.list(query, show=set(('a',)))

        errs = Reporter()

        with self._server.conf:

            for obj in objects: