OW2 Consortium contrail

Rev

Rev 2774 | Rev 3198 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 2774 Rev 3043
Line 246... Line 246...
246
246
247 
    def _do_remove_nodes(self, count):
247 
    def _do_remove_nodes(self, count):
248 
        if count > len(self.nodes) - 1:
248 
        if count > len(self.nodes) - 1:
249 
            self.state = self.S_RUNNING
249 
            self.state = self.S_RUNNING
250 
            return HttpErrorResponse('ERROR: Cannot delete so many workers')
250 
            return HttpErrorResponse('ERROR: Cannot delete so many workers')
251 
        for i in range(0, count):
- 
 
252 
            self.controller.delete_nodes([self.nodes.pop(1)])
- 
 
253 
        self.state = self.S_RUNNING
- 
 
254 
        return HttpJsonResponse()
- 
 
- 
 
 251 
        if count == len(self.nodes):
- 
 
 252 
            self.logger.info('killing the nodes')
- 
 
 253 
            for i in range(0, count):
- 
 
 254 
                self.controller.delete_nodes([self.nodes.pop(1)])
- 
 
 255 
            self.state = self.S_RUNNING
- 
 
 256 
            return HttpJsonResponse()
- 
 
 257 
        else:
- 
 
 258 
            for i in range(0, count):
- 
 
 259 
                node = self.nodes.pop(1)
- 
 
 260 
                self.logger.info('graceful leave on %s', node)
- 
 
 261 
                res = client.graceful_leave(node.ip, 5555)
- 
 
 262 
                self.logger.info('graceful leave: %s', res)
- 
 
 263 
                self.controller.delete_nodes([node])
- 
 
 264 
            self.state = self.S_RUNNING
- 
 
 265 
            return HttpJsonResponse()
255
266
256 
    @expose('GET')
267 
    @expose('GET')
257 
    def getLog(self, kwargs):
268 
    def getLog(self, kwargs):
258 
        self.logger.info('called get_log')
269 
        self.logger.info('called get_log')
259 
        if len(kwargs) != 0:
270 
        if len(kwargs) != 0: