From af0f0511bcc6ed660227796c194d59f5c9bbf067 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Mon, 16 Oct 2017 18:46:44 +0300 Subject: Refactor: make State handle any resource type --- ick2/controllerapi.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'ick2/controllerapi.py') diff --git a/ick2/controllerapi.py b/ick2/controllerapi.py index 958b35d..c2d4ef4 100644 --- a/ick2/controllerapi.py +++ b/ick2/controllerapi.py @@ -30,12 +30,7 @@ class ControllerAPI: def set_state_directory(self, dirname): self._state.set_state_directory(dirname) - def load_projects(self): # pragma: no cover - return self._state.load_projects() - def find_missing_route(self, missing_path): # pragma: no cover - self.load_projects() - apis = { '/version': VersionAPI, '/projects': ProjectAPI, @@ -43,6 +38,7 @@ class ControllerAPI: routes = [] for path in apis: + self._state.load_resources(path[1:]) api = apis[path](self._state) routes.extend(api.get_routes(path)) ick2.log.log('info', msg_texg='Found routes', routes=routes) @@ -179,21 +175,20 @@ class ProjectAPI(APIbase): def list(self): return { - 'projects': self._state.get_projects(), + 'projects': self._state.get_resources('projects'), } def show(self, name): - ick2.log.log('xxxxxxx') - return self._state.get_project(name) + return self._state.get_resource('projects', name) def create(self, body): - return self._state.add_project(body) + return self._state.add_resource('projects', body['project'], body) def update(self, body, name): - return self._state.update_project(name, body) + return self._state.update_resource('projects', name, body) def delete(self, name): - self._state.remove_project(name) + self._state.remove_resource('projects', name) def response(status_code, body, headers): # pragma: no cover -- cgit v1.2.1